diff --git a/image-extras/tplink_tl-wdr3600-v1/etc/uci-defaults/99-defaults b/image-extras/tplink_tl-wdr3600-v1/etc/uci-defaults/99-defaults
index e8ddaac..85d1fec 100644
--- a/image-extras/tplink_tl-wdr3600-v1/etc/uci-defaults/99-defaults
+++ b/image-extras/tplink_tl-wdr3600-v1/etc/uci-defaults/99-defaults
@@ -263,98 +263,98 @@ uci set firewall.@defaults[0].drop_invalid='1'
 uci set firewall.@defaults[0].synflood_protect='1'
 # ADD ZONES
 uci add firewall zone
-uci set firewall.@zone[2].name='vpn0'
-uci set firewall.@zone[2].input='ACCEPT'
-uci set firewall.@zone[2].forward='ACCEPT'
-uci set firewall.@zone[2].device='vpn0'
-uci set firewall.@zone[2].output='ACCEPT'
-uci set firewall.@zone[2].network='vpn0'
+uci set firewall.@zone[-1].name='vpn0'
+uci set firewall.@zone[-1].input='ACCEPT'
+uci set firewall.@zone[-1].forward='ACCEPT'
+uci set firewall.@zone[-1].device='vpn0'
+uci set firewall.@zone[-1].output='ACCEPT'
+uci set firewall.@zone[-1].network='vpn0'
 uci add firewall zone
-uci set firewall.@zone[3].name='vpn1'
-uci set firewall.@zone[3].input='ACCEPT'
-uci set firewall.@zone[3].forward='ACCEPT'
-uci set firewall.@zone[3].device='vpn1'
-uci set firewall.@zone[3].output='ACCEPT'
-uci set firewall.@zone[3].network='vpn1'
+uci set firewall.@zone[-1].name='vpn1'
+uci set firewall.@zone[-1].input='ACCEPT'
+uci set firewall.@zone[-1].forward='ACCEPT'
+uci set firewall.@zone[-1].device='vpn1'
+uci set firewall.@zone[-1].output='ACCEPT'
+uci set firewall.@zone[-1].network='vpn1'
 uci add firewall zone
-uci set firewall.@zone[4].name='vpn2'
-uci set firewall.@zone[4].input='ACCEPT'
-uci set firewall.@zone[4].forward='ACCEPT'
-uci set firewall.@zone[4].device='vpn2'
-uci set firewall.@zone[4].output='ACCEPT'
-uci set firewall.@zone[4].network='vpn2'
+uci set firewall.@zone[-1].name='vpn2'
+uci set firewall.@zone[-1].input='ACCEPT'
+uci set firewall.@zone[-1].forward='ACCEPT'
+uci set firewall.@zone[-1].device='vpn2'
+uci set firewall.@zone[-1].output='ACCEPT'
+uci set firewall.@zone[-1].network='vpn2'
 uci add firewall zone
-uci set firewall.@zone[5].name='vpn3'
-uci set firewall.@zone[5].input='ACCEPT'
-uci set firewall.@zone[5].forward='ACCEPT'
-uci set firewall.@zone[5].device='vpn3'
-uci set firewall.@zone[5].output='ACCEPT'
-uci set firewall.@zone[5].network='vpn3'
+uci set firewall.@zone[-1].name='vpn3'
+uci set firewall.@zone[-1].input='ACCEPT'
+uci set firewall.@zone[-1].forward='ACCEPT'
+uci set firewall.@zone[-1].device='vpn3'
+uci set firewall.@zone[-1].output='ACCEPT'
+uci set firewall.@zone[-1].network='vpn3'
 uci add firewall zone
-uci set firewall.@zone[6].name='wg777'
-uci set firewall.@zone[6].input='ACCEPT'
-uci set firewall.@zone[6].forward='ACCEPT'
-uci set firewall.@zone[6].output='ACCEPT'
-uci set firewall.@zone[6].network='wg777'
+uci set firewall.@zone[-1].name='wg777'
+uci set firewall.@zone[-1].input='ACCEPT'
+uci set firewall.@zone[-1].forward='ACCEPT'
+uci set firewall.@zone[-1].output='ACCEPT'
+uci set firewall.@zone[-1].network='wg777'
 uci add firewall zone
