diff --git a/Build/Changes.txt b/Build/Changes.txt
index 2e6ccefda..5cfbfed07 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -40,7 +40,7 @@ Current BETA/RC Version 5.21.813.(build_#) (2021-08-13)
 NEW:
 --------------------------------------------------------
 [.###.#]- .
-[.811.1]- Add support for "Notepad3 Replacement" for Windows 11 Insider Preview (22000.120).
+[.811.1]- Add "Notepad3 Replacement" for Windows 11 Insider Preview (ext: .inf, .ini, .log, .ps1, .psd1, .psm1, .scp, .txt, .wtx).
 [.809.1]- Configure app to open hyperlink (instead of default browser).
 [.805.1]- File URL forced to open in new window by (Ctrl+Alt+Click).
 [.805.1]- File change notification, if removed current file is recreated.
diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt
index 5115e648e..3ea878826 100644
--- a/Build/Docs/KeyboardShortcuts.txt
+++ b/Build/Docs/KeyboardShortcuts.txt
@@ -30,6 +30,11 @@
                               Minimize or Exit Notepad3 (optionally, if no state).
     Shift+Esc                 Save file and Exit Notepad3.
 
+      Path to Clipboard
+      -----------------
+        Ctrl+F9               Copy Filename Only to Clipboard.
+        Ctrl+Shift+F9         Copy Full Path to Clipboard.
+
       Launch
       ------
         Ctrl+Shift+F          Search in Files.
@@ -185,8 +190,6 @@
         Ctrl+Shift+Space      Multi-Select All Matches.
         Alt+Shift+Arrows      Rectangular Selection.
         Alt+Shift+Left Mouse  Rectangular Selection.
-        Ctrl+F9               Copy Filename Only to Clipboard.
-        Ctrl+Shift+F9         Copy Full Path to Clipboard.
 
       Bookmarks
       ---------
diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss
index 396557a49..18afe1623 100644
--- a/Build/notepad3_setup.iss
+++ b/Build/notepad3_setup.iss
@@ -123,8 +123,6 @@ Source: "{#bindir}\Release_x86_v142\grepWinNP3.exe"; DestDir: "{app}"; Flags: ig
 Source: "..\License.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Readme.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\grepWinNP3\grepWinLicense.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\grepWinNP3\translationsNP3\*.lang"; DestDir: "{app}\lng\gwLng"; Flags: ignoreversion; Check: Is64BitInstallMode()
-Source: "..\grepWinNP3\translationsNP3\*.lang"; DestDir: "{app}\lng\gwLng"; Flags: ignoreversion; Check: not Is64BitInstallMode()
 Source: "Notepad3.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "minipath.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "Themes\Dark.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3\Themes"; Flags: ignoreversion uninsneveruninstall
@@ -132,6 +130,7 @@ Source: "Themes\Obsidian.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3\Theme
 Source: "Themes\Sombra.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3\Themes"; Flags: ignoreversion uninsneveruninstall
 Source: "{#bindir}\Release_x64_v142\lng\mplng.dll"; DestDir: "{app}\lng"; Flags: ignoreversion; Check: Is64BitInstallMode()
 Source: "{#bindir}\Release_x64_v142\lng\np3lng.dll"; DestDir: "{app}\lng"; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: "{#bindir}\Release_x64_v142\lng\gwLng\*.lang"; DestDir: "{app}\lng\gwLng"; Flags: ignoreversion; Check: Is64BitInstallMode()
 Source: "{#bindir}\Release_x64_v142\lng\af-ZA\mplng.dll.mui"; DestDir: "{app}\lng\af-ZA"; Flags: ignoreversion; Check: Is64BitInstallMode()
 Source: "{#bindir}\Release_x64_v142\lng\af-ZA\np3lng.dll.mui"; DestDir: "{app}\lng\af-ZA"; Flags: ignoreversion; Check: Is64BitInstallMode()
 Source: "{#bindir}\Release_x64_v142\lng\be-BY\mplng.dll.mui"; DestDir: "{app}\lng\be-BY"; Flags: ignoreversion; Check: Is64BitInstallMode()
@@ -184,6 +183,7 @@ Source: "{#bindir}\Release_x64_v142\lng\zh-TW\mplng.dll.mui"; DestDir: "{app}\ln
 Source: "{#bindir}\Release_x64_v142\lng\zh-TW\np3lng.dll.mui"; DestDir: "{app}\lng\zh-TW"; Flags: ignoreversion; Check: Is64BitInstallMode()
 Source: "{#bindir}\Release_x86_v142\lng\mplng.dll"; DestDir: "{app}\lng"; Flags: ignoreversion; Check: not Is64BitInstallMode()
 Source: "{#bindir}\Release_x86_v142\lng\np3lng.dll"; DestDir: "{app}\lng"; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: "{#bindir}\Release_x86_v142\lng\gwLng\*.lang"; DestDir: "{app}\lng\gwLng"; Flags: ignoreversion; Check: not Is64BitInstallMode()
 Source: "{#bindir}\Release_x86_v142\lng\af-ZA\mplng.dll.mui"; DestDir: "{app}\lng\af-ZA"; Flags: ignoreversion; Check: not Is64BitInstallMode()
 Source: "{#bindir}\Release_x86_v142\lng\af-ZA\np3lng.dll.mui"; DestDir: "{app}\lng\af-ZA"; Flags: ignoreversion; Check: not Is64BitInstallMode()
 Source: "{#bindir}\Release_x86_v142\lng\be-BY\mplng.dll.mui"; DestDir: "{app}\lng\be-BY"; Flags: ignoreversion; Check: not Is64BitInstallMode()
diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss
index beaae7b58..7022573b7 100644
--- a/Build/notepad3_x86_setup.iss
+++ b/Build/notepad3_x86_setup.iss
@@ -112,7 +112,6 @@ Source: "{#bindir}\Release_x86_v142\grepWinNP3.exe"; DestDir: "{app}"; Flags: ig
 Source: "..\License.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\Readme.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\grepWinNP3\grepWinLicense.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\grepWinNP3\translationsNP3\*.lang"; DestDir: "{app}\lng\gwLng"; Flags: ignoreversion
 Source: "Notepad3.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "minipath.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3"; Flags: onlyifdoesntexist uninsneveruninstall
 Source: "Themes\Dark.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3\Themes"; Flags: ignoreversion uninsneveruninstall
@@ -120,6 +119,7 @@ Source: "Themes\Obsidian.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3\Theme
 Source: "Themes\Sombra.ini"; DestDir: "{userappdata}\Rizonesoft\Notepad3\Themes"; Flags: ignoreversion uninsneveruninstall
 Source: "{#bindir}\Release_x86_v142\lng\mplng.dll"; DestDir: "{app}\lng"; Flags: ignoreversion
 Source: "{#bindir}\Release_x86_v142\lng\np3lng.dll"; DestDir: "{app}\lng"; Flags: ignoreversion
+Source: "{#bindir}\Release_x86_v142\lng\gwLng\*.lang"; DestDir: "{app}\lng\gwLng"; Flags: ignoreversion
 Source: "{#bindir}\Release_x86_v142\lng\af-ZA\mplng.dll.mui"; DestDir: "{app}\lng\af-ZA"; Flags: ignoreversion
 Source: "{#bindir}\Release_x86_v142\lng\af-ZA\np3lng.dll.mui"; DestDir: "{app}\lng\af-ZA"; Flags: ignoreversion
 Source: "{#bindir}\Release_x86_v142\lng\be-BY\mplng.dll.mui"; DestDir: "{app}\lng\be-BY"; Flags: ignoreversion
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index d50b896ef..88a9633d8 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -166,7 +166,7 @@ if exist "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" (
 ) else (
 	mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng"
 )
-copy /B "%NP3_GREPWIN_DIR%\translationsNP3\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" /Y /V
+copy /B "%NP3_WIN32_DIR%\lng\gwLng\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\lng\gwLng\" /Y /V
 copy /B "%NP3_WIN32_DIR%\grepWinNP3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
 
 if exist "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" (
@@ -174,31 +174,11 @@ if exist "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" (
 ) else (
 	mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng"
 )
-copy /B "%NP3_GREPWIN_DIR%\translationsNP3\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" /Y /V
+copy /B "%NP3_X64_DIR%\lng\gwLng\*.lang" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\lng\gwLng\" /Y /V
 copy /B "%NP3_X64_DIR%\grepWinNP3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 
 :: ---------------------------------------------------------------------------------------------------
 
-goto :SKIP_DLL
-
-:: Only for "Notepad3Portable_DLL" version
-:: Copy all current "Scintilla.dll" files
-if exist %NP3_WIN32_DIR%\Scintilla.dll (
-    copy /B "%NP3_WIN32_DIR%\Scintilla.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
-) else (
-    echo. \x86\Scintilla.dll does not exist
-)
-
-if exist %NP3_X64_DIR%\Scintilla.dll (
-    copy /B "%NP3_X64_DIR%\Scintilla.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
-) else (
-    echo. \x64\Scintilla.dll does not exist
-)
-
-:SKIP_DLL
-
-:: ---------------------------------------------------------------------------------------------------
-
 call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP3_PORTAPP_INFO%_tmp.ini"
 
 call :REPLACE "xxxDEVNAMExxx" "%NP3_PORTAPP_INFO%_tmp.ini" "%DEVNAME%" "%NP3_PORTAPP_INFO%.ini"