diff --git a/x11-packages/far2l/WinPort-src-Backend-WinPortMain.cpp.patch b/x11-packages/far2l/WinPort-src-Backend-WinPortMain.cpp.patch
deleted file mode 100644
index 1effe787e4a5dc8..000000000000000
--- a/x11-packages/far2l/WinPort-src-Backend-WinPortMain.cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/WinPort/src/Backend/WinPortMain.cpp
-+++ b/WinPort/src/Backend/WinPortMain.cpp
-@@ -261,7 +261,7 @@
- 	bool x11 = false;
- 	bool wayland = false;
- 	std::string ext_clipboard;
--	unsigned int esc_expiration = 0;
-+	unsigned int esc_expiration = 100;
- 	std::vector<char *> filtered_argv;
- 
- 	ArgOptions() = default;
diff --git a/x11-packages/far2l/build.sh b/x11-packages/far2l/build.sh
index c02e04a325ac53f..16c864e9e8451a3 100644
--- a/x11-packages/far2l/build.sh
+++ b/x11-packages/far2l/build.sh
@@ -3,16 +3,16 @@ TERMUX_PKG_DESCRIPTION="FAR Manager v2"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.6.3"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION="2.6.4"
 TERMUX_PKG_SRCURL=https://github.com/elfmz/far2l/archive/refs/tags/v_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=ffb216a4f9b24bb45a2194d5e833c60334a4f4e9150c1ce0fc8eddffa6a9e173
-TERMUX_PKG_DEPENDS="libarchive, libc++, libuchardet, pcre"
+TERMUX_PKG_SHA256=49bf67dd5cb2069b1212ff3256d85123ceaee74470bedeef9ef1836582e4a5bc
+TERMUX_PKG_DEPENDS="libarchive, libc++, libuchardet"
 TERMUX_PKG_SUGGESTS="chafa, exiftool, htop, timg"
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/applications"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DCMAKE_BUILD_TYPE=Release
 -DANDROID=ON
 -DUSEWX=OFF
--DCOLORER=OFF
 "
diff --git a/x11-packages/far2l/far2l-plugins-colorer.subpackage.sh b/x11-packages/far2l/far2l-plugins-colorer.subpackage.sh
new file mode 100644
index 000000000000000..8edc1f2c82ad702
--- /dev/null
+++ b/x11-packages/far2l/far2l-plugins-colorer.subpackage.sh
@@ -0,0 +1,6 @@
+TERMUX_SUBPKG_DESCRIPTION="FAR2L colorer plugin"
+TERMUX_SUBPKG_DEPENDS="libxml2"
+TERMUX_SUBPKG_INCLUDE="
+lib/far2l/Plugins/colorer
+share/far2l/Plugins/colorer
+"
diff --git a/x11-packages/far2l/far2l-src-cfg-ConfigOpt.cpp.patch b/x11-packages/far2l/far2l-src-cfg-ConfigOpt.cpp.patch
index c72d8839cde5ba7..1c684f37b43ad0c 100644
--- a/x11-packages/far2l/far2l-src-cfg-ConfigOpt.cpp.patch
+++ b/x11-packages/far2l/far2l-src-cfg-ConfigOpt.cpp.patch
@@ -1,11 +1,20 @@
 --- a/far2l/src/cfg/ConfigOpt.cpp
 +++ b/far2l/src/cfg/ConfigOpt.cpp
