diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 894b7f1..1e502d2 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -72,9 +72,8 @@ echo ### UNINSTALL tasks ###
 echo #######################
 echo.
 
-rem uninstall ALL Apps (but keep the store) ...
-rem powershell -Command .\uninstall-apps.ps1
-rem echo.
+powershell -command .\uninstall-apps.ps1
+echo.
 
 call uninstall-onedrive.cmd
 echo.
diff --git a/scripts/deploy/logon.cmd b/scripts/deploy/logon.cmd
index 0af26b7..97eb34a 100644
--- a/scripts/deploy/logon.cmd
+++ b/scripts/deploy/logon.cmd
@@ -68,6 +68,18 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 echo refresh desktop (W10 style)
 ie4uinit.exe -show
 
+echo enabling fast shutdown ...
+reg add "HKEY_CURRENT_USER\Control Panel\Desktop"
+  /v "WaitToKillAppTimeOut" /t REG_DWORD /d 2000 /f 1>nul
+reg add "HKEY_CURRENT_USER\Control Panel\Desktop"
+  /v "HungAppTimeout" /t REG_DWORD /d 2000 /f 1>nul
+reg add "HKEY_CURRENT_USER\Control Panel\Desktop"
+  /v "AutoEndTasks" /t REG_DWORD /d 1 /f 1>nul
+
+echo add seconds to clock ...
+reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+  /v "ShowSecondsInSystemClock" /t REG_DWORD /d 1 /f 1>nul
+
 echo disable search box on taskbar ...
 reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Search" ^
   /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f 1>nul
diff --git a/scripts/tweaks/add_seconds_to_clock.reg b/scripts/tweaks/add_seconds_to_clock.reg
deleted file mode 100644
index 081b4af..0000000
Binary files a/scripts/tweaks/add_seconds_to_clock.reg and /dev/null differ
diff --git a/scripts/tweaks/fast_reboot_and_shutdown.reg b/scripts/tweaks/fast_reboot_and_shutdown.reg
index 53a76c7..d5896f6 100644
Binary files a/scripts/tweaks/fast_reboot_and_shutdown.reg and b/scripts/tweaks/fast_reboot_and_shutdown.reg differ
diff --git a/scripts/uninstall-apps.ps1 b/scripts/uninstall-apps.ps1
index bec3593..690fae3 100644
--- a/scripts/uninstall-apps.ps1
+++ b/scripts/uninstall-apps.ps1
@@ -1,22 +1,22 @@
-# REMOVE all applications except the Store and the Terminal ...
+# REMOVE all applications except the Calculator, the Store and the Terminal ...
 
 write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
 
 $ErrorActionPreference = 'SilentlyContinue'
 
 Get-AppxPackage -AllUsers |
+  where-object {$_.name -notlike "*calc*"} |
   where-object {$_.name -notlike "*store*"} |
   where-object {$_.name -notlike "*terminal*"} |
   Remove-AppxPackage
 
 Get-AppxProvisionedPackage -online |
+  where-object {$_.name -notlike "*calc*"} |
   where-object {$_.name -notlike "*store*"} |
   where-object {$_.name -notlike "*terminal*"} |
   Remove-AppxProvisionedPackage -online
 
-# REINSTALL the Calculator ...
-# just sparing it is not working ... must be reinstalled ...
-
+# make sure that the calculator is installed ...
 $PROGS=$Env:ProgramFiles
 $CALC=Get-AppXpackage -Allusers Microsoft.WindowsCalculator | select -expand PackageFullName
 Add-AppXPackage -register "$PROGS\WindowsApps\$CALC\AppXManifest.xml" -DisableDevelopmentMode