diff --git a/avl b/avl
index ddd5d5a..acc6822 100644
--- a/avl
+++ b/avl
@@ -1,45 +1,49 @@
 config section avl
-    option 'enabled' '0'
-    option 'hostname' '192.168.0.1'
-    option 'port' '8501'
-    option 'proto' 'tcp'
-    option 'con_cont' '0'
-    option 'send_retry' '0'
-    option 'static_navigation' '0'
+	option enabled '0'
+	option con_cont '0'
+	option send_retry '0'
+	option static_navigation '0'
+	option send_empty '0'
+	option timeout_empty '2'
 
 config section avl_rule_main
-    option 'enabled' '1'
-    option 'priority' 'low'
-    option 'distance' '50'
-    option 'collect_period' '5'
-    option 'angle' '50'
-    option 'saved_records' '20'
-    option 'send_period' '60'
+	option enabled '1'
+	option priority 'low'
+	option distance '50'
+	option collect_period '5'
+	option angle '50'
+	option saved_records '20'
+	option send_period '60'
+	option accuracy '10'
 
 config avl_rule
-    option 'enabled' '1'
-    option 'priority' 'low'
-    option 'name' 'mobile_home and roaming'
-    option 'distance' '25'
-    option 'collect_period' '10'
-    option 'angle' '25'
-    option 'saved_records' '10'
-    option 'send_period' '10'
-    option 'wan_status' 'mobile_home'
-    option 'din_status' 'high'
-    option 'io_type' 'gpio'
-    option 'io_name' 'din1'
+	option enabled '1'
+	option priority 'low'
+	option name 'mobile_home and roaming'
+	option distance '25'
+	option collect_period '10'
+	option angle '25'
+	option saved_records '10'
+	option send_period '10'
+	option wan_status 'mobile_home'
+	option din_status 'high'
+	option io_type 'gpio'
+	option io_name 'din1'
+	option accuracy '10'
+	option ignore '0'
 
 config avl_rule
-    option 'enabled' '1'
-    option 'priority' 'high'
-    option 'name' 'roaming'
-    option 'distance' '200'
-    option 'collect_period' '100'
-    option 'angle' '50'
-    option 'saved_records' '20'
-    option 'send_period' '100'
-    option 'wan_status' 'mobile_roaming'
+	option enabled '1'
+	option priority 'high'
+	option name 'roaming'
+	option distance '200'
+	option collect_period '100'
+	option angle '50'
+	option saved_records '20'
+	option send_period '100'
+	option wan_status 'mobile_roaming'
+	option accuracy '10'
+	option ignore '1'
 
 config tavl_rule
 	option enabled '0'
@@ -50,3 +54,8 @@ config tavl_rule
 	option enabled '0'
 	option type 'gpio'
 	option name 'din1'
+
+config tavl_rule
+	option type 'GPS'
+	option name 'HDOP'
+	option enabled '0'
diff --git a/bgp b/bgp
new file mode 100644
index 0000000..1e87058
--- /dev/null
+++ b/bgp
@@ -0,0 +1,3 @@
+config bgp_general 'bgp'
+
+config bgp_instance 'general'
diff --git a/ble_devices b/ble_devices
index e69de29..8b13789 100644
--- a/ble_devices
+++ b/ble_devices
@@ -0,0 +1 @@
+
diff --git a/blesem b/blesem
index beec757..ba53d67 100644
--- a/blesem
+++ b/blesem
@@ -1,7 +1,5 @@
-
-config section 'general'
-	option enabled '0'
+config section general
+	option 'enabled' '0'
 
 config app 'settings'
 	option refresh_time '30000'
-
diff --git a/call_utils b/call_utils
index fd614bc..97944eb 100644
--- a/call_utils
+++ b/call_utils
@@ -1,4 +1,3 @@
 config call 'call'
-	option ringing '0'
 	option action 'reject'
 	option enabled '1'
diff --git a/cli b/cli
index b6a89bb..080ee3f 100644
--- a/cli
+++ b/cli
@@ -1,4 +1,3 @@
-
 config status 'status'
 	option enable '1'
 	option port '4200-4220'
@@ -6,4 +5,3 @@ config status 'status'
 	option _cliWanAccess '0'
 
 config cli
-
diff --git a/connchecker b/connchecker
new file mode 100644
index 0000000..5742fed
--- /dev/null
+++ b/connchecker
@@ -0,0 +1,6 @@
+config globals 'globals'
+    option enabled '1'
+    option track_ipv4 '1.1.1.1'
+    option track_ipv6 '2a00:1450:4001:831::200e'
+    option track_domain 'dns.google.com'
+    option interval '60'
diff --git a/data_sender b/data_sender
new file mode 100644
index 0000000..2536532
--- /dev/null
+++ b/data_sender
@@ -0,0 +1,2 @@
+config settings 'settings'
+	option loglevel '1'
diff --git a/dfota b/dfota
new file mode 100644
index 0000000..f4ace17
--- /dev/null
+++ b/dfota
@@ -0,0 +1,2 @@
+config dfota 'config'
+    option notify '1'
\ No newline at end of file
diff --git a/dhcp b/dhcp
index 387dff8..903d1c3 100644
--- a/dhcp
+++ b/dhcp
@@ -22,10 +22,10 @@ config dhcp 'lan'
 	option start '100'
 	option limit '150'
 	option leasetime '12h'
-	option relay_enabled '0'
-	option force '0'
-
-config dhcp 'wan'
-	option interface 'wan'
-	option ignore '1'
+	option dhcpv6 'server'
+	option ra 'server'
+	option ra_slaac '1'
+	list ra_flags 'managed-config'
+	list ra_flags 'other-config'
+	option ignore_ipv6 '1'
 
diff --git a/dot1x b/dot1x
new file mode 100644
index 0000000..25d61e4
--- /dev/null
+++ b/dot1x
@@ -0,0 +1,26 @@
+
+config port '_lan1'
+	option role 'client'
+	option enabled '0'
+	option iface 'lan1'
+
+config port '_lan2'
+	option role 'client'
+	option enabled '0'
+	option iface 'lan2'
+
+config port '_lan3'
+	option role 'client'
+	option enabled '0'
+	option iface 'lan3'
+
+config port '_lan4'
+	option role 'client'
+	option enabled '0'
+	option iface 'lan4'
+
+config port '_wan5'
+	option role 'client'
+	option enabled '0'
+	option iface 'wan'
+
diff --git a/dropbear b/dropbear
index 0b22d23..7cab5aa 100644
--- a/dropbear
+++ b/dropbear
@@ -1,9 +1,9 @@
 
 config dropbear
 	option PasswordAuth 'on'
-	option RootPasswordAuth 'on'
+	option RootPasswordAuth '1'
 	option Port '22'
 	option enable '1'
-	option enable_key_ssh '0'
+	option IdleTimeout '1800'
 	option _sshWanAccess '1'
 
diff --git a/eigrp b/eigrp
new file mode 100644
index 0000000..343d482
--- /dev/null
+++ b/eigrp
@@ -0,0 +1 @@
+config eigrp_general 'eigrp'
diff --git a/etherwake b/etherwake
index f218f08..53940d8 100644
--- a/etherwake
+++ b/etherwake
@@ -1,6 +1,6 @@
 config 'etherwake' 'setup'
 	# possible program paths
