diff --git a/.editorconfig b/.editorconfig
index 6d7e2e19a2..7578f5d980 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ charset = utf-8
 indent_style = tab
 indent_size = 4
 
-[*.{bat,vcproj,vcxproj,sln,vbs,rc}]
+[*.{bat,vcproj,vcxproj,sln,vbs,rc,nsi}]
 end_of_line = crlf
 
 [LICENSE]
diff --git a/.gitattributes b/.gitattributes
index cbd43c6469..b276dc1e8e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -37,7 +37,7 @@ CODEOWNERS              export-ignore
 ctags.cnf               export-ignore
 .editorconfig           export-ignore
 Packages/Artwork        export-ignore
-XOPs-MacOSX-IP9-64bit   export-ignore
+XOPs-MacOSX-64bit       export-ignore
 
 *.dot !diff
 
@@ -65,3 +65,5 @@ Packages/doc/** linguist-documentation
 tools/installer/nsis/** linguist-vendored
 tools/installer/Shelllink/** linguist-vendored
 tools/installer/AccessControl/** linguist-vendored
+
+PkgInfo -diff
diff --git a/.github/workflows/test-igor-rebase-exec-workflow.yml b/.github/workflows/test-igor-rebase-exec-workflow.yml
index 2c4cef6523..362846930a 100644
--- a/.github/workflows/test-igor-rebase-exec-workflow.yml
+++ b/.github/workflows/test-igor-rebase-exec-workflow.yml
@@ -4,7 +4,7 @@ env:
   # if this environment variable is set it will use the igor version from
   # C:\Program Files\WaveMetrics\Igor Pro ${VERSION} Folder\IgorBinaries_x64_${CI_IGOR${VERSION}_REVISION}
   CI_IGOR9_REVISION: "r56565"
-  CI_IGOR10_REVISION: "r29756"
+  CI_IGOR10_REVISION: "r29764"
 on:
   workflow_call:
     inputs:
diff --git a/.github/workflows/test-igor-workflow.yml b/.github/workflows/test-igor-workflow.yml
index 4453898b4f..2637ba9d6e 100644
--- a/.github/workflows/test-igor-workflow.yml
+++ b/.github/workflows/test-igor-workflow.yml
@@ -4,7 +4,7 @@ env:
   # if this environment variable is set it will use the igor version from
   # C:\Program Files\WaveMetrics\Igor Pro ${VERSION} Folder\IgorBinaries_x64_${CI_IGOR${VERSION}_REVISION}
   CI_IGOR9_REVISION: "r56565"
-  CI_IGOR10_REVISION: "r29756"
+  CI_IGOR10_REVISION: "r29764"
 on:
   workflow_call:
     inputs:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fdb2586e51..8926359fd6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ exclude: |
            .*patch$|
            .*svg$|
            # don't touch MacOSX XOPs
-           ^XOPs-MacOSX-IP9-64bit|
+           ^XOPs-MacOSX-64bit|
            ^Packages/ITCXOP2/tools/Disable-ASLR-for-Igor64.ps1
          ) # end alternations
 repos:
diff --git a/HelpFiles-IP10/AxonTelegraph Help.ihf - Shortcut.lnk b/HelpFiles-IP10/AxonTelegraph Help.ihf - Shortcut.lnk
new file mode 100644
index 0000000000..cafc57d8da
Binary files /dev/null and b/HelpFiles-IP10/AxonTelegraph Help.ihf - Shortcut.lnk differ
diff --git a/HelpFiles-IP9/Json Help.ihf b/HelpFiles/Json Help.ihf
similarity index 99%
rename from HelpFiles-IP9/Json Help.ihf
rename to HelpFiles/Json Help.ihf
index f640901503..295a60a59c 100644
Binary files a/HelpFiles-IP9/Json Help.ihf and b/HelpFiles/Json Help.ihf differ
diff --git a/HelpFiles-IP9/MIESUtils Help.ihf b/HelpFiles/MIESUtils Help.ihf
similarity index 98%
rename from HelpFiles-IP9/MIESUtils Help.ihf
rename to HelpFiles/MIESUtils Help.ihf
index 9c8d8dc7ea..d48f05a0fb 100644
Binary files a/HelpFiles-IP9/MIESUtils Help.ihf and b/HelpFiles/MIESUtils Help.ihf differ
diff --git a/HelpFiles-IP9/MultiClamp700xCommander Help.ihf b/HelpFiles/MultiClamp700xCommander Help.ihf
similarity index 100%
rename from HelpFiles-IP9/MultiClamp700xCommander Help.ihf
rename to HelpFiles/MultiClamp700xCommander Help.ihf
diff --git a/HelpFiles-IP9/ZeroMQ.ihf b/HelpFiles/ZeroMQ.ihf
similarity index 100%
rename from HelpFiles-IP9/ZeroMQ.ihf
rename to HelpFiles/ZeroMQ.ihf
diff --git a/HelpFiles-IP9/itcxop2 Help.ihf b/HelpFiles/itcxop2 Help.ihf
similarity index 99%
rename from HelpFiles-IP9/itcxop2 Help.ihf
rename to HelpFiles/itcxop2 Help.ihf
index adac063c76..e1805cb42d 100644
Binary files a/HelpFiles-IP9/itcxop2 Help.ihf and b/HelpFiles/itcxop2 Help.ihf differ
diff --git a/HelpFiles-IP9/mies-nwb2-compound-XOP Help.ihf b/HelpFiles/mies-nwb2-compound-XOP Help.ihf
similarity index 100%
rename from HelpFiles-IP9/mies-nwb2-compound-XOP Help.ihf
rename to HelpFiles/mies-nwb2-compound-XOP Help.ihf
diff --git a/Packages/MIES_Include.ipf b/Packages/MIES_Include.ipf
index fb3f09a943..978893305a 100644
--- a/Packages/MIES_Include.ipf
+++ b/Packages/MIES_Include.ipf
@@ -20,7 +20,7 @@
 // They are defined here so that we can parse them from within IP.
 //
 // .. |IgorPro9WindowsNightly| replace:: `Igor Pro 9 (Windows) <https://www.byte-physics.de/Downloads/WinIgor9_01Dec2023.zip>`__
-// .. |IgorPro10WindowsNightly| replace:: `Igor Pro 10 (Windows) <https://www.wavemetrics.net/Downloads/latest10/>`__
+// .. |IgorPro10WindowsNightly| replace:: `Igor Pro 10 (Windows) <https://www.byte-physics.de/Downloads/setupIgor10-r29764.exe>`__
 // .. |IgorPro9MacOSXNightly| replace:: `Igor Pro 9 (MacOSX) <https://www.byte-physics.de/Downloads/MacIgor9_01Dec2023.dmg>`__
 
 #pragma IgorVersion = 9.00
@@ -28,7 +28,7 @@
 ///@cond HIDDEN_SYMBOL
 #if IgorVersion() < 10 && (NumberByKey("BUILD", IgorInfo(0)) < 56565)
 #define TOO_OLD_IGOR
-#elif IgorVersion() == 10 && (NumberByKey("BUILD", IgorInfo(0)) < 29756)
+#elif IgorVersion() == 10 && (NumberByKey("BUILD", IgorInfo(0)) < 29764)
 #define TOO_OLD_IGOR
 #endif
 
@@ -76,10 +76,6 @@ static Function/S GetDownloadLink()
 	FATAL_ERROR("Unsupported OS")
 #endif
 
-	if(cmpstr(igorMajorVersion, "9"))
-		Abort "Download for Igor Pro 10 is not yet supported.\r Please manually download the nightly build from the documentation link."
-	endif
-
 	text         = ProcedureText("", 0, "MIES_Include.ipf")
 	lineWithLink = GrepList(text, "\\Q|IgorPro" + igorMajorVersion + os + "Nightly|\\E", 0, "\r")
 	SplitString/E=".*<(.*)>.*" lineWithLink, url
diff --git a/Packages/doc/installation.rst b/Packages/doc/installation.rst
index 22be373fdf..d1170edbb4 100644
--- a/Packages/doc/installation.rst
+++ b/Packages/doc/installation.rst
@@ -29,18 +29,15 @@ and a dialog appears with a button which opens this documentation.
 
 In that case please perform the following steps:
 
-- Download the package for |IgorPro9WindowsNightly| or |IgorPro9MacOSXNightly|.
+- Download the package for |IgorPro9WindowsNightly|, |IgorPro10WindowsNightly| or |IgorPro9MacOSXNightly|.
   Either from within Igor Pro or from a web browser.
 - Close Igor Pro
-- Windows: Replace the folders ``IgorBinaries_x64`` and ``IgorBinaries_Win32``
-           in ``C:\Program Files\WaveMetrics\Igor Pro 9`` with the ones from the
-           downloaded zip package. This requires admin access.
+- Windows:
+  - Igor Pro 9: Replace the folders ``IgorBinaries_x64`` and ``IgorBinaries_Win32`` in ``C:\Program Files\WaveMetrics\Igor Pro 9`` with the ones from the downloaded zip package. This requires admin access.
+  - Igor Pro 10: Install as usual
 - MacOSX: Install from image as usual
 - Restart Igor Pro
 
-For Igor Pro 10, download the installer for |IgorPro10WindowsNightly|. This requires access to the beta
-program of WaveMetrics.
-
 Installation using the installer (preferred)
 --------------------------------------------
 
@@ -195,7 +192,8 @@ Windows (with hardware support)
    <https://github.com/AllenInstitute/MIES/blob/main/tools/installer/vc_redist.x64.exe>`__
 -  Quit Igor Pro. If you have never opened it, open it once and then close it.
 -  Get the MIES source code and initialize the repo, see :ref:`getting MIES`
--  Create the following shortcuts in ``C:\Users\$username\Documents\WaveMetrics\Igor Pro 9 User Files``
+-  Create the following shortcuts in ``C:\Users\$username\Documents\WaveMetrics\Igor Pro XXX User Files``
+   where ``XXX`` is either ``9`` or ``10``:
 
    -  In ``User Procedures`` a shortcut pointing to
 
@@ -203,8 +201,15 @@ Windows (with hardware support)
       -  ``Packages\MIES``
 
    -  In ``Igor Procedures`` a shortcut pointing to ``Packages\MIES_Include.ipf``
-   -  In ``Igor Extensions (64-bit)`` a shortcut pointing to ``XOPs-IP9-64bit``
-   -  In ``Igor Help Files`` a shortcut pointing to ``HelpFiles-IP9``
+   -  In ``Igor Extensions (64-bit)`` a shortcut pointing to
+
+      - ``XOPs-IPXXX-64bit``
+      - ``XOPs-64bit``
+
+   -  In ``Igor Help Files`` a shortcut pointing to
+
+      - ``HelpFiles-IPXXX``
+      - ``HelpFiles``
 
 -  ITC hardware:
 
@@ -239,8 +244,8 @@ require, you can also install MIES without any hardware related XOPs present.
 -  Install the `Visual C++ Redistributable package <https://github.com/AllenInstitute/MIES/blob/main/tools/installer/vc_redist.x64.exe>`__
 -  Quit Igor Pro
 -  Get the MIES source code, see :ref:`getting MIES`
--  Create the following shortcuts in
-   ``C:\Users\$username\Documents\WaveMetrics\Igor Pro 9 User Files``
+-  Create the following shortcuts in ``C:\Users\$username\Documents\WaveMetrics\Igor Pro XXX User Files``
+   where ``XXX`` is either ``9`` or ``10``:
 
    -  In ``User Procedures`` a shortcut pointing to
 
@@ -251,13 +256,13 @@ require, you can also install MIES without any hardware related XOPs present.
 
    -  In ``Igor Extensions (64-bit)`` a shortcut pointing to
 
-      -  ``XOPs-IP9-64bit\JSON-64.xop``
-      -  ``XOPs-IP9-64bit\MIESUtils-64.xop``
-      -  ``XOPs-IP9-64bit\ZeroMQ-64.xop``
-      -  ``XOPs-IP9-64bit\TUFXOP-64.xop``
-      -  ``XOPs-IP9-64bit\mies-nwb2-compound-XOP-64.xop``
+      -  ``XOPs-64bit\JSON-64.xop``
+      -  ``XOPs-64bit\MIESUtils-64.xop``
+      -  ``XOPs-64bit\ZeroMQ-64.xop``
+      -  ``XOPs-64bit\TUFXOP-64.xop``
+      -  ``XOPs-64bit\mies-nwb2-compound-XOP-64.xop``
 
-   -  In ``Igor Help Files`` a shortcut pointing to HelpFiles-IP9
+   -  In ``Igor Help Files`` a shortcut pointing to ``HelpFiles``
 
 -  Start Igor Pro
 
@@ -280,9 +285,9 @@ Analysis support only. Data acquisition and NWBv2 export are not supported on Ma
 
    -  In ``Igor Extensions (64-bit)`` a symlink pointing to
 
-      -  ``XOPs-MacOSX-IP9-64bit``
+      -  ``XOPs-MacOSX-64bit``
 
-   -  In ``Igor Help Files`` a shortcut pointing to HelpFiles-IP9
+   -  In ``Igor Help Files`` a shortcut pointing to ``HelpFiles``
 
 -  Start Igor Pro
 
diff --git a/XOPs-IP9-64bit/JSON-64.xop b/XOPs-64bit/JSON-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/JSON-64.xop
rename to XOPs-64bit/JSON-64.xop
diff --git a/XOPs-IP9-64bit/MIESUtils-64.xop b/XOPs-64bit/MIESUtils-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/MIESUtils-64.xop
rename to XOPs-64bit/MIESUtils-64.xop
diff --git a/XOPs-IP9-64bit/MultiClamp700xCommander64.xop b/XOPs-64bit/MultiClamp700xCommander64.xop
similarity index 100%
rename from XOPs-IP9-64bit/MultiClamp700xCommander64.xop
rename to XOPs-64bit/MultiClamp700xCommander64.xop
diff --git a/XOPs-IP9-64bit/SutterXOP_Win-64.xop b/XOPs-64bit/SutterXOP_Win-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/SutterXOP_Win-64.xop
rename to XOPs-64bit/SutterXOP_Win-64.xop
diff --git a/XOPs-IP9-64bit/TUF-64.xop b/XOPs-64bit/TUF-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/TUF-64.xop
rename to XOPs-64bit/TUF-64.xop
diff --git a/XOPs-IP9-64bit/ZeroMQ-64.xop b/XOPs-64bit/ZeroMQ-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/ZeroMQ-64.xop
rename to XOPs-64bit/ZeroMQ-64.xop
diff --git a/XOPs-IP9-64bit/itcXOP2-64.xop b/XOPs-64bit/itcXOP2-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/itcXOP2-64.xop
rename to XOPs-64bit/itcXOP2-64.xop
diff --git a/XOPs-IP9-64bit/libzmq-v142-mt-4_3_4.dll b/XOPs-64bit/libzmq-v142-mt-4_3_4.dll
similarity index 100%
rename from XOPs-IP9-64bit/libzmq-v142-mt-4_3_4.dll
rename to XOPs-64bit/libzmq-v142-mt-4_3_4.dll
diff --git a/XOPs-IP9-64bit/mies-nwb2-compound-XOP-64.xop b/XOPs-64bit/mies-nwb2-compound-XOP-64.xop
similarity index 100%
rename from XOPs-IP9-64bit/mies-nwb2-compound-XOP-64.xop
rename to XOPs-64bit/mies-nwb2-compound-XOP-64.xop
diff --git a/XOPs-IP10-64bit/AxonTelegraph64.xop - Shortcut.lnk b/XOPs-IP10-64bit/AxonTelegraph64.xop - Shortcut.lnk
new file mode 100644
index 0000000000..a29558b3ba
Binary files /dev/null and b/XOPs-IP10-64bit/AxonTelegraph64.xop - Shortcut.lnk differ
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/CodeResources b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/CodeResources
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/CodeResources
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/CodeResources
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/Info.plist b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/Info.plist
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/Info.plist
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/Info.plist
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/MacOS/JSON-64 b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/MacOS/JSON-64
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/MacOS/JSON-64
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/MacOS/JSON-64
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/PkgInfo b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/PkgInfo
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/PkgInfo
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/PkgInfo
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/Resources/English.lproj/InfoPlist.strings b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/Resources/JSON-64.rsrc b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/Resources/JSON-64.rsrc
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/Resources/JSON-64.rsrc
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/Resources/JSON-64.rsrc
diff --git a/XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/_CodeSignature/CodeResources b/XOPs-MacOSX-64bit/JSON-64.xop/Contents/_CodeSignature/CodeResources
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/JSON-64.xop/Contents/_CodeSignature/CodeResources
rename to XOPs-MacOSX-64bit/JSON-64.xop/Contents/_CodeSignature/CodeResources
diff --git a/XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/Info.plist b/XOPs-MacOSX-64bit/TUF-64.xop/Contents/Info.plist
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/Info.plist
rename to XOPs-MacOSX-64bit/TUF-64.xop/Contents/Info.plist
diff --git a/XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/MacOS/TUF-64 b/XOPs-MacOSX-64bit/TUF-64.xop/Contents/MacOS/TUF-64
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/MacOS/TUF-64
rename to XOPs-MacOSX-64bit/TUF-64.xop/Contents/MacOS/TUF-64
diff --git a/XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/PkgInfo b/XOPs-MacOSX-64bit/TUF-64.xop/Contents/PkgInfo
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/PkgInfo
rename to XOPs-MacOSX-64bit/TUF-64.xop/Contents/PkgInfo
diff --git a/XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/Resources/English.lproj/InfoPlist.strings b/XOPs-MacOSX-64bit/TUF-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
rename to XOPs-MacOSX-64bit/TUF-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/Resources/TUF-64.rsrc b/XOPs-MacOSX-64bit/TUF-64.xop/Contents/Resources/TUF-64.rsrc
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/TUF-64.xop/Contents/Resources/TUF-64.rsrc
rename to XOPs-MacOSX-64bit/TUF-64.xop/Contents/Resources/TUF-64.rsrc
diff --git a/XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/Info.plist b/XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/Info.plist
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/Info.plist
rename to XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/Info.plist
diff --git a/XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/MacOS/ZeroMQ-64 b/XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/MacOS/ZeroMQ-64
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/MacOS/ZeroMQ-64
rename to XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/MacOS/ZeroMQ-64
diff --git a/XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/PkgInfo b/XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/PkgInfo
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/PkgInfo
rename to XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/PkgInfo
diff --git a/XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/Resources/English.lproj/InfoPlist.strings b/XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
rename to XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/Resources/ZeroMQ-64.rsrc b/XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/Resources/ZeroMQ-64.rsrc
similarity index 100%
rename from XOPs-MacOSX-IP9-64bit/ZeroMQ-64.xop/Contents/Resources/ZeroMQ-64.rsrc
rename to XOPs-MacOSX-64bit/ZeroMQ-64.xop/Contents/Resources/ZeroMQ-64.rsrc
diff --git a/tools/installer/installer.nsi b/tools/installer/installer.nsi
index 0216a0cfe1..ff32b637fc 100644
--- a/tools/installer/installer.nsi
+++ b/tools/installer/installer.nsi
@@ -26,10 +26,11 @@
 !define IGOR64EXTENSIONPATH "Igor Extensions (64-bit)"
 # Endings for Helpfiles
 !define IGOR9DIRTEMPL "IP9"
-!define IGOR10DIRTEMPL "IP9"
+!define IGOR10DIRTEMPL "IP10"
 # source folder name for installation with XOPs
+!define IGORCOMMONXOPSOURCETEMPL "XOPs-64bit"
 !define IGOR964XOPSOURCETEMPL "XOPs-IP9-64bit"
-!define IGOR1064XOPSOURCETEMPL "XOPs-IP9-64bit"
+!define IGOR1064XOPSOURCETEMPL "XOPs-IP10-64bit"
 
 # source file names for XOPs for installation without Hardware XOPs
 !define IGORUTILXOPSOURCETEMPL "MIESUtils-64.xop"
@@ -100,6 +101,7 @@ Var ISADMIN
 
 Var IGORDIRTEMPL
 Var IGORBITDIRTEMPL
+Var IGORBITCOMMONDIRTEMPL
 Var IGORUTILSOURCETEMPL
 Var IGORJSONSOURCETEMPL
 Var IGORZEROMQSOURCETEMPL
@@ -643,7 +645,13 @@ CLTDone_${CLTID}:
 !define CREALNKSID ${__LINE__}
   !insertmacro CreateIgorDirs
   IntCmp $XOPINST 0 NoXOPInst__${CREALNKSID}
-# All MIES XOPs linked by complete folder
+    # All MIES XOPs linked by complete folder
+
+    # common XOPs
+    CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITCOMMONDIRTEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL"
+    FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITCOMMONDIRTEMPL.lnk$\n"
+
+    # version specific XOPs
     CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITDIRTEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL"
     FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITDIRTEMPL.lnk$\n"
 
@@ -652,27 +660,27 @@ NoXOPInst__${CREALNKSID}:
 # Link XOP files directly that are not Hardware XOPs
     StrLen $0 $IGORUTILSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORUTILSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORUTILSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORUTILSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORUTILSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORUTILSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORJSONSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORJSONSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORJSONSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORJSONSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORJSONSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORJSONSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORZEROMQSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORZEROMQSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORZEROMQSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORZEROMQSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORZEROMQSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORZEROMQSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORTUFSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORTUFSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORTUFSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORNWBSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORNWBSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORNWBSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk$\n"
     ${EndIf}
 
@@ -688,6 +696,9 @@ ProcInst_${CREALNKSID}:
     CreateShortCut "$IGORBASEPATH\Igor Help Files\HelpFiles-$IGORDIRTEMPL.lnk" "$INSTDIR\HelpFiles-$IGORDIRTEMPL"
     FileWrite $FILEHANDLE "$IGORBASEPATH\Igor Help Files\HelpFiles-$IGORDIRTEMPL.lnk$\n"
 
+    CreateShortCut "$IGORBASEPATH\Igor Help Files\HelpFiles.lnk" "$INSTDIR\HelpFiles"
+    FileWrite $FILEHANDLE "$IGORBASEPATH\Igor Help Files\HelpFiles.lnk$\n"
+
 !undef CREALNKSID
 !macroend
 
@@ -740,6 +751,7 @@ AdminCheckDone:
     IntCmp $INSTALL_I964 0 InstallEnd964
       StrCpy $IGORDIRTEMPL "${IGOR9DIRTEMPL}"
       StrCpy $IGORBITDIRTEMPL "${IGOR964XOPSOURCETEMPL}"
+      StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
       StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
       StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
       StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
@@ -753,6 +765,7 @@ InstallEnd964:
     IntCmp $INSTALL_I1064 0 InstallEnd1064
       StrCpy $IGORDIRTEMPL "${IGOR10DIRTEMPL}"
       StrCpy $IGORBITDIRTEMPL "${IGOR1064XOPSOURCETEMPL}"
+      StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
       StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
       StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
       StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
@@ -769,6 +782,7 @@ InstallAllUser:
   IntCmp $INSTALL_I964 0 InstallAEnd964
     StrCpy $IGORDIRTEMPL "${IGOR9DIRTEMPL}"
     StrCpy $IGORBITDIRTEMPL "${IGOR964XOPSOURCETEMPL}"
+    StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
     StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
     StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
     StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
@@ -781,6 +795,7 @@ InstallAEnd964:
   IntCmp $INSTALL_I1064 0 InstallAEnd1064
     StrCpy $IGORDIRTEMPL "${IGOR10DIRTEMPL}"
     StrCpy $IGORBITDIRTEMPL "${IGOR1064XOPSOURCETEMPL}"
+    StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
     StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
     StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
     StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
diff --git a/tools/installer/nsis/Bin/GenPat.exe b/tools/installer/nsis/Bin/GenPat.exe
index d8afd4967f..94627ca9dc 100644
Binary files a/tools/installer/nsis/Bin/GenPat.exe and b/tools/installer/nsis/Bin/GenPat.exe differ
diff --git a/tools/installer/nsis/Bin/MakeLangId.exe b/tools/installer/nsis/Bin/MakeLangId.exe
index 2e09094a8e..8ffce81b61 100644
Binary files a/tools/installer/nsis/Bin/MakeLangId.exe and b/tools/installer/nsis/Bin/MakeLangId.exe differ
diff --git a/tools/installer/nsis/Bin/RegTool-x86.bin b/tools/installer/nsis/Bin/RegTool-x86.bin
index e7abee087a..1312474da0 100644
Binary files a/tools/installer/nsis/Bin/RegTool-x86.bin and b/tools/installer/nsis/Bin/RegTool-x86.bin differ
diff --git a/tools/installer/nsis/Bin/makensis.exe b/tools/installer/nsis/Bin/makensis.exe
index 99b650b8ad..568e52ae06 100644
Binary files a/tools/installer/nsis/Bin/makensis.exe and b/tools/installer/nsis/Bin/makensis.exe differ
diff --git a/tools/installer/nsis/Bin/zip2exe.exe b/tools/installer/nsis/Bin/zip2exe.exe
index b3eeb57b98..080f5f8dc7 100644
Binary files a/tools/installer/nsis/Bin/zip2exe.exe and b/tools/installer/nsis/Bin/zip2exe.exe differ
diff --git a/tools/installer/nsis/COPYING b/tools/installer/nsis/COPYING
index a8cbcffc09..402183edfc 100644
--- a/tools/installer/nsis/COPYING
+++ b/tools/installer/nsis/COPYING
@@ -1,7 +1,7 @@
 COPYRIGHT
 ---------
 
-Copyright (C) 1999-2023 Contributors
+Copyright (C) 1999-2025 Contributors
 
 More detailed copyright information can be found in the individual source code files.
 
diff --git a/tools/installer/nsis/Contrib/Language files/Belarusian.nlf b/tools/installer/nsis/Contrib/Language files/Belarusian.nlf
index b1a4e273d2..7e710e43fb 100644
--- a/tools/installer/nsis/Contrib/Language files/Belarusian.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/Belarusian.nlf	
@@ -147,7 +147,7 @@ Nullsoft Install System %s
 # ^DeleteOnReboot
 "Выдаленне пасля перазапуску камп'ютара: "
 # ^ErrorCreatingShortcut
-"Памылка стварэння ярлыка: " 
+"Памылка стварэння ярлыка: "
 # ^ErrorCreating
 "Памылка стварэння: "
 # ^ErrorDecompressing
@@ -155,7 +155,7 @@ Nullsoft Install System %s
 # ^ErrorRegistering
 Немагчыма зарэгістраваць бібліятэку (DLL)
 # ^ExecShell
-"Выкананне каманды абалонкі: " 
+"Выкананне каманды абалонкі: "
 # ^Exec
 "Выкананне: "
 # ^Extract
@@ -165,7 +165,7 @@ Nullsoft Install System %s
 # ^InvalidOpcode
 дыстрыбутыў пашкоджаны: код памылкi
 # ^NoOLE
-"Няма OLE для: " 
+"Няма OLE для: "
 # ^OutputFolder
 "Папка усталявання: "
 # ^RemoveFolder
diff --git a/tools/installer/nsis/Contrib/Language files/Finnish.nlf b/tools/installer/nsis/Contrib/Language files/Finnish.nlf
index b9fdf3b002..6e01c723e7 100644
--- a/tools/installer/nsis/Contrib/Language files/Finnish.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/Finnish.nlf	
@@ -16,13 +16,13 @@ NLF v6
 # ^Branding
 Nullsoft Install System %s
 # ^SetupCaption
-$(^Name) -ohjelman asennus
+$(^Name) -asennus
 # ^UninstallCaption
-$(^Name) -ohjelman poisto
+$(^Name) -poisto
 # ^LicenseSubCaption
 : Lisenssisopimus
 # ^ComponentsSubCaption
-: Asennusvaihtoehdot
+: Asennusvalinnat
 # ^DirSubCaption
 : Asennuskansio
 # ^InstallingSubCaption
@@ -30,7 +30,7 @@ $(^Name) -ohjelman poisto
 # ^CompletedSubCaption
 : Valmis
 # ^UnComponentsSubCaption
-: Poistovaihtoehdot
+: Poistovalinnat
 # ^UnDirSubCaption
 : Poistokansio
 # ^ConfirmSubCaption
@@ -40,7 +40,7 @@ $(^Name) -ohjelman poisto
 # ^UnCompletedSubCaption
 : Valmis
 # ^BackBtn
-< &Takaisin
+< &Edellinen
 # ^NextBtn
 &Seuraava >
 # ^AgreeBtn
@@ -62,71 +62,71 @@ S&elaa...
 # ^ShowDetailsBtn
 &Näytä tiedot
 # ^ClickNext
-Valitse Seuraava jatkaaksesi.
+Jatka valitsemalla Seuraava.
 # ^ClickInstall
-Valitse Asenna aloittaaksesi asennuksen.
+Aloita asennus valitsemalla Asenna.
 # ^ClickUninstall
-Valitse Poista poistaaksesi asennuksen.
+Aloita asennuksen poisto valitsemalla Poista.
 # ^Name
 Nimi
 # ^Completed
 Valmis
 # ^LicenseText
-Lue lisenssisopimus ennen asentamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse Hyväksyn.
+Lue lisenssisopimus ennen asennusta ja jos hyväksyt sopimuksen kaikki ehdot, valitse Hyväksyn.
 # ^LicenseTextCB
-Lue lisenssisopimus ennen asentamista. Jos hyväksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
+Lue lisenssisopimus ennen asennusta ja jos hyväksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
 # ^LicenseTextRB
-Lue lisenssisopimus ennen asentamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse ensimmäinen vaihtoehto alapuolelta. $_CLICK
+Lue lisenssisopimus ennen asennusta ja jos hyväksyt sopimuksen kaikki ehdot, valitse alta ensimmäinen valinta. $_CLICK
 # ^UnLicenseText
-Lue lisenssisopimus ennen poistamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse Hyväksyn.
+Lue lisenssisopimus ennen asennuksen poistoa ja jos hyväksyt sopimuksen kaikki ehdot, valitse Hyväksyn.
 # ^UnLicenseTextCB
-Lue lisenssisopimus ennen poistamista. Jos hyväksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
+Lue lisenssisopimus ennen asennuksen poistoa ja jos hyväksyt sopimuksen kaikki ehdot, laita rasti ruutuun. $_CLICK
 # ^UnLicenseTextRB
-Lue lisenssisopimus ennen poistamista. Jos hyväksyt sopimuksen kaikki ehdot, valitse ensimmäinen vaihtoehto alapuolelta. $_CLICK
+Lue lisenssisopimus ennen asennuksen poistoa ja jos hyväksyt sopimuksen kaikki ehdot, valitse alta ensimmäinen valinta. $_CLICK
 # ^Custom
-Oma
+Mukautettu
 # ^ComponentsText
-Valitse komponentit, jotka haluat asentaa, ja poista valinta komponenteista, joita et halua asentaa. $_CLICK
+Valitse asennettavat komponentit ja poista valinnat niistä, joita et halua asentaa. $_CLICK
 # ^ComponentsSubText1
 Valitse asennustyyppi:
 # ^ComponentsSubText2_NoInstTypes
 Valitse asennettavat komponentit:
 # ^ComponentsSubText2
-Tai, valitse valinnaiset komponentit, jotka haluat asentaa:
+Tai valitse valinnaiset komponentit, jotka haluat asentaa:
 # ^UnComponentsText
-Valitse komponentit, jotka haluat poistaa, ja poista valinta komponenteista, joita et haluat poistaa. $_CLICK
+Valitse poistettavat komponentit ja poista valinnat niistä, joita et haluat poistaa. $_CLICK
 # ^UnComponentsSubText1
 Valitse poistotyyppi:
 # ^UnComponentsSubText2_NoInstTypes
 Valitse poistettavat komponentit:
 # ^UnComponentsSubText2
-Tai, valitse valinnaiset komponentit, jotka haluat poistaa
+Tai valitse valinnaiset komponentit, jotka haluat poistaa
 # ^DirText
-$(^NameDA) -ohjelma asennetaan seuraavaan kansioon. Jos haluat asentaa sen johonkin muuhun kansioon, valitse Selaa, ja valitse toinen kansio. $_CLICK
+$(^NameDA) -asennetaan seuraavaan kansioon. Jos haluat asentaa sen eri kansioon, valitse kansio painamalla Selaa. $_CLICK
 # ^DirSubText
 Kohdekansio
 # ^DirBrowseText
-Valitse kansio, johon haluat asentaa ohjelman $(^NameDA):
+Valitse kansio, johon $(^NameDA) asennetaan:
 # ^UnDirText
-Poistetaan ohjelman $(^NameDA) seuraavasta kansiosta. Jos haluat poistaa sen jostakin muusta kansiosta, valitse Selaa, ja valitse toinen kansio. $_CLICK
+$(^NameDA) poistetaan seuraavasta kansiosta. Jos haluat poistaa sen eri kansiosta, valitse kansio painamalla Selaa. $_CLICK
 # ^UnDirSubText
 ""
 # ^UnDirBrowseText
-Valitse kansio, josta haluat poistaa ohjelman $(^NameDA):
+Valitse kansio, josta $(^NameDA) poistetaan:
 # ^SpaceAvailable
 "Tilaa vapaana: "
 # ^SpaceRequired
 "Tarvittava tila: "
 # ^UninstallingText
-Tämä ohjelma poistaa ohjelman $(^NameDA) tietokoneelta. $_CLICK
+Tämä asentaja poistaa $(^NameDA) -asennuksen tietokoneelta. $_CLICK
 # ^UninstallingSubText
 Poistetaan kansiosta:
 # ^FileError
-Tiedostoon ei voitu kirjoittaa: \r\n\t"$0"\r\nLopeta asennus valitsemalla Hylkää,\r\nyritä uudelleen valitsemalla Uudelleen, tai\r\nohita tiedosto valitsemalla Ohita
+Tiedostomuutoksia ei voida tallentaa: \r\n\t"$0"\r\nLopeta asennus valitsemalla Keskeytä,\r\nyritä uudelleen valitsemalla Uudelleen, tai\r\nohita tiedosto valitsemalla Ohita.
 # ^FileError_NoIgnore
-Tiedostoon ei voitu kirjoittaa: \r\n\t"$0"\r\nYritä uudelleen valitsemalla Uudelleen, tai\r\nlopeta asennus valitsemalla Hylkää
+Tiedostomuutoksia ei voida tallentaa: \r\n\t"$0"\r\nYritä uudelleen valitsemalla Uudelleen tai\r\nlopeta asennus valitsemalla Keskeytä.
 # ^CantWrite
-"Ei voi kirjoittaa: "
+"Tiedostomuutoksia ei voida tallentaa: "
 # ^CopyFailed
 Kopiointi epäonnistui
 # ^CopyTo
@@ -138,25 +138,25 @@ Kopiointi epäonnistui
 # ^SymbolNotFound
 "Symbolia ei löytynyt: "
 # ^CouldNotLoad
-"Ei voitu ladata: "
+"Lataus epäonnistui: "
 # ^CreateFolder
 "Luo kansio: "
 # ^CreateShortcut
 "Luo pikakuvake: "
 # ^CreatedUninstaller
-"Poisto-ohjelma luotiin: "
+"Asennuksen poisto luotiin: "
 # ^Delete
 "Poista: "
 # ^DeleteOnReboot
-"Poista käynnistyksen yhteydessä: "
+"Poista uudelleenkäynnistyksen yhteydessä: "
 # ^ErrorCreatingShortcut
 "Virhe luotaessa pikakuvaketta: "
 # ^ErrorCreating
 "Virhe luotaessa: "
 # ^ErrorDecompressing
-Pakettia ei voitu purkaa. Korruptoitunut asennusohjelma?
+Pakettia ei voitu purkaa. Onko asennuksen poisto vioittunut?
 # ^ErrorRegistering
-Virhe rekisteröidessä DLL-tiedostoa
+Virhe rekisteröitäessä DLL-tiedostoa
 # ^ExecShell
 "ExecShell: "
 # ^Exec
@@ -164,19 +164,19 @@ Virhe rekisteröidessä DLL-tiedostoa
 # ^Extract
 "Pura: "
 # ^ErrorWriting
-"Pura: tiedostoon ei voitu kirjoittaa "
+"Pura: tiedostomuutoksia ei voitu tallentaa "
 # ^InvalidOpcode
 Asennuspaketti on vioittunut: virheellinen opcode
 # ^NoOLE
-"Ei OLEa: "
+"OLE puuttuu: "
 # ^OutputFolder
 "Kansio: "
 # ^RemoveFolder
 "Poista kansio: "
 # ^RenameOnReboot
-"Muuta nimi uudelleenkäynnistyksen yhteydessä: "
+"Nimeä uudelleen uudelleenkäynnistyksen yhteydessä: "
 # ^Rename
-"Muuta nimi: "
+"Nimeä uudelleen: "
 # ^Skipped
 "Ohitettiin: "
 # ^CopyDetails
diff --git a/tools/installer/nsis/Contrib/Language files/Finnish.nsh b/tools/installer/nsis/Contrib/Language files/Finnish.nsh
index d1c1c3266f..5afa9da269 100644
--- a/tools/installer/nsis/Contrib/Language files/Finnish.nsh	
+++ b/tools/installer/nsis/Contrib/Language files/Finnish.nsh	
@@ -3,96 +3,97 @@
 ;By Eclipser (Jonne Lehtinen) <Eclipser at pilvikaupunki dot com>
 ;Updated by Puuhis (puuhis@puuhis.net)
 ;Updated 11/08 by WTLib Team
+;Updated 01/24 by olavinto (Oskari Lavinto) (l18npub@olavinto.simplelogin.com)
 
 !insertmacro LANGFILE "Finnish" = "Suomi" =
 
 !ifdef MUI_WELCOMEPAGE
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -ohjelman asennukseen"
-  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Saat tarvittavia ohjeita sitä mukaa kuin $(^NameDA) -ohjelman asennus edistyy.$\r$\n$\r$\nOn suositeltavaa sulkea kaikki muut ohjelmat ennen asennuksen aloittamista, jotta asennus voi päivittää järjestelmätiedostoja käynnistämättä konetta uudelleen.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -asennukseen"
+  ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Näet tarpeellisia ohjeita $(^NameDA) -asennuksen edistyessä.$\r$\n$\r$\nKaikki muut sovellukset kannattaa sulkea ennen asennuksen aloitusta, jotta asennus voi päivittää järjestelmätiedostoja käynnistämättä tietokonetta uudelleen.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_UNWELCOMEPAGE
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -ohjelman poisto-ohjelmaan"
-  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Saat tarvittavia ohjeita sitä mukaa kuin $(^NameDA) -ohjelman poisto edistyy.$\r$\n$\r$\nEnnen poiston aloittamista varmista, ettei $(^NameDA) ole käynnissä.$\r$\n$\r$\n$_CLICK"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Tervetuloa $(^NameDA) -asennuksen poistoon"
+  ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Saat tarvittavia ohjeita sitä mukaa kuin $(^NameDA) -asennuksen poisto edistyy.$\r$\n$\r$\nVarmista ennen asennuksen poiston aloitusta, ettei $(^NameDA) ole käynnissä.$\r$\n$\r$\n$_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE
   ${LangFileString} MUI_TEXT_LICENSE_TITLE "Käyttöoikeussopimus"
-  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Lue käyttöehdot huolellisesti ennen $(^NameDA) -ohjelman asentamista."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jos hyväksyt ehdot, valitse Hyväksyn. Ohjelman asentaminen edellyttää käyttöehtojen hyväksymistä."
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyväksyt ehdot, laita rasti alla olevaan ruutuun. Ohjelman asentaminen edellyttää käyttöehtojen hyväksymistä. $_CLICK"
-  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyväksyt ehdot, valitse ensimmäinen vaihtoehto alapuolelta. Ohjelman asentaminen edellyttää käyttöehtojen hyväksymistä. $_CLICK"
+  ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Lue käyttöehdot huolellisesti ennen $(^NameDA) -asennusta."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Jos hyväksyt ehdot, valitse Hyväksyn. Asennus edellyttää käyttöehtojen hyväksyntää."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyväksyt ehdot, laita rasti ruutuun. Asennus edellyttää käyttöehtojen hyväksyntää. $_CLICK"
+  ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyväksyt ehdot, valitse alta ensimmäinen valinta. Asennus edellyttää käyttöehtojen hyväksyntää. $_CLICK"
 !endif
 
 !ifdef MUI_UNLICENSEPAGE
   ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Käyttöoikeussopimus"
-  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Lue käyttöehdot huolellisesti ennen $(^NameDA) -ohjelman poistoa."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jos hyväksyt ehdot, valitse Hyväksyn. Ohjelman asentaminen edellyttää käyttöehtojen hyväksymistä."
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyväksyt ehdot, laita rasti alla olevaan ruutuun. Ohjelman asentaminen edellyttää käyttöehtojen hyväksymistä. $_CLICK"
-  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyväksyt ehdot, valitse ensimmäinen vaihtoehto alapuolelta. Ohjelman asentaminen edellyttää käyttöehtojen hyväksymistä. $_CLICK"
+  ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Lue käyttöehdot huolellisesti ennen $(^NameDA) -asennuksen poistoa."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM "Jos hyväksyt ehdot, valitse Hyväksyn. Asennuksen poisto edellyttää käyttöehtojen hyväksyntää."
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Jos hyväksyt ehdot, laita rasti ruutuun. Asennuksen poisto edellyttää käyttöehtojen hyväksyntää. $_CLICK"
+  ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Jos hyväksyt ehdot, valitse alta ensimmäinen valinta. Asennuksen poisto edellyttää käyttöehtojen hyväksyntää. $_CLICK"
 !endif
 
 !ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
-  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Paina Page Down -näppäintä nähdäksesi loput sopimuksesta."
+  ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Vieritä ja näytä sopimusta lisää painamalla Page Down -näppäintä."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE
   ${LangFileString} MUI_TEXT_COMPONENTS_TITLE "Valitse komponentit"
-  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Valitse toiminnot, jotka haluat asentaa ohjelmaan $(^NameDA)."
+  ${LangFileString} MUI_TEXT_COMPONENTS_SUBTITLE "Valitse asennettavat $(^NameDA) -ominaisuudet."
 !endif
 
 !ifdef MUI_UNCOMPONENTSPAGE
   ${LangFileString} MUI_UNTEXT_COMPONENTS_TITLE "Valitse komponentit"
-  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Valitse $(^NameDA) toiminnot, jotka haluat poistaa."
+  ${LangFileString} MUI_UNTEXT_COMPONENTS_SUBTITLE "Valitse $(^NameDA) -ominaisuudet, jotka haluat poistaa."
 !endif
 
 !ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
-  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Selitys"
+  ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Kuvaus"
   !ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Siirrä hiiri komponentin nimen päälle nähdäksesi sen selityksen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Näytä komponentin kuvaus osoittamalla sitä hiirellä."
   !else
-    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Valitse komponentti nähdäksesi sen selityksen."
+    ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Näytä komponentin kuvaus valitsemalla se."
   !endif
 !endif
 
 !ifdef MUI_DIRECTORYPAGE
   ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Valitse asennuskansio"
-  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Valitse kansio, johon haluat asentaa $(^NameDA) -ohjelman."
+  ${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Valitse kansio, johon $(^NameDA) asennetaan."
 !endif
 
 !ifdef MUI_UNDIRECTORYPAGE
-  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Valitse kansio, josta poistetaan"
+  ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Valitse poistokansio"
   ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Valitse kansio, josta $(^NameDA) poistetaan."
 !endif
 
 !ifdef MUI_INSTFILESPAGE
   ${LangFileString} MUI_TEXT_INSTALLING_TITLE "Asennetaan"
   ${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Odota... $(^NameDA) asennetaan..."
-  ${LangFileString} MUI_TEXT_FINISH_TITLE "Asennus valmis."
+  ${LangFileString} MUI_TEXT_FINISH_TITLE "Asennus on valmis"
   ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "Asennus onnistui."
-  ${LangFileString} MUI_TEXT_ABORT_TITLE "Asennus keskeytyi."
-  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Asennus ei onnistunut."
+  ${LangFileString} MUI_TEXT_ABORT_TITLE "Asennus keskeytettiin"
+  ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "Asennus epäonnistui."
 !endif
 
 !ifdef MUI_UNINSTFILESPAGE
-  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Poistetaan"
+  ${LangFileString} MUI_UNTEXT_UNINSTALLING_TITLE "Asennusta poistetaan"
   ${LangFileString} MUI_UNTEXT_UNINSTALLING_SUBTITLE "Odota... $(^NameDA) poistetaan."
-  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Poisto valmis."
-  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Poisto onnistui."
-  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Poisto keskeytyi."
-  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Poisto epäonnistui."
+  ${LangFileString} MUI_UNTEXT_FINISH_TITLE "Asennuksen poisto on valmis"
+  ${LangFileString} MUI_UNTEXT_FINISH_SUBTITLE "Asennuksen poisto onnistui."
+  ${LangFileString} MUI_UNTEXT_ABORT_TITLE "Asennuksen poisto keskeytettiin"
+  ${LangFileString} MUI_UNTEXT_ABORT_SUBTITLE "Asennuksen poisto epäonnistui."
 !endif
 
 !ifdef MUI_FINISHPAGE
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) -ohjelman asennus on valmis"
-  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) on asennettu tietokoneelle.$\r$\n$\r$\nValitse Valmis sulkeaksesi asennusohjelman."
-  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) -ohjelman asennuksen viimeisteleminen edellyttää tietokoneen uudelleenkäynnistämistä. Haluatko käynnistää tietokoneen uudelleen nyt?"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "$(^NameDA) on asennettu"
+  ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "$(^NameDA) on asennettu tietokoneelle.$\r$\n$\r$\nSulje asentaja valitsemalla Valmis."
+  ${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "$(^NameDA) -asennuksen viimeisteleminen edellyttää tietokoneen uudelleenkäynnistämistä. Haluatko käynnistää tietokoneen uudelleen nyt?"
 !endif
 
 !ifdef MUI_UNFINISHPAGE
   ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "$(^NameDA) on poistettu"
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) on poistettu tietokoneelta.$\r$\n$\r$\nValitse Lopeta sulkeaksesi poisto-ohjelman."
-  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) -ohjelman poiston viimeisteleminen edellyttää tietokoneen uudelleenkäynnistämistä. Haluatko käynnistää tietokoneen uudelleen nyt?"
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) on poistettu tietokoneelta.$\r$\n$\r$\nSulje asentaja valitsemalla Lopeta."
+  ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "$(^NameDA) -asennuksen poiston viimeisteleminen edellyttää tietokoneen uudelleenkäynnistystä. Haluatko käynnistää tietokoneen uudelleen nyt?"
 !endif
 
 !ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
@@ -105,8 +106,8 @@
 
 !ifdef MUI_STARTMENUPAGE
   ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Valitse Käynnistä-valikon kansio"
-  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Valitse Käynnistä-valikon kansio, johon ohjelman pikakuvakkeet asennetaan."
-  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Valitse Käynnistä-valikon kansio, johon haluat asentaa ohjelman pikakuvakkeet. Voit myös kirjoittaa uuden kansion nimen."
+  ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Valitse Käynnistä-valikon kansio, johon pikakuvakkeet asennetaan."
+  ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Valitse Käynnistä-valikon kansio, johon pikakuvakkeet asennetaan. Voit luoda myös uuden kansion kirjoittamalla sen nimen."
   ${LangFileString} MUI_INNERTEXT_STARTMENU_CHECKBOX "Älä luo pikakuvakkeita."
 !endif
 
@@ -116,9 +117,9 @@
 !endif
 
 !ifdef MUI_ABORTWARNING
-  ${LangFileString} MUI_TEXT_ABORTWARNING "Haluatko varmasti keskeyttää $(^Name) -ohjelman asennuksen?"
+  ${LangFileString} MUI_TEXT_ABORTWARNING "Haluatko varmasti keskeyttää $(^Name) -asennuksen?"
 !endif
 
 !ifdef MUI_UNABORTWARNING
-  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Haluatko varmasti keskeyttää $(^Name) -ohjelman poiston?"
+  ${LangFileString} MUI_UNTEXT_ABORTWARNING "Haluatko varmasti keskeyttää $(^Name) -asennuksen poiston?"
 !endif
diff --git a/tools/installer/nsis/Contrib/Language files/Georgian.nlf b/tools/installer/nsis/Contrib/Language files/Georgian.nlf
index 7292aa3dbe..7f56eb9978 100644
--- a/tools/installer/nsis/Contrib/Language files/Georgian.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/Georgian.nlf	
@@ -147,7 +147,7 @@ $(^Name)–ის წაშლა
 # ^DeleteOnReboot
 "წაიშლება კომპიუტერის გადატვირთვის დროს: "
 # ^ErrorCreatingShortcut
-"იარლიყის შექმნისას დაშვებულია შეცდომა: " 
+"იარლიყის შექმნისას დაშვებულია შეცდომა: "
 # ^ErrorCreating
 "შექმნისას დაშვებულია შეცდომა: "
 # ^ErrorDecompressing
@@ -155,7 +155,7 @@ $(^Name)–ის წაშლა
 # ^ErrorRegistering
 არ რეგისტრირდება (DLL)
 # ^ExecShell
-"ExecShell: " 
+"ExecShell: "
 # ^Exec
 "შესრულება: "
 # ^Extract
@@ -165,7 +165,7 @@ $(^Name)–ის წაშლა
 # ^InvalidOpcode
 საინსტალაციო პროგრამა დაზიანებულია: კოდი არ არსებობს
 # ^NoOLE
-"OLE არ არის: " 
+"OLE არ არის: "
 # ^OutputFolder
 "ჩატვირთვის ფოლდერი: "
 # ^RemoveFolder
diff --git a/tools/installer/nsis/Contrib/Language files/SimpChinese.nlf b/tools/installer/nsis/Contrib/Language files/SimpChinese.nlf
index fbe1e1129d..a001985248 100644
--- a/tools/installer/nsis/Contrib/Language files/SimpChinese.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/SimpChinese.nlf	
@@ -139,7 +139,7 @@ $(^Name) 卸载
 # ^CouldNotLoad
 "无法加载: "
 # ^CreateFolder
-"创建文件夹: " 
+"创建文件夹: "
 # ^CreateShortcut
 "创建快捷方式: "
 # ^CreatedUninstaller
diff --git a/tools/installer/nsis/Contrib/Language files/Tatar.nlf b/tools/installer/nsis/Contrib/Language files/Tatar.nlf
index bcbf3b3265..b19ad4675e 100644
--- a/tools/installer/nsis/Contrib/Language files/Tatar.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/Tatar.nlf	
@@ -147,7 +147,7 @@ $(^NameDA) программасы санагыгыздан бетереләчә
 # ^DeleteOnReboot
 "Санак сүндереп кабызылганда бетерү: "
 # ^ErrorCreatingShortcut
-"Сылтама ясауда хата: " 
+"Сылтама ясауда хата: "
 # ^ErrorCreating
 "Ясауда хата: "
 # ^ErrorDecompressing
@@ -155,7 +155,7 @@ $(^NameDA) программасы санагыгыздан бетереләчә
 # ^ErrorRegistering
 DLL теркәүдә хата
 # ^ExecShell
-"Тышча командасын башкару: " 
+"Тышча командасын башкару: "
 # ^Exec
 "Башкару: "
 # ^Extract
@@ -165,7 +165,7 @@ DLL теркәүдә хата
 # ^InvalidOpcode
 Урнаштыручы бозылган: мөмкин булмаган код
 # ^NoOLE
-"OLE моның өчен юк: " 
+"OLE моның өчен юк: "
 # ^OutputFolder
 "Урнаштыру папкасы: "
 # ^RemoveFolder
diff --git a/tools/installer/nsis/Contrib/Language files/TradChinese.nlf b/tools/installer/nsis/Contrib/Language files/TradChinese.nlf
index 81ce2b583f..45694dbae5 100644
--- a/tools/installer/nsis/Contrib/Language files/TradChinese.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/TradChinese.nlf	
@@ -141,7 +141,7 @@ $(^Name) 解除安裝
 # ^CouldNotLoad
 "無法載入: "
 # ^CreateFolder
-"建立資料夾: " 
+"建立資料夾: "
 # ^CreateShortcut
 "建立捷徑: "
 # ^CreatedUninstaller
diff --git a/tools/installer/nsis/Contrib/Language files/Uzbek.nlf b/tools/installer/nsis/Contrib/Language files/Uzbek.nlf
index 8d32284394..66c90cc147 100644
--- a/tools/installer/nsis/Contrib/Language files/Uzbek.nlf	
+++ b/tools/installer/nsis/Contrib/Language files/Uzbek.nlf	
@@ -147,7 +147,7 @@ Kopiya qilganda xato bor
 # ^DeleteOnReboot
 "Kompyuter qayta yuklash jaraonida o'chirish: "
 # ^ErrorCreatingShortcut
-"Belgini yaratish jarayonida xato: " 
+"Belgini yaratish jarayonida xato: "
 # ^ErrorCreating
 "Yaratish xatosi: "
 # ^ErrorDecompressing
@@ -155,7 +155,7 @@ Ma'lumotlarni asilga qaytarish xatosi! Distributiv ziyonlangan bulishi mumkin.
 # ^ErrorRegistering
 Kutubxonani ro'xatga olish imkoniyati yuq (DLL)
 # ^ExecShell
-"Qoplang'ich komandasini bajarish: " 
+"Qoplang'ich komandasini bajarish: "
 # ^Exec
 "Bajarish: "
 # ^Extract
@@ -165,7 +165,7 @@ Kutubxonani ro'xatga olish imkoniyati yuq (DLL)
 # ^InvalidOpcode
 Distributiv ziyonlangan: ruxsatlanmangan kod
 # ^NoOLE
-"Quydagilarga OLE yuq: " 
+"Quydagilarga OLE yuq: "
 # ^OutputFolder
 "Papkani o'rnatish: "
 # ^RemoveFolder
diff --git a/tools/installer/nsis/Contrib/Modern UI 2/MUI2.nsh b/tools/installer/nsis/Contrib/Modern UI 2/MUI2.nsh
index cc0635d6ec..b935242dd6 100644
--- a/tools/installer/nsis/Contrib/Modern UI 2/MUI2.nsh	
+++ b/tools/installer/nsis/Contrib/Modern UI 2/MUI2.nsh	
@@ -1,7 +1,7 @@
 /*
 
 NSIS Modern User Interface - Version 2.1
-Copyright 2002-2023 Joost Verburg
+Copyright 2002-2025 Joost Verburg
 Contributors: Amir Szekely, Anders Kjersem
 
 */
