diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index c6bfd7e..d408659 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -17,260 +17,248 @@ board=$(ramips_board_name)
 board_config_update
 
 case $board in
-	3g-6200n)
-		set_wifi_led "edimax:amber:wlan"
-		set_usb_led "edimax:blue:3g"
-		;;
-	3g-6200nl)
-		set_wifi_led "edimax:green:wlan"
-		;;
-	3g150b |\
-	3g300m)
-		set_usb_led "tenda:blue:3g"
-		;;
-	ai-br100)
-		ucidef_set_led_netdev "wan" "wan" "aigale:blue:wan" "eth0.2"
-		set_wifi_led "aigale:blue:wlan"
-		;;
-	a5-v11)
-		ucidef_set_led_default "power" "POWER" "a5-v11:red:power" "1"
-		;;
-	air3gii)
-		set_wifi_led "airlive:green:wlan"
-		set_usb_led "airlive:green:mobile"
-		;;
-	all0256n)
-		ucidef_set_rssimon "wlan0" "40000" "1"
-		ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
-		ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
-		ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	ar670w|\
-	ar725w|\
-	awapn2403)
-		set_wifi_led "rt2800soc-phy0::radio"
-		;;
-	asl26555)
-		ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1"
-		ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
-		set_wifi_led "asl26555:green:wlan"
-		set_usb_led "asl26555:green:3g"
-		;;
-	bc2)
-		set_usb_led "bc2:blue:usb"
-		;;
-	br6425)
-		set_wifi_led "edimax:orange:wlan"
-		;;
-	br-6475nd)
-		set_wifi_led "edimax:amber:wlan"
-		;;
-	broadway)
-		set_usb_led "red:diskmounted"
-		set_wifi_led "red:wps_active"
-		;;
-	br6524n)
-		set_wifi_led "edimax:blue:wlan"
-		;;
-	cf-wr800n)
-		ucidef_set_led_netdev "lan" "lan" "comfast:white:ethernet" eth0.1
-		set_wifi_led "comfast:white:wifi"
-		;;
-	cy-swr1100)
-		ucidef_set_led_default "wps" "WPS" "samsung:blue:wps" "0"
-		set_usb_led "samsung:blue:usb"
-		;;
-	d105)
-		ucidef_set_led_default "power" "POWER" "d105:red:power" "1"
-		set_usb_led "d105:green:usb"
-		;;
-	dcs-930l-b1)
-		ucidef_set_led_default "power" "POWER" "d-link:red:power" "1"
-		ucidef_set_led_netdev "wifi" "WiFi" "d-link:blue:wps"
-		;;
-	dir-300-b1|\
-	dir-600-b1|\
-	dir-600-b2|\
-	dir-620-a1)
-		# ANDed with vlan switch port 4 led state
-		ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	dir-615-d|\
-	dir-615-h1)
-		ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	dir-620-d1)
-		set_wifi_led "d-link:green:wifi"
-		;;
-	dir-810l)
-		ucidef_set_led_default "power" "POWER" "d-link:green:power" "1"
-		;;
-	dir-610-a1 |\
-	dir-300-b7 |\
-	dir-320-b1 |\
-	esr-9753)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	f5d8235-v1)
-		set_usb_led "f5d8235-v1:blue:storage"
-		;;
-	f5d8235-v2)
-		set_usb_led "f5d8235v2:blue:storage"
-		;;
-	fonera20n)
-		set_usb_led "fonera20n:orange:usb"
-		set_wifi_led "fonera20n:orange:wifi"
-		;;
-	hlk-rm04)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	ht-tm02)
-		ucidef_set_led_netdev "eth" "Ethernet" "ht-tm02:green:lan" "eth0"
-		set_wifi_led "ht-tm02:blue:wlan"
-		;;
-	all0239-3g|\
-	hw550-3g)
-		set_usb_led "hw550-3g:green:usb"
-		;;
-	mlw221|\
-	mlwg2)
-		set_wifi_led "kingston:blue:wifi"
-		ucidef_set_led_default "system" "system" "kingston:blue:system" "1"
-		;;
-	mofi3500-3gn)
-		set_usb_led "mofi3500-3gn:green:usb"
-		;;
-	mpr-a1)
-		set_wifi_led "hame:blue:system"
-		;;
-	mpr-a2)
-		set_wifi_led "hame:blue:system"
-		;;
-	mr-102n)
-		set_wifi_led "mr-102n:green:wlan"
-		set_usb_led "mr-102n:green:usb"
-		;;
-	mzk-w300nh2)
-		set_wifi_led "mzkw300nh2:amber:wlan"
-		;;
-	na930)
-		set_usb_led "na930:blue:status"
-		;;
-	nw718)
-		set_usb_led "nw718:amber:usb"
-		;;
-	m2m)
-		set_wifi_led "m2m:blue:wifi"
-		ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
-		;;
-	omni-emb-hpm)
-		ucidef_set_led_default "power" "POWER" "emb:orange:power" "1"
-		ucidef_set_led_netdev "eth" "ETH" "emb:green:eth" "eth0"
-		set_wifi_led "emb:green:wifi"
-		;;
-	omni-plug)
-		set_wifi_led "miniplug:green:wlan"
-		set_usb_led "miniplug:green:mobile"
-		;;
-	px4885)
-		set_wifi_led "7links:orange:wifi"
-		set_usb_led "7links:blue:storage"
-		;;
-    pbr-m1)
-        ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2"
-        ucidef_set_led_default "power" "power" "pbr-m1:green:power" "1"
-        ucidef_set_led_default "sys" "sys" "pbr-m1:green:sys" "1"
-        ;;
-	sap-g3200u3)
-		set_usb_led "storylink:green:usb"
-		;;
-	sl-r7205)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	v11st-fe)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	vocore)
-		ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
-		set_wifi_led "vocore:green:status"
-		;;
-	w306r-v20)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	w502u)
-		set_usb_led "alfa:blue:usb"
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	wcr-150gn)
-		set_usb_led "wcr150gn:amber:user"
-		;;
-	hg255d)
-		set_wifi_led "hg255d:wlan"
-		set_usb_led "hg255d:usb"
-		ucidef_set_led_interface "lan" "hg255d:internet"
-		;;
-	wnce2001)
-		set_wifi_led "netgear:green:wlan"
-		;;
-	re6500)
-		ucidef_set_led_default "power" "power" "linksys:white:power" "1"
-		ucidef_set_led_default "wifi" "wifi" "linksys:orange:wifi" "1"
-		;;
-	rt-n14u)
-		ucidef_set_led_default "power" "power" "asus:blue:power" "1"
-		ucidef_set_led_netdev "lan" "lan" "asus:blue:lan" eth0.1
-		ucidef_set_led_netdev "wan" "wan" "asus:blue:wan" eth0.2
-		set_wifi_led "asus:blue:air"
-		set_usb_led "asus:blue:usb"
-		;;
-	rp-n53)
-		ucidef_set_led_netdev "eth" "Network" "asus:white:back" "eth0"
-		set_wifi_led "asus:blue:wifi"
-		;;
-	whr-300hp2 |\
-	whr-600d |\
-	whr-1166d)
-		ucidef_set_led_default "power" "power" "buffalo:green:power" "1"
-		ucidef_set_led_default "router" "router" "buffalo:green:router" "1"
-		;;
-	zbt-wa05)
-		ucidef_set_led_default "power" "power" "zbtlink:blue:power" "1"
-		set_wifi_led "zbtlink:blue:air"
-		set_usb_led "zbtlink:blue:usb"
-		;;
-	oy-0001)
-		ucidef_set_led_default "power" "power" "oy:green:power" "1"
-		set_wifi_led "oy:green:wifi"
-		;;
-	wr8305rt)
-		ucidef_set_led_default "power" "power" "wr8305rt:sys" "1"
-		set_usb_led "wr8305rt:usb"
-		set_wifi_led "wr8305rt:wifi"
-		;;
-	wt1520)
-		set_wifi_led "rt2800pci-phy0::radio"
-		;;
-	wt3020)
-		ucidef_set_led_default "power" "power" "nexx:blue:power" "0"
-		;;
-	xiaomi-miwifi-mini)
-		ucidef_set_led_default "power" "power" "xiaomi:red:status" "1"
-		;;
-	y1 |\
-	y1s)
-		ucidef_set_led_default "power" "power" "lenovo:blue:power" "1"
-		set_usb_led "lenovo:blue:usb"
-		set_wifi_led "lenovo:blue:wifi"
-		;;
-	zte-q7)
-		set_wifi_led "zte:blue:status"
-		;;
-	mzk-dp150n)
-		ucidef_set_led_default "power" "power" "mzkdp150n:green:power" "1"
-		;;
+3g-6200n)
+	set_wifi_led "edimax:amber:wlan"
+	set_usb_led "edimax:blue:3g"
+	;;
+3g-6200nl)
+	set_wifi_led "edimax:green:wlan"
+	;;
+3g150b|\
+3g300m)
+	set_usb_led "tenda:blue:3g"
+	;;
+ai-br100)
+	ucidef_set_led_netdev "wan" "wan" "aigale:blue:wan" "eth0.2"
+	set_wifi_led "aigale:blue:wlan"
+	;;
+a5-v11)
+	ucidef_set_led_default "power" "POWER" "a5-v11:red:power" "1"
+	;;
+air3gii)
+	set_wifi_led "airlive:green:wlan"
+	set_usb_led "airlive:green:mobile"
+	;;
+all0256n)
+	ucidef_set_rssimon "wlan0" "40000" "1"
+	ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
+	ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
+	ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+ar670w|\
+ar725w|\
+awapn2403)
+	set_wifi_led "rt2800soc-phy0::radio"
+	;;
+asl26555)
+	ucidef_set_led_default "power" "POWER" "asl26555:green:power" "1"
+	ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
+	set_wifi_led "asl26555:green:wlan"
+	set_usb_led "asl26555:green:3g"
+	;;
+bc2)
+	set_usb_led "bc2:blue:usb"
+	;;
+br6425)
+	set_wifi_led "edimax:orange:wlan"
+	;;
+br-6475nd)
+	set_wifi_led "edimax:amber:wlan"
+	;;
+broadway)
+	set_usb_led "red:diskmounted"
+	set_wifi_led "red:wps_active"
+	;;
+br6524n)
+	set_wifi_led "edimax:blue:wlan"
+	;;
+cf-wr800n)
+	ucidef_set_led_netdev "lan" "lan" "comfast:white:ethernet" eth0.1
+	set_wifi_led "comfast:white:wifi"
+	;;
+cy-swr1100)
+	ucidef_set_led_default "wps" "WPS" "samsung:blue:wps" "0"
+	set_usb_led "samsung:blue:usb"
+	;;
+d105)
+	ucidef_set_led_default "power" "POWER" "d105:red:power" "1"
+	set_usb_led "d105:green:usb"
+	;;
+dcs-930l-b1)
+	ucidef_set_led_default "power" "POWER" "d-link:red:power" "1"
+	ucidef_set_led_netdev "wifi" "WiFi" "d-link:blue:wps"
+	;;
+dir-300-b1|\
+dir-600-b1|\
+dir-600-b2|\
+dir-620-a1)
+	# ANDed with vlan switch port 4 led state
+	ucidef_set_led_default "wan" "WAN LED (amber)" "d-link:amber:wan" "1"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-615-d|\
+dir-615-h1)
+	ucidef_set_led_default "status" "Status LED (amber)" "d-link:amber:status" "0"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+dir-620-d1)
+	set_wifi_led "d-link:green:wifi"
+	;;
+dir-810l)
+	ucidef_set_led_default "power" "POWER" "d-link:green:power" "1"
+	;;
+dir-300-b7|\
+dir-320-b1|\
+dir-610-a1|\
+esr-9753|\
+hlk-rm04|\
+sl-r7205|\
+v11st-fe|\
+w306r-v20|\
+wt1520)
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+f5d8235-v1)
+	set_usb_led "f5d8235-v1:blue:storage"
+	;;
+f5d8235-v2)
+	set_usb_led "f5d8235v2:blue:storage"
+	;;
+fonera20n)
+	set_usb_led "fonera20n:orange:usb"
+	set_wifi_led "fonera20n:orange:wifi"
+	;;
+ht-tm02)
+	ucidef_set_led_netdev "eth" "Ethernet" "ht-tm02:green:lan" "eth0"
+	set_wifi_led "ht-tm02:blue:wlan"
+	;;
+all0239-3g|\
+hw550-3g)
+	set_usb_led "hw550-3g:green:usb"
+	;;
+mlw221|\
+mlwg2)
+	set_wifi_led "kingston:blue:wifi"
+	ucidef_set_led_default "system" "system" "kingston:blue:system" "1"
+	;;
+mofi3500-3gn)
+	set_usb_led "mofi3500-3gn:green:usb"
+	;;
+mpr-a1|\
+mpr-a2)
+	set_wifi_led "hame:blue:system"
+	;;
+mr-102n)
+	set_wifi_led "mr-102n:green:wlan"
+	set_usb_led "mr-102n:green:usb"
+	;;
+mzk-w300nh2)
+	set_wifi_led "mzkw300nh2:amber:wlan"
+	;;
+na930)
+	set_usb_led "na930:blue:status"
+	;;
+nw718)
+	set_usb_led "nw718:amber:usb"
+	;;
+m2m)
+	set_wifi_led "m2m:blue:wifi"
+	ucidef_set_led_netdev "eth" "Ethernet" "m2m:green:wan" "eth0"
+	;;
+omni-emb-hpm)
+	ucidef_set_led_default "power" "POWER" "emb:orange:power" "1"
+	ucidef_set_led_netdev "eth" "ETH" "emb:green:eth" "eth0"
+	set_wifi_led "emb:green:wifi"
+	;;
+omni-plug)
+	set_wifi_led "miniplug:green:wlan"
+	set_usb_led "miniplug:green:mobile"
+	;;
+px4885)
+	set_wifi_led "7links:orange:wifi"
+	set_usb_led "7links:blue:storage"
+	;;
+pbr-m1)
+	ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet" "eth0.2"
+	ucidef_set_led_default "power" "power" "pbr-m1:green:power" "1"
+	ucidef_set_led_default "sys" "sys" "pbr-m1:green:sys" "1"
+	;;
+sap-g3200u3)
+	set_usb_led "storylink:green:usb"
+	;;
+vocore)
+	ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
+	set_wifi_led "vocore:green:status"
+	;;
+w502u)
+	set_usb_led "alfa:blue:usb"
+	set_wifi_led "rt2800pci-phy0::radio"
+	;;
+wcr-150gn)
+	set_usb_led "wcr150gn:amber:user"
+	;;
+hg255d)
+	set_wifi_led "hg255d:wlan"
+	set_usb_led "hg255d:usb"
+	ucidef_set_led_interface "lan" "hg255d:internet"
+	;;
+wnce2001)
+	set_wifi_led "netgear:green:wlan"
+	;;
+re6500)
+	ucidef_set_led_default "power" "power" "linksys:white:power" "1"
+	ucidef_set_led_default "wifi" "wifi" "linksys:orange:wifi" "1"
+	;;
+rt-n14u)
+	ucidef_set_led_default "power" "power" "asus:blue:power" "1"
+	ucidef_set_led_netdev "lan" "lan" "asus:blue:lan" eth0.1
+	ucidef_set_led_netdev "wan" "wan" "asus:blue:wan" eth0.2
+	set_wifi_led "asus:blue:air"
+	set_usb_led "asus:blue:usb"
+	;;
+rp-n53)
+	ucidef_set_led_netdev "eth" "Network" "asus:white:back" "eth0"
+	set_wifi_led "asus:blue:wifi"
+	;;
+whr-300hp2|\
+whr-600d|\
+whr-1166d)
+	ucidef_set_led_default "power" "power" "buffalo:green:power" "1"
+	ucidef_set_led_default "router" "router" "buffalo:green:router" "1"
+	;;
+zbt-wa05)
+	ucidef_set_led_default "power" "power" "zbtlink:blue:power" "1"
+	set_wifi_led "zbtlink:blue:air"
+	set_usb_led "zbtlink:blue:usb"
+	;;
+oy-0001)
+	ucidef_set_led_default "power" "power" "oy:green:power" "1"
+	set_wifi_led "oy:green:wifi"
+	;;
+wr8305rt)
+	ucidef_set_led_default "power" "power" "wr8305rt:sys" "1"
+	set_usb_led "wr8305rt:usb"
+	set_wifi_led "wr8305rt:wifi"
+	;;
+wt3020)
+	ucidef_set_led_default "power" "power" "nexx:blue:power" "0"
+	;;
+xiaomi-miwifi-mini)
+	ucidef_set_led_default "power" "power" "xiaomi:red:status" "1"
+	;;
+y1|\
+y1s)
+	ucidef_set_led_default "power" "power" "lenovo:blue:power" "1"
+	set_usb_led "lenovo:blue:usb"
+	set_wifi_led "lenovo:blue:wifi"
+	;;
+zte-q7)
+	set_wifi_led "zte:blue:status"
+	;;
+mzk-dp150n)
+	ucidef_set_led_default "power" "power" "mzkdp150n:green:power" "1"
+	;;
 esac
 
 board_config_flush
diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index da1854a..334e889 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -42,171 +42,150 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 6t"
 		;;
-
-	3g150b | \
-	3g300m | \
-	microwrt | \
-	w150m | \
-	zte-q7 | \
-	all0256n | \
-	all5002 | \
-	all5003 | \
-	broadway | \
-	dcs-930| \
-	dcs-930l-b1| \
-	ht-tm02| \
-	ncs601w | \
+	3g150b|\
+	3g300m|\
+	microwrt|\
+	w150m|\
+	zte-q7|\
+	all0256n|\
+	all5002|\
+	all5003|\
+	broadway|\
+	dcs-930|\
+	dcs-930l-b1|\
+	ht-tm02|\
+	ncs601w|\
 	wnce2001)
 		ucidef_add_switch "switch0" "1" "0"
 		ucidef_set_interface_lan "eth0"
 		;;
-
-	3g-6200nl | \
-	mlw221 | \
+	3g-6200nl|\
+	mlw221|\
 	mr-102n)
 		ucidef_set_interface_lan "eth0.2"
 		;;
-	mlwg2)
-		ucidef_set_interface_lan "eth0.1"
-		;;
-
 	m2m)
 		ucidef_add_switch "switch0" "4"
 		ucidef_set_interface_lan "eth0"
 		;;
