diff --git a/content/eittland.org b/content/eittland.org
index 6ecaff0..eaafd97 100644
--- a/content/eittland.org
+++ b/content/eittland.org
@@ -1,18 +1,16 @@
# -*- org-confirm-babel-evaluate: nil -*-
-#+TITLE: Eittlandais
-#+LANGUAGE: fr
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+LATEX_HEADER: \usepackage{allrunes}
-#+INCLUDE: headers
-#+MACRO: rune-manual @@latex:\textara{$1}@@@@html:$2@@
-#+MACRO: rune (eval (conlanging/eittlanda-org-export-runes $1))
-#+STARTUP: content
-#+STARTUP: shrink
-#+KEYWORDS: eittland eittlande einnland einnlande nordique viking islande norrois
-#+OPTIONS: auto-id:t
-#+UID: https://langue.phundrak.com/eittland
+#+setupfile: headers
+#+title: Eittlandais
+#+html_head:
+#+html_head:
+#+html_head:
+#+latex_header: \usepackage{allrunes}
+#+macro: rune-manual @@latex:\textara{$1}@@@@html:$2@@
+#+macro: rune (eval (conlanging/eittlanda-org-export-runes $1))
+#+keywords: eittland eittlande einnland einnlande nordique viking islande norrois
+#+options: auto-id:t
+#+uid: https://langue.phundrak.com/eittland
+#+startup: content
* Propos préliminaires
:PROPERTIES:
diff --git a/content/en/nyqy.org b/content/en/nyqy.org
index 10f40ba..8e530f7 100644
--- a/content/en/nyqy.org
+++ b/content/en/nyqy.org
@@ -8,6 +8,7 @@
#+HTML_HEAD_EXTRA:
#+OPTIONS: auto-id:t
#+MACRO: nyqy (eval (conlanging/nyqy-to-phonetics $1))
+#+startup: content
# To be used at https://jasontank.net/wordgen.html
#+NAME: wordgen-backup
@@ -1288,8 +1289,8 @@ with a base 12 system, except for its units.
[fn:3] [[https://www.internationalphoneticassociation.org/content/ipa-chart]]
-[fn:2] [[https://phundrak.fr]]
+[fn:2] [[https://phundrak.com]]
-[fn:1] https://langue.phundrak.fr
+[fn:1] https://langue.phundrak.com
# LocalWords: Rhete né Hje lpel neography Ňy Qy proto
diff --git a/content/headers b/content/headers
index d825863..19983df 100644
--- a/content/headers
+++ b/content/headers
@@ -6,46 +6,65 @@
# ### ORG OPTIONS ##############################################################
-#+OPTIONS: H:4 broken_links:mark email:t ^:{} tex:dvisvgm
-#+KEYWORDS: conlang idéolangue langue langues linguistique phundrak drakpa
+#+options: H:4 broken_links:mark email:t ^:{} tex:dvisvgm
+#+keywords: conlang idéolangue langue langues linguistique phundrak drakpa
# ### LaTeX ####################################################################
-#+LATEX_CLASS: conlang
-#+LaTeX_CLASS_OPTIONS: [a4paper,twoside]
-#+LATEX_HEADER_EXTRA: \usepackage{xltxtra}
-#+LATEX_HEADER_EXTRA: \usepackage[total={17cm,24cm}]{geometry}
-#+LATEX_HEADER_EXTRA: \setmainfont{Charis SIL}
-#+LATEX_HEADER_EXTRA: \usepackage{newunicodechar}
-#+LATEX_HEADER_EXTRA: \newunicodechar{’}{'}
-#+LATEX_HEADER_EXTRA: \newunicodechar{…}{...}
-#+LATEX_HEADER_EXTRA: \usepackage{xcolor}
-#+LATEX_HEADER_EXTRA: \usepackage{hyperref}
-#+LATEX_HEADER_EXTRA: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
-#+LATEX_HEADER_EXTRA: \usepackage{indentfirst}
+#+latex_class: conlang
+#+latex_class_options: [a4paper,twoside]
+#+latex_header_extra: \usepackage{xltxtra}
+#+latex_header_extra: \usepackage[total={17cm,24cm}]{geometry}
+#+latex_header_extra: \usepackage{newunicodechar}
+#+latex_header_extra: \usepackage{xcolor}
+#+latex_header_extra: \usepackage{hyperref}
+#+latex_header_extra: \usepackage{indentfirst}
+#+latex_header_extra: \usepackage{enumitem}
+#+latex_header_extra: \setmainfont{Charis SIL}
+#+latex_header_extra: \newunicodechar{’}{'}
+#+latex_header_extra: \newunicodechar{…}{\ldots}
+#+latex_header_extra: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
+
# ### HTML #####################################################################
-#+HTML_DOCTYPE: html5
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
-#+HTML_HEAD_EXTRA:
+#+html_doctype: html5
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
+#+html_head_extra:
# ### EPUB #####################################################################
-#+PUBLISHER: Lucien Cartier-Tilet
+#+publisher: Lucien Cartier-Tilet
# ### MACROS ###################################################################
-#+MACRO: newline @@latex:\hspace{0pt}\\@@ @@html:
@@
-#+MACRO: newpage @@latex:\newpage@@
-#+MACRO: latex-html @@latex:$1@@@@html:$2@@
-#+MACRO: phon @@latex:/$1/@@@@html:/$1/@@@@ascii:/$1/@@
-#+MACRO: v @@latex:\rotatebox[origin=c]{270}{$1}@@@@html:$1@@
-#+MACRO: begin-largetable @@html: