diff --git a/content/events.xml b/content/events.xml
index b3a0997c6..567d630b4 100644
--- a/content/events.xml
+++ b/content/events.xml
@@ -10142,6 +10142,7 @@
   </event>
   <event title="Bitcoin Stammtisch">
     <start>2024-03-14T19:00:00</start>
+    <location><link href="https://www.faehrgarten.de/">Fährgarten Johannstadt</link>, Käthe-Kollwitz-Ufer 23b, 01307 Dresden</location>
     <link>https://bitcoin-dresden.de/</link>
   </event>
   <event title="Bitcoin Stammtisch">
@@ -10384,4 +10385,14 @@
   	<location><link href="http://www.c3d2.de/space.html">HQ</link>, /proc, Zentralwerk, Riesaer Straße 32, 01127 Dresden</location>
     <link>https://chaos.jetzt/</link>
   </event>
+  <event title="Planungstreffen Filmvorführung Total Trust">
+    <start>2024-03-20:30:00</start>
+    <location><link href="http://www.c3d2.de/space.html">HQ</link>, /proc, Zentralwerk, Riesaer Straße 32, 01127 Dresden</location>
+    <link>https://hedgedoc.c3d2.de/total_trust</link>
+  </event>
+  <event title="are we mainstream yet?">
+    <start>2024-04-27T22:00:00</start>
+    <location>Bunker, Zentralwerk</location>
+    <link>https://are-we-mainstream-yet.xyz/</link>
+  </event>
 </calendar>
diff --git a/content/navigation.xml b/content/navigation.xml
index dab384278..25a46b532 100644
--- a/content/navigation.xml
+++ b/content/navigation.xml
@@ -23,7 +23,7 @@ please adjust the #navigation li:nth-child(...) rules in the CSS file.
   <group>
     <file>kontakt</file>
     <file>muc</file>
-    <file>wiki</file>
+    <link href="https://wiki.c3d2.de/">Wiki</link>
   </group>
   <group>
     <file>radio</file>
