diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 70941b9..99688e4 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -39,12 +39,14 @@ rem windows update blocker is in the zipfiles ...
 call unpack-zipfiles.cmd
 echo.
 
+rem put vnc in place ...
+call unpack-vnc.cmd
+echo.
+
 rem copy some other stuff ...
 call copy-exefiles.cmd
 echo.
 
-
-
 rem this must be done EARLY!
 call disable-updates.cmd 
 echo.
@@ -141,9 +143,6 @@ echo.
 call install-vlc.cmd
 echo.
 
-call install-vnc.cmd
-echo.
-
 call install-virtualbox.cmd
 echo.
 
@@ -159,6 +158,12 @@ echo.
 call install-dbbrowser.cmd
 echo.
 
+call install-totalcommander.cmd
+echo.
+
+call install-xnview.cmd
+echo.
+
 echo #####################
 echo ### DISABLE tasks ###
 echo #####################
diff --git a/tools/OfflineRegistryFinder.cfg b/scripts/config/OfflineRegistryFinder.cfg
similarity index 100%
rename from tools/OfflineRegistryFinder.cfg
rename to scripts/config/OfflineRegistryFinder.cfg
diff --git a/scripts/config/install-xnview.txt b/scripts/config/install-xnview.txt
new file mode 100644
index 0000000..7985762
--- /dev/null
+++ b/scripts/config/install-xnview.txt
@@ -0,0 +1,6 @@
+[Setup]
+Lang=en
+Dir=C:\Program Files\XnViewMP
+Group=XnViewMP
+NoIcons=0
+Tasks=desktopicon
diff --git a/scripts/install-far.cmd b/scripts/install-far.cmd
index 57b1e75..0649404 100644
--- a/scripts/install-far.cmd
+++ b/scripts/install-far.cmd
@@ -21,4 +21,7 @@ rem copy link to desktop ...
 copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Far Manager 3 x64\Far*" ^
   %PUBLIC%\Desktop
 
+echo renaming Far Manager desktop link ...
+move /Y "%PUBLIC%\Desktop\Far Manager 3 x64.lnk" "%PUBLIC%\Desktop\Far Manager.lnk"
+
 echo ####### %0 #######
diff --git a/scripts/install-totalcommander.cmd b/scripts/install-totalcommander.cmd
new file mode 100644
index 0000000..6ffef6d
--- /dev/null
+++ b/scripts/install-totalcommander.cmd
@@ -0,0 +1,21 @@
+@echo off
+
+set EXE=..\software\totalcommander-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing TotalCommander ...
+%EXE% /AHMGDU
+
+rem this runs in the background - we have to wait 10 seconds for it to complete ...
+timeout /T 10
+
+echo renaming TotalCommander desktop link ...
+move /Y "%USERPROFILE%\Desktop\Total Commander*" "%PUBLIC%\Desktop\Total Commander.lnk"
+
+echo ####### %0 #######
diff --git a/scripts/install-xnview.cmd b/scripts/install-xnview.cmd
new file mode 100644
index 0000000..8e51696
--- /dev/null
+++ b/scripts/install-xnview.cmd
@@ -0,0 +1,14 @@
+@echo off
+
+set CONFIG=config\install-xnview.txt
+set EXE=..\software\xnview-setup.exe
+
+echo ####### %0 #######
+
+echo killing XnView processes...
+taskkill /F /IM xnviewmp.exe 2>nul
+
+echo installing XnView ...
+%EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+echo ####### %0 #######
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index ba30cea..bce39f5 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -42,7 +42,8 @@ echo.
 
 echo BGinfo ...
 mkdir %TOOLS%\bginfo 2>nul
-move /Y %T%\bginfo\Bginfo64.exe %TOOLS%\bginfo
+move /Y %T%\bginfo\Bginfo64.exe %TOOLS%
+copy /Y config\config.bgi %TOOLS%\bginfo
 rd /S /Q %T%\bginfo 2>nul
 echo.
 
@@ -67,6 +68,7 @@ echo.
 echo OfflineRegistryFinder
 move /Y %T%\offlineregistryfinder\*.exe %TOOLS%
 rd /S /Q %T%\offlineregistryfinder
+copy /Y config\OfflineRegistryFinder.cfg %TOOLS%
 echo.
 
 echo RClone
diff --git a/software/extended.csv b/software/extended.csv
index c4b5d75..2009e4d 100644
--- a/software/extended.csv
+++ b/software/extended.csv
@@ -10,7 +10,7 @@ https://www.softmaker.net/down/ofw2021_64.msi softmaker-setup.msi
 http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe
 http://download.spotify.com/SpotifyFullSetup.exe spotify-setup.exe
 https://statics.teams.cdn.office.net/production-windows-x64/1.4.00.2879/Teams_windows_x64.exe teams-setup.exe
-https://totalcommander.ch/win/fixed/tcmd951x64.exe tcmd-setup.exe
+https://totalcommander.ch/win/fixed/tcmd951x64.exe totalcommander-setup.exe
 https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe
 https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18-142142-Win.exe virtualbox-setup.exe
 https://code.visualstudio.com/sha/download?build=stable&os=win32-x64 vscode-setup.exe