diff --git a/eittlanda.org b/eittlanda.org
index bd126fd..ec25300 100644
--- a/eittlanda.org
+++ b/eittlanda.org
@@ -10,7 +10,7 @@
 #+MACRO: rune (eval (conlanging/eittlanda-org-export-runes "$1"))
 #+STARTUP: align shrink
 #+OPTIONS: auto-id:t
-# #+TOC: headlines
+#+KEYWORDS: eittland eittlande einnland einnlande nordique viking islande norrois
 
 * Propos préliminaires
   :PROPERTIES:
@@ -161,23 +161,26 @@
     l’Écosse et le nord de l’Angleterre.
 
     #+NAME: img:map-world
+    #+ATTR_HTML: :width 100%
     #+CAPTION: Emplacement d’Eittlande dans l’Océan Atlantique.
-    [[./img/eittlanda/map-world.jpg]]
+    [[file:img/eittlanda/map-world.jpg][file:img/eittlanda/map-world.jpg]]
 
     Vous pouvez également trouver une  carte simplifiée d’Eittlande montrant les
     principaux lieux et principales villes du pays avec la carte [[img:map-simple]]
 
     #+NAME: img:map-simple
+    #+ATTR_HTML: :width 100%
     #+CAPTION: Carte simplifiée d’Eittlande
-    [[./img/eittlanda/map-simple.jpg]]
+    [[file:img/eittlanda/map-simple.jpg][file:img/eittlanda/map-simple.jpg]]
 
     Une carte de style plus topologique  et plus détaillée d’Eittlande peut être
     trouvé avec la carte [[img:map-typo]]
 
     #+NAME: img:map-typo
     #+ATTR_LATEX: :float sideways
+    #+ATTR_HTML: :width 100%
     #+CAPTION: Topologie d’Eittlande
-    [[./img/eittlanda/map-hq.jpg]]
+    [[file:img/eittlanda/map-hq.jpg][file:img/eittlanda/map-hq.jpg]]
 
 *** Histoire, migrations
     :PROPERTIES:
@@ -456,7 +459,7 @@
       (tree-to-dot vowels)
     #+END_SRC
 
-    #+BEGIN_SRC dot :file img/eittlanda/vowel-feature-tree.png :var input=vow-dot :exports results :cache yes
+    #+BEGIN_SRC dot :file img/eittlanda/vowel-feature-tree.svg :var input=vow-dot :exports results :cache yes
       $input
     #+END_SRC
     #+NAME: arbre:vowels
diff --git a/headers/headers.org b/headers/headers.org
index dfda703..d39308f 100644
--- a/headers/headers.org
+++ b/headers/headers.org
@@ -4,6 +4,10 @@
 #+CREATOR: Lucien Cartier-Tilet
 #+LANGUAGE: fr
 
+
+#+OPTIONS: H:4 broken_links:mark email:t ^:{} tex:dvisvgm
+#+KEYWORDS: conlang idéolangue langue langues linguistique phundrak drakpa
+
 # ### CODE #####################################################################
 
 #+name: setup
@@ -77,28 +81,28 @@
 
 #+LATEX_CLASS: conlang
 #+LaTeX_CLASS_OPTIONS: [a4paper,twoside]
-#+LATEX_HEADER: \usepackage{tocloft} \setlength{\cftchapnumwidth}{3em}
-#+LATEX_HEADER: \usepackage{xltxtra,fontspec,xunicode}
-#+LATEX_HEADER: \usepackage[total={17cm,22cm}]{geometry}
-#+LATEX_HEADER: \setromanfont{Charis SIL}
-#+LATEX_HEADER: \usepackage{xcolor}
-#+LATEX_HEADER: \usepackage{hyperref}
-#+LATEX_HEADER: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
-#+LATEX_HEADER: \usepackage{multicol}
-#+LATEX_HEADER: \usepackage{indentfirst}
-#+LATEX_HEADER: \sloppy
+#+LATEX_HEADER_EXTRA: \usepackage{tocloft} \setlength{\cftchapnumwidth}{3em}
+#+LATEX_HEADER_EXTRA: \usepackage{xltxtra,fontspec,xunicode,svg}
+#+LATEX_HEADER_EXTRA: \usepackage[total={17cm,22cm}]{geometry}
+#+LATEX_HEADER_EXTRA: \setromanfont{Charis SIL}
+#+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{multicol}
+#+LATEX_HEADER_EXTRA: \usepackage{indentfirst}
+#+LATEX_HEADER_EXTRA: \sloppy
 
 # ### HTML #####################################################################
 
 #+HTML_DOCTYPE: html5
-#+HTML_HEAD: <script src="https://kit.fontawesome.com/4d42d0c8c5.js"></script>
-#+HTML_HEAD: <script src="https://cdn.jsdelivr.net/npm/js-cookie@2/src/js.cookie.min.js"></script>
-#+HTML_HEAD: <link rel="shortcut icon" href="https://cdn.phundrak.fr/img/mahakala-128x128.png" type="img/png" media="screen" />
-#+HTML_HEAD: <link rel="shortcut icon" href="https://cdn.phundrak.fr/img/favicon.ico" type="image/x-icon" media="screen" />
-#+HTML_HEAD: <meta property="og:image" content="https://cdn.phundrak.fr/img/rich_preview.png" />
-#+HTML_HEAD: <meta name="twitter:card" content="summary" />
-#+HTML_HEAD: <meta name="twitter:site" content="@phundrak" />
-#+HTML_HEAD: <meta name="twitter:creator" content="@phundrak" />
+#+HTML_HEAD_EXTRA: <script src="https://kit.fontawesome.com/4d42d0c8c5.js"></script>
+#+HTML_HEAD_EXTRA: <script src="https://cdn.jsdelivr.net/npm/js-cookie@2/src/js.cookie.min.js"></script>
+#+HTML_HEAD_EXTRA: <link rel="shortcut icon" href="https://cdn.phundrak.fr/img/mahakala-128x128.png" type="img/png" media="screen" />
+#+HTML_HEAD_EXTRA: <link rel="shortcut icon" href="https://cdn.phundrak.fr/img/favicon.ico" type="image/x-icon" media="screen" />
+#+HTML_HEAD_EXTRA: <meta property="og:image" content="https://cdn.phundrak.fr/img/rich_preview.png" />
+#+HTML_HEAD_EXTRA: <meta name="twitter:card" content="summary" />
+#+HTML_HEAD_EXTRA: <meta name="twitter:site" content="@phundrak" />
+#+HTML_HEAD_EXTRA: <meta name="twitter:creator" content="@phundrak" />
 
 # ### MACROS ###################################################################
 #+MACRO: newline @@latex:\hspace{0pt}\\@@ @@html:<br>@@
@@ -108,4 +112,3 @@
 #+MACRO: v @@latex:\rotatebox[origin=c]{270}{$1}@@@@html:<span class=vertical>$1</span>@@
 #+MACRO: begin-largetable @@html:<div class="largetable">@@
 #+MACRO: end-largetable @@html:</div>@@
-#+OPTIONS: H:4 broken_links:mark email:t ^:{}