diff --git a/files/archer-c5-single-trunk/etc/config/network b/files/archer-c5-single-trunk/etc/config/network
index 41eaf7b..aa6cbc0 100644
--- a/files/archer-c5-single-trunk/etc/config/network
+++ b/files/archer-c5-single-trunk/etc/config/network
@@ -4,12 +4,6 @@ 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 'br-lan.20'
         option proto 'static'
@@ -19,45 +13,34 @@ config interface 'management'
         option dns '10.20.0.1'
         option ipv6 'no'
 
+config device
+        option name 'br-tmp'
+        option type 'bridge'
+        list ports 'eth1.1'
+#
+#config interface 'tmp'
+#        option device 'br-tmp'
+#        option proto 'static'
+#        option ipaddr '192.168.1.1'
+#        option netmask '255.255.255.0'
+#
 
 config switch
         option name 'switch0'
         option reset '1'
-        option enable_vlan '0'
+        option enable_vlan '1'
 
-dgconfig switch_vlan
+config switch_vlan
         option device 'switch0'
         option vlan '1'
-        option ports '0 1 2 6'
+        option ports '0t 4 5'
+	option vid '1'
 
-config bridge-vlan
-        option device 'br-lan'
-        option vlan '20'
-        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'
+        option type 'bridge'
+        option ipv6 '0'
+        list ports 'eth0'
 
 config device
         option name 'br-lan.20'
@@ -77,3 +60,47 @@ config device
         option ifname 'br-lan'
         option vid '23'
 
+config bridge-vlan
+        option device 'br-lan'
+        option vlan '20'
+        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 switch_vlan
+        option device 'switch0'
+        option vlan '2'
+        option ports '1t 2t 3t 6t'
+        option vid '20'
+
+config switch_vlan
+        option device 'switch0'
+        option vlan '3'
+        option ports '1t 2t 3t 6t'
+        option vid '21'
+
+config switch_vlan
+        option device 'switch0'
+        option vlan '4'
+        option ports '1t 2t 3t 6t'
+        option vid '23'
+
+
+config interface 'userwifi'
+        option proto 'none'
+        option device 'br-lan.21'
+
+config interface 'videowifi'
+        option proto 'none'
+        option device 'br-lan.23'
+
+
diff --git a/files/archer-c5/etc/config/wireless b/files/archer-c5/etc/config/wireless
index 282eda7..5e84ee2 100644
--- a/files/archer-c5/etc/config/wireless
+++ b/files/archer-c5/etc/config/wireless
@@ -17,7 +17,7 @@ config wifi-device  radio0
 
 config wifi-iface
 	option device radio0
-	option network 'wireless'
+	option network 'userwifi'
 	option mode 'ap'
 	option ssid 'OpenFest'
 	option encryption 'none'
@@ -44,7 +44,7 @@ config wifi-device radio1
 
 config wifi-iface
 	option device radio1
-	option network 'wireless'
+	option network 'userwifi'
 	option mode 'ap'
 	option ssid 'OpenFest'
 	option encryption 'none'
@@ -54,7 +54,6 @@ config wifi-iface
 
 config wifi-iface
         option device radio0
-        option network 'wireless'
         option mode 'ap'
         option ssid 'ofvideo'
         option encryption 'psk2'
@@ -65,7 +64,6 @@ config wifi-iface
 
 config wifi-iface
         option device radio1
-        option network 'wireless'
         option mode 'ap'
         option ssid 'ofvideo'
         option encryption 'psk2'