diff --git a/slides.yml b/slides.yml
index aa16aa8..63c1cf5 100644
--- a/slides.yml
+++ b/slides.yml
@@ -1,19 +1,19 @@
 - intro
-- chapter-00
-- chapter-01
-- chapter-02
-- chapter-03
-- chapter-04
-- chapter-05
-- chapter-06
-- chapter-07
-- chapter-08
-- chapter-09
-- chapter-10
-- chapter-11
-- chapter-12
-- chapter-13
-- chapter-14
-- chapter-15
+- titlepage
+- why-use-latex
+- basic-functionality
+- basic-document-structure
+- project-structure
+- special-characters
+- text-markup
+- lists
+- maths
+- graphics
+- tables
+- references-and-footnotes
+- literature
+- source-code-listings
+- packages
+- support
 
   
\ No newline at end of file
diff --git a/slides/chapter-03.de.md b/slides/basic-document-structure.de.md
similarity index 100%
rename from slides/chapter-03.de.md
rename to slides/basic-document-structure.de.md
diff --git a/slides/chapter-03.en.md b/slides/basic-document-structure.en.md
similarity index 100%
rename from slides/chapter-03.en.md
rename to slides/basic-document-structure.en.md
diff --git a/slides/chapter-02.de.md b/slides/basic-functionality.de.md
similarity index 100%
rename from slides/chapter-02.de.md
rename to slides/basic-functionality.de.md
diff --git a/slides/chapter-02.en.md b/slides/basic-functionality.en.md
similarity index 100%
rename from slides/chapter-02.en.md
rename to slides/basic-functionality.en.md
diff --git a/slides/chapter-09.de.md b/slides/graphics.de.md
similarity index 100%
rename from slides/chapter-09.de.md
rename to slides/graphics.de.md
diff --git a/slides/chapter-09.en.md b/slides/graphics.en.md
similarity index 100%
rename from slides/chapter-09.en.md
rename to slides/graphics.en.md
diff --git a/slides/chapter-07.de.md b/slides/lists.de.md
similarity index 100%
rename from slides/chapter-07.de.md
rename to slides/lists.de.md
diff --git a/slides/chapter-07.en.md b/slides/lists.en.md
similarity index 100%
rename from slides/chapter-07.en.md
rename to slides/lists.en.md
diff --git a/slides/chapter-13.de.md b/slides/literature.de.md
similarity index 99%
rename from slides/chapter-13.de.md
rename to slides/literature.de.md
index 69c4e2a..5c3689d 100644
--- a/slides/chapter-13.de.md
+++ b/slides/literature.de.md
@@ -1,7 +1,7 @@
 @slide(layout=chapter-slide)
 
 @number
-13
+12
 
 @title
 Literatur­verwaltung
@@ -96,7 +96,7 @@ Durch BibTeX wird LaTeX um einige Befehle zum Zitieren erweitert. Außerdem ben
 @slide(layout=wide-task)
 
 @task-number
-13
+12
 
 @title
 Ein Literaturverzeichnis erstellen und einfügen
diff --git a/slides/chapter-13.en.md b/slides/literature.en.md
similarity index 99%
rename from slides/chapter-13.en.md
rename to slides/literature.en.md
index f170021..79325df 100644
--- a/slides/chapter-13.en.md
+++ b/slides/literature.en.md
@@ -1,7 +1,7 @@
 @slide(layout=chapter-slide)
 
 @number
-13
+12
 
 @title
 Reference management
@@ -96,7 +96,7 @@ BibTeX adds some citation commands to LaTeX. In addition, we need the `natbib` p
 @slide(layout=wide-task)
 
 @task-number
-13
+12
 
 @title
 
diff --git a/slides/chapter-08.de.md b/slides/maths.de.md
similarity index 100%
rename from slides/chapter-08.de.md
rename to slides/maths.de.md
diff --git a/slides/chapter-08.en.md b/slides/maths.en.md
similarity index 100%
rename from slides/chapter-08.en.md
rename to slides/maths.en.md
diff --git a/slides/chapter-14.de.md b/slides/packages.de.md
similarity index 100%
rename from slides/chapter-14.de.md
rename to slides/packages.de.md
diff --git a/slides/chapter-14.en.md b/slides/packages.en.md
similarity index 100%
rename from slides/chapter-14.en.md
rename to slides/packages.en.md
diff --git a/slides/chapter-04.de.md b/slides/project-structure.de.md
similarity index 100%
rename from slides/chapter-04.de.md
rename to slides/project-structure.de.md
diff --git a/slides/chapter-04.en.md b/slides/project-structure.en.md
similarity index 100%
rename from slides/chapter-04.en.md
rename to slides/project-structure.en.md
diff --git a/slides/chapter-12.de.md b/slides/references-and-footnotes.de.md
similarity index 99%
rename from slides/chapter-12.de.md
rename to slides/references-and-footnotes.de.md
index 1320d82..7254760 100644
--- a/slides/chapter-12.de.md
+++ b/slides/references-and-footnotes.de.md
@@ -1,7 +1,7 @@
 @slide(layout=chapter-slide)
 
 @number
