diff --git a/RosBE-Windows/Powershell/RosBE.ps1 b/RosBE-Windows/Powershell/RosBE.ps1
index c4db539..b586083 100644
--- a/RosBE-Windows/Powershell/RosBE.ps1
+++ b/RosBE-Windows/Powershell/RosBE.ps1
@@ -70,7 +70,7 @@ $ENV:CCACHE_SLOPPINESS = "time_macros"
 
 # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) and add M4 path to a env var
 $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_BASEDIR\share\bison")).ShortPath
-$ENV:M4 = ((New-Object -ComObject Scripting.FileSystemObject).GetFile("$_ROSBE_BASEDIR\bin\m4.exe")).ShortPath
+$ENV:M4 = "m4.exe"
 
 # Get the number of CPUs in the system so we know how many jobs to execute.
 # To modify the number used, see the cpucount usage for getting to know about the possible options
diff --git a/RosBE-Windows/Root/ChangeLog.txt b/RosBE-Windows/Root/ChangeLog.txt
index a38c0ce..ad81fbd 100644
--- a/RosBE-Windows/Root/ChangeLog.txt
+++ b/RosBE-Windows/Root/ChangeLog.txt
@@ -1,12 +1,11 @@
-*** Jun xxth, 2021 - RosBE 2.3.0 Released
+*** Jan xxth, 2026 - RosBE 2.3.0 Released
 
 - Readded forgotten 7z.dll to setup. Fixes ROSBE-171 (Daniel Reimer)
-- Fixed build problems of some testers by going from "core2" cpu optimize to "nocona" optimize. (Daniel Reimer)
-- Added GMP as separate libs to RosBE's compiler suite. (Daniel Reimer)
-- Added Windows experimental plugin support to RosBE's compiler suite.
-  Needed for Jérôme Gardou's x64 PSEH plugin support. (Daniel Reimer)
-
-Needed patches for GCC, binutils and ninja can be found here: https://www.dreimer.de/?p=1582
+- Full 64 Bit RosBE Setup thanks to https://github.com/negrutiu/nsis (Daniel Reimer)
+- Massive cleanup and easier to use NSIS Script. Mostly just copy a RosBE InstallDir and start the scripts (Daniel Reimer)
+- 64 Bit Fixes for a few included Tools (Justin Miller, Carl Bialorucki Timo Kreuzer)
+- New GCCs for 32 and 64 Bit.
+- Inluded Tools updated to newest versions. CMake to last 3.X Version available (Daniel Reimer)
 
 *** Jun 05th, 2020 - RosBE 2.2.1 Released
 
diff --git a/RosBE-Windows/Root/README.odt b/RosBE-Windows/Root/README.odt
index 43b92e1..7029f35 100644
Binary files a/RosBE-Windows/Root/README.odt and b/RosBE-Windows/Root/README.odt differ
diff --git a/RosBE-Windows/Root/README.pdf b/RosBE-Windows/Root/README.pdf
index 01dd931..e7baac4 100644
Binary files a/RosBE-Windows/Root/README.pdf and b/RosBE-Windows/Root/README.pdf differ
diff --git a/RosBE-Windows/Root/RosBE.cmd b/RosBE-Windows/Root/RosBE.cmd
index c408f7c..8883e02 100644
--- a/RosBE-Windows/Root/RosBE.cmd
+++ b/RosBE-Windows/Root/RosBE.cmd
@@ -91,7 +91,7 @@ set CCACHE_SLOPPINESS=time_macros
 
 :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) and add M4 path to a env var
 set BISON_PKGDATADIR=%~ds0%~sp0%share\bison
-set M4=%~ds0%~sp0%bin\m4.exe
+set M4=m4.exe
 
 :: Get the number of CPUs in the system so we know how many jobs to execute.
 :: To modify the number used, see the cpucount usage for getting to know about the possible options
diff --git a/RosBE-Windows/RosBE.nsi b/RosBE-Windows/RosBE.nsi
index 1a63acc..cfc7e56 100644
--- a/RosBE-Windows/RosBE.nsi
+++ b/RosBE-Windows/RosBE.nsi
@@ -168,26 +168,15 @@ Section -BaseFiles SEC01
     File /r RosBE\bin\chknewer.exe
     File /r RosBE\bin\chkslash.exe
     File /r RosBE\bin\cmake.exe
-    ;File /r RosBE\bin\cmcldeps.exe
     File /r RosBE\bin\cmp.exe
-    ;File /r RosBE\bin\cpack.exe
     File /r RosBE\bin\cpucount.exe
-    ;File /r RosBE\bin\ctest.exe
     File /r RosBE\bin\diff.exe
     File /r RosBE\bin\diff3.exe
     File /r RosBE\bin\echoh.exe
     File /r RosBE\bin\flash.exe
     File /r RosBE\bin\flex.exe
-    File /r RosBE\bin\flex++.exe
-    ;File /r RosBE\bin\gdb.exe
-    ;File /r RosBE\bin\gdbserver.exe
     File /r RosBE\bin\getdate.exe
-    ;File /r RosBE\bin\libgcc_s_dw2-1.dll
-    ;File /r RosBE\bin\libstdc++-6.dll
-    ;File /r RosBE\bin\libwinpthread-1.dll
-    ;File /r RosBE\bin\log2lines.exe
     File /r RosBE\bin\m4.exe
-    ;File /r RosBE\bin\mingw32-make.exe
     File /r RosBE\bin\msys-2.0.dll
     File /r RosBE\bin\msys-gnutls-30.dll
     File /r RosBE\bin\msys-iconv-2.dll
@@ -202,15 +191,12 @@ Section -BaseFiles SEC01
     File /r RosBE\bin\options.exe
     File /r RosBE\bin\patch.exe
     File /r RosBE\bin\patch.exe.manifest
-    ;File /r RosBE\bin\pexports.exe
-    ;File /r RosBE\bin\piperead.exe
     File /r RosBE\bin\playwav.exe
     File /r RosBE\bin\rquote.exe
     File /r RosBE\bin\scut.exe
     File /r RosBE\bin\sdiff.exe
     File /r RosBE\bin\tee.exe
     File /r RosBE\bin\wget.exe
-    ;File /r RosBE\bin\zlib1.dll
     SetOutPath "$INSTDIR\samples"
     SetOverwrite try
     File /r RosBE\samples\*.*