diff --git a/lektor/lektordata/project/content/contents.lr b/lektor/lektordata/project/content/contents.lr
index 63ae877..519512b 100644
--- a/lektor/lektordata/project/content/contents.lr
+++ b/lektor/lektordata/project/content/contents.lr
@@ -4,12 +4,12 @@ title: Willkommen beim PC Stammertal
 ---
 html:
 
-<h3>Unser nächster Anlass: </h3><br/>
+<h3>Unser nächster Anlass: </h3><br>
 <div class="nextevent">Leider unbekannt, aber <strong>frag mal den Vorstand</strong> der müsste es wissen</div>
 <div>
-  &nbsp;<br/>
-  &nbsp;<br/>
-  &nbsp;<br/>
+  &nbsp;<br>
+  &nbsp;<br>
+  &nbsp;<br>
 </div>
 <h4>...und auch nicht verpassen:</h4>
 <a href="https://www.wyland25.ch/" target="_blank"><img src="/images/zhksf.png" alt="27. Zürcher Kantonalschützenfest 2025" class="stamp"></a>
diff --git a/lektor/lektordata/project/content/termine/contents.lr b/lektor/lektordata/project/content/termine/contents.lr
index 137bcb0..ea25998 100644
--- a/lektor/lektordata/project/content/termine/contents.lr
+++ b/lektor/lektordata/project/content/termine/contents.lr
@@ -4,41 +4,273 @@ title: Termine
 ---
 body:
 
-* <div>Pistolen Gangfisch Schiessen</div>&nbsp;
-  * <div>So. 15. Dezember 2024</div>&nbsp;
+* <div>Generalversammlung</div>&nbsp;
+  * <div>Do. 6. Februar 2025</div>&nbsp;
+  * <div>19:00</div>&nbsp;
+  * <div>Restaurant Hirschen</div>&nbsp;
+* <div>Bezirksmatch 10m</div>&nbsp;
+  * <div>Do. 13. Februar 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Bezirksmatch 10m</div>&nbsp;
+  * <div>Do. 20. Februar 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Bezirkswinterschiessen</div>&nbsp;
+  * <div>Do. 6. März 2025</div>&nbsp;
+  * <div>17:30</div>&nbsp;
+  * <div>Flurlingen</div>&nbsp;
+* <div>Bezirkswinterschiessen</div>&nbsp;
+  * <div>Sa. 8. März 2025</div>&nbsp;
+  * <div>14:00</div>&nbsp;
+  * <div>Flurlingen</div>&nbsp;
+* <div>Frühlingsschiessen</div>&nbsp;
+  * <div>Sa. 15. März 2025</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>Bülach</div>&nbsp;
+* <div>Frühlingsschiessen</div>&nbsp;
+  * <div>Sa. 15. März 2025</div>&nbsp;
+  * <div>13:30</div>&nbsp;
+  * <div>Bülach</div>&nbsp;
+* <div>Frühlingsschiessen</div>&nbsp;
+  * <div>Sa. 22. März 2025</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>Bülach</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 31. März 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Eulachschiessen</div>&nbsp;
+  * <div>Fr. 4. April 2025</div>&nbsp;
+  * <div>16:00</div>&nbsp;
+  * <div>Winterthur</div>&nbsp;
+* <div>Eulachschiessen</div>&nbsp;
+  * <div>Sa. 5. April 2025</div>&nbsp;
+  * <div>8:30</div>&nbsp;
+  * <div>Winterthur</div>&nbsp;
+* <div>Eulachschiessen</div>&nbsp;
+  * <div>Fr. 11. April 2025</div>&nbsp;
+  * <div>16:00</div>&nbsp;
+  * <div>Winterthur</div>&nbsp;
+* <div>Eulachschiessen</div>&nbsp;
+  * <div>Sa. 12. April 2025</div>&nbsp;
+  * <div>8:30</div>&nbsp;
+  * <div>Winterthur</div>&nbsp;
+* <div>Kreis Winterschiessen</div>&nbsp;
+  * <div>Mo. 14. April 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 21. April 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Obligatorisches Programm und Kreis Winterschiessen</div>&nbsp;
+  * <div>Mo. 28. April 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 5. Mai 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 12. Mai 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Schlossschiessen</div>&nbsp;
+  * <div>Do. 15. Mai 2025</div>&nbsp;
+  * <div>17:30</div>&nbsp;
+  * <div>Wülflingen</div>&nbsp;
+* <div>Schlossschiessen</div>&nbsp;
+  * <div>Fr. 16. Mai 2025</div>&nbsp;
+  * <div>17:30</div>&nbsp;
+  * <div>Wülflingen</div>&nbsp;
+* <div>Schlossschiessen</div>&nbsp;
+  * <div>Sa. 17. Mai 2025</div>&nbsp;
+  * <div>9:30</div>&nbsp;
+  * <div>Wülflingen</div>&nbsp;
+* <div>Obligatorisches Programm und freies Training</div>&nbsp;
+  * <div>Mo. 19. Mai 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Schlossschiessen</div>&nbsp;
+  * <div>Do. 22. Mai 2025</div>&nbsp;
+  * <div>17:30</div>&nbsp;
+  * <div>Wülflingen</div>&nbsp;
+* <div>Schlossschiessen</div>&nbsp;
+  * <div>Fr. 23. Mai 2025</div>&nbsp;
+  * <div>17:30</div>&nbsp;
+  * <div>Wülflingen</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 26. Mai 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Kreis Sommerschiessen</div>&nbsp;
+  * <div>Mo. 2. Juni 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Sommer-Schüsse</div>&nbsp;
+  * <div>Fr. 6. Juni 2025</div>&nbsp;
+  * <div>17:00</div>&nbsp;
+  * <div>Rafz</div>&nbsp;
+* <div>Sommer-Schüsse</div>&nbsp;
+  * <div>Sa. 14. Juni 2025</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>Rafz</div>&nbsp;
+* <div>Obligatorisches Programm und freies Training</div>&nbsp;
+  * <div>Mo. 16. Juni 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 23. Juni 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 30. Juni 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Bezirks Sommerschiessen</div>&nbsp;
+  * <div>Sa. 5. Juli 2025</div>&nbsp;
+  * <div>17:00</div>&nbsp;
+  * <div>Flurlingen</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 7. Juli 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Terassenfest</div>&nbsp;
+  * <div>Fr. 11. Juli 2025</div>&nbsp;
+  * <div>19:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Bezirks Sommerschiessen</div>&nbsp;
+  * <div>Sa. 12. Juli 2025</div>&nbsp;
+  * <div>14:00</div>&nbsp;
+  * <div>Flurlingen</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 14. Juli 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Obligatorisches Programm und freies Training</div>&nbsp;
+  * <div>Mo. 11. August 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>ZHKSF Ausbildung Pistole</div>&nbsp;
+  * <div>Do. 14. August 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
-  * <div>Ermatingen</div>&nbsp;
-* <div>40. Appenzeller Luftpistolenmeisterschaft 2025</div>&nbsp;
-  * <div>Do. 2. Januar 2025</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Fr. 15. August 2025</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
-* <div>40. Appenzeller Luftpistolenmeisterschaft 2025</div>&nbsp;
-  * <div>Do. 9. Januar 2025</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Sa. 16. August 2025</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
-* <div>Appenzeller Lupi Meisterschaft</div>&nbsp;
-  * <div>So. 12. Januar 2025</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>So. 17. August 2025</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
+* <div>KEIN Training</div>&nbsp;
+  * <div>Mo. 18. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>ZHKSF intern</div>&nbsp;
+  * <div>Do. 21. August 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Fr. 22. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Sa. 23. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>So. 24. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Mo. 25. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Fr. 29. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>Sa. 30. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Zürcher Kantonalschützenfest</div>&nbsp;
+  * <div>So. 31. August 2025</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 1. September 2025</div>&nbsp;
+  * <div>18:30</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Kreismatch</div>&nbsp;
+  * <div>Mo. 8. September 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
 * <div>Orientierungslauf Stammerberg (kein Schiessbetrieb!)</div>&nbsp;
   * <div>Sa. 13. September 2025</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