-	option 'pathes' '/usr/bin/etherwake /usr/bin/ether-wake'
+	option 'pathes' '/usr/bin/etherwake /usr/bin/ether-wake /usr/local/usr/bin/etherwake /usr/local/usr/bin/ether-wake'
 	# use sudo, defaults to off
 	option 'sudo' 'off'
 	# interface, defaults to 'eth0'
diff --git a/firewall b/firewall
index 1c5a457..cc67251 100644
--- a/firewall
+++ b/firewall
@@ -4,13 +4,14 @@ config defaults '1'
 	option input 'REJECT'
 	option output 'ACCEPT'
 	option forward 'REJECT'
+	option flow_offloading '0'
 
 config zone '2'
 	option name 'lan'
+	list network 'lan'
 	option input 'ACCEPT'
 	option output 'ACCEPT'
 	option forward 'ACCEPT'
-	option network 'lan'
 
 config zone '3'
 	option name 'wan'
@@ -28,7 +29,7 @@ config forwarding '4'
 config rule '5'
 	option name 'Allow-DHCP-Renew'
 	option src 'wan'
-	option proto 'udp'
+	list proto 'udp'
 	option dest_port '68'
 	option target 'ACCEPT'
 	option family 'ipv4'
@@ -37,7 +38,7 @@ config rule '5'
 config rule '6'
 	option name 'Allow-Ping'
 	option src 'wan'
-	option proto 'icmp'
+	list proto 'icmp'
 	option icmp_type 'echo-request'
 	option family 'ipv4'
 	option target 'ACCEPT'
@@ -46,7 +47,7 @@ config rule '6'
 config rule '7'
 	option name 'Allow-IGMP'
 	option src 'wan'
-	option proto 'igmp'
+	list proto 'igmp'
 	option family 'ipv4'
 	option target 'ACCEPT'
 	option priority '3'
@@ -54,7 +55,7 @@ config rule '7'
 config rule '8'
 	option name 'Allow-DHCPv6'
 	option src 'wan'
-	option proto 'udp'
+	list proto 'udp'
 	option src_ip 'fc00::/6'
 	option dest_ip 'fc00::/6'
 	option dest_port '546'
@@ -65,7 +66,7 @@ config rule '8'
 config rule '9'
 	option name 'Allow-MLD'
 	option src 'wan'
-	option proto 'icmp'
+	list proto 'icmp'
 	option src_ip 'fe80::/10'
 	list icmp_type '130/0'
 	list icmp_type '131/0'
@@ -78,7 +79,7 @@ config rule '9'
 config rule '10'
 	option name 'Allow-ICMPv6-Input'
 	option src 'wan'
-	option proto 'icmp'
+	list proto 'icmp'
 	list icmp_type 'echo-request'
 	list icmp_type 'echo-reply'
 	list icmp_type 'destination-unreachable'
@@ -99,7 +100,7 @@ config rule '11'
 	option name 'Allow-ICMPv6-Forward'
 	option src 'wan'
 	option dest '*'
-	option proto 'icmp'
+	list proto 'icmp'
 	list icmp_type 'echo-request'
 	list icmp_type 'echo-reply'
 	list icmp_type 'destination-unreachable'
@@ -116,7 +117,7 @@ config rule '12'
 	option name 'Allow-IPSec-ESP'
 	option src 'wan'
 	option dest 'lan'
-	option proto 'esp'
+	list proto 'esp'
 	option target 'ACCEPT'
 	option priority '8'
 
@@ -125,75 +126,72 @@ config rule '13'
 	option src 'wan'
 	option dest 'lan'
 	option dest_port '500'
-	option proto 'udp'
+	list proto 'udp'
 	option target 'ACCEPT'
 	option priority '9'
 
-config rule '14'
-	option name 'Support-UDP-Traceroute'
-	option src 'wan'
-	option dest_port '33434:33689'
-	option proto 'udp'
-	option family 'ipv4'
-	option target 'REJECT'
-	option enabled 'false'
-	option priority '10'
-
-config include '15'
+config include '14'
 	option path '/etc/firewall.user'
 
-config rule '16'
+config rule '15'
 	option dest_port '22'
-	option proto 'tcp'
+	list proto 'tcp'
 	option name 'Enable_SSH_WAN'
 	option target 'ACCEPT'
 	option src 'wan'
-	option priority '11'
+	option priority '10'
 
-config rule '17'
-	option dest_port '80'
-	option proto 'tcp'
+config rule '16'
+	list proto 'tcp'
 	option name 'Enable_HTTP_WAN'
 	option target 'ACCEPT'
 	option src 'wan'
-	option priority '12'
+	option priority '11'
+	list dest_port '80'
 
-config rule '18'
-	option dest_port '443'
-	option proto 'tcp'
+config rule '17'
+	list proto 'tcp'
 	option name 'Enable_HTTPS_WAN'
 	option target 'ACCEPT'
 	option src 'wan'
-	option priority '13'
+	option priority '12'
+	list dest_port '443'
 
-config rule '19'
+config rule '18'
 	option dest_port '4200-4220'
-	option proto 'tcp'
+	list proto 'tcp'
 	option name 'Enable_CLI_WAN'
 	option target 'ACCEPT'
 	option src 'wan'
 	option enabled '0'
-	option priority '14'
+	option priority '13'
 
-config include '20'
-	option path '/etc/add-rs-rule.sh'
-	option reload '1'
+config rule '19'
+	option src_port '5353'
+	option src 'lan'
+	option name 'Allow-mDNS'
+	option target 'ACCEPT'
+	list dest_ip '224.0.0.251'
+	option dest_port '5353'
+	list proto 'udp'
+	option priority '14'
 
 config include 'pscan'
 	option port_scan '0'
 	option type 'script'
 	option reload '1'
-	option path '/usr/bin/port-scan-prevention'
+	option path '/usr/bin/attack_prevention'
+
+config rule '20'
+	option src 'lan'
+	option name 'Block LAN'
+	option priority '15'
+	option dest 'wan'
+	option enabled '1'
+	list proto 'all'
+	option target 'DROP'
 
 config rule '21'
-	option dest_port '23'
-	option proto 'tcp udp'
-	option name 'Enable_TELNET_WAN'
-	option target 'ACCEPT'
-	option src 'wan'
-	option enabled '0'
-
-config rule '22'
 	option dest_port '502'
 	option proto 'tcp'
 	option name 'Enable_MODBUSD_WAN'
@@ -201,9 +199,3 @@ config rule '22'
 	option src 'wan'
 	option enabled '1'
 
-config include 'miniupnpd'
-	option type 'script'
-	option path '/usr/share/miniupnpd/firewall.include'
-	option family 'any'
-	option reload '1'
-
diff --git a/fstab b/fstab
index 6f7648e..75b84e2 100644
--- a/fstab
+++ b/fstab
@@ -1,7 +1,7 @@
 config global
-        option anon_swap '0'
-        option anon_mount '1'
-        option auto_swap '1'
-        option auto_mount '1'
-        option delay_root '5'
-        option check_fs '0'
+	option anon_swap '0'
+	option anon_mount '1'
+	option auto_swap '1'
+	option auto_mount '1'
+	option delay_root '5'
+	option check_fs '0'
diff --git a/gps b/gps
index c8cab2f..1fe160b 100644
--- a/gps
+++ b/gps
@@ -1,15 +1,15 @@
 
 config section 'gpsd'
 	option enabled '1'
