diff --git a/Build/Changes.txt b/Build/Changes.txt
index b82541d68..275f7d63d 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.506.(build_#) (2021-06-06)
+Current BETA/RC Version 5.21.511.(build_#) (2021-05-11)
 ========================================================
 
 --------------------------------------------------------
@@ -120,6 +120,11 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[.511.1]- Space-width, avgchar-width and tab-width calculation.
+[.511.1]- Scintilla missing recalculation of space width (to get correct tab width for indentation).
+[.511.1]- Revert to Scintilla std  tabwidth calculation on font changes.
+[.511.1]- Preserve "2nd Common Base" styling state across restarts.
+[.511.1]- Default style settings should not be written to .ini-file.
 [.429.1]- Handling of "File Vars" vs. "Encoding Tags".
 [.427.1]- Minor fixes around font redrawing.
 [.423.1]- Add thread COM initializations.
diff --git a/Versions/day.txt b/Versions/day.txt
index 055b6671a..c0556fb20 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-507
+511
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 0a3cfd439..9eabf4d28 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Rizonesoft.Notepad3"
     processorArchitecture="*"
-    version="5.21.507.1"
+    version="5.21.511.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/DarkMode/DarkMode.cpp b/src/DarkMode/DarkMode.cpp
index a737e78f6..c1f0dc3c5 100644
--- a/src/DarkMode/DarkMode.cpp
+++ b/src/DarkMode/DarkMode.cpp
@@ -71,9 +71,9 @@ constexpr bool CheckBuildNumber(DWORD buildNumber)
     case 18363: // Win10 v1909
     case 19041: // Win10 v2004
     case 19042: // Win10 v20H2
-    case 19043: // Win10 v21H1 insider beta [2021-03-15]
+    case 19043: // Win10 v21H1 Insider beta [2021-03-15]
     // unknown, if working with these version(s) :-O
-    case 21337: // Win10 v21H2 insider dev-preview [2021-03-19]
+    case 21376: // Win10 v21H2 Insider Dev-preview [2021-05-03]
         return true;
     default:
         // not supported
diff --git a/src/VersionEx.h b/src/VersionEx.h
index e786000ca..1e19e4554 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 507
+#define VERSION_REV 511
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 502
 #define LEXILLA_VER 502