diff --git a/Richtfunk/bb-esmarch95-kern/etc/config/network b/Richtfunk/bb-esmarch95-kern/etc/config/network
index e1368a1..a4e7655 100644
--- a/Richtfunk/bb-esmarch95-kern/etc/config/network
+++ b/Richtfunk/bb-esmarch95-kern/etc/config/network
@@ -5,20 +5,29 @@ config interface 'loopback'
 	option ipaddr '127.0.0.1'
 	option netmask '255.0.0.0'
 
+config globals 'globals'
+	option ula_prefix 'fd13:bd3e:0d0b::/48'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname 'br-wan'
+	option ip6table '1'
+	option peerdns '0'
+
 config switch
+	option name 'switch0'
 	option reset '1'
 	option enable_vlan '1'
-	option name 'switch0'
 
 config switch_vlan
+	option device 'switch0'
 	option vlan '1'
 	option ports '0t 3 4 5'
-	option device 'switch0'
 
 config switch_vlan
+	option device 'switch0'
 	option vlan '2'
 	option ports '0t 1'
-	option device 'switch0'
 
 config switch_vlan
 	option vlan '5'
@@ -59,18 +68,13 @@ config interface 'vlan20'
 	option macaddr 'de:ad:be:ef:90:01'
 
 config interface 'wan'
+	option igmp_snooping '0'
 	option ifname 'eth0.2'
-	option proto 'dhcp'
-	option type 'bridge'
-	option peerdns '0'
 	option auto '1'
-	option macaddr 'ea:95:f6:cd:6d:46'
-
-config interface 'wan6'
-	option proto 'dhcpv6'
-	option ifname 'br-wan'
 	option peerdns '0'
-	option ip6table '1'
+	option type 'bridge'
+	option proto 'dhcp'
+	option macaddr 'fa:1b:67:5a:5d:e8'
 
 config rule6 'wan6_lookup'
 	option mark '0x01/0x01'
@@ -89,9 +93,24 @@ config interface 'client'
 	option ifname 'eth0.1 bat0'
 	option proto 'dhcpv6'
 	option type 'bridge'
-	option macaddr 'e8:94:f6:cd:6d:46'
-	option peerdns '1'
 	option igmp_snooping '0'
+	option macaddr 'f8:1a:67:5a:5d:e8'
+	option peerdns '1'
+
+config interface 'bat0'
+	option ifname 'bat0'
+	option macaddr 'f8:1a:67:5a:5d:e8'
+	option proto 'none'
+
+config interface 'mesh_radio0'
+	option mesh 'bat0'
+	option proto 'batadv'
+	option mtu '1528'
+
+config interface 'mesh_radio1'
+	option mesh 'bat0'
+	option proto 'batadv'
+	option mtu '1528'
 
 config interface 'mesh_wan'
 	option auto '0'
@@ -99,27 +118,19 @@ config interface 'mesh_wan'
 	option mesh 'bat0'
 	option proto 'batadv'
 
+config interface 'mesh_lan'
+	option ifname 'eth0.1'
+	option auto '0'
+	option macaddr 'fa:1b:68:5a:5d:e8'
+	option mesh 'bat0'
+	option proto 'batadv'
+
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
 	option mesh_no_rebroadcast '1'
+	option macaddr 'fa:1e:67:5a:5d:e8'
 	option mesh 'bat0'
 	option proto 'batadv'
-	option macaddr 'ea:98:f6:cd:6d:46'
-
-config interface 'bat0'
-	option ifname 'bat0'
-	option macaddr 'e8:94:f6:cd:6d:46'
-	option proto 'none'
-
-config interface 'mesh_radio0'
-	option proto 'batadv'
-	option mesh 'bat0'
-	option mtu '1528'
-
-config interface 'mesh_radio1'
-	option proto 'batadv'
-	option mesh 'bat0'
-	option mtu '1528'
 
 config device 'local_node_dev'
 	option macaddr '16:41:95:40:f7:dc'
