diff --git a/package/lienol/luci-app-mia/luasrc/controller/mia.lua b/package/lienol/luci-app-mia/luasrc/controller/mia.lua
index f91fb120f6..4096b41894 100644
--- a/package/lienol/luci-app-mia/luasrc/controller/mia.lua
+++ b/package/lienol/luci-app-mia/luasrc/controller/mia.lua
@@ -3,10 +3,10 @@ module("luci.controller.mia", package.seeall)
 function index()
     if not nixio.fs.access("/etc/config/mia") then return end
 
-    entry({"admin", "network"}, firstchild(), "Control", 44).dependent = false
-    entry({"admin", "network", "mia"}, cbi("mia"), _("时间控制"), 10).dependent =
+    entry({"admin", "control"}, firstchild(), "Control", 44).dependent = false
+    entry({"admin", "control", "mia"}, cbi("mia"), _("时间控制"), 10).dependent =
         true
-    entry({"admin", "network", "mia", "status"}, call("status")).leaf = true
+    entry({"admin", "control", "mia", "status"}, call("status")).leaf = true
 end
 
 function status()
diff --git a/package/lienol/luci-app-passwall/Makefile b/package/lienol/luci-app-passwall/Makefile
index 34e6c75edd..4f04678415 100644
--- a/package/lienol/luci-app-passwall/Makefile
+++ b/package/lienol/luci-app-passwall/Makefile
@@ -6,11 +6,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=3.1
-PKG_RELEASE:=3-20200103
+PKG_VERSION:=3.3
+PKG_RELEASE:=25-20200114
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PO2LMO:=./po2lmo
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -19,7 +18,7 @@ menu "Configuration"
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_ipt2socks
 	bool "Include ipt2socks"
-	default n
+	default y
 	
 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks
 	bool "Include Shadowsocks Redir (ss-redir)"
@@ -55,19 +54,19 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_kcptun
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_haproxy
 	bool "Include haproxy"
-	default n
+	default y
 	
 config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
 	bool "Include ChinaDNS-NG"
 	default y
 	
-config PACKAGE_$(PKG_NAME)_INCLUDE_dns2socks
-	bool "Include dns2socks"
-	default y
-	
 config PACKAGE_$(PKG_NAME)_INCLUDE_pdnsd
 	bool "Include pdnsd"
 	default y
+	
+config PACKAGE_$(PKG_NAME)_INCLUDE_dns2socks
+	bool "Include dns2socks"
+	default n
 
 endmenu
 endef
@@ -77,8 +76,8 @@ define Package/$(PKG_NAME)
   SUBMENU:=3. Applications
   TITLE:=LuCI support for PassWall By Lienol
   PKGARCH:=all
-  DEPENDS:=+curl +wget +libcurl +libmbedtls +ca-bundle +ca-certificates +resolveip +iptables-mod-tproxy +kmod-ipt-tproxy +iptables-mod-ipopt +kmod-ipt-ipopt +ip +ipset +coreutils +coreutils-base64 +coreutils-nohup +luci-lib-jsonc +unzip \
-  +dnsmasq-full +tcping +bash \
+  DEPENDS:=+libmbedtls +iptables-mod-tproxy +kmod-ipt-tproxy +iptables-mod-ipopt +kmod-ipt-ipopt +ip +ipset +coreutils +coreutils-base64 +coreutils-nohup +luci-lib-jsonc \
+  +bash +wget +resolveip +unzip +dnsmasq-full +tcping \
   +PACKAGE_$(PKG_NAME)_INCLUDE_ipt2socks:ipt2socks \
   +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
   +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR:shadowsocksr-libev-alt \