+	option glonass_sup '7'
 	option galileo_sup '1'
 	option beidou_sup '3'
-	option glonass_sup '7'
+	option dpo_enabled '0'
 
 config section 'nmea_forwarding'
 	option enabled '0'
-	option port '8500'
-	option proto 'tcp'
-	option con_contain '0'
+
+config section 'nmea_serial_forwarding'
 
 config section 'nmea_forwarding_cache'
 	option type 'ram'
@@ -84,19 +84,6 @@ config nmea_rule 'PQGSA'
 	option collecting_enabled '0'
 	option collecting_interval '5'
 
-config section 'https'
-	option enabled '0'
-
-config https_tavl_rule
-	option enabled '0'
-	option type 'mobile'
-	option name 'signal'
-
-config https_tavl_rule
-	option enabled '0'
-	option type 'gpio'
-	option name 'din1'
-
 config nmea_rule 'GARMC'
 	option forwarding_enabled '0'
 	option forwarding_interval '5'
@@ -127,13 +114,13 @@ config nmea_rule 'GBGSV'
 	option collecting_enabled '0'
 	option collecting_interval '5'
 
-config nmea_rule 'GQGSV'
+config nmea_rule 'GBGSA'
 	option forwarding_enabled '0'
 	option forwarding_interval '5'
 	option collecting_enabled '0'
 	option collecting_interval '5'
 
-config nmea_rule 'GBGSA'
+config nmea_rule 'GQGSV'
 	option forwarding_enabled '0'
 	option forwarding_interval '5'
 	option collecting_enabled '0'
@@ -145,3 +132,154 @@ config nmea_rule 'GQGSA'
 	option collecting_enabled '0'
 	option collecting_interval '5'
 
+config nmea_rule 'GLGSA'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GLGNS'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GNGSV'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'PQGGA'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'PQRMC'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'PQVTG'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GNGGA'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GNRMC'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GNVTG'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GPGLL'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'PQGLL'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GBGGA'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GBRMC'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GBVTG'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GBGLL'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GPGNS'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'GAGNS'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'BDGGA'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'BDRMC'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'BDGSV'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'BDGSA'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'BDVTG'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config nmea_rule 'BDGNS'
+	option forwarding_enabled '0'
+	option forwarding_interval '5'
+	option collecting_enabled '0'
+	option collecting_interval '5'
+
+config section 'https'
+	option enabled '0'
+
+config https_tavl_rule
+	option enabled '0'
+	option type 'mobile'
+	option name 'signal'
+
+config https_tavl_rule
+	option enabled '0'
+	option type 'gpio'
+	option name 'din1'
+
diff --git a/hostblock b/hostblock
index 7c39de1..b8343ee 100644
--- a/hostblock
+++ b/hostblock
@@ -2,3 +2,4 @@ config hostblock 'config'
 	option enabled '0'
 	option icmp_host '8.8.8.8'
 	option mode 'whitelist'
+	option network 'all'
diff --git a/impulse_counter b/impulse_counter
new file mode 100644
index 0000000..954304a
--- /dev/null
+++ b/impulse_counter
@@ -0,0 +1,4 @@
+config general 'general'
+	option enabled '0'
+	option count_store_duration '86400'
+
diff --git a/ioman b/ioman
index 4c48892..4b1a130 100644
--- a/ioman
+++ b/ioman
@@ -1,15 +1,14 @@
-
 config scheduler_general 'scheduler_general'
 	option enabled '0'
 
+config gpio 'din1'
+	option direction 'in'
+	option bi_dir '0'
+	option invert_input '0'
+	option debounce_ms '10'
+
 config gpio 'dout1'
 	option direction 'out'
 	option value '0'
 	option bi_dir '0'
 
-config gpio 'din1'
-	option direction 'in'
-	option value '0'
-	option bi_dir '0'
-	option invert_input '0'
-
diff --git a/ip_blockd b/ip_blockd
index 3f419a9..35baac4 100644
--- a/ip_blockd
+++ b/ip_blockd
@@ -1,5 +1,5 @@
-
-config globals
+config globals 'ip_blockd'
 	option max_attempt_count '10'
 	option enabled '1'
-
+	option reboot_clear '0'
+	option enabled_time_based '1'
diff --git a/ipsec b/ipsec
index aed5972..d28328e 100644
--- a/ipsec
+++ b/ipsec
@@ -1,5 +1,3 @@
-
 config ipsec
 	option rtinstall_enabled '1'
 	option make_before_break '0'
-
diff --git a/mdcollectd b/mdcollectd
index e9d64c3..3e866bf 100644
--- a/mdcollectd
+++ b/mdcollectd
@@ -1,9 +1,8 @@
 
-config mdcollectd 'config'
+config 'mdcollectd' 'config'
 	option enabled '1'
 	option traffic '0'
 	option datalimit '0'
 	option sim_switch '0'
 	option interval '10'
 	list ignore 'lo'
-
diff --git a/modbus_client b/modbus_client
new file mode 100644
index 0000000..4b0c03e
--- /dev/null
+++ b/modbus_client
@@ -0,0 +1,65 @@
+
+config main 'main'
+	option debug '0'
+	option enabled '1'
+
+config tcp_server '1'
+	option server_id '1'
+	option port '502'
+	option dev_ipaddr '127.0.0.1'
+	option timeout '5'
+	option reconnect '1'
+	option period '1'
+	option name 'wasd'
+	option enabled '1'
+	option delay '0'
+	option frequency 'period'
+
+config alarm_1 '2'
+	option enabled '0'
+
+config request_1 '3'
+	option name 'timestamp'
+	option enabled '1'
+	option reg_count '2'
+	option no_brackets '0'
+	option function '3'
+	option data_type '32bit_uint1234'
+	option first_reg '365'
+
+config request_1 '4'
+	option name 'gps_lat'
+	option enabled '1'
+	option reg_count '2'
+	option no_brackets '0'
+	option function '3'
+	option data_type '32bit_float1234'
+	option first_reg '144'
+
+config request_1 '5'
+	option name 'gps_lon'
+	option enabled '1'
+	option reg_count '2'
+	option no_brackets '0'
+	option function '3'
+	option data_type '32bit_float1234'
+	option first_reg '146'
+
+config request_1 '6'
+	option name 'rssi'
+	option enabled '1'
+	option reg_count '2'
+	option no_brackets '0'
+	option function '3'
+	option data_type '32bit_int1234'
+	option first_reg '4'
+
+config request_1 '7'
+	option name 'nettype'
+	option enabled '1'
+	option reg_count '16'
+	option no_brackets '0'
+	option function '3'
+	option data_type 'ascii'
+	option first_reg '120'
+
diff --git a/modbus_server b/modbus_server
new file mode 100644
index 0000000..13ba23a
--- /dev/null
+++ b/modbus_server
@@ -0,0 +1,10 @@
+
+config modbus 'modbus'
+	option keepconn '1'
+	option enabled '1'
+	option port '502'
+	option timeout '0'
+	option clientregs '0'
+	option device_id '1'
+	option md_data_type '0'
+
diff --git a/modbusgateway b/modbusgateway
index b991934..2265203 100644
--- a/modbusgateway
+++ b/modbusgateway
@@ -1,5 +1,8 @@
 config gateway 'gateway'
 	option enabled 0
+	option host '127.0.0.1'
 	option port '1883'
