diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 2286a402..c049c624 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -16,6 +16,13 @@ const lang = getLangFromUrl(Astro.url) || defaultLang;
 <!doctype html>
 <html lang={lang}>
 	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<title>{title} — Leim Wiki</title>
+
+        <script is:inline src="/leaflet/leaflet.js" />
+        <script is:inline type="text/javascript" src="/js/leaflet-measure.min.js"></script>
+        <script is:inline type="text/javascript" src="/js/leaflet-zoomify.min.js"></script>
         <script>
             import { setLang } from "@/i18n/store";
             import { defaultLang, type Language } from "@/i18n/ui";
@@ -25,12 +32,21 @@ const lang = getLangFromUrl(Astro.url) || defaultLang;
             setLang(currentLang || defaultLang);
         </script>
 
-		<meta charset="UTF-8" />
+        <link rel="stylesheet" href="/leaflet/leaflet.css" rel="preload" />
+        <link rel="stylesheet" href="/leaflet-measure/leaflet-measure.css" rel="preload" />
+
         <meta name="author" content="Alexis Pelé" />
-		{head?.description && <meta name="description" content={head.description} /> }
-		<meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta property="og:author" content="Alexis Pelé" />
+        <meta property="og:locale" content={lang}>
+        <meta name="application-name" content="leim-maps">
+        <meta name="format-detection" content="telephone=no">
+        <meta name="msapplication-config" content="none">
+
+		{head?.description && (
+            <meta name="description" content={head.description} />
+            <meta property="og:description" content={head.description} />
+        )}
 		<meta name="generator" content={Astro.generator} />
-		<title>{title} — Leim Wiki</title>
 
         <link rel="canonical" href={Astro.url}>
 
@@ -41,22 +57,18 @@ const lang = getLangFromUrl(Astro.url) || defaultLang;
         <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#6595b4">
         <meta name="msapplication-TileColor" content="#00aba9">
         <meta name="theme-color" content="#a9d1eb">
+        <meta name="color-scheme" content="dark light">
 
         <meta property="og:title" content={title} />
         <meta property="og:type" content="website" />
         <meta property="og:url" content={Astro.url} />
-        {head?.image && <meta property="og:image" content={head.image} />}
 
         {head?.description && <meta name="twitter:description" content={head.description} /> }
-        {head?.image && <meta property="twitter:image" content={head.image} />}
-
-        <link rel="stylesheet" href="/leaflet/leaflet.css" rel="preload" />
-        <script is:inline src="/leaflet/leaflet.js" />
-
-        <script is:inline type="text/javascript" src="/js/leaflet-zoomify.min.js"></script>
-
-        <link rel="stylesheet" href="/leaflet-measure/leaflet-measure.css" rel="preload" />
-        <script is:inline type="text/javascript" src="/js/leaflet-measure.min.js"></script>
+        {head?.image && (
+            <meta property="og:image" content={`${Astro.site?.origin}${head.image}`} />
+            <meta name="twitter:image" content={`${Astro.site?.origin}${head.image}`} />
+            <meta name="twitter:card" content="summary_large_image" />
+        )}
 	</head>
 	<body>
         <script is:inline>
diff --git a/src/pages/en/aldys/borelis/index.astro b/src/pages/en/aldys/borelis/index.astro
index 0d963538..98b2fa9d 100644
--- a/src/pages/en/aldys/borelis/index.astro
+++ b/src/pages/en/aldys/borelis/index.astro
@@ -4,7 +4,12 @@ import Map from '@/components/maps/Map.astro'
 import MapOverlay from '@/components/maps/MapOverlay.astro'
 ---
 
