diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 2b2f78a2f..4d610239c 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -49,14 +49,6 @@ iiab_domain: lan
 lan_ip: 172.18.96.1
 lan_netmask: 255.255.224.0
 
-# Gateway mode
-iiab_lan_enabled: True
-iiab_wan_enabled: True
-ssh_port: 22
-gui_wan: True
-adm_cons_force_ssl: False
-adm_cons_allow_downloads: False
-
 # Internal Wi-Fi Access Point
 # Values are used if there is an internal Wi-Fi adapter and hostapd is enabled
 # The platform variable adapts install to specific hardware (raspberry pi=rpi2)
@@ -67,6 +59,19 @@ host_channel: 6
 hostapd_secure: False
 hostapd_password: changeme
 
+# Gateway mode
+iiab_lan_enabled: True
+iiab_wan_enabled: True
+ssh_port: 22
+gui_wan: True
+adm_cons_force_ssl: False
+adm_cons_allow_downloads: False
+
+# Gateway and Filters
+iiab_gateway_enabled: True
+gw_squid_whitelist: False
+gw_block_https: False
+
 # dhcpd
 dhcpd_install: True
 dhcpd_enabled: False
@@ -89,11 +94,6 @@ dansguardian_enabled: False
 wondershaper_install: False
 wondershaper_enabled: False
 
-# Gateway and Filters
-gw_squid_whitelist: False
-gw_block_https: False
-iiab_gateway_enabled: True
-
 # Intended for developers
 user_wan_iface: auto
 user_lan_iface: auto
@@ -304,7 +304,7 @@ munin_enabled: False
 phpmyadmin_install: False
 phpmyadmin_enabled: False
 
-# sugar-stats
+# sugar-stats - unmaintained
 sugar_stats_install: False
 sugar_stats_enabled: False
 
@@ -316,7 +316,7 @@ teamviewer_enabled: False
 vnstat_install: True
 vnstat_enabled: False
 
-# XOVis
+# XOVis - unmaintained
 xovis_install: False
 xovis_enabled: False
 xovis_target_host: "127.0.0.1:5984"