diff --git a/data/cosin.toml b/data/cosin.toml
index 4a329f6..6ea03d0 100644
--- a/data/cosin.toml
+++ b/data/cosin.toml
@@ -59,8 +59,10 @@ irc_server = "ircs://irc.chaostreff.ch:6601/"
 irc_channel = "#cosin"
 
 matrix_server = "fairydust.space"
-matrix_room = "#cosin"
+matrix_room = "#cosin-allgemein"
+matrix_space = "#cosin"
 matrix_client = "https://chat.fairydust.space/#/room/"
+matrix_to = "https://matrix.to/#/"
 
 mastodon_server = "https://chaos.social/"
 mastodon_handle = "@CoSin"
diff --git a/layouts/partials/site-sidebar.de.html b/layouts/partials/site-sidebar.de.html
index 13421a6..630cd2c 100644
--- a/layouts/partials/site-sidebar.de.html
+++ b/layouts/partials/site-sidebar.de.html
@@ -62,10 +62,10 @@ Offen bis {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year
 {{ end }}
 
 
-<p><strong><s>IRC:</s></strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}"><s>{{ .irc_channel }}</s></a> (obsolet)</p>
+<p><s><strong>IRC:</strong></s> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}"><s>{{ .irc_channel }}</s></a> (obsolet)</p>
 
 
-<p><strong>Matrix:</strong> <a href="{{ .matrix_client | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_room }}:{{ .matrix_server }}</a></p>
+<p><strong>Matrix:</strong> <a href="{{ .matrix_to | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_space }}:{{ .matrix_server }}</a></p>
 
 
 <p><strong>Mastodon:</strong> <a rel="me" href="{{ .mastodon_server | safeURL }}{{ .mastodon_handle }}">{{ .mastodon_handle }}</a></p>
diff --git a/layouts/partials/site-sidebar.en.html b/layouts/partials/site-sidebar.en.html
index 4a0d48b..7ddc373 100644
--- a/layouts/partials/site-sidebar.en.html
+++ b/layouts/partials/site-sidebar.en.html
@@ -65,7 +65,7 @@ Open until {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year
 <p><strong><s>IRC:</s></strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}"><s>{{ .irc_channel }}</s></a> (obsolete)</p>
 
 
-<p><strong>Matrix:</strong> <a href="{{ .matrix_client | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_room }}:{{ .matrix_server }}</a></p>
+<p><strong>Matrix:</strong> <a href="{{ .matrix_to | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_space }}:{{ .matrix_server }}</a></p>
 
 
 <p><strong>Mastodon:</strong> <a rel="me" href="{{ .mastodon_server | safeURL }}{{ .mastodon_handle }}">{{ .mastodon_handle }}</a></p>
diff --git a/layouts/partials/site-sidebar.fr.html b/layouts/partials/site-sidebar.fr.html
index c0c74a1..7c06925 100644
--- a/layouts/partials/site-sidebar.fr.html
+++ b/layouts/partials/site-sidebar.fr.html
@@ -65,7 +65,7 @@ Offen bis {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year
 <p><strong><s>IRC:</s></strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}"><s>{{ .irc_channel }}</s></a> (obsolète)</p>
 
 
-<p><strong>Matrix:</strong> <a href="{{ .matrix_client | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_room }}:{{ .matrix_server }}</a></p>
+<p><strong>Matrix:</strong> <a href="{{ .matrix_to | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_space }}:{{ .matrix_server }}</a></p>
 
 
 <p><strong>Mastodon:</strong> <a rel="me" href="{{ .mastodon_server | safeURL }}{{ .mastodon_handle }}">{{ .mastodon_handle }}</a></p>
diff --git a/layouts/partials/site-sidebar.it.html b/layouts/partials/site-sidebar.it.html
index c6b2cf4..dd5b5fd 100644
--- a/layouts/partials/site-sidebar.it.html
+++ b/layouts/partials/site-sidebar.it.html
@@ -65,7 +65,7 @@ Offen bis {{ .cfp_end_date_day }}. {{ i18n .cfp_end_date_month }} {{ .date_year
 <p><strong><s>IRC:</s></strong> <a href="{{ .irc_server | safeURL }}{{ .irc_channel }}"><s>{{ .irc_channel }}</s></a> (obsoleto)</p>
 
 
-<p><strong>Matrix:</strong> <a href="{{ .matrix_client | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_room }}:{{ .matrix_server }}</a></p>
+<p><strong>Matrix:</strong> <a href="{{ .matrix_to | safeURL }}{{ urlquery .matrix_room }}:{{ .matrix_server }}">{{ .matrix_space }}:{{ .matrix_server }}</a></p>
 
 
 <p><strong>Mastodon:</strong> <a rel="me" href="{{ .mastodon_server | safeURL }}{{ .mastodon_handle }}">{{ .mastodon_handle }}</a></p>