diff --git a/content/contact.md b/content/contact.md
index f75f685..b763fa6 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -9,20 +9,21 @@ Que ce soit pour un devis, pour rejoindre notre collectif ou pour toute question
 ## On est là
 
 {% map() %}
-[42.6998, 9.4518], // Bastia
-[44.4742, 1.8296], // Cajarc
-[50.1718, 3.2305], // Cambrai
-[43.6578, 6.9228], // Grasse
-[49.4927, 0.1641], // Le Havre
-[43.3099, 5.4127], // Marseille
-[43.6048, 3.8818], // Montpellier
-[48.8584, 2.4371], // Montreuil
-[47.2084, -1.6026], // Nantes
-[48.8505, 2.3380], // Paris
-[43.2926, -0.3703], // Pau
-[48.1077, -1.6795], // Rennes
-[46.0321, 4.0730], // Roanne
-[43.5931, 1.4272], // Toulouse
+[[43.3879, 6.0785], "Brignoles", [["Francis Drubigny", "liberatio@librezo.fr"]]],
+//[[42.6998, 9.4518], "Bastia", [["Fred", "frodoric@librezo.fr"]]],
+[[44.4742, 1.8296], "Cajarc", [["Sylvestre Mignot", "syoul@librezo.fr"]]],
+[[50.1718, 3.2305], "Cambrai", [["Tobias Ollive", "oiseauroch@librezo.fr"]]],
+[[43.6578, 6.9228], "Grasse", [["Ismaël Bouya", "immae@librezo.fr"], ["Vincent Dubois", "vdubs@librezo.fr"]]],
+[[49.4927, 0.1641], "Le Havre", [["Pierre-Jean Chancellier", "paidge@librezo.fr"]]],
+[[43.3099, 5.4127], "Marseille", [["Jean-Jacques Brucker", "jbar@librezo.fr"]]],
+[[48.5421, 2.6551], "Melun", [["Étienne Bouché", "poka@librezo.fr"]]],
+[[43.6048, 3.8818], "Montpellier", [["Fabrice", "12b@librezo.fr"]]],
+[[48.8584, 2.4371], "Montreuil", [["Cédric Dumond", "attilax@librezo.fr"]]],
+//[[47.2084, -1.6026], "Nantes", [["Clément", "clement_t@librezo.fr"]]],
+[[43.2926, -0.3703], "Pau", [["Thibaut Parent", "parhit@librezo.fr"]]],
+[[48.1077, -1.6795], "Rennes", [["Philippe Lhardy", "artlog@librezo.fr"]]],
+[[46.0321, 4.0730], "Roanne", [["Pierre Kuhn", "pierretux@librezo.fr"]]],
+[[43.5931, 1.4272], "Toulouse", [["Baptiste Malet-Schalck", "ethicit@librezo.fr"], ["Mathilde Longuet", "denna@librezo.fr"]]],
 {% end %}
 
 Librezo<br/>
diff --git a/content/qui-sommes-nous.md b/content/qui-sommes-nous.md
index 9fd9259..f28689d 100644
--- a/content/qui-sommes-nous.md
+++ b/content/qui-sommes-nous.md
@@ -110,7 +110,7 @@ Librezo est un collectif décentralisé, né de la rencontre d'ami·es libristes
 {% end %}
 {% team_box(
 	title = "Fabrice alias 12b"
-	place = "Cévennes"
+	place = "Montpellier"
 	subtitle = "Ingénieur système"
 	img = "fabrice.jpg"
 ) %}
diff --git a/templates/base.html b/templates/base.html
index 797ac39..e9a902b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,8 +24,8 @@
 					<source srcset="/img/librezo-little-white.png" media="(prefers-color-scheme: dark)" />
 					<source srcset="/img/librezo-little-black.png" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)" />
 					<img decoding="async" id="header-logo" src="/img/librezo-little-black.png" alt="Librezo" aria-hidden/>
-			  </picture>
-			  <h1 class="sr-only">Librezo</h1>
+				</picture>
+				<h1 class="sr-only">Librezo</h1>
 			</a>
 			<nav id="header-menu">
 				<ul>
diff --git a/templates/shortcodes/map.html b/templates/shortcodes/map.html
index 214b3c2..fab0288 100644
--- a/templates/shortcodes/map.html
+++ b/templates/shortcodes/map.html
@@ -10,6 +10,11 @@
 		{{body|safe}}
 	];
 	for(i in places) {
-		L.marker(places[i]).addTo(map);
+		var popup = '<strong>'+places[i][1]+'</strong>';
+		for(j in places[i][2]) {
+			popup += '<br/>'+places[i][2][j][0]+'&nbsp;: <a href="mailto:'+places[i][2][j][1]+'">'+places[i][2][j][1]+'</a>';
+		}
+		L.marker(places[i][0]).addTo(map)
+			.bindPopup(popup);
 	}
 </script>