From f311f9cf96ab369392128286704b15fbfaf60bde Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sat, 13 Feb 2021 22:29:02 +0100
Subject: [PATCH] .

---
 scripts/autoconfig-all.cmd |  3 +++
 scripts/deploy/logon.cmd   |  9 ++-------
 scripts/modify-taskbar.cmd | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 scripts/modify-taskbar.cmd

diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index cebd9aa..984e829 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -57,6 +57,9 @@ echo.
 call modify-desktoptheme.cmd
 echo.
 
+call modify-taskbar.cmd
+echo.
+
 call install-tweaks.cmd
 echo.
 
diff --git a/scripts/deploy/logon.cmd b/scripts/deploy/logon.cmd
index f639e42..3cd4195 100644
--- a/scripts/deploy/logon.cmd
+++ b/scripts/deploy/logon.cmd
@@ -87,13 +87,8 @@ echo disable notification center ...
 reg add "HKEY_CURRENT_USER\SOFTWARE\Policies\Microsoft\Windows\Explorer" ^
   /v "DisableNotificationCenter" /t REG_DWORD /d 1 /f 1>nul
 
-echo disable windows ink completely ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsInkWorkspace" ^
- /v "AllowWindowsInkWorkspace" /t REG_DWORD /d 0 /f 1>nul
-
-echo remove store icon from taskbar ...
-reg add "HKEY_CURRENT_USER\SOFTWARE\Policies\Microsoft\Windows\Explorer" ^
-  /v "NoPinningStoreToTaskbar" /t REG_DWORD /d 0 /f 1>nul
+del /F /S /Q /A "%AppData%\Microsoft\Internet Explorer\Quick Launch\User Pinned\TaskBar\*"
+reg delete "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Taskband" /f
 
 echo restarting explorer ...
 taskkill /f /im explorer.exe 1>nul 2>nul
diff --git a/scripts/modify-taskbar.cmd b/scripts/modify-taskbar.cmd
new file mode 100644
index 0000000..e4bc74e
--- /dev/null
+++ b/scripts/modify-taskbar.cmd
@@ -0,0 +1,18 @@
+@echo off
+
+echo ####### %0 #######
+
+echo disable windows ink completely ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\WindowsInkWorkspace" ^
+  /v "AllowWindowsInkWorkspace" /t REG_DWORD /d 0 /f 1>nul
+
+echo remove store icon from taskbar ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer" ^
+  /v "NoPinningStoreToTaskbar" /t REG_DWORD /d 1 /f 1>nul
+
+reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ^
+  /v "SecurityHealth" /f 1>nul 2>nul
+taskkill /f /im SecurityHealthSystray.exe 1>nul 2>nul
+
+echo ####### %0 #######
+