diff --git a/README.md b/README.md
index a2280de..cd72f85 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,10 @@ Welcome to the LibreGaming website repository!
 
 ## How to contribute
 
-*libregaming.org* is built with zola. Please remember to include a licence header (e.g. CC0-1.0). Happy writing!
+*libregaming.org* is built with [zola][1]. Please remember to include 
+a licence header (e.g. CC0-1.0). Happy writing!
 
-You can build the site with `zola build`, which puts the output in `public/`, or run `zola serve` for previewing.
+You can build the site with `zola build`, which puts the output in 
+`public/`, or run `zola serve` for previewing.
+
+[1]: https://www.getzola.org/
diff --git a/content/chat-with-us.md b/content/chat-with-us.md
index cbda4f9..40d7c3c 100644
--- a/content/chat-with-us.md
+++ b/content/chat-with-us.md
@@ -43,7 +43,46 @@ New projects should take advantage of [FreeGameDev]'s cross-platform integration
 
 To join one such room called `ROOM`, configure your client according to the instructions below.
 
-## Communities
+### Matrix
+
+Room name: `#libregaming-ROOM:freedombox.emorrp1.name`
+
+- [Create an account](https://tchncs.de/matrix), or use any other Matrix server
+- [Choose a client](https://matrix.org/docs/projects/try-matrix-now/)
+- [Libre Gaming space](https://matrix.to/#/#libregaming-space:matrix.org)
+- Subspaces: [Communities], [Games], [Engines], [Tools], [Historical]
+
+[Communities]: https://matrix.to/#/#libregaming-communities:freedombox.emorrp1.name
+[Games]: https://matrix.to/#/#libregaming-games:freedombox.emorrp1.name
+[Engines]: https://matrix.to/#/#libregaming-engines:freedombox.emorrp1.name
+[Tools]: https://matrix.to/#/#libregaming-tools:freedombox.emorrp1.name
+[Historical]: https://matrix.to/#/#libregaming-historical:freedombox.emorrp1.name
+
+### Jabber/XMPP
+
+Room name: `#libregaming-ROOM#freedombox.emorrp1.name@matrix.org`
+
+- [Create an account](https://tchncs.de/xmpp), or use any other Jabber/XMPP server
+- [Choose a client](https://joinjabber.org/)
+- Bridged with [matrix-bifrost](https://github.com/matrix-org/matrix-bifrost)
+  ([Usage details](https://github.com/matrix-org/matrix-bifrost/wiki/Address-syntax))
+
+### IRC
+
+Room name: `#libregaming-ROOM` on `irc.libera.chat`
+
+- [Create an account](https://libera.chat/guides/registration), or connect as a guest user
+- [Choose a client](https://libera.chat/guides/clients)
+- Various features are not supported by the IRC protocol: for a better user experience, consider using a Matrix or Jabber/XMPP client instead
+- Bridged with [matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc)
+  ([Usage details](https://matrix-org.github.io/matrix-appservice-irc/latest/usage.html))
+  <details><summary>Settings</summary>
+  Room -> Settings -> Advanced -> Open Devtools -> Send Custom Event -> Event ->
+  Event Type: `org.matrix.appservice-irc.config`; State Key: ``;
+  Content: `{ "lineLimit": 9, "allowUnconnectedMatrixUsers": true }`
+  </details>
+
+## Other communities and chatrooms
 
 For on-topic chat about Libre Gaming, these are the active communities we are aware of.
 
@@ -68,42 +107,3 @@ For on-topic chat about Libre Gaming, these are the active communities we are aw
 - *Free, Libre, and Open Source Gaming*
   [matrix](https://matrix.to/#/#libregaming:matrix.org)
   [xmpp](xmpp:%23libregaming%23matrix.org@matrix.org?join)
-
-## Matrix
-
-Room name: `#libregaming-ROOM:freedombox.emorrp1.name`
-
-- [Create an account](https://tchncs.de/matrix), or use any other Matrix server
-- [Choose a client](https://matrix.org/docs/projects/try-matrix-now/)
-- [Libre Gaming space](https://matrix.to/#/#libregaming-space:matrix.org)
-- Subspaces: [Communities], [Games], [Engines], [Tools], [Historical]
-
-[Communities]: https://matrix.to/#/#libregaming-communities:freedombox.emorrp1.name
-[Games]: https://matrix.to/#/#libregaming-games:freedombox.emorrp1.name
-[Engines]: https://matrix.to/#/#libregaming-engines:freedombox.emorrp1.name
-[Tools]: https://matrix.to/#/#libregaming-tools:freedombox.emorrp1.name
-[Historical]: https://matrix.to/#/#libregaming-historical:freedombox.emorrp1.name
-
-## Jabber/XMPP
-
-Room name: `#libregaming-ROOM#freedombox.emorrp1.name@matrix.org`
-
-- [Create an account](https://tchncs.de/xmpp), or use any other Jabber/XMPP server
-- [Choose a client](https://joinjabber.org/)
-- Bridged with [matrix-bifrost](https://github.com/matrix-org/matrix-bifrost)
-  ([Usage details](https://github.com/matrix-org/matrix-bifrost/wiki/Address-syntax))
-
-## IRC
-
-Room name: `#libregaming-ROOM` on `irc.libera.chat`
-
-- [Create an account](https://libera.chat/guides/registration), or connect as a guest user
-- [Choose a client](https://libera.chat/guides/clients)
-- Various features are not supported by the IRC protocol: for a better user experience, consider using a Matrix or Jabber/XMPP client instead
-- Bridged with [matrix-appservice-irc](https://github.com/matrix-org/matrix-appservice-irc)
-  ([Usage details](https://matrix-org.github.io/matrix-appservice-irc/latest/usage.html))
-  <details><summary>Settings</summary>
-  Room -> Settings -> Advanced -> Open Devtools -> Send Custom Event -> Event ->
-  Event Type: `org.matrix.appservice-irc.config`; State Key: ``;
-  Content: `{ "lineLimit": 9, "allowUnconnectedMatrixUsers": true }`
-  </details>