-12
+11
 
 @title
 Referenzen und Fußnoten
@@ -139,7 +139,7 @@ Dinge, die zu beachten sind
 @slide(layout=task)
 
 @task-number
-12a
+11a
 
 @title
 Fußnoten einfügen
@@ -153,7 +153,7 @@ Fußnoten einfügen
 @slide(layout=task)
 
 @task-number
-12b
+11b
 
 @title
 Referenzen einfügen
diff --git a/slides/chapter-12.en.md b/slides/references-and-footnotes.en.md
similarity index 99%
rename from slides/chapter-12.en.md
rename to slides/references-and-footnotes.en.md
index 8b66b66..868d3a4 100644
--- a/slides/chapter-12.en.md
+++ b/slides/references-and-footnotes.en.md
@@ -1,7 +1,7 @@
 @slide(layout=chapter-slide)
 
 @number
-12
+11
 
 @title
 References and footnotes
@@ -142,7 +142,7 @@ Things to consider
 @slide(layout=task)
 
 @task-number
-12a
+11a
 
 @title
 Inserting footnotes
@@ -155,7 +155,7 @@ Inserting footnotes
 @slide(layout=task)
 
 @task-number
-12b
+11b
 
 @title
 Inserting references
diff --git a/slides/chapter-11.de.md b/slides/source-code-listings.de.md
similarity index 99%
rename from slides/chapter-11.de.md
rename to slides/source-code-listings.de.md
index bace090..44720a2 100644
--- a/slides/chapter-11.de.md
+++ b/slides/source-code-listings.de.md
@@ -1,7 +1,7 @@
 @slide(layout=chapter-slide)
 
 @number
-11
+13
 
 @title
 Quelltext-Listings
@@ -92,7 +92,7 @@ Weitere Materialien
 @slide(layout=task)
 
 @task-number
-11
+13
 
 @title
 Listings
diff --git a/slides/chapter-11.en.md b/slides/source-code-listings.en.md
similarity index 99%
rename from slides/chapter-11.en.md
rename to slides/source-code-listings.en.md
index 0848dff..850cb90 100644
--- a/slides/chapter-11.en.md
+++ b/slides/source-code-listings.en.md
@@ -1,7 +1,7 @@
 @slide(layout=chapter-slide)
 
 @number
-11
+13
 
 @title
 Source code listings
@@ -92,7 +92,7 @@ Further resources
 @slide(layout=task)
 
 @task-number
-11
+13
 
 @title
 Listings
diff --git a/slides/chapter-05.de.md b/slides/special-characters.de.md
similarity index 100%
rename from slides/chapter-05.de.md
rename to slides/special-characters.de.md
diff --git a/slides/chapter-05.en.md b/slides/special-characters.en.md
similarity index 100%
rename from slides/chapter-05.en.md
rename to slides/special-characters.en.md
diff --git a/slides/chapter-15.de.md b/slides/support.de.md
similarity index 100%
rename from slides/chapter-15.de.md
rename to slides/support.de.md
diff --git a/slides/chapter-15.en.md b/slides/support.en.md
similarity index 100%
rename from slides/chapter-15.en.md
rename to slides/support.en.md
diff --git a/slides/chapter-10.de.md b/slides/tables.de.md
similarity index 100%
rename from slides/chapter-10.de.md
rename to slides/tables.de.md
diff --git a/slides/chapter-10.en.md b/slides/tables.en.md
similarity index 100%
rename from slides/chapter-10.en.md
rename to slides/tables.en.md
diff --git a/slides/chapter-06.de.md b/slides/text-markup.de.md
similarity index 100%
rename from slides/chapter-06.de.md
rename to slides/text-markup.de.md
diff --git a/slides/chapter-06.en.md b/slides/text-markup.en.md
similarity index 100%
rename from slides/chapter-06.en.md
rename to slides/text-markup.en.md
diff --git a/slides/chapter-00.de.md b/slides/titlepage.de.md
similarity index 100%
rename from slides/chapter-00.de.md
rename to slides/titlepage.de.md
diff --git a/slides/chapter-00.en.md b/slides/titlepage.en.md
similarity index 100%
rename from slides/chapter-00.en.md
rename to slides/titlepage.en.md
diff --git a/slides/chapter-01.de.md b/slides/why-use-latex.de.md
similarity index 100%
rename from slides/chapter-01.de.md
rename to slides/why-use-latex.de.md
diff --git a/slides/chapter-01.en.md b/slides/why-use-latex.en.md
similarity index 77%
rename from slides/chapter-01.en.md
rename to slides/why-use-latex.en.md
index b80bb19..da1b5f1 100644
--- a/slides/chapter-01.en.md
+++ b/slides/why-use-latex.en.md
@@ -31,8 +31,7 @@ Origin
 Reasons for using LaTeX: macrotypography
 
 @example-text
-This paragraph shows the effect of varied line heights in combination with varied line lengths. 
-For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. 
+This paragraph shows the effect of varied line heights in combination with varied line lengths. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. For this purpose, a little more text is needed to make it look like an actual paragraph. 
 
 @narrow-tight
 short & tight