diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index 2d19ec5..cc91a00 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -310,6 +310,11 @@
             "url": "https://framapiaf.org/@Emmabuntus",
             "avatar": "/img/avatars/emmabuntus.png"
           },
+          {
+            "name": "Solus",
+            "url": "https://fosstodon.org/@solus",
+            "avatar": "/img/avatars/solus.png"
+          },
           {
             "name": "PINE64",
             "url": "https://fosstodon.org/@PINE64",
diff --git a/source/_data/peertube.json b/source/_data/peertube.json
index 5b0bcde..7e2836e 100644
--- a/source/_data/peertube.json
+++ b/source/_data/peertube.json
@@ -69,7 +69,7 @@
           },
           {
             "name": "FSF",
-            "url": "https://framatube.org/accounts/fsf/video-channels",
+            "url": "https://framatube.org/accounts/fsf",
             "avatar": "/img/avatars/fsf.png"
           },
           {
diff --git a/source/img/avatars/solus.png b/source/img/avatars/solus.png
new file mode 100644
index 0000000..eecd6b3
Binary files /dev/null and b/source/img/avatars/solus.png differ
diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs
index 7b3709a..63ff234 100644
--- a/themes/starter/layout/mastodon.ejs
+++ b/themes/starter/layout/mastodon.ejs
@@ -9,8 +9,8 @@ network: true
   const tuts = [__('howto'), __('guide')];
   const uxList = [__('pinafore'), __('halcyon'), __('mastoGallery'), __('trunk')];
   const stats = [__('stats')];
-  const tech = [__('awesome'), __('mediaHosting')];
-  const tools = [__('preinstalled'), __('backup')];
+  const tech = [__('awesome'), __('backup')];
+  const tools = [__('preinstalled'), __('mediaHosting')];
   const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot')];
 %>