diff --git a/Build/Changes.txt b/Build/Changes.txt
index cc2814b1a..dd4fa0637 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -53,6 +53,8 @@ CHANGES:
 - Remove spinning wait-cursor for text operations (may need reactivation for long operations).
 - "grepWinNP3": move packages.config to corresponding project folder(GRE).
 - Add filepath to message on file locking error.
+- Update Oniguruma Regex (ONI) engine version 6.9.5 (2020/04/20).
+- Update Scintilla Library (SCI) version 4.3.2 (2020/03/06).
 
 -----------------------------------------------------
 ENHANCEMENT:
diff --git a/Versions/build.txt b/Versions/build.txt
index 00750edc0..b8626c4cf 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-3
+4
diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc
index 00a2e557e..0d1b28a87 100644
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@@ -340,31 +340,31 @@ IDS_MUI_ABOUT_RTF_6  "\
 \\cf0 Notepad3 and MiniPath Copyright \\u0169   2008-2020 Rizonesoft, All rights reserved.\\par\
 \\cf0 https://www.rizonesoft.com\\par\
 \\cf0 \\par\
-\\cf0 変更の有無にかかわらず、ソースやバイナリとしての再配布と使用は\\par\
-\\cf0 以下の条件が満たされている場合に許可されています:\\par\
+\\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\
+\\cf0 are permitted provided that the following conditions are met:\\par\
 \\cf0 \\par\
-\\cf0 1. ソースコードの再配布には、上記の著作権表示、この条件の箇条書き、\\par\
-\\cf0 以下の免責事項を保つ必要があります。\\par\
+\\cf0 1. Redistributions of source code must retain the above copyright\\par\
+\\cf0 notice, this list of conditions and the following disclaimer.\\par\
 \\cf0 \\par\
-\\cf0 2. バイナリ形式での再配布には、上記の著作権表示、この条件の箇条書き、\\par\
-\\cf0 以下の免責事項を、配布物と共に提供される文書や他の資料中に\\par\
-\\cf0 複製する必要があります。\\par\
+\\cf0 2. Redistributions in binary form must reproduce the above copyright\\par\
+\\cf0 notice, this list of conditions and the following disclaimer in the\\par\
+\\cf0 documentation and/or other materials provided with the distribution.\\par\
 \\cf0 \\par\
-\\cf0 3. Florian Balmer とその貢献者の名前を、\\par\
-\\cf0 このソフトウェアから派生した製品を宣伝するために\\par\
-\\cf0 使用することは、明確な事前の書面による許可なくできません。\\par\
+\\cf0 3. Neither the name of Florian Balmer nor the names of its contributors\\par\
+\\cf0 may be used to endorse or promote products derived from this software\\par\
+\\cf0 without specific prior written permission.\\par\
 \\cf0 \\par\
-\\cf0 本ソフトウェアは、著作権所有者と貢献者によって「現状のまま」提供され\\par\
-\\cf0 商品性の黙示保証および特定目的への適合性に限らず\\par\
-\\cf0 あらゆる明示的あるいは黙示的な保証は否認されている。\\par\
-\\cf0 いかなる原因また責任理論においても\\par\
-\\cf0 契約、厳格責任、不法行為を問わず (過失その他を含む)\\par\
-\\cf0 そのような損害の可能性を知らされてたとしても\\par\
-\\cf0 本ソフトウェアの使用からなんらかの形で発生した\\par\
-\\cf0 直接、間接、偶発、特別、懲罰的、また間接的損害\\par\
-\\cf0 (以下に限定されないが、代替品やサービスの調達;\\par\
-\\cf0 使用、データや利益の損失;事業中断) に対し\\par\
-\\cf0 いかなる場合も著作権所有者と貢献者は責任を負わない。\\par\
+\\cf0 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\par\
+\\cf0 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED\\par\
+\\cf0 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\\par\
+\\cf0 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\par\
+\\cf0 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\par\
+\\cf0 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\\par\
+\\cf0 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\\par\
+\\cf0 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\\par\
+\\cf0 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\par\
+\\cf0 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\par\
+\\cf0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\par\
 }"
 
 END