-  * <div>&nbsp;</div>&nbsp;
+  * <div>Unterstammheim</div>&nbsp;
+* <div>Kreismatch</div>&nbsp;
+  * <div>Mo. 15. September 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
 * <div>Schwaderlohschiessen</div>&nbsp;
   * <div>Sa. 20. September 2025</div>&nbsp;
-  * <div>13:00</div>&nbsp;
-  * <div>&nbsp;</div>&nbsp;
+  * <div>13:30</div>&nbsp;
+  * <div>Alterswilen</div>&nbsp;
+* <div>freies Training</div>&nbsp;
+  * <div>Mo. 22. September 2025</div>&nbsp;
+  * <div>18:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
 * <div>Schwaderlohschiessen (unser Schiesstag)</div>&nbsp;
   * <div>Di. 23. September 2025</div>&nbsp;
-  * <div>17:00</div>&nbsp;
-  * <div>&nbsp;</div>&nbsp;
+  * <div>17:30</div>&nbsp;
+  * <div>Alterswilen</div>&nbsp;
 * <div>Schwaderlohschiessen</div>&nbsp;
   * <div>Sa. 27. September 2025</div>&nbsp;
-  * <div>&nbsp;</div>&nbsp;
-  * <div>&nbsp;</div>&nbsp;
+  * <div>8:00</div>&nbsp;
+  * <div>Alterswilen</div>&nbsp;
 * <div>Schwaderlohschiessen</div>&nbsp;
   * <div>So. 28. September 2025</div>&nbsp;