@@ -11,7 +11,7 @@ Contributors: Amir Szekely, Anders Kjersem
 !define MUI_INCLUDED
 !define MUI_SYSVERSION "2.1"
 !verbose pop
-!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2023 Joost Verburg"
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2025 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3
diff --git a/tools/installer/nsis/Contrib/Modern UI/System.nsh b/tools/installer/nsis/Contrib/Modern UI/System.nsh
index f71140c662..e7fbcbdbde 100644
--- a/tools/installer/nsis/Contrib/Modern UI/System.nsh	
+++ b/tools/installer/nsis/Contrib/Modern UI/System.nsh	
@@ -1,7 +1,7 @@
 /*
 
 NSIS Modern User Interface - Version 1.81
-Copyright 2002-2023 Joost Verburg
+Copyright 2002-2025 Joost Verburg
 
 */
 
@@ -10,7 +10,7 @@ Copyright 2002-2023 Joost Verburg
 !define MUI_INCLUDED
 !define MUI_SYSVERSION "1.81"
 !verbose pop
-!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2023 Joost Verburg"
+!echo "NSIS Modern User Interface version ${MUI_SYSVERSION} - Copyright 2002-2025 Joost Verburg"
 
 ;--------------------------------
 !verbose push 3
diff --git a/tools/installer/nsis/Contrib/UIs/default.exe b/tools/installer/nsis/Contrib/UIs/default.exe
index 1d6635e6e8..588c57df6c 100644
Binary files a/tools/installer/nsis/Contrib/UIs/default.exe and b/tools/installer/nsis/Contrib/UIs/default.exe differ
diff --git a/tools/installer/nsis/Contrib/UIs/modern.exe b/tools/installer/nsis/Contrib/UIs/modern.exe
index 25fe6c02b3..eb9061a401 100644
Binary files a/tools/installer/nsis/Contrib/UIs/modern.exe and b/tools/installer/nsis/Contrib/UIs/modern.exe differ
diff --git a/tools/installer/nsis/Contrib/UIs/modern_headerbmp.exe b/tools/installer/nsis/Contrib/UIs/modern_headerbmp.exe
index b1c17838e9..9dfec8367c 100644
Binary files a/tools/installer/nsis/Contrib/UIs/modern_headerbmp.exe and b/tools/installer/nsis/Contrib/UIs/modern_headerbmp.exe differ
diff --git a/tools/installer/nsis/Contrib/UIs/modern_headerbmpr.exe b/tools/installer/nsis/Contrib/UIs/modern_headerbmpr.exe
index f113818d8e..2f466ccf7d 100644
Binary files a/tools/installer/nsis/Contrib/UIs/modern_headerbmpr.exe and b/tools/installer/nsis/Contrib/UIs/modern_headerbmpr.exe differ
diff --git a/tools/installer/nsis/Contrib/UIs/modern_nodesc.exe b/tools/installer/nsis/Contrib/UIs/modern_nodesc.exe
index 1b6746106e..a7511759ab 100644
Binary files a/tools/installer/nsis/Contrib/UIs/modern_nodesc.exe and b/tools/installer/nsis/Contrib/UIs/modern_nodesc.exe differ
diff --git a/tools/installer/nsis/Contrib/UIs/modern_smalldesc.exe b/tools/installer/nsis/Contrib/UIs/modern_smalldesc.exe
index b54e03b535..5e4cf4e7ad 100644
Binary files a/tools/installer/nsis/Contrib/UIs/modern_smalldesc.exe and b/tools/installer/nsis/Contrib/UIs/modern_smalldesc.exe differ
diff --git a/tools/installer/nsis/Contrib/UIs/sdbarker_tiny.exe b/tools/installer/nsis/Contrib/UIs/sdbarker_tiny.exe
index eb87ebe5e6..b2c75452f6 100644
Binary files a/tools/installer/nsis/Contrib/UIs/sdbarker_tiny.exe and b/tools/installer/nsis/Contrib/UIs/sdbarker_tiny.exe differ
diff --git a/tools/installer/nsis/Contrib/zip2exe/Base.nsh b/tools/installer/nsis/Contrib/zip2exe/Base.nsh
index ca780a9aa3..0b3ec8d163 100644
--- a/tools/installer/nsis/Contrib/zip2exe/Base.nsh
+++ b/tools/installer/nsis/Contrib/zip2exe/Base.nsh
@@ -11,14 +11,8 @@ AllowRootDirInstall true
 !else
   !define SETCOMPRESSOR_SWITCH
 !endif