-uci set firewall.@zone[7].name='wg'
-uci set firewall.@zone[7].family='ipv4'
-uci set firewall.@zone[7].masq='1'
-uci set firewall.@zone[7].output='ACCEPT'
-uci set firewall.@zone[7].forward='REJECT'
-uci set firewall.@zone[7].input='REJECT'
-uci set firewall.@zone[7].mtu_fix='1'
-uci set firewall.@zone[7].network='wg0'
+uci set firewall.@zone[-1].name='wg'
+uci set firewall.@zone[-1].family='ipv4'
+uci set firewall.@zone[-1].masq='1'
+uci set firewall.@zone[-1].output='ACCEPT'
+uci set firewall.@zone[-1].forward='REJECT'
+uci set firewall.@zone[-1].input='REJECT'
+uci set firewall.@zone[-1].mtu_fix='1'
+uci set firewall.@zone[-1].network='wg0'
 
 # ADD RULES
 uci add firewall rule
-uci set firewall.@rule[10].target='ACCEPT'
-uci set firewall.@rule[10].src='wan'
-uci set firewall.@rule[10].proto='tcp udp'
-uci set firewall.@rule[10].dest_port='5001'
-uci set firewall.@rule[10].name='iperf '
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].src='wan'
+uci set firewall.@rule[-1].proto='tcp udp'
+uci set firewall.@rule[-1].dest_port='5001'
+uci set firewall.@rule[-1].name='iperf '
 uci add firewall rule
-uci set firewall.@rule[11].target='ACCEPT'
-uci set firewall.@rule[11].proto='udp'
-uci set firewall.@rule[11].dest_port='23555'
-uci set firewall.@rule[11].name='Allow-Baumana-Elmash-Inbound'
-uci set firewall.@rule[11].src='wan'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='23555'
+uci set firewall.@rule[-1].name='Allow-Baumana-Elmash-Inbound'
+uci set firewall.@rule[-1].src='wan'
 uci add firewall rule 
-uci set firewall.@rule[12].target='ACCEPT'
-uci set firewall.@rule[12].proto='udp'
-uci set firewall.@rule[12].dest_port='23556'
-uci set firewall.@rule[12].name='Allow-Elmash-Aramil-Inbound'
-uci set firewall.@rule[12].src='wan'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='23556'
+uci set firewall.@rule[-1].name='Allow-Elmash-Aramil-Inbound'
+uci set firewall.@rule[-1].src='wan'
 uci add firewall rule
-uci set firewall.@rule[13].target='ACCEPT'
-uci set firewall.@rule[13].proto='udp'
-uci set firewall.@rule[13].dest_port='23559'
-uci set firewall.@rule[13].name='Allow-Elmash-Olga-Inbound'
-uci set firewall.@rule[13].src='wan'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='23559'
+uci set firewall.@rule[-1].name='Allow-Elmash-Olga-Inbound'
+uci set firewall.@rule[-1].src='wan'
 uci add firewall rule
-uci set firewall.@rule[14].target='ACCEPT'
-uci set firewall.@rule[14].proto='udp'
-uci set firewall.@rule[14].dest_port='51820'
-uci set firewall.@rule[14].name='Allow-Wireguard-Hetzner'
-uci set firewall.@rule[14].src='wan'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='51820'
+uci set firewall.@rule[-1].name='Allow-Wireguard-Hetzner'
+uci set firewall.@rule[-1].src='wan'
 uci add firewall rule 
-uci set firewall.@rule[15].target='ACCEPT'
-uci set firewall.@rule[15].proto='udp'
-uci set firewall.@rule[15].dest_port='26261'
-uci set firewall.@rule[15].name='Allow-Wireguard-VPS'
-uci set firewall.@rule[15].src='wan'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='26261'
+uci set firewall.@rule[-1].name='Allow-Wireguard-VPS'
+uci set firewall.@rule[-1].src='wan'
 uci add firewall rule
