diff --git a/optional/install-irfanview.cmd b/optional/install-irfanview.cmd
index 922cf6c..ba596ab 100644
--- a/optional/install-irfanview.cmd
+++ b/optional/install-irfanview.cmd
@@ -3,6 +3,7 @@ call check-for-admin
 if %ERRORLEVEL% neq 0 exit /b
 
 set EXE=..\software\iview-setup.exe
+set ZIP=..\software\iview-plugins.zip
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 set TARGET=%PROGRAMFILES%\IrfanView
 
@@ -121,6 +122,11 @@ for %%A in (
 
 )
 
+if EXIST %ZIP% (
+  echo extracting and installing PDF plugin ...
+  7z -o"%TARGET%"\Plugins x %ZIP% PDF.dll 
+)
+
 echo ####### %0 #######
 pause
 
diff --git a/scripts/install-shortcuts.cmd b/scripts/install-shortcuts.cmd
index d25c5fa..26a63c1 100644
--- a/scripts/install-shortcuts.cmd
+++ b/scripts/install-shortcuts.cmd
@@ -8,9 +8,15 @@ echo ####### %0 #######
 echo copying desktop shortcuts ...
 xcopy /CDI /HERBY desktop %DESKTOP%
 
+echo setting access rights for desktop shortcuts ...
+icacls %DESKTOP%\* /grant Users:R 1>nul 2>nul
+
 echo copying startmenu shortcuts ...
 mkdir %STARTMENU%\Tools 2>nul
 xcopy /CDI /HERBY startmenu %STARTMENU%\Tools
 
+echo setting access rights for startmenu shortcuts ...
+icacls %STARTMENU%\Tools\* /grant Users:R 1>nul 2>nul
+
 echo ####### %0 #######
 
diff --git a/software/other.csv b/software/other.csv
index 1c10761..ac83bed 100644
--- a/software/other.csv
+++ b/software/other.csv
@@ -8,4 +8,4 @@ dummy MACDRIVER.zip
 dummy brother-dcpl6600dw-drivers.EXE
 dummy Win10_20H2_English_x64.iso
 dummy vce_exam_simulator_setup.exe
-
+dummy iview-plugins.zip
diff --git a/tools/logon.cmd b/tools/logon.cmd
index e200a70..d754565 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -7,11 +7,10 @@ rem ===================
 set TOOLS=c:\tools
 set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd
 set COMPANY_SETTINGS=%TOOLS%\company\settings.cmd
-set USERCONFIG_DONE=%LOCALAPPDATA%\.userconfig_done
-set EMLICENSE_DONE=%LOCALAPPDATA%\.emlicense_done
-set STARTMENU=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
-set STARTMENU_PUBLIC=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
-
+set USERCONFIG_DONE="%LOCALAPPDATA%"\.userconfig_done
+set EMLICENSE_DONE="%LOCALAPPDATA%"\.emlicense_done
+set STARTMENU="%APPDATA%\Microsoft\Windows\Start Menu\Programs"
+set STARTMENU_PUBLIC="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
 rem ===================
 rem DEFAULTS
@@ -28,7 +27,6 @@ set seafile_domain=0
 set install_aerolite=0
 set preserve_savedgames_folder=0
 
-
 echo ####### %0 #######
 
 rem ===================
@@ -68,7 +66,7 @@ echo Removing the wallpaper ...
 reg add "HKCU\Control Panel\Desktop" /v WallPaper /t REG_SZ /d " " /f 1>nul
 RUNDLL32.EXE user32.dll,UpdatePerUserSystemParameters 
 
-echo Setting the desktop colour (RGB) ...
+echo Setting the desktop colour ...
 %TOOLS%\setbgcol %bgcol_R% %bgcol_G% %bgcol_B%
 
 echo Starting BGInfo tool ...
@@ -81,7 +79,7 @@ echo.
 
 echo Remapping Desktop folder to standard location ...
 reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders" ^
