diff --git a/content/chat-with-us.md b/content/chat-with-us.md
index 8b6b497..67e2f03 100644
--- a/content/chat-with-us.md
+++ b/content/chat-with-us.md
@@ -7,18 +7,9 @@ title = "Chat with us!"
# Chat with us!
You can access LibreGaming chatrooms/server(s) from any of Matrix, XMPP, Libera.chat or FreeGameDev irc
-*Fun fact: All rooms are bridged via [FreeGameDev IRC] using its [Matrix Gateway], [XMPP Gateway] and IRC bridge [(matterbridge)] for libera-chat.
-Official LibreGaming rooms will not be connected to discord for [numerous reasons].*
-[Matrix Gateway]:https://wiki.f-hub.org/books/chat-network/page/gateways-for-xmpp-and-matrix#bkmrk-how-to-connect-from--1
-[XMPP Gateway]: https://wiki.f-hub.org/books/chat-network/page/gateways-for-xmpp-and-matrix#bkmrk-how-to-connect-from-
-[(matterbridge)]: https://wiki.f-hub.org/books/chat-network/page/bridges-to-other-chat-systems#bkmrk-matterbridge-bot-bri
-[FreeGameDev IRC]: https://irc.freegamedev.net/
-[numerous reasons]: https://drewdevault.com/2021/12/28/Dont-use-Discord-for-FOSS.html
-[FreeGameDev]: https://freegamedev.net/
-
-Official chatrooms summary *(Also available in the [LibreGaming](https://matrix.to/#/#libregaming-community:tchncs.de) Space):*
-- *general*: chat about libre games, their development and philosophy
+Official chatrooms summary *(Also available in the [LibreGaming Matrix Space](https://matrix.to/#/#libregaming-community:tchncs.de)):*
+- **general:** chat about libre games, their development and philosophy
[matrix](https://matrix.to/#/#libregaming-general:tchncs.de)
[xmpp](https://xmpp.f-hub.org/#%23libregaming@irc.f-hub.org?join)
@@ -26,7 +17,7 @@ Official chatrooms summary *(Also available in the [LibreGaming](https://matrix.
[fgd](ircs://irc.freegamedev.net/#libregaming)
[archive](https://view.matrix.org/room/!YBYGuZnidXkfegAxjg:freedombox.emorrp1.name/)
-- *matchmaking*: matchmaking service/bot to find people to play with
+- **matchmaking:** matchmaking service/bot to find people to play with
[matrix](https://matrix.to/#/#libregaming-matchmaking:tchncs.de)
[xmpp](https://xmpp.f-hub.org/#%23matchmaking@irc.f-hub.org?join)
@@ -34,7 +25,7 @@ Official chatrooms summary *(Also available in the [LibreGaming](https://matrix.
[fgd](ircs://irc.freegamedev.net/#matchmaking)
[archive](https://view.matrix.org/room/!CUNOtCEVFEdXaOUjXL:matrix.org/)
-- *offtopic*: for discussions with LibreGaming folks about everything except libregaming
+- **offtopic:** for discussions with LibreGaming folks about everything except libregaming
[matrix](https://matrix.to/#/#libregaming-offtopic:tchncs.de)
[xmpp](https://xmpp.f-hub.org/#%23offtopic@irc.f-hub.org?join)
@@ -42,7 +33,7 @@ Official chatrooms summary *(Also available in the [LibreGaming](https://matrix.
[fgd](ircs://irc.freegamedev.net/#offtopic)
[archive](https://view.matrix.org/room/!csFYqQwEzkhBXOMzLF:matrix.org/)
-- *organization*: meta channel for discussing the LibreGaming.org project itself
+- **organization:** meta channel for discussing the LibreGaming.org project itself
[matrix](https://matrix.to/#/#libregaming-organization:tchncs.de)
[xmpp](https://xmpp.f-hub.org/#%23libregaming-org@irc.f-hub.org?join)
@@ -55,9 +46,9 @@ Official chatrooms summary *(Also available in the [LibreGaming](https://matrix.
---
-## How to join from Matrix
-- [Create an account here](https://tchncs.de/matrix) or on any other Matrix server (if you want, [Install an App](https://matrix.org/ecosystem/clients/) to use instead of the website).
-- Join the [LibreGaming](https://matrix.to/#/#libregaming-community:tchncs.de) Space or join these rooms individually if you want to avoid Matrix Spaces:
+## Matrix Space and Rooms
+*For new Matrix users, you can [create an account here](https://tchncs.de/matrix) or on any [other Matrix server](https://servers.joinmatrix.org/) (then optionally [Install an App](https://matrix.org/ecosystem/clients/) to use instead of the website).*
+- [LibreGaming Space](https://matrix.to/#/#libregaming-community:tchncs.de) *Note: you can also join the rooms individually and ignore the Space*
- [General](https://matrix.to/#/#libregaming-general:tchncs.de) (`#libregaming-general:tchncs.de`)
- [Matchmaking](https://matrix.to/#/#libregaming-matchmaking:tchncs.de) (`#libregaming-matchmaking:tchncs.de`)
- [Offtopic](https://matrix.to/#/#libregaming-offtopic:tchncs.de) (`#libregaming-offtopic:tchncs.de`)
@@ -66,35 +57,41 @@ Official chatrooms summary *(Also available in the [LibreGaming](https://matrix.
---
-## How to join from Jabber/XMPP
-- [Get started with XMPP](https://joinjabber.org/docs/)
-- Join the rooms:
- - [General](https://xmpp.f-hub.org/#%23libregaming@irc.f-hub.org?join) (`#libregaming@irc.f-hub.org`)
- - [Matchmaking](https://xmpp.f-hub.org/#%23matchmaking@irc.f-hub.org?join) (`#matchmaking@irc.f-hub.org`)
- - [Offtopic](https://xmpp.f-hub.org/#%23offtopic@irc.f-hub.org?join) (`#offtopic@irc.f-hub.org`)
- - [Organization](https://xmpp.f-hub.org/#%23libregaming-org@irc.f-hub.org?join) (`#libregaming-org@irc.f-hub.org`)
+## Jabber/XMPP Channels
+*For new XMPP users, you can follow this link to [get started with XMPP](https://joinjabber.org/docs/)*
+- [General](https://xmpp.f-hub.org/#%23libregaming@irc.f-hub.org?join) (`#libregaming@irc.f-hub.org`)
+- [Matchmaking](https://xmpp.f-hub.org/#%23matchmaking@irc.f-hub.org?join) (`#matchmaking@irc.f-hub.org`)
+- [Offtopic](https://xmpp.f-hub.org/#%23offtopic@irc.f-hub.org?join) (`#offtopic@irc.f-hub.org`)
+- [Organization](https://xmpp.f-hub.org/#%23libregaming-org@irc.f-hub.org?join) (`#libregaming-org@irc.f-hub.org`)
---
-## How to join from libera.chat IRC
-Note: various features are not supported by the IRC protocol: for a better experience, consider using a Matrix or Jabber/XMPP instead
-- [Open Libera.chats's webclient](https://web.libera.chat/?channel=#libregamenight) or [Download another client](https://libera.chat/guides/clients) *and optionally [Register an account](https://libera.chat/guides/registration) after joining*.
-- Join the channels:
- - [General](ircs://irc.libera.chat/#libregamenight) (`#libregamenight`)
- - [Matchmaking](ircs://irc.libera.chat/#libregaming-matchmaking) (`#libregaming-matchmaking`)
- - [Offtopic](ircs://irc.libera.chat/#libregaming-offtopic) (`#libregaming-offtopic`)
- - [Organization](ircs://irc.libera.chat/#libregaming-organization) (`#libregaming-organization`)
+## libera.chat IRC Channels
+*For new users, you can [use libera.chat's webclient](https://web.libera.chat/?channel=#libregamenight) or pick and configure another [IRC client](https://libera.chat/guides/clients) then optionally [register on libera.chat](https://libera.chat/guides/registration)*
+- [General](ircs://irc.libera.chat/#libregamenight) (`#libregamenight`)
+- [Matchmaking](ircs://irc.libera.chat/#libregaming-matchmaking) (`#libregaming-matchmaking`)
+- [Offtopic](ircs://irc.libera.chat/#libregaming-offtopic) (`#libregaming-offtopic`)
+- [Organization](ircs://irc.libera.chat/#libregaming-organization) (`#libregaming-organization`)
---
-## How to join from FreeGameDev (FGD) IRC
-Note: Although FGD supports more features than libera.chat, various features are still not supported: for a better experience, consider using a Matrix or Jabber/XMPP instead.
-- [Open FGD's webclient](https://irc.freegamedev.net/kiwiirc/#libregaming) or use your favorite IRC client and configure it to (address: irc.freegamedev.net, port: 6697 (TLS only))
-- Join the channels:
- - [General](ircs://irc.freegamedev.net/#libregaming) (`#libregaming`)
- - [Matchmaking](ircs://irc.freegamedev.net/#matchmaking) (`#matchmaking`)
- - [Offtopic](ircs://irc.freegamedev.net/#offtopic) (`#offtopic`)
- - [Organization](ircs://irc.freegamedev.net/#libregaming-org) (`#libregaming-org`)
+## FreeGameDev (FGD) IRCv3 Channels
+*For new users, you can [use FGD's webclient](https://irc.freegamedev.net/kiwiirc/#libregaming) or use your favorite IRC client and configure it to (address: irc.freegamedev.net, port: 6697 ,TLS only) and optionally [register on fgd](https://wiki.f-hub.org/books/accounts/page/irc-network-accounts)*
+- [General](ircs://irc.freegamedev.net/#libregaming) (`#libregaming`)
+- [Matchmaking](ircs://irc.freegamedev.net/#matchmaking) (`#matchmaking`)
+- [Offtopic](ircs://irc.freegamedev.net/#offtopic) (`#offtopic`)
+- [Organization](ircs://irc.freegamedev.net/#libregaming-org) (`#libregaming-org`)
+
+*Fun fact: All rooms are bridged via [FreeGameDev IRC] using its [Matrix Gateway], [XMPP Gateway] and IRC bridge [(matterbridge)] for libera-chat.
+Official LibreGaming rooms will not be connected to discord for [numerous reasons].*
+
+[Matrix Gateway]:https://wiki.f-hub.org/books/chat-network/page/gateways-for-xmpp-and-matrix#bkmrk-how-to-connect-from--1
+[XMPP Gateway]: https://wiki.f-hub.org/books/chat-network/page/gateways-for-xmpp-and-matrix#bkmrk-how-to-connect-from-
+[(matterbridge)]: https://wiki.f-hub.org/books/chat-network/page/bridges-to-other-chat-systems#bkmrk-matterbridge-bot-bri
+[FreeGameDev IRC]: https://irc.freegamedev.net/
+[numerous reasons]: https://drewdevault.com/2021/12/28/Dont-use-Discord-for-FOSS.html
+[FreeGameDev]: https://freegamedev.net/
+
---