diff --git a/themes/buha/layouts/_default/imprint.html b/themes/buha/layouts/_default/imprint.html
index e36ad424..8cbbb401 100644
--- a/themes/buha/layouts/_default/imprint.html
+++ b/themes/buha/layouts/_default/imprint.html
@@ -20,7 +20,7 @@
         </div>
 {{ end }}
 <article>
-{{ partial "contact.html" }}
+{{ partial "contentlayouts/contact" }}
 {{ i18n "executive" }}: {{ site.Params.imprintdata.executive }}
 {{ .Content }}
 </article>
diff --git a/themes/buha/layouts/partials/contentlayouts/article.html b/themes/buha/layouts/partials/contentlayouts/article.html
index 586b2f02..492d682c 100644
--- a/themes/buha/layouts/partials/contentlayouts/article.html
+++ b/themes/buha/layouts/partials/contentlayouts/article.html
@@ -22,7 +22,6 @@
 			{{ $showmeta = "true" }}
 			{{ $covid = true }}
 		{{ end }}
-		
 		{{ if and (eq $showmeta "true") (ne .type "contact") }}
 			<div id="articlemeta" style="font-size: smaller;">
 				{{ if eq $when true }}
@@ -79,7 +78,7 @@
 			{{ end }}
 			{{- if or .context.Content .context.Summary -}}
 				<div id="articletext" class="{{ $big }}">
-					{{ if eq .type "contact" }}{{ partial "contact.html" }}{{ end }}
+					{{ if eq .type "contact" }}{{ partial "contentlayouts/contact" }}{{ end }}
 					{{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
 					{{ if and .context.Truncated (eq .type "list") }}
 						<div id="readmore">{{- i18n "readmore" -}}..</div>
diff --git a/themes/buha/layouts/partials/contact.html b/themes/buha/layouts/partials/contentlayouts/contact.html
similarity index 100%
rename from themes/buha/layouts/partials/contact.html
rename to themes/buha/layouts/partials/contentlayouts/contact.html
diff --git a/themes/buha/layouts/partials/form.html b/themes/buha/layouts/partials/misc/form.html
similarity index 100%
rename from themes/buha/layouts/partials/form.html
rename to themes/buha/layouts/partials/misc/form.html
diff --git a/themes/buha/layouts/partials/misc/generator.html b/themes/buha/layouts/partials/misc/generator.html
index 165e156c..c52a91e9 100644
--- a/themes/buha/layouts/partials/misc/generator.html
+++ b/themes/buha/layouts/partials/misc/generator.html
@@ -8,7 +8,7 @@
 <noscript><p><b>Bitte aktiviere Javascript, sonst funktioniert der Generator nicht.</b></p></noscript>
 
 {{ if (index .Page.Params.forms 0) }}
-  {{ partial "form.html" (dict "context" . "form" 0) }}
+  {{ partial "misc/form" (dict "context" . "form" 0) }}
 {{ end }}
 
 </article>
diff --git a/themes/buha/layouts/partials/structure/footer.html b/themes/buha/layouts/partials/structure/footer.html
index 0c855675..49993363 100644
--- a/themes/buha/layouts/partials/structure/footer.html
+++ b/themes/buha/layouts/partials/structure/footer.html
@@ -5,7 +5,7 @@
 			{{ $contact = i18n "contact" }}
 		{{ end }}
 		<a href="{{- "contact" | absLangURL -}}">{{- $contact | strings.FirstUpper -}}:</a><br><br>
-		{{- partial "contact.html" -}}
+		{{- partial "contentlayouts/contact" -}}
 	</div>
 {{- end -}}
 
diff --git a/themes/buha/layouts/shortcodes/picture.html b/themes/buha/layouts/shortcodes/picture.html
deleted file mode 100644
index eef29795..00000000
--- a/themes/buha/layouts/shortcodes/picture.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ $nr := index .Params 0 }}
-{{ $alt := "sry_no_desc" }}
-{{ if index .Params 1}}{{ $alt = index .Params 1 }}{{ end }}
-{{- $pic := index ($.Page.Resources.ByType "image") $nr -}}
-<a href="{{- $pic.Permalink -}}"><img src="{{- $pic.Permalink -}}" alt="{{ $alt }}" /></a>