diff --git a/xsl/podcast.xsl b/xsl/podcast.xsl
index 5517c31e2..a836fa4e8 100644
--- a/xsl/podcast.xsl
+++ b/xsl/podcast.xsl
@@ -22,6 +22,8 @@
   <xsl:include href="common.xsl" />
 
   <xsl:variable name="baseurl">https://www.c3d2.de/</xsl:variable>
+  <xsl:variable name="publisher">C3D2</xsl:variable>
+  <xsl:variable name="mailto">podcast@c3d2.de</xsl:variable>
   <xsl:param name="selection" select="''"/>
   <xsl:param name="format"/>
   <xsl:param name="archivefeed"/>
@@ -33,179 +35,93 @@
 
       <channel>
 
-			<xsl:variable name="podtitle">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia'">
-						Penta*
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentaradio'">
-						Pentaradio
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						Pentacast
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						Pentamusic
-				  </xsl:when>
-				  <xsl:otherwise>
-						C3D2 Podcast
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="podtitle">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia'">Penta*</xsl:when>
+			  <xsl:when test="$selection = 'pentaradio'">Pentaradio</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'">Pentacast</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'">Pentamusic</xsl:when>
+			  <xsl:otherwise>C3D2 Podcast</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="podurl">
-				<xsl:choose>
-<!--
-				  <xsl:when test="$selection = 'pentamedia'">
-						<xsl:value-of select="$baseurl"/>
-				  </xsl:when>
--->
-				  <xsl:when test="$selection = 'pentaradio'">
-						<xsl:value-of select="$baseurl"/>radio.html
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						<xsl:value-of select="$baseurl"/>podcast.html
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						<xsl:value-of select="$baseurl"/>pentamusic.html
-				  </xsl:when>
-				  <xsl:otherwise>
-						<xsl:value-of select="$baseurl"/>
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="podurl">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia'"><xsl:value-of select="$baseurl"/></xsl:when>
+			  <xsl:when test="$selection = 'pentaradio'"><xsl:value-of select="$baseurl"/>radio.html</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'"><xsl:value-of select="$baseurl"/>podcast.html</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'"><xsl:value-of select="$baseurl"/>pentamusic.html</xsl:when>
+			  <xsl:otherwise><xsl:value-of select="$baseurl"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="poddesc">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia'">
-						Pentaradio, Pentacast, Pentamusic
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentaradio'">
-						C3D2 Pentaradio
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						C3D2 Pentacast
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						C3D2 Pentamusic
-				  </xsl:when>
-				  <xsl:otherwise>
-						C3D2 Podcast
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="poddesc">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia'">Pentaradio, Pentacast, Pentamusic</xsl:when>
+			  <xsl:when test="$selection = 'pentaradio'">C3D2 Pentaradio</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'">C3D2 Pentacast</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'">C3D2 Pentamusic</xsl:when>
+			  <xsl:otherwise>C3D2 Podcast</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="imgtitle">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'">
-						Pentaradio
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						Pentacast
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						Pentamusic
-				  </xsl:when>
-				  <xsl:otherwise>
-						C3D2
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="imgtitle">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'">Pentaradio</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'">Pentacast</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'">Pentamusic</xsl:when>
+			  <xsl:otherwise>C3D2</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="imgurl">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'">
-						<xsl:value-of select="$baseurl"/>images/pentaradio-artwork.png
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						<xsl:value-of select="$baseurl"/>images/pentacast-artwork.png
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						<xsl:value-of select="$baseurl"/>images/pentamusic-quadratic.png
-				  </xsl:when>
-				  <xsl:otherwise>
-						<xsl:value-of select="$baseurl"/>images/ck.png
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="imgurl">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'"><xsl:value-of select="$baseurl"/>images/pentaradio-artwork.png</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'"><xsl:value-of select="$baseurl"/>images/pentacast-artwork.png</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'"><xsl:value-of select="$baseurl"/>images/pentamusic-quadratic.png</xsl:when>
+			  <xsl:otherwise><xsl:value-of select="$baseurl"/>images/ck.png</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="imglink">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'">
-						<xsl:value-of select="$baseurl"/>radio.html
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						<xsl:value-of select="$baseurl"/>podcast.html
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						<xsl:value-of select="$baseurl"/>pentamusic.html
-				  </xsl:when>
-				  <xsl:otherwise>
-						<xsl:value-of select="$baseurl"/>
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="imglink">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'"><xsl:value-of select="$baseurl"/>radio.html</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'"><xsl:value-of select="$baseurl"/>podcast.html</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'"><xsl:value-of select="$baseurl"/>pentamusic.html</xsl:when>
+			  <xsl:otherwise><xsl:value-of select="$baseurl"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="podsubtitle">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia'">
-						Die drei Podcasts vom CCC Dresden
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentaradio'">
-						Radio vom CCC Dresden
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						Podcasts vom CCC Dresden
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						Musikvorstellungen vom CCC Dresden
-				  </xsl:when>
-				  <xsl:otherwise>
-						Radio &amp; Podcasts vom CCC Dresden
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="podsubtitle">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia'">Die drei Podcasts vom CCC Dresden</xsl:when>
+			  <xsl:when test="$selection = 'pentaradio'">Radio vom CCC Dresden</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'">Podcasts vom CCC Dresden</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'">Musikvorstellungen vom CCC Dresden</xsl:when>
+			  <xsl:otherwise>Radio &amp; Podcasts vom CCC Dresden</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="podsummary">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia'">
-						Enthält Podcasts von Pentaradio, Pentacast und Pentamusic
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentaradio'">
-						Pentaradio sind die Sendungen des Chaos Computer Club Dresden auf coloRadio, bestehend aus einem informativen Rahmenprogramm und Beiträgen zu einem sendungsspezifischen Thema.
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentacast'">
-						Pentacast sind themenspezifische Sendungen des Chaos Computer Club Dresden.
-				  </xsl:when>
-				  <xsl:when test="$selection = 'pentamusic'">
-						Versuch, Künstler, Bands und Labels der CC-Szene vor's Mikro zu holen um diese einer breiteren Öffentlichkeit bekannt zu machen.
-				  </xsl:when>
-				  <xsl:otherwise>
-						Pentaradio, Pentacast &amp; Pentamusic vom Chaos Computer Club Dresden.
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="podsummary">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia'">Enthält Podcasts von Pentaradio, Pentacast und Pentamusic</xsl:when>
+			  <xsl:when test="$selection = 'pentaradio'">Pentaradio sind die Sendungen des Chaos Computer Club Dresden auf coloRadio, bestehend aus einem informativen Rahmenprogramm und Beiträgen zu einem sendungsspezifischen Thema.</xsl:when>
+			  <xsl:when test="$selection = 'pentacast'">Pentacast sind themenspezifische Sendungen des Chaos Computer Club Dresden.</xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'">Versuch, Künstler, Bands und Labels der CC-Szene vor's Mikro zu holen um diese einer breiteren Öffentlichkeit bekannt zu machen.</xsl:when>
+			  <xsl:otherwise>Pentaradio, Pentacast &amp; Pentamusic vom Chaos Computer Club Dresden.</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-			<xsl:variable name="ctech">
-				<xsl:choose>
-				  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'">
-						<itunes:category text="Technology"><itunes:category text="Tech News"/></itunes:category>
-				  </xsl:when>
-<!--
-				  <xsl:when test="$selection = 'pentacast'">
-						<itunes:category text="Technology"/>
-				  </xsl:when>
--->
-				  <xsl:when test="$selection = 'pentamusic'">
-						<itunes:category text="Music"/>
-				  </xsl:when>
-				  <xsl:otherwise>
-						<itunes:category text="Technology"/>
-				  </xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+		<xsl:variable name="ctech">
+			<xsl:choose>
+			  <xsl:when test="$selection = 'pentamedia' or $selection = 'pentaradio'"><itunes:category text="Technology"><itunes:category text="Tech News"/></itunes:category></xsl:when>
+			  <xsl:when test="$selection = 'pentacast'"><itunes:category text="Technology"/></xsl:when>
+			  <xsl:when test="$selection = 'pentamusic'"><itunes:category text="Music"/></xsl:when>
+			  <xsl:otherwise><itunes:category text="Technology"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 
-		<title><xsl:if test="concat('',$podtitle) != ''"><xsl:value-of select="$podtitle"/></xsl:if></title>
+		<title><xsl:value-of select="$podtitle"/></title>
 		<link><xsl:value-of select="$podurl"/></link>
 		<description><xsl:value-of select="$poddesc"/></description>
 		<language>de-DE</language>
