diff --git a/resources/langs/nheko_ca.ts b/resources/langs/nheko_ca.ts
index 978425ac..c789bdd8 100644
--- a/resources/langs/nheko_ca.ts
+++ b/resources/langs/nheko_ca.ts
@@ -438,12 +438,12 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -458,27 +458,27 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
+        <source>/invite &lt;@userid&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
+        <source>/kick &lt;@userid&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
+        <source>/ban &lt;@userid&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
+        <source>/unban &lt;@userid&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -523,37 +523,37 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
+        <source>/md &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/cmark [message]</source>
+        <source>/cmark &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
+        <source>/plain &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
+        <source>/rainbow &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
+        <source>/rainbowme &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
+        <source>/notice &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
+        <source>/rainbownotice &lt;message&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts
index 96455669..da916c6c 100644
--- a/resources/langs/nheko_cs.ts
+++ b/resources/langs/nheko_cs.ts
@@ -439,7 +439,7 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 117d012d..8ef9641d 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -441,13 +441,13 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dein Anklopfen anne
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!raumid|#alias) [Grund]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!raumid|#alias&gt; [Grund]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!raumid|#alias) [Grund]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!raumid|#alias&gt; [Grund]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -461,28 +461,28 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dein Anklopfen anne
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @nutzerid [Grund]</translation>
+        <source>/invite &lt;@userid&gt;[reason]</source>
+        <translation>/invite &lt;@nutzerid&gt;[Grund]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @nutzerid [Grund]</translation>
+        <source>/kick &lt;@userid&gt;[reason]</source>
+        <translation>/kick &lt;@nutzerid&gt;[Grund]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @nutzerid [Grund]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@nutzerid&gt; [Grund]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @nutzerid [Grund]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@nutzerid&gt; [Grund]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($eventid|@nutzerid)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$eventid|@nutzerid&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -526,38 +526,38 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dein Anklopfen anne
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [Nachricht]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/cmark [message]</source>
-        <translation>/cmark [Nachricht]</translation>
+        <source>/cmark &lt;message&gt;</source>
+        <translation>/cmark &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [Nachricht]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [Nachricht]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [Nachricht]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [Nachricht]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [Nachricht]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;Nachricht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index 1552ad8e..7384c287 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -441,13 +441,13 @@ You may optionally provide a reason for others to accept your knock:</translatio
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!roomid|#alias) [reason]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!roomid|#alias&gt; [reason]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!roomid|#alias) [reason]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!roomid|#alias&gt; [reason]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -461,28 +461,28 @@ You may optionally provide a reason for others to accept your knock:</translatio
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @userid [reason]</translation>
+        <source>/invite &lt;userid&gt; [reason]</source>
+        <translation>/invite &lt;userid&gt; [reason]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @userid [reason]</translation>
+        <source>/kick &lt;userid&gt; [reason]</source>
+        <translation>/kick &lt;userid&gt; [reason]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @userid [reason]</translation>
+        <source>/ban &lt;userid&gt; [reason]</source>
+        <translation>/ban &lt;userid&gt; [reason]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @userid [reason]</translation>
+        <source>/unban &lt;userid&gt; [reason]</source>
+        <translation>/unban &lt;userid&gt; [reason]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($eventid|@userid)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$eventid|@userid&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -526,38 +526,38 @@ You may optionally provide a reason for others to accept your knock:</translatio
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [message]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/cmark [message]</source>
-        <translation>/cmark [message]</translation>
+        <source>/cmark &lt;message&gt;</source>
+        <translation>/cmark &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [message]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [message]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [message]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [message]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [message]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;message&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts
index 0acc047f..00deab2d 100644
--- a/resources/langs/nheko_eo.ts
+++ b/resources/langs/nheko_eo.ts
@@ -442,13 +442,13 @@ Vi povas aldoni noton, pri kial oni akceptu vian frapadon:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!identigilo|#kromnomo) [kialo]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!identigilo|#kromnomo&gt; [kialo]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!identigilo!#kromnomo) [kialo]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!identigilo!#kromnomo&gt; [kialo]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -462,28 +462,28 @@ Vi povas aldoni noton, pri kial oni akceptu vian frapadon:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @identigilo [kialo]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@identigilo&gt; [kialo]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @identigilo [kialo]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@identigilo&gt; [kialo]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @identigilo [kialo]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@identigilo&gt; [kialo]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @identigilo [kialo]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@identigilo&gt; [kialo]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($identigilo-de-okazo|@identigilo-de-uzanto)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$identigilo-de-okazo|@identigilo-de-uzanto&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -527,8 +527,8 @@ Vi povas aldoni noton, pri kial oni akceptu vian frapadon:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [mesaĝo]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;mesaĝo&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -537,28 +537,28 @@ Vi povas aldoni noton, pri kial oni akceptu vian frapadon:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [mesaĝo]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;mesaĝo&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [mesaĝo]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;mesaĝo&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [mesaĝo]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;mesaĝo&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [mesaĝo]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;mesaĝo&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [mesaĝo]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;mesaĝo&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts
index 5347f37f..e87cd58b 100644
--- a/resources/langs/nheko_et.ts
+++ b/resources/langs/nheko_et.ts
@@ -441,13 +441,13 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!roomid|#alias) [põhjus]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!roomid|#alias&gt; [põhjus]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!roomid|#alias) [põhjus]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!roomid|#alias&gt; [põhjus]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -461,28 +461,28 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @userid [põhjus]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@userid&gt; [põhjus]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @userid [põhjus]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@userid&gt; [põhjus]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @userid [põhjus]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@userid&gt; [põhjus]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @userid [põhjus]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@userid&gt; [põhjus]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($eventid|@userid)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$eventid|@userid&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -526,8 +526,8 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [sõnum]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;sõnum&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -536,28 +536,28 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [sõnum]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;sõnum&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [sõnum]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;sõnum&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [sõnum]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;sõnum&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [sõnum]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;sõnum&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [sõnum]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;sõnum&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 89b19b6c..ba73c47b 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -441,13 +441,13 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!huonetunnus|#alias) [syy]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!huonetunnus|#alias&gt; [syy]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!huonetunnus|#alias) [syy]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!huonetunnus|#alias&gt; [syy]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -461,28 +461,28 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @käyttäjätunnus [syy]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@käyttäjätunnus&gt; [syy]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @käyttäjätunnus [syy]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@käyttäjätunnus&gt; [syy]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @käyttäjätunnus [syy]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@käyttäjätunnus&gt; [syy]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @käyttäjätunnus [syy]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@käyttäjätunnus&gt; [syy]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($tapahtumatunnus|@käyttäjätunnus)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$tapahtumatunnus|@käyttäjätunnus&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_id.ts b/resources/langs/nheko_id.ts
index e452d063..44f13634 100644
--- a/resources/langs/nheko_id.ts
+++ b/resources/langs/nheko_id.ts
@@ -440,13 +440,13 @@ Kamu dapat memberikan alasan untuk orang lain untuk menerima ketukanmu:</transla
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!idruangan|#alias) [alasan]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!idruangan|#alias&gt; [alasan]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!idruangan|#alias) [alasan]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!idruangan|#alias&gt; [alasan]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -460,28 +460,28 @@ Kamu dapat memberikan alasan untuk orang lain untuk menerima ketukanmu:</transla
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @idpengguna [alasan]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@idpengguna&gt; [alasan]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @idpengguna [alasan]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@idpengguna&gt; [alasan]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @idpengguna [alasan]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@idpengguna&gt; [alasan]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @idpengguna [alasan]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@idpengguna&gt; [alasan]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($idperistiwa|@idpengguna)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$idperistiwa|@idpengguna&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -525,8 +525,8 @@ Kamu dapat memberikan alasan untuk orang lain untuk menerima ketukanmu:</transla
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [pesan]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;pesan&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -535,28 +535,28 @@ Kamu dapat memberikan alasan untuk orang lain untuk menerima ketukanmu:</transla
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [pesan]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;pesan&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [pesan]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;pesan&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [pesan]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;pesan&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [pesan]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;pesan&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [pesan]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;pesan&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index f60e75cc..13e1b360 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -441,13 +441,13 @@ Je kan optioneel hier een reden invoeren dat je aanklopt:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!kamerid|#alias) [reden]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!kamerid|#alias&gt; [reden]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!kamerid|#alias) [reden]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!kamerid|#alias&gt; [reden]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -461,28 +461,28 @@ Je kan optioneel hier een reden invoeren dat je aanklopt:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @gebruikerid [reden]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@gebruikerid&gt; [reden]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @gebruikerid [reden]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@gebruikerid&gt; [reden]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @gebruikerid [reden]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@gebruikerid&gt; [reden]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @gebruikerid [reden]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@gebruikerid&gt; [reden]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($gebeurtenisid|@gebruikerid)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$gebeurtenisid|@gebruikerid&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -526,8 +526,8 @@ Je kan optioneel hier een reden invoeren dat je aanklopt:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [bericht]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;bericht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -536,28 +536,28 @@ Je kan optioneel hier een reden invoeren dat je aanklopt:</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [bericht]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;bericht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [bericht]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;bericht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [bericht]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;bericht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [bericht]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;bericht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [bericht]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;bericht&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 0d414b98..e4d6b9f1 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -439,13 +439,13 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!roomid|#alias) [przyczyna]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!roomid|#alias&gt; [przyczyna]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!roomid|#alias) [przyczyna]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!roomid|#alias&gt; [przyczyna]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -459,28 +459,28 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @userid [przyczyna]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@userid&gt; [przyczyna]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @userid [przyczyna]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@userid&gt; [przyczyna]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @userid [przyczyna]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@userid&gt; [przyczyna]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @userid [przyczyna]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@userid&gt; [przyczyna]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($eventid|@userid)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$eventid|@userid&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -524,8 +524,8 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [wiadomość]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;wiadomość&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -534,28 +534,28 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [wiadomość]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;wiadomość&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [wiadomość]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;wiadomość&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [wiadomość]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;wiadomość&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [wiadomość]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;wiadomość&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [wiadomość]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;wiadomość&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_uk.ts b/resources/langs/nheko_uk.ts
index 7010207c..c83f7ac7 100644
--- a/resources/langs/nheko_uk.ts
+++ b/resources/langs/nheko_uk.ts
@@ -442,13 +442,13 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!ідентифікатор-кімнати|#псевдонім) [причина]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!ідентифікатор-кімнати|#псевдонім&gt; [причина]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!ідентифікатор-кімнати|#псевдонім) [причина]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!ідентифікатор-кімнати|#псевдонім&gt; [причина]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -462,28 +462,28 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @ідентифікатор-користувача [причина]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@ідентифікатор-користувача [причина]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @ідентифікатор-користувача [причина]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@ідентифікатор-користувача&gt; [причина]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @ідентифікатор-користувача [причина]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@ідентифікатор-користувача&lt; [причина]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @ідентифікатор-користувача [причина]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@ідентифікатор-користувача&gt; [причина]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($ідентифікатор-події|@ідентифікатор-користувача)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$ідентифікатор-події|@ідентифікатор-користувача&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -527,8 +527,8 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [повідомлення]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;повідомлення&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -537,28 +537,28 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [повідомлення]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;повідомлення&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [повідомлення]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;повідомлення&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [повідомлення]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;повідомлення&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [повідомлення]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;повідомлення&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [повідомлення]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;повідомлення&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index e4c45b1e..543cfc03 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -440,13 +440,13 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/join (!roomid|#alias) [reason]</source>
-        <translation>/join (!聊天室id|#别名) [理由]</translation>
+        <source>/join &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/join &lt;!聊天室id|#别名&gt; [理由]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/knock (!roomid|#alias) [reason]</source>
-        <translation>/knock (!聊天室id|#别名) [原因]</translation>
+        <source>/knock &lt;!roomid|#alias&gt; [reason]</source>
+        <translation>/knock &lt;!聊天室id|#别名&gt; [原因]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -460,28 +460,28 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/invite @userid [reason]</source>
-        <translation>/invite @用户id [理由]</translation>
+        <source>/invite &lt;@userid&gt; [reason]</source>
+        <translation>/invite &lt;@用户id&gt; [理由]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/kick @userid [reason]</source>
-        <translation>/kick @用户id [原因]</translation>
+        <source>/kick &lt;@userid&gt; [reason]</source>
+        <translation>/kick &lt;@用户id&gt; [原因]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/ban @userid [reason]</source>
-        <translation>/ban @用户id [原因]</translation>
+        <source>/ban &lt;@userid&gt; [reason]</source>
+        <translation>/ban &lt;@用户id&gt; [原因]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/unban @userid [reason]</source>
-        <translation>/unban @用户id [原因]</translation>
+        <source>/unban &lt;@userid&gt; [reason]</source>
+        <translation>/unban &lt;@用户id&gt; [原因]</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/redact ($eventid|@userid)</source>
-        <translation>/redact ($事件id|@用户id)</translation>
+        <source>/redact &lt;$eventid|@userid&gt;</source>
+        <translation>/redact &lt;$事件id|@用户id&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -525,8 +525,8 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/md [message]</source>
-        <translation>/md [消息]</translation>
+        <source>/md &lt;message&gt;</source>
+        <translation>/md &lt;消息&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -535,28 +535,28 @@ You may optionally provide a reason for others to accept your knock:</source>
     </message>
     <message>
         <location line="+2"/>
-        <source>/plain [message]</source>
-        <translation>/plain [消息]</translation>
+        <source>/plain &lt;message&gt;</source>
+        <translation>/plain &lt;消息&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbow [message]</source>
-        <translation>/rainbow [消息]</translation>
+        <source>/rainbow &lt;message&gt;</source>
+        <translation>/rainbow &lt;消息&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbowme [message]</source>
-        <translation>/rainbowme [消息]</translation>
+        <source>/rainbowme &lt;message&gt;</source>
+        <translation>/rainbowme &lt;消息&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/notice [message]</source>
-        <translation>/notice [消息]</translation>
+        <source>/notice &lt;message&gt;</source>
+        <translation>/notice &lt;消息&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
-        <source>/rainbownotice [message]</source>
-        <translation>/rainbownotice [消息]</translation>
+        <source>/rainbownotice &lt;message&gt;</source>
+        <translation>/rainbownotice &lt;消息&gt;</translation>
     </message>
     <message>
         <location line="+2"/>
diff --git a/src/CommandCompleter.cpp b/src/CommandCompleter.cpp
index 51eef4f5..5efcbd25 100644
--- a/src/CommandCompleter.cpp
+++ b/src/CommandCompleter.cpp
@@ -107,23 +107,23 @@ CommandCompleter::data(const QModelIndex &index, int role) const
             case React:
                 return tr("/react <text>");
             case Join:
-                return tr("/join (!roomid|#alias) [reason]");
+                return tr("/join <!roomid|#alias> [reason]");
             case Knock:
-                return tr("/knock (!roomid|#alias) [reason]");
+                return tr("/knock <!roomid|#alias> [reason]");
             case Part:
                 return tr("/part [reason]");
             case Leave:
                 return tr("/leave [reason]");
             case Invite:
-                return tr("/invite @userid [reason]");
+                return tr("/invite <@userid> [reason]");
             case Kick:
-                return tr("/kick @userid [reason]");
+                return tr("/kick <@userid> [reason]");
             case Ban:
-                return tr("/ban @userid [reason]");
+                return tr("/ban <@userid> [reason]");
             case Unban:
-                return tr("/unban @userid [reason]");
+                return tr("/unban <@userid> [reason]");
             case Redact:
-                return tr("/redact ($eventid|@userid)");
+                return tr("/redact <$eventid|@userid>");
             case Roomnick:
                 return tr("/roomnick <displayname>");
             case Shrug:
@@ -141,25 +141,25 @@ CommandCompleter::data(const QModelIndex &index, int role) const
             case RotateMegolmSession:
                 return tr("/rotate-megolm-session");
             case Md:
-                return tr("/md [message]");
+                return tr("/md <message>");
             case Cmark:
-                return tr("/cmark [message]");
+                return tr("/cmark <message>");
             case Plain:
-                return tr("/plain [message]");
+                return tr("/plain <message>");
             case Rainbow:
-                return tr("/rainbow [message]");
+                return tr("/rainbow <message>");
             case RainbowMe:
-                return tr("/rainbowme [message]");
+                return tr("/rainbowme <message>");
             case Notice:
-                return tr("/notice [message]");
+                return tr("/notice <message>");
             case RainbowNotice:
-                return tr("/rainbownotice [message]");
+                return tr("/rainbownotice <message>");
             case Confetti:
                 return tr("/confetti [message]");
             case RainbowConfetti:
                 return tr("/rainbowconfetti [message]");
             case Goto:
-                return tr("/goto ($eventid|message index|matrix:r/room/e/event)");
+                return tr("/goto <message reference>");
             case ConvertToDm:
                 return tr("/converttodm");
             case ConvertToRoom:
@@ -228,7 +228,7 @@ CommandCompleter::data(const QModelIndex &index, int role) const
             case RainbowConfetti:
                 return tr("Send a message in rainbow colors with confetti.");
             case Goto:
-                return tr("Go to this event or link.");
+                return tr("Go to a specific message using an event id, index or matrix: link");
             case ConvertToDm:
                 return tr("Convert this room to a direct chat.");
             case ConvertToRoom: