diff --git a/scripts/install-firefox.cmd b/scripts/install-firefox.cmd
index 7c98272..b4278f9 100644
--- a/scripts/install-firefox.cmd
+++ b/scripts/install-firefox.cmd
@@ -30,8 +30,8 @@ cd %SOFTWARE%
 @echo on
 firefox-setup.exe /S /MaintenanceService=false /TaskbarShortcut=false /RegisterDefaultAgent=false
 @echo off
-echo sleep 10 seconds ...
-ping 127.0.0.1 -n 10 > NUL 2>&1
+echo sleep 5 seconds ...
+ping 127.0.0.1 -n 5 > NUL 2>&1
 cd %SCRIPTS%
 
 rem copy config ...
diff --git a/scripts/install-logonscript.cmd b/scripts/install-logonscript.cmd
index 086aacd..ff5d2cf 100644
--- a/scripts/install-logonscript.cmd
+++ b/scripts/install-logonscript.cmd
@@ -11,8 +11,5 @@ rd /S /Q %PUBLIC%\Desktop\Startup 1>nul 2>nul
 echo creating link for logon script ...
 mklink %TARGET%\logon.cmd %TOOLS%\logon.cmd
 
-echo create link for Startup folder on desktop ...
-mklink /D "%PUBLIC%\Desktop\Startup" %TARGET%
-
 echo ####### %0 #######
 
diff --git a/scripts/modify-explorer.cmd b/scripts/modify-explorer.cmd
index 06e0389..f2059bd 100644
--- a/scripts/modify-explorer.cmd
+++ b/scripts/modify-explorer.cmd
@@ -2,19 +2,37 @@
 
 echo ####### %0 #######
 
-echo disable quick access ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" ^
-  /v "HubMode" /t REG_DWORD /d 1 /f 1>nul
-
-echo disable network icon ...
+echo disabling network icon ...
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\NonEnum" ^
   /v "{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}" /t REG_DWORD /d 1 /f 1>nul
 
-echo removing other BULLSHIT ...
+echo removing user folders ...
+for %%K in (
 
-rem 3d Objects ...
-reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}" /f 1>nul
-reg delete "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}" /f 1>nul
+  {0DB7E03F-FC29-4DC6-9020-FF41B59E513A}
+  {B4BFCC3A-DB2C-424C-B029-7FE99A87C641}
+  {A8CDFF1C-4878-43be-B5FD-F8091C1C60D0}
+  {d3162b92-9365-467a-956b-92703aca08af}
+  {374DE290-123F-4565-9164-39C4925E467B}
+  {088e3905-0323-4b02-9826-5d99428e115f}
+  {1CF1260C-4DD0-4ebb-811F-33C572699FDE}
+  {3dfdf296-dbec-4fb4-81d1-6a3438bcf4de}
+  {3ADD1653-EB32-4cb0-BBD7-DFA0ABB5ACCA}
+  {24ad3ad4-a569-4530-98e1-ab02f9417aa8}
+  {A0953C92-50DC-43bf-BE83-3742FED03C9C}
+  {f86fa3ab-70d2-4fc7-9c99-fcbf05467f3a}
+
+) do (
+
+  echo %%K
+  rem reg delete ^
+    "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\%%K" /f 2>nul
+  rem reg delete ^
+    "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\%%K" /f 2>nul
+  reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideMyComputerIcons" ^
+    /v "%%K" /t REG_DWORD /d 1 /f 2>nul
+
+)
 
 echo restarting explorer ...
 taskkill /f /im explorer.exe 1>nul 2>nul
diff --git a/tools/logon.cmd b/tools/logon.cmd
index af33199..b6b74cc 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -97,12 +97,6 @@ reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Hi
 reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu" ^
  /v "{20D04FE0-3AEA-1069-A2D8-08002B30309D}" /t REG_DWORD /d 0 /f 1>nul
 
-echo add userhome icon on windows 10 desktop for current user ...
-reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel" ^
- /v "{59031a47-3f72-44a7-89c5-5595fe6b30ee}" /t REG_DWORD /d 0 /f 1>nul
-reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu" ^
- /v "{59031a47-3f72-44a7-89c5-5595fe6b30ee}" /t REG_DWORD /d 0 /f 1>nul
-
 echo refresh desktop (W10 style)
 ie4uinit.exe -show