@@ -221,13 +137,13 @@
 			<xsl:attribute name="href"><xsl:value-of select="$imgurl"/></xsl:attribute>
 		</itunes:image>
 
+		<xsl:copy-of select="$ctech"/>
 		<itunes:category text="Society &amp; Culture"/>
-		<xsl:value-of select="$ctech"/>
 
         <itunes:author>Chaos Computer Club Dresden</itunes:author>
         <itunes:owner>
-          <itunes:name>C3D2</itunes:name>
-          <itunes:email>podcast@c3d2.de</itunes:email>
+          <itunes:name><xsl:value-of select="$publisher"/></itunes:name>
+          <itunes:email><xsl:value-of select="$mailto"/></itunes:email>
         </itunes:owner>
         <itunes:explicit>no</itunes:explicit>
 
@@ -237,7 +153,7 @@
             <xsl:with-param name="date" select="$builddate"/>
           </xsl:call-template>
         </lastBuildDate-->
-        <podcast:locked owner="mail@c3d2.de">no</podcast:locked>
+        <podcast:locked owner="{$mailto}">no</podcast:locked>
         <podcast:funding url="https://c3d2.de/unterstuetzen.html">C3D2 Unterstützen!</podcast:funding>
         <podcast:funding url="c3d2.de/membership.html">Mitglied werden!</podcast:funding>
         <podcast:location geo="geo:51.08106,13.72867">C3D2, Dresden, Germany</podcast:location>
