diff --git a/Build/Changes.txt b/Build/Changes.txt
index 5ddd1c1b4..460d3ef6a 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,15 +33,17 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.816.(build_#) (2021-08-16)
+Current BETA/RC Version 5.21.818.(build_#) (2021-08-18)
 ========================================================
 
 --------------------------------------------------------
 NEW:
 --------------------------------------------------------
 [.###.#]- .
-[.###.#]- Add Configuration (Properties) Lexer: add style setting for Key (of Key-Value pair).
-[.811.1]- Add "Notepad3 Replacement" for Windows 11 Insider Preview (ext: .inf, .ini, .log, .ps1, .psd1, .psm1, .scp, .txt, .wtx).
+[.816.1]- Add Configuration (Properties) Lexer: add style setting for Key (of Key-Value pair).
+[.811.1]- Add "Notepad3 Replacement" on Windows 11 Insider Preview which works almost like with Windows 10:
+          - Open (ext: .inf, .ini, .log, .ps1, .psd1, .psm1, .scp, .txt, .wtx, .compositefont, .css, .sct, .wsc).
+          - Edit (ext: .bat, .cmd, .jse, .reg, .text, .vbe, .wsf).
 [.809.1]- Configure app to open hyperlink (instead of default browser).
 [.805.1]- File URL forced to open in new window by (Ctrl+Alt+Click).
 [.805.1]- File change notification, if removed current file is recreated.
diff --git a/Versions/day.txt b/Versions/day.txt
index cd93ccc9d..68c7a4170 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-816
+818
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 05a256ba1..fa043380a 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.816.1"
+    version="5.21.818.1"
     type="win32"
   />
-  <description>Notepad3 beta</description>
+  <description>Notepad3 rc</description>
 </assembly>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 92c5d60b6..4d49b82bb 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
-#define VERSION_REV 816
+#define VERSION_REV 818
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 511
 #define LEXILLA_VER 511
@@ -16,5 +16,5 @@
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.1.0
-#define VERSION_PATCH beta
+#define VERSION_PATCH rc
 #define VERSION_COMMIT_ID dkt1-amr