diff --git a/settings-configs/BPI-R4/luci b/settings-configs/BPI-R4/luci
index a9a361c..b17b404 100644
--- a/settings-configs/BPI-R4/luci
+++ b/settings-configs/BPI-R4/luci
@@ -1,7 +1,7 @@
 
 config core 'main'
-	option lang 'pl'
-	option mediaurlbase '/luci-static/bootstrap'
+	option lang 'auto'
+	option mediaurlbase '/luci-static/bootstrap-dark'
 	option resourcebase '/luci-static/resources'
 	option ubuspath '/ubus/'
 
@@ -28,6 +28,7 @@ config internal 'themes'
 	option Bootstrap '/luci-static/bootstrap'
 	option BootstrapDark '/luci-static/bootstrap-dark'
 	option BootstrapLight '/luci-static/bootstrap-light'
+	option Argon '/luci-static/argon'
 
 config internal 'apply'
 	option rollback '90'
diff --git a/settings-configs/BPI-R4/luci_statistics b/settings-configs/BPI-R4/luci_statistics
index 31512a1..6f58974 100644
--- a/settings-configs/BPI-R4/luci_statistics
+++ b/settings-configs/BPI-R4/luci_statistics
@@ -15,8 +15,7 @@ config statistics 'rrdtool'
 	option image_path '/tmp/rrdimg'
 
 config statistics 'collectd_rrdtool'
-	option enable '1'
-	option DataDir '/tmp/rrd'
+	option DataDir '/mnt/rrd'
 	option RRARows '288'
 	option RRASingle '1'
 	option backup '1'
@@ -25,6 +24,7 @@ config statistics 'collectd_rrdtool'
 	list RRATimespans '1week'
 	list RRATimespans '1month'
 	list RRATimespans '1year'
+	option enable '1'
 
 config statistics 'collectd_csv'
 	option enable '0'
@@ -127,7 +127,7 @@ config collectd_iptables_match
 	option table 'nat'
 	option chain 'luci_fw_postrouting'
 	option target 'MASQUERADE'
-	option source '192.168.88.0/24'
+	option source '192.168.1.0/24'
 	option outputif 'br-ff'
 	option name 'LAN-Clients traffic'
 
@@ -145,7 +145,6 @@ config statistics 'collectd_irq'
 
 config statistics 'collectd_iwinfo'
 	option enable '1'
-	option IgnoreSelected '1'
 
 config statistics 'collectd_load'
 	option enable '1'
diff --git a/settings-configs/BPI-R4/qosify b/settings-configs/BPI-R4/qosify
index 71c03d9..62a8066 100644
--- a/settings-configs/BPI-R4/qosify
+++ b/settings-configs/BPI-R4/qosify
@@ -27,19 +27,15 @@ config class voice
 config interface wan
 	option name wan
 	option disabled 0
-	option bandwidth_up 1000mbit
-	option bandwidth_down 1000mbit
-	## It is better to set own overhead and mpu than what is set in the template
-	## https://forum.openwrt.org/t/qosify-new-package-for-dscp-marking-cake/111789/729
-	# option overhead_type ethernet
-	option overhead_type none
-	# defaults:
+	option bandwidth_up 1gbit
+	option bandwidth_down 1gbit
+	option overhead_type ethernet
 	option ingress 1
 	option egress 1
 	option mode diffserv4
 	option nat 1
 	option host_isolate 1
 	option autorate_ingress 0
-	option ingress_options "overhead 44 mpu 84"
-	option egress_options "overhead 44 mpu 84"
 	option options ""