-	option request 'request'
-	option response 'response'
+	option request 'request/$$SERIAL'
+	option response 'response/$$SERIAL'
+	option keepalive '5'
+	option qos '2'
diff --git a/mwan3 b/mwan3
index 866a0b6..36efb1c 100644
--- a/mwan3
+++ b/mwan3
@@ -11,13 +11,13 @@ config interface 'wan'
 config condition
 	option interface 'wan'
 	option track_method 'ping'
+	list track_ip '1.1.1.1'
+	list track_ip '8.8.8.8'
 	option reliability '1'
 	option count '1'
 	option timeout '2'
 	option down '3'
 	option up '3'
-	list track_ip '1.1.1.1'
-	list track_ip '8.8.8.8'
 
 config member 'wan_member_mwan'
 	option interface 'wan'
@@ -40,6 +40,7 @@ config policy 'balance_default'
 config rule 'default_rule'
 	option dest_ip '0.0.0.0/0'
 	option use_policy 'mwan_default'
+	option family 'ipv4'
 
 config interface 'mob1s1a1'
 	option interval '3'
@@ -49,17 +50,17 @@ config interface 'mob1s1a1'
 config condition
 	option interface 'mob1s1a1'
 	option track_method 'ping'
+	list track_ip '1.1.1.1'
+	list track_ip '8.8.8.8'
 	option reliability '1'
 	option count '1'
 	option timeout '2'
 	option down '3'
 	option up '3'
-	list track_ip '1.1.1.1'
-	list track_ip '8.8.8.8'
 
 config member 'mob1s1a1_member_mwan'
 	option interface 'mob1s1a1'
-	option metric '2'
+	option metric '3'
 
 config member 'mob1s1a1_member_balance'
 	option interface 'mob1s1a1'
@@ -73,17 +74,17 @@ config interface 'mob2s1a1'
 config condition
 	option interface 'mob2s1a1'
 	option track_method 'ping'
+	list track_ip '1.1.1.1'
+	list track_ip '8.8.8.8'
 	option reliability '1'
 	option count '1'
 	option timeout '2'
 	option down '3'
 	option up '3'
-	list track_ip '1.1.1.1'
-	list track_ip '8.8.8.8'
 
 config member 'mob2s1a1_member_mwan'
 	option interface 'mob2s1a1'
-	option metric '3'
+	option metric '4'
 
 config member 'mob2s1a1_member_balance'
 	option interface 'mob2s1a1'
diff --git a/network b/network
index 47a6a12..9a63eeb 100644
--- a/network
+++ b/network
@@ -1,33 +1,69 @@
 
 config interface 'loopback'
+	option device 'lo'
 	option proto 'static'
 	option ipaddr '127.0.0.1'
 	option netmask '255.0.0.0'
-	option device 'lo'
+	option area_type 'lan'
 
 config globals 'globals'
-	option ula_prefix 'fd02:bb5a:a885::/48'
+	option ula_prefix 'fd67:ab5b:0f96::/48'
+
+config port '_lan1'
+	option enabled '1'
+	option autoneg 'on'
+	option role 'lan'
+	option port_num '1'
+
+config port '_lan2'
+	option enabled '1'
+	option autoneg 'on'
+	option role 'lan'
+	option port_num '2'
+
+config port '_lan3'
+	option enabled '1'
+	option autoneg 'on'
+	option role 'lan'
+	option port_num '3'
+
+config port '_lan4'
+	option enabled '1'
+	option autoneg 'on'
+	option role 'lan'
+	option port_num '4'
+
+config port '_wan5'
+	option enabled '1'
+	option autoneg 'on'
+	option role 'wan'
+	option port_num '5'
+	option ifname 'eth1'
 
 config interface 'lan'
+	option device 'br-lan'
+	option area_type 'lan'
 	option proto 'static'
 	option netmask '255.255.255.0'
 	option ip6assign '60'
-	option device 'br-lan'
-	option metric '1'
-	option delegate '1'
-	option force_link '1'
 	option ipaddr '192.168.0.45'
-	option stp '0'
+
+config device 'br_lan'
+	option name 'br-lan'
+	option type 'bridge'
+	list ports 'eth0'
 
 config interface 'wan'
+	option device 'eth1'
 	option proto 'dhcp'
 	option metric '1'
-	option device 'eth1'
+	option area_type 'wan'
 
 config interface 'wan6'
-	option proto 'dhcpv6'
-	option metric '1'
 	option device 'eth1'
+	option proto 'dhcpv6'
+	option metric '2'
+	option area_type 'wan'
 
 config switch
 	option name 'switch0'
@@ -37,44 +73,39 @@ config switch
 config switch_vlan
 	option device 'switch0'
 	option vlan '1'
+	option vid '1'
 	option ports '1 2 3 4 0'
 
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
+	option vid '2'
 	option ports '5 0'
 
 config interface 'mob1s1a1'
 	option proto 'wwan'
 	option modem '3-1'
-	option metric '2'
+	option metric '3'
 	option sim '1'
-	option pdp '1'
 	option dhcpv6 '0'
-	option pdptype 'ip'
-	option force_apn '-1'
+	option method 'nat'
+	option auth 'none'
+	option area_type 'wan'
+	option pdp '1'
 	option auto_apn '0'
 	option apn 'wsim.vpn'
-	option auth 'none'
+	option pdptype 'ip'
 
 config interface 'mob2s1a1'
 	option proto 'wwan'
 	option modem '1-1.2'
-	option metric '3'
+	option metric '4'
 	option sim '1'
-	option pdp '1'
 	option dhcpv6 '0'
-	option pdptype 'ip'
-	option force_apn '-1'
-	option auto_apn '0'
 	option method 'nat'
-	option apn 'wsim.vpn'
-	option delegate '1'
-	option force_link '0'
 	option auth 'none'
-
-config device 'br_lan'
-	option name 'br-lan'
-	option type 'bridge'
-	list ports 'eth0'
+	option area_type 'wan'
+	option auto_apn '0'
+	option apn 'wsim.vpn'
+	option pdptype 'ip'
 
diff --git a/nhrp b/nhrp
new file mode 100644
index 0000000..1a4f29a
--- /dev/null
+++ b/nhrp
@@ -0,0 +1 @@
+config nhrp_general 'nhrp'
diff --git a/ntpclient b/ntpclient
index 889c4e2..f5dfa92 100644
--- a/ntpclient
+++ b/ntpclient
@@ -1,24 +1,19 @@
-config ntpserver
-	option hostname '0.openwrt.pool.ntp.org'
-	option port     '123'
+config ntpserver '1'
+	option hostname 'time1.google.com'
 
-config ntpserver
-	option hostname '1.openwrt.pool.ntp.org'
-	option port     '123'
+config ntpserver '2'
+	option hostname 'time2.google.com'
 
-config ntpserver
-	option hostname '2.openwrt.pool.ntp.org'
-	option port     '123'
+config ntpserver '3'
+	option hostname 'time3.google.com'
 
-config ntpserver
-	option hostname '3.openwrt.pool.ntp.org'
-	option port     '123'
+config ntpserver '4'
+	option hostname 'time4.google.com'
 
-config ntpdrift
-	option freq     '0'
+config ntpdrift 'ntpdrift'
+	option freq '0'
 
