diff --git a/CustomSetup.cmd b/CustomSetup.cmd
index 844b72f..1b60c40 100644
--- a/CustomSetup.cmd
+++ b/CustomSetup.cmd
@@ -2,9 +2,7 @@
 rem this script puts everything in place ...
 
 set TOOLS=c:\tools
-set SOFTWARE=%TOOLS%\software
-set SCRIPTS=%TOOLS%\scripts
-set BATCH=%SCRIPTS%\autoconfig-all.cmd
+set BATCH=%TOOLS%\scripts\\autoconfig-all.cmd
 set LOG=c:\CustomSetup.txt
 
 del /F %LOG% 1>nul 2>nul
@@ -31,35 +29,6 @@ echo deleting %TOOLS% ...
 rd /S /Q %TOOLS%
 echo.
 
-echo copying folder %TOOLS% ...
-robocopy tools %TOOLS% /MIR /256 /NJH /NFL /NDL
-echo.
-
-echo unpacking BGInfo ...
-%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\BGInfo.zip
-del /F %TOOLS%\BGInfo.zip 1>nul 2>nul
-echo.
-
-echo unpacking TOTAL commander ...
-%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\totalcmd_951.zip
-del /F %TOOLS%\totalcmd_951.zip 1>nul 2>nul
-echo.
-
-echo unpacking notepad++ ...
-%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\notepad++.zip
-del /F %TOOLS%\notepad++.zip 1>nul 2>nul
-echo.
-
-echo unpacking ImapCopy ...
-%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\ImapCopy.zip
-del /F %TOOLS%\ImapCopy.zip 1>nul 2>nul
-echo.
-
-echo unpacking MediaCreationTool ...
-%TOOLS%\7z x -aoa -o%SOFTWARE% %SOFTWARE%\MediaCreationTool20H2.zip
-del /F %SOFTWARE%\MediaCreationTool20H2.zip 1>nul 2>nul
-echo.
-
 echo starting %BATCH% ...
 call %BATCH%
 echo.
diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 8924891..8f9a77a 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -21,12 +21,6 @@ mkdir %T% 1>nul 2>nul
 echo cd to %SCRIPTS% ...
 cd /D %SCRIPTS%
 
-echo copy files in deploy folder to %TOOLS% ...
-if EXIST deploy (
-  move /Y deploy\* %TOOLS% 2>nul
-  rmdir deploy 2>nul
-)
-
 echo.
 echo #######################
 echo ### GLOBAL settings ###
diff --git a/scripts/config/vimrc.txt b/scripts/config/vimrc.txt
index 2100a94..06ded3e 100644
--- a/scripts/config/vimrc.txt
+++ b/scripts/config/vimrc.txt
@@ -27,8 +27,8 @@ set noswapfile
 "                             "
 """""""""""""""""""""""""""""""
 
-"Show line numbers
-set number
+"dont't show line numbers
+set nonumber
 
 "Transform tabs to spaces
 set tabstop=8
diff --git a/scripts/install-adk.cmd b/scripts/install-adk.cmd
index da3bfa8..759bf78 100644
--- a/scripts/install-adk.cmd
+++ b/scripts/install-adk.cmd
@@ -1,6 +1,11 @@
 @echo off
 
-set EXE=..\software\adksetup.exe
+set EXE=..\software\adk-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-antivir.cmd b/scripts/install-antivir.cmd
index dd7ae3f..37be12c 100644
--- a/scripts/install-antivir.cmd
+++ b/scripts/install-antivir.cmd
@@ -2,13 +2,18 @@
 
 set EXE=..\software\F-SecureNetworkInstaller-AV_AVTR20F930_.exe
 
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
 echo ####### %0 #######
 
 echo installing F-Secure Anti-Virus ...
 %EXE% --silent
 
 echo removing F-Secure desktop link ...
-del /F "%PUBLIC%\Desktop\F-Secure Anti-Virus.lnk"
+del /F "%PUBLIC%\Desktop\F-Secure Anti-Virus.lnk" 2>nul
 
 echo ####### %0 #######
 
diff --git a/scripts/install-emclient.cmd b/scripts/install-emclient.cmd
index 79879ba..7cba5cb 100644
--- a/scripts/install-emclient.cmd
+++ b/scripts/install-emclient.cmd
@@ -2,8 +2,12 @@
 
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
+set MSI=emclient-setup.msi
 
-set MSI=emclient-v8.1.1054.msi
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-far.cmd b/scripts/install-far.cmd
index aedc4c9..2490e4b 100644
--- a/scripts/install-far.cmd
+++ b/scripts/install-far.cmd
@@ -2,9 +2,13 @@
 
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
-
 set MSI=far-setup.msi
 
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
+
 echo ####### %0 #######
 
 cd %SOFTWARE%
diff --git a/scripts/install-firefox.cmd b/scripts/install-firefox.cmd
index f4f78df..d680e11 100644
--- a/scripts/install-firefox.cmd
+++ b/scripts/install-firefox.cmd
@@ -1,27 +1,31 @@
 @echo off
 
 set CONF=config\firefox
