diff --git a/domains/aurich.conf b/domains/aurich.conf
index 0d379b710b8b6bbe65f36e63a96b75c64a14128a..0ef1b2c91e0bd873231d5f163351c49b8ab393c6 100644
--- a/domains/aurich.conf
+++ b/domains/aurich.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -53,36 +53,51 @@
 	hoodselector = {
 		shapes = {
 			{
+				{
+					lat = 53.32,
+					lon = 6.981
+				},
+				{
+					lat = 53.32,
+					lon = 7.322
+				},
 				{
 					lat = 53.372,
-					lon = 6.98
+					lon = 7.322
+				},
+				{
+					lat = 53.372,
+					lon = 7.825
 				},
 				{
 					lat = 53.436,
 					lon = 7.825
 				},
-			},
-			{
 				{
-					lat = 53.32,
-					lon = 6.98
+					lat = 53.436,
+					lon = 7.648
 				},
 				{
-					lat = 53.372,
-					lon  = 7.322
+					lat = 53.806,
+					lon = 7.648
+				},
+				{
+					lat = 53.806,
+					lon = 6.624
 				},
-			},
-			{
 				{
 					lat = 53.436,
 					lon = 6.624
 				},
 				{
-					lat = 53.807,
-					lon = 7.648
+					lat = 53.436,
+					lon = 6.981
 				},
-			},
-
-		},
-	},
+				{
+					lat = 53.32,
+					lon = 6.981
+				}
+			}
+		}
+	}
 }
diff --git a/domains/bad_iburg.conf b/domains/bad_iburg.conf
index 5eef82ade733acfd812ac94da4f02c0a653dfac6..8f35e30ecd8937f8305863c298d76468b2f79864 100644
--- a/domains/bad_iburg.conf
+++ b/domains/bad_iburg.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,9 +57,21 @@
 					lat = 52.07,
 					lon = 7.99
 				},
+				{
+					lat = 52.07,
+					lon = 8.15
+				},
 				{
 					lat = 52.182,
 					lon = 8.15
+				},
+				{
+					lat = 52.182,
+					lon = 7.99
+				},
+				{
+					lat = 52.07,
+					lon = 7.99
 				}
 			}
 		}
diff --git a/domains/butjadingen.conf b/domains/butjadingen.conf
index 76be57a1366e93251f0e7c90a13202779832314a..5b94a3332049e9de30b2fdc0772c08b49f729298 100644
--- a/domains/butjadingen.conf
+++ b/domains/butjadingen.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,9 +57,21 @@
 					lat = 53.5,
 					lon = 8.315
 				},
+				{
+					lat = 53.5,
+					lon = 8.403
+				},
 				{
 					lat = 53.63,
 					lon = 8.403
+				},
+				{
+					lat = 53.63,
+					lon = 8.315
+				},
+				{
+					lat = 53.5,
+					lon = 8.315
 				}
 			}
 		}
diff --git a/domains/default.conf b/domains/default.conf
index b5adf94bc07f94459955165549154ca757377580..be88a8675981f1160608ad5f07e3fac1e331b87a 100644
--- a/domains/default.conf
+++ b/domains/default.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
diff --git a/domains/delmenhorst.conf b/domains/delmenhorst.conf
index 33b9d91c87bf2d74ec032dea27be042bb077de36..162933fbf017d438a2efff6fc38d133d94c943d6 100644
--- a/domains/delmenhorst.conf
+++ b/domains/delmenhorst.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -55,23 +55,33 @@
 			{
 				{
 					lat = 52.944,
-					lon = 8.3
+					lon = 8.14
+				},
+				{
+					lat = 52.944,
+					lon = 8.78
 				},
 				{
 					lat = 53.22,
-					lon =8.78
+					lon = 8.78
 				},
-			},
-			{
 				{
-					lat = 52.944,
-					lon = 8.14
+					lat = 53.22,
+					lon = 8.3
 				},
 				{
 					lat = 53.08,
 					lon = 8.3
 				},
-			},
-		},
-	},
+				{
+					lat = 53.08,
+					lon = 8.14
+				},
+				{
+					lat = 52.944,
+					lon = 8.14
+				}
+			}
+		}
+	}
 }