-config ntpclient
-    option enabled 1
-	option interval	86400
-	#option count	10
-	#option interface wan
+config ntpclient 'ntpclient'
+	option enabled '1'
+	option interval '86400'
+	option zoneName 'UTC'
diff --git a/ntpserver b/ntpserver
index 72d9f6c..8bf534c 100644
--- a/ntpserver
+++ b/ntpserver
@@ -1,4 +1,3 @@
-
 config ntpserver 'general'
 	option enabled '0'
-
+    
\ No newline at end of file
diff --git a/openssl b/openssl
new file mode 100644
index 0000000..d146129
--- /dev/null
+++ b/openssl
@@ -0,0 +1,3 @@
+
+config provider 'legacy'
+	option enabled '1'
diff --git a/openvpn b/openvpn
index 6023736..e69de29 100644
--- a/openvpn
+++ b/openvpn
@@ -1,3 +0,0 @@
-
-config webui 'webui'
-	option _auth 'tls'
diff --git a/operctl b/operctl
index 0303c9e..eb3fa4d 100644
--- a/operctl
+++ b/operctl
@@ -10,3 +10,4 @@ config dns_list 'dns_list'
 	list dns6 '2620:119:35::35'
 	list dns6 '2620:fe::fe'
 	list dns6 '2620:74:1b::1:1'
+
diff --git a/ospf b/ospf
new file mode 100644
index 0000000..a7f8c9d
--- /dev/null
+++ b/ospf
@@ -0,0 +1 @@
+config ospf_general 'ospf'
diff --git a/overview b/overview
index 3f6256a..a60bf1e 100644
--- a/overview
+++ b/overview
@@ -6,63 +6,86 @@ config overview
 
 config overview
 	option id 'mobile'
+	option position '2'
 	option enabled '1'
 	option section_name '3-1'
-	option position '3'
-
-config overview
-	option id 'wireless'
-	option enabled '1'
-	option section_name 'radio1.network1'
-	option position '5'
-
-config overview
-	option id 'interface'
-	option enabled '1'
-	option section_name 'lan'
-	option position '6'
-
-config overview
-	option id 'interface'
-	option enabled '1'
-	option section_name 'wan'
-	option position '7'
-
-config overview
-	option id 'interface'
-	option enabled '0'
-	option section_name 'wan6'
-	option position '8'
 
 config overview
 	option id 'mobile'
+	option position '3'
 	option enabled '1'
 	option section_name '1-1.2'
-	option position '9'
+
+config overview
+	option id 'wireless'
+	option position '4'
+	option enabled '1'
+	option section_name 'default_radio0'
+
+config overview
+	option id 'wireless'
+	option position '5'
+	option enabled '1'
+	option section_name 'default_radio1'
 
 config overview
 	option id 'interface'
+	option position '6'
+	option enabled '1'
+	option section_name 'lan'
+
+config overview
+	option id 'interface'
+	option position '7'
+	option enabled '1'
+	option section_name 'wan'
+
+config overview
+	option id 'interface'
+	option position '8'
+	option enabled '1'
+	option section_name 'wan6'
+
+config overview
+	option id 'interface'
+	option position '9'
 	option enabled '1'
 	option section_name 'mob1s1a1'
+
+config overview
+	option id 'interface'
 	option position '10'
+	option enabled '1'
+	option section_name 'mob2s1a1'
 
 config overview
 	option id 'mobile_data_limit'
+	option position '11'
 	option enabled '0'
 	option section_name 'mob1s1a1'
-	option position '11'
 
 config overview
 	option id 'mobile_data_limit'
+	option position '12'
 	option enabled '0'
 	option section_name 'mob2s1a1'
-	option position '12'
 
 config overview
 	option id 'sms_limit_sim1'
+	option position '13'
 	option enabled '0'
-	option section_name 'cfg02aa0e'
+	option section_name 'cfg01aa0e'
+
+config overview
+	option id 'sms_limit_sim1'
 	option position '14'
+	option enabled '0'
+	option section_name 'cfg03aa0e'
+
+config overview
+	option id 'access_control'
+	option enabled '0'
+	option position '15'
 
 config overview
 	option id 'system_events'
@@ -80,20 +103,13 @@ config overview
 	option position '18'
 
 config overview
-	option id 'interface'
+	option id 'connchecker'
+	option position '19'
+	option enabled '1'
+	option section_name 'globals'
+
+config overview
+	option id 'failover_priority'
 	option enabled '1'
-	option section_name 'mob2s1a1'
 	option position '20'
 
-config overview
-	option id 'wireless'
-	option position '21'
-	option enabled '1'
-	option section_name 'radio0.network1'
-
-config overview
-	option id 'sms_limit_sim1'
-	option position '22'
-	option enabled '1'
-	option section_name 'cfg01aa0e'
-
diff --git a/password_policy b/password_policy
new file mode 100644
index 0000000..a88aba7
--- /dev/null
+++ b/password_policy
@@ -0,0 +1,6 @@
+config policy
+	option password_length '8'
+	option require_digits '1'
+	option require_lower_upper '1'
+	option require_special '0'
+	option password_lifetime '0'
diff --git a/ping_reboot b/ping_reboot
index 3271bbd..1fe3e9a 100644
--- a/ping_reboot
+++ b/ping_reboot
@@ -2,30 +2,25 @@
 config ping_reboot
 	option action '1'
 	option time '5'
+	option host '8.8.8.8'
+	option retry '2'
 	option fail_counter '0'
 	option packet_size '56'
-	option stop_action '0'
+	option time_out '5'
+	option interface '1'
 	option type 'ping'
-	option ip_type2 'ipv4'
-	option ip_type1 'ipv4'
 	option enable '1'
-	option time_out '7'
-	option host2 '8.8.8.8'
-	option retry '11'
-	option host1 '8.8.8.8'
-	option interface '2'
 	option modem '3-1'
-	option current_try '4'
+	option current_try '0'
 
 config ping_reboot
 	option type 'wget'
 	option action '1'
-	option enable '1'
-	option host 'http://www.google.com'
+	option action_when 'all'
+	list host 'https://google.com'
 	option time '120'
 	option time_out '20'
 	option stop_action '0'
 	option retry '3'
-	option modem '3-1'
-	option current_try '1'
+	option enable '1'
 
diff --git a/post_get b/post_get
index de5b69b..97759d6 100644
--- a/post_get
+++ b/post_get
@@ -3,10 +3,12 @@ config post_get 'io'
     list allow "io_state"
     list allow "io_type"
     list allow "io_value"
+    list allow "io_invert"
 
 config post_get 'mobile'
     option enabled '0'
     list allow 'mobile_data'
+    list allow 'mobile_sim_pin'
     list allow 'sms_delete'
     list allow 'sms_list'
     list allow 'sms_read'
diff --git a/profiles b/profiles
index fe8e955..b082f1a 100644
--- a/profiles
+++ b/profiles
@@ -7,5 +7,5 @@ config profile 'default'
 	option archive 'default.tar.gz'
 	option md5file 'default.md5'
 	option id '0'
-	option updated '1689675671'
+	option updated '1741014865'
 
diff --git a/quota_limit b/quota_limit
index 7641397..3392a35 100644
--- a/quota_limit
+++ b/quota_limit
@@ -1,5 +1,15 @@
 
 config interface 'mob1s1a1'
+	option enable_warning '0'
+	option period '1'
+	option reset_hour '0'
+	option enabled '0'
+	option wrn_time '0'
 
 config interface 'mob2s1a1'