-<Layout title="Borélis ~ Maps">
+<Layout
+    title="Borélis ~ Maps"
+    head={{
+        description: "Map of Borélis, a harbour city on the northern shores of the Kaldelium Accord."
+    }}
+>
     <MapOverlay
         mapKey='aldys-borelis'
         searchConfig={{
diff --git a/src/pages/en/aldys/cantane/index.astro b/src/pages/en/aldys/cantane/index.astro
index bee5f3ba..586a1885 100644
--- a/src/pages/en/aldys/cantane/index.astro
+++ b/src/pages/en/aldys/cantane/index.astro
@@ -1,5 +1,5 @@
 ---
-import type { MapMarker, PlayerMarker } from '@/types/Leaflet';
+import type { MapMarker } from '@/types/Leaflet';
 
 import Layout from '@/layouts/Layout.astro';
 import Map from '@/components/maps/Map.astro'
@@ -10,7 +10,12 @@ import markersData from '@/components/maps/data/en/aldys/cantane/markers.json'
 const markers = markersData.data as MapMarker[]
 ---
 
-<Layout title="Cantane ~ Maps">
+<Layout
+    title="Cantane ~ Maps"
+    head={{
+        description: "Map of the old city of Cantane, south of the Kaldelium Accord."
+    }}
+>
     <MapOverlay
         mapKey='aldys-cantane'
         markers={markers}
diff --git a/src/pages/en/aldys/cantane/mines-blanches.astro b/src/pages/en/aldys/cantane/mines-blanches.astro
index 4185439c..6e48903b 100644
--- a/src/pages/en/aldys/cantane/mines-blanches.astro
+++ b/src/pages/en/aldys/cantane/mines-blanches.astro
@@ -10,7 +10,12 @@ import markersData from '@/components/maps/data/en/aldys/cantane/les-mines-blanc
 const markers = markersData.data as MapMarker[]
 ---
 
-<Layout title="White Hollow ~ Maps">
+<Layout
+    title="White Hollow ~ Maps"
+    head={{
+        description: "Map of the White Hollow mining complex, left abandonned east of Cantane."
+    }}
+>
     <MapOverlay
         mapKey='aldys-cantane-mines'
         markers={markers}
diff --git a/src/pages/en/bamast/index.astro b/src/pages/en/bamast/index.astro
index 83417a90..2660f81c 100644
--- a/src/pages/en/bamast/index.astro
+++ b/src/pages/en/bamast/index.astro
@@ -12,7 +12,12 @@ const markers = markersData.data as MapMarker[]
 const players = playersData as PlayerMarker
 ---
 
-<Layout title="Bamast ~ Maps">
+<Layout
+    title="Bamast ~ Maps"
+    head={{
+        description: "Map of the archipelago of Bamast and its many islands in the Balamian Ocean."
+    }}
+>
     <MapOverlay
         mapKey='bamast'
         markers={markers}
diff --git a/src/pages/en/index.astro b/src/pages/en/index.astro
index 90333ae9..cf99a1be 100644
--- a/src/pages/en/index.astro
+++ b/src/pages/en/index.astro
@@ -16,8 +16,8 @@ const players = playersData as PlayerMarker
     title="Aldys ~ Maps"
     head={
         {
-            description: "Carte de l'Alliance Kaldélienne sur la planète de Léim.",
-            image: '/images/bailey-zindel-NRQV-hBF10M-unsplash.jpg'
+            description: "Map of the Aldys continent on the planet of Léim, displaying the Kaldelium accord and the Common Lands of Syaltha.",
+            image: '/bailey-zindel-NRQV-hBF10M-unsplash.jpg'
         }
     }
 >
diff --git a/src/pages/fr/aldys/borelis/index.astro b/src/pages/fr/aldys/borelis/index.astro
index 386ba8c3..cd5e7723 100644
--- a/src/pages/fr/aldys/borelis/index.astro
+++ b/src/pages/fr/aldys/borelis/index.astro
@@ -4,7 +4,12 @@ import Map from '@/components/maps/Map.astro'
 import MapOverlay from '@/components/maps/MapOverlay.astro'
 ---
 
-<Layout title="Borélis ~ Cartographie">
+<Layout
+    title="Borélis ~ Cartographie"
+    head={{
+        description: "Carte de la ville côtière de Borélis, sur les côtes gelées au nord de l'Alliance Kaldélienne."
+    }}
+>
     <MapOverlay
         mapKey='aldys-borelis'
         searchConfig={{
diff --git a/src/pages/fr/aldys/cantane/index.astro b/src/pages/fr/aldys/cantane/index.astro
index 90e2011d..cedfe8b2 100644
--- a/src/pages/fr/aldys/cantane/index.astro
+++ b/src/pages/fr/aldys/cantane/index.astro
@@ -10,7 +10,12 @@ import markersData from '@/components/maps/data/fr/aldys/cantane/markers.json'
 const markers = markersData.data as MapMarker[]
 ---
 
-<Layout title="Cantane ~ Cartographie">
+<Layout
+    title="Cantane ~ Cartographie"
+    head={{
+        description: "Carte de la ville de Cantane, au sud de l'Alliance Kaldélienne."
+    }}
+>
     <MapOverlay
         mapKey='aldys-cantane'
         markers={markers}
diff --git a/src/pages/fr/aldys/cantane/mines-blanches.astro b/src/pages/fr/aldys/cantane/mines-blanches.astro
index fd6533f6..0717ec9d 100644
--- a/src/pages/fr/aldys/cantane/mines-blanches.astro
+++ b/src/pages/fr/aldys/cantane/mines-blanches.astro
@@ -10,7 +10,12 @@ import markersData from '@/components/maps/data/fr/aldys/cantane/les-mines-blanc
 const markers = markersData.data as MapMarker[]
 ---
 
-<Layout title="Les Mines Blanches ~ Cartographie">
+<Layout
+    title="Les Mines Blanches ~ Cartographie"
+    head={{
+        description: "Cartographie du complexe des Mines Blanches, laissé à l'abandon à l'est de Cantane."
+    }}
+>
     <MapOverlay
         mapKey='aldys-cantane-mines'
         markers={markers}
diff --git a/src/pages/fr/bamast/index.astro b/src/pages/fr/bamast/index.astro
index ad83dea5..3ab1ac75 100644
--- a/src/pages/fr/bamast/index.astro
+++ b/src/pages/fr/bamast/index.astro
@@ -12,7 +12,12 @@ const markers = markersData.data as MapMarker[]
 const players = playersData as PlayerMarker
 ---
 
-<Layout title="Bamast ~ Cartographie">
+<Layout
+    title="Bamast ~ Cartographie"
+    head={{
+        description: "Carte de l'Archipel de Bamast et ses nombreuses îles de l'Océan Balamien."
+    }}
+>
     <MapOverlay
         mapKey='bamast'
         markers={markers}
diff --git a/src/pages/fr/index.astro b/src/pages/fr/index.astro
index c3acc240..b62f171b 100644
--- a/src/pages/fr/index.astro
+++ b/src/pages/fr/index.astro
@@ -16,8 +16,8 @@ const players = playersData as PlayerMarker
     title="Aldys ~ Cartographie"
     head={
         {
-            description: "Carte de l'Alliance Kaldélienne sur la planète de Léim.",
-            image: '/images/bailey-zindel-NRQV-hBF10M-unsplash.jpg'
+            description: "Carte du continent Aldys sur la planète de Léim, comprenant l'Alliance Kaldélienne et les Terres de Syaltha.",
+            image: '/bailey-zindel-NRQV-hBF10M-unsplash.jpg'
         }
     }
 >
