diff --git a/assets/foundations/aktionmensch.png b/assets/foundations/aktionmensch.png
deleted file mode 100644
index efd32c1..0000000
Binary files a/assets/foundations/aktionmensch.png and /dev/null differ
diff --git a/assets/foundations/brentrup.jpg b/assets/foundations/brentrup.jpg
deleted file mode 100644
index 5fc5204..0000000
Binary files a/assets/foundations/brentrup.jpg and /dev/null differ
diff --git a/assets/foundations/jusos.jpg b/assets/foundations/jusos.jpg
new file mode 100644
index 0000000..2c358ca
Binary files /dev/null and b/assets/foundations/jusos.jpg differ
diff --git a/config/_default/params.toml b/config/_default/params.toml
index d0cfcde..7a57a66 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -42,4 +42,4 @@ placeholder = "/images/no_article_pic.png"
     nonprofit = true
 
 [foundations]
-    brentrup = "https://heise.de"
+    jusos = "https://jusos.de/"
diff --git a/content/archive/_index.de.md b/content/archive.de.md
similarity index 100%
rename from content/archive/_index.de.md
rename to content/archive.de.md
diff --git a/content/contact/_index.de.md b/content/contact.de.md
similarity index 100%
rename from content/contact/_index.de.md
rename to content/contact.de.md
diff --git a/content/contact/kontakt_anfahrt.png b/content/contact/kontakt_anfahrt.png
deleted file mode 100644
index b8584d0..0000000
Binary files a/content/contact/kontakt_anfahrt.png and /dev/null differ
diff --git a/content/imprint/_index.de.md b/content/imprint.de.md
similarity index 100%
rename from content/imprint/_index.de.md
rename to content/imprint.de.md
diff --git a/content/links.de.md b/content/links.de.md
new file mode 100644
index 0000000..4e9bebc
--- /dev/null
+++ b/content/links.de.md
@@ -0,0 +1,9 @@
+---
+title: "Links"
+layout: "links"
+---
+http://list-celle.over-blog.com/  
+Gruppe LiST: Land in Sicht - Transition Celle
+
+https://rheinmetallentwaffnen.noblogs.org/  
+Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß
diff --git a/content/links/_index.de.md b/content/links/_index.de.md
deleted file mode 100644
index 23bcfd8..0000000
--- a/content/links/_index.de.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Links"
-layout: "links"
----
diff --git a/content/links/list.md b/content/links/list.md
deleted file mode 100644
index 4fbb592..0000000
--- a/content/links/list.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Gruppe LiST: Land in Sicht - Transition Celle"
-link: "http://list-celle.over-blog.com/"
----
diff --git a/content/links/rheinmetall.md b/content/links/rheinmetall.md
deleted file mode 100644
index 06658ee..0000000
--- a/content/links/rheinmetall.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Aktionstage, Camp & Demonstration “Rheinmetall entwaffnen” in Unterlüß"
-link: "https://rheinmetallentwaffnen.noblogs.org/"
----
diff --git a/content/media/nabu_vdj2018_broschuere.pdf b/content/media/nabu_vdj2018_broschuere.pdf
new file mode 100644
index 0000000..0e2c342
Binary files /dev/null and b/content/media/nabu_vdj2018_broschuere.pdf differ
diff --git a/content/media/pwd b/content/media/pwd
new file mode 100755
index 0000000..25b83ee
Binary files /dev/null and b/content/media/pwd differ
diff --git a/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md b/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md
index f89752a..7016380 100644
--- a/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md
+++ b/content/news/2002-02-20-Informationsveranstaltung-PKK-Verbot/index.de.md
@@ -4,5 +4,5 @@ lastmod: 2002-02-20T14:00:00+02:00
 when: "20.02.,2002, 19:00 Uhr"
 tags: ["Antifa","Informationsveranstaltungen","PKK Verbot","Antifa Celle","Kurdistan","Kurdistan Solidarität Uelzen","AZADI","Repression","Kazim E","Manfred Kanther","Bundesinnenministerium","OLG Celle","Oberlandesgericht","Kurden","Türkei"]
 price: "free"
-contact: "kurd-soli-uelzen@gmx.net"
+contact_mail: "kurd-soli-uelzen@gmx.net"
 ---
diff --git a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md
index 4a77eff..fb98f22 100644
--- a/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md
+++ b/content/news/2022-04-04-Konzert-Katzengejammer/index.de.md
@@ -4,7 +4,7 @@ date: "2022-04-04T23:16:00+02:00"
 when: "Montag, 04.04.2022, 23.23 Uhr"
 events: ["Konzerte"]
 price: "free"
-foundations: ["brentrup","aktionmensch"]
+foundations: ["rote_hilfe"]
 covid: "Keine Masken mehr!"
 ---
 
