diff --git a/links.md b/links.md
index 97a03e2..f9ca61d 100644
--- a/links.md
+++ b/links.md
@@ -9,22 +9,22 @@ weight: 30
 
 Below are some links to pages/sites of our running services that expose information or a user interface to the web:
 
-* [Banaan!](http://banaan.luon.net/), your friendly test page
-* [Gitea](https://git.luon.net), our hosted Git accounts and repositories
-* [Jitsi Meet](https://meet.luon.net/), a web-based video conferencing service
-* [Nextcloud](https://cloud.luon.net/), Nextcloud service
-* [Riot Web](https://chat.luon.net/), Matrix (Riot) web client
-* [Roundcube](https://webmail.luon.net/), email access via web
-* [Web statistics](http://luon.net/webstats), web usage statistics
-* [Wiki](https://wiki.luon.net/), web wiki
+* **[Banaan!](http://banaan.luon.net/)**: friendly test page
+* **[Gitea](https://git.luon.net)**: hosted [Git](services/git.html) accounts and repositories
+* **[Jitsi Meet](https://meet.luon.net/)**: web-based [audio/video conferencing](services/jitsi-meet.html) service
+* **[Nextcloud](https://cloud.luon.net/)**: complete [cloud](services/nextcloud.html) service
+* **[Riot Web](https://chat.luon.net/)**: preconfigured fully-featured [Matrix](services/matrix.html)  web client
+* **[Roundcube](https://webmail.luon.net/)**: your [e-mail](services/email.html) accessed via the web
+* **[Web statistics](http://luon.net/webstats)**: our [web](services/web.html) usage statistics
+* **[Wiki](https://wiki.luon.net/)**: main web wiki
 
 Additionally, some links to projects hosted on our network:
 
-* [Feeding Frenzy!](http://ffrenzy.luon.net/), game developed during a study project
-* [Team Onbekend](http://luon.net/~onbekend/), Createch'99 team home page
-* [Utopia MOO](http://utopiamoo.net), virtual text-based on-line multi-user world
+* **[Feeding Frenzy!](http://ffrenzy.luon.net/)**: game developed during a study project
+* **[Team Onbekend](http://luon.net/~onbekend/)**: Createch'99 team home page
+* **[Utopia MOO](http://utopiamoo.net)**: virtual text-based on-line multi-user world
 
 and blogs/journals/homepages by some of our users:
 
-* [Paul van Tilburg](http://paul.luon.net/)
-* [Sjoerd Simons](http://sjoerd.luon.net/)
\ No newline at end of file
+* **[Paul van Tilburg](http://paul.luon.net/)**
+* **[Sjoerd Simons](http://sjoerd.luon.net/)**
\ No newline at end of file
diff --git a/services.md b/services.md
index d709666..3033901 100644
--- a/services.md
+++ b/services.md
@@ -13,24 +13,24 @@ friends & family (whoever is interested).
 
 A rough overview of what is available for a Luon user:
 
-* E-mail account
+* [E-mail](services/email.html) account
   * access via IMAP and webmail
   * server-side (spam) filtering
   * mail submission
-* Git account
-* Nextcloud account
+* [Git](services/git.html) account
+* [Nextcloud](services/nextcloud.html) account
   * personal/shared calendars
   * personal/shared contacts
   * personal/shared files
   * polls
   * Kanban boards
   * *much more…*
-* Jitsi Meet access
+* [Jitsi Meet](services/jitsi-meet.html) access
 * Mailing list(s)
-* Matrix account
-* Shell account (via SSH)
-* Web space (and/or wiki)
-* XMPP (Jabber) account
+* [Matrix](services/matrix.html) account
+* [Shell/SSH](services/ssh.html) account
+* [Web](services/webhosting.html) space (and/or wiki)
+* [XMPP (Jabber)](services/xmpp.html) account
 
 See the [Links](links.html) page for links to the website of some of these
 services or the [Contact Info](contact.html) page if you want to get it touch