-
-	wizard8800 | \
-	wl-330n | \
+	mlwg2|\
+	wizard8800|\
+	wl-330n|\
 	wmr300)
 		ucidef_set_interface_lan "eth0.1"
 		;;
-
-	b2c | \
-	nw718 | \
-	psr-680w | \
-	sl-r7205 | \
-	w502u | \
+	b2c|\
+	nw718|\
+	psr-680w|\
+	sl-r7205|\
+	ur-336un|\
+	w502u|\
 	wr6202)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
-
 	awapn2403)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 6t"
 		ucidef_add_switch_vlan "switch0" "2" "1 6t"
 		;;
-
 	br-6475nd)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 9t"
 		ucidef_add_switch_vlan "switch0" "2" "0 9t"
 		;;
-
-        re6500 | \
+	re6500|\
 	asl26555)
 		ucidef_set_interface_lan "eth0.1"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t"
 		;;
-
 	cf-wr800n)
 		ucidef_set_interface_lan "eth0.1"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "4 6t"
 		;;
-
 	cy-swr1100)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 9t"
 		ucidef_add_switch_vlan "switch0" "2" "4 9t"
 		;;
-
-	3g-6200n | \
-	ai-br100 | \
-	dir-610-a1 | \
-	dir-300-b7 | \
-	dir-320-b1 | \
-	dir-615-h1 | \
-	firewrt | \
-	pbr-m1 | \
-	hlk-rm04 | \
-	mt7621 | \
-	mt7628 | \
-	mzk-w300nh2 | \
-	mzk-750dhp | \
-	whr-300hp2 | \
-	whr-600d | \
-	oy-0001 | \
-	sap-g3200u3 | \
-	wsr-600 | \
-	wsr-1166 | \
-	wt1520 | \
-	xiaomi-miwifi-mini |\
+	3g-6200n|\
+	ai-br100|\
+	dir-610-a1|\
+	dir-300-b7|\
+	dir-320-b1|\
+	dir-615-h1|\
+	firewrt|\
+	pbr-m1|\
+	hlk-rm04|\
+	mt7621|\
+	mt7628|\
+	mzk-w300nh2|\
+	mzk-750dhp|\
+	whr-300hp2|\
+	whr-600d|\
+	oy-0001|\
+	sap-g3200u3|\
+	wsr-600|\
+	wsr-1166|\
+	wt1520|\
+	xiaomi-miwifi-mini|\
 	y1)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t"
 		ucidef_add_switch_vlan "switch0" "2" "4 6t"
 		;;
