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/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/page/amateurfunk.md b/content/veranstaltungen/amateurfunk.md
similarity index 100%
rename from content/page/amateurfunk.md
rename to content/veranstaltungen/amateurfunk.md
diff --git a/content/page/bastelabend.md b/content/veranstaltungen/bastelabend.md
similarity index 100%
rename from content/page/bastelabend.md
rename to content/veranstaltungen/bastelabend.md
diff --git a/content/page/chaosradio.md b/content/veranstaltungen/chaosradio.md
similarity index 100%
rename from content/page/chaosradio.md
rename to content/veranstaltungen/chaosradio.md
diff --git a/content/page/clubdiscordia.md b/content/veranstaltungen/clubdiscordia.md
similarity index 96%
rename from content/page/clubdiscordia.md
rename to content/veranstaltungen/clubdiscordia.md
index 6192413..4217595 100644
--- a/content/page/clubdiscordia.md
+++ b/content/veranstaltungen/clubdiscordia.md
@@ -12,7 +12,7 @@ menu:
     parent: "Veranstaltungen"
 ---
 
-![Kochen in der CCCB Küche](/img/club/Kochen_in_der_CCCB_Küche.jpg)
+![E-Lab im CCCB](/img/club/e-lab-kisten.jpg)
 
 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 100%
rename from content/page/cms.md
rename to content/veranstaltungen/cms.md
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 100%
rename from content/page/plenum.md
rename to content/veranstaltungen/plenum.md
diff --git a/content/page/spieleabend.md b/content/veranstaltungen/spieleabend.md
similarity index 100%
rename from content/page/spieleabend.md
rename to content/veranstaltungen/spieleabend.md
diff --git a/content/page/subbotnik.md b/content/veranstaltungen/subbotnik.md
similarity index 100%
rename from content/page/subbotnik.md
rename to content/veranstaltungen/subbotnik.md
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/page/calendar.md b/content/verein/calendar.md
similarity index 100%
rename from content/page/calendar.md
rename to content/verein/calendar.md
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/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/40544370280_1703903e06.jpg b/static/img/club/e-lab-kisten.jpg
similarity index 100%
rename from static/img/club/40544370280_1703903e06.jpg
rename to static/img/club/e-lab-kisten.jpg