-set SCRIPTS=..\..\scripts
-set SOFTWARE=..\software\firefox
+set SCRIPTS=..\scripts
+set SOFTWARE=..\software
+set MSI=firefox-setup.msi
 
-set MSI=Firefox_Setup_83.0b9.msi
-set FIREFOXBASE="C:\Program Files\Mozilla Firefox"
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
 
-set BADGERFILE=%SOFTWARE%\privacy_badger-2020.12.10.xpi
+set FIREFOXBASE="%ProgramFiles%\Mozilla Firefox"
+
+set BADGERFILE=%SOFTWARE%\privacybadger-addon.xpi
 set BADGERTARGET=jid1-MnnxcxisBPnSXQ@jetpack.xpi
 
-set UBLOCKFILE=%SOFTWARE%\ublock_origin-1.32.0.xpi
+set UBLOCKFILE=%SOFTWARE%\ublockorigin-addon.xpi
 set UBLOCKTARGET=uBlock0@raymondhill.net.xpi
 
-set PASSWORD1FILE=%SOFTWARE%\1password-1.22.3.xpi
+set PASSWORD1FILE=%SOFTWARE%\1password-addon.xpi
 set PASSWORD1TARGET={d634138d-c276-4fc8-924b-40a0ea21d284}.xpi
 
-set BITWARDENFILE=%SOFTWARE%\bitwarden-1.47.1.xpi
+set BITWARDENFILE=%SOFTWARE%\bitwarden-addon.xpi
 set BITWARDENTARGET={446900e4-71c2-419f-a6a7-df9c091e268b}.xpi
 
 echo ####### %0 #######
 
-cd %SOFTWARE%
 @echo on
 msiexec /i %MSI% /passive
 @echo off
diff --git a/scripts/install-git.cmd b/scripts/install-git.cmd
index 28aca42..a61e679 100644
--- a/scripts/install-git.cmd
+++ b/scripts/install-git.cmd
@@ -1,8 +1,13 @@
 @echo off
 
 set CONFIG=config\install-git.txt
-set EXE=..\software\Git-2.29.0-64-bit.exe
 set TOOLS=c:\tools
+set EXE=..\software\git-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-googledrive.cmd b/scripts/install-googledrive.cmd
index 7a5122c..618613a 100644
--- a/scripts/install-googledrive.cmd
+++ b/scripts/install-googledrive.cmd
@@ -3,8 +3,12 @@
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+set MSI=gsync-setup.msi 
 
-set MSI=gsync_enterprise64.msi 
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-openshell.cmd b/scripts/install-openshell.cmd
index 3198d73..2b01cf5 100644
--- a/scripts/install-openshell.cmd
+++ b/scripts/install-openshell.cmd
@@ -2,27 +2,26 @@
 
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
+set EXE=openshell-setup.exe
 
-rem must be full qualified pathname (OpenShell BUG!)
+if NOT EXIST %SOFTWARE%\%EXE% (
+  echo ERROR: %SOFTWARE%\%EXE% not found!
+  exit /b
+)
+
+rem config must be full qualified pathname (OpenShell BUG!)
 set CONFIG=c:\tools\scripts\config\OpenshellSettings.xml 
 
-set EXE=OpenShellSetup_4_4_160.exe
-set MSI=OpenShellSetup64_4_4_160.msi
-
 echo ####### %0 #######
 
 cd %SOFTWARE%
 @echo on
-%EXE% extract64
-msiexec /i %MSI% ADDLOCAL=StartMenu,ClassicExplorer /passive
+%EXE% ADDLOCAL=StartMenu,ClassicExplorer /passive
 @echo off
-
-rem cleanup ...
-del /F %MSI%
 cd %SCRIPTS%
 
 echo removing OpenShell Readme file link ...
-del /F "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Open-Shell\Open-Shell Readme.lnk"
+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%
diff --git a/scripts/install-purebasic.cmd b/scripts/install-purebasic.cmd
index ba56755..6e041a9 100644
--- a/scripts/install-purebasic.cmd
+++ b/scripts/install-purebasic.cmd
@@ -1,7 +1,7 @@
 @echo off
 
 set CONFIG=config\install-purebasic.txt
-set EXE=..\software\PureBasic_Windows_X64_LTS_5.73.exe
+set EXE=..\software\purebasic-setup.exe
 
 echo ####### %0 #######
 
diff --git a/scripts/install-receiver.cmd b/scripts/install-receiver.cmd
index e5e2072..9f44300 100644
--- a/scripts/install-receiver.cmd
+++ b/scripts/install-receiver.cmd
@@ -1,6 +1,11 @@
 @echo off
 