-
 	whr-1166d)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 6t"
 		ucidef_add_switch_vlan "switch0" "2" "5 6t"
 		;;
-
-	awm002-evb | \
-	awm003-evb | \
-	argus-atp52b | \
-	dir-645 | \
-	dir-860l-b1 | \
-	f5d8235-v1 | \
-	f5d8235-v2 | \
-	hg255d | \
-	rt-n14u | \
-	wrtnode | \
-	wt3020 | \
-	ur-326n4g | \
+	awm002-evb|\
+	awm003-evb|\
+	argus-atp52b|\
+	dir-645|\
+	dir-860l-b1|\
+	f5d8235-v1|\
+	f5d8235-v2|\
+	hg255d|\
+	rt-n14u|\
+	wrtnode|\
+	wt3020|\
+	ur-326n4g|\
 	zbt-wa05)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t"
 		ucidef_add_switch_vlan "switch0" "2" "0 6t"
 		;;
-
-	ur-336un)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		;;
-
-	br6524n | \
-	v11st-fe)
+	br6524n|\
+	v11st-fe|\
+	wzr-agl300nh)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
 		ucidef_add_switch_vlan "switch0" "2" "0 5t"
 		;;
-
-	ar670w | \
-	ar725w | \
-	rt-n15 | \
+	ar670w|\
+	ar725w|\
+	rt-n15|\
 	wl-351)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
 		ucidef_add_switch_vlan "switch0" "2" "4 5t"
 		;;