diff --git a/language/np3_sk_sk/dialogs_sk_sk.rc b/language/np3_sk_sk/dialogs_sk_sk.rc
index 1e696f78d..6b301f0f4 100644
--- a/language/np3_sk_sk/dialogs_sk_sk.rc
+++ b/language/np3_sk_sk/dialogs_sk_sk.rc
@@ -480,7 +480,7 @@ BEGIN
     EDITTEXT        IDC_PWD_EDIT1,17,35,276,12,ES_PASSWORD | ES_AUTOHSCROLL | WS_GROUP
     EDITTEXT        IDC_PWD_EDIT2,17,74,277,12,ES_PASSWORD | ES_AUTOHSCROLL
     LTEXT           "Voľby hlavného kľúča:",IDC_STATIC,17,61,75,10,NOT WS_GROUP
-    CONTROL         "Šifrovať pomocou prístupovej frázy",IDC_PWD_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,98,10
+    CONTROL         "Šifrovať pomocou prístupovej frázy",IDC_PWD_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,122,10
     CONTROL         "Znova použiť hlavný kľúč",IDC_PWD_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,60,95,10
     GROUPBOX        " Prístupová fráza ",IDC_STATIC,7,7,297,108
     CONTROL         "Zobraziť prístupovú frázu ",IDC_PWD_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,97,93,10
@@ -540,7 +540,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Ú&vodný Tag (s atribútmi):",IDC_STATIC,7,7,97,8
     EDITTEXT        100,7,18,98,14,ES_AUTOHSCROLL
-    LTEXT           "&Koncový Tag (možná úprava):",IDC_STATIC,7,37,90,8
+    LTEXT           "&Koncový Tag (možná úprava):",IDC_STATIC,7,37,97,8
     EDITTEXT        101,7,48,98,14,ES_AUTOHSCROLL
     EDITTEXT        102,125,48,20,14,ES_AUTOHSCROLL
     LTEXT           "X-krát",IDC_STATIC,148,50,24,8
diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc
index 874f4d478..46b682690 100644
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@@ -337,34 +337,34 @@ IDS_MUI_ABOUT_RTF_5  "\
 IDS_MUI_ABOUT_RTF_6  "\
 \\cf0 \\fs20\\b1\\ul1 Notepad3 Licencia:\\ul0\\b0\\fs18\\par\
 \\cf0 \\par\
-\\cf0 Notepad3 a MiniPath Copyright \\u0169   2008-2020 Rizonesoft, All rights reserved.\\par\
+\\cf0 Notepad3 and MiniPath Copyright \\u0169   2008-2020 Rizonesoft, All rights reserved.\\par\
 \\cf0 https://www.rizonesoft.com\\par\
 \\cf0 \\par\
-\\cf0 Redistribúcia a použitie v zdrojovej a binárnej forme, s úpravou alebo bez nej\\par\
-\\cf0 sú povolené za predpokladu, že sú splnené tieto podmienky:\\par\
+\\cf0 Redistribution and use in source and binary forms, with or without modification,\\par\
+\\cf0 are permitted provided that the following conditions are met:\\par\
 \\cf0 \\par\
-\\cf0 1. Redistribúciou zdrojového kódu sa musia zachovať vyššie uvedené autorské práva\\par\
-\\cf0 s upozornením na tento zoznam podmienok a nasledujúcim vylúčením zodpovednosti.\\par\
+\\cf0 1. Redistributions of source code must retain the above copyright\\par\
+\\cf0 notice, this list of conditions and the following disclaimer.\\par\
 \\cf0 \\par\
-\\cf0 2. Redistribúciou v binárnej podobe musia byť reprodukované vyššie uvedené autorské práva\\par\
-\\cf0 s upozornením na tento zoznam podmienok a nasledujúcim vylúčením zodpovednosti\\par\
-\\cf0 v dokumentácii a/alebo v iných materiáloch, dodávaných s distribúciou.\\par\
+\\cf0 2. Redistributions in binary form must reproduce the above copyright\\par\
+\\cf0 notice, this list of conditions and the following disclaimer in the\\par\
+\\cf0 documentation and/or other materials provided with the distribution.\\par\
 \\cf0 \\par\
-\\cf0 3. Meno Florian Balmer ani mená jeho prispievateľov nesmú byť\\par\
-\\cf0 bez predchádzajúceho písomného súhlasu použité na podporu\\par\
-\\cf0 alebo propagáciu produktov odvodených z tohto softvéru.\\par\
+\\cf0 3. Neither the name of Florian Balmer nor the names of its contributors\\par\
+\\cf0 may be used to endorse or promote products derived from this software\\par\
+\\cf0 without specific prior written permission.\\par\
 \\cf0 \\par\
