diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd
index 7875cfb..8d50bcf 100644
--- a/04_PrepareImage.cmd
+++ b/04_PrepareImage.cmd
@@ -67,6 +67,7 @@ echo ======
 GOTO END
 
 :USAGE
+echo.
 echo "usage: %0 [/R|/?]"
 echo "  /R = remove apps from main image"
 echo "  /? = show help                  "
diff --git a/optional/install-purebasic.cmd b/optional/install-purebasic.cmd
index 667d4a4..67afd26 100644
--- a/optional/install-purebasic.cmd
+++ b/optional/install-purebasic.cmd
@@ -8,12 +8,13 @@ set CONFIG=config\install-purebasic.txt
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
 rem licensed version (exe contains key!)
-rem access only for customers ...
 set EXE=..\company\purebasic-setup.exe
 
 rem demo version (publically accessible)
 set ZIP=..\software\purebasic.zip
 
+echo ####### %0 #######
+
 echo killing PureBasic processes...
 taskkill /F /IM PureBasic.exe 2>nul
 taskkill /F /IM pbcompiler.exe 2>nul
@@ -24,25 +25,21 @@ if NOT EXIST %EXE% if NOT EXIST %ZIP% (
   goto END
 )
 
-echo ####### %0 #######
-
 if EXIST %EXE% (
-  echo INFO: %EXE% found, installing licensed version ...
 
-  rem remove old links ...
-  del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul
+  echo INFO: %EXE% found, installing licensed version ...
 
   echo installing purebasic ...
   start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL ^
     /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
   goto LINK
+
 )
 
 if EXIST %ZIP% (
-  echo INFO: %ZIP% found, installing demo version ...
 
-  rem remove old links ...
-  del /F /Q /A %PUBLIC%\Desktop\PureBasic*.lnk 2>nul
+  echo INFO: %ZIP% found, installing demo version ...
 
   7z e -y -aoa -o%T%\purebasic %ZIP%
   move /Y %T%\purebasic\PureBasic*.exe %T%\purebasic\purebasic-setup.exe
@@ -52,28 +49,30 @@ if EXIST %ZIP% (
     /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
 
   echo cleanup ...
-  rd /S /Q %T%\purebasic 2>nul  
+  rd /S /Q %T%\purebasic 2>nul
+
   goto LINK
+
 )
 
 :LINK
-rem remove link from users desktop  ...
-del /F /Q /A %USERPROFILE%\Desktop\PureBasic*.lnk 2>nul
+echo removing old desktop links ...
+del /F /Q /A "%PUBLIC%\Desktop\PureBasic*.lnk" 2>nul
+del /F /Q /A "%USERPROFILE%\Desktop\PureBasic*.lnk" 2>nul
 
-echo copy new PureBasic link to public desktop ...
-copy /Y "%STARTMENU%\PureBasic\PureBasic (x64).lnk" ^
-  %PUBLIC%\Desktop\PureBasic.lnk
+echo copying new PureBasic link to public desktop ...
+copy /Y %STARTMENU%\"PureBasic\PureBasic (x64).lnk" %PUBLIC%\Desktop\PureBasic.lnk
+
+echo moving PureBasic startmenu shortcut ...
+move /Y %STARTMENU%\"PureBasic\PureBasic (x64).lnk" %STARTMENU%\PureBasic.lnk
+
+echo removing PureBasic startmenu folder ...
+rd /S /Q %STARTMENU%\PureBasic 2>nul
 
 rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
-echo moving PureBasic startmenu shortcut ...
-move /Y %STARTMENU%\"PureBasic\PureBasic (x64).lnk" %STARTMENU%
-
-echo removing PureBasic startmenu folder ...
-rd /S /Q %STARTMENU%\"PureBasic" 2>nul
-
-echo ####### %0 #######
 :END
+echo ####### %0 #######
 pause
 
diff --git a/scripts/set-filetypes.cmd b/scripts/set-filetypes.cmd
index 074533e..a806ab5 100644
--- a/scripts/set-filetypes.cmd
+++ b/scripts/set-filetypes.cmd
@@ -1,4 +1,8 @@
 @echo off
+set ARG1=null
+
+IF "%~1" NEQ "" set ARG1=%1
+if /I %ARG1% == /? goto usage
 
 echo ####### %0 #######
 
@@ -18,23 +22,49 @@ call :SFTA
 
 set AKA=Presentations
 set BINARY="%PROGRAMFILES%\Softmaker Office 2021\Presentations.exe"
-set SUFFIX=ppt pptx
+set SUFFIX=prdx prsx prvx ppt pptx potx pot ppsx pps prd prv
 call :SFTA
 
 set AKA=PlanMaker
 set BINARY="%PROGRAMFILES%\Softmaker Office 2021\Planmaker.exe"
-set SUFFIX=xls xlsx
+set SUFFIX=pmd pmdx pmv pmvx xls xlsx xlsm xlt xltx xltm
 call :SFTA
 
 set AKA=TextMaker
 set BINARY="%PROGRAMFILES%\Softmaker Office 2021\Textmaker.exe"
-set SUFFIX=doc docx
+set SUFFIX=doc docx dot dotx odt tmd tmdx tmv tmvx rtf psw pwd
+call :SFTA
+
+set AKA=PureBasic
+set BINARY="%PROGRAMFILES%\PureBasic\PureBasic.exe"
+set SUFFIX=pb pbi pbp pbf
+call :SFTA
+
+set AKA=emClient
+set BINARY="%PROGRAMFILES(x86)%\eM Client\MailClient.exe"
+set SUFFIX=eml
+call :SFTA
+
+set AKA=VScode
+set BINARY="%PROGRAMFILES%\Microsoft VS Code\Code.exe"
+set SUFFIX=c txt md sh bash py go
+call :SFTA
+
+set AKA=VLC
+set BINARY="%PROGRAMFILES%\VideoLAN\VLC\vlc.exe"
+set SUFFIX=3g2 3gp 3gp2 3gpp amv asf avi bik divx drc dv dvr-ms evo f4v flv gvi gxf m1v m2t m2ts m4v mkv mov ^
+           mp2 mp2v mp4 mp4v mpe mpeg mpeg1 mpeg2 mpeg4 mpg mpv2 mts mtv mxf mxg nsv nuv ogg ogm ogv ogx ^
+           rec rm rmvb rpl thp tod tp ts tts txd vob vro webm 3ga 669 a52 aac ac3 adt adts aif aifc aiff amb ^
+           amr aob ape au awb caf dts flac it kar m4a m4b m4p m5p mid mka mlp mod mpa mp1 mp3 mpc mpga mus oga ^
+           oma opus qcp ra rmi s3m sid spx tak thd tta voc vqf w64 wav wma wv xa xm asx b4s cue ifo m3u m3u8 ^
+           pls sdp vlc xspf wvx
 call :SFTA
 
 rem refresh desktop (W10 style)
 ie4uinit.exe -show
 
-goto :END
+echo ####### %0 #######
+goto END
 
 rem ####################################################
 rem set filetypes with tool "sfta" ...
@@ -49,6 +79,12 @@ if NOT EXIST %BINARY% (
   echo working on [ %AKA% ] ...
 )
 
+rem use the FORCE Luke!
+if /I %ARG1% == /F (
+  del /F /Q %FILETYPE_DONE% 2>nul
+)
+
+rem do the work HERE!
 if NOT EXIST %FILETYPE_DONE% (
   for %%A in (
     %SUFFIX%
@@ -61,9 +97,14 @@ if NOT EXIST %FILETYPE_DONE% (
 )
 
 goto :eof
-
 rem ####################################################
 
-:END
-echo ####### %0 #######
+:USAGE
+echo.
+echo "usage: %0 [/F|/?]"
+echo "  /F = force    "
+echo "  /? = show help"
+echo.
+
+:END