diff --git a/content/.vuepress/head.ts b/content/.vuepress/head.ts
index eeb1a4f..a1be005 100644
--- a/content/.vuepress/head.ts
+++ b/content/.vuepress/head.ts
@@ -13,6 +13,10 @@ const simplifiedHead: SimplifiedHeader[] = [
         name: 'author',
         content: 'Lucien Cartier-Tilet',
       },
+      {
+        name: 'fediverse:creator',
+        content: '@phundrak@mastodon.phundrak.com',
+      },
       {
         property: 'og:image',
         content: 'https://cdn.phundrak.com/img/rich_preview.png',
@@ -131,7 +135,7 @@ simplifiedHead.forEach((tag) => {
 });
 headBuilder.push([
   'a',
-  { rel: 'me', href: 'https://emacs.ch/@phundrak' },
+  { rel: 'me', href: 'https://mastodon.phundrak.com/@phundrak' },
   'Mastodon',
 ]);
 
diff --git a/content/en/find-me.org b/content/en/find-me.org
index b40e897..6e112fb 100644
--- a/content/en/find-me.org
+++ b/content/en/find-me.org
@@ -7,26 +7,25 @@ I am on various websites and some social networks where you can follow
 me.
 
 ** Social Networks
-- {{{icon(mastodon)}}} Mastodon :: [[https://emacs.ch/@phundrak][@phundrak@phundrak.com]] should work,
-  otherwise head over to [[https://emacs.ch/@phundrak][@phundrak@emacs.ch]]
-- {{{icon(twitter)}}} Twitter :: [[https://twitter.com/phundrak][@phundrak]], though I harldy use it anymore
+- {{{icon(mastodon)}}} *Mastodon* :: [[https://mastodon.phundrak.com/@phundrak][@phundrak@mastodon.phundrak.com]]
+- {{{icon(twitter)}}} *Twitter* :: [[https://twitter.com/phundrak][@phundrak]], though I harldy use it anymore
   and mostly reshare my Mastodon messages when I think to, and
   sometimes they get truncated
-- {{{icon(writefreely)}}} Writefreely :: ⁣
+- {{{icon(writefreely)}}} *Writefreely* :: ⁣
   - [[https://write.phundrak.com/phundrak][@phundrak@write.phundrak.com]] : blog alternative
   - [[https://write.phundrak.com/phundraks-short-stories][@phundraks-short-stories@write.phundrak.com]] :: short stories,
     mainly in French for now
-- {{{icon(discord)}}} Discord :: =@phundrak= (tell me you come from here,
+- {{{icon(discord)}}} *Discord* :: =@phundrak= (tell me you come from here,
   otherwise there’s a chance I’ll consider your message as spam)
 
 ** Other Websites
-- {{{icon(envelope)}}} Email :: [[mailto:lucien@phundrak.com][lucien@phundrak.com]]
-- {{{icon(rss)}}} Blog :: [[https://blog.phundrak.com][blog.phundrak.com]]
-- {{{icon(gitea)}}} Gitea :: [[https://labs.phundrak.com/phundrak][@phundrak@labs.phundrak.com]]
-- {{{icon(github)}}} GitHub :: [[https://github.com/Phundrak][Phundrak]]
-- {{{icon(youtube)}}} YouTube :: [[https://www.youtube.com/@phundrak][@phundrak]]
-- {{{icon(reddit)}}} Reddit :: [[https://www.reddit.com/user/phundrak][/u/phundrak]]
-- {{{icon(linkedin)}}} LinkedIn :: [[https://www.linkedin.com/in/lucien-cartier-tilet/][Lucien Cartier-Tilet]]
-- {{{icon(twitch)}}} Twitch :: [[https://www.twitch.tv/phundrak][phundrak]]
+- {{{icon(envelope)}}} *Email* :: [[mailto:lucien@phundrak.com][lucien@phundrak.com]]
+- {{{icon(rss)}}} *Blog* :: [[https://blog.phundrak.com][blog.phundrak.com]]
+- {{{icon(gitea)}}} *Gitea* :: [[https://labs.phundrak.com/phundrak][@phundrak@labs.phundrak.com]]
+- {{{icon(github)}}} *GitHub* :: [[https://github.com/Phundrak][Phundrak]]
+- {{{icon(youtube)}}} *YouTube* :: [[https://www.youtube.com/@phundrak][@phundrak]]
+- {{{icon(reddit)}}} *Reddit* :: [[https://www.reddit.com/user/phundrak][/u/phundrak]]
+- {{{icon(linkedin)}}} *LinkedIn* :: [[https://www.linkedin.com/in/lucien-cartier-tilet/][Lucien Cartier-Tilet]]
+- {{{icon(twitch)}}} *Twitch* :: [[https://www.twitch.tv/phundrak][phundrak]]
 
 #+include: other-links
diff --git a/content/find-me.org b/content/find-me.org
index 8a69d33..78616d7 100644
--- a/content/find-me.org
+++ b/content/find-me.org
@@ -7,26 +7,25 @@ Je suis présent sur différentes plateformes et quelques réseaux
 sociaux où vous pouvez me suivre.
 
 ** Réseaux sociaux
-- {{{icon(mastodon)}}} *Mastodon* : [[https://emacs.ch/@phundrak][@phundrak@phundrak.com]] devrait
-  fonctionner, sinon direction [[https://emacs.ch/@phundrak][@phundrak@emacs.ch]]
-- {{{icon(twitter)}}} *Twitter* : [[https://twitter.com/phundrak][@phundrak]], cependant je n’y suis plus très
+- {{{icon(mastodon)}}} *Mastodon* :: [[https://mastodon.phundrak.com/@phundrak][@phundrak@mastodon.phundrak.com]]
+- {{{icon(twitter)}}} *Twitter* :: [[https://twitter.com/phundrak][@phundrak]], cependant je n’y suis plus très
   actif et j’y repartage principalement mes messages Mastodon qui
   parfois se font tronquer
-- {{{icon(writefreely)}}} *Writefreely* :
+- {{{icon(writefreely)}}} *Writefreely* ::
   - [[https://write.phundrak.com/phundrak][*@phundrak@write.phundrak.com*]] : billets personnels
   - [[https://write.phundrak.com/phundraks-short-stories][*@phundraks-short-stories@write.phundrak.com*]] : histoires courtes
-- {{{icon(discord)}}} *Discord* : =@phundrak= (dites-moi que vous venez
+- {{{icon(discord)}}} *Discord* :: =@phundrak= (dites-moi que vous venez
   d’ici, autrement il est possible que je considère le message comme
   du pourriel)
 
 ** Autres plateformes
-- {{{icon(envelope)}}} *Courriel* : [[mailto:lucien@phundrak.com][lucien@phundrak.com]]
-- {{{icon(rss)}}} *Blog* : [[https://blog.phundrak.com][blog.phundrak.com]]
-- {{{icon(gitea)}}} *Gitea* : [[https://labs.phundrak.com/phundrak][@phundrak@labs.phundrak.com]]
-- {{{icon(github)}}} *GitHub* : [[https://github.com/Phundrak][Phundrak]]
-- {{{icon(youtube)}}} *YouTube* : [[https://www.youtube.com/@phundrak][@phundrak]]
-- {{{icon(reddit)}}} *Reddit*: [/u/phundrak](https://www.reddit.com/user/phundrak)
-- {{{icon(linkedin)}}} *LinkedIn*: [[https://www.linkedin.com/in/lucien-cartier-tilet/][Lucien Cartier-Tilet]]
-- {{{icon(twitch)}}} *Twitch*: [[https://www.twitch.tv/phundrak][phundrak]]
+- {{{icon(envelope)}}} *Courriel* :: [[mailto:lucien@phundrak.com][lucien@phundrak.com]]
+- {{{icon(rss)}}} *Blog* :: [[https://blog.phundrak.com][blog.phundrak.com]]
+- {{{icon(gitea)}}} *Gitea* :: [[https://labs.phundrak.com/phundrak][@phundrak@labs.phundrak.com]]
+- {{{icon(github)}}} *GitHub* :: [[https://github.com/Phundrak][Phundrak]]
+- {{{icon(youtube)}}} *YouTube* :: [[https://www.youtube.com/@phundrak][@phundrak]]
+- {{{icon(reddit)}}} *Reddit* :: [[https://www.reddit.com/user/phundrak][/u/phundrak]]
+- {{{icon(linkedin)}}} *LinkedIn* :: [[https://www.linkedin.com/in/lucien-cartier-tilet/][Lucien Cartier-Tilet]]
+- {{{icon(twitch)}}} *Twitch* :: [[https://www.twitch.tv/phundrak][phundrak]]
 
 #+include: other-links
diff --git a/content/lfn/find-me.org b/content/lfn/find-me.org
index d988d35..14902cb 100644
--- a/content/lfn/find-me.org
+++ b/content/lfn/find-me.org
@@ -5,25 +5,24 @@
 On pote trova me sur multe loca ueb e redes sosial do on pote segue me.
 
 ** Redes sosial
-- {{{icon(mastodon)}}} Mastodon :: [[https://emacs.ch/@phundrak][@phundrak@phundrak.com]] ta debe funsiona,
-  si no, visita [[https://emacs.ch/@phundrak][@phundrak@emacs.ch]]
-- {{{icon(twitter)}}} Twitter :: [[https://twitter.com/phundrak][@phundrak]], ma me usa lo a poca veses, la
+- {{{icon(mastodon)}}} *Mastodon* :: [[https://mastodon.phundrak.com/@phundrak][@phundrak@mastodon.phundrak.com]]
+- {{{icon(twitter)}}} *Twitter* :: [[https://twitter.com/phundrak][@phundrak]], ma me usa lo a poca veses, la
   plu de mea tuitas es mea mesajes mastodon ce es a vesas truncada
-- {{{icon(writefreely)}}} Writefreely :: ⁣
+- {{{icon(writefreely)}}} *Writefreely* :: ⁣
   - [[https://write.phundrak.com/phundrak][@phundrak@write.phundrak.com]] :: revistas personal
   - [[https://write.phundrak.com/phundraks-short-stories][@phundraks-short-stories@write.phundrak.com]] :: istorias corta (a
     multe veses en Frans)
-- {{{icon(discord)}}} Discord :: =@phundrak= (dise me ce tu veni de asi,
+- {{{icon(discord)}}} *Discord* :: =@phundrak= (dise me ce tu veni de asi,
   si no, me pote pensa ce tua mesaje es spam)
 
 ** Other Websites
-- {{{icon(envelope)}}} Eposta :: [[mailto:lucien@phundrak.com][lucien@phundrak.com]]
-- {{{icon(rss)}}} Blog :: [[https://blog.phundrak.com][blog.phundrak.com]]
-- {{{icon(gitea)}}} Gitea :: [[https://labs.phundrak.com/phundrak][@phundrak@labs.phundrak.com]]
-- {{{icon(github)}}} GitHub :: [[https://github.com/Phundrak][Phundrak]]
-- {{{icon(youtube)}}} YouTube :: [[https://www.youtube.com/@phundrak][@phundrak]]
-- {{{icon(reddit)}}} Reddit :: [[https://www.reddit.com/user/phundrak][/u/phundrak]]
-- {{{icon(linkedin)}}} LinkedIn :: [[https://www.linkedin.com/in/lucien-cartier-tilet/][Lucien Cartier-Tilet]]
-- {{{icon(twitch)}}} Twitch :: [[https://www.twitch.tv/phundrak][phundrak]]
+- {{{icon(envelope)}}} *Eposta* :: [[mailto:lucien@phundrak.com][lucien@phundrak.com]]
+- {{{icon(rss)}}} *Blog* :: [[https://blog.phundrak.com][blog.phundrak.com]]
+- {{{icon(gitea)}}} *Gitea* :: [[https://labs.phundrak.com/phundrak][@phundrak@labs.phundrak.com]]
+- {{{icon(github)}}} *GitHub* :: [[https://github.com/Phundrak][Phundrak]]
+- {{{icon(youtube)}}} *YouTube* :: [[https://www.youtube.com/@phundrak][@phundrak]]
+- {{{icon(reddit)}}} *Reddit* :: [[https://www.reddit.com/user/phundrak][/u/phundrak]]
+- {{{icon(linkedin)}}} *LinkedIn* :: [[https://www.linkedin.com/in/lucien-cartier-tilet/][Lucien Cartier-Tilet]]
+- {{{icon(twitch)}}} *Twitch* :: [[https://www.twitch.tv/phundrak][phundrak]]
 
 #+include: other-links