diff --git a/domains/grafschaft_bentheim.conf b/domains/grafschaft_bentheim.conf
index 25b4f65bead9f48b514d544fa754c9622e420bad..6f16f4b48ff958365cd74a63604b791059b076a2 100644
--- a/domains/grafschaft_bentheim.conf
+++ b/domains/grafschaft_bentheim.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,19 +57,29 @@
 					lat = 52.178,
 					lon = 6.652
 				},
-				{
-					lat = 52.69,
-					lon = 7.244
-				}
-			},
-			{
 				{
 					lat = 52.178,
-					lon = 7.244
+					lon = 7.41
 				},
 				{
 					lat = 52.35,
 					lon = 7.41
+				},
+				{
+					lat = 52.35,
+					lon = 7.244
+				},
+				{
+					lat = 52.69,
+					lon = 7.244
+				},
+				{
+					lat = 52.69,
+					lon = 6.652
+				},
+				{
+					lat = 52.178,
+					lon = 6.652
 				}
 			}
 		}
diff --git a/domains/ibbenbueren.conf b/domains/ibbenbueren.conf
index be23bcf696603b0d7165083a843a9396767186d7..37c75e309e1f452ab58d8a6a1a88626917692efd 100644
--- a/domains/ibbenbueren.conf
+++ b/domains/ibbenbueren.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,9 +57,21 @@
 					lat = 52.25,
 					lon = 7.66
 				},
+				{
+					lat = 52.25,
+					lon = 7.76
+				},
 				{
 					lat = 52.3,
 					lon = 7.76
+				},
+				{
+					lat = 52.3,
+					lon = 7.66
+				},
+				{
+					lat = 52.25,
+					lon = 7.66
 				}
 			}
 		}
diff --git a/domains/landkreis_cloppenburg.conf b/domains/landkreis_cloppenburg.conf
index da4bb4bc151d4e19a8fb6e96b09ff14817de2add..2e166d068b0b8f4c667e8d5a809e889205ba8b30 100644
--- a/domains/landkreis_cloppenburg.conf
+++ b/domains/landkreis_cloppenburg.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,42 +54,40 @@
 		shapes = {
 			{
 				{
-					lat = 52.76,
+					lat = 52.69,
 					lon = 7.699
 				},
+				{
+					lat = 52.69,
+					lon = 8.05
+				},
+				{
+					lat = 52.76,
+					lon = 8.05
+				},
+				{
+					lat = 52.76,
+					lon = 8.21
+				},
 				{
 					lat = 52.944,
 					lon = 8.21
-				}
-			},
-			{
+				},
 				{
 					lat = 52.944,
-					lon = 7.699
+					lon = 8.14
 				},
 				{
 					lat = 53.08,
 					lon = 8.14
-				}
-			},
-			{
-				{
-					lat = 52.69,
-					lon = 7.699
 				},
 				{
-					lat = 52.76,
-					lon = 8.05
-				}
-			},
-			{
-				{
-					lat = 53.122,
-					lon = 6.41
+					lat = 53.08,
+					lon = 7.699
 				},
 				{
-					lat = 53.123,
-					lon = 6.411
+					lat = 52.69,
+					lon = 7.699
 				}
 			}
 		}
diff --git a/domains/landkreis_emsland.conf b/domains/landkreis_emsland.conf
index 8355e2eadf020ac56d684c08dded5a48cd682d06..2264324ef22601cef9e5bec922e7d40b69aa8677 100644
--- a/domains/landkreis_emsland.conf
+++ b/domains/landkreis_emsland.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,32 +54,48 @@
 		shapes = {
 			{
 				{
-					lat = 52.69,
-					lon = 6.982
+					lat = 52.35,
+					lon = 7.244
 				},
-				{
-					lat = 53.026,
-					lon = 7.699
-				}
-			},
-			{
 				{
 					lat = 52.35,
-					lon = 7.244
+					lon = 7.9
 				},
 				{
 					lat = 52.69,
 					lon = 7.9
-				}
-			},
-			{
+				},
+				{
+					lat = 52.69,
+					lon = 7.699
+				},
 				{
 					lat = 53.026,
-					lon = 6.982
+					lon = 7.699
+				},
+				{
+					lat = 53.026,
+					lon = 7.498
 				},
 				{
 					lat = 53.115,
 					lon = 7.498
+				},
+				{
+					lat = 53.115,
+					lon = 6.981
+				},
+				{
+					lat = 52.69,
+					lon = 6.981
+				},
+				{
+					lat = 52.69,
+					lon = 7.244
+				},
+				{
+					lat = 52.35,
+					lon = 7.244
 				}
 			}
 		}
