diff --git a/conf/format.yaml b/conf/format.yaml
index afcf2ac..2b4d668 100644
--- a/conf/format.yaml
+++ b/conf/format.yaml
@@ -6,3 +6,4 @@ paragraph-spacing: 1.5  # relative to line height
 line-spacing: 0.75    # relative to line height
 first-line-indent: 1  # in centimetres
 font-size: 12         # in point
+font-familty: "Noto Serif"
\ No newline at end of file
diff --git a/res/font/Noto Serif/LICENSE.txt b/res/font/Noto Serif/LICENSE.txt
new file mode 100644
index 0000000..09f020b
--- /dev/null
+++ b/res/font/Noto Serif/LICENSE.txt	
@@ -0,0 +1,93 @@
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/res/font/Noto Serif/Noto Serif Bold.ttf b/res/font/Noto Serif/Noto Serif Bold.ttf
new file mode 100644
index 0000000..aa21d44
Binary files /dev/null and b/res/font/Noto Serif/Noto Serif Bold.ttf differ
diff --git a/res/font/Noto Serif/Noto Serif Italic.ttf b/res/font/Noto Serif/Noto Serif Italic.ttf
new file mode 100644
index 0000000..786ecc7
Binary files /dev/null and b/res/font/Noto Serif/Noto Serif Italic.ttf differ
diff --git a/res/font/Noto Serif/Noto Serif Regular.ttf b/res/font/Noto Serif/Noto Serif Regular.ttf
new file mode 100644
index 0000000..dc30297
Binary files /dev/null and b/res/font/Noto Serif/Noto Serif Regular.ttf differ
diff --git a/res/font/Times New Roman/Times New Roman Bold-Italic.ttf b/res/font/Times New Roman/Times New Roman Bold-Italic.ttf
deleted file mode 100644
index c0b27d2..0000000
Binary files a/res/font/Times New Roman/Times New Roman Bold-Italic.ttf and /dev/null differ
diff --git a/res/font/Times New Roman/Times New Roman Bold.ttf b/res/font/Times New Roman/Times New Roman Bold.ttf
deleted file mode 100644
index 43259eb..0000000
Binary files a/res/font/Times New Roman/Times New Roman Bold.ttf and /dev/null differ
diff --git a/res/font/Times New Roman/Times New Roman Italic.ttf b/res/font/Times New Roman/Times New Roman Italic.ttf
deleted file mode 100644
index 4bcad69..0000000
Binary files a/res/font/Times New Roman/Times New Roman Italic.ttf and /dev/null differ
diff --git a/res/font/Times New Roman/Times New Roman Regular.ttf b/res/font/Times New Roman/Times New Roman Regular.ttf
deleted file mode 100644
index f71d84a..0000000
Binary files a/res/font/Times New Roman/Times New Roman Regular.ttf and /dev/null differ
diff --git a/src/main.typ b/src/main.typ
index 7ce4768..bc61f1a 100644
--- a/src/main.typ
+++ b/src/main.typ
@@ -10,7 +10,7 @@
 
 // set global text parameter
 #set text(
-  font: "Times New Roman",
+  font: prelude.format.font-familty,
   size: prelude.to_pt(prelude.format.font-size),
   ligatures: prelude.format.ligratures,
   hyphenate: prelude.format.hyphenate,
@@ -30,6 +30,39 @@
   lang: prelude.format.language
 )
 
