diff --git a/Build/Changes.txt b/Build/Changes.txt
index 0caf731bf..0ad4762b5 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,13 +33,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.429.(build_#) (2021-04-29)
+Current BETA/RC Version 5.21.506.(build_#) (2021-06-06)
 ========================================================
 
 --------------------------------------------------------
 NEW:
 --------------------------------------------------------
 [.###.#]- .
+[.506.1]- Base64 Encoding/Decoding.
 [.428.1]- Custom ChooseColor resource definition.
 [.426.1]- Prepare Application Manifest for to grant Identity for non-package desktop apps.
 [.425.1]- Add file/dir exists/not-found to hyperlink tooltip (if file-url).
@@ -176,6 +177,7 @@ FIXES:
 REMOVED:
 --------------------------------------------------------
 [.###.#]- .
+[.506.1]- "fontsValid" extension (closer to default scintilla code base).
 [.420.1]- Remove useless font stretch handling.
 [.419.2]- Removing the font-style string for font selection.
 [.411.1]- Remove deprecated WinXP support (no horiz. mouse wheel).
diff --git a/Versions/day.txt b/Versions/day.txt
index 356066671..80e3e6eab 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-429
+506
diff --git a/language/Line numbers to translate.txt b/language/Line numbers to translate.txt
index ef6ff9b57..ef1f3144b 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:  "April 2021" on 2021-04-29  ==
+==                                                      Latest update:  "May 2021" on 2021-05-06  ==
 ====================================================================================================
 
 March 2021:   Line numbers to translate_2021-03.png - https://workupload.com/file/MrtH6U2RhKC
 
 April 2021:   Line numbers to translate_2021-04.png - https://workupload.com/file/jcbdVpEBCfr  (updated)
 
-May 2021:     Line numbers to translate_2021-05.png - 
+May 2021:     Line numbers to translate_2021-05.png - https://workupload.com/file/fW35WNxMa5y  (updated)
 
 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 776f4fa73..74e292306 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bifiseer Inkeep\tCtrl+Alt+T",          IDM_EDIT_CONVERTSPACES2
             MENUITEM "On-Tabi&fiseer Inkeep\tCtrl+Alt+S",       IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL Kod&eer\tCtrl+Shift+E",               IDM_EDIT_URLENCODE
             MENUITEM "URL &Dekodeer\tCtrl+Shift+R",             IDM_EDIT_URLDECODE
             MENUITEM "Lêerstelselpad na URL",                 	IDM_EDIT_PATH2URL
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index 9db3a9bbb..95aa7302f 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Т&абуляцыя замест прабелаў у водступах\tCtrl+Alt+T",   IDM_EDIT_CONVERTSPACES2
             MENUITEM "Пра&белы замест табуляцыі ў водступах\tCtrl+Alt+S",    IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "Ка&даваць URL\tCtrl+Shift+E",                     IDM_EDIT_URLENCODE
             MENUITEM "Д&экадаваць URL\tCtrl+Shift+R",                   IDM_EDIT_URLDECODE
             MENUITEM "Сістэмны шлях у URL",                             IDM_EDIT_PATH2URL
diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc
index 077815701..006c5fa5a 100644
--- a/language/np3_el_gr/menu_el_gr.rc
+++ b/language/np3_el_gr/menu_el_gr.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Μετατροπή διαστημάτων εσο&χής σε στηλοθέτες\tCtrl+Alt+T",     IDM_EDIT_CONVERTSPACES2
             MENUITEM "Μετατροπή στηλοθετών εσ&οχής σε διαστήματα\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "Κ&ωδικοποίηση URL\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "&Αποκωδικοποίηση URL\tCtrl+Shift+R",      IDM_EDIT_URLDECODE
             MENUITEM "Διαδρομή συστήματος αρχείων σε URL",      IDM_EDIT_PATH2URL
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index bc9f58c52..e6029ae33 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bify Indent\tCtrl+Alt+T",        IDM_EDIT_CONVERTSPACES2
             MENUITEM "Untabi&fy Indent\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
             MENUITEM "File System Path to URL",           IDM_EDIT_PATH2URL
diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc
index fc2ed2d9d..98ee194de 100644
--- a/language/np3_es_419/menu_es_419.rc
+++ b/language/np3_es_419/menu_es_419.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bular la sangría\tCtrl+Alt+T",                 IDM_EDIT_CONVERTSPACES2
             MENUITEM "Destabular la &sangría\tCtrl+Alt+S",              IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Codificar",                               IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decodificar",                             IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&Codificar URL\tCtrl+Shift+E",                    IDM_EDIT_URLENCODE
             MENUITEM "D&ecodificar URL\tCtrl+Shift+R",                  IDM_EDIT_URLDECODE
             MENUITEM "Ruta sistema-archivos como URL",                  IDM_EDIT_PATH2URL
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 69655fff9..960542a9d 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bular la sangría\tCtrl+Alt+T",                 IDM_EDIT_CONVERTSPACES2
             MENUITEM "Destabular la &sangría\tCtrl+Alt+S",              IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Codificar",                               IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decodificar",                             IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&Codificar URL\tCtrl+Shift+E",                    IDM_EDIT_URLENCODE
             MENUITEM "D&ecodificar URL\tCtrl+Shift+R",                  IDM_EDIT_URLDECODE
             MENUITEM "Ruta sistema-archivos como URL",                  IDM_EDIT_PATH2URL
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 41e7c90fd..f4efc20a4 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&buler le Retrait\tCtrl+Alt+T",                 IDM_EDIT_CONVERTSPACES2
             MENUITEM "Détabuler le R&etrait\tCtrl+Alt+S",               IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encodage",                                IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Décodage",                                IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&URL Encodage\tCtrl+Shift+E",                     IDM_EDIT_URLENCODE
             MENUITEM "URL &Décodage\tCtrl+Shift+R",                     IDM_EDIT_URLDECODE
             MENUITEM "Chemin système-fichiers comme URL",               IDM_EDIT_PATH2URL
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index 82e5dae51..19be9d05b 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "इंडेंट Tabify करें (&A)\tCtrl+Alt+T",        IDM_EDIT_CONVERTSPACES2
             MENUITEM "इंडेंट Untabify करें (&F)\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL एन्कोड (&E)\tCtrl+Shift+E",           IDM_EDIT_URLENCODE
             MENUITEM "URL डिकोड (&D)\tCtrl+Shift+R",           IDM_EDIT_URLDECODE
             MENUITEM "File System Path to URL",                IDM_EDIT_PATH2URL
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 6c8808dad..7049be817 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Behúzás Tab&ulátorrá\tCtrl+Alt+T",           IDM_EDIT_CONVERTSPACES2
             MENUITEM "Behúzás Tab-m&entes\tCtrl+Alt+S",            IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            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
             MENUITEM "Fájlrendszer útvonal URL-re",                IDM_EDIT_PATH2URL
diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc
index 82b8b7d68..b3b70cf64 100644
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bify Indent\tCtrl+Alt+T",        IDM_EDIT_CONVERTSPACES2
             MENUITEM "Untabi&fy Indent\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
             MENUITEM "File System Path to URL",           IDM_EDIT_PATH2URL
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 3a51e2c00..a6a90fe3f 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Indentazione: Spazi -> Ta&b\tCtrl+Alt+T",   IDM_EDIT_CONVERTSPACES2
             MENUITEM "Indentazione: Tab -> Spa&zi\tCtrl+Alt+S",   IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&URL Encode\tCtrl+Shift+E",                 IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",                 IDM_EDIT_URLDECODE
             MENUITEM "Da Percorso di File System a URL",          IDM_EDIT_PATH2URL
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 0b1d94ce7..f1d4ec95b 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "インデントをタブに\tCtrl+Alt+T",               IDM_EDIT_CONVERTSPACES2
             MENUITEM "インデントを空白に\tCtrl+Alt+S",              IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URLエンコード(&E)\tCtrl+Shift+E",            IDM_EDIT_URLENCODE
             MENUITEM "URLデコード(&D)\tCtrl+Shift+R",             IDM_EDIT_URLDECODE
             MENUITEM "ファイルシステムのパスをURLへ",                IDM_EDIT_PATH2URL
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 59492a5e4..3dae68652 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "들여쓰기 탭 지정(&B)\tCtrl+Alt+T",           IDM_EDIT_CONVERTSPACES2
             MENUITEM "들여쓰기 탭 해제(&F)\tCtrl+Alt+S",           IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL 인코딩(&E)\tCtrl+Shift+E",               IDM_EDIT_URLENCODE
             MENUITEM "URL 디코딩(&D)\tCtrl+Shift+R",               IDM_EDIT_URLDECODE
             MENUITEM "URL에 대한 파일 시스템 경로",                   IDM_EDIT_PATH2URL
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 55bccce61..d11b5d6f5 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&b inspringen\tCtrl+Alt+T",                 IDM_EDIT_CONVERTSPACES2
             MENUITEM "Untab ins&pringen\tCtrl+Alt+S",               IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                              IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                              IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&URL Encode\tCtrl+Shift+E",                   IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",                   IDM_EDIT_URLDECODE
             MENUITEM "Bestands-systeem pad als URL",                IDM_EDIT_PATH2URL
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 4f72438d8..a99db9a45 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Wcięcia tabulatorami\tCtrl+Alt+T",            IDM_EDIT_CONVERTSPACES2
             MENUITEM "Wcięcia spacjami\tCtrl+Alt+S",                IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&Koduj URL\tCtrl+Shift+E",                    IDM_EDIT_URLENCODE
             MENUITEM "Dekoduj URL\tCtrl+Shift+R",                   IDM_EDIT_URLDECODE
             MENUITEM "Ścieżka systemu plików do URL",               IDM_EDIT_PATH2URL
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index ad56172e5..b30ccae5b 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bular Indentação\tCtrl+Alt+T",      IDM_EDIT_CONVERTSPACES2
             MENUITEM "Destabu&lar Indentação\tCtrl+Alt+S",   IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "Codificar &URL\tCtrl+Shift+E",             IDM_EDIT_URLENCODE
             MENUITEM "&Decodificar URL\tCtrl+Shift+R",           IDM_EDIT_URLDECODE
             MENUITEM "Caminho do Arquivo do Sistema para URL",   IDM_EDIT_PATH2URL
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index 469fd1848..2a9e16980 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bular indentação\tCtrl+Alt+T",                  IDM_EDIT_CONVERTSPACES2
             MENUITEM "Remover tabulação da indentação\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "Codificar &URL\tCtrl+Shift+E",          IDM_EDIT_URLENCODE
             MENUITEM "&Descodificar URL\tCtrl+Shift+R",       IDM_EDIT_URLDECODE
             MENUITEM "Caminho do sistema de ficheiros para URL",               IDM_EDIT_PATH2URL
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index ce9181841..596ff91a7 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Т&абуляции вместо пробелов в отступах\tCtrl+Alt+T",       IDM_EDIT_CONVERTSPACES2
             MENUITEM "Про&белы вместо табуляции в отступах\tCtrl+Alt+S",        IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "Ко&дировать URL\tCtrl+Shift+E",                   IDM_EDIT_URLENCODE
             MENUITEM "Дек&одировать URL\tCtrl+Shift+R",                 IDM_EDIT_URLDECODE
             MENUITEM "Системный путь в URL",                            IDM_EDIT_PATH2URL
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index 823962ed7..d0a532e34 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bify odsadenie\tCtrl+Alt+T",       IDM_EDIT_CONVERTSPACES2
             MENUITEM "Untabi&fy odsadenie\tCtrl+Alt+S",     IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "&Kódovať URL\tCtrl+Shift+E",          IDM_EDIT_URLENCODE
             MENUITEM "&Dekódovať URL\tCtrl+Shift+R",        IDM_EDIT_URLDECODE
             MENUITEM "Systémová cesta súboru na URL",       IDM_EDIT_PATH2URL
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index 95b335338..3aabd138d 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Konvertera indrag till tab\tCtrl+Alt+T",      IDM_EDIT_CONVERTSPACES2
             MENUITEM "Ta bort tab för indrag\tCtrl+Alt+S",          IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL-kodning\tCtrl+Shift+E",                      IDM_EDIT_URLENCODE
             MENUITEM "Ta bort URL-kodning\tCtrl+Shift+R",           IDM_EDIT_URLDECODE
             MENUITEM "Filsystemets sökväg till URL",                IDM_EDIT_PATH2URL
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index db733fe03..70e80260c 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bify Indent\tCtrl+Alt+T",        IDM_EDIT_CONVERTSPACES2
             MENUITEM "Untabi&fy Indent\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
             MENUITEM "File System Path to URL",           IDM_EDIT_PATH2URL
diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc
index ee6f0326d..bf857e1a8 100644
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "Ta&bify Indent\tCtrl+Alt+T",        IDM_EDIT_CONVERTSPACES2
             MENUITEM "Untabi&fy Indent\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL &Encode\tCtrl+Shift+E",         IDM_EDIT_URLENCODE
             MENUITEM "URL &Decode\tCtrl+Shift+R",         IDM_EDIT_URLDECODE
             MENUITEM "File System Path to URL",           IDM_EDIT_PATH2URL
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 9114ad776..e06c7ed1b 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "转换行首空格为制表符(&B)\tCtrl+Alt+T",    IDM_EDIT_CONVERTSPACES2
             MENUITEM "转换行首制表符为空格(&F)\tCtrl+Alt+S",    IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL 编码(&E)\tCtrl+Shift+E",            IDM_EDIT_URLENCODE
             MENUITEM "URL 解码(&D)\tCtrl+Shift+R",            IDM_EDIT_URLDECODE
             MENUITEM "转换文件路径为 URL",               IDM_EDIT_PATH2URL
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index 509ccecc7..7bde40b50 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -263,6 +263,9 @@ BEGIN
             MENUITEM "轉換行首空格為TAB(&B)\tCtrl+Alt+T",      IDM_EDIT_CONVERTSPACES2
             MENUITEM "轉換行首TAB為空格(&F)\tCtrl+Alt+S",      IDM_EDIT_CONVERTTABS2
             MENUITEM SEPARATOR
+            MENUITEM "Base&64 Encode",                    IDM_EDIT_BASE64ENCODE
+            MENUITEM "Base6&4 Decode",                    IDM_EDIT_BASE64DECODE
+            MENUITEM SEPARATOR
             MENUITEM "URL 編碼(&E)\tCtrl+Shift+E",            IDM_EDIT_URLENCODE
             MENUITEM "URL 解碼(&D)\tCtrl+Shift+R",            IDM_EDIT_URLDECODE
             MENUITEM "File System Path to URL",               IDM_EDIT_PATH2URL
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 0e9c9c8c6..2cdf99f8d 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.429.1"
+    version="5.21.506.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 148aa6fd2..82269366e 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 429
+#define VERSION_REV 506
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 502
 #define LEXILLA_VER 502