diff --git a/domains/landkreis_friesland.conf b/domains/landkreis_friesland.conf
index ee80fba071cfbfc93fe9dd01b2527f3e299c735e..1cc8a2ed67471810807e349aa90dad756f44b2a5 100644
--- a/domains/landkreis_friesland.conf
+++ b/domains/landkreis_friesland.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,32 +54,48 @@
 		shapes = {
 			{
 				{
-					lat = 53.62,
-					lon = 7.85
+					lat = 53.372,
+					lon = 7.956
 				},
-				{
-					lat = 53.72,
-					lon = 8.18
-				}
-			},
-			{
 				{
 					lat = 53.372,
-					lon = 7.956
+					lon = 8.18
 				},
 				{
 					lat = 53.5,
 					lon = 8.18
-				}
-			},
-			{
+				},
 				{
 					lat = 53.5,
-					lon = 7.85
+					lon = 8.03
 				},
 				{
 					lat = 53.62,
 					lon = 8.03
+				},
+				{
+					lat = 53.62,
+					lon = 8.18
+				},
+				{
+					lat = 53.72,
+					lon = 8.18
+				},
+				{
+					lat = 53.72,
+					lon = 7.85
+				},
+				{
+					lat = 53.62,
+					lon = 7.85
+				},
+				{
+					lat = 53.62,
+					lon = 7.956
+				},
+				{
+					lat = 53.372,
+					lon = 7.956
 				}
 			}
 		}
diff --git a/domains/landkreis_osnabrueck.conf b/domains/landkreis_osnabrueck.conf
index bb9a8165c48da2942521e1f5e2e071c93d191d3a..1a94f90ca331aee8d899c308269b84994187c757 100644
--- a/domains/landkreis_osnabrueck.conf
+++ b/domains/landkreis_osnabrueck.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -55,51 +55,61 @@
 			{
 				{
 					lat = 52.07,
+					lon = 7.9
+				},
+				{
+					lat = 52.07,
+					lon = 7.99
+				},
+				{
+					lat = 52.182,
+					lon = 7.99
+				},
+				{
+					lat = 52.182,
 					lon = 8.15
 				},
 				{
-					lat = 52.32,
-					lon = 8.42
-				}
-			},
-			{
+					lat = 52.07,
+					lon = 8.15
+				},
 				{
 					lat = 52.07,
+					lon = 8.42
+				},
+				{
+					lat = 52.46,
+					lon = 8.42
+				},
+				{
+					lat = 52.46,
 					lon = 7.9
 				},
 				{
-					lat = 52.32,
-					lon = 7.99
+					lat = 52.07,
+					lon = 7.9
 				}
 			},
 			{
 				{
-					lat = 52.182,
+					lat = 52.24,
 					lon = 7.99
 				},
 				{
 					lat = 52.24,
 					lon = 8.15
-				}
-			},
-			{
-				{
-					lat = 52.057,
-					lon = 8.101
 				},
 				{
-					lat = 52.058,
-					lon = 8.102
-				}
-			},
-			{
+					lat = 52.32,
+					lon = 8.15
+				},
 				{
 					lat = 52.32,
-					lon = 7.9
+					lon = 7.99
 				},
 				{
-					lat = 52.46,
-					lon = 8.42
+					lat = 52.24,
+					lon = 7.99
 				}
 			}
 		}
diff --git a/domains/landkreis_steinfurt.conf b/domains/landkreis_steinfurt.conf
index 7f56dac8da3d32db6dc31a172c385539cc00989d..97b4b282a8042621ea59aba334dda1b1ac854a6b 100644
--- a/domains/landkreis_steinfurt.conf
+++ b/domains/landkreis_steinfurt.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -58,38 +58,50 @@
 					lon = 7.41
 				},
 				{
-					lat = 52.35,
+					lat = 52.154,
 					lon = 7.66
-				}
-			},
-			{
+				},
 				{
-					lat = 52.3,
+					lat = 52.18,
 					lon = 7.66
 				},