diff --git a/content/news/pentaradio24-20240227.xml b/content/news/pentaradio24-20240227.xml
new file mode 100644
index 000000000..5bc53145b
--- /dev/null
+++ b/content/news/pentaradio24-20240227.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE item SYSTEM "https://www.c3d2.de/dtd/c3d2web.dtd">
+<item title="pentaradio24: Die Computerflüsterer" date="2024-03-03T12:49:38" author="Mole, Simon und Xyrill">
+  <image title="(((pentaradio))">../pentaradio.png</image>
+  <p>Die Entwicklung schreitet unaufhörlich voran: ✨KI✨ generiert jetzt auch minutenlange Videos, ukrainische und russische Hacker generieren einen Cyberwar, und wir generieren mal wieder eine Liste mit Tool-Empfehlungen für angenehmes Hacken. Auf Basis der Livesendung vom 27. Februar 2024.</p>
+  <p>Shownotes:</p>
+  <ul>
+    <li><link href="https://ftp.c3d2.de/pentaradio/shownotes/shownotes-pentaradio-2024-02-27.txt">Shownotes als Textdatei</link></li>
+    <li><link href="https://codimd.c3d2.de/pentaradio-2024-02">Shownotes als Webseite</link></li>
+  </ul>
+  <resource size="72402438"
+            type="audio/mpeg"
+            url="https://ftp.c3d2.de/pentaradio/pentaradio-2024-02-27.mp3"
+            title="pentaradio24 vom 27. Februar 2024">
+    <alternative size="52821314" type="audio/mp4" url="https://ftp.c3d2.de/pentaradio/pentaradio-2024-02-27.m4a"/>
+    <alternative size="58496012" type="audio/ogg" url="https://ftp.c3d2.de/pentaradio/pentaradio-2024-02-27.ogg"/>
+    <alternative size="31641631" type="audio/opus" url="https://ftp.c3d2.de/pentaradio/pentaradio-2024-02-27.opus"/>
+    <chapters xmlns="https://podlove.de/simple-chapters">
+      <chapter start="00:00:00.000" title="Begrüßung" href="https://c3d2.de/radio.html" />
+      <chapter start="00:00:29.000" title="Feedback: Ressourcenknappheit und Right to Repair" />
+      <chapter start="00:08:25.000" title="Feedback: Medienkompetenz und Dark Patterns" />
+      <chapter start="00:11:07.000" title="News: Reservierte TLD für Intranet-Domains" href="https://www.heise.de/-9612253" />
+      <chapter start="00:15:36.000" title="News: Wärmepumpen mit schwachem Passwort" href="https://www.heise.de/-9618846" />
+      <chapter start="00:18:05.000" title="News: BKA stellt 2 Mrd. € in Bitcoin sicher" href="https://www.mdr.de/nachrichten/sachsen/dresden/dresden-radebeul/bitcoin-geld-raubkopie-ermittlung-100.html" />
+      <chapter start="00:21:09.000" title="News: Cyberwar zwischen Ukraine und Russland" href="https://winfuture.de/news,140108.html" />
+      <chapter start="00:37:25.000" title="KI-News: Demenz bei GPT-4" href="https://www.reddit.com/r/ChatGPT/comments/1avwqzh/very_strange_rambling_responses/" />
+      <chapter start="00:49:51.000" title="KI-News: OpenAI Sora generiert Videos aus Text" href="https://openai.com/sora" />
+      <chapter start="01:01:37.000" title="News: Raubmordkopien sind wieder da" href="https://torrentfreak.com/netflix-piracy-is-difficult-to-compete-against-and-growing-rapidly-240204/" />
+      <chapter start="01:04:44.000" title="Musik: &#34;Help me Dadá computer&#34;, Pablo Ribot (2010)" href="https://freemusicarchive.org/music/Pablo_Ribot/Bent_Interlocutor/Help_me_Dada_computer/" />
+      <chapter start="01:08:06.000" title="Thema: Noch mehr kleine Software-Helfer" />
+      <chapter start="01:09:48.000" title="Helfer: mitmproxy" href="https://mitmproxy.org/" />
+      <chapter start="01:12:11.000" title="Helfer: strace" href="https://strace.io/" />
+      <chapter start="01:15:34.000" title="Helfer: magic-wormhole" href="https://github.com/magic-wormhole/magic-wormhole" />
+      <chapter start="01:18:12.000" title="Helfer: qrencode" href="https://fukuchi.org/works/qrencode/" />
+      <chapter start="01:21:00.000" title="Helfer: nc/ncat/netcat" />
+      <chapter start="01:23:09.000" title="Musik: &#34;Help You Out&#34;, Leonell Cassio ft. Jonathon (2023)" href="https://freemusicarchive.org/music/leonell-cassio/single/leonell-cassio-help-you-out-ft-jonathon/" />
+    </chapters>
+  </resource>
+</item>
diff --git a/content/pages/unterstuetzen.xml b/content/pages/unterstuetzen.xml
index f6e6d56fa..5dcc15b94 100644
--- a/content/pages/unterstuetzen.xml
+++ b/content/pages/unterstuetzen.xml
@@ -37,7 +37,7 @@
 	</div>
 	<div id="sepaqrcode" class="inline-block">
 		<image class="qrcode" title="SEPA QR-Code" alt="SEPA Daten als QR-Code">images/qr-sepa-spendenadresse.png</image>
-		<div class="figcaption">SEPA QR-Code</div>
+		<div class="figcaption"><link href="https://de.wikipedia.org/wiki/EPC-QR-Code">EPC-QR-Code</link>/GiroCode</div>
 	</div>
   </div>
   <div title="Bitcoin">
