diff --git a/.gitignore b/.gitignore
index fd04121..195fa26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,4 @@ tmp/
 temp/
 company/
 ftpsettings.cmd
-custom.cmd
-customsettings.cmd
 
diff --git a/optional/install-ntlite.cmd b/optional/install-ntlite.cmd
index d1bdd2d..9a9d435 100644
--- a/optional/install-ntlite.cmd
+++ b/optional/install-ntlite.cmd
@@ -4,8 +4,6 @@ if %ERRORLEVEL% neq 0 exit /b
 
 set CONFIG=config\install-ntlite.txt
 set EXE=..\software\ntlite-setup.exe
-set SETTINGS=..\company\ntlite-settings.xml
-set LICENSE=..\company\ntlite-license.dat
 set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
 set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
 
@@ -26,16 +24,6 @@ move /Y %STARTMENU%\"NTLite\NTLite.lnk" %STARTMENU%\Tools 2>nul
 echo cleanup ...
 rd /S /Q %STARTMENU%\"NTLite" 2>nul
 
-if EXIST %LICENSE% (
-  echo installing license ...
-  copy /Y %LICENSE% "%PROGRAMFILES%\NTLite\license.dat"
-)
-
-if EXIST %SETTINGS% (
-  echo copying settings ...
-  copy /Y %SETTINGS% "%PROGRAMFILES%\NTLite\settings.xml"
-)
-
 rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
diff --git a/optional/install-purebasic.cmd b/optional/install-purebasic.cmd
index dab6d0f..9294c75 100644
--- a/optional/install-purebasic.cmd
+++ b/optional/install-purebasic.cmd
@@ -8,7 +8,7 @@ set CONFIG=config\install-purebasic.txt
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
 rem licensed version (exe contains key!)
-set EXE=..\company\purebasic-setup.exe
+set EXE=..\software\purebasic-setup.exe
 
 rem demo version (publically accessible)
 set ZIP=..\software\purebasic.zip
diff --git a/optional/install-seafile.cmd b/optional/install-seafile.cmd
index 918e0fe..d810d20 100644
--- a/optional/install-seafile.cmd
+++ b/optional/install-seafile.cmd
@@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=seafile-setup.msi
-set SETTINGS=..\company\settings.cmd
+set CUSTOM_SETTINGS=..\customsettings.cmd
 set seafile_server_url=0
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
@@ -14,20 +14,21 @@ if NOT EXIST %SOFTWARE%\%MSI% (
   exit /b
 )
 
+echo ####### %0 #######
+
 rem ===================
 rem CONFIGFILE CHECK
 rem ===================
 
