diff --git a/public/blog/index.html b/public/blog/index.html
index eb9eabe..0f33233 100644
--- a/public/blog/index.html
+++ b/public/blog/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/blog/page-bundle-example/index.html b/public/blog/page-bundle-example/index.html
index 9f2a9b9..7702a9f 100644
--- a/public/blog/page-bundle-example/index.html
+++ b/public/blog/page-bundle-example/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/blog/post/index.html b/public/blog/post/index.html
index 46911ad..aa307cf 100644
--- a/public/blog/post/index.html
+++ b/public/blog/post/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/blog/post1/index.html b/public/blog/post1/index.html
index 89a0038..5074d9f 100644
--- a/public/blog/post1/index.html
+++ b/public/blog/post1/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/blog/post2/index.html b/public/blog/post2/index.html
index 424b65c..079928b 100644
--- a/public/blog/post2/index.html
+++ b/public/blog/post2/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/blog/post3/index.html b/public/blog/post3/index.html
index 34d2719..e3f0ab1 100644
--- a/public/blog/post3/index.html
+++ b/public/blog/post3/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/blog/post4/index.html b/public/blog/post4/index.html
index 75e37bc..1f706dd 100644
--- a/public/blog/post4/index.html
+++ b/public/blog/post4/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/calendar/index.html b/public/calendar/index.html
new file mode 100644
index 0000000..83aa10f
--- /dev/null
+++ b/public/calendar/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+    <head>
+
+
+
+<title> | Freifunk-Leipzig</title>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<link rel="stylesheet" href="/style.css" /></head>
+    <body class="is-preload">
+        <div id="page-wrapper">
+<header id="header">
+    <h1>Freifunk-Leipzig</h1>
+    <nav id="nav">
+        <ul>
+            
+            
+            <li><a href="/blog" >Blog</a></li>
+            
+            
+            
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
+            
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Karten</a>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
+            </li>
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Firmware</a>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
+            </li>
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Kontakt</a>
+                <ul><li><a href="https://freifunk.net/impressum/">Impressum</a></li><li><a href="https://freifunk.net/datenschutz/">Datenschutz</a></li></ul>
+            </li>
+        </ul>
+    </nav>
+</header><script type="text/javascript">
+              $(document).ready(function() {
+                if(window.location.hash) {
+                  $("iframe").attr("src",
+                    "https://dezentrale.space/kalender/" + window.location.hash);
+                }
+              });
+          </script>
+              
+          <iframe src="https://dezentrale.space/kalender/"
+                width="100%" style="display:block; height: calc(100vh - 3.25em);width: 100%;">
+          </iframe>
+        </div>
+<script src="https://freifunk-leipzig.de/js/jquery.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/jquery.dropotron.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/jquery.scrollex.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/browser.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/breakpoints.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/util.js"></script>
+<script src="https://freifunk-leipzig.de/js/main.js"></script></body>
+</html>
\ No newline at end of file
diff --git a/public/categories/index.html b/public/categories/index.html
index a42e6ee..94d6475 100644
--- a/public/categories/index.html
+++ b/public/categories/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/buttons/index.html b/public/elements/buttons/index.html
index 0c060ea..011071a 100644
--- a/public/elements/buttons/index.html
+++ b/public/elements/buttons/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/form/index.html b/public/elements/form/index.html
index f431326..2751ebb 100644
--- a/public/elements/form/index.html
+++ b/public/elements/form/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/image/index.html b/public/elements/image/index.html
index 526f1d1..61ba6b1 100644
--- a/public/elements/image/index.html
+++ b/public/elements/image/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/index.html b/public/elements/index.html
index 9762fc6..7b58ceb 100644
--- a/public/elements/index.html
+++ b/public/elements/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/lists/index.html b/public/elements/lists/index.html
index fc10aa6..ce044ba 100644
--- a/public/elements/lists/index.html
+++ b/public/elements/lists/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/table/index.html b/public/elements/table/index.html
index 5e4d516..9dc55eb 100644
--- a/public/elements/table/index.html
+++ b/public/elements/table/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/elements/text/index.html b/public/elements/text/index.html
index c292d01..851d4d7 100644
--- a/public/elements/text/index.html
+++ b/public/elements/text/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/gluon/index.html b/public/gluon/index.html
new file mode 100644
index 0000000..1dd42cd
--- /dev/null
+++ b/public/gluon/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+    <head>
+
+
+
+<title> | Freifunk-Leipzig</title>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<link rel="stylesheet" href="/style.css" /></head>
+    <body class="is-preload">
+        <div id="page-wrapper">
+<header id="header">
+    <h1>Freifunk-Leipzig</h1>
+    <nav id="nav">
+        <ul>
+            
+            
+            <li><a href="/blog" >Blog</a></li>
+            
+            
+            
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
+            
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Karten</a>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
+            </li>
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Firmware</a>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
+            </li>
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Kontakt</a>
+                <ul><li><a href="https://freifunk.net/impressum/">Impressum</a></li><li><a href="https://freifunk.net/datenschutz/">Datenschutz</a></li></ul>
+            </li>
+        </ul>
+    </nav>
+</header><script type="text/javascript">
+              $(document).ready(function() {
+                if(window.location.hash) {
+                  $("iframe").attr("src",
+                    "https://images.freifunk-leipzig.de/" + window.location.hash);
+                }
+              });
+          </script>
+              
+          <iframe src="https://images.freifunk-leipzig.de/"
+                width="100%" style="display:block; height: calc(100vh - 3.25em);width: 100%;">
+          </iframe>
+        </div>
+<script src="https://freifunk-leipzig.de/js/jquery.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/jquery.dropotron.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/jquery.scrollex.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/browser.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/breakpoints.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/util.js"></script>
+<script src="https://freifunk-leipzig.de/js/main.js"></script></body>
+</html>
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 77b3980..697616b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -28,15 +28,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
@@ -54,7 +54,7 @@
                 
                     <li><a href="#" class="button primary">Mach mit</a></li>
                 
