diff --git a/Build/Changes.txt b/Build/Changes.txt
index 73511a3c2..e6e8a6e41 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,9 @@ NEW:
CHANGES:
--------------------------------------------------------
[.###.#]- .
+[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.
@@ -65,6 +68,8 @@ CHANGES Versions in Tools or Libraries:
FIXES:
--------------------------------------------------------
[.###.#]- .
+[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/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/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
index bc7c9eada..c17e77a88 100644
--- a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
+++ b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
@@ -268,7 +268,7 @@ msgstr "KB"
#. Resource IDs: (1075)
msgid "Language:"
-msgstr "Taal (language):"
+msgstr "Taal:"
#. Resource IDs: (1017)
msgid "Limit search"
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index adab85478..3cf0556fd 100644
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
@@ -93,8 +93,8 @@ BEGIN
COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "&Hoofdlettergevoelig",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,110,10
CONTROL "Alleen heel &woord",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
- CONTROL "&Begin van het woord",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
- CONTROL "Backslashes &transformeren",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,110,10
+ CONTROL "&Begin van het woord",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,100,10
+ CONTROL "Backslashes &transformeren",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,100,10
CONTROL "Reguliere &expressie",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10
CONTROL "Punt &matches alles",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10
CONTROL "Niet opnieuw zoeken",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10
@@ -106,7 +106,7 @@ BEGIN
DEFPUSHBUTTON "Vo&lgende",IDOK,211,7,55,14
PUSHBUTTON "Vo&rige",IDC_FINDPREV,211,24,55,14
PUSHBUTTON "Sluiten",IDCANCEL,211,99,55,14
- CONTROL "Vervangen (Ctrl+H)",IDC_TOGGLEFINDREPLACE,"SysLink",0x0,125,103,85,10
+ CONTROL "Naar Vervangen (Ctrl+H)",IDC_TOGGLEFINDREPLACE,"SysLink",0x0,125,103,85,10
CONTROL "(?)",IDC_REGEXPHELP,"SysLink",0x0,106,85,14,10
CONTROL "(?)",IDC_BACKSLASHHELP,"SysLink",0x0,106,73,14,10
CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10
@@ -127,8 +127,8 @@ BEGIN
COMBOBOX IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "&Hoofdlettergevoelig",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,110,10
CONTROL "Alleen heel &woord",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
- CONTROL "&Begin van het woord",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
- CONTROL "Backslashes &transformeren",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,110,10
+ CONTROL "&Begin van het woord",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,100,10
+ CONTROL "Backslashes &transformeren",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,100,10
CONTROL "Reguliere &expressie",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10
CONTROL "Punt &matches alles",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10
CONTROL "Niet opnieuw zoeken",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10
@@ -144,7 +144,7 @@ BEGIN
PUSHBUTTON "&Alles vervangen",IDC_REPLACEALL,211,75,55,14
PUSHBUTTON "Tekst uitwisselen",IDC_SWAPSTRG,150,32,49,12
PUSHBUTTON "Sluiten",IDCANCEL,211,126,55,14
- CONTROL "Zoeken (Ctrl+F)",IDC_TOGGLEFINDREPLACE,"SysLink",0x0,125,130,85,10
+ CONTROL "Naar Zoeken (Ctrl+F)",IDC_TOGGLEFINDREPLACE,"SysLink",0x0,125,130,85,10
CONTROL "(?)",IDC_BACKSLASHHELP,"SysLink",0x0,107,102,14,10
CONTROL "(?)",IDC_REGEXPHELP,"SysLink",0x0,107,114,14,10
CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 7b81a77d6..e4373aaff 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 beta
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 4293274d0..a550027ba 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 929
+#define VERSION_REV 1015
#define VERSION_BUILD 1
#define SCINTILLA_VER 511
#define LEXILLA_VER 511