diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json
index c6f0794..ba2bbf9 100644
--- a/source/_data/diaspora.json
+++ b/source/_data/diaspora.json
@@ -33,7 +33,7 @@
         [
           "tag subscription",
           "limited posts",
-          "making your contact list private",
+          "making contact list private",
           "markdown support",
           "birthday notifications"
         ],
diff --git a/source/_data/friendica.json b/source/_data/friendica.json
index b365629..4d2b66b 100644
--- a/source/_data/friendica.json
+++ b/source/_data/friendica.json
@@ -41,7 +41,7 @@
       "dwellers": "friends",
       "communities": [{"title": "List of forums", "url": "https://dir.friendica.social/directory/forums"}],
       "descr": "Friendica aims at being a platform that suits everyone. Newcomers will feel right at home: the network's interface and functionality include common features of a mainstream social network. Being comparatively light on resources makes it attractive for administrators to host (Friendica's servers are called \"nodes\"). The community is good-natured and helpful. Friendica is well connected with the rest of Fediverse — its users can follow friends on most other federated networks.",
-      "connections": ["diaspora*", "Hubzilla", "GNU Social", "Mastodon", "Socialhome", "GangGo", "Pleroma", "postActiv"],
+      "connections": ["diaspora*", "GangGo", "GNU Social", "Hubzilla", "Mastodon", "Osada", "Pleroma", "postActiv", "Socialhome"],
       "tracker": "https://github.com/friendica/friendica/issues",
       "bounty": "",
       "translating": "https://www.transifex.com/Friendica/friendica",
@@ -66,6 +66,11 @@
         ],
       "notable":
         [
+          {
+            "name": "Feneas",
+            "url": "https://friendica.feneas.org/profile/feneas",
+            "avatar": "/img/avatars/feneas.png"
+          },
           {
             "name": "Attac Lübeck",
             "url": "https://libranet.de/profile/attac_hl",
diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json
index b30fa90..1d5c96e 100644
--- a/source/_data/gnusocial.json
+++ b/source/_data/gnusocial.json
@@ -36,7 +36,7 @@
       "dwellers": "GNU-hackers",
       "communities": [{"title": "List of groups", "url": "http://laemeur.sdf.org/gs/group-index.html"}],
       "descr": "GNU Social creators are the founding fathers of free libre microblogging networks. The platform has a significant userbase and multiple plugins.",
-      "connections": ["postActiv", "Mastodon", "Pleroma", "Friendica", "Hubzilla"],
+      "connections": ["Friendica", "Hubzilla", "Mastodon", "Pleroma", "postActiv"],
       "tracker": "https://git.gnu.io/gnu/gnu-social/issues",
       "bounty": "",
       "translating": "https://www.transifex.com/gnu-social/gnu-social",
@@ -57,16 +57,6 @@
             "name": "FSF",
             "url": "https://status.fsf.org/fsf",
             "avatar": "/img/avatars/fsf.png"
-          },
-          {
-            "name": "the Vikings",
-            "url": "https://social.vikings.net/vikings",
-            "avatar": "/img/avatars/vikings.png"
-          },
-          {
-            "name": "Umea hackerspace",
-            "url": "https://social.umeahackerspace.se/blog",
-            "avatar": "/img/avatars/umea.png"
           }
         ]
     }
diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json
index 1931f2b..a172354 100644
--- a/source/_data/hubzilla.json
+++ b/source/_data/hubzilla.json
@@ -45,12 +45,14 @@
       "connections": ["diaspora*", "Friendica", "GNU Social", "Mastodon", "Pleroma", "Socialhome", "GangGo", "postActiv"],
       "features":
         [
+          "granular privacy settings",
           "forums",
           "file sharing",
-          "nomadic indentity",
-          "direct messages deletion",
-          "expiring posts and mail",
+          "expiring posts",
+          "nomadic identity",
           "events",
+          "calendar",
+          "recallable direct messages (mail)",
           "encrypting comments with passphrase"
         ],
       "information":
diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index 6fcb318..ad1fd89 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -73,15 +73,17 @@
       "dwellers": "mastonauts",
       "communities": [{"title": "List of servers by theme", "url": "https://github.com/distributopia/masto-world-overview"}],
       "descr": "Mastodon network grew quickly and its development is still speedy. You'll find everything you want of a microblogging platform, and much more. There are numerous Mastodon servers (called \"instances\") created specifically for certain communities and dedicated to various interests, spheres of knowledge, regions and activities.",
-      "connections": ["GNU Social", "Friendica", "Hubzilla", "Pleroma", "PeerTube", "postActiv", "Misskey"],
+      "connections": ["Friendica", "GNU Social", "Hubzilla", "Misskey", "Osada", "PeerTube", "Pleroma", "postActiv"],
       "features":
         [
           "contact lists",
+          "making contact list private",
           "custom emojis",
           "pinned posts",
           "spoiler warnings",
           "redrafting posts",
-          "adjusting image preview with focal points"
+          "image preview with focal points",
+          "account verification with links"
         ],
       "donate": "https://patreon.com/mastodon",
       "tracker": "https://github.com/tootsuite/mastodon/issues",
