diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json
index 8ab4e63..0cb7924 100644
--- a/source/_data/miscellaneous.json
+++ b/source/_data/miscellaneous.json
@@ -1459,6 +1459,60 @@
         "OStatusClass": false,
         "categories": ["Other","Extension"]
       },
+      {
+        "title": "tootik",
+        "source": "https://github.com/dimkr/tootik",
+        "protocols": "ActivityPub",
+        "site": "gemini://hd.206267.xyz",
+        "logo": "",
+        "servers": "",
+        "description": "Federated nanoblogging service with a Gemini frontend.",
+        "codeLanguage": "Go",
+        "techStack": "",
+        "license": "Apache-2.0",
+        "FediAccount": "",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["SN-mi", "Other"]
+      },
+      {
+        "title": "Bugle",
+        "source": "https://github.com/rknightuk/bugle",
+        "protocols": "ActivityPub",
+        "site": "https://bugle.lol",
+        "logo": "",
+        "servers": "",
+        "description": "Minimal ActivityPub server built with Laravel.",
+        "codeLanguage": "PHP",
+        "techStack": "Laravel",
+        "license": "-",
+        "FediAccount": "https://bugle.lol/@bugle",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["SN-mi"]
+      },
+      {
+        "title": "Postmarks",
+        "source": "https://github.com/ckolderup/postmarks",
+        "protocols": "ActivityPub",
+        "site": "https://postmarks.glitch.me",
+        "logo": "",
+        "servers": "",
+        "description": "Single-user bookmarking platform that lets you save, tag and share bookmarks on the Fediverse. It can interact with other Postmarks sites as well as any text-based ActivityPub platform.",
+        "codeLanguage": "Javascript",
+        "techStack": "",
+        "license": "MIT",
+        "FediAccount": "https://sharetron.com/@casey",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["Links", "Other"]
+      },
       {
         "title": "diaspora*",
         "source": "https://github.com/diaspora/diaspora",
@@ -1638,42 +1692,6 @@
         "diasporaClass": false,
         "OStatusClass": false,
         "categories": ["SN-mi"]
-      },
-      {
-        "title": "tootik",
-        "source": "https://github.com/mastodon/mastodon",
-        "protocols": "ActivityPub",
-        "site": "gemini://hd.206267.xyz",
-        "logo": "/img/misc/mastodon.svg",
-        "servers": "https://the-federation.info/mastodon",
-        "description": "A federated nanoblogging service with a Gemini frontend.",
-        "codeLanguage": "Go",
-        "techStack": "",
-        "license": "Apache-2.0",
-        "FediAccount": "@dimkr@hd.206267.xyz",
-        "apClass": true,
-        "zotClass": false,
-        "diasporaClass": false,
-        "OStatusClass": false,
-        "categories": ["SN-mi", "Other"]
-      },
-      {
-        "title": "Bugle",
-        "source": "https://github.com/rknightuk/bugle",
-        "protocols": "ActivityPub",
-        "site": "https://bugle.lol/",
-        "logo": "/img/misc/mastodon.svg",
-        "servers": "https://the-federation.info/mastodon",
-        "description": "A minimal ActivityPub server built with Laravel.",
-        "codeLanguage": "Laravel",
-        "techStack": "",
-        "license": "",
-        "FediAccount": "@bugle@bugle.lol",
-        "apClass": true,
-        "zotClass": false,
-        "diasporaClass": false,
-        "OStatusClass": false,
-        "categories": ["SN-mi"]
       }
     ]
 }
diff --git a/source/_data/tools.json b/source/_data/tools.json
index a63508b..c25db6d 100644
--- a/source/_data/tools.json
+++ b/source/_data/tools.json
@@ -1,60 +1,6 @@
 {
   "apps":
     [
-      {
-        "title": "fossilphant",
-        "source": "https://github.com/swaldman/fossilphant",
-        "protocols": "ActivityPub",
-        "site": "",
-        "logo": "",
-        "servers": "",
-        "description": "a static-site generator for mastodon archives",
-        "codeLanguage": "Javascript",
-        "techStack": "",
-        "license": "MIT License",
-        "FediAccount": "@interfluidity@zirk.us",
-        "apClass": true,
-        "zotClass": false,
-        "diasporaClass": false,
-        "OStatusClass": false,
-        "categories": ["Utils"]
-      },
-	  {
-        "title": "Fediverse Export Analyzer",
-        "source": "https://github.com/stefanbohacek/fediverse-export-analyzer",
-        "protocols": "ActivityPub",
-        "site": "https://fediverse-export-analyzer.stefanbohacek.dev/",
-        "logo": "",
-        "servers": "",
-        "description": "a single-user bookmarking website designed to live on the Fediverse",
-        "codeLanguage": "Javascript",
-        "techStack": "",
-        "license": "MIT License",
-        "FediAccount": "https://stefanbohacek.online/@stefan",
-        "apClass": true,
-        "zotClass": false,
-        "diasporaClass": false,
-        "OStatusClass": false,
-        "categories": ["Utils"]
-      },
-      {
-        "title": "Postmarks",
-        "source": "https://github.com/ckolderup/postmarks",
-        "protocols": "ActivityPub",
-        "site": "https://postmarks.glitch.me/",
-        "logo": "",
-        "servers": "",
-        "description": "a single-user bookmarking website designed to live on the Fediverse",
-        "codeLanguage": "Javascript",
-        "techStack": "",
-        "license": "MIT License",
-        "FediAccount": "https://sharetron.com/@casey",
-        "apClass": true,
-        "zotClass": false,
-        "diasporaClass": false,
-        "OStatusClass": false,
-        "categories": ["Plugins"]
-      },
       {
         "title": "rtoot",
         "source": "https://github.com/schochastics/rtoot",
@@ -1998,6 +1944,42 @@
         "diasporaClass": false,
         "OStatusClass": false,
         "categories": ["Plugins"]
+      },
+      {
+        "title": "fossilphant",
+        "source": "https://github.com/swaldman/fossilphant",
+        "protocols": "ActivityPub",
+        "site": "",
+        "logo": "",
+        "servers": "",
+        "description": "Static-site generator for Mastodon archives.",
+        "codeLanguage": "Scala",
+        "techStack": "",
+        "license": "AGPL-3.0",
+        "FediAccount": "https://zirk.us/@interfluidity",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["Utils"]
+      },
+      {
+        "title": "Fediverse Export Analyzer",
+        "source": "https://github.com/stefanbohacek/fediverse-export-analyzer",
+        "protocols": "ActivityPub",
+        "site": "",
+        "logo": "",
+        "servers": "",
+        "description": "Visualize your fediverse export data.",
+        "codeLanguage": "Javascript",
+        "techStack": "",
+        "license": "MIT",
+        "FediAccount": "https://stefanbohacek.online/@stefan",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["Utils"]
       }
     ]
 }