diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index e46be05..0d70ee9 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -76,6 +76,9 @@ echo.
 call install-git.cmd
 echo.
 
+call install-far.cmd
+echo.
+
 call install-wezterm.cmd
 echo.
 
diff --git a/scripts/config/wezterm.lua b/scripts/config/wezterm.lua
index 3cd030a..c88ccef 100644
--- a/scripts/config/wezterm.lua
+++ b/scripts/config/wezterm.lua
@@ -2,7 +2,7 @@ local wezterm = require 'wezterm';
 return {
 
   default_prog = {"cmd.exe","/K c:/tools/start-ssh-agent.cmd"},
-  initial_cols = 120,
+  initial_cols = 100,
   initial_rows = 40,
 
   set_environment_variables = {
@@ -25,8 +25,8 @@ return {
     }
   },
 
-  font_size = 20.0,
-  scrollback_lines = 10000,
+  font_size = 16.0,
+  scrollback_lines = 5000,
   enable_scroll_bar = true,
   default_cursor_style = "BlinkingBlock",
   cursor_blink_rate = 500,
@@ -39,7 +39,7 @@ return {
 
   window_padding = {
     left = 8,
-    right = 32,
+    right = 16,
     top = 0,
     bottom = 8,
   },
diff --git a/scripts/icons/Far Manager.lnk b/scripts/icons/Far Manager.lnk
new file mode 100644
index 0000000..c0e4bd9
Binary files /dev/null and b/scripts/icons/Far Manager.lnk differ
diff --git a/scripts/icons/Terminal.lnk b/scripts/icons/Terminal.lnk
deleted file mode 100644
index c788c00..0000000
Binary files a/scripts/icons/Terminal.lnk and /dev/null differ
diff --git a/scripts/install-far.cmd b/scripts/install-far.cmd
index 576b755..6f44a33 100644
--- a/scripts/install-far.cmd
+++ b/scripts/install-far.cmd
@@ -13,11 +13,5 @@ msiexec /i %MSI% /quiet
 @echo off
 cd %SCRIPTS%
 
-rem extend global PATH variable ...
-setx PATH "%PATH%;%ProgramFiles%\Far Manager" /M
-
-copy /Y "%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs\Far Manager 3 x64\Far Manager 3 x64.lnk" ^
-  "%PUBLIC%\Desktop\Far Manager.lnk"
-
 echo ####### %0 #######
 
diff --git a/scripts/install-git.cmd b/scripts/install-git.cmd
index 6ab665b..28aca42 100644
--- a/scripts/install-git.cmd
+++ b/scripts/install-git.cmd
@@ -27,9 +27,5 @@ reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Env
   /d "%TOOLS%\usr\bin\ssh.exe" ^
   /f
 
-rem GIT ...
-setx PATH "%PATH%;%TOOLS%\git\bin" /M
-setx PATH "%PATH%;%TOOLS%\git\usr\bin" /M
-
 echo ####### %0 #######
 
diff --git a/scripts/install-purebasic.cmd b/scripts/install-purebasic.cmd
index a2ae7da..ba56755 100644
--- a/scripts/install-purebasic.cmd
+++ b/scripts/install-purebasic.cmd
@@ -12,8 +12,5 @@ taskkill /F /IM pbcompiler.exe 2>nul
 echo installing PUREBASIC ...
 %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
 
-rem extend global PATH variable ...
-setx PATH "%PATH%;%ProgramFiles%\PureBasic\Compilers" /M
-
 echo ####### %0 #######
 
diff --git a/scripts/modify-path.cmd b/scripts/modify-path.cmd
index b150711..00324e1 100644
--- a/scripts/modify-path.cmd
+++ b/scripts/modify-path.cmd
@@ -3,22 +3,11 @@
 echo ####### %0 #######
 
 echo setting GLOBAL PATH variable ...
-
-rem first the standard pathes (via registry) ...
-reg add ^
-  "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /d ^
-  /d "%SYSTEMROOT%;%SYSTEMROOT%\system32;%SYSTEMROOT%\system32\wbem" ^
-  /v PATH /t REG_EXPAND_SZ /f
-
-rem now add powershell and local apps ...
-setx PATH "%PATH%;%SYSTEMROOT%\system32\WindowsPowerShell\v1.0" /M
-setx PATH "%PATH%;%LOCALAPPDATA%\Microsoft\WindowsApps" /M
-
-rem TOOLS path ...
-setx PATH "%PATH%;%TOOLS%" /M
-
-rem other stuff (that will not be set in other scripts) ...
-setx PATH "%PATH%;%TOOLS%\notepad++" /M
+reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" ^
+  /v PATH ^
+  /t REG_EXPAND_SZ ^
+  /d "%SYSTEMROOT%;%SYSTEMROOT%\system32;%SYSTEMROOT%\system32\wbem;%SYSTEMROOT%\system32\WindowsPowerShell\v1.0;%LOCALAPPDATA%\Microsoft\WindowsApps;%TOOLS%;%TOOLS%\notepad++;%TOOLS%\git\bin;%TOOLS%\git\usr\bin;%ProgramFiles%\PureBasic\Compilers;%ProgramFiles%\Far Manager" ^
+  /f
 
 echo ####### %0 #######
 
diff --git a/scripts/uninstall-apps.ps1 b/scripts/uninstall-apps.ps1
index 51f804a..6daf705 100644
--- a/scripts/uninstall-apps.ps1
+++ b/scripts/uninstall-apps.ps1
@@ -1,14 +1,14 @@
-# REMOVE all applications except the Store ...
+# REMOVE all applications except the Store and the Calculator ...
 
 write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
 
 $ErrorActionPreference = 'SilentlyContinue'
 
 Get-AppxPackage -AllUsers |
-  where-object {$_.name -notlike "*store*"} |
+  where-object {$_.name -notlike @("*store*","*calc*")} |
   Remove-AppxPackage
 Get-AppxProvisionedPackage -online |
-  where-object {$_.name -notlike "*store*"} |
+  where-object {$_.name -notlike @("*store*","*calc*")} |
   Remove-AppxProvisionedPackage -online
 
 write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
diff --git a/wim/remove-apps.cmd b/wim/remove-apps.cmd
index 407c48d..2abe354 100644
--- a/wim/remove-apps.cmd
+++ b/wim/remove-apps.cmd
@@ -29,7 +29,6 @@ dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WebMedia
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WebpImageExtension_1.0.22753.0_x64__8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.Windows.Photos_2019.19071.12548.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsAlarms_2019.807.41.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsCalculator_2020.1906.55.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsCamera_2018.826.98.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:microsoft.windowscommunicationsapps_16005.11629.20316.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsFeedbackHub_2019.1111.2029.0_neutral_~_8wekyb3d8bbwe
@@ -44,8 +43,9 @@ dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.XboxSpee
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.YourPhone_2019.430.2026.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneMusic_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
 dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.ZuneVideo_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.StorePurchaseApp_11811.1001.1813.0_neutral_~_8wekyb3d8bbwe
-dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsStore_11910.1002.513.0_neutral_~_8wekyb3d8bbwe
+rem dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsCalculator_2020.1906.55.0_neutral_~_8wekyb3d8bbwe
+rem dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.StorePurchaseApp_11811.1001.1813.0_neutral_~_8wekyb3d8bbwe
+rem dism /Image:%MNT% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.WindowsStore_11910.1002.513.0_neutral_~_8wekyb3d8bbwe
 
 @echo off
 
diff --git a/wim/remove-packages.cmd b/wim/remove-packages.cmd
index 63e6a00..99ea05f 100644
--- a/wim/remove-packages.cmd
+++ b/wim/remove-packages.cmd
@@ -138,12 +138,9 @@ for %%P in (
   Microsoft-Windows-TabletPCMath
   microsoft-windows-tabletpcmath-package-Wrapper
   Microsoft-Windows-TabShellExperience
-  Microsoft-Windows-Telnet-Client
-  Microsoft-Windows-Telnet
   Microsoft-Windows-TerminalServices
   Microsoft-Windows-TextPrediction-Dictionaries
   Microsoft-Windows-TextPrediction
-  Microsoft-Windows-TFTP-Client
   Microsoft-Windows-TroubleShooting
   Microsoft-Windows-TS
   Microsoft-Windows-UpdateTargeting-ClientOS
@@ -165,14 +162,6 @@ for %%P in (
   Microsoft-Windows-WPD-UltimatePortableDeviceFeature-Feature
   Microsoft-Windows-Xps
   Microsoft-Xbox
-  microsoft-onecore-applicationmodel
-  Microsoft-OneCore-IsolatedUserMode
-  Microsoft-OneCore-Multimedia-CastingCommon
-  Microsoft-OneCore-Multimedia-CastingReceiver
-  Microsoft-OneCore-VirtualizationBasedSecurity
-  Microsoft-OneCore-Multimedia-CastingTransmitter-Media-Package
-  Microsoft-Onecore-SPP-VirtualDevice
-  Microsoft-OneCoreUAP-AppRuntime
   MSMQ-Driver-Package
   MultiPoint
   Networking-MPSSVC-Rules-EnterpriseEdition-Package