diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index d56e71223..dc412ec3d 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=26.11.3
-PKG_RELEASE:=371
+PKG_RELEASE:=372
 PKG_PO_VERSION:=$(PKG_VERSION)
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm b/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm
index ad8ce3908..5fdb5e667 100644
--- a/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm
+++ b/luci-app-passwall/luasrc/view/passwall/cbi/nodes_listvalue_com.htm
@@ -256,7 +256,7 @@
 			document.head.appendChild(styleNode)
 			// trace back from option -> select -> body for background color
 			const panelRadius = styleSelect.borderRadius;
-			const optionColor = !lv_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : !lv_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : styleBody.backgroundColor
+			const optionColor = !lv_isTransparent(styleSelect.backgroundColor) ? styleSelect.backgroundColor : !lv_isTransparent(styleOption.backgroundColor) ? styleOption.backgroundColor : styleBody.backgroundColor
 			const titleColor = lv_getColorSchema(optionColor) === "light" ? lv_darker(optionColor, 30) : lv_lighter(optionColor, 30)
 			// 自带箭头已占据布局空间，右内边距使用主题的左内边距
 			const selectStyleCSS = [`#${CSS.escape(cbid + ".display")} {`, lv_style2Css(styleSelect, styleNames), lv_style2Css(styleSelect, ["backgroundColor"]), `padding-right: ${styleSelect.paddingLeft} !important;`, "}"]
diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh
index 2d5796607..b31da9ad4 100755
--- a/luci-app-passwall/root/usr/share/passwall/iptables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh
@@ -1029,16 +1029,16 @@ add_firewall_rule() {
 	[ -n "$ISP_DNS" ] && {
 		#echolog "处理 ISP DNS 例外..."
 		for ispip in $ISP_DNS; do
-			ipset -! add $IPSET_WHITE $ispip timeout 0
-			echolog "  - [$?]追加ISP IPv4 DNS到白名单：${ispip}"
+			ipset -! add $IPSET_VPS $ispip
+			echolog "  - [$?]追加ISP IPv4 DNS到ipset[$IPSET_VPS]：${ispip}"
 		done
 	}
 
 	[ -n "$ISP_DNS6" ] && {
 		#echolog "处理 ISP IPv6 DNS 例外..."
 		for ispip6 in $ISP_DNS6; do
-			ipset -! add $IPSET_WHITE6 $ispip6 timeout 0
-			echolog "  - [$?]追加ISP IPv6 DNS到白名单：${ispip6}"
+			ipset -! add $IPSET_VPS6 $ispip6
+			echolog "  - [$?]追加ISP IPv6 DNS到ipset[$IPSET_VPS6]：${ispip6}"
 		done
 	}
 
@@ -1468,7 +1468,7 @@ del_firewall_rule() {
 	destroy_ipset $IPSET_WAN
 	destroy_ipset $IPSET_LAN
 	destroy_ipset $IPSET_VPS
-	#destroy_ipset $IPSET_SHUNT
+	destroy_ipset $IPSET_SHUNT
 	#destroy_ipset $IPSET_GFW
 	#destroy_ipset $IPSET_CHN
 	#destroy_ipset $IPSET_BLACK
@@ -1479,13 +1479,18 @@ del_firewall_rule() {
 	destroy_ipset $IPSET_WAN6
 	destroy_ipset $IPSET_LAN6
 	destroy_ipset $IPSET_VPS6
-	#destroy_ipset $IPSET_SHUNT6
+	destroy_ipset $IPSET_SHUNT6
 	#destroy_ipset $IPSET_GFW6
 	#destroy_ipset $IPSET_CHN6
 	#destroy_ipset $IPSET_BLACK6
 	destroy_ipset $IPSET_BLOCK6
 	destroy_ipset $IPSET_WHITE6
 
+	local ipset_name
+	for ipset_name in $(ipset list -name 2>/dev/null | grep -E '^psw_.+_shunt6?$'); do
+		destroy_ipset "$ipset_name"
+	done
+
 	echolog "删除 iptables 规则完成。"
 }
 
diff --git a/luci-app-passwall/root/usr/share/passwall/nftables.sh b/luci-app-passwall/root/usr/share/passwall/nftables.sh
index ef0e9d3fb..c301effd6 100755
--- a/luci-app-passwall/root/usr/share/passwall/nftables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh
@@ -224,7 +224,7 @@ gen_nftset() {
 		if [ "$timeout_argument_set" = "0" ]; then
 			nft "add set $NFTABLE_NAME $nftset_name { type $ip_type; flags interval; auto-merge; }"
 		else
-			nft "add set $NFTABLE_NAME $nftset_name { type $ip_type; flags interval, timeout; timeout $timeout_argument_set; gc-interval $gc_interval_time; auto-merge; }"
+			nft "add set $NFTABLE_NAME $nftset_name { type $ip_type; flags interval, timeout; timeout $timeout_argument_set; gc-interval $gc_interval_time; }"
 		fi
 	fi
 }
@@ -1102,17 +1102,17 @@ add_firewall_rule() {
 
 	[ -n "$ISP_DNS" ] && {
 		#echolog "处理 ISP DNS 例外..."
-		echo "$ISP_DNS" | insert_nftset $NFTSET_WHITE
+		echo "$ISP_DNS" | insert_nftset $NFTSET_VPS
 		for ispip in $ISP_DNS; do
-			echolog "  - [$?]追加ISP IPv4 DNS到白名单：${ispip}"
+			echolog "  - [$?]追加ISP IPv4 DNS到nftset[$NFTSET_VPS]：${ispip}"
 		done
 	}
 
 	[ -n "$ISP_DNS6" ] && {
 		#echolog "处理 ISP IPv6 DNS 例外..."
-		echo $ISP_DNS6 | insert_nftset $NFTSET_WHITE6
+		echo "$ISP_DNS6" | insert_nftset $NFTSET_VPS6
 		for ispip6 in $ISP_DNS6; do
-			echolog "  - [$?]追加ISP IPv6 DNS到白名单：${ispip6}"
+			echolog "  - [$?]追加ISP IPv6 DNS到nftset[$NFTSET_VPS6]：${ispip6}"
 		done
 	}
 
@@ -1549,6 +1549,11 @@ del_firewall_rule() {
 	destroy_nftset $NFTSET_BLOCK6 $NFTSET_BLOCK6_STATIC
 	destroy_nftset $NFTSET_WHITE6 $NFTSET_WHITE6_STATIC
 
+	local nftset
+	for nftset in $(nft -t list table $NFTABLE_NAME 2>/dev/null | awk '$1 == "set" && $2 ~ /^psw_.+_shunt6?_static$/ {print $2}'); do
+		destroy_nftset "$nftset"
+	done
+
 	del_script_mwan3
 
 	echolog "删除 nftables 规则完成。"
diff --git a/luci-app-trafficctl/Makefile b/luci-app-trafficctl/Makefile
index fe4f197fb..03a7b8b9b 100644
--- a/luci-app-trafficctl/Makefile
+++ b/luci-app-trafficctl/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-trafficctl
-PKG_VERSION:=1.29.2
-PKG_RELEASE:=26
+PKG_VERSION:=1.30.0
+PKG_RELEASE:=27
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Denis Iusupov <yusdyr@gmail.com>