-                    <li><a href="#" class="button ">Chatte mit der Community</a></li>
+                    <li><a href="https://matrix.to/#/#freifunk:chat.dezentrale.space" class="button ">Chatte mit der Community</a></li>
                 
                 </ul>
             
diff --git a/public/index.xml b/public/index.xml
index a90060a..cc83764 100644
--- a/public/index.xml
+++ b/public/index.xml
@@ -98,24 +98,6 @@
       <description>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet dui nec dui commodo auctor non eu mauris. Duis varius finibus vestibulum. Praesent aliquam, erat sed dictum feugiat, velit erat iaculis elit, eget iaculis ex libero ac sapien. Sed maximus ut lectus et varius. Nullam posuere velit vitae est consectetur porttitor. Vestibulum tempor felis ante, nec volutpat risus vestibulum ac. Mauris at finibus felis, eu placerat arcu. Sed nec semper nunc.</description>
     </item>
     
-    <item>
-      <title>Contact Us</title>
-      <link>https://freifunk-leipzig.de/contact/</link>
-      <pubDate>Wed, 06 Feb 2019 00:00:00 +0000</pubDate>
-      
-      <guid>https://freifunk-leipzig.de/contact/</guid>
-      <description>          </description>
-    </item>
-    
-    <item>
-      <title>This Is A Generic Page</title>
-      <link>https://freifunk-leipzig.de/generic/</link>
-      <pubDate>Wed, 06 Feb 2019 00:00:00 +0000</pubDate>
-      
-      <guid>https://freifunk-leipzig.de/generic/</guid>
-      <description>This is a subheading Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus.</description>
-    </item>
-    
     <item>
       <title>first post</title>
       <link>https://freifunk-leipzig.de/blog/post/</link>
@@ -125,6 +107,33 @@
       <description>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet dui nec dui commodo auctor non eu mauris. Duis varius finibus vestibulum. Praesent aliquam, erat sed dictum feugiat, velit erat iaculis elit, eget iaculis ex libero ac sapien. Sed maximus ut lectus et varius. Nullam posuere velit vitae est consectetur porttitor. Vestibulum tempor felis ante, nec volutpat risus vestibulum ac. Mauris at finibus felis, eu placerat arcu. Sed nec semper nunc.</description>
     </item>
     
+    <item>
+      <title></title>
+      <link>https://freifunk-leipzig.de/calendar/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://freifunk-leipzig.de/calendar/</guid>
+      <description></description>
+    </item>
+    
+    <item>
+      <title></title>
+      <link>https://freifunk-leipzig.de/gluon/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://freifunk-leipzig.de/gluon/</guid>
+      <description></description>
+    </item>
+    
+    <item>
+      <title></title>
+      <link>https://freifunk-leipzig.de/map/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://freifunk-leipzig.de/map/</guid>
+      <description></description>
+    </item>
+    
     <item>
       <title>Primis eget imperdiet lorem</title>
       <link>https://freifunk-leipzig.de/blog/post1/</link>
