diff --git a/files/archer-c5-single-trunk/etc/config/network b/files/archer-c5-single-trunk/etc/config/network
index b90c2fa..41eaf7b 100644
--- a/files/archer-c5-single-trunk/etc/config/network
+++ b/files/archer-c5-single-trunk/etc/config/network
@@ -4,8 +4,14 @@ config interface 'loopback'
         option ipaddr '127.0.0.1'
         option netmask '255.0.0.0'
 
+config device
+        option name 'br-lan'
+        option type 'bridge'
+        option ipv6 '0'
+        list ports 'eth0'
+
 config interface 'management'
-        option ifname 'eth0'
+        option ifname 'br-lan.20'
         option proto 'static'
         option ipaddr '<ip>'
         option netmask '255.255.255.0'
@@ -13,24 +19,61 @@ config interface 'management'
         option dns '10.20.0.1'
         option ipv6 'no'
 
-config interface 'wireless'
-        option ifname 'eth1'
-        option proto 'none'
-        option ipv6 'no'
-        option force_link '1'
-        option type 'bridge'
 
 config switch
         option name 'switch0'
         option reset '1'
-        option enable_vlan '1'
+        option enable_vlan '0'
 
-config switch_vlan
+dgconfig switch_vlan
         option device 'switch0'
+        option vlan '1'
+        option ports '0 1 2 6'
+
+config bridge-vlan
+        option device 'br-lan'
         option vlan '20'
-        option ports '1t 6'
+        list ports 'eth0:t'
+
+config bridge-vlan
+        option device 'br-lan'
+        option vlan '21'
+        list ports 'eth0:t'
+
+config bridge-vlan
+        option device 'br-lan'
+        option vlan '23'
+        list ports 'eth0:t'
+
+config interface 'userwifi'
+        option proto 'none'
+        option device 'br-lan.21'
+        option defaultroute '0'
+        option peerdns '0'
+        option delegate '0'
+
+config interface 'videowifi'
+        option proto 'none'
+        option device 'br-lan.23'
+        option defaultroute '0'
+        option peerdns '0'
+        option delegate '0'
+
+config device
+        option name 'br-lan.20'
+        option type '8021q'
+        option ifname 'br-lan'
+        option vid '20'
+
+config device
+        option name 'br-lan.21'
+        option type '8021q'
+        option ifname 'br-lan'
+        option vid '21'
+
+config device
+        option name 'br-lan.23'
+        option type '8021q'
+        option ifname 'br-lan'
+        option vid '23'
 
-config switch_vlan
-        option device 'switch0'
-        option vlan '22'
-        option ports '0 1t'
diff --git a/files/archer-c5/etc/config/wireless b/files/archer-c5/etc/config/wireless
index 17b84d3..282eda7 100644
--- a/files/archer-c5/etc/config/wireless
+++ b/files/archer-c5/etc/config/wireless
@@ -1,8 +1,8 @@
 config wifi-device  radio0
 	option type mac80211
-	option hwmode 11a
+	option band '5g'
 	option path 'pci0000:01/0000:01:00.0'
-	option channel <radio0-channel>
+	option channel '<radio0-channel>'
 	option txpower '<wlan0-txpower>'
 	option htmode VHT80
 	option distance '20'
@@ -13,6 +13,7 @@ config wifi-device  radio0
 	option country 'BG'
 	option country_ie '1'
 	option doth '1'
+	option cell_density '0'
 
 config wifi-iface
 	option device radio0
@@ -22,12 +23,11 @@ config wifi-iface
 	option encryption 'none'
 	option macaddr '<wlan0-macaddr>'
 	option isolate '1'
-	option wnm_sleep_mode 1
-	option proxy_arp 1
+	option wnm_sleep_mode '1'
 
 config wifi-device radio1
 	option type mac80211
-	option hwmode 11g
+	option band '2g'
 	option path 'platform/qca955x_wmac'
 	option channel <radio1-channel>
 	option txpower '<wlan1-txpower>'
@@ -40,6 +40,7 @@ config wifi-device radio1
 	option log_level '-1'
 	option country 'BG'
 	option country_ie '1'
+	option cell_density '0'
 
 config wifi-iface
 	option device radio1
@@ -49,6 +50,28 @@ config wifi-iface
 	option encryption 'none'
 	option macaddr '<wlan1-macaddr>'
 	option isolate '1'
-	option wnm_sleep_mode 1
-	option proxy_arp 1
+	option wnm_sleep_mode '1'
+
+config wifi-iface
+        option device radio0
+        option network 'wireless'
+        option mode 'ap'
+        option ssid 'ofvideo'
+        option encryption 'psk2'
+        option macaddr '<wlan2-macaddr>'
+        option key '<wlan2-key>'
+        option wnm_sleep_mode 1
+        option network 'videowifi'
+
+config wifi-iface
+        option device radio1
+        option network 'wireless'
+        option mode 'ap'
+        option ssid 'ofvideo'
+        option encryption 'psk2'
+        option macaddr '<wlan3-macaddr>'
+        option key '<wlan3-key>'
+        option wnm_sleep_mode 1
+        option network 'videowifi'
+