update Matrix section

content/chat-with-us.md

@@ -44,21 +44,25 @@ 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.
 
 ### Matrix
+- [Create an account here](https://tchncs.de/matrix) or on any other Matrix server (if you want, you can [Install an App](https://matrix.org/ecosystem/clients/) to use instead of the website)
+- Join the [Libre Gaming Community](https://matrix.to/#/#libregaming-community:freedombox.emorrp1.name)
+- You can also check [Libre Gaming Space](/space.html) for other related Matrix spaces and rooms
+<details><summary> if you don't want to use Matrix Spaces you can join each room individually </summary>
 
-Room name: `#libregaming-ROOM:tchncs.de`
-
-- [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](/space.html)
+  - [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`)
+  - [Organization](https://matrix.to/#/#libregaming-organization:tchncs.de) (`#libregaming-organization:tchncs.de`)
+</details>
 
 ### Jabber/XMPP:
 - [Get started with XMPP](https://joinjabber.org/docs/)
 - XMPP rooms are bridged with the rest [f-hub.org XMPP gateway](https://wiki.f-hub.org/books/chat-network/page/gateways-for-xmpp-and-matrix)
 - Rooms:
-    - [General](xmpp:%23libregaming@irc.f-hub.org?join)    (`#libregaming@irc.f-hub.org`)
-    - [Matchmaking](xmpp:%23matchmaking@irc.f-hub.org?join)    (`#matchmaking@irc.f-hub.org`)
-    - [Offtopic](xmpp:%23offtopic@irc.f-hub.org?join)    (`#offtopic@irc.f-hub.org`)
-    - [Organisation](xmpp:%23libregaming-org@irc.f-hub.org?join)    (`#libregaming-org@irc.f-hub.org`)
+    - [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`)
 
 ### IRC
 
@@ -82,12 +86,12 @@ For on-topic chat about Libre Gaming, these are the active communities we are aw
 - [FreeGameDev.net](https://freegamedev.net): bring players and developers together like the old #freegamer on Freenode
   [matrix](https://matrix.f-hub.org/#/%23irc_%23general:matrix.f-hub.org)
   [xmpp](https://xmpp.f-hub.org/#%23general@irc.f-hub.org?join)
-  [irc](ircs://irc.freegamedev.net:6697/#general)
+  [irc](ircs://irc.freegamedev.net/#general)
   [archive](https://matrix.f-hub.org/#/%23irc_%23general:matrix.f-hub.org)
 - [onFOSS](https://onfoss.org/): an online LAN-Party-like event
-  [irc](ircs://irc.freegamedev.net:6697/#onfoss)
   [matrix](https://matrix.f-hub.org/#/%23irc_%23onfoss:matrix.f-hub.org)
   [xmpp](https://xmpp.f-hub.org/#%23onfoss@irc.f-hub.org?join)
+  [irc](ircs://irc.freegamedev.net/#onfoss)
 - [opensource_gaming](https://twitch.tv/opensource_gaming): twitch channel to bring attention to a lot of great Open Source projects
   [matrix](https://matrix.to/#/#generalosg:matrix.org)
   [xmpp](xmpp:%23generalosg%23matrix.org@aria-net.org?join)