diff --git a/Build/Changes.txt b/Build/Changes.txt
index 73511a3c2..122922e49 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.929.(build_#) (2021-09-29)
+Current BETA/RC Version 5.21.1015.(build_#) (2021-10-15)
 ========================================================
 
 --------------------------------------------------------
@@ -46,6 +46,10 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[1015.2]- Xperm.: Some more DynStrg refactorings and LongPath handling.
+[1015.1]- Remove the max win version check for undocumented DarkMode UxTheme methods.
+[1015.1]- DarkMode enable up to Win11 build 22471.
+[1015.1]- SQL Lexer bright and dark mode highlight color enhanced.
 [.924.1]- Disable actively file change polling - rely on directory change notification by default.
 [.924.1]- Allow [Settings2] "FileCheckInverval" to be zero(0), means no active file change polling.
 [.923.2]- Enable context menu for Statusbar.
@@ -56,8 +60,8 @@ CHANGES:
 --------------------------------------------------------
 CHANGES Versions in Tools or Libraries:
 --------------------------------------------------------
+[1015.2]- Xperm.: Update Scintilla Library (SCI) version 5.1.3 (2021-09-29).
 [.802.1]- Update Lexilla Library (LEX) version 5.1.2 (2021-07-26).
-[.726.1]- Update Scintilla Library (SCI) version 5.1.1 (2021-07-26).
 [.726.1]- Update grepWinNP3 (GRE) version 2.1.8.39 (2021-07-26).
 [.702.5]- Update Oniguruma Regex (ONI) engine version 7.0.0 (2021-06-23).
 
@@ -65,6 +69,9 @@ CHANGES Versions in Tools or Libraries:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[1015.2]- Xperm.: Path_StripPath().
+[1015.1]- SQL Lexer dark mode highlight default colors.
+[1015.1]- Disabled menu items if settings file itself is locked by file change notification.
 [.927.1]- Over paint annoying menu-bar bottom line.
 [.926.1]- Dark-mode system menu bar coloring (except bottom line).
 [.925.1]- Correction of some wrong keyboard shortcut (Alt+ Up, Alt+ Down).
diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/Versions/day.txt b/Versions/day.txt
index 63881d8a1..07b0c7609 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-929
+1015
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 7b81a77d6..888313876 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Rizonesoft.Notepad3"
     processorArchitecture="*"
-    version="5.21.929.1"
+    version="5.21.1015.2"
     type="win32"
   />
-  <description>Notepad3 beta</description>
+  <description>Notepad3 alpha</description>
 </assembly>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 4293274d0..c8fd88a14 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,13 +8,13 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
-#define VERSION_REV 929
-#define VERSION_BUILD 1
-#define SCINTILLA_VER 511
+#define VERSION_REV 1015
+#define VERSION_BUILD 2
+#define SCINTILLA_VER 513
 #define LEXILLA_VER 511
 #define ONIGURUMA_REGEX_VER 7.0.0
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
-#define UTHASH_VER 2.1.0
-#define VERSION_PATCH beta
+#define UTHASH_VER 2.3.0
+#define VERSION_PATCH alpha
 #define VERSION_COMMIT_ID dkt1-amr