-
 	rt-n56u)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 8t"
 		ucidef_add_switch_vlan "switch0" "2" "4 8t"
 		;;
-
 	tew-691gr|\
 	tew-692gr)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
@@ -214,61 +193,43 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
 		ucidef_add_switch_vlan "switch0" "2" "0t 5"
 		;;
-
+	mzk-dp150n|\
 	vocore)
 		ucidef_set_interface_lan "eth0.1"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 4 6t"
 		;;
-
 	wcr-150gn)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 6t"
 		ucidef_add_switch_vlan "switch0" "2" "6t"
 		;;
-
 	wr8305rt)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t"
 		ucidef_add_switch_vlan "switch0" "2" "4 6t"
 		;;
-
 	y1s)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5 6t"
 		ucidef_add_switch_vlan "switch0" "2" "0 6t"
 		;;
-	d105 | \
-	na930 | \
+	d105|\
+	na930|\
 	omni-emb-hpm|\
 	wli-tx4-ag300n)
 		ucidef_set_interface_lan "eth0"
 		;;
-
-	e1700 | \
+	e1700|\
 	mt7620a_mt7530)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch1" "1" "1"
 		ucidef_add_switch_vlan "switch1" "1" "0 1 2 3 6t"
 		ucidef_add_switch_vlan "switch1" "2" "4 6t"
 		;;
