diff --git a/gluon b/gluon
index e3f2805..ca36317 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit e3f280584170c6e12549f1f00276f966cc168975
+Subproject commit ca3631723f4c21885ef8923b43b531102e598b1a
diff --git a/site.conf b/site.conf
index 90eeaee..a220e7e 100644
--- a/site.conf
+++ b/site.conf
@@ -49,6 +49,9 @@
 
 	mesh = {
 		vxlan = false,
+		batman_adv = {
+			routing_algo = 'BATMAN_IV_LEGACY',
+		},
 	},
 
 	next_node = {
diff --git a/site.mk b/site.mk
index 6130051..74d02ea 100755
--- a/site.mk
+++ b/site.mk
@@ -1,28 +1,23 @@
+GLUON_FEATURES := \
+	autoupdater \
+	ebtables-filter-multicast \
+	ebtables-filter-ra-dhcp \
+	ebtables-limit-arp \
+	mesh-batman-adv-14 \
+	mesh-vpn-fastd \
+	respondd \
+	status-page \
+	web-advanced \
+	web-wizard
+
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
-	gluon-respondd \
 	respondd-module-airtime \
-	gluon-autoupdater \
 	gluon-config-mode-core \
-	gluon-config-mode-hostname \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-web-admin \
-	gluon-web-autoupdater \
-	gluon-web-mesh-vpn-fastd \
-	gluon-web-network \
-	gluon-web-private-wifi \
-	gluon-web-wifi-config \
-	gluon-mesh-vpn-fastd \
+        gluon-web-mesh-vpn-fastd \
+        gluon-web-private-wifi \
 	gluon-radv-filterd \
-	gluon-radvd \
 	gluon-setup-mode \
 	gluon-speedtest \
-	gluon-status-page \
 	iputils-ping6 \
 	iwinfo \
 	iptables \