@@ -139,9 +141,9 @@
             "avatar": "/img/avatars/fsfe.png"
           },
           {
-            "name": "Liberapay",
-            "url": "https://mstdn.io/@Liberapay",
-            "avatar": "/img/avatars/liberapay.png"
+            "name": "the Vikings",
+            "url": "https://social.vikings.net/@vikings",
+            "avatar": "/img/avatars/vikings.png"
           },
           {
             "name": "La Quadrature du Net",
@@ -153,26 +155,16 @@
             "url": "https://framapiaf.org/@ChatonsOrg",
             "avatar": "/img/avatars/chatons.png"
           },
-          {
-            "name": "Krita",
-            "url": "https://mastodon.art/@krita",
-            "avatar": "/img/avatars/krita.png"
-          },
-          {
-            "name": "Inkscape",
-            "url": "https://mastodon.art/@inkscape",
-            "avatar": "/img/avatars/inkscape.png"
-          },
-          {
-            "name": "GIMP",
-            "url": "https://mastodon.at/@GIMP",
-            "avatar": "/img/avatars/gimp.png"
-          },
           {
             "name": "F-Droid",
             "url": "https://mastodon.technology/@fdroidorg",
             "avatar": "/img/avatars/fdroid.png"
           },
+          {
+            "name": "Matomo",
+            "url": "https://mastodon.social/@Matomo",
+            "avatar": "/img/avatars/matomo.png"
+          },
           {
             "name": "David Revoy",
             "url": "https://framapiaf.org/@davidrevoy",
@@ -188,16 +180,6 @@
             "url": "https://chaos.social/@Digitalcourage",
             "avatar": "/img/avatars/digitalcourage.png"
           },
-          {
-            "name": "NOYB.eu",
-            "url": "https://mastodon.at/@noybeu",
-            "avatar": "/img/avatars/noyb.png"
-          },
-          {
-            "name": "Matomo",
-            "url": "https://mastodon.social/@Matomo",
-            "avatar": "/img/avatars/matomo.png"
-          },
           {
             "name": "TorProject",
             "url": "https://mastodon.social/@torproject",
@@ -218,6 +200,21 @@
             "url": "https://mastodon.social/@privacylab",
             "avatar": "/img/avatars/yale-privacylab.png"
           },
+          {
+            "name": "Krita",
+            "url": "https://mastodon.art/@krita",
+            "avatar": "/img/avatars/krita.png"
+          },
+          {
+            "name": "Inkscape",
+            "url": "https://mastodon.art/@inkscape",
+            "avatar": "/img/avatars/inkscape.png"
+          },
+          {
+            "name": "GIMP",
+            "url": "https://mastodon.at/@GIMP",
+            "avatar": "/img/avatars/gimp.png"
+          },
           {
             "name": "Doorbraak",
             "url": "https://todon.nl/@doorbraak",
@@ -228,16 +225,6 @@
             "url": "https://framapiaf.org/@RAPasso",
             "avatar": "/img/avatars/rap.png"
           },
-          {
-            "name": "Bijstandsbond",
-            "url": "https://todon.nl/@bijstandsbond",
-            "avatar": "/img/avatars/bijstandsbond.png"
-          },
-          {
-            "name": "Attac Lübeck",
-            "url": "https://mastodon.social/@attac_hl",
-            "avatar": "/img/avatars/attac_lubeck.png"
-          },
           {
             "name": "OCCRP",
             "url": "https://mastodon.cloud/@OCCRP",
@@ -248,6 +235,11 @@
             "url": "https://social.coop/@snowdrift",
             "avatar": "/img/avatars/snowdrift.png"
           },
+          {
+            "name": "Liberapay",
+            "url": "https://mastodon.xyz/@Liberapay",
+            "avatar": "/img/avatars/liberapay.png"
+          },
           {
             "name": "UBPorts",
             "url": "https://mastodon.rocks/@UBports",
@@ -283,15 +275,15 @@
             "url": "https://mastodon.social/@mxlinux",
             "avatar": "/img/avatars/mxlinux.png"
           },
-          {
-            "name": "Fairphone",
-            "url": "https://social.weho.st/@Fairphone",
-            "avatar": "/img/avatars/fairphone.png"
-          },
           {
             "name": "Purism",
             "url": "https://mastodon.social/@Purism",
             "avatar": "/img/avatars/purism.png"
+          },
+          {
+            "name": "NOYB.eu",
+            "url": "https://mastodon.at/@noybeu",
+            "avatar": "/img/avatars/noyb.png"
           }
         ]
     }
diff --git a/source/img/avatars/bijstandsbond.png b/source/img/avatars/bijstandsbond.png
deleted file mode 100644
index 3fd846c..0000000
Binary files a/source/img/avatars/bijstandsbond.png and /dev/null differ
diff --git a/source/img/avatars/fairphone.png b/source/img/avatars/fairphone.png
deleted file mode 100644
index 9cd91e7..0000000
Binary files a/source/img/avatars/fairphone.png and /dev/null differ
diff --git a/source/img/avatars/feneas.png b/source/img/avatars/feneas.png
new file mode 100644
index 0000000..f1fbc97
Binary files /dev/null and b/source/img/avatars/feneas.png differ
diff --git a/source/img/avatars/umea.png b/source/img/avatars/umea.png
deleted file mode 100644
index 45f0ece..0000000
Binary files a/source/img/avatars/umea.png and /dev/null differ