-
-	wzr-agl300nh)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "switch0" "1" "1"
-		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "switch0" "2" "0 5t"
-		;;
-
-	mzk-dp150n)
-		ucidef_set_interface_lan "eth0.1"
-		ucidef_add_switch "switch0" "1" "1"
-		ucidef_add_switch_vlan "switch0" "1" "0 4 6t"
-		;;
-
 	*)
 		RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"`
 		if [ -n "${RT3X5X}" ]; then
@@ -291,89 +252,79 @@ ramips_setup_macs()
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(mtd_get_mac_binary devdata 7)
 		;;
-
 	oy-0001)
 		lan_mac=$(mtd_get_mac_binary factory 40)
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
-
 	w306r-v20)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 5)
 		;;
-
 	tew-691gr)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 3)
 		;;
-
 	tew-692gr)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 4)
 		;;
-
-	m3 |\
-	m4 |\
-	x5 |\
+	m3|\
+	m4|\
+	x5|\
 	x8)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_add "$lan_mac" -2)
 		;;
-
-	a5-v11 |\
-	bc2 |\
-	broadway |\
-	d105 |\
-	dir-620-a1 |\
-	esr-9753 |\
-	freestation5 |\
-	hlk-rm04 | \
-	mpr-a1 | \
-	mpr-a2 | \
-	dir-300-b7 | \
-	dir-320-b1 | \
-	psr-680w |\
-	sl-r7205 |\
-	y1 |\
+	a5-v11|\
+	bc2|\
+	broadway|\
+	d105|\
+	dir-620-a1|\
+	esr-9753|\
+	freestation5|\
+	hlk-rm04|\
+	mpr-a1|\
+	mpr-a2|\
+	dir-300-b7|\
+	dir-320-b1|\
+	psr-680w|\
+	sl-r7205|\
+	y1|\
 	y1s)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
-
 	ht-tm02)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		;;
-
-	cy-swr1100 | \
+	cy-swr1100|\
 	dir-645)
 		lan_mac=$(mtd_get_mac_ascii nvram lanmac)
 		wan_mac=$(mtd_get_mac_ascii nvram wanmac)
 		;;
-
 	e1700)
 		wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
 		;;
-
 	wcr-150gn)
 		wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
-
 	rt-n56u)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(mtd_get_mac_binary factory 32772)
 		;;
-
-	all0239-3g | \
-	carambola | \
-	freestation5 | \
-	w502u | \
+	all0239-3g|\
+	carambola|\
+	freestation5|\
+	w502u|\
 	wnce2001)
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
-
-	wsr-600|whr-300hp2|whr-600d|whr-1166d)
+	whr-1166d|\
+	whr-300hp2|\
+	whr-600d|\
+	wsr-600)
 		wan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$wan_mac
 		;;
@@ -386,7 +337,6 @@ ramips_setup_macs()
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
-
 	esac
 
 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
