diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 5f52cd3..3e2216a 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -175,6 +175,9 @@ if %install_firefox% == 1 (
 call install-win32diskimager.cmd
 echo.
 
+call install-irfanview.cmd
+echo.
+
 call install-shortcuts.cmd
 echo.
 
diff --git a/optional/install-irfanview.cmd b/scripts/install-irfanview.cmd
similarity index 94%
rename from optional/install-irfanview.cmd
rename to scripts/install-irfanview.cmd
index 8576c78..097d83a 100644
--- a/optional/install-irfanview.cmd
+++ b/scripts/install-irfanview.cmd
@@ -1,6 +1,4 @@
 @echo off
-call check-for-admin
-if %ERRORLEVEL% neq 0 exit /b
 
 set EXE=..\software\iview-setup.exe
 set ZIP=..\software\iview-plugins.zip
diff --git a/scripts/set-filetypes.cmd b/scripts/set-filetypes.cmd
index a806ab5..14fa730 100644
--- a/scripts/set-filetypes.cmd
+++ b/scripts/set-filetypes.cmd
@@ -1,4 +1,5 @@
 @echo off
+set %TOOLS%=c:\tools
 set ARG1=null
 
 IF "%~1" NEQ "" set ARG1=%1
@@ -15,9 +16,9 @@ set SUFFIX=acr ani b3d bmp dib clp crw cr2 cr3 cur dcm ima dcx dds djvu iw44 dxf
            mpg mpe mpeg mov wmv aif mid rmi mp3 ogg au snd wav wma
 call :SFTA
 
-set AKA=PDF24
-set BINARY="%PROGRAMFILES%\PDF24\pdf24-Reader.exe"
-set SUFFIX=pdf
+set AKA=SumatraPDF
+set BINARY="%TOOLS%\SumatraPDF.exe"
+set SUFFIX=pdf epub mobi fb2 fb2z pdb tcr cbz cbr cbt cb7 djv djvu chm xps oxps xod 
 call :SFTA
 
 set AKA=Presentations
diff --git a/scripts/startmenu/Sumatra PDF.lnk b/scripts/startmenu/Sumatra PDF.lnk
new file mode 100644
index 0000000..afbc465
Binary files /dev/null and b/scripts/startmenu/Sumatra PDF.lnk differ
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index 93fea1a..8ec4236 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -25,6 +25,7 @@ for %%A in (
   serviwin
   setdefaultbrowser
   showkeyplus
+  sumatrapdf
   trid
   triddefs
   vim
@@ -122,6 +123,11 @@ move /Y %T%\showkeyplus\*.exe %TOOLS%
 rd /S /Q %T%\showkeyplus
 echo.
 
+echo SumatraPDF
+move /Y %T%\sumatrapdf\*.exe %TOOLS%\SumatraPDF.exe
+rd /S /Q %T%\sumatrapdf
+echo.
+
 echo TrID (File identifier)
 move /Y %T%\trid\trid.exe %TOOLS%
 rd /S /Q %T%\trid
diff --git a/software/basic.csv b/software/basic.csv
index 3e17042..2006d58 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -1,4 +1,5 @@
 https://www.7-zip.org/a/7z1900-x64.msi 7z-setup.msi
+https://www.sumatrapdfreader.org/dl/rel/3.4.6/SumatraPDF-3.4.6-64.zip sumatrapdf.zip
 https://go.microsoft.com/fwlink/?linkid=2120254 adk-setup.exe
 https://download.sysinternals.com/files/SysinternalsSuite.zip sysinternals.zip
 https://curl.se/windows/latest.cgi?p=win64-mingw.zip curl.zip