diff --git a/docs/self-hosted.md b/docs/self-hosted.md
index ddd7f9f2..f0689085 100644
--- a/docs/self-hosted.md
+++ b/docs/self-hosted.md
@@ -184,7 +184,7 @@ Running a local version of Peergos alongside a registered account on their paid,
{ align=right }
-**SearXNG** is an open-source, [metasearch engine](https://en.wikipedia.org/wiki/Metasearch_engine).
+**SearXNG** is an open-source, [metasearch engine](https://en.wikipedia.org/wiki/Metasearch_engine) that serves as a proxy between you and the search engines it aggregates from.
[:octicons-home-16:](https://searxng.org){ .card-link title="Homepage" }
[:octicons-info-16:](https://docs.searxng.org/admin/installation.html#installation){ .card-link title="Admin Documentation" }
@@ -302,11 +302,11 @@ Self-hosting your own instance of a web-based frontend can help you circumvent r
- { .twemoji } **Piped (YouTube)**
+ ---
+
[:octicons-info-24:](https://docs.piped.video/docs/self-hosting){ .card-link title="Admin Documentation" }
[:octicons-code-16:](https://github.com/TeamPiped/Piped){ .card-link title="Source Code" }
- ---
-
## More Tools...
@@ -315,16 +315,92 @@ Tool recommendations in other categories of the website also provide a self-host
-- { .twemoji } [Addy.io (Email Aliasing)](email-aliasing.md#addyio) [:octicons-info-24:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
-- { .twemoji } [SimpleLogin (Email Aliasing)](email-aliasing.md#simplelogin) [:octicons-info-24:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
-- { .twemoji }{ .twemoji } [Ente Photos (Photo Manager)](photo-management.md#ente-photos) [:octicons-info-24:](https://help.ente.io/self-hosting){ .card-link title="Admin Documentation" }
-- { .twemoji }{ .twemoji } [Stingle (Photo Manager)](photo-management.md#stingle) [:octicons-info-24:](https://stingle.org/server){ .card-link title="Admin Documentation" }
-- { .twemoji } [CryptPad (Online Office Suite)](document-collaboration.md#cryptpad) [:octicons-info-24:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
-- { .twemoji }{ .twemoji } [LanguageTool (Grammar, Style, and Spell Checker)](language-tools.md#languagetool) [:octicons-info-24:](https://dev.languagetool.org/http-server){ .card-link title="Admin Documentation" }
-- { .twemoji }{ .twemoji } [Miniflux (News Aggregator)](news-aggregators.md#miniflux) [:octicons-info-24:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
-- { .twemoji } [PrivateBin (Pastebin)](pastebins.md#privatebin) [:octicons-info-24:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
-- { .twemoji } [Paaster (Pastebin)](pastebins.md#paaster) [:octicons-info-24:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
-- { .twemoji } [SimpleX Chat (Instant Messenger)](real-time-communication.md#simplex-chat) [:octicons-info-24:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
-- { .twemoji } [Element (Matrix Client)](real-time-communication.md#element) [:octicons-info-24:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+- { .twemoji } **Addy.io (Email Aliasing)**
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://addy.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/anonaddy){ .card-link title="Source Code" }
+
+- { .twemoji } **SimpleLogin (Email Aliasing)**
+
+ ---
+
+ [:octicons-home-16:](https://addy.io){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://github.com/simple-login/app#prerequisites){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simple-login){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } **Ente Photos (Photo Manager)**
+
+ ---
+
+ [:octicons-home-16:](https://ente.io){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://help.ente.io/self-hosting){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/ente-io/ente){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } **Stingle (Photo Manager)**
+
+ ---
+
+ [:octicons-home-16:](https://ente.io){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://stingle.org/server){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/stingle){ .card-link title="Source Code" }
+
+- { .twemoji } **CryptPad (Online Office Suite)**
+
+ ---
+
+ [:octicons-home-16:](https://cryptpad.fr){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://docs.cryptpad.org/en/admin_guide/index.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/xwiki-labs/cryptpad){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } **LanguageTool (Grammar, Style, and Spell Checker)**
+
+ ---
+
+ [:octicons-home-16:](https://languagetool.org){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://dev.languagetool.org/http-server){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/languagetool-org){ .card-link title="Source Code" }
+
+- { .twemoji }{ .twemoji } **Miniflux (News Aggregator)**
+
+ ---
+
+ [:octicons-home-16:](https://miniflux.app){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://miniflux.app/docs/index.html#administration-guide){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/miniflux/v2){ .card-link title="Source Code" }
+
+- { .twemoji } **PrivateBin (Pastebin)**
+
+ ---
+
+ [:octicons-home-16:](https://privatebin.info){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://github.com/PrivateBin/PrivateBin/blob/master/doc/Installation.md){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/PrivateBin/PrivateBin){ .card-link title="Source Code" }
+
+- { .twemoji } **Paaster (Pastebin)**
+
+ ---
+
+ [:octicons-home-16:](https://paaster.io){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://github.com/WardPearce/paaster#deployment){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/WardPearce/paaster){ .card-link title="Source Code" }
+
+- { .twemoji } **SimpleX Chat (Instant Messenger)**
+
+ ---
+
+ [:octicons-home-16:](https://simplex.chat){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://simplex.chat/docs/server.html){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/simplex-chat){ .card-link title="Source Code" }
+
+- { .twemoji } **Element (Matrix Client)**
+
+ ---
+
+ [:octicons-home-16:](https://element.io){ .card-link title="Homepage" }
+ [:octicons-info-24:](https://element-hq.github.io/synapse/latest){ .card-link title="Admin Documentation" }
+ [:octicons-code-16:](https://github.com/element-hq){ .card-link title="Source Code" }