-if NOT EXIST %SETTINGS% (
-  echo.
-  echo WARNING: %SETTINGS% NOT FOUND
-  echo.
+echo.
+echo searching for CUSTOM settings ...
+if NOT EXIST %CUSTOM_SETTINGS% (
+  echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND
 ) else (
-  call %SETTINGS%
+  echo OK. Loading CUSTOM settings ...
+  call %CUSTOM_SETTINGS%
 )
 
-echo ####### %0 #######
-
 echo installing SeaFile ...
 cd %SOFTWARE%
 @echo on
diff --git a/optional/install-snapcontrol.cmd b/optional/install-snapcontrol.cmd
index bed803f..3e87b14 100644
--- a/optional/install-snapcontrol.cmd
+++ b/optional/install-snapcontrol.cmd
@@ -3,41 +3,25 @@ call check-for-admin
 if %ERRORLEVEL% neq 0 exit /b
 
 set TOOLS=%SystemDrive%\tools
-set INI_STANDARD=..\scripts\config\snapcontrol.ini
-set INI_COMPANY=..\company\snapcontrol.ini
+set INIFILE=..\scripts\config\snapcontrol.ini
 
 echo ####### %0 #######
 
 echo moving snapcontrol binary to [ %windir% ] ...
 move /Y %TOOLS%\snapcontrol.exe %windir% 2>nul
 
-if EXIST %INI_COMPANY% (
-
+if EXIST %INIFILE% (
+  
   if NOT EXIST %windir%\snapcontrol.ini (
-    echo putting COMPANY inifile in place ...
-    copy /Y %INI_COMPANY% %windir%
-    %TOOLS%\searchreplace %windir%\snapcontrol.ini "__COMPUTERNAME__" "%COMPUTERNAME%"
+    
+    echo putting STANDARD inifile in place ...
+    copy /Y %INI_STANDARD% %windir%
     %windir%\snapcontrol /I
+
   ) else (
     echo inifile already copied. nothing to do!
   )
 
-) else (
-
-  if EXIST %INI_STANDARD% (
-
-    if NOT EXIST %windir%\snapcontrol.ini (
-      echo putting STANDARD inifile in place ...
-      copy /Y %INI_STANDARD% %windir%
-      %windir%\snapcontrol /I
-    ) else (
-      echo inifile already copied. nothing to do!
-    )
-
-  )
-
-)
-
 echo ####### %0 #######
 pause
 
diff --git a/optional/install-softmaker-2024.cmd b/optional/install-softmaker-2024.cmd
index c10ea85..f636765 100644
--- a/optional/install-softmaker-2024.cmd
+++ b/optional/install-softmaker-2024.cmd
@@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=softmaker-setup-2024.msi 
-set SETTINGS=..\company\settings.cmd
+set CUSTOM_SETTINGS=..\customsettings.cmd
 set softmaker_license=0
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
@@ -14,20 +14,21 @@ if NOT EXIST %SOFTWARE%\%MSI% (
   exit /b
 )
 
+echo ####### %0 #######
+
 rem ===================
 rem CONFIGFILE CHECK
 rem ===================
 
-if NOT EXIST %SETTINGS% (
-  echo.
-  echo WARNING: %SETTINGS% NOT FOUND
-  echo.
+echo.
+echo searching for CUSTOM settings ...
+if NOT EXIST %CUSTOM_SETTINGS% (
+  echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND
 ) else (
-  call %SETTINGS%
+  echo OK. Loading CUSTOM settings ...
+  call %CUSTOM_SETTINGS%
 )
 
-echo ####### %0 #######
-
 cd %SOFTWARE%
 @echo on
 msiexec /i %MSI% /qb APPLICATIONFOLDER="c:\Program Files\Softmaker Office 2024" ^
diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd
index bdb853a..6f9ae40 100644
--- a/optional/install-softmaker.cmd
+++ b/optional/install-softmaker.cmd
@@ -5,7 +5,7 @@ if %ERRORLEVEL% neq 0 exit /b
 set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=softmaker-setup.msi 
-set SETTINGS=..\company\settings.cmd
+set CUSTOM_SETTINGS=..\customsettings.cmd
 set softmaker_license=0
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
@@ -14,20 +14,21 @@ if NOT EXIST %SOFTWARE%\%MSI% (
   exit /b
 )
 
+echo ####### %0 #######
+
 rem ===================
 rem CONFIGFILE CHECK
 rem ===================
 
-if NOT EXIST %SETTINGS% (
-  echo.
-  echo WARNING: %SETTINGS% NOT FOUND
-  echo.
+echo.
+echo searching for CUSTOM settings ...
+if NOT EXIST %CUSTOM_SETTINGS% (
+  echo INFO: config file %CUSTOM_SETTINGS% NOT FOUND
 ) else (
-  call %SETTINGS%
+  echo OK. Loading CUSTOM settings ...
+  call %CUSTOM_SETTINGS%
 )
 
-echo ####### %0 #######
-
 cd %SOFTWARE%
 @echo on
 msiexec /i %MSI% /qb APPLICATIONFOLDER="c:\Program Files\Softmaker Office 2021" ^
diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd
index de7bd38..58ef969 100644
--- a/optional/install-totalcommander.cmd
+++ b/optional/install-totalcommander.cmd
@@ -3,7 +3,7 @@ call check-for-admin
 if %ERRORLEVEL% neq 0 exit /b
 
 set EXE=..\software\totalcommander-setup.exe
-set KEY=..\company\wincmd.key
+set KEY=..\software\wincmd.key
 set TARGET=c:\totalcmd
 set STARTMENU=%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs
 set STARTMENU_USER=%APPDATA%\Microsoft\Windows\Start Menu\Programs