diff --git a/content/tools/generator.de.md b/content/tools/generator.de.md
index 54fd6f2c..73073d35 100644
--- a/content/tools/generator.de.md
+++ b/content/tools/generator.de.md
@@ -29,7 +29,7 @@ forms:
         buttons: "headline,Überschrift;url,URL;pic,Bild;bold,Fett;paragraph,Absatz;newline,Neue Zeile"
         required: true
         placeholder: "Der Inhalt des Artikels. Denke an die Formatierungshilfe hinter dem Link oben."
-      - title: categories
+      - title: news
         input_type: rb
         name: "Kategorie"
         expanded: true
@@ -117,3 +117,5 @@ Hier kannst du einen neuen Artikel generieren.
 
 
 **Einträge mit * sind minimal erforderlich.**
+
+{{< generator >}}
diff --git a/content/tools/not_translated.de.md b/content/tools/not_translated.de.md
index 6d6b2491..864a9e5d 100644
--- a/content/tools/not_translated.de.md
+++ b/content/tools/not_translated.de.md
@@ -6,3 +6,4 @@ type: "tools"
 tool: "nottranslated"
 banner: false
 ---
+{{< not_translated >}}
diff --git a/themes/buha/layouts/partials/layout/tags_n_categories.html b/themes/buha/layouts/partials/layout/tags_n_categories.html
deleted file mode 100644
index 28ac94a4..00000000
--- a/themes/buha/layouts/partials/layout/tags_n_categories.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{{ $type := .type }}
-<div>
-{{ range .pages }}
-        <a href="{{ .Page.Permalink }}" class="underline" style="margin-right: 1rem;">{{ .Page.Title }} {{ if eq $type "tags"}}{{ .Count }}{{ end }}</a>
-{{ end }}
-</div>
diff --git a/themes/buha/layouts/posts/list.html b/themes/buha/layouts/posts/list.html
new file mode 100644
index 00000000..c8426dc1
--- /dev/null
+++ b/themes/buha/layouts/posts/list.html
@@ -0,0 +1,25 @@
+{{ define "intro" }}
+    {{ if ne .Content "" }}
+        {{ partial "snippets/content" (dict "content" .Content) }}
+    {{ end }}
+{{ end }}
+
+{{ define "content" }}
+    {{- $pages := where .Site.RegularPages "Section" "in" .Site.Params.searchSections -}}
+    {{ partial "news/gen_list" (dict "context" . "pages" $pages "content" .Content "type" .Type "paginate" true) }}
+{{ end }}
+
+{{ define "sidebar" }}
+        <aside class="sidebar">
+            <h3 class="align_menu">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</h3>
+                {{ range $taxonomyname, $taxonomy := .Site.Taxonomies.news }}
+                    {{ $orig := $taxonomyname }}
+                    {{ if ne (i18n $taxonomyname) "" }}
+                        {{ $taxonomyname = i18n $taxonomyname }}
+                    {{ else }}
+                        {{ $taxonomyname = $taxonomyname | humanize }}
+                    {{ end }}
+                    <div class="align_menu"><a href="{{ "news/" | relLangURL}}{{ $orig | urlize }}">{{ $taxonomyname }}</a></div>
+                {{ end }}
+        </aside>
+{{ end }}
diff --git a/themes/buha/layouts/partials/tools/generator.html b/themes/buha/layouts/shortcodes/generator.html
similarity index 58%
rename from themes/buha/layouts/partials/tools/generator.html
rename to themes/buha/layouts/shortcodes/generator.html
index 5dccb858..45d01b42 100644
--- a/themes/buha/layouts/partials/tools/generator.html
+++ b/themes/buha/layouts/shortcodes/generator.html
@@ -1,10 +1,4 @@
-<div class="generator">
-{{ .context.Content }}
-</div>
 <noscript><p><b>Bitte aktiviere Javascript, sonst funktioniert der Generator nicht.</b></p></noscript>
-{{ if (index .context.Params.forms 0) }}
-  {{ partial "tools/generator/form" (dict "context" .context "form" 0) }}
-{{ end }}
-
+  {{ partial "tools/generator/form" (dict "context" . "form" 0) }}
 <script defer src="{{ "/js/visibleIf.js" | urlize | relURL }}"></script>
 <script defer src="{{ "/js/generator.js" | urlize | relURL }}"></script>
diff --git a/themes/buha/layouts/partials/tools/nottranslated.html b/themes/buha/layouts/shortcodes/not_translated.html
similarity index 100%
rename from themes/buha/layouts/partials/tools/nottranslated.html
rename to themes/buha/layouts/shortcodes/not_translated.html
diff --git a/themes/buha/layouts/tools/single.html b/themes/buha/layouts/tools/single.html
index f1f4e37c..86ceff4a 100644
--- a/themes/buha/layouts/tools/single.html
+++ b/themes/buha/layouts/tools/single.html
@@ -6,6 +6,6 @@
         {{ $partial = "tools/nottranslated" }}
     {{ end }}
     <article>
-    {{ partial $partial (dict "context" . "content" .Content) }}
+    {{ .Content }}
     </article>
 {{ end }}
diff --git a/themes/buha/static/js/generator.js b/themes/buha/static/js/generator.js
index 88588e9d..b27c4951 100644
--- a/themes/buha/static/js/generator.js
+++ b/themes/buha/static/js/generator.js
@@ -106,8 +106,8 @@ function showInput(e) {
   var insta = form.elements['insta'].value;
   var events = check_checkboxes('events');
   if (form.elements['newevents']) { var newevents = testor(form.elements['newevents'].value.split(',')); }
-  var categories = check_checkboxes('categories');
-  if (form.elements['newcategories']) { var newcategories = testor(form.elements['newcategories'].value.split(',')); }
+  var news = check_checkboxes('news');
+  if (form.elements['newnews']) { var newnews = testor(form.elements['newnews'].value.split(',')); }
   var tags = check_checkboxes('tags');
   if (form.elements['newtags']) { var newtags = testor(form.elements['newtags'].value.split(',')); }
   var featured = check_checkboxes('featured');
@@ -138,16 +138,16 @@ function showInput(e) {
   
   
   
-  if (newcategories != '""') {
-      var ncategories = newcategories;
+  if (newnews != '""') {
+      var nnews = newnews;
   }
 
-  if (categories != '' ) {
-      var ncategories = categories;
+  if (news != '' ) {
+      var nnews = news;
   }
  
-  if (categories != '' && newcategories != '""') {
-      var ncategories = categories + "," + newcategories;
+  if (news != '' && newnews != '""') {
+      var nnews = news + "," + newnews;
   }
 
   
@@ -210,8 +210,8 @@ function showInput(e) {
       display.innerHTML += "when: \"" + when + "\"<br>";
     }
     
-    if (ncategories) {
-        display.innerHTML += "categories: \[" + ncategories + "]<br>";
+    if (nnews) {
+        display.innerHTML += "news: \[" + nnews + "]<br>";
     }
 
     if (nevents) {