diff --git a/Build/Changes.txt b/Build/Changes.txt
index b221ad1a7..6417df415 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package
 
 
 =====================================================
-Current BETA Version 5.20.727.(build_#) (2020-07-27)
+Current BETA Version 5.20.729.(build_#) (2020-07-29)
 =====================================================
 
 -----------------------------------------------------
@@ -46,6 +46,7 @@ NEW:
 CHANGES:
 -----------------------------------------------------
 - 
+- Swap Shortcuts: "Search in Files" -> "Ctrl+Shift+F" and Toggle Folds -> "Ctrl+Alt+F".
 - Review document modified handler (dirty-flag).
 - Update grepWinNP3 (GRE) version 2.1.3.21 (2020-07-24).
 - Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-05).
diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt
index 75efa0e5d..01f212c5c 100644
--- a/Build/Docs/KeyboardShortcuts.txt
+++ b/Build/Docs/KeyboardShortcuts.txt
@@ -8,7 +8,7 @@
 ================================================================================
 
 
-*** Keyboard Shortcuts ***               date: 2020/03/18
+*** Keyboard Shortcuts ***               date: 2020/07/29
 ---------------------------------------------------------
 
 
@@ -32,7 +32,7 @@
 
       Launch
       ------
-        Ctrl+Alt+F            Search in Files.
+        Ctrl+Shift+F          Search in Files.
         Alt+N                 Open Document in New Window.
         Alt+Shift+N           Open New Empty Window.
         Ctrl+L                Launch Document.
@@ -199,7 +199,7 @@
         Ctrl+H                Replace...
         F4                    Replace Next.
         Ctrl+G                Jump to Line...
-        Ctrl+Alt+F            Search in Files.
+        Ctrl+Shift+F          Search in Files.
 
 
   VIEW
@@ -222,7 +222,7 @@
 
       Folding
       -------
-        Ctrl+Shift+F          Toggle All Folds.
+        Ctrl+Alt+F            Toggle All Folds.
         Alt+ +                Jump Next Fold.
         Alt+ –                Jump Prev Fold.
         Alt+ ←                Collapse Fold.
diff --git a/Versions/day.txt b/Versions/day.txt
index 5a9a14151..1f276db26 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-727
+729
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 6cc31aa62..43f804a24 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Begin"
         BEGIN
-            MENUITEM "&Soek in lêers\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "&Soek in lêers\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nuwe Venster\tAlt+N",                IDM_FILE_NEWWINDOW
             MENUITEM "Lê&er Venster\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Vervang Volge&nde\tF4",                        IDM_EDIT_REPLACENEXT
             MENUITEM "&Gaan na...\tCtrl+G",                          IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Soek in lêers\tCtrl+Alt+F",                 IDM_GREP_WIN_SEARCH
+            MENUITEM "&Soek in lêers\tCtrl+Shift+F",                 IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Aansig"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Vou"
         BEGIN
             MENUITEM "&Kode Vou",                           IDM_VIEW_FOLDING
-            MENUITEM "&Wissel Voue\tCtrl+Shift+F",          IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Wissel Voue\tCtrl+Alt+F",          IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Spring &Volgende Vou\tAlt+ +",        CMD_FOLDJUMPDOWN
             MENUITEM "&Spring Vorige Vou\tAlt+ –",          CMD_FOLDJUMPUP
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index 581ba3ca8..629f130a7 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Запусціць"
         BEGIN
-            MENUITEM "&Шукаць у файлах\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Шукаць у файлах\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "Копі&ю акна\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Пустое акно\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "За&мяніць далей\tF4",                         IDM_EDIT_REPLACENEXT
             MENUITEM "Пе&райсці...\tCtrl+G",                        IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Шукаць у файлах\tCtrl+Alt+F",                IDM_GREP_WIN_SEARCH
+            MENUITEM "&Шукаць у файлах\tCtrl+Shift+F",                IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Выгляд"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Блокі коду"
         BEGIN
             MENUITEM "Згорт&ванне блокаў коду",                 IDM_VIEW_FOLDING
-            MENUITEM "Згарнуць/ра&згарнуць блок\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Згарнуць/ра&згарнуць блок\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Перайсці да &наступнага блоку\tAlt+ +",    CMD_FOLDJUMPDOWN
             MENUITEM "Перайсці да &папярэдняга блоку\tAlt+ –",   CMD_FOLDJUMPUP
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 92f3a8d89..d7124c8e3 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Starte"
         BEGIN
-            MENUITEM "Suche in &Dateien\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "Suche in &Dateien\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Neues Fenster\tAlt+N",               IDM_FILE_NEWWINDOW
             MENUITEM "&Leeres Fenster\tAlt+Shift+N",        IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Ersetze Nächstes\tF4",                    IDM_EDIT_REPLACENEXT
             MENUITEM "&Gehe zu...\tCtrl+G",                     IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "Suche in &Dateien\tCtrl+Alt+F",           IDM_GREP_WIN_SEARCH
+            MENUITEM "Suche in &Dateien\tCtrl+Shift+F",           IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Ansicht"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "Code &Faltung"
         BEGIN
             MENUITEM "&Aktiviere Faltung",                      IDM_VIEW_FOLDING
-            MENUITEM "Alle Falten &Umschalten\tCtrl+Shift+F",   IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Alle Falten &Umschalten\tCtrl+Alt+F",   IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Gehe zur &Nächsten\tAlt+ +",              CMD_FOLDJUMPDOWN
             MENUITEM "Gehe zur &Vorherigen\tAlt+ –",            CMD_FOLDJUMPUP
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index e1469ce70..f17184759 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Launch"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&New Window\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Empty Window\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Replace Ne&xt\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Goto...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&View"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
-            MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle Folds\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index d8716733a..ff45d8831 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Launch"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&New Window\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Empty Window\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Replace Ne&xt\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Goto...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&View"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
-            MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle Folds\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 4e330a33f..1c3e6da66 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "Lan&zar"
         BEGIN
-            MENUITEM "B&uscar en archivos\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "B&uscar en archivos\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nueva ventana\tAlt+N",               IDM_FILE_NEWWINDOW
             MENUITEM "V&entana vacía\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Ree&mplazar siguiente\tF4",                       IDM_EDIT_REPLACENEXT
             MENUITEM "&Ir a...\tCtrl+G",                                IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "B&uscar en archivos\tCtrl+Alt+F",                    IDM_GREP_WIN_SEARCH
+            MENUITEM "B&uscar en archivos\tCtrl+Shift+F",                    IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Vista"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Plegable"
         BEGIN
             MENUITEM "&Código plegable",                    IDM_VIEW_FOLDING
-            MENUITEM "&Alternar pliegues\tCtrl+Shift+F",    IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Alternar pliegues\tCtrl+Alt+F",    IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "&Ir al siguiente pliegue\tAlt+ +",    CMD_FOLDJUMPDOWN
             MENUITEM "I&r al pliegue anterior\tAlt+ –",     CMD_FOLDJUMPUP
diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc
index b3fde6c8e..52fa99fb9 100644
--- a/language/np3_es_mx/menu_es_mx.rc
+++ b/language/np3_es_mx/menu_es_mx.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "Lan&zar"
         BEGIN
-            MENUITEM "B&uscar en archivos\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "B&uscar en archivos\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nueva ventana\tAlt+N",               IDM_FILE_NEWWINDOW
             MENUITEM "V&entana vacía\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Ree&mplazar siguiente\tF4",                       IDM_EDIT_REPLACENEXT
             MENUITEM "&Ir a...\tCtrl+G",                                IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "B&uscar en archivos\tCtrl+Alt+F",                    IDM_GREP_WIN_SEARCH
+            MENUITEM "B&uscar en archivos\tCtrl+Shift+F",                    IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Vista"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Plegable"
         BEGIN
             MENUITEM "&Código plegable",                    IDM_VIEW_FOLDING
-            MENUITEM "&Alternar pliegues\tCtrl+Shift+F",    IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Alternar pliegues\tCtrl+Alt+F",    IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "&Ir al siguiente pliegue\tAlt+ +",    CMD_FOLDJUMPDOWN
             MENUITEM "I&r al pliegue anterior\tAlt+ –",     CMD_FOLDJUMPUP
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index eab83ca65..3a52b1306 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Lancer"
         BEGIN
-            MENUITEM "Rec&hercher dans fichiers\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "Rec&hercher dans fichiers\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nouvelle fenêtre\tAlt+N",            IDM_FILE_NEWWINDOW
             MENUITEM "&Fenêtre vide\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Remplacer suivan&t\tF4",                          IDM_EDIT_REPLACENEXT
             MENUITEM "&Aller à...\tCtrl+G",                             IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "Rec&hercher dans fichiers\tCtrl+Alt+F",                    IDM_GREP_WIN_SEARCH
+            MENUITEM "Rec&hercher dans fichiers\tCtrl+Shift+F",                    IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Affichage"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Pliage"
         BEGIN
             MENUITEM "&Code pliage",                        IDM_VIEW_FOLDING
-            MENUITEM "Al&terner pliages\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Al&terner pliages\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "&Aller pli suivant\tAlt+ +",          CMD_FOLDJUMPDOWN
             MENUITEM "All&er pli précédent\tAlt+ –",        CMD_FOLDJUMPUP
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index 684546a88..760a3f86c 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Launch"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&New Window\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Empty Window\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Replace Ne&xt\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Goto...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&View"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
-            MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle Folds\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index c0c369c59..eea863ca7 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "In&dítás"
         BEGIN
-            MENUITEM "Keresés &fájlokban\tCtrl+Alt+F",     IDM_GREP_WIN_SEARCH
+            MENUITEM "Keresés &fájlokban\tCtrl+Shift+F",     IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Új ablak\tAlt+N",                   IDM_FILE_NEWWINDOW
             MENUITEM "&Üres ablak\tAlt+Shift+N",           IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Következő cse&réje\tF4",                 IDM_EDIT_REPLACENEXT
             MENUITEM "&Ugrás...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "Keresés &fájlokban\tCtrl+Alt+F",         IDM_GREP_WIN_SEARCH
+            MENUITEM "Keresés &fájlokban\tCtrl+Shift+F",         IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Nézet"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Behajtások"
         BEGIN
             MENUITEM "Kó&dblokk behajtások",                    IDM_VIEW_FOLDING
-            MENUITEM "Kódblokk &váltás\tCtrl+Shift+F",          IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Kódblokk &váltás\tCtrl+Alt+F",          IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Ugrás a &köv. behajtásra\tAlt+ +",        CMD_FOLDJUMPDOWN
             MENUITEM "Ugrás az &előző behajtásra\tAlt+ –",      CMD_FOLDJUMPUP
diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc
index f191d4d45..867b7a665 100644
--- a/language/np3_id_id/menu_id_id.rc
+++ b/language/np3_id_id/menu_id_id.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Launch"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&New Window\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Empty Window\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Replace Ne&xt\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Goto...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&View"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
-            MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle Folds\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 907bf39b1..9f7f9d36b 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Esegui"
         BEGIN
-            MENUITEM "&Cerca nei file\tCtrl+Alt+F",      IDM_GREP_WIN_SEARCH
+            MENUITEM "&Cerca nei file\tCtrl+Shift+F",      IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nuova finestra\tAlt+N",            IDM_FILE_NEWWINDOW
             MENUITEM "&Finestra vuota\tAlt+Shift+N",      IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Sostituisci successivo\tF4",                IDM_EDIT_REPLACENEXT
             MENUITEM "&Vai a...\tCtrl+G",                         IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Cerca nei file\tCtrl+Alt+F",              IDM_GREP_WIN_SEARCH
+            MENUITEM "&Cerca nei file\tCtrl+Shift+F",              IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Visualizza"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                              IDM_VIEW_FOLDING
-            MENUITEM "&Attiva/Disattiva Folds\tCtrl+Shift+F",      IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Attiva/Disattiva Folds\tCtrl+Alt+F",      IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Salta al Prossimo Fold\tAlt+ +",             CMD_FOLDJUMPDOWN
             MENUITEM "Salta al Precedente Fold\tAlt+ –",           CMD_FOLDJUMPUP
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index e3ad37a48..6852e8d9e 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "起動(&L)"
         BEGIN
-            MENUITEM "ファイル群から検索(&S)\tCtrl+Alt+F",             IDM_GREP_WIN_SEARCH
+            MENUITEM "ファイル群から検索(&S)\tCtrl+Shift+F",             IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "同じファイルを開く(&N)\tAlt+N",             IDM_FILE_NEWWINDOW
             MENUITEM "新規ウィンドウ(&E)\tAlt+Shift+N",           IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "置換し次へ(&X)\tF4",                         IDM_EDIT_REPLACENEXT
             MENUITEM "指定行へジャンプ(&G)...\tCtrl+G",            IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "ファイル群から検索(&S)\tCtrl+Alt+F",              IDM_GREP_WIN_SEARCH
+            MENUITEM "ファイル群から検索(&S)\tCtrl+Shift+F",              IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "表示(&V)"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "折りたたみ(&F)"
         BEGIN
             MENUITEM "コード折りたたみを表示(&F)",                   IDM_VIEW_FOLDING
-            MENUITEM "すべて折りたたみ(&T)\tCtrl+Shift+F",          IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "すべて折りたたみ(&T)\tCtrl+Alt+F",          IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "次の折りたたみへ移動(&N)\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "前の折りたたみへ移動(&P)\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index b1bd5debe..91a31d580 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "실행(&L)"
         BEGIN
-            MENUITEM "검색하기(&S) \tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "검색하기(&S) \tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "새 창에 열기(&N)\tAlt+N",              IDM_FILE_NEWWINDOW
             MENUITEM "빈 창 열기(&E)\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "다음 바꾸기(&X)\tF4",                      IDM_EDIT_REPLACENEXT
             MENUITEM "바로가기(&G)...\tCtrl+G",                  IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "파일에서 검색하기\tCtrl+Alt+F",            IDM_GREP_WIN_SEARCH
+            MENUITEM "파일에서 검색하기\tCtrl+Shift+F",            IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "보기(&V)"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "접기"
         BEGIN
             MENUITEM "코드 접기(&F)",                     IDM_VIEW_FOLDING
-            MENUITEM "모든 접기 전환(&T)\tCtrl+Shift+F",    IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "모든 접기 전환(&T)\tCtrl+Alt+F",    IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "다음 접은 부분으로 가기\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "이전 접은 부분으로 가기\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 3523b0faf..bb42784d5 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Lancering"
         BEGIN
-            MENUITEM "Zoek in &bestanden\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "Zoek in &bestanden\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nieuw venster\tAlt+N",               IDM_FILE_NEWWINDOW
             MENUITEM "&Leeg venster\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Vervangen volgen&de\tF4",                 IDM_EDIT_REPLACENEXT
             MENUITEM "&Ga naar...\tCtrl+G",                     IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "Zoek in &bestanden\tCtrl+Alt+F",            IDM_GREP_WIN_SEARCH
+            MENUITEM "Zoek in &bestanden\tCtrl+Shift+F",            IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "Beel&d"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Vouwen"
         BEGIN
             MENUITEM "Vouw&code",                           IDM_VIEW_FOLDING
-            MENUITEM "&Toggle vouwen\tCtrl+Shift+F",        IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle vouwen\tCtrl+Alt+F",        IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "&Spring volgende vouw\tAlt+ +",       CMD_FOLDJUMPDOWN
             MENUITEM "S&pring vorige vouw\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 76ec91f96..c1a50298b 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Uruchom"
         BEGIN
-            MENUITEM "&Szukaj w plikach\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Szukaj w plikach\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nowe okno\tAlt+N",                  IDM_FILE_NEWWINDOW
             MENUITEM "&Puste okno\tAlt+Shift+N",           IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Zamień następny\tF4",                         IDM_EDIT_REPLACENEXT
             MENUITEM "&Przejdź do wiersza...\tCtrl+G",              IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Szukaj w plikach\tCtrl+Alt+F",                IDM_GREP_WIN_SEARCH
+            MENUITEM "&Szukaj w plikach\tCtrl+Shift+F",                IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Widok"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Składanie"
         BEGIN
             MENUITEM "Składanie kodu",                              IDM_VIEW_FOLDING
-            MENUITEM "&Przełącz składanie kodu\tCtrl+Shift+F",      IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Przełącz składanie kodu\tCtrl+Alt+F",      IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Przeskocz do nast.\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Przeskocz do poprzed.\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 49f443c06..7610ebcd3 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Executar"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",    IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",    IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nova Janela\tAlt+N",             IDM_FILE_NEWWINDOW
             MENUITEM "Janela &Vazia\tAlt+Shift+N",      IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Substituir Pró&ximo\tF4",                         IDM_EDIT_REPLACENEXT
             MENUITEM "&Ir para...\tCtrl+G",                             IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",                    IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",                    IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Vizualizar"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "&Agrupador de Código",                        IDM_VIEW_FOLDING
-            MENUITEM "&Alternar Códigos Agrupados\tCtrl+Shift+F",   IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Alternar Códigos Agrupados\tCtrl+Alt+F",   IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc
index e730ceee3..4e9936a38 100644
--- a/language/np3_pt_pt/menu_pt_pt.rc
+++ b/language/np3_pt_pt/menu_pt_pt.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Iniciar"
         BEGIN
-            MENUITEM "Procurar em ficheiro&s\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "Procurar em ficheiro&s\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nova janela\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "Jan&ela vazia\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Substituir se&guinte\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Ir para...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Procurar em ficheiros\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Procurar em ficheiros\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Ver"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Dobragem"
         BEGIN
             MENUITEM "&Dobragem de código",                   IDM_VIEW_FOLDING
-            MENUITEM "Ac&tivar/desactivar dobragem\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Ac&tivar/desactivar dobragem\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Saltar para dobragem segui&nte\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Saltar para dobragem &anterior\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 31980ecd1..05fdf00c0 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Запустить"
         BEGIN
-            MENUITEM "&Искать в файлах\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Искать в файлах\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "Копи&ю окна\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Пустое окно\tAlt+Shift+N",          IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "За&менить далее\tF4",                         IDM_EDIT_REPLACENEXT
             MENUITEM "Пе&рейти...\tCtrl+G",                         IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Искать в файлах\tCtrl+Alt+F",                IDM_GREP_WIN_SEARCH
+            MENUITEM "&Искать в файлах\tCtrl+Shift+F",                IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Вид"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "Блоки &кода"
         BEGIN
             MENUITEM "Свора&чивание блоков кода",               IDM_VIEW_FOLDING
-            MENUITEM "Свернуть/ра&звернуть блок\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Свернуть/ра&звернуть блок\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Перейти к следующему &блоку\tAlt+ +",     CMD_FOLDJUMPDOWN
             MENUITEM "Перейти к &предыдущему блоку\tAlt+ –",    CMD_FOLDJUMPUP
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index 9f03b8c3b..cf7404242 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "O&tvoriť"
         BEGIN
-            MENUITEM "&Vyhľadávať v súboroch\tCtrl+Alt+F",  IDM_GREP_WIN_SEARCH
+            MENUITEM "&Vyhľadávať v súboroch\tCtrl+Shift+F",  IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&Nové okno\tAlt+N",                   IDM_FILE_NEWWINDOW
             MENUITEM "N&ové prázdne okno\tAlt+Shift+N",     IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Z&ameniť ďalej\tF4",                      IDM_EDIT_REPLACENEXT
             MENUITEM "Pr&ejsť na...\tCtrl+G",                   IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Vyhľadávať v súboroch\tCtrl+Alt+F",      IDM_GREP_WIN_SEARCH
+            MENUITEM "&Vyhľadávať v súboroch\tCtrl+Shift+F",      IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&Zobraziť"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Skladanie"
         BEGIN
             MENUITEM "Skladacia &väzba",                         IDM_VIEW_FOLDING
-            MENUITEM "Zvinúť všetky &uzly\tCtrl+Shift+F",        IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Zvinúť všetky &uzly\tCtrl+Alt+F",        IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Prejsť na ď&alší uzol\tAlt+ +",            CMD_FOLDJUMPDOWN
             MENUITEM "Prejsť na p&redchádzajúci uzol\tAlt+ –",   CMD_FOLDJUMPUP
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index cab065d16..421879023 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "Kör"
         BEGIN
-            MENUITEM "Sök i filer\tCtrl+Alt+F",                     IDM_GREP_WIN_SEARCH
+            MENUITEM "Sök i filer\tCtrl+Shift+F",                     IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "Nytt fönster\tAlt+N",                         IDM_FILE_NEWWINDOW
             MENUITEM "Tomt fönster\tAlt+Shift+N",                   IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Ersätt nästa\tF4",                            IDM_EDIT_REPLACENEXT
             MENUITEM "Gå till...\tCtrl+G",                          IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "Sök i filer\tCtrl+Alt+F",                     IDM_GREP_WIN_SEARCH
+            MENUITEM "Sök i filer\tCtrl+Shift+F",                     IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "Visa"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "Vikning"
         BEGIN
             MENUITEM "Ihopvikning av kodsegment",                   IDM_VIEW_FOLDING
-            MENUITEM "Växla ihopvikning\tCtrl+Shift+F",             IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "Växla ihopvikning\tCtrl+Alt+F",             IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Gå till nästa vikpunkt\tAlt+ +",              CMD_FOLDJUMPDOWN
             MENUITEM "Gå till föregående vikpunkt\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 6287e31bf..bf1709ea9 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Launch"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&New Window\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Empty Window\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Replace Ne&xt\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Goto...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&View"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
-            MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle Folds\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc
index fc3f93e7d..0b4e19af4 100644
--- a/language/np3_vi_vn/menu_vi_vn.rc
+++ b/language/np3_vi_vn/menu_vi_vn.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "&Launch"
         BEGIN
-            MENUITEM "&Search in Files\tCtrl+Alt+F",       IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",       IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "&New Window\tAlt+N",                 IDM_FILE_NEWWINDOW
             MENUITEM "&Empty Window\tAlt+Shift+N",         IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "Replace Ne&xt\tF4",                     IDM_EDIT_REPLACENEXT
             MENUITEM "&Goto...\tCtrl+G",                      IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "&Search in Files\tCtrl+Alt+F",          IDM_GREP_WIN_SEARCH
+            MENUITEM "&Search in Files\tCtrl+Shift+F",          IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "&View"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "&Folding"
         BEGIN
             MENUITEM "Code &Folding",                   IDM_VIEW_FOLDING
-            MENUITEM "&Toggle Folds\tCtrl+Shift+F",     IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "&Toggle Folds\tCtrl+Alt+F",     IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "Jump &Next Fold\tAlt+ +",         CMD_FOLDJUMPDOWN
             MENUITEM "Jump &Prev Fold\tAlt+ –",         CMD_FOLDJUMPUP
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 20998d600..6aa164f14 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "启动(&L)"
         BEGIN
-            MENUITEM "在文件中查找(&S)...\tCtrl+Alt+F",           IDM_GREP_WIN_SEARCH
+            MENUITEM "在文件中查找(&S)...\tCtrl+Shift+F",           IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "新窗口(&N)\tAlt+N",                      IDM_FILE_NEWWINDOW
             MENUITEM "空窗口(&E)\tAlt+Shift+N",                IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "替换下一个(&X)\tF4",                   IDM_EDIT_REPLACENEXT
             MENUITEM "跳转到(&G)...\tCtrl+G",                IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "在文件中查找(&S)...\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "在文件中查找(&S)...\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "查看(&V)"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "折叠(&F)"
         BEGIN
             MENUITEM "启用折叠(&F)",                         IDM_VIEW_FOLDING
-            MENUITEM "切换折叠(&T)\tCtrl+Shift+F",           IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "切换折叠(&T)\tCtrl+Alt+F",           IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "跳转到下一折叠点(&N)\tAlt++",          CMD_FOLDJUMPDOWN
             MENUITEM "跳转到上一折叠点(&P)\tAlt+-",          CMD_FOLDJUMPUP
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index 7f2bd184d..494c42cd4 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -77,7 +77,7 @@ BEGIN
         END
         POPUP "啟動(&L)"
         BEGIN
-            MENUITEM "在檔案中查詢(&S)...\tCtrl+Alt+F",           IDM_GREP_WIN_SEARCH
+            MENUITEM "在檔案中查詢(&S)...\tCtrl+Shift+F",           IDM_GREP_WIN_SEARCH
             MENUITEM SEPARATOR
             MENUITEM "新視窗(&N)\tAlt+N",                      IDM_FILE_NEWWINDOW
             MENUITEM "空視窗(&E)\tAlt+Shift+N",                IDM_FILE_NEWWINDOW2
@@ -309,7 +309,7 @@ BEGIN
             MENUITEM "替換下一個(&X)\tF4",                   IDM_EDIT_REPLACENEXT
             MENUITEM "跳到(&G)...\tCtrl+G",                  IDM_EDIT_GOTOLINE
             MENUITEM SEPARATOR
-            MENUITEM "在檔案中查詢(&S)...\tCtrl+Alt+F",        IDM_GREP_WIN_SEARCH
+            MENUITEM "在檔案中查詢(&S)...\tCtrl+Shift+F",        IDM_GREP_WIN_SEARCH
         END
     END
     POPUP "檢視(&V)"
@@ -352,7 +352,7 @@ BEGIN
         POPUP "摺疊(&F)"
         BEGIN
             MENUITEM "啟用摺疊(&F)",                         IDM_VIEW_FOLDING
-            MENUITEM "切換摺疊(&T)\tCtrl+Shift+F",           IDM_VIEW_TOGGLEFOLDS
+            MENUITEM "切換摺疊(&T)\tCtrl+Alt+F",           IDM_VIEW_TOGGLEFOLDS
             MENUITEM SEPARATOR
             MENUITEM "跳到下一折疊點(&N)\tAlt++",            CMD_FOLDJUMPDOWN
             MENUITEM "跳到上一折疊點(&P)\tAlt+-",            CMD_FOLDJUMPUP
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index da82a5b97..b6c07b92d 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.727.1"
+    version="5.20.729.1"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index d326a503b..43e392c12 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -189,9 +189,9 @@ BEGIN
     "E",            IDM_EDIT_URLENCODE,               VIRTKEY, SHIFT, CONTROL, NOINVERT
     //~"E",            MMMMMMMMMMMMMMMMMM,            VIRTKEY, ALT, NOINVERT  /// Menu(Edit)
     "F",            IDM_EDIT_FIND,                    VIRTKEY, CONTROL, NOINVERT
-    "F",            IDM_GREP_WIN_SEARCH,              VIRTKEY, CONTROL, ALT, NOINVERT
+    "F",            IDM_VIEW_TOGGLEFOLDS,             VIRTKEY, CONTROL, ALT, NOINVERT
     //"F",            IDM_VIEW_FOLDING, (issue #1609) VIRTKEY, SHIFT, CONTROL, ALT, NOINVERT
-    "F",            IDM_VIEW_TOGGLEFOLDS,             VIRTKEY, SHIFT, CONTROL, NOINVERT
+    "F",            IDM_GREP_WIN_SEARCH,              VIRTKEY, SHIFT, CONTROL, NOINVERT
     //~"F",            MMMMMMMMMMMMMMMMMM,            VIRTKEY, ALT, NOINVERT  /// Menu(File)
     "G",            IDM_EDIT_GOTOLINE,                VIRTKEY, CONTROL, NOINVERT
     "G",            IDM_VIEW_SHOWINDENTGUIDES,        VIRTKEY, SHIFT, CONTROL, NOINVERT
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 7a2d49892..207525c59 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 727
+#define VERSION_REV 729
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 444
 #define ONIGURUMA_REGEX_VER 6.9.5