diff --git a/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md b/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md
index 0d47da2..3fa4cf4 100644
--- a/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md
+++ b/content/news/2022-04-05-Gedenken-an-Arkan/index.de.md
@@ -2,7 +2,7 @@
 title: "Gedenken an Arkan"
 date: 2022-04-05T09:31:00+02:00
 when: "Donnerstag, 07.04.2022, 18:00 Uhr, Celler Triftpark"
-contact: "ArkanGedenken@riseup.net"
+contact_mail: "ArkanGedenken@riseup.net"
 featured: true
 ---
 
diff --git a/content/news/foodsaving/index.de.md b/content/news/foodsaving/index.de.md
index 03841d5..7837d5b 100644
--- a/content/news/foodsaving/index.de.md
+++ b/content/news/foodsaving/index.de.md
@@ -5,7 +5,8 @@ lastmod: "2021-04-06T19:00:00+02:00"
 about: true
 when: "Jeden Mittwoch 18:30-19:00Uhr & Samstags 15:00-15:30Uhr"
 events: ["Regelmäßig"]
-contact: "foodsavingcelle@riseup.net"
+contact_mail: "foodsavingcelle@riseup.net"
+insta: "foodsavingcelle"
 featured: true
 ---
 Die **kostenfreie** Verteilung von gespendeten und geretteten **Lebensmitteln** geht auch nach der Wiedereröffnung der Tafel weiter.  
@@ -53,7 +54,4 @@ Natürlich wollen die Aktiven sich und alle anderen schützen: Deswegen wird das
 „Sagt Menschen Bescheid, die wenig Geld haben und sich über Obst und Gemüse freuen würden!“ ruft Nina auf, „Engagiert euch, bietet eure Unterstützung an, wenn ihr könnt, sprecht Nachbar_innen und Wohnungslose an, damit sie vom Projekt erfahren. Denn Menschen zu helfen und Unterstützung zu erfahren ist wertvoller für die Gesellschaft als Geld und Banken. Nicht nur während Corona.“
 
 
-Kontakt:  
-Mail: foodsavingcelle@riseup.net  
-Instagram: www.instagram.com/foodsavingcelle  
 Nebenan.de: https://nebenan.de/places/organizations/6021  
diff --git a/content/newsletter/_index.de.md b/content/newsletter.de.md
similarity index 100%
rename from content/newsletter/_index.de.md
rename to content/newsletter.de.md
diff --git a/themes/buha/assets/css/article.css b/themes/buha/assets/css/article.css
index cff3f6f..8386603 100644
--- a/themes/buha/assets/css/article.css
+++ b/themes/buha/assets/css/article.css
@@ -1,7 +1,6 @@
 article {
     flex-grow: 1;
     flex-shrink: 0;
-    background-color: var(--background);
     padding: 1rem;
     margin-bottom: 2rem;
     border-radius: 10px;
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index 73b1da1..fd74850 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -8,7 +8,7 @@
     {{ $partial := "" }}
     {{ $title := "" }}
     {{ $pic := "true" }}
-    {{ $pre := "l1" }}
+    {{ $pre := "layout" }}
     {{- $paginator := "" -}}
     {{ $part := .Layout }}
     {{ $partial_before := "" }}
@@ -24,13 +24,11 @@
         {{ else if eq .Section "featured" }}
             {{- $pages = where $pages ".Params.featured" "=" true -}}
         {{ end }}
-    {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }}
-         {{ $partial_before = "snippets/contact" }}
     {{ else }}
         {{ if eq .Kind "term" }}
             {{- $pages = .Data.Pages -}}
             {{ $part = "article_list" }}
-        {{ else if or (eq .Kind "taxonomy") }}
+        {{ else if eq .Kind "taxonomy" }}
             {{- $pages = .Data.Terms.Alphabetical -}}
             {{ $part = "tags_n_categories" }}
         {{ end }}    
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index 5da31df..fc2c695 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -11,6 +11,11 @@
         {{ $partial = "layout/generator" }}
    {{ else if eq .Params.tool "nottranslated" }}
         {{ $partial = "layout/nottranslated" }}