+  * <div>10:00</div>&nbsp;
+  * <div>Alterswilen</div>&nbsp;
+* <div>Endschiessen</div>&nbsp;
+  * <div>Mo. 29. September 2025</div>&nbsp;
+  * <div>17:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Endschiessen</div>&nbsp;
+  * <div>Mo. 6. Oktober 2025</div>&nbsp;
+  * <div>17:00</div>&nbsp;
+  * <div>Stammheim</div>&nbsp;
+* <div>Niklausschiessen</div>&nbsp;
+  * <div>Sa. 25. Oktober 2025</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>Diessenhofen</div>&nbsp;
+* <div>Niklausschiessen</div>&nbsp;
+  * <div>So. 26. Oktober 2025</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>Diessenhofen</div>&nbsp;
+* <div>Absenden</div>&nbsp;
+  * <div>Fr. 31. Oktober 2025</div>&nbsp;
+  * <div>19:00</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
+* <div>Niklausschiessen</div>&nbsp;
+  * <div>Sa. 1. November 2025</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>Diessenhofen</div>&nbsp;
+* <div>Appenzeller Lupi Meisterschaft</div>&nbsp;
+  * <div>So. 11. Januar 2026</div>&nbsp;
+  * <div>9:00</div>&nbsp;
+  * <div>&nbsp;</div>&nbsp;
+* <div>Generalversammlung</div>&nbsp;
+  * <div>Do. 5. Februar 2026</div>&nbsp;
+  * <div>19:00</div>&nbsp;
   * <div>&nbsp;</div>&nbsp;
 * <div>Bezirkssommerschiessen</div>&nbsp;
   * <div>Do. 23. August 2029</div>&nbsp;
diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html
index d370b32..a69ba40 100644
--- a/lektor/lektordata/project/templates/layout.html
+++ b/lektor/lektordata/project/templates/layout.html
@@ -1,12 +1,12 @@
 <!doctype html>
 <meta charset="utf-8">
 <link rel="stylesheet" href="{{ '/static/style.css'|url }}">
-<link rel="icon" type="image/png" href="{{ '/favicon-96x96.png'|url }}" sizes="96x96" />
-<link rel="icon" type="image/svg+xml" href="{{ '/favicon.svg'|url }}" />
-<link rel="shortcut icon" href="{{ '/favicon.ico'|url }}" />
-<link rel="apple-touch-icon" sizes="180x180" href="{{ '/apple-touch-icon.png'|url }}" />
-<meta name="apple-mobile-web-app-title" content="PCS" />
-<link rel="manifest" href="{{ '/site.webmanifest'|url }}" />
+<link rel="icon" type="image/png" href="{{ '/favicon-96x96.png'|url }}" sizes="96x96">
+<link rel="icon" type="image/svg+xml" href="{{ '/favicon.svg'|url }}">
+<link rel="shortcut icon" href="{{ '/favicon.ico'|url }}">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ '/apple-touch-icon.png'|url }}">
+<meta name="apple-mobile-web-app-title" content="PCS">
+<link rel="manifest" href="{{ '/site.webmanifest'|url }}">
 <title>{% block title %}Welcome{% endblock %} — PCS</title>
 <body>
   <header>
@@ -22,7 +22,7 @@
           <label for='menu' tabindex="0">
             &#x2630;
           </label>
-          <input id='menu' type='checkbox' />
+          <input id='menu' type='checkbox'>
           <ul class="nav navbar-nav">
             {% for href, title in [
               ['/termine', 'Termine'],
@@ -49,9 +49,9 @@
   <footer>
     <div class="inner_footer">
       <div class="left_footer">
-        &nbsp;<br/>
-        Pistolenclub Stammertal<br/>
-        8476 Unterstammheim<br/>
+        &nbsp;<br>
+        Pistolenclub Stammertal<br>
+        8476 Unterstammheim<br>
       </div>
       <div class="middle_footer">
         <a href="/impressum/">Impressum</a>
diff --git a/lektor/lektordata/scripts/calendar-fetcher-main.py b/lektor/lektordata/scripts/calendar-fetcher-main.py
index 46bc78b..05da116 100644
--- a/lektor/lektordata/scripts/calendar-fetcher-main.py
+++ b/lektor/lektordata/scripts/calendar-fetcher-main.py
@@ -42,12 +42,12 @@ title: Willkommen beim PC Stammertal
 ---
 html:
 
-<h3>Unser nächster Anlass: </h3><br/>
+<h3>Unser nächster Anlass: </h3><br>
 {self.fallback_html}
 <div>
-  &nbsp;<br/>
-  &nbsp;<br/>
-  &nbsp;<br/>
+  &nbsp;<br>
+  &nbsp;<br>
+  &nbsp;<br>
 </div>
 <h4>...und auch nicht verpassen:</h4>
 <a href="https://www.wyland25.ch/" target="_blank"><img src="/images/zhksf.png" alt="27. Zürcher Kantonalschützenfest 2025" class="stamp"></a>