diff --git a/Build/Changes.txt b/Build/Changes.txt
index 0ad4762b5..b82541d68 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -71,6 +71,8 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.507.1]- Base64 Decoding: select source code-page for decoding.
+[.507.1]- Base64: default Encoding/Decoding based on current code-page
 [.427.1]- Color selection dialog: NP3 icon, positioning and dark-mode.
 [.427.1]- Adjust standard colors for URL Hyperlink (better standard dark-mode visual).
 [.425.1]- New default for hyperlink tooltip is OFF.
diff --git a/Versions/day.txt b/Versions/day.txt
index 80e3e6eab..055b6671a 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-506
+507
diff --git a/language/Line numbers to translate.txt b/language/Line numbers to translate.txt
index ef1f3144b..a9022072e 100644
--- a/language/Line numbers to translate.txt	
+++ b/language/Line numbers to translate.txt	
@@ -3,14 +3,14 @@
 ==  This .txt file is intended for Translators to communicate to them the Line Mumbers of the     ==
 ==  "Added/Modified" items in the Resource files ("xx_yy.rc" and "grepWinNP3.lang").              ==
 ==                                                                                                ==
-==                                                      Latest update:  "May 2021" on 2021-05-06  ==
+==                                                      Latest update:  "May 2021" on 2021-05-07  ==
 ====================================================================================================
 
-March 2021:   Line numbers to translate_2021-03.png - https://workupload.com/file/MrtH6U2RhKC
+March 2021:   Line numbers to translate_2021-03.png - https://workupload.com/file/MrtH6U2RhKC (2021-03-31)
 
-April 2021:   Line numbers to translate_2021-04.png - https://workupload.com/file/jcbdVpEBCfr  (updated)
+April 2021:   Line numbers to translate_2021-04.png - https://workupload.com/file/jcbdVpEBCfr (2021-04-29)
 
-May 2021:     Line numbers to translate_2021-05.png - https://workupload.com/file/fW35WNxMa5y  (updated)
+May 2021:     Line numbers to translate_2021-05.png - https://workupload.com/file/B3Gq4QFHERL (2021-05-07)
 
 June 2021:    Line numbers to translate_2021-06.png - 
 
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 74e292306..0b0452cc2 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL Kod&eer\tCtrl+Shift+E",               IDM_EDIT_URLENCODE
             MENUITEM "URL &Dekodeer\tCtrl+Shift+R",             IDM_EDIT_URLDECODE
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index 95aa7302f..82305b5e9 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "Ка&даваць URL\tCtrl+Shift+E",                     IDM_EDIT_URLENCODE
             MENUITEM "Д&экадаваць URL\tCtrl+Shift+R",                   IDM_EDIT_URLDECODE
diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc
index 006c5fa5a..7079b7c89 100644
--- a/language/np3_el_gr/menu_el_gr.rc
+++ b/language/np3_el_gr/menu_el_gr.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "Κ&ωδικοποίηση URL\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "&Αποκωδικοποίηση URL\tCtrl+Shift+R",      IDM_EDIT_URLDECODE
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index e6029ae33..26c7476d7 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc
index 98ee194de..3db3ad5c0 100644
--- a/language/np3_es_419/menu_es_419.rc
+++ b/language/np3_es_419/menu_es_419.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Codificar",                               IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decodificar",                             IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decodificar como ...",                     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&Codificar URL\tCtrl+Shift+E",                    IDM_EDIT_URLENCODE
             MENUITEM "D&ecodificar URL\tCtrl+Shift+R",                  IDM_EDIT_URLDECODE
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 960542a9d..a62bd9c2a 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Codificar",                               IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decodificar",                             IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decodificar como ...",                     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&Codificar URL\tCtrl+Shift+E",                    IDM_EDIT_URLENCODE
             MENUITEM "D&ecodificar URL\tCtrl+Shift+R",                  IDM_EDIT_URLDECODE
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index f4efc20a4..8a1e07c1f 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encodage",                                IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Décodage",                                IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Décodage comme ...",                       IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&URL Encodage\tCtrl+Shift+E",                     IDM_EDIT_URLENCODE
             MENUITEM "URL &Décodage\tCtrl+Shift+R",                     IDM_EDIT_URLDECODE
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index 19be9d05b..73635674f 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL एन्कोड (&E)\tCtrl+Shift+E",           IDM_EDIT_URLENCODE
             MENUITEM "URL डिकोड (&D)\tCtrl+Shift+R",           IDM_EDIT_URLDECODE
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 7049be817..e91980533 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&URL bekódolás\tCtrl+Shift+E",               IDM_EDIT_URLENCODE
             MENUITEM "U&RL kikódolás\tCtrl+Shift+R",               IDM_EDIT_URLDECODE
diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc
index b3b70cf64..b27f562b9 100644
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index a6a90fe3f..cb6f31afa 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&URL Encode\tCtrl+Shift+E",                 IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",                 IDM_EDIT_URLDECODE
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index f1d4ec95b..c33e665d8 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URLエンコード(&E)\tCtrl+Shift+E",            IDM_EDIT_URLENCODE
             MENUITEM "URLデコード(&D)\tCtrl+Shift+R",             IDM_EDIT_URLDECODE
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 3dae68652..a48b7a431 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL 인코딩(&E)\tCtrl+Shift+E",               IDM_EDIT_URLENCODE
             MENUITEM "URL 디코딩(&D)\tCtrl+Shift+R",               IDM_EDIT_URLDECODE
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index d11b5d6f5..d7bc683ba 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                              IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                              IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode als ...",                       IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&URL Encode\tCtrl+Shift+E",                   IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",                   IDM_EDIT_URLDECODE
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index a99db9a45..5e06dc757 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&Koduj URL\tCtrl+Shift+E",                    IDM_EDIT_URLENCODE
             MENUITEM "Dekoduj URL\tCtrl+Shift+R",                   IDM_EDIT_URLDECODE
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index b30ccae5b..0b3a91e78 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "Codificar &URL\tCtrl+Shift+E",             IDM_EDIT_URLENCODE
             MENUITEM "&Decodificar URL\tCtrl+Shift+R",           IDM_EDIT_URLDECODE
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index 2a9e16980..630394928 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "Codificar &URL\tCtrl+Shift+E",          IDM_EDIT_URLENCODE
             MENUITEM "&Descodificar URL\tCtrl+Shift+R",       IDM_EDIT_URLDECODE
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 596ff91a7..013aa93ea 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "Ко&дировать URL\tCtrl+Shift+E",                   IDM_EDIT_URLENCODE
             MENUITEM "Дек&одировать URL\tCtrl+Shift+R",                 IDM_EDIT_URLDECODE
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index d0a532e34..4259e3595 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "&Kódovať URL\tCtrl+Shift+E",          IDM_EDIT_URLENCODE
             MENUITEM "&Dekódovať URL\tCtrl+Shift+R",        IDM_EDIT_URLDECODE
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index 3aabd138d..21ee62168 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL-kodning\tCtrl+Shift+E",                      IDM_EDIT_URLENCODE
             MENUITEM "Ta bort URL-kodning\tCtrl+Shift+R",           IDM_EDIT_URLDECODE
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 70e80260c..b7bd20981 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc
index bf857e1a8..c2b95e208 100644
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index e06c7ed1b..a01b7b7d7 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL 编码(&E)\tCtrl+Shift+E",            IDM_EDIT_URLENCODE
             MENUITEM "URL 解码(&D)\tCtrl+Shift+R",            IDM_EDIT_URLDECODE
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index 7bde40b50..f39131dc2 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -265,6 +265,7 @@ BEGIN
             MENUITEM SEPARATOR
             MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
             MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM "Base64 Decode to codepage ...",     IDM_EDIT_B64DECODESEL
             MENUITEM SEPARATOR
             MENUITEM "URL 編碼(&E)\tCtrl+Shift+E",            IDM_EDIT_URLENCODE
             MENUITEM "URL 解碼(&D)\tCtrl+Shift+R",            IDM_EDIT_URLDECODE
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 2cdf99f8d..0a3cfd439 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.506.1"
+    version="5.21.507.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 82269366e..e786000ca 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 506
+#define VERSION_REV 507
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 502
 #define LEXILLA_VER 502