-set EXE=..\software\CitrixReceiver_4.9.9002_LTSR.exe
+set EXE=..\software\citrixreceiver-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-softmaker.cmd b/scripts/install-softmaker.cmd
index 85fda15..a12af93 100644
--- a/scripts/install-softmaker.cmd
+++ b/scripts/install-softmaker.cmd
@@ -2,8 +2,12 @@
 
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
+set MSI=softmaker-setup.msi 
 
-set MSI=ofw2021_64.msi 
+if NOT EXIST %SOFTWARE%\%MSI% (
+  echo ERROR: %SOFTWARE%\%MSI% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-virtualbox.cmd b/scripts/install-virtualbox.cmd
index 795a3ff..97f4a9e 100644
--- a/scripts/install-virtualbox.cmd
+++ b/scripts/install-virtualbox.cmd
@@ -1,6 +1,11 @@
 @echo off
 
-set EXE=..\software\VirtualBox-6.1.18-142142-Win.exe
+set EXE=..\software\virtualbox-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
@@ -15,4 +20,3 @@ rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
 echo ####### %0 #######
-
diff --git a/scripts/install-vlc.cmd b/scripts/install-vlc.cmd
index a72e3b5..b8a3332 100644
--- a/scripts/install-vlc.cmd
+++ b/scripts/install-vlc.cmd
@@ -1,6 +1,11 @@
 @echo off
 
-set EXE=..\software\vlc-3.0.12-win64.exe
+set EXE=..\software\vlc-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
 
 echo ####### %0 #######
 
diff --git a/scripts/install-vscode.cmd b/scripts/install-vscode.cmd
index 3562396..898464a 100644
--- a/scripts/install-vscode.cmd
+++ b/scripts/install-vscode.cmd
@@ -3,6 +3,11 @@
 set CONFIG=config\install-vscode.txt
 set EXE=..\software\VSCodeSetup-x64-1.53.2.exe
 
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
 echo ####### %0 #######
 
 echo killing ssh processes...
diff --git a/scripts/install-windowsterminal.ps1 b/scripts/install-windowsterminal.ps1
index 49e0bb6..65bda0a 100644
--- a/scripts/install-windowsterminal.ps1
+++ b/scripts/install-windowsterminal.ps1
@@ -1,14 +1,14 @@
 # Install Windows Terminal ...
 
-#$MSIBUNDLE="..\software\Microsoft.WindowsTerminal_1.5.10271.0_8wekyb3d8bbwe.msixbundle"
 $MSIBUNDLE="..\software\windowsterminal-setup.msixbundle"
+if (! (Test-Path $MSIBUNDLE)) {
+  write-host "ERROR: $MSIBUNDLE not found!"
+  exit 1
+}
 
 write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
 
 $ErrorActionPreference = "SilentlyContinue"
-# $progressPreference = 'SilentlyContinue'
-
 Add-AppXPackage -path "$MSIBUNDLE"
 
 write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
-
diff --git a/scripts/install-zipfiles.cmd b/scripts/install-zipfiles.cmd
new file mode 100644
index 0000000..8de24b3
--- /dev/null
+++ b/scripts/install-zipfiles.cmd
@@ -0,0 +1,19 @@
+echo unpacking TOTAL commander ...
+%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\totalcmd_951.zip
+del /F %TOOLS%\totalcmd_951.zip 1>nul 2>nul
+echo.
+
+echo unpacking notepad++ ...
+%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\notepad++.zip
+del /F %TOOLS%\notepad++.zip 1>nul 2>nul
+echo.
+
+echo unpacking ImapCopy ...
+%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\ImapCopy.zip
+del /F %TOOLS%\ImapCopy.zip 1>nul 2>nul
+echo.
+
+echo unpacking MediaCreationTool ...
+%TOOLS%\7z x -aoa -o%SOFTWARE% %SOFTWARE%\MediaCreationTool20H2.zip
+del /F %SOFTWARE%\MediaCreationTool20H2.zip 1>nul 2>nul
+echo.
diff --git a/scripts/deploy/OfflineRegistryFinder.cfg b/tools/OfflineRegistryFinder.cfg
similarity index 100%
rename from scripts/deploy/OfflineRegistryFinder.cfg
rename to tools/OfflineRegistryFinder.cfg
diff --git a/scripts/deploy/killiconcache.cmd b/tools/killiconcache.cmd
similarity index 100%
rename from scripts/deploy/killiconcache.cmd
rename to tools/killiconcache.cmd
diff --git a/scripts/deploy/logon.cmd b/tools/logon.cmd
similarity index 100%
rename from scripts/deploy/logon.cmd
rename to tools/logon.cmd
diff --git a/scripts/deploy/pbc.cmd b/tools/pbc.cmd
similarity index 100%
rename from scripts/deploy/pbc.cmd
rename to tools/pbc.cmd
diff --git a/scripts/deploy/start-ssh-agent.cmd b/tools/start-ssh-agent.cmd
similarity index 100%
rename from scripts/deploy/start-ssh-agent.cmd
rename to tools/start-ssh-agent.cmd