+	option ingress_options ""
+	option egress_options ""
diff --git a/settings-configs/BPI-R4/qosmate b/settings-configs/BPI-R4/qosmate
new file mode 100644
index 0000000..158c78f
--- /dev/null
+++ b/settings-configs/BPI-R4/qosmate
@@ -0,0 +1,49 @@
+
+config global 'global'
+	option enabled '0'
+
+config settings 'settings'
+	option WAN 'br-wan'
+	option DOWNRATE '860000'
+	option UPRATE '860000'
+	option ROOT_QDISC 'hfsc'
+
+config advanced 'advanced'
+	option PRESERVE_CONFIG_FILES '1'
+	option WASHDSCPUP '1'
+	option WASHDSCPDOWN '1'
+	option BWMAXRATIO '20'
+	option UDP_RATE_LIMIT_ENABLED '0'
+	option TCP_UPGRADE_ENABLED '1'
+	option UDPBULKPORT '51413,6881-6889'
+	option TCPBULKPORT '51413,6881-6889'
+	option NFT_HOOK 'forward'
+	option NFT_PRIORITY '0'
+
+config hfsc 'hfsc'
+	option LINKTYPE 'ethernet'
+	option OH '44'
+	option gameqdisc 'pfifo'
+	option nongameqdisc 'fq_codel'
+	option nongameqdiscoptions 'besteffort ack-filter'
+	option MAXDEL '24'
+	option PFIFOMIN '5'
+	option PACKETSIZE '450'
+	option netemdelayms '30'
+	option netemjitterms '7'
+	option netemdist 'normal'
+	option pktlossp 'none'
+	option netem_direction 'both'
+
+config cake 'cake'
+	option COMMON_LINK_PRESETS 'ethernet'
+	option PRIORITY_QUEUE_INGRESS 'diffserv4'
+	option PRIORITY_QUEUE_EGRESS 'diffserv4'
+	option HOST_ISOLATION '1'
+	option NAT_INGRESS '1'
+	option NAT_EGRESS '1'
+	option ACK_FILTER_EGRESS 'auto'
+	option AUTORATE_INGRESS '0'
+
+config custom_rules 'custom_rules'
+
diff --git a/settings-configs/BPI-R4/smartdns b/settings-configs/BPI-R4/smartdns
new file mode 100644
index 0000000..7e4f6a4
--- /dev/null
+++ b/settings-configs/BPI-R4/smartdns
@@ -0,0 +1,50 @@
+
+config smartdns
+	option enabled '1'
+	option server_name 'smartdns'
+	option port '5353'
+	option auto_set_dnsmasq '1'
+	option tcp_server '1'
+	option ipv6_server '1'
+	option bind_device '1'
+	option dualstack_ip_selection '1'
+	option serve_expired '1'
+	option cache_persist '1'
+	option cache_size '20000'
+	option resolve_local_hostnames '1'
+	option force_https_soa '1'
+	option rr_ttl_min '600'
+	option seconddns_port '6553'
+	option seconddns_tcp_server '1'
+	option response_mode 'fastest-response'
+	option old_port '5353'
+	option old_enabled '1'
+	option old_auto_set_dnsmasq '1'
+
+config domain-rule
+
+config server
+	option enabled '1'
+	option name 'NextDNS'
+	option ip '45.XX.XX.174'
+	option type 'tls'
+	option port '853'
+
+config server
+	option enabled '1'
+	option name 'Quad9'
+	option ip 'https://dns.quad9.net/dns-query'
+	option type 'https'
+
+config server
+	option enabled '1'
+	option name 'ControlD'
+	option ip 'p1.freedns.controld.com'
+	option type 'tls'
+
+config server
+	option enabled '1'
+	option name 'Rethink'
+	option ip '1-iabqabaqaaaae.max.rethinkdns.com'
+	option type 'tls'
+
diff --git a/settings-configs/BPI-R4/sqm b/settings-configs/BPI-R4/sqm
index db70a7d..c66bd2f 100644
--- a/settings-configs/BPI-R4/sqm
+++ b/settings-configs/BPI-R4/sqm
@@ -1,17 +1,18 @@
 
 config queue 'eth1'
-	option enabled '0'
+	option enabled '1'
 	option interface 'br-wan'
-	option download '850000'
-	option upload '850000'
+	option download '860000'
+	option upload '860000'
 	option qdisc 'fq_codel'
-	option script 'piece_of_cake.qos'
+	option script 'simplest_tbf.qos'
 	option linklayer 'ethernet'
 	option debug_logging '0'
 	option verbosity '5'
-	option overhead '44'
+	option overhead '38'
 	option linklayer_advanced '1'
 	option tcMTU '2047'
 	option tcTSIZE '128'
 	option tcMPU '84'
 	option linklayer_adaptation_mechanism 'default'
+
diff --git a/settings-configs/BPI-R4/stubby b/settings-configs/BPI-R4/stubby
index dbc9bee..da211a6 100644
--- a/settings-configs/BPI-R4/stubby
+++ b/settings-configs/BPI-R4/stubby
@@ -15,8 +15,8 @@ config stubby 'global'
        option edns_client_subnet_private '1'
        option idle_timeout '10000'
        option round_robin_upstreams '1'
-       list listen_address '127.0.0.1@5453'
-       list listen_address '0::1@5453'
+       list listen_address '127.0.0.1@5353'
+       list listen_address '0::1@5353'
        # option log_level '7'
        # option command_line_arguments ''
        # option tls_cipher_list 'EECDH+AESGCM:EECDH+CHACHA20'
@@ -25,6 +25,26 @@ config stubby 'global'
        # option tls_max_version '1.3'
 
 
