diff --git a/.forgejo/CODEOWNERS b/.forgejo/CODEOWNERS
deleted file mode 100644
index 431cfd9..0000000
--- a/.forgejo/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @cccb/web
diff --git a/.forgejo/dependabot.yml b/.forgejo/dependabot.yml
deleted file mode 100644
index 174728a..0000000
--- a/.forgejo/dependabot.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "staging"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "gh-action"
-    labels:
-      - "gh-action"
-      - "dependencies"
-    reviewers:
-      - "cccb/web"
-  - package-ecosystem: "pip"
-    directory: "/"
-    target-branch: "dev"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "python"
-    labels:
-      - "python"
-      - "dependencies"
-    reviewers:
-      - "cccb/web"
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
deleted file mode 100644
index 40bd95b..0000000
--- a/.forgejo/workflows/release.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-name: Release website
-
-on:
-  schedule:
-    - cron: "0 4 * * *"
-  push:
-    branches:
-      - staging
-      - production
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-          
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
-        with:
-          hugo-version: 'latest'
-          
-      - name: Build pages
-        run: hugo $(cat .hugo-params)
-        
-      - name: Add de_DE.UTF-8 locale
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install locales
-          sudo locale-gen de_DE.UTF-8
-          
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          cache: 'pip'
-          
-      - name: Install dependencies
-        run: |
-          pip install --upgrade pip setuptools wheel
-          pip install -r requirements.txt
-          
-      - name: Generate calendars
-        run: python tools/merge_cals.py
-        
-      - name: Copy calendar to output dir
-        run: cp static/all.ics public/all.ics
-        
-      - name: Update homepage with latest event
-        run: upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html
-        
-      - name: Generate timestamp
-        run: echo "timestamp=$(date -u +'%Y-%m-%dT%H%M%SZ')" >> $GITHUB_ENV
-        
-      - name: Create Release Archive
-        uses: thedoctor0/zip-release@0.7.6
-        with:
-          type: zip
-          filename: ../release-${{ github.ref_name }}-${{ env.timestamp }}.zip
-          directory: public
-          
-      - name: Create Release
-        uses: ncipollo/release-action@v1.16.0
-        with:
-          tag: ${{ github.ref_name }}-${{ env.timestamp }}
-          name: Website ${{ github.ref_name }} version ${{ env.timestamp }}
-          body: Website ${{ github.ref_name }} version ${{ env.timestamp }}
-          artifacts: release-${{ github.ref_name }}-${{ env.timestamp }}.zip
-          token: ${{ secrets.GITEA_TOKEN }}
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index 431cfd9..0000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @cccb/web
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 174728a..0000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "staging"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "gh-action"
-    labels:
-      - "gh-action"
-      - "dependencies"
-    reviewers:
-      - "cccb/web"
-  - package-ecosystem: "pip"
-    directory: "/"
-    target-branch: "dev"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "python"
-    labels:
-      - "python"
-      - "dependencies"
-    reviewers:
-      - "cccb/web"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 5741be5..0000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-name: Release website
-
-on:
-  schedule:
-    - cron: "0 4 * * *"
-  push:
-    branches:
-      - staging
-      - production
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  pages:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v3
-        with:
-          hugo-version: 'latest'
-      - name: Build pages
-        run: hugo $(cat .hugo-params)
-      - uses: actions/upload-artifact@v4
-        name: Upload pages
-        with:
-          name: pages
-          path: public
-
-  calendar:
-    needs: [ pages ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add de_DE.UTF-8 locale
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install locales
-          sudo locale-gen de_DE.UTF-8
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          cache: 'pip' # caching pip dependencies
-      - name: Install dependencies
-        run: |
-          pip install --upgrade pip setuptools wheel
-          pip install -r requirements.txt
-      - name: Download pages
-        uses: actions/download-artifact@v4
-        with:
-          name: pages
-          path: public/
-      - name: Generate calendars
-        run: python tools/merge_cals.py
-      - name: Copy calendar to output dir
-        run: cp static/all.ics public/all.ics
-      - name: Update homepage with latest event
-        run: upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html
-      - uses: actions/upload-artifact@v4
-        name: Upload pages
-        with:
-          name: enhanced_pages
-          path: public
-
-  staging:
-    needs: [ calendar ]
-    runs-on: ubuntu-latest
-    environment: staging
-    if: (github.ref == 'refs/heads/staging' && github.event_name == 'push') || github.event_name == 'schedule'
-    steps:
-      - name: Download pages
-        uses: actions/download-artifact@v4
-        with:
-          name: enhanced_pages
-          path: public
-      - name: Generate timestamp
-        run: echo "timestamp=$(date -u +'%Y-%m-%dT%H%M%SZ')" >> $GITHUB_ENV
-      - name: Create Release Archive
-        uses: thedoctor0/zip-release@0.7.6
-        with:
-          type: zip
-          filename: ../release-staging-${{ env.timestamp }}.zip
-          directory: public
-      - name: Create Release
-        uses: ncipollo/release-action@v1.16.0
-        with:
-          tag: staging-${{ env.timestamp }}
-          name: Website staging version ${{ env.timestamp }}
-          body: Website staging version ${{ env.timestamp }}
-          artifacts: release-staging-${{ env.timestamp }}.zip
-          token: ${{ secrets.GITHUB_TOKEN }}
-  
-  production:
-    needs: [ calendar ]
-    runs-on: ubuntu-latest
-    environment: production
-    if: (github.ref == 'refs/heads/production' && github.event_name == 'push') || github.event_name == 'schedule'
-    steps:
-      - name: Download pages
-        uses: actions/download-artifact@v4
-        with:
-          name: enhanced_pages
-          path: public
-      - name: Generate timestamp
-        run: echo "timestamp=$(date -u +'%Y-%m-%dT%H%M%SZ')" >> $GITHUB_ENV
-      - name: Create Release Archive
-        uses: thedoctor0/zip-release@0.7.6
-        with:
-          type: zip
-          filename: ../release-production-${{ env.timestamp }}.zip
-          directory: public
-      - name: Create Release
-        uses: ncipollo/release-action@v1.16.0
-        with:
-          makeLatest: true
-          tag: production-${{ env.timestamp }}
-          name: Website production version ${{ env.timestamp }}
-          body: Website production version ${{ env.timestamp }}
-          artifacts: release-production-${{ env.timestamp }}.zip
-          token: ${{ secrets.GITHUB_TOKEN }}
-          
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 349c2d2..54e16e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 static/all.ics
+.envrc
 
 # Created by https://www.toptal.com/developers/gitignore/api/windows,linux,macos,hugo
 # Edit at https://www.toptal.com/developers/gitignore?templates=windows,linux,macos,hugo
@@ -100,4 +101,4 @@ shell.nix
 .direnv
 
 # Python
-.venv
\ No newline at end of file
+.venv
diff --git a/README.md b/README.md
index a544e7a..c299d95 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,19 @@
-![CCCB logo](static/img/logo.png)
-
 # CCCB Website
 
 This is the website of the CCCB.
 
+![CCCB logo](assets/img/logo.png)
+
 ## Getting started
 
 1. Get Hugo: <https://gohugo.io/getting-started/installing>
-2. Clone this repo
+2. Clone this repo (`--recursive` is needed to check out submodules)
    ```shell
-   git clone https://github.com/cccb/www
+   git clone --recursive https://git.berlin.ccc.de/cccb-website-team/www.git cccb-website
    ```
 3. Switch directory
    ```shell
-   cd www
-   ```
-3. Fetch Submodules
-   ```shell
-   git submodule update --recursive --remote --init
+   cd cccb-website
    ```
 
 ### Run site locally
@@ -35,13 +31,13 @@ Every change you make on the project will be reflected in your browser as long a
 
 ## Making a change
 
-1. Use your local dev setup (see Getting started) or via GitHub editor.
+1. Use your local dev setup (see Getting started) or via the Forgejo editor.
 2. Make your change in `staging` branch.
 3. Commit (and push) your change.
-4. GitHub Actions is running the release workflow.
+4. ~~GitHub Actions is running the release workflow.~~
    - If successful, check [Staging Website](https://staging.berlin.ccc.de/) if change is correct.
 5. Create merge request to merge changes from `staging` to `production` branch. Ask somebody to check merge request or if small change, merge yourself.
-6. GitHub Actions is running the release workflow.
+6. ~~GitHub Actions is running the release workflow.~~
    - If successfull, check [Website](https://berlin.ccc.de/) if change is correct.
 7. Profit!
 
diff --git a/TODO.md b/TODO.md
index 7401796..10121f4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,8 @@
 
 - DSGVO-compliant Datenschutzerklärung reinbasteln
 - Entscheiden, welche Seiten sonst noch konvertiert werden sollen und welche in die ewigen Datengründe gehen können
-- add nix config to repo
+
+
 
 # Done
 
@@ -17,4 +18,3 @@
 - Bestehende Datengarten-Termine konvertieren
   - ggf. template mit frontmatter
 - Theme forken, alle assets sollten lokal gehosted sein und nicht von irgendwelchen CDNs bezogen werden (HTTP/2 ftw!)
-
diff --git a/build.sh b/build.sh
index 11d85bf..3a07414 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
+set -e
+set -x
+
 hugo $(cat .hugo-params)
 ./tools/merge_cals.py
 upcoming="$(tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')"
 cp static/all.ics public/all.ics
-sed -i "s#CALENDAR#$upcoming#g" public/index.html
\ No newline at end of file
+sed -i "s#CALENDAR#$upcoming#g" public/index.html
diff --git a/config/_default/languages.de.toml b/config/_default/languages.de.toml
index a6e4f46..e3fc5ce 100644
--- a/config/_default/languages.de.toml
+++ b/config/_default/languages.de.toml
@@ -25,53 +25,9 @@ title = "Chaos Computer Club Berlin"
   headline = "Willkommen! Wir sind ein Erfa-Kreis des Chaos Computer Club e.V. und die örtliche Niederlassung des CCC in Berlin."
 #   bio = "A little bit about you"
   links = [
-    { email = "mailto:mail2025@berlin.ccc.de" },
-#     { link = "https://link-to-some-website.com/" },
-#     { amazon = "https://www.amazon.com/hz/wishlist/ls/wishlist-id" },
-#     { apple = "https://www.apple.com" },
-#     { blogger = "https://username.blogspot.com/" },
-#     { bluesky = "https://bsky.app/profile/username" },
-#     { codepen = "https://codepen.io/username" },
-#     { dev = "https://dev.to/username" },
-#     { discord = "https://discord.gg/invitecode" },
-#     { dribbble = "https://dribbble.com/username" },
-#     { facebook = "https://facebook.com/username" },
-#     { flickr = "https://www.flickr.com/photos/username/" },
-#     { foursquare = "https://foursquare.com/username" },
-    { github = "https://github.com/cccb/" },
-    { gitlab = "https://git.berlin.ccc.de/explore/repos" },
-#     { google = "https://www.google.com/" },
-#     { hashnode = "https://username.hashnode.dev" },
-#     { instagram = "https://instagram.com/username" },
-#     { itch-io = "https://username.itch.io" },
-#     { keybase = "https://keybase.io/username" },
-#     { kickstarter = "https://www.kickstarter.com/profile/username" },
-#     { lastfm = "https://lastfm.com/user/username" },
-#     { linkedin = "https://linkedin.com/in/username" },
     { mastodon = "https://chaos.social/@clubdiscordia" },
-    # { irc = "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb" },
-#     { medium = "https://medium.com/username" },
-#     { microsoft = "https://www.microsoft.com/" },
-#     { orcid = "https://orcid.org/userid" },
-#     { patreon = "https://www.patreon.com/username" },
-#     { pinterest = "https://pinterest.com/username" },
-#     { reddit = "https://reddit.com/user/username" },
-#     { researchgate = "https://www.researchgate.net/profile/username" },
-#     { slack = "https://workspace.url/team/userid" },
-#     { snapchat = "https://snapchat.com/add/username" },
-#     { soundcloud = "https://soundcloud.com/username" },
-#     { spotify = "https://open.spotify.com/user/userid" },
-#     { stack-overflow = "https://stackoverflow.com/users/userid/username" },
-#     { steam = "https://steamcommunity.com/profiles/userid" },
-#     { telegram = "https://t.me/username" },
-#     { threads = "https://www.threads.net/@username" },
-#     { tiktok = "https://tiktok.com/@username" },
-#     { tumblr = "https://username.tumblr.com" },
-#     { twitch = "https://twitch.tv/username" },
-#     { twitter = "https://twitter.com/username" },
-#     { x-twitter = "https://twitter.com/username" },
-#     { whatsapp = "https://wa.me/phone-number" },
-#     { youtube = "https://youtube.com/username" },
-#     { ko-fi = "https://ko-fi.com/username" },
-#     { codeberg = "https://codeberg.org/username"},
+    { forgejo = "https://git.berlin.ccc.de/explore/repos" },
+    { email = "mailto:mail2025@berlin.ccc.de" },
+    { github = "https://github.com/cccb/" },
+
   ]
diff --git a/config/_default/menus.de.toml b/config/_default/menus.de.toml
index 53f1159..c8bd31f 100644
--- a/config/_default/menus.de.toml
+++ b/config/_default/menus.de.toml
@@ -46,7 +46,7 @@
   weight = 10
 
 [[footer]]
-  name = "Categories"
+  name = "Kategorien"
   pageRef = "categories"
   weight = 20
 
@@ -56,6 +56,6 @@
  weight = 500
 
 [[footer]]
- name = "Privacy"
+ name = "Datenschutz"
  pageRef = "datenschutz"
- weight = 600
\ No newline at end of file
+ weight = 600
diff --git a/config/_default/params.toml b/config/_default/params.toml
index 38e9f23..9490cc7 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -26,8 +26,8 @@ backgroundImageWidth = 1200
 defaultFeaturedImage = "/img/avatar-CCCB-Logo.png" # used as default for featured images in all articles
 
 # highlightCurrentMenuArea = true
-# smartTOC = true
-# smartTOCHideUnfocusedChildren = true
+smartTOC = true
+smartTOCHideUnfocusedChildren = true
 
 giteaDefaultServer = "https://git.fsfe.org"
 forgejoDefaultServer = "https://v8.next.forgejo.org"
@@ -68,7 +68,7 @@ forgejoDefaultServer = "https://v8.next.forgejo.org"
   showBreadcrumbs = true
   showDraftLabel = true
   showEdit = true
-  editURL = "https://github.com/cccb/www/tree/staging/content/"
+  editURL = "https://git.berlin.ccc.de/cccb-website-team/www/src/branch/staging/content/"
   editAppendPath = true
   seriesOpened = false
   showHeadingAnchors = true
diff --git a/content/_index.md b/content/_index.md
index b4658f5..11b925a 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -6,4 +6,4 @@ description: "Startseite CCCB mit Kurzkalender"
 
 CALENDAR
 
-Keinen Termin mehr verpeilen? Einfach den [Veranstaltungskalender abonnieren](all.ics)!
+Weitere Termine findest du [hier](/verein/calendar/).
\ No newline at end of file
diff --git a/content/page/calendar.md b/content/page/calendar.md
deleted file mode 100644
index 2bc48d9..0000000
--- a/content/page/calendar.md
+++ /dev/null
@@ -1,370 +0,0 @@
----
-title: "Kalender"
-subtitle: "Der Kalender des CCCB"
-date: 2025-02-26T10:00:00+02:00
-menu:
-  main:
-    parent: "Verein"
----
-![Ein Schild im CCCB mit der Aufschrift "Closed at Night"](/img/club/42303247602_56716d8704.jpg)
-
-<!-- Kalender-Widget -->
-<style>
-  .calendar-container {
-    display: flex;
-    flex-wrap: wrap;
-    width: 100%;
-    gap: 20px;
-  }
-  #calendar {
-    flex: 1;
-    min-width: 300px;
-  }
-  #event-panel {
-    flex: 1;
-    min-width: 300px;
-    background-color: var(--color-bg-secondary);
-    padding: 15px;
-    border-radius: 5px;
-    min-height: 300px;
-    display: none;
-  }
-  #calendar-controls {
-    text-align: center;
-    margin-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  #calendar-controls button {
-    background: none;
-    border: none;
-    font-size: 2em;
-    cursor: pointer;
-    padding: 5px 15px;
-  }
-  #calendar-table {
-    width: 100%;
-    border-collapse: collapse;
-  }
-  #calendar-table th, #calendar-table td {
-    border: 1px solid var(--color-border);
-    padding: 5px;
-    text-align: center;
-    vertical-align: top;
-    height: 60px;
-    width: 14.28%;
-  }
-  #calendar-table th {
-    background-color: var(--color-bg-secondary);
-  }
-  #calendar-table td {
-    background-color: var(--color-bg-primary);
-    position: relative;
-    cursor: pointer;
-  }
-  #calendar-table td:hover {
-    background-color: var(--color-bg-hover);
-  }
-  .event-dot {
-    height: 8px;
-    width: 8px;
-    background-color: greenyellow;
-    border-radius: 50%;
-    display: block;
-    margin: 5px auto 0;
-  }
-  .has-event {
-    background-color: var(--color-bg-secondary) !important;
-  }
-  .selected-day {
-    background-color: var(--color-bg-hover) !important;
-    font-weight: bold;
-  }
-  #event-date {
-    font-size: 1.2em;
-    margin-bottom: 15px;
-  }
-  .event-item {
-    margin-bottom: 15px;
-    padding-bottom: 15px;
-    border-bottom: 1px solid var(--color-border);
-  }
-  .event-title {
-    font-weight: bold;
-    margin-bottom: 5px;
-  }
-  .event-time, .event-description {
-    font-size: 0.9em;
-    margin-bottom: 5px;
-  }
-  .no-events {
-    font-style: italic;
-    color: var(--color-text-secondary);
-  }
-</style>
-
-<div class="calendar-container">
-  <div id="calendar">
-    <div id="calendar-controls">
-      <button id="prev-month">&larr;</button>
-      <span id="current-month"></span>
-      <button id="next-month">&rarr;</button>
-    </div>
-    <table id="calendar-table">
-      <thead>
-        <tr>
-          <th>Mo</th>
-          <th>Di</th>
-          <th>Mi</th>
-          <th>Do</th>
-          <th>Fr</th>
-          <th>Sa</th>
-          <th>So</th>
-        </tr>
-      </thead>
-      <tbody id="calendar-body"></tbody>
-    </table>
-  </div>
-  <div id="event-panel">
-    <div id="event-date"></div>
-    <div id="event-details"></div>
-  </div>
-</div>
-
-<script>
-(function(){
-    let events = [];
-    let eventsByDate = {};
-
-    // Funktion zum Parsen der ICS-Datei
-    function parseICS(icsText) {
-        let events = [];
-        let lines = icsText.split(/\r?\n/);
-        let event = null;
-        lines.forEach(line => {
-            if (line.startsWith("BEGIN:VEVENT")) {
-                event = {};
-            } else if (line.startsWith("END:VEVENT")) {
-                if (event) events.push(event);
-                event = null;
-            } else if (event) {
-                let colonIndex = line.indexOf(":");
-                if (colonIndex > -1) {
-                    let key = line.substring(0, colonIndex);
-                    let value = line.substring(colonIndex + 1);
-                    if (key.startsWith("DTSTART")) {
-                        event.start = value;
-                    } else if (key.startsWith("DTEND")) {
-                        event.end = value;
-                    } else if (key.startsWith("SUMMARY")) {
-                        event.summary = value;
-                    } else if (key.startsWith("DESCRIPTION")) {
-                        event.description = value;
-                    }
-                }
-            }
-        });
-        return events;
-    }
-
-    // Hilfsfunktion: Parst einen ICS-Datum-String ins Format "YYYY-MM-DD"
-    function parseDateString(icsDateStr) {
-        // Erwartet entweder ganztägige Daten (YYYYMMDD) oder Datum+Zeit (YYYYMMDDTHHmmssZ)
-        if (icsDateStr.length === 8) {
-            let year = icsDateStr.substring(0, 4);
-            let month = icsDateStr.substring(4, 6);
-            let day = icsDateStr.substring(6, 8);
-            return `${year}-${month}-${day}`;
-        } else if (icsDateStr.length >= 15) {
-            let year = icsDateStr.substring(0, 4);
-            let month = icsDateStr.substring(4, 6);
-            let day = icsDateStr.substring(6, 8);
-            return `${year}-${month}-${day}`;
-        }
-        return null;
-    }
-
-    // Kalender initialisieren
-    let currentYear, currentMonth;
-    const currentMonthElem = document.getElementById("current-month");
-    const calendarBody = document.getElementById("calendar-body");
-    const eventPanel = document.getElementById("event-panel");
-    const eventDateElem = document.getElementById("event-date");
-    const eventDetailsElem = document.getElementById("event-details");
-
-    document.getElementById("prev-month").addEventListener("click", function(){
-         currentMonth--;
-         if (currentMonth < 0) {
-              currentMonth = 11;
-              currentYear--;
-         }
-         renderCalendar(currentYear, currentMonth);
-    });
-    document.getElementById("next-month").addEventListener("click", function(){
-         currentMonth++;
-         if (currentMonth > 11) {
-              currentMonth = 0;
-              currentYear++;
-         }
-         renderCalendar(currentYear, currentMonth);
-    });
-
-    function renderCalendar(year, month) {
-        // Setze die Monatsbeschriftung (in Deutsch)
-        const monthNames = ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"];
-        currentMonthElem.textContent = monthNames[month] + " " + year;
-        calendarBody.innerHTML = "";
-
-        let firstDay = new Date(year, month, 1);
-        let firstDayIndex = (firstDay.getDay() + 6) % 7; // Montag = 0, Dienstag = 1, etc.
-        let daysInMonth = new Date(year, month + 1, 0).getDate();
-
-        let row = document.createElement("tr");
-        // Leere Zellen vor dem 1. Tag
-        for (let i = 0; i < firstDayIndex; i++){
-            let cell = document.createElement("td");
-            row.appendChild(cell);
-        }
-
-        // Tage hinzufügen
-        for (let day = 1; day <= daysInMonth; day++){
-            if (row.children.length === 7) {
-                calendarBody.appendChild(row);
-                row = document.createElement("tr");
-            }
-            let cell = document.createElement("td");
-            cell.innerHTML = "<strong>" + day + "</strong>";
-            
-            let dayStr = day < 10 ? "0" + day : day;
-            let monthStr = (month + 1) < 10 ? "0" + (month + 1) : (month + 1);
-            let dateKey = year + "-" + monthStr + "-" + dayStr;
-            
-            if (eventsByDate[dateKey]) {
-                let eventDot = document.createElement("div");
-                eventDot.className = "event-dot";
-                cell.appendChild(document.createElement("br"));
-                cell.appendChild(eventDot);
-                
-                cell.dataset.dateKey = dateKey;
-                cell.addEventListener("click", function() {
-                    // Clear previous selections
-                    document.querySelectorAll('.selected-day').forEach(el => {
-                        el.classList.remove('selected-day');
-                    });
-                    cell.classList.add('selected-day');
-                    showEventDetails(dateKey);
-                });
-            }
-            row.appendChild(cell);
-        }
-        // Falls die letzte Zeile nicht komplett ist
-        while (row.children.length < 7) {
-            let cell = document.createElement("td");
-            row.appendChild(cell);
-        }
-        calendarBody.appendChild(row);
-    }
-
-    function createEventLink(eventTitle) {
-        if (eventTitle.startsWith("Datengarten")) {
-            // Extract the number after "Datengarten "
-            const match = eventTitle.match(/Datengarten\s+(\d+)/i);
-            if (match && match[1]) {
-                return `https://berlin.ccc.de/datengarten/${match[1]}/`;
-            }
-        } 
-        
-        // For other titles, convert to lowercase and use as path
-        const slug = eventTitle.toLowerCase().replace(/\s+/g, '-').replace(/[^\w-]/g, '');
-        return `https://berlin.ccc.de/page/${slug}/`;
-    }
-
-    function showEventDetails(dateKey) {
-        const events = eventsByDate[dateKey];
-        eventDateElem.textContent = formatDate(dateKey);
-        eventDetailsElem.innerHTML = "";
-
-        if (events && events.length > 0) {
-            events.forEach(ev => {
-                let eventItem = document.createElement("div");
-                eventItem.className = "event-item";
-
-                let eventTitle = document.createElement("div");
-                eventTitle.className = "event-title";
-                
-                // Create a link for the event title
-                let titleLink = document.createElement("a");
-                titleLink.textContent = ev.summary;
-                titleLink.href = createEventLink(ev.summary);
-                titleLink.target = "_blank";
-                eventTitle.appendChild(titleLink);
-                
-                eventItem.appendChild(eventTitle);
-
-                let eventTime = document.createElement("div");
-                eventTime.className = "event-time";
-                eventTime.textContent = `Start: ${formatTime(ev.start)}, End: ${formatTime(ev.end)}`;
-                eventItem.appendChild(eventTime);
-
-                if (ev.description) {
-                    let eventDescription = document.createElement("div");
-                    eventDescription.className = "event-description";
-                    eventDescription.textContent = ev.description;
-                    eventItem.appendChild(eventDescription);
-                }
-
-                eventDetailsElem.appendChild(eventItem);
-            });
-        } else {
-            let noEvents = document.createElement("div");
-            noEvents.className = "no-events";
-            noEvents.textContent = "Keine Veranstaltungen an diesem Tag.";
-            eventDetailsElem.appendChild(noEvents);
-        }
-
-        eventPanel.style.display = "block";
-    }
-
-    function formatDate(dateStr) {
-        // Convert YYYY-MM-DD to DD.MM.YYYY
-        const parts = dateStr.split("-");
-        return `${parts[2]}.${parts[1]}.${parts[0]}`;
-    }
-
-    function formatTime(icsTimeStr) {
-        // Format time for display
-        if (icsTimeStr.length === 8) {
-            // All-day event
-            return "Ganztägig";
-        } else if (icsTimeStr.length >= 15) {
-            // Time-specific event
-            const hour = icsTimeStr.substring(9, 11);
-            const minute = icsTimeStr.substring(11, 13);
-            return `${hour}:${minute}`;
-        }
-        return icsTimeStr;
-    }
-
-    // ICS-Datei abrufen und Events verarbeiten
-    fetch('/all.ics')
-      .then(response => response.text())
-      .then(data => {
-         events = parseICS(data);
-         events.forEach(ev => {
-             let dateKey = parseDateString(ev.start);
-             if (dateKey) {
-                if (!eventsByDate[dateKey]) {
-                    eventsByDate[dateKey] = [];
-                }
-                eventsByDate[dateKey].push(ev);
-             }
-         });
-         let today = new Date();
-         currentYear = today.getFullYear();
-         currentMonth = today.getMonth();
-         renderCalendar(currentYear, currentMonth);
-      })
-      .catch(err => console.error('Fehler beim Laden der ICS-Datei:', err));
-})();
-</script>
diff --git a/content/post/tag_des_offenen_hackerspace.md b/content/post/tag_des_offenen_hackerspace.md
index 3f165a9..b23ef1b 100644
--- a/content/post/tag_des_offenen_hackerspace.md
+++ b/content/post/tag_des_offenen_hackerspace.md
@@ -1,13 +1,31 @@
 ---
