diff --git a/extra/ffrgb.conf b/extra/ffrgb.conf
deleted file mode 100644
index 87ca94f..0000000
--- a/extra/ffrgb.conf
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  hostname_prefix = '',
-  site_name = 'Freifunk Regensburg',
-  site_code = 'ffrgb',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
-
-  prefix4 = '10.90.0.0/19',
-  prefix6 = 'fdef:f00f:1337:cafe/64',
-
-  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
-  mesh_on_wan = true,
-
-  regdom = 'DE',
-
-  wifi24 = {
-    channel = 1,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    }
-  },
-
-  next_node = {
-    ip4 = '10.90.0.1',
-    ip6 = 'fdef:f00f:1337:cafe::1',
-    mac = '16:41:95:40:f7:dd',
-  },
-
-
-  fastd_mesh_vpn = {
-    bandwidth_limit = {
-      enabled = false,
-      ingress = 12000,
-      egress = 1200,
-    },
-    methods = {'salsa2012+umac'},
-    mtu = 1426,
-    groups = {
-      backbone = {
-      limit = 2,
-        peers = {
-          gw01 = {   --[[ sven ]]
-            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-            remotes = {
-              'ipv4 "78.47.168.108" port 10000',
-            },
-          },
-          gw02 = {   --[[ alamar ]]
-            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
-            remotes = {
-              'ipv4 "185.53.218.23" port 10000',
-            },
-          },
-          gw04 = {   --[[ mephisto ]]
-            key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-            remotes = {
-              'ipv4 "213.166.225.5" port 10000',
-            },
-          },
-        },
-      },
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branch = 'stable',
-    branches = {
-      stable = {
-        name = 'stable',
-        mirrors = {
-          'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
-        },
-        probability = 0.1,
-        good_signatures = 1,
-        pubkeys = {
-          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
-          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
-	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
-        },
-      },
-      experimental = {
-        name = 'experimental',
-        mirrors = {
-          'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
-        },
-        probability = 0.5,
-        good_signatures = 1,
-        pubkeys = {
-          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
-	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
-	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
-        },
-      },
-    },
-  },
-}
--- vim: set ft=lua:ts=2:sw=2:et
diff --git a/extra/ffrgb_umland.conf b/extra/ffrgb_umland.conf
deleted file mode 100644
index 01ee888..0000000
--- a/extra/ffrgb_umland.conf
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  hostname_prefix = '',
-  site_name = 'Freifunk Regensburg Umland',
-  site_code = 'ffrgb_umland',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
-
-  prefix4 = '10.90.32.0/19',
-  prefix6 = 'fdef:f00f:1337:caff/64',
-
-  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
-  mesh_on_wan = true,
-
-  regdom = 'DE',
-
-  wifi24 = {
-    channel = 1,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb.umland',
-      bssid = '02:0E:8E:1E:61:18',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb.umland',
-      bssid = '02:0E:8E:1E:61:18',
-      mcast_rate = 12000,
-    }
-  },
-
-  next_node = {
-    ip4 = '10.90.32.1',
-    ip6 = 'fdef:f00f:1337:caff::1',
-    mac = '16:41:95:40:f7:dd',
-  },
-
-
-  fastd_mesh_vpn = {
-    bandwidth_limit = {
-      enabled = false,
-      ingress = 12000,
-      egress = 1200,
-    },
-    methods = {'salsa2012+umac'},
-    mtu = 1426,
-    groups = {
-      backbone = {
-      limit = 2,
-        peers = {
-          gw01 = {   --[[ sven ]]
-            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-            remotes = {
-              'ipv4 "78.47.168.108" port 10010',
-            },
-          },
-          gw02 = {   --[[ alamar ]]
-            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
-            remotes = {
-              'ipv4 "185.53.218.23" port 10010',
-            },
-          },
-          gw04 = {   --[[ mephisto ]]
-            key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-            remotes = {
-              'ipv4 "213.166.225.5" port 10010',
-            },
-          },
-        },
-      },
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branch = 'stable',
-    branches = {
-      stable = {
-        name = 'stable',
-        mirrors = {
-          'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
-        },
-        probability = 0.1,
-        good_signatures = 1,
-        pubkeys = {
-          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
-          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
-	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
-        },
-      },
-      experimental = {
-        name = 'experimental',
-        mirrors = {
-          'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
-        },
-        probability = 0.5,
-        good_signatures = 1,
-        pubkeys = {
-          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
-	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
-	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
-        },
-      },
-    },
-  },
-}
--- vim: set ft=lua:ts=2:sw=2:et
diff --git a/extra/groups.conf b/extra/groups.conf
new file mode 100644
index 0000000..8d27dee
--- /dev/null
+++ b/extra/groups.conf
@@ -0,0 +1,18 @@
+{
+	ffrgb_cty = {
+		subst = {
+			['%%ID'] = '01',
+			['%%V4'] = '10.90.32.0/19',
+			['%%V6'] = '100',
+			['%%N4'] = '10.90.32.1',
+		},
+	},
+	ffrgb_uml = {
+		subst = {
+			['%%ID'] = '02',
+			['%%V4'] = '10.90.64.0/19',
+			['%%V6'] = '200',
+			['%%N4'] = '10.90.64.1',
+		},
+	},
+}
diff --git a/extra/sites.conf b/extra/sites.conf
new file mode 100644
index 0000000..fca9513
--- /dev/null
+++ b/extra/sites.conf
@@ -0,0 +1,62 @@
+-- Define Blocks like:
+-- ffho_pad = {
+-- 	-- name of the region
+-- 	site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+--
+--	-- short name of the region
+--	site_code = 'ffho_pad_uml',
+--
+--	subst = {
+--		-- wifi settings
+--		['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
+--	},
+--
+--	site_select = {
+--		hidden = 0,
+--		group = 'pad_uml'
+--	},
+--},
+{
+	{
+		site_name = 'Freifunk Regensburg - Legacy',
+		site_code = 'ffrgb',
+		subst = {
+			['%%SS'] = 'regensburg.freifunk.net',
+		},
+		site_select = {
+			group = 'legacy',
+		},
+	},
+	{
+		site_name = 'Freifunk Regensburg - Stadt',
+		site_code = 'ffrgb_cty',
+		subst = {
+			['%%SS'] = 'regensburg.freifunk.net',
+		},
+		site_select = {
+			group = 'ffrgb_city',
+		},
+	},
+	{
+		site_name = 'Freifunk Regensburg - Umland',
+		site_code = 'ffrgb_uml',
+		subst = {
+			['%%SS'] = 'regensburg.freifunk.net',
+		},
+		site_select = {
+			group = 'ffrgb_uml',
+		},
+	},
+	-- start hidden sites here --
+	{
+		site_name = 'Freifunk Regensburg - Test',
+		site_code = 'ffho_ham',
+		subst = {
+			['%%SS'] = 'test.ffrgb.net',
+		},
+		site_select = {
+			hidden = 1,
+			group = 'ffrgb_uml',
+		},
+	},
+}