diff --git a/luci-app-dockerman/luasrc/model/docker.lua b/luci-app-dockerman/luasrc/model/docker.lua
index bf8fc6254..2a902912a 100644
--- a/luci-app-dockerman/luasrc/model/docker.lua
+++ b/luci-app-dockerman/luasrc/model/docker.lua
@@ -110,6 +110,9 @@ _docker.clear_empty_tables = function ( t )
 		for k, v in pairs(t) do
 			if type(v) == 'table' then
 				t[k] = _docker.clear_empty_tables(v)
+				if t[k] and next(t[k]) == nil then
+					t[k] = nil
+				end
 			end
 		end
 	end
diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log
deleted file mode 100644
index 9495f9bae..000000000
--- a/luci-app-godproxy/rulesupdate.log
+++ /dev/null
@@ -1,51 +0,0 @@
-2021-11-20 16:32:28: ------------------- 规则更新 -----------------------
-2021-11-20 16:32:28: ====================================================
-2021-11-20 16:32:28: 开始更新koolproxy的规则，请等待...
-2021-11-20 16:32:28:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:30: ABP规则的本地版本号： 202111201616
-2021-11-20 16:32:30: ABP规则的在线版本号： 202111201616
-2021-11-20 16:32:30: 检测到 ABP规则本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-20 16:32:30:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:31: Fanboy规则本地版本号： 202111201600
-2021-11-20 16:32:31: Fanboy规则在线版本号： 202111201600
-2021-11-20 16:32:31: 检测到 Fanboy规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-20 16:32:31:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:31: Yhosts规则本地版本号： 202111082343
-2021-11-20 16:32:31: Yhosts规则在线版本号： 202111082343
-2021-11-20 16:32:31: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-20 16:32:31:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:31: Antiad规则本地版本号： 20211120024124
-2021-11-20 16:32:31: Antiad规则在线版本号： 20211120024124
-2021-11-20 16:32:31: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-20 16:32:31:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:31: StevenBlack规则本地版本号： 18 November 2021
-2021-11-20 16:32:31: StevenBlack规则在线版本号： 18 November 2021
-2021-11-20 16:32:31: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-20 16:32:31:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:31: AdGuard DNS规则本地版本号： 2021-11-20T12:07:18.124Z
-2021-11-20 16:32:31: AdGuard DNS规则在线版本号： 2021-11-20T12:07:18.124Z
-2021-11-20 16:32:31: 检测到 AdGuard DNS规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-20 16:32:31:  ---------------------------------------------------------------------------------------
-2021-11-20 16:32:32: ADgk规则本地版本号：
-2021-11-20 16:32:32: ADgk规则在线版本号： 20211120183731
-2021-11-20 16:32:32: 检测到新版本 ADgk规则 列表，开始更新...
-2021-11-20 16:32:32: 将临时文件覆盖到原始 ADgk规则 文件
-2021-11-20 16:32:32: 跳过优化 ABP规则。。。。。
-2021-11-20 16:32:32: 跳过优化 Fanboy规则。。。。。
-2021-11-20 16:32:32: 跳过优化 补充规则Yhosts。。。。。
-2021-11-20 16:32:32: 跳过优化 补充规则Antiad。。。。。
-2021-11-20 16:32:32: 跳过优化 补充规则StevenBlack。。。。。
-2021-11-20 16:32:32: 跳过优化 补充规则 AdGuard DNS。。。。。
-2021-11-20 16:32:32: 正在优化 ADgk规则。。。。。
-2021-11-20 16:32:43: 所有规则更新并优化完毕！
-2021-11-20 16:32:43: ====================================================
-2021-11-20 16:32:44: -------------------ABP规则 version 202111201616
-2021-11-20 16:32:44: -------------------Fanboy规则 version 202111201600
-2021-11-20 16:32:44: -------------------Yhosts规则 version 202111082343
-2021-11-20 16:32:44: -------------------Antiad规则 version 20211120024124
-2021-11-20 16:32:44: -------------------AdGuard DNS规则 version
-2021-11-20 16:32:44: -------------------StevenBlack规则 version 18 November 2021
-2021-11-20 16:32:44: -------------------静态规则 version 2021-10-07 18:00
-2021-11-20 16:32:44: -------------------乘风视频 version 202111131
-2021-11-20 16:32:44: ------------------- 内置规则更新成功！ -------------------
-2021-11-20 16:32:44: ------------------- 规则更新成功！ -------------------
diff --git a/luci-app-wizard/README.md b/luci-app-wizard/README.md
index 005723504..940da9548 100644
--- a/luci-app-wizard/README.md
+++ b/luci-app-wizard/README.md
@@ -1,3 +1,3 @@
 # luci-app-wizard
 