+	option enable_warning '0'
+	option period '1'
+	option reset_hour '0'
+	option enabled '0'
+	option wrn_time '0'
 
diff --git a/relayd b/relayd
new file mode 100644
index 0000000..e69de29
diff --git a/rip b/rip
new file mode 100644
index 0000000..1d80d08
--- /dev/null
+++ b/rip
@@ -0,0 +1 @@
+config rip_general 'rip'
diff --git a/rms_mqtt b/rms_mqtt
index 79c6da5..48c21e8 100644
--- a/rms_mqtt
+++ b/rms_mqtt
@@ -11,12 +11,14 @@ config rms_connect_mqtt 'rms_connect_mqtt'
 	option retry '60'
 	option port '15009'
 	option remote 'rms.teltonika-networks.com'
-	option debug '1'
 	option enable '2'
 
+config rms_proxy 'rms_proxy'
+	option enabled '0'
+
 config rms_connect_timer 'rms_connect_timer'
 	option level '0'
-	option next_level '1689674488'
+	option next_level '1741004900'
 
 config rms_connect_timer 'default'
 	option repeat_time '21600'
@@ -27,5 +29,13 @@ config rms_connect_timer_level
 
 config rms_connect_timer_level
 	option repeat_time '300'
+	option whole_time '3600'
+
+config rms_connect_timer_level
+	option repeat_time '600'
+	option whole_time '3600'
+
+config rms_connect_timer_level
+	option repeat_time '3600'
 	option whole_time '1209600'
 
diff --git a/rpcd b/rpcd
index b1bcb6f..646a7ce 100644
--- a/rpcd
+++ b/rpcd
@@ -1,61 +1,72 @@
-
 config rpcd
-	option socket '/var/run/ubus/ubus.sock'
-	option timeout '200'
+	option socket /var/run/ubus/ubus.sock
+	option timeout 200
 
 config login
 	option username 'admin'
 	option password '$p$admin'
 	option group 'root'
-	option _dummy_time '1688370835'
+
+config superuser
+	option username 'admin'
+	option password '$p$root'
+	option group 'root'
+
+config group 'root'
+	option hide_sensitive '0'
+	option privilege_lvl '3'
+	option target_write 'allow'
+	option target_read 'allow'
 	list read 'superuser'
 	list read '*'
 	list write 'superuser'
 	list write '*'
 
-config superuser
-	option username 'admin'
-	list read '*'
-	list write '*'
-	option password '$p$admin'
-
-config group 'root'
-	option target_write 'allow'
-	option target_read 'allow'
-	list write '*'
-	list read '*'
-
 config group 'admin'
-	option target_read 'deny'
-	list read 'system/multiusers/users_configuration'
-	list read 'system/backup'
-	list read 'system/flashops'
-	list read 'system/cli'
-	list read 'system/wizard'
-	list read 'system/uscripts'
-	list read 'system/profiles'
+	option hide_sensitive '1'
+	option privilege_lvl '2'
 	option target_write 'deny'
-	list write 'system/flashops'
-	list write 'system/uscripts'
-	list write 'system/wizard'
-	list write 'system/multiusers/users_configuration'
-	list write 'system/profiles'
-	list write 'system/admin/access_control/general'
-	list write 'system/backup'
+	option target_read 'deny'
+	list read '!system/admin/multiusers/users_configuration*'
+	list read '!system/admin/profiles*'
+	list read '!system/maintenance/backup*'
+	list read '!system/flashops*'
+	list read '!system/maintenance/cli*'
+	list read '!system/wizard*'
+	list read '!system/maintenance/uscripts*'
+	list read '!superuser'
+	list read '*'
+	list write '!system/admin/multiusers/users_configuration*'
+	list write '!system/maintenance/backup*'
+	list write '!system/flashops*'
+	list write '!system/maintenance/cli*'
+	list write '!system/wizard*'
+	list write '!system/maintenance/uscripts*'
+	list write '!system/admin/access_control/general*'
+	list write '!system/admin/profiles*'
+	list write '!superuser'
+	list write '*'
 
 config group 'user'
+	option hide_sensitive '1'
+	option privilege_lvl '1'
 	option target_write 'allow'
 	option target_read 'deny'
-	list write 'system/multiusers/change_password'
-	list read 'system/multiusers/users_configuration'
-	list read 'system/flashops'
-	list read 'system/backup'
-	list read 'system/admin/access_control'
-	list read 'system/cli'
-	list read 'system/uscripts'
-	list read 'services/packages'
-	list read 'network'
-	list read 'system/wizard'
-	list read 'services/hotspot/general/userscripts'
-	list read 'services/mobile_utilities/sms_messages/send'
-
+	list read '!system/admin/multiusers/users_configuration*'
+	list read '!system/flashops*'
+	list read '!system/maintenance/backup*'
+	list read '!system/admin/access_control*'
+	list read '!system/maintenance/cli*'
+	list read '!system/maintenance/uscripts*'
+	list read '!system/maintenance/troubleshoot*'
+	list read '!system/package_manager*'
+	list read '!network*'
+	list read '!system/wizard*'
+	list read '!status/wireless/channel_analysis*'
+	list read '!services/hotspot/general/userscripts*'
+	list read '!services/mobile_utilities/sms_messages/send*'
+	list read '!superuser'
+	list read '*'
+	list write 'system/admin/multiusers/change_password*'
+	list write '!superuser'
+	list write 'core'
diff --git a/rut_fota b/rut_fota
index c9c3d3b..cdd02ff 100644
--- a/rut_fota
+++ b/rut_fota
@@ -1,7 +1,5 @@
-
 config rut_fota 'config'
 	option enabled '1'
+	option notify '1'
 	option communication_host 'rut.teltonika.lt'
 	option communication_port '5000'
-	option fw_info 'N/A'
-
diff --git a/simcard b/simcard
index f04f9c1..fda865a 100644
--- a/simcard
+++ b/simcard
@@ -4,7 +4,13 @@ config sim
 	option position '1'
 	option primary '1'
 	option volte 'auto'
-	option iccid '8935201641414312139F'
+	option iccid '8935201641417386601F'
+	option mbn 'ROW_Generic_3GPP'
+
+config simman
+	option free '5'
+	option info_modem_id '3-1'
+	option msg_storage 'sm'
 
 config sim
 	option modem '1-1.2'
@@ -12,11 +18,6 @@ config sim
 	option primary '1'
 	option volte 'auto'
 
-config simman
-	option free '5'
-	option info_modem_id '3-1'
-	option msg_storage 'sm'
-
 config simman
 	option free '5'
 	option info_modem_id '1-1.2'
diff --git a/sms_gateway b/sms_gateway
index eb2d545..65172e9 100644
--- a/sms_gateway
+++ b/sms_gateway
@@ -1,31 +1,27 @@
 
-config reply
+config fwd 'reply'
 	option enabled '0'
 	option mode 'everyone'
 	option delete_sms '0'
 
-config fwd_to_http
+config fwd 'to_http'
 	option enabled '0'
 	option mode 'everyone'
 	option every_sms '0'
 	option sender_num '0'
 	option delete_sms '0'
 
-config fwd_to_sms
+config fwd 'to_sms'
 	option enabled '0'
 	option mode 'everyone'
 	option every_sms '0'
 	option sender_num '0'
 	option delete_sms '0'
 
-config fwd_to_smtp
+config fwd 'to_smtp'
 	option enabled '0'
 	option mode 'everyone'
 	option every_sms '0'
 	option sender_num '0'
 	option delete_sms '0'
 
