From 982cf4a66bd42da9f6ba0f1e7b1fec2a5698a106 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 9 Apr 2022 21:34:04 +0200
Subject: [PATCH 1/7] small fixes

---
 content/tools/generator.de.md                 |   4 +
 docs/todo.de                                  |  17 ++-
 themes/buha/assets/css/layout.css             |   6 +-
 .../_markup/render-heading.html               |   0
 .../_markup/render-image.html                 |   0
 .../{_default => _default.old}/archive.html   |   0
 themes/buha/layouts/_default.old/baseof.html  |  27 ++++
 .../{_default => _default.old}/contact.html   |   0
 .../{_default => _default.old}/imprint.html   |   0
 .../{_default => _default.old}/links.html     |   0
 .../misc.html => _default.old/list.html}      |   0
 themes/buha/layouts/_default.old/misc.html    |  12 ++
 .../{_default => _default.old}/news.html      |   0
 .../newsletter.html                           |   0
 themes/buha/layouts/_default.old/rss.xml      |  75 +++++++++
 themes/buha/layouts/_default.old/single.html  |  46 ++++++
 .../{_default => _default.old}/taxonomy.html  |   0
 themes/buha/layouts/_default/baseof.html      |   2 +-
 themes/buha/layouts/_default/list.html        |  39 ++++-
 themes/buha/layouts/_default/rss.xml          |   2 +
 themes/buha/layouts/_default/single.html      |  45 +-----
 themes/buha/layouts/index.html                |  28 +---
 themes/buha/layouts/index.html.old            |  40 +++++
 .../partials.old/contentlayouts/article.html  |  51 +++++++
 .../partials.old/contentlayouts/footer.html   |  55 +++++++
 .../partials.old/contentlayouts/list.html     |   1 +
 .../partials.old/contentlayouts/menu.html     |  27 ++++
 .../partials.old/contentlayouts/meta.html     |  18 +++
 .../partials.old/contentlayouts/termlist.html |  29 ++++
 themes/buha/layouts/partials.old/debug.html   |   8 +
 .../{partials => partials.old}/layout/about   |   0
 .../layout/archive.html                       |   0
 .../layout/categories                         |   0
 .../{partials => partials.old}/layout/events  |   0
 .../layout/featured                           |   0
 .../{partials => partials.old}/layout/index   |   0
 .../{partials => partials.old}/layout/links   |   0
 .../{partials => partials.old}/layout/misc    |   0
 .../{partials => partials.old}/layout/tags    |   0
 .../misc/expand.html                          |   0
 .../{partials => partials.old}/misc/form.html |   0
 .../misc/generator.html                       |   0
 .../misc/nottranslated.html                   |   0
 .../{partials => partials.old}/rrule.html     |   0
 .../partials.old/structure/contact.html       |   6 +
 .../layouts/partials.old/structure/empty.html |   0
 .../layouts/partials.old/structure/head.html  |  27 ++++
 .../partials.old/structure/header.html        |  15 ++
 .../layouts/partials.old/structure/langs.html |  10 ++
 .../partials.old/structure/paginator.html     | 102 +++++++++++++
 .../partials.old/structure/sidebar.html       |   2 +
 .../partials.old/structure/submenu.html       |   8 +
 themes/buha/layouts/partials/debug.html       |   4 +-
 .../partials/layout/lists/article_list.html   |  29 ++++
 .../partials/layout/lists/section_list.html   |   5 +
 .../layout/lists/taxonomies_list.html         |   3 +
 .../partials/layout/lists/term_list.html      |   4 +
 .../partials/layout/single/archive.html       |  14 ++
 .../partials/layout/single/article.html       |  48 ++++++
 .../layout/single/content_single.html         |  33 ++++
 .../partials/layout/single/generator.html     |  17 +++
 .../layout/single/generator/expand.html       |   3 +
 .../layout/single/generator/form.html         | 142 ++++++++++++++++++
 .../layouts/partials/layout/single/links.html |   6 +
 .../partials/layout/single/newsletter.html    |   1 +
 .../partials/snippets/article_metadata.html   |  21 +++
 .../layouts/partials/snippets/contact.html    |   6 +
 .../layouts/partials/snippets/content.html    |   1 +
 .../layouts/partials/snippets/paginator.html  | 102 +++++++++++++
 .../partials/snippets/single_chooser.html     |  22 +++
 70 files changed, 1085 insertions(+), 78 deletions(-)
 rename themes/buha/layouts/{_default => _default.old}/_markup/render-heading.html (100%)
 rename themes/buha/layouts/{_default => _default.old}/_markup/render-image.html (100%)
 rename themes/buha/layouts/{_default => _default.old}/archive.html (100%)
 create mode 100644 themes/buha/layouts/_default.old/baseof.html
 rename themes/buha/layouts/{_default => _default.old}/contact.html (100%)
 rename themes/buha/layouts/{_default => _default.old}/imprint.html (100%)
 rename themes/buha/layouts/{_default => _default.old}/links.html (100%)
 rename themes/buha/layouts/{_default/misc.html => _default.old/list.html} (100%)
 create mode 100644 themes/buha/layouts/_default.old/misc.html
 rename themes/buha/layouts/{_default => _default.old}/news.html (100%)
 rename themes/buha/layouts/{_default => _default.old}/newsletter.html (100%)
 create mode 100644 themes/buha/layouts/_default.old/rss.xml
 create mode 100644 themes/buha/layouts/_default.old/single.html
 rename themes/buha/layouts/{_default => _default.old}/taxonomy.html (100%)
 create mode 100644 themes/buha/layouts/index.html.old
 create mode 100644 themes/buha/layouts/partials.old/contentlayouts/article.html
 create mode 100644 themes/buha/layouts/partials.old/contentlayouts/footer.html
 create mode 100644 themes/buha/layouts/partials.old/contentlayouts/list.html
 create mode 100644 themes/buha/layouts/partials.old/contentlayouts/menu.html
 create mode 100644 themes/buha/layouts/partials.old/contentlayouts/meta.html
 create mode 100644 themes/buha/layouts/partials.old/contentlayouts/termlist.html
 create mode 100644 themes/buha/layouts/partials.old/debug.html
 rename themes/buha/layouts/{partials => partials.old}/layout/about (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/archive.html (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/categories (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/events (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/featured (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/index (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/links (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/misc (100%)
 rename themes/buha/layouts/{partials => partials.old}/layout/tags (100%)
 rename themes/buha/layouts/{partials => partials.old}/misc/expand.html (100%)
 rename themes/buha/layouts/{partials => partials.old}/misc/form.html (100%)
 rename themes/buha/layouts/{partials => partials.old}/misc/generator.html (100%)
 rename themes/buha/layouts/{partials => partials.old}/misc/nottranslated.html (100%)
 rename themes/buha/layouts/{partials => partials.old}/rrule.html (100%)
 create mode 100644 themes/buha/layouts/partials.old/structure/contact.html
 create mode 100644 themes/buha/layouts/partials.old/structure/empty.html
 create mode 100644 themes/buha/layouts/partials.old/structure/head.html
 create mode 100644 themes/buha/layouts/partials.old/structure/header.html
 create mode 100644 themes/buha/layouts/partials.old/structure/langs.html
 create mode 100644 themes/buha/layouts/partials.old/structure/paginator.html
 create mode 100644 themes/buha/layouts/partials.old/structure/sidebar.html
 create mode 100644 themes/buha/layouts/partials.old/structure/submenu.html
 create mode 100644 themes/buha/layouts/partials/layout/lists/article_list.html
 create mode 100644 themes/buha/layouts/partials/layout/lists/section_list.html
 create mode 100644 themes/buha/layouts/partials/layout/lists/taxonomies_list.html
 create mode 100644 themes/buha/layouts/partials/layout/lists/term_list.html
 create mode 100644 themes/buha/layouts/partials/layout/single/archive.html
 create mode 100644 themes/buha/layouts/partials/layout/single/article.html
 create mode 100644 themes/buha/layouts/partials/layout/single/content_single.html
 create mode 100644 themes/buha/layouts/partials/layout/single/generator.html
 create mode 100644 themes/buha/layouts/partials/layout/single/generator/expand.html
 create mode 100644 themes/buha/layouts/partials/layout/single/generator/form.html
 create mode 100644 themes/buha/layouts/partials/layout/single/links.html
 create mode 100644 themes/buha/layouts/partials/layout/single/newsletter.html
 create mode 100644 themes/buha/layouts/partials/snippets/article_metadata.html
 create mode 100644 themes/buha/layouts/partials/snippets/contact.html
 create mode 100644 themes/buha/layouts/partials/snippets/content.html
 create mode 100644 themes/buha/layouts/partials/snippets/paginator.html
 create mode 100644 themes/buha/layouts/partials/snippets/single_chooser.html

diff --git a/content/tools/generator.de.md b/content/tools/generator.de.md
index 42124be..ad3e39d 100644
--- a/content/tools/generator.de.md
+++ b/content/tools/generator.de.md
@@ -48,6 +48,10 @@ forms:
         group: misc
         input_type: checkbox
         name: "Über uns"
+      - title: lastmod
+        group: misc
+        input_type: date
+        name: "Zurueckdatieren"
       - title: tags
         group: misc
         input_type: mc
diff --git a/docs/todo.de b/docs/todo.de
index 33e408b..bb21981 100644
--- a/docs/todo.de
+++ b/docs/todo.de
@@ -2,14 +2,27 @@ todo buha.de
 - anleitung git proxy fuer tor
 - eintritt "gegen spende"
 - covid regel verfeinern
-- diskutieren, ob jede aenderung via rss raus soll (lastmod vs einmalig)
+- diskutieren, ob jede aenderung via rss raus soll (lastmod vs einmalig) (erstellung und lastmod gt date werden erstellt)
 - generator form: aus mc ein checkbox machen und kategorien und/oder eventkategorien soloauswaehlbar machen. 
-- sollte kein bild gefunden werden, wird ein standard bild verwendet. (diskutabel, hat vor und nachteile. man kann aber auch ein pool bereitstellen, je nach kategorie? im generator auswaehlen?)
+- sollte kein bild gefunden werden, wird ein standard bild verwendet. ( einen pool fuer bestimmte kategorien)
 - diskutieren, in welcher reihenfolge artikel angezeigt werden sollen. 
 
+- links in content unterstrichen
+
+- runde ecken? 2px
+
+- stiftung via prefix filename vom bild. maximale hoehe =s wenigst hohe bild. beim footer
+
+- generator "nachtrag": lastmod in frontmatter
 
 - dokumentiere, das artikel der alten homepage "lastmod" mit demgenau bis ungefaehren datum der damligen erstellung, im frontmatter haben sollten, wann sie erstellt wurden.
 
+- rss: das macht, das nur neue und if (Lastmod = Date) or (Lastmod gt Date.AddDate 0 0 -1)
+
+- push.sh: pushen optional? commit extra? commit --amend?
+
+- https://schlomp.space/Bunteshaus/bunteshaus.de/src/branch/main/docs/artikel_formatierung.md#absatz: durcheinander
+
 listen:
 mit preview:
 events
diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css
index 0314a50..deea30c 100644
--- a/themes/buha/assets/css/layout.css
+++ b/themes/buha/assets/css/layout.css
@@ -116,7 +116,7 @@ article {
 	display: flex;
 	flex-direction: column;
 	margin-bottom: 2rem;
-	padding: 1rem 1rem 1rem 1rem;
+	padding: 1rem;
 }
 
 #articletext img {
@@ -125,8 +125,10 @@ article {
 	width: 80%;
 }
 
+
 #articlemeta {
 	margin-bottom: 1rem;
+    margin-left: 1rem;    
 }
 
 #articlemeta div:first-child {
@@ -137,7 +139,7 @@ article {
 #articleinner {
 	display: flex;
 	flex-direction: column-reverse;
-	margin-top: .5rem;
+    margin-left: 1rem;
 }
 
 #articletext {
diff --git a/themes/buha/layouts/_default/_markup/render-heading.html b/themes/buha/layouts/_default.old/_markup/render-heading.html
similarity index 100%
rename from themes/buha/layouts/_default/_markup/render-heading.html
rename to themes/buha/layouts/_default.old/_markup/render-heading.html
diff --git a/themes/buha/layouts/_default/_markup/render-image.html b/themes/buha/layouts/_default.old/_markup/render-image.html
similarity index 100%
rename from themes/buha/layouts/_default/_markup/render-image.html
rename to themes/buha/layouts/_default.old/_markup/render-image.html
diff --git a/themes/buha/layouts/_default/archive.html b/themes/buha/layouts/_default.old/archive.html
similarity index 100%
rename from themes/buha/layouts/_default/archive.html
rename to themes/buha/layouts/_default.old/archive.html
diff --git a/themes/buha/layouts/_default.old/baseof.html b/themes/buha/layouts/_default.old/baseof.html
new file mode 100644
index 0000000..2ad994b
--- /dev/null
+++ b/themes/buha/layouts/_default.old/baseof.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+    {{- partial "structure/head.html" . -}}
+    {{ block "css" . -}}{{- end }}
+    <body>
+        <div class="container">
+            <header>
+                {{ partialCached "structure/header" . }}
+                {{ partial "structure/submenu" . }}
+            </header>
+            <div class="content">
+                <main>
+                    {{ block "title" . -}}{{- end }}
+                    {{ block "content" . -}}{{- end }}
+                    {{ block "main" . -}}{{- end }}
+                </main>
+                <aside class="right-sidebar">
+                {{ block "sidebar" . -}}{{- end }}
+                </aside>
+            </div>
+            {{ block "pagefooter" . -}}{{- end }}
+            <footer>
+                {{- partial "contentlayouts/footer" . -}}
+            </footer>
+        </div>
+    </body>
+</html>
diff --git a/themes/buha/layouts/_default/contact.html b/themes/buha/layouts/_default.old/contact.html
similarity index 100%
rename from themes/buha/layouts/_default/contact.html
rename to themes/buha/layouts/_default.old/contact.html
diff --git a/themes/buha/layouts/_default/imprint.html b/themes/buha/layouts/_default.old/imprint.html
similarity index 100%
rename from themes/buha/layouts/_default/imprint.html
rename to themes/buha/layouts/_default.old/imprint.html
diff --git a/themes/buha/layouts/_default/links.html b/themes/buha/layouts/_default.old/links.html
similarity index 100%
rename from themes/buha/layouts/_default/links.html
rename to themes/buha/layouts/_default.old/links.html
diff --git a/themes/buha/layouts/_default/misc.html b/themes/buha/layouts/_default.old/list.html
similarity index 100%
rename from themes/buha/layouts/_default/misc.html
rename to themes/buha/layouts/_default.old/list.html
diff --git a/themes/buha/layouts/_default.old/misc.html b/themes/buha/layouts/_default.old/misc.html
new file mode 100644
index 0000000..e612da4
--- /dev/null
+++ b/themes/buha/layouts/_default.old/misc.html
@@ -0,0 +1,12 @@
+{{ define "title" }}
+<h1>{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ "Misc" }}{{ end }}</h1>
+{{ end }}
+
+{{ define "main" }}
+    {{ partial "debug" (dict "context" . ) }}
+	<article>
+		{{ range .Pages }}
+			<a href="{{ .Permalink }}">{{ .Name }}</a><br>
+		{{ end }}
+	</article>
+{{ end }}
diff --git a/themes/buha/layouts/_default/news.html b/themes/buha/layouts/_default.old/news.html
similarity index 100%
rename from themes/buha/layouts/_default/news.html
rename to themes/buha/layouts/_default.old/news.html
diff --git a/themes/buha/layouts/_default/newsletter.html b/themes/buha/layouts/_default.old/newsletter.html
similarity index 100%
rename from themes/buha/layouts/_default/newsletter.html
rename to themes/buha/layouts/_default.old/newsletter.html
diff --git a/themes/buha/layouts/_default.old/rss.xml b/themes/buha/layouts/_default.old/rss.xml
new file mode 100644
index 0000000..fdf2e42
--- /dev/null
+++ b/themes/buha/layouts/_default.old/rss.xml
@@ -0,0 +1,75 @@
+{{- $pages := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}}  
+{{- $title := lower .Title -}}
+{{- if eq $title "events" -}}
+    {{- $pages = where $pages ".Params.when" "ne" nil -}}
+{{- end -}}
+{{- $limit := .Site.Config.Services.RSS.Limit -}}
+{{- if ge $limit 1 -}}
+{{- $pages = $pages | first $limit -}}
+{{- end -}}
+{{- $pages = $pages.ByLastmod.Reverse -}}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ .Site.Title }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Aktuelles von {{ .Site.Title }}</description>
+    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
+    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{- with .OutputFormats.Get "RSS" -}}
+    {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{- end -}}
+    {{ range where $pages "Type" "in" .Site.Params.searchSections }}
+    {{ $when := .Params.when }}
+    {{ $about := .Params.about }}
+    {{ $covid := .Params.covid }} 
+    {{ $contact := .Params.contact }} 
+    {{ $price := .Params.price }} 
+    {{ $featured := .Params.featured }} 
+    {{ $categories := slice }}
+    {{ range .Params.categories }}
+      {{ $categories = $categories | append . }}
+    {{ end }}
+    {{ $events := slice }}
+    {{ range .Params.events }}
+      {{ $events = $events | append . }}
+    {{ end }}
+    {{ $tags := slice }}
+    {{ range .Params.tags }}
+      {{ $tags = $tags | append . }}
+    {{ end }}
+    {{ $images := slice }}
+    {{ range .Resources.ByType "image" }}
+      {{ $images = $images | append . }}
+    {{ end }}
+    {{ $hash := slice $when $about $categories $events $covid $contact $price $featured $tags .Date .Lastmod .Title .Content }}
+    {{ $hash = delimit $hash ", " }}
+    {{ $hash = md5 $hash }}
+    
+    <item>
+      <title>{{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <guid>{{ .Permalink }}-{{ $hash }}</guid>
+      <description>
+        {{- $c := replace .Content "<img" "<img width=\"600\"" -}}
+        {{- if $when -}}
+          {{- $c = printf "<p><b>%s</b></p>%s" $when $c -}}
+        {{- end -}}
+        {{- $img := index (.Resources.ByType "image") 0 -}}
+        {{- with $img -}}
+          {{- $img := .Resize "640x" -}}
+          {{- $c = printf "%s<img src=\"%s\" width=\"%d\" height=\"%d\" />" $c $img.Permalink $img.Width $img.Height -}}
+        {{- end -}}
+        {{- printf "<![CDATA[%s]]>" $c | safeHTML -}}
+      </description>
+
+    </item>
+    {{ end }}
+  </channel>
+</rss>
diff --git a/themes/buha/layouts/_default.old/single.html b/themes/buha/layouts/_default.old/single.html
new file mode 100644
index 0000000..3f35aa2
--- /dev/null
+++ b/themes/buha/layouts/_default.old/single.html
@@ -0,0 +1,46 @@
+{{ define "title" }}
+    {{ $name := .Title }}
+    {{ if lower $name | i18n }}
+            {{ $name = lower $name | i18n }}
+    {{ end }}
+    <h1>{{ $name }}</h1>
+{{ end }}
+
+{{ define "main" }}
+   {{ partial "debug" (dict "context" . "caller" "single.html" )}}
+<article>
+	{{ if eq .Type "tools" }}
+		<article>
+		{{ $tool := printf "misc/%s" .Params.tool }}
+		{{ partial $tool . }}
+		</article>
+	{{ else }}
+		<article>
+			{{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }}
+		</article>
+	{{ end }}
+{{ end }}
+
+{{ define "pagefooter" }}
+	{{ if and (ne .Section "misc") (eq .Type "tools") }}
+		<div id="article_footer">
+			<div style="flex-grow: 1; flex-direction: column;">
+				<b>{{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}</b><br>
+				{{ .Date | time.Format ":date_full" }}
+			</div>
+			{{ if ne .Date .Lastmod }}	
+				<div style="flex-grow: 1; flex-direction: column;">
+					<b>{{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}</b><br>
+					{{ .Lastmod | time.Format ":date_full" }}
+				</div>
+			{{ end }}
+		</div>
+	{{ end }}
+{{ end }}
+
+
+{{ define "sidebar" }}
+    {{ if ne .Type "tools" }}
+        {{- partial "contentlayouts/menu.html" . }}
+    {{ end }}
+{{ end }}
diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default.old/taxonomy.html
similarity index 100%
rename from themes/buha/layouts/_default/taxonomy.html
rename to themes/buha/layouts/_default.old/taxonomy.html
diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html
index 2ad994b..08990cf 100644
--- a/themes/buha/layouts/_default/baseof.html
+++ b/themes/buha/layouts/_default/baseof.html
@@ -11,8 +11,8 @@
             <div class="content">
                 <main>
                     {{ block "title" . -}}{{- end }}
+                    {{ block "calc" . -}}{{- end }}
                     {{ block "content" . -}}{{- end }}
-                    {{ block "main" . -}}{{- end }}
                 </main>
                 <aside class="right-sidebar">
                 {{ block "sidebar" . -}}{{- end }}
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index e612da4..2f56718 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -1,12 +1,35 @@
 {{ define "title" }}
-<h1>{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ "Misc" }}{{ end }}</h1>
+    <h1>{{ if .Title }}{{ .Title }}{{ else }}{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ .Section }}{{ end }}{{ end }}</h1>
 {{ end }}
 
-{{ define "main" }}
-    {{ partial "debug" (dict "context" . ) }}
-	<article>
-		{{ range .Pages }}
-			<a href="{{ .Permalink }}">{{ .Name }}</a><br>
-		{{ end }}
-	</article>
+{{ define "content" }}
+    {{ partial "debug" (dict "context" . "caller" "list.html")}}
+
+    {{- $pages := where .Site.RegularPages "Permalink" "!=" .Permalink -}}
+
+    {{ $partial := "layout/lists/article_list" }}
+    {{ $title := "" }}
+    {{ $pic := "true" }}
+    {{ if eq .Section "news" }}
+        {{- $pages = .Data.Pages -}}
+    {{ else if eq .Section "events" }}
+        {{- $pages = where $pages ".Params.when" "ne" nil -}}
+    {{ else if eq .Section "about" }}
+        {{- $pages = where $pages ".Params.about" "=" true -}}
+    {{ else if eq .Section "featured" }}
+        {{- $pages = where $pages ".Params.featured" "=" true -}}
+    {{ else if or (eq .Section "misc") (eq .Section "tools") }}
+        {{ $partial = "layout/lists/section_list" }}
+    {{ else if or (eq .Section "tags") (eq .Section "categories")}}
+        {{ $partial = "layout/lists/taxonomies_list" }}
+    {{ else }}
+        {{ $partial = "snippets/single_chooser" }}
+        {{ $pic = "false" }}
+    {{ end }}
+    {{ if eq .Kind "term" }}
+        {{- $pages = .Data.Pages -}}
+        {{ $partial = "layout/lists/term_list" }}
+    {{ end }}
+    {{ $partial := string $partial }}
+    {{ partial $partial (dict "context" . "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic) }}
 {{ end }}
diff --git a/themes/buha/layouts/_default/rss.xml b/themes/buha/layouts/_default/rss.xml
index fdf2e42..43190f9 100644
--- a/themes/buha/layouts/_default/rss.xml
+++ b/themes/buha/layouts/_default/rss.xml
@@ -24,6 +24,7 @@
     {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{- end -}}
     {{ range where $pages "Type" "in" .Site.Params.searchSections }}
+    {{ if or (eq .Lastmod .Date) (gt .Lastmod (.Date.AddDate 0 0 -1)) }}
     {{ $when := .Params.when }}
     {{ $about := .Params.about }}
     {{ $covid := .Params.covid }} 
@@ -67,6 +68,7 @@
           {{- $c = printf "%s<img src=\"%s\" width=\"%d\" height=\"%d\" />" $c $img.Permalink $img.Width $img.Height -}}
         {{- end -}}
         {{- printf "<![CDATA[%s]]>" $c | safeHTML -}}
+        {{- end -}}
       </description>
 
     </item>
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index 3f35aa2..52a6422 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -1,46 +1,7 @@
 {{ define "title" }}
-    {{ $name := .Title }}
-    {{ if lower $name | i18n }}
-            {{ $name = lower $name | i18n }}
-    {{ end }}
-    <h1>{{ $name }}</h1>
+    <h1>{{ if (i18n .Title (dict "Count" 0))}}{{ i18n .Title (dict "Count" 0) }}{{ else }}{{ .Title }}{{ end }}</h1>
 {{ end }}
 
-{{ define "main" }}
-   {{ partial "debug" (dict "context" . "caller" "single.html" )}}
-<article>
-	{{ if eq .Type "tools" }}
-		<article>
-		{{ $tool := printf "misc/%s" .Params.tool }}
-		{{ partial $tool . }}
-		</article>
-	{{ else }}
-		<article>
-			{{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }}
-		</article>
-	{{ end }}
-{{ end }}
-
-{{ define "pagefooter" }}
-	{{ if and (ne .Section "misc") (eq .Type "tools") }}
-		<div id="article_footer">
-			<div style="flex-grow: 1; flex-direction: column;">
-				<b>{{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}</b><br>
-				{{ .Date | time.Format ":date_full" }}
-			</div>
-			{{ if ne .Date .Lastmod }}	
-				<div style="flex-grow: 1; flex-direction: column;">
-					<b>{{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}</b><br>
-					{{ .Lastmod | time.Format ":date_full" }}
-				</div>
-			{{ end }}
-		</div>
-	{{ end }}
-{{ end }}
-
-
-{{ define "sidebar" }}
-    {{ if ne .Type "tools" }}
-        {{- partial "contentlayouts/menu.html" . }}
-    {{ end }}
+{{ define "content" }}
+    {{ partial "snippets/single_chooser" (dict "context" . "pic" "true") }}
 {{ end }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index e848f4c..5105020 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -1,10 +1,8 @@
 {{ define "title" }}
-{{ if .Content }}
-	<h1>{{ .Title }}</h1>
-{{ end }}
+<h1>{{ .Title }}</h1>
 {{ end }}
 
-{{ define "main" }}
+{{ define "content" }}
 	{{- $all := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }}
 	{{ $days := int (mul (mul (int .Site.Params.featured_expire) 7) -1) }}
 	{{ $featured := where (where (where $all ".Params.featured" "=" true) "Type" "in" .Site.Params.searchSections) ".Params.Lastmod" "gt" (now.AddDate 0 0 $days) }}
@@ -13,28 +11,14 @@
     {{- $paginator := .Paginate $posts -}}
 	{{ if eq $paginator.PageNumber 1 }}
 		{{ if ne .Content "" }}
-		<article>
-			{{ .Content }}
-		</article>
+            {{ partial "snippets/content" (dict "content" .Content) }}
 		{{ end }}
-		{{ if gt (len $featured) 0 }}
-            <a href="/featured"><h2 style="margin-left: .5rem;">{{if  "featured" | i18n }}{{ "featured" | i18n }}{{ else }}{{ "Featured" }}{{ end }}</h2></a> 
-            {{ partial "contentlayouts/list.html" (dict "context" . "pages" $featured "amount" "3" ) }}
-        {{ end }}
+        {{ partial "layout/lists/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
 	{{ end }}
     {{ if gt (len $posts) 1 }}
-        <a href="/news"><h2 style="margin-left: .5rem;">{{ if "news" | i18n }}{{ "news" | i18n }}{{ else }}{{ "News" }}{{ end }}</h2></a> 
-        {{ partial "contentlayouts/list.html" (dict "context" . "paginator" $paginator "amount" "5") }}
-
+        {{ partial "layout/lists/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News") }}
         <div id="pagination_outer" style="display: flex; justify-content: center;">
-            {{ partial "structure/paginator" (dict "paginator" $paginator) }}
+            {{ partial "snippets/paginator" (dict "paginator" $paginator) }}
         </div>
     {{ end }}
-
-
 {{ end }}
-
-{{ define "sidebar" }}
-	{{- partial "contentlayouts/menu.html" . }}
-{{ end }}
-
diff --git a/themes/buha/layouts/index.html.old b/themes/buha/layouts/index.html.old
new file mode 100644
index 0000000..e848f4c
--- /dev/null
+++ b/themes/buha/layouts/index.html.old
@@ -0,0 +1,40 @@
+{{ define "title" }}
+{{ if .Content }}
+	<h1>{{ .Title }}</h1>
+{{ end }}
+{{ end }}
+
+{{ define "main" }}
+	{{- $all := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }}
+	{{ $days := int (mul (mul (int .Site.Params.featured_expire) 7) -1) }}
+	{{ $featured := where (where (where $all ".Params.featured" "=" true) "Type" "in" .Site.Params.searchSections) ".Params.Lastmod" "gt" (now.AddDate 0 0 $days) }}
+	{{ $featured = $all | intersect $featured }}
+	{{ $posts := $all | complement $featured }}
+    {{- $paginator := .Paginate $posts -}}
+	{{ if eq $paginator.PageNumber 1 }}
+		{{ if ne .Content "" }}
+		<article>
+			{{ .Content }}
+		</article>
+		{{ end }}
+		{{ if gt (len $featured) 0 }}
+            <a href="/featured"><h2 style="margin-left: .5rem;">{{if  "featured" | i18n }}{{ "featured" | i18n }}{{ else }}{{ "Featured" }}{{ end }}</h2></a> 
+            {{ partial "contentlayouts/list.html" (dict "context" . "pages" $featured "amount" "3" ) }}
+        {{ end }}
+	{{ end }}
+    {{ if gt (len $posts) 1 }}
+        <a href="/news"><h2 style="margin-left: .5rem;">{{ if "news" | i18n }}{{ "news" | i18n }}{{ else }}{{ "News" }}{{ end }}</h2></a> 
+        {{ partial "contentlayouts/list.html" (dict "context" . "paginator" $paginator "amount" "5") }}
+
+        <div id="pagination_outer" style="display: flex; justify-content: center;">
+            {{ partial "structure/paginator" (dict "paginator" $paginator) }}
+        </div>
+    {{ end }}
+
+
+{{ end }}
+
+{{ define "sidebar" }}
+	{{- partial "contentlayouts/menu.html" . }}
+{{ end }}
+
diff --git a/themes/buha/layouts/partials.old/contentlayouts/article.html b/themes/buha/layouts/partials.old/contentlayouts/article.html
new file mode 100644
index 0000000..2bffda5
--- /dev/null
+++ b/themes/buha/layouts/partials.old/contentlayouts/article.html
@@ -0,0 +1,51 @@
+{{ $showmeta := "false" }}
+        {{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid"
+        .context.Params.covid }}
+        {{ if eq .type "list" }}
+            {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
+        {{ end }}
+        {{ partial "contentlayouts/meta.html" $metas }}
+
+		{{ $small := "solo" }}
+		{{ $big := "solo" }}
+		{{ $img := "" }}
+		{{ $thumb := "" }}
+		{{ $placeholder := site.Params.placeholder }}
+		{{ if ne .context.Section "misc"}}
+            {{ $img = resources.Get $placeholder }}
+            {{- $thumb = $img.Resize "1024x" }}
+		{{ end }}
+		{{- if or (.context.Resources.ByType "image") (.Summary) ($img) -}}
+			{{ $small = "multiple_small" }}
+			{{ $big = "multiple_big" }}
+		{{ else }}
+			{{ $small = "multiple_big"}}
+		{{ end }}
+
+		{{- if and (.context.Resources.ByType "image") (ne .context.Section "misc") -}}
+			{{- $img = index (.context.Resources.ByType "image") 0 -}}
+			{{- $thumb = $img.Resize "1024x" }}
+			{{ if ne .context.Content "" }}
+				{{- $thumb = $img.Resize "2048x" }}
+			{{ end }}
+		{{ end }}
+		
+		<div id="articleinner">
+            {{ if ne $img "" }}
+			<div id="articlepicture" class="{{ $small }} borderrad25">
+				{{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
+					<img src="{{- $thumb.Permalink -}}" class="borderrad25" />
+				{{ if ne .type "list" }}</a>{{ end }}
+				{{ if eq .type "article" }}{{ .TableOfContents }}{{ end }}
+			</div>
+			{{ end }}
+			{{- if or .context.Content .context.Summary -}}
+				<div id="articletext" class="{{ $big }}">
+					{{ if eq .type "contact" }}{{ partial "structure/contact" }}{{ end }}
+					{{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
+					{{ if and .context.Truncated (eq .type "list") }}
+						<div id="readmore">{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..</div>
+					{{ end }}
+				</div>
+			{{- end }}
+        </div>
diff --git a/themes/buha/layouts/partials.old/contentlayouts/footer.html b/themes/buha/layouts/partials.old/contentlayouts/footer.html
new file mode 100644
index 0000000..17c107c
--- /dev/null
+++ b/themes/buha/layouts/partials.old/contentlayouts/footer.html
@@ -0,0 +1,55 @@
+{{- if eq site.Params.contact true }}
+	<div class="infobox">
+		{{ $contact := "Contact" }}
+		{{ if i18n "contact" }}
+			{{ $contact = i18n "contact" }}
+		{{ end }}
+		<a href="{{- "contact" | absLangURL -}}">{{- $contact | strings.FirstUpper -}}:</a><br><br>
+		{{- partial "structure/contact" -}}
+	</div>
+{{- end -}}
+
+<div class="infobox">
+    {{- if eq site.Params.archive true -}}
+		{{ $archive := "Archive" }}
+		{{ if i18n "archive" }}
+			{{ $archive = i18n "archive" }}
+		{{ end }}    
+        <a href="{{- "archive" | absLangURL -}}">{{- $archive | strings.FirstUpper -}}</a><br><br>
+    {{- end -}}
+    {{- if eq site.Params.newsletter true -}}
+		{{ $newsletter := "Newsletter" }}
+		{{ if i18n "newsletter" }}
+			{{ $newsletter = i18n "newsletter" }}
+		{{ end }}    
+        <a href="{{- "newsletter" | absLangURL -}}">{{- $newsletter | strings.FirstUpper -}}</a><br><br>
+    {{- end -}}
+    <a href="{{- "misc" | absLangURL -}}">Misc</a><br><br>
+</div>
+
+<div class="infobox">
+    {{- if eq site.Params.imprint true -}}
+		{{ $imprint := "Imprint" }}
+		{{ if i18n "imprint" }}
+			{{ $imprint = i18n "imprint" }}
+		{{ end }}        
+        <a href="{{- "imprint" | absLangURL -}}">{{- $imprint | strings.FirstUpper -}}</a><br><br>
+    {{- end -}}
+    {{- if eq site.Params.links true -}}
+		{{ $links := "Links" }}
+		{{ if i18n "links" }}
+			{{ $links = i18n "links" }}
+		{{ end }}        
+        <a href="{{- "links" | absLangURL -}}">{{- $links | strings.FirstUpper -}}</a><br><br>
+    {{- end -}}
+   	{{- if not (or (eq .Section "featured") (eq .Section "about")) -}}
+            {{- with .OutputFormats.Get "rss" -}}
+                {{- if .Permalink -}}
+                    {{- printf `<a href="%s">` .Permalink | safeHTML -}}
+                {{- end -}}
+                RSS</a><br><br>
+            {{- end -}}
+    {{ end }}
+	<a href="https://schlomp.space/Bunteshaus/bunteshaus.de">Sourcecode</a>
+</div>
+
diff --git a/themes/buha/layouts/partials.old/contentlayouts/list.html b/themes/buha/layouts/partials.old/contentlayouts/list.html
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/themes/buha/layouts/partials.old/contentlayouts/list.html
@@ -0,0 +1 @@
+
diff --git a/themes/buha/layouts/partials.old/contentlayouts/menu.html b/themes/buha/layouts/partials.old/contentlayouts/menu.html
new file mode 100644
index 0000000..9b1a557
--- /dev/null
+++ b/themes/buha/layouts/partials.old/contentlayouts/menu.html
@@ -0,0 +1,27 @@
+        {{ if gt .Site.Taxonomies.categories 0 }}
+          <li class="align_menu"><a href="{{ "/news" | relLangURL}}"><h3>{{ if i18n "news" }}{{ i18n "news" }}{{ else }}{{ "News" }}{{ end }}</h3></a></li>
+          {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.categories }}
+            {{ $orig := $taxonomyname }}
+            {{ if ne (i18n $taxonomyname) "" }}
+                {{ $taxonomyname = i18n $taxonomyname }}
+            {{ else }}
+                {{ $taxonomyname = $taxonomyname | humanize }}
+            {{ end }}        
+              <li class="align_menu"><a href="{{ "categories/" | relLangURL}}{{ $orig | urlize }}">{{ $taxonomyname }}</a></li>
+          {{ end }}
+        {{ end }}
+        {{ if gt .Site.Taxonomies.events 0 }}
+          <li class="align_menu"><a href="{{ "/events" | relLangURL}}"><h3>{{ if i18n "events" }}{{ i18n "events" }}{{ else }}{{ "Events" }}{{ end }}</h3></a></li>
+          {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.events }}
+            {{ $orig := $taxonomyname }}
+            {{ if ne (i18n $taxonomyname) "" }}
+                {{ $taxonomyname = i18n $taxonomyname }}
+            {{ else }}
+                {{ $taxonomyname = $taxonomyname | humanize }}
+            {{ end }}        
+              <li class="align_menu"><a href="{{ "events/" | relLangURL}}{{ $orig | urlize }}">{{ $taxonomyname }}</a></li>
+          {{ end }}
+        {{ end }}
+        {{ if .IsHome }}
+            {{ partial "structure/langs" . }}
+        {{ end }}
diff --git a/themes/buha/layouts/partials.old/contentlayouts/meta.html b/themes/buha/layouts/partials.old/contentlayouts/meta.html
new file mode 100644
index 0000000..f3442d9
--- /dev/null
+++ b/themes/buha/layouts/partials.old/contentlayouts/meta.html
@@ -0,0 +1,18 @@
+			<div id="articlemeta" style="font-size: smaller;">
+				{{ if .when }}
+					<div>{{ .when }}</div>
+				{{ end }}
+				{{ if .price }}
+					{{ if eq .price "free" }}
+					        <div>{{ if i18n "freeentry" }}{{ i18n "freeentry" }}{{ else }}{{ "Free Entry" }}{{ end }}</div>
+					{{ else }}
+					        <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 }} {{ site.Params.imprintdata.tel }}</div>
+				{{ end }}
+				{{ if .covid }}
+					<div>Covid: {{ .covid }}</div>
+				{{ end }}
+			</div>
diff --git a/themes/buha/layouts/partials.old/contentlayouts/termlist.html b/themes/buha/layouts/partials.old/contentlayouts/termlist.html
new file mode 100644
index 0000000..39ac2a9
--- /dev/null
+++ b/themes/buha/layouts/partials.old/contentlayouts/termlist.html
@@ -0,0 +1,29 @@
+{{ $name := .context.Title }}
+{{ $title := lower .context.Title }}
+
+
+{{ range $taxonomyname, $taxonomy := .context.Site.Taxonomies }}
+    {{ if eq $title $taxonomyname }}
+        {{ range $key, $value := $taxonomy }}
+        <a href="{{ printf "%s" $key }}">{{ $key }}</a>
+        {{ end }}
+    {{ end }}
+{{ end }}
+    
+    
+{{ if and site.Params.debug false }}    
+    {{ range $taxonomyname, $taxonomy := .context.Site.Taxonomies }}
+      <li><a href="/{{ $taxonomyname | urlize }}">{{ $taxonomyname }}</a>
+        <ul>
+          {{ range $key, $value := $taxonomy }}
+          <li> {{ $key }} </li>
+                <ul>
+                {{ range $value.Pages }}
+                    <li hugo-nav="{{ .RelPermalink}}"><a href="{{ .Permalink}}"> {{ .LinkTitle }} </a> </li>
+                {{ end }}
+                </ul>
+          {{ end }}
+        </ul>
+      </li>
+    {{ end }}
+{{ end }}
diff --git a/themes/buha/layouts/partials.old/debug.html b/themes/buha/layouts/partials.old/debug.html
new file mode 100644
index 0000000..c1cb7da
--- /dev/null
+++ b/themes/buha/layouts/partials.old/debug.html
@@ -0,0 +1,8 @@
+{{ if eq site.Params.debug true }}
+Title: {{ .context.Title }}<br>
+Name: {{ .context.Name }}<br>
+section: {{ .context.Section }}<br>
+type: {{ .context.Type }}<br>
+{{ if .caller }}caller: {{ .caller }}<br>{{ end }}
+kind: {{ .context.Kind }}
+{{ end }}
diff --git a/themes/buha/layouts/partials/layout/about b/themes/buha/layouts/partials.old/layout/about
similarity index 100%
rename from themes/buha/layouts/partials/layout/about
rename to themes/buha/layouts/partials.old/layout/about
diff --git a/themes/buha/layouts/partials/layout/archive.html b/themes/buha/layouts/partials.old/layout/archive.html
similarity index 100%
rename from themes/buha/layouts/partials/layout/archive.html
rename to themes/buha/layouts/partials.old/layout/archive.html
diff --git a/themes/buha/layouts/partials/layout/categories b/themes/buha/layouts/partials.old/layout/categories
similarity index 100%
rename from themes/buha/layouts/partials/layout/categories
rename to themes/buha/layouts/partials.old/layout/categories
diff --git a/themes/buha/layouts/partials/layout/events b/themes/buha/layouts/partials.old/layout/events
similarity index 100%
rename from themes/buha/layouts/partials/layout/events
rename to themes/buha/layouts/partials.old/layout/events
diff --git a/themes/buha/layouts/partials/layout/featured b/themes/buha/layouts/partials.old/layout/featured
similarity index 100%
rename from themes/buha/layouts/partials/layout/featured
rename to themes/buha/layouts/partials.old/layout/featured
diff --git a/themes/buha/layouts/partials/layout/index b/themes/buha/layouts/partials.old/layout/index
similarity index 100%
rename from themes/buha/layouts/partials/layout/index
rename to themes/buha/layouts/partials.old/layout/index
diff --git a/themes/buha/layouts/partials/layout/links b/themes/buha/layouts/partials.old/layout/links
similarity index 100%
rename from themes/buha/layouts/partials/layout/links
rename to themes/buha/layouts/partials.old/layout/links
diff --git a/themes/buha/layouts/partials/layout/misc b/themes/buha/layouts/partials.old/layout/misc
similarity index 100%
rename from themes/buha/layouts/partials/layout/misc
rename to themes/buha/layouts/partials.old/layout/misc
diff --git a/themes/buha/layouts/partials/layout/tags b/themes/buha/layouts/partials.old/layout/tags
similarity index 100%
rename from themes/buha/layouts/partials/layout/tags
rename to themes/buha/layouts/partials.old/layout/tags
diff --git a/themes/buha/layouts/partials/misc/expand.html b/themes/buha/layouts/partials.old/misc/expand.html
similarity index 100%
rename from themes/buha/layouts/partials/misc/expand.html
rename to themes/buha/layouts/partials.old/misc/expand.html
diff --git a/themes/buha/layouts/partials/misc/form.html b/themes/buha/layouts/partials.old/misc/form.html
similarity index 100%
rename from themes/buha/layouts/partials/misc/form.html
rename to themes/buha/layouts/partials.old/misc/form.html
diff --git a/themes/buha/layouts/partials/misc/generator.html b/themes/buha/layouts/partials.old/misc/generator.html
similarity index 100%
rename from themes/buha/layouts/partials/misc/generator.html
rename to themes/buha/layouts/partials.old/misc/generator.html
diff --git a/themes/buha/layouts/partials/misc/nottranslated.html b/themes/buha/layouts/partials.old/misc/nottranslated.html
similarity index 100%
rename from themes/buha/layouts/partials/misc/nottranslated.html
rename to themes/buha/layouts/partials.old/misc/nottranslated.html
diff --git a/themes/buha/layouts/partials/rrule.html b/themes/buha/layouts/partials.old/rrule.html
similarity index 100%
rename from themes/buha/layouts/partials/rrule.html
rename to themes/buha/layouts/partials.old/rrule.html
diff --git a/themes/buha/layouts/partials.old/structure/contact.html b/themes/buha/layouts/partials.old/structure/contact.html
new file mode 100644
index 0000000..d8b273c
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/contact.html
@@ -0,0 +1,6 @@
+{{ site.Title }}<br>
+{{ site.Params.imprintdata.street }}<br>
+{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "Po.Box" }}{{ end }} {{ site.Params.imprintdata.pobox }}<br>
+{{ site.Params.imprintdata.city }}<br>
+{{ if site.Params.imprintdata.tel }}<p>{{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: {{ site.Params.imprintdata.tel }}</p>{{ end }}
+{{ if site.Params.imprintdata.mail }}<p>{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }}: {{ site.Params.imprintdata.mail | markdownify }}{{ end }}</p>
diff --git a/themes/buha/layouts/partials.old/structure/empty.html b/themes/buha/layouts/partials.old/structure/empty.html
new file mode 100644
index 0000000..e69de29
diff --git a/themes/buha/layouts/partials.old/structure/head.html b/themes/buha/layouts/partials.old/structure/head.html
new file mode 100644
index 0000000..e747c55
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/head.html
@@ -0,0 +1,27 @@
+
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+{{ $stylecolor := resources.Get "css/color.css" }}
+{{ $stylelayout := resources.Get "css/layout.css" }}
+{{ $allcss := slice $stylecolor $stylelayout | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }}
+<link rel="stylesheet" href="{{ $allcss.RelPermalink }}" integrity="{{ $allcss.Data.Integrity }}">
+
+{{ $title := print .Site.Title " | " .Title }}
+{{ if .IsHome }}{{ $title = .Site.Title }}{{ end }}
+<title>{{ $title }}</title>
+<meta property="og:title" content="{{ site.Title }}" />
+
+<link rel="canonical" href="{{ .Permalink }}">
+{{ range .AlternativeOutputFormats -}}
+    {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
+{{ end -}}
+
+{{ if .Site.Params.keywords -}}
+<meta name="keywords" content="{{ .Site.Params.keywords }}" />
+{{- end }}
+
+<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
+
+{{ template "_internal/opengraph.html" . }}
+
diff --git a/themes/buha/layouts/partials.old/structure/header.html b/themes/buha/layouts/partials.old/structure/header.html
new file mode 100644
index 0000000..8e4fae9
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/header.html
@@ -0,0 +1,15 @@
+<div id="headerinner">
+        <a href="/">
+            <img src="/images/logo.svg" alt="SVG mit img laden" width="auto" height="100%" >
+         </a>
+        <div id="menu">
+        {{- range site.Params.mainMenu -}}
+                    {{ $name := . }}
+                    {{ if i18n . }}
+                            {{ $name = i18n . }}
+                    {{ end }}
+                    <a href="{{- . | relLangURL -}}">{{- $name | humanize -}}</a>
+        {{- end -}}
+
+        </div>
+</div>
diff --git a/themes/buha/layouts/partials.old/structure/langs.html b/themes/buha/layouts/partials.old/structure/langs.html
new file mode 100644
index 0000000..c5921c1
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/langs.html
@@ -0,0 +1,10 @@
+{{ if not .IsHome }}
+  {{ if .Translations }}
+    <li class="align_menu"><h3>{{ "Languages" }}</h3></li>
+    {{ range .Translations }}
+      {{ if ne .Lang $.Lang }}
+        <li class="align_menu"><a href="{{- .Permalink -}}">{{- if i18n .Lang -}}{{- i18n .Lang -}}{{- else -}}{{- humanize .Lang -}}{{ end }}</a></li>
+      {{ end }}
+    {{ end }}
+  {{ end }}
+{{ end }}
diff --git a/themes/buha/layouts/partials.old/structure/paginator.html b/themes/buha/layouts/partials.old/structure/paginator.html
new file mode 100644
index 0000000..71895c3
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/paginator.html
@@ -0,0 +1,102 @@
+	{{ $paginator := .paginator}}
+<div id="pagination_outer" style="display: flex; justify-content: center;">
+<div id="pagination">
+	<!-- Number of links either side of the current page. -->
+	{{ $adjacent_links := 2 }}
+
+	<!-- $max_links = ($adjacent_links * 2) + 1 -->
+	{{ $max_links := (add (mul $adjacent_links 2) 1) }}
+
+	<!-- $lower_limit = $adjacent_links + 1 -->
+	{{ $lower_limit := (add $adjacent_links 1) }}
+
+	<!-- $upper_limit = $paginator.TotalPages - $adjacent_links -->
+	{{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
+
+	<!-- If there's more than one page. -->
+	{{ if gt $paginator.TotalPages 1 }}
+
+		<!-- First page. -->
+		{{ if ne $paginator.PageNumber 1 }}
+		  <a class="pagination__link pagination__link--first" href="{{ $paginator.First.URL }}">
+		    ««
+		  </a>
+		{{ end }}
+
+		<!-- Previous page. -->
+		{{ if $paginator.HasPrev }}
+		  <a href="{{ $paginator.Prev.URL }}" class="pagination__link pagination__link--previous">
+		    «
+		  </a>
+		{{ end }}
+
+		<!-- Page numbers. -->
+		{{ range $paginator.Pagers }}
+			{{ $page_number_flag := false }}
+
+
+			<!-- Advanced page numbers. -->
+			{{ if gt $paginator.TotalPages $max_links }}
+
+				<!-- Lower limit pages. -->
+				<!-- If the user is on a page which is in the lower limit.  -->
+				{{ if le $paginator.PageNumber $lower_limit }}
+
+					<!-- If the current loop page is less than max_links. -->
+					{{ if le .PageNumber $max_links }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				<!-- Upper limit pages. -->
+				<!-- If the user is on a page which is in the upper limit. -->
+				{{ else if ge $paginator.PageNumber $upper_limit }}
+
+					<!-- If the current loop page is greater than total pages minus $max_links -->
+					{{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				<!-- Middle pages. -->
+				{{ else }}
+
+					{{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				{{ end }}
+
+
+			<!-- Simple page numbers. -->
+			{{ else }}
+
+				{{ $page_number_flag = true }}
+
+			{{ end }}
+
+			<!-- Output page numbers. -->
+			{{ if eq $page_number_flag true }}
+			<a href="{{ .URL }}" class="pagination__link">
+				{{ if eq $paginator.PageNumber .PageNumber }}<b>{{ end }}
+				{{ .PageNumber }}
+				{{ if eq $paginator.PageNumber .PageNumber }}</b>{{ end }}
+			</a>
+			{{ end }}
+
+		{{ end }}
+
+	    <!-- Next page. -->
+	    {{ if $paginator.HasNext }}
+	      <a href="{{ $paginator.Next.URL }}" class="pagination__link pagination__link--next">
+	        »
+	      </a>
+	    {{ end }}
+
+	    <!-- Last page. -->
+	    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+	      <a class="pagination__link pagination__link--last" href="{{ $paginator.Last.URL }}">
+	        »»
+	      </a>
+	    {{ end }}
+	{{ end }}
+</div>
+</div>
\ No newline at end of file
diff --git a/themes/buha/layouts/partials.old/structure/sidebar.html b/themes/buha/layouts/partials.old/structure/sidebar.html
new file mode 100644
index 0000000..0d5ca4a
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/sidebar.html
@@ -0,0 +1,2 @@
+{{ partial "contentlayouts/menu.html" . }}
+
diff --git a/themes/buha/layouts/partials.old/structure/submenu.html b/themes/buha/layouts/partials.old/structure/submenu.html
new file mode 100644
index 0000000..c5c83f2
--- /dev/null
+++ b/themes/buha/layouts/partials.old/structure/submenu.html
@@ -0,0 +1,8 @@
+                     <div>
+                        <details>
+                            <summary style="list-style: none; text-align: right;">Menü ☰</summary>
+                            <p>
+                                {{ partial "contentlayouts/menu.html" . }}
+                            </p>
+                        </details>
+                    </div>
diff --git a/themes/buha/layouts/partials/debug.html b/themes/buha/layouts/partials/debug.html
index c1cb7da..188f46f 100644
--- a/themes/buha/layouts/partials/debug.html
+++ b/themes/buha/layouts/partials/debug.html
@@ -3,6 +3,8 @@ Title: {{ .context.Title }}<br>
 Name: {{ .context.Name }}<br>
 section: {{ .context.Section }}<br>
 type: {{ .context.Type }}<br>
+layout: {{ .context.Layout }}<br>
 {{ if .caller }}caller: {{ .caller }}<br>{{ end }}
-kind: {{ .context.Kind }}
+kind: {{ .context.Kind }}<br>
+is page: {{ if .context.IsPage }}yes{{end}}<br>
 {{ end }}
diff --git a/themes/buha/layouts/partials/layout/lists/article_list.html b/themes/buha/layouts/partials/layout/lists/article_list.html
new file mode 100644
index 0000000..44fae32
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/lists/article_list.html
@@ -0,0 +1,29 @@
+{{ if and .amount (or .paginator .pages) }}
+    {{ $amount := .amount }}
+    {{ $pages := "" }}
+    {{ if .pages }}
+        {{ $pages = .pages.ByLastmod.Reverse }}
+    {{ else if .paginator }}
+        {{ $pages = .paginator.Pages.ByLastmod.Reverse }}
+    {{ end }}
+    {{ if .content }}
+        {{ partial "snippets/content" (dict "content" .content) }}
+    {{ end }}
+    {{- if gt (len $pages) 0 -}}
+        {{ if .title }}<h2>{{ .title }}</h2>{{ end }}
+        {{- range first $amount $pages -}}
+            <article class="articlebgcol1 borderrad25">
+                <a href="{{- .Permalink -}}">
+                    <div id="articletitle">
+                        <h2>{{- .Title -}}</h2>
+                    </div>
+                </a>
+                <a href="{{- .Permalink -}}">
+                    <div id="articlecontent">
+                        {{ partial "layout/single/article" (dict "context" . "type" "list" "pic" "true") }}
+                    </div>
+                </a>
+            </article>
+        {{ end }}
+    {{ end }}
+{{ end }}
diff --git a/themes/buha/layouts/partials/layout/lists/section_list.html b/themes/buha/layouts/partials/layout/lists/section_list.html
new file mode 100644
index 0000000..12e3b5f
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/lists/section_list.html
@@ -0,0 +1,5 @@
+<article>
+{{ range .context.Pages }}
+    <a href="{{ .Permalink }}">🗀 {{ .Title }}</a>
+{{ end }}
+</article>
diff --git a/themes/buha/layouts/partials/layout/lists/taxonomies_list.html b/themes/buha/layouts/partials/layout/lists/taxonomies_list.html
new file mode 100644
index 0000000..20d08c9
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/lists/taxonomies_list.html
@@ -0,0 +1,3 @@
+{{ range .context.Data.Terms.Alphabetical }}
+        <li><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ .Count }}</li>
+{{ end }}
diff --git a/themes/buha/layouts/partials/layout/lists/term_list.html b/themes/buha/layouts/partials/layout/lists/term_list.html
new file mode 100644
index 0000000..b0bea2e
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/lists/term_list.html
@@ -0,0 +1,4 @@
+{{ range .context.Pages }}
+    {{ .Title }}<br>
+{{ end }}
+
diff --git a/themes/buha/layouts/partials/layout/single/archive.html b/themes/buha/layouts/partials/layout/single/archive.html
new file mode 100644
index 0000000..d9ac971
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/archive.html
@@ -0,0 +1,14 @@
+
+{{ partial "debug" (dict "context" . "caller" "archive.html" )}}
+{{ $prev := 3000}}
+{{range where site.RegularPages "Type" "in" site.Params.searchSections }}
+    {{ $date := .Date }}
+    {{ if gt $prev ($date.Format "2006") }}
+        <h2>{{ $date.Format "2006" }}</h2>
+    {{end}}
+    <div class="frow">
+        <div class="underline" style="margin-right: 1em;"><a href="{{.Permalink}}">{{ .Title }}</a></div>
+        <div class="frow" style="margin-right: 1em;">{{- $date.Format "02" }}. {{ if $date.Format "Jan" | i18n }}{{ $date.Format "Jan" | i18n -}}{{- else -}} {{- $date.Format "Jan" -}}{{- end }} {{ $date.Format "2006 15:04" }}</div><br>
+    </div>	
+    {{ $prev = $date.Format "2006"}}
+{{end}}
diff --git a/themes/buha/layouts/partials/layout/single/article.html b/themes/buha/layouts/partials/layout/single/article.html
new file mode 100644
index 0000000..2fa9d92
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/article.html
@@ -0,0 +1,48 @@
+{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid"
+.context.Params.covid }}
+{{ if eq .type "list" }}
+    {{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
+{{ end }}
+
+{{ $small := "solo" }}
+{{ $big := "solo" }}
+{{ $img := "" }}
+{{ $thumb := "" }}
+{{ $placeholder := site.Params.placeholder }}
+
+{{- if or (.context.Resources.ByType "image") (.context.Summary) -}}
+    {{ $small = "multiple_small" }}
+    {{ $big = "multiple_big" }}
+{{ else }}
+    {{ $small = "multiple_big"}}
+{{ end }}
+
+{{- if .context.Resources.ByType "image" -}}
+    {{- $img = index (.context.Resources.ByType "image") 0 -}}
+    {{ if ne .context.Content "" }}
+        {{- $thumb = $img.Resize "2048x" }}
+    {{ else if .type "list" }}
+        {{- $thumb = $img.Resize "500x" }}
+    {{ end }}
+{{ end }}
+
+    {{ partial "snippets/article_metadata" $metas }}
+    <div id="articleinner">
+        {{ if and (ne $img "") (eq .pic "true")}}
+            <div id="articlepicture" class="{{ $small }} borderrad25">
+                {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
+                    <img src="{{- $thumb.Permalink -}}" class="borderrad25" />
+                {{ if ne .type "list" }}</a>{{ end }}
+                {{ if eq .type "article" }}{{ end }}
+            </div>
+        {{ end }}
+        {{- if or .context.Content .context.Summary -}}
+            <div id="articletext" class="{{ $big }}">
+                {{ if eq .type "contact" }}{{ partial "structure/contact" }}{{ end }}
+                {{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
+                {{ if and .context.Truncated (eq .type "list") }}
+                    <div id="readmore">{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..</div>
+                {{ end }}
+            </div>
+        {{- end }}
+    </div>
diff --git a/themes/buha/layouts/partials/layout/single/content_single.html b/themes/buha/layouts/partials/layout/single/content_single.html
new file mode 100644
index 0000000..363cc41
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/content_single.html
@@ -0,0 +1,33 @@
+{{ $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 }} borderrad25">
+            {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
+                <img src="{{- $thumb.Permalink -}}" class="borderrad25" />
+            {{ 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/layout/single/generator.html b/themes/buha/layouts/partials/layout/single/generator.html
new file mode 100644
index 0000000..6289d91
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/generator.html
@@ -0,0 +1,17 @@
+{{ define "css" }}
+  <link rel="stylesheet" href="/css/visibleIf.css" type="text/css" />
+{{ end }}
+
+
+<article class="minmax">
+<div style="flex-direction: row;">
+{{ .Content }}
+</div>
+<noscript><p><b>Bitte aktiviere Javascript, sonst funktioniert der Generator nicht.</b></p></noscript>
+{{ if (index .context.Params.forms 0) }}
+  {{ partial "layout/single/generator/form" (dict "context" .context "form" 0) }}
+{{ end }}
+
+</article>
+<script defer language="javascript" type="text/javascript"  src="{{ "/js/visibleIf.js" | urlize | relURL }}"></script>
+<script defer language="javascript" type="text/javascript"  src="{{ "/js/generator.js" | urlize | relURL }}"></script>
diff --git a/themes/buha/layouts/partials/layout/single/generator/expand.html b/themes/buha/layouts/partials/layout/single/generator/expand.html
new file mode 100644
index 0000000..7929c0a
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/generator/expand.html
@@ -0,0 +1,3 @@
+
+    <input type="checkbox" name="{{ .name }}" id="{{ .name }}" value="true" style="font-size: smaller; margin-right: 0;" >
+    <label for="{{ .name }}" style="font-size: smaller; margin: 0;"> {{ if i18n "expand" }}{{ i18n "expand" }}{{ else }}{{ "expand" }}{{ end }}</label>
diff --git a/themes/buha/layouts/partials/layout/single/generator/form.html b/themes/buha/layouts/partials/layout/single/generator/form.html
new file mode 100644
index 0000000..11fe41b
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/generator/form.html
@@ -0,0 +1,142 @@
+{{ $pageform := (index .context.Page.Params.forms .form) }}
+{{ $group := slice }}
+{{ $divide := .context.Page.Params.divide }}
+<form id="myform">
+
+
+{{ range $pageform.fields }}
+    {{ $title := .title }}
+    {{ $name := $title }}
+    {{ if .name }}
+        {{ $name = .name }}
+    {{ end }}
+
+    {{ if and .group (not (in $group .group))}}
+        <div class="margin_top_1rem">
+            {{ if i18n (singularize .group) }}{{ i18n (singularize .group) }}{{ else }}{{ humanize .group }}{{ end }}
+            {{ partial "layout/single/generator/expand" (dict "name" (printf "%sgroup" .group)) }}
+        </div>
+        {{ $group = $group | append .group }}
+    {{ end }}    
+    
+    {{ if eq .input_type "title" }}
+        <h3 {{ if .group }}class="visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ end }}>{{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}</h3>
+    {{ else if eq .input_type "textarea" }}
+        <div {{ if .group }}class="visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ end }}>
+            <label {{ if $pageform.names }}sr-only{{ end }} for="{{ .title }}">{{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+            <textarea name="{{ .title }}" id="{{ .title }}" rows="10" {{ if $pageform.names }}placeholder="{{ .name }}{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}></textarea>
+        </div>
+    {{ else if eq .input_type "radio" }}
+        <div class="radio {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
+            <label><input type="radio" name="{{ .title }}" id="{{ .title }}" value="{{ .name }}" {{ .Scratch.Get "requiredtext" }}>{{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+        </div>
+    {{ else if eq .input_type "checkbox" }}
+        <div class="checkbox {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
+            <label><input type="checkbox" name="{{ .title }}" id="{{ .title }}" value="{{ .name }}" {{ .Scratch.Get "requiredtext" }}>{{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+        </div>
+    {{ else if eq .input_type "results" }}
+          <div id='display' class="result" style="white-space: pre; display: none; background: var(--background-body); padding: .6rem 0 1rem 1rem;"></div>
+    {{ else if eq .input_type "submit" }}
+        <div class="margin_top_1rem {{ if .group }}visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
+            <input type="{{ .input_type }}" value="{{- $name -}}" onclick="showInput(event);" />
+        </div>
+
+        
+        
+        
+    
+    
+    
+    
+    {{ else if eq .input_type "mc" }}
+        {{ $in0 := .title }}
+
+        {{- $finale := slice -}}
+        {{ $pages := where site.RegularPages "Type" "in" site.Params.searchSections }}
+        {{ if eq .title "tags" }}
+            {{ range $pages }}
+                {{- if .Params.tags -}}
+                    {{- $finale = $finale | append .Params.tags -}}
+                {{ end }}
+            {{ end }}
+        {{ else }}
+            {{ range $pages }}
+                {{ range .Param $in0 }}
+                    {{- $finale = $finale | append . -}}
+                {{ end }}
+            {{ end }}
+        {{ end }}
+        {{- $finale = $finale | uniq -}}
+        
+        <div class="margin_top_1rem {{- if .group }} visibleIf" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }}  style="flex-direction: column;">
+            <div class="{{- if .group }}margin_left_1rem{{ end }}">
+                {{ .name }}
+                {{ if ne .expanded true }}{{ partial "layout/single/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}}
+            </div>
+
+
+
+                <div class="checkbox  {{ if ne .expanded true }}visibleIf" data-visibleif-rule="{{ $in0 }}cat == 'true'{{end}}">
+
+
+                        <div class="{{- if .group }} margin_left_1rem{{ end }} minmax" style="display: flex; flex-direction: column;">
+                        <fieldset id="{{ $in0 }}" name="{{ $in0 }}" style="display: flex; flex-direction: row; padding: 0; border: none; margin: 0 0 .3rem .5rem;">
+                            {{ range sort $finale }}
+                                    <input type="checkbox" name="{{ $in0 }}" id="{{ $in0 }}-cat" value="{{ . }}"><label for="{{ $in0 }}-cat">{{ . }}</label>
+                            {{ end }}
+                        </fieldset>
+                        {{ if .new }}
+                            <label id="label" for="new{{- .title -}}">{{ .new }} <span style="font-size: x-small;">({{ $divide }})</span></label>
+                            <input type="text" name="new{{- .title -}}" id="new{{- .title -}}" value="" placeholder="{{ .eg }}" />
+                        {{ end }}
+                        </div>
+                </div>
+ 
+        </div>    
+   
+    
+    
+    
+    
+    
+    
+    
+        
+        
+    {{ else }}
+        {{ if eq .title "name" }}
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
+                <label class="{{ if $pageform.names }}sr-only{{ end }}" for="firstname">First name{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+                <input type="text" name="firstname" id="firstname" {{ if $pageform.names }}placeholder="First name{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
+                <label class="{{ if $pageform.names }}sr-only{{ end }}" for="lastname">Last name{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+                <input type="text" name="lastname" id="lastname" {{ if $pageform.names }}placeholder="Last name{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+        {{ else if eq .title "address" }}
+            <div {{- if .group }} class="visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'"{{ end -}}>
+                <label class="{{ if $pageform.names }}sr-only{{ end }}" for="address">Address{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+                <input type="text" name="address" id="address" {{ if $pageform.names }}placeholder="Address{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true{{ end }}">
+                <label class="{{ if $pageform.names }}sr-only{{ end }}" for="city">City{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+                <input type="text" name="city" id="city" {{ if $pageform.names }}placeholder="City{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+
+            <div class="half {{- if .group }} visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
+                <label class="{{ if $pageform.names }}sr-only{{ end }}" for="postalcode">Postal code{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+                <input type="text" name="postalcode" id="postalcode" {{ if $pageform.names }}placeholder="Postal code{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+            </div>
+        {{ else }}
+            <div class="margin_top_1rem {{ if .group }} visibleIf margin_left_1rem" data-visibleif-rule=" {{ .group }}group == 'true' {{ end }}" class="minmax">
+                <div class="minmax" style="display: flex; flex-direction: column;">
+                    <label class="{{ if $pageform.names }}sr-only{{ end }}" for="{{ .title }}">{{ .name }}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
+                    <input type="{{ .input_type }}" name="{{ .title }}" id="{{ .title }}" {{ if $pageform.names }}placeholder="{{ .name }}{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+                </div>
+            </div>
+        {{ end }}
+    {{ end }}
+
+{{ end }}
+
+</form>
diff --git a/themes/buha/layouts/partials/layout/single/links.html b/themes/buha/layouts/partials/layout/single/links.html
new file mode 100644
index 0000000..066f09b
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/links.html
@@ -0,0 +1,6 @@
+{{ range .context.Pages }}
+<article>
+    <a href="{{ .Params.link }}">{{ .Params.link }}</a>
+    {{ .Title }}
+</article>
+{{ end }}
diff --git a/themes/buha/layouts/partials/layout/single/newsletter.html b/themes/buha/layouts/partials/layout/single/newsletter.html
new file mode 100644
index 0000000..bec81d2
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/newsletter.html
@@ -0,0 +1 @@
+nl
diff --git a/themes/buha/layouts/partials/snippets/article_metadata.html b/themes/buha/layouts/partials/snippets/article_metadata.html
new file mode 100644
index 0000000..916668c
--- /dev/null
+++ b/themes/buha/layouts/partials/snippets/article_metadata.html
@@ -0,0 +1,21 @@
+{{ if or .when .price .contact .covid }}
+
+			<div id="articlemeta" style="font-size: smaller;">
+				{{ if .when }}
+					<div>{{ .when }}</div>
+				{{ end }}
+				{{ if .price }}
+					{{ if eq .price "free" }}
+					        <div>{{ if i18n "freeentry" }}{{ i18n "freeentry" }}{{ else }}{{ "Free Entry" }}{{ end }}</div>
+					{{ else }}
+					        <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 }} {{ site.Params.imprintdata.tel }}</div>
+				{{ end }}
+				{{ if .covid }}
+					<div>Covid: {{ .covid }}</div>
+				{{ end }}
+			</div>
+{{ end }}
diff --git a/themes/buha/layouts/partials/snippets/contact.html b/themes/buha/layouts/partials/snippets/contact.html
new file mode 100644
index 0000000..d8b273c
--- /dev/null
+++ b/themes/buha/layouts/partials/snippets/contact.html
@@ -0,0 +1,6 @@
+{{ site.Title }}<br>
+{{ site.Params.imprintdata.street }}<br>
+{{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "Po.Box" }}{{ end }} {{ site.Params.imprintdata.pobox }}<br>
+{{ site.Params.imprintdata.city }}<br>
+{{ if site.Params.imprintdata.tel }}<p>{{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: {{ site.Params.imprintdata.tel }}</p>{{ end }}
+{{ if site.Params.imprintdata.mail }}<p>{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }}: {{ site.Params.imprintdata.mail | markdownify }}{{ end }}</p>
diff --git a/themes/buha/layouts/partials/snippets/content.html b/themes/buha/layouts/partials/snippets/content.html
new file mode 100644
index 0000000..50c5652
--- /dev/null
+++ b/themes/buha/layouts/partials/snippets/content.html
@@ -0,0 +1 @@
+<article>{{ .content }}</article>
diff --git a/themes/buha/layouts/partials/snippets/paginator.html b/themes/buha/layouts/partials/snippets/paginator.html
new file mode 100644
index 0000000..71895c3
--- /dev/null
+++ b/themes/buha/layouts/partials/snippets/paginator.html
@@ -0,0 +1,102 @@
+	{{ $paginator := .paginator}}
+<div id="pagination_outer" style="display: flex; justify-content: center;">
+<div id="pagination">
+	<!-- Number of links either side of the current page. -->
+	{{ $adjacent_links := 2 }}
+
+	<!-- $max_links = ($adjacent_links * 2) + 1 -->
+	{{ $max_links := (add (mul $adjacent_links 2) 1) }}
+
+	<!-- $lower_limit = $adjacent_links + 1 -->
+	{{ $lower_limit := (add $adjacent_links 1) }}
+
+	<!-- $upper_limit = $paginator.TotalPages - $adjacent_links -->
+	{{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }}
+
+	<!-- If there's more than one page. -->
+	{{ if gt $paginator.TotalPages 1 }}
+
+		<!-- First page. -->
+		{{ if ne $paginator.PageNumber 1 }}
+		  <a class="pagination__link pagination__link--first" href="{{ $paginator.First.URL }}">
+		    ««
+		  </a>
+		{{ end }}
+
+		<!-- Previous page. -->
+		{{ if $paginator.HasPrev }}
+		  <a href="{{ $paginator.Prev.URL }}" class="pagination__link pagination__link--previous">
+		    «
+		  </a>
+		{{ end }}
+
+		<!-- Page numbers. -->
+		{{ range $paginator.Pagers }}
+			{{ $page_number_flag := false }}
+
+
+			<!-- Advanced page numbers. -->
+			{{ if gt $paginator.TotalPages $max_links }}
+
+				<!-- Lower limit pages. -->
+				<!-- If the user is on a page which is in the lower limit.  -->
+				{{ if le $paginator.PageNumber $lower_limit }}
+
+					<!-- If the current loop page is less than max_links. -->
+					{{ if le .PageNumber $max_links }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				<!-- Upper limit pages. -->
+				<!-- If the user is on a page which is in the upper limit. -->
+				{{ else if ge $paginator.PageNumber $upper_limit }}
+
+					<!-- If the current loop page is greater than total pages minus $max_links -->
+					{{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				<!-- Middle pages. -->
+				{{ else }}
+
+					{{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				{{ end }}
+
+
+			<!-- Simple page numbers. -->
+			{{ else }}
+
+				{{ $page_number_flag = true }}
+
+			{{ end }}
+
+			<!-- Output page numbers. -->
+			{{ if eq $page_number_flag true }}
+			<a href="{{ .URL }}" class="pagination__link">
+				{{ if eq $paginator.PageNumber .PageNumber }}<b>{{ end }}
+				{{ .PageNumber }}
+				{{ if eq $paginator.PageNumber .PageNumber }}</b>{{ end }}
+			</a>
+			{{ end }}
+
+		{{ end }}
+
+	    <!-- Next page. -->
+	    {{ if $paginator.HasNext }}
+	      <a href="{{ $paginator.Next.URL }}" class="pagination__link pagination__link--next">
+	        »
+	      </a>
+	    {{ end }}
+
+	    <!-- Last page. -->
+	    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
+	      <a class="pagination__link pagination__link--last" href="{{ $paginator.Last.URL }}">
+	        »»
+	      </a>
+	    {{ end }}
+	{{ end }}
+</div>
+</div>
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/snippets/single_chooser.html b/themes/buha/layouts/partials/snippets/single_chooser.html
new file mode 100644
index 0000000..0e05f2b
--- /dev/null
+++ b/themes/buha/layouts/partials/snippets/single_chooser.html
@@ -0,0 +1,22 @@
+    {{ partial "debug" (dict "context" .context "caller" "single_chooser.html")}}
+    {{ $partial_before := "" }}
+    {{ $partial := "layout/single/article" }}
+    {{ $pic := .pic }}
+    {{ if eq (lower .context.Section) "imprint" }}
+       {{ $partial_before = "snippets/contact" }}
+       {{ $partial = "layout/single/content_single" }}
+       {{ $pic = false }}
+    {{ else if eq (lower .context.Section) "contact" }}
+       {{ $partial_before = "snippets/contact" }}
+       {{ $partial = "layout/single/content_single" }}
+       {{ $pic = true }}
+    {{ else if eq (lower .context.Section) "links" }}
+        {{ $partial = "layout/single/links" }}
+    {{ else if eq (lower .context.Section) "archive" }}
+        {{ $partial = "layout/single/archive" }}
+    {{ else if eq .context.Title "Generator" }}
+        {{ $partial = "layout/single/generator" }}
+    {{ end }}
+    <article>
+    {{ partial $partial (dict "context" .context "pic" $pic "content" .context.Content  "partial_before" $partial_before) }}
+    </article>

From 722a701944904554797512c88515f17383b6833f Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 10 Apr 2022 00:53:31 +0200
Subject: [PATCH 2/7] first batch of restructure

---
 config.toml                                   |   2 +-
 content/about/_index.de.md                    |   1 +
 content/archive/_index.de.md                  |   5 +-
 content/contact/_index.de.md                  |   3 +-
 content/events/_index.de.md                   |   4 ++
 content/featured/_index.de.md                 |   4 ++
 content/imprint/_index.de.md                  |   3 +-
 content/links/_index.de.md                    |   4 ++
 .../Buntes.Haus.Celle.Logo.1.jpg              | Bin
 .../Buntes.Haus.Celle.Logo.2.jpg              | Bin
 .../Buntes.Haus.Celle.Logo.3.jpg              | Bin
 .../Buntes.Haus.Celle.Logo.4.jpg              | Bin
 .../Buntes.Haus.Celle.Logo.5.jpg              | Bin
 .../Buntes.Haus.Celle.Logo.5.png              | Bin
 .../Buntes.Haus.Celle.Zeichnung.jpg           | Bin
 content/media/_index.de.md                    |   4 ++
 content/{misc/medien => media}/index.de.md    |   4 --
 content/misc/_index.de.md                     |   4 ++
 content/misc/_index.md                        |   3 --
 content/news/_index.de.md                     |   4 ++
 content/newsletter/_index.de.md               |   1 +
 content/tools/_index.de.md                    |   4 ++
 themes/buha/assets/css/layout.css             |   5 +-
 .../_default/_markup/render-heading.html      |   7 +++
 .../_default/_markup/render-image.html        |  35 +++++++++++++
 themes/buha/layouts/_default/list.html        |  48 ++++++++++--------
 themes/buha/layouts/_default/single.html      |  13 ++++-
 themes/buha/layouts/index.html                |   4 +-
 themes/buha/layouts/partials/l1/archive.html  |  15 ++++++
 .../{layout/lists => l1}/article_list.html    |   2 +-
 themes/buha/layouts/partials/l1/contact.html  |  33 ++++++++++++
 .../buha/layouts/partials/l1/easy_list.html   |   6 +++
 themes/buha/layouts/partials/l1/imprint.html  |  33 ++++++++++++
 .../partials/{layout/single => l1}/links.html |   2 +-
 themes/buha/layouts/partials/l1/media.html    |   5 ++
 .../buha/layouts/partials/l1/newsletter.html  |  33 ++++++++++++
 .../section_list.html => l1/section_list}     |   0
 .../layout/lists/taxonomies_list.html         |   3 --
 .../partials/layout/lists/term_list.html      |   4 --
 .../partials/layout/single/article.html       |   4 +-
 .../layout/single/content_single.html         |   4 +-
 .../partials/layout/single/nottranslated.html |  25 +++++++++
 .../snippets/.single_chooser.html.kate-swp    | Bin 0 -> 259 bytes
 .../partials/snippets/article_metadata.html   |   2 +-
 .../layouts/partials/snippets/contact.html    |   2 +-
 .../partials/snippets/single_chooser.html     |  16 ++----
 46 files changed, 285 insertions(+), 66 deletions(-)
 create mode 100644 content/events/_index.de.md
 create mode 100644 content/featured/_index.de.md
 create mode 100644 content/links/_index.de.md
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Logo.1.jpg (100%)
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Logo.2.jpg (100%)
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Logo.3.jpg (100%)
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Logo.4.jpg (100%)
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Logo.5.jpg (100%)
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Logo.5.png (100%)
 rename content/{misc/medien => media}/Buntes.Haus.Celle.Zeichnung.jpg (100%)
 create mode 100644 content/media/_index.de.md
 rename content/{misc/medien => media}/index.de.md (52%)
 create mode 100644 content/misc/_index.de.md
 delete mode 100644 content/misc/_index.md
 create mode 100644 content/news/_index.de.md
 create mode 100644 content/tools/_index.de.md
 create mode 100644 themes/buha/layouts/_default/_markup/render-heading.html
 create mode 100644 themes/buha/layouts/_default/_markup/render-image.html
 create mode 100644 themes/buha/layouts/partials/l1/archive.html
 rename themes/buha/layouts/partials/{layout/lists => l1}/article_list.html (92%)
 create mode 100644 themes/buha/layouts/partials/l1/contact.html
 create mode 100644 themes/buha/layouts/partials/l1/easy_list.html
 create mode 100644 themes/buha/layouts/partials/l1/imprint.html
 rename themes/buha/layouts/partials/{layout/single => l1}/links.html (50%)
 create mode 100644 themes/buha/layouts/partials/l1/media.html
 create mode 100644 themes/buha/layouts/partials/l1/newsletter.html
 rename themes/buha/layouts/partials/{layout/lists/section_list.html => l1/section_list} (100%)
 delete mode 100644 themes/buha/layouts/partials/layout/lists/taxonomies_list.html
 delete mode 100644 themes/buha/layouts/partials/layout/lists/term_list.html
 create mode 100644 themes/buha/layouts/partials/layout/single/nottranslated.html
 create mode 100644 themes/buha/layouts/partials/snippets/.single_chooser.html.kate-swp

diff --git a/config.toml b/config.toml
index fe97905..e932de0 100644
--- a/config.toml
+++ b/config.toml
@@ -27,7 +27,7 @@ featured = 'featured'
 [params]
     # keywords for seo
     keywords = "buntes haus celle, buntes haus, bunteshaus, celle, buntes haus e.V., www.bunteshaus.de, celle, punk, reggae, ska, konzerte, partys, soziokultur, soziokulturelles zentrum celle, elektro, electroe, jugendzentrum, celle, dum n bass, konzert, musik, politik, kultur, alternativ, cd kaserne celle, cd kaserne, plenum, celle, antifa, antira, anti akw, anti atom celle, veranstaltungen, infoladen, proberaum celle, archiv für neue soziale bewegungen in celle, hartz 4 IV beratung celle, skaten, graffiti, sprayen, kunst, fahrradwerkstatt, deka dance celle, dekadance, Revista, probably the friendliest Place on Earth"
-    debug = true
+    debug = false
     #do you want a contact page?
     contact = true
 
diff --git a/content/about/_index.de.md b/content/about/_index.de.md
index 6fb3665..804bf0f 100644
--- a/content/about/_index.de.md
+++ b/content/about/_index.de.md
@@ -1,5 +1,6 @@
 ---
 title: "Über uns"
+layout: "article_list"
 ---
 Wir sind das Buntehaus, ein [soziokulturelles](/bunteshaus/soziokultur) Zentrum in Celle.  
 Wir leben vom mitmachen und so. 
diff --git a/content/archive/_index.de.md b/content/archive/_index.de.md
index ba47535..7875694 100644
--- a/content/archive/_index.de.md
+++ b/content/archive/_index.de.md
@@ -1,3 +1,4 @@
 ---
-type: "archive"
----
\ No newline at end of file
+title: "Archiv"
+layout: "archive"
+---
diff --git a/content/contact/_index.de.md b/content/contact/_index.de.md
index 81eeabf..561ef6f 100644
--- a/content/contact/_index.de.md
+++ b/content/contact/_index.de.md
@@ -1,4 +1,5 @@
 ---
+title: "Kontakt"
 layout: "contact"
 ---
-Konzerte: konzerte@bunteshaus.de
\ No newline at end of file
+Konzerte: konzerte@bunteshaus.de
diff --git a/content/events/_index.de.md b/content/events/_index.de.md
new file mode 100644
index 0000000..338976e
--- /dev/null
+++ b/content/events/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "EVENE"
+layout: "article_list"
+---
diff --git a/content/featured/_index.de.md b/content/featured/_index.de.md
new file mode 100644
index 0000000..2f8dcb4
--- /dev/null
+++ b/content/featured/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "featureds"
+layout: "article_list"
+---
diff --git a/content/imprint/_index.de.md b/content/imprint/_index.de.md
index b6687eb..331aa1d 100644
--- a/content/imprint/_index.de.md
+++ b/content/imprint/_index.de.md
@@ -1,4 +1,5 @@
 ---
+title: "Impressum"
 layout: "imprint"
 ---
 Angaben gemäß § 5 TMG
@@ -35,4 +36,4 @@ Die durch die Seitenbetreiber erstellten Inhalte und Werke auf diesen Seiten unt
 
 Die Nutzung unserer Webseite ist in der Regel ohne Angabe personenbezogener Daten möglich. Soweit auf unseren Seiten personenbezogene Daten (beispielsweise Name, Anschrift oder eMail-Adressen) erhoben werden, erfolgt dies, soweit möglich, stets auf freiwilliger Basis. Diese Daten werden ohne Ihre ausdrückliche Zustimmung nicht an Dritte weitergegeben.
 Wir weisen darauf hin, dass die Datenübertragung im Internet (z.B. bei der Kommunikation per E-Mail) Sicherheitslücken aufweisen kann. Ein lückenloser Schutz der Daten vor dem Zugriff durch Dritte ist nicht möglich.
-Der Nutzung von im Rahmen der Impressumspflicht veröffentlichten Kontaktdaten durch Dritte zur Übersendung von nicht ausdrücklich angeforderter Werbung und Informationsmaterialien wird hiermit ausdrücklich widersprochen. Die Betreiber der Seiten behalten sich ausdrücklich rechtliche Schritte im Falle der unverlangten Zusendung von Werbeinformationen, etwa durch Spam-Mails, vor.
\ No newline at end of file
+Der Nutzung von im Rahmen der Impressumspflicht veröffentlichten Kontaktdaten durch Dritte zur Übersendung von nicht ausdrücklich angeforderter Werbung und Informationsmaterialien wird hiermit ausdrücklich widersprochen. Die Betreiber der Seiten behalten sich ausdrücklich rechtliche Schritte im Falle der unverlangten Zusendung von Werbeinformationen, etwa durch Spam-Mails, vor.
diff --git a/content/links/_index.de.md b/content/links/_index.de.md
new file mode 100644
index 0000000..23bcfd8
--- /dev/null
+++ b/content/links/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "Links"
+layout: "links"
+---
diff --git a/content/misc/medien/Buntes.Haus.Celle.Logo.1.jpg b/content/media/Buntes.Haus.Celle.Logo.1.jpg
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Logo.1.jpg
rename to content/media/Buntes.Haus.Celle.Logo.1.jpg
diff --git a/content/misc/medien/Buntes.Haus.Celle.Logo.2.jpg b/content/media/Buntes.Haus.Celle.Logo.2.jpg
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Logo.2.jpg
rename to content/media/Buntes.Haus.Celle.Logo.2.jpg
diff --git a/content/misc/medien/Buntes.Haus.Celle.Logo.3.jpg b/content/media/Buntes.Haus.Celle.Logo.3.jpg
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Logo.3.jpg
rename to content/media/Buntes.Haus.Celle.Logo.3.jpg
diff --git a/content/misc/medien/Buntes.Haus.Celle.Logo.4.jpg b/content/media/Buntes.Haus.Celle.Logo.4.jpg
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Logo.4.jpg
rename to content/media/Buntes.Haus.Celle.Logo.4.jpg
diff --git a/content/misc/medien/Buntes.Haus.Celle.Logo.5.jpg b/content/media/Buntes.Haus.Celle.Logo.5.jpg
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Logo.5.jpg
rename to content/media/Buntes.Haus.Celle.Logo.5.jpg
diff --git a/content/misc/medien/Buntes.Haus.Celle.Logo.5.png b/content/media/Buntes.Haus.Celle.Logo.5.png
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Logo.5.png
rename to content/media/Buntes.Haus.Celle.Logo.5.png
diff --git a/content/misc/medien/Buntes.Haus.Celle.Zeichnung.jpg b/content/media/Buntes.Haus.Celle.Zeichnung.jpg
similarity index 100%
rename from content/misc/medien/Buntes.Haus.Celle.Zeichnung.jpg
rename to content/media/Buntes.Haus.Celle.Zeichnung.jpg
diff --git a/content/media/_index.de.md b/content/media/_index.de.md
new file mode 100644
index 0000000..f0b3e55
--- /dev/null
+++ b/content/media/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "Medien"
+layout: "media"
+---
diff --git a/content/misc/medien/index.de.md b/content/media/index.de.md
similarity index 52%
rename from content/misc/medien/index.de.md
rename to content/media/index.de.md
index eb783ca..534e0ef 100644
--- a/content/misc/medien/index.de.md
+++ b/content/media/index.de.md
@@ -1,7 +1,3 @@
----
-title: "Medien"
-date: 2021-06-22T23:00:00+02:00
----
 ![](0)  
 ![](1)  
 ![](2)  
diff --git a/content/misc/_index.de.md b/content/misc/_index.de.md
new file mode 100644
index 0000000..e45f3bd
--- /dev/null
+++ b/content/misc/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "Verschiedenes"
+layout: "section_list"
+---
diff --git a/content/misc/_index.md b/content/misc/_index.md
deleted file mode 100644
index 9dca41f..0000000
--- a/content/misc/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-type: "misc"
----
diff --git a/content/news/_index.de.md b/content/news/_index.de.md
new file mode 100644
index 0000000..c600675
--- /dev/null
+++ b/content/news/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "Neues"
+layout: "article_list"
+---
diff --git a/content/newsletter/_index.de.md b/content/newsletter/_index.de.md
index f33cad9..0d71e63 100644
--- a/content/newsletter/_index.de.md
+++ b/content/newsletter/_index.de.md
@@ -1,5 +1,6 @@
 ---
 title: "Newsletter"
+layout: "newsletter"
 ---
 Wenn ihr in unseren Newsletter aufgenommen werden wollt, schickt uns eine email!
 
diff --git a/content/tools/_index.de.md b/content/tools/_index.de.md
new file mode 100644
index 0000000..658043e
--- /dev/null
+++ b/content/tools/_index.de.md
@@ -0,0 +1,4 @@
+---
+title: "Tools"
+layout: "section_list"
+---
diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css
index deea30c..458351a 100644
--- a/themes/buha/assets/css/layout.css
+++ b/themes/buha/assets/css/layout.css
@@ -121,7 +121,6 @@ article {
 
 #articletext img {
 
-	border-radius: 15px;
 	width: 80%;
 }
 
@@ -209,6 +208,10 @@ input, textarea {
 	border-radius: 15px;
 }
 
+.borderrad4px {
+	border-radius: 4px;
+}
+
 .minmax {
 	width: auto; 
 	max-width: auto;
diff --git a/themes/buha/layouts/_default/_markup/render-heading.html b/themes/buha/layouts/_default/_markup/render-heading.html
new file mode 100644
index 0000000..7afe29a
--- /dev/null
+++ b/themes/buha/layouts/_default/_markup/render-heading.html
@@ -0,0 +1,7 @@
+    {{ $url := (printf "%s#%s" .Page.Permalink .Anchor)  | safeURL }}
+    <h{{ .Level }} id="{{ .Anchor | safeURL }}">
+        
+            <a class="heading-anchor" href="{{ $url }}">
+            {{ .Text | safeHTML }}
+        </a>
+    </h{{ .Level }}>
diff --git a/themes/buha/layouts/_default/_markup/render-image.html b/themes/buha/layouts/_default/_markup/render-image.html
new file mode 100644
index 0000000..5b4116c
--- /dev/null
+++ b/themes/buha/layouts/_default/_markup/render-image.html
@@ -0,0 +1,35 @@
+{{- if strings.HasPrefix .Destination "http" -}}
+    <a href="{{- .Destination -}}">
+        <img loading="lazy" 
+            src="{{ .Destination | safeURL }}" 
+            alt="{{ .Text }}" 
+            {{ with .Title}} title="{{ . }}"{{ end }} />
+        <div style="display: flex; justify-content: center;">{{ .Text }}</div>
+    </a>
+{{- else -}}
+    {{ if .Page.Resources.ByType "image" }}
+        {{ $nr := .Destination }}
+        {{- $pic := index (.Page.Resources.ByType "image") (int $nr) -}}
+        {{- $image := .Page.Resources.GetMatch (printf "%s" ($pic | safeURL)) -}}
+            <div>
+        <a href="{{- $image.Permalink -}}">
+            {{- $permalink := "" -}}
+
+            {{- if ne $image nil -}}
+            {{- $permalink = $image.RelPermalink -}}
+            {{- else -}}
+            {{- $image = imageConfig (printf "static/%s" (.Destination | safeURL)) -}}
+            {{- $permalink = (printf "/%s" (.Destination | safeURL)) -}}
+            {{- end -}}
+
+                <div style="display: flex; justify-content: center;"><img loading="lazy" 
+                src="{{ $permalink }}" 
+                alt="{{ .Text }}" 
+                {{ with .Title}} title="{{ . }}"{{ end }} 
+                width={{ $image.Width }} 
+                height="{{ $image.Height }}" class="borderrad4px" /></div>
+                <div style="display: flex; justify-content: center;">{{ .Text }}</div>
+        </a>
+            </div>
+    {{ end }}
+{{- end -}}
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index 2f56718..55697de 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -4,32 +4,36 @@
 
 {{ define "content" }}
     {{ partial "debug" (dict "context" . "caller" "list.html")}}
-
     {{- $pages := where .Site.RegularPages "Permalink" "!=" .Permalink -}}
-
-    {{ $partial := "layout/lists/article_list" }}
+    {{ $partial := "" }}
     {{ $title := "" }}
     {{ $pic := "true" }}
-    {{ if eq .Section "news" }}
-        {{- $pages = .Data.Pages -}}
-    {{ else if eq .Section "events" }}
-        {{- $pages = where $pages ".Params.when" "ne" nil -}}
-    {{ else if eq .Section "about" }}
-        {{- $pages = where $pages ".Params.about" "=" true -}}
-    {{ else if eq .Section "featured" }}
-        {{- $pages = where $pages ".Params.featured" "=" true -}}
-    {{ else if or (eq .Section "misc") (eq .Section "tools") }}
-        {{ $partial = "layout/lists/section_list" }}
-    {{ else if or (eq .Section "tags") (eq .Section "categories")}}
-        {{ $partial = "layout/lists/taxonomies_list" }}
+    {{ $pre := "l1" }}
+    {{ $part := .Layout }}
+    {{ $partial_before := "" }}
+    {{ if eq .Layout "article_list" }}
+        {{ if eq .Section "events" }}
+            {{- $pages = where $pages ".Params.when" "ne" nil -}}
+        {{ else if eq .Type "about" }}
+            {{- $pages = where $pages ".Params.about" "=" true -}}
+        {{ else if eq .Section "news" }}
+            {{- $pages = .Data.Pages -}}
+        {{ 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 }}
-        {{ $partial = "snippets/single_chooser" }}
-        {{ $pic = "false" }}
+        {{ if eq .Kind "term" }}
+            {{- $pages = .Data.Pages -}}
+            {{ $part = "easy_list" }}
+        {{ else if eq .Kind "taxonomy" }}
+            {{- $pages = .Data.Terms.Alphabetical -}}
+            {{ $part = "easy_list" }}
+        {{ end }}    
     {{ end }}
-    {{ if eq .Kind "term" }}
-        {{- $pages = .Data.Pages -}}
-        {{ $partial = "layout/lists/term_list" }}
+    {{ if and $pre $part }}
+        {{ $partial := string (printf "%s/%s" $pre $part) }}
+        {{ partial $partial (dict "context" . "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic "type" .Type "partial_before" $partial_before) }}
     {{ end }}
-    {{ $partial := string $partial }}
-    {{ partial $partial (dict "context" . "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic) }}
 {{ end }}
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index 52a6422..ca72b71 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -3,5 +3,16 @@
 {{ end }}
 
 {{ define "content" }}
-    {{ partial "snippets/single_chooser" (dict "context" . "pic" "true") }}
+   {{ partial "debug" (dict "context" . "caller" "single_chooser.html")}}
+    {{ $partial_before := "" }}
+    {{ $partial := "layout/single/article" }}
+    {{ $pic := "true" }}
+    {{ if eq .Params.tool "generator" }}
+        {{ $partial = "layout/single/generator" }}
+   {{ else if eq .Params.tool "nottranslated" }}
+        {{ $partial = "layout/single/nottranslated" }}
+    {{ end }}
+    <article>
+    {{ partial $partial (dict "context" . "pic" $pic "content" .Content  "partial_before" $partial_before) }}
+    </article>
 {{ end }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 5105020..997dbb9 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 "layout/lists/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
+        {{ partial "l1/article_list" (dict "context" . "pages" $featured "amount" "3" "title" "Featured") }}
 	{{ end }}
     {{ if gt (len $posts) 1 }}
-        {{ partial "layout/lists/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News") }}
+        {{ partial "l1/article_list" (dict "context" . "paginator" $paginator "amount" "5" "title" "News") }}
         <div id="pagination_outer" style="display: flex; justify-content: center;">
             {{ partial "snippets/paginator" (dict "paginator" $paginator) }}
         </div>
diff --git a/themes/buha/layouts/partials/l1/archive.html b/themes/buha/layouts/partials/l1/archive.html
new file mode 100644
index 0000000..f28f6a5
--- /dev/null
+++ b/themes/buha/layouts/partials/l1/archive.html
@@ -0,0 +1,15 @@
+<article>
+{{ partial "debug" (dict "context" . "caller" "archive.html" )}}
+{{ $prev := 3000}}
+{{range where site.RegularPages "Type" "in" site.Params.searchSections }}
+    {{ $date := .Date }}
+    {{ if gt $prev ($date.Format "2006") }}
+        <h2>{{ $date.Format "2006" }}</h2>
+    {{end}}
+    <div class="frow">
+        <div class="underline" style="margin-right: 1em;"><a href="{{.Permalink}}">{{ .Title }}</a></div>
+        <div class="frow" style="margin-right: 1em;">{{- $date.Format "02" }}. {{ if $date.Format "Jan" | i18n }}{{ $date.Format "Jan" | i18n -}}{{- else -}} {{- $date.Format "Jan" -}}{{- end }} {{ $date.Format "2006 15:04" }}</div><br>
+    </div>	
+    {{ $prev = $date.Format "2006"}}
+{{end}}
+</article>
diff --git a/themes/buha/layouts/partials/layout/lists/article_list.html b/themes/buha/layouts/partials/l1/article_list.html
similarity index 92%
rename from themes/buha/layouts/partials/layout/lists/article_list.html
rename to themes/buha/layouts/partials/l1/article_list.html
index 44fae32..5598f5a 100644
--- a/themes/buha/layouts/partials/layout/lists/article_list.html
+++ b/themes/buha/layouts/partials/l1/article_list.html
@@ -10,7 +10,7 @@
         {{ partial "snippets/content" (dict "content" .content) }}
     {{ end }}
     {{- if gt (len $pages) 0 -}}
-        {{ if .title }}<h2>{{ .title }}</h2>{{ end }}
+        {{ if .title }}<h2 style="margin-left: .6rem;">{{ .title }}</h2>{{ end }}
         {{- range first $amount $pages -}}
             <article class="articlebgcol1 borderrad25">
                 <a href="{{- .Permalink -}}">
diff --git a/themes/buha/layouts/partials/l1/contact.html b/themes/buha/layouts/partials/l1/contact.html
new file mode 100644
index 0000000..d32809c
--- /dev/null
+++ b/themes/buha/layouts/partials/l1/contact.html
@@ -0,0 +1,33 @@
+{{ $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/easy_list.html b/themes/buha/layouts/partials/l1/easy_list.html
new file mode 100644
index 0000000..86f60a9
--- /dev/null
+++ b/themes/buha/layouts/partials/l1/easy_list.html
@@ -0,0 +1,6 @@
+<article>
+{{ $type := .type }}
+{{ range .pages }}
+        <a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ if eq $type "taxonomy"}}{{ .Count }}{{ end }}
+{{ end }}
+</article>
diff --git a/themes/buha/layouts/partials/l1/imprint.html b/themes/buha/layouts/partials/l1/imprint.html
new file mode 100644
index 0000000..d32809c
--- /dev/null
+++ b/themes/buha/layouts/partials/l1/imprint.html
@@ -0,0 +1,33 @@
+{{ $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/layout/single/links.html b/themes/buha/layouts/partials/l1/links.html
similarity index 50%
rename from themes/buha/layouts/partials/layout/single/links.html
rename to themes/buha/layouts/partials/l1/links.html
index 066f09b..156030a 100644
--- a/themes/buha/layouts/partials/layout/single/links.html
+++ b/themes/buha/layouts/partials/l1/links.html
@@ -1,6 +1,6 @@
 {{ range .context.Pages }}
 <article>
-    <a href="{{ .Params.link }}">{{ .Params.link }}</a>
+    <a href="{{ .Params.link }}" class="underline">{{ .Params.link }}</a>
     {{ .Title }}
 </article>
 {{ end }}
diff --git a/themes/buha/layouts/partials/l1/media.html b/themes/buha/layouts/partials/l1/media.html
new file mode 100644
index 0000000..9f89d96
--- /dev/null
+++ b/themes/buha/layouts/partials/l1/media.html
@@ -0,0 +1,5 @@
+<article>
+{{ range .context.Resources.ByType "image" }}
+    <img src="{{ .Permalink }}" class="borderrad4px"/>
+{{ end }}
+</article>
diff --git a/themes/buha/layouts/partials/l1/newsletter.html b/themes/buha/layouts/partials/l1/newsletter.html
new file mode 100644
index 0000000..d32809c
--- /dev/null
+++ b/themes/buha/layouts/partials/l1/newsletter.html
@@ -0,0 +1,33 @@
+{{ $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/layout/lists/section_list.html b/themes/buha/layouts/partials/l1/section_list
similarity index 100%
rename from themes/buha/layouts/partials/layout/lists/section_list.html
rename to themes/buha/layouts/partials/l1/section_list
diff --git a/themes/buha/layouts/partials/layout/lists/taxonomies_list.html b/themes/buha/layouts/partials/layout/lists/taxonomies_list.html
deleted file mode 100644
index 20d08c9..0000000
--- a/themes/buha/layouts/partials/layout/lists/taxonomies_list.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ range .context.Data.Terms.Alphabetical }}
-        <li><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ .Count }}</li>
-{{ end }}
diff --git a/themes/buha/layouts/partials/layout/lists/term_list.html b/themes/buha/layouts/partials/layout/lists/term_list.html
deleted file mode 100644
index b0bea2e..0000000
--- a/themes/buha/layouts/partials/layout/lists/term_list.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ range .context.Pages }}
-    {{ .Title }}<br>
-{{ end }}
-
diff --git a/themes/buha/layouts/partials/layout/single/article.html b/themes/buha/layouts/partials/layout/single/article.html
index 2fa9d92..bffc4db 100644
--- a/themes/buha/layouts/partials/layout/single/article.html
+++ b/themes/buha/layouts/partials/layout/single/article.html
@@ -29,9 +29,9 @@
     {{ partial "snippets/article_metadata" $metas }}
     <div id="articleinner">
         {{ if and (ne $img "") (eq .pic "true")}}
-            <div id="articlepicture" class="{{ $small }} borderrad25">
+            <div id="articlepicture" class="{{ $small }}" >
                 {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                    <img src="{{- $thumb.Permalink -}}" class="borderrad25" />
+                    <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
                 {{ if ne .type "list" }}</a>{{ end }}
                 {{ if eq .type "article" }}{{ end }}
             </div>
diff --git a/themes/buha/layouts/partials/layout/single/content_single.html b/themes/buha/layouts/partials/layout/single/content_single.html
index 363cc41..d32809c 100644
--- a/themes/buha/layouts/partials/layout/single/content_single.html
+++ b/themes/buha/layouts/partials/layout/single/content_single.html
@@ -17,9 +17,9 @@
 {{ end }}
  <div id="articleinner">
     {{ if and (ne $img "") (eq .pic true)}}
-         <div id="articlepicture" class="{{ $small }} borderrad25">
+         <div id="articlepicture" class="{{ $small }}">
             {{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
-                <img src="{{- $thumb.Permalink -}}" class="borderrad25" />
+                <img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
             {{ if ne .type "list" }}</a>{{ end }}
             {{ if eq .type "article" }}{{ end }}
         </div>
diff --git a/themes/buha/layouts/partials/layout/single/nottranslated.html b/themes/buha/layouts/partials/layout/single/nottranslated.html
new file mode 100644
index 0000000..9a16e2b
--- /dev/null
+++ b/themes/buha/layouts/partials/layout/single/nottranslated.html
@@ -0,0 +1,25 @@
+{{ $l1 := slice }}
+{{ $l2 := slice }}
+{{ range $.Site.Home.Translations }}
+  {{ $l1 = $l1 | append .Language }}
+{{ end }}
+
+{{ $all_lang := $.Site.Home.Translations }}
+{{ range where site.RegularPages "Type" "in" site.Params.searchSections }}
+  {{ $missing := slice}}
+  {{ if .Translations }}
+  {{ range .Translations }}
+    {{ $l2 = $l2 | append .Language }}
+  {{ end }}
+  {{ $final := $l1 | complement $l2 }}
+    {{ range $final }}
+      {{ $missing = $missing | append . }}
+    {{ end }}
+  {{ else }}
+    {{ $missing = $missing | append "all translations" }}
+  {{ end }}
+  {{ if $missing }}
+    <a href="{{ .Permalink}}" style="margin-top: 1rem;" class="underline">{{ .Name }}:</a>
+    <div>missing: {{ index $missing 0 }}</div>
+  {{ end }}
+{{ end }}
diff --git a/themes/buha/layouts/partials/snippets/.single_chooser.html.kate-swp b/themes/buha/layouts/partials/snippets/.single_chooser.html.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..53d20ac60de3175383dda515abdcb32a1ae270ba
GIT binary patch
literal 259
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn>DOLRpU-znd!F{OYvwcf%0<o2Bm@Tm
zWw?PD1o%K4E-;gUp$5d^gmQR691dg-JCtJvl3{~#EI=GqD8~rIVS#cCKpbW$M-0Sa
zf^u|097ZTdJ`~8{1`%8!f)hk=fCzRF!3H8&K?DnkU<MIPAnhOkG9nNp!srSB6!sYP

literal 0
HcmV?d00001

diff --git a/themes/buha/layouts/partials/snippets/article_metadata.html b/themes/buha/layouts/partials/snippets/article_metadata.html
index 916668c..7751438 100644
--- a/themes/buha/layouts/partials/snippets/article_metadata.html
+++ b/themes/buha/layouts/partials/snippets/article_metadata.html
@@ -12,7 +12,7 @@
 					{{ end }}
 				{{ end }}
 				{{ if .contact }}
-					<div>{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} {{ site.Params.imprintdata.tel }}</div>
+					<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>
 				{{ end }}
 				{{ if .covid }}
 					<div>Covid: {{ .covid }}</div>
diff --git a/themes/buha/layouts/partials/snippets/contact.html b/themes/buha/layouts/partials/snippets/contact.html
index d8b273c..296bceb 100644
--- a/themes/buha/layouts/partials/snippets/contact.html
+++ b/themes/buha/layouts/partials/snippets/contact.html
@@ -2,5 +2,5 @@
 {{ site.Params.imprintdata.street }}<br>
 {{ if i18n "pobox" }}{{ i18n "pobox" }}{{ else }}{{ "Po.Box" }}{{ end }} {{ site.Params.imprintdata.pobox }}<br>
 {{ site.Params.imprintdata.city }}<br>
-{{ if site.Params.imprintdata.tel }}<p>{{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: {{ site.Params.imprintdata.tel }}</p>{{ end }}
+{{ if site.Params.imprintdata.tel }}<p>{{ if i18n "phone" }}{{ i18n "phone" }}{{ else }}{{ "phone" }}{{ end }}: <a href="tel://{{ site.Params.imprintdata.tel }}">{{ site.Params.imprintdata.tel }}</a></p>{{ end }}
 {{ if site.Params.imprintdata.mail }}<p>{{ if i18n "mail" }}{{ i18n "mail" }}{{ else }}{{ "mail" }}{{ end }}: {{ site.Params.imprintdata.mail | markdownify }}{{ end }}</p>
diff --git a/themes/buha/layouts/partials/snippets/single_chooser.html b/themes/buha/layouts/partials/snippets/single_chooser.html
index 0e05f2b..8f2ba07 100644
--- a/themes/buha/layouts/partials/snippets/single_chooser.html
+++ b/themes/buha/layouts/partials/snippets/single_chooser.html
@@ -2,20 +2,10 @@
     {{ $partial_before := "" }}
     {{ $partial := "layout/single/article" }}
     {{ $pic := .pic }}
-    {{ if eq (lower .context.Section) "imprint" }}
-       {{ $partial_before = "snippets/contact" }}
-       {{ $partial = "layout/single/content_single" }}
-       {{ $pic = false }}
-    {{ else if eq (lower .context.Section) "contact" }}
-       {{ $partial_before = "snippets/contact" }}
-       {{ $partial = "layout/single/content_single" }}
-       {{ $pic = true }}
-    {{ else if eq (lower .context.Section) "links" }}
-        {{ $partial = "layout/single/links" }}
-    {{ else if eq (lower .context.Section) "archive" }}
-        {{ $partial = "layout/single/archive" }}
-    {{ else if eq .context.Title "Generator" }}
+    {{ 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) }}

From 20139b8f8dc5815398e9b4c312aca9eba3644856 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 10 Apr 2022 02:24:33 +0200
Subject: [PATCH 3/7] second batch of restructure

---
 content/media/index.de.md                     |   7 -----
 content/news/29-11-2022-tanzabend/index.de.md |   5 ++++
 themes/buha/archetypes/default.md             |  11 --------
 themes/buha/archetypes/news.md                |   9 -------
 themes/buha/layouts/_default/list.html        |  12 ++++++---
 themes/buha/layouts/index.html                |   1 +
 ...{easy_list.html => tags_n_categories.html} |   0
 .../partials/layout/single/article.html       |  24 ++++++++++++++++++
 .../layout/single/generator/form.html         |   2 +-
 .../snippets/.single_chooser.html.kate-swp    | Bin 259 -> 0 bytes
 themes/buha/static/js/generator.js            |  14 ++++++++--
 11 files changed, 52 insertions(+), 33 deletions(-)
 delete mode 100644 content/media/index.de.md
 create mode 100644 content/news/29-11-2022-tanzabend/index.de.md
 delete mode 100644 themes/buha/archetypes/default.md
 rename themes/buha/layouts/partials/l1/{easy_list.html => tags_n_categories.html} (100%)
 delete mode 100644 themes/buha/layouts/partials/snippets/.single_chooser.html.kate-swp

diff --git a/content/media/index.de.md b/content/media/index.de.md
deleted file mode 100644
index 534e0ef..0000000
--- a/content/media/index.de.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![](0)  
-![](1)  
-![](2)  
-![](3)  
-![](4)  
-![](5)  
-![](6)  
diff --git a/content/news/29-11-2022-tanzabend/index.de.md b/content/news/29-11-2022-tanzabend/index.de.md
new file mode 100644
index 0000000..b281b79
--- /dev/null
+++ b/content/news/29-11-2022-tanzabend/index.de.md
@@ -0,0 +1,5 @@
+---
+title: "La Le Lu"
+date: 2022-04-10T01:08:23+02:00
+---
+sadasd
diff --git a/themes/buha/archetypes/default.md b/themes/buha/archetypes/default.md
deleted file mode 100644
index d12345a..0000000
--- a/themes/buha/archetypes/default.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: ""
-date: {{ .Date }}
-when: ""
-price: ""
-covid: ""
-contact: ""
-categories: []
-tags: []
-events: []
----
diff --git a/themes/buha/archetypes/news.md b/themes/buha/archetypes/news.md
index f4b5008..a14e469 100644
--- a/themes/buha/archetypes/news.md
+++ b/themes/buha/archetypes/news.md
@@ -1,13 +1,4 @@
 ---
 title: ""
 date: {{ .Date }}
-newscategories: []
-eventcategories: []
-when: ""
-featured: false
-covid: ""
-contact: ""
-price: ""
-draft: false
-tags: []
 ---
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index 55697de..c777927 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -9,8 +9,10 @@
     {{ $title := "" }}
     {{ $pic := "true" }}
     {{ $pre := "l1" }}
+    {{- $paginator := "" -}}
     {{ $part := .Layout }}
     {{ $partial_before := "" }}
+    {{ $paginate := true }}
     {{ if eq .Layout "article_list" }}
         {{ if eq .Section "events" }}
             {{- $pages = where $pages ".Params.when" "ne" nil -}}
@@ -26,14 +28,18 @@
     {{ else }}
         {{ if eq .Kind "term" }}
             {{- $pages = .Data.Pages -}}
-            {{ $part = "easy_list" }}
+            {{ $part = "article_list" }}
         {{ else if eq .Kind "taxonomy" }}
             {{- $pages = .Data.Terms.Alphabetical -}}
-            {{ $part = "easy_list" }}
+            {{ $part = "tags_n_categories" }}
+            {{ $paginate = false }}
         {{ end }}    
     {{ end }}
+    {{ if eq $paginate true}}
+        {{- $paginator = .Paginate $pages -}}
+    {{ end }}
     {{ if and $pre $part }}
         {{ $partial := string (printf "%s/%s" $pre $part) }}
-        {{ partial $partial (dict "context" . "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic "type" .Type "partial_before" $partial_before) }}
+        {{ partial $partial (dict "context" . "paginator" $paginator "pages" $pages "amount" "5" "title" $title "content" .Content "pic" $pic "type" .Type "partial_before" $partial_before) }}
     {{ end }}
 {{ end }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 997dbb9..95e8794 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -3,6 +3,7 @@
 {{ end }}
 
 {{ define "content" }}
+    {{ time.Format "Monday, Jan 2, 2006" "2015-01-21" }}
 	{{- $all := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }}
 	{{ $days := int (mul (mul (int .Site.Params.featured_expire) 7) -1) }}
 	{{ $featured := where (where (where $all ".Params.featured" "=" true) "Type" "in" .Site.Params.searchSections) ".Params.Lastmod" "gt" (now.AddDate 0 0 $days) }}
diff --git a/themes/buha/layouts/partials/l1/easy_list.html b/themes/buha/layouts/partials/l1/tags_n_categories.html
similarity index 100%
rename from themes/buha/layouts/partials/l1/easy_list.html
rename to themes/buha/layouts/partials/l1/tags_n_categories.html
diff --git a/themes/buha/layouts/partials/layout/single/article.html b/themes/buha/layouts/partials/layout/single/article.html
index bffc4db..839ab51 100644
--- a/themes/buha/layouts/partials/layout/single/article.html
+++ b/themes/buha/layouts/partials/layout/single/article.html
@@ -46,3 +46,27 @@
             </div>
         {{- end }}
     </div>
+
+{{ define "pagefooter" }}
+    {{ if and (eq .Kind "page") (or (eq .Section "news") (eq .Section "events") (eq .Section "about")) }}
+		<div id="article_footer">
+			<div style="flex-grow: 1; flex-direction: column;">
+				<b>{{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}</b><br>
+				{{ .Date | time.Format ":date_full" }}
+			</div>
+			{{ if ne .Date .Lastmod }}	
+				<div style="flex-grow: 1; flex-direction: column;">
+					<b>{{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}</b><br>
+					{{ .Lastmod | time.Format ":date_full" }}
+				</div>
+			{{ end }}
+		</div>
+    {{ end }}
+{{ end }}
+
+
+{{ define "sidebar" }}
+    {{ if ne .Type "tools" }}
+        {{- partial "contentlayouts/menu.html" . }}
+    {{ end }}
+{{ end }}
diff --git a/themes/buha/layouts/partials/layout/single/generator/form.html b/themes/buha/layouts/partials/layout/single/generator/form.html
index 11fe41b..bddeed1 100644
--- a/themes/buha/layouts/partials/layout/single/generator/form.html
+++ b/themes/buha/layouts/partials/layout/single/generator/form.html
@@ -131,7 +131,7 @@
             <div class="margin_top_1rem {{ if .group }} visibleIf margin_left_1rem" data-visibleif-rule=" {{ .group }}group == 'true' {{ end }}" class="minmax">
                 <div class="minmax" style="display: flex; flex-direction: column;">
                     <label class="{{ if $pageform.names }}sr-only{{ end }}" for="{{ .title }}">{{ .name }}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
-                    <input type="{{ .input_type }}" name="{{ .title }}" id="{{ .title }}" {{ if $pageform.names }}placeholder="{{ .name }}{{ .Scratch.Get "requiredstar" }}"{{ end }} {{ .Scratch.Get "requiredtext" }}>
+                    <input type="{{ .input_type }}" name="{{ .title }}" id="{{ .title }}" {{ if $pageform.names }}placeholder="{{ .name }}"{{ end }}>
                 </div>
             </div>
         {{ end }}
diff --git a/themes/buha/layouts/partials/snippets/.single_chooser.html.kate-swp b/themes/buha/layouts/partials/snippets/.single_chooser.html.kate-swp
deleted file mode 100644
index 53d20ac60de3175383dda515abdcb32a1ae270ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 259
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn>DOLRpU-znd!F{OYvwcf%0<o2Bm@Tm
zWw?PD1o%K4E-;gUp$5d^gmQR691dg-JCtJvl3{~#EI=GqD8~rIVS#cCKpbW$M-0Sa
zf^u|097ZTdJ`~8{1`%8!f)hk=fCzRF!3H8&K?DnkU<MIPAnhOkG9nNp!srSB6!sYP

diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js
index cf59d5b..94bc8d0 100644
--- a/themes/buha/static/js/generator.js
+++ b/themes/buha/static/js/generator.js
@@ -30,8 +30,10 @@ function showInput(e) {
   var output_info = document.getElementById("myform");
   var display = document.getElementById("display");
 
+
+  
   var d = new Date();
-  var datestring = d.getFullYear() + "-" + ("0"+(d.getMonth()+1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2) + "T" + ("0" + d.getHours()).slice(-2) + ":" + ("0" + d.getMinutes()).slice(-2) + ":00+02:00\"";
+  var datestring = d.getFullYear() + "-" + ("0"+(d.getMonth()+1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2) + "T" + ("0" + d.getHours()).slice(-2) + ":" + ("0" + d.getMinutes()).slice(-2) + ":00+02:00";
 
   var form = document.querySelector('form[id="myform"]');
   var title = form.elements['title'].value;
@@ -49,6 +51,11 @@ function showInput(e) {
   var featured = check_checkboxes('featured');
   var about = check_checkboxes('about');
 
+  var lastmod = form.elements['lastmod'].value;
+  if (lastmod) {
+    var dl = new Date(lastmod);
+    var lastmod = dl.getFullYear() + "-" + ("0"+(dl.getMonth()+1)).slice(-2) + "-" + ("0" + dl.getDate()).slice(-2) + "T" + "14:" + "00:00+02:00";
+}
 
   if (newtags != '""') {
     var ntags = newtags;
@@ -105,7 +112,7 @@ function showInput(e) {
   if (title && content) {
     display.innerHTML += "---<br>";
     display.innerHTML += "title: \"" + title + "\"<br>";
-    display.innerHTML += "date: \"" + datestring + "<br>";
+    display.innerHTML += "date: " + datestring + "<br>";
 
     if (featured != '') {
       display.innerHTML += "featured: true<br>";
@@ -136,6 +143,9 @@ function showInput(e) {
     if (price) {
         display.innerHTML += "price: \"" + price + "\"<br>";
     }
+    if (lastmod) {
+        display.innerHTML += "lastmod: " + lastmod + "<br>";
+    }
     if (contact) {
         display.innerHTML += "contact: \"" + contact + "\"<br>";
     }

From 68bb2e7ec002147925c063f1c95a40d0e553760c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 10 Apr 2022 02:27:54 +0200
Subject: [PATCH 4/7] second batch of restructure, fix

---
 content/tools/generator.de.md      | 4 ++++
 themes/buha/static/js/generator.js | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/content/tools/generator.de.md b/content/tools/generator.de.md
index ad3e39d..7b2a04c 100644
--- a/content/tools/generator.de.md
+++ b/content/tools/generator.de.md
@@ -40,6 +40,10 @@ forms:
         name: "Eventkategorien"
         expanded: false
         new: "Neue Events"
+      - title: covid
+        group: misc
+        input_type: text
+        name: "Bemerkung zu Covid"
       - title: featured
         group: misc
         input_type: checkbox
diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js
index 94bc8d0..0900c61 100644
--- a/themes/buha/static/js/generator.js
+++ b/themes/buha/static/js/generator.js
@@ -39,7 +39,7 @@ function showInput(e) {
   var title = form.elements['title'].value;
   var content = form.elements['content'].value;
   var when = form.elements['when'].value;
-  // var covid = form.elements['newcovid'].value;
+  var covid = form.elements['covid'].value;
   var price = form.elements['price'].value;
   var contact = form.elements['contact'].value;
   var events = check_checkboxes('events');
@@ -137,9 +137,9 @@ function showInput(e) {
     if (ntags) {
         display.innerHTML += "tags: \[" + ntags + "]<br>";
     }
-    // if (covid) {
-    //     display.innerHTML += "covid: \"" + covid + "\"<br>";
-    // }
+    if (covid) {
+        display.innerHTML += "covid: \"" + covid + "\"<br>";
+    }
     if (price) {
         display.innerHTML += "price: \"" + price + "\"<br>";
     }

From 5728b9e1ac8c053233cac402ca788d3de570cbcc Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 10 Apr 2022 02:28:59 +0200
Subject: [PATCH 5/7] second batch of restructure, fix

---
 themes/buha/layouts/partials/layout/single/generator/form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/buha/layouts/partials/layout/single/generator/form.html b/themes/buha/layouts/partials/layout/single/generator/form.html
index bddeed1..3dd9289 100644
--- a/themes/buha/layouts/partials/layout/single/generator/form.html
+++ b/themes/buha/layouts/partials/layout/single/generator/form.html
@@ -35,7 +35,7 @@
             <label><input type="checkbox" name="{{ .title }}" id="{{ .title }}" value="{{ .name }}" {{ .Scratch.Get "requiredtext" }}>{{- $name -}}{{- if .required -}}{{- " *" -}}{{- end -}}</label>
         </div>
     {{ else if eq .input_type "results" }}
-          <div id='display' class="result" style="white-space: pre; display: none; background: var(--background-body); padding: .6rem 0 1rem 1rem;"></div>
+          <div id='display' class="result" style="white-space: pre; display: none; background: var(--background-body); padding: .6rem 0 1rem 1rem; margin-top: 1rem;"></div>
     {{ else if eq .input_type "submit" }}
         <div class="margin_top_1rem {{ if .group }}visibleIf margin_left_1rem" data-visibleif-rule="{{ .group }}group == 'true'{{ end }}">
             <input type="{{ .input_type }}" value="{{- $name -}}" onclick="showInput(event);" />

From 349664892b9c381d64d8f90598561337f57f024c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 10 Apr 2022 02:31:00 +0200
Subject: [PATCH 6/7] second batch of restructure, fix

---
 docs/.todo.de.kate-swp       | Bin 0 -> 90 bytes
 docs/artikel_formatierung.md |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 docs/.todo.de.kate-swp

diff --git a/docs/.todo.de.kate-swp b/docs/.todo.de.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..92ef33b514ecbadbb62fc159be5367b06452a424
GIT binary patch
literal 90
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn*{wK3y7g68e#L*M((T)qURe-hpdB0p
dl;H(pOCYv#1#|g<Oc2m>4GslT{1A%I6#!QO6runC

literal 0
HcmV?d00001

diff --git a/docs/artikel_formatierung.md b/docs/artikel_formatierung.md
index eab935e..24d6122 100644
--- a/docs/artikel_formatierung.md
+++ b/docs/artikel_formatierung.md
@@ -23,7 +23,9 @@ Soll eine neue Zeile angefangen werden, schreibe zwei Leerzeichen hinter den Sat
 
 #### Absatz
 Soll ein Absatz gemacht werden, lasse eine Zeile zwischen dem ersten und dem neuen Absatz frei.  
-Eine Link kann einfach geschrieben werden, allerdings kann man diesen auch gestalten:  
+
+#### Links
+Eine Link kann einfach so geschrieben werden, allerdings kann man diesen auch gestalten:  
 `[Bunteshaus](https://bunteshaus.de)` wird [Bunteshaus](https://bunteshaus.de)  
 
 #### Bilder

From 1bc416d9e454b7ceafd77c037f307eea85c7a322 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 10 Apr 2022 02:31:42 +0200
Subject: [PATCH 7/7] second batch of restructure, fix

---
 themes/buha/layouts/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 95e8794..997dbb9 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -3,7 +3,6 @@
 {{ end }}
 
 {{ define "content" }}
-    {{ time.Format "Monday, Jan 2, 2006" "2015-01-21" }}
 	{{- $all := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }}
 	{{ $days := int (mul (mul (int .Site.Params.featured_expire) 7) -1) }}
 	{{ $featured := where (where (where $all ".Params.featured" "=" true) "Type" "in" .Site.Params.searchSections) ".Params.Lastmod" "gt" (now.AddDate 0 0 $days) }}