diff --git a/Versions/build.txt b/Versions/build.txt
index 632921140..b6da714f5 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2519
+2520
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 35818c85f..2f3565bd4 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.730.2519"
+    version="5.19.730.2520"
     type="win32"
   />
   <description>Notepad3 RC2</description>
diff --git a/src/Styles.c b/src/Styles.c
index af268df49..8e05118cc 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -611,6 +611,11 @@ bool Style_ImportFromFile(const WCHAR* szFile)
       IniSectionGetString(Lexer_Section, L"FileNameExtensions", g_pLexArray[iLexer]->pszDefExt,
         g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions));
 
+      // don't allow empty extensions settings => use default ext
+      if (StrIsEmpty(g_pLexArray[iLexer]->szExtensions)) {
+        StringCchCopy(g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions), g_pLexArray[iLexer]->pszDefExt);
+      }
+
       unsigned i = 0;
       while (g_pLexArray[iLexer]->Styles[i].iStyle != -1)
       {
@@ -627,13 +632,13 @@ bool Style_ImportFromFile(const WCHAR* szFile)
         if (StringCchCompareXI(L"Text Files", g_pLexArray[iLexer]->pszName) == 0)
         {
           if (StrIsNotEmpty(g_pLexArray[0]->szExtensions)) {
-            StringCchCopyW(g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions), g_pLexArray[0]->szExtensions);
+            StringCchCopy(g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions), g_pLexArray[0]->szExtensions);
             StrTrim(g_pLexArray[iLexer]->szExtensions, L"; ");
           }
           lexStandard.szExtensions[0] = L'\0';
           lexStandard2nd.szExtensions[0] = L'\0';
           // copy default style
-          StringCchCopyW(g_pLexArray[iLexer]->Styles[0].szValue, COUNTOF(g_pLexArray[iLexer]->Styles[0].szValue), g_pLexArray[0]->Styles[0].szValue);
+          StringCchCopy(g_pLexArray[iLexer]->Styles[0].szValue, COUNTOF(g_pLexArray[iLexer]->Styles[0].szValue), g_pLexArray[0]->Styles[0].szValue);
         }
       }
     }
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 9b1c759ba..1b2ac053a 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
 #define VERSION_REV 730
-#define VERSION_BUILD 2519
+#define VERSION_BUILD 2520
 #define SCINTILLA_VER 420
 #define ONIGURUMA_REGEX_VER 6.9.3
 #define VERSION_PATCH RC2