-  /v Desktop /t REG_EXPAND_SZ /d "%%USERPROFILE%%\Desktop" /f 1>nul
+  /v Desktop /t REG_EXPAND_SZ /d "%USERPROFILE%\Desktop" /f 1>nul
 
 if EXIST "%ProgramFiles%\Seafile\bin\seafile-applet.exe" (
   echo Setting autostart for SEAFILE client ...
@@ -90,9 +88,9 @@ if EXIST "%ProgramFiles%\Seafile\bin\seafile-applet.exe" (
 )
 
 rem fix for broken SEAFILE folder access rights ...
-if EXIST %USERPROFILE%\Seafile (
+if EXIST "%USERPROFILE%"\Seafile (
   echo Removing "system" attribute on SEAFILE storage folder ...
-  attrib -S %USERPROFILE%\Seafile /S /D 1>nul 2>nul
+  attrib -S "%USERPROFILE%"\Seafile /S /D 1>nul 2>nul
 )
 
 
@@ -167,37 +165,32 @@ if %ERRORLEVEL% == 0 (
 
 )
 
-rem WORKSPACE folder
-echo Creating folder %USERPROFILE%\workspace ...
-mkdir %USERPROFILE%\workspace 1>nul 2>nul
+echo Creating workspace folder ...
+mkdir "%USERPROFILE%"\workspace 1>nul 2>nul
 
-rem SSH
 echo Setting up SSH client ...
-mkdir %USERPROFILE%\.ssh 1>nul 2>nul
-copy /Y %TOOLS%\scripts\config\ssh-config.txt %USERPROFILE%\.ssh\config 1>nul 2>nul
+mkdir "%USERPROFILE%"\.ssh 1>nul 2>nul
+copy /Y %TOOLS%\scripts\config\ssh-config.txt "%USERPROFILE%"\.ssh\config 1>nul 2>nul
 
-rem VIM
 echo Installing a VIM configuration ...
-copy /Y %TOOLS%\scripts\config\vimrc.txt %USERPROFILE%\.vimrc 1>nul 2>nul
+copy /Y %TOOLS%\scripts\config\vimrc.txt "%USERPROFILE%"\.vimrc 1>nul 2>nul
 
-rem WINDOWS TERMINAL
 echo Setting up WINDOWS TERMINAL ...
-set LOCALSTATE=%LOCALAPPDATA%\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState
+set LOCALSTATE="%LOCALAPPDATA%"\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState
 mkdir %LOCALSTATE% 1>nul 2>nul
 copy /Y %TOOLS%\scripts\config\wt-settings.json %LOCALSTATE%\settings.json 1>nul 2>nul
 
 rem TOTALCOMMANDER
-mkdir %APPDATA%\GHISLER 1>nul 2>nul
-if NOT EXIST %APPDATA%\GHISLER\WINCMD.ini (
+mkdir "%APPDATA%"\GHISLER 1>nul 2>nul
+if NOT EXIST "%APPDATA%"\GHISLER\WINCMD.ini (
   echo Copying standard inifile for TOTALCOMMANDER ...
-  copy /Y %TOOLS%\optional\config\WINCMD.ini %APPDATA%\GHISLER 1>nul 2>nul
+  copy /Y %TOOLS%\optional\config\WINCMD.ini "%APPDATA%"\GHISLER 1>nul 2>nul
 )
-if NOT EXIST %APPDATA%\GHISLER\wcx_ftp.ini (
+if NOT EXIST "%APPDATA%"\GHISLER\wcx_ftp.ini (
   echo Copying standard TOTALCOMMANDER ftp config file ...
-  copy /Y %TOOLS%\optional\config\wcx_ftp.ini %APPDATA%\GHISLER 1>nul 2>nul
+  copy /Y %TOOLS%\optional\config\wcx_ftp.ini "%APPDATA%"\GHISLER 1>nul 2>nul
 )
 
-rem THISPC
 echo Adding "This PC" icon for current user on desktop Windows 10 ...
 reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel" ^
  /v "{20D04FE0-3AEA-1069-A2D8-08002B30309D}" /t REG_DWORD /d 0 /f 1>nul
@@ -267,9 +260,9 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" ^
   /v "LaunchTo" /t REG_DWORD /d 1 /f 1>nul
 
 echo Cleaning up recent files and libraries ...
-del /F /Q %APPDATA%\Microsoft\Windows\Recent\AutomaticDestinations\* 2>nul
-del /F /Q %APPDATA%\Microsoft\Windows\Recent\* 2>nul
-del /F /Q %APPDATA%\Microsoft\Windows\Libraries\* 2>nul
+del /F /Q "%APPDATA%"\Microsoft\Windows\Recent\AutomaticDestinations\* 2>nul
+del /F /Q "%APPDATA%"\Microsoft\Windows\Recent\* 2>nul
+del /F /Q "%APPDATA%"\Microsoft\Windows\Libraries\* 2>nul
 
 echo Disabling frequent and recent files view in explorer ...
 reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" ^
@@ -280,7 +273,14 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" ^
 rem setting Aerolite theme...
 if %install_aerolite% == 1 (
   call %TOOLS%\scripts\modify-desktoptheme.cmd
+
+  echo Removing the wallpaper ...
+  reg add "HKCU\Control Panel\Desktop" /v WallPaper /t REG_SZ /d " " /f 1>nul
+  RUNDLL32.EXE user32.dll,UpdatePerUserSystemParameters 
+
+  echo Setting the desktop colour ...
   %TOOLS%\setbgcol %bgcol_R% %bgcol_G% %bgcol_B%
+
   echo.
 )
 
@@ -308,16 +308,14 @@ echo reorganizing start menu and desktop
 echo ########################################
 echo.
 
-rem Onedrive ...
 echo Removing OneDrive link in start menu ...
-del /F %APPDATA%\"Microsoft\Windows\Start Menu\Programs\OneDrive.lnk"
+del /F /Q "%APPDATA%\Microsoft\Windows\Start Menu\Programs\OneDrive.lnk" 2>nul
 
 rem create a statusfile (this codeblock must be executed only once per user) ...
 echo 1 >%USERCONFIG_DONE%
 
 :USERTWEAKS_DONE
 
-
 rem ========================================
 rem ACCOUNT CLEANUP AND FIXES (runs always)
 rem ========================================
@@ -385,18 +383,18 @@ rem DO NOT remove the "PICTURES" folder!
 rem this is used and needed by the snipping tool!
 
 echo removing folder "3D Objects" ...
-rd /S /Q %USERPROFILE%\"3D Objects" 2>nul
+rd /S /Q "%USERPROFILE%\3D Objects" 2>nul
 
 echo removing folder "Links" ...
-rd /S /Q %USERPROFILE%\"Links" 2>nul
+rd /S /Q "%USERPROFILE%\Links" 2>nul
 
 if %preserve_savedgames_folder% == 0 (
   echo removing folder "Saved Games" ...
-  rd /S /Q %USERPROFILE%\"Saved Games" 2>nul
+  rd /S /Q "%USERPROFILE%\Saved Games" 2>nul
 )
 
 echo removing folder "Searches" ...
-rd /S /Q %USERPROFILE%\"Searches" 2>nul
+rd /S /Q "%USERPROFILE%\Searches" 2>nul
 
 for %%D in (
 
@@ -410,10 +408,10 @@ for %%D in (
 ) do (
 
   echo %%D ...
-  attrib -R -S -H %USERPROFILE%\%%D 1>nul 2>nul
-  attrib -R -S -H %USERPROFILE%\%%D\desktop.ini 1>nul 2>nul
-  del /F /Q %USERPROFILE%\%%D\desktop.ini 2>nul
-  rmdir /Q %USERPROFILE%\%%D 2>nul
+  attrib -R -S -H "%USERPROFILE%"\%%D 1>nul 2>nul
+  attrib -R -S -H "%USERPROFILE%"\%%D\desktop.ini 1>nul 2>nul
+  del /F /Q "%USERPROFILE%"\%%D\desktop.ini 2>nul
+  rmdir /Q "%USERPROFILE%"\%%D 2>nul
 
 )
 
@@ -439,11 +437,11 @@ rem ... stupid OS!
 rem Edge is a zombie too!
 echo Removing microsoft edge links in start menu and desktop ...
 del /F %STARTMENU%\"Microsoft Edge.lnk" 2>nul
-del /F %USERPROFILE%\"Desktop\Microsoft Edge.lnk" 2>nul
+del /F "%USERPROFILE%\Desktop\Microsoft Edge.lnk" 2>nul
 
 rem re-create "Pictures" in case it was deleted ...
 echo Creating "Pictures" folder for snipping tool ...
-mkdir %USERPROFILE%\Pictures 2>nul
+mkdir "%USERPROFILE%"\Pictures 2>nul
 
 rem workstation service should run always ...
 echo.