+SetCompressor ${SETCOMPRESSOR_SWITCH} ${ZIP2EXE_COMPRESSOR}
 
-!ifdef ZIP2EXE_COMPRESSOR_ZLIB
-  SetCompressor ${SETCOMPRESSOR_SWITCH} zlib
-!else ifdef ZIP2EXE_COMPRESSOR_BZIP2
-  SetCompressor ${SETCOMPRESSOR_SWITCH} bzip2
-!else ifdef ZIP2EXE_COMPRESSOR_LZMA
-  SetCompressor ${SETCOMPRESSOR_SWITCH} lzma
-!endif
 
 !ifdef ZIP2EXE_INSTALLDIR
 
diff --git a/tools/installer/nsis/Docs/InstallOptions/Readme.html b/tools/installer/nsis/Docs/InstallOptions/Readme.html
index bfd0432b35..e8fa7cbd27 100644
--- a/tools/installer/nsis/Docs/InstallOptions/Readme.html
+++ b/tools/installer/nsis/Docs/InstallOptions/Readme.html
@@ -885,7 +885,7 @@ <h2 id="license">
         <pre>
 Original version Copyright &copy; 2001 Michael Bishop
 DLL version 1 Copyright &copy; 2001-2002 Nullsoft, Inc., ORTIM