diff --git a/xsl/common.xsl b/xsl/common.xsl
index a9e1e120a..b9ce5aa0c 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -508,14 +508,12 @@
     <xsl:copy-of select="."/>
   </xsl:template>
 
-  <xsl:template name="navitem">
-    <xsl:param name="file"/>
-    <xsl:param name="baseurl"/>
-    <xsl:param name="title"/>
+  <xsl:template mode="navitem" match="file">
+    <xsl:variable name="file" select="."/>
     <li>
       <a href="{$baseurl}{$file}.html">
         <xsl:choose>
-          <xsl:when test="string-length($title) = 0">
+          <xsl:when test="string-length(@title) = 0">
             <xsl:if test="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle">
               <xsl:attribute name="title"><xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle"/></xsl:attribute>
             </xsl:if>
@@ -523,23 +521,23 @@
             <xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@title"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="$title"/>
+            <xsl:value-of select="@title"/>
           </xsl:otherwise>
         </xsl:choose>
       </a>
     </li>
   </xsl:template>
 
+  <xsl:template mode="navitem" match="link">
+    <li>
+      <xsl:apply-templates select="."/>
+    </li>
+  </xsl:template>
+
   <xsl:template name="navitems">
     <xsl:for-each select="document('../content/navigation.xml')/navigation/group">
       <ul>
-    <xsl:for-each select="file">
-          <xsl:call-template name="navitem">
-            <xsl:with-param name="file" select="."/>
-            <xsl:with-param name="title" select="@title"/>
-            <xsl:with-param name="baseurl" select="$baseurl"/>
-          </xsl:call-template>
-    </xsl:for-each>
+        <xsl:apply-templates mode="navitem"/>
       </ul>
     </xsl:for-each>
   </xsl:template>
diff --git a/xsl/gemini.xsl b/xsl/gemini.xsl
index 0a9d116dd..df89aacae 100644
--- a/xsl/gemini.xsl
+++ b/xsl/gemini.xsl
@@ -15,26 +15,45 @@
 
     <text>## Navigation&#10;</text>
     <for-each select="document('../content/navigation.xml')/navigation/group">
-      <for-each select="file">
-        <text>=&gt; </text>
-        <value-of select="concat($baseurl, ., '.gmi')"/>
-        <text> </text>
-        <choose>
-          <when test="string-length(@title) = 0">
-            <value-of select="document(concat('../content/pages/', ., '.xml'))/page/@title"/>
-          </when>
-          <otherwise>
-            <value-of select="@title"/>
-          </otherwise>
-        </choose>
-        <text>&#10;</text>
-      </for-each>
+      <apply-templates mode="navitem" select="child::*"/>
+      <text>&#10;</text>
     </for-each>
-    <text>&#10;</text>
 
     <call-template name="body"/>
   </template>
 
+  <template mode="navitem" match="file">
+    <text>=&gt; </text>
+    <value-of select="concat($baseurl, ., '.gmi')"/>
+    <text> </text>
+    <choose>
+      <when test="string-length(@title) = 0">
+        <value-of select="document(concat('../content/pages/', ., '.xml'))/page/@title"/>
+      </when>
+      <otherwise>
+        <value-of select="@title"/>
+      </otherwise>
+    </choose>
+    <text>&#10;</text>
+  </template>
+
+  <template mode="navitem" match="link">
+    <text>=> </text>
+    <call-template name="make-href">
+      <with-param name="href">
+        <choose>
+          <when test="@href"><value-of select="@href"/></when>
+          <otherwise><value-of select="."/></otherwise>
+        </choose>
+      </with-param>
+    </call-template>
+    <text> </text>
+    <call-template name="normalize-paragraph">
+      <with-param name="text" select="normalize-space(.)"/>
+    </call-template>
+    <text>&#10;</text>
+  </template>
+
   <template match="/page[@pagetitle]">
     <text># </text><value-of select="@pagetitle"/><text> | c3d2.de&#10;</text>