+#show heading.where(level: 1): set text(
+  font: prelude.format.font-familty,
+  size: prelude.to_pt(prelude.format.font-size) * 2,
+  ligatures: prelude.format.ligratures,
+  hyphenate: prelude.format.hyphenate,
+  alternates: prelude.format.ligratures,
+  discretionary-ligatures: prelude.format.ligratures,
+  lang: prelude.format.language,
+  weight: "regular"
+)
+
+#show heading.where(level: 2): set text(
+  font: prelude.format.font-familty,
+  size: prelude.to_pt(prelude.format.font-size) * 1.5,
+  ligatures: prelude.format.ligratures,
+  hyphenate: prelude.format.hyphenate,
+  alternates: prelude.format.ligratures,
+  discretionary-ligatures: prelude.format.ligratures,
+  lang: prelude.format.language,
+  weight: "regular"
+)
+
+#show heading.where(level: 3): set text(
+  font: prelude.format.font-familty,
+  size: prelude.to_pt(prelude.format.font-size) * 1.25,
+  ligatures: prelude.format.ligratures,
+  hyphenate: prelude.format.hyphenate,
+  alternates: prelude.format.ligratures,
+  discretionary-ligatures: prelude.format.ligratures,
+  lang: prelude.format.language,
+  weight: "regular"
+)
+
 // use block element as paragraph
 // set block settings for every paragraph
 #show par: set block(
@@ -53,15 +86,6 @@
 #set heading(numbering: none)
 #set page(numbering: "I.", footer: "")
 
-#show heading.where(
-  level: 1
-): it => block(width: 100%)[
-  #set align(center)
-  #set text(prelude.to_pt(prelude.format.font-size) * 2, weight: "regular")
-  #it.body
-  #v(0.5cm)
-]
-
 #include "pages/titel.typ"
 #include "pages/selbständigkeitserklärung.typ"
 #include "pages/sperrvermerk.typ"
@@ -70,25 +94,17 @@
   binding: left,
   header-ascent: 1em,
   header: locate(loc => {
-    smallcaps(prelude.info.titel)
-    v(-2em)
-    align(right, counter(page).display("I."))
-    v(-1em)
-    line(length: 100%)
+    text(size: 12pt)[
+      #prelude.info.titel
+      #v(-2em)
+      #align(right, counter(page).display("I."))
+      #v(-1em)
+      #line(length: 100%)
+    ]
   }),
   footer: ""
 )
 
-#show heading.where(
-  level: 1
-): it => block(width: 100%)[
-  #set align(left)
-  #set text(prelude.to_pt(prelude.format.font-size) * 2, weight: "regular")
-  #v(0.25cm)
-  #it.body
-  #v(0.5cm)
-]
-
 #include "pages/gender-hinweis.typ"
 #include "pages/übersicht-arbeitspakete.typ"
 
@@ -152,23 +168,26 @@
 
 = Abteilung
 
-#show heading.where(
-  level: 1
-): it => block(width: 100%)[
-  #set align(left)
-  #set text(prelude.to_pt(prelude.format.font-size) * 2, weight: "regular")
-  #v(0.25cm)
-  #it.numbering
-  #it.body
-  #v(0.5cm)
-]
-
 #set heading(numbering: "1.")
+
+#let filter_heading(heading) = {
+  heading.level == 1
+}
+
 #set page(
   binding: left,
   header-ascent: 1em,
   header: locate(loc => {
-    align(right, counter(page).display("1."))
+    align(left, context [
+      #let current_heading = query(selector(heading).after(here())).filter(filter_heading).first()
+      #let heading_depth = counter(heading).get().at(0) + 1
+
+      #heading_depth
+      #h(0.25cm)
+      #current_heading.body
+    ])
+    v(-2em)
+    align(right, counter(page).display("1"))
     v(-1em)
     line(length: 100%)
   }),
@@ -178,11 +197,34 @@
 #set page(numbering: "1.")
 
 = Kapitel
-#lorem(100)
+
+== Überschrift 2
+
+#pagebreak()
+
+#lorem(200)
+
+= Kapitel 2
+
+=== Überschrift 3
+
+#lorem(50)
 
 #pagebreak()
 
 #set heading(numbering: none)
+#set page(
+  header: locate(loc => {
+    align(left, context [
+      #let current_heading = query(selector(heading).after(here())).filter(filter_heading).first()
+      #current_heading.body
+    ])
+    v(-2em)
+    align(right, counter(page).display("1"))
+    v(-1em)
+    line(length: 100%)
+  }),
+)
 
 #bibliography(
   style: "ieee",