diff --git a/source/_data/common.json b/source/_data/common.json
index 32fa209..d45602c 100644
--- a/source/_data/common.json
+++ b/source/_data/common.json
@@ -1,12 +1,6 @@
 {
   "list":
     [
-      {
-        "title": "diaspora",
-        "url" : "https://diasporafoundation.org",
-        "smallImg": "img/diaspora.png",
-        "descr": "Online world where you are in control. Own your data. Choose your audience. Be who you want to be"
-      },
       {
         "title": "Friendica",
         "url" : "https://friendi.ca",
@@ -14,16 +8,10 @@
         "descr": "Personal network with no central authority or ownership. Keep in contact with people you care about"
       },
       {
-        "title": "GNU Social",
-        "url" : "https://gnusocial.network",
-        "smallImg": "img/gnusocial.png",
-        "descr": "Connecting free and independent communities across the web"
-      },
-      {
-        "title": "Hubzilla",
-        "url" : "https://hubzilla.org",
-        "smallImg": "img/hubzilla.png",
-        "descr": "Feature-rich social platform. Create channels with a decentralized nomadic identity"
+        "title": "Lemmy",
+        "url" : "https://join-lemmy.org",
+        "smallImg": "img/lemmy.png",
+        "descr": "Follow communities anywhere in the world"
       },
       {
         "title": "Mastodon",
@@ -31,12 +19,6 @@
         "smallImg": "img/mastodon.png",
         "descr": "Social networking back in your hands. Find your perfect community. Take control of your content"
       },
-      {
-        "title": "Misskey",
-        "url" : "https://join.misskey.page/en",
-        "smallImg": "img/misskey.png",
-        "descr": "Sophisticated microblogging with personality"
-      },
       {
         "title": "PeerTube",
         "url" : "https://joinpeertube.org/en",
@@ -49,6 +31,24 @@
         "smallImg": "img/pleroma.png",
         "descr": "Federated microblogging, light as a feather"
       },
+      {
+        "title": "Funkwhale",
+        "url" : "https://funkwhale.audio",
+        "smallImg": "img/funkwhale.png",
+        "descr": "A social platform to enjoy and share music"
+      },
+      {
+        "title": "Hubzilla",
+        "url" : "https://hubzilla.org",
+        "smallImg": "img/hubzilla.png",
+        "descr": "Feature-rich social platform. Create channels with a decentralized nomadic identity"
+      },
+      {
+        "title": "Misskey",
+        "url" : "https://join.misskey.page/en",
+        "smallImg": "img/misskey.png",
+        "descr": "Sophisticated microblogging with personality"
+      },
       {
         "title": "Pixelfed",
         "url" : "https://pixelfed.org",
@@ -56,10 +56,10 @@
         "descr": "Federated social image sharing for everyone"
       },
       {
-        "title": "Funkwhale",
-        "url" : "https://funkwhale.audio",
-        "smallImg": "img/funkwhale.png",
-        "descr": "A social platform to enjoy and share music"
+        "title": "diaspora",
+        "url" : "https://diasporafoundation.org",
+        "smallImg": "img/diaspora.png",
+        "descr": "Online world where you are in control. Own your data. Choose your audience. Be who you want to be"
       }
     ],
   "protocols":
diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json
index 2844ea7..5511957 100644
--- a/source/_data/diaspora.json
+++ b/source/_data/diaspora.json
@@ -71,21 +71,6 @@
         ],
       "notable":
         [
-          {
-            "name": "FSF",
-            "url": "https://framasphere.org/u/fsf",
-            "avatar": "/img/avatars/fsf.png"
-          },
-          {
-            "name": "Framasoft",
-            "url": "https://framasphere.org/u/framasoft",
-            "avatar": "/img/avatars/framasoft.png"
-          },
-          {
-            "name": "La Quadrature du Net",
-            "url": "https://framasphere.org/u/la_quadrature_du_net",
-            "avatar": "/img/avatars/laquadrature.png"
-          },
           {
             "name": "Monomeer",
             "url": "https://pod.geraspora.de/u/monomeer",
@@ -100,11 +85,6 @@
             "name": "Die is lieb",
             "url": "https://pod.geraspora.de/u/ey_lou_flynn",
             "avatar": "/img/avatars/die_is_lieb.png"
-          },
-          {
-            "name": "Liberapay",
-            "url": "https://framasphere.org/u/liberapay",
-            "avatar": "/img/avatars/liberapay.png"
           }
         ]
     }
diff --git a/source/img/lemmy.png b/source/img/lemmy.png
new file mode 100644
index 0000000..b6dd400
Binary files /dev/null and b/source/img/lemmy.png differ
diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss
index d70fe65..91c5a99 100644
--- a/themes/starter/source/assets/scss/modules/_index.scss
+++ b/themes/starter/source/assets/scss/modules/_index.scss
@@ -79,12 +79,12 @@
   left: 28%;
 }
 
-.f-diaspora {
-  top: 3em;
-  left: 84%;
+.f-Lemmy {
+  top: 4em;
+  left: 80%;
 }
 
-.f-Pleroma {
+.f-PeerTube {
   top: 48%;
   left: 13%;
 }
@@ -99,12 +99,12 @@
   left: 32%;
 }
 
-.f-GNUSocial {
+.f-diaspora {
   top: 76%;
   left: 83%;
 }
 
-.f-PeerTube {
+.f-Pleroma {
   top: 53%;
   left: 85%;
 }
@@ -289,7 +289,7 @@
     flex: 25% 0 0;
   }
 
-  .f-diaspora {
+  .f-Lemmy {
     left: 75%;
   }