diff --git a/dhsn.typ b/dhsn.typ
index 1060a73..021693e 100644
--- a/dhsn.typ
+++ b/dhsn.typ
@@ -20,8 +20,7 @@
     column-gutter: 1cm,
     columns: (50%, 50%),
     row-gutter: 10pt,
-    [#location, #submission-date.display("[day].[month].[year]")],
-    align(bottom, line(length: 6cm, stroke: 0.75pt)),
+    [#location, #submission-date.display("[day].[month].[year]")], align(bottom, line(length: 6cm, stroke: 0.75pt)),
     [],
     (
       if gender == none {
@@ -35,15 +34,25 @@
   )
 
 ]
-#let addendum-outline() = context {
-    if query(selector(figure).after(here())).len() > 0 {
-      {
-        show heading: none
-        heading(numbering: none)[Anhangverzeichnis]
-      }
-      outline(title: "Anhangverzeichnis", target: selector(figure).after(here()))
-      pagebreak()
+#let addendum(body) = {
+  pagebreak()
+  counter(heading).update(0)
+  set heading(numbering: none)
+  context if query(selector(figure).after(here())).len() > 0 {
+    {
+      show heading: none
+      heading(numbering: none)[Anhangverzeichnis]
     }
+    outline(title: "Anhangverzeichnis", target: selector(figure).after(here()))
+    pagebreak()
+  }
+
+  set figure(kind: raw, supplement: "Anhang")
+  counter(figure.where(kind: raw)).update(0)
+
+  [= Anhang <dhsn.addendum>]
+  body
+  pagebreak()
 }
 #let dhsn(
   topic: "Thema der Arbeit",
@@ -69,7 +78,6 @@
   body,
 ) = {
   // show figure.where(kind: table): set figure(kind: raw, supplement: "Anhang")
-  show figure.where(kind: raw): set figure(supplement: "Anhang")
   set heading(numbering: (..nums) => nums.pos().map(str).join("."))
 
   set bibliography(style: "harvard-cite-them-right", title: "Literaturverzeichnis")
@@ -111,7 +119,7 @@
   context [
     #set page(footer: none, margin: (left: 2cm))
     #set text(size: 14pt)
-    #set par(leading: (1/1.2)*1em)
+    #set par(leading: (1 / 1.2) * 1em)
     #show heading.where(level: 1): it => {
       set text(size: 24pt)
       block(it.body)
@@ -165,15 +173,28 @@
   pagebreak()
 
   context {
-    if query(selector(figure).before(<dhsn.addendum>)).len() > 0 {
+    if query(selector(figure.where(kind: image).before(<dhsn.addendum>))).len() > 0 {
       {
         show heading: none
         heading(numbering: none)[Abbildungsverzeichnis]
       }
-      outline(title: "Abbildungsverzeichnis", target: selector(figure).before(<dhsn.addendum>))
-      pagebreak()
+      outline(title: "Abbildungsverzeichnis", target: selector(figure.where(kind: image)).before(<dhsn.addendum>))
     }
   }
+  context {
+    if query(selector(figure.where(kind: table)).before(<dhsn.addendum>)).len() > 0 {
+      {
+        show heading: none
+        heading(numbering: none)[Tabellenverzeichnis]
+      }
+      outline(title: "Tabellenverzeichnis", target: selector(figure.where(kind: table)).before(<dhsn.addendum>))
+    }
+  }
+  context if (
+    query(selector(figure.where(kind: table).or(figure.where(kind: table))).before(<dhsn.addendum>)).len() > 0
+  ) {
+    pagebreak()
+  }
 
   context {
     if (acros.get() != none and acros.get().len() > 0) {
@@ -181,7 +202,7 @@
         show heading: none
         heading(numbering: none)[Abkürzungsverzeichnis]
       }
-      print-index(title: "Abkürzungsverzeichnis", row-gutter: 0.5em)
+      print-index(title: "Abkürzungsverzeichnis", row-gutter: 1.2em)
       pagebreak()
     }
   }
@@ -198,8 +219,8 @@
     }
     show regex(`Zugegriffen\: \d+`.text): it => {
       let day = str.replace(it.text, "Zugegriffen: ", "")
-      "Abgerufen am " +day+ "."
-      }
+      "Abgerufen am " + day + "."
+    }
     bib
   }
   statement(location, submission-date, author_gender)