-来源 https://github.com/x-wrt/com.x-wrt/tree/master/luci-app-wizard
+修改自 https://github.com/x-wrt/com.x-wrt/tree/master/luci-app-wizard
diff --git a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js
index d2209ae3c..55d477161 100644
--- a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js
+++ b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js
@@ -68,10 +68,6 @@ return view.extend({
 		o.datatype = 'ip4addr';
 		o.cast = 'string';
 
-		o = s.taboption('wansetup', form.Flag, 'ipv6', _('Enable IPv6'), _('Enable/Disable IPv6'));
-		o.default = o.enabled;
-		o.rmempty = false;
-
 		if (has_wifi) {
 			o = s.taboption('wifisetup', form.Value, 'wifi_ssid', _('<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>'));
 			o.datatype = 'maxlength(32)';
@@ -95,7 +91,6 @@ return view.extend({
 		o.cast = 'string';
 
 		o = s.taboption('lansetup', form.Flag, 'siderouter', _('Siderouter'));
-		o.rmempty = false;
 		
 		o = s.taboption('lansetup', form.Value, 'lan_gateway', _('IPv4 gateway'));
 		o.depends('siderouter', '1');
@@ -106,6 +101,17 @@ return view.extend({
 		o = s.taboption('lansetup', form.Flag, 'dhcp', _('DHCP Server'), _('开启此DHCP则需要关闭主路由的DHCP, 关闭此DHCP则需要手动将所有上网设备的网关和DNS改为此旁路由的IP'));
 		o.depends('siderouter', '1');
 		o.default = o.enabled;
+		
+		s.tab('firmware', _('Firmware Settings'));
+
+		o = s.taboption('firmware', form.Flag, 'autoupgrade_pkg', _('Packages Auto Upgrade'));
+		o.default = o.enabled;
+
+		o = s.taboption('firmware', form.Flag, 'autoupgrade_fm', _('Firmware Upgrade Notice'));
+		o.default = o.enabled;
+		
+		o = s.taboption('firmware', form.Flag, 'ipv6', _('Enable IPv6'), _('Enable/Disable IPv6'));
+		o.default = o.enabled;
 
 		return m.render();
 	}
diff --git a/luci-app-wizard/po/zh_Hans/wizard.po b/luci-app-wizard/po/zh_Hans/wizard.po
index be8e5dfaf..4f766d0c1 100644
--- a/luci-app-wizard/po/zh_Hans/wizard.po
+++ b/luci-app-wizard/po/zh_Hans/wizard.po
@@ -32,4 +32,13 @@ msgid "Enable IPv6"
 msgstr "启用IPv6"
 
 msgid "Enable/Disable IPv6"
-msgstr "一键开启/关闭 IPv6"
\ No newline at end of file
+msgstr "一键开启/关闭 IPv6"
+
+msgid "Firmware Settings"
+msgstr "固件设置"
+
+msgid "Packages Auto Upgrade"
+msgstr "软件包自动更新"
+
+msgid "Firmware Upgrade Notice"
+msgstr "固件更新提醒"
diff --git a/luci-app-wizard/root/etc/init.d/wizard b/luci-app-wizard/root/etc/init.d/wizard
index ce4e27466..35d1e0d7e 100644
--- a/luci-app-wizard/root/etc/init.d/wizard
+++ b/luci-app-wizard/root/etc/init.d/wizard
@@ -12,7 +12,7 @@ add_wizard() {
 	local wan_proto wan_ipaddr wan_netmask wan_gateway wan_pppoe_user wan_pppoe_pass
 	local wifi_ssid wifi_key
 	local lan_ipaddr lan_netmask lan_dns lan_gateway dhcp
-	local device ipv6
+	local device ipv6 old_ipv6 siderouter old_siderouter
 
 	config_get wan_proto "$cfg" wan_proto
 
@@ -39,32 +39,23 @@ add_wizard() {
 				uci set network.wan.ipaddr="${wan_ipaddr}"
 				uci set network.wan.netmask="${wan_netmask}"
 				uci set network.wan.gateway="${wan_gateway}"
-			
-			config_get wan_dns "$cfg" wan_dns
-				test -n "${wan_dns}" && {
-					uci set network.wan.peerdns='0'
-					uci set network.wan.dns="${wan_dns}"
-				}
 			}
 		;;
 		pppoe)
 			config_get wan_pppoe_user "$cfg" wan_pppoe_user
 			config_get wan_pppoe_pass "$cfg" wan_pppoe_pass
-			uci delete network.wan
-			uci set network.wan=interface
-			uci set network.wan.proto='pppoe'
-			uci set network.wan.device="$device"
-			uci set network.wan.metric='40'
-			uci set network.wan.username="${wan_pppoe_user}"
-			uci set network.wan.password="${wan_pppoe_pass}"
-			uci set network.wan.keepalive='5 5'
-			uci set network.wan.mtu='1492'
-
-			uci get network.wan6 2>/dev/null && {
-				uci set network.wan6.device='@wan'
-				uci set network.wan6.reqaddress='try'
-				uci set network.wan6.reqprefix='auto'
+			test -n "${wan_pppoe_user}" && test -n "${wan_pppoe_pass}" && {
+				uci delete network.wan
+				uci set network.wan=interface
+				uci set network.wan.proto='pppoe'
+				uci set network.wan.device="$device"
+				uci set network.wan.metric='40'
+				uci set network.wan.username="${wan_pppoe_user}"
+				uci set network.wan.password="${wan_pppoe_pass}"
+				uci set network.wan.keepalive='5 5'
+				uci set network.wan.mtu='1492'
 			}
+		}
 		;;
 	esac
 
@@ -90,23 +81,33 @@ add_wizard() {
 	}
 
 	config_get siderouter "$cfg" siderouter
+	config_get old_siderouter "$cfg" old_siderouter
 	config_get lan_gateway "$cfg" lan_gateway
 	config_get dhcp "$cfg" dhcp
 	config_get lan_dns "$cfg" lan_dns
 
-	if [ "${siderouter}" == "1" ]; then
+	[ -n "$lan_dns" ] && {
+		uci set network.wan.peerdns='0'
+		uci -q set network.lan.dns="${lan_dns}"
+		} || uci del network.wan.peerdns
+
+	if [ "${siderouter}" != "old_siderouter" ]; then
+	if [ -n "${siderouter}" ]; then
 		uci -q set network.lan.gateway="${lan_gateway}"
-		[ -n "$lan_dns" ] && uci -q set network.lan.dns="${lan_dns}" || uci -q set network.lan.dns='223.5.5.5'
+		[ -n "$lan_dns" ] || uci -q set network.lan.dns='223.5.5.5'
 		[ -n "$dhcp" ] && uci -q set dhcp.lan.ignore="1" || uci -q del dhcp.lan.ignore
-	elif [ "${siderouter}" == "0" ]; then
+	else
 		uci -q del network.lan.gateway
 		uci -q del dhcp.lan.ignore
-		uci -q set network.lan.dns="${lan_dns}"
+	fi
+	uci -q set wizard.default.old_siderouter="${siderouter}"
 	fi
 	
 	config_get ipv6 "$cfg" ipv6
-
-	if [ "${ipv6}" == "0" ]; then
+	config_get old_ipv6 "$cfg" old_ipv6
+	
+	if [ "${ipv6}" != "old_ipv6" ]; then
+	if [ -n "${ipv6}" ]; then
 		uci -q delete dhcp.lan.ra
 		uci -q delete dhcp.lan.dhcpv6
 		uci -q set network.lan.delegate='0'
@@ -115,7 +116,7 @@ add_wizard() {
 		uci commit dhcp
 		/etc/init.d/odhcpd disable
 		/etc/init.d/odhcpd stop
-	elif [ "${ipv6}" == "1" ]; then
+	else
 		uci -q set dhcp.lan.ra='hybrid'
 		uci -q set dhcp.lan.dhcpv6='hybrid'
 		uci -q del network.lan.delegate
@@ -124,7 +125,10 @@ add_wizard() {
 		/etc/init.d/odhcpd enable
 		/etc/init.d/odhcpd start
 	fi
-
+	uci -q set wizard.default.old_ipv6="${ipv6}"
+	fi
+	
+	uci commit wizard
 	uci commit network
 	uci commit wireless
 	(
diff --git a/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults b/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults
index b83c20675..d4ea5aa29 100644
--- a/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults
+++ b/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults
@@ -1,25 +1,14 @@
-
-SSID=$(uci -q get wireless.@wifi-iface[0].ssid)
-KEY=$(uci -q get wireless.@wifi-iface[0].key)
-IPADDR=$(uci -q get network.lan.ipaddr)
 NETMASK=$(uci -q get network.lan.netmask)
 DNS=$(uci -q get network.lan.dns)
 GATEWAY=$(uci -q get network.lan.gateway)
 PROTO=$(uci -q get network.wan.proto)
-USERNAME=$(uci -q get network.wan.username)
-PASSWORD=$(uci -q get network.wan.password)
 
 uci -q set wizard.default=wizard
-uci -q set wizard.default.wifi_ssid="$SSID"
-uci -q set wizard.default.wifi_key="$KEY"
-uci -q set wizard.default.lan_ipaddr="$IPADDR"
 uci -q set wizard.default.lan_netmask="$NETMASK"
 uci -q set wizard.default.lan_dns="$DNS"
 uci -q set wizard.default.lan_gateway="$GATEWAY"
 [ "$(uci -q get dhcp.lan.ignore)" ] && uci -q set wizard.default.dhcp="0"
 uci -q set wizard.default.wan_proto="$PROTO"
-uci -q set wizard.default.wan_pppoe_user="$USERNAME"
-uci -q set wizard.default.wan_pppoe_pass="$PASSWORD"
 
 uci commit wizard
 
diff --git a/luci-app-wizard/root/usr/share/luci/menu.d/luci-app-wizard.json b/luci-app-wizard/root/usr/share/luci/menu.d/luci-app-wizard.json
index b856f0cc7..cc6810dbf 100644
--- a/luci-app-wizard/root/usr/share/luci/menu.d/luci-app-wizard.json
+++ b/luci-app-wizard/root/usr/share/luci/menu.d/luci-app-wizard.json
@@ -1,7 +1,7 @@
 {
-	"admin/network/initsetup": {
+	"admin/system/initsetup": {
 		"title": "Wizard",
-		"order": 30,
+		"order": 1,
 		"action": {
 			"type": "view",
 			"path": "wizard/initsetup"
diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile
index 7933acd03..1b11fdd62 100644
--- a/naiveproxy/Makefile
+++ b/naiveproxy/Makefile
@@ -61,7 +61,9 @@ endif
 CLANG_VER:=14-init-5759-g02895eed-1
 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz
 define Download/CLANG
-	URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64
+	URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64 \
+	     https://sources.immortalwrt.org \
+	     https://sources.cdn.immortalwrt.org
 	URL_FILE:=$(CLANG_FILE)
 	FILE:=$(CLANG_FILE)
 	HASH:=5c2d11236c7254d48b02535ff58897830bc64e7258434d658c7d606e8d01b179
@@ -70,7 +72,9 @@ endef
 GN_VER:=0153d369bbccc908f4da4993b1ba82728055926a
 GN_FILE:=gn-git_revision-$(GN_VER).zip
 define Download/GN_TOOL
-	URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+
+	URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ \
+	     https://sources.immortalwrt.org \
+	     https://sources.cdn.immortalwrt.org
 	URL_FILE:=git_revision:$(GN_VER)
 	FILE:=$(GN_FILE)
 	HASH:=8022d1e0d6627a740847806c27a195fa9fc15c4883359a6d162944c3d5e26b44
@@ -81,8 +85,8 @@ PGO_FILE:=chrome-linux-$(PGO_VER).profdata
 define Download/PGO_PROF
 	URL:=https://storage.googleapis.com.cnpmjs.org/chromium-optimization-profiles/pgo_profiles \
 	     https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles \
-	     https://mirror01.download.immortalwrt.eu.org \
-	     https://mirror02.download.immortalwrt.eu.org
+	     https://sources.immortalwrt.org \
+	     https://sources.cdn.immortalwrt.org
 	URL_FILE:=$(PGO_FILE)
 	FILE:=$(PGO_FILE)
 	HASH:=8dcf5973033d40c9a7b15e571dea3832e7b67976aad9113369e22d43808c603f
diff --git a/tcpping/Makefile b/tcpping/Makefile
index 72e79e5b1..77cfc864e 100644
--- a/tcpping/Makefile
+++ b/tcpping/Makefile
@@ -1,38 +1,38 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tcpping
-PKG_VERSION:=0.2
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tcpping
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libnet-1.2.x
-  TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
-endef
-
-define Package/tcpping/description
-Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \
-		INSTALL_PROG=":"
-endef
-
-define Package/tcpping/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcpping
-endef
-
-$(eval $(call BuildPackage,tcpping))
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tcpping
+PKG_VERSION:=0.2
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/coolsnowwolf/tcping
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=d890cc1bd8e3951390ceeff1ccb092a5d802850c
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/tcpping
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libnet-1.2.x
+  TITLE:=Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
+endef
+
+define Package/tcpping/description
+Ping look-alike that uses TCP SYN packets to get around firewalls and ICMP blackholes
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.2.x/include -L$(STAGING_DIR)/usr/lib/libnet-1.2.x/lib" \
+		INSTALL_PROG=":"
+endef
+
+define Package/tcpping/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tcpping $(1)/usr/bin/tcpping
+endef
+
+$(eval $(call BuildPackage,tcpping))