-@@ -157,7 +157,7 @@
- 	{true,  NSecInterface, "ExclusiveWinLeft", &Opt.ExclusiveWinLeft, 0},
- 	{true,  NSecInterface, "ExclusiveWinRight", &Opt.ExclusiveWinRight, 0},
+@@ -168,7 +168,7 @@ const ConfigOpt g_cfg_opts[] {
+ 	{true,  NSecInterface, "TimeSeparator", &Opt.strTimeSeparator, GetTimeSeparatorDefaultStr()},
+ 	{true,  NSecInterface, "DecimalSeparator", &Opt.strDecimalSeparator, GetDecimalSeparatorDefaultStr()},
  
 -	{true,  NSecInterface, "OSC52ClipSet", &Opt.OSC52ClipSet, 0},
 +	{true,  NSecInterface, "OSC52ClipSet", &Opt.OSC52ClipSet, 1},
  	{true,  NSecInterface, "TTYPaletteOverride", &Opt.TTYPaletteOverride, 1},
  
  	{false, NSecInterface, "ShowTimeoutDelFiles", &Opt.ShowTimeoutDelFiles, 50},
+@@ -260,7 +260,7 @@ const ConfigOpt g_cfg_opts[] {
+ 	{true,  NSecSystem, "SaveViewHistory", &Opt.SaveViewHistory, 1},
+ 	{true,  NSecSystem, "HistoryRemoveDupsRule", &Opt.HistoryRemoveDupsRule, 2},
+ 	{true,  NSecSystem, "AutoHighlightHistory", &Opt.AutoHighlightHistory, 1},
+-	{true,  NSecSystem, "AutoSaveSetup", &Opt.AutoSaveSetup, 0},
++	{true,  NSecSystem, "AutoSaveSetup", &Opt.AutoSaveSetup, 1},
+ 	{true,  NSecSystem, "DeleteToRecycleBin", &Opt.DeleteToRecycleBin, 0},
+ 	{true,  NSecSystem, "DeleteToRecycleBinKillLink", &Opt.DeleteToRecycleBinKillLink, 1},
+ 	{false, NSecSystem, "WipeSymbol", &Opt.WipeSymbol, 0},
diff --git a/x11-packages/far2l/multiarc-src-formats-7z-C.patch b/x11-packages/far2l/multiarc-src-formats-7z-C.patch
deleted file mode 100644
index 801b7008b6cf4f3..000000000000000
--- a/x11-packages/far2l/multiarc-src-formats-7z-C.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/multiarc/src/formats/7z/C/Aes.c b/multiarc/src/formats/7z/C/Aes.c
-index 27e32e6..115832e 100755
---- a/multiarc/src/formats/7z/C/Aes.c
-+++ b/multiarc/src/formats/7z/C/Aes.c
-@@ -56,6 +56,7 @@ static Byte InvS[256];
- #ifdef MY_CPU_X86_OR_AMD64
-   #define USE_HW_AES
- #elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
-+ #if (__ARM_ARCH > 7)
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
-       #define USE_HW_AES
-@@ -69,6 +70,7 @@ static Byte InvS[256];
-       #define USE_HW_AES
-     #endif
-   #endif
-+ #endif
- #endif
- 
- #ifdef USE_HW_AES
-diff --git a/multiarc/src/formats/7z/C/AesOpt.c b/multiarc/src/formats/7z/C/AesOpt.c
-index 6e793af..7ba2b1e 100755
---- a/multiarc/src/formats/7z/C/AesOpt.c
-+++ b/multiarc/src/formats/7z/C/AesOpt.c
-@@ -516,7 +516,7 @@ VAES_COMPAT_STUB (AesCtr_Code_HW)
- 
- 
- #elif defined(MY_CPU_ARM_OR_ARM64) && defined(MY_CPU_LE)
-- #if defined(__ARM_NEON) || defined(__ARM_NEON__)
-+ #if (__ARM_ARCH > 7)
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
-       #define USE_HW_AES
-diff --git a/multiarc/src/formats/7z/C/Sha1.c b/multiarc/src/formats/7z/C/Sha1.c
-index 9665b5b..4faf0d7 100755
---- a/multiarc/src/formats/7z/C/Sha1.c
-+++ b/multiarc/src/formats/7z/C/Sha1.c
-@@ -33,6 +33,7 @@ This code is based on public domain code of Steve Reid from Wei Dai's Crypto++ l
-     #endif
-   #endif
- #elif defined(MY_CPU_ARM_OR_ARM64)
-+ #if (__ARM_ARCH > 7)
-   #ifdef _MSC_VER
-     #if _MSC_VER >= 1910 && _MSC_VER >= 1929 && _MSC_FULL_VER >= 192930037
-       #define _SHA_SUPPORTED
-@@ -46,6 +47,7 @@ This code is based on public domain code of Steve Reid from Wei Dai's Crypto++ l
-       #define _SHA_SUPPORTED
-     #endif
-   #endif
-+ #endif
- #endif
- 
- void MY_FAST_CALL Sha1_UpdateBlocks(UInt32 state[5], const Byte *data, size_t numBlocks);
-diff --git a/multiarc/src/formats/7z/C/Sha1Opt.c b/multiarc/src/formats/7z/C/Sha1Opt.c
-index 61da0b1..ecf4187 100755
---- a/multiarc/src/formats/7z/C/Sha1Opt.c
-+++ b/multiarc/src/formats/7z/C/Sha1Opt.c
-@@ -213,7 +213,7 @@ void MY_FAST_CALL Sha1_UpdateBlocks_HW(UInt32 state[5], const Byte *data, size_t
- #endif // USE_HW_SHA
- 
- #elif defined(MY_CPU_ARM_OR_ARM64)
-- #if defined(__ARM_NEON) || defined(__ARM_NEON__)
-+ #if (__ARM_ARCH > 7)
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
-       #define USE_HW_SHA
-diff --git a/multiarc/src/formats/7z/C/Sha256.c b/multiarc/src/formats/7z/C/Sha256.c
-index 8b3983e..72a746f 100755
---- a/multiarc/src/formats/7z/C/Sha256.c
-+++ b/multiarc/src/formats/7z/C/Sha256.c
-@@ -33,6 +33,7 @@ This code is based on public domain code from Wei Dai's Crypto++ library. */
-     #endif
-   #endif
- #elif defined(MY_CPU_ARM_OR_ARM64)
-+ #if (__ARM_ARCH > 7)
-   #ifdef _MSC_VER
-     #if _MSC_VER >= 1910
-       #define _SHA_SUPPORTED
-@@ -46,6 +47,7 @@ This code is based on public domain code from Wei Dai's Crypto++ library. */
-       #define _SHA_SUPPORTED
-     #endif
-   #endif
-+ #endif
- #endif
- 
- void MY_FAST_CALL Sha256_UpdateBlocks(UInt32 state[8], const Byte *data, size_t numBlocks);
-diff --git a/multiarc/src/formats/7z/C/Sha256Opt.c b/multiarc/src/formats/7z/C/Sha256Opt.c
-index 2022aba..1790a37 100755
---- a/multiarc/src/formats/7z/C/Sha256Opt.c
-+++ b/multiarc/src/formats/7z/C/Sha256Opt.c
-@@ -213,7 +213,7 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[8], const Byte *data, size
- #endif // USE_HW_SHA
- 
- #elif defined(MY_CPU_ARM_OR_ARM64)
-- #if defined(__ARM_NEON) || defined(__ARM_NEON__)
-+ #if (__ARM_ARCH > 7)
-   #if defined(__clang__)
-     #if (__clang_major__ >= 8) // fix that check
-       #define USE_HW_SHA