@@ -124,8 +123,7 @@ define Package/$(PKG_NAME)/install
 	cp -pR ./luasrc/* $(1)/usr/lib/lua/luci/
 	
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
-	chmod 755 $(PO2LMO)
-	$(PO2LMO) ./po/zh-cn/passwall.po $(1)/usr/lib/lua/luci/i18n/passwall.zh-cn.lmo
+	po2lmo ./po/zh-cn/passwall.po $(1)/usr/lib/lua/luci/i18n/passwall.zh-cn.lmo
 endef
 
 define Package/$(PKG_NAME)/postinst
diff --git a/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua
index 4861a65753..e289bf5179 100644
--- a/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua
+++ b/package/lienol/luci-app-passwall/luasrc/controller/passwall.lua
@@ -19,13 +19,13 @@ function index()
     end
     entry({"admin", "vpn", "passwall", "settings"}, cbi("passwall/global"),
           _("Basic Settings"), 1).dependent = true
-    entry({"admin", "vpn", "passwall", "node_list"},
-          cbi("passwall/node_list", {autoapply = true}), _("Node List"), 2).dependent =
-        true
+    entry({"admin", "vpn", "passwall", "node_list"}, cbi("passwall/node_list"),
+          _("Node List"), 2).dependent = true
     -- entry({"admin", "vpn", "passwall", "auto_switch"},
     --      cbi("passwall/auto_switch"), _("Auto Switch"), 3).leaf = true
-    entry({"admin", "vpn", "passwall", "other"}, cbi("passwall/other"),
-          _("Other Settings"), 94).leaf = true
+    entry({"admin", "vpn", "passwall", "other"},
+          cbi("passwall/other", {autoapply = true}), _("Other Settings"), 94).leaf =
+        true
     if nixio.fs.access("/usr/sbin/haproxy") then
         entry({"admin", "vpn", "passwall", "balancing"},
               cbi("passwall/balancing"), _("Load Balancing"), 95).leaf = true
@@ -34,10 +34,12 @@ function index()
           _("Rule Update"), 96).leaf = true
     entry({"admin", "vpn", "passwall", "acl"}, cbi("passwall/acl"),
           _("Access control"), 97).leaf = true
-    entry({"admin", "vpn", "passwall", "rule_list"}, cbi("passwall/rule_list"),
+    entry({"admin", "vpn", "passwall", "rule_list"},
+          cbi("passwall/rule_list", {autoapply = true}),
           _("Set Blacklist And Whitelist"), 98).leaf = true
-    entry({"admin", "vpn", "passwall", "log"}, cbi("passwall/log"),
-          _("Watch Logs"), 99).leaf = true
+    entry({"admin", "vpn", "passwall", "log"},
+          cbi("passwall/log", {autoapply = true}), _("Watch Logs"), 99).leaf =
+        true
     entry({"admin", "vpn", "passwall", "node_config"},
           cbi("passwall/node_config")).leaf = true
 
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua
index 0efbbf5deb..2b7c2d7285 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/auto_switch.lua
@@ -1,10 +1,12 @@
 local uci = require"luci.model.uci".cursor()
+local api = require "luci.model.cbi.passwall.api.api"
 local appname = "passwall"
 
 local n = {}
 uci:foreach(appname, "nodes", function(e)
-    if e.type and e.address and e.remarks then
-        n[e[".name"]] = "%s：[%s] %s" % {e.type, e.remarks, e.address}
+    if e.type and e.remarks and e.address and e.port then
+        n[e[".name"]] = "%s：[%s] %s:%s" %
+                            {e.type, e.remarks, e.address, e.port}
     end
 end)
 
@@ -26,12 +28,16 @@ o.rmempty = false
 ---- Testing Time
 o = s:option(Value, "testing_time", translate("How often is a diagnosis made"),
              translate("Units:minutes"))
-o.default = "10"
+o.default = "3"
 
----- Tcp Redir Server
-o = s:option(DynamicList, "tcp_redir_server",
-             translate("List of alternate TCP forwarding nodes"), translate(
-                 "When there is no server, an automatic reconnect scheme is used"))
-for _, key in pairs(key_table) do o:value(key, n[key]) end
+---- TCP Node
+local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num", 1)
+for i = 1, tcp_node_num, 1 do
+    o = s:option(DynamicList, "tcp_node" .. i,
+                 "TCP " .. i .. " " .. translate("List of backup nodes"),
+                 translate(
+                     "List of backup nodes, the first of which must be the primary node and the others the standby node."))
+    for _, key in pairs(key_table) do o:value(key, n[key]) end
+end
 
 return m
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua
index b0400551ac..7b33cc84ad 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/balancing.lua
@@ -4,22 +4,27 @@ local net = require"luci.model.network".init()
 local uci = require"luci.model.uci".cursor()
 local ifaces = e.net:devices()
 local appname = "passwall"
-local nodes_name = {}
-local nodes_port = {}
 
+local n = {}
 uci:foreach(appname, "nodes", function(e)
-    if e.address and e.port and e.address ~= "127.0.0.1" then
-        nodes_name[e[".name"]] = "%s" % {e.address}
-        nodes_port[e[".name"]] = "%s" % {e.port}
+    if e.remarks and e.address and e.port and e.address ~= "127.0.0.1" then
+        e.remark = "[%s] %s:%s" % {e.remarks, e.address, e.port}
+        n[e[".name"]] = e
     end
 end)
 
-m = Map("passwall")
+local key_table = {}
+for key, _ in pairs(n) do table.insert(key_table, key) end
+table.sort(key_table)
+
+m = Map(appname)
 
 -- [[ Haproxy Settings ]]--
 s = m:section(TypedSection, "global_haproxy", translate("Load Balancing"))
 s.anonymous = true
 
+s:append(Template("passwall/haproxy/status"))
+
 ---- Balancing Enable
 o = s:option(Flag, "balancing_enable", translate("Enable Load Balancing"))
 o.rmempty = false
@@ -43,15 +48,15 @@ o.default = "1188"
 o:depends("balancing_enable", 1)
 
 ---- Haproxy Port
-o = s:option(Value, "haproxy_port", translate("Haproxy Port"), translate(
-    "Configure this node with 127.0.0.1: this port"))
+o = s:option(Value, "haproxy_port", translate("Haproxy Port"),
+             translate("Configure this node with 127.0.0.1: this port"))
 o.default = "1181"
 o:depends("balancing_enable", 1)
 
 -- [[ Balancing Settings ]]--
 s = m:section(TypedSection, "balancing", translate("Load Balancing Setting"),
               translate(
-                  "Add a node, Export Of Multi WAN Only support Multi Wan. If no effect, please go to mwan3 to set. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline!"))
+                  "Add a node, Export Of Multi WAN Only support Multi Wan. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline!"))
 s.template = "cbi/tblsection"
 s.sortable = true
 s.anonymous = true
@@ -59,12 +64,14 @@ s.addremove = true
 
 ---- Node Address
 o = s:option(Value, "lbss", translate("Node Address"))
-for m, s in pairs(nodes_name) do o:value(s) end
+for _, key in pairs(key_table) do
+    o:value(n[key].address .. ":" .. n[key].port, n[key].remark)
+end
 o.rmempty = false
 
 ---- Node Port
 o = s:option(Value, "lbort", translate("Node Port"))
-for m, s in pairs(nodes_port) do o:value(s) end
+o:value("default", translate("Default"))
 o.rmempty = false
 
 ---- Node Weight
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua
index 8b1e3e02fb..ae1154d4e3 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/global.lua
@@ -40,11 +40,15 @@ else
 end
 
 -- [[ Global Settings ]]--
-s = m:section(TypedSection, "global", translate("Global Settings"),
-              translate("If you can use it, very stable. If not, GG !!!"))
+s = m:section(TypedSection, "global", translate("Global Settings"))
+-- s.description = translate("If you can use it, very stable. If not, GG !!!")
 s.anonymous = true
 s.addremove = false
 
+---- Main switch
+o = s:option(Flag, "enabled", translate("Main switch"))
+o.rmempty = false
+
 ---- TCP Node
 local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num", 1)
 for i = 1, tcp_node_num, 1 do
@@ -81,7 +85,7 @@ local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num", 1)
 for i = 1, socks5_node_num, 1 do
     if i == 1 then
         o = s:option(ListValue, "socks5_node" .. i, translate("Socks5 Node"),
-                     translate("The client can use the router's Socks5 proxy"))
+                     translate("The client can use the router's Socks5 proxy."))
     else
         o = s:option(ListValue, "socks5_node" .. i,
                      translate("Socks5 Node") .. " " .. i)
@@ -91,8 +95,8 @@ for i = 1, socks5_node_num, 1 do
 end
 
 ---- DNS Forward Mode
-o = s:option(ListValue, "dns_mode", translate("DNS Forward Mode"), translate(
-                 "if you use no patterns are used, DNS of wan will be used by default as upstream of dnsmasq"))
+o = s:option(ListValue, "dns_mode", translate("DNS Mode"), translate(
+                 "if has problem, please try another mode.<br />if you use no patterns are used, DNS of wan will be used by default as upstream of dnsmasq."))
 o.rmempty = false
 o:reset_values()
 if is_finded("chinadns-ng") then o:value("chinadns-ng", "ChinaDNS-NG") end
@@ -105,15 +109,35 @@ end
 o:value("local_7913", translate("Use local port 7913 as DNS"))
 o:value("nonuse", translate("No patterns are used"))
 
----- DNS Forward
-o = s:option(Value, "dns_forward", translate("DNS Forward Address"))
-o.default = "8.8.4.4"
-o:value("8.8.4.4", "8.8.4.4 (Google DNS)")
-o:value("8.8.8.8", "8.8.8.8 (Google DNS)")
-o:value("208.67.222.222", "208.67.222.222 (OpenDNS DNS)")
-o:value("208.67.220.220", "208.67.220.220 (OpenDNS DNS)")
-o:depends("dns_mode", "dns2socks")
-o:depends("dns_mode", "pdnsd")
+---- China DNS Server
+o = s:option(Value, "up_china_dns", translate("China DNS Server") .. "(UDP)",
+             translate(
+                 "Example: 127.0.0.1#6053 ,Represents DNS on using 127.0.0.1 the 6053 port. such as smartdns,AdGuard Home...<br />Only use two at most, english comma separation, If you do not fill in the # and the following port, you are using port 53.<br />If you use custom, unless you know what you're doing, setting it up incorrectly can cause your stuck to crash!"))
+o.default = "223.5.5.5"
+o:value("dnsbyisp", translate("dnsbyisp"))
+o:value("223.5.5.5", "223.5.5.5 (" .. translate("Ali") .. "DNS)")
+o:value("223.6.6.6", "223.6.6.6 (" .. translate("Ali") .. "DNS)")
+o:value("114.114.114.114", "114.114.114.114 (114DNS)")
+o:value("114.114.115.115", "114.114.115.115 (114DNS)")
+o:value("119.29.29.29", "119.29.29.29 (DNSPOD DNS)")
+o:value("182.254.116.116", "182.254.116.116 (DNSPOD DNS)")
+o:value("1.2.4.8", "1.2.4.8 (CNNIC DNS)")
+o:value("210.2.4.8", "210.2.4.8 (CNNIC DNS)")
+o:value("180.76.76.76", "180.76.76.76 (" .. translate("Baidu") .. "DNS)")
+
+---- Upstream trust DNS Server for ChinaDNS-NG
+o = s:option(Value, "up_trust_chinadns_ng_dns",
+             translate("Upstream trust DNS Server for ChinaDNS-NG") .. "(UDP)",
+             translate(
+                 "Example: 127.0.0.1#5353 ,such as dns2socks,dns-forwarder...<br />Only use two at most, english comma separation, If you do not fill in the # and the following port, you are using port 53."))
+o.default = "8.8.4.4,8.8.8.8"
+o:value("8.8.4.4,8.8.8.8", "8.8.4.4, 8.8.8.8 (Google DNS)")
+o:value("208.67.222.222,208.67.220.220",
+        "208.67.222.222, 208.67.220.220 (Open DNS)")
+if is_finded("dns2socks") then
+    o:value("dns2socks", "dns2socks " .. translate("Need Socks5 server"))
+end
+o:depends("dns_mode", "chinadns-ng")
 
 ---- Use TCP Node Resolve DNS
 o = s:option(Flag, "use_tcp_node_resolve_dns",
@@ -122,28 +146,27 @@ o = s:option(Flag, "use_tcp_node_resolve_dns",
 o.default = 1
 o:depends("dns_mode", "pdnsd")
 
----- upstreamm DNS Server for ChinaDNS-NG
-o = s:option(ListValue, "up_chinadns_ng_mode",
-             translate("upstreamm DNS Server for ChinaDNS-NG"), translate(
-                 "Domestic DNS server in advanced Settings is used as domestic DNS by default"))
-o.default = "208.67.222.222"
-o:value("208.67.222.222", "208.67.222.222 (OpenDNS DNS)")
-o:value("208.67.220.220", "208.67.220.220 (OpenDNS DNS)")
-if is_finded("dns2socks") then
-    o:value("dns2socks", "dns2socks " .. translate("Need Socks5 server"))
-end
-o:value("custom", translate("custom"))
-o:depends("dns_mode", "chinadns-ng")
+---- DNS Forward
+o = s:option(Value, "dns_forward", translate("DNS Address"))
+o.default = "8.8.4.4"
+o:value("8.8.4.4", "8.8.4.4 (Google DNS)")
+o:value("8.8.8.8", "8.8.8.8 (Google DNS)")
+o:value("208.67.222.222", "208.67.222.222 (Open DNS)")
+o:value("208.67.220.220", "208.67.220.220 (Open DNS)")
+o:depends("dns_mode", "dns2socks")
+o:depends("dns_mode", "pdnsd")
+o:depends("up_trust_chinadns_ng_dns", "dns2socks")
 
-o = s:option(Value, "up_chinadns_ng_custom", translate("DNS Server"), translate(
-                 "example: 127.0.0.1#5335<br>Need at least one,Other DNS services can be used as upstream, such as dns2socks."))
-o.default = "208.67.222.222#443"
-o:depends("up_chinadns_ng_mode", "custom")
+---- DNS Hijack
+o = s:option(Flag, "dns_53", translate("DNS Hijack"))
+o.default = 1
+o.rmempty = false
 
 ---- Default Proxy Mode
 o = s:option(ListValue, "proxy_mode",
-             translate("Default") .. translate("Proxy Mode"))
-o.default = "gfwlist"
+             translate("Default") .. translate("Proxy Mode"), translate(
+                 "If using GFW mode is not available, try clearing the native cache."))
+o.default = "chnroute"
 o.rmempty = false
 o:value("disable", translate("No Proxy"))
 o:value("global", translate("Global Proxy"))
@@ -155,14 +178,18 @@ o:value("returnhome", translate("Return Home"))
 ---- Localhost Proxy Mode
 o = s:option(ListValue, "localhost_proxy_mode",
              translate("Localhost") .. translate("Proxy Mode"), translate(
-                 "The server client can also use this rule to scientifically surf the Internet"))
+                 "The server client can also use this rule to scientifically surf the Internet.<br /> Global and continental whitelist are not recommended for non-special cases!"))
 o:value("default", translate("Default"))
--- o:value("global", translate("Global Proxy").."（"..translate("Danger").."）")
+o:value("global",
+        translate("Global Proxy") .. "（" .. translate("Danger") .. "）")
 o:value("gfwlist", translate("GFW List"))
--- o:value("chnroute", translate("China WhiteList"))
+o:value("chnroute", translate("China WhiteList"))
 o.default = "default"
 o.rmempty = false
 
+---- Tips
+s:append(Template("passwall/global/tips"))
+
 --[[
 local apply = luci.http.formvalue("cbi.apply")
 if apply then
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
index edd89e2445..bb74c941f3 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
@@ -3,8 +3,12 @@ local ipkg = require("luci.model.ipkg")
 
 local appname = "passwall"
 
+local function get_customed_path(e)
+    return luci.model.cbi.passwall.api.api.uci_get_type("global_app", e .. "_file")
+end
+
 local function is_finded(e)
-    return luci.sys.exec("find /usr/*bin -iname " .. e .. " -type f") ~= "" and
+    return luci.sys.exec("find /usr/*bin %s -iname %s -type f" % {get_customed_path(e), e}) ~= "" and
                true or false
 end
 
@@ -62,7 +66,9 @@ if ((is_installed("redsocks2") or is_finded("redsocks2")) or
 end
 if is_finded("ss-redir") then type:value("SS", translate("Shadowsocks")) end
 if is_finded("ssr-redir") then type:value("SSR", translate("ShadowsocksR")) end
-if is_installed("v2ray") then type:value("V2ray", translate("V2ray")) end
+if is_installed("v2ray") or is_finded("v2ray") then
+    type:value("V2ray", translate("V2ray"))
+end
 if is_installed("brook") or is_finded("brook") then
     type:value("Brook", translate("Brook"))
 end
@@ -239,7 +245,7 @@ v2ray_tcp_guise_http_path:depends("v2ray_tcp_guise", "http")
 
 v2ray_mkcp_guise = s:option(ListValue, "v2ray_mkcp_guise",
                             translate("Camouflage Type"), translate(
-                                '<br>none: default, no masquerade, data sent is packets with no characteristics.<br>srtp: disguised as an SRTP packet, it will be recognized as video call data (such as FaceTime).<br>utp: packets disguised as uTP will be recognized as bittorrent downloaded data.<br>wechat-video: packets disguised as WeChat video calls.<br>dtls: disguised as DTLS 1.2 packet.<br>wireguard: disguised as a WireGuard packet. (not really WireGuard protocol)'))
+                                '<br />none: default, no masquerade, data sent is packets with no characteristics.<br />srtp: disguised as an SRTP packet, it will be recognized as video call data (such as FaceTime).<br />utp: packets disguised as uTP will be recognized as bittorrent downloaded data.<br />wechat-video: packets disguised as WeChat video calls.<br />dtls: disguised as DTLS 1.2 packet.<br />wireguard: disguised as a WireGuard packet. (not really WireGuard protocol)'))
 for a, t in ipairs(v2ray_header_type_list) do v2ray_mkcp_guise:value(t) end
 v2ray_mkcp_guise:depends("v2ray_transport", "mkcp")
 
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua
index dad2429867..c46ac6df5d 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_list.lua
@@ -11,16 +11,16 @@ m = Map(appname)
 s = m:section(TypedSection, "global_other")
 s.anonymous = true
 
----- Use TCPing
-o = s:option(Flag, "use_tcping", translate("Use TCPing"),
-             translate("This will use tcping replace ping detection of node"))
-o.default = 1
-
 ---- Auto Ping
 o = s:option(Flag, "auto_ping", translate("Auto Ping"),
              translate("This will automatically ping the node for latency"))
 o.default = 1
 
+---- Use TCP Detection delay
+o = s:option(Flag, "use_tcping", translate("Use TCP Detection delay"),
+             translate("This will use tcping replace ping detection of node"))
+o.default = 1
+
 ---- Concise display nodes
 o = s:option(Flag, "compact_display_nodes", translate("Concise display nodes"))
 o.default = 0
@@ -37,8 +37,8 @@ o.default = 1
 s:append(Template("passwall/node_list/link_add_node"))
 
 -- [[ Node List ]]--
-s = m:section(TypedSection, "nodes", translate(""), translate(
-                  "Support for more than 10,000 ping nodes and luci does not crash and not slow."))
+s = m:section(TypedSection, "nodes")
+-- s.description = translate("Support for more than 10,000 ping nodes and luci does not crash and not slow.")
 s.anonymous = true
 s.addremove = true
 s.template = "cbi/tblsection"
@@ -85,9 +85,6 @@ if api.uci_get_type("global_other", "compact_display_nodes", "0") == "1" then
     end
 else
     s.sortable = true
-    ---- Remarks
-    o = s:option(DummyValue, "remarks", translate("Remarks"))
-
     ---- Add Mode
     if api.uci_get_type("global_other", "show_add_mode", "1") == "1" then
         o = s:option(DummyValue, "add_mode", translate("Add Mode"))
@@ -101,6 +98,8 @@ else
             return str
         end
     end
+    ---- Remarks
+    o = s:option(DummyValue, "remarks", translate("Remarks"))
 
     ---- Type
     o = s:option(DummyValue, "type", translate("Type"))
@@ -129,18 +128,13 @@ end--]]
 end
 
 ---- Ping
-o = s:option(DummyValue, "ping", translate("Ping"))
-o.width = "10%"
+o = s:option(DummyValue, "ping", translate("Latency"))
 if api.uci_get_type("global_other", "auto_ping", "0") == "0" then
     o.template = "passwall/node_list/ping"
 else
     o.template = "passwall/node_list/auto_ping"
 end
 
----- Apply
-o = s:option(DummyValue, "apply", translate("Apply"))
-o.template = "passwall/node_list/apply"
-
 m:append(Template("passwall/node_list/node_list"))
 
 return m
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua
index b25390304d..ba7213a7b9 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/other.lua
@@ -46,81 +46,6 @@ o:depends("auto_on", "1")
 o:value(nil, translate("Disable"))
 for e = 0, 23 do o:value(e, e .. translate("oclock")) end
 
--- [[ DNS Settings ]]--
-s = m:section(TypedSection, "global_dns", translate("DNS Settings"))
-s.anonymous = true
-s.addremove = false
-
----- Mainland DNS Sever 1
-o = s:option(Value, "dns_1", translate("Mainland DNS Sever 1"))
-o.rmempty = false
-o.default = "dnsbyisp"
-o:value("dnsbyisp", translate("dnsbyisp"))
-o:value("223.5.5.5", "223.5.5.5(" .. translate("Ali") .. "DNS1)")
-o:value("223.6.6.6", "223.6.6.6(" .. translate("Ali") .. "DNS2)")
-o:value("114.114.114.114", "114.114.114.114(114DNS1)")
-o:value("114.114.115.115", "114.114.115.115(114DNS2)")
-o:value("119.29.29.29", "119.29.29.29(DNSPOD DNS1)")
-o:value("182.254.116.116", "182.254.116.116(DNSPOD DNS2)")
-o:value("1.2.4.8", "1.2.4.8(CNNIC DNS1)")
-o:value("210.2.4.8", "210.2.4.8(CNNIC DNS2)")
-o:value("180.76.76.76", "180.76.76.76(" .. translate("Baidu") .. "DNS)")
-
----- Mainland DNS Sever 2
-o = s:option(Value, "dns_2", translate("Mainland DNS Sever 2"))
-o.rmempty = false
-o.default = "223.5.5.5"
-o:value("dnsbyisp", translate("dnsbyisp"))
-o:value("223.5.5.5", "223.5.5.5(" .. translate("Ali") .. "DNS1)")
-o:value("223.6.6.6", "223.6.6.6(" .. translate("Ali") .. "DNS2)")
-o:value("114.114.114.114", "114.114.114.114(114DNS1)")
-o:value("114.114.115.115", "114.114.115.115(114DNS2)")
-o:value("119.29.29.29", "119.29.29.29(DNSPOD DNS1)")
-o:value("182.254.116.116", "182.254.116.116(DNSPOD DNS2)")
-o:value("1.2.4.8", "1.2.4.8(CNNIC DNS1)")
-o:value("210.2.4.8", "210.2.4.8(CNNIC DNS2)")
-o:value("180.76.76.76", "180.76.76.76(" .. translate("Baidu") .. "DNS)")
-
----- DNS Export Of Multi WAN
-o = s:option(ListValue, "dns_port", translate("DNS Export Of Multi WAN"),
-             translate(
-                 "Only support Multi Wan. If no effect, please go to mwan3 to set."))
-o.rmempty = false
-o.default = 0
-o:value(0, translate("Auto"))
-for _, iface in ipairs(ifaces) do
-    if (iface:match("^pppoe*")) then
-        local nets = net:get_interface(iface)
-        nets = nets and nets:get_networks() or {}
-        for k, v in pairs(nets) do nets[k] = nets[k].sid end
-        nets = table.concat(nets, ",")
-        o:value(iface, ((#nets > 0) and "%s (%s)" % {iface, nets} or iface))
-    end
-end
-
----- Node Export Of Multi WAN
-o = s:option(ListValue, "wan_port", translate("Node Export Of Multi WAN"),
-             translate(
-                 "Only support Multi Wan. If no effect, please go to mwan3 to set."))
-o.default = 0
-o.rmempty = false
-o:value(0, translate("Auto"))
-for _, iface in ipairs(ifaces) do
-    if (iface:match("^pppoe*")) then
-        local nets = net:get_interface(iface)
-        nets = nets and nets:get_networks() or {}
-        for k, v in pairs(nets) do nets[k] = nets[k].sid end
-        nets = table.concat(nets, ",")
-        o:value(iface, ((#nets > 0) and "%s (%s)" % {iface, nets} or iface))
-    end
-end
-
----- DNS Hijack
-o = s:option(Flag, "dns_53", translate("DNS Hijack"), translate(
-                 "If the GFW mode cannot be used normally, please enable it"))
-o.default = 1
-o.rmempty = false
-
 -- [[ Forwarding Settings ]]--
 s = m:section(TypedSection, "global_forwarding",
               translate("Forwarding Settings"))
@@ -142,7 +67,7 @@ o:value("1:65535", translate("All"))
 o:value("53", "53")
 
 ---- Multi SS/SSR Process Option
-o = s:option(Value, "process", translate("Multi Process Option"),
+--[[ o = s:option(Value, "process", translate("Multi Process Option"),
              translate("you can start SS/SSR with multiple process"))
 o.default = "0"
 o.rmempty = false
@@ -151,6 +76,7 @@ o:value("1", translate("1 Process"))
 o:value("2", "2 " .. translate("Process"))
 o:value("3", "3 " .. translate("Process"))
 o:value("4", "4 " .. translate("Process"))
+--]]
 
 -- [[ Proxy Settings ]]--
 s = m:section(TypedSection, "global_proxy", translate("Proxy Settings"))
@@ -187,15 +113,15 @@ o = s:option(Flag, "proxy_ipv6", translate("Proxy IPv6"),
 o.default = 0
 
 -- [[ Other Settings ]]--
-s = m:section(TypedSection, "global_other", translate("Other Settings"))
+s = m:section(TypedSection, "global_other", translate("Other Settings"),
+              translatef(
+                  "You can only set up a maximum of %s nodes for the time being",
+                  "3"))
 s.anonymous = true
 s.addremove = false
 
 ---- TCP Node Number Option
-o = s:option(ListValue, "tcp_node_num", "TCP" .. translate("Node Number"),
-             translatef(
-                 "You can only set up a maximum of %s nodes for the time being",
-                 "3"))
+o = s:option(ListValue, "tcp_node_num", "TCP" .. translate("Node Number"))
 o.default = "1"
 o.rmempty = false
 o:value("1")
@@ -203,10 +129,7 @@ o:value("2")
 o:value("3")
 
 ---- UDP Node Number Option
-o = s:option(ListValue, "udp_node_num", "UDP" .. translate("Node Number"),
-             translatef(
-                 "You can only set up a maximum of %s nodes for the time being",
-                 "3"))
+o = s:option(ListValue, "udp_node_num", "UDP" .. translate("Node Number"))
 o.default = "1"
 o.rmempty = false
 o:value("1")
@@ -214,47 +137,35 @@ o:value("2")
 o:value("3")
 
 ---- Socks5 Node Number Option
-o = s:option(ListValue, "socks5_node_num", "Socks5" .. translate("Node Number"),
-             translatef(
-                 "You can only set up a maximum of %s nodes for the time being",
-                 "5"))
+o = s:option(ListValue, "socks5_node_num", "Socks5" .. translate("Node Number"))
 o.default = "1"
 o.rmempty = false
 o:value("1")
 o:value("2")
 o:value("3")
-o:value("4")
-o:value("5")
 
 ---- 状态使用大图标
 o = s:option(Flag, "status_use_big_icon", translate("Status Use Big Icon"))
+o.default = "1"
+o.rmempty = false
+
+---- 显示节点检测
+o = s:option(Flag, "status_show_check_port", translate("Status Show Check Port"))
+o.default = "0"
+o.rmempty = false
+
+---- 显示IP111
+o = s:option(Flag, "status_show_ip111", translate("Status Show IP111"))
 o.default = "0"
 o.rmempty = false
 
 ---- Hide Menu
 o = s:option(Button, "hide", translate("Hide Menu"), translate(
-                 "After the hidden to the display, type in the address bar enter the admin/vpn/passwall/show, such as: http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show"))
+                 "After the hidden to the display, type in the address bar enter the admin/vpn/passwall/show.<br />such as: http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show"))
 o.inputstyle = "remove"
 function o.write(e, e)
     luci.http.redirect(luci.dispatcher.build_url("admin", "vpn", "passwall",
                                                  "hide"))
 end
 
--- [[ Custom Dnsmasq Settings ]]--
---[[
-s = m:section(TypedSection, "global", translate("Custom Dnsmasq"))
-s.anonymous = true
-local e = "/usr/share/passwall/dnsmasq.d/user.conf"
-o = s:option(TextValue, "userconf")
-o.description = translate("Setting a parameter error will cause dnsmasq fail to start.")
-o.rows = 15
-o.wrap = "off"
-o.cfgvalue = function(a, a)
-return fs.readfile(e)or""
-end
-o.write = function(o, o, a)
-fs.writefile(e, a:gsub("\r\n", "\n"))
-end
-]] --
-
 return m
diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua
index 914e3668b1..7d19957eab 100644
--- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua
+++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/rule.lua
@@ -58,8 +58,8 @@ for e = 0, 23 do o:value(e, e .. translate("oclock")) end
 o.default = 0
 o:depends("auto_update_subscribe", 1)
 
----- Subscribe Manually update
-o = s:option(Button, "_update", translate("Manually update"))
+---- Manual subscription
+o = s:option(Button, "_update", translate("Manual subscription"))
 o.inputstyle = "apply"
 function o.write(e, e)
     luci.sys
@@ -72,8 +72,7 @@ end
 o = s:option(Button, "_stop", translate("Delete All Subscribe Node"))
 o.inputstyle = "remove"
 function o.write(e, e)
-    luci.sys.call(
-        "nohup /usr/share/passwall/subscription.sh stop > /dev/null 2>&1 &")
+    luci.sys.call("/usr/share/passwall/subscription.sh stop")
     luci.http.redirect(luci.dispatcher.build_url("admin", "vpn", "passwall",
                                                  "log"))
 end
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm
index 55b5282ee3..e5e1972377 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status.htm
@@ -14,6 +14,9 @@ end
 local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num", 1)
 local udp_node_num = api.uci_get_type("global_other", "udp_node_num", 1)
 local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num", 1)
+
+local status_show_check_port = api.uci_get_type("global_other", "status_show_check_port", 0)
+local status_show_ip111 = api.uci_get_type("global_other", "status_show_ip111", 0)
 -%>
 
 <style>
@@ -120,7 +123,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
                             src="data:image/png;base64,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WHRkYXRlOmNyZWF0ZQAyMDE2LTA5LTE3VDE1OjIxOjMyKzA4OjAwR74VGwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wMi0yNFQxODo0NDo0NyswODowMM5zM3oAAABNdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDcuMC4xLTYgUTE2IHg4Nl82NCAyMDE2LTA5LTE3IGh0dHA6Ly93d3cuaW1hZ2VtYWdpY2sub3Jn3dmlTgAAAGN0RVh0c3ZnOmNvbW1lbnQAIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTcuMS4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgbjvP9wAAABh0RVh0VGh1bWI6OkRvY3VtZW50OjpQYWdlcwAxp/+7LwAAABh0RVh0VGh1bWI6OkltYWdlOjpIZWlnaHQAMzA1DH+L0QAAABd0RVh0VGh1bWI6OkltYWdlOjpXaWR0aAAzMDWfjtuMAAAAGXRFWHRUaHVtYjo6TWltZXR5cGUAaW1hZ2UvcG5nP7JWTgAAABd0RVh0VGh1bWI6Ok1UaW1lADE0MjQ3NzQ2ODfo5GxtAAAAEnRFWHRUaHVtYjo6U2l6ZQAxNS4yS0J7Sgm2AAAAX3RFWHRUaHVtYjo6VVJJAGZpbGU6Ly8vaG9tZS93d3dyb290L3NpdGUvd3d3LmVhc3lpY29uLm5ldC9jZG4taW1nLmVhc3lpY29uLmNuL3NyYy8xMTg1MS8xMTg1MTUzLnBuZx52BOUAAAAASUVORK5CYII=" />
 					</div>
                 </div>
-				<br>
+				<br />
             </div>
         </div>
         <div class="pure-u-1-4">
@@ -218,6 +221,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
                 </div>
             </div>
         </div>
+		<% if tonumber(status_show_check_port) == 1 then %>
 		<div class="pure-u-1-2 check" onclick="check_port(this)">
             <div class="block pure-g">
                 <div class="pure-u-4-5">
@@ -232,6 +236,8 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
                 </div>
             </div>
         </div>
+		<% end %>
+		<% if tonumber(status_show_ip111) == 1 then %>
 		<div class="pure-u-1-2 check" onclick="javascript:window.open('http://www.ip111.cn/','target');">
             <div class="block pure-g">
                 <div class="pure-u-4-5">
@@ -245,6 +251,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
                 </div>
             </div>
         </div>
+		<% end %>
     </div>
     <script>
 		//<![CDATA[
@@ -329,9 +336,9 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
 					}
 					
                     if (data.dns_mode_status) {
-                        status_dns.innerHTML = 'DNS<br><span class="green"><%:RUNNING%></span>';
+                        status_dns.innerHTML = 'DNS<br /><span class="green"><%:RUNNING%></span>';
                     } else {
-                        status_dns.innerHTML = 'DNS<br><span class="red"><%:NOT RUNNING%></span>';
+                        status_dns.innerHTML = 'DNS<br /><span class="red"><%:NOT RUNNING%></span>';
                     }
 					if (status_haproxy) {
 						if (data.haproxy_status) {
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm
index ccf6d20424..289c0fae20 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/status2.htm
@@ -14,6 +14,9 @@ end
 local tcp_node_num = api.uci_get_type("global_other", "tcp_node_num", 1)
 local udp_node_num = api.uci_get_type("global_other", "udp_node_num", 1)
 local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num", 1)
+
+local status_show_check_port = api.uci_get_type("global_other", "status_show_check_port", 0)
+local status_show_ip111 = api.uci_get_type("global_other", "status_show_ip111", 0)
 -%>
 
 <style>
@@ -146,6 +149,7 @@ local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num", 1)
 				<font id="_google_status"></font>
 			</div>
 		</div>
+		<% if tonumber(status_show_check_port) == 1 then %>
 		<div class="cbi-value">
 			<label class="cbi-value-title">
 				<%:Node Check%>
@@ -156,12 +160,15 @@ local socks5_node_num = api.uci_get_type("global_other", "socks5_node_num", 1)
 				<input id="clear_check_port_btn" type="button" class="cbi-button cbi-button-remove" style="display:none" value="<%:Clear%>" onclick="return clear_check_port(this)" />
 			</div>
 		</div>
+		<% end %>
+		<% if tonumber(status_show_ip111) == 1 then %>
 		<div class="cbi-value">
 			<label class="cbi-value-title"></label>
 			<div class="cbi-value-field">
 				<input type="button" class="cbi-button cbi-input-reload" value="IP111.cn" onclick="javascript:window.open('http://www.ip111.cn/','target');" />
 			</div>
 		</div>
+		<% end %>
 	</fieldset>
 </fieldset>
 
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/global/tips.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/tips.htm
new file mode 100644
index 0000000000..75ca4e61ac
--- /dev/null
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/global/tips.htm
@@ -0,0 +1,6 @@
+<div class="cbi-value">
+	<label class="cbi-value-title"></label>
+	<div class="cbi-value-field">
+		<%:Tips%>：<%:You can use load balancing for failover.%>
+	</div>
+</div>
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/haproxy/status.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/haproxy/status.htm
new file mode 100644
index 0000000000..2149a06a0a
--- /dev/null
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/haproxy/status.htm
@@ -0,0 +1,24 @@
+<%
+local dsp = require "luci.dispatcher"
+-%>
+
+<p id="_status"></p>
+
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(3,'<%=dsp.build_url("admin/vpn/passwall/status")%>', null,
+		function(x, json) {
+			if (x && x.status == 200) {
+				var _status = document.getElementById('_status');
+				if (_status) {
+					if (json.haproxy_status) {
+						_status.innerHTML = '<input type="button" class="cbi-button cbi-input-apply" value="<%:Enter interface%>" onclick="openwebui()" />';
+					}
+				}
+			}
+		});
+		
+	function openwebui(){
+		var url = window.location.host+":<%=luci.sys.exec("uci -q get passwall.@global_haproxy[0].console_port"):gsub("^%s*(.-)%s*$", "%1")%>";
+		window.open('http://'+url,'target','');
+	}
+//]]></script>
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm
index 76bf862c56..349469f71e 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/log/log.htm
@@ -30,6 +30,6 @@ local dsp = require "luci.dispatcher"
 	<legend>
 		<%:These is logs.%>
 	</legend>
-	<input class="cbi-button cbi-input-remove" type="button" onclick="clearlog()" value="<%:Clear logs%>">
+	<input class="cbi-button cbi-input-remove" type="button" onclick="clearlog()" value="<%:Clear logs%>" />
 	<textarea id="log_textarea" class="cbi-input-textarea" style="width: 100%;margin-top: 10px;" data-update="change" rows="40" wrap="off" readonly="readonly"></textarea>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm
deleted file mode 100644
index 92e773669a..0000000000
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/apply.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<%+cbi/valueheader%>
-	<input class="cbi-button cbi-button-add" type="button" onclick="open_set_node_div('<%=section%>')" value="<%:Use%>">
-<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
index a6077f58e5..bb0e7c0d34 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/link_add_node.htm
@@ -68,7 +68,7 @@ local dsp = require "luci.dispatcher"
 <div class="cbi-value">
 	<label class="cbi-value-title"><%:Add Node%></label>
 	<div class="cbi-value-field">
-		<input class="cbi-button cbi-button-add" type="button" onclick="open_add_link_div()" value="<%:Add the node via the link%>">
+		<input class="cbi-button cbi-button-add" type="button" onclick="open_add_link_div()" value="<%:Add the node via the link%>" />
 	</div>
 </div>
 
@@ -82,8 +82,8 @@ local dsp = require "luci.dispatcher"
 	<div class="cbi-value">
 		<label class="cbi-value-title"></label>
 		<div class="cbi-value-field">
-			<input class="cbi-button cbi-button-add" type="button" onclick="add_node()" value="<%:Add%>">
-			<input class="cbi-button cbi-button-remove" type="button" onclick="close_add_link_div()" value="<%:Close%>">
+			<input class="cbi-button cbi-button-add" type="button" onclick="add_node()" value="<%:Add%>" />
+			<input class="cbi-button cbi-button-remove" type="button" onclick="close_add_link_div()" value="<%:Close%>" />
 		</div>
 	</div>
 </div>
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
index 35187c5f6f..53426f413c 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm
@@ -121,10 +121,17 @@ table td, .table .td {
 				},
 				function(x, result) {
 					if(x && x.status == 200) {
-						if (result.ping != null && result.ping != "")
-							dom.outerHTML = result.ping + " ms";
-						else
-							dom.outerHTML = "--";
+						if (result.ping == null || result.ping.trim() == "") {
+							dom.outerHTML = "<font style='color:red'><%:Timeout%></font>";
+						} else {
+							var ping = parseInt(result.ping);
+							if (ping < 100)
+								dom.outerHTML = "<font style='color:green'>" + result.ping + " ms" + "</font>";
+							else if (ping < 200)
+								dom.outerHTML = "<font style='color:#fb9a05'>" + result.ping + " ms" + "</font>";
+							else if (ping >= 200)
+								dom.outerHTML = "<font style='color:red'>" + result.ping + " ms" + "</font>";
+						}
 					}
 				}
 			);
@@ -135,46 +142,99 @@ table td, .table .td {
 	var auto_ping_value = document.getElementsByClassName('auto_ping_value');
 	var index = 0;
 	function auto_ping() {
-		if (index >= auto_ping_value.length){ 
+		if (index >= auto_ping_value.length) { 
 			return;
 		}
-		var cbi_id = auto_ping_value[index].getAttribute("cbiid");
-		<% if compact_display_nodes and tonumber(compact_display_nodes) == 1 then %>
-			var remarks = document.getElementById("cbid.passwall." + cbi_id + ".remarks").value;
-			var address = null;
-			var port = null;
-			if (remarks.lastIndexOf("（") != -1 && remarks.lastIndexOf("）") != -1) {
-				var address_full = remarks.substring(remarks.lastIndexOf("（") + 1, remarks.lastIndexOf("）"));
-				address = address_full.substring(0, address_full.lastIndexOf(":"));
-				port = address_full.substring(address_full.lastIndexOf(":") + 1);
-			}
-		<% else %>
-			var address = document.getElementById("cbid.passwall." + cbi_id + ".address").value;
-			var port = document.getElementById("cbid.passwall." + cbi_id + ".port").value;
-		<% end %>
-		var json = JSON.stringify(auto_ping_value[index]);
-		ajax.post('<%=dsp.build_url("admin/vpn/passwall/ping_node")%>', {
-				index: index,
-				address: address,
-				port: port
-			},
-			function(x, result) {
-				if(x && x.status == 200) {
-					auto_ping_value[result.index].innerHTML = (result.ping ? result.ping : "--") + " ms";
+		var is_ping = auto_ping_value[index].getAttribute("ping");
+		if (is_ping == null) {
+			var cbi_id = auto_ping_value[index].getAttribute("cbiid");
+			<% if compact_display_nodes and tonumber(compact_display_nodes) == 1 then %>
+				var remarks = document.getElementById("cbid.passwall." + cbi_id + ".remarks").value;
+				var address = null;
+				var port = null;
+				if (remarks.lastIndexOf("（") != -1 && remarks.lastIndexOf("）") != -1) {
+					var address_full = remarks.substring(remarks.lastIndexOf("（") + 1, remarks.lastIndexOf("）"));
+					address = address_full.substring(0, address_full.lastIndexOf(":"));
+					port = address_full.substring(address_full.lastIndexOf(":") + 1);
 				}
-				index++;
-				auto_ping();
-			},
-			function(x) {
-				auto_ping_value[index].innerHTML = "<font style='color:red'><%:Timeout%></font>";
-				index++;
-				auto_ping();
-			},
-		);
+			<% else %>
+				var address = document.getElementById("cbid.passwall." + cbi_id + ".address").value;
+				var port = document.getElementById("cbid.passwall." + cbi_id + ".port").value;
+			<% end %>
+			var json = JSON.stringify(auto_ping_value[index]);
+			ajax.post('<%=dsp.build_url("admin/vpn/passwall/ping_node")%>', {
+					index: index,
+					address: address,
+					port: port
+				},
+				function(x, result) {
+					if(x && x.status == 200) {
+						for(var i = 0; i < auto_ping_value.length; i++) {
+							var obj = auto_ping_value[i];
+							var obj_cbi_id = obj.getAttribute("cbiid");
+							<% if compact_display_nodes and tonumber(compact_display_nodes) == 1 then %>
+								var obj_remarks = document.getElementById("cbid.passwall." + obj_cbi_id + ".remarks").value;
+								var obj_address = null;
+								var obj_port = null;
+								if (obj_remarks.lastIndexOf("（") != -1 && obj_remarks.lastIndexOf("）") != -1) {
+									var obj_address_full = obj_remarks.substring(obj_remarks.lastIndexOf("（") + 1, obj_remarks.lastIndexOf("）"));
+									obj_address = obj_address_full.substring(0, obj_address_full.lastIndexOf(":"));
+									obj_port = obj_address_full.substring(obj_address_full.lastIndexOf(":") + 1);
+								}
+							<% else %>
+								var obj_address = document.getElementById("cbid.passwall." + obj_cbi_id + ".address").value;
+								var obj_port = document.getElementById("cbid.passwall." + obj_cbi_id + ".port").value;
+							<% end %>
+							
+							if (address == obj_address && port == obj_port) {
+								auto_ping_value[i].setAttribute("ping", "1");
+								if (result.ping == null || result.ping.trim() == "") {
+									auto_ping_value[i].innerHTML = "<font style='color:red'><%:Timeout%></font>";
+								} else {
+									var ping = parseInt(result.ping);
+									if (ping < 100)
+										auto_ping_value[i].innerHTML = "<font style='color:green'>" + result.ping + " ms" + "</font>";
+									else if (ping < 200)
+										auto_ping_value[i].innerHTML = "<font style='color:#fb9a05'>" + result.ping + " ms" + "</font>";
+									else if (ping >= 200)
+										auto_ping_value[i].innerHTML = "<font style='color:red'>" + result.ping + " ms" + "</font>";
+								}
+							}
+						}
+					}
+					index++;
+					auto_ping();
+				},
+				function(x) {
+					auto_ping_value[index].innerHTML = "<font style='color:red'><%:Timeout%></font>";
+					index++;
+					auto_ping();
+				},
+			);
+		}
+		else {
+			index++;
+			auto_ping();
+		}
 	}
 	
 	auto_ping();
 	
+	//添加"应用"按钮到"修改"按钮前
+	var edit_btn = document.getElementsByClassName("cbi-button cbi-button-edit");
+	for(var i = 0; i < edit_btn.length; i++) {
+		try {
+			var onclick_str = edit_btn[i].getAttribute("onclick");
+			var id = onclick_str.substring(onclick_str.lastIndexOf('/') + 1, onclick_str.length - 1);
+			var td = edit_btn[i].parentNode;
+			var apply = '<input class="cbi-button cbi-button-add" type="button" value="<%:Use%>" onclick="open_set_node_div(\'' + id + '\')" alt="<%:Use%>" title="<%:Use%>" />';
+			td.innerHTML = apply + "&nbsp;&nbsp;" + td.innerHTML;
+		}
+		catch(err) {
+			console.error(err);
+		}
+	}
+	
 	//]]>
 </script>
 
@@ -183,21 +243,21 @@ table td, .table .td {
 	<div class="cbi-value">
 		<% if tcp_node_num and tonumber(tcp_node_num) >= 1 then %>
 			<% for i = 1, tcp_node_num, 1 do %>
-				<input class="cbi-button cbi-button-edit" type="button" onclick="set_node('tcp',<%=i%>)" value="TCP_<%=i%>">
+				<input class="cbi-button cbi-button-edit" type="button" onclick="set_node('tcp',<%=i%>)" value="TCP_<%=i%>" />
 			<% end %>
 		<% end %>
 		
 		<% if udp_node_num and tonumber(udp_node_num) >= 1 then %>
 			<% for i = 1, udp_node_num, 1 do %>
-				<input class="cbi-button cbi-button-edit" type="button" onclick="set_node('udp',<%=i%>)" value="UDP_<%=i%>">
+				<input class="cbi-button cbi-button-edit" type="button" onclick="set_node('udp',<%=i%>)" value="UDP_<%=i%>" />
 			<% end %>
 		<% end %>
 		
 		<% if socks5_node_num and tonumber(socks5_node_num) >= 1 then %>
 			<% for i = 1, socks5_node_num, 1 do %>
-				<input class="cbi-button cbi-button-edit" type="button" onclick="set_node('socks5',<%=i%>)" value="Socks5_<%=i%>">
+				<input class="cbi-button cbi-button-edit" type="button" onclick="set_node('socks5',<%=i%>)" value="Socks5_<%=i%>" />
 			<% end %>
 		<% end %>
-		<input class="cbi-button cbi-button-remove" type="button" onclick="close_set_node_div()" value="<%:Close%>">
+		<input class="cbi-button cbi-button-remove" type="button" onclick="close_set_node_div()" value="<%:Close%>" />
 	</div>
 </div>
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm
index 59501c61ac..84621a5317 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/brook_version.htm
@@ -152,7 +152,7 @@ local brook_version = luci.sys.exec("[ -f '" .. brook_path .. "' ] && " .. brook
 	<div class="cbi-value-field">
 		<div class="cbi-value-description">
 			<span>【 <%=brook_version%>】</span>
-			<input class="cbi-button cbi-input-apply" type="submit" id="_brook-check_btn" onclick="onBtnClick_brook(this);" value="<%:Manually update%>">
+			<input class="cbi-button cbi-input-apply" type="button" id="_brook-check_btn" onclick="onBtnClick_brook(this);" value="<%:Manually update%>" />
 			<span id="_brook-check_btn-detail"></span>
 		</div>
 	</div>
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm
index 1e679d3f83..326afe1152 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/kcptun_version.htm
@@ -168,7 +168,7 @@ local kcptun_version = luci.sys.exec("[ -f '" .. kcptun_path .. "' ] && " .. kcp
 	<div class="cbi-value-field">
 		<div class="cbi-value-description">
 			<span>【 <%=kcptun_version%>】</span>
-			<input class="cbi-button cbi-input-apply" type="submit" id="_kcptun-check_btn" onclick="onBtnClick_kcptun(this);" value="<%:Manually update%>">
+			<input class="cbi-button cbi-input-apply" type="button" id="_kcptun-check_btn" onclick="onBtnClick_kcptun(this);" value="<%:Manually update%>" />
 			<span id="_kcptun-check_btn-detail"></span>
 		</div>
 	</div>
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm
index d2a69f51ee..2447822083 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm
@@ -39,7 +39,6 @@ local chnlist_update = api.uci_get_type("global_rules", "chnlist_update", "1") =
 				}
 			}
 		);
-		return false;
 	}
 	//]]>
 </script>
@@ -86,7 +85,7 @@ local chnlist_update = api.uci_get_type("global_rules", "chnlist_update", "1") =
 				<%:Manually update%>
 			</label>
 			<div class="cbi-value-field">
-				<input class="cbi-button cbi-input-apply" type="submit" id="update_rules_btn" onclick="update_rules(this)" value="<%:Manually update%>">
+				<input class="cbi-button cbi-input-apply" type="button" id="update_rules_btn" onclick="update_rules(this)" value="<%:Manually update%>" />
 			</div>
 		</div>
 		
diff --git a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm
index 74a6dd0050..35316a4e49 100644
--- a/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm
+++ b/package/lienol/luci-app-passwall/luasrc/view/passwall/rule/v2ray_version.htm
@@ -168,7 +168,7 @@ local V2ray_version = luci.sys.exec("[ -f '" .. V2ray_path .. "/v2ray' ] && " ..
 	<div class="cbi-value-field">
 		<div class="cbi-value-description">
 			<span>【 <%=V2ray_version%>】</span>
-			<input class="cbi-button cbi-input-apply" type="submit" id="_v2ray-check_btn" onclick="onBtnClick_v2ray(this);" value="<%:Manually update%>">
+			<input class="cbi-button cbi-input-apply" type="button" id="_v2ray-check_btn" onclick="onBtnClick_v2ray(this);" value="<%:Manually update%>" />
 			<span id="_v2ray-check_btn-detail"></span>
 		</div>
 	</div>
diff --git a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po
index 551ca9b58a..9df6ed66eb 100644
--- a/package/lienol/luci-app-passwall/po/zh-cn/passwall.po
+++ b/package/lienol/luci-app-passwall/po/zh-cn/passwall.po
@@ -1,5 +1,5 @@
 msgid "Pass Wall"
-msgstr "科学上网"
+msgstr "正确上网姿势 √"
 
 msgid "Shadowsocks Server"
 msgstr "ShadowSocks 服务器"
@@ -82,6 +82,9 @@ msgstr "高级设置"
 msgid "Load Balancing"
 msgstr "负载均衡"
 
+msgid "Enter interface"
+msgstr "进入界面"
+
 msgid "Rule Update"
 msgstr "自动更新"
 
@@ -121,6 +124,9 @@ msgstr "清除"
 msgid "If you can use it, very stable. If not, GG !!!"
 msgstr "如果你会用，稳得一批。否则，GG！！！"
 
+msgid "Main switch"
+msgstr "总开关"
+
 msgid "TCP Node"
 msgstr "TCP节点"
 
@@ -142,11 +148,11 @@ msgstr "用于游戏模式或DNS解析等。"
 msgid "The selected server will not use Kcptun."
 msgstr "选中的服务器不会使用Kcptun。"
 
-msgid "The client can use the router's Socks5 proxy"
-msgstr "客户端可以使用路由器的Socks5代理"
+msgid "The client can use the router's Socks5 proxy."
+msgstr "客户端可以使用路由器的Socks5代理。"
 
-msgid "DNS Forward Mode"
-msgstr "DNS转发模式"
+msgid "DNS Mode"
+msgstr "DNS模式"
 
 msgid "Use local port 7913 as DNS"
 msgstr "使用本机7913端口的DNS"
@@ -154,8 +160,8 @@ msgstr "使用本机7913端口的DNS"
 msgid "No patterns are used"
 msgstr "不使用"
 
-msgid "if you use no patterns are used, DNS of wan will be used by default as upstream of dnsmasq"
-msgstr "如果您没有使用任何模式，则会使用WAN的DNS"
+msgid "if has problem, please try another mode.<br />if you use no patterns are used, DNS of wan will be used by default as upstream of dnsmasq."
+msgstr "如果有问题，请尝试其他模式。<br />如果您没有使用任何模式，则会使用WAN的DNS。"
 
 msgid "Use TCP Node Resolve DNS"
 msgstr "使用TCP节点解析DNS"
@@ -163,14 +169,53 @@ msgstr "使用TCP节点解析DNS"
 msgid "If checked, DNS is resolved using the TCP node."
 msgstr "如果勾选，则使用TCP节点解析DNS解决污染。"
 
-msgid "upstreamm DNS Server for ChinaDNS-NG"
-msgstr "ChinaDNS-NG的上游服务器"
+msgid "DNS Address"
+msgstr "DNS地址"
 
-msgid "Domestic DNS server in advanced Settings is used as domestic DNS by default"
-msgstr "默认使用高级设置里的国内DNS服务器作为国内DNS"
+msgid "China DNS Server"
+msgstr "国内DNS服务器"
 
-msgid "example: 127.0.0.1#5335<br>Need at least one,Other DNS services can be used as upstream, such as dns2socks."
-msgstr "例：127.0.0.1#5335<br>需要至少一个服务器，其他DNS服务可以作为上游使用，比如：dns2socks。"
+msgid "Example: 127.0.0.1#6053 ,Represents DNS on using 127.0.0.1 the 6053 port. such as smartdns,AdGuard Home...<br />Only use two at most, english comma separation, If you do not fill in the # and the following port, you are using port 53.<br />If you use custom, unless you know what you're doing, setting it up incorrectly can cause your stuck to crash!"
+msgstr "例：127.0.0.1#6053 使用本机的6053端口的DNS服务。例：smartdns，AdGuardHome等等。<br />最多使用2个DNS服务器，英文逗号分隔，如果没有填#和后面的端口，则使用53端口。<br />如果你使用自定义，除非你知道你在做什么，否则设置不当会直接导致卡到崩溃！"
+
+msgid "Upstream trust DNS Server for ChinaDNS-NG"
+msgstr "ChinaDNS-NG可信DNS"
+
+msgid "Example: 127.0.0.1#5353 ,such as dns2socks,dns-forwarder...<br />Only use two at most, english comma separation, If you do not fill in the # and the following port, you are using port 53."
+msgstr "例：127.0.0.1#5353 例：dns2socks，dns-forwarder等等。<br />最多使用2个DNS服务器，英文逗号分隔，如果没有填#和后面的端口，则使用53端口。"
+
+msgid "The server client can also use this rule to scientifically surf the Internet.<br /> Global and continental whitelist are not recommended for non-special cases!"
+msgstr "本机服务器的客户端也可以使用这个代理模式上网。<br />非特殊情况不推荐使用全局和大陆白名单！"
+
+msgid "Tips"
+msgstr "小提示"
+
+msgid "You can use load balancing for failover."
+msgstr "可以使用负载均衡实现故障切换功能。"
+
+msgid "dnsbyisp"
+msgstr "运营商DNS(自动分配)"
+
+msgid "Ali"
+msgstr "阿里"
+
+msgid "Baidu"
+msgstr "百度"
+
+msgid "DNS Export Of Multi WAN"
+msgstr "国内DNS指定解析出口"
+
+msgid "Node Export Of Multi WAN"
+msgstr "节点指定出口"
+
+msgid "Only support Multi Wan."
+msgstr "只有多线接入才有效。"
+
+msgid "Not Specify"
+msgstr "不指定"
+
+msgid "DNS Hijack"
+msgstr "DNS劫持"
 
 msgid "custom"
 msgstr "自定义"
@@ -196,6 +241,9 @@ msgstr "单进程"
 msgid "Proxy Mode"
 msgstr "代理模式"
 
+msgid "If using GFW mode is not available, try clearing the native cache."
+msgstr "如果使用GFW模式无法使用，请尝试清除本机缓存。"
+
 msgid "No Proxy"
 msgstr "不代理"
 
@@ -244,9 +292,6 @@ msgstr "你选择的节点是："
 msgid "Timeout"
 msgstr "超时"
 
-msgid "The server client can also use this rule to scientifically surf the Internet"
-msgstr "本机服务器的客户端也可以使用这个代理模式上网"
-
 msgid "Node Remarks"
 msgstr "节点备注"
 
@@ -274,11 +319,8 @@ msgstr "加密"
 msgid "Kcptun Switch"
 msgstr "Kcptun开关"
 
-msgid "Ping Latency"
-msgstr "Ping延迟"
-
-msgid "Ping Value"
-msgstr "Ping值"
+msgid "Latency"
+msgstr "延迟"
 
 msgid "Show Add Mode"
 msgstr "显示添加方式"
@@ -289,18 +331,18 @@ msgstr "显示组"
 msgid "Group"
 msgstr "组"
 
-msgid "Use TCPing"
-msgstr "使用TCPing"
-
-msgid "This will use tcping replace ping detection of node"
-msgstr "选中后保存应用后即使用tcping替换ping检测节点"
-
 msgid "Auto Ping"
 msgstr "自动Ping"
 
 msgid "This will automatically ping the node for latency"
 msgstr "选中后保存应用后即自动Ping节点"
 
+msgid "Use TCP Detection delay"
+msgstr "使用TCP检测延迟"
+
+msgid "This will use tcping replace ping detection of node"
+msgstr "选中后保存应用后即使用tcping替换ping检测节点"
+
 msgid "Concise display nodes"
 msgstr "简洁显示节点"
 
@@ -313,45 +355,6 @@ msgstr "应用"
 msgid "Use"
 msgstr "使用"
 
-msgid "DNS Settings"
-msgstr "DNS配置"
-
-msgid "DNS Forward Address"
-msgstr "DNS转发地址"
-
-msgid "Mainland DNS Sever 1"
-msgstr "国内DNS服务器1"
-
-msgid "Mainland DNS Sever 2"
-msgstr "国内DNS服务器2"
-
-msgid "dnsbyisp"
-msgstr "运营商DNS(自动分配)"
-
-msgid "Ali"
-msgstr "阿里"
-
-msgid "Baidu"
-msgstr "百度"
-
-msgid "DNS Export Of Multi WAN"
-msgstr "国内DNS指定解析出口"
-
-msgid "Node Export Of Multi WAN"
-msgstr "节点指定出口"
-
-msgid "Only support Multi Wan. If no effect, please go to mwan3 to set."
-msgstr "只有多线接入才有效，如果设置后还是无效，请到mwan3设置。"
-
-msgid "Not Specify"
-msgstr "不指定"
-
-msgid "DNS Hijack"
-msgstr "DNS劫持"
-
-msgid "If the GFW mode cannot be used normally, please enable it"
-msgstr "如果GFW模式不能正常使用，请启用"
-
 msgid "Delay Settings"
 msgstr "定时配置"
 
@@ -436,8 +439,11 @@ msgstr "检测时间"
 msgid "Automatic switching cannot be used when this option is checked"
 msgstr "当勾选此选项时，不能使用自动切换"
 
-msgid "List of alternate TCP forwarding servers"
-msgstr "备用TCP转发服务器的列表"
+msgid "List of backup nodes"
+msgstr "备用节点的列表"
+
+msgid "List of backup nodes, the first of which must be the primary node and the others the standby node."
+msgstr "备用节点的列表，第一个必须是主节点，其他是备用节点。"
 
 msgid "Configure this node with 127.0.0.1: this port"
 msgstr "使用127.0.0.1和此端口配置节点"
@@ -463,8 +469,8 @@ msgstr "负载均衡端口"
 msgid "Load Balancing Setting"
 msgstr "负载均衡设置"
 
-msgid "Add a node, Export Of Multi WAN Only support Multi Wan. If no effect, please go to mwan3 to set. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline!"
-msgstr "添加节点，指定出口功能是为多WAN用户准备的，如果设置后还是无效，请到mwan3设置。负载比重范围1-256。多个主服务器可以负载均衡，备用只有在主服务器离线时才会启用！"
+msgid "Add a node, Export Of Multi WAN Only support Multi Wan. Load specific gravity range 1-256. Multiple primary servers can be load balanced, standby will only be enabled when the primary server is offline!"
+msgstr "添加节点，指定出口功能是为多WAN用户准备的。负载比重范围1-256。多个主服务器可以负载均衡，备用只有在主服务器离线时才会启用！"
 
 msgid "Node Address"
 msgstr "节点地址"
@@ -583,15 +589,18 @@ msgstr "订阅网址"
 msgid "Please input the subscription url first, save and submit before updating. If you subscribe to update, it is recommended to delete all subscriptions and then re-subscribe."
 msgstr "请输入订阅网址保存应用后再更新，如果订阅节点更新了，建议删除所有订阅，然后重新订阅。"
 
-msgid "Delete All Subscribe Node"
-msgstr "删除所有订阅节点"
-
 msgid "Subscribe via proxy"
 msgstr "通过代理订阅"
 
 msgid "Enable auto update subscribe"
 msgstr "开启自动更新订阅"
 
+msgid "Manual subscription"
+msgstr "手动订阅"
+
+msgid "Delete All Subscribe Node"
+msgstr "删除所有订阅节点"
+
 msgid "Add"
 msgstr "添加"
 
@@ -739,8 +748,8 @@ msgstr "域名"
 msgid "Whether unsafe connections are allowed. When checked, V2Ray does not check the validity of the TLS certificate provided by the remote host."
 msgstr "是否允许不安全连接。当勾选时，V2Ray 不会检查远端主机所提供的 TLS 证书的有效性。"
 
-msgid "<br>none: default, no masquerade, data sent is packets with no characteristics.<br>srtp: disguised as an SRTP packet, it will be recognized as video call data (such as FaceTime).<br>utp: packets disguised as uTP will be recognized as bittorrent downloaded data.<br>wechat-video: packets disguised as WeChat video calls.<br>dtls: disguised as DTLS 1.2 packet.<br>wireguard: disguised as a WireGuard packet. (not really WireGuard protocol)"
-msgstr "<br>none：默认值，不进行伪装，发送的数据是没有特征的数据包。<br>srtp：伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）。<br>utp：伪装成 uTP 数据包，会被识别为 BT 下载数据。<br>wechat-video：伪装成微信视频通话的数据包。<br>dtls：伪装成 DTLS 1.2 数据包。<br>wireguard：伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)"
+msgid "<br />none: default, no masquerade, data sent is packets with no characteristics.<br />srtp: disguised as an SRTP packet, it will be recognized as video call data (such as FaceTime).<br />utp: packets disguised as uTP will be recognized as bittorrent downloaded data.<br />wechat-video: packets disguised as WeChat video calls.<br />dtls: disguised as DTLS 1.2 packet.<br />wireguard: disguised as a WireGuard packet. (not really WireGuard protocol)"
+msgstr "<br />none：默认值，不进行伪装，发送的数据是没有特征的数据包。<br />srtp：伪装成 SRTP 数据包，会被识别为视频通话数据（如 FaceTime）。<br />utp：伪装成 uTP 数据包，会被识别为 BT 下载数据。<br />wechat-video：伪装成微信视频通话的数据包。<br />dtls：伪装成 DTLS 1.2 数据包。<br />wireguard：伪装成 WireGuard 数据包。(并不是真正的 WireGuard 协议)"
 
 msgid "A legal file path. This file must not exist before running V2Ray."
 msgstr "一个合法的文件路径。在运行 V2Ray 之前，这个文件必须不存在。"
@@ -775,11 +784,17 @@ msgstr "目前最多只能设置%s个节点"
 msgid "Status Use Big Icon"
 msgstr "状态信息使用大图标"
 
+msgid "Status Show Check Port"
+msgstr "状态信息显示节点检测"
+
+msgid "Status Show IP111"
+msgstr "状态信息显示IP111"
+
 msgid "Hide Menu"
 msgstr "隐藏菜单"
 
-msgid "After the hidden to the display, type in the address bar enter the admin/vpn/passwall/show, such as: http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show"
-msgstr "当你隐藏后想再次显示，在地址栏后面输入admin/vpn/passwall/show，例如:http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show"
+msgid "After the hidden to the display, type in the address bar enter the admin/vpn/passwall/show.<br />such as: http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show"
+msgstr "当你隐藏后想再次显示，在地址栏后面输入admin/vpn/passwall/show<br />例如:http://192.168.1.1/cgi-bin/luci/admin/vpn/passwall/show"
 
 msgid "Can't determine ARCH, or ARCH not supported."
 msgstr "无法确认ARCH架构，或是不支持。"
diff --git a/package/lienol/luci-app-passwall/po2lmo b/package/lienol/luci-app-passwall/po2lmo
deleted file mode 100755
index e397ee2fb3..0000000000
Binary files a/package/lienol/luci-app-passwall/po2lmo and /dev/null differ
diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall b/package/lienol/luci-app-passwall/root/etc/config/passwall
index a86b418adb..e75dfce1c5 100644
--- a/package/lienol/luci-app-passwall/root/etc/config/passwall
+++ b/package/lienol/luci-app-passwall/root/etc/config/passwall
@@ -1,11 +1,14 @@
 
 config global
+	option enabled '0'
 	option tcp_node1 'nil'
 	option udp_node1 'nil'
 	option socks5_node1 'nil'
 	option dns_mode 'pdnsd'
+	option up_china_dns '114.114.114.114'
 	option dns_forward '8.8.4.4'
 	option use_tcp_node_resolve_dns '1'
+	option dns_53 '1'
 	option proxy_mode 'chnroute'
 	option localhost_proxy_mode 'gfwlist'
 
@@ -17,13 +20,6 @@ config global_delay
 	option start_daemon '0'
 	option start_delay '20'
 
-config global_dns
-	option dns_port '0'
-	option wan_port '0'
-	option dns_53 '1'
-	option dns_1 '114.114.114.114'
-	option dns_2 '119.29.29.29'
-
 config global_forwarding
 	option udp_redir_ports '1:65535'
 	option tcp_redir_ports '80,443'
@@ -43,6 +39,8 @@ config global_other
 	option udp_node_num '1'
 	option socks5_node_num '1'
 	option status_use_big_icon '1'
+	option status_show_check_port '0'
+	option status_show_ip111 '0'
 	option compact_display_nodes '0'
 	option show_group '0'
 	option show_add_mode '0'
@@ -54,7 +52,7 @@ config global_rules
 	option chnlist_update '1'
 	option gfwlist_version '2019-12-10'
 	option chnroute_version '2019-12-05'
-	option chnlist_version '2019-12-31'
+	option chnlist_version '2020-01-06'
 	
 config global_app
 	option v2ray_file '/usr/bin/v2ray/'
@@ -66,5 +64,5 @@ config global_subscribe
 	option auto_update_subscribe '0'
 
 config auto_switch
-	option testing_time '50'
+	option testing_time '3'
 	option enable '0'
diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist
index 9f85c6390e..03ee7b78af 100644
--- a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist
+++ b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/chnlist
@@ -318,6 +318,7 @@
 027kingzone.com
 027lyw.com
 027lyx.com
+027one.com
 027pn.com
 027qyt.com
 027qyy.com
@@ -376,7 +377,6 @@
 02wq.com
 030303.com
 030buy.com
-030didi.com
 030mall.com
 0310520.com
 0311top.com
@@ -407,6 +407,7 @@
 0356f.com
 0357hz.com
 035x.com
+0368.com
 036yx.com
 0370zc.com
 0371techan.com
@@ -572,7 +573,6 @@
 0577job.com
 0577p.com
 0577qiche.com
-0577wh.com
 0578rencai.com
 0578zhaopin.com
 0579com.com
@@ -1116,7 +1116,6 @@
 1066888.com
 106903.com
 106.com
-106jsw.com
 106.se
 1073.com
 107788.com
@@ -1586,7 +1585,6 @@
 13735524159.com
 1373600.com
 1373700.com
-137414.xyz
 13760120293.com
 1377.com
 137home.com
@@ -1958,6 +1956,7 @@
 176878.com
 1768.com
 176mob.com
+176quan.com
 176vr.com
 1773.com
 17773d.com
@@ -1987,6 +1986,7 @@
 179179.com
 17937.net
 1797wan.com
+17986.net
 17989.com
 179.com
 17ai.me
@@ -2176,6 +2176,7 @@
 185kh.com
 186078.com
 1864445.com
+1865u.com
 18665348887.com
 186688.com
 1866.tv
@@ -2323,6 +2324,7 @@
 1biqu.com
 1biquge.com
 1btbtt.com
+1btjia.com
 1cae.com
 1caifu.com
 1caitong.com
@@ -2442,7 +2444,6 @@
 1q2q.com
 1qianbao.com
 1qq.me
-1qtv.com
 1qwe3r.com
 1qyl.com
 1r1g.com
@@ -2959,12 +2960,12 @@
 263ytx.com
 263zw.com
 264006.com
-264g.com
 265660.com
 265958.com
 26595.com
 265.com
 265g.com
+265ps.com
 265tv.com
 266555c.com
 2669356.com
@@ -2999,6 +3000,7 @@
 2770014.com
 2770ff.com
 27844b.com
+2799web.com
 279wo.com
 27aichi.com
 27bao.com
@@ -3323,7 +3325,6 @@
 3208.net
 320921.com
 321200.com
-321211.net
 321ba.com
 321cad.com
 321cy.com
@@ -3435,7 +3436,6 @@
 3456.com
 3456.tv
 34580.com
-345dj.com
 345down.com
 345fk.com
 345kam.com
@@ -3959,7 +3959,6 @@
 3big.net
 3btbtt.com
 3bu.com
-3buh.com
 3bwx.com
 3c2p.com
 3cjob.com
@@ -4834,6 +4833,7 @@
 51-games.com
 51gcw.com
 51geeks.com
+51gfl.com
 51ggwu.com
 51gh.net
 51gif.com
@@ -5398,6 +5398,7 @@
 52ch.net
 52cik.com
 52cj.net
+52ckd.com
 52click.net
 52codes.cc
 52codes.net
@@ -5598,6 +5599,7 @@
 52zhizuo.com
 52zhushan.com
 52zixue.com
+52zuji.net
 52zwxs.com
 52zx.net
 52zxw.com
@@ -5649,6 +5651,7 @@
 53shubiao.com
 53sikao.com
 53tct.com
+53xjd.com
 53yao.com
 53yu.com
 54086.com
@@ -5660,6 +5663,7 @@
 546mail.com
 546yun.com
 5477dm.com
+548041.com
 549493.com
 549826.com
 54admin.net
@@ -5710,7 +5714,6 @@
 55178.com
 55188.com
 551house.com
-55228885.com
 5523.com
 55344.com
 553.com
@@ -5929,7 +5932,6 @@
 58daojia.com
 58display.com
 58dm.com
-58dm.tv
 58enuo.com
 58fangdai.com
 58fenlei.com
@@ -6123,7 +6125,6 @@
 5helpyou.com
 5.hn
 5hrc.com
-5huu.com
 5i0o.com
 5i5aj.com
 5i5j.com
@@ -6152,7 +6153,6 @@
 5ifund.com
 5ifxw.com
 5igupiao.com
-5ihaha.com
 5ihse.com
 5ijuyi.com
 5ikang.com
@@ -6210,6 +6210,7 @@
 5lewen.com
 5-link.com
 5lux.com
+5lyq.com
 5m5m5m.com
 5m68.com
 5-mail.com
@@ -6795,7 +6796,6 @@
 6u8.net
 6u.com
 6v68.com
-6v6v8.com
 6v.com
 6vdy.com
 6vhao.tv
@@ -7177,7 +7177,6 @@
 7999.tv
 799job.com
 799.net
-79ce.com
 79cha.com
 79.com
 79tao.com
@@ -7186,6 +7185,7 @@
 79xs.cc
 79yx.com
 7a31jmf.com
+7a8k.com
 7acg.com
 7ahr.com
 7analytics.com
@@ -7272,6 +7272,7 @@
 7mx.com
 7naicha.com
 7nepal.com
+7oh.net
 7pa.com
 7pc8.com
 7pei.com
@@ -7369,6 +7370,7 @@
 801358.com
 8014.com
 8038.pw
+8044445.com
 806409.com
 806699a.com
 80710.com
@@ -7475,7 +7477,6 @@
 8222.com
 82250856.com
 822644.com
-822wz.com
 8232365.com
 82326999.com
 82335966.com
@@ -7695,6 +7696,7 @@
 8809806.com
 880job.com
 880sy.com
+880txt.com
 880you.com
 88106.com
 88175.com
@@ -7876,6 +7878,7 @@
 8jj.cc
 8jxn.com
 8jzw.cc
+8jzw.com
 8k7k.com
 8k8z.com
 8kana.com
@@ -7907,7 +7910,6 @@
 8spo.com
 8taobaodian.com
 8taomeili.com
-8tennis.com
 8ttt8.com
 8tupian.com
 8twan.com
@@ -8452,6 +8454,7 @@
 95px.com
 95vintage.com
 95xiu.com
+95ye.com
 95yijing.com
 96005656.com
 960123.com
@@ -8703,6 +8706,7 @@
 99danji.com
 99ddd.com
 99down.com
+99downer.com
 99dqw.com
 99dw.com
 99edu.net
@@ -8727,7 +8731,6 @@
 99kaii.com
 99kanp.com
 99kgames.com
-99kill.com
 99lantu.net
 99lao.com
 99lb.net
@@ -8782,7 +8785,6 @@
 9aimai.com
 9aiot.com
 9air.com
-9aixuexi.com
 9.am
 9aoduo.com
 9aola.com
@@ -8801,6 +8803,7 @@
 9che.com
 9chew.com
 9chun.com
+9clive.com
 9coc.com
 9conn.net
 9cp2p.com
@@ -9000,6 +9003,7 @@ aa43z7.com
 aa65535.com
 aa7.org
 aa8828.com
+aa99cdn.com
 aaadns.com
 aaahsxb.com
 aaak1.com
@@ -9023,6 +9027,7 @@ aardio.com
 aaspt.net
 aastartups.com
 aatccn.com
+aaxxr.com
 aay63.com
 aayfw.com
 aazao.com
@@ -9238,7 +9243,6 @@ adashuo.com
 adbats.com
 adbxb.com
 adbyby.com
-adcase.org
 adccd.com
 adc-cn.org
 adcdownload.apple.com
@@ -9441,6 +9445,7 @@ afshanghai.org
 aft1v1.com
 aft888.com
 afuchina.com
+afu.io
 afunapp.com
 afxbbs.com
 afzhan.com
@@ -9479,7 +9484,6 @@ agrodt.com
 agrofairs.com
 agrosg.com
 agrowingchina.com
-aguangg8.com
 agucn.com
 aguo.com
 agxs.net
@@ -9665,6 +9669,7 @@ aidingbuding.com
 aidm17.com
 aidog.com
 aidong.me
+aidoor.net
 aidpaper.com
 aidrive.com
 aiduoka.com
@@ -9941,6 +9946,7 @@ aixiawa.com
 aixiegao.com
 aixiezuo.com
 aixifan.com
+aixigua.com
 aixinbaomu.com
 aixinwu.org
 aixq.com
@@ -10152,6 +10158,7 @@ alipaycs.com
 alipaydev.com
 alipaydns.com
 alipay-eco.com
+alipay.hk
 alipaylog.com
 alipay.net
 alipayobjects.com
@@ -10186,6 +10193,7 @@ alixinxiu.com
 alixixi.com
 alixox.com
 aliyiyao.com
+aliyoo999.com
 aliyue.net
 aliyun90.com
 aliyunbaike.com
@@ -10385,7 +10393,6 @@ ancun.com
 andaike.com
 andan.me
 andhj.com
-andksocket.com
 andlvshi.com
 andouw.com
 andpay.me
@@ -10599,6 +10606,7 @@ any8.com
 anyan.com
 anyang100.com
 anyangedu.com
+anyant.com
 anybeen.com
 anydd.com
 anyelse.com
@@ -10703,6 +10711,7 @@ aoserp.com
 aoshaoye.com
 aoshitang.com
 aoshu.com
+aosong.com
 aosoo.com
 aoswtc.com
 aotian.com
@@ -11188,6 +11197,7 @@ asnlab.org
 aso100.com
 aso114.com
 aso120.com
+asoasm.com
 asofdate.com
 aso.ink
 asomob.com
@@ -11262,6 +11272,7 @@ atf.com
 atguigu.com
 atguigu.org
 athaitao.com
+athmapp.com
 atianqi.com
 atido.com
 atimeit.com
@@ -11303,6 +11314,7 @@ atwtech.net
 atxwm.com
 atyun.net
 atzjg.net
+atzlinux.com
 atzuche.com
 au7g.com
 auak.com
@@ -11478,6 +11490,7 @@ axmro.com
 axnsc.com
 axshuyuan.com
 axsoft.co
+axtmy.com
 axtoutiao.com
 axuer.com
 axure.me
@@ -11555,6 +11568,7 @@ b2bkk.com
 b2bname.com
 b2bneican.com
 b2bvip.com
+b2bvip.net
 b2bybz.com
 b2cedu.com
 b2c-seo.com
@@ -12138,6 +12152,7 @@ baoxili.com
 baoxinleasing.com
 baoxinwen.com
 baoxuanhunsha.com
+baoxuexi.com
 baoyang1.com
 baoyang888.com
 baoyang88.com
@@ -12219,6 +12234,7 @@ bayinmao.com
 bayuegua.com
 bayueju.com
 bayueweb.com
+bayunhome.com
 bazaarjewelrychina.com
 bazai.com
 bazhan.com
@@ -12430,6 +12446,7 @@ beadwallet.com
 bearead.com
 beargoo.com
 bearjoy.com
+bearminers.xyz
 bearoom.xyz
 bearrental.com
 bearyboard.com
@@ -12740,7 +12757,6 @@ b-fairy.com
 bfcmovie.com
 bfdcdn.com
 bfdfe.com
-bfdz.ink
 bfenb.com
 bffzb.com
 bfgame.com
@@ -13054,6 +13070,7 @@ binhaiforum.org
 binhuo.com
 binkery.com
 binmt.cc
+binmtplus.com
 binospace.com
 binpang.me
 binqsoft.com
@@ -13100,7 +13117,9 @@ biqubao.com
 biqubu.com
 biqu.cm
 biqudd.com
+biqudie.com
 biqudu.com
+biqudu.net
 biqudu.tv
 biqufu.com
 biquga.com
@@ -13756,7 +13775,6 @@ bluelettercn.org
 bluelightfuse.com
 bluelive.me
 blueplus.cc
-bluereader.org
 bluesdream.com
 bluesdy.com
 bluesharkinfo.com
@@ -14254,6 +14272,7 @@ btime.com
 btiyu.com
 btjia.com
 btjyjs.com
+btkiller.com
 btmao.cc
 btmeiju.com
 btmil.com
@@ -14318,6 +14337,7 @@ budhano.com
 buding.tv
 budingtv.com
 budkr.com
+budongnvren.com
 budou.com
 budusu.com
 bufan.com
@@ -14492,6 +14512,7 @@ bxycw.com
 bxynzz.com
 bxyuer.com
 bxzhiku.com
+bxzxw.com
 by56.com
 by6sx.com
 bybbs.org
@@ -14586,6 +14607,7 @@ bzgd.com
 bzgxqj.com
 bzhqmm.com
 bzjw.com
+bzkad.com
 bzko.com
 bzmfxz.com
 bzname.com
@@ -14630,6 +14652,7 @@ c-3.moe
 c3x.me
 c4008.com
 c400c.cc
+c45.fun
 c4datc.com
 c4dba.com
 c4dcn.com
@@ -14749,6 +14772,7 @@ caicomes.com
 caicui.com
 caidan2.com
 caidao1.com
+caidao8.com
 caidaocloud.com
 caidaoli.com
 caidian.com
@@ -14761,6 +14785,7 @@ caigaowang.com
 caigou2003.com
 caigoubao.cc
 caigoushichang.com
+caiguayun.com
 caihang.com
 caihao.com
 caihao.net
@@ -15086,6 +15111,7 @@ cbex.com
 cbfook.com
 cbgcloud.com
 cbi360.net
+cbice.com
 cbide.com
 cbiec.com
 cbiec.net
@@ -15153,7 +15179,6 @@ ccd86.com
 ccdby.com
 ccding.xyz
 ccdol.com
-ccdongman.com
 cceai.com
 cceato.com
 ccedisp.com
@@ -15526,7 +15551,6 @@ cdnet.win
 cdnetworks.com
 cdnetworks.net
 cdn-files.net
-cdnfly.biz
 cdngl.net
 cdngslb.com
 cdngtm.com
@@ -15546,6 +15570,7 @@ cdnok.com
 cdn-okzyw.com
 cdnpan.com
 cdnpod.com
+cdn.razersynapse.com
 cdnren.com
 cdn.samsung.com
 cdn.shanghai.nyu.edu
@@ -15780,6 +15805,7 @@ cfcglx.com
 cfcpn.com
 cfcyb.com
 cfd163.com
+cfd-24h.com
 cfdaguanjia.com
 cfda.pub
 cfd-china.com
@@ -15993,6 +16019,7 @@ changancap.com
 changan.com
 changandaxiyuancn.com
 changanfunds.com
+changansuzuki.com
 changantaihe.com
 changbaapi.com
 changbaapp.com
@@ -16069,7 +16096,6 @@ chaoart.com
 chaobaida.com
 chaochaojin.com
 chaodream.com
-chaoex.io
 chaofan365.com
 chaofan86.com
 chaofan.wang
@@ -17077,7 +17103,6 @@ chinatet.com
 chinatex.com
 chinatex.net
 chinatex.org
-chinathink.net
 chinatianshen.com
 chinatibetnews.com
 chinaticket.com
@@ -17129,6 +17154,7 @@ chinauos.org
 chinaupa.com
 china-up.com
 chinaups.com
+chinaus.com
 chinaus-maker.org
 chinauso.com
 chinauui.com
@@ -17165,7 +17191,6 @@ chinawebmap.com
 chinaweiyu.com
 chinawenben.com
 chinawenwang.com
-chinawestair.com
 chinawestnews.net
 chinawie.com
 chinawin.net
@@ -17196,7 +17221,6 @@ china-yingkouyu.com
 chinayk.com
 chinaymc.com
 chinayouji.com
-chinayoyocar.com
 chinayyjx.com
 chinayyo.com
 china-zbycg.com
@@ -17543,6 +17567,7 @@ chuseo.com
 chushan.com
 chushang027.com
 chushi007.com
+chushibiao5.com
 chushihome.com
 chushiji.com
 chushou.tv
@@ -17649,7 +17674,6 @@ cili8.me
 cilidb.org
 cilimao.cc
 cilimao.me
-cilimaotest.cc
 cilin.org
 cilogo.com
 cilook.net
@@ -17869,6 +17893,7 @@ claves.me
 clayidols.com
 claymore.wang
 clb6.net
+clboss.com
 clbu.club
 clchawaii.com
 clcindex.com
@@ -18995,6 +19020,7 @@ com126.com
 com-1-iqiyi.com
 com4loves.com
 comac.cc
+combaidu.com
 comba.xyz
 combomen.com
 combpm.com
@@ -19024,6 +19050,7 @@ comicocn.com
 comicst.com
 comicv.com
 comicyu.com
+comidu.com
 comiis.com
 comingchina.com
 comingspace.com
@@ -19102,7 +19129,6 @@ coo8.com
 coocaa.com
 coocare.com
 cooch3d.com
-coochen.com
 coocla.org
 coocox.org
 coodir.com
@@ -19350,7 +19376,6 @@ cqgongyi.com
 cqgz.com
 cqh2o.com
 cqhansa.com
-cqhbhg.com
 cqhcbk.com
 cqhdx.com
 cqhhr2.com
@@ -19584,6 +19609,7 @@ csbly.net
 csbthyhh.com
 csc108.com
 csc86.com
+cscatv.com
 cscdf.org
 cscec5b3.com
 cscec.com
@@ -20028,6 +20054,7 @@ cybtc.net
 cybwcl.com
 cycares.com
 cy-cdn.com
+cychaiqian.com
 cyclingchina.net
 cyclone-robotics.com
 cycnet.com
@@ -20135,6 +20162,7 @@ czitc.com
 czjdu.com
 czjdxl.com
 czjpw.com
+czjsy.com
 czjtj.com
 czkbdq.net
 czkingdee.com
@@ -20276,20 +20304,19 @@ daddymami.net
 dadetong.com
 dadeyu.com
 dadianstudio.com
-dadiapi.com
 dadigho.com
 dadighost.com
 dadijilu.com
 dadipedia.com
 dadiwang.com
 dadi-yun.com
-dadiziyuan.net
 dadizq.com
 dadou.com
 dadukou.net
 dadunet.com
 dafaji.com
 dafak33.com
+dafakuaisantouzhupingtai.com
 dafang24.com
 dafangya.com
 dafanpx.com
@@ -20653,7 +20680,6 @@ dashikou.com
 dashitech.com
 dashiyou.com
 dashoucloud.com
-dashubao.la
 dashubao.net
 dashuju123.com
 dashuye.com
@@ -20956,6 +20982,7 @@ ddspsc.com
 ddstarapp.com
 ddsy.com
 ddtkj.com
+ddtui.com
 ddun.com
 ddurl.to
 dduwork.com
@@ -21038,7 +21065,6 @@ deepin.store
 deepleaper.com
 deeplearn.me
 deepleo.com
-deepmindtech.cc
 deepms.net
 deepoon.com
 deepsheet.ltd
@@ -21380,6 +21406,7 @@ diandianzu.com
 diandongche.biz
 diandong.com
 diandongzhi.com
+dianfengcms.com
 diangan.org
 diangon.com
 diangong8.com
@@ -22016,6 +22043,7 @@ dns100.net
 dns110.com
 dns123456789.com
 dns123.net
+dns1861.com
 dns2008.com
 dns234.net
 dns383.com
@@ -22546,6 +22574,7 @@ dqzc.com
 dr009.com
 dragonballcn.com
 dragoncg.com
+dragonchinashoes.com
 dragonclaw.org
 dragonest.com
 dragon-guide.net
@@ -22625,6 +22654,7 @@ drvsky.com
 drwfggc.com
 dr-zh.com
 ds123456.com
+ds163.cc
 ds-360.com
 ds599.com
 ds5f.com
@@ -22812,6 +22842,7 @@ duoduowz.com
 duoduoyin.com
 duoduozhifu.com
 duoente.net
+duofull.com
 duogouhui.com
 duohou.net
 duohui.co
@@ -22956,6 +22987,7 @@ dwfei.com
 dwightwigh.com
 dwinput.com
 dwion.com
+dwiworem.com
 dwjoy.com
 dwl226.com
 dw.la
@@ -22976,7 +23008,6 @@ dwuva.com
 dwz1.cc
 dwz.lc
 dwz.mn
-dwz.win
 dx04131.com
 dx114118.com
 dx168.com
@@ -23250,6 +23281,7 @@ e8ud3.com
 e8zw.com
 e9377f.com
 e9727.com
+e9898.com
 e99999.com
 ea3w.com
 ea56.com
@@ -23258,6 +23290,7 @@ eachdaystory.com
 eachinfo.com
 eachnet.com
 eachsee.com
+eaeb.com
 eafifaonline2.com
 eaglexiang.org
 eahui.com
@@ -23390,6 +23423,7 @@ ebaoquan.org
 ebasset.com
 ebcmall.com
 ebdoor.com
+ebeioz.com
 ebeta.org
 ebfcn.com
 e-bidding.org
@@ -24035,9 +24069,9 @@ emojiall.com
 emojimobile.com
 empos.net
 ems517.com
-emsec.hk
 emshost.com
 emswxw.com
+emsym.com
 emtronix.com
 emtx.com
 emu999.net
@@ -24281,6 +24315,7 @@ ershenghuo.com
 ershenghuo.net
 ershicimi.com
 ershouhui.com
+ert7.com
 ertongkongjian.com
 ertongtuku.com
 ertongyouleshebei.com
@@ -24375,7 +24410,6 @@ eszwdx.com
 et59.com
 etao.com
 etaog.com
-etaoshi.com
 etaxcn.com
 etccenter.com
 etcchebao.com
@@ -24592,6 +24626,7 @@ exchangecn.com
 exchen.net
 exdoll.com
 exehack.net
+exfree.com
 exhera.com
 exiaoba.com
 exiaoxin.com
@@ -24607,6 +24642,7 @@ exo-mk.com
 exotxt.com
 exound.com
 expai.com
+expba.com
 expcloud.net
 expdns.net
 expiredns.net
@@ -25112,6 +25148,7 @@ fateqq.com
 fatiao.pro
 fatjiong.com
 fatkun.com
+fatmouse.xyz
 fa-today.com
 fatong9.com
 fatsoon.com
@@ -25173,6 +25210,7 @@ fccook.com
 fccs.com
 fcczp.com
 fcg51.com
+fcga.club
 fcgsnews.com
 fcgtt.com
 fcheche.com
@@ -25361,6 +25399,7 @@ feizhaojun.com
 feizl.com
 felearn.com
 feling.net
+felink.com
 felix021.com
 felixglow.com
 felixhe.net
@@ -25563,6 +25602,7 @@ fhdq.net
 fhduo.com
 fhg90.com
 fhhgj.com
+fhkioskmodules.com
 fhldns.com
 fhlun.com
 fhlyou.com
@@ -25645,6 +25685,7 @@ fintechinchina.com
 fintechquan.com
 finupfriends.com
 finupgroup.com
+finzfin.com
 fiphoenix.com
 fire2333.com
 fire233.com
@@ -25863,6 +25904,7 @@ flxc.net
 flxdns.com
 fly086.com
 fly1999.com
+fly3949.com
 fly63.com
 flyacat.com
 flyco.com
@@ -25930,6 +25972,7 @@ fnnsh.com
 fnrcw.com
 fn-tech.com
 fnysb.com
+fnzoo.com
 fnzw.com
 fo12.com
 fo515.com
@@ -26282,6 +26325,7 @@ ftnormal00ab.com
 ftnormal01as.com
 ftoul.com
 ftqq.com
+ftrsit.com
 ftsafe.com
 ftsfund.com
 ftsm-vip.com
@@ -26524,7 +26568,6 @@ fxltsbl.com
 fxmoe.com
 fxo2opt.com
 fxoas.gdn
-fxopne.com
 fxpan.com
 fxshopweb.com
 fxtiyu.com
@@ -27040,7 +27083,6 @@ gdcyl.org
 gddarf.com
 gddata.net
 gddg.cc
-gddvb.com
 gdebidding.com
 gdefair.com
 gdems.com
@@ -27061,7 +27103,6 @@ gdiso.com
 gdjc666.com
 gdjdxy.com
 gdjinge.com
-gdjinyide.com
 gdjn.org
 gdjyw.com
 gdkepler.com
@@ -27174,6 +27215,7 @@ geekcar.com
 geekdigging.com
 geek-docs.com
 geekdream.com
+geek-era.com
 geekercloud.com
 geekerconsulting.com
 geekersq.cc
@@ -27227,6 +27269,7 @@ geindex.com
 geiniwan.com
 geishost.com
 geisnic.com
+geitu.net
 geizan.cc
 gejiawen.com
 gelibrand.com
@@ -27421,7 +27464,6 @@ ggxpj5.com
 ggxt.net
 ggxxe.com
 ggxyx.com
-ggyad.com
 ggytc.com
 ggyum.com
 ggyy8.cc
@@ -27506,7 +27548,6 @@ giltbridge.com
 giltworld.com
 gimcyun.com
 gimhoy.com
-gimimi.com
 gimmgimm.com
 gimoo.net
 giocdn.com
@@ -27554,6 +27595,7 @@ gj515.com
 gj5s.com
 gjb9001b.com
 gj.com
+gjfax.com
 gjgov.com
 gjgwy.net
 gjgwy.org
@@ -27728,10 +27770,10 @@ gnvip.net
 gnway.cc
 gnway.com
 go007.com
-go008.com
 go0931.com
 go2050.com
 go24k.com
+go2aaron.com
 go2eu.com
 go2hn.com
 go2map.com
@@ -28762,6 +28804,7 @@ gxkjbg.com
 gxkjdns.com
 gxkjjt.com
 gxlxs2008.net
+gxmlyjy.com
 gxmmkt.com
 gxnas.com
 gx-newmedia.com
@@ -28810,6 +28853,7 @@ gymsj.com
 gymwen.com
 gyncb.net
 gynsh.net
+gypserver.com
 gyqbedu.com
 gyqcw.com
 gyql.org
@@ -29096,7 +29140,6 @@ h6688.com
 h687.com
 h6969.com
 h6app.com
-h6nq.com
 h7687.com
 h7ec.com
 h88823.com
@@ -29195,6 +29238,7 @@ haieruplus.com
 haierxue.com
 haifangbest.com
 haifeisi.com
+haige.com
 haigeek.com
 haiguangyaoye.com
 haigui001.com
@@ -29274,7 +29318,6 @@ haitaoyunfei.com
 haitaozhinan.com
 haitaozu.org
 haitaozy.com
-haitejs.com
 haitianhome.com
 haitl.com
 haitongjiaoyu.com
@@ -29471,6 +29514,7 @@ hanzify.org
 hao007.net
 hao0202.com
 hao120.cc
+hao123-123.com
 hao123.com
 hao123.com.sg
 hao123-hao123.com
@@ -29535,7 +29579,6 @@ haocode123.com
 haodai321.com
 haodaibao.com
 haodai.com
-haodaima.net
 haodanku.com
 haodaquan.com
 haodevps.com
@@ -29924,6 +29967,7 @@ hbhdhd.com
 hbhm.net
 hbhtcm.com
 hbhtxx.com
+hbhxbb.com
 hbhxqq.com
 hbhyychem.com
 hbhz.net
@@ -30629,6 +30673,7 @@ hftogo.com
 hfun.me
 hfwx.net
 hfxinkai.com
+hfx.net
 hfyestar.com
 hfyjgg.com
 hfykd.com
@@ -31018,6 +31063,7 @@ hktv.tv
 hktzschool.com
 hkwb.net
 hkxbjj.com
+hkxbjt.com
 hkxen.com
 hkxfw.com
 hkyqygl.com
@@ -31294,7 +31340,6 @@ hollywood6.com
 holmesian.org
 holoem.com
 holteksupport.com
-holyo.se
 holyxiongan.com
 home0311.com
 home0538.com
@@ -31454,6 +31499,7 @@ hooyagames.com
 hooyoo.com
 hope999.com
 hopebank.com
+hope-city.com
 hopecool.com
 hopedafz.com
 hopehook.com
@@ -31659,6 +31705,7 @@ hrbmilan.com
 hrbpma.com
 hrbrc.com
 hrbslh.com
+hrbswx.com
 hrbybjz.com
 hrbzdty.com
 hrcfc.com
@@ -31688,6 +31735,7 @@ hrsay.com
 hrsee.com
 hrsxb.vip
 hrteachu.com
+hrtechchina.com
 hrtn.net
 hrtstor.com
 hrtx.com
@@ -31794,6 +31842,7 @@ ht88.com
 ht9.com
 htanwang.com
 htbaba.com
+htbaidu.com
 htbenet.net
 ht-cao.com
 htcbbs.net
@@ -31839,6 +31888,7 @@ htmlsucai.com
 htnice.com
 htouhui.com
 htpc1.com
+htpcw.com
 htqyy.com
 htranslate.com
 htrfid.com
@@ -31849,10 +31899,13 @@ htsh.cc
 htsjdp.com
 ht-sonic.com
 htstzm.com
+htt5.com
 httingshu.com
+httpbaidu.com
 http-cache.com
 httpcn.com
 httprunner.org
+httpsbaidu.com
 htuwenming.com
 htwbb.com
 htwed.com
@@ -31960,6 +32013,7 @@ huamanshu.com
 huameicheng.com
 huameiyuezi.com
 huami.com
+huamivip.com
 huamoe.com
 huanaotong.com
 huanbao.com
@@ -32169,6 +32223,7 @@ huayuejob.com
 huayuidc.com
 huayun.com
 huayunshuzi.com
+huayunyy.com
 huayushufang.com
 huayutuan.com
 huazhen2008.com
@@ -32232,7 +32287,6 @@ huhuang.net
 huhuvr.com
 hui100.com
 hui10.com
-hui163.com
 hui20.com
 hui320.com
 hui800.com
@@ -32271,6 +32325,7 @@ huihaicenter.com
 huihaicn.com
 huihedian.com
 huihua365.com
+huihua8.com
 huihuaren.com
 huihuarensheng.com
 huihuavr.com
@@ -32317,6 +32372,7 @@ huiqituan.com
 huirendai.com
 huiris.com
 huirong168.com
+huiruanzhijia.com
 huishangbao.com
 huishangol.com
 huishangxian.com
@@ -32351,6 +32407,7 @@ huixiangmall.com
 huixiangtiandi.com
 huixiaoer.com
 huixiaoer.net
+huixing.hk
 huixinkang.com
 huixinli.com
 huixinyt.com
@@ -32769,7 +32826,6 @@ hymind.com
 hymom.com
 hynews.net
 hynews.org
-hynhyl.site
 hynpay.com
 hyocr.com
 hypefolio.com
@@ -32850,6 +32906,7 @@ hzhx.com
 hz-hxl.com
 hzhybz.com
 hzins.com
+hzjingxian.com
 hzjlxx.com
 hzjmqz.com
 hzjs56.com
@@ -32986,6 +33043,7 @@ iakmai.com
 ialicdn.com
 ialloc.com
 ialloc.org
+iambanban.com
 iambocai.com
 iameduwork.com
 iamfisher.net
@@ -34074,6 +34132,7 @@ imlianai.com
 imlike.cc
 imliuyi.com
 imliyan.com
+immi520.com
 immi.cc
 immiexpo.com
 immivip.com
@@ -34213,6 +34272,7 @@ inetgoes.com
 inetnoc.com
 inewhope.com
 inewoffice.com
+inewpower.com
 inewray.com
 inewya.com
 inezha.com
@@ -34432,7 +34492,6 @@ ip138.com
 ip192.com
 ip285.com
 ip33.com
-ip508.com
 ip518.com
 ip87.com
 ip998.com
@@ -34477,6 +34536,7 @@ ipengtai.com
 iper2.com
 ipexp.com
 ipfeibiao.com
+ipfen.com
 ipfsbit.com
 ipgoal.com
 ip-guard.net
@@ -34487,11 +34547,13 @@ iphonespirit.com
 iphp8.com
 ipianchang.com
 ipicfriend.com
+ipinba.com
 ipin.com
 ipinyou.com
 ipip.net
 ipktv.com
 ip.la
+iplascloud.com
 iplaymtg.com
 iplaypy.com
 iplaypython.com
@@ -35189,7 +35251,6 @@ ixpub.net
 ixs.cc
 ixsch.com
 ixs.la
-ixuela.com
 ixueshu.com
 ixueyi.com
 ixu.me
@@ -35243,6 +35304,7 @@ iyouxia.com
 iyouxun.com
 iyoya.com
 iyozai.com
+iyrejug.com
 iyuedan.com
 iyuedian.com
 iyule.cc
@@ -35352,7 +35414,6 @@ janpn.com
 janxing.com
 japanzhuanyun.com
 jarhu.com
-jarryham.com
 jartto.wang
 jar-world3000.com
 jaskni.com
@@ -35524,6 +35585,7 @@ jdgwdq.com
 jdhhmd.com
 jd.hk
 jdhyplay.com
+jdiy.club
 jdiy.org
 jdjob88.com
 jdjrdns.com
@@ -35685,6 +35747,7 @@ jgyflqc.com
 jgyljt.com
 jgzx.org
 jgzyw.com
+jh0110.com
 jh3j.com
 jh61588.com
 jh725.com
@@ -35809,7 +35872,6 @@ jiandaopay.com
 jiandaoyun.com
 jiandati.com
 jiando.com
-jianduankm.com
 jiandudu.com
 jiane86.com
 jianfanjia.com
@@ -36103,6 +36165,7 @@ jietusoft.com
 jiexi8.com
 jiexiyouxuan.com
 jieyou.com
+jieyoujin.com
 jieyoujob.com
 jieyue.net
 jiezhong.org
@@ -37018,6 +37081,7 @@ jowto.com
 joy95.com
 joy9.cc
 joyact.com
+joyami.com
 joyany.com
 joyapi.com
 joyboke.com
@@ -37170,6 +37234,7 @@ js17x.com
 js3.org
 js444123.com
 js53777.com
+js667.vip
 js6777.net
 js7xc.com
 js811.com
@@ -37531,7 +37596,6 @@ jumi.com
 jumin.cc
 juming.com
 juming-xz.com
-juminquan.com
 jumore.com
 jumorenews.com
 jumpcnnet.com
@@ -37657,6 +37721,8 @@ just.im
 justjavac.com
 justsy.com
 justwe.site
+justyle.cc
+justylepro.com
 jutaobao.cc
 jutao.com
 jutean.com
@@ -37716,7 +37782,6 @@ jwdns.com
 jwetech.com
 jwfirst.com
 jwipc.com
-jwmobi.com
 jwshy.com
 jwslbb.com
 jwview.com
@@ -37811,7 +37876,6 @@ jxtvshop.com
 jxtyzx.org
 jxtzw.com
 jxunicom.com
-jx.vc
 jxvivi.com
 jxwaiyu.com
 jxweizhi.com
@@ -37961,7 +38025,6 @@ jztvxmt.com
 jztylxx.com
 jztzw.net
 jzwcom.com
-jzw.tv
 jzx2.com
 jzxs.com
 jzxue.com
@@ -38121,6 +38184,7 @@ kalading.com
 kalazan.com
 kalcaddle.com
 kalegou.com
+kaliorg.com
 kaluli.com
 kameng.com
 kamengjinfu.com
@@ -38162,6 +38226,7 @@ kangdaoai.com
 kangepian.com
 kanggou.com
 kanggui.com
+kanghuayun.com
 kanghui.com
 kanghui.org
 kanghu.net
@@ -38609,6 +38674,7 @@ kgula.com
 kguowai.com
 khanarabia.com
 khdatasolutions.com
+khdmw.com
 khesport.com
 khews.com
 kh.google.com
@@ -39130,7 +39196,6 @@ kqzjw.com
 kqzlzx.com
 kr126.com
 krahag.com
-krbxg.com
 kr-cell.com
 kr.com
 krdem.com
@@ -39164,6 +39229,7 @@ ksbao.cc
 ksbao.com
 ksbbs.com
 kscac.com
+ks-cdn1.com
 ks-cdn.com
 kscdns.com
 ksdang.com
@@ -39231,7 +39297,6 @@ ktorrent.org
 ktp8.com
 ktpf.cc
 ktplay.com
-ktpme.com
 ktsdad.com
 ktsee.com
 kttake.com
@@ -39530,6 +39595,7 @@ kutianxia.com
 kutj.com
 kutongji.com
 kutoo8.com
+kutu66.com
 kutuan.com
 kuuhu.com
 kuuhuu.com
@@ -39801,7 +39867,6 @@ lancdn.com
 lanconvey.com
 landai.com
 landa-solenoid.com
-landcement.com
 landed.cc
 landian.la
 landiannews.com
@@ -40203,6 +40268,7 @@ leadercf.com
 leaderhero.com
 leadermall.com
 leader-tech.net
+leadge.com
 leadjinrong.com
 leadong.com
 leadpeixun.com
@@ -40811,7 +40877,6 @@ licomsh.com
 licqi.com
 licstar.net
 lid1688.com
-lidaofang.com
 lidaoliang.com
 lidaren.com
 lidazhuang.com
@@ -41365,7 +41430,6 @@ liuxue114.com
 liuxue360.com
 liuxue51.net
 liuxue86.com
-liuxue8.cc
 liuxuebaba.com
 liuxueban.org
 liuxuecentre.com
@@ -41633,6 +41697,7 @@ logacg.com
 logclub.com
 logdu.com
 loger.me
+loghao.com
 logi-inno.com
 logi.ml
 logisticsy.com
@@ -41688,6 +41753,7 @@ loli.cd
 lolico.moe
 loli.ee
 loli.my
+lolip.net
 lolitaf.com
 lolitawardrobe.com
 loliyun.vip
@@ -42090,7 +42156,6 @@ ltwkw.com
 ltwsh.cc
 ltxjob.com
 ltxs.me
-ltyun.cc
 ltzsjt.com
 lu33.com
 lu35.com
@@ -42323,7 +42388,6 @@ lvfl.net
 lvgaud.ga
 lvgou.com
 lvguang.net
-lvguoning.com
 lvhezi.com
 lvhuadai.com
 lvjihong.com
@@ -42911,7 +42975,6 @@ mamelook.com
 mamicode.com
 mamilist.com
 mamipush.com
-mamshare.com
 man189.com
 manage.c3edge.com
 managershare.com
@@ -43168,7 +43231,6 @@ maxthonimg.com
 maxuscloud.com
 maxw.cc
 maxwealthfund.com
-maxwellxxx.com
 maxwi.com
 maxxipoint.com
 maxzhang.com
@@ -43256,6 +43318,7 @@ mcgcn.com
 mchat.com
 mchifi.com
 mchunghua.org
+mcjcjx.com
 mcjd.net
 mcjxqy.com
 mckuai.com
@@ -43346,7 +43409,6 @@ media.admob.com
 mediaclub.cc
 media.licdn.com
 medianewpower.com
-mediaqx.com
 mediatek.com
 mediav.com
 mediawords.org
@@ -43787,6 +43849,7 @@ mgogo.com
 mg-pen.com
 mgplay.com.tw
 mgpyh.com
+mgsdk.com
 mgslb.com
 mgtv.com
 mgw999.com
@@ -43987,6 +44050,7 @@ migroom.com
 migucloud.com
 migudy.com
 migufun.com
+migutv.com
 miguvideo.com
 miguyu.com
 mihayo.com
@@ -44128,6 +44192,7 @@ mingin.com
 mingjian.com
 mingjinglu.com
 mingjiu-cn.com
+mingjiufu.com
 minglian.com
 mingliu8.com
 mingliwenhua.com
@@ -44140,6 +44205,7 @@ mingrentalk.com
 mingrenteahouse.com
 mingrenxiang.com
 mingrenzhuan.com
+mingrenziliao.com
 mingricctv.com
 mingritouban.com
 mingshiedu.com
@@ -44317,6 +44383,7 @@ mkswp.com
 mkszxh.com
 mktcreator.com
 mktplassets-ssl.xbox.com
+mktzr.com
 mkuai.net
 mkv99.com
 mkvcn.com
@@ -44334,7 +44401,6 @@ mlgame.wang
 mlgame.xin
 mlgj.com
 mlibaba.com
-mli.im
 mlinks.cc
 mlishou.com
 mlito.com
@@ -44619,6 +44685,7 @@ mogubill.com
 mogucdn.com
 mogu.com
 mogucun.net
+mogudong.com
 moguf.com
 mogu.io
 mogujia.com
@@ -44728,7 +44795,6 @@ moomcherry.com
 moonbasa.com
 moonfly.net
 mooninbox.com
-mooninsky.net
 moonlian.com
 moonsec.com
 moonsun.cc
@@ -44982,6 +45048,7 @@ mso2011.com
 m.sohu
 msooso.com
 msotu.com
+msphcn.com
 mspring.org
 msqzxmr.com
 msrtvu.net
@@ -45011,6 +45078,7 @@ mtasia.net
 mtavip.com
 mt-bbs.com
 mtblj.com
+mtchome.com
 mtcnsoft.com
 mtcop.com
 mtcsys.com
@@ -45105,10 +45173,12 @@ muniao.com
 muoue.xyz
 murl.tv
 muruoxi.com
+muruoxi.pw
 muse100.com
 muse-ui.org
 mushapi.com
 mushshen.com
+music163.com
 music4x.com
 music.apple.com
 musicbody.net
@@ -45195,6 +45265,7 @@ mxgw.info
 mxgz5.fit
 mxhaitao.com
 mxhichina.com
+mxiaoer.com
 mxin100.com
 mxingkong.net
 mxipp.tech
@@ -45814,7 +45885,6 @@ ncu.me
 ncu.space
 ncvtinfo.com
 ncvtmi.com
-ncwjfc.com
 ncwsxd.com
 ncwuli.com
 ncwyxh.com
@@ -46010,6 +46080,7 @@ newhopegroup.com
 newhtml.net
 newhua.com
 newifi.com
+newistock.com
 newjianzhi.com
 newjson.com
 newjunshi.net
@@ -46127,7 +46198,6 @@ ngbbs.com
 ngc1512.xyz
 ngcgears.com
 ngctransmission.com
-ngfang.com
 ngfans.net
 ngh6.com
 nginxs.com
@@ -47269,6 +47339,7 @@ onjobedu.com
 onlinecn.com
 onlinedown.net
 online-edu.org
+online-exam.site
 onlinekr.com
 onlinenic.net
 onlinesjtu.com
@@ -47484,6 +47555,7 @@ oschina.com
 oschina.io
 oschina.net
 os-easy.com
+ose.cc
 osechina.com
 osedu.net
 oseminfo.com
@@ -47690,8 +47762,10 @@ oyoumo.com
 oyqcmc.com
 oz138.com
 ozhibao.com
+ozrot.com
 ozzyad.com
 p12345.com
+p138.com
 p1.com
 p2220.com
 p2cdn.com
@@ -47718,6 +47792,7 @@ p2pxing.com
 p2pxsj.com
 p2pzc.com
 p2yang.com
+p31.net
 p3k3.com
 p44.com
 p4.cc
@@ -47762,6 +47837,7 @@ paidanzi.com
 paidui.com
 paiduidai.com
 paihang360.com
+pai-hang-bang.com
 paihb.com
 paihotels.cc
 paike.com
@@ -47976,12 +48052,14 @@ pautoclub.com
 pawpawsoft.com
 paxgl.com
 paxiangdanche.com
+pay5168.com
 pay5858.com
 paydaybqx.com
 payeco.com
 payhearts.com
 payloads.online
 paymax.cc
+paympay.com
 payrao.com
 paysapi.com
 paytbf.com
@@ -48086,7 +48164,6 @@ pcwenti.com
 pcwl.com
 pcyangguangban.com
 pcyule.com
-pcze.com
 pd120.com
 pd521.com
 pdadians.com
@@ -48148,7 +48225,6 @@ pearvideo.com
 pec365.com
 p-e-china.com
 pediy.com
-pedland.com
 pedli.com
 peepic.com
 peersafe.com.sg
@@ -48227,6 +48303,7 @@ perfect-is-shit.com
 perfectonlive.com
 perfect-visions.com
 perfgeek.com
+peropero.net
 peryi.net
 pes-china.com
 pesiv.com
@@ -48278,6 +48355,7 @@ pgysoft.com
 pgyst.net
 pgzs.com
 pgzx.net
+ph0en1x.space
 ph1126.net
 ph-126.net
 ph2323.com
@@ -48545,7 +48623,6 @@ pingjiata.com
 pinglu123.com
 pinglun8.cc
 pingnanlearning.com
-pingnan.net
 pingnuosoft.com
 pingpang.info
 pingpangwang.com
@@ -49192,7 +49269,6 @@ ptd100.com
 ptd99.com
 ptdsh.com
 pteca.com
-pter.club
 ptfdc.com
 ptfish.com
 pthc1.com
@@ -49271,6 +49347,7 @@ pureage.info
 pureasme.com
 purecpp.org
 pureh2b.com
+purenyy.com
 purji.com
 puroyal.com
 pusa123.com
@@ -49385,8 +49462,10 @@ pyyx.com
 pz1789.com
 pz18155.com
 pz2008.com
+pz2777.com
 pz3433.com
 pz44444.com
+pz4555.com
 pz5355.com
 pz550.com
 pz555666.com
@@ -49411,6 +49490,7 @@ pzjdimg.com
 pzjiadian.com
 pzjinxiudadi.com
 pzlink.com
+pznews.com
 pznrfsy.com
 pznsh.com
 pzoom.com
@@ -49530,6 +49610,7 @@ qdaiduo.com
 qdailyapp.com
 qdaily.com
 q-dazzle.com
+qdbaikal.com
 qdbdsk.com
 qdbeian.com
 qdcaijing.com
@@ -50028,6 +50109,7 @@ qincaigame.com
 qinchugudao.com
 qin.com
 qinco.net
+qind.mobi
 qineasy.com
 qinengwuliu.com
 qinfukai.com
@@ -50108,6 +50190,7 @@ qing-shan.com
 qingsj.com
 qingsongchou.com
 qingstor.com
+qingsucai.com
 qingsword.com
 qingtaoke.com
 qingtian16265.com
@@ -50206,6 +50289,7 @@ qirui.com
 qisbook.com
 qishixitong.com
 qishixunmei.com
+qishu2.com
 qishu.cc
 qishu.co
 qishudu.com
@@ -50217,7 +50301,6 @@ qisucdn.com
 qisuu.com
 qisuu.la
 qite111.com
-qitedao.com
 qitete.com
 qiti88.com
 qitian.biz
@@ -50275,6 +50358,7 @@ qi-wen.com
 qiwendi.com
 qiwentu.com
 qixia.ltd
+qixiandoc.com
 qixifuren.com
 qixin007.com
 qixin18.com
@@ -50300,7 +50384,6 @@ qiyenet.net
 qiyeqq-sd.com
 qiyeshangpu.com
 qiyeshangpu.net
-qiyesou.com
 qiyetuozhan.com
 qiyeweixin.com
 qiyewenhua.net
@@ -50429,7 +50512,6 @@ qmei.vip
 qmengyun.com
 qmitao.com
 qmji.net
-qmjjj.com
 qmm.la
 qmood.com
 qmqm.net
@@ -50488,6 +50570,7 @@ qp110.com
 qp2168.com
 qp46.com
 qp56780.com
+qp56787.com
 qp832.com
 qp88801.com
 qpb187.com
@@ -50557,6 +50640,7 @@ qq.do
 qqdswl.com
 qqe2.com
 qqenglish.com
+qqeo.com
 qqershou.com
 qqevd.com
 qq-ex.com
@@ -50875,6 +50959,7 @@ quceaiqing.com
 quchaogu.com
 quchao.net
 quchew.com
+qudangdang.com
 qudao168.com
 qudao.com
 qudao.info
@@ -51039,7 +51124,6 @@ qvbuy.com
 qvip.net
 qvkanwen.com
 qvlz.com
-qvod.com
 qvpublish.com
 qvxo.com
 qw.cc
@@ -51140,6 +51224,7 @@ qyqc4s.com
 qy-qq.com
 qyqzj.com
 qyrb.com
+qysd.net
 qysfl.com
 qyt1902.com
 qyule.org
@@ -51380,6 +51465,7 @@ rdxmt.com
 rdxw8.com
 rdypd.com
 rdzhijia.com
+rdzjw.com
 rdzs.com
 rdzx.net
 re1d.com
@@ -51874,7 +51960,6 @@ ronghub.com
 ronghuisign.com
 rong.io
 rongji.com
-rongjihall.com
 rongjinsuo.com
 rongledz.com
 ronglianmeng.net
@@ -52270,7 +52355,6 @@ s350kk.com
 s3graphics.com
 s3.mzstatic.com
 s4g5.com
-s4lm0x.com
 s4.mzstatic.com
 s4yd.com
 s5217.com
@@ -52441,7 +52525,6 @@ sankaijian.com
 sankgo.com
 sankougift.com
 sankuai.com
-sanlangwang.xyz
 sanmaofafa.com
 sanpowergroup.com
 sanpuzhiyao.com
@@ -52657,6 +52740,7 @@ scjzjyjc.com
 sckfzx.com
 sclezhu.com
 sclf.org
+sclinktech.com
 scmenhu.com
 scmeye.com
 scmor.com
@@ -52858,6 +52942,7 @@ sdtxmq.com
 sduod.com
 sdutacm.org
 sdwanghan.com
+sdwanping.com
 sdwdxl.com
 sdwebseo.com
 sdwenlian.com
@@ -53025,7 +53110,6 @@ selfservicechina.com
 selinuxplus.com
 seliujs.com
 sellingexpress.net
-sellxiu.com
 sem123.com
 semgg.com
 semgz.com
@@ -53064,6 +53148,7 @@ senselock.com
 senseluxury.com
 sensertek.com
 sensetime.com
+senseyun.com
 sensorshome.com
 senstoo.com
 senszx.com
@@ -53090,6 +53175,7 @@ seohet.com
 seohuizhou.com
 seoimg.tech
 seoniao.com
+seopath.net
 seopre.com
 seoshenzhen.com
 seosn.com
@@ -53206,7 +53292,6 @@ sgndjy.com
 sgnet.cc
 sgnongkang.com
 sgou.com
-sgseed.cc
 sgshero.com
 sgshuangfa.com
 sgsxw.com
@@ -53395,6 +53480,7 @@ shanlink.com
 shanliulian.com
 shanlu.im
 shanmao.me
+shannonai.com
 shannon-sys.com
 shannxidg.com
 shanp.com
@@ -53540,6 +53626,7 @@ sheeyi.com
 shehuo.me
 sheinet.com
 sheitc.org
+shejibao.com
 shejiben.com
 sheji.com
 shejicool.com
@@ -53778,6 +53865,7 @@ shidiao18.com
 shidi.org
 shidz.com
 shifee.com
+shifen1.com
 shifen.com
 shifendaojia.com
 shifeng.com
@@ -54146,6 +54234,7 @@ shscxh.net
 shsczs.com
 shsee.com
 sh-service.com
+shshilin.com
 shsipo.com
 shsixun.com
 shskapp.com
@@ -54549,6 +54638,7 @@ silenceper.com
 silianmall.com
 siliaobaba.com
 siliaoycw.com
+siliconext.com
 siling.com
 silingge.com
 silkpresent.com
@@ -54602,7 +54692,6 @@ simulway.com
 simuwang.com
 simwe.com
 simxhs.com
-sinaalicdn.com
 sinaapp.com
 sinacdn.com
 sinacloud.com
@@ -55411,6 +55500,7 @@ songshu.cc
 songshudiandian.com
 songshuhui.net
 songshushan.com
+songshushuo.com
 songsongruanwen.com
 songsongxiongdi.com
 songsongyingxiao.com
@@ -55807,7 +55897,6 @@ ssfb8.com
 ssf.cc
 ssffx.com
 ssggg.com
-ssgjjy.com
 ssgushi.com
 sshv.net
 ssipex.com
@@ -55815,11 +55904,9 @@ ssjee.com
 ssjjss.com
 ssjjtt.com
 ssjlicai.com
-ssjtcn.com
 ssjxx.com
 ssjzw.com
 ssky123.com
-sskzmz.com
 sslaaa.com
 sslchina.com
 sslcity.com
@@ -56567,6 +56654,7 @@ sxgs.com
 sxguofen.com
 sxhaishan.com
 sxhctv.com
+sxhjks.ph
 sxhjsz.com
 sxhlxy.com
 sxhm.com
@@ -56725,6 +56813,7 @@ sys-ele.com
 sysengi.com
 syshihua.com
 syshospital.com
+syshospital.org
 sysight.com
 sysjdjy.com
 sysmini.com
@@ -56766,6 +56855,7 @@ sz1978.com
 sz315.org
 sz-3a.com
 sz4db.com
+sz5156.com
 sz5983.com
 sz61.com
 sz68.com
@@ -56800,6 +56890,7 @@ szcatic.cc
 szcatic.com
 szc.com
 szcec.com
+sz-cerberus.com
 szcfqiche.com
 szchigemy.com
 szchi.net
@@ -57021,6 +57112,7 @@ szxxtx.com
 szy880.com
 szyehuo.com
 szyepuw.com
+szyfdz.net
 szyhljt.com
 szyibei.com
 szyibuda.com
@@ -57208,7 +57300,6 @@ tan.cc
 tancdn.com
 tandehao.com
 tandjx.com
-tanfujun.com
 tangangny.com
 tangangnyxm.com
 tangdaoya.com
@@ -57467,6 +57558,7 @@ tavsiktlig.com
 tax12366.org
 tax-edu.net
 taxiaoshuo.com
+taxjiangkewang.com
 taxnote.org
 taxspirit.com
 taxwen.com
@@ -57533,6 +57625,7 @@ tccqb.com
 tcc.so
 tccxfw.com
 tcdai.com
+tcdbcc.com
 tcdnlive.com
 tcdnv3.com
 tcdnvod.com
@@ -57645,6 +57738,7 @@ tech126.com
 tech2ipo.com
 techan.com
 techanghui.com
+techantong.net
 techaxiang.net
 techbrood.com
 techbulo.com
@@ -57674,6 +57768,7 @@ techxinwen.com
 techxue.com
 techyan.me
 teclast.com
+tecyle.com
 tedaniu.com
 teddymobile.net
 tedx.net
@@ -57921,6 +58016,7 @@ theonemusic.net
 theonews.com
 theorychina.org
 thepast.cc
+thereandhere.tk
 therecity.com
 theswapsy.com
 thethirdmedia.com
@@ -58024,6 +58120,7 @@ tianduntech.com
 tiandy.com
 tianelian.com
 tianfeiyu.com
+tianfengfeiye.com
 tianfus.com
 tianfusoftwarepark.com
 tianfuw.com
@@ -58095,7 +58192,6 @@ tianshan277.com
 tianshangrenjian123.com
 tianshannet.com
 tianshengdiyi.com
-tianshi2.com
 tianshi2.net
 tianshiaomei.com
 tianshi.info
@@ -58267,7 +58363,6 @@ timeso.cc
 timetw.com
 timev.com
 time-weekly.com
-timewhile.com
 time-year.com
 timing360.com
 timipc.com
@@ -58386,6 +58481,7 @@ tjdyf.com
 tjece.com
 tjfer.com
 tjflcpw.com
+tjflora.com
 tjgangkouyiyuan.com
 tjgcs.com
 tjgdjn.com
@@ -58549,6 +58645,7 @@ tntdown.com
 t-nvlang.com
 to4f.com
 to8to.com
+to9.org
 tobaccobid.com
 toberp.com
 tobnews.com
@@ -58913,7 +59010,6 @@ toysir.com
 toysuperman.com
 tp88.net
 tp8.me
-tp999.net
 tpba1688.com
 tpbar.com
 tpbook.com
@@ -58925,8 +59021,10 @@ tplm123.com
 tplogincn.com
 tpooo.com
 tpoxiaozhan.com
+tpsxs.com
 tpturang.com
 tpy100.com
+tpy10.net
 tpyboard.com
 tpywlkj.net
 tpyyes.com
@@ -59033,7 +59131,6 @@ triplexservice.com
 trippanda.com
 tripren.com
 tripvivid.com
-tripvv.com
 tripwirechina.com
 tripzm.com
 tripzm.net
@@ -59105,6 +59202,7 @@ tse3.mm.bing.net
 tse4.mm.bing.net
 tsfucai.com
 tsg-online.net
+tshaisen.com
 tshare365.com
 tshe.com
 tshell.net
@@ -59119,6 +59217,7 @@ tsinghua-getinfo.com
 tsinghuaicwx.com
 tsinghuajournals.com
 tsinghuan.com
+tsinghuawoman.com
 tsingming.com
 tsingpost.com
 tsingtoo.com
@@ -59341,6 +59440,7 @@ tuhongwei.com
 tuhu.com
 tuhu.org
 tuhusmart.com
+tuhu.work
 tui18.com
 tui18edu.com
 tui56.com
@@ -59464,6 +59564,7 @@ tupianlu.com
 tupianzj.com
 tupu360.com
 tuputech.com
+tupuw.com
 tuquu.com
 turangyq.com
 turbomail.org
@@ -59712,7 +59813,6 @@ tyjlwy.com
 tyjmmy.com
 tyjmqz.com
 tyjxpt.com
-tykor.net
 tyksl.com
 tyldclub.com
 tylll.com
@@ -60170,6 +60270,7 @@ union400.com
 union555.com
 union888.net
 union968.com
+unionclouds.net
 unioncyber.net
 union-game.com
 unionli.com
@@ -60336,6 +60437,7 @@ uqyqcuq.ml
 urams.com
 urart.cc
 urbanchina.org
+urbanmatters.com
 urbetter.com
 urbetter.net
 urcb.com
@@ -60372,7 +60474,6 @@ usbabyada.com
 usbing.com
 usbmi.com
 usbxyz.com
-uschinapress.com
 uscnk.com
 uscnpm.com
 usd-cny.com
@@ -60501,6 +60602,7 @@ uusky.com
 uusoo.net
 uustory.com
 uustv.com
+uusucai.com
 uutop.com
 uutuu.com
 uuu9.com
@@ -60957,6 +61059,7 @@ viphxw.com
 vipjr.com
 vipkaoyan.net
 vipkdy.com
+vipkid.club
 vipkid.com
 vipkidresource.com
 vipkidstatic.com
@@ -61087,6 +61190,7 @@ vmengblog.com
 vmeok.com
 vmeti.com
 vmfor.com
+vmgirls.com
 vmicloud.com
 vmoiver.com
 vmonkey.mobi
@@ -61114,6 +61218,7 @@ vocinno.com
 vodjk.com
 vodxb.com
 vodxc.com
+vodxc.tv
 voguemate.com
 vohringer.com
 voicedic.com
@@ -61309,6 +61414,7 @@ vvtech.xyz
 vvtor.com
 vvtt.org
 vvup.net
+vvvcd.com
 vvvdj.com
 vvvfans.com
 vvv.io
@@ -61468,6 +61574,7 @@ wak123.org
 wakatool.com
 wakedata.com
 waketu.com
+wakeup.fun
 wal8.com
 walanwalan.com
 walatao.com
@@ -61611,6 +61718,7 @@ wangjubao.com
 wangjunwei.com
 wangketuan.com
 wangkuai.net
+wangle.com
 wangleipeng.com
 wanglibank.com
 wanglibao.com
@@ -61618,6 +61726,7 @@ wanglibing.com
 wang-li.com
 wanglu.info
 wangluojianshen.com
+wangluoliuxing.com
 wangluomeirongyuan.com
 wanglutech.com
 wanglv.com
@@ -61762,6 +61871,7 @@ wannengxiaoge.com
 wannengzj.com
 wannianli.mobi
 wannianli.net
+wanning1.com
 wannuoda.com
 wanparks.com
 wanplus.com
@@ -62057,6 +62167,7 @@ web-feifei.com
 webfont.com
 webfoss.com
 webfoxers.com
+webfreecounter.com
 webfuns.net
 webfuwu.com
 webgl.club
@@ -62161,7 +62272,6 @@ wehefei.com
 weherepost.com
 wehwr.com
 wei2008.com
-wei266.com
 wei6.com
 weiangtz.com
 weiaokeji.com
@@ -62445,6 +62555,7 @@ welansh.com
 weldr.net
 welefen.com
 weleve.com
+weliads.com
 welian.com
 welife001.com
 welife100.com
@@ -63104,6 +63215,7 @@ wifi0917.com
 wifi188.com
 wifi33.com
 wifi8.com
+wifi99.com
 wifibanlv.com
 wifichain.com
 wifi.com
@@ -63133,7 +63245,6 @@ wikore.org
 wilddog.com
 wilddogio.com
 wildgun.net
-wileam.com
 will6.com
 willerce.com
 willmao.com
@@ -63365,7 +63476,6 @@ wjiaxing.com
 wjiee.com
 wjika.com
 wjin.cc
-wjiul.com
 wj-jd.com
 wjjfjt.com
 wjkwl.com
@@ -63633,9 +63743,11 @@ wondershare.cc
 wondershare.com
 wondershare.net
 wondersmemory.com
+wonderstar027.com
 wonder.wiki
 wonei.com
 wonerqu.com
+wongcw.com
 wonggang.com
 wongpeace.com
 woniu8.com
@@ -64074,6 +64186,7 @@ wuhu.cc
 wuhulife.com
 wuhusanlian.com
 wuhuzhongao.com
+wui5.com
 wujianblog.com
 wujiangtong.com
 wujiayi.vip
@@ -64205,7 +64318,6 @@ wuzhenwic.org
 wuzhiwei.net
 wuzhouqianzheng.com
 wuzongping.com
-wuzuowei.net
 wvshare.com
 ww2bbs.net
 ww9aafe.com
@@ -64289,7 +64401,6 @@ www.parallels.com
 wwwqq.com
 wwwquan.com
 www.redhat.com
-www.renren.com.cdngc.net
 www.samsung.com
 www.sl
 www-ssl.intel.com
@@ -64354,7 +64465,6 @@ wxjflab.com
 wxjx123.com
 wxjxyb.com
 wxjyql.com
-wxlinli.com
 wxlongre.com
 wxlss.com
 wxlvxin.com
@@ -64519,7 +64629,6 @@ x69shu.com
 x6kj.com
 x6x8.com
 x72y.com
-x7ef.com
 x7sy.com
 x81zw.com
 x821.com
@@ -64608,6 +64717,7 @@ xaybh.com
 xayestar.com
 xayy999.net
 xazcit.com
+xaztdz.com
 xazyms.com
 xazzg.com
 xazzp.com
@@ -64616,7 +64726,6 @@ xb100.net
 xb2s.com
 xb918116.com
 xbaixing.com
-xbaoj.com
 xbaquge.com
 xbase.cloud
 xbatu.com
@@ -64651,7 +64760,6 @@ xbiqugew.com
 xbirder.com
 xbj8888.com
 xbjianzhan.com
-xbk020.com
 xblds.com
 xblyw.com
 xbmiaomu.com
@@ -65290,6 +65398,7 @@ xiaokesoso.com
 xiaokuihua.net
 xiaokusha.com
 xiaokyx.com
+xiaolaba.xin
 xiaolai.net
 xiaolajiao.com
 xiaolang.xyz
@@ -65332,6 +65441,7 @@ xiaomei.cc
 xiaomeiti.com
 xiaomeme.com
 xiaomengdoufu.com
+xiaomiaozai.com
 xiaomi.com
 xiaomicp.com
 xiaomi.hk
@@ -65435,6 +65545,7 @@ xiaot.com
 xiaotee.com
 xiaoten.com
 xiaotengyouxi.com
+xiaotongxing.net
 xiaotuzhan.com
 xiaou2014.com
 xiaouguanjia.com
@@ -65446,6 +65557,7 @@ xiaowanzhou.net
 xiaowazi.com
 xiaoweigod.com
 xiaoweirobot.com
+xiaoweizhibo.com
 xiaowiba.com
 xiaowm.com
 xiaoxiaapi.com
@@ -65459,6 +65571,7 @@ xiaoxiaoapps.com
 xiaoxiao.com
 xiaoxiaoketang.com
 xiaoxiaomo.com
+xiaoxiaotong.org
 xiaoxiaozi.com
 xiaoxichangliu.com
 xiaoxineye.com
@@ -65499,6 +65612,7 @@ xiaoyusanchou.com
 xiaoyusan.com
 xiaoyuxitong.com
 xiaoyuzhuanqian.com
+xiaoz123.com
 xiaozaixiao.com
 xiaozaokt.com
 xiaozehuashi.com
@@ -65651,7 +65765,9 @@ xifuwa.com
 xigeweb.com
 xigo.tv
 xigua110.com
+xigua15.cc
 xigua15.com
+xigua15.net
 xigua66.com
 xiguabook.com
 xigua.com
@@ -65832,7 +65948,6 @@ xinguanyun.com
 xingumin.net
 xingxing.com
 xingxingmeiyu.com
-xingyafei.me
 xingye58.com
 xingyi.com
 xingyigz.com
@@ -65893,7 +66008,6 @@ xinji2.com
 xinjiadiy.com
 xinjiance.com
 xinjianggou.com
-xinjiangtravel.com
 xinjimo.com
 xinjingks.com
 xinji.org
@@ -65962,6 +66076,7 @@ xinshiye.cc
 xinshoucun.com
 xinshouzhanzhang.com
 xinshubao.net
+xinshulaile.com
 xinshuru.com
 xinsilu.com
 xinsiyang.com
@@ -65971,7 +66086,6 @@ xintaizhou.com
 xintaovip.com
 xintengai.com
 xintenseo.com
-xintheme.com
 xintian.org
 xintiao100.com
 xintudiy.com
@@ -66603,6 +66717,7 @@ xplus.com
 xpsheying.com
 xpsy.net
 xptt.com
+xpu93.com
 xpw888.com
 xpwang.com
 xpxt.net
@@ -66710,6 +66825,7 @@ xslb.net
 xsldh.net
 xslou.com
 xsmaofa.com
+xsmnews.com
 xsmore.com
 xsnsyh.com
 xsnvshen.com
@@ -66867,6 +66983,7 @@ xueepay.com
 xueersen.com
 xueersi.com
 xueerxing.com
+xuefaschool.com
 xuefenxi.com
 xuefo.net
 xuegaogame.com
@@ -67048,7 +67165,6 @@ xunyixia.com
 xunyou.com
 xunyou.mobi
 xunyun.com
-xunzai.com
 xunzi.cc
 xupengjinshu.com
 xupu120.com
@@ -67273,6 +67389,7 @@ xywy.com
 xywyfw.com
 xyx234.com
 xyxcables.com
+xyxdie.com
 xyxl.net
 xyxsc.com
 xyxsns.com
@@ -67342,7 +67459,6 @@ xztyhl.com
 xztz88.com
 xzw.com
 xzwwxn.com
-xzwyu.com
 xzx.com
 xzxw.com
 xzycate.com
@@ -67547,6 +67663,7 @@ yanjiaoweixin.com
 yanjinews.com
 yanjingge.com
 yanjunbo.com
+yankanshu.cc
 yankanshu.net
 yankay.com
 yanlinghm.com
@@ -67640,6 +67757,7 @@ yaoyuan.com
 yaozh.com
 yaozui.com
 yarnn.com
+yarnui.com
 yashuseed.com
 yasishuo.com
 yasiyasi.com
@@ -67660,7 +67778,6 @@ yaxinde.com
 yaxi.net
 yaxuntuhang.com
 yayabizhi.com
-yayachuguo.com
 yayigou.net
 yayihouse.com
 yaypool.com
@@ -67739,6 +67856,7 @@ ycigilink.com
 yciyun.com
 ycjcl.cc
 ycjiqi.com
+ycjt2007.com
 ycjtj.com
 ycjyjt.com
 ycku.com
@@ -68054,7 +68172,6 @@ yhxuexiao.com
 yhy50.com
 yhy66.com
 yhyf.cc
-yhymdata.com
 yhyshop.com
 yhz2000.com
 yhz365.com
@@ -68081,6 +68198,7 @@ yibaixun.com
 yiban1314.com
 yibanglv.com
 yiban.io
+yibannashuiren.com
 yibei.com
 yibencaijing.com
 yibianxueyuan.com
@@ -68422,7 +68540,6 @@ yinongtouzi.com
 yinpiao.com
 yinsha.com
 yinshua.cc
-yinsutv.com
 yintai.com
 yintechi.com
 yintop.com
@@ -68836,7 +68953,6 @@ ymwl111.com
 ymxiaopin.com
 ymxinxi.com
 ymxxs.com
-ymyc.site
 ymyun.com
 ymyxzz.com
 ymzer.com
@@ -68888,6 +69004,7 @@ ynshf.com
 ynshijian.com
 ynsjg.com
 ynsjtyb.com
+ynteng.com
 yntlgs.com
 yn-tobacco.com
 yntrip88.com
@@ -69042,6 +69159,7 @@ you37.com
 youai.cm
 youba.com
 youban.com
+youbangchina.com
 youbangyun.com
 youbbs.org
 youbh.com
@@ -69164,6 +69282,7 @@ youmi5.com
 youmiad.com
 you-mi.net
 youmi.net
+youmingdifu.com
 youmingdot.com
 youminonline.com
 youmobi.com
@@ -69299,6 +69418,7 @@ youxiping.com
 youxiputao.com
 youxiqiang.com
 youxiqun.com
+youxishiguang.com
 youxishuo.com
 youxitexiao.com
 youxituoluo.com
@@ -69496,6 +69616,7 @@ ysicing.me
 ysicing.net
 ysiis.com
 ysiss.com
+ysjpin.com
 ysk05.cc
 yslang.com
 yslcw.com
@@ -69616,7 +69737,6 @@ yuangongbao.com
 yuanhuai979.com
 yuanhuikai.com
 yuaniis.com
-yuanjiaocheng.net
 yuanjiaoshequ.com
 yuanjie.org
 yuan-ji.me
@@ -69666,7 +69786,6 @@ yuanyinshiye.com
 yuanyintang.com
 yuanyouhandan.com
 yuanyoutao.com
-yuanyuanhl.com
 yuanz.cc
 yuanzhexi.com
 yuanzidai.com
@@ -69729,7 +69848,6 @@ yueji.com
 yuejiewangluo.com
 yuekenet.com
 yuekeyun.com
-yueliangjiejie.com
 yuelol.com
 yueloo.com
 yuelu.net
@@ -69767,6 +69885,7 @@ yuexinyp.com
 yuexiuw.com
 yuexunedu.com
 yueyaa.com
+yueyat.net
 yueyear.com
 yueye.org
 yueyin99.com
@@ -69803,6 +69922,7 @@ yuhuijob.com
 yuiapi.com
 yuike.com
 yui-nya.com
+yujia.com
 yujiahui.com
 yujunren.com
 yujzw.com
@@ -69865,6 +69985,7 @@ yunarm.com
 yunaw.com
 yunba.io
 yunban.com
+yunbang.net
 yunbei.com
 yunbeisoft.com
 yunbeitech.com
@@ -69875,6 +69996,7 @@ yunbook.vip
 yuncai5.com
 yuncaijing.com
 yuncdn.bid
+yuncdndun.com
 yunceng.com
 yuncheng.com
 yunchong-powder.com
@@ -70226,6 +70348,7 @@ ywy7.com
 ywyanxing.com
 yx10011.com
 yx129.com
+yx129.net
 yx4w.com
 yx74.com
 yx8u.com
@@ -70304,6 +70427,7 @@ yxss.com
 yxsss.com
 yxstudy.net
 yxszw.net
+yxszyy.com
 yxt521.com
 yxt.com
 yxt-tattoo.com
@@ -70441,7 +70565,6 @@ yz061.com
 yz168.cc
 yz360.cc
 yz868.com
-yz918.com
 yzbank.com
 yzbo.tv
 yzbqzx.net
@@ -70474,6 +70597,7 @@ yznovel.com
 yzqww.com
 yzracing.com
 yzrb.com
+yzrom.com
 yzs.com
 yz-show.com
 yzskj.com
@@ -70565,6 +70689,7 @@ zangaifamily.com
 zangao8.com
 zanghaihuatxt.com
 zanmeishi.com
+zanpic.com
 zan-shang.com
 zantainet.com
 zanyiba.com
@@ -70730,6 +70855,7 @@ zdapei.com
 zdaye.com
 zdb.io
 zdcj.net
+zdcjw18.com
 zddhr.com
 zdding.com
 zdexe.com
@@ -70843,7 +70969,6 @@ zf3d.com
 zf503.com
 zf678.com
 zf-8.com
-zfanc.com
 zfancy.net
 zfbgelycyf09.com
 zfboke.com
@@ -70985,6 +71110,7 @@ zgncjr.com
 zgnfys.com
 zgnhzx.com
 zgnt.net
+zgong.com
 zgpingshu.com
 zgpj.net
 zgppdls.com
@@ -71063,7 +71189,6 @@ zgylqy.com
 zgynys.com
 zgyongxin.com
 zgyryt.com
-zgysjs.cc
 zgys.net
 zgyssyxh.com
 zgyuwen.com
@@ -71082,6 +71207,7 @@ zgzkw.com
 zgznh.com
 zgzpbz.com
 zgzqzdcs.com
+zgzsrc.com
 zgzxwsg.com
 zgzy.net
 zgzyqccj.com
@@ -71180,6 +71306,7 @@ zhangyue03.com
 zhangyue.com
 zhangyue.net
 zhangyugg.com
+zhangyulive.com
 zhangyunling.com
 zhangyuqing.me
 zhangzhao.me
@@ -71259,6 +71386,7 @@ zhaoluobo.com
 zhaomap.com
 zhaomengtu.com
 zhaoming.biz
+zhaoneibuquan.com
 zhaoneirong.com
 zhaoniupai.com
 zhaoonline.com
@@ -71646,6 +71774,7 @@ zhixiaoren.com
 zhixiaorenurl.com
 zhixing69.com
 zhixingapp.com
+zhixingbus.com
 zhixiuchang.com
 zhixuan.com
 zhixue.com
@@ -71659,6 +71788,7 @@ zhiyi.com
 zhiyicx.com
 zhiyinghui.com
 zhiyinhao.com
+zhiyonw.net
 zhiyoo.com
 zhiyoubao.com
 zhiyoujie.com
@@ -72073,6 +72203,7 @@ zhuo.com
 zhuoda.org
 zhuodown.com
 zhuofan.net
+zhuofansoft.com
 zhuoguang.net
 zhuoji.com
 zhuojie.cc
@@ -72539,6 +72670,7 @@ zkeys.com
 zkh360.com
 zkhcsy.com
 zkii.net
+zkl2333.com
 zkread.com
 zkroom.com
 zksoftwaresz.com
@@ -72819,6 +72951,7 @@ zqanju.com
 zq-car.com
 zqchuanyue.com
 zqctqcz.com
+zqfxj.com
 zqgame.com
 zqgreen.com
 zqjjr.com
@@ -72829,6 +72962,7 @@ zq-scm.com
 zq-scm.net
 zqsign.com
 zqsos.com
+zqtong.com
 zqvip8.cc
 zqwzc.com
 zqxinxi.com
@@ -73103,6 +73237,7 @@ zuowenku.net
 zuowenren.com
 zuowens.com
 zuowenwang.net
+zuowenxue.com
 zuowenzhai.com
 zuowenzhang.com
 zuowenzhitiao.com
diff --git a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip
index 91cca54e1e..5e71c9ce72 100644
--- a/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip
+++ b/package/lienol/luci-app-passwall/root/etc/config/passwall_rule/whitelist_ip
@@ -6,4 +6,4 @@
 114.215.126.16
 1.2.4.8
 210.2.4.8
-119.29.29.29
+119.29.29.29
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/root/etc/init.d/passwall b/package/lienol/luci-app-passwall/root/etc/init.d/passwall
index 1c99597aa6..a8d7316071 100755
--- a/package/lienol/luci-app-passwall/root/etc/init.d/passwall
+++ b/package/lienol/luci-app-passwall/root/etc/init.d/passwall
@@ -17,6 +17,5 @@ stop() {
 
 restart() {
 	stop
-	sleep 3
 	start
 }
\ No newline at end of file
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
index 9b4618d6a5..970d2bb577 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -7,6 +7,8 @@
 CONFIG=passwall
 CONFIG_PATH=/var/etc/$CONFIG
 RUN_PID_PATH=$CONFIG_PATH/pid
+RUN_ID_PATH=$CONFIG_PATH/id
+RUN_IP_PATH=$CONFIG_PATH/ip
 RUN_PORT_PATH=$CONFIG_PATH/port
 HAPROXY_FILE=$CONFIG_PATH/haproxy.cfg
 REDSOCKS_CONFIG_TCP_FILE=$CONFIG_PATH/redsocks_TCP.conf
@@ -135,6 +137,8 @@ set_subscribe_proxy() {
 	}
 }
 
+ENABLED=$(config_t_get global enabled 0)
+
 TCP_NODE_NUM=$(config_t_get global_other tcp_node_num 1)
 for i in $(seq 1 $TCP_NODE_NUM); do
 	eval TCP_NODE$i=$(config_t_get global tcp_node$i nil)
@@ -175,6 +179,9 @@ KCPTUN_REDIR_PORT=$(config_t_get global_proxy kcptun_port 11183)
 PROXY_MODE=$(config_t_get global proxy_mode gfwlist)
 
 load_config() {
+	[ "$ENABLED" != 1 ] && {
+		return 1
+	}
 	[ "$TCP_NODE1" == "nil" -a "$UDP_NODE1" == "nil" -a "$SOCKS5_NODE1" == "nil" ] && {
 		echolog "没有选择节点！"
 		return 1
@@ -182,6 +189,7 @@ load_config() {
 	DNS_MODE=$(config_t_get global dns_mode pdnsd)
 	DNS_FORWARD=$(config_t_get global dns_forward 8.8.4.4)
 	use_tcp_node_resolve_dns=$(config_t_get global use_tcp_node_resolve_dns 0)
+	use_udp_node_resolve_dns=0
 	process=1
 	if [ "$(config_t_get global_forwarding process 0)" = "0" ]; then
 		process=$(cat /proc/cpuinfo | grep 'processor' | wc -l)
@@ -189,8 +197,17 @@ load_config() {
 		process=$(config_t_get global_forwarding process)
 	fi
 	LOCALHOST_PROXY_MODE=$(config_t_get global localhost_proxy_mode default)
-	DNS1=$(config_t_get global_dns dns_1)
-	DNS2=$(config_t_get global_dns dns_2)
+	UP_CHINA_DNS=$(config_t_get global up_china_dns 223.5.5.5,114.114.114.114)
+	[ "$UP_CHINA_DNS" == "dnsbyisp" ] && {
+		local dns1=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1 | sed -n '1P')
+		if [ -n "$dns1" ]; then
+			UP_CHINA_DNS=$dns1
+		else
+			UP_CHINA_DNS="223.5.5.5,114.114.114.114"
+		fi
+		local dns2=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1 | sed -n '2P')
+		[ -n "$dns1" -a -n "$dns2" ] && UP_CHINA_DNS="$dns1,$dns2"
+	}
 	TCP_REDIR_PORT1=$(config_t_get global_proxy tcp_redir_port 1041)
 	TCP_REDIR_PORT2=$(expr $TCP_REDIR_PORT1 + 1)
 	TCP_REDIR_PORT3=$(expr $TCP_REDIR_PORT2 + 1)
@@ -201,7 +218,7 @@ load_config() {
 	SOCKS5_PROXY_PORT2=$(expr $SOCKS5_PROXY_PORT1 + 1)
 	SOCKS5_PROXY_PORT3=$(expr $SOCKS5_PROXY_PORT2 + 1)
 	PROXY_IPV6=$(config_t_get global_proxy proxy_ipv6 0)
-	mkdir -p /var/etc $CONFIG_PATH $RUN_PID_PATH $RUN_PORT_PATH
+	mkdir -p /var/etc $CONFIG_PATH $RUN_PID_PATH $RUN_ID_PATH $RUN_IP_PATH $RUN_PORT_PATH
 	config_load $CONFIG
 	return 0
 }
@@ -264,11 +281,11 @@ gen_config_file() {
 
 	if [ "$redir_type" == "Socks5" ]; then
 		if [ "$network_type" == "ipv6" ]; then
-			SOCKS5_NODE1_IPV6=$server_ip
+			eval SOCKS5_NODE${5}_IPV6=$server_ip
 		else
-			SOCKS5_NODE1_IP=$server_ip
+			eval SOCKS5_NODE${5}_IP=$server_ip
 		fi
-		SOCKS5_NODE1_PORT=$port
+		eval SOCKS5_NODE${5}_PORT=$port
 		if [ "$type" == "ss" -o "$type" == "ssr" ]; then
 			gen_ss_ssr_config_file $type $local_port 0 $node $config_file_path
 		elif [ "$type" == "v2ray" ]; then
@@ -282,11 +299,11 @@ gen_config_file() {
 
 	if [ "$redir_type" == "UDP" ]; then
 		if [ "$network_type" == "ipv6" ]; then
-			UDP_NODE1_IPV6=$server_ip
+			eval UDP_NODE${5}_IPV6=$server_ip
 		else
-			UDP_NODE1_IP=$server_ip
+			eval UDP_NODE${5}_IP=$server_ip
 		fi
-		UDP_NODE1_PORT=$port
+		eval UDP_NODE${5}_PORT=$port
 		if [ "$type" == "ss" -o "$type" == "ssr" ]; then
 			gen_ss_ssr_config_file $type $local_port 0 $node $config_file_path
 		elif [ "$type" == "v2ray" ]; then
@@ -303,11 +320,12 @@ gen_config_file() {
 
 	if [ "$redir_type" == "TCP" ]; then
 		if [ "$network_type" == "ipv6" ]; then
-			TCP_NODE1_IPV6=$server_ip
+			eval TCP_NODE${5}_IPV6=$server_ip
 		else
-			TCP_NODE1_IP=$server_ip
+			eval TCP_NODE${5}_IP=$server_ip
 		fi
-		TCP_NODE1_PORT=$port
+		eval TCP_NODE${5}_PORT=$port
+		
 		if [ "$type" == "v2ray" ]; then
 			lua /usr/lib/lua/luci/model/cbi/passwall/api/gen_v2ray_client_config_file.lua $node tcp $local_port nil >$config_file_path
 		elif [ "$type" == "trojan" ]; then
@@ -384,7 +402,7 @@ start_tcp_redir() {
 			eval current_port=\$TCP_REDIR_PORT$i
 			local port=$(echo $(get_not_exists_port_after $current_port tcp))
 			eval TCP_REDIR_PORT$i=$port
-			gen_config_file $temp_server $port TCP $config_file
+			gen_config_file $temp_server $port TCP $config_file $i
 			if [ "$TYPE" == "v2ray" ]; then
 				v2ray_path=$(config_t_get global_app v2ray_file)
 				if [ -f "${v2ray_path}/v2ray" ]; then
@@ -434,7 +452,7 @@ start_tcp_redir() {
 					if [ "$plugin" != "none" ]; then
 						[ "$plugin" == "v2ray-plugin" ] && {
 							local opts=$(config_n_get $temp_server ss_plugin_v2ray_opts)
-							plugin_params="--plugin v2ray-plugin --plugin-opts \"$opts\""
+							plugin_params="--plugin v2ray-plugin --plugin-opts $opts"
 						}
 					fi
 					for k in $(seq 1 $process); do
@@ -442,7 +460,10 @@ start_tcp_redir() {
 					done
 				}
 			fi
-			echo $port > $CONFIG_PATH/port/TCP_${i}
+			echo $port > $RUN_PORT_PATH/TCP_${i}
+			eval ip=\$TCP_NODE${i}_IP
+			echo $ip > $RUN_IP_PATH/TCP_${i}
+			echo $temp_server > $RUN_ID_PATH/TCP_${i}
 		}
 	done
 }
@@ -456,7 +477,7 @@ start_udp_redir() {
 			eval current_port=\$UDP_REDIR_PORT$i
 			local port=$(echo $(get_not_exists_port_after $current_port udp))
 			eval UDP_REDIR_PORT$i=$port
-			gen_config_file $temp_server $port UDP $config_file
+			gen_config_file $temp_server $port UDP $config_file $i
 			if [ "$TYPE" == "v2ray" ]; then
 				v2ray_path=$(config_t_get global_app v2ray_file)
 				if [ -f "${v2ray_path}/v2ray" ]; then
@@ -518,13 +539,16 @@ start_udp_redir() {
 					if [ "$plugin" != "none" ]; then
 						[ "$plugin" == "v2ray-plugin" ] && {
 							local opts=$(config_n_get $temp_server ss_plugin_v2ray_opts)
-							plugin_params="--plugin v2ray-plugin --plugin-opts \"$opts\""
+							plugin_params="--plugin v2ray-plugin --plugin-opts $opts"
 						}
 					fi
 					$ss_bin -c $config_file -f $RUN_PID_PATH/udp_${TYPE}_1_$i -U $plugin_params >/dev/null 2>&1 &
 				}
 			fi
-			echo $port > $CONFIG_PATH/port/UDP_${i}
+			echo $port > $RUN_PORT_PATH/UDP_${i}
+			eval ip=\$UDP_NODE${i}_IP
+			echo $ip > $RUN_IP_PATH/UDP_${i}
+			echo $temp_server > $RUN_ID_PATH/UDP_${i}
 		}
 	done
 }
@@ -538,7 +562,7 @@ start_socks5_proxy() {
 			eval current_port=\$SOCKS5_PROXY_PORT$i
 			local port=$(get_not_exists_port_after $current_port tcp)
 			eval SOCKS5_PROXY_PORT$i=$port
-			gen_config_file $temp_server $port Socks5 $config_file
+			gen_config_file $temp_server $port Socks5 $config_file $i
 			if [ "$TYPE" == "v2ray" ]; then
 				v2ray_path=$(config_t_get global_app v2ray_file)
 				if [ -f "${v2ray_path}/v2ray" ]; then
@@ -571,13 +595,16 @@ start_socks5_proxy() {
 					if [ "$plugin" != "none" ]; then
 						[ "$plugin" == "v2ray-plugin" ] && {
 							local opts=$(config_n_get $temp_server ss_plugin_v2ray_opts)
-							plugin_params="--plugin v2ray-plugin --plugin-opts \"$opts\""
+							plugin_params="--plugin v2ray-plugin --plugin-opts $opts"
 						}
 					fi
 					$ss_bin -c $config_file -b 0.0.0.0 -u $plugin_params >/dev/null 2>&1 &
 				}
 			fi
-			echo $port > $CONFIG_PATH/port/Socks5_${i}
+			echo $port > $RUN_PORT_PATH/Socks5_${i}
+			eval ip=\$SOCKS5_NODE${i}_IP
+			echo $ip > $RUN_IP_PATH/SOCKS5_${i}
+			echo $temp_server > $RUN_ID_PATH/SOCKS5_${i}
 		fi
 	done
 }
@@ -691,146 +718,49 @@ start_dns() {
 		[ -n "$pdnsd_bin" ] && {
 			gen_pdnsd_config
 			nohup $pdnsd_bin --daemon -c $pdnsd_dir/pdnsd.conf -d >/dev/null 2>&1 &
-			echolog "运行DNS转发模式：Pdnsd..."
+			echolog "运行DNS转发模式：pdnsd..."
 		}
 	;;
 	chinadns-ng)
 		chinadns_ng_bin=$(find_bin chinadns-ng)
 		[ -n "$chinadns_ng_bin" ] && {
-			local dns1=$DNS1
-			[ "$DNS1" = "dnsbyisp" ] && dns1=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1 | sed -n '1P')
-			local dns2=$DNS2
-			[ "$DNS2" = "dnsbyisp" ] && dns2=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1 | sed -n '2P')
 			other_port=$(expr $DNS_PORT + 1)
 			cat $RULE_PATH/gfwlist.conf | sort | uniq | sed -e '/127.0.0.1/d' | sed 's/ipset=\/.//g' | sed 's/\/gfwlist//g' > $CONFIG_PATH/gfwlist_chinadns_ng.txt
 			[ -f "$CONFIG_PATH/gfwlist_chinadns_ng.txt" ] && local gfwlist_param="-g $CONFIG_PATH/gfwlist_chinadns_ng.txt"
 			[ -f "$RULE_PATH/chnlist" ] && local chnlist_param="-m $RULE_PATH/chnlist -M"
-			up_chinadns_ng_mode=$(config_t_get global up_chinadns_ng_mode "208.67.222.222")
-			case "$up_chinadns_ng_mode" in
-			208.67.222.222)
-				DNS_FORWARD=$up_chinadns_ng_mode
-				nohup $chinadns_ng_bin -l $DNS_PORT -c $dns1,$dns2 -t 208.67.222.222#443,208.67.222.222#5353 $gfwlist_param $chnlist_param >/dev/null 2>&1 &
-				echolog "运行DNS转发模式：ChinaDNS-NG，国内DNS：$dns1, $dns2，可信DNS：208.67.222.222"
-				;;
-			208.67.220.220)
-				DNS_FORWARD=$up_chinadns_ng_mode
-				nohup $chinadns_ng_bin -l $DNS_PORT -c $dns1,$dns2 -t 208.67.220.220#443,208.67.220.220#5353 $gfwlist_param $chnlist_param >/dev/null 2>&1 &
-				echolog "运行DNS转发模式：ChinaDNS-NG，国内DNS：$dns1, $dns2，可信DNS：208.67.220.220"
-				;;
-			dns2socks)
+			
+			up_trust_chinadns_ng_dns=$(config_t_get global up_trust_chinadns_ng_dns "8.8.4.4,8.8.8.8")
+			if [ "$up_trust_chinadns_ng_dns" == "dns2socks" ]; then
 				if [ -n "$SOCKS5_NODE1" -a "$SOCKS5_NODE1" != "nil" ]; then
 					dns2socks_bin=$(find_bin dns2socks)
 					[ -n "$dns2socks_bin" ] && {
 						nohup $dns2socks_bin 127.0.0.1:$SOCKS5_PROXY_PORT1 ${DNS_FORWARD}:53 127.0.0.1:$other_port >/dev/null 2>&1 &
-						nohup $chinadns_ng_bin -l $DNS_PORT -c $dns1,$dns2 -t 127.0.0.1#$other_port $gfwlist_param $chnlist_param >/dev/null 2>&1 &
-						echolog "运行DNS转发模式：ChinaDNS-NG + dns2socks，国内DNS：$dns1, $dns2"
+						nohup $chinadns_ng_bin -l $DNS_PORT -c $UP_CHINA_DNS -t 127.0.0.1#$other_port $gfwlist_param $chnlist_param >/dev/null 2>&1 &
+						echolog "运行DNS转发模式：ChinaDNS-NG + dns2socks(${DNS_FORWARD}:53)，国内DNS：$UP_CHINA_DNS"
 					}
 				else
 					echolog "dns2socks模式需要使用Socks5代理节点，请开启！"
+					force_stop
 				fi
-			;;
-			custom)
-				up_chinadns_ng_custom=$(config_t_get global up_chinadns_ng_custom '208.67.222.222#443,208.67.222.222#5353')
-				nohup $chinadns_ng_bin -l $DNS_PORT -c $dns1,$dns2 -t $up_chinadns_ng_custom $gfwlist_param $chnlist_param >/dev/null 2>&1 &
-				echolog "运行DNS转发模式：ChinaDNS-NG，国内DNS：$dns1, $dns2，可信DNS：$up_chinadns_ng_custom"
-				;;
-			esac
+			else
+				if [ -z "$UDP_NODE1" -o "$UDP_NODE1" == "nil" ]; then
+					nohup $chinadns_ng_bin -l $DNS_PORT -c $UP_CHINA_DNS -t 208.67.222.222#443,208.67.222.222#5353 $gfwlist_param $chnlist_param >/dev/null 2>&1 &
+					echolog "运行DNS转发模式：ChinaDNS-NG，国内DNS：$UP_CHINA_DNS，因为你没有使用UDP节点，将使用OpenDNS 443端口或5353端口作为可信DNS。"
+				else
+					use_udp_node_resolve_dns=1
+					DNS_FORWARD=$(echo $up_trust_chinadns_ng_dns | sed 's/,/ /g')
+					nohup $chinadns_ng_bin -l $DNS_PORT -c $UP_CHINA_DNS -t $up_trust_chinadns_ng_dns $gfwlist_param $chnlist_param >/dev/null 2>&1 &
+					echolog "运行DNS转发模式：ChinaDNS-NG，国内DNS：$UP_CHINA_DNS，可信DNS：$up_trust_chinadns_ng_dns"
+				fi
+			fi
 		}
 	;;
 	esac
-	echolog "若不正常，请尝试其他模式！"
 }
 
 add_dnsmasq() {
 	mkdir -p $TMP_DNSMASQ_PATH $DNSMASQ_PATH /var/dnsmasq.d
-	local wirteconf dnsconf dnsport isp_dns isp_ip
-	dnsport=$(config_t_get global_dns dns_port)
-	[ -z "$dnsport" ] && dnsport=0
-	if [ "$DNS1" = "dnsbyisp" -o "$DNS2" = "dnsbyisp" ]; then
-		cat >/etc/dnsmasq.conf <<EOF
-all-servers
-no-poll
-no-resolv
-cache-size=2048
-local-ttl=60
-neg-ttl=3600
-max-cache-ttl=1200
-EOF
-		echolog "生成Dnsmasq配置文件。"
-
-		if [ "$dnsport" != "0" ]; then
-			failcount=0
-			while [ "$failcount" -lt "10" ]; do
-				interface=$(ifconfig | grep "$dnsport" | awk '{print $1}')
-				if [ -z "$interface" ]; then
-					echolog "找不到出口接口：$dnsport，1分钟后再重试"
-					let "failcount++"
-					[ "$failcount" -ge 10 ] && exit 0
-					sleep 1m
-				else
-					[ "$DNS1" != "dnsbyisp" ] && {
-						route add -host ${DNS1} dev ${dnsport}
-						echolog "添加DNS1出口路由表：$dnsport"
-						echo server=$DNS1 >>/etc/dnsmasq.conf
-					}
-					[ "$DNS2" != "dnsbyisp" ] && {
-						route add -host ${DNS2} dev ${dnsport}
-						echolog "添加DNS2出口路由表：$dnsport"
-						echo server=$DNS2 >>/etc/dnsmasq.conf
-					}
-					break
-				fi
-			done
-		else
-			isp_dnss=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1)
-			[ -n "$isp_dnss" ] && {
-				for isp_dns in $isp_dnss; do
-					echo server=$isp_dns >>/etc/dnsmasq.conf
-				done
-			}
-			[ "$DNS1" != "dnsbyisp" ] && {
-				echo server=$DNS1 >>/etc/dnsmasq.conf
-			}
-			[ "$DNS2" != "dnsbyisp" ] && {
-				echo server=$DNS2 >>/etc/dnsmasq.conf
-			}
-		fi
-	else
-		wirteconf=$(cat /etc/dnsmasq.conf 2>/dev/null | grep "server=$DNS1")
-		dnsconf=$(cat /etc/dnsmasq.conf 2>/dev/null | grep "server=$DNS2")
-		if [ "$dnsport" != "0" ]; then
-			failcount=0
-			while [ "$failcount" -lt "10" ]; do
-				interface=$(ifconfig | grep "$dnsport" | awk '{print $1}')
-				if [ -z "$interface" ]; then
-					echolog "找不到出口接口：$dnsport，1分钟后再重试"
-					let "failcount++"
-					[ "$failcount" -ge 10 ] && exit 0
-					sleep 1m
-				else
-					route add -host ${DNS1} dev ${dnsport}
-					echolog "添加DNS1出口路由表：$dnsport"
-					route add -host ${DNS2} dev ${dnsport}
-					echolog "添加DNS2出口路由表：$dnsport"
-					break
-				fi
-			done
-		fi
-		if [ -z "$wirteconf" ] || [ -z "$dnsconf" ]; then
-			cat >/etc/dnsmasq.conf <<EOF
-all-servers
-no-poll
-no-resolv
-server=$DNS1
-server=$DNS2
-cache-size=2048
-local-ttl=60
-neg-ttl=3600
-max-cache-ttl=1200
-EOF
-			echolog "生成Dnsmasq配置文件。"
-		fi
-	fi
+	
 	# if [ -n "cat /var/state/network |grep pppoe|awk -F '.' '{print $2}'" ]; then
 	# sed -i '/except-interface/d' /etc/dnsmasq.conf >/dev/null 2>&1 &
 	# for wanname in $(cat /var/state/network |grep pppoe|awk -F '.' '{print $2}')
@@ -877,13 +807,24 @@ EOF
 		rm -rf $TMP_DNSMASQ_PATH/blacklist_host.conf
 		rm -rf $TMP_DNSMASQ_PATH/whitelist_host.conf
 		restdns=1
-		echolog "生成回国模式Dnsmasq配置文件。"
 	fi
 
-	echo "conf-dir=$TMP_DNSMASQ_PATH" >/var/dnsmasq.d/dnsmasq-$CONFIG.conf
-	echo "conf-dir=$TMP_DNSMASQ_PATH" >$DNSMASQ_PATH/dnsmasq-$CONFIG.conf
+	echo "" > /etc/dnsmasq.conf
+	server="server=127.0.0.1#$DNS_PORT"
+	local china_dns1=$(echo $UP_CHINA_DNS | awk -F "," '{print $1}')
+	local china_dns2=$(echo $UP_CHINA_DNS | awk -F "," '{print $2}')
+	[ -n "$china_dns1" ] && server="server=$china_dns1"
+	[ -n "$china_dns2" ] && server="${server}\n${server_2}"
+	cat <<-EOF > /var/dnsmasq.d/dnsmasq-$CONFIG.conf
+			$(echo -e $server)
+			all-servers
+			no-poll
+			no-resolv
+			conf-dir=$TMP_DNSMASQ_PATH
+	EOF
+	cp -rf /var/dnsmasq.d/dnsmasq-$CONFIG.conf $DNSMASQ_PATH/dnsmasq-$CONFIG.conf
 	if [ "$restdns" == 1 ]; then
-		echolog "重启Dnsmasq。。。"
+		echolog "dnsmasq：生成配置文件并重启服务。"
 		/etc/init.d/dnsmasq restart 2>/dev/null
 	fi
 }
@@ -1073,7 +1014,7 @@ start_haproxy() {
 				    bind 0.0.0.0:$bport
 				    mode tcp
 			EOF
-			for i in $(seq 0 100); do
+			for i in $(seq 0 50); do
 				bips=$(config_t_get balancing lbss '' $i)
 				bports=$(config_t_get balancing lbort '' $i)
 				bweight=$(config_t_get balancing lbweight '' $i)
@@ -1082,35 +1023,39 @@ start_haproxy() {
 				if [ -z "$bips" ] || [ -z "$bports" ]; then
 					break
 				fi
+				local bip=$(echo $bips | awk -F ":" '{print $1}')
+				local bport=$(echo $bips | awk -F ":" '{print $2}')
+				[ "$bports" != "default" ] && bport=$bports
+				[ -z "$bport" ] && break
 				if [ "$bbackup" = "1" ]; then
 					bbackup=" backup"
-					echolog "添加故障转移备节点:$bips"
+					echolog "负载均衡：添加故障转移备节点:$bip"
 				else
 					bbackup=""
-					echolog "添加负载均衡主节点:$bips"
+					echolog "负载均衡：添加负载均衡主节点:$bip"
 				fi
-				#si=$(echo $bips | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}")
+				#si=$(echo $bip | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}")
 				#if [ -z "$si" ]; then
-				#	bips=$(resolveip -4 -t 2 $bips | awk 'NR==1{print}')
-				#	if [ -z "$bips" ]; then
-				#		bips=$(nslookup $bips localhost | sed '1,4d' | awk '{print $3}' | grep -v : | awk 'NR==1{print}')
+				#	bip=$(resolveip -4 -t 2 $bip | awk 'NR==1{print}')
+				#	if [ -z "$bip" ]; then
+				#		bip=$(nslookup $bip localhost | sed '1,4d' | awk '{print $3}' | grep -v : | awk 'NR==1{print}')
 				#	fi
-				#	echolog "负载均衡${i} IP为：$bips"
+				#	echolog "负载均衡${i} IP为：$bip"
 				#fi
-				echo "    server server_$i $bips:$bports weight $bweight check inter 1500 rise 1 fall 3 $bbackup" >>$HAPROXY_FILE
+				echo "    server $bip:$bport $bip:$bport weight $bweight check inter 1500 rise 1 fall 3 $bbackup" >> $HAPROXY_FILE
 				if [ "$exports" != "0" ]; then
 					failcount=0
-					while [ "$failcount" -lt "10" ]; do
+					while [ "$failcount" -lt "3" ]; do
 						interface=$(ifconfig | grep "$exports" | awk '{print $1}')
 						if [ -z "$interface" ]; then
 							echolog "找不到出口接口：$exports，1分钟后再重试"
 							let "failcount++"
-							[ "$failcount" -ge 10 ] && exit 0
+							[ "$failcount" -ge 3 ] && exit 0
 							sleep 1m
 						else
-							route add -host ${bips} dev ${exports}
+							route add -host ${bip} dev ${exports}
 							echolog "添加SS出口路由表：$exports"
-							echo "$bips" >>/tmp/balancing_ip
+							echo "$bip" >>/tmp/balancing_ip
 							break
 						fi
 					done
@@ -1120,7 +1065,7 @@ start_haproxy() {
 			console_port=$(config_t_get global_haproxy console_port)
 			console_user=$(config_t_get global_haproxy console_user)
 			console_password=$(config_t_get global_haproxy console_password)
-			cat <<-EOF >>$HAPROXY_FILE
+			cat <<-EOF >> $HAPROXY_FILE
 			
 				listen status
 				    bind 0.0.0.0:$console_port
@@ -1131,46 +1076,21 @@ start_haproxy() {
 				    #stats hide-version
 				    stats admin if TRUE
 			EOF
-			nohup $haproxy_bin -f $HAPROXY_FILE 2>&1
-			echolog "负载均衡运行成功！"
+			nohup $haproxy_bin -f $HAPROXY_FILE >/dev/null 2>&1 &
+			[ "$?" == 0 ] && echolog "负载均衡：运行成功！" || echolog "负载均衡：运行失败！"
 		}
 	}
 }
 
-add_vps_port() {
-	multiwan=$(config_t_get global_dns wan_port 0)
-	if [ "$multiwan" != "0" ]; then
-		failcount=0
-		while [ "$failcount" -lt "10" ]; do
-			interface=$(ifconfig | grep "$multiwan" | awk '{print $1}')
-			if [ -z "$interface" ]; then
-				echolog "找不到出口接口：$multiwan，1分钟后再重试"
-				let "failcount++"
-				[ "$failcount" -ge 10 ] && exit 0
-				sleep 1m
-			else
-				route add -host ${TCP_NODE1_IP} dev ${multiwan}
-				route add -host ${UDP_NODE1_IP} dev ${multiwan}
-				echolog "添加SS出口路由表：$multiwan"
-				echo "$TCP_NODE1_IP" >$CONFIG_PATH/tcp_ip
-				echo "$UDP_NODE1_IP" >$CONFIG_PATH/udp_ip
-				break
-			fi
-		done
-	fi
-}
-
-del_vps_port() {
-	tcp_ip=$(cat $CONFIG_PATH/tcp_ip 2>/dev/null)
-	udp_ip=$(cat $CONFIG_PATH/udp_ip 2>/dev/null)
-	[ -n "$tcp_ip" ] && route del -host ${tcp_ip}
-	[ -n "$udp_ip" ] && route del -host ${udp_ip}
-}
-
 kill_all() {
 	kill -9 $(pidof $@) >/dev/null 2>&1 &
 }
 
+force_stop() {
+	rm -f "$LOCK_FILE"
+	exit 0
+}
+
 boot() {
 	local delay=$(config_t_get global_delay start_delay 0)
 	if [ "$delay" -gt 0 ]; then
@@ -1188,19 +1108,18 @@ start() {
 	! load_config && return 1
 	[ -f "$LOCK_FILE" ] && return 3
 	touch "$LOCK_FILE"
-	add_vps_port
+	start_dns
+	add_dnsmasq
 	start_haproxy
 	start_socks5_proxy
 	start_tcp_redir
 	start_udp_redir
-	start_dns
-	add_dnsmasq
 	source $APP_PATH/iptables.sh start
 	/etc/init.d/dnsmasq restart >/dev/null 2>&1 &
 	start_crontab
 	set_cru
 	rm -f "$LOCK_FILE"
-	echolog "运行完成！"
+	echolog "运行完成！\n"
 	return 0
 }
 
@@ -1210,7 +1129,6 @@ stop() {
 	done
 	clean_log
 	source $APP_PATH/iptables.sh stop
-	del_vps_port
 	kill_all brook dns2socks haproxy chinadns-ng ipt2socks v2ray-plugin
 	ps -w | grep -E "$CONFIG_TCP_FILE|$CONFIG_UDP_FILE|$CONFIG_SOCKS5_FILE" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
 	ps -w | grep -E "$CONFIG_PATH" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
@@ -1220,12 +1138,13 @@ stop() {
 	rm -rf $CONFIG_PATH
 	stop_dnsmasq
 	stop_crontab
-	echolog "关闭相关程序，清理相关文件和缓存完成。\n"
+	echolog "关闭相关程序，清理相关文件和缓存完成。"
 	sleep 1s
 }
 
 case $1 in
 stop)
+	[ -n "$2" -a "$2" == "force" ] && force_stop
 	stop
 	;;
 start)
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh
index 8232bf2ce1..364bd0ccf8 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/iptables.sh
@@ -11,6 +11,7 @@ IPSET_WHITELIST="whitelist"
 iptables_nat="iptables -t nat"
 iptables_mangle="iptables -t mangle"
 ip6tables_nat="ip6tables -t nat"
+iptables_comment="-m comment --comment PassWall"
 
 factor() {
 	if [ -z "$1" ] || [ -z "$2" ]; then
@@ -39,25 +40,30 @@ get_ip_mark() {
 	fi
 }
 
+get_dst_list() {
+	echo "-m set --match-set $1 dst"
+}
+
+
 get_action_chain() {
 	case "$1" in
 	disable)
 		echo "RETURN"
 		;;
 	global)
-		echo "SS_GLO"
+		echo "PSW_GLO"
 		;;
 	gfwlist)
-		echo "SS_GFW"
+		echo "PSW_GFW"
 		;;
 	chnroute)
-		echo "SS_CHN"
+		echo "PSW_CHN"
 		;;
 	gamemode)
-		echo "SS_GAME"
+		echo "PSW_GAME"
 		;;
 	returnhome)
-		echo "SS_HOME"
+		echo "PSW_HOME"
 		;;
 	esac
 }
@@ -132,17 +138,24 @@ load_acl() {
 				[ -n "$ip" ] && echolog "访问控制：IP：$ip，代理模式：$(get_action_chain_name $proxy_mode)"
 				[ -n "$mac" ] && echolog "访问控制：MAC：$mac，代理模式：$(get_action_chain_name $proxy_mode)"
 			fi
-			[ "$TCP_NODE" != "nil" ] && {
-				#local TCP_NODE_TYPE=$(echo $(config_get $TCP_NODE type) | tr 'A-Z' 'a-z')
-				$iptables_mangle -A SS_ACL $(factor $ip "-s") -p tcp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$remarks" -j TTL --ttl-set 14$tcp_node
-				$iptables_mangle -A SS_ACL $(factor $ip "-s") -p tcp $(factor $mac "-m mac --mac-source") $(factor $tcp_redir_ports "-m multiport --dport") -m comment --comment "$remarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$tcp_node
-			}
-			[ "$UDP_NODE" != "nil" ] && {
-				#local UDP_NODE_TYPE=$(echo $(config_get $UDP_NODE type) | tr 'A-Z' 'a-z')
-				eval udp_redir_port=\$UDP_REDIR_PORT$udp_node
-				$iptables_mangle -A SS_ACL $(factor $ip "-s") -p udp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "$remarks" -j TPROXY --on-port $udp_redir_port --tproxy-mark 0x1/0x1
-				$iptables_mangle -A SS_ACL $(factor $ip "-s") -p udp $(factor $mac "-m mac --mac-source") $(factor $udp_redir_ports "-m multiport --dport") -m comment --comment "$remarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$udp_node
-			}
+			
+			if [ "$proxy_mode" == "disable" ]; then
+				$iptables_nat -A PSW_ACL $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p tcp -m comment --comment "$remarks" -j RETURN
+				$iptables_mangle -A PSW_ACL $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p udp -m comment --comment "$remarks" -j RETURN
+			else
+				[ "$TCP_NODE" != "nil" ] && {
+					#local TCP_NODE_TYPE=$(echo $(config_get $TCP_NODE type) | tr 'A-Z' 'a-z')
+					eval tcp_redir_port=\$TCP_REDIR_PORT$tcp_node
+					$iptables_nat -A PSW_ACL $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p tcp $(get_dst_list $IPSET_BLACKLIST) -m comment --comment "$remarks" -j REDIRECT --to-ports $tcp_redir_port
+					$iptables_nat -A PSW_ACL $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p tcp $(factor $tcp_redir_ports "-m multiport --dport") -m comment --comment "$remarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$tcp_node
+				}
+				[ "$UDP_NODE" != "nil" ] && {
+					#local UDP_NODE_TYPE=$(echo $(config_get $UDP_NODE type) | tr 'A-Z' 'a-z')
+					eval udp_redir_port=\$UDP_REDIR_PORT$udp_node
+					$iptables_mangle -A PSW_ACL $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p udp $(get_dst_list $IPSET_BLACKLIST) -m comment --comment "$remarks" -j TPROXY --on-port $udp_redir_port --tproxy-mark 0x1/0x1
+					$iptables_mangle -A PSW_ACL $(factor $ip "-s") $(factor $mac "-m mac --mac-source") -p udp $(factor $udp_redir_ports "-m multiport --dport") -m comment --comment "$remarks" -$(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)$udp_node
+				}
+			fi
 			[ -z "$ip" ] && {
 				lower_mac=$(echo $mac | tr '[A-Z]' '[a-z]')
 				ip=$(ip neigh show | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | grep $lower_mac | awk '{print $1}')
@@ -170,20 +183,20 @@ filter_vpsip() {
 }
 
 dns_hijack() {
-	dnshijack=$(config_t_get global_dns dns_53)
+	dnshijack=$(config_t_get global dns_53)
 	if [ "$dnshijack" = "1" -o "$1" = "force" ]; then
-		chromecast_nu=$($iptables_nat -L SS -v -n --line-numbers | grep "dpt:53" | awk '{print $1}')
-		is_right_lanip=$($iptables_nat -L SS -v -n --line-numbers | grep "dpt:53" | grep "$lanip")
+		chromecast_nu=$($iptables_nat -L PSW -v -n --line-numbers | grep "dpt:53" | awk '{print $1}')
+		is_right_lanip=$($iptables_nat -L PSW -v -n --line-numbers | grep "dpt:53" | grep "$lanip")
 		if [ -z "$chromecast_nu" ]; then
-			echolog "添加接管局域网DNS解析规则..."
-			$iptables_nat -I SS -i br-lan -p udp --dport 53 -j DNAT --to $lanip 2>/dev/null
+			echolog "添加DNS劫持规则..."
+			$iptables_nat -I PSW -i br-lan -p udp --dport 53 -j DNAT --to $lanip 2>/dev/null
 		else
 			if [ -z "$is_right_lanip" ]; then
-				echolog "添加接管局域网DNS解析规则..."
-				$iptables_nat -D SS $chromecast_nu >/dev/null 2>&1 &
-				$iptables_nat -I SS -i br-lan -p udp --dport 53 -j DNAT --to $lanip 2>/dev/null
+				echolog "添加DNS劫持规则..."
+				$iptables_nat -D PSW $chromecast_nu >/dev/null 2>&1 &
+				$iptables_nat -I PSW -i br-lan -p udp --dport 53 -j DNAT --to $lanip 2>/dev/null
 			else
-				echolog " DNS劫持规则已经添加，跳过~" >>$LOG_FILE
+				echolog "DNS劫持规则已经添加，跳过~" >>$LOG_FILE
 			fi
 		fi
 	fi
@@ -195,7 +208,8 @@ add_firewall_rule() {
 	ipset -! create $IPSET_LANIPLIST nethash && ipset flush $IPSET_LANIPLIST
 	ipset -! create $IPSET_VPSIPLIST nethash && ipset flush $IPSET_VPSIPLIST
 	ipset -! create $IPSET_ROUTER nethash && ipset flush $IPSET_ROUTER
-	ipset -! create $IPSET_GFW nethash && ipset flush $IPSET_GFW
+	#ipset -! create $IPSET_GFW nethash && ipset flush $IPSET_GFW
+	ipset -! create $IPSET_GFW nethash
 	ipset -! create $IPSET_CHN nethash && ipset flush $IPSET_CHN
 	ipset -! create $IPSET_BLACKLIST nethash && ipset flush $IPSET_BLACKLIST
 	ipset -! create $IPSET_WHITELIST nethash && ipset flush $IPSET_WHITELIST
@@ -211,7 +225,7 @@ add_firewall_rule() {
 	ISP_DNS=$(cat /tmp/resolv.conf.auto 2>/dev/null | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | sort -u | grep -v 0.0.0.0 | grep -v 127.0.0.1)
 	[ -n "$ISP_DNS" ] && {
 		for ispip in $ISP_DNS; do
-			ipset -! add $IPSET_WHITELIST $ispip >/dev/null 2>&1 &
+			ipset -! add $IPSET_LANIPLIST $ispip >/dev/null 2>&1 &
 		done
 	}
 
@@ -222,23 +236,35 @@ add_firewall_rule() {
 
 	#  过滤所有节点IP
 	config_foreach filter_vpsip "nodes"
+	
+	$iptables_nat -N PSW
+	$iptables_nat -A PSW $(get_dst_list $IPSET_LANIPLIST) -j RETURN
+	$iptables_nat -A PSW $(get_dst_list $IPSET_VPSIPLIST) -j RETURN
+	$iptables_nat -A PSW $(get_dst_list $IPSET_WHITELIST) -j RETURN
+	$iptables_nat -N PSW_ACL
 
-	$iptables_mangle -N SS
-	$iptables_mangle -A SS -m set --match-set $IPSET_LANIPLIST dst -j RETURN
-	$iptables_mangle -A SS -m set --match-set $IPSET_VPSIPLIST dst -j RETURN
-	$iptables_mangle -A SS -m set --match-set $IPSET_WHITELIST dst -j RETURN
-	$iptables_mangle -N SS_ACL
+	$iptables_mangle -N PSW
+	$iptables_mangle -A PSW $(get_dst_list $IPSET_LANIPLIST) -j RETURN
+	$iptables_mangle -A PSW $(get_dst_list $IPSET_VPSIPLIST) -j RETURN
+	$iptables_mangle -A PSW $(get_dst_list $IPSET_WHITELIST) -j RETURN
+	$iptables_mangle -N PSW_ACL
 
 	if [[ "$TCP_NODE_NUM" -ge 1 ]] || [[ "$UDP_NODE_NUM" -ge 1 ]]; then
 		local max_num=1
 		[ "$TCP_NODE_NUM" -ge "$UDP_NODE_NUM" ] && max_num=$TCP_NODE_NUM
 		if [ "$max_num" -ge 1 ]; then
 			for i in $(seq 1 $max_num); do
-				$iptables_mangle -N SS_GLO$i
-				$iptables_mangle -N SS_GFW$i
-				$iptables_mangle -N SS_CHN$i
-				$iptables_mangle -N SS_HOME$i
-				$iptables_mangle -N SS_GAME$i
+				$iptables_nat -N PSW_GLO$i
+				$iptables_nat -N PSW_GFW$i
+				$iptables_nat -N PSW_CHN$i
+				$iptables_nat -N PSW_HOME$i
+				$iptables_nat -N PSW_GAME$i
+			
+				$iptables_mangle -N PSW_GLO$i
+				$iptables_mangle -N PSW_GFW$i
+				$iptables_mangle -N PSW_CHN$i
+				$iptables_mangle -N PSW_HOME$i
+				$iptables_mangle -N PSW_GAME$i
 
 				ip rule add fwmark 1 lookup 100
 				ip route add local 0.0.0.0/0 dev lo table 100
@@ -254,7 +280,7 @@ add_firewall_rule() {
 				local address=$(config_get $temp_server address)
 				local SOCKS5_NODE_PORT=$(config_get $temp_server port)
 				local SOCKS5_NODE_IP=$(get_host_ip "ipv4" $address)
-				[ -n "$SOCKS5_NODE_IP" -a -n "$SOCKS5_NODE_PORT" ] && $iptables_mangle -A SS -p tcp -d $SOCKS5_NODE_IP -m multiport --dports $SOCKS5_NODE_PORT -j RETURN
+				[ -n "$SOCKS5_NODE_IP" -a -n "$SOCKS5_NODE_PORT" ] && $iptables_nat -A PSW -p tcp -d $SOCKS5_NODE_IP -m multiport --dports $SOCKS5_NODE_PORT -j RETURN
 			fi
 		done
 	fi
@@ -272,53 +298,52 @@ add_firewall_rule() {
 				local TCP_NODE_PORT=$(config_get $temp_server port)
 				local TCP_NODE_IP=$(get_host_ip "ipv4" $address)
 				local TCP_NODE_TYPE=$(echo $(config_get $temp_server type) | tr 'A-Z' 'a-z')
-				[ -n "$TCP_NODE_IP" -a -n "$TCP_NODE_PORT" ] && $iptables_mangle -A SS -p tcp -d $TCP_NODE_IP -m multiport --dports $TCP_NODE_PORT -j RETURN
+				[ -n "$TCP_NODE_IP" -a -n "$TCP_NODE_PORT" ] && $iptables_nat -A PSW -p tcp -d $TCP_NODE_IP -m multiport --dports $TCP_NODE_PORT -j RETURN
 				if [ "$TCP_NODE_TYPE" == "brook" ]; then
-					$iptables_mangle -A SS_ACL -p tcp -m socket -j MARK --set-mark 1
+					$iptables_mangle -A PSW_ACL -p tcp -m socket -j MARK --set-mark 1
 
-					# $iptables_mangle -A SS$k -p tcp -m set --match-set $IPSET_BLACKLIST dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+					# $iptables_mangle -A PSW$k -p tcp $(get_dst_list $IPSET_BLACKLIST) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 					# 全局模式
-					$iptables_mangle -A SS_GLO$k -p tcp -j TPROXY --tproxy-mark 0x1/0x1 --on-port $local_port
+					$iptables_mangle -A PSW_GLO$k -p tcp -j TPROXY --tproxy-mark 0x1/0x1 --on-port $local_port
 
 					# GFWLIST模式
-					$iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_GFW dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
-					$iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_ROUTER dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+					$iptables_mangle -A PSW_GFW$k -p tcp $(get_dst_list $IPSET_GFW) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 					# 大陆白名单模式
-					$iptables_mangle -A SS_CHN$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN
-					$iptables_mangle -A SS_CHN$k -p tcp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+					$iptables_mangle -A PSW_CHN$k -p tcp $(get_dst_list $IPSET_CHN) -j RETURN
+					$iptables_mangle -A PSW_CHN$k -p tcp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 					# 回国模式
-					$iptables_mangle -A SS_HOME$k -p tcp -m set --match-set $IPSET_CHN dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+					$iptables_mangle -A PSW_HOME$k -p tcp $(get_dst_list $IPSET_CHN) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 					# 游戏模式
-					$iptables_mangle -A SS_GAME$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN
+					$iptables_mangle -A PSW_GAME$k -p tcp $(get_dst_list $IPSET_CHN) -j RETURN
 
 					# 用于本机流量转发，默认只走router
-					$iptables_mangle -A SS -s $lan_ip -p tcp -m set --match-set $IPSET_ROUTER dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
-					$iptables_mangle -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -j MARK --set-mark 1
+					$iptables_mangle -A PSW -s $lan_ip -p tcp $(get_dst_list $IPSET_ROUTER) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+					$iptables_mangle -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS $(get_dst_list $IPSET_ROUTER) $iptables_comment -j MARK --set-mark 1
 				else
 					# 全局模式
-					$iptables_mangle -A SS_GLO$k -p tcp -j TTL --ttl-set $ttl
+					$iptables_nat -A PSW_GLO$k -p tcp -j REDIRECT --to-ports $local_port
 
 					# GFWLIST模式
-					$iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_GFW dst -j TTL --ttl-set $ttl
-					$iptables_mangle -A SS_GFW$k -p tcp -m set --match-set $IPSET_ROUTER dst -j TTL --ttl-set $ttl
+					$iptables_nat -A PSW_GFW$k -p tcp $(get_dst_list $IPSET_ROUTER) -j REDIRECT --to-ports $local_port
+					$iptables_nat -A PSW_GFW$k -p tcp $(get_dst_list $IPSET_GFW) -j REDIRECT --to-ports $local_port
 
 					# 大陆白名单模式
-					$iptables_mangle -A SS_CHN$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN
-					#$iptables_mangle -A SS_CHN$k -p tcp -m geoip ! --destination-country CN -j TTL --ttl-set $ttl
-					$iptables_mangle -A SS_CHN$k -p tcp -j TTL --ttl-set $ttl
+					$iptables_nat -A PSW_CHN$k -p tcp $(get_dst_list $IPSET_CHN) -j RETURN
+					#$iptables_nat -A PSW_CHN$k -p tcp -m geoip ! --destination-country CN -j REDIRECT --to-ports $local_port
+					$iptables_nat -A PSW_CHN$k -p tcp -j REDIRECT --to-ports $local_port
 
 					# 回国模式
-					#$iptables_mangle -A SS_HOME$k -p tcp -m geoip --destination-country CN -j TTL --ttl-set $ttl
-					$iptables_mangle -A SS_HOME$k -p tcp -m set --match-set $IPSET_CHN dst -j TTL --ttl-set $ttl
+					#$iptables_nat -A PSW_HOME$k -p tcp -m geoip --destination-country CN -j REDIRECT --to-ports $local_port
+					$iptables_nat -A PSW_HOME$k -p tcp $(get_dst_list $IPSET_CHN) -j REDIRECT --to-ports $local_port
 
 					# 游戏模式
-					$iptables_mangle -A SS_GAME$k -p tcp -m set --match-set $IPSET_CHN dst -j RETURN
+					$iptables_nat -A PSW_GAME$k -p tcp $(get_dst_list $IPSET_CHN) -j RETURN
 
 					[ "$k" == 1 ] && {
-						$iptables_nat -N SS
+						[ "$use_tcp_node_resolve_dns" == 1 -a -n "$DNS_FORWARD" ] && $iptables_nat -I PSW 2 -p tcp -d $DNS_FORWARD -m multiport --dport 1:65535 -j REDIRECT --to-ports $local_port
 
 						is_add_prerouting=0
 
@@ -326,7 +351,7 @@ add_firewall_rule() {
 						if [ -n "$KP_INDEX" ]; then
 							let KP_INDEX+=1
 							#确保添加到KOOLPROXY规则之后
-							$iptables_nat -I PREROUTING $KP_INDEX -j SS
+							$iptables_nat -I PREROUTING $KP_INDEX -j PSW
 							is_add_prerouting=1
 						fi
 
@@ -334,7 +359,7 @@ add_firewall_rule() {
 						if [ -n "$ADBYBY_INDEX" ]; then
 							let ADBYBY_INDEX+=1
 							#确保添加到ADBYBY规则之后
-							$iptables_nat -I PREROUTING $ADBYBY_INDEX -j SS
+							$iptables_nat -I PREROUTING $ADBYBY_INDEX -j PSW
 							is_add_prerouting=1
 						fi
 
@@ -346,49 +371,50 @@ add_firewall_rule() {
 							else
 								let PR_INDEX+=1
 							fi
-							$iptables_nat -I PREROUTING $PR_INDEX -j SS
+							$iptables_nat -I PREROUTING $PR_INDEX -j PSW
 						fi
 						# 用于本机流量转发，默认只走router
-						#$iptables_nat -I OUTPUT -j SS
-						$iptables_nat -A OUTPUT -m set --match-set $IPSET_LANIPLIST dst -m comment --comment "PassWall" -j RETURN
-						[ "$use_tcp_node_resolve_dns" == 1 -a -n "$DNS_FORWARD" ] && $iptables_nat -A OUTPUT -p tcp -d $DNS_FORWARD -m multiport --dport 1:65535 -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT1
-						$iptables_nat -A OUTPUT -m set --match-set $IPSET_VPSIPLIST dst -m comment --comment "PassWall" -j RETURN
-						$iptables_nat -A OUTPUT -m set --match-set $IPSET_WHITELIST dst -m comment --comment "PassWall" -j RETURN
-						$iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT1
-						$iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT1
+						#$iptables_nat -I OUTPUT -j PSW
+						$iptables_nat -A OUTPUT $(get_dst_list $IPSET_LANIPLIST) $iptables_comment -j RETURN
+						[ "$use_tcp_node_resolve_dns" == 1 -a -n "$DNS_FORWARD" ] && $iptables_nat -A OUTPUT -p tcp -d $DNS_FORWARD -m multiport --dport 1:65535 $iptables_comment -j REDIRECT --to-ports $TCP_REDIR_PORT1
+						$iptables_nat -A OUTPUT $(get_dst_list $IPSET_VPSIPLIST) $iptables_comment -j RETURN
+						$iptables_nat -A OUTPUT $(get_dst_list $IPSET_WHITELIST) $iptables_comment -j RETURN
+						$iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS $(get_dst_list $IPSET_ROUTER) $iptables_comment -j REDIRECT --to-ports $TCP_REDIR_PORT1
+						$iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS $(get_dst_list $IPSET_BLACKLIST) $iptables_comment -j REDIRECT --to-ports $TCP_REDIR_PORT1
 
-						[ "$LOCALHOST_PROXY_MODE" == "global" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT1
-						[ "$LOCALHOST_PROXY_MODE" == "gfwlist" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_GFW dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT1
+						[ "$LOCALHOST_PROXY_MODE" == "global" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS $iptables_comment -j REDIRECT --to-ports $TCP_REDIR_PORT1
+						[ "$LOCALHOST_PROXY_MODE" == "gfwlist" ] && $iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS $(get_dst_list $IPSET_GFW) $iptables_comment -j REDIRECT --to-ports $TCP_REDIR_PORT1
 						[ "$LOCALHOST_PROXY_MODE" == "chnroute" ] && {
-							$iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set ! --match-set $IPSET_CHN dst -m comment --comment "PassWall" -j REDIRECT --to-ports $TCP_REDIR_PORT1
+							$iptables_nat -A OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set ! --match-set $IPSET_CHN dst $iptables_comment -j REDIRECT --to-ports $TCP_REDIR_PORT1
 						}
 					}
 					# 重定所有流量到透明代理端口
-					$iptables_nat -A SS -p tcp -m ttl --ttl-eq $ttl -j REDIRECT --to $local_port
+					# $iptables_nat -A PSW -p tcp -m ttl --ttl-eq $ttl -j REDIRECT --to $local_port
 					echolog "IPv4 防火墙TCP转发规则加载完成！"
 				fi
 				if [ "$PROXY_IPV6" == "1" ]; then
 					lan_ipv6=$(ip address show br-lan | grep -w "inet6" | awk '{print $2}') #当前LAN IPv6段
-					$ip6tables_nat -N SS
-					$ip6tables_nat -N SS_ACL
-					$ip6tables_nat -A PREROUTING -j SS
+					$ip6tables_nat -N PSW
+					$ip6tables_nat -N PSW_ACL
+					$ip6tables_nat -A PREROUTING -j PSW
 					[ -n "$lan_ipv6" ] && {
 						for ip in $lan_ipv6; do
-							$ip6tables_nat -A SS -d $ip -j RETURN
+							$ip6tables_nat -A PSW -d $ip -j RETURN
 						done
 					}
-					[ "$use_ipv6" == "1" -a -n "$server_ip" ] && $ip6tables_nat -A SS -d $server_ip -j RETURN
-					$ip6tables_nat -N SS_GLO$k
-					$ip6tables_nat -N SS_GFW$k
-					$ip6tables_nat -N SS_CHN$k
-					$ip6tables_nat -N SS_HOME$k
-					$ip6tables_nat -A SS_GLO$k -p tcp -j REDIRECT --to $TCP_REDIR_PORT
-					$ip6tables_nat -A SS -j SS_GLO$k
-					#$ip6tables_nat -I OUTPUT -p tcp -j SS
+					[ "$use_ipv6" == "1" -a -n "$server_ip" ] && $ip6tables_nat -A PSW -d $server_ip -j RETURN
+					$ip6tables_nat -N PSW_GLO$k
+					$ip6tables_nat -N PSW_GFW$k
+					$ip6tables_nat -N PSW_CHN$k
+					$ip6tables_nat -N PSW_HOME$k
+					$ip6tables_nat -A PSW_GLO$k -p tcp -j REDIRECT --to $TCP_REDIR_PORT
+					$ip6tables_nat -A PSW -j PSW_GLO$k
+					#$ip6tables_nat -I OUTPUT -p tcp -j PSW
 					echolog "IPv6防火墙规则加载完成！"
 				fi
 			fi
 		done
+		$iptables_nat -A PSW -j PSW_ACL
 	else
 		echolog "主节点未选择，无法转发TCP！"
 	fi
@@ -405,51 +431,72 @@ add_firewall_rule() {
 				local UDP_NODE_PORT=$(config_get $temp_server port)
 				local UDP_NODE_IP=$(get_host_ip "ipv4" $address)
 				local UDP_NODE_TYPE=$(echo $(config_get $temp_server type) | tr 'A-Z' 'a-z')
-				[ -n "$UDP_NODE_IP" -a -n "$UDP_NODE_PORT" ] && $iptables_mangle -A SS -p udp -d $UDP_NODE_IP -m multiport --dports $UDP_NODE_PORT -j RETURN
-				[ "$UDP_NODE_TYPE" == "brook" ] && $iptables_mangle -A SS_ACL -p udp -m socket -j MARK --set-mark 1
+				[ -n "$UDP_NODE_IP" -a -n "$UDP_NODE_PORT" ] && $iptables_mangle -A PSW -p udp -d $UDP_NODE_IP -m multiport --dports $UDP_NODE_PORT -j RETURN
+				[ "$UDP_NODE_TYPE" == "brook" ] && $iptables_mangle -A PSW_ACL -p udp -m socket -j MARK --set-mark 1
 				#  全局模式
-				$iptables_mangle -A SS_GLO$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				$iptables_mangle -A PSW_GLO$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 				#  GFWLIST模式
-				$iptables_mangle -A SS_GFW$k -p udp -m set --match-set $IPSET_GFW dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
-				$iptables_mangle -A SS_GFW$k -p udp -m set --match-set $IPSET_ROUTER dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				$iptables_mangle -A PSW_GFW$k -p udp $(get_dst_list $IPSET_ROUTER) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				$iptables_mangle -A PSW_GFW$k -p udp $(get_dst_list $IPSET_GFW) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 				#  大陆白名单模式
-				$iptables_mangle -A SS_CHN$k -p udp -m set --match-set $IPSET_CHN dst -j RETURN
-				$iptables_mangle -A SS_CHN$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				$iptables_mangle -A PSW_CHN$k -p udp $(get_dst_list $IPSET_CHN) -j RETURN
+				$iptables_mangle -A PSW_CHN$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 				#  回国模式
-				$iptables_mangle -A SS_HOME$k -p udp -m set --match-set $IPSET_CHN dst -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				$iptables_mangle -A PSW_HOME$k -p udp $(get_dst_list $IPSET_CHN) -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
 
 				#  游戏模式
-				$iptables_mangle -A SS_GAME$k -p udp -m set --match-set $IPSET_CHN dst -j RETURN
-				$iptables_mangle -A SS_GAME$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				$iptables_mangle -A PSW_GAME$k -p udp $(get_dst_list $IPSET_CHN) -j RETURN
+				$iptables_mangle -A PSW_GAME$k -p udp -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+				
+				# 用于本机流量转发，默认只走router
+				#$iptables_mangle -I OUTPUT -j PSW
+				$iptables_mangle -A OUTPUT -p udp $(get_dst_list $IPSET_LANIPLIST) $iptables_comment -j RETURN
+				[ "$use_udp_node_resolve_dns" == 1 -a -n "$DNS_FORWARD" ] && {
+					for dns in $DNS_FORWARD
+					do
+						$iptables_mangle -A OUTPUT -p udp -d $dns -m multiport --dport 1:65535 $iptables_comment -j MARK --set-mark 1
+						$iptables_mangle -I PSW 2 -p udp -d $dns -m multiport --dport 1:65535 $iptables_comment -j TPROXY --on-port $local_port --tproxy-mark 0x1/0x1
+					done
+				}
+				$iptables_mangle -A OUTPUT -p udp $(get_dst_list $IPSET_VPSIPLIST) $iptables_comment -j RETURN
+				$iptables_mangle -A OUTPUT -p udp $(get_dst_list $IPSET_WHITELIST) $iptables_comment -j RETURN
+				$iptables_mangle -A OUTPUT -p udp -m multiport --dport $UDP_REDIR_PORTS $(get_dst_list $IPSET_ROUTER) $iptables_comment -j MARK --set-mark 1
+				$iptables_mangle -A OUTPUT -p udp -m multiport --dport $UDP_REDIR_PORTS $(get_dst_list $IPSET_BLACKLIST) $iptables_comment -j MARK --set-mark 1
+
+				[ "$LOCALHOST_PROXY_MODE" == "global" ] && $iptables_mangle -A OUTPUT -p udp -m multiport --dport $UDP_REDIR_PORTS $iptables_comment -j MARK --set-mark 1
+				[ "$LOCALHOST_PROXY_MODE" == "gfwlist" ] && $iptables_mangle -A OUTPUT -p udp -m multiport --dport $UDP_REDIR_PORTS $(get_dst_list $IPSET_GFW) $iptables_comment -j MARK --set-mark 1
+				[ "$LOCALHOST_PROXY_MODE" == "chnroute" ] && {
+					$iptables_mangle -A OUTPUT -p udp -m multiport --dport $UDP_REDIR_PORTS -m set ! --match-set $IPSET_CHN dst $iptables_comment -j MARK --set-mark 1
+				}
 
 				echolog "IPv4 防火墙UDP转发规则加载完成！"
 			fi
 		done
+		$iptables_mangle -A PSW -j PSW_ACL
 	else
 		echolog "UDP节点未选择，无法转发UDP！"
 	fi
 
-	$iptables_mangle -A PREROUTING -j SS
-	$iptables_mangle -A SS -j SS_ACL
+	$iptables_mangle -A PREROUTING -j PSW
 	
 	#  加载ACLS
 	config_foreach load_acl "acl_rule"
 
 	#  加载默认代理模式
 	if [ "$PROXY_MODE" == "disable" ]; then
-		[ "$TCP_NODE1" != "nil" ] && $iptables_mangle -A SS_ACL -p tcp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)
-		[ "$UDP_NODE1" != "nil" ] && $iptables_mangle -A SS_ACL -p udp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)
+		[ "$TCP_NODE1" != "nil" ] && $iptables_nat -A PSW_ACL -p tcp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)
+		[ "$UDP_NODE1" != "nil" ] && $iptables_mangle -A PSW_ACL -p udp -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)
 	else
 		[ "$TCP_NODE1" != "nil" ] && {
-			$iptables_mangle -A SS_ACL -p tcp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "Default" -j TTL --ttl-set 141
-			$iptables_mangle -A SS_ACL -p tcp -m multiport --dport $TCP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)1
+			$iptables_nat -A PSW_ACL -p tcp $(get_dst_list $IPSET_BLACKLIST) -m comment --comment "Default" -j REDIRECT --to-ports $TCP_REDIR_PORT1
+			$iptables_nat -A PSW_ACL -p tcp -m multiport --dport $TCP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)1
 		}
 		[ "$UDP_NODE1" != "nil" ] && {
-			$iptables_mangle -A SS_ACL -p udp -m set --match-set $IPSET_BLACKLIST dst -m comment --comment "Default" -j TPROXY --on-port $UDP_REDIR_PORT1 --tproxy-mark 0x1/0x1
-			$iptables_mangle -A SS_ACL -p udp -m multiport --dport $UDP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)1
+			$iptables_mangle -A PSW_ACL -p udp $(get_dst_list $IPSET_BLACKLIST) -m comment --comment "Default" -j TPROXY --on-port $UDP_REDIR_PORT1 --tproxy-mark 0x1/0x1
+			$iptables_mangle -A PSW_ACL -p udp -m multiport --dport $UDP_REDIR_PORTS -m comment --comment "Default" -j $(get_action_chain $PROXY_MODE)1
 		}
 	fi
 }
@@ -467,11 +514,23 @@ del_firewall_rule() {
 			ipv4_output_exist=$(expr $ipv4_output_exist - 1)
 		done
 	}
+	
+	ipv4_output_exist=$($iptables_mangle -L OUTPUT 2>/dev/null | grep -c -E "PassWall")
+	[ -n "$ipv4_output_exist" ] && {
+		until [ "$ipv4_output_exist" = 0 ]; do
+			rules=$($iptables_mangle -L OUTPUT --line-numbers | grep -E "PassWall" | awk '{print $1}')
+			for rule in $rules; do
+				$iptables_mangle -D OUTPUT $rule 2>/dev/null
+				break
+			done
+			ipv4_output_exist=$(expr $ipv4_output_exist - 1)
+		done
+	}
 
-	ipv6_output_ss_exist=$($ip6tables_nat -L OUTPUT 2>/dev/null | grep -c "SS")
+	ipv6_output_ss_exist=$($ip6tables_nat -L OUTPUT 2>/dev/null | grep -c "PSW")
 	[ -n "$ipv6_output_ss_exist" ] && {
 		until [ "$ipv6_output_ss_exist" = 0 ]; do
-			rules=$($ip6tables_nat -L OUTPUT --line-numbers | grep "SS" | awk '{print $1}')
+			rules=$($ip6tables_nat -L OUTPUT --line-numbers | grep "PSW" | awk '{print $1}')
 			for rule in $rules; do
 				$ip6tables_nat -D OUTPUT $rule 2>/dev/null
 				break
@@ -480,36 +539,38 @@ del_firewall_rule() {
 		done
 	}
 
-	$iptables_mangle -D PREROUTING -p tcp -m socket -j MARK --set-mark 1 2>/dev/null
-	$iptables_mangle -D PREROUTING -p udp -m socket -j MARK --set-mark 1 2>/dev/null
-	$iptables_mangle -D OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_ROUTER dst -j MARK --set-mark 1 2>/dev/null
-	$iptables_mangle -D OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -m set --match-set $IPSET_GFW dst -j MARK --set-mark 1 2>/dev/null
-	$iptables_mangle -D OUTPUT -p tcp -m multiport --dport $TCP_REDIR_PORTS -j MARK --set-mark 1 2>/dev/null
+	$iptables_nat -D PREROUTING -j PSW 2>/dev/null
+	$iptables_nat -F PSW 2>/dev/null && $iptables_nat -X PSW 2>/dev/null
+	$iptables_nat -F PSW_ACL 2>/dev/null && $iptables_nat -X PSW_ACL 2>/dev/null
+	
+	$iptables_mangle -D PREROUTING -j PSW$k 2>/dev/null
+	$iptables_mangle -F PSW 2>/dev/null && $iptables_mangle -X PSW 2>/dev/null
+	$iptables_mangle -F PSW_ACL 2>/dev/null && $iptables_mangle -X PSW_ACL 2>/dev/null
 
-	$iptables_nat -D PREROUTING -j SS 2>/dev/null
-	$iptables_nat -F SS 2>/dev/null && $iptables_nat -X SS 2>/dev/null
-	$iptables_mangle -D PREROUTING -j SS$k 2>/dev/null
-	$iptables_mangle -F SS 2>/dev/null && $iptables_mangle -X SS 2>/dev/null
-	$iptables_mangle -F SS_ACL 2>/dev/null && $iptables_mangle -X SS_ACL 2>/dev/null
-
-	$ip6tables_nat -D PREROUTING -j SS 2>/dev/null
-	$ip6tables_nat -F SS 2>/dev/null && $ip6tables_nat -X SS 2>/dev/null
-	$ip6tables_nat -F SS_ACL 2>/dev/null && $ip6tables_nat -X SS_ACL 2>/dev/null
+	$ip6tables_nat -D PREROUTING -j PSW 2>/dev/null
+	$ip6tables_nat -F PSW 2>/dev/null && $ip6tables_nat -X PSW 2>/dev/null
+	$ip6tables_nat -F PSW_ACL 2>/dev/null && $ip6tables_nat -X PSW_ACL 2>/dev/null
 
 	local max_num=5
 	if [ "$max_num" -ge 1 ]; then
 		for i in $(seq 1 $max_num); do
 			local k=$i
-			$iptables_mangle -F SS_GLO$k 2>/dev/null && $iptables_mangle -X SS_GLO$k 2>/dev/null
-			$iptables_mangle -F SS_GFW$k 2>/dev/null && $iptables_mangle -X SS_GFW$k 2>/dev/null
-			$iptables_mangle -F SS_CHN$k 2>/dev/null && $iptables_mangle -X SS_CHN$k 2>/dev/null
-			$iptables_mangle -F SS_GAME$k 2>/dev/null && $iptables_mangle -X SS_GAME$k 2>/dev/null
-			$iptables_mangle -F SS_HOME$k 2>/dev/null && $iptables_mangle -X SS_HOME$k 2>/dev/null
+			$iptables_nat -F PSW_GLO$k 2>/dev/null && $iptables_nat -X PSW_GLO$k 2>/dev/null
+			$iptables_nat -F PSW_GFW$k 2>/dev/null && $iptables_nat -X PSW_GFW$k 2>/dev/null
+			$iptables_nat -F PSW_CHN$k 2>/dev/null && $iptables_nat -X PSW_CHN$k 2>/dev/null
+			$iptables_nat -F PSW_GAME$k 2>/dev/null && $iptables_nat -X PSW_GAME$k 2>/dev/null
+			$iptables_nat -F PSW_HOME$k 2>/dev/null && $iptables_nat -X PSW_HOME$k 2>/dev/null
+			
+			$iptables_mangle -F PSW_GLO$k 2>/dev/null && $iptables_mangle -X PSW_GLO$k 2>/dev/null
+			$iptables_mangle -F PSW_GFW$k 2>/dev/null && $iptables_mangle -X PSW_GFW$k 2>/dev/null
+			$iptables_mangle -F PSW_CHN$k 2>/dev/null && $iptables_mangle -X PSW_CHN$k 2>/dev/null
+			$iptables_mangle -F PSW_GAME$k 2>/dev/null && $iptables_mangle -X PSW_GAME$k 2>/dev/null
+			$iptables_mangle -F PSW_HOME$k 2>/dev/null && $iptables_mangle -X PSW_HOME$k 2>/dev/null
 
-			$ip6tables_nat -F SS_GLO$k 2>/dev/null && $ip6tables_nat -X SS_GLO$k 2>/dev/null
-			$ip6tables_nat -F SS_GFW$k 2>/dev/null && $ip6tables_nat -X SS_GFW$k 2>/dev/null
-			$ip6tables_nat -F SS_CHN$k 2>/dev/null && $ip6tables_nat -X SS_CHN$k 2>/dev/null
-			$ip6tables_nat -F SS_HOME$k 2>/dev/null && $ip6tables_nat -X SS_HOME$k 2>/dev/null
+			$ip6tables_nat -F PSW_GLO$k 2>/dev/null && $ip6tables_nat -X PSW_GLO$k 2>/dev/null
+			$ip6tables_nat -F PSW_GFW$k 2>/dev/null && $ip6tables_nat -X PSW_GFW$k 2>/dev/null
+			$ip6tables_nat -F PSW_CHN$k 2>/dev/null && $ip6tables_nat -X PSW_CHN$k 2>/dev/null
+			$ip6tables_nat -F PSW_HOME$k 2>/dev/null && $ip6tables_nat -X PSW_HOME$k 2>/dev/null
 
 			ip_rule_exist=$(ip rule show | grep "from all fwmark 0x1 lookup 100" | grep -c 100)
 			if [ ! -z "$ip_rule_exist" ]; then
@@ -523,7 +584,7 @@ del_firewall_rule() {
 	fi
 
 	ipset -F $IPSET_ROUTER >/dev/null 2>&1 && ipset -X $IPSET_ROUTER >/dev/null 2>&1 &
-	ipset -F $IPSET_GFW >/dev/null 2>&1 && ipset -X $IPSET_GFW >/dev/null 2>&1 &
+	#ipset -F $IPSET_GFW >/dev/null 2>&1 && ipset -X $IPSET_GFW >/dev/null 2>&1 &
 	#ipset -F $IPSET_CHN >/dev/null 2>&1 && ipset -X $IPSET_CHN >/dev/null 2>&1 &
 	ipset -F $IPSET_BLACKLIST >/dev/null 2>&1 && ipset -X $IPSET_BLACKLIST >/dev/null 2>&1 &
 	ipset -F $IPSET_WHITELIST >/dev/null 2>&1 && ipset -X $IPSET_WHITELIST >/dev/null 2>&1 &
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh
index 58c0dfd0ba..b612df6e5c 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/rule_update.sh
@@ -36,9 +36,9 @@ uci_get_by_type() {
 get_url() {
 	local url=$1
 	local save_path=$2
-	status=$(/usr/bin/curl -w %{http_code} --connect-timeout 10 $url --silent -o $save_path)
+	status=$(/usr/bin/curl -w %{http_code} --connect-timeout 5 --retry 1 $url --silent -o $save_path)
 	[ "$?" != 0 ] && {
-		status=$(/usr/bin/wget -q --no-check-certificate --timeout=15 $url -O $save_path)
+		status=$(/usr/bin/wget -q --no-check-certificate --timeout=5 --tries 1 $url -O $save_path)
 		[ "$?" == 0 ] && status=200
 	}
 	echo $status
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh
index 72fbbf25d4..0f6e5ac943 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/subscription.sh
@@ -54,9 +54,9 @@ start_subscribe() {
 			config_get subscrib_remark $1 remark
 			let index+=1
 			echo "$Date: 正在订阅：$url" >> $LOG_FILE
-			result=$(/usr/bin/curl --connect-timeout 10 -sL $url)
+			result=$(/usr/bin/curl --connect-timeout 5 --retry 1 -sL $url)
 			[ "$?" != 0 ] || [ -z "$result" ] && {
-				result=$(/usr/bin/wget --no-check-certificate --timeout=8 -t 1 -O- $url)
+				result=$(/usr/bin/wget --no-check-certificate --timeout=5 -t 1 -O- $url)
 				[ "$?" != 0 ] || [ -z "$result" ] && echo "$Date: 订阅失败：$url，请检测订阅链接是否正常或使用代理尝试！" >> $LOG_FILE && continue
 			}
 			file="/var/${CONFIG}_sub/$index"
@@ -64,36 +64,42 @@ start_subscribe() {
 			
 			get_local_nodes
 			
-			[ -z "$(du -sh $file 2> /dev/null)" ] && echo "$Date: 订阅失败：$url，解密失败！" >> $LOG_FILE && continue
-			decode_link=$(cat "$file" | base64 -d 2> /dev/null)
-			maxnum=$(echo -n "$decode_link" | grep "MAX=" | awk -F"=" '{print $2}')
-			if [ -n "$maxnum" ]; then
-				decode_link=$(echo -n "$decode_link" | sed '/MAX=/d' | shuf -n${maxnum})
-			else
-				decode_link=$(echo -n "$decode_link")
-			fi
-			
-			[ -z "$decode_link" ] && continue
-			for link in $decode_link
-			do
-				if expr "$link" : "ss://";then
-					link_type="ss"
-					new_link=$(echo -n "$link" | sed 's/ss:\/\///g')
-				elif expr "$link" : "ssr://";then
-					link_type="ssr"
-					new_link=$(echo -n "$link" | sed 's/ssr:\/\///g')
-				elif expr "$link" : "vmess://";then
-					link_type="v2ray"
-					new_link=$(echo -n "$link" | sed 's/vmess:\/\///g')
-				elif expr "$link" : "trojan://";then
-					link_type="trojan"
-					new_link=$(echo -n "$link" | sed 's/trojan:\/\///g')
+			if [ $(expr "$result" : "ssd://") == 0 ];then
+				[ -z "$(du -sh $file 2> /dev/null)" ] && echo "$Date: 订阅失败：$url，解密失败！" >> $LOG_FILE && continue
+				decode_link=$(cat "$file" | base64 -d 2> /dev/null)
+				maxnum=$(echo -n "$decode_link" | grep "MAX=" | awk -F"=" '{print $2}')
+				if [ -n "$maxnum" ]; then
+					decode_link=$(echo -n "$decode_link" | sed '/MAX=/d' | shuf -n${maxnum})
+				else
+					decode_link=$(echo -n "$decode_link")
 				fi
+				
+				[ -z "$decode_link" ] && continue
+				for link in $decode_link
+				do
+					if expr "$link" : "ss://";then
+						link_type="ss"
+						new_link=$(echo -n "$link" | sed 's/ss:\/\///g')
+					elif expr "$link" : "ssr://";then
+						link_type="ssr"
+						new_link=$(echo -n "$link" | sed 's/ssr:\/\///g')
+					elif expr "$link" : "vmess://";then
+						link_type="v2ray"
+						new_link=$(echo -n "$link" | sed 's/vmess:\/\///g')
+					elif expr "$link" : "trojan://";then
+						link_type="trojan"
+						new_link=$(echo -n "$link" | sed 's/trojan:\/\///g')
+					fi
+					[ -z "$link_type" ] && continue
+					get_remote_config "$link_type" "$new_link"
+				done
+			else
+				link=$result
+				link_type="ssd"
+				new_link=$(echo -n "$link" | sed 's/ssd:\/\///g')
 				[ -z "$link_type" ] && continue
 				get_remote_config "$link_type" "$new_link"
-				update_config
-			done
-			
+			fi
 			[ "$addnum_ss" -gt 0 ] || [ "$updatenum_ss" -gt 0 ] || [ "$delnum_ss" -gt 0 ] && echo "$Date: $subscrib_remark： SS节点新增 $addnum_ss 个，修改 $updatenum_ss 个，删除 $delnum_ss 个。" >> $LOG_FILE
 			[ "$addnum_ssr" -gt 0 ] || [ "$updatenum_ssr" -gt 0 ] || [ "$delnum_ssr" -gt 0 ] && echo "$Date: $subscrib_remark： SSR节点新增 $addnum_ssr 个，修改 $updatenum_ssr 个，删除 $delnum_ssr 个。" >> $LOG_FILE
 			[ "$addnum_v2ray" -gt 0 ] || [ "$updatenum_v2ray" -gt 0 ] || [ "$delnum_v2ray" -gt 0 ] && echo "$Date: $subscrib_remark： V2ray节点新增 $addnum_v2ray 个，修改 $updatenum_v2ray 个，删除 $delnum_v2ray 个。" >> $LOG_FILE
@@ -141,11 +147,11 @@ get_local_nodes(){
 }
 
 get_remote_config(){
-	isAdd=1
 	add_mode="$subscrib_remark"
 	[ -n "$3" ] && add_mode="导入"
+	new_node_type=$(echo $1 | tr '[a-z]' '[A-Z]')
+	decode_link="$2"
 	if [ "$1" == "ss" ]; then
-		decode_link="$2"
 		decode_link=$(ss_decode $decode_link)
 		ss_encrypt_method=$(echo "$decode_link" | awk -F ':' '{print $1}')
 		password=$(echo "$decode_link" | awk -F ':' '{print $2}' | awk -F '@' '{print $1}')
@@ -153,7 +159,6 @@ get_remote_config(){
 		node_port=$(echo "$decode_link" | awk -F '@' '{print $2}' | awk -F '#' '{print $1}' | awk -F ':' '{print $2}')
 		remarks=$(urldecode $(echo "$decode_link" | awk -F '#' '{print $2}'))
 	elif [ "$1" == "ssr" ]; then
-		decode_link="$2"
 		decode_link=$(decode_url_link $decode_link 1)
 		node_address=$(echo "$decode_link" | awk -F ':' '{print $1}')
 		node_port=$(echo "$decode_link" | awk -F ':' '{print $2}')
@@ -195,16 +200,80 @@ get_remote_config(){
 		
 		remarks="${json_ps}"
 		node_address=$json_node_address
+		node_port=$json_node_port
 	elif [ "$1" == "trojan" ]; then
 		link="$2"
 		node_password=$(echo "$link" | sed 's/trojan:\/\///g' | awk -F '@' '{print $1}')
 		node_address=$(echo "$link" | sed 's/trojan:\/\///g' | awk -F '@' '{print $2}' | awk -F ':' '{print $1}')
 		node_port=$(echo "$link" | sed 's/trojan:\/\///g' | awk -F '@' '{print $2}' | awk -F ':' '{print $2}')
 		remarks="${node_address}:${node_port}"
+	elif [ "$1" == "ssd" ]; then
+		link_type="ss"
+		new_node_type=$(echo $link_type | tr '[a-z]' '[A-Z]')
+		decode_link=$(decode_url_link $2 1)
+		json_load "$decode_link"
+		json_get_var json_airport airport
+		json_get_var json_port port
+		json_get_var json_encryption encryption
+		json_get_var json_password password
+		json_get_var json_traffic_used traffic_used
+		json_get_var json_traffic_total traffic_total
+		json_get_var json_expiry expiry
+		json_get_var json_url url
+		json_get_var json_plugin plugin
+		json_get_var json_plugin_options plugin_options
+		
+		ss_encrypt_method=$json_encryption
+		password=$json_password
+		plugin=$json_plugin
+		plugin_options=$json_plugin_options
+		
+		[ -n "$plugin" -a "$plugin" == "simple-obfs" ] && echo "$Date: 不支持simple-obfs插件，导入失败！" >> $LOG_FILE && return
+
+		if json_get_type Type servers && [ "$Type" == array ]
+		then
+			json_select servers
+			idx=1
+			while json_get_type Type "$idx" && [ "$Type" == object ]
+			do
+				json_select $idx
+				json_get_var json_server server
+				json_get_var json_server_id id
+				json_get_var json_server_ratio ratio
+				json_get_var json_server_remarks remarks
+				
+				remarks="${json_server_remarks}"
+				node_address=$json_server
+				node_port=$json_port
+				
+				idx=$(expr $idx + 1)
+				json_select ..
+				
+				node_address=$(echo -n $node_address | awk '{print gensub(/[^!-~]/,"","g",$0)}')
+				node_address=$(echo -n $node_address | grep -F ".")
+				[ -z "$node_address" -o "$node_address" == "" ] && return
+				
+				[ -z "$remarks" -o "$remarks" == "" ] && remarks="${node_address}:${node_port}"
+				
+				# 把全部节点节点写入文件 /usr/share/${CONFIG}/sub/all_onlinenodes
+				if [ ! -f "/usr/share/${CONFIG}/sub/all_onlinenodes" ]; then
+					echo $node_address > /usr/share/${CONFIG}/sub/all_onlinenodes
+				else
+					echo $node_address >> /usr/share/${CONFIG}/sub/all_onlinenodes
+				fi
+				
+				update_config
+			done
+			return
+		fi
+	
 	fi
 	
-	node_address=$(echo $node_address |awk '{print gensub(/[^!-~]/,"","g",$0)}')
-	#[ -z "$node_address" -o "$node_address" == "" ] && isAdd=0
+	node_address=$(echo -n $node_address | awk '{print gensub(/[^!-~]/,"","g",$0)}')
+	node_address=$(echo -n $node_address | grep -F ".")
+	[ -z "$node_address" -o "$node_address" == "" ] && return
+	
+	[ -z "$remarks" -o "$remarks" == "" ] && remarks="${node_address}:${node_port}"
 	
 	# 把全部节点节点写入文件 /usr/share/${CONFIG}/sub/all_onlinenodes
 	if [ ! -f "/usr/share/${CONFIG}/sub/all_onlinenodes" ]; then
@@ -213,13 +282,18 @@ get_remote_config(){
 		echo $node_address >> /usr/share/${CONFIG}/sub/all_onlinenodes
 	fi
 	
+	update_config
 }
 
 add_nodes(){
-	get_node_index
+	if [ "$1" == "add" ]; then
+		get_node_index
+		uci add $CONFIG nodes
+	elif [ "$1" == "update" ]; then
+		nodes_index=$update_index
+	fi
 	uci_set="uci set $CONFIG.@nodes[$nodes_index]."
-	uci add $CONFIG nodes > /dev/null
-	[ -z "$3" ] && ${uci_set}is_sub="is_sub"
+	[ "$add_mode" != "导入" ] && ${uci_set}is_sub="is_sub"
 	if [ "$2" == "ss" ]; then
 		${uci_set}add_mode="$add_mode"
 		${uci_set}remarks="$remarks"
@@ -231,6 +305,8 @@ add_nodes(){
 		${uci_set}ss_encrypt_method="$ss_encrypt_method"
 		${uci_set}timeout=300
 		${uci_set}tcp_fast_open=false
+		[ -n "$plugin" ] && ${uci_set}ss_plugin="$plugin"
+		[ -n "$plugin_options" ] && ${uci_set}ss_plugin_v2ray_opts="$plugin_options"
 		
 		if [ "$1" == "add" ]; then
 			let addnum_ss+=1
@@ -306,18 +382,29 @@ add_nodes(){
 }
 
 update_config(){
-	[ "$isAdd" == 1 ] && {
-		isadded_remarks=$(uci show $CONFIG | grep "@nodes" | grep "remarks" | grep -c -F "$remarks")
-		if [ "$isadded_remarks" -eq 0 ]; then
+	[ -z "$remarks" -o "$remarks" == "" ] && return
+	indexs=$(uci show $CONFIG | grep "@nodes" | grep "remarks=" | grep -F "$remarks" | cut -d '[' -f2|cut -d ']' -f1)
+	if [ -z "$indexs" ]; then
+		add_nodes add "$link_type"
+	else
+		action="add"
+		for index in $indexs
+		do
+			local is_sub=$(uci -q get $CONFIG.@nodes[$index].is_sub)
+			[ -z "$is_sub" -o "$is_sub" == "" ] && return
+			local old_node_type=$(uci -q get $CONFIG.@nodes[$index].type | tr '[a-z]' '[A-Z]')
+			if [ -n "$old_node_type" -a "$old_node_type" == "$new_node_type" ]; then
+				action="update"
+				update_index=$index
+				break
+			fi
+		done
+		if [ "$action" == "add" ]; then
 			add_nodes add "$link_type"
-		else
-			index=$(uci show $CONFIG | grep "@nodes" | grep "remarks" | grep -w -F "$remarks" | cut -d '[' -f2|cut -d ']' -f1)
-			[ "$?" == 0 ] && {
-				uci delete $CONFIG.@nodes[$index]
-				add_nodes update "$link_type"
-			}
+		elif [ "$action" == "update" ]; then
+			add_nodes update "$link_type"
 		fi
-	}
+	fi
 }
 
 del_config(){
@@ -433,7 +520,6 @@ add() {
 			fi
 			[ -z "$link_type" ] && continue
 			get_remote_config "$link_type" "$new_link" 1
-			update_config
 		done
 		[ -f "/usr/share/${CONFIG}/sub/all_onlinenodes" ] && rm -f /usr/share/${CONFIG}/sub/all_onlinenodes
 	}
diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh
index c2cf699791..13df42f446 100755
--- a/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh
+++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/test.sh
@@ -1,16 +1,21 @@
 #!/bin/sh
 
 CONFIG=passwall
-LOCK_FILE=/var/lock/passwall_test.lock
+LOCK_FILE=/var/lock/${CONFIG}_test.lock
+LOG_FILE=/var/log/$CONFIG.log
 
 get_date() {
 	echo "$(date "+%Y-%m-%d %H:%M:%S")"
 }
 
+echolog() {
+	echo -e "$(get_date): $1" >> $LOG_FILE
+}
+
 test_url() {
-	status=$(/usr/bin/curl -I -o /dev/null -s --connect-timeout 2 -w %{http_code} "$1" | grep 200)
+	status=$(/usr/bin/curl -I -o /dev/null -s --connect-timeout 2 --retry 1 -w %{http_code} "$1" | grep 200)
 	[ "$?" != 0 ] && {
-		status=$(/usr/bin/wget --no-check-certificate --spider --timeout=2 "$1")
+		status=$(/usr/bin/wget --no-check-certificate --spider --timeout=2 --tries 1 "$1")
 		[ "$?" == 0 ] && status=200
 	}
 	echo $status
@@ -33,25 +38,25 @@ test_proxy() {
 }
 
 test_auto_switch() {
-	if [ -f "/var/etc/passwall/tcp_server_id" ]; then
-		TCP_NODES1=$(cat /var/etc/passwall/tcp_server_id)
+	if [ -f "/var/etc/$CONFIG/tcp_server_id" ]; then
+		TCP_NODES1=$(cat /var/etc/$CONFIG/tcp_server_id)
 	else
 		rm -f $LOCK_FILE
 		exit 1
 	fi
 
 	failcount=1
-	while [ "$failcount" -lt "6" ]; do
+	while [ "$failcount" -le 5 ]; do
 		status=$(test_proxy)
 		if [ "$status" == 2 ]; then
-			echo "$(get_date): 自动切换检测：无法连接到网络，请检查网络是否正常！" >>/var/log/passwall.log
+			echolog "自动切换检测：无法连接到网络，请检查网络是否正常！"
 			break
 		elif [ "$status" == 1 ]; then
-			echo "$(get_date): 自动切换检测：第$failcount次检测异常" >>/var/log/passwall.log
+			echolog "自动切换检测：第$failcount次检测异常"
 			let "failcount++"
-			[ "$failcount" -ge 6 ] && {
-				echo "$(get_date): 自动切换检测：检测异常，切换节点" >>/var/log/passwall.log
-				TCP_NODES=$(uci get passwall.@auto_switch[0].tcp_node)
+			[ "$failcount" -ge 5 ] && {
+				echolog "自动切换检测：检测异常，切换节点"
+				TCP_NODES=$(uci get $CONFIG.@auto_switch[0].tcp_node)
 				has_backup_server=$(echo $TCP_NODES | grep $TCP_NODES1)
 				setserver=
 				if [ -z "$has_backup_server" ]; then
@@ -77,14 +82,14 @@ test_auto_switch() {
 					done
 				fi
 				rm -f $LOCK_FILE
-				uci set passwall.@global[0].tcp_node=$setserver
-				uci commit passwall
-				/etc/init.d/passwall restart
+				uci set $CONFIG.@global[0].tcp_node=$setserver
+				uci commit $CONFIG
+				/etc/init.d/$CONFIG restart
 				exit 1
 			}
 			sleep 5s
 		elif [ "$status" == 0 ]; then
-			echo "$(get_date): 自动切换检测：检测正常" >>/var/log/passwall.log
+			echolog "自动切换检测：检测正常"
 			break
 		fi
 	done
@@ -92,23 +97,23 @@ test_auto_switch() {
 
 test_reconnection() {
 	failcount=1
-	while [ "$failcount" -lt "6" ]; do
+	while [ "$failcount" -le 5 ]; do
 		status=$(test_proxy)
 		if [ "$status" == 2 ]; then
-			echo "$(get_date): 掉线重连检测：无法连接到网络，请检查网络是否正常！" >>/var/log/passwall.log
+			echolog "掉线重连检测：无法连接到网络，请检查网络是否正常！"
 			break
 		elif [ "$status" == 1 ]; then
-			echo "$(get_date): 掉线重连检测：第$failcount次检测异常" >>/var/log/passwall.log
+			echolog "掉线重连检测：第$failcount次检测异常"
 			let "failcount++"
-			[ "$failcount" -ge 6 ] && {
-				echo "$(get_date): 掉线重连检测：检测异常，重启程序" >>/var/log/passwall.log
+			[ "$failcount" -ge 5 ] && {
+				echolog "掉线重连检测：检测异常，重启程序"
 				rm -f $LOCK_FILE
-				/etc/init.d/passwall restart
+				/etc/init.d/$CONFIG restart
 				exit 1
 			}
 			sleep 5s
 		elif [ "$status" == 0 ]; then
-			echo "$(get_date): 掉线重连检测：检测正常" >>/var/log/passwall.log
+			echolog "掉线重连检测：检测正常"
 			break
 		fi
 	done
diff --git a/package/lienol/luci-app-timewol/luasrc/controller/timewol.lua b/package/lienol/luci-app-timewol/luasrc/controller/timewol.lua
index c411e8b555..67a18fd972 100644
--- a/package/lienol/luci-app-timewol/luasrc/controller/timewol.lua
+++ b/package/lienol/luci-app-timewol/luasrc/controller/timewol.lua
@@ -3,17 +3,14 @@ module("luci.controller.timewol", package.seeall)
 function index()
     if not nixio.fs.access("/etc/config/timewol") then return end
 
-    entry({"admin", "network"}, firstchild(), "Control", 44).dependent = false
-    entry({"admin", "network", "timewol"}, cbi("timewol"), _("定时唤醒"), 95).dependent =
-        true
-    entry({"admin", "network", "timewol", "status"}, call("status")).leaf = true
+    entry({"admin", "control"}, firstchild(), "Control", 44).dependent = false
+    entry({"admin", "control", "timewol"}, cbi("timewol"), _("定时唤醒"), 95).dependent = true
+    entry({"admin", "control", "timewol", "status"}, call("status")).leaf = true
 end
 
 function status()
     local e = {}
-    e.status = luci.sys
-                   .call("cat /etc/crontabs/root |grep etherwake >/dev/null") ==
-                   0
+    e.status = luci.sys.call("cat /etc/crontabs/root |grep etherwake >/dev/null") == 0
     luci.http.prepare_content("application/json")
     luci.http.write_json(e)
 end
diff --git a/package/lienol/luci-app-trojan-server/Makefile b/package/lienol/luci-app-trojan-server/Makefile
index d3f5daa638..411141da00 100644
--- a/package/lienol/luci-app-trojan-server/Makefile
+++ b/package/lienol/luci-app-trojan-server/Makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 2019-2020 Lienol
+# Copyright (C) 2019-2020 Lienol <lawlienol@gmail.com>
 #
-# This is free software, licensed under the Apache License, Version 2.0 .
+# This is free software, licensed under the GNU General Public License v3.
 #
 
 include $(TOPDIR)/rules.mk
@@ -9,11 +9,9 @@ PKG_NAME:=luci-app-trojan-server
 LUCI_TITLE:=LuCI support for Trojan Server
 LUCI_DEPENDS:=+luci-lib-jsonc +trojan 
 LUCI_PKGARCH:=all
-PKG_VERSION:=1.0
-PKG_RELEASE:=3-20191220
+PKG_VERSION:=1.1
+PKG_RELEASE:=2-20200112
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
-# call BuildPackage - OpenWrt buildroot signature
-
-
+# call BuildPackage - OpenWrt buildroot signature
\ No newline at end of file
diff --git a/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/api/gen_trojan_config_file.lua b/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/api/gen_trojan_config_file.lua
index d430cb12eb..10eb32a7ab 100644
--- a/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/api/gen_trojan_config_file.lua
+++ b/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/api/gen_trojan_config_file.lua
@@ -7,8 +7,10 @@ local trojan = {
     run_type = "server",
     local_addr = "0.0.0.0",
     local_port = tonumber(server.port),
-    --remote_addr = "127.0.0.1",
-    --remote_port = 80,
+    remote_addr = (server.remote_enable == "1" and server.remote_address) and
+        server.remote_address or nil,
+    remote_port = (server.remote_enable == "1" and server.remote_port) and
+        server.remote_port or nil,
     password = server.password,
     log_level = 1,
     ssl = {
diff --git a/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/config.lua b/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/config.lua
index d6c2a07476..060ce52d1e 100644
--- a/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/config.lua
+++ b/package/lienol/luci-app-trojan-server/luasrc/model/cbi/trojan_server/config.lua
@@ -28,13 +28,27 @@ tcp_fast_open = t:option(ListValue, "tcp_fast_open", translate("TCP Fast Open"),
 tcp_fast_open:value("false")
 tcp_fast_open:value("true")
 
--- [[ SSL部分 ]] --
+remote_enable = t:option(Flag, "remote_enable", translate("Enable Remote"),
+                         translate(
+                             "You can forward to Nginx/Caddy/V2ray WebSocket and more."))
+remote_enable.default = "1"
+remote_enable.rmempty = false
+
+remote_address = t:option(Value, "remote_address", translate("Remote Address"))
+remote_address.default = "127.0.0.1"
+remote_address:depends("remote_enable", 1)
+
+remote_port = t:option(Value, "remote_port", translate("Remote Port"))
+remote_port.datatype = "port"
+remote_port.default = "80"
+remote_port:depends("remote_enable", 1)
+
 tls_certFile = t:option(Value, "ssl_certFile",
-                        translate("Public key absolute path"),
+                        "HTTPS" .. translate("Public key absolute path"),
                         translate("as:") .. "/etc/ssl/fullchain.pem")
 
 tls_keyFile = t:option(Value, "ssl_keyFile",
-                       translate("Private key absolute path"),
+                       "HTTPS" .. translate("Private key absolute path"),
                        translate("as:") .. "/etc/ssl/private.key")
 
 return map
diff --git a/package/lienol/luci-app-trojan-server/po/zh-cn/trojan_server.po b/package/lienol/luci-app-trojan-server/po/zh-cn/trojan_server.po
index f4d421c2ae..2111c944e8 100644
--- a/package/lienol/luci-app-trojan-server/po/zh-cn/trojan_server.po
+++ b/package/lienol/luci-app-trojan-server/po/zh-cn/trojan_server.po
@@ -25,6 +25,18 @@ msgstr "TCP快速打开"
 msgid "Enable TCP fast open (kernel support required)"
 msgstr "是否启用TCP快速打开（需要内核支持）"
 
+msgid "Enable Remote"
+msgstr "启用转发"
+
+msgid "You can forward to Nginx/Caddy/V2ray WebSocket and more."
+msgstr "您可以转发到Nginx/Caddy/V2ray WebSocket等。"
+
+msgid "Remote Address"
+msgstr "远程地址"
+
+msgid "Remote Port"
+msgstr "远程端口"
+
 msgid "as:"
 msgstr "如："
 
diff --git a/package/lienol/luci-app-trojan-server/root/etc/init.d/trojan_server b/package/lienol/luci-app-trojan-server/root/etc/init.d/trojan_server
index f9a6f489b3..0407ba5977 100755
--- a/package/lienol/luci-app-trojan-server/root/etc/init.d/trojan_server
+++ b/package/lienol/luci-app-trojan-server/root/etc/init.d/trojan_server
@@ -17,6 +17,10 @@ gen_trojan_config_file() {
 	[ "$enable" = "0" ] && return 0
 	config_get remarks $1 remarks
 	config_get port $1 port
+	config_get ssl_certFile $1 ssl_certFile
+	config_get ssl_keyFile $1 ssl_keyFile
+	[ ! -f "$ssl_certFile" ] && echolog "$remarks $port 找不到HTTPS公钥文件，运行失败！" && exit 
+	[ ! -f "$ssl_keyFile" ] && echolog "$remarks $port 找不到HTTPS私钥文件，运行失败！" && exit 
 	lua /usr/lib/lua/luci/model/cbi/trojan_server/api/gen_trojan_config_file.lua $1 > $CONFIG_PATH/$1.json
 	echolog "$remarks $port 生成并运行 Trojan 配置文件 - $CONFIG_PATH/$1.json" 
 	trojan -c $CONFIG_PATH/$1.json >/dev/null 2>&1 &
diff --git a/package/lienol/luci-app-webrestriction/luasrc/controller/webrestriction.lua b/package/lienol/luci-app-webrestriction/luasrc/controller/webrestriction.lua
index 67fb817907..4ab412fe05 100644
--- a/package/lienol/luci-app-webrestriction/luasrc/controller/webrestriction.lua
+++ b/package/lienol/luci-app-webrestriction/luasrc/controller/webrestriction.lua
@@ -3,17 +3,14 @@ module("luci.controller.webrestriction", package.seeall)
 function index()
     if not nixio.fs.access("/etc/config/webrestriction") then return end
 
-    entry({"admin", "network"}, firstchild(), "Control", 44).dependent = false
-    entry({"admin", "network", "webrestriction"}, cbi("webrestriction"),
-          _("访问限制"), 11).dependent = true
-    entry({"admin", "network", "webrestriction", "status"}, call("status")).leaf =
-        true
+    entry({"admin", "control"}, firstchild(), "Control", 44).dependent = false
+    entry({"admin", "control", "webrestriction"}, cbi("webrestriction"),_("访问限制"), 11).dependent = true
+    entry({"admin", "control", "webrestriction", "status"}, call("status")).leaf = true
 end
 
 function status()
     local e = {}
-    e.status = luci.sys.call(
-                   "iptables -L FORWARD |grep WEB_RESTRICTION >/dev/null") == 0
+    e.status = luci.sys.call("iptables -L FORWARD |grep WEB_RESTRICTION >/dev/null") == 0
     luci.http.prepare_content("application/json")
     luci.http.write_json(e)
 end
diff --git a/package/lienol/luci-app-weburl/luasrc/controller/weburl.lua b/package/lienol/luci-app-weburl/luasrc/controller/weburl.lua
index e88c389c4f..5036d18686 100644
--- a/package/lienol/luci-app-weburl/luasrc/controller/weburl.lua
+++ b/package/lienol/luci-app-weburl/luasrc/controller/weburl.lua
@@ -3,10 +3,9 @@ module("luci.controller.weburl", package.seeall)
 function index()
     if not nixio.fs.access("/etc/config/weburl") then return end
 
-    entry({"admin", "network"}, firstchild(), "Control", 44).dependent = false
-    entry({"admin", "network", "weburl"}, cbi("weburl"), _("网址过滤"), 12).dependent =
-        true
-    entry({"admin", "network", "weburl", "status"}, call("status")).leaf = true
+    entry({"admin", "control"}, firstchild(), "Control", 44).dependent = false
+    entry({"admin", "control", "weburl"}, cbi("weburl"), _("网址过滤"), 12).dependent = true
+    entry({"admin", "control", "weburl", "status"}, call("status")).leaf = true
 end
 
 function status()
diff --git a/package/lienol/luci-theme-bootstrap-mod/Makefile b/package/lienol/luci-theme-bootstrap-mod/Makefile
index afec48ec20..ff4ca9cee2 100644
--- a/package/lienol/luci-theme-bootstrap-mod/Makefile
+++ b/package/lienol/luci-theme-bootstrap-mod/Makefile
@@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Bootstrap Mod Theme By Lienol
 LUCI_DEPENDS:=
-PKG_VERSION:=1.0
-PKG_RELEASE:=43-20191221
+PKG_VERSION:=1.1
+PKG_RELEASE:=1-20200104
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css
index 75d5ec6244..a8aed0ae45 100644
--- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css
+++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css
@@ -906,12 +906,12 @@ button {
     border-radius: 6px !important;
     display: inline-block;
     background: #fff;
-    border: 2px solid #99d;
+    border: 2px solid #118af3;
     border-radius: 2px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, .05);
     color: #333;
     line-height: 16px;
-    padding: 4px 8px;
+    padding: 0.5em;
     cursor: pointer;
     margin-left: 0.2em;
 }
@@ -1499,6 +1499,8 @@ body.modal-overlay-active #modal_overlay>.modal {
 .cbi-page-actions .cbi-button-apply,
 .cbi-section-actions .cbi-button-edit {
     color: #fff;
+    background: #118af3;
+    border: 1px solid #118af3;
 }
 
 .cbi-dropdown {
@@ -1538,4 +1540,4 @@ body.modal-overlay-active #modal_overlay>.modal {
     white-space: pre;
     overflow: hidden;
     text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_purple/cascade.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_purple/cascade.css
index e1fdc11947..5ddb1695ce 100644
--- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_purple/cascade.css
+++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_purple/cascade.css
@@ -906,12 +906,12 @@ button {
     border-radius: 6px !important;
     display: inline-block;
     background: #fff;
-    border: 2px solid #99d;
+    border: 2px solid #726bda;
     border-radius: 2px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, .05);
     color: #333;
     line-height: 16px;
-    padding: 4px 8px;
+    padding: 0.5em;
     cursor: pointer;
     margin-left: 0.2em;
 }
@@ -1503,6 +1503,8 @@ body.modal-overlay-active #modal_overlay>.modal {
 .cbi-page-actions .cbi-button-apply,
 .cbi-section-actions .cbi-button-edit {
     color: #fff;
+    background: #726bda;
+    border: 1px solid #726bda;
 }
 
 .cbi-dropdown {
@@ -1542,4 +1544,4 @@ body.modal-overlay-active #modal_overlay>.modal {
     white-space: pre;
     overflow: hidden;
     text-overflow: ellipsis;
-}
\ No newline at end of file
+}