+config resolver
+       option address '45.XX.XX.0'
+       option tls_auth_name 'XXX.dns.nextdns'
+       option tls_port 853
+
+config resolver
+       option address '2a07:XXX::0'
+       option tls_auth_name 'XXX.dns.nextdns.io'
+       option tls_port 853
+
+config resolver
+       option address '9.9.9.11'
+       option tls_auth_name '1-iabqabaqaaaae.max.rethinkdns.com'
+       option tls_port 853
+
+config resolver
+       option address '2620:fe::11'
+       option tls_auth_name '1-iabqabaqaaaae.max.rethinkdns.com'
+       option tls_port 853
+
 config resolver
        option address '9.9.9.11'
        option tls_auth_name 'dns11.quad9.net'
@@ -40,7 +60,6 @@ config resolver
        option tls_auth_name 'p1.freedns.controld.com'
        option tls_port 853
 
-
 config resolver
        option address '2606:1a40::1'
        option tls_auth_name 'p1.freedns.controld.com'
diff --git a/settings-configs/BPI-R4/unbound b/settings-configs/BPI-R4/unbound
index 97009bc..33100ed 100644
--- a/settings-configs/BPI-R4/unbound
+++ b/settings-configs/BPI-R4/unbound
@@ -1,46 +1,7 @@
 
-config zone
-	option fallback '0'
-	option enabled '1'
-	option zone_type 'forward_zone'
-	list server '9.9.9.11'
-	list server '149.112.112.11'
-	list server '2620:fe::11'
-	list server '2620:fe::fe:11'
-	option dns_assist 'none'
-	option tls_upstream '1'
-	option tls_index 'dns11.quad9.net'
-	list zone_name 'quad9'
-
-config zone
-	option fallback '0'
-	option enabled '1'
-	option zone_type 'forward_zone'
-	list server '76.76.2.1'
-	list server '76.76.10.1'
-	list server '2606:1a40::1'
-	list server '2606:1a40:1::1'
-	option dns_assist 'none'
-	option tls_upstream '1'
-	option tls_index 'p1.freedns.controld.com'
-	list zone_name 'controld'
-
-config zone
-	option fallback '0'
-	option enabled '0'
-	option zone_type 'forward_zone'
-	list zone_name '. '
-	option dns_assist 'none'
-	option tls_upstream '1'
-	option tls_index 'dns.nextdns.io'
-	list server 'XXX.dns.nextdns.io'
-	list server 'XXX.dns.nextdns.io'
-	list server 'XXX.dns.nextdns.io'
-	list server 'XXX.dns.nextdns.io'
-
 config unbound 'ub_main'
 	option add_extra_dns '0'
-	option add_local_fqdn '0'
+	option add_local_fqdn '1'
 	option add_wan_fqdn '0'
 	option dhcp_link 'none'
 	option dns64 '0'
@@ -50,12 +11,12 @@ config unbound 'ub_main'
 	option extended_stats '1'
 	option hide_binddata '1'
 	option interface_auto '1'
-	option listen_port '53'
+	option listen_port '5353'
 	option localservice '1'
 	option manual_conf '0'
 	option num_threads '2'
-	option protocol 'default'
-	option rate_limit '60'
+	option protocol 'ip4_only'
+	option rate_limit '0'
 	option rebind_localhost '0'
 	option rebind_protection '1'
 	option recursion 'default'
@@ -64,11 +25,62 @@ config unbound 'ub_main'
 	option ttl_min '120'
 	option ttl_neg_max '1000'
 	option unbound_control '0'
-	option validator '1'
+	option validator '0'
 	option verbosity '1'
 	list iface_wan 'wan'
 	option enabled '1'
-	option validator_ntp '1'
 	list iface_trig 'lan'
 	list iface_trig 'wan'
 