@@ -131,14 +142,8 @@ config interface 'local_node'
 	option ifname 'local-node'
 	option ipaddr '10.112.0.1'
 	option ip6addr '2a03:2267::1/128'
-	option netmask '255.255.255.255'
-	option proto 'static'
-
-config route 'local_node_route4'
-	option target '10.112.0.0'
-	option gateway '0.0.0.0'
 	option netmask '255.255.192.0'
-	option interface 'client'
+	option proto 'static'
 
 config route6 'local_node_route6'
 	option target '2a03:2267::/64'
diff --git a/Richtfunk/bb-esmarch95-kern/etc/config/wireless b/Richtfunk/bb-esmarch95-kern/etc/config/wireless
index bbaa688..a89ca2e 100644
--- a/Richtfunk/bb-esmarch95-kern/etc/config/wireless
+++ b/Richtfunk/bb-esmarch95-kern/etc/config/wireless
@@ -1,34 +1,20 @@
 
 config wifi-device 'radio0'
 	option type 'mac80211'
-	option hwmode '11ng'
-	option path 'platform/ar934x_wmac'
-	list ht_capab 'LDPC'
-	list ht_capab 'SHORT-GI-20'
-	list ht_capab 'SHORT-GI-40'
-	list ht_capab 'TX-STBC'
-	list ht_capab 'RX-STBC1'
-	list ht_capab 'DSSS_CCK-40'
-	option channel '1'
-	option country 'DE'
-	option htmode 'HT20'
-	option disabled '1'
-
-config wifi-device 'radio1'
-	option type 'mac80211'
-	option hwmode '11na'
-	option path 'pci0000:00/0000:00:00.0'
-	list ht_capab 'LDPC'
-	list ht_capab 'SHORT-GI-20'
-	list ht_capab 'SHORT-GI-40'
-	list ht_capab 'TX-STBC'
-	list ht_capab 'RX-STBC1'
-	list ht_capab 'DSSS_CCK-40'
+	option hwmode '11a'
+	option path 'ffe09000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0'
 	option channel '44'
 	option htmode 'HT40+'
 	option country 'DE'
-	option disabled '0'
-	option txpower '15'
+
+config wifi-device 'radio1'
+	option type 'mac80211'
+	option hwmode '11g'
+	option path 'ffe0a000.pcie/pci0001:02/0001:02:00.0/0001:03:00.0'
+	option htmode 'HT20'
+	option channel '1'
+	option country 'DE'
+        option disabled '1'   
 
 config wifi-iface 'client_radio0'
 	option ifname 'client0'
@@ -36,7 +22,7 @@ config wifi-iface 'client_radio0'
 	option disabled '0'
 	option device 'radio0'
 	option mode 'ap'
-	option macaddr 'ea:96:f7:cd:6d:46'
+	option macaddr 'fa:1c:68:5a:5d:e8'
 	option ssid 'hamburg.freifunk.net'
 
 config wifi-iface 'mesh_radio0'
@@ -47,7 +33,7 @@ config wifi-iface 'mesh_radio0'
 	option disabled '0'
 	option mcast_rate '12000'
 	option mode 'adhoc'
-	option macaddr 'ea:97:f7:cd:6d:46'
+	option macaddr 'fa:1d:68:5a:5d:e8'
 	option ssid 'f8:d1:11:87:52:2e'
 
 config wifi-iface 'client_radio1'
@@ -56,7 +42,7 @@ config wifi-iface 'client_radio1'
 	option disabled '0'
 	option device 'radio1'
 	option mode 'ap'
-	option macaddr 'ea:96:f8:cd:6d:46'
+	option macaddr 'fa:1c:69:5a:5d:e8'
 	option ssid 'hamburg.freifunk.net'
 
 config wifi-iface 'mesh_radio1'
@@ -67,6 +53,6 @@ config wifi-iface 'mesh_radio1'
 	option disabled '0'
 	option mcast_rate '12000'
 	option mode 'adhoc'
-	option macaddr 'ea:97:f8:cd:6d:46'
+	option macaddr 'fa:1d:69:5a:5d:e8'
 	option ssid 'f8:d1:11:87:52:2e'