+				{
+					lat = 52.18,
+					lon = 7.9
+				},
 				{
 					lat = 52.35,
 					lon = 7.9
+				},
+				{
+					lat = 52.35,
+					lon = 7.41
+				},
+				{
+					lat = 52.154,
+					lon = 7.41
 				}
 			},
 			{
 				{
-					lat = 52.18,
+					lat = 52.25,
 					lon = 7.66
 				},
 				{
 					lat = 52.25,
-					lon = 7.9
-				}
-			},
-			{
+					lon = 7.76
+				},
 				{
-					lat = 52.25,
+					lat = 52.3,
 					lon = 7.76
 				},
 				{
 					lat = 52.3,
-					lon = 7.9
+					lon = 7.66
+				},
+				{
+					lat = 52.25,
+					lon = 7.66
 				}
 			}
 		}
diff --git a/domains/landkreis_vechta.conf b/domains/landkreis_vechta.conf
index a895c1c486ed9e42e59ec090d367980fe27b56a1..d5726f329e012b530981f259cb1364a32cf81b92 100644
--- a/domains/landkreis_vechta.conf
+++ b/domains/landkreis_vechta.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -50,42 +50,64 @@
 		shapes = {
 			{
 				{
-					lat = 52.625,
+					lat = 52.46,
 					lon = 7.9
 				},
-				{
-					lat = 52.69,
-					lon = 8.16
-				}
-			},
-			{
 				{
 					lat = 52.46,
-					lon = 7.9
+					lon = 8.32
 				},
 				{
 					lat = 52.625,
 					lon = 8.32
-				}
-			},
-			{
+				},
+				{
+					lat = 52.625,
+					lon = 8.16
+				},
+				{
+					lat = 52.69,
+					lon = 8.16
+				},
+				{
+					lat = 52.69,
+					lon = 8.443
+				},
 				{
 					lat = 52.76,
-					lon = 8.21
+					lon = 8.443
+				},
+				{
+					lat = 52.76,
+					lon = 8.67
 				},
 				{
 					lat = 52.944,
 					lon = 8.67
-				}
-			},
-			{
+				},
+				{
+					lat = 52.944,
+					lon = 8.21
+				},
+				{
+					lat = 52.76,
+					lon = 8.21
+				},
+				{
+					lat = 52.76,
+					lon = 8.05
+				},
 				{
 					lat = 52.69,
 					lon = 8.05
 				},
 				{
-					lat = 52.76,
-					lon = 8.443
+					lat = 52.69,
+					lon = 7.9
+				},
+				{
+					lat = 52.46,
+					lon = 7.9
 				}
 			}
 		}
diff --git a/domains/landkreis_wesermarsch.conf b/domains/landkreis_wesermarsch.conf
index 513afb4fca03f2ad7ac2eb584c39077b8ad67a01..da458f7e41ffa8905cfc4e81712421f0659e88b3 100644
--- a/domains/landkreis_wesermarsch.conf
+++ b/domains/landkreis_wesermarsch.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,42 +54,48 @@
 		shapes = {
 			{
 				{
-					lat = 53.372,
-					lon = 8.18
+					lat = 53.28,
+					lon = 8.13
 				},
 				{
-					lat = 53.5,
-					lon = 8.57
-				}
-			},
-			{
+					lat = 53.28,
+					lon = 8.3
+				},
 				{
 					lat = 53.22,
 					lon = 8.3
 				},
 				{
-					lat = 53.372,
+					lat = 53.22,
 					lon = 8.57
-				}
-			},
-			{
+				},
 				{
-					lat = 53.28,
-					lon = 8.13
+					lat = 53.63,
+					lon = 8.57
 				},
 				{
-					lat = 53.372,
-					lon = 8.3
-				}
-			},
-			{
+					lat = 53.63,
+					lon = 8.403
+				},
 				{
-					lat = 53.501,
+					lat = 53.50,
 					lon = 8.403
 				},
 				{
-					lat = 53.63,
-					lon = 8.57
+					lat = 53.50,
+					lon = 8.18
+				},
+				{
+					lat = 53.372,
+					lon = 8.18
+				},
+				{
+					lat = 53.372,
+					lon = 8.13
+				},
+				{
+					lat = 53.28,
+					lon = 8.13
 				}
 			}
 		}