-DLL version 2 Copyright &copy; 2003-2023 Amir Szekely, Joost Verburg, Dave Laundon
+DLL version 2 Copyright &copy; 2003-2025 Amir Szekely, Joost Verburg, Dave Laundon
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/tools/installer/nsis/Docs/Modern UI 2/License.txt b/tools/installer/nsis/Docs/Modern UI 2/License.txt
index 3fcfa6b889..b773876675 100644
--- a/tools/installer/nsis/Docs/Modern UI 2/License.txt	
+++ b/tools/installer/nsis/Docs/Modern UI 2/License.txt	
@@ -1,4 +1,4 @@
-Copyright � 2002-2023 Joost Verburg
+Copyright � 2002-2025 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/tools/installer/nsis/Docs/Modern UI 2/Readme.html b/tools/installer/nsis/Docs/Modern UI 2/Readme.html
index 402b008842..d78a8bce8a 100644
--- a/tools/installer/nsis/Docs/Modern UI 2/Readme.html	
+++ b/tools/installer/nsis/Docs/Modern UI 2/Readme.html	
@@ -1134,7 +1134,7 @@ <h3>
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2023 Joost Verburg
+Copyright &copy; 2002-2025 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/tools/installer/nsis/Docs/Modern UI/License.txt b/tools/installer/nsis/Docs/Modern UI/License.txt
index f7b0e6d0d4..48bdf9e517 100644
--- a/tools/installer/nsis/Docs/Modern UI/License.txt	
+++ b/tools/installer/nsis/Docs/Modern UI/License.txt	
@@ -1,4 +1,4 @@
-Copyright 2002-2023 Joost Verburg
+Copyright 2002-2025 Joost Verburg
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/tools/installer/nsis/Docs/Modern UI/Readme.html b/tools/installer/nsis/Docs/Modern UI/Readme.html
index 7555ff8b39..56e38010f0 100644
--- a/tools/installer/nsis/Docs/Modern UI/Readme.html	
+++ b/tools/installer/nsis/Docs/Modern UI/Readme.html	
@@ -1132,7 +1132,7 @@ <h3>
                             License Terms</h3>
                         <div class="toggle" id="toggle_lic">
                             <pre>