-uci set firewall.@rule[16].target='ACCEPT'
-uci set firewall.@rule[16].proto='udp'
-uci set firewall.@rule[16].dest_port='23560'
-uci set firewall.@rule[16].name='Allow-Elmash-Pivko-Inbound'
-uci set firewall.@rule[16].src='wan'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='23560'
+uci set firewall.@rule[-1].name='Allow-Elmash-Pivko-Inbound'
+uci set firewall.@rule[-1].src='wan'
 uci add firewall rule 
-uci set firewall.@rule[17].target='ACCEPT'
-uci set firewall.@rule[17].proto='udp'
-uci set firewall.@rule[17].dest_port='27027'
-uci set firewall.@rule[17].src='wan'
-uci set firewall.@rule[17].name='Allow-Remote-Jurists-Inbound'
+uci set firewall.@rule[-1].target='ACCEPT'
+uci set firewall.@rule[-1].proto='udp'
+uci set firewall.@rule[-1].dest_port='27027'
+uci set firewall.@rule[-1].src='wan'
+uci set firewall.@rule[-1].name='Allow-Remote-Jurists-Inbound'
 
 #ADD IPSET
 uci add firewall ipset
@@ -375,31 +375,31 @@ uci set firewall.@rule[-1].family='ipv4'
 
 # ADD REDIRECT
 uci add firewall redirect
-uci set firewall.@redirect[0].target='DNAT'
-uci set firewall.@redirect[0].src='wan'
-uci set firewall.@redirect[0].dest='lan'
-uci set firewall.@redirect[0].proto='tcp'
-uci set firewall.@redirect[0].src_dport='5222'
-uci set firewall.@redirect[0].dest_port='5222'
-uci set firewall.@redirect[0].name='jabber1'
-uci set firewall.@redirect[0].dest_ip='192.168.77.2'
+uci set firewall.@redirect[-1].target='DNAT'
+uci set firewall.@redirect[-1].src='wan'
+uci set firewall.@redirect[-1].dest='lan'
+uci set firewall.@redirect[-1].proto='tcp'
+uci set firewall.@redirect[-1].src_dport='5222'
+uci set firewall.@redirect[-1].dest_port='5222'
+uci set firewall.@redirect[-1].name='jabber1'
+uci set firewall.@redirect[-1].dest_ip='192.168.77.2'
 uci add firewall redirect
-uci set firewall.@redirect[1].target='DNAT'
-uci set firewall.@redirect[1].src='wan'
-uci set firewall.@redirect[1].dest='lan'
-uci set firewall.@redirect[1].proto='tcp'
-uci set firewall.@redirect[1].src_dport='5223'
-uci set firewall.@redirect[1].dest_port='5223'
-uci set firewall.@redirect[1].name='jabber2'
-uci set firewall.@redirect[1].dest_ip='192.168.77.2'
+uci set firewall.@redirect[-1].target='DNAT'
+uci set firewall.@redirect[-1].src='wan'
+uci set firewall.@redirect[-1].dest='lan'
+uci set firewall.@redirect[-1].proto='tcp'
+uci set firewall.@redirect[-1].src_dport='5223'
+uci set firewall.@redirect[-1].dest_port='5223'
+uci set firewall.@redirect[-1].name='jabber2'
+uci set firewall.@redirect[-1].dest_ip='192.168.77.2'
 uci add firewall redirect
-uci set firewall.@redirect[2].target='DNAT'
-uci set firewall.@redirect[2].src='wan'
-uci set firewall.@redirect[2].dest='lan'
-uci set firewall.@redirect[2].proto='tcp'
-uci set firewall.@redirect[2].src_dport='5269'
-uci set firewall.@redirect[2].dest_port='5269'
-uci set firewall.@redirect[2].name='jabber3'
+uci set firewall.@redirect[-1].target='DNAT'
+uci set firewall.@redirect[-1].src='wan'
+uci set firewall.@redirect[-1].dest='lan'
+uci set firewall.@redirect[-1].proto='tcp'
+uci set firewall.@redirect[-1].src_dport='5269'
+uci set firewall.@redirect[-1].dest_port='5269'
+uci set firewall.@redirect[-1].name='jabber3'
 uci set firewall.@redirect[2].dest_ip='192.168.77.2'
 uci add firewall redirect
 uci set firewall.@redirect[3].target='DNAT'