-title: "Tag Des Offenen Hackerspace"
-subtitle: "Der CCCB lädt ein zum kennenlernen und entdecken."
+title: "Tag Des Offenen Hackspace"
+subtitle: "Der CCCB lädt ein zum Kennenlernen und Entdecken."
 date: 2025-02-10T12:00:00+02:00
 dtstart:  20250329T130000
 dtend:    20250329T200000
 ---
 
-Der [Tag des offenen Hackerspace](https://events.ccc.de/2024/02/23/tag-des-offenen-hackspace-einladung/) findet dieses Jahr auch im CCCB statt.
-Es wird Führungen durch die Räume geben und Möglichkeiten zum kennenlernen und Spaß am Gerät.
+{{< figure
+    src="/img/tdoh/20250309_001608.jpg"
+    title="Das Airport Display im CCCB"
+    alt="Das Airport Display im CCCB"
+    caption="Das Airport Display im CCCB"
+>}}
 
-- Programm folgt :-)
+Der [Tag des offenen Hackspace](https://events.ccc.de/2025/02/28/tag-des-offenen-hackspace-2025/) findet dieses Jahr auch im Chaos Computer Club Berlin statt:
 
+- Führungen durch die Räume
+  - mit Hack- und Lachgeschichten
+- Kurzvorträge ab 17 Uhr u.a. zu den Themen:
+  - Der CCCB stellt sich vor!
+  - Freifunk
+  - OpenWrt
+- Spaß am Gerät mit dem Service-Point
+- Live-Schaltungen zu anderen Hackspaces
+- die Community kennenlernen
+
+Am 29.03.2025 freuen wir uns, Euch von 13 Uhr bis 20 Uhr in unseren Clubräumen begrüßen zu dürfen!
+Anfahrt: https://berlin.ccc.de/verein/anfahrt/
+
+All Creatures Welcome!
diff --git a/content/page/amateurfunk.md b/content/veranstaltungen/amateurfunk.md
similarity index 82%
rename from content/page/amateurfunk.md
rename to content/veranstaltungen/amateurfunk.md
index 9544143..c0de50e 100644
--- a/content/page/amateurfunk.md
+++ b/content/veranstaltungen/amateurfunk.md
@@ -3,7 +3,13 @@ title: "Amateurfunk"
 subtitle: "Funken und Löten im CCCB"
 date: 2018-05-17T22:41:48+02:00
 ---
-![Logo der Chaoswelle](/img/chaoswelle.png "Logo der Chaoswelle")
+
+{{< figure
+    src="/img/chaoswelle.png"
+    title="Logo der Chaoswelle"
+    alt="Logo der Chaoswelle"
+    caption="Logo der Chaoswelle"
+>}}
 
 Vor einiger Zeit fanden gelegentlich Amateurfunkkurse im CCCB statt. Im Zusammenhang damit trafen sich Funkamateure und Interessierte rund um drahtlose Kommunikation auch an den offenen Abenden. Das Treffen war Nahe zur [Interessensgemeinschaft
 Chaoswelle](http://chaoswelle.de), die sich im DARC e.V. Ortsverband D23
diff --git a/content/page/bastelabend.md b/content/veranstaltungen/bastelabend.md
similarity index 61%
rename from content/page/bastelabend.md
rename to content/veranstaltungen/bastelabend.md
index 29e4f08..e288c08 100644
--- a/content/page/bastelabend.md
+++ b/content/veranstaltungen/bastelabend.md
@@ -10,7 +10,21 @@ menu:
     parent: "Veranstaltungen"
 ---
 
-![Lötkolben im CCCB](/img/club/27481933907_f240f4232d.jpg)  
+
+{{< figure
+    src="/img/club/27481933907_f240f4232d.jpg"
+    title="Lötkolben im CCCB"
+    alt="Lötkolben im CCCB"
+    caption="Lötkolben im CCCB"
+>}}
+
 
 **Jeden 1. und 3. Samstag im Monat ist ab 17 Uhr Bastelabend im Club.**
-Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen. Generell sind aber alle herzlich eingeladen, an den Spieleabenden vorbeizukommen.
\ No newline at end of file
+
+
+
+{{< alert "circle-info" >}}
+Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen.
+
+Generell sind aber alle, die schonmal im Club waren, herzlich eingeladen, an den Bastelabenden vorbeizukommen.
+{{< /alert >}}
\ No newline at end of file
diff --git a/content/page/chaosradio.md b/content/veranstaltungen/chaosradio.md
similarity index 86%
rename from content/page/chaosradio.md
rename to content/veranstaltungen/chaosradio.md
index 30a1c71..56a6535 100644
--- a/content/page/chaosradio.md
+++ b/content/veranstaltungen/chaosradio.md
@@ -11,7 +11,12 @@ menu:
     parent: "Veranstaltungen"
 ---
 
-![Chaosradio logo](/img/chaosradio.png)
+{{< figure
+    src="/img/chaosradio.png"
+    title="Chaosradio logo"
+    alt="Chaosradio logo"
+    caption="Chaosradio logo"
+>}}
 
 [Chaosradio](https://chaosradio.ccc.de) ist der Podcast des CCCB. Seit 2020 zeichen
 wir ihn remote auf. Gelegentlich finden Sendungen vor Live-Publikum im Club, auf
diff --git a/content/page/clubdiscordia.md b/content/veranstaltungen/clubdiscordia.md
similarity index 93%
rename from content/page/clubdiscordia.md
rename to content/veranstaltungen/clubdiscordia.md
index 6192413..55b81e4 100644
--- a/content/page/clubdiscordia.md
+++ b/content/veranstaltungen/clubdiscordia.md
@@ -12,7 +12,13 @@ menu:
     parent: "Veranstaltungen"
 ---
 
-![Kochen in der CCCB Küche](/img/club/Kochen_in_der_CCCB_Küche.jpg)
+{{< figure
+    src="/img/club/e-lab-kisten.jpg"
+    title="Das E-Lab im CCCB"
+    alt="Das E-Lab im CCCB"
+    caption="Das E-Lab im CCCB"
+>}}
+
 
 Der **Club Discordia** ist ein öffentliches Treffen in den Clubräumen des CCC Berlin. Jeder, der Lust hat, ist eingeladen, **Donnerstags so ab ca. 19 Uhr bis 24 Uhr** vorbeizukommen. Wer will, kann seinen Computer mitbringen und sollte das auch tun, sonst ist es langweilig wenn die Nerds erstmal nicht mit einem reden oder wenig los ist.
 
diff --git a/content/page/cms.md b/content/veranstaltungen/cms.md
similarity index 98%
rename from content/page/cms.md
rename to content/veranstaltungen/cms.md
index f2256d1..56686b9 100644
--- a/content/page/cms.md
+++ b/content/veranstaltungen/cms.md
@@ -10,7 +10,12 @@ menu:
     parent: "Veranstaltungen"
 ---
 
-![Chaos Macht Schule Logo](/img/cms-logo.jpg "Chaos Macht Schule Logo")
+{{< figure
+    src="/img/cms-logo.jpg"
+    title="Chaos Macht Schule Logo"
+    alt="Chaos Macht Schule Logo"
+    caption="Chaos Macht Schule Logo"
+>}}
 
 Unter dem Begriff “Chaos macht Schule” finden sich mehrere regionale
 Projekte diverser ERFA-Kreise des CCC. Bestärkt in der bisherigen
diff --git a/content/page/datengarten.md b/content/veranstaltungen/datengarten.md
similarity index 100%
rename from content/page/datengarten.md
rename to content/veranstaltungen/datengarten.md
diff --git a/content/page/mitgliedschaft-infos.md b/content/veranstaltungen/mitgliedschaft-infos.md
similarity index 100%
rename from content/page/mitgliedschaft-infos.md
rename to content/veranstaltungen/mitgliedschaft-infos.md
diff --git a/content/page/openwrt.md b/content/veranstaltungen/openwrt.md
similarity index 100%
rename from content/page/openwrt.md
rename to content/veranstaltungen/openwrt.md
diff --git a/content/page/plenum.md b/content/veranstaltungen/plenum.md
similarity index 91%
rename from content/page/plenum.md
rename to content/veranstaltungen/plenum.md
index 41a1472..8a0d364 100644
--- a/content/page/plenum.md
+++ b/content/veranstaltungen/plenum.md
@@ -1,5 +1,5 @@
 ---
-title: "Plenum (club closed, members only)"
+title: "Plenum (club closed - members only)"
 subtitle: "Instrument der internen Konsensfindung"
 date: 2018-05-18T01:11:54+02:00
 dtstart: 20180704T200000
diff --git a/content/page/spieleabend.md b/content/veranstaltungen/spieleabend.md
similarity index 77%
rename from content/page/spieleabend.md
rename to content/veranstaltungen/spieleabend.md
index 09db203..2a9c6eb 100644
--- a/content/page/spieleabend.md
+++ b/content/veranstaltungen/spieleabend.md
@@ -13,4 +13,9 @@ menu:
 ![Dorfromantik spielen im CCCB](/img/club/dorfromantik-im-cccb.jpg)  
 
 **Jeden 2. und 4. Samstag im Monat ist ab 17 Uhr Spieleabend im Club.**
-Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen. Generell sind aber alle herzlich eingeladen, an den Bastelabenden vorbeizukommen.
\ No newline at end of file
+
+{{< alert "circle-info" >}}
+Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen.
+
+Generell sind aber alle, die schonmal im Club waren, herzlich eingeladen, an den Spieleabenden vorbeizukommen.
+{{< /alert >}}
\ No newline at end of file
diff --git a/content/page/subbotnik.md b/content/veranstaltungen/subbotnik.md
similarity index 84%
rename from content/page/subbotnik.md
rename to content/veranstaltungen/subbotnik.md
index 648de2f..f527cd1 100644
--- a/content/page/subbotnik.md
+++ b/content/veranstaltungen/subbotnik.md
@@ -18,4 +18,11 @@ Ungefähr jedes viertel Jahr wird im CCCB von den Mitgliedern einmal richtig dur
 
 Der Begriff [Subbotnik](https://de.wikipedia.org/wiki/Subbotnik) ist eine in Sowjetrussland entstandene Bezeichnung für einen unbezahlten Arbeitseinsatz am Sonnabend, der in den Sprachgebrauch in der DDR und daraufhin auch in den Sprachgebrauch der CCCB-Mitglieder übernommen wurde.
 
-Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen. Generell sind aber alle herzlich eingeladen, am Subbotnik vorbeizukommen und mitzuhelfen.
\ No newline at end of file
+---
+
+{{< alert "circle-info" >}}
+Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen.
+
+Generell sind aber alle, die schonmal im Club waren, herzlich eingeladen am Subbotnik vorbeizukommen und mitzuhelfen.
+{{< /alert >}}
+
diff --git a/content/page/anfahrt.md b/content/verein/anfahrt.md
similarity index 100%
rename from content/page/anfahrt.md
rename to content/verein/anfahrt.md
diff --git a/content/verein/calendar.md b/content/verein/calendar.md
new file mode 100644
index 0000000..c429f35
--- /dev/null
+++ b/content/verein/calendar.md
@@ -0,0 +1,603 @@
+---
+title: "Kalender"
+subtitle: "Der Kalender des CCCB"
+date: 2025-02-26T10:00:00+02:00
+menu:
+  main:
+    parent: "Verein"
+---
+![Ein Schild im CCCB mit der Aufschrift "Closed at Night"](/img/club/42303247602_56716d8704.jpg)
+
+<!-- Kalender-Widget -->
+<style>
+  .calendar-container {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+    gap: 20px;
+  }
+  #calendar {
+    flex: 1;
+    min-width: 300px;
+  }
+  #event-panel {
+    flex: 1;
+    min-width: 30%;
+    background-color: var(--color-bg-secondary);
+    padding: 15px;
+    border-radius: 5px;
+    min-height: 300px;
+    display: none;
+  }
+  #calendar-controls {
+    text-align: center;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  #calendar-controls button {
+    background: none;
+    border: none;
+    font-size: 2em;
+    cursor: pointer;
+    padding: 5px 15px;
+  }
+  #calendar-table {
+    width: 100%;
+    border-collapse: collapse;
+  }
+  #calendar-table th, #calendar-table td {
+    border: 1px;
+    padding: 5px;
+    text-align: center;
+    vertical-align: top;
+    height: 50px;
+    width: 15%;
+  }
+  #calendar-table th
+  #calendar-table td {
+    position: relative;
+    cursor: pointer;
+  }
+  #calendar-table td:hover {
+    background-color: rgba(255, 255, 255, 0.2);
+    box-shadow: 0 0 20px rgba(255, 255, 255, 0.2);
+  }
+  .event-dot-greenyellow {
+    height: 8px;
+    width: 8px;
+    background-color: #9acd32;
+    border-radius: 50%;
+    display: block;
+    margin: 5px auto 0;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
+  }
+  .event-dot-orange {
+    height: 8px;
+    width: 8px;
+    background-color: #ffa500;
+    border-radius: 50%;
+    display: block;
+    margin: 5px auto 0;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
+  }
+  .event-dot-red {
+    height: 8px;
+    width: 8px;
+    background-color: #ff4500;
+    border-radius: 50%;
+    display: block;
+    margin: 5px auto 0;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
+  }
+  .has-event {
+    
+  }
+  .selected-day {
+    background-color: rgba(255, 255, 255, 0.1);
+    box-shadow: 0 0 20px rgba(255, 255, 255, 0.1);
+    border-radius: 8px;
+    width: 20px;
+    height: 20px;
+    border: 5px solid grey;
+    font-weight: lighter;
+    position: relative;
+    z-index: 1;
+  }
+  #event-date {
+    font-size: 1.2em;
+    margin-bottom: 15px;
+  }
+  .event-item {
+    margin-bottom: 15px;
+    padding-bottom: 15px;
+    border-bottom: 1px solid var(--color-border);
+  }
+  .event-title {
+    font-weight: bold;
+    margin-bottom: 5px;
+  }
+  .event-time, .event-description {
+    font-size: 0.9em;
+    margin-bottom: 5px;
+  }
+  .no-events {
+    font-style: italic;
+    color: var(--color-text-secondary);
+  }
+</style>
+
+<div class="calendar-container">
+  <div id="calendar">
+    <div id="calendar-controls">
+      <button id="prev-month">&larr;</button>
+      <span id="current-month"></span>
+      <button id="next-month">&rarr;</button>
+    </div>
+    <table id="calendar-table">
+      <thead>
+        <tr>
+          <th>Mo</th>
+          <th>Di</th>
+          <th>Mi</th>
+          <th>Do</th>
+          <th>Fr</th>
+          <th>Sa</th>
+          <th>So</th>
+        </tr>
+      </thead>
+      <tbody id="calendar-body"></tbody>
+    </table>
+  </div>
+  <div id="event-panel">
+    <div id="event-date"></div>
+    <div id="event-details"></div>
+  </div>
+</div>
+
+<script>
+(function(){
+    let events = [];
+    let eventsByDate = {};
+
+    // Funktion zum Parsen der ICS-Datei
+    function parseICS(icsText) {
+        let events = [];
+        let lines = icsText.split(/\r?\n/);
+        let event = null;
+        lines.forEach(line => {
+            if (line.startsWith("BEGIN:VEVENT")) {
+                event = {};
+            } else if (line.startsWith("END:VEVENT")) {
+                if (event) events.push(event);
+                event = null;
+            } else if (event) {
+                let colonIndex = line.indexOf(":");
+                if (colonIndex > -1) {
+                    let key = line.substring(0, colonIndex);
+                    let value = line.substring(colonIndex + 1);
+                    
+                    // Handle properties with parameters (like TZID)
+                    const baseKey = key.split(";")[0];
+                    
+                    if (baseKey === "DTSTART") {
+                        event.start = value;
+                        event.startParams = key.includes(";") ? key.substring(key.indexOf(";") + 1) : null;
+                    } else if (baseKey === "DTEND") {
+                        event.end = value;
+                        event.endParams = key.includes(";") ? key.substring(key.indexOf(";") + 1) : null;
+                    } else if (baseKey === "SUMMARY") {
+                        event.summary = value;
+                    } else if (baseKey === "DESCRIPTION") {
+                        event.description = value;
+                    } else if (baseKey === "RRULE") {
+                        event.rrule = value;
+                    }
+                }
+            }
+        });
+        return events;
+    }
+
+    // Hilfsfunktion: Parst einen ICS-Datum-String ins Format "YYYY-MM-DD"
+    function parseDateString(icsDateStr) {
+        // Handle different date formats
+        if (!icsDateStr) return null;
+        
+        // For basic date format: YYYYMMDD
+        if (icsDateStr.length === 8) {
+            let year = icsDateStr.substring(0, 4);
+            let month = icsDateStr.substring(4, 6);
+            let day = icsDateStr.substring(6, 8);
+            return `${year}-${month}-${day}`;
+        } 
+        // For datetime formats: YYYYMMDDTHHmmssZ or YYYYMMDDTHHmmss
+        else if (icsDateStr.includes("T")) {
+            let year = icsDateStr.substring(0, 4);
+            let month = icsDateStr.substring(4, 6);
+            let day = icsDateStr.substring(6, 8);
+            return `${year}-${month}-${day}`;
+        }
+        return null;
+    }
+
+    // Extract date components from different date formats
+    function getDateComponents(icsDateStr) {
+        if (!icsDateStr) return null;
+        
+        // Basic handling - extract YYYY, MM, DD regardless of format
+        const year = parseInt(icsDateStr.substring(0, 4));
+        const month = parseInt(icsDateStr.substring(4, 6)) - 1; // 0-based months
+        const day = parseInt(icsDateStr.substring(6, 8));
+        
+        return { year, month, day };
+    }
+
+    function expandRecurringEvents(event, year, month) {
+        if (!event.rrule) return [event];
+        
+        const rruleStr = event.rrule;
+        
+        // Get start date components
+        const startComponents = getDateComponents(event.start);
+        if (!startComponents) return [event];
+        
+        const startDate = new Date(
+            startComponents.year,
+            startComponents.month,
+            startComponents.day
+        );
+        
+        const rangeStart = new Date(year, month, 1);
+        const rangeEnd = new Date(year, month + 1, 0);
+        const expandedEvents = [];
+        
+        if (rruleStr.includes("FREQ=WEEKLY") && rruleStr.includes("BYDAY")) {
+            const bydayMatch = rruleStr.match(/BYDAY=([^;]+)/);
+            if (bydayMatch) {
+                const dayCode = bydayMatch[1];
+                const dayMap = {
+                    'MO': 1, 'TU': 2, 'WE': 3, 'TH': 4, 'FR': 5, 'SA': 6, 'SU': 0
+                };
+                const targetDay = dayMap[dayCode];
+                
+                if (targetDay !== undefined) {
+                    // Create events for each matching day in the month
+                    let day = 1;
+                    while (day <= rangeEnd.getDate()) {
+                        const testDate = new Date(year, month, day);
+                        if (testDate.getDay() === targetDay && testDate >= startDate) {
+                            const newEvent = {...event};
+                            const eventDate = formatDateForICS(testDate);
+                            
+                            // Preserve time portion from original event
+                            const timePart = event.start.includes('T') ? 
+                                event.start.substring(event.start.indexOf('T')) : '';
+                            const endTimePart = event.end.includes('T') ? 
+                                event.end.substring(event.end.indexOf('T')) : '';
+                            
+                            newEvent.start = eventDate + timePart;
+                            newEvent.end = eventDate + endTimePart;
+                            expandedEvents.push(newEvent);
+                        }
+                        day++;
+                    }
+                }
+            }
+        }
+        else if (rruleStr.includes("FREQ=MONTHLY") && rruleStr.includes("BYDAY")) {
+            const bydayMatch = rruleStr.match(/BYDAY=([^;]+)/);
+            if (bydayMatch) {
+                const bydays = bydayMatch[1].split(',');
+                const dayMap = {
+                    'MO': 1, 'TU': 2, 'WE': 3, 'TH': 4, 'FR': 5, 'SA': 6, 'SU': 0
+                };
+                
+                bydays.forEach(byday => {
+                    const occurrence = parseInt(byday) || 1;
+                    const dayCode = byday.slice(-2);
+                    const dayIndex = dayMap[dayCode];
+                    
+                    let day = 1;
+                    let count = 0;
+                    
+                    while (day <= rangeEnd.getDate()) {
+                        const testDate = new Date(year, month, day);
+                        if (testDate.getDay() === dayIndex) {
+                            count++;
+                            if (count === occurrence || (occurrence < 0 && day > rangeEnd.getDate() + occurrence * 7)) {
+                                const newEvent = {...event};
+                                const eventDate = new Date(year, month, day);
+                                
+                                // Preserve time portion from original event
+                                const timePart = event.start.includes('T') ? 
+                                    event.start.substring(event.start.indexOf('T')) : '';
+                                const endTimePart = event.end.includes('T') ? 
+                                    event.end.substring(event.end.indexOf('T')) : '';
+                                
+                                newEvent.start = formatDateForICS(eventDate) + timePart;
+                                newEvent.end = formatDateForICS(eventDate) + endTimePart;
+                                expandedEvents.push(newEvent);
+                            }
+                        }
+                        day++;
+                    }
+                });
+            }
+        }
+        
+        return expandedEvents.length > 0 ? expandedEvents : [event];
+    }
+
+    // Kalender initialisieren
+    let currentYear, currentMonth;
+    const currentMonthElem = document.getElementById("current-month");
+    const calendarBody = document.getElementById("calendar-body");
+    const eventPanel = document.getElementById("event-panel");
+    const eventDateElem = document.getElementById("event-date");
+    const eventDetailsElem = document.getElementById("event-details");
+
+    document.getElementById("prev-month").addEventListener("click", function(){
+         currentMonth--;
+         if (currentMonth < 0) {
+              currentMonth = 11;
+              currentYear--;
+         }
+         updateEventsForMonth(currentYear, currentMonth);
+    });
+    document.getElementById("next-month").addEventListener("click", function(){
+         currentMonth++;
+         if (currentMonth > 11) {
+          currentMonth = 0;
+          currentYear++;
+         }
+         updateEventsForMonth(currentYear, currentMonth);
+    });
+
+    function updateEventsForMonth(year, month) {
+        // Clear existing events for this month view
+        eventsByDate = {};
+        
+        // Process each event, expanding recurring ones
+        events.forEach(ev => {
+            if (ev.rrule) {
+                // For recurring events, expand them for current month
+                const expandedEvents = expandRecurringEvents(ev, year, month);
+                expandedEvents.forEach(expandedEv => {
+                    let dateKey = parseDateString(expandedEv.start);
+                    if (dateKey) {
+                        if (!eventsByDate[dateKey]) {
+                            eventsByDate[dateKey] = [];
+                        }
+                        eventsByDate[dateKey].push(expandedEv);
+                    }
+                });
+            } else {
+                // For regular events, check if they fall in current month
+                let dateKey = parseDateString(ev.start);
+                if (dateKey) {
+                    // Check if this event belongs to current month view
+                    const eventYear = parseInt(dateKey.split('-')[0]);
+                    const eventMonth = parseInt(dateKey.split('-')[1]) - 1;
+                    
+                    if (eventYear === year && eventMonth === month) {
+                        if (!eventsByDate[dateKey]) {
+                            eventsByDate[dateKey] = [];
+                        }
+                        eventsByDate[dateKey].push(ev);
+                    }
+                }
+            }
+        });
+        
+        renderCalendar(year, month);
+    }
+
+    function renderCalendar(year, month) {
+        // Setze die Monatsbeschriftung (in Deutsch)
+        const monthNames = ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"];
+        currentMonthElem.textContent = monthNames[month] + " " + year;
+        calendarBody.innerHTML = "";
+
+        let firstDay = new Date(year, month, 1);
+        let firstDayIndex = (firstDay.getDay() + 6) % 7; // Montag = 0, Dienstag = 1, etc.
+        let daysInMonth = new Date(year, month + 1, 0).getDate();
+
+        let row = document.createElement("tr");
+        // Leere Zellen vor dem 1. Tag
+        for (let i = 0; i < firstDayIndex; i++){
+            let cell = document.createElement("td");
+            row.appendChild(cell);
+        }
+
+        // Tage hinzufügen
+        for (let day = 1; day <= daysInMonth; day++){
+            if (row.children.length === 7) {
+                calendarBody.appendChild(row);
+                row = document.createElement("tr");
+            }
+            let cell = document.createElement("td");
+            cell.innerHTML = "<strong>" + day + "</strong>";
+            
+            let dayStr = day < 10 ? "0" + day : day;
+            let monthStr = (month + 1) < 10 ? "0" + (month + 1) : (month + 1);
+            let dateKey = year + "-" + monthStr + "-" + dayStr;
+            
+            if (eventsByDate[dateKey]) {
+                let dotsContainer = document.createElement("div");
+                dotsContainer.className = "event-dots-container";
+                cell.classList.add("has-event");
+                
+                // Gruppe Events nach Typ
+                const events = eventsByDate[dateKey];
+                const hasMembersOnly = events.some(e => e.summary.toLowerCase().includes("members only"));
+                const hasSubbotnik = events.some(e => e.summary.toLowerCase().includes("subbotnik"));
+                const hasBastelabend = events.some(e => e.summary.toLowerCase().includes("bastelabend"));
+                const hasSpieleabend = events.some(e => e.summary.toLowerCase().includes("spieleabend"));
+                const hasRegular = events.some(e => {
+                    const title = e.summary.toLowerCase();
+                    return !title.includes("members only") && 
+                          !title.includes("subbotnik") && 
+                          !title.includes("bastelabend") && 
+                          !title.includes("spieleabend");
+                });
+                
+                // Füge Dots entsprechend der Event-Typen hinzu
+                if (hasMembersOnly) {
+                    let dot = document.createElement("div");
+                    dot.className = "event-dot event-dot-red";
+                    dotsContainer.appendChild(dot);
+                }
+                if (hasSubbotnik || hasBastelabend || hasSpieleabend) {
+                    let dot = document.createElement("div");
+                    dot.className = "event-dot event-dot-orange";
+                    dotsContainer.appendChild(dot);
+                }
+                if (hasRegular) {
+                    let dot = document.createElement("div");
+                    dot.className = "event-dot event-dot-greenyellow";
+                    dotsContainer.appendChild(dot);
+                }
+                
+                cell.appendChild(dotsContainer);
+                cell.dataset.dateKey = dateKey;
+                cell.addEventListener("click", function() {
+                    // Clear previous selections
+                    document.querySelectorAll('.selected-day').forEach(el => {
+                        el.classList.remove('selected-day');
+                    });
+                    cell.classList.add('selected-day');
+                    showEventDetails(dateKey);
+                });
+            }
+            row.appendChild(cell);
+        }
+        // Falls die letzte Zeile nicht komplett ist
+        while (row.children.length < 7) {
+            let cell = document.createElement("td");
+            row.appendChild(cell);
+        }
+        calendarBody.appendChild(row);
+    }
+
+    function createEventLink(eventTitle) {
+        if (eventTitle.startsWith("Datengarten")) {
+            // Extract the number after "Datengarten "
+            const match = eventTitle.match(/Datengarten\s+(\d+)/i);
+            if (match && match[1]) {
+                return `https://berlin.ccc.de/datengarten/${match[1]}/`;
+            }
+        } 
+        
+        // For other titles, convert to lowercase and use as path
+        const slug = eventTitle.toLowerCase().replace(/\s+/g, '-').replace(/[^\w-]/g, '');
+        return `https://berlin.ccc.de/page/${slug}/`;
+    }
+
+    function showEventDetails(dateKey) {
+        const events = eventsByDate[dateKey];
+        eventDateElem.textContent = formatDate(dateKey);
+        eventDetailsElem.innerHTML = "";
+
+        if (events && events.length > 0) {
+            events.forEach(ev => {
+                let eventItem = document.createElement("div");
+                eventItem.className = "event-item";
+
+                let eventTitle = document.createElement("div");
+                eventTitle.className = "event-title";
+                
+                // Create a link for the event title
+                let titleLink = document.createElement("h");
+                titleLink.textContent = ev.summary;
+                titleLink.target = "_blank";
+                eventTitle.appendChild(titleLink);
+                
+                eventItem.appendChild(eventTitle);
+
+                let eventTime = document.createElement("div");
+                eventTime.className = "event-time";
+                eventTime.textContent = `Start: ${formatTime(ev.start)}, End: ${formatTime(ev.end)}`;
+                eventItem.appendChild(eventTime);
+
+                        if (ev.description) {
+                          let eventDescription = document.createElement("div");
+                          eventDescription.className = "event-description";
+                          
+                          // Check if the description is a URL and make it a clickable link
+                          if (ev.description.trim().startsWith('http')) {
+                            let linkElement = document.createElement("a");
+                            linkElement.href = ev.description.trim();
+                            linkElement.textContent = ev.description.trim();
+                            linkElement.target = "_blank";
+                            eventDescription.innerHTML = '';
+                            eventDescription.appendChild(linkElement);
+                          } else {
+                            eventDescription.textContent = ev.description;
+                          }
+                          
+                          eventItem.appendChild(eventDescription);
+                        }
+
+                          eventDetailsElem.appendChild(eventItem);
+            });
+        } else {
+            let noEvents = document.createElement("div");
+            noEvents.className = "no-events";
+            noEvents.textContent = "Keine Veranstaltungen an diesem Tag.";
+            eventDetailsElem.appendChild(noEvents);
+        }
+
+        eventPanel.style.display = "block";
+    }
+
+    function formatDate(dateStr) {
+        // Convert YYYY-MM-DD to DD.MM.YYYY
+        const parts = dateStr.split("-");
+        return `${parts[2]}.${parts[1]}.${parts[0]}`;
+    }
+
+    function formatTime(icsTimeStr) {
+        // Format time for display
+        if (!icsTimeStr) return "";
+        
+        if (icsTimeStr.length === 8) {
+            // All-day event
+            return "Ganztägig";
+        } else if (icsTimeStr.includes("T")) {
+            // Time-specific event (with or without timezone)
+            const timeStart = icsTimeStr.indexOf("T") + 1;
+            const hour = icsTimeStr.substring(timeStart, timeStart + 2);
+            const minute = icsTimeStr.substring(timeStart + 2, timeStart + 4);
+            return `${hour}:${minute}`;
+        }
+        return icsTimeStr;
+    }
+
+    function formatDateForICS(date) {
+        const year = date.getFullYear();
+        const month = (date.getMonth() + 1).toString().padStart(2, '0');
+        const day = date.getDate().toString().padStart(2, '0');
+        return `${year}${month}${day}`;
+    }
+
+    // ICS-Datei abrufen und Events verarbeiten
+    fetch('/all.ics')
+      .then(response => response.text())
+      .then(data => {
+         events = parseICS(data);
+         
+         // Initialize with current date
+         let today = new Date();
+         currentYear = today.getFullYear();
+         currentMonth = today.getMonth();
+         
+         // Process events for current month
+         updateEventsForMonth(currentYear, currentMonth);
+      })
+      .catch(err => console.error('Fehler beim Laden der ICS-Datei:', err));
+})();
+</script>
+
+Keinen Termin mehr verpeilen? Einfach den [Veranstaltungskalender abonnieren](all.ics)!
\ No newline at end of file
diff --git a/content/page/fotos.md b/content/verein/fotos.md
similarity index 100%
rename from content/page/fotos.md
rename to content/verein/fotos.md
diff --git a/content/page/mastodon.md b/content/verein/mastodon.md
similarity index 100%
rename from content/page/mastodon.md
rename to content/verein/mastodon.md
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..6cc6b35
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1741332913,
+        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..73e94d9
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,41 @@
+{
+  description = "A flake containing a development environment for the CCCB website.";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+  };
+
+  outputs =
+    { self, nixpkgs }:
+    let
+      forAllSystems =
+        f:
+        nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (
+          system:
+          f rec {
+            pkgs = nixpkgs.legacyPackages.${system};
+            inherit system;
+          }
+        );
+    in
+    {
+      devShells = forAllSystems (
+        { pkgs, ... }:
+        {
+          default = pkgs.mkShell rec {
+            packages = with pkgs; [
+              hugo
+              go
+              (pkgs.python3.withPackages (python-pkgs: [
+                python-pkgs.icalendar
+                python-pkgs.pytz
+              ]))
+              shellcheck
+            ];
+          };
+        }
+      );
+
+      formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
+    };
+}
diff --git a/static/img/club/Kochen_in_der_CCCB_Küche.jpg b/static/img/club/Kochen_in_der_CCCB_Küche.jpg
deleted file mode 100644
index 31bb484..0000000
Binary files a/static/img/club/Kochen_in_der_CCCB_Küche.jpg and /dev/null differ
diff --git a/static/img/club/e-lab-kisten.jpg b/static/img/club/e-lab-kisten.jpg
new file mode 100644
index 0000000..6705505
Binary files /dev/null and b/static/img/club/e-lab-kisten.jpg differ
diff --git a/static/img/tdoh/20250309_001608.jpg b/static/img/tdoh/20250309_001608.jpg
new file mode 100644
index 0000000..846b3a9
Binary files /dev/null and b/static/img/tdoh/20250309_001608.jpg differ