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