-\\cf0 TENTO SOFTVÉR POSKYTUJÚ DRŽITELIA AUTORSKÝCH PRÁV A PRISPIEVATELIA TAK\\par\
-\\cf0 'AKO JE' A AKÉKOĽVEK VÝSLOVNÉ ALEBO IMPLICITNÉ ZÁRUKY, VRÁTANE, ALE NIE\\par\
-\\cf0 VÝLUČNE, IMPLIKOVANÝCH ZÁRUK OBCHODOVATEĽNOSTI A VHODNOSTI NA KONKRÉTNY\\par\
-\\cf0 ÚČEL SÚ ZAMIETNUTÉ. ZA ŽIADNYCH OKOLNOSTÍ NEVYHRADZUJÚ AUTORSKÉ PRÁVA\\par\
-\\cf0 VLASTNÍKOV ALEBO DODÁVATEĽOV ZODPOVEDNOSŤ ZA ŽIADNE PRIAME, NEPRIAME,\\par\
-\\cf0 NÁHODNÉ, ZVLÁŠTNE, EXEMPLÁRNE ALEBO NÁSLEDNÉ ŠKODY (VRÁTANE, ALE NIE\\par\
-\\cf0 OBMEDZENÉ NA OBSTARÁVANIE NÁHRADNÝCH TOVAROV ALEBO SLUŽIEB; STRATA\\par\
-\\cf0 POUŽITIA, ÚDAJOV ALEBO ZISKOV; ALEBO PRERUŠENIA ČINNOSTI), ZA PÔSOBENIA\\par\
-\\cf0 TEÓRIE ZODPOVEDNOSTI, ČI UŽ NA ZÁKAZKU, PRIAMU ZODPOVEDNOSŤ, ALEBO DELIKT\\par\
-\\cf0 (VRÁTANE NEDBANLIVOSTI ALEBO INAK) V ŽIADNOM PRÍPADE VZNIKNUTÉ Z POUŽÍVANIA\\par\
-\\cf0 TOHTO SOFTVÉRU, AJ KEĎ INFORMOVALI O MOŽNOSTI TAKÉHOTO POŠKODENIA.\\par\
+\\cf0 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\\par\
+\\cf0 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED\\par\
+\\cf0 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\\par\
+\\cf0 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\\par\
+\\cf0 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\\par\
+\\cf0 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\\par\
+\\cf0 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\\par\
+\\cf0 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\\par\
+\\cf0 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\\par\
+\\cf0 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\\par\
+\\cf0 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\\par\
 }"
 
 END
diff --git a/minipath/language/mp_sk_sk/dialogs_sk_sk.rc b/minipath/language/mp_sk_sk/dialogs_sk_sk.rc
index 974b04eaa..5b982fdb2 100644
--- a/minipath/language/mp_sk_sk/dialogs_sk_sk.rc
+++ b/minipath/language/mp_sk_sk/dialogs_sk_sk.rc
@@ -182,7 +182,7 @@ BEGIN
     CONTROL         "Okno &MiniPath vždy navrchu.",IDC_ALWAYSONTOP,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,109,140,10
     CONTROL         "Minimalizovať na &panel úloh (kliknutím reaktivovať).",IDC_MINIMIZETOTRAY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,121,157,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,121,176,10
     CONTROL         "Pokúsiť sa znova použiť &existujúce okno pri spustení MiniPath.",IDC_REUSEWINDOW,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,133,212,10
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,151,205,1
@@ -198,7 +198,7 @@ BEGIN
     LTEXT           "Ďalšie možnosti nastavenia programu MiniPath.",IDC_STATIC,40,15,160,8
     CONTROL         "Po spustení &otvoriť:",IDC_STARTUPDIR,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,10,46,87,10
     CONTROL         "&Naposledy použité.",IDC_GOTOMRU,"Button",BS_AUTORADIOBUTTON,100,46,79,10
-    CONTROL         """O&bľúbené"" položky.",IDC_GOTOFAV,"Button",BS_AUTORADIOBUTTON,100,58,75,10
+    CONTROL         """O&bľúbené"" položky.",IDC_GOTOFAV,"Button",BS_AUTORADIOBUTTON,100,58,79,10
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,76,205,1
     CONTROL         "&Vymazať atribút uložených súborov len na čítanie.",IDC_CLEARREADONLY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,174,10
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 5e4eb2bd3..e0bfb5b2f 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.420.3"
+    version="5.20.420.4"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index ea4f2a5ab..87bbfd630 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,11 +9,11 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 420
-#define VERSION_BUILD 3
+#define VERSION_BUILD 4
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.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_COMMIT_ID t7820-rk
+#define VERSION_COMMIT_ID dkt1-amr