diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 713977e..bf506e0 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -146,9 +146,6 @@ echo.
 call install-virtualbox.cmd
 echo.
 
-call install-antivir.cmd
-echo.
-
 call install-desktoplinks.cmd
 echo.
 
diff --git a/scripts/install-openshell.cmd b/scripts/install-openshell.cmd
index 2b01cf5..092dc6e 100644
--- a/scripts/install-openshell.cmd
+++ b/scripts/install-openshell.cmd
@@ -9,9 +9,6 @@ if NOT EXIST %SOFTWARE%\%EXE% (
   exit /b
 )
 
-rem config must be full qualified pathname (OpenShell BUG!)
-set CONFIG=c:\tools\scripts\config\OpenshellSettings.xml 
-
 echo ####### %0 #######
 
 cd %SOFTWARE%
@@ -23,8 +20,5 @@ cd %SCRIPTS%
 echo removing OpenShell Readme file link ...
 del /F "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Open-Shell\Open-Shell Readme.lnk" 2>nul
 
-echo loading OpenShell config ...
-"%ProgramFiles%\Open-Shell\StartMenu.exe" -xml %CONFIG%
-
 echo ####### %0 #######
 
diff --git a/tools/logon.cmd b/tools/logon.cmd
index 74dd4ab..bd4c339 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -108,6 +108,11 @@ echo removing pinned apps from taskbar ...
 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 loading OpenShell config ...
+rem config must be full qualified pathname (OpenShell BUG!)
+set CONFIG=%TOOLS%\scripts\config\OpenshellSettings.xml
+"%ProgramFiles%\Open-Shell\StartMenu.exe" -xml %CONFIG%
+
 echo restarting explorer ...
 taskkill /f /im explorer.exe 1>nul 2>nul
 start explorer.exe
diff --git a/scripts/install-antivir.cmd b/tools/optional/install-antivir.cmd
similarity index 100%
rename from scripts/install-antivir.cmd
rename to tools/optional/install-antivir.cmd