-Copyright &copy; 2002-2023 Joost Verburg
+Copyright &copy; 2002-2025 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/tools/installer/nsis/Docs/System/System.html b/tools/installer/nsis/Docs/System/System.html
index 4d0fd346d6..e2c8dfa7ec 100644
--- a/tools/installer/nsis/Docs/System/System.html
+++ b/tools/installer/nsis/Docs/System/System.html
@@ -29,7 +29,7 @@
 <body>
 <h1>NSIS System Plug-in</h1>
 <p>
-<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2023 NSIS Contributors</i>
+<i>Copyright &copy; 2002 brainsucker (Nik Medved)</i><br><i>Copyright &copy; 2002-2025 NSIS Contributors</i>
 </p>
 
 <h2>Table of Contents</h2>
diff --git a/tools/installer/nsis/Examples/NSISMenu.nsi b/tools/installer/nsis/Examples/NSISMenu.nsi
index 36f2141d5f..177b44903a 100644
--- a/tools/installer/nsis/Examples/NSISMenu.nsi
+++ b/tools/installer/nsis/Examples/NSISMenu.nsi
@@ -296,7 +296,7 @@ ${If} ${Errors}
 	MessageBox MB_IconStop 'Error: Unable to open "$0"!'
 ${EndIf}
 !ifdef QUIT_ON_EXECUTE
