diff --git a/Build/Changes.txt b/Build/Changes.txt
index de81bfc27..e7511b30a 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.22.1125.(build_#) (2022-11-25)
+Current BETA/RC Version 5.22.1212.(build_#) (2022-12-12)
 ========================================================
 
 --------------------------------------------------------
@@ -103,6 +103,9 @@ CHANGES Versions in Tools or Libraries:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[1212.1]- "Notepad3 Replacement" after update to Win11 22H2 (SUP).
+[1212.1]- Oniguruma fix (ONIG_OPTION_FIND_LONGEST behavior) (ONI).
+[1212.1]- Make current line visible after word-wrap-mode toggle.
 [1125.1]- Restore and correction the line "IDM_SETPASS" in menu_fr_fr_rc.
 [1115.1]- Revert relative size for ANSI Art.
 [1114.1]- Reset change history except in case of "revert from file".
diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss
index d180f4834..c269651d0 100644
--- a/Build/notepad3_setup.iss
+++ b/Build/notepad3_setup.iss
@@ -287,78 +287,66 @@ Root: "HKCR"; Subkey: "Microsoft.PowerShellModule.1\shell\Open\Command"; ValueTy
 Root: "HKCR"; Subkey: "txtfile\DefaultIcon"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\imageres.dll,-102"
 Root: "HKCR"; Subkey: "txtfile\shell\open\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe %1"
 Root: "HKCR"; Subkey: "txtfile\shell\print\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /p %1"
+Root: "HKCR"; Subkey: "txtfile\shell\printto"; ValueType: string; ValueName: "NeverDefault"
 Root: "HKCR"; Subkey: "txtfile\shell\printto\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /pt ""%1"" ""%2"" ""%3"" ""%4"
+Root: "HKCR"; Subkey: "txtfilelegacy\DefaultIcon"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\imageres.dll,-102"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\open\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe %1"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\print\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /p %1"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\printto"; ValueType: string; ValueName: "NeverDefault"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\printto\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /pt ""%1"" ""%2"" ""%3"" ""%4"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "inffile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "inifile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "Microsoft.PowerShellScript.1"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "Microsoft.PowerShellData.1"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "Microsoft.PowerShellModule.1"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts"; ValueType: dword; ValueName: "Applications\Notepad3.exe_.inf"; ValueData: "0"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts"; ValueType: dword; ValueName: "Applications\Notepad3.exe_.ini"; ValueData: "0"
diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss
index 11d332525..df41359bf 100644
--- a/Build/notepad3_x86_setup.iss
+++ b/Build/notepad3_x86_setup.iss
@@ -223,78 +223,66 @@ Root: "HKCR"; Subkey: "Microsoft.PowerShellModule.1\shell\Open\Command"; ValueTy
 Root: "HKCR"; Subkey: "txtfile\DefaultIcon"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\imageres.dll,-102"
 Root: "HKCR"; Subkey: "txtfile\shell\open\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe %1"
 Root: "HKCR"; Subkey: "txtfile\shell\print\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /p %1"
+Root: "HKCR"; Subkey: "txtfile\shell\printto"; ValueType: string; ValueName: "NeverDefault"
 Root: "HKCR"; Subkey: "txtfile\shell\printto\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /pt ""%1"" ""%2"" ""%3"" ""%4"
+Root: "HKCR"; Subkey: "txtfilelegacy\DefaultIcon"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\imageres.dll,-102"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\open\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe %1"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\print\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /p %1"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\printto"; ValueType: string; ValueName: "NeverDefault"
+Root: "HKCR"; Subkey: "txtfilelegacy\shell\printto\command"; ValueType: expandsz; ValueData: "%SystemRoot%\system32\notepad.exe /pt ""%1"" ""%2"" ""%3"" ""%4"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.inf\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "inffile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ini\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "inifile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.ps1\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "Microsoft.PowerShellScript.1"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psd1\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "Microsoft.PowerShellData.1"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.psm1\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "Microsoft.PowerShellModule.1"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.log\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.scp\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; Flags: deletekey
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\UserChoice"; Flags: deletekey
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Microsoft.WindowsNotepad_8wekyb3d8bbwe!App"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "{{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "c"; ValueData: "Notepad.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "d"; ValueData: "Notepad3.exe"
-Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "bacd"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "a"; ValueData: "Notepad3.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "b"; ValueData: "Notepad.exe"
+Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\OpenWithList"; ValueType: string; ValueName: "MRUList"; ValueData: "ab"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.wtx\UserChoice"; ValueType: string; ValueName: "ProgId"; ValueData: "txtfile"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts"; ValueType: dword; ValueName: "Applications\Notepad3.exe_.inf"; ValueData: "0"
 Root: "HKCU"; Subkey: "Software\Microsoft\Windows\CurrentVersion\ApplicationAssociationToasts"; ValueType: dword; ValueName: "Applications\Notepad3.exe_.ini"; ValueData: "0"
diff --git a/Readme.md b/Readme.md
index 4a0407b44..6d028af37 100644
--- a/Readme.md
+++ b/Readme.md
@@ -9,15 +9,15 @@ Notepad3 is a fast and light-weight Scintilla-based text editor with syntax high
 > *Notepad3 is based on code from Florian Balmer's Notepad2 and XhmikosR's Notepad2-mod. MiniPath is based on code from Florian Balmer's metapath.*
 
 ## Important links!
-* Notepad3/RC download page - https://www.rizonesoft.com/downloads/notepad3
+* Download page - https://www.rizonesoft.com/downloads/notepad3
 * Latest changelog (release notes) - https://www.rizonesoft.com/downloads/notepad3/update
-* Notepad3 changelog (all versions/builds) - [Notepad3 - Full Changelog](https://raw.githubusercontent.com/rizonesoft/Notepad3/master/Build/Changes.txt)
-* Notepad3 Documentation - https://www.rizonesoft.com/documents/notepad3
+* Full changelog (all versions/builds) - [Notepad3 - Full Changelog](https://raw.githubusercontent.com/rizonesoft/Notepad3/master/Build/Changes.txt)
+* Documentation - https://www.rizonesoft.com/documents/notepad3
 
 ## Rizonesoft Support
 
 * **[GET IN TOUCH](https://www.rizonesoft.com/#contact)**
-* **Premium Support** - On Rizonesoft, support is free and we will assist you the best we can. Please be patient when contacting us; there are mainly volunteers working on Rizonesoft projects and time is a precious commodity.
+* **Premium Support** - On Rizonesoft, support is free and we will assist you the best we can. Please be patient when contacting us; there are mainly volunteers working on Rizonesoft projects, and time is a precious commodity.
 
 ## Changes compared to Flo's official [Notepad2](https://www.flos-freeware.ch/notepad2.html) (made in [Notepad2-mod](https://xhmikosr.github.io/notepad2-mod/)):
 
@@ -34,28 +34,28 @@ Notepad3 is a fast and light-weight Scintilla-based text editor with syntax high
 ## Changes compared to the Notepad2-mod fork:
 
 * Additional syntax highlighting support for Awk, D, golang, MATLAB
-* State of the art Regular Expression search engine ([Onigmu](https://github.com/k-takata/Onigmo))
-* New toolbar icons based on Yusuke Kamiyaman's Fugue Icons (Purchased by [Rizonesoft](https://www.rizonesoft.com))
-* Hyperlink Hotspot highlighting (single click Open in Browser (Ctrl) / Load in Editor (Alt)
-* Syntax highlighting support for D Source Script, Go Source Script, JSON, Makefiles, MATLAB, Nim Source Code, Power Shell Script, Resource Script, Shell Script.
+* Regular Expression search engine ([Oniguruma](https://github.com/kkos/oniguruma))
+* New toolbar icons based on Yusuke Kamiyaman's Fugue Icons (purchased by [Rizonesoft](https://www.rizonesoft.com))
+* Hyperlink hotspot highlighting (single-click Open in Browser (Ctrl) / Load in Editor (Alt)
+* Syntax highlighting support for D Source Script, Go Source Script, JSON, Makefiles, MATLAB, Nim Source Code, Power Shell Script, Resource Script, Shell Script
 * New program icon and other small cosmetic changes
-* In-App support for AES-256 Rijndael encryption/decryption of files (incl. external commandline tool for batch processing)
-* Virtual Space rectangular selection box (Alt-Key down)
+* In-App support for AES-256 Rijndael encryption/decryption of files (incl. external command line tool for batch processing)
+* Virtual space rectangular selection box (Alt-key down)
 * High-DPI awareness, including high definition toolbar icons
 * Undo/Redo preserves selection
-* File History preserves Caret position (optional) and remembers encoding of file
+* File history preserves caret position (optional) and remembers encoding of file
 * Accelerated word navigation
 * Preserve caret position of items in file history
 * Count occurrences of a marked selection or word
-* Count and Mark occurrences of matching search/find expression
+* Count and mark occurrences of matching search/find expression
 * Visual Studio style copy/paste current line (no selection)
 * Insert GUIDs
-* Dropped support for Windows XP version
-* Other various minor changes, tweaks and bugfixes
+* Dropped support for Windows XP
+* Other various minor changes, tweaks, and bugfixes
 
 ## Supported Operating Systems:
 
-* Windows 7, 8, 8.1 and 10 both 32-bit and 64-bit
+* Windows 7, 8, 8.1, 10, and 11 (both 32-bit and 64-bit)
 
 <hr/>
 
@@ -63,9 +63,7 @@ Notepad3 is a fast and light-weight Scintilla-based text editor with syntax high
 
 Seen on Nsane Forums: [Notepad3 is an advanced text editor...](https://www.nsaneforums.com/topic/382910-guidereview-notepad3-is-an-advanced-text-editor-that-supports-many-programming-languages/), a review of **Notepad3** posted by the moderator [Karston](https://www.nsaneforums.com/profile/12756-karlston/) at [nsane.forums](https://www.nsaneforums.com/). 
 
-To be correct and complete, this **Notepad3's review** is written on 2020-08-11 by **[Ashwin](https://www.ghacks.net/author/ashwin/)** and posted on **[gHacks](https://www.ghacks.net/)**.
-
-Original source:  **[Notepad3 is an advanced text editor that supports many programming languages](https://www.ghacks.net/2020/08/11/notepad3-is-an-advanced-text-editor-that-supports-many-programming-languages/)**.
+**Notepad3's review**: **[Notepad3 is an advanced text editor that supports many programming languages](https://www.ghacks.net/2020/08/11/notepad3-is-an-advanced-text-editor-that-supports-many-programming-languages/)**.
 
 <hr/>
 
@@ -74,22 +72,22 @@ Original source:  **[Notepad3 is an advanced text editor that supports many prog
 
 ## **`[Notepad3]`**
 
-This section can be used to redirect to a settings file which should be used by Notepad3.
-If a non elevated user is not allowed to write to the program directory of Notepad3.exe, 
-the side-by-side Notepad3.ini can point to a place, where the user is allowed to write his settings, 
-for example : 
+This section can be used to redirect to a settings file which will be used by Notepad3.
+If a non-elevated user is not allowed to write to the program directory of Notepad3.exe, 
+the side-by-side Notepad3.ini can point to a place where the user is allowed to write their settings, 
+for example: 
 
 `Notepad3.ini=%APPDATA%\Rizonesoft\Notepad3\Notepad3.ini`
 
-or a to have user specific settings:
+or a to have user-specific settings:
 
 `Notepad3.ini=%WINDIR%\Notepad3-%USERNAME%.ini`
 
 
 ## **`[Settings]`**
 
-This settings are read and written by Notepad3’s user interface.
-For examples all Menu ? Settings will go here.
+These settings are read and written by Notepad3’s user interface.
+For example, all Menu ? Settings will go here.
 
 #### `SettingsVersion=4`
 
@@ -210,10 +208,9 @@ If you don't like it, you can configure e.g.
 
 #### `grepWin.exe=grepWinNP3.exe`
 
-We have integrated of a Powerful External Tool called **grepWinNP3**. 
-**grepWinNP3** is a simple search and replace tool which can use regular expressions to do its job. 
-
-This allows to do much more powerful searches and replaces in Files.
+We have integrated a powerful external tool called **grepWinNP3**. 
+**grepWinNP3** is a search and replace tool which can use regular expressions to perform its job.
+This allows you to perform much more powerful search and replace operations in files.
 
 **grepWinNP3** can be launched:
 - from "File --> Launch --> Search in Files"
@@ -241,7 +238,7 @@ The size limit, in megabytes, to display a warning message for large files.
 
 #### `MultiFileArg=0`
 
-Control if Notepad2 should allow multiple files on the command line (set to 1). 
+Control if Notepad3 should allow multiple files on the command line (set to 1). 
 The default behavior is to accept only a single file, without quoted spaces, like Windows Notepad (set to 0). 
 The command line switches + and - can be used to override this setting on the fly, and the /z command-line switch has the same effect as the - switch.
 
@@ -373,7 +370,7 @@ UseOldStyleBraceMatching=1 to switch back to (not recommended) old style behavio
 
 #### `ExtendedWhiteSpaceChars=:`
 
-Put in here all ASCII chars which should be word delimiter in case of "Accelerated Word Navigation".
+Put in here all ASCII chars which will be word delimiters for "Accelerated Word Navigation".
 
 #### `AutoCompleteWordCharSet=`
 
@@ -408,7 +405,7 @@ This parameter is not used at the moment.
 
 #### `DevDebugMode=0`
 
-Encoding Detector information in Titlebar. This parameter is used to "debug"  UCHARDET
+Encoding Detector information in Titlebar. This parameter is used to "debug" UCHARDET.
 
 #### `AnalyzeReliableConfidenceLevel=75`
 
@@ -439,7 +436,7 @@ New parameter "[Settings2] ExitOnESCSkipLevel = 2"
 
 #### `ZoomTooltipTimeout=3200`
 
-- A value of zero (0) (or less than 100 ms) will disable the Tooltip display.
+- A value of zero (0) (or less than 100 ms) will disable the tooltip display.
 
 #### `LargeIconScalePrecent=150`
 
@@ -455,8 +452,8 @@ New parameter "[Settings2] ExitOnESCSkipLevel = 2"
 
 #### `HyperlinkShellExURLWithApp=""`
 
-- If not defined or empty the default behavior on `Ctrl+Click` URL is done:
-- The URL-String is send to OS via ShellExecute(), which will try open the URL using the registered protocol (e.g. http:// or file://) - in most cases the default browser resp. the file, if extension is known.
+- If not defined or empty the default behavior on `Ctrl+Click` URL is performed:
+- The URL-String is sent to the OS via ShellExecute(), which will try open the URL using the registered protocol (e.g. http:// or file://) - in most cases the default browser resp. the file, if extension is known.
 - If defined, e.g. "`D:\PortableApps\GoogleChromePortable\GoogleChromePortable.exe`", this application will be started on `Ctrl+Click`.
 
 #### `HyperlinkShellExURLCmdLnArgs="${URL}"`
diff --git a/Readme.txt b/Readme.txt
index 5daac1fcf..30e127d59 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -33,7 +33,7 @@ Changes compared to Flo's official Notepad2 (made in Notepad2-mod):
 Changes compared to the Notepad2-mod fork:
 ------------------------------------------
 - Additional syntax highlighting support for Awk, D, golang, MATLAB
-- State of the art Regular Expression search engine (Onigmu)
+- State of the art Regular Expression search engine (Oniguruma)
 - New toolbar icons based on Yusuke Kamiyaman's Fugue Icons 
   (Purchased by Rizonesoft)
 - Hyperlink Hotspot highlighting 
diff --git a/Versions/day.txt b/Versions/day.txt
index 706146535..1f8248cea 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-1125
+1212
diff --git a/minipath/language/mp_af_za/menu_af_za.rc b/minipath/language/mp_af_za/menu_af_za.rc
index fbf0ec841..d3d1e94ec 100644
--- a/minipath/language/mp_af_za/menu_af_za.rc
+++ b/minipath/language/mp_af_za/menu_af_za.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Keur Om",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Ga&an na...",                 IDM_FILE_GOTO
         MENUITEM "&Gaan na Gunstelinge",        IDM_VIEW_FAVORITES
         MENUITEM "Wysig Gunst&elinge",          IDM_VIEW_EDITFAVORITES
         MENUITEM "&Gidse...",               	IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_be_by/menu_be_by.rc b/minipath/language/mp_be_by/menu_be_by.rc
index 61402ab4e..f0142b9a0 100644
--- a/minipath/language/mp_be_by/menu_be_by.rc
+++ b/minipath/language/mp_be_by/menu_be_by.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "І&нвертаваць",            IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Пе&райсці...",                IDM_FILE_GOTO
         MENUITEM "Перайсці ў а&бранае",         IDM_VIEW_FAVORITES
         MENUITEM "&Рэдагаваць абранае",         IDM_VIEW_EDITFAVORITES
         MENUITEM "Перайсці ў п&апку...",        IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_de_de/menu_de_de.rc b/minipath/language/mp_de_de/menu_de_de.rc
index 1df7d854d..e5c1ac0dc 100644
--- a/minipath/language/mp_de_de/menu_de_de.rc
+++ b/minipath/language/mp_de_de/menu_de_de.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Umgekehrt",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Ge&he zu...",                   IDM_FILE_GOTO
         MENUITEM "&Gehe zu Favoriten",            IDM_VIEW_FAVORITES
         MENUITEM "&Bearbeite Favoriten",          IDM_VIEW_EDITFAVORITES
         MENUITEM "&Verzeichnis...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_el_gr/menu_el_gr.rc b/minipath/language/mp_el_gr/menu_el_gr.rc
index 57e38a6ea..1dbd563ec 100644
--- a/minipath/language/mp_el_gr/menu_el_gr.rc
+++ b/minipath/language/mp_el_gr/menu_el_gr.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Αντίστροφα",             IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Μετά&βαση...",                IDM_FILE_GOTO
         MENUITEM "&Μετάβαση στα αγαπημένα",     IDM_VIEW_FAVORITES
         MENUITEM "Επε&ξεργασία αγαπημένων",     IDM_VIEW_EDITFAVORITES
         MENUITEM "&Κατάλογος...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_en_gb/menu_en_gb.rc b/minipath/language/mp_en_gb/menu_en_gb.rc
index ba76f0162..c5e086640 100644
--- a/minipath/language/mp_en_gb/menu_en_gb.rc
+++ b/minipath/language/mp_en_gb/menu_en_gb.rc
@@ -96,8 +96,9 @@ BEGIN
             MENUITEM "&Reverse",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
-        MENUITEM "&Goto Favourites",             IDM_VIEW_FAVORITES
-        MENUITEM "&Edit Favourites",             IDM_VIEW_EDITFAVORITES
+        MENUITEM "Go&to...",                    IDM_FILE_GOTO
+        MENUITEM "&Goto Favourites",            IDM_VIEW_FAVORITES
+        MENUITEM "&Edit Favourites",            IDM_VIEW_EDITFAVORITES
         MENUITEM "&Directory...",               IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "Show Dri&ves",                IDM_VIEW_DRIVEBOX
diff --git a/minipath/language/mp_en_us/menu_en_us.rc b/minipath/language/mp_en_us/menu_en_us.rc
index d2f28109d..94ec093df 100644
--- a/minipath/language/mp_en_us/menu_en_us.rc
+++ b/minipath/language/mp_en_us/menu_en_us.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Reverse",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Go&to...",                    IDM_FILE_GOTO
         MENUITEM "&Goto Favorites",             IDM_VIEW_FAVORITES
         MENUITEM "&Edit Favorites",             IDM_VIEW_EDITFAVORITES
         MENUITEM "&Directory...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_es_es/menu_es_es.rc b/minipath/language/mp_es_es/menu_es_es.rc
index 7dbc7e472..c659406ea 100644
--- a/minipath/language/mp_es_es/menu_es_es.rc
+++ b/minipath/language/mp_es_es/menu_es_es.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Inverso",                     IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Ir a...",                         IDM_FILE_GOTO
         MENUITEM "&Ir a Favoritos",                  IDM_VIEW_FAVORITES
         MENUITEM "&Editar Favoritos",                IDM_VIEW_EDITFAVORITES
         MENUITEM "&Carpeta...",                      IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_es_mx/menu_es_mx.rc b/minipath/language/mp_es_mx/menu_es_mx.rc
index aef9a1642..27226eb5e 100644
--- a/minipath/language/mp_es_mx/menu_es_mx.rc
+++ b/minipath/language/mp_es_mx/menu_es_mx.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Inverso",                     IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Ir a...",                         IDM_FILE_GOTO
         MENUITEM "&Ir a Favoritos",                  IDM_VIEW_FAVORITES
         MENUITEM "&Editar Favoritos",                IDM_VIEW_EDITFAVORITES
         MENUITEM "&Carpeta...",                      IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_fr_fr/menu_fr_fr.rc b/minipath/language/mp_fr_fr/menu_fr_fr.rc
index 8feb4f43c..f0f42e5e8 100644
--- a/minipath/language/mp_fr_fr/menu_fr_fr.rc
+++ b/minipath/language/mp_fr_fr/menu_fr_fr.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Inverser l'ordre",           IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Aller à...",                     IDM_FILE_GOTO
         MENUITEM "&Aller aux favoris",              IDM_VIEW_FAVORITES
         MENUITEM "&Editer les favoris",             IDM_VIEW_EDITFAVORITES
         MENUITEM "&Répertoire..."                   IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_hi_in/menu_hi_in.rc b/minipath/language/mp_hi_in/menu_hi_in.rc
index 5198a7340..c721f072e 100644
--- a/minipath/language/mp_hi_in/menu_hi_in.rc
+++ b/minipath/language/mp_hi_in/menu_hi_in.rc
@@ -96,9 +96,10 @@ BEGIN
             MENUITEM "उल्टा करें (&R)",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "यहाँ पर जाएं (&T...",              IDM_FILE_GOTO
         MENUITEM "पसंदीदा पर जाएं (&G)",             IDM_VIEW_FAVORITES
-        MENUITEM "पसंदीदा संपादित करें (&E)",             IDM_VIEW_EDITFAVORITES
-        MENUITEM "निदेशिका (&D)...",               IDM_FILE_CHANGEDIR
+        MENUITEM "पसंदीदा संपादित करें (&E)",          IDM_VIEW_EDITFAVORITES
+        MENUITEM "निदेशिका (&D)...",                IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "ड्राइव दिखाएं (&V)",                IDM_VIEW_DRIVEBOX
         MENUITEM SEPARATOR
diff --git a/minipath/language/mp_hu_hu/menu_hu_hu.rc b/minipath/language/mp_hu_hu/menu_hu_hu.rc
index 8f21df838..bea72195c 100644
--- a/minipath/language/mp_hu_hu/menu_hu_hu.rc
+++ b/minipath/language/mp_hu_hu/menu_hu_hu.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Fordítva",             IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Ugrás...",                 IDM_FILE_GOTO
         MENUITEM "&Ugrás a Kedvencekhez",     IDM_VIEW_FAVORITES
         MENUITEM "Kedvencek s&zerkesztése",   IDM_VIEW_EDITFAVORITES
         MENUITEM "&Mappa...",                 IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_id_id/menu_id_id.rc b/minipath/language/mp_id_id/menu_id_id.rc
index 825cb00e6..382807168 100644
--- a/minipath/language/mp_id_id/menu_id_id.rc
+++ b/minipath/language/mp_id_id/menu_id_id.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Reverse",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Go&to...",                    IDM_FILE_GOTO
         MENUITEM "&Goto Favourites",             IDM_VIEW_FAVORITES
         MENUITEM "&Edit Favourites",             IDM_VIEW_EDITFAVORITES
         MENUITEM "&Directory...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_it_it/menu_it_it.rc b/minipath/language/mp_it_it/menu_it_it.rc
index 0b6eda39d..c8a16cb3b 100644
--- a/minipath/language/mp_it_it/menu_it_it.rc
+++ b/minipath/language/mp_it_it/menu_it_it.rc
@@ -96,9 +96,10 @@ BEGIN
             MENUITEM "&Inverti",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Vai a...",                     IDM_FILE_GOTO
         MENUITEM "&Vai ai Preferiti",             IDM_VIEW_FAVORITES
-        MENUITEM "&Modifica Preferiti",             IDM_VIEW_EDITFAVORITES
-        MENUITEM "&Cartella...",               IDM_FILE_CHANGEDIR
+        MENUITEM "&Modifica Preferiti",           IDM_VIEW_EDITFAVORITES
+        MENUITEM "&Cartella...",                  IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "Mostra unità disco",                IDM_VIEW_DRIVEBOX
         MENUITEM SEPARATOR
diff --git a/minipath/language/mp_ja_jp/menu_ja_jp.rc b/minipath/language/mp_ja_jp/menu_ja_jp.rc
index 6860a873f..4a7eefc5b 100644
--- a/minipath/language/mp_ja_jp/menu_ja_jp.rc
+++ b/minipath/language/mp_ja_jp/menu_ja_jp.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "逆順(&R)",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "指定行へジャンプ(&T)...",          IDM_FILE_GOTO
         MENUITEM "お気に入りを表示(&G)",             IDM_VIEW_FAVORITES
         MENUITEM "お気に入りをエクスプローラで開く(&E)",   IDM_VIEW_EDITFAVORITES
         MENUITEM "フォルダ選択(&D)...",              IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_ko_kr/menu_ko_kr.rc b/minipath/language/mp_ko_kr/menu_ko_kr.rc
index 344dcb715..8c0b457a4 100644
--- a/minipath/language/mp_ko_kr/menu_ko_kr.rc
+++ b/minipath/language/mp_ko_kr/menu_ko_kr.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "역순(&R)",                  IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "이동(&T)...",                  IDM_FILE_GOTO
         MENUITEM "즐겨찾기로 이동(&G)",           IDM_VIEW_FAVORITES
         MENUITEM "즐겨찾기 편집(&E)",             IDM_VIEW_EDITFAVORITES
         MENUITEM "디렉토리(&D)...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_nl_nl/menu_nl_nl.rc b/minipath/language/mp_nl_nl/menu_nl_nl.rc
index 9d9ee5174..880ec00a9 100644
--- a/minipath/language/mp_nl_nl/menu_nl_nl.rc
+++ b/minipath/language/mp_nl_nl/menu_nl_nl.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "Omgekee&rd",              IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Ga &naar...",                 IDM_FILE_GOTO
         MENUITEM "&Favorieten",             	IDM_VIEW_FAVORITES
         MENUITEM "Favorieten b&ewerken",        IDM_VIEW_EDITFAVORITES
         MENUITEM "&Mappen...",               	IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_pl_pl/menu_pl_pl.rc b/minipath/language/mp_pl_pl/menu_pl_pl.rc
index 139205a68..159ae1a54 100644
--- a/minipath/language/mp_pl_pl/menu_pl_pl.rc
+++ b/minipath/language/mp_pl_pl/menu_pl_pl.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Odwróć",                     IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "P&rzejdź do wiersza...",          IDM_FILE_GOTO
         MENUITEM "&Przejdź do Ulubionych",          IDM_VIEW_FAVORITES
         MENUITEM "&Edytuj Ulubione",                IDM_VIEW_EDITFAVORITES
         MENUITEM "&Katalog...",                     IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_pt_br/menu_pt_br.rc b/minipath/language/mp_pt_br/menu_pt_br.rc
index 5ab64181d..10e018850 100644
--- a/minipath/language/mp_pt_br/menu_pt_br.rc
+++ b/minipath/language/mp_pt_br/menu_pt_br.rc
@@ -96,9 +96,10 @@ BEGIN
             MENUITEM "Ordem Inve&rsa",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "I&r para...",                    IDM_FILE_GOTO
         MENUITEM "&Ir para Favoritos",             IDM_VIEW_FAVORITES
-        MENUITEM "&Editar Favoritos",             IDM_VIEW_EDITFAVORITES
-        MENUITEM "&Pasta...",               IDM_FILE_CHANGEDIR
+        MENUITEM "&Editar Favoritos",              IDM_VIEW_EDITFAVORITES
+        MENUITEM "&Pasta...",                      IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "Mostrar &Unidades",                IDM_VIEW_DRIVEBOX
         MENUITEM SEPARATOR
diff --git a/minipath/language/mp_pt_pt/menu_pt_pt.rc b/minipath/language/mp_pt_pt/menu_pt_pt.rc
index 4dff1f86c..1c0d48571 100644
--- a/minipath/language/mp_pt_pt/menu_pt_pt.rc
+++ b/minipath/language/mp_pt_pt/menu_pt_pt.rc
@@ -96,9 +96,10 @@ BEGIN
             MENUITEM "Inve&rter",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "I&r para...",                    IDM_FILE_GOTO
         MENUITEM "&Ir para favoritos",             IDM_VIEW_FAVORITES
-        MENUITEM "&Editar favoritos",             IDM_VIEW_EDITFAVORITES
-        MENUITEM "&Pasta...",               IDM_FILE_CHANGEDIR
+        MENUITEM "&Editar favoritos",              IDM_VIEW_EDITFAVORITES
+        MENUITEM "&Pasta...",                      IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "Mostrar &unidades",                IDM_VIEW_DRIVEBOX
         MENUITEM SEPARATOR
diff --git a/minipath/language/mp_ru_ru/menu_ru_ru.rc b/minipath/language/mp_ru_ru/menu_ru_ru.rc
index 289c5e43a..a411e597a 100644
--- a/minipath/language/mp_ru_ru/menu_ru_ru.rc
+++ b/minipath/language/mp_ru_ru/menu_ru_ru.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "И&нвертировать",          IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Пе&рейти...",                 IDM_FILE_GOTO
         MENUITEM "Перейти в &избранное",        IDM_VIEW_FAVORITES
         MENUITEM "&Редактировать избранное",    IDM_VIEW_EDITFAVORITES
         MENUITEM "Перейти в п&апку...",         IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_sk_sk/menu_sk_sk.rc b/minipath/language/mp_sk_sk/menu_sk_sk.rc
index 479c305bb..8db97df71 100644
--- a/minipath/language/mp_sk_sk/menu_sk_sk.rc
+++ b/minipath/language/mp_sk_sk/menu_sk_sk.rc
@@ -96,9 +96,10 @@ BEGIN
             MENUITEM "&Obrátene",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Pr&ejsť na...",                 IDM_FILE_GOTO
         MENUITEM "O&bľúbené položky",             IDM_VIEW_FAVORITES
-        MENUITEM "&Upraviť obľúbené položky",             IDM_VIEW_EDITFAVORITES
-        MENUITEM "&Adresáre...",               IDM_FILE_CHANGEDIR
+        MENUITEM "&Upraviť obľúbené položky",     IDM_VIEW_EDITFAVORITES
+        MENUITEM "&Adresáre...",                  IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "Zobraziť &disky",                IDM_VIEW_DRIVEBOX
         MENUITEM SEPARATOR
diff --git a/minipath/language/mp_sv_se/menu_sv_se.rc b/minipath/language/mp_sv_se/menu_sv_se.rc
index 069592e07..8d0a0aa5d 100644
--- a/minipath/language/mp_sv_se/menu_sv_se.rc
+++ b/minipath/language/mp_sv_se/menu_sv_se.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "Omvänt",                    IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Gå till...",                    IDM_FILE_GOTO
         MENUITEM "Gå till favoriter",             IDM_VIEW_FAVORITES
         MENUITEM "Redigera favoriter",            IDM_VIEW_EDITFAVORITES
         MENUITEM "Mapp...",                       IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_tr_tr/menu_tr_tr.rc b/minipath/language/mp_tr_tr/menu_tr_tr.rc
index c8de5e436..8c59b3619 100644
--- a/minipath/language/mp_tr_tr/menu_tr_tr.rc
+++ b/minipath/language/mp_tr_tr/menu_tr_tr.rc
@@ -96,11 +96,12 @@ BEGIN
             MENUITEM "T&ersten",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "&Git...",                             IDM_FILE_GOTO
         MENUITEM "Sık k&ullanılanlara git",             IDM_VIEW_FAVORITES
-        MENUITEM "Sık kulla&nılanları düzenle",             IDM_VIEW_EDITFAVORITES
-        MENUITEM "&Klasör...",               IDM_FILE_CHANGEDIR
+        MENUITEM "Sık kulla&nılanları düzenle",         IDM_VIEW_EDITFAVORITES
+        MENUITEM "&Klasör...",                          IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
-        MENUITEM "Sürü&cüleri görüntüle",                IDM_VIEW_DRIVEBOX
+        MENUITEM "Sürü&cüleri görüntüle",               IDM_VIEW_DRIVEBOX
         MENUITEM SEPARATOR
         MENUITEM "&Ayarları kaydet",              IDM_VIEW_SAVESETTINGS
         MENUITEM "&Hedefi ayarla...",            IDM_VIEW_FINDTARGET
diff --git a/minipath/language/mp_vi_vn/menu_vi_vn.rc b/minipath/language/mp_vi_vn/menu_vi_vn.rc
index 8871c123b..713e6d813 100644
--- a/minipath/language/mp_vi_vn/menu_vi_vn.rc
+++ b/minipath/language/mp_vi_vn/menu_vi_vn.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "&Reverse",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "Go&to...",                    IDM_FILE_GOTO
         MENUITEM "&Goto Favourites",             IDM_VIEW_FAVORITES
         MENUITEM "&Edit Favourites",             IDM_VIEW_EDITFAVORITES
         MENUITEM "&Directory...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_zh_cn/menu_zh_cn.rc b/minipath/language/mp_zh_cn/menu_zh_cn.rc
index 52dac9bc7..96468712f 100644
--- a/minipath/language/mp_zh_cn/menu_zh_cn.rc
+++ b/minipath/language/mp_zh_cn/menu_zh_cn.rc
@@ -96,6 +96,7 @@ BEGIN
             MENUITEM "反向排序(&R)",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
+        MENUITEM "跳转到(&Y)...",                  IDM_FILE_GOTO
         MENUITEM "转到收藏夹(&G)\tF11",             IDM_VIEW_FAVORITES
         MENUITEM "编辑收藏夹(&E)",                  IDM_VIEW_EDITFAVORITES
         MENUITEM "转到文件夹(&D)...",               IDM_FILE_CHANGEDIR
diff --git a/minipath/language/mp_zh_tw/menu_zh_tw.rc b/minipath/language/mp_zh_tw/menu_zh_tw.rc
index f9989cf36..3dc60ea50 100644
--- a/minipath/language/mp_zh_tw/menu_zh_tw.rc
+++ b/minipath/language/mp_zh_tw/menu_zh_tw.rc
@@ -96,8 +96,9 @@ BEGIN
             MENUITEM "反向排序(&R)",                IDM_SORT_REVERSE
         END
         MENUITEM SEPARATOR
-        MENUITEM "移至常用(&G)",             IDM_VIEW_FAVORITES
-        MENUITEM "編輯常用(&E)",             IDM_VIEW_EDITFAVORITES
+        MENUITEM "移至(&T)...",               IDM_FILE_GOTO
+        MENUITEM "移至常用(&G)",               IDM_VIEW_FAVORITES
+        MENUITEM "編輯常用(&E)",               IDM_VIEW_EDITFAVORITES
         MENUITEM "目錄(&D)...",               IDM_FILE_CHANGEDIR
         MENUITEM SEPARATOR
         MENUITEM "顯示磁碟(&V)",                IDM_VIEW_DRIVEBOX
diff --git a/minipath/res/MiniPath.exe.manifest.conf b/minipath/res/MiniPath.exe.manifest.conf
index 19473121c..15b9d10aa 100644
--- a/minipath/res/MiniPath.exe.manifest.conf
+++ b/minipath/res/MiniPath.exe.manifest.conf
@@ -3,7 +3,7 @@
     <assemblyIdentity
         name="MiniPath"
         processorArchitecture="*"
-        version="1.0.2.181"
+        version="1.0.2.191"
         type="win32"
      />
     <description>metapath</description>
diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h
index d956ad357..723b54fee 100644
--- a/minipath/src/VersionEx.h
+++ b/minipath/src/VersionEx.h
@@ -2,4 +2,4 @@
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_REV 2
-#define VERSION_BUILD 181
+#define VERSION_BUILD 191
diff --git a/res/Notepad3.exe.conf.manifest b/res/Notepad3.exe.conf.manifest
index 7c1e68e64..030a11bd3 100644
--- a/res/Notepad3.exe.conf.manifest
+++ b/res/Notepad3.exe.conf.manifest
@@ -3,9 +3,9 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
 	<assemblyIdentity
 		name="Rizonesoft.Notepad3"
-		version="5.22.1125.1"
+		version="5.22.1212.1"
 		processorArchitecture="*"
 		type="win32"
 	/>
-	<description>Notepad3 rc</description>
+	<description>Notepad3 beta</description>
 </assembly>
diff --git a/scintilla/oniguruma/README.md b/scintilla/oniguruma/README.md
index ebe31b760..59f6c5f3f 100644
--- a/scintilla/oniguruma/README.md
+++ b/scintilla/oniguruma/README.md
@@ -44,6 +44,7 @@ Master branch
 * Fixed: (?I) option was not enabled for character classes (Issue #264).
 * Changed specification to check for incorrect POSIX bracket (Issue #253).
 * Changed [[:punct:]] in Unicode encodings to be compatible with POSIX definition. (Issue #268)
+* Fixed: ONIG_OPTION_FIND_LONGEST behavior
 
 
 Version 6.9.8
diff --git a/scintilla/oniguruma/src/regcomp.c b/scintilla/oniguruma/src/regcomp.c
index c79fc2241..ec6c9f864 100644
--- a/scintilla/oniguruma/src/regcomp.c
+++ b/scintilla/oniguruma/src/regcomp.c
@@ -1686,6 +1686,10 @@ compile_length_bag_node(BagNode* node, regex_t* reg)
     /* never come here, but set for escape warning */
     len = 0;
     break;
+
+  default:
+    return ONIGERR_TYPE_BUG;
+    break;
   }
 
   return len;
@@ -1888,6 +1892,10 @@ compile_bag_node(BagNode* node, regex_t* reg, ParseEnv* env)
       }
     }
     break;
+
+  default:
+    return ONIGERR_TYPE_BUG;
+    break;
   }
 
   return r;
@@ -2416,6 +2424,10 @@ compile_length_gimmick_node(GimmickNode* node, regex_t* reg)
     }
     break;
 #endif
+
+  default:
+    return ONIGERR_TYPE_BUG;
+    break;
   }
 
   return len;
diff --git a/scintilla/oniguruma/src/regexec.c b/scintilla/oniguruma/src/regexec.c
index f9337ce41..eb450dba0 100644
--- a/scintilla/oniguruma/src/regexec.c
+++ b/scintilla/oniguruma/src/regexec.c
@@ -2818,7 +2818,7 @@ typedef struct {
 
 #define MATCH_COUNTER_OUT(title) do {\
   int i;\
-  fprintf(DBGFP, "%s (%ld): retry limit: %8lu, subexp_call: %8lu\n", (title), (sstart - str), retry_in_match_counter, msa->subexp_call_in_search_counter); \
+  fprintf(DBGFP, "%s (%ld): retry limit: %8lu/%8lu, subexp_call: %8lu\n", (title), (sstart - str), retry_in_match_counter, retry_limit_in_match, msa->subexp_call_in_search_counter); \
   fprintf(DBGFP, "      ");\
   for (i = 0; i < MAX_SUBEXP_CALL_COUNTERS; i++) {\
     fprintf(DBGFP, " %6lu", subexp_call_counters[i]);\
@@ -3058,33 +3058,33 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         goto fail; /* for retry */
       }
 
-      if (n > best_len) {
 #ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
         if (OPTON_FIND_LONGEST(options)) {
+        if (n > best_len) {
           if (n > msa->best_len) {
+            best_len = n;
             msa->best_len = n;
             msa->best_s   = (UChar* )sstart;
-            if (s >= in_right_range) {
-              best_len = msa->best_len; /* end of find */
-            }
           }
           else {
             if (s >= in_right_range && msa->best_s == sstart) {
-              best_len = msa->best_len; /* end of find */
+              goto op_end_out;
             }
             else {
-              SOP_OUT;
               goto fail; /* for retry */
             }
           }
         }
         else {
+          goto fail; /* for retry */
+        }
+      }
+      else {
           best_len = n;
         }
 #else
         best_len = n;
 #endif
-      }
 
       /* set region */
       region = msa->region;
@@ -3149,14 +3149,14 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 #endif
       } /* if (region) */
 
-      SOP_OUT;
-
       if (OPTON_CALLBACK_EACH_MATCH(options) &&
           IS_NOT_NULL(CallbackEachMatch)) {
         i = CallbackEachMatch(str, end, sstart, region,
                               msa->mp->callout_user_data);
-        if (i < 0) MATCH_AT_ERROR_RETURN(i);
-
+        if (i < 0) {
+          SOP_OUT;
+          MATCH_AT_ERROR_RETURN(i);
+        }
 #ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
         if (! OPTON_FIND_LONGEST(options))
 #endif
@@ -3165,7 +3165,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         goto fail;
       }
 
+#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
+      if (OPTON_FIND_LONGEST(options)) goto fail;
+#endif
+
+  op_end_out:
       /* default behavior: return first-matching result. */
+      SOP_OUT;
       goto match_at_end;
 
     CASE_OP(STR_1)
@@ -4414,6 +4420,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 #endif
 
     CASE_OP(FINISH)
+#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
+      if (OPTON_FIND_LONGEST(options)) {
+        best_len = ONIG_MISMATCH;
+      }
+#endif
       goto match_at_end;
 
 #ifdef ONIG_DEBUG_STATISTICS
diff --git a/src/Edit.c b/src/Edit.c
index 6a2bdc4c7..1abb66855 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -5336,18 +5336,10 @@ void EditSortLines(HWND hwnd, int iSortFlags)
 //
 //  _EnsurePositionsVisible()
 //
-static void _EnsurePositionsVisible(const DocPos iAnchorPos, const DocPos iCurrentPos) {
-
-    DocLn const iAnchorLine = SciCall_LineFromPosition(iAnchorPos);
-    DocLn const iCurrentLine = SciCall_LineFromPosition(iCurrentPos);
-    if (iAnchorLine != iCurrentLine) {
-        if (!SciCall_GetLineVisible(iAnchorLine)) {
-            SciCall_EnsureVisible(iAnchorLine);
-        }
-    }
-    if (!SciCall_GetLineVisible(iCurrentLine)) {
-        SciCall_EnsureVisibleEnforcePolicy(iCurrentLine);
-    }
+static inline void _EnsurePositionsVisible(const DocPos iAnchorPos, const DocPos iCurrentPos)
+{
+    SciCall_EnsureVisible(SciCall_LineFromPosition(iAnchorPos));
+    SciCall_EnsureVisibleEnforcePolicy(SciCall_LineFromPosition(iCurrentPos));
 }
 
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 53f601d43..8310b5717 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,13 +8,13 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 22
-#define VERSION_REV 1125
+#define VERSION_REV 1212
 #define VERSION_BUILD 1
-#define SCINTILLA_VER 531
-#define LEXILLA_VER 520
-#define ONIGURUMA_REGEX_VER 6.9.8
+#define SCINTILLA_VER 532
+#define LEXILLA_VER 521
+#define ONIGURUMA_REGEX_VER 6.9.9
 #define UCHARDET_VER 2018.09.27
 #define TINYEXPR_VER 2018.05.11
 #define UTHASH_VER 2.3.0
-#define VERSION_PATCH rc
+#define VERSION_PATCH beta
 #define VERSION_COMMIT_ID dkt1-amr