diff --git a/public/map/index.html b/public/map/index.html
new file mode 100644
index 0000000..e66b5ad
--- /dev/null
+++ b/public/map/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+    <head>
+
+
+
+<title> | Freifunk-Leipzig</title>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<link rel="stylesheet" href="/style.css" /></head>
+    <body class="is-preload">
+        <div id="page-wrapper">
+<header id="header">
+    <h1>Freifunk-Leipzig</h1>
+    <nav id="nav">
+        <ul>
+            
+            
+            <li><a href="/blog" >Blog</a></li>
+            
+            
+            
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
+            
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Karten</a>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
+            </li>
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Firmware</a>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
+            </li>
+            <li>
+                <a href="#" class="icon solid fa-angle-down">Kontakt</a>
+                <ul><li><a href="https://freifunk.net/impressum/">Impressum</a></li><li><a href="https://freifunk.net/datenschutz/">Datenschutz</a></li></ul>
+            </li>
+        </ul>
+    </nav>
+</header><script type="text/javascript">
+              $(document).ready(function() {
+                if(window.location.hash) {
+                  $("iframe").attr("src",
+                    "http://karte.leipzig.freifunk.net:8018/meshviewer2/build/" + window.location.hash);
+                }
+              });
+          </script>
+              
+          <iframe src="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/"
+                width="100%" style="display:block; height: calc(100vh - 3.25em);width: 100%;">
+          </iframe>
+        </div>
+<script src="https://freifunk-leipzig.de/js/jquery.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/jquery.dropotron.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/jquery.scrollex.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/browser.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/breakpoints.min.js"></script>
+<script src="https://freifunk-leipzig.de/js/util.js"></script>
+<script src="https://freifunk-leipzig.de/js/main.js"></script></body>
+</html>
\ No newline at end of file
diff --git a/public/sitemap.xml b/public/sitemap.xml
index ebd568a..d43cf92 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -71,21 +71,23 @@
     <lastmod>2019-04-07T00:00:00+00:00</lastmod>
   </url>
   
-  <url>
-    <loc>https://freifunk-leipzig.de/contact/</loc>
-    <lastmod>2019-02-06T00:00:00+00:00</lastmod>
-  </url>
-  
-  <url>
-    <loc>https://freifunk-leipzig.de/generic/</loc>
-    <lastmod>2019-02-06T00:00:00+00:00</lastmod>
-  </url>
-  
   <url>
     <loc>https://freifunk-leipzig.de/blog/post/</loc>
     <lastmod>2012-02-06T00:00:00+00:00</lastmod>
   </url>
   
+  <url>
+    <loc>https://freifunk-leipzig.de/calendar/</loc>
+  </url>
+  
+  <url>
+    <loc>https://freifunk-leipzig.de/gluon/</loc>
+  </url>
+  
+  <url>
+    <loc>https://freifunk-leipzig.de/map/</loc>
+  </url>
+  
   <url>
     <loc>https://freifunk-leipzig.de/categories/</loc>
   </url>
diff --git a/public/tags/index.html b/public/tags/index.html
index ff6a1e6..f85d047 100644
--- a/public/tags/index.html
+++ b/public/tags/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
diff --git a/public/tags/tag1/index.html b/public/tags/tag1/index.html
index 6e79ced..9ee77a5 100644
--- a/public/tags/tag1/index.html
+++ b/public/tags/tag1/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
@@ -59,36 +59,6 @@
               </section>
           </div>
       
-          <div class="col-6 col-12-narrower">
-              <section class="box special">
-                  
-                  <h3>Contact Us</h3>
-                  <p>Feb 6, 2019</p>
-                  
-                  <p>Tell us what you think about our little operation.</p>
-                  
-                  <ul class="actions special">
-                      <li><a href="https://freifunk-leipzig.de/contact/" class="button alt"> </a></li>
-                  </ul>
-              </section>
-          </div>
-      
-          <div class="col-6 col-12-narrower">
-              <section class="box special">
-                  
-                  <span class="image featured"><img src="/images/pic01.jpg" alt="" /></span>
-                  
-                  <h3>This Is A Generic Page</h3>
-                  <p>Feb 6, 2019</p>
-                  
-                  <p>A generic page for every non-generic situation.</p>
-                  
-                  <ul class="actions special">
-                      <li><a href="https://freifunk-leipzig.de/generic/" class="button alt"> </a></li>
-                  </ul>
-              </section>
-          </div>
-      
   </div>
 
             </section>
diff --git a/public/tags/tag1/index.xml b/public/tags/tag1/index.xml
index 08bbfc7..a94786f 100644
--- a/public/tags/tag1/index.xml
+++ b/public/tags/tag1/index.xml
@@ -16,23 +16,5 @@
       <description>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet dui nec dui commodo auctor non eu mauris. Duis varius finibus vestibulum. Praesent aliquam, erat sed dictum feugiat, velit erat iaculis elit, eget iaculis ex libero ac sapien. Sed maximus ut lectus et varius. Nullam posuere velit vitae est consectetur porttitor. Vestibulum tempor felis ante, nec volutpat risus vestibulum ac. Mauris at finibus felis, eu placerat arcu. Sed nec semper nunc.</description>
     </item>
     