@@ -247,6 +163,8 @@
           <podcast:valueRecipient name="C3D2" type="bech32" address="BC1QANU4755ULAU2JJDQSJLC3YW2XDJAWJ8WMVF5LA" fee="true"/>
           <podcast:valueRecipient name="C3D2" type="p2sh" address="3AhYpTzozbxFSmL1NqdZqsFgZhKc95BsCP" fee="true"/>
           <podcast:valueRecipient name="C3D2" type="p2pkh" address="195jSW9hXHdhu5QEeHkhyAN6Kf2oFUkmyK" fee="true"/>
+        </podcast:value>
+        <podcast:value type="bitcoin" method="bip47" suggested="0.00000001">
           <podcast:valueRecipient name="C3D2" type="bip47" address="PM8TJRmTRWxcrfqwbA1t3KYk555WecaJ7CZJzPoK11R1nE8LuTHebppUysAnqNTX4kLrUyHm7oNPbsjAZrLjmfLdStiNG34iDMNcXqY27j9w7uaFcCah" fee="true"/>
           <podcast:valueRecipient name="C3D2" type="paynym" address="https://paynym.is/+lingeringmouse27c" fee="true"/>
         </podcast:value>
@@ -389,11 +307,11 @@
 
       <title><xsl:value-of select="$item_title"/></title>
       <description>
-	<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
-	<div xmlns="http://www.w3.org/1999/xhtml">
-	  <xsl:apply-templates select="document($newsfile)/item/*[name() != 'resource']"/>
-	</div>
-	<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
+		<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
+		<div xmlns="http://www.w3.org/1999/xhtml">
+		<xsl:apply-templates select="document($newsfile)/item/*[name() != 'resource']"/>
+		</div>
+		<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
       </description>
       <link><xsl:value-of select="$href"/></link>