diff --git a/config.yaml b/config.yaml
index 383c1e4..dbc4b08 100644
--- a/config.yaml
+++ b/config.yaml
@@ -107,7 +107,7 @@ params:
     subtitle: section3_subtitle
     image: illustrations/fediverse.png
     buttonText: section3_buttontext
-    buttonLink: "https://social.bund.de/explore"
+    buttonLink: "https://tour.fediverse.at/"
   section4:
     title: section4_title
     subtitle: section4_subtitle
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 9584c7a..98adc71 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -71,7 +71,7 @@ section3_title:
 section3_subtitle:
   other: Verschiedene miteinander verbundene Dienste, welche für soziale Netzwerke, Microblogging, Blogging oder Websites und Filehosting genutzt werden.
 section3_buttontext:
-  other: Mastodon entdecken
+  other: Entdecken
 section4_title:
   other: Positive Beispiele
 section4_subtitle:
diff --git a/public/en/imprint/index.html b/public/en/imprint/index.html
index 5e66afa..ce11aeb 100644
--- a/public/en/imprint/index.html
+++ b/public/en/imprint/index.html
@@ -165,14 +165,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>initiative by</h3>
-				<a href="https://gnulinux.ch"><img src="/images/logos/gln_logo.png"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 
diff --git a/public/en/index.html b/public/en/index.html
index 4c30c78..94c801b 100644
--- a/public/en/index.html
+++ b/public/en/index.html
@@ -309,7 +309,7 @@
     </div>
 
     <p class="has-text-centered mt-20">
-      <a class="button cta is-large rounded secondary-btn raised" href="https://social.bund.de/explore">
+      <a class="button cta is-large rounded secondary-btn raised" href="https://tour.fediverse.at/">
         Explore Mastodon
       </a>
     </p>
@@ -440,14 +440,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>initiative by</h3>
-				<a href="https://gnulinux.ch"><img src="/images/logos/gln_logo.png"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 
diff --git a/public/fr/index.html b/public/fr/index.html
index 9321fd8..f8de2ae 100644
--- a/public/fr/index.html
+++ b/public/fr/index.html
@@ -309,7 +309,7 @@
     </div>
 
     <p class="has-text-centered mt-20">
-      <a class="button cta is-large rounded secondary-btn raised" href="https://social.bund.de/explore">
+      <a class="button cta is-large rounded secondary-btn raised" href="https://tour.fediverse.at/">
         Découvrir Mastodon
       </a>
     </p>
@@ -440,14 +440,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>Une initiative de</h3>
-				<a href="https://gnulinux.ch"><img src="/images/logos/gln_logo.png"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 
diff --git a/public/images/logos/fsfe_logo.png b/public/images/logos/fsfe_logo.png
new file mode 100644
index 0000000..9b626fc
Binary files /dev/null and b/public/images/logos/fsfe_logo.png differ
diff --git a/public/imprint/index.html b/public/imprint/index.html
index 1a9e61a..6a0ca7b 100644
--- a/public/imprint/index.html
+++ b/public/imprint/index.html
@@ -165,14 +165,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>Eine Initiative von</h3>
-				<a href="https://gnulinux.ch"><img src="/images/logos/gln_logo.png"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 
diff --git a/public/index.html b/public/index.html
index 296ddf3..9a12f2c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -309,8 +309,8 @@
     </div>
 
     <p class="has-text-centered mt-20">
-      <a class="button cta is-large rounded secondary-btn raised" href="https://social.bund.de/explore">
-        Mastodon entdecken
+      <a class="button cta is-large rounded secondary-btn raised" href="https://tour.fediverse.at/">
+        Entdecken
       </a>
     </p>
   </div>
@@ -440,14 +440,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>Eine Initiative von</h3>
-				<a href="https://gnulinux.ch"><img src="/images/logos/gln_logo.png"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 
diff --git a/public/it/index.html b/public/it/index.html
index 5af6d01..ef7a54f 100644
--- a/public/it/index.html
+++ b/public/it/index.html
@@ -309,7 +309,7 @@
     </div>
 
     <p class="has-text-centered mt-20">
-      <a class="button cta is-large rounded secondary-btn raised" href="https://social.bund.de/explore">
+      <a class="button cta is-large rounded secondary-btn raised" href="https://tour.fediverse.at/">
         Scoprire Mastodon
       </a>
     </p>
@@ -440,14 +440,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>un&#39;iniziativa di</h3>
-				<a href="https://gnulinux.ch"><img src="/images/logos/gln_logo.png"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 
diff --git a/static/images/logos/fsfe_logo.png b/static/images/logos/fsfe_logo.png
new file mode 100644
index 0000000..9b626fc
Binary files /dev/null and b/static/images/logos/fsfe_logo.png differ
diff --git a/themes/hugo-fresh/layouts/partials/footer.html b/themes/hugo-fresh/layouts/partials/footer.html
index bbbe431..ee174f5 100644
--- a/themes/hugo-fresh/layouts/partials/footer.html
+++ b/themes/hugo-fresh/layouts/partials/footer.html
@@ -55,14 +55,16 @@
         <div class="footer-column">
           <div class="footer-header">
 			<h3>{{ $sponsorText }}</h3>
-				<a href="https://gnulinux.ch"><img src="{{ printf "/images/logos/%s" $sponsorLogo | relURL }}"></a>
+				<a href="https://gnulinux.ch" style="color: #a39688" target="_blank">GNU/Linux.ch</a>
+				 und <a href="https://fsfe.org" style="color: #a39688" target="_blank">FSFE Lokalgruppe Zürich</a>
+<!--			<a href="https://fsfe.org"><img src="{{ printf "/images/logos/%s" $sponsorLogo | relURL }}"></a> -->
           </div>
         </div>
       </div>       
   </div>
   <div class="title-wrapper has-text-centered">
-    <p><a href="mailto:kontakt@gnulinux.ch"  style="color: #a39688" target="_blank">Contact</a> | 
-    <a href="https://gnulinux.ch/impressum"  style="color: #a39688" target="_blank">Imprint</a> | 
+    <p><a href="mailto:kontakt@gnulinux.ch" style="color: #a39688" target="_blank">Contact</a> | 
+    <a href="https://gnulinux.ch/impressum" style="color: #a39688" target="_blank">Imprint</a> | 
     <a href="http://creativecommons.org/licenses/by-sa/3.0/" style="color: #a39688">CC-BY-SA 3.0</a></p>
   </div>
 <!--