diff --git a/domains/landkreis_wittmund.conf b/domains/landkreis_wittmund.conf
index f9fc6a9841f26dadd2100729d25de4a988c925ff..53e90d22ab5db0667fd86f6b766e5fff89fc6550 100644
--- a/domains/landkreis_wittmund.conf
+++ b/domains/landkreis_wittmund.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,42 +54,48 @@
 		shapes = {
 			{
 				{
-					lat = 53.5,
-					lon = 7.648
+					lat = 53.372,
+					lon = 7.825
+				},
+				{
+					lat = 53.372,
+					lon = 7.956
+				},
+				{
+					lat = 53.62,
+					lon = 7.956
+				},
+				{
+					lat = 53.62,
+					lon = 7.85
 				},
 				{
 					lat = 53.72,
 					lon = 7.85
-				}
-			},
-			{
+				},
 				{
 					lat = 53.72,
-					lon = 7.648
+					lon = 8.052
 				},
 				{
 					lat = 53.806,
 					lon = 8.052
-				}
-			},
-			{
+				},
 				{
-					lat = 53.436,
+					lat = 53.806,
 					lon = 7.648
 				},
 				{
-					lat = 53.5,
-					lon = 7.956
-				}
-			},
-			{
+					lat = 53.436,
+					lon = 7.648
+				},
 				{
-					lat = 53.372,
+					lat = 53.436,
 					lon = 7.825
 				},
 				{
-					lat = 53.436,
-					lon = 7.956
+					lat = 53.372,
+					lon = 7.825
 				}
 			}
 		}
diff --git a/domains/leer.conf b/domains/leer.conf
index 6355639a23128546caccba5bc493755abbe7e4b2..08178d9ee604613417847253d081a848604612ab 100644
--- a/domains/leer.conf
+++ b/domains/leer.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,42 +54,48 @@
 		shapes = {
 			{
 				{
-					lat = 53.21,
-					lon = 6.98
+					lat = 53.115,
+					lon = 6.981
 				},
 				{
-					lat = 53.32,
-					lon = 7.322
-				}
-			},
-			{
+					lat = 53.115,
+					lon = 7.498
+				},
+				{
+					lat = 53.026,
+					lon = 7.498
+				},
+				{
+					lat = 53.026,
+					lon = 7.699
+				},
 				{
 					lat = 53.21,
-					lon = 7.322
+					lon = 7.699
+				},
+				{
+					lat = 53.21,
+					lon = 7.85
 				},
 				{
 					lat = 53.372,
 					lon = 7.85
-				}
-			},
-			{
+				},
 				{
-					lat = 53.115,
-					lon = 6.981
+					lat = 53.372,
+					lon = 7.322
 				},
 				{
-					lat = 53.21,
-					lon = 7.699
-				}
-			},
-			{
+					lat = 53.32,
+					lon = 7.322
+				},
 				{
-					lat = 53.026,
-					lon = 7.498
+					lat = 53.32,
+					lon = 6.981
 				},
 				{
 					lat = 53.115,
-					lon = 7.699
+					lon = 6.981
 				}
 			}
 		}
diff --git a/domains/lohne.conf b/domains/lohne.conf
index 5653b6974160d4c2ea035b58a1cdd9fbc0aa4693..97cf953cfd94c8ce6dc19df48962150963974424 100644
--- a/domains/lohne.conf
+++ b/domains/lohne.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,11 +57,23 @@
 					lat = 52.625,
 					lon = 8.16
 				},
+				{
+					lat = 52.625,
+					lon = 8.32
+				},
 				{
 					lat = 52.69,
 					lon = 8.32
+				},
+				{
+					lat = 52.69,
+					lon = 8.16
+				},
+				{
+					lat = 52.625,
+					lon = 8.16
 				}
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/domains/oldenburg.conf b/domains/oldenburg.conf
index 837e8a14823b266e1c6a01cb26bdf25676005bc1..77098ec03b86f1bd0fd45a0c8e0bcf0af1d16033 100644
--- a/domains/oldenburg.conf
+++ b/domains/oldenburg.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,18 +57,28 @@
 					lat = 53.124,
 					lon = 8.216
 				},
+				{
+					lat = 53.124,
+					lon = 8.3
+				},
 				{
 					lat = 53.163,
 					lon = 8.3
-				}
-			},
-			{
+				},
+				{
+					lat = 53.163,
+					lon = 8.187
+				},
 				{
 					lat = 53.128,
 					lon = 8.187
 				},
 				{
-					lat = 53.163,
+					lat = 53.128,
+					lon = 8.216
+				},
+				{
+					lat = 53.124,
 					lon = 8.216
 				}
 			}
