diff --git a/Build/Changes.txt b/Build/Changes.txt
index 93ed9d813..429709a94 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -34,7 +34,7 @@ SUP - (S)et(UP) / Installer Package
 
 
 ========================================================
-Current BETA/RC Version 5.20.1118.(build_#) (2020-11-18)
+Current BETA/RC Version 5.20.1125.(build_#) (2020-11-25)
 ========================================================
 
 --------------------------------------------------------
@@ -63,6 +63,7 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.xxx.x]- .
+[1125.1]- Format: AStyle ALLMAN core code base.
 [1118.1]- Sci_PositionCR type reverted to long for Win32 compatibility reasons.
 [1001.1]- Rebase DarkMode module on delay load version branch of win32-darkmode project.
 [.930.1]- Update the KeyWordList of lexers "C# Source Code" and "SQL Query".
@@ -93,6 +94,9 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.xxx.x]- .
+[1125.1]- Code styling reformat (AStyle: OTBS).
+[1125.1]- File encoding analysis with 7-bit ASCII only.
+[1125.1]- File save problem after switching encoding to GB2312 (52936).
 [1116.1]- Initial path on OpenFile dialog (load file).
 [1116.1]- Compiler complaints (new VS2019 version v16.8.1).
 [1024.2]- Allow single character filename on command line.
diff --git a/Version.cmd b/Version.cmd
index 3e928d355..92a45deba 100644
--- a/Version.cmd
+++ b/Version.cmd
@@ -12,9 +12,9 @@ PowerShell.exe -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Unrestricted
 set EXITCODE=%ERRORLEVEL%
 ::ECHO ERRORLEVEL=%EXITCODE%
 
-:: Pause for 2 seconds to verify the "Notepad3 version number:" before exiting
+:: Pause for 4 seconds to verify the "Notepad3 version number:" before exiting
 :: ============================================================================
-ping -n 3 127.0.0.1>nul
+ping -n 5 127.0.0.1>nul
 
 goto :END
 
diff --git a/Version_alpha.cmd b/Version_alpha.cmd
index 051bbbcc1..aba0087f9 100644
--- a/Version_alpha.cmd
+++ b/Version_alpha.cmd
@@ -1,6 +1,7 @@
+:: Batch file for ALPHA and XPERIMENTAL version
 @echo off
 setlocal
 set _VERPATCH_=alpha
-echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt
+echo."_%_VERPATCH_%">.\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal
diff --git a/Version_beta.cmd b/Version_beta.cmd
index a6124ac83..94e63081a 100644
--- a/Version_beta.cmd
+++ b/Version_beta.cmd
@@ -1,6 +1,7 @@
+:: Batch file for BETA version
 @echo off
 setlocal
 set _VERPATCH_=beta
-echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt
+echo."_%_VERPATCH_%">.\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal
diff --git a/Version_rc.cmd b/Version_rc.cmd
index 0b509e47c..3645b2f77 100644
--- a/Version_rc.cmd
+++ b/Version_rc.cmd
@@ -1,6 +1,7 @@
+:: Batch file for RELEASE CANDIDATE version
 @echo off
 setlocal
 set _VERPATCH_=rc
-echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt
+echo."_%_VERPATCH_%">.\np3portableapp\_buildname.txt
 Version -VerPatch "%_VERPATCH_%"
 endlocal
diff --git a/Version_rel.cmd b/Version_rel.cmd
new file mode 100644
index 000000000..b9c2d8b15
--- /dev/null
+++ b/Version_rel.cmd
@@ -0,0 +1,7 @@
+:: Batch file for RELEASE version (without the separator "_" before ".paf" in Notepad3Portable)
+@echo off
+setlocal
+set _VERPATCH_=
+echo."%_VERPATCH_%">.\np3portableapp\_buildname.txt
+Version -VerPatch "%_VERPATCH_%"
+endlocal
diff --git a/Versions/day.txt b/Versions/day.txt
index 79e6287b6..706146535 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-1118
+1125
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
index a55039cc8..ffdd97344 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo_template.ini
@@ -24,7 +24,7 @@ CommercialUse=true
 
 [Version]
 PackageVersion=xxxVERSIONxxx
-DisplayVersion=xxxVERSIONxxx_xxxDEVNAMExxx
+DisplayVersion=xxxVERSIONxxxxxxDEVNAMExxx
 
 [SpecialPaths]
 Plugins=NONE
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 76c7a4240..34882e695 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -216,7 +216,7 @@ del /f /q "%NP3_PORTAPP_INFO%_tmp.ini"
 :: call %SCRIPT_DIR%Signing_for_NP3P_2nd_EXE.cmd
 
 :: Creation of a "7-Zip" file by appending the extension ".7z"
-set Notepad3Portable.paf.exe=%SCRIPT_DIR%Notepad3Portable_%VERSION%_%DEVNAME%.paf.exe
+set Notepad3Portable.paf.exe=%SCRIPT_DIR%Notepad3Portable_%VERSION%%DEVNAME%.paf.exe
 if exist %Notepad3Portable.paf.exe% (
     copy /B %Notepad3Portable.paf.exe% %Notepad3Portable.paf.exe%.7z /Y /V
 ) else (
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index c46cd8e11..3b171dd47 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.1118.1"
+    version="5.20.1125.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 6dca23898..fe35d03d3 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 1118
+#define VERSION_REV 1125
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 445
 #define ONIGURUMA_REGEX_VER 6.9.6