-    <item>
-      <title>Contact Us</title>
-      <link>https://freifunk-leipzig.de/contact/</link>
-      <pubDate>Wed, 06 Feb 2019 00:00:00 +0000</pubDate>
-      
-      <guid>https://freifunk-leipzig.de/contact/</guid>
-      <description>          </description>
-    </item>
-    
-    <item>
-      <title>This Is A Generic Page</title>
-      <link>https://freifunk-leipzig.de/generic/</link>
-      <pubDate>Wed, 06 Feb 2019 00:00:00 +0000</pubDate>
-      
-      <guid>https://freifunk-leipzig.de/generic/</guid>
-      <description>This is a subheading Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus.</description>
-    </item>
-    
   </channel>
 </rss>
diff --git a/public/tags/tag2/index.html b/public/tags/tag2/index.html
index 30331d6..0c58f01 100644
--- a/public/tags/tag2/index.html
+++ b/public/tags/tag2/index.html
@@ -20,15 +20,15 @@
             
             
             
-            <li><a href="/">Kalender</a></li>
+            <li><a href="https://next.dezentrale.cloud/nextcloud/apps/calendar/p/fMxrf4srxN65TpcW/dayGridMonth/now">Kalender</a></li>
             
             <li>
                 <a href="#" class="icon solid fa-angle-down">Karten</a>
-                <ul><li><a href="http://karte.leipzig.freifunk.net:8018/meshviewer2/build/">Meshviewer</a></li></ul>
+                <ul><li><a href="map">Meshviewer</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Firmware</a>
-                <ul><li><a href="https://images.freifunk-leipzig.de/">Gluon</a></li></ul>
+                <ul><li><a href="gluon/">Gluon</a></li></ul>
             </li>
             <li>
                 <a href="#" class="icon solid fa-angle-down">Kontakt</a>
@@ -59,36 +59,6 @@
               </section>
           </div>
       
-          <div class="col-6 col-12-narrower">
-              <section class="box special">
-                  
-                  <h3>Contact Us</h3>
-                  <p>Feb 6, 2019</p>
-                  
-                  <p>Tell us what you think about our little operation.</p>
-                  
-                  <ul class="actions special">
-                      <li><a href="https://freifunk-leipzig.de/contact/" class="button alt"> </a></li>
-                  </ul>
-              </section>
-          </div>
-      
-          <div class="col-6 col-12-narrower">
-              <section class="box special">
-                  
-                  <span class="image featured"><img src="/images/pic01.jpg" alt="" /></span>
-                  
-                  <h3>This Is A Generic Page</h3>
-                  <p>Feb 6, 2019</p>
-                  
-                  <p>A generic page for every non-generic situation.</p>
-                  
-                  <ul class="actions special">
-                      <li><a href="https://freifunk-leipzig.de/generic/" class="button alt"> </a></li>
-                  </ul>
-              </section>
-          </div>
-      
   </div>
 
             </section>
diff --git a/public/tags/tag2/index.xml b/public/tags/tag2/index.xml
index 96686eb..48daa78 100644
--- a/public/tags/tag2/index.xml
+++ b/public/tags/tag2/index.xml
@@ -16,23 +16,5 @@
       <description>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet dui nec dui commodo auctor non eu mauris. Duis varius finibus vestibulum. Praesent aliquam, erat sed dictum feugiat, velit erat iaculis elit, eget iaculis ex libero ac sapien. Sed maximus ut lectus et varius. Nullam posuere velit vitae est consectetur porttitor. Vestibulum tempor felis ante, nec volutpat risus vestibulum ac. Mauris at finibus felis, eu placerat arcu. Sed nec semper nunc.</description>
     </item>
     
-    <item>
-      <title>Contact Us</title>
-      <link>https://freifunk-leipzig.de/contact/</link>
-      <pubDate>Wed, 06 Feb 2019 00:00:00 +0000</pubDate>
-      
-      <guid>https://freifunk-leipzig.de/contact/</guid>
-      <description>          </description>
-    </item>
-    
-    <item>
-      <title>This Is A Generic Page</title>
-      <link>https://freifunk-leipzig.de/generic/</link>
-      <pubDate>Wed, 06 Feb 2019 00:00:00 +0000</pubDate>
-      
-      <guid>https://freifunk-leipzig.de/generic/</guid>
-      <description>This is a subheading Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus.</description>
-    </item>
-    
   </channel>
 </rss>