diff --git a/domains/oldenburg2.conf b/domains/oldenburg2.conf
index c299dab2606a23a7292ab1a6474e3aa112f6a10a..9f1f12995a4e511a31d95d0b1be6bd37d355d536 100644
--- a/domains/oldenburg2.conf
+++ b/domains/oldenburg2.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -58,50 +58,54 @@
 					lon = 8.14
 				},
 				{
-					lat = 53.21,
+					lat = 53.08,
+					lon = 8.3
+				},
+				{
+					lat = 53.124,
+					lon = 8.3
+				},
+				{
+					lat = 53.124,
+					lon = 8.216
+				},
+				{
+					lat = 53.128,
+					lon = 8.216
+				},
+				{
+					lat = 53.128,
 					lon = 8.187
-				}
-			},
-			{
+				},
 				{
 					lat = 53.163,
 					lon = 8.187
 				},
+				{
+					lat = 53.163,
+					lon = 8.3
+				},
 				{
 					lat = 53.2,
 					lon = 8.3
-				}
-			},
-			{
+				},
 				{
 					lat = 53.2,
-					lon = 8.187
+					lon = 8.22
 				},
 				{
 					lat = 53.21,
 					lon = 8.22
-				}
-			},
-			{
-				{
-					lat = 53.08,
-					lon = 8.216
 				},
 				{
-					lat = 53.124,
-					lon = 8.3
-				}
-			},
-			{
-				{
-					lat = 53.08,
-					lon = 8.187
+					lat = 53.21,
+					lon = 8.14
 				},
 				{
-					lat = 53.128,
-					lon = 8.216
+					lat = 53.08,
+					lon = 8.14
 				}
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/domains/osnabrueck.conf b/domains/osnabrueck.conf
index d1a4f03e13c46a8b3bd1c3a41fc2f8b839c0e3af..28898766242f6dd88eed9b31cfaea21a62540cc7 100644
--- a/domains/osnabrueck.conf
+++ b/domains/osnabrueck.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,42 +54,46 @@
 		shapes = {
 			{
 				{
-					lat = 52.282,
+					lat = 52.24,
 					lon = 7.99
 				},
+				{
+					lat = 52.24,
+					lon = 8.15
+				},
 				{
 					lat = 52.32,
 					lon = 8.15
-				}
-			},
-			{
+				},
 				{
-					lat = 52.24,
+					lat = 52.32,
 					lon = 7.99
 				},
 				{
-					lat = 52.282,
-					lon = 8.036
+					lat = 52.24,
+					lon = 7.99
 				}
 			},
 			{
+				{
+					lat = 52.268,
+					lon = 8.036
+				},
 				{
 					lat = 52.268,
 					lon = 8.06
 				},
 				{
 					lat = 52.282,
-					lon = 8.15
-				}
-			},
-			{
+					lon = 8.06
+				},
 				{
-					lat = 52.24,
+					lat = 52.282,
 					lon = 8.036
 				},
 				{
 					lat = 52.268,
-					lon = 8.15
+					lon = 8.036
 				}
 			}
 		}
diff --git a/domains/osnabrueck2.conf b/domains/osnabrueck2.conf
index d44ffc692fc3bb7aca433cc95c7e2d4fe771100c..10a772e642ef423ed5cc3eac4eaf112e34de602d 100644
--- a/domains/osnabrueck2.conf
+++ b/domains/osnabrueck2.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,9 +57,21 @@
 					lat = 52.268,
 					lon = 8.036
 				},
+				{
+					lat = 52.268,
+					lon = 8.06
+				},
 				{
 					lat = 52.282,
 					lon = 8.06
+				},
+				{
+					lat = 52.282,
+					lon = 8.036
+				},
+				{
+					lat = 52.268,
+					lon = 8.036
 				}
 			}
 		}
