diff --git a/Build/Changes.txt b/Build/Changes.txt
index 31c85137e..a613ec444 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.802.(build_#) (2021-08-02)
+Current BETA/RC Version 5.21.803.(build_#) (2021-08-03)
 ========================================================
 
 --------------------------------------------------------
@@ -75,6 +75,9 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.803.1]- New Sombra scheme as default Dark Mode coloring theme.
+[.803.1]- Optimized default style handling for settings file (Dark Mode).
+[.803.1]- Adapted other Dark Mode Theme Files.
 [.802.1]- Default FileWatchingMode from "don't care" to "notify by MsgBox".
 [.721.1]- Adapded "Sombra" Dark Mode default color scheme.
 [.721.1]- Rename "KiX Config" to "KiXtart Script".
diff --git a/Build/Themes/Dark.ini b/Build/Themes/Dark.ini
index 9eea387c2..b3398a363 100644
--- a/Build/Themes/Dark.ini
+++ b/Build/Themes/Dark.ini
@@ -1,4 +1,4 @@
-# Lexer Styles "Dark" taken from Axl Cash (https://www.axlcash.com/notepad2-dark-theme-schemes-style-or-whatever-you-call-it)
+# Lexer Styles "Dark" taken from Axl Cash (https://www.axlcash.com/notepad2-dark-theme-schemes-style-or-whatever-you-call-it)
 
 [Custom Colors]
 01=#252526
diff --git a/Build/Themes/Sombra.ini b/Build/Themes/Sombra.ini
index 2505b91f7..9dddeb879 100644
--- a/Build/Themes/Sombra.ini
+++ b/Build/Themes/Sombra.ini
@@ -1,4 +1,5 @@
-# Lexer Style "NewSombra" from MadDogVachon (https://github.com/MadDogVachon)
+# Lexer Style "NewSombra" from MadDogVachon (https://github.com/MadDogVachon)
+
 [Custom Colors]
 01=#DEDEDE
 02=#B4E1F5
diff --git a/Versions/day.txt b/Versions/day.txt
index 227b54a06..25e1ae45f 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-802
+803
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 9e406e079..d50b896ef 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -48,7 +48,7 @@ set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\Porta
 
 call :RESOLVEPATH NP3_DISTRIB_DIR %SCRIPT_DIR%..\Build
 call :RESOLVEPATH NP3_DOC_DIR %SCRIPT_DIR%..\Build\Docs
-call :RESOLVEPATH NP3_BUILD_SCHEMES_DIR %SCRIPT_DIR%..\Build\themes
+call :RESOLVEPATH NP3_BUILD_SCHEMES_DIR %SCRIPT_DIR%..\Build\Themes
 call :RESOLVEPATH NP3_WIN32_DIR %SCRIPT_DIR%..\Bin\Release_x86_v142
 call :RESOLVEPATH NP3_X64_DIR %SCRIPT_DIR%..\Bin\Release_x64_v142
 
@@ -141,8 +141,8 @@ copy "%NP3_DISTRIB_DIR%\Notepad3.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\setting
 copy "%NP3_DISTRIB_DIR%\minipath.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\minipath.ini" /Y /V
 
 :: Copy all current "Themes" files
-del /s /f /q "%NP3_PORTAPP_DIR%\App\DefaultData\settings\themes\*.*"
-xcopy "%NP3_BUILD_SCHEMES_DIR%" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\themes" /C /V /I /S /Y
+del /s /f /q "%NP3_PORTAPP_DIR%\App\DefaultData\settings\Themes\*.*"
+xcopy "%NP3_BUILD_SCHEMES_DIR%" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\Themes" /C /V /I /S /Y
 
 :: Copy all current "lng" files
 for /d %%d in (%NP3_LANGUAGE_SET%) do (
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index cfad9ce0d..c32f5ee75 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.802.1"
+    version="5.21.803.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 089c703be..5293d4c78 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 802
+#define VERSION_REV 803
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 511
 #define LEXILLA_VER 511