diff --git a/optional/unpack-setacl.cmd b/optional/unpack-setacl.cmd
new file mode 100644
index 0000000..8c1ede0
--- /dev/null
+++ b/optional/unpack-setacl.cmd
@@ -0,0 +1,22 @@
+@echo off
+
+set TOOLS=c:\tools
+set ZIP=..\software\setacl.zip
+set T=C:\TEMP
+
+if NOT EXIST %ZIP% (
+  echo ERROR: %ZIP% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo unpacking SetACL ...
+%TOOLS%\7z e -y -aoa -o%T%\setacl %ZIP% 1>nul
+move /Y %T%\setacl\*.exe %TOOLS%\setacl.exe
+rd /S /Q %T%\setacl
+echo.
+
+echo ####### %0 #######
+pause
+
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index 5708d08..66c5542 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -22,12 +22,12 @@ for %%A in (
   rclone
   regscanner
   restic
-  setacl
   showkeyplus
   vim
   vivetool
   winscp
   wub
+  cmail
 
 ) do (
   
@@ -54,7 +54,6 @@ rd /S /Q %T%\bginfo 2>nul
 echo.
 
 echo Autoruns ...
-mkdir %TOOLS%\autoruns 2>nul
 move /Y %T%\autoruns\autoruns.exe %TOOLS%
 rd /S /Q %T%\autoruns 2>nul
 echo.
@@ -98,11 +97,6 @@ move /Y %T%\restic\*.exe %TOOLS%\restic.exe
 rd /S /Q %T%\restic
 echo.
 
-echo Setacl
-move /Y %T%\setacl\*.exe %TOOLS%\setacl.exe
-rd /S /Q %T%\setacl
-echo.
-
 echo ShowKeyPlus
 move /Y %T%\showkeyplus\*.exe %TOOLS%
 rd /S /Q %T%\showkeyplus
@@ -133,14 +127,21 @@ move /Y %T%\wub\wub_x64.exe %TOOLS%\wub.exe
 rd /S /Q %T%\wub
 echo.
 
+echo CMail - a Windows mailer
+move /Y %T%\cmail\cmail.exe %TOOLS%
+rd /S /Q %T%\cmail
+echo.
+
 echo Android tools ...
 if NOT EXIST %SOFTWARE%\android.zip (
   echo WARNING: %SOFTWARE%\android.zip not found!
 ) else (
   echo unpacking android.zip ...
   %TOOLS%\7z x -y -aoa -o%TOOLS% %SOFTWARE%\android.zip 1>nul
+  rd /S /Q %TOOLS%\android
   move /Y %TOOLS%\platform-tools %TOOLS%\android
 )
 echo.
 
 echo ####### %0 #######
+
diff --git a/software/basic.csv b/software/basic.csv
index b7e7e9b..e2b4951 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -2,7 +2,7 @@ https://www.7-zip.org/a/7z1900-x64.msi 7z-setup.msi
 https://go.microsoft.com/fwlink/?linkid=2120254 adk-setup.exe
 https://download.sysinternals.com/files/BGInfo.zip bginfo.zip
 https://download.sysinternals.com/files/Autoruns.zip autoruns.zip
-https://curl.se/windows/dl-7.75.0_3/curl-7.75.0_3-win64-mingw.zip curl.zip
+https://curl.se/windows/dl-7.79.1/curl-7.79.1-win64-mingw.zip curl.zip
 https://github.com/git-for-windows/git/releases/download/v2.30.1.windows.1/Git-2.30.1-64-bit.exe git-setup.exe
 http://www.ardiehl.de/imapcopy/IMAPCopy.zip imapcopy.zip
 https://www.deskmodder.de/blog/wp-content/uploads/2018/06/install-wim-tweak.zip installwimtweak.zip
@@ -22,11 +22,11 @@ https://www.python.org/ftp/python/3.9.2/python-3.9.2-amd64.exe python3-setup.exe
 https://www.nirsoft.net/utils/regscanner-x64.zip regscanner.zip
 https://github.com/pbatard/rufus/releases/download/v3.13/rufus-3.13p.exe rufus.exe
 http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe
-https://helgeklein.com/downloads/SetACL/current/SetACL%20(executable%20version).zip setacl.zip
-https://github.com/Superfly-Inc/ShowKeyPlus/releases/download/ShowKeyPlus1.1.14.1/ShowKeyPlus1.1.14.1.zip showkeyplus.zip
+https://github.com/Superfly-Inc/ShowKeyPlus/releases/download/ShowKeyPlus1.1.16.0/ShowKeyPlus1.1.16.0_x64.zip showkeyplus.zip
 https://github.com/thebookisclosed/ViVe/releases/download/v0.2.1/ViVeTool-v0.2.1.zip vivetool.zip
 https://win32diskimager.org/wp-content/uploads/win32diskimager-1.0.0-install.exe win32diskimager.exe
 https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe
 https://www.heidoc.net/php/Windows-ISO-Downloader.exe Windows-ISO-Downloader.exe
-https://github.com/microsoft/terminal/releases/download/v1.10.2383.0/Microsoft.WindowsTerminal_1.10.2383.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle
 https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip android.zip
+https://www.inveigle.net/downloads/CMail_0.8.3_amd64.zip cmail.zip
+https://github.com/microsoft/terminal/releases/download/v1.10.2383.0/Microsoft.WindowsTerminal_1.10.2383.0_8wekyb3d8bbwe.msixbundle windowsterminal-setup.msixbundle
diff --git a/software/other.csv b/software/other.csv
index a4b9d05..2ec1112 100644
--- a/software/other.csv
+++ b/software/other.csv
@@ -1,10 +1,11 @@
+dummy setacl.zip
 dummy citrixreceiver-setup.exe
 dummy xojo-setup.exe
 dummy PL2303-setup.exe
 dummy WFC5210-setup.exe
 dummy cyberjack-setup.exe
 dummy java-setup.exe
-dummy Win10_20H2_English_x64.iso
 dummy MACDRIVER.zip
 dummy dcp-l6600dw-drivers.EXE
+dummy Win10_20H2_English_x64.iso