diff --git a/domains/rastede.conf b/domains/rastede.conf
index 57114c157dcb6c056e3ccd042d00dc6c38ae797e..04a0ff8361d60ec22937e0ad3ff60bac984fe76f 100644
--- a/domains/rastede.conf
+++ b/domains/rastede.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -49,43 +49,57 @@
 	hoodselector = {
 		shapes = {
 			{
+				{
+					lat = 53.08,
+					lon = 7.699
+				},
+				{
+					lat = 53.08,
+					lon = 8.14
+				},
 				{
 					lat = 53.21,
-					lon = 7.85
+					lon = 8.14
+				},
+				{
+					lat = 53.21,
+					lon = 8.22
+				},
+				{
+					lat = 53.2,
+					lon = 8.22
+				},
+				{
+					lat = 53.2,
+					lon = 8.3
 				},
 				{
 					lat = 53.28,
 					lon = 8.3
-				}
-			},
-			{
+				},
 				{
 					lat = 53.28,
-					lon = 7.85
+					lon = 8.13
 				},
 				{
 					lat = 53.372,
 					lon = 8.13
-				}
-			},
-			{
+				},
 				{
-					lat = 53.2,
-					lon = 8.22
+					lat = 53.372,
+					lon = 7.85
 				},
 				{
 					lat = 53.21,
-					lon = 8.3
-				}
-			},
-			{
+					lon = 7.85
+				},
 				{
-					lat = 53.08,
+					lat = 53.21,
 					lon = 7.699
 				},
 				{
-					lat = 53.21,
-					lon = 8.14
+					lat = 53.08,
+					lon = 7.699
 				}
 			}
 		}
diff --git a/domains/suedost.conf b/domains/suedost.conf
index dff8f3e8a9d7911fa1e770e0d3b14710908c80dc..aaf8eff472fb5ad01d27b08f30fe9d281462045b 100644
--- a/domains/suedost.conf
+++ b/domains/suedost.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -54,42 +54,48 @@
 		shapes = {
 			{
 				{
-					lat = 52.69,
-					lon = 8.67
+					lat = 52.07,
+					lon = 8.42
+				},
+				{
+					lat = 52.07,
+					lon = 9.3
 				},
 				{
 					lat = 52.944,
 					lon = 9.3
-				}
-			},
-			{
+				},
 				{
-					lat = 52.46,
-					lon = 8.32
+					lat = 52.944,
+					lon = 8.67
+				},
+				{
+					lat = 52.76,
+					lon = 8.67
+				},
+				{
+					lat = 52.76,
+					lon = 8.443
 				},
 				{
 					lat = 52.69,
-					lon = 9.3
-				}
-			},
-			{
+					lon = 8.443
+				},
 				{
-					lat = 52.07,
-					lon = 8.42
+					lat = 52.69,
+					lon = 8.32
 				},
 				{
 					lat = 52.46,
-					lon = 9.3
-				}
-			},
-			{
+					lon = 8.32
+				},
 				{
-					lat = 52.69,
-					lon = 8.443
+					lat = 52.46,
+					lon = 8.42
 				},
 				{
-					lat = 52.76,
-					lon = 8.67
+					lat = 52.07,
+					lon = 8.42
 				}
 			}
 		}
diff --git a/domains/tossens.conf b/domains/tossens.conf
index 1f98cdad7275c7d7a9df9c2ee332bb757a655494..47115585377525f2dc380e012994694652a751ec 100644
--- a/domains/tossens.conf
+++ b/domains/tossens.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,9 +57,21 @@
 					lat = 53.5,
 					lon = 8.18
 				},
+				{
+					lat = 53.5,
+					lon = 8.315
+				},
 				{
 					lat = 53.63,
 					lon = 8.315
+				},
+				{
+					lat = 53.63,
+					lon = 8.18
+				},
+				{
+					lat = 53.5,
+					lon = 8.18
 				}
 			}
 		}
diff --git a/domains/wilhelmshaven.conf b/domains/wilhelmshaven.conf
index 30e8ea49617ae4e2bad06bbc9f96226f7b5cbb90..7511b04332335a4bf81b8e9308e83202528a2885 100644
--- a/domains/wilhelmshaven.conf
+++ b/domains/wilhelmshaven.conf
@@ -30,7 +30,7 @@
 	},
 
 	mesh_vpn = {
- 		fastd = {
+		fastd = {
 			groups = {
 				backbone = {
 					peers = {
@@ -57,9 +57,21 @@
 					lat = 53.5,
 					lon = 8.03
 				},
+				{
+					lat = 53.5,
+					lon = 8.18
+				},
 				{
 					lat = 53.62,
 					lon = 8.18
+				},
+				{
+					lat = 53.62,
+					lon = 8.03
+				},
+				{
+					lat = 53.5,
+					lon = 8.03
 				}
 			}
 		}