-${IfThen} $9 < 0 ${|} SendMessage $hWndParent ${WM_CLOSE} 0 0 ${|}
+${IfThen} $9 & 0x8000 ${|} SendMessage $hWndParent ${WM_CLOSE} 0 0 ${|}
 !endif
 FunctionEnd
 
diff --git a/tools/installer/nsis/Examples/Plugin/nsis/api.h b/tools/installer/nsis/Examples/Plugin/nsis/api.h
index 09cbf36388..1b1e9d4325 100644
--- a/tools/installer/nsis/Examples/Plugin/nsis/api.h
+++ b/tools/installer/nsis/Examples/Plugin/nsis/api.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2023 Nullsoft and Contributors
+ * Copyright (C) 1999-2025 Nullsoft and Contributors
  * 
  * Licensed under the zlib/libpng license (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/tools/installer/nsis/Examples/Plugin/nsis/nsis_tchar.h b/tools/installer/nsis/Examples/Plugin/nsis/nsis_tchar.h
index 34a4427a0f..bebab3297e 100644
--- a/tools/installer/nsis/Examples/Plugin/nsis/nsis_tchar.h
+++ b/tools/installer/nsis/Examples/Plugin/nsis/nsis_tchar.h
@@ -3,7 +3,7 @@
  * 
  * This file is a part of NSIS.
  * 
- * Copyright (C) 1999-2023 Nullsoft and Contributors
+ * Copyright (C) 1999-2025 Nullsoft and Contributors
  * 
  * This software is provided 'as-is', without any express or implied
  * warranty.
diff --git a/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-ansi.lib b/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-ansi.lib
index 30080031c2..e9b801d279 100644
Binary files a/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-ansi.lib and b/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-ansi.lib differ
diff --git a/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-unicode.lib b/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-unicode.lib
index 4ebafc2869..fc36fd547c 100644
Binary files a/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-unicode.lib and b/tools/installer/nsis/Examples/Plugin/nsis/pluginapi-x86-unicode.lib differ
diff --git a/tools/installer/nsis/Examples/System/Resource.dll b/tools/installer/nsis/Examples/System/Resource.dll
index b7fece7506..d2ca046d16 100644
Binary files a/tools/installer/nsis/Examples/System/Resource.dll and b/tools/installer/nsis/Examples/System/Resource.dll differ
diff --git a/tools/installer/nsis/Examples/makensis.nsi b/tools/installer/nsis/Examples/makensis.nsi
index c52caac239..0d9d8b05ca 100644
--- a/tools/installer/nsis/Examples/makensis.nsi
+++ b/tools/installer/nsis/Examples/makensis.nsi
@@ -829,7 +829,7 @@ Section -post
   WriteRegStr HKLM "${REG_UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninst-nsis.exe" /S'
   WriteRegStr HKLM "${REG_UNINST_KEY}" "InstallLocation" "$INSTDIR"
   WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayName" "Nullsoft Install System${NAMESUFFIX}"
-  WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayIcon" "$INSTDIR\uninst-nsis.exe,0"
+  WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayIcon" "$INSTDIR\NSIS.exe"
   WriteRegStr HKLM "${REG_UNINST_KEY}" "DisplayVersion" "${VERSION}"
 !ifdef VER_MAJOR & VER_MINOR & VER_REVISION & VER_BUILD
   WriteRegDWORD HKLM "${REG_UNINST_KEY}" "VersionMajor" "${VER_MAJOR}" ; Required by WACK
diff --git a/tools/installer/nsis/Include/LangFile.nsh b/tools/installer/nsis/Include/LangFile.nsh
index 08f8007480..dc37f83e97 100644
--- a/tools/installer/nsis/Include/LangFile.nsh
+++ b/tools/installer/nsis/Include/LangFile.nsh
@@ -5,7 +5,7 @@ LangFile.nsh
 Header file to create language files that can be
 included with a single command.
 
-Copyright 2008-2023 Joost Verburg, Anders Kjersem
+Copyright 2008-2025 Joost Verburg, Anders Kjersem
 
 * Either LANGFILE_INCLUDE or LANGFILE_INCLUDE_WITHDEFAULT
   can be called from the script to include a language file.
diff --git a/tools/installer/nsis/Include/MultiUser.nsh b/tools/installer/nsis/Include/MultiUser.nsh
index 979387de06..eb28167065 100644
--- a/tools/installer/nsis/Include/MultiUser.nsh
+++ b/tools/installer/nsis/Include/MultiUser.nsh
@@ -4,7 +4,7 @@ MultiUser.nsh
 
 Installer configuration for multi-user Windows environments
 
-Copyright 2008-2023 Joost Verburg
+Copyright 2008-2025 Joost Verburg
 
 */
 
diff --git a/tools/installer/nsis/Include/VB6RunTime.nsh b/tools/installer/nsis/Include/VB6RunTime.nsh
index c697f18417..b1ba14879b 100644
--- a/tools/installer/nsis/Include/VB6RunTime.nsh
+++ b/tools/installer/nsis/Include/VB6RunTime.nsh
@@ -4,7 +4,7 @@ VB6RunTime.nsh
 
 Setup of Visual Basic 6.0 run-time files, including the Oleaut32.dll security update
 
-Copyright 2008-2023 Joost Verburg
+Copyright 2008-2025 Joost Verburg
 
 To obtain the run-time files, download and extract
 https://nsis.sourceforge.io/vb6runtime.zip
diff --git a/tools/installer/nsis/Include/WinVer.nsh b/tools/installer/nsis/Include/WinVer.nsh
index e7c652a8b5..0c5e394534 100644
--- a/tools/installer/nsis/Include/WinVer.nsh
+++ b/tools/installer/nsis/Include/WinVer.nsh
@@ -667,22 +667,24 @@
 !macroend
 
 !macro _WinVer_WaaS op id _t _f
-  !insertmacro WinVer_WaaS "${id}" 10240 1507 "Threshold"   "Windows 10" ; 10240.16384
-  !insertmacro WinVer_WaaS "${id}" 10586 1511 "Threshold 2" "November Update" ; 10586.0?
-  !insertmacro WinVer_WaaS "${id}" 14393 1607 "Redstone"    "Anniversary Update" ; 14393.10
-  !insertmacro WinVer_WaaS "${id}" 15063 1703 "Redstone 2"  "Creators Update" ; 15063.13
-  !insertmacro WinVer_WaaS "${id}" 16299 1709 "Redstone 3"  "Fall Creators Update" ; 16299.19
-  !insertmacro WinVer_WaaS "${id}" 17134 1803 "Redstone 4"  "April 2018 Update" ; 17134.1
-  !insertmacro WinVer_WaaS "${id}" 17763 1809 "Redstone 5"  "October 2018 Update" ; 17763.1
-  !insertmacro WinVer_WaaS "${id}" 18362 1903 "19H1"        "May 2019 Update" ; 18362.116
-  !insertmacro WinVer_WaaS "${id}" 18363 1909 "19H2"        "November 2019 Update" ; 18363.418
-  !insertmacro WinVer_WaaS "${id}" 19041 2004 "20H1"        "May 2020 Update" ; 19041.264?
-  !insertmacro WinVer_WaaS "${id}" 19042 20H2 "20H2"        "October 2020 Update" ; 19042.572? A.K.A. 2009
-  !insertmacro WinVer_WaaS "${id}" 19043 21H1 "21H1"        "May 2021 Update" ; 19043.928
-  !insertmacro WinVer_WaaS "${id}" 19044 21H2 "21H2"        "November 2021 Update" ; 19044.1288
-  !insertmacro WinVer_WaaS "${id}" 19045 "?"  "?"           "October 2022 Update" ; 19045.2130 22H2
-  !insertmacro WinVer_WaaS "${id}" 22000 "?"  "Sun Valley"  "Windows 11" ; 10.0.22000.194 21H2
+  !insertmacro WinVer_WaaS "${id}" 10240 1507 "Threshold"    "Windows 10" ; 10240.16384
+  !insertmacro WinVer_WaaS "${id}" 10586 1511 "Threshold 2"  "November Update" ; 10586.0?
+  !insertmacro WinVer_WaaS "${id}" 14393 1607 "Redstone"     "Anniversary Update" ; 14393.10
+  !insertmacro WinVer_WaaS "${id}" 15063 1703 "Redstone 2"   "Creators Update" ; 15063.13
+  !insertmacro WinVer_WaaS "${id}" 16299 1709 "Redstone 3"   "Fall Creators Update" ; 16299.19
+  !insertmacro WinVer_WaaS "${id}" 17134 1803 "Redstone 4"   "April 2018 Update" ; 17134.1
+  !insertmacro WinVer_WaaS "${id}" 17763 1809 "Redstone 5"   "October 2018 Update" ; 17763.1
+  !insertmacro WinVer_WaaS "${id}" 18362 1903 "19H1"         "May 2019 Update" ; 18362.116
+  !insertmacro WinVer_WaaS "${id}" 18363 1909 "19H2"         "November 2019 Update" ; 18363.418
+  !insertmacro WinVer_WaaS "${id}" 19041 2004 "20H1"         "May 2020 Update" ; 19041.264?
+  !insertmacro WinVer_WaaS "${id}" 19042 20H2 "20H2"         "October 2020 Update" ; 19042.572? A.K.A. 2009
+  !insertmacro WinVer_WaaS "${id}" 19043 21H1 "21H1"         "May 2021 Update" ; 19043.928
+  !insertmacro WinVer_WaaS "${id}" 19044 21H2 "21H2"         "November 2021 Update" ; 19044.1288
+  !insertmacro WinVer_WaaS "${id}" 19045 "?"  "?"            "October 2022 Update" ; 19045.2130 22H2
+  !insertmacro WinVer_WaaS "${id}" 22000 "?"  "Sun Valley"   "Windows 11" ; 10.0.22000.194 21H2
   !insertmacro WinVer_WaaS "${id}" 22621 22H2 "Sun Valley 2" "2022 Update" ; 10.0.22621.521
+  !insertmacro WinVer_WaaS "${id}" 22631 23H2 "Sun Valley 3" "2023 Update"
+  !insertmacro WinVer_WaaS "${id}" 26100 24H2 "Hudson Valley" "2024 Update"
 
   !ifmacrodef WinVerExternal_WaaS_MapToBuild
     !insertmacro WinVerExternal_WaaS_MapToBuild ${op} "${id}" WinVer_WaaS_Build
diff --git a/tools/installer/nsis/NSIS.chm b/tools/installer/nsis/NSIS.chm
index eff03ffd54..dca0776bc8 100644
Binary files a/tools/installer/nsis/NSIS.chm and b/tools/installer/nsis/NSIS.chm differ
diff --git a/tools/installer/nsis/NSIS.chw b/tools/installer/nsis/NSIS.chw
new file mode 100644
index 0000000000..828298fd08
Binary files /dev/null and b/tools/installer/nsis/NSIS.chw differ
diff --git a/tools/installer/nsis/NSIS.exe b/tools/installer/nsis/NSIS.exe
index 923ecc3951..72509202c2 100644
Binary files a/tools/installer/nsis/NSIS.exe and b/tools/installer/nsis/NSIS.exe differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/Banner.dll b/tools/installer/nsis/Plugins/x86-ansi/Banner.dll
index 54a8e60f8b..99d468f36c 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/Banner.dll and b/tools/installer/nsis/Plugins/x86-ansi/Banner.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/BgImage.dll b/tools/installer/nsis/Plugins/x86-ansi/BgImage.dll
index ee617a25ec..3b62ab6e9f 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/BgImage.dll and b/tools/installer/nsis/Plugins/x86-ansi/BgImage.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/Dialer.dll b/tools/installer/nsis/Plugins/x86-ansi/Dialer.dll
index ec86145c40..a137d64699 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/Dialer.dll and b/tools/installer/nsis/Plugins/x86-ansi/Dialer.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/InstallOptions.dll b/tools/installer/nsis/Plugins/x86-ansi/InstallOptions.dll
index 4b229043a9..3c2f4ae9cd 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/InstallOptions.dll and b/tools/installer/nsis/Plugins/x86-ansi/InstallOptions.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/LangDLL.dll b/tools/installer/nsis/Plugins/x86-ansi/LangDLL.dll
index f038254efc..a2f0f95dda 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/LangDLL.dll and b/tools/installer/nsis/Plugins/x86-ansi/LangDLL.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/Math.dll b/tools/installer/nsis/Plugins/x86-ansi/Math.dll
index 7d90ff7169..feb0127c76 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/Math.dll and b/tools/installer/nsis/Plugins/x86-ansi/Math.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/StartMenu.dll b/tools/installer/nsis/Plugins/x86-ansi/StartMenu.dll
index e6e0469a7d..32603c15db 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/StartMenu.dll and b/tools/installer/nsis/Plugins/x86-ansi/StartMenu.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/System.dll b/tools/installer/nsis/Plugins/x86-ansi/System.dll
index ba15fec688..a6f8edd9ed 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/System.dll and b/tools/installer/nsis/Plugins/x86-ansi/System.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/TypeLib.dll b/tools/installer/nsis/Plugins/x86-ansi/TypeLib.dll
index b3ffba160a..b3b42b41b1 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/TypeLib.dll and b/tools/installer/nsis/Plugins/x86-ansi/TypeLib.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/UserInfo.dll b/tools/installer/nsis/Plugins/x86-ansi/UserInfo.dll
index df01d58246..ec83e850b7 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/UserInfo.dll and b/tools/installer/nsis/Plugins/x86-ansi/UserInfo.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/VPatch.dll b/tools/installer/nsis/Plugins/x86-ansi/VPatch.dll
index 73bf46d3ec..be714ff508 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/VPatch.dll and b/tools/installer/nsis/Plugins/x86-ansi/VPatch.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/advsplash.dll b/tools/installer/nsis/Plugins/x86-ansi/advsplash.dll
index c65ddd5ae4..ea8d111647 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/advsplash.dll and b/tools/installer/nsis/Plugins/x86-ansi/advsplash.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/nsDialogs.dll b/tools/installer/nsis/Plugins/x86-ansi/nsDialogs.dll
index a48510e5ad..2f8385487c 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/nsDialogs.dll and b/tools/installer/nsis/Plugins/x86-ansi/nsDialogs.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/nsExec.dll b/tools/installer/nsis/Plugins/x86-ansi/nsExec.dll
index 2c9b40cb69..4018c66984 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/nsExec.dll and b/tools/installer/nsis/Plugins/x86-ansi/nsExec.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/nsisdl.dll b/tools/installer/nsis/Plugins/x86-ansi/nsisdl.dll
index bbd12557e7..9916e8efd9 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/nsisdl.dll and b/tools/installer/nsis/Plugins/x86-ansi/nsisdl.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-ansi/splash.dll b/tools/installer/nsis/Plugins/x86-ansi/splash.dll
index a73b9641cc..92e740f6cc 100644
Binary files a/tools/installer/nsis/Plugins/x86-ansi/splash.dll and b/tools/installer/nsis/Plugins/x86-ansi/splash.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/Banner.dll b/tools/installer/nsis/Plugins/x86-unicode/Banner.dll
index 131fe8541c..8dbcd05f76 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/Banner.dll and b/tools/installer/nsis/Plugins/x86-unicode/Banner.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/BgImage.dll b/tools/installer/nsis/Plugins/x86-unicode/BgImage.dll
index 20fb009bc7..87cc221fe9 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/BgImage.dll and b/tools/installer/nsis/Plugins/x86-unicode/BgImage.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/Dialer.dll b/tools/installer/nsis/Plugins/x86-unicode/Dialer.dll
index 996d594c94..0ba73fa238 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/Dialer.dll and b/tools/installer/nsis/Plugins/x86-unicode/Dialer.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/InstallOptions.dll b/tools/installer/nsis/Plugins/x86-unicode/InstallOptions.dll
index e5fa335c2f..5cc398790d 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/InstallOptions.dll and b/tools/installer/nsis/Plugins/x86-unicode/InstallOptions.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/LangDLL.dll b/tools/installer/nsis/Plugins/x86-unicode/LangDLL.dll
index a3ffc84cbf..a6a1a8be81 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/LangDLL.dll and b/tools/installer/nsis/Plugins/x86-unicode/LangDLL.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/Math.dll b/tools/installer/nsis/Plugins/x86-unicode/Math.dll
index de87aead8f..bcfb1bc28e 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/Math.dll and b/tools/installer/nsis/Plugins/x86-unicode/Math.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/StartMenu.dll b/tools/installer/nsis/Plugins/x86-unicode/StartMenu.dll
index 185954b3ec..7f513a668d 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/StartMenu.dll and b/tools/installer/nsis/Plugins/x86-unicode/StartMenu.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/System.dll b/tools/installer/nsis/Plugins/x86-unicode/System.dll
index 8ea901d9f4..213fff449c 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/System.dll and b/tools/installer/nsis/Plugins/x86-unicode/System.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/TypeLib.dll b/tools/installer/nsis/Plugins/x86-unicode/TypeLib.dll
index fb9d51b2db..7e60a12110 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/TypeLib.dll and b/tools/installer/nsis/Plugins/x86-unicode/TypeLib.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/UserInfo.dll b/tools/installer/nsis/Plugins/x86-unicode/UserInfo.dll
index cb0ce71d12..fdc16249c5 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/UserInfo.dll and b/tools/installer/nsis/Plugins/x86-unicode/UserInfo.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/VPatch.dll b/tools/installer/nsis/Plugins/x86-unicode/VPatch.dll
index 10e9e3c178..22815f335a 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/VPatch.dll and b/tools/installer/nsis/Plugins/x86-unicode/VPatch.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/advsplash.dll b/tools/installer/nsis/Plugins/x86-unicode/advsplash.dll
index 16add7f766..6567c7a917 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/advsplash.dll and b/tools/installer/nsis/Plugins/x86-unicode/advsplash.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/nsDialogs.dll b/tools/installer/nsis/Plugins/x86-unicode/nsDialogs.dll
index 3df7d2813a..ddf260fefa 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/nsDialogs.dll and b/tools/installer/nsis/Plugins/x86-unicode/nsDialogs.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/nsExec.dll b/tools/installer/nsis/Plugins/x86-unicode/nsExec.dll
index 79a8f8677b..bc271c8585 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/nsExec.dll and b/tools/installer/nsis/Plugins/x86-unicode/nsExec.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/nsisdl.dll b/tools/installer/nsis/Plugins/x86-unicode/nsisdl.dll
index 5beaab598f..1abf1e9836 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/nsisdl.dll and b/tools/installer/nsis/Plugins/x86-unicode/nsisdl.dll differ
diff --git a/tools/installer/nsis/Plugins/x86-unicode/splash.dll b/tools/installer/nsis/Plugins/x86-unicode/splash.dll
index 8f5989255a..48cc612b9c 100644
Binary files a/tools/installer/nsis/Plugins/x86-unicode/splash.dll and b/tools/installer/nsis/Plugins/x86-unicode/splash.dll differ
diff --git a/tools/installer/nsis/Stubs/bzip2-x86-ansi b/tools/installer/nsis/Stubs/bzip2-x86-ansi
index f083e1cb30..7cd7333745 100644
Binary files a/tools/installer/nsis/Stubs/bzip2-x86-ansi and b/tools/installer/nsis/Stubs/bzip2-x86-ansi differ
diff --git a/tools/installer/nsis/Stubs/bzip2-x86-unicode b/tools/installer/nsis/Stubs/bzip2-x86-unicode
index 62bd3bf008..d04c672fd1 100644
Binary files a/tools/installer/nsis/Stubs/bzip2-x86-unicode and b/tools/installer/nsis/Stubs/bzip2-x86-unicode differ
diff --git a/tools/installer/nsis/Stubs/bzip2_solid-x86-ansi b/tools/installer/nsis/Stubs/bzip2_solid-x86-ansi
index 6e2d674021..7481e0f5d8 100644
Binary files a/tools/installer/nsis/Stubs/bzip2_solid-x86-ansi and b/tools/installer/nsis/Stubs/bzip2_solid-x86-ansi differ
diff --git a/tools/installer/nsis/Stubs/bzip2_solid-x86-unicode b/tools/installer/nsis/Stubs/bzip2_solid-x86-unicode
index 48ce2891eb..035f048b14 100644
Binary files a/tools/installer/nsis/Stubs/bzip2_solid-x86-unicode and b/tools/installer/nsis/Stubs/bzip2_solid-x86-unicode differ
diff --git a/tools/installer/nsis/Stubs/lzma-x86-ansi b/tools/installer/nsis/Stubs/lzma-x86-ansi
index 2ecebb1ae0..520ed2b22a 100644
Binary files a/tools/installer/nsis/Stubs/lzma-x86-ansi and b/tools/installer/nsis/Stubs/lzma-x86-ansi differ
diff --git a/tools/installer/nsis/Stubs/lzma-x86-unicode b/tools/installer/nsis/Stubs/lzma-x86-unicode
index 48985a1a3b..9fa117eaa7 100644
Binary files a/tools/installer/nsis/Stubs/lzma-x86-unicode and b/tools/installer/nsis/Stubs/lzma-x86-unicode differ
diff --git a/tools/installer/nsis/Stubs/lzma_solid-x86-ansi b/tools/installer/nsis/Stubs/lzma_solid-x86-ansi
index 06b3795d6d..e0ea171fa5 100644
Binary files a/tools/installer/nsis/Stubs/lzma_solid-x86-ansi and b/tools/installer/nsis/Stubs/lzma_solid-x86-ansi differ
diff --git a/tools/installer/nsis/Stubs/lzma_solid-x86-unicode b/tools/installer/nsis/Stubs/lzma_solid-x86-unicode
index 22bbdaf77a..36e7ffe792 100644
Binary files a/tools/installer/nsis/Stubs/lzma_solid-x86-unicode and b/tools/installer/nsis/Stubs/lzma_solid-x86-unicode differ
diff --git a/tools/installer/nsis/Stubs/zlib-x86-ansi b/tools/installer/nsis/Stubs/zlib-x86-ansi
index 4071c1280a..857f89db09 100644
Binary files a/tools/installer/nsis/Stubs/zlib-x86-ansi and b/tools/installer/nsis/Stubs/zlib-x86-ansi differ
diff --git a/tools/installer/nsis/Stubs/zlib-x86-unicode b/tools/installer/nsis/Stubs/zlib-x86-unicode
index 589e9b0625..9792a90713 100644
Binary files a/tools/installer/nsis/Stubs/zlib-x86-unicode and b/tools/installer/nsis/Stubs/zlib-x86-unicode differ
diff --git a/tools/installer/nsis/Stubs/zlib_solid-x86-ansi b/tools/installer/nsis/Stubs/zlib_solid-x86-ansi
index bc54b4f4f7..4bed724191 100644
Binary files a/tools/installer/nsis/Stubs/zlib_solid-x86-ansi and b/tools/installer/nsis/Stubs/zlib_solid-x86-ansi differ
diff --git a/tools/installer/nsis/Stubs/zlib_solid-x86-unicode b/tools/installer/nsis/Stubs/zlib_solid-x86-unicode
index 89dcafc200..62faf420ca 100644
Binary files a/tools/installer/nsis/Stubs/zlib_solid-x86-unicode and b/tools/installer/nsis/Stubs/zlib_solid-x86-unicode differ
diff --git a/tools/installer/nsis/makensis.exe b/tools/installer/nsis/makensis.exe
index 1864fdaa9c..a8ebccce52 100644
Binary files a/tools/installer/nsis/makensis.exe and b/tools/installer/nsis/makensis.exe differ
diff --git a/tools/installer/nsis/makensisw.exe b/tools/installer/nsis/makensisw.exe
index e76310f0af..450cffce8d 100644
Binary files a/tools/installer/nsis/makensisw.exe and b/tools/installer/nsis/makensisw.exe differ
diff --git a/tools/installer/nsis/uninst-nsis.exe b/tools/installer/nsis/uninst-nsis.exe
index 711122415a..3f1b44d1a3 100644
Binary files a/tools/installer/nsis/uninst-nsis.exe and b/tools/installer/nsis/uninst-nsis.exe differ