diff --git a/Build/Changes.txt b/Build/Changes.txt
index d724658e1..8604d5b20 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.1030.(build_#) (2021-10-30)
+Current ALPHA Version 5.23.1021.(build_#) (2021-10-23)
 ========================================================
 
 --------------------------------------------------------
@@ -47,6 +47,7 @@ CHANGES:
 --------------------------------------------------------
 [.###.#]- .
 [1021.1]- On file restore, do not notify immediately, but check against stored file attributes.
+[1015.2]- 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.
@@ -69,11 +70,10 @@ CHANGES Versions in Tools or Libraries:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
-[1030.1]- Wrong format for reporting number of replaced occurrences "In Selection".
-[1030.1]- "grepWinNP3" not intended switching file size search settings (GRE).
 [1023.1]- Key "Favorites=(path)" not added in "Setup" version.
 [1021.1]- "grepWinNP3" not intended switching "AllSize" settings (GRE).
 [1021.1]- Don't save default values for Caret and Whitespace.
+[1015.2]- 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.
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..00750edc0 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+3
diff --git a/Versions/day.txt b/Versions/day.txt
index e445c3bb2..8463e0903 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-1030
+1021
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 579a42683..e218f466b 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.1030.1"
+    version="5.21.1021.3"
     type="win32"
   />
-  <description>Notepad3 beta</description>
+  <description>Notepad3 alpha</description>
 </assembly>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index ec48c2025..f5980bf45 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 1030
-#define VERSION_BUILD 1
-#define SCINTILLA_VER 511
-#define LEXILLA_VER 511
+#define VERSION_REV 1021
+#define VERSION_BUILD 3
+#define SCINTILLA_VER 513
+#define LEXILLA_VER 512
 #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