-config simman
-	option info_modem_id '3-1'
-	option free '5'
-
diff --git a/sms_utils b/sms_utils
index 0bcc7d3..a033208 100644
--- a/sms_utils
+++ b/sms_utils
@@ -6,7 +6,7 @@ config rule
 	option authorization 'password'
 	option allowed_phone 'all'
 	option status_sms '1'
-	option message 'Router name - %rn; WAN IP - %wi; Data Connection state - %cs; Connection type - %ct; Signal Strength - %ss; New FW available - %fs;'
+	option message 'Router name - %rn; WAN IP - %wi; Data Connection state - %cs; Network type - %ct; Signal Strength - %ss; New FW available - %fs;'
 	option to_other_phone '0'
 
 config rule
@@ -15,11 +15,11 @@ config rule
 	option smstext 'status'
 	option authorization 'password'
 	option allowed_phone 'all'
-	option message 'Router name - %rn; WAN IP - %wi; Data Connection state - %cs; Connection type - %ct; Signal Strength - %ss; New FW available - %fs;'
+	option message 'Router name - %rn; WAN IP - %wi; Data Connection state - %cs; Network type - %ct; Signal Strength - %ss; New FW available - %fs;'
 	option to_other_phone '0'
 
 config rule
-	option action 'iostatus'
+	option action 'send_status'
 	option smstext 'iostatus'
 	option authorization 'password'
 	option allowed_phone 'all'
@@ -32,28 +32,8 @@ config rule
 	option smstext 'ioset'
 	option authorization 'password'
 	option allowed_phone 'all'
+	option value 'on'
 	option io 'dout1'
-	option value 'on'
-	option enabled '0'
-
-config rule
-	option action 'wifi'
-	option value 'on'
-	option smstext 'wifion'
-	option authorization 'password'
-	option allowed_phone 'all'
-	option write_wifi '1'
-	option to_other_phone '0'
-	option enabled '0'
-
-config rule
-	option action 'wifi'
-	option value 'off'
-	option smstext 'wifioff'
-	option authorization 'password'
-	option allowed_phone 'all'
-	option write_wifi '1'
-	option to_other_phone '0'
 	option enabled '0'
 
 config rule
@@ -119,6 +99,14 @@ config rule
 	option to_other_phone '0'
 	option enabled '0'
 
+config rule
+	option action 'change_profile'
+	option smstext 'pr'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option to_other_phone '0'
+	option enabled '0'
+
 config rule
 	option action 'ssh_access'
 	option smstext 'sshon'
@@ -165,45 +153,11 @@ config rule
 
 config rule
 	option action 'firstboot'
+	option enabled '1'
 	option smstext 'restore'
 	option authorization 'password'
 	option allowed_phone 'all'
 	option to_other_phone '0'
-	option enabled '0'
-
-config rule
-	option action 'userdefaults'
-	option smstext 'userdefaults'
-	option authorization 'password'
-	option allowed_phone 'all'
-	option to_other_phone '0'
-	option enabled '0'
-
-config rule
-	option action 'gps_coordinates'
-	option smstext 'gps'
-	option authorization 'password'
-	option allowed_phone 'all'
-	option to_other_phone '0'
-	option enabled '0'
-
-config rule
-	option action 'gps'
-	option value 'off'
-	option smstext 'gps_off'
-	option authorization 'password'
-	option allowed_phone 'all'
-	option to_other_phone '0'
-	option enabled '0'
-
-config rule
-	option action 'gps'
-	option value 'on'
-	option smstext 'gps_on'
-	option authorization 'password'
-	option allowed_phone 'all'
-	option to_other_phone '0'
-	option enabled '0'
 
 config rule
 	option action 'fw_upgrade'
@@ -263,6 +217,14 @@ config rule
 	option to_other_phone '0'
 	option enabled '0'
 
+config rule
+	option action 'ip_unblock'
+	option smstext 'ip_unblock'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option to_other_phone '0'
+	option enabled '0'
+
 config rule
 	option action 'more'
 	option smstext 'more'
@@ -271,3 +233,64 @@ config rule
 	option to_other_phone '0'
 	option enabled '0'
 
+config rule
+	option action 'api'
+	option smstext 'api'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option enabled '0'
+
+config rule
+	option action 'userdefaults'
+	option enabled '1'
+	option smstext 'userdefaults'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option to_other_phone '0'
+
+config rule
+	option action 'gps_coordinates'
+	option smstext 'gps'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option to_other_phone '0'
+	option enabled '0'
+
+config rule
+	option action 'gps'
+	option value 'off'
+	option smstext 'gps_off'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option to_other_phone '0'
+	option enabled '0'
+
+config rule
+	option action 'gps'
+	option value 'on'
+	option smstext 'gps_on'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option to_other_phone '0'
+	option enabled '0'
+
+config rule
+	option action 'wifi'
+	option enabled '1'
+	option value 'on'
+	option smstext 'wifion'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option write_wifi '1'
+	option to_other_phone '0'
+
+config rule
+	option action 'wifi'
+	option enabled '1'
+	option value 'off'
+	option smstext 'wifioff'
+	option authorization 'password'
+	option allowed_phone 'all'
+	option write_wifi '1'
+	option to_other_phone '0'
+
diff --git a/snmpd b/snmpd
index 4aa3571..dfd5f5e 100644
--- a/snmpd
+++ b/snmpd
@@ -5,8 +5,8 @@ config agent 'general'
 	option port '161'
 	option v1mode '1'
 	option v2cmode '1'
-	option proto 'udp'
 	option mibfile '/etc/snmp/RUTX12.mib'
+	option proto 'udp'
 
 config com2sec 'public'
 	option secname 'ro'
@@ -22,14 +22,14 @@ config com2sec 'private'
 	option ipaddr '127.0.0.1'
 	option netmask '32'
 
-config com2sec6
+config com2sec6 'public6'
 	option secname 'ro'
-	option source 'default'
+	option source '::/0'
 	option community 'public'
 
-config com2sec6
+config com2sec6 'private6'
 	option secname 'rw'
-	option source 'default'
+	option source '::1/128'
 	option community 'private'
 
 config group 'public_v1'
@@ -90,7 +90,7 @@ config access 'private_access'
 config system
 	option sysLocation 'location'
 	option sysContact 'email@example.com'
-	option sysName 'name'
+	option sysName 'Teltonika-RUTX12.com'
 
 config exec
 	option name 'filedescriptors'
diff --git a/system b/system
index 59ded25..957da25 100644
--- a/system
+++ b/system
@@ -1,16 +1,17 @@
 
 config system 'system'
-	option hostname 'Teltonika-RUTX12.com'
 	option timezone 'UTC'
 	option ttylogin '0'
-	option urandom_seed '0'
-	option device_code 'RUTX1200XXXX'
-	option routername 'RUTX12'
-	option device_fw_version 'RUTX_R_00.07.04.3'
 	option log_buffer_size '128'
 	option log_size '200'
+	option urandom_seed '0'
+	option device_fw_version 'RUTX_R_00.07.11'
+	option device_code 'RUTX1200XXXX'
+	option devicename 'RUTX12'
+	option hostname 'Teltonika-RUTX12.com'
 
 config timeserver 'ntp'
+	option zoneName 'UTC'
 	option enabled '0'
 	option enable_server '0'
 	list server '0.pool.ntp.org'
