diff --git a/Build/Changes.txt b/Build/Changes.txt
index 96a9dde10..50252c198 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -40,6 +40,7 @@ Current BETA/RC Version 5.21.419.(build_#) (2021-04-19)
 NEW:
 --------------------------------------------------------
 [.###.#]- .
+[.419.2]- Line Comment Add/Remove commands, additonal to existing Toggle.
 [.415.1]- Cut lines for rectangular and multi selection.
 [.412.1]- Use 'Ctrl+' key to force dropping files into new instance (Ctrl+ for new instance).
 [.402.1]- ScintillaWin horizontal mouse-wheel support.
@@ -60,6 +61,8 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.419.2]- Comment BockEdit shortcut changed (Ctl+Alt+Q => Alt+Shift+Q).
+[.419.2]- Comment has separate popup menu (Edit -> Selection).
 [.419.1]- Move some Lexer related functions to other module.
 [.419.1]- Enable compiler warnings level 4 and issue "Warnings as Errors" (for Lexilla, Scintilla, grepWinNP3).
 [.417.1]- Remove short-note from wrap around match tooltip.
@@ -144,6 +147,7 @@ FIXES:
 REMOVED:
 --------------------------------------------------------
 [.###.#]- .
+[.419.2]- Removing the font-style string for font selection.
 [.411.1]- Remove deprecated WinXP support (no horiz. mouse wheel).
 [.311.1]- Obsolete SCI_LEXER preproc symbol / no need to link lexers in Scintilla.
 
diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt
index e858c224b..5115e648e 100644
--- a/Build/Docs/KeyboardShortcuts.txt
+++ b/Build/Docs/KeyboardShortcuts.txt
@@ -8,7 +8,7 @@
 ================================================================================
 
 
-*** Keyboard Shortcuts for Notepad3 ***              date: 2021/03/09
+*** Keyboard Shortcuts for Notepad3 ***              date: 2021-04-19
 ---------------------------------------------------------------------
 
 
@@ -111,8 +111,6 @@
 
       Selection
       ---------
-        Ctrl+Q                Block Comment (Toggle).
-        Ctrl+Alt+Q            Line Comment Block Edit
         Ctrl+Shift+Q          Stream Comment.
         Ctrl+D                Duplicate Selection or Line.
         Alt+B                 Pad with Blanks.
@@ -129,6 +127,13 @@
         Shift+Tab             Unindent Selected Block.
         Ctrl+Tab              Insert Tabulator.
 
+          Line Comment
+          ------------
+            Ctrl+Q                Toggle.
+            Ctrl+Alt+Q            Add.
+            Ctrl+Alt+Shift+Q      Remove.
+            Alt+Shift+Q           Block Edit.
+
           Enclose Selection
           ------------------
             Ctrl+1            Enclose within '' (Single Quotes).
diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/language/Line numbers to translate_2021-04-13 (April).png b/language/Line numbers to translate_2021-04-13 (April).png
deleted file mode 100644
index ce004208f..000000000
Binary files a/language/Line numbers to translate_2021-04-13 (April).png and /dev/null differ
diff --git a/language/Line numbers to translate_2021-04-19 (April).png b/language/Line numbers to translate_2021-04-19 (April).png
new file mode 100644
index 000000000..bcdf4f608
Binary files /dev/null and b/language/Line numbers to translate_2021-04-19 (April).png differ
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 75664663a..7801aa2b4 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -209,10 +209,15 @@ BEGIN
             MENUITEM "&Inkeep",                             IDM_EDIT_INDENT
             MENUITEM "&Ontkeep",                            IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "L&yn Kommentaar (Toggle)\tCtrl+Q",                IDM_EDIT_LINECOMMENT
-            MENUITEM "Wysiging van Lyn Kommentaarblok\tCtrl+Alt+Q",     IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q",                IDM_EDIT_STREAMCOMMENT
+            MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q",  IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
             POPUP "Omsluit S&eleksie"
             BEGIN
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index c032f889f..7b1345bb1 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -209,10 +209,15 @@ BEGIN
             MENUITEM "&Дадаць водступ",                    IDM_EDIT_INDENT
             MENUITEM "&Выдаліць водступ",                  IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Каментарыі (пераключыць)\tCtrl+Q",                IDM_EDIT_LINECOMMENT
-            MENUITEM "Блокавае рэдагаванне каментарыяў\tCtrl+Alt+Q",     IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "&Блокавы каментарый\tCtrl+Shift+Q",  IDM_EDIT_STREAMCOMMENT
+            MENUITEM "&Блокавы каментарый\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
             POPUP "&Абгарнуць вылучэнне"
             BEGIN
diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc
index 244dfb2af..b7086cc15 100644
--- a/language/np3_el_gr/menu_el_gr.rc
+++ b/language/np3_el_gr/menu_el_gr.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Εσοχή",                                          IDM_EDIT_INDENT
             MENUITEM "&Κατάργηση εσοχής",                               IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Σχόλιο γραμμής (εναλλαγή)\tCtrl+Q",              IDM_EDIT_LINECOMMENT
-            MENUITEM "Επεξεργάσιμο &τμήμα σχολίου γραμμής\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Σχόλιο &πολλαπλών γραμμών\tCtrl+Shift+Q",         IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index 24a206619..b45618b51 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -209,10 +209,15 @@ BEGIN
             MENUITEM "&Indent",                              IDM_EDIT_INDENT
             MENUITEM "&Unindent",                            IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "Line &Comment (Toggle)\tCtrl+Q",       IDM_EDIT_LINECOMMENT
-            MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "St&ream Comment\tCtrl+Shift+Q",        IDM_EDIT_STREAMCOMMENT
+            MENUITEM "St&ream Comment\tCtrl+Shift+Q",     IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
             POPUP "&Enclose Selection"
             BEGIN
diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc
index 29fae0014..4adddc8ed 100644
--- a/language/np3_es_419/menu_es_419.rc
+++ b/language/np3_es_419/menu_es_419.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Aumentar la sangría",                            IDM_EDIT_INDENT
             MENUITEM "&Reducir la sangría",                             IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q",               IDM_EDIT_LINECOMMENT
-            MENUITEM "Editar bloque de &comentario de línea\tCtrl+Alt+Q",   IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "&Comentario de línea"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",                             IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",                            IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Eliminar\tCtrl+Alt+Shift+Q",                 IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Editar bloque de comentario\tAlt+Shift+Q",   IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q",               IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 98b3f272f..5e189b0e8 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -209,10 +209,15 @@ BEGIN
             MENUITEM "&Aumentar la sangría",                            IDM_EDIT_INDENT
             MENUITEM "&Reducir la sangría",                             IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q",               IDM_EDIT_LINECOMMENT
-            MENUITEM "Editar bloque de &comentario de línea\tCtrl+Alt+Q",   IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "&Comentario de línea"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",                             IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",                            IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Eliminar\tCtrl+Alt+Shift+Q",                 IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Editar bloque de comentario\tAlt+Shift+Q",   IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q",               IDM_EDIT_STREAMCOMMENT
+            MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q",           IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
             POPUP "&Envolver selección"
             BEGIN
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 0237c8bdb..b67345114 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -209,10 +209,15 @@ BEGIN
             MENUITEM "&Mettre en Retrait",                              IDM_EDIT_INDENT
             MENUITEM "&Réduire le Retrait",                             IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Commentaire de Ligne (Alterner)\tCtrl+Q",            IDM_EDIT_LINECOMMENT
-            MENUITEM "Éditer bloc de Lignes de &Commentaires\tCtrl+Alt+Q",  IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "&Commentaire de Ligne"
+            BEGIN
+                MENUITEM "&Alterner\tCtrl+Q",                           IDM_EDIT_LINECOMMENT
+                MENUITEM "&Ajouter\tCtrl+Alt+Q",                        IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Supprimer\tCtrl+Alt+Shift+Q",                IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Éditer Bloc de Commentaire\tAlt+Shift+Q",    IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
-            MENUITEM "Commentaire &Multiligne\tCtrl+Shift+Q",               IDM_EDIT_STREAMCOMMENT
+            MENUITEM "Commentaire &Multiligne\tCtrl+Shift+Q",           IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
             POPUP "&Entourer la Sélection"
             BEGIN
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index a38e36f79..cd6724200 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "इंडेंट (&I)",                                  IDM_EDIT_INDENT
             MENUITEM "इंडेंट हटाएं (&U)",                             IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "रेखा टिप्पणी (टॉगल)(&C)\tCtrl+Q",               IDM_EDIT_LINECOMMENT
-            MENUITEM "लाइन टिप्पणी ब्लॉक संपादित करें (&O)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q",            IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index be8d95f81..1192ea9a1 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Behúzás",                           IDM_EDIT_INDENT
             MENUITEM "Behúzás törlése",                    IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Sor megjegyzés (váltás)\tCtrl+Q",                 IDM_EDIT_LINECOMMENT
-            MENUITEM "Vonal megjegyzés bl&okk szerkesztése\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "&Blokk megjegyzés\tCtrl+Shift+Q",            IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc
index 3ff1adcc1..a2b94ef80 100644
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Indent",                              IDM_EDIT_INDENT
             MENUITEM "&Unindent",                            IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "Line &Comment (Toggle)\tCtrl+Q",       IDM_EDIT_LINECOMMENT
-            MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "St&ream Comment\tCtrl+Shift+Q",        IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 626303b83..0ce7a1a79 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Indenta",                             IDM_EDIT_INDENT
             MENUITEM "&Rimuovi indentazione",                IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Commenta riga (attiva/disattiva)\tCtrl+Q", IDM_EDIT_LINECOMMENT
-            MENUITEM "Modifica &blocco commenti\tCtrl+Alt+Q",     IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "&Commento multi-riga\tCtrl+Shift+Q",        IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index c6cbe647d..428005564 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "インデント(&I)\tTab",                      IDM_EDIT_INDENT
             MENUITEM "逆インデント(&U)\tShift+Tab",              IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "行コメント(切替)(&C)\tCtrl+Q",             IDM_EDIT_LINECOMMENT
-            MENUITEM "行コメントブロック編集(&O)\tCtrl+Alt+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "ブロックコメント(&R)\tCtrl+Shift+Q",         IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 16c5e4955..781e69bc5 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "들여쓰기(&I)",                           IDM_EDIT_INDENT
             MENUITEM "내어쓰기(&U)",                           IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "줄 주석 (전환)(&C)\tCtrl+Q",              IDM_EDIT_LINECOMMENT
-            MENUITEM "줄 주석 블록 편집(&O)\tCtrl+Alt+Q",       IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "스트림 주석(&R)\tCtrl+Shift+Q",           IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index a0523f3e9..842bc4c34 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Inspringen",                                  IDM_EDIT_INDENT
             MENUITEM "Teru&gspringen",                               IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q",            IDM_EDIT_LINECOMMENT
-            MENUITEM "Lijn &commentaarblok bewerken\tCtrl+Alt+Q",    IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Lijn commentaar"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",                         IDM_EDIT_LINECOMMENT
+                MENUITEM "&Toevoegen\tCtrl+Alt+Q",                  IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Verwijderen\tCtrl+Alt+Shift+Q",          IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "Commentaarblok &bewerken\tAlt+Shift+Q",   IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q",        IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index db5d60eee..c5eab23e0 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Wcięcie",                              IDM_EDIT_INDENT
             MENUITEM "&Bez wcięcia",                          IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Komentarz liniowy (Toggle)\tCtrl+Q",              IDM_EDIT_LINECOMMENT
-            MENUITEM "Edycję wierszy bloku komentarzy\tCtrl+Alt+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "&Komentarz strumieniowy\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index ded52ba2b..e2374aa9f 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Indentar",                         IDM_EDIT_INDENT
             MENUITEM "&Remover Indentar",                 IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "Comentário de &Linha (Alternar)\tCtrl+Q",          IDM_EDIT_LINECOMMENT
-            MENUITEM "Edição de Bloco de Linha &Comentário\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Comentário de &Bloco\tCtrl+Shift+Q",               IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index 5a285cb60..8c3fb2f1c 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Indentar",                               IDM_EDIT_INDENT
             MENUITEM "&Desindentar",                            IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Linha de comentário (Alternar)\tCtrl+Q",             IDM_EDIT_LINECOMMENT
-            MENUITEM "Edição de bloco de &comentário de linha\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Vária&s linhas de comentário\tCtrl+Shift+Q",          IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 0d01814b3..631356a3d 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Добавить отступ",                  IDM_EDIT_INDENT
             MENUITEM "&Удалить отступ",                   IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Комментарий (вкл./выкл.)\tCtrl+Q",                   IDM_EDIT_LINECOMMENT
-            MENUITEM "Блочное редактирование &комментариев\tCtrl+Alt+Q",    IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "&Блочный комментарий\tCtrl+Shift+Q",          IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index 7b6eb967d..6f668f205 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Odsadenie",                          IDM_EDIT_INDENT
             MENUITEM "Z&rušiť odsadenie",                   IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "&Riadkový komentár (zap./vyp.)\tCtrl+Q",      IDM_EDIT_LINECOMMENT
-            MENUITEM "Úpravu bloku &komentára riadka\tCtrl+Alt+Q",  IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Pr&enos komentára\tCtrl+Shift+Q",         IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index e5bb3198c..fa092549b 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "Skapa indrag",                                IDM_EDIT_INDENT
             MENUITEM "Ta bort indrag",                              IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "Linjekommentar (växla)\tCtrl+Q",              IDM_EDIT_LINECOMMENT
-            MENUITEM "Redigering av radkommentar\tCtrl+Alt+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "Strömkommentar\tCtrl+Shift+Q",                IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 4bec7fa46..c4f1da54a 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Indent",                              IDM_EDIT_INDENT
             MENUITEM "&Unindent",                            IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "Line &Comment (Toggle)\tCtrl+Q",       IDM_EDIT_LINECOMMENT
-            MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "St&ream Comment\tCtrl+Shift+Q",        IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc
index fc347a4ef..c4afde5ab 100644
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "&Indent",                              IDM_EDIT_INDENT
             MENUITEM "&Unindent",                            IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "Line &Comment (Toggle)\tCtrl+Q",       IDM_EDIT_LINECOMMENT
-            MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "St&ream Comment\tCtrl+Shift+Q",        IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 1e98a35ed..ab0113211 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "增加缩进(&I)",                           IDM_EDIT_INDENT
             MENUITEM "减少缩进(&U)",                           IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "切换行注释(&C)\tCtrl+Q",                   IDM_EDIT_LINECOMMENT
-            MENUITEM "使用矩形编辑模式切换行注释(&O)\tCtrl+Alt+Q",             IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "添加块注释(&R)\tCtrl+Shift+Q",             IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index d1a035b1c..c9152fc66 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -209,8 +209,13 @@ BEGIN
             MENUITEM "增加縮排(&I)",                           IDM_EDIT_INDENT
             MENUITEM "減少縮排(&U)",                           IDM_EDIT_UNINDENT
             MENUITEM SEPARATOR
-            MENUITEM "切換行註釋(&C)\tCtrl+Q",                   IDM_EDIT_LINECOMMENT
-            MENUITEM "行註釋塊編輯(&O)\tCtrl+Alt+Q",             IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            POPUP "Line &Comment"
+            BEGIN
+                MENUITEM "&Toggle\tCtrl+Q",               IDM_EDIT_LINECOMMENT
+                MENUITEM "&Add\tCtrl+Alt+Q",              IDM_EDIT_LINECOMMENT_ADD
+                MENUITEM "&Remove\tCtrl+Alt+Shift+Q",     IDM_EDIT_LINECOMMENT_REMOVE
+                MENUITEM "&Block Edit\tAlt+Shift+Q",      IDM_EDIT_LINECOMMENT_BLOCKEDIT
+            END
             MENUITEM SEPARATOR
             MENUITEM "新增塊註釋(&R)\tCtrl+Shift+Q",             IDM_EDIT_STREAMCOMMENT
             MENUITEM SEPARATOR
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index d44405353..766206fa7 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.21.419.1"
+    version="5.21.419.2"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 3f533955d..78321ed74 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
 #define VERSION_REV 419
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 501
 #define LEXILLA_VER 501
 #define ONIGURUMA_REGEX_VER 6.9.6