diff --git a/.github/diy/patches/luci-app-passwall2.patch b/.github/diy/patches/luci-app-passwall2.patch
index 8b94c1313..3185a5609 100644
--- a/.github/diy/patches/luci-app-passwall2.patch
+++ b/.github/diy/patches/luci-app-passwall2.patch
@@ -14,83 +14,38 @@
 
 --- a/luci-app-passwall2/Makefile
 +++ b/luci-app-passwall2/Makefile
-@@ -32,6 +32,21 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
+@@ -34,6 +34,21 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
  	+ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc +resolveip +tcping \
- 	+xray-core +v2ray-geoip +v2ray-geosite \
+ 	+xray-core +geoview +v2ray-geoip +v2ray-geosite \
  	+unzip \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy:haproxy \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client:shadowsocks-rust-sslocal \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server:shadowsocks-rust-ssserver \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-local \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-redir \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs-client \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_SingBox:sing-box \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_tuic_client:tuic-client \
-+	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy:haproxy \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client:shadowsocks-rust-sslocal \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server:shadowsocks-rust-ssserver \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-local \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-redir \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs-client \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_SingBox:sing-box \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_tuic_client:tuic-client \
+++	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
  	+PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat:ip6tables-mod-nat
  
  define Package/$(PKG_NAME)/config
-@@ -71,7 +86,6 @@ config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy
- 	bool "Include Haproxy"
--	select PACKAGE_haproxy
- 	default y if aarch64||arm||i386||x86_64
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
-@@ -87,8 +101,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
- 	bool "Include Shadowsocks Libev Client"
--	select PACKAGE_shadowsocks-libev-ss-local
--	select PACKAGE_shadowsocks-libev-ss-redir
- 	default y
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
-@@ -99,7 +111,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
- config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
- 	bool "Include Shadowsocks Rust Client"
- 	depends on !i386
--	select PACKAGE_shadowsocks-rust-sslocal
- 	default y if aarch64||x86_64
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
-@@ -110,8 +121,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
- 	bool "Include ShadowsocksR Libev Client"
--	select PACKAGE_shadowsocksr-libev-ssr-local
--	select PACKAGE_shadowsocksr-libev-ssr-redir
- 	default y
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
-@@ -121,12 +130,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
- 	bool "Include Simple-Obfs (Shadowsocks Plugin)"
--	select PACKAGE_simple-obfs-client
- 	default y
+@@ -130,8 +145,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
  
  config PACKAGE_$(PKG_NAME)_INCLUDE_SingBox
  	bool "Include Sing-Box"
 -	select PACKAGE_sing-box
- 	default y if aarch64||arm||i386||x86_64
+-	default y if aarch64||arm||i386||x86_64
++	default y
  
  config PACKAGE_$(PKG_NAME)_INCLUDE_tuic_client
-@@ -137,7 +144,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_tuic_client
- 
- config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin
- 	bool "Include V2ray-Plugin (Shadowsocks Plugin)"
--	select PACKAGE_v2ray-plugin
- 	default y if aarch64||arm||i386||x86_64
- 
- endif
+ 	bool "Include tuic-client"
 
 --- a/luci-app-passwall2/luasrc/controller/passwall2.lua
 +++ b/luci-app-passwall2/luasrc/controller/passwall2.lua