@@ -21,12 +22,11 @@ config timeserver 'ntp'
 config debug 'debug'
 	option sms_utils_debug_level '4'
 
+config remote_logger 'default'
+
+config banner 'banner'
+	option enabled '0'
+
 config ledman 'ledman'
 	option enabled '1'
 
-config mctl 'modem2'
-	option disable '0'
-
-config mctl 'modem'
-	option disable '0'
-
diff --git a/travelmate b/travelmate
new file mode 100644
index 0000000..6e72ca3
--- /dev/null
+++ b/travelmate
@@ -0,0 +1,9 @@
+
+config travelmate 'global'
+	option trm_enabled '0'
+	option trm_captive '1'
+	option trm_proactive '1'
+	option trm_netcheck '0'
+	option trm_autoadd '0'
+	option trm_mail '0'
+	option trm_debug '0'
diff --git a/uhttpd b/uhttpd
index cfeafa6..47514ce 100644
--- a/uhttpd
+++ b/uhttpd
@@ -3,7 +3,8 @@ config uhttpd 'main'
 	option enable_http '1'
 	option enable_https '1'
 	option home '/www'
-	option rfc1918_filter '1'
+	option rfc1918_filter_http '1'
+	option rfc1918_filter_https '1'
 	option max_requests '10'
 	option max_connections '100'
 	option cert '/etc/uhttpd.crt'
@@ -12,22 +13,22 @@ config uhttpd 'main'
 	option script_timeout '600'
 	option network_timeout '30'
 	option http_keepalive '0'
-	option tcp_keepalive '1'
+	option tcp_keepalive '5'
 	option ubus_prefix '/ubus'
 	option no_dirlists '1'
+	list lua_prefix '/api=/www/cgi-bin/api_dispatcher.lua'
 	option index_page 'cgi-bin/index'
-	option listen_http '80'
-	option listen_https '443'
 	option error_page '/cgi-bin/index'
+	list listen_https '443'
+	list listen_http '80'
 	option _httpWanAccess '1'
 	option _httpsWanAccess '1'
-	option redirect_https '0'
-	list lua_prefix '/api=/www/cgi-bin/api_dispatcher.lua'
 
 config uhttpd 'hotspot'
+	option listen_http '81'
+	option listen_https '444'
 	option enablehttp '1'
-	option home '/hotspotlogin'
-	option rfc1918_filter '1'
+	option home '/etc/chilli/hotspotlogin'
 	option max_requests '3'
 	option max_connections '100'
 	option cert '/etc/uhttpd.crt'
@@ -39,8 +40,6 @@ config uhttpd 'hotspot'
 	option tcp_keepalive '1'
 	option no_dirlists '1'
 	option disabled '1'
-	option listen_http '81'
-	option listen_https '444'
 
 config cert 'defaults'
 	option days '730'
diff --git a/ulogd b/ulogd
index 84ee93a..3b1a642 100644
--- a/ulogd
+++ b/ulogd
@@ -10,6 +10,7 @@ config ulogd "global"
 	list plugin 'ulogd_output_LOGEMU.so'
 	list plugin 'ulogd_raw2packet_BASE.so'
 	option stack 'log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU'
+	list network 'lan'
 
 config log 'log1'
 	option group '1'
diff --git a/vuci b/vuci
index f01011b..1b4f3eb 100644
--- a/vuci
+++ b/vuci
@@ -1,7 +1,10 @@
 
 config core 'main'
 	option session_timeout '1800'
+	option api_session_timeout '300'
 	option lang 'en'
+	option data_analytics '0'
+	option device_identifier '02d8fdd751bf3a55f895b4383a745b70'
 	option advanced '1'
 
 config internal 'languages'
diff --git a/widget b/widget
index 0df7e40..e69de29 100644
--- a/widget
+++ b/widget
@@ -1,43 +0,0 @@
-
-config widget
-	option id 'widget1'
-	option type 'ethernet'
-	option position '1'
-	option enabled '1'
-
-config widget
-	option id 'mobile-widget1'
-	option type 'mobile'
-	option position '2'
-	option enabled '1'
-
-config widget
-	option id 'mobile-widget2'
-	option type 'mobile'
-	option position '3'
-	option enabled '1'
-
-config widget
-	option id 'widget3'
-	option type 'system'
-	option position '4'
-	option enabled '1'
-
-config widget
-	option id 'radio0.network1'
-	option type 'wifi'
-	option position '5'
-	option enabled '1'
-
-config widget
-	option id 'radio1.network1'
-	option type 'wifi'
-	option position '6'
-	option enabled '1'
-
-config widget
-	option id 'widget5'
-	option type 'rms'
-	option position '7'
-	option enabled '1'
-
diff --git a/wireless b/wireless
index d667544..0cb94e9 100644
--- a/wireless
+++ b/wireless
@@ -1,47 +1,57 @@
 
 config wifi-device 'radio0'
 	option type 'mac80211'
-	option channel '11'
+	option channel 'auto'
 	option hwmode '11g'
 	option path 'platform/soc/a000000.wifi'
 	option htmode 'HT20'
-	option country 'US'
+	option ifname_prefix 'wlan0'
+	option country 'DE'
+	option txpower '20'
 
 config wifi-iface 'default_radio0'
 	option device 'radio0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'RUT_9A6A_2G'
 	option wifi_id 'wifi0'
-	option encryption 'psk2+tkip+ccmp'
+	option _device_id '1'
+	option wds '0'
+	option isolate '0'
 	option key '47Delmag_Abi'
 	option skip_inactivity_poll '0'
-	option hidden '0'
+	option bss_transition '0'
 	option ieee80211r '0'
-	option isolate '0'
-	option short_preamble '1'
-	option disassoc_low_ack '1'
+	option ieee80211k '0'
+	option hidden '0'
+	option encryption 'psk2'
+	option ssid 'DAC.Site_WIFI_2G'
 
 config wifi-device 'radio1'
 	option type 'mac80211'
-	option channel '36'
+	option channel 'auto'
 	option hwmode '11a'
 	option path 'platform/soc/a800000.wifi'
 	option htmode 'VHT80'
-	option country 'US'
+	option channels '36-165'
+	option ifname_prefix 'wlan1'
+	option acs_exclude_dfs '1'
+	option country 'DE'
+	option txpower '23'
 
 config wifi-iface 'default_radio1'
 	option device 'radio1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'RUT_9A6B_5G'
 	option wifi_id 'wifi1'
-	option encryption 'psk2+tkip+ccmp'
-	option key '47Delmag_Abi'
-	option skip_inactivity_poll '0'
-	option hidden '0'
-	option ieee80211r '0'
+	option _device_id '1'
+	option encryption 'psk2'
+	option wds '0'
 	option isolate '0'
-	option short_preamble '1'
-	option disassoc_low_ack '1'
+	option skip_inactivity_poll '0'
+	option bss_transition '0'
+	option ieee80211r '0'
+	option ieee80211k '0'
+	option hidden '0'
+	option key '47Delmag_Abi'
+	option ssid 'DAC.Site_WIFI_5G'
 
diff --git a/xl2tpd b/xl2tpd
index 3a01c0b..e69de29 100644
--- a/xl2tpd
+++ b/xl2tpd
@@ -1,3 +0,0 @@
-config 'login'
-	option 'username' 'user'
-	option 'password' 'pass'