Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10243)
+++ /tools/gformat.py	(revision 10244)
@@ -300,8 +300,11 @@
 {% endif -%}
 
-{% if nodetype == "Proxy" %}
+{% if nodetype == "Proxy" or nodetype == "Hybrid" %}
 #
-# PROXY Configuration
+# Edge Configuration
 #
+
+
+# Firewall and Routing Configuration
 
 {% if gateway -%}
@@ -310,8 +313,5 @@
 #defaultrouter="NOTSET"
 {% endif -%}
-
 internalif="{{ internalif }}"
-
-# PROXY iLeiden Configuration
 ileiden_enable="{{ autogen_ileiden_enable }}"
 gateway_enable="{{ autogen_ileiden_enable }}"
@@ -338,41 +338,11 @@
 # iLeiden Proxies {{ autogen_ileiden_proxies_names }}
 lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z {{ autogen_ileiden_proxies }}"
+{% endif %}
+{% if vpnif -%}
+  vpnif="{{ vpnif }}"
+{% endif -%}
 
 captive_portal_whitelist=""
 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
-{% endif %}
-
-{% if nodetype == "Hybrid" %} 
-#
-# Hybrid Node
-#
-{% if internalroute -%}
-static_routes="wleiden"
-route_wleiden="-net 172.16.0.0/12 {{ internalroute }}"
-{% endif -%}
-
-{% if gateway -%}
-defaultrouter="{{ gateway }}"
-{% else -%}
-#defaultrouter="NOTSET"
-{% endif -%}
-
-internalif="{{ internalif }}"
-{% if vpnif -%}
-  vpnif="{{ vpnif }}"\n
-{% endif -%}
-
-lvrouted_enable="{{ autogen_ileiden_enable }}"
-lvrouted_flags="-u -s s00p3rs3kr3t -m 28"
-
-gateway_enable="{{ autogen_ileiden_enable }}"
-
-ileiden_enable="{{ autogen_ileiden_enable }}"
-firewall_enable="{{ autogen_ileiden_enable }}"
-firewall_script="/etc/ipfw.sh"
-
-captive_portal_whitelist=""
-captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
-{% endif %}
 
 """).render(datadump)