diff --git a/source/main.adoc b/source/main.adoc
index 28f7750..0b2796c 100644
--- a/source/main.adoc
+++ b/source/main.adoc
@@ -5,13 +5,16 @@ Cédric Declerfayt <jaguarondi27@gmail.com>; Fred Pauchet <fred@grimbox.be>
 :toclevels: 2
 :sectnums:
 :chapter-label: Chapitre
-:preface-title: Préface
 :bibtex-file: source/references.bib
 :bibtex-order: alphabetical
 :bibtex-throw: true
 :source-highlighter: rouge
 :icons: font
 
+
+[preface]
+== Préface
+
 "The only way to go fast, is to go well"
 -- Robert C. Martin
 
@@ -53,24 +56,22 @@ Nous aborderons les concepts clés qui permettent à une application de rester m
 
 footnote:[Avec même un peu d'https://www.xkcd.com[XKCD] et de Calvin & Hobbes dedans]
 
-*Qui cela peut intéresser*
+=== Pour qui ?
 
 
-*Ce que ce livre couvre*
+=== Pour quoi ?
 
 
-*Pour aller plus loin*
+=== Pour aller plus loin
 
 
-*Conventions*
+=== Conventions
 
 
-*Let's keep in touch*
+=== Let's keep in touch
 
 
 
-Bonne lecture.
-
 include::part-1-workspace/_main.adoc[]
 
 include::part-2-deployment/_main.adoc[]
@@ -81,6 +82,15 @@ include::part-4-go-live/_index.adoc[]
 
 include::part-9-resources/_index.adoc[]
 
-== Bibliographie
+[glossary]
+= Glossaire
 
-bibliography::[]
+ORM:: _Object Relational Mapper_, où une instance est directement (ou à proximité) liée à un mode de persistance de données.
+
+PaaS:: _Platform as a Service_, qui consiste à proposer les composants d'une plateforme (Redis, PostgreSQL, ...) en libre service et disponibles à la demande (quoiqu'après avoir communiqué son numéro de carte de crédit...).
+
+[index]
+== Index
+
+== Bibliographie
+bibliography::[]
\ No newline at end of file
diff --git a/source/part-9-resources/_index.adoc b/source/part-9-resources/_index.adoc
index 11f90e3..7654012 100644
--- a/source/part-9-resources/_index.adoc
+++ b/source/part-9-resources/_index.adoc
@@ -1,24 +1,5 @@
 = Ressources et bibliographie
 
-* https://simpleisbetterthancomplex.com/series/beginners-guide/1.11/[Simple Is Better Than Complex]
-* https://www.feldroy.com/collections/two-scoops-press/products/two-scoops-of-django-1-11[Two Scoops of Django 1.11]
-* https://www.feldroy.com/products/django-crash-course[Django Crash Course]
-* https://www.amazon.com/dp/B07BDGC57[Django Design Patterns and Best Practices] (Packt Publishing)
-* https://books.agiliq.com/en/latest/README.html[Books by Agiliq]
-
 include::code-snippets.adoc[]
 
 include::legacy.adoc[]
-
-. https://simpleisbetterthancomplex.com/series/beginners-guide/1.11/[A Complete Beginner's Guide to Django]:
-  . https://simpleisbetterthancomplex.com/series/2017/09/04/a-complete-beginners-guide-to-django-part-1.html[Getting Started]
-  . https://simpleisbetterthancomplex.com/series/2017/09/11/a-complete-beginners-guide-to-django-part-2.html[Fundamentals]
-  . https://simpleisbetterthancomplex.com/series/2017/09/18/a-complete-beginners-guide-to-django-part-3.html[Advanced Concepts]
-  . https://simpleisbetterthancomplex.com/series/2017/09/25/a-complete-beginners-guide-to-django-part-4.html[Authentication]
-  . https://simpleisbetterthancomplex.com/series/2017/10/02/a-complete-beginners-guide-to-django-part-5.html[Django ORM]
-  . https://simpleisbetterthancomplex.com/series/2017/10/09/a-complete-beginners-guide-to-django-part-6.html[Class Based Views]
-  . https://simpleisbetterthancomplex.com/series/2017/10/16/a-complete-beginners-guide-to-django-part-7.html[Deployment]
-
-== Livres
-
-* https://www.packtpub.com/product/expert-python-programming-third-edition/9781789808896[Expert Python Programming - Third Edition] - pour les chapitres sur Docker, Vagrant.
diff --git a/source/references.bib b/source/references.bib
index 234e2e3..46a7363 100644
--- a/source/references.bib
+++ b/source/references.bib
@@ -48,4 +48,30 @@
    publisher = {O'Reilly Media, Inc.},
    isbn = {978-1-491-95452-2},
    url = {http://shop.oreilly.com/product/0636920049555.do}
+}
+@book{two_scoops_of_django,
+   author = {Daniel Roy and Andrey Greenfeld},
+   title = {Two Scoops of Django},
+   year = {2021},
+}
+@book{django_design_patterns,
+   year = {2015},
+   publisher = {Packt Publishing}
+}
+@misc{agiliq_admin,
+   title = {Django Admin Cookbook, How to do things with Django admin},
+   year = {2018},
+   url = {https://books.agiliq.com/projects/django-admin-cookbook/en/latest/}
+}
+@misc{agiliq_multi_tenant,
+   title = {Building Multi Tenant Applications with Django},
+   year = {2018},
+   url = {https://books.agiliq.com/projects/django-multi-tenant/en/latest/},
+}
+@misc{simple_is_better_than_complex,
+   author = {Vitor Freitas},
+   title = {A Complete Beginner's Guide to Django},
+   year = {2017},
+   note = {Last visited in 2021},
+   url = {https://simpleisbetterthancomplex.com/series/beginners-guide/1.11/}
 }
\ No newline at end of file