+    {{ else if or (eq .Layout "contact") (eq .Layout "imprint") }}
+        {{ $partial_before = "snippets/contact" }}
+        {{ $partial = printf "layout/%s" .Layout }}
+    {{ else if eq .Layout "archive" }}
+        {{ $partial = printf "layout/%s" .Layout }}
     {{ end }}
     <article>
     {{ partial $partial (dict "context" . "pic" $pic "content" .Content  "partial_before" $partial_before "type" "article") }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 04761c3..0ff400f 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -13,10 +13,10 @@
 		{{ if ne .Content "" }}
             {{ partial "snippets/content" (dict "content" .Content) }}
 		{{ end }}
-        {{ partial "l1/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
+        {{ partial "layout/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
 	{{ end }}
     {{ if gt (len $posts) 1 }}
-        {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }}
+        {{ partial "layout/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News" "type" "list") }}
             {{ partial "snippets/paginator" (dict "paginator" $paginator) }}
     {{ end }}
 {{ end }}
diff --git a/themes/buha/layouts/partials/l1/generic_single.html b/themes/buha/layouts/partials/l1/generic_single.html
deleted file mode 100644
index c3c31b5..0000000
--- a/themes/buha/layouts/partials/l1/generic_single.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{{ $pic := "solo" }}
-{{ $text := "solo" }}
-{{- if and (.context.Resources.ByType "image") (.context.Content) -}}
-    {{ $pic = "multiple_small" }}
-    {{ $text = "multiple_big" }}
-{{ end }}
-{{ $img := "" }}
-{{ $thumb := "" }}
-{{- if .context.Resources.ByType "image" -}}
-    {{- $img = index (.context.Resources.ByType "image") 0 -}}
-    {{- $thumb = $img.Resize "1024x" }}
-    {{ if .content }}
-        {{- $thumb = $img.Resize "500x" }}
-    {{ end }}
-{{ end }}
-
-<section>
- <div class="articleinner">
-    {{ if and (ne $img "") (eq .pic true)}}
-         <div class="articlepicture {{ $pic }}">
-            {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
-            {{ if ne .type "list" }}</a>{{ end }}
-            {{ if eq .type "article" }}{{ end }}
-        </div>
-    {{ end }}
-    <div class="articletext {{ $text }}">
-        {{ if .partial_before }}
-            {{ partial .partial_before (dict "context" .context "pic" .pic) }}
-        {{ end }}
-        {{ .content }}
-    </div>
-</div>
-</section>
diff --git a/themes/buha/layouts/partials/l1/links.html b/themes/buha/layouts/partials/l1/links.html
deleted file mode 100644
index 3132060..0000000
--- a/themes/buha/layouts/partials/l1/links.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{{ if ne .context.Content "" }}
-    <section>
-        {{ partial "snippets/content" (dict "content" .context.Content) }}
-    </section>
-{{ end }}
-{{ range .context.Pages }}
-    <section>
-        <a href="{{ .Params.link }}" class="underline">{{ .Params.link }}</a><br>
-        {{ .Title }}<br>
-        <br>
-    </section>
-{{ end }}
diff --git a/themes/buha/layouts/partials/l1/archive.html b/themes/buha/layouts/partials/layout/archive.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/archive.html
rename to themes/buha/layouts/partials/layout/archive.html
diff --git a/themes/buha/layouts/partials/layout/article.html b/themes/buha/layouts/partials/layout/article.html
index 826f3ac..181b57d 100644
--- a/themes/buha/layouts/partials/layout/article.html
+++ b/themes/buha/layouts/partials/layout/article.html
@@ -1,5 +1,4 @@
-{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid"
-.context.Params.covid }}
+{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact_mail" .context.Params.contact_mail "covid" .context.Params.covid "insta" .context.Params.insta }}
 {{ if eq .type "list" }}
     {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
 {{ end }}
@@ -55,12 +54,16 @@
                             {{ $url = index site.Params.foundations $l }}
                         {{ end }}
                         
-                       
+                    
                         {{- $res_im := resources.GetMatch (printf "/foundations/%s*" $l ) -}}
                         {{ if $res_im }}
                             <div class="article_footer_item1">
                                 {{ if $url }}<a href="{{ $url | safeHTML }}">{{ end }}<img src="{{- $res_im.Permalink -}}" class="borderrad4px article_footer_item1" /> {{ if $url }}</a>{{ end }}
                             </div>
+                        {{ else }}
+                            <div class="article_footer_item1">
+                                assets/foundations/{{- $l -}} .* missing
+                            </div>
                         {{ end }}
                     {{ end }}
                 </div>
diff --git a/themes/buha/layouts/partials/l1/article_list.html b/themes/buha/layouts/partials/layout/article_list.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/article_list.html
rename to themes/buha/layouts/partials/layout/article_list.html
diff --git a/themes/buha/layouts/partials/l1/contact.html b/themes/buha/layouts/partials/layout/contact.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/contact.html
rename to themes/buha/layouts/partials/layout/contact.html
diff --git a/themes/buha/layouts/partials/layout/content_single.html b/themes/buha/layouts/partials/layout/content_single.html
deleted file mode 100644
index d32809c..0000000
--- a/themes/buha/layouts/partials/layout/content_single.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{{ $small := "solo" }}
-{{ $big := "solo" }}
-{{ $img := "" }}
-{{ $thumb := "" }}
-{{- if .context.Resources.ByType "image" -}}
-    {{- $img = index (.context.Resources.ByType "image") 0 -}}
-    {{- $thumb = $img.Resize "1024x" }}
-    {{ if .content }}
-        {{- $thumb = $img.Resize "500x" }}
-    {{ end }}
-{{ end }}
-{{- if or (.context.Resources.ByType "image") (.context.Summary) ($img) -}}
-    {{ $small = "multiple_small" }}
-    {{ $big = "multiple_big" }}
-{{ else }}
-    {{ $small = "multiple_big"}}
-{{ end }}
- <div id="articleinner">
-    {{ if and (ne $img "") (eq .pic true)}}
-         <div id="articlepicture" class="{{ $small }}">
-            {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
-            {{ if ne .type "list" }}</a>{{ end }}
-            {{ if eq .type "article" }}{{ end }}
-        </div>
-    {{ end }}
-    <div id="articletext" class="{{ $big }}">
-        {{ if .partial_before }}
-            {{ partial .partial_before (dict "context" .context "pic" .pic) }}
-        {{ end }}
-        {{ .content }}
-    </div>
-</div>
diff --git a/themes/buha/layouts/partials/l1/media.html b/themes/buha/layouts/partials/layout/media.html
similarity index 63%
rename from themes/buha/layouts/partials/l1/media.html
rename to themes/buha/layouts/partials/layout/media.html
index e339049..6f036e0 100644
--- a/themes/buha/layouts/partials/l1/media.html
+++ b/themes/buha/layouts/partials/layout/media.html
@@ -4,7 +4,7 @@
     </section>
 {{ end }}
 <section>
-{{ range .context.Resources.ByType "image" }}
-    <img src="{{ .Permalink }}" class="borderrad4px"/>
+{{ range .context.Resources }}
+     <div>🗀 <a href="{{ .Permalink }}">{{ . }}</a></div>
 {{ end }}
 </section>
diff --git a/themes/buha/layouts/partials/l1/section_list.html b/themes/buha/layouts/partials/layout/section_list.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/section_list.html
rename to themes/buha/layouts/partials/layout/section_list.html
diff --git a/themes/buha/layouts/partials/l1/tags_n_categories.html b/themes/buha/layouts/partials/layout/tags_n_categories.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/tags_n_categories.html
rename to themes/buha/layouts/partials/layout/tags_n_categories.html
diff --git a/themes/buha/layouts/partials/snippets/article_metadata.html b/themes/buha/layouts/partials/snippets/article_metadata.html
index aad40bb..33ace3b 100644
--- a/themes/buha/layouts/partials/snippets/article_metadata.html
+++ b/themes/buha/layouts/partials/snippets/article_metadata.html
@@ -1,4 +1,4 @@
-{{ if or .when .price .contact .covid }}
+{{ if or .when .price .contact_mail .covid .insta }}
 
 			<div class="articlemeta font_size_smaller">
 				{{ if .when }}
@@ -13,8 +13,11 @@
 					        <div>{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "Entry" }}{{ end }}: {{ .price }}</div>
 					{{ end }}
 				{{ end }}
-				{{ if .contact }}
-					<div>{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} <a href="tel://{{ site.Params.imprintdata.tel }}">{{ site.Params.imprintdata.tel }}</a></div>
+				{{ if .insta }}
+                    <div>Instagram: <a href="https://instagram.com/{{- .insta -}}">https://instagram.com/{{- .insta -}}</a></div>
+				{{ end }}
+				{{ if .contact_mail }}
+					<div>{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }} {{ .contact_mail | markdownify }}</div>
 				{{ end }}
 				{{ if .covid }}
 					<div>Covid: {{ .covid }}</div>
diff --git a/themes/buha/layouts/partials/snippets/single_chooser.html b/themes/buha/layouts/partials/snippets/single_chooser.html
deleted file mode 100644
index 8f2ba07..0000000
--- a/themes/buha/layouts/partials/snippets/single_chooser.html
+++ /dev/null
@@ -1,12 +0,0 @@
-    {{ partial "debug" (dict "context" .context "caller" "single_chooser.html")}}
-    {{ $partial_before := "" }}
-    {{ $partial := "layout/single/article" }}
-    {{ $pic := .pic }}
-    {{ if eq .context.Params.tool "generator" }}
-        {{ $partial = "layout/single/generator" }}
-   {{ else if eq .context.Params.tool "nottranslated" }}
-        {{ $partial = "layout/single/nottranslated" }}
-    {{ end }}
-    <article>
-    {{ partial $partial (dict "context" .context "pic" $pic "content" .context.Content  "partial_before" $partial_before) }}
-    </article>