+config zone
+	option fallback '0'
+	option enabled '1'
+	option zone_type 'forward_zone'
+	list zone_name '. '
+	list server '9.9.9.11'
+	list server '149.112.112.11'
+	list server '2620:fe::11'
+	list server '2620:fe::fe:11'
+	option dns_assist 'none'
+	option tls_upstream '1'
+	option tls_index 'dns11.quad9.net'
+
+config zone
+	option fallback '0'
+	option enabled '1'
+	option zone_type 'forward_zone'
+	list zone_name '. '
+	list server '76.76.2.1'
+	list server '76.76.10.1'
+	list server '2606:1a40::1'
+	list server '2606:1a40:1::1'
+	option dns_assist 'none'
+	option tls_upstream '1'
+	option tls_index 'p1.freedns.controld.com'
+
+config zone
+	option fallback '0'
+	option enabled '0'
+	option zone_type 'forward_zone'
+	list zone_name '. '
+	option dns_assist 'none'
+	option tls_upstream '1'
+	option tls_index 'dns.nextdns.io'
+	list server '45.XX.XX.0#XX.dns.nextdns.io'
+	list server '45.XX.XX.0#XX.dns.nextdns.io'
+	list server '2a07:XX::#XX.dns.nextdns.io'
+	list server '2a07:XX::#XX.dns.nextdns.io'
+
+config zone
+	option fallback '0'
+	option enabled '0'
+	option zone_type 'forward_zone'
+	list zone_name '. '
+	list server '94.XX.XX.49'
+	list server '94.XX.XX.59'
+	list server '2a10:XX::ded:ff'
+	list server '2a10:XX::dad:ff'
+	option dns_assist 'none'
+	option tls_upstream '1'
+	option tls_index 'XX.d.adguard-dns.com'
+
diff --git a/settings-configs/BPI-R4/usteer b/settings-configs/BPI-R4/usteer
index be9889c..d480ca1 100644
--- a/settings-configs/BPI-R4/usteer
+++ b/settings-configs/BPI-R4/usteer
@@ -1,12 +1,12 @@
+
 config usteer
-        option network 'lan'
-        option syslog '1'
-        option local_mode '0'
-        option ipv6 '0'
-        option debug_level '1'
-        option roam_scan_snr '-68'
-        option roam_trigger_snr '-72'
-        option min_snr '-78'
-        option roam_scan_tries '0'
-        option signal_diff_threshold '10'
-        list ssid_list 'MYWIFI'
+	option network 'lan'
+	option syslog '1'
+	option local_mode '0'
+	option ipv6 '0'
+	option debug_level '2'
+	option roam_scan_snr '-70'
+	option roam_trigger_snr '-75'
+	option min_snr '-78'
+	list ssid_list 'MYWIFI'
+	list ssid_list 'MYWIFI_6G'
diff --git a/settings-configs/BPI-R4/wireless b/settings-configs/BPI-R4/wireless
index 19579b8..91eb58a 100644
--- a/settings-configs/BPI-R4/wireless
+++ b/settings-configs/BPI-R4/wireless
@@ -5,9 +5,9 @@ config wifi-device 'radio0'
 	option radio '0'
 	option band '2g'
 	option channel '8'
+	option htmode 'EHT40'
 	option country 'PL'
 	option cell_density '0'
-	option htmode 'EHT40'
 	option txpower '20'
 
 config wifi-iface 'default_radio0'
@@ -17,7 +17,7 @@ config wifi-iface 'default_radio0'
 	option ssid 'MYWIFI_2G'
 	option encryption 'psk2'
 	option disassoc_low_ack '0'
-	option key 'PASSWORD1234'
+	option key 'mysecretpassword123'
 	option wnm_sleep_mode '1'
 	option bss_transition '1'
 
@@ -28,13 +28,13 @@ config wifi-device 'radio1'
 	option band '5g'
 	option channel '100'
 	option htmode 'EHT160'
-	option txpower '20'
 	option country 'PL'
 	option cell_density '0'
+	option txpower '20'
 	option background_radar '1'
-	option log_level '1'
-	# option rnr '1'
-	# option tx_burst '0.0'
+        option log_level '1'
+        # option rnr '1'
+        # option tx_burst '0.0'
 
 config wifi-iface 'default_radio1'
 	option device 'radio1'
@@ -42,7 +42,7 @@ config wifi-iface 'default_radio1'
 	option mode 'ap'
 	option ssid 'MYWIFI'
 	option encryption 'sae'
-	option key 'PASSWORD1234'
+	option key 'mysecretpassword123'
 	option ieee80211k '1'
 	option wnm_sleep_mode '1'
 	option bss_transition '1'
@@ -57,12 +57,11 @@ config wifi-device 'radio2'
 	option htmode 'EHT160'
 	option country 'PL'
 	option cell_density '0'
-	option log_level '1'
-	option txpower '20'
+	option txpower '21'
 	option background_radar '1'
-	# option tx_burst '0.0'
-	# option rnr '1'
-	# option disabled '1'
+        option log_level '1'
+        # option rnr '1'
+        # option tx_burst '0.0'
 
 config wifi-iface 'default_radio2'
 	option device 'radio2'
@@ -70,6 +69,8 @@ config wifi-iface 'default_radio2'
 	option mode 'ap'
 	option ssid 'MYWIFI_6G'
 	option encryption 'sae'
-	option key 'PASSWORD1234'
+	option key 'mysecretpassword123'
+	option ieee80211k '1'
+	option wnm_sleep_mode '1'
+	option bss_transition '1'
 	option ocv '0'
-	option max_inactivity '86400'