diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..a797ade
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [lise-henry]
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..e1da4c8
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,16 @@
+on:
+    push:
+        branches:
+            - main
+
+jobs:
+    contrib-readme-job:
+        runs-on: ubuntu-latest
+        name: A job to automate contrib in readme
+        steps:
+            - name: Contribute List
+              uses: akhilmhdh/contributors-readme-action@v2.3.6
+              with:
+                  readme_path: "README.md"
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 7377814..914dd10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c"
 dependencies = [
  "memchr",
 ]
@@ -82,9 +82,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
 dependencies = [
  "anstyle",
  "windows-sys 0.48.0",
@@ -161,9 +161,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
 dependencies = [
  "libc",
 ]
@@ -190,9 +190,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.3.19"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
+checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -201,9 +201,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.19"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
+checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
 dependencies = [
  "anstream",
  "anstyle",
@@ -255,7 +255,7 @@ dependencies = [
  "entities",
  "memchr",
  "once_cell",
- "regex 1.9.1",
+ "regex 1.9.3",
  "shell-words",
  "slug",
  "syntect",
@@ -351,9 +351,8 @@ dependencies = [
  "hyphenation",
  "indicatif",
  "lazy_static 1.4.0",
- "log 0.4.19",
+ "log",
  "mime_guess",
- "mustache",
  "numerals",
  "punkt",
  "rayon",
@@ -361,6 +360,7 @@ dependencies = [
  "syntect",
  "tempfile",
  "textwrap",
+ "upon",
  "uuid",
  "walkdir 2.3.3",
  "yaml-rust",
@@ -393,7 +393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a749441fe0b30ba727c31367438f7e2f001e6ec23d3c5f417834f2fa17098a27"
 dependencies = [
  "lazy_static 1.4.0",
- "regex 1.9.1",
+ "regex 1.9.3",
 ]
 
 [[package]]
@@ -428,17 +428,17 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"
 
 [[package]]
 name = "epub-builder"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a72a19c37335c0e1d78857d4c1cf64c2fdd927896e7427685c19e67072d25907"
+checksum = "a6fcc8fc7b93c7001e0d47c269aa5a30a78a1f44692dc09cc9d0f781378545e1"
 dependencies = [
  "chrono",
  "eyre",
  "html-escape",
- "log 0.4.19",
- "mustache",
+ "log",
  "once_cell",
- "tempdir",
+ "tempfile",
+ "upon",
  "uuid",
  "zip",
 ]
@@ -481,7 +481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
 dependencies = [
  "bit-set",
- "regex 1.9.1",
+ "regex 1.9.3",
 ]
 
 [[package]]
@@ -658,7 +658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.6",
+ "rustix 0.38.8",
  "windows-sys 0.48.0",
 ]
 
@@ -732,15 +732,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-dependencies = [
- "log 0.4.19",
-]
-
 [[package]]
 name = "log"
 version = "0.4.19"
@@ -787,16 +778,6 @@ dependencies = [
  "adler",
 ]
 
-[[package]]
-name = "mustache"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51956ef1c5d20a1384524d91e616fb44dfc7d8f249bf696d49c97dd3289ecab5"
-dependencies = [
- "log 0.3.9",
- "serde",
-]
-
 [[package]]
 name = "num"
 version = "0.1.42"
@@ -1239,11 +1220,11 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick 1.0.3",
  "memchr",
  "regex-automata",
  "regex-syntax 0.7.4",
@@ -1251,11 +1232,11 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick 1.0.3",
  "memchr",
  "regex-syntax 0.7.4",
 ]
@@ -1275,15 +1256,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rust-freqdist"
 version = "0.1.5"
@@ -1312,9 +1284,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.6"
+version = "0.38.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -1362,18 +1334,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.181"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.181"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
 dependencies = [
  "proc-macro2 1.0.66",
  "quote 1.0.32",
@@ -1403,7 +1375,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
 dependencies = [
- "log 0.4.19",
+ "log",
  "termcolor",
  "time",
 ]
@@ -1479,26 +1451,16 @@ dependencies = [
  "yaml-rust",
 ]
 
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-dependencies = [
- "rand 0.4.6",
- "remove_dir_all",
-]
-
 [[package]]
 name = "tempfile"
-version = "3.7.0"
+version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
+checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
 dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall",
- "rustix 0.38.6",
+ "rustix 0.38.8",
  "windows-sys 0.48.0",
 ]
 
@@ -1642,6 +1604,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
+[[package]]
+name = "upon"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a9260fe394dfd8ab204a8eab40f88eb9a331bb852147d24fc0aff6b30daa02"
+dependencies = [
+ "serde",
+ "unicode-ident",
+ "unicode-width",
+]
+
 [[package]]
 name = "utf8-ranges"
 version = "1.0.5"
@@ -1719,7 +1692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
- "log 0.4.19",
+ "log",
  "once_cell",
  "proc-macro2 1.0.66",
  "quote 1.0.32",
diff --git a/Cargo.toml b/Cargo.toml
index 8aa7f40..da065f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,6 @@ doc = false
 default = ["binary", "syntect"]
 binary = ["clap", "simplelog", "tempfile", "console", "indicatif", "textwrap"]
 nightly = ["punkt", "hyphenation"]
-odt = []
 
 [build-dependencies]
 crowbook-intl = "0.2"
@@ -51,7 +50,7 @@ html-escape = "0.2"
 mime_guess = "2"
 comrak = "0.18"
 yaml-rust = "0.4"
-mustache = "0.9"
+upon = "0.7"
 uuid = { version = "1", features = ["v4"] }
 walkdir = "2"
 base64 = "0.21"
@@ -71,6 +70,3 @@ clap = { version = "4", optional = true }
 simplelog = { version = "0.12", optional = true }
 syntect = { version = "5", optional = true }
 tempfile = { version = "3", optional = true }
-
-
-
diff --git a/README.md b/README.md
index 57142d6..37b5210 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,11 @@ either using precompiled binaries, or compiling it using `cargo`.
 
 See
 [the releases page](https://github.com/lise-henry/crowbook/releases)
-to download a precompiled binary for your architecture
-(currently: Linux, Windows and MacOSX).
+to download a precompiled binary for your architecture.
 Just extract the archive and run `crowbook`
 (or `crowbook.exe` on Windows).
 You might also want to copy the binary somewhere in your `PATH` for later usage.
 
-If you are on Debian GNU/Linux or Ubuntu (on a PC architecture), you can also download `.deb` packages on
-[the releases page](https://github.com/lise-henry/crowbook/releases).
 
 ### Using Cargo
 
@@ -49,16 +46,11 @@ compile it, and install it on your system.
 
 > Some dependencies also require building C libraries;
 > you might thus also need to install a C compiler and `make`/`cmake` build tools.
-> You can also try to build a version of Crowbook without optional features:
-> `cargo install crowbook --no-default-features --features "clap"`
-> will disable syntactic highlighting and proofreading, requiring less dependencies.
 
 ## Dependencies
 
-While there should be, strictly speaking, no real dependencies to be able to run Crowbook (it is published as a statically compiled binary), some features require additional commands to work correctly:
-
-* EPUB rendering requires the `zip` command to be present on your system;
-* PDF rendering requires a working installation of LaTeX (preferably `xelatex`).
+While there should be, strictly speaking, no real dependencies to be able to run Crowbook (it is published as a statically compiled binary), 
+PDF rendering requires a working installation of LaTeX (preferably `xelatex`).
 
 ## Quick tour
 
@@ -138,12 +130,6 @@ title: My title
 
 This is mostly useful when Crowbook is run with the `--single` argument (receiving a single Markdown file instead of a book configuration file), for short texts that only contain one "chapter".
 
-### Proofreading
-
-Crowbook can also generate "proofreading" copies in HTML or PDF, highlighting grammar errors and repetitions.
-For more information, see
-[the proofreading chapter of the guide](guide/05_proofreading.md).
-
 ### Interactive fiction
 
 Crowbook has experimental support for writing interactive fiction (only for HTML).
@@ -162,8 +148,132 @@ See the
 
 ## Contributors
 
-* [Stéphane Mourey](http://stephanemourey.fr/) `<s+crowbook AT stephanemourey DOT fr>`
-* [Falco Hirschenberger](https://github.com/hirschenberger)
+<!-- readme: contributors -start -->
+<table>
+<tr>
+    <td align="center">
+        <a href="https://github.com/lise-henry">
+            <img src="https://avatars.githubusercontent.com/u/1961791?v=4" width="100;" alt="lise-henry"/>
+            <br />
+            <sub><b>Élisabeth Henry</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/Crowdagger">
+            <img src="https://avatars.githubusercontent.com/u/1954779?v=4" width="100;" alt="Crowdagger"/>
+            <br />
+            <sub><b>Lizzie Crowdagger</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/stefan0xC">
+            <img src="https://avatars.githubusercontent.com/u/509385?v=4" width="100;" alt="stefan0xC"/>
+            <br />
+            <sub><b>Stefan Melmuk</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/hirschenberger">
+            <img src="https://avatars.githubusercontent.com/u/1053180?v=4" width="100;" alt="hirschenberger"/>
+            <br />
+            <sub><b>Falco Hirschenberger</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/Geobert">
+            <img src="https://avatars.githubusercontent.com/u/72570?v=4" width="100;" alt="Geobert"/>
+            <br />
+            <sub><b>Geobert Quach</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/jrappen">
+            <img src="https://avatars.githubusercontent.com/u/8577450?v=4" width="100;" alt="jrappen"/>
+            <br />
+            <sub><b>Johannes Rappen</b></sub>
+        </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/taophp">
+            <img src="https://avatars.githubusercontent.com/u/5610065?v=4" width="100;" alt="taophp"/>
+            <br />
+            <sub><b>Stéphane Mourey</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/dkotrada">
+            <img src="https://avatars.githubusercontent.com/u/698296?v=4" width="100;" alt="dkotrada"/>
+            <br />
+            <sub><b>Alfa</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/hfiguiere">
+            <img src="https://avatars.githubusercontent.com/u/114441?v=4" width="100;" alt="hfiguiere"/>
+            <br />
+            <sub><b>Hubert Figuière</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/dvalter">
+            <img src="https://avatars.githubusercontent.com/u/38795282?v=4" width="100;" alt="dvalter"/>
+            <br />
+            <sub><b>Dmitry Valter</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/Dylan-DPC">
+            <img src="https://avatars.githubusercontent.com/u/99973273?v=4" width="100;" alt="Dylan-DPC"/>
+            <br />
+            <sub><b>Dylan DPC</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/steffahn">
+            <img src="https://avatars.githubusercontent.com/u/3986214?v=4" width="100;" alt="steffahn"/>
+            <br />
+            <sub><b>Frank Steffahn</b></sub>
+        </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/cuviper">
+            <img src="https://avatars.githubusercontent.com/u/36186?v=4" width="100;" alt="cuviper"/>
+            <br />
+            <sub><b>Josh Stone</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/mgeisler">
+            <img src="https://avatars.githubusercontent.com/u/89623?v=4" width="100;" alt="mgeisler"/>
+            <br />
+            <sub><b>Martin Geisler</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/sigurdsvela">
+            <img src="https://avatars.githubusercontent.com/u/5571884?v=4" width="100;" alt="sigurdsvela"/>
+            <br />
+            <sub><b>Sigurd Svela</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/twirrim">
+            <img src="https://avatars.githubusercontent.com/u/59949?v=4" width="100;" alt="twirrim"/>
+            <br />
+            <sub><b>Twirrim</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/ar1ocker">
+            <img src="https://avatars.githubusercontent.com/u/109543340?v=4" width="100;" alt="ar1ocker"/>
+            <br />
+            <sub><b>Ar1oc</b></sub>
+        </a>
+    </td></tr>
+</table>
+<!-- readme: contributors -end -->
 
 ## Acknowledgements
 
diff --git a/guide.book b/guide.book
index 046cfe3..f2db895 100644
--- a/guide.book
+++ b/guide.book
@@ -41,7 +41,7 @@ proofread.languagetool: true
 rendering.num_depth: 4
 rendering.initials: false
 rendering.inline_toc: true
-rendering.chapter.template: "{{{number}}}. {{{chapter_title}}}"
+rendering.chapter.template: "{{number}}. {{chapter_title}}"
 rendering.chapter.roman_numerals: false
 rendering.part.reset_counter: true
 rendering.highlight: syntect
@@ -50,8 +50,8 @@ html.highlight.theme: "Solarized (dark)"
 
 # Html options
 html.icon: crowbook.svg
-html.header: "{{{title}}} {{{version}}}"
-html.footer: "Generated by [Crowbook](https://github.com/lise-henry/crowbook) {{{crowbook_version}}}"
+html.header: "{{title}} {{version}}"
+html.footer: "Generated by [Crowbook](https://github.com/lise-henry/crowbook) {{crowbook_version}}"
 html.side_notes: false
 html.standalone.one_chapter: false
 
@@ -74,7 +74,6 @@ epub.version: 3
 + guide/02_config.md
 + guide/03_markdown.md
 + guide/04_templates.md
-+ guide/05_proofreading.md
 + guide/06_interactive_fiction.md
 + guide/07_miscellaneous.md
 + guide/08_contributing.md
diff --git a/guide/01_arguments.md b/guide/01_arguments.md
index db3cce5..5e1dc03 100644
--- a/guide/01_arguments.md
+++ b/guide/01_arguments.md
@@ -182,23 +182,6 @@ crowbook -S <BOOK>
 
 Display some statistics (word and character counts) about the book.
 
-## `--proofread`
-
-**Usage**:
-
-```bash
-crowbook --proofread <BOOK>
-```
-
-or:
-
-```bash
-crowbook -p <BOOK>
-```
-
-Equivalent to `--set proofread true`, enables proofreading.
-See [Proofreading](05_proofreading.md).
-
 ## `--autograph`
 
 **Usage**:
diff --git a/guide/02_config.md b/guide/02_config.md
index 2f67434..ddde66d 100644
--- a/guide/02_config.md
+++ b/guide/02_config.md
@@ -299,11 +299,6 @@ Current output options are:
 * `output.tex`: renders a LaTeX file.
 * `output.pdf`: renders a PDF file (using `tex.command`).
 
-(There are other output options for generating proofreading files, see
-[Proofreading](05_proofreading.md),
-and interactive fiction, see
-[Interactive fiction](06_interactive_fiction.md).)
-
 #### The `output` option
 
 Setting output file names manually can be a bit tedious, and is not always necessary.
@@ -643,12 +638,6 @@ The `path` type might puzzle you a bit, but it's equivalent to a string, except
 - **default value**: `not set`
 -  Output file name for PDF rendering
 
-#### `output.odt`
-
-- **type**: path
-- **default value**: `not set`
--  Output file name for ODT rendering
-
 #### `output.html.if`
 
 - **type**: path
diff --git a/src/lib/book.rs b/src/lib/book.rs
index ae0b39a..61577e1 100644
--- a/src/lib/book.rs
+++ b/src/lib/book.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2016, 2017, 2018 Élisabeth HENRY.
+// Copyright (C) 2016-2023 Élisabeth HENRY.
 //
 // This file is part of Crowbook.
 //
@@ -22,15 +22,13 @@ use crate::chapter::Chapter;
 use crate::cleaner::{Cleaner, CleanerParams, Default, French, Off};
 use crate::epub::Epub;
 use crate::error::{Error, Result, Source};
-use crate::html_dir::{HtmlDir, ProofHtmlDir};
+use crate::html_dir::HtmlDir;
 use crate::html_if::HtmlIf;
-use crate::html_single::{HtmlSingle, ProofHtmlSingle};
+use crate::html_single::HtmlSingle;
 use crate::lang;
-use crate::latex::{Latex, Pdf, ProofLatex, ProofPdf};
+use crate::latex::{Latex, Pdf};
 use crate::misc;
 use crate::number::Number;
-#[cfg(feature = "odt")]
-use crate::odt::Odt;
 use crate::parser::Features;
 use crate::parser::Parser;
 use crate::resource_handler::ResourceHandler;
@@ -38,50 +36,15 @@ use crate::templates::{epub, epub3, highlight, html, html_dir, html_if, html_sin
 use crate::text_view::view_as_text;
 use crate::token::Token;
 
-#[cfg(feature = "proofread")]
-use crate::grammalecte::GrammalecteChecker;
-#[cfg(feature = "proofread")]
-use crate::grammar_check::GrammarChecker;
-#[cfg(feature = "proofread")]
-use crate::repetition_check::RepetitionDetector;
-// Dummy grammarchecker thas does nothing to let the compiler compile
-#[cfg(not(feature = "proofread"))]
-struct GrammarChecker {}
-#[cfg(not(feature = "proofread"))]
-impl GrammarChecker {
-    fn check_chapter(&self, _: &[Token]) -> Result<()> {
-        Ok(())
-    }
-}
-// Dummy grammalectechecker thas does nothing to let the compiler compile
-#[cfg(not(feature = "proofread"))]
-struct GrammalecteChecker {}
-#[cfg(not(feature = "proofread"))]
-impl GrammalecteChecker {
-    fn check_chapter(&self, _: &[Token]) -> Result<()> {
-        Ok(())
-    }
-}
-// Dummy RepetitionDetector thas does nothing to let the compiler compile
-#[cfg(not(feature = "proofread"))]
-struct RepetitionDetector {}
-#[cfg(not(feature = "proofread"))]
-impl RepetitionDetector {
-    fn check_chapter(&self, _: &[Token]) -> Result<()> {
-        Ok(())
-    }
-}
-
 use std::borrow::Cow;
 use std::cmp::Ordering;
-use std::collections::HashMap;
+use std::collections::{HashMap, BTreeMap};
 use std::fmt;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::iter::IntoIterator;
 use std::path::{Path, PathBuf};
 
-use mustache::{MapBuilder, Template};
 use numerals::roman::Roman;
 use rayon::prelude::*;
 use yaml_rust::{Yaml, YamlLoader};
@@ -156,7 +119,7 @@ impl fmt::Display for HeaderData {
 /// // Render the book as html to stdout
 /// book.render_format_to("html", &mut std::io::stdout()).unwrap();
 /// ```
-pub struct Book {
+pub struct Book<'a> {
     /// Internal structure. You should not accesss this directly except if
     /// you are writing a new renderer.
     pub chapters: Vec<Chapter>,
@@ -177,75 +140,52 @@ pub struct Book {
     pub features: Features,
 
     cleaner: Box<dyn Cleaner>,
-    chapter_template: Option<Template>,
-    part_template: Option<Template>,
-    checker: Option<GrammarChecker>,
-    grammalecte: Option<GrammalecteChecker>,
-    detector: Option<RepetitionDetector>,
     formats: HashMap<&'static str, (String, Box<dyn BookRenderer>)>,
 
     #[doc(hidden)]
     pub bars: Bars,
+
+    /// Store the templates registry
+    pub registry: upon::Engine<'a>,
 }
 
-impl Book {
+impl<'a> Book<'a> {
     /// Creates a new, empty `Book`
-    pub fn new() -> Book {
+    pub fn new() -> Book<'a> {
         let mut book = Book {
             source: Source::empty(),
             chapters: vec![],
             cleaner: Box::new(Off),
             root: PathBuf::new(),
             options: BookOptions::new(),
-            chapter_template: None,
-            part_template: None,
-            checker: None,
-            grammalecte: None,
-            detector: None,
             formats: HashMap::new(),
             features: Features::new(),
             bars: Bars::new(),
+            registry: upon::Engine::new(),
         };
+
+        // Add some filters to registry that are useful for some templates
+        book.registry.add_filter("eq", str::eq);
+        book.registry.add_filter("starts", |a: &str, b: &str| a.starts_with(b));
+
         book.add_format(
             "html",
             lformat!("HTML (standalone page)"),
             Box::new(HtmlSingle {}),
         )
-        .add_format(
-            "proofread.html",
-            lformat!("HTML (standalone page/proofreading)"),
-            Box::new(ProofHtmlSingle {}),
-        )
         .add_format(
             "html.dir",
             lformat!("HTML (multiple pages)"),
             Box::new(HtmlDir {}),
         )
-        .add_format(
-            "proofread.html.dir",
-            lformat!("HTML (multiple pages/proofreading)"),
-            Box::new(ProofHtmlDir {}),
-        )
         .add_format("tex", lformat!("LaTeX"), Box::new(Latex {}))
-        .add_format(
-            "proofread.tex",
-            lformat!("LaTeX (proofreading)"),
-            Box::new(ProofLatex {}),
-        )
         .add_format("pdf", lformat!("PDF"), Box::new(Pdf {}))
-        .add_format(
-            "proofread.pdf",
-            lformat!("PDF (proofreading)"),
-            Box::new(ProofPdf {}),
-        )
         .add_format("epub", lformat!("EPUB"), Box::new(Epub {}))
         .add_format(
             "html.if",
             lformat!("HTML (interactive fiction)"),
             Box::new(HtmlIf {}),
         );
-        #[cfg(feature = "odt")]
-        book.add_format("odt", lformat!("ODT"), Box::new(Odt {}));
         book
     }
 
@@ -307,9 +247,9 @@ impl Book {
     /// assert_eq!(book.options.get_str("author").unwrap(), "Foo");
     /// assert_eq!(book.options.get_str("title").unwrap(), "Bar");
     /// ```
-    pub fn set_options<'a, I>(&mut self, options: I) -> &mut Book
+    pub fn set_options<'b, I>(&mut self, options: I) -> &mut Self
     where
-        I: IntoIterator<Item = &'a (&'a str, &'a str)>,
+        I: IntoIterator<Item = &'b (&'b str, &'b str)>,
     {
         // set options
         for (key, value) in options {
@@ -344,7 +284,7 @@ impl Book {
     /// let mut book = Book::new();
     /// let result = book.load_file("some.book");
     /// ```
-    pub fn load_file<P: AsRef<Path>>(&mut self, path: P) -> Result<&mut Book> {
+    pub fn load_file<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
         let filename = format!("{}", path.as_ref().display());
         self.source = Source::new(filename.as_str());
         self.options.source = Source::new(filename.as_str());
@@ -358,9 +298,8 @@ impl Book {
             self.options.root = self.root.clone();
         }
 
-        let result = self.read_config(&f);
-        match result {
-            Ok(book) => Ok(book),
+        match self.read_config(&f) {
+            Ok(_) => Ok(()),
             Err(err) => {
                 if err.is_config_parser() && path.as_ref().ends_with(".md") {
                     let err = Error::default(
@@ -395,7 +334,7 @@ impl Book {
     /// let mut book = Book::new();
     /// book.load_markdown_file("foo.md"); // not unwraping since foo.md doesn't exist
     /// ```
-    pub fn load_markdown_file<P: AsRef<Path>>(&mut self, path: P) -> Result<&mut Self> {
+    pub fn load_markdown_file<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
         let filename = format!("{}", path.as_ref().display());
         self.source = Source::new(filename.as_str());
 
@@ -414,7 +353,7 @@ impl Book {
         // Update grammar checker according to options
         self.add_chapter(Number::Hidden, &relative_path.to_string_lossy(), false)?;
 
-        Ok(self)
+        Ok(())
     }
 
     /// Reads a single markdown config from a `Read`able object.
@@ -439,18 +378,18 @@ impl Book {
     /// book.read_markdown_config(content.as_bytes()).unwrap();
     /// assert_eq!(book.options.get_str("title").unwrap(), "Bar");
     /// ```
-    pub fn read_markdown_config<R: Read>(&mut self, source: R) -> Result<&mut Self> {
+    pub fn read_markdown_config<R: Read>(&mut self, source: R) -> Result<()> {
         self.options.set("tex.class", "article").unwrap();
         self.options.set("input.yaml_blocks", "true").unwrap();
 
         // Update grammar checker according to options
         self.add_chapter_from_source(Number::Hidden, source, false)?;
 
-        Ok(self)
+        Ok(())
     }
 
     /// Sets options from a YAML block
-    fn set_options_from_yaml(&mut self, yaml: &str) -> Result<&mut Book> {
+    fn set_options_from_yaml(&mut self, yaml: &str) -> Result<&mut Self> {
         self.options.source = self.source.clone();
         match YamlLoader::load_from_str(yaml) {
             Err(err) => {
@@ -513,8 +452,8 @@ impl Book {
     /// let mut book = Book::new();
     /// book.read_config(content.as_bytes()); // no unwraping as `intro.md` and `chapter_01.md` don't exist
     /// ```
-    pub fn read_config<R: Read>(&mut self, mut source: R) -> Result<&mut Book> {
-        fn get_filename<'a>(source: &Source, s: &'a str) -> Result<&'a str> {
+    pub fn read_config<R: Read>(&mut self, mut source: R) -> Result<()> {
+        fn get_filename<'b>(source: &Source, s: &'b str) -> Result<&'b str> {
             let words: Vec<&str> = (s[1..]).split_whitespace().collect();
             if words.len() > 1 {
                 return Err(Error::config_parser(
@@ -613,9 +552,6 @@ impl Book {
         // Update cleaner according to options (autoclean/lang)
         self.update_cleaner();
 
-        // Update grammar checker according to options (proofread.*)
-        self.init_checker();
-
         self.bar_set_message(Crowbar::Main, &lformat!("Parsing chapters"));
 
         // Parse chapters
@@ -736,7 +672,7 @@ impl Book {
 
         self.source.unset_line();
         self.set_chapter_template()?;
-        Ok(self)
+        Ok(())
     }
 
     /// Determine whether proofreading is activated or not
@@ -747,63 +683,6 @@ impl Book {
                 || self.options.get("output.proofread.pdf").is_ok())
     }
 
-    /// Initialize the grammar checker and repetetion detector if they needs to be
-    #[cfg(feature = "proofread")]
-    fn init_checker(&mut self) {
-        if self.is_proofread() {
-            if self.options.get_bool("proofread.languagetool").unwrap() {
-                let port = self.options.get_i32("proofread.languagetool.port").unwrap() as usize;
-                let lang = self.options.get_str("lang").unwrap();
-                let checker = GrammarChecker::new(port, lang);
-                match checker {
-                    Ok(checker) => self.checker = Some(checker),
-                    Err(e) => {
-                        error!(
-                            "{}",
-                            lformat!("{error}. Proceeding without using languagetool.", error = e)
-                        )
-                    }
-                }
-            }
-            if self.options.get_bool("proofread.grammalecte").unwrap() {
-                let port = self.options.get_i32("proofread.grammalecte.port").unwrap() as usize;
-                let lang = self.options.get_str("lang").unwrap();
-                let checker = GrammalecteChecker::new(port, lang);
-                match checker {
-                    Ok(checker) => self.grammalecte = Some(checker),
-                    Err(e) => {
-                        error!(
-                            "{}",
-                            lformat!("{error}. Proceeding without using grammalecte.", error = e)
-                        )
-                    }
-                }
-            }
-            if self.options.get_bool("proofread.repetitions").unwrap() {
-                self.detector = Some(RepetitionDetector::new(self));
-            }
-        }
-    }
-
-    #[cfg(not(feature = "proofread"))]
-    fn init_checker(&mut self) {}
-
-    /// Renders the book to the given format if output.{format} is set;
-    /// do nothing otherwise.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use crowbook::Book;
-    /// let mut book = Book::new();
-    /// /* Will do nothing as book is empty and has no output format specified */
-    /// book.render_format("pdf");
-    /// ```
-    pub fn render_format(&self, format: &str) {
-        // TODO: check that it doesn't break everything, or use option?
-        self.render_format_with_bar(format, 0)
-    }
-
     /// Generates output files acccording to book options.
     ///
     /// # Example
@@ -1115,76 +994,6 @@ impl Book {
             misc::insert_title(&mut tokens);
         }
 
-        // If one of the renderers requires it, perform grammarcheck
-        if cfg!(feature = "proofread") && self.is_proofread() {
-            let normalized = misc::normalize(file);
-            if let Some(ref checker) = self.checker {
-                self.bar_set_message(Crowbar::Second, &lformat!("Running languagetool"));
-
-                info!(
-                    "{}",
-                    lformat!(
-                        "Trying to run languagetool on {file}, this might take a \
-                                    while...",
-                        file = &normalized
-                    )
-                );
-                if let Err(err) = checker.check_chapter(&mut tokens) {
-                    error!(
-                        "{}",
-                        lformat!(
-                            "Error running languagetool on {file}: {error}",
-                            file = &normalized,
-                            error = err
-                        )
-                    );
-                }
-            }
-            if let Some(ref checker) = self.grammalecte {
-                self.bar_set_message(Crowbar::Second, &lformat!("Running grammalecte"));
-
-                info!(
-                    "{}",
-                    lformat!(
-                        "Trying to run grammalecte on {file}, this might take a \
-                                    while...",
-                        file = &normalized
-                    )
-                );
-                if let Err(err) = checker.check_chapter(&mut tokens) {
-                    error!(
-                        "{}",
-                        lformat!(
-                            "Error running grammalecte on {file}: {error}",
-                            file = &normalized,
-                            error = err
-                        )
-                    );
-                }
-            }
-            if let Some(ref detector) = self.detector {
-                self.bar_set_message(Crowbar::Second, &lformat!("Detecting repetitions"));
-
-                info!(
-                    "{}",
-                    lformat!(
-                        "Trying to run repetition detector on {file}, this might take a \
-                                      while...",
-                        file = &normalized
-                    )
-                );
-                if let Err(err) = detector.check_chapter(&mut tokens) {
-                    error!(
-                        "{}",
-                        lformat!(
-                            "Error running repetition detector on {file}: {error}",
-                            file = &normalized,
-                            error = err
-                        )
-                    );
-                }
-            }
-        }
         self.bar_set_message(Crowbar::Second, "");
 
         self.chapters.push(Chapter::new(number, file, tokens));
@@ -1351,12 +1160,16 @@ impl Book {
 
     /// Sets the chapter_template once and for all
     fn set_chapter_template(&mut self) -> Result<()> {
-        let template = compile_str(
-            self.options.get_str("rendering.chapter.template").unwrap(),
-            &self.source,
-            "rendering.chapter.template",
-        )?;
-        self.chapter_template = Some(template);
+        self.registry.add_template("rendering.chapter.template", 
+            self.options.get_str("rendering.chapter.template").unwrap().to_owned())
+            .map_err(|e| Error::template(
+                &self.source,
+                lformat!(
+                    "could not compile '{template}': {error}",
+                    template = "rendering.chapter.template",
+                    error = e
+                ))
+            )?;
         Ok(())
     }
 
@@ -1408,7 +1221,7 @@ impl Book {
         };
         let mut data = self.get_metadata(&mut f)?;
         if !title.is_empty() {
-            data = data.insert_bool(format!("has_{header_type}_title"), true);
+            data.insert(format!("has_{header_type}_title"), true.into());
         }
         let number = self.get_header_number(header, n)?;
         let header_name = self
@@ -1417,43 +1230,20 @@ impl Book {
             .map(|s| s.to_owned())
             .unwrap_or_else(|_| lang::get_str(self.options.get_str("lang").unwrap(), header_type));
 
-        data = data
-            .insert_str(format!("{header_type}_title"), title.clone())
-            .insert_str(header_type, header_name.clone())
-            .insert_str("number", number.clone());
-        let data = data.build();
-        let mut res: Vec<u8> = vec![];
+        data.insert(format!("{header_type}_title"), title.clone().into());
+        data.insert(header_type.into(), header_name.clone().into());
+        data.insert("number".into(), number.clone().into());
 
-        let opt_template = match header {
-            Header::Part => &self.part_template,
-            Header::Chapter => &self.chapter_template,
-        };
-
-        if let Some(ref template) = *opt_template {
-            template.render_data(&mut res, &data)?;
-        } else {
-            let template = compile_str(
-                self.options
-                    .get_str(&format!("rendering.{header_type}.template"))
-                    .unwrap(),
-                &self.source,
-                &format!("rendering.{header_type}.template"),
-            )?;
-            template.render_data(&mut res, &data)?;
-        }
-
-        match String::from_utf8(res) {
-            Err(_) => panic!(
-                "{}",
-                lformat!("header generated by mustache was not valid utf-8")
-            ),
-            Ok(res) => Ok(HeaderData {
-                text: res,
-                number,
-                header: header_name,
-                title,
-            }),
-        }
+        let res = self.registry.get_template(&format!("rendering.{header_type}.template"))
+            .expect("Error accessing template rendering.{header_type}.template")
+            .render(&data)
+            .to_string()?;
+        Ok(HeaderData {
+            text: res,
+            number,
+            header: header_name,
+            title,
+        })
     }
 
     /// Returns the string corresponding to a number, title, and the numbering template for chapter
@@ -1474,26 +1264,24 @@ impl Book {
         self.get_header(Header::Part, n, title, f)
     }
 
-    /// Returns a `MapBuilder` (used by `Mustache` for templating), to be used (and completed)
+    /// Returns a `Map of Key/Value` (used by `Upon` for templating), to be used (and completed)
     /// by renderers. It fills it with the metadata options.
     ///
     /// It also uses the lang/xx.yaml file corresponding to the language and fills
     /// `loc_xxx` fiels with it that corresponds to translated versions.
     ///
     /// This method treats the metadata as Markdown and thus calls `f` to render it.
+    /// This is why we can’t really cache this as it will depend on the renderer. 
     #[doc(hidden)]
-    pub fn get_metadata<F>(&self, mut f: F) -> Result<MapBuilder>
+    pub fn get_metadata<F>(&self, mut f: F) -> Result<BTreeMap<String, upon::Value>>
     where
         F: FnMut(&str) -> Result<String>,
     {
-        let mut mapbuilder = MapBuilder::new();
-        mapbuilder = mapbuilder.insert_str("crowbook_version", env!("CARGO_PKG_VERSION"));
-        mapbuilder = mapbuilder.insert_bool(
-            format!("lang_{}", self.options.get_str("lang").unwrap()),
-            true,
-        );
+        let mut m: BTreeMap<String, upon::Value> = BTreeMap::new();
+        m.insert("crowbook_version".into(), env!("CARGO_PKG_VERSION").into());
+        m.insert(format!("lang_{}", self.options.get_str("lang").unwrap()), true.into());
 
-        // Add metadata to mapbuilder
+        // Add metadata to map
         for key in self.options.get_metadata() {
             if let Ok(s) = self.options.get_str(key) {
                 let key = key.replace('.', "_");
@@ -1507,12 +1295,13 @@ impl Book {
                 match content {
                     Ok(content) => {
                         if !content.is_empty() {
-                            mapbuilder = mapbuilder.insert_str(format!("{key}_raw"), raw);
-                            mapbuilder = mapbuilder.insert_str(key.clone(), content);
+                            m.insert(format!("{key}_raw"), raw.into());
+                            m.insert(key.clone(), content.into());
 
-                            mapbuilder = mapbuilder.insert_bool(format!("has_{key}"), true);
+                            m.insert(format!("has_{key}"), true.into());
                         } else {
-                            mapbuilder = mapbuilder.insert_bool(format!("has_{key}"), false);
+                            m.insert(key.clone(), "".into());
+                            m.insert(format!("has_{key}"), false.into());
                         }
                     }
                     Err(err) => {
@@ -1528,7 +1317,8 @@ impl Book {
                     }
                 }
             } else {
-                mapbuilder = mapbuilder.insert_bool(format!("has_{key}"), false);
+                m.insert(key.clone(), "".into());
+                m.insert(format!("has_{key}"), false.into());
             }
         }
 
@@ -1537,11 +1327,30 @@ impl Book {
         for (key, value) in hash {
             let key = format!("loc_{}", key.as_str().unwrap());
             let value = value.as_str().unwrap();
-            mapbuilder = mapbuilder.insert_str(key, value);
+            m.insert(key, value.into());
         }
-        Ok(mapbuilder)
+        Ok(m)
     }
 
+    /// Calls upon::engine::compile, does NOT registre the complete 
+    pub fn compile_str<'s, O>(&self, template: &'s str, source: O, template_name: &str) -> Result<upon::Template<'_, 's>>
+    where
+        O: Into<Source>,
+    {
+        let result = self.registry.compile(template);
+        match result {
+            Ok(result) => Ok(result),
+            Err(err) => Err(Error::template(
+                source,
+                lformat!(
+                    "could not compile '{template_name}': {:#}",
+                    err
+                ),
+            )),
+        }
+    }
+
+
     /// Remove YAML blocks from a string and try to parse them to set options
     ///
     /// YAML blocks start with
@@ -1606,7 +1415,6 @@ impl Book {
                     }
 
                     self.update_cleaner();
-                    self.init_checker();
                 } else {
                     debug!(
                         "{}",
@@ -1668,28 +1476,9 @@ impl Book {
     }
 }
 
-impl std::default::Default for Book {
+impl std::default::Default for Book<'_> {
     fn default() -> Self {
         Self::new()
     }
 }
 
-/// Calls mustache::compile_str but catches panics and returns a result
-pub fn compile_str<O>(template: &str, source: O, template_name: &str) -> Result<mustache::Template>
-where
-    O: Into<Source>,
-{
-    let input: String = template.to_owned();
-    let result = mustache::compile_str(&input);
-    match result {
-        Ok(result) => Ok(result),
-        Err(err) => Err(Error::template(
-            source,
-            lformat!(
-                "could not compile '{template}': {error}",
-                template = template_name,
-                error = err
-            ),
-        )),
-    }
-}
diff --git a/src/lib/book_bars.rs b/src/lib/book_bars.rs
index 2b501c7..7528852 100644
--- a/src/lib/book_bars.rs
+++ b/src/lib/book_bars.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2022 Élisabeth HENRY.
+// Copyright (C) 2017-2023 Élisabeth HENRY.
 //
 // This file is part of Crowbook.
 //
@@ -63,7 +63,7 @@ impl Default for Bars {
 
 /// Return the style of a bar
 
-impl Book {
+impl Book<'_> {
     /// Adds a progress bar where where info should be written.
     ///
     /// See [indicatif doc](https://docs.rs/indicatif) for more information.
@@ -270,7 +270,7 @@ impl Book {
     }
 }
 
-impl Drop for Book {
+impl Drop for Book<'_> {
     fn drop(&mut self) {
         if let Some(ref bar) = self.bars.secondbar {
             bar.finish_and_clear();
diff --git a/src/lib/book_bars_stubs.rs b/src/lib/book_bars_stubs.rs
index 0de7c73..155f8e9 100644
--- a/src/lib/book_bars_stubs.rs
+++ b/src/lib/book_bars_stubs.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Élisabeth HENRY.
+// Copyright (C) 2017-2023 Élisabeth HENRY.
 //
 // This file is part of Crowbook.
 //
@@ -28,7 +28,7 @@ impl Bars {
     }
 }
 
-impl Book {
+impl Book<'_> {
     pub fn private_add_progress_bar(&mut self, _: bool) {}
 
     /// Sets a finished message to the progress bar, if it is set
diff --git a/src/lib/bookoptions.rs b/src/lib/bookoptions.rs
index 769be38..a2fa28e 100644
--- a/src/lib/bookoptions.rs
+++ b/src/lib/bookoptions.rs
@@ -5,7 +5,6 @@ use crate::style;
 
 use std::collections::HashMap;
 use std::env;
-use std::mem;
 use std::path::{Path, PathBuf};
 use yaml_rust::{Yaml, YamlLoader};
 
@@ -41,16 +40,16 @@ rendering.highlight:str:syntect                                      # {renderin
 rendering.highlight.theme:str:InspiredGitHub                         # {rendering_highlight_theme}
 rendering.initials:bool:false                                        # {rendering_initials}
 rendering.inline_toc:bool:false                                      # {inline_toc}
-rendering.inline_toc.name:str:\"{{{{{{loc_toc}}}}}}\"                        # {toc_name}
+rendering.inline_toc.name:str:\"{{{{loc_toc}}}}\"                        # {toc_name}
 rendering.num_depth:int:1                                            # {num_depth}
 rendering.chapter:str                                                # {chapter}
 rendering.part:str                                                   # {part}
 rendering.chapter.roman_numerals:bool:false                                  # {roman_numerals_chapters}
 rendering.part.roman_numerals:bool:true                                      # {roman_numerals_parts}
 rendering.part.reset_counter:bool:true                                      # {reset_counter}
-rendering.chapter.template:str:\"{{{{{{number}}}}}}. {{{{{{chapter_title}}}}}}\" # {chapter_template}
+rendering.chapter.template:str:\"{{{{number}}}}. {{{{chapter_title}}}}\" # {chapter_template}
 
-rendering.part.template:str:\"{{{{{{number}}}}}}. {{{{{{part_title}}}}}}\" # {part_template}
+rendering.part.template:str:\"{{{{number}}}}. {{{{part_title}}}}\" # {part_template}
 
 
 
@@ -72,8 +71,8 @@ html.highlight.js:tpl               # {highlight_js}
 html.highlight.css:tpl              # {highlight_css}
 html.side_notes:bool:false          # {side_notes}
 html.escape_nb_spaces:bool:true     # {nb_spaces}
-html.chapter.template:str:\"<h1 id = 'link-{{{{{{link}}}}}}'>{{{{#has_number}}}}<span class = 'chapter-header'>{{{{{{header}}}}}} {{{{{{number}}}}}}</span>{{{{#has_title}}}}<br />{{{{/has_title}}}}{{{{/has_number}}}}{{{{{{title}}}}}}</h1>\" # {html_chapter_template}
-html.part.template:str:\"<h2 class = 'part'>{{{{{{header}}}}}} {{{{{{number}}}}}}</h2> <h1 id = 'link-{{{{{{link}}}}}}' class = 'part'>{{{{{{title}}}}}}</h1>\" # {html_part_template}
+html.chapter.template:str:\"<h1 id = 'link-{{{{link}}}}'>{{% if has_number %}}<span class = 'chapter-header'>{{{{header}}}} {{{{number}}}}</span>{{% if has_title %}}<br />{{% endif %}}{{% endif %}}{{{{title}}}}</h1>\" # {html_chapter_template}
+html.part.template:str:\"<h2 class = 'part'>{{{{header}}}} {{{{number}}}}</h2> <h1 id = 'link-{{{{link}}}}' class = 'part'>{{{{title}}}}</h1>\" # {html_part_template}
 
 # {html_single_opt}
 html.standalone.template:tpl                # {single_html}
@@ -559,8 +558,7 @@ impl BookOptions {
                     })?;
                     let mut book = Book::new();
                     book.load_file(file)?;
-                    let options = mem::replace(&mut book.options, BookOptions::new());
-                    self.merge(options)?;
+                    self.merge(&book.options)?;
                     Ok(None)
                 } else {
                     Ok(self.options.insert(key, BookOption::Path(value)))
@@ -910,7 +908,7 @@ impl BookOptions {
     /// If option is already set in self, don't add it, unless it was the default.
     /// Option is not inserted either if new value is equal to default.
     #[doc(hidden)]
-    pub fn merge(&mut self, other: BookOptions) -> Result<()> {
+    pub fn merge(&mut self, other: &BookOptions) -> Result<()> {
         for (key, value) in &other.options {
             // Check if option was already set, and if it was to default or to something else
             if self.defaults.contains_key(key) {
diff --git a/src/lib/epub.rs b/src/lib/epub.rs
index eb2a9cd..4f2b815 100644
--- a/src/lib/epub.rs
+++ b/src/lib/epub.rs
@@ -16,7 +16,7 @@
 // along with Crowbook.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::book::Header;
-use crate::book::{compile_str, Book};
+use crate::book::Book;
 use crate::book_renderer::BookRenderer;
 use crate::error::{Error, Result, Source};
 use crate::html::HtmlRenderer;
@@ -34,7 +34,7 @@ use epub_builder::{
     EpubBuilder, EpubContent, EpubVersion, ReferenceType, ZipCommand, ZipCommandOrLibrary,
     ZipLibrary,
 };
-use mustache::Template;
+use upon::Template;
 
 use std::borrow::Cow;
 use std::convert::{AsMut, AsRef};
@@ -194,8 +194,9 @@ impl<'a> EpubRenderer<'a> {
         }
 
         // Write chapters
-        let template_chapter = compile_str(
-            self.html.book.get_template("epub.chapter.xhtml")?.as_ref(),
+        let template_chapter_src = self.html.book.get_template("epub.chapter.xhtml")?;
+        let template_chapter = self.html.book.compile_str(
+            template_chapter_src.as_ref(),
             &self.html.book.source,
             "epub.chapter.xhtml",
         )?;
@@ -229,23 +230,21 @@ impl<'a> EpubRenderer<'a> {
         self.html.source = Source::empty();
 
         // Render the CSS file and write it
-        let template_css = compile_str(
-            self.html.book.get_template("epub.css").unwrap().as_ref(),
+        let template_css_src = self.html.book.get_template("epub.css").unwrap();
+        let template_css = self.html.book.compile_str(
+            template_css_src.as_ref(),
             &self.html.book.source,
             "epub.css",
         )?;
         let mut data = self
             .html
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_bool(self.html.book.options.get_str("lang").unwrap(), true);
-        if let Ok(epub_css_add) = self.html.book.options.get_str("epub.css.add") {
-            data = data.insert_str("additional_code", epub_css_add);
-        }
-        let data = data.build();
-        let mut res: Vec<u8> = vec![];
-        template_css.render_data(&mut res, &data)?;
-        let css = String::from_utf8_lossy(&res);
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        data.insert(self.html.book.options.get_str("lang").unwrap().into(), true.into());
+        let epub_css_add = self.html.book.options.get_str("epub.css.add").unwrap_or("".into()); 
+        data.insert("additional_code".into(), epub_css_add.into());
+        
+        let css = template_css.render(&data).to_string()?;
         maker.stylesheet(css.as_bytes())
             .map_err(|err| Error::render(Source::empty(), format!("{}", err)))?;
 
@@ -308,25 +307,17 @@ impl<'a> EpubRenderer<'a> {
 
     /// Render the titlepgae
     fn render_titlepage(&mut self) -> Result<String> {
-        let template = compile_str(
-            self.html
-                .book
-                .get_template("epub.titlepage.xhtml")?
-                .as_ref(),
+        let template_src = self.html.book.get_template("epub.titlepage.xhtml")?;
+        let template = self.html.book.compile_str(
+            template_src.as_ref(),
             &self.html.book.source,
             "epub.titlepage.xhtml",
         )?;
         let data = self
             .html
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .build();
-        let mut res: Vec<u8> = vec![];
-        template.render_data(&mut res, &data)?;
-        match String::from_utf8(res) {
-            Err(_) => panic!("generated HTML in titlepage was not utf-8 valid"),
-            Ok(res) => Ok(res),
-        }
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        Ok(template.render(&data).to_string()?)
     }
 
     /// Render cover.xhtml
@@ -341,32 +332,22 @@ impl<'a> EpubRenderer<'a> {
                 ));
             }
             let epub3 = self.html.book.options.get_i32("epub.version").unwrap() == 3;
-            let template = compile_str(
+            let template = self.html.book.compile_str(
                 if epub3 { epub3::COVER } else { COVER },
                 &self.html.book.source,
                 "cover.xhtml",
             )?;
-            let data = self
+            let mut data = self
                 .html
                 .book
-                .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-                .insert_str(
-                    "cover",
+                .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+            data.insert(
+                    "cover".into(),
                     self.html
                         .handler
                         .map_image(&self.html.source, Cow::Owned(cover))?
-                        .into_owned(),
-                )
-                .build();
-            let mut res: Vec<u8> = vec![];
-            template.render_data(&mut res, &data)?;
-            match String::from_utf8(res) {
-                Err(_) => panic!(
-                    "{}",
-                    lformat!("generated HTML for cover.xhtml was not utf-8 valid")
-                ),
-                Ok(res) => Ok(res),
-            }
+                        .into());
+            Ok(template.render(&data).to_string()?)
         } else {
             panic!(
                 "{}",
@@ -421,21 +402,15 @@ impl<'a> EpubRenderer<'a> {
         }
         self.toc.push(self.chapter_title.clone());
 
-        let data = self
+        let mut data = self
             .html
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("content", content)
-            .insert_str("chapter_title_raw", self.chapter_title_raw.clone())
-            .insert_str("chapter_title", std::mem::take(&mut self.chapter_title))
-            .build();
-        self.chapter_title = String::new();
-        let mut res: Vec<u8> = vec![];
-        template.render_data(&mut res, &data)?;
-        match String::from_utf8(res) {
-            Err(_) => panic!("{}", lformat!("generated HTML was not utf-8 valid")),
-            Ok(res) => Ok((res, std::mem::take(&mut self.chapter_title_raw))),
-        }
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        data.insert("content".into(), content.into());
+        data.insert("chapter_title_raw".into(), self.chapter_title_raw.clone(). into());
+        data.insert("chapter_title".into(), std::mem::take(&mut self.chapter_title).into());
+        Ok((template.render(&data).to_string()?,
+            std::mem::take(&mut self.chapter_title_raw)))
     }
 
     /// Renders the header section of the book, finding the title of the chapter
diff --git a/src/lib/error.rs b/src/lib/error.rs
index 9d2184c..da2fe63 100644
--- a/src/lib/error.rs
+++ b/src/lib/error.rs
@@ -179,7 +179,7 @@ impl Error {
 
     /// Creates a new template error.
     ///
-    /// Error when compiling a mustache template.
+    /// Error when compiling a template.
     pub fn template<S: Into<Cow<'static, str>>, O: Into<Source>>(source: O, msg: S) -> Error {
         Error {
             source: source.into(),
@@ -360,10 +360,10 @@ impl fmt::Display for Error {
 /// Crowbook's Result type, used by many methods that can fail
 pub type Result<T> = result::Result<T, Error>;
 
-/// Implement our Error from mustache::Error
-impl From<mustache::Error> for Error {
-    fn from(err: mustache::Error) -> Error {
-        Error::template(Source::empty(), format!("{err}"))
+/// Implement our Error from upon::error
+impl From<upon::Error> for Error {
+    fn from(err: upon::Error) -> Error {
+        Error::template(Source::empty(), format!("{:#}", err))
     }
 }
 
diff --git a/src/lib/html.rs b/src/lib/html.rs
index b152fe0..e4c863c 100644
--- a/src/lib/html.rs
+++ b/src/lib/html.rs
@@ -17,7 +17,7 @@
 
 use crate::book::Header;
 use crate::book::HeaderData;
-use crate::book::{compile_str, Book};
+use crate::book::Book;
 use crate::error::{Error, Result, Source};
 use crate::lang;
 use crate::number::Number;
@@ -32,12 +32,11 @@ use crate::text_view;
 use std::borrow::Cow;
 use std::convert::{AsMut, AsRef};
 use std::fmt::Write;
+use std::collections::BTreeMap;
 
 use crowbook_text_processing::escape;
 use epub_builder::Toc;
 use epub_builder::TocElement;
-use mustache::MapBuilder;
-use mustache::Template;
 use numerals::roman::Roman;
 
 #[derive(Debug, PartialEq, Copy, Clone)]
@@ -63,7 +62,7 @@ pub struct HtmlRenderer<'a> {
     filename: String,
 
     /// Book that must be rendered
-    pub book: &'a Book,
+    pub book: &'a Book<'a>,
 
     /// Proofread or not
     pub proofread: bool,
@@ -109,8 +108,8 @@ pub struct HtmlRenderer<'a> {
 
     syntax: Option<Syntax>,
 
-    part_template_html: Template,
-    chapter_template_html: Template,
+    part_template_html: upon::Template<'a, 'a>,
+    chapter_template_html: upon::Template<'a, 'a>,
 }
 
 impl<'a> HtmlRenderer<'a> {
@@ -161,12 +160,12 @@ impl<'a> HtmlRenderer<'a> {
             proofread: false,
             syntax,
             highlight,
-            part_template_html: compile_str(
+            part_template_html: book.compile_str(
                 book.options.get_str("html.part.template").unwrap(),
                 Source::empty(),
                 "html.part.template",
             )?,
-            chapter_template_html: compile_str(
+            chapter_template_html: book.compile_str(
                 book.options.get_str("html.chapter.template").unwrap(),
                 Source::empty(),
                 "html.chapter.template",
@@ -278,17 +277,15 @@ impl<'a> HtmlRenderer<'a> {
                 };
                 let has_number = !data.header.is_empty();
                 let has_title = !data.title.is_empty();
-                let data = MapBuilder::new()
-                    .insert_bool("has_number", has_number)
-                    .insert_bool("has_title", has_title)
-                    .insert_str("header", data.header)
-                    .insert_str("number", data.number)
-                    .insert_str("link", format!("{}", self.link_number))
-                    .insert_str("title", data.title)
-                    .build();
-                let mut res = vec![];
-                template.render_data(&mut res, &data)?;
-                Ok(String::from_utf8(res)?)
+                let data = upon::value!{
+                    has_number: has_number,
+                    has_title: has_title,
+                    header: data.header,
+                    number: data.number,
+                    title: data.title,
+                    link: format!("{}", self.link_number)
+                };
+                Ok(template.render(&data).to_string()?)
             }
         } else {
             Ok(format!(
@@ -667,12 +664,12 @@ impl<'a> HtmlRenderer<'a> {
 
     /// Consider the html as a template
     fn templatize(&mut self, s: &str) -> Result<String> {
-        let mapbuilder = self.book.get_metadata(|s| Ok(s.to_owned()))?;
-        let data = mapbuilder.build();
-        let template = compile_str(s, &self.book.source, "")?;
-        let mut res = vec![];
-        template.render_data(&mut res, &data)?;
-        Ok(String::from_utf8_lossy(&res).into_owned())
+        if s.is_empty() {
+            return Ok(String::new());
+        }
+        let data = self.book.get_metadata(|s| Ok(s.to_owned()))?;
+        let template = self.book.compile_str(s, &self.book.source, "")?;
+        Ok(template.render(&data).to_string()?)
     }
 
     /// Renders the toc name
@@ -680,17 +677,14 @@ impl<'a> HtmlRenderer<'a> {
     pub fn get_toc_name(&mut self) -> Result<String> {
         let data = self
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .build();
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
         let template = self
             .book
             .options
             .get_str("rendering.inline_toc.name")
             .unwrap();
-        let template = compile_str(template, &self.book.source, "rendering.inline_toc.name")?;
-        let mut res = vec![];
-        template.render_data(&mut res, &data)?;
-        Ok(String::from_utf8_lossy(&res).into_owned())
+        let template = self.book.compile_str(template, &self.book.source, "rendering.inline_toc.name")?;
+        Ok(template.render(&data).to_string()?)
     }
 
     /// Render a section containing schema.org JSON-LD code
@@ -700,23 +694,37 @@ impl<'a> HtmlRenderer<'a> {
 {
     "@context": "http://schema.org/",
     "@type": "Book",
-    "author": "{{{author}}}",
-    "name": "{{{title}}}",
-    {{#has_version}}"version": "{{{version}}}",{{/has_version}}
-    {{#has_subtitle}}"alternateName": "{{{subtitle}}}",{{/has_subtitle}}
-    {{#has_subject}}"keywords": "{{{subject}}}",{{/has_subject}}
-    {{#has_license}}"license": "{{{license}}}",{{/has_license}}
-    {{#has_description}}"about": "{{{description}}}",{{/has_description}}
-    "inLanguage": "{{{lang}}}"
-
-
-
-
+    "author": "{{author}}",
+    "name": "{{title}}",
+    {% if has_version %}"version": "{{version}}",{% endif %}
+    {% if has_subtitle %}"alternateName": "{{subtitle}}",{% endif %}
+    {% if has_subject %}"keywords": "{{subject}}",{% endif %}
+    {% if has_license %}"license": "{{license}}",{% endif %}
+    {% if has_description %}"about": "{{description}}",{% endif %}
+    "inLanguage": "{{lang}}"
 }
 </script>"#;
         self.templatize(json)
     }
 
+    /// Get metadata useful for many HTML templates.
+    /// This could be cached yes.
+    pub fn get_metadata(&mut self) -> Result<BTreeMap<String, upon::Value>> {
+        // Get base metadata 
+        let mut data = self
+            .book
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+
+        // Add stuff used for HTML templates
+        data.insert("json_data".into(), self.get_json_ld()?.into());
+        data.insert("script".into(), self.book.get_template("html.js").unwrap().into());
+        data.insert("highlight_code".into(), (self.highlight == Highlight::Js).into());
+        data.insert("footer".into(), HtmlRenderer::get_footer(self)?.into());
+        data.insert("header".into(), HtmlRenderer::get_header(self)?.into());
+
+        Ok(data)
+    }
+
     /// Renders a footer, which can include a "Generated by Crowboook" link
     /// or a customized text
     #[doc(hidden)]
diff --git a/src/lib/html_dir.rs b/src/lib/html_dir.rs
index e7ba183..d9994cc 100644
--- a/src/lib/html_dir.rs
+++ b/src/lib/html_dir.rs
@@ -15,7 +15,7 @@
 // You should have received ba copy of the GNU Lesser General Public License
 // along with Crowbook.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::book::{compile_str, Book};
+use crate::book::Book;
 use crate::book_renderer::BookRenderer;
 use crate::error::{Error, Result, Source};
 use crate::html::Highlight;
@@ -58,12 +58,6 @@ impl<'a> HtmlDirRenderer<'a> {
         Ok(HtmlDirRenderer { html })
     }
 
-    /// Set aproofreading to true
-    pub fn proofread(mut self) -> HtmlDirRenderer<'a> {
-        self.html.proofread = true;
-        self
-    }
-
     /// Render a book
     pub fn render_book(&mut self, dest_path: &Path) -> Result<()> {
         // Add internal files to resource handler
@@ -273,8 +267,9 @@ impl<'a> HtmlDirRenderer<'a> {
         let toc = self.html.toc.render(false, false);
 
         // render all chapters
-        let template = compile_str(
-            self.html.book.get_template("html.dir.template")?.as_ref(),
+        let template_src = self.html.book.get_template("html.dir.template")?;
+        let template = self.html.book.compile_str(
+            template_src.as_ref(),
             &self.html.book.source,
             "html.dir.template",
         )?;
@@ -308,39 +303,33 @@ impl<'a> HtmlDirRenderer<'a> {
             };
 
             // Render each HTML document
-            let mut mapbuilder = self
+            let mut data = self
                 .html
-                .book
-                .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-                .insert_str("content", content?)
-                .insert_str("chapter_title", titles[i].clone())
-                .insert_str("json_data", self.html.get_json_ld()?)
-                .insert_str("chapter_title_raw", titles_raw[i].clone())
-                .insert_str("toc", toc.clone())
-                .insert_str("prev_chapter", prev_chapter)
-                .insert_str("next_chapter", next_chapter)
-                .insert_str("footer", HtmlRenderer::get_footer(self)?)
-                .insert_str("header", HtmlRenderer::get_header(self)?)
-                .insert_str("script", self.html.book.get_template("html.js").unwrap())
-                .insert_bool(self.html.book.options.get_str("lang").unwrap(), true);
-
+                .get_metadata()?;
+            data.insert("content".into(), content?.into());
+            data.insert("chapter_title".into(), titles[i].clone().into());
+            data.insert("chapter_title_raw".into(), titles_raw[i].clone().into());
+            data.insert("toc".into(), toc.clone().into());
+            data.insert("prev_chapter".into(), prev_chapter.into());
+            data.insert("next_chapter".into(), next_chapter.into());
+            data.insert("is_chapter".into(), true.into());
+            
             if let Ok(favicon) = self.html.book.options.get_path("html.icon") {
                 let favicon = self
                     .html
                     .handler
                     .map_image(&self.html.book.source, favicon)?;
-                mapbuilder = mapbuilder.insert_str(
-                    "favicon",
-                    format!("<link rel = \"icon\" href = \"{favicon}\">"),
+                data.insert(
+                    "favicon".into(),
+                    format!("<link rel = \"icon\" href = \"{favicon}\">").into(),
                 );
+            } else {
+                data.insert("favicon".into(), "".into());
             }
-            if self.html.highlight == Highlight::Js {
-                mapbuilder = mapbuilder.insert_bool("highlight_code", true);
-            }
-            let data = mapbuilder.build();
-            let mut res = vec![];
-            template.render_data(&mut res, &data)?;
-            self.write_file(&filenamer(i), &res)?;
+
+
+            let res = template.render(&data).to_string()?;
+            self.write_file(&filenamer(i), res.as_bytes())?;
         }
 
         let mut content = if let Ok(cover) = self.html.book.options.get_path("cover") {
@@ -420,38 +409,30 @@ impl<'a> HtmlDirRenderer<'a> {
             )?;
         }
         // Render index.html and write it too
-        let mut mapbuilder = self
+        let mut data = self
             .html
-            .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("content", content)
-            .insert_str("header", HtmlRenderer::get_header(self)?)
-            .insert_str("footer", HtmlRenderer::get_footer(self)?)
-            .insert_str("toc", toc.clone())
-            .insert_str("script", self.html.book.get_template("html.js").unwrap())
-            .insert_bool(self.html.book.options.get_str("lang").unwrap(), true);
+            .get_metadata()?;
+        data.insert("content".into(), content.into());
+        data.insert("toc".into(), toc.into());
+        data.insert("is_chapter".into(), false.into());
         if let Ok(favicon) = self.html.book.options.get_path("html.icon") {
             let favicon = self
                 .html
                 .handler
                 .map_image(&self.html.book.source, favicon)?;
-            mapbuilder = mapbuilder.insert_str(
-                "favicon",
-                format!("<link rel = \"icon\" href = \"{favicon}\">"),
+            data.insert(
+                "favicon".into(),
+                format!("<link rel = \"icon\" href = \"{favicon}\">").into(),
             );
         }
-        if self.html.highlight == Highlight::Js {
-            mapbuilder = mapbuilder.insert_bool("highlight_code", true);
-        }
-        let data = mapbuilder.build();
-        let template = compile_str(
-            self.html.book.get_template("html.dir.template")?.as_ref(),
+        let template_src = self.html.book.get_template("html.dir.template")?;
+        let template = self.html.book.compile_str(
+            template_src.as_ref(),
             &self.html.book.source,
             "html.dir.template",
         )?;
-        let mut res = vec![];
-        template.render_data(&mut res, &data)?;
-        self.write_file("index.html", &res)?;
+        let res = template.render(&data).to_string()?;
+        self.write_file("index.html", res.as_bytes())?;
 
         Ok(())
     }
@@ -459,20 +440,18 @@ impl<'a> HtmlDirRenderer<'a> {
     // Render the CSS file and write it
     fn write_css(&self) -> Result<()> {
         // Render the CSS
-        let template_css = compile_str(
-            self.html.book.get_template("html.css")?.as_ref(),
+        let template_css_src = self.html.book.get_template("html.css")?;
+        let template_css = self.html.book.compile_str(
+            template_css_src.as_ref(),
             &self.html.book.source,
             "html.css",
         )?;
         let mut data = self.html.book.get_metadata(|s| Ok(s.to_owned()))?;
-        data = data.insert_str("colors", self.html.book.get_template("html.css.colors")?);
-        if let Ok(html_css_add) = self.html.book.options.get_str("html.css.add") {
-            data = data.insert_str("additional_code", html_css_add);
-        }
-        let data = data.build();
-        let mut res: Vec<u8> = vec![];
-        template_css.render_data(&mut res, &data)?;
-        let css = String::from_utf8_lossy(&res);
+        data.insert("colors".into(), self.html.book.get_template("html.css.colors")?.into());
+        let html_css_add = self.html.book.options.get_str("html.css.add").unwrap_or("".into());
+        data.insert("additional_code".into(), html_css_add.into());
+        
+        let css = template_css.render(&data).to_string()?;
 
         // Write it
         self.write_file("stylesheet.css", css.as_bytes())
@@ -542,7 +521,6 @@ fn filenamer(i: usize) -> String {
 derive_html! {HtmlDirRenderer<'a>, HtmlRenderer::static_render_token}
 
 pub struct HtmlDir {}
-pub struct ProofHtmlDir {}
 
 impl BookRenderer for HtmlDir {
     fn auto_path(&self, _: &str) -> Result<String> {
@@ -560,22 +538,4 @@ impl BookRenderer for HtmlDir {
         HtmlDirRenderer::new(book)?.render_book(path)?;
         Ok(())
     }
-}
-
-impl BookRenderer for ProofHtmlDir {
-    fn auto_path(&self, _: &str) -> Result<String> {
-        Ok(String::from("output_html_proof"))
-    }
-
-    fn render(&self, _: &Book, _: &mut dyn io::Write) -> Result<()> {
-        Err(Error::render(
-            Source::empty(),
-            lformat!("can only render HTML directory to a path, not to a stream"),
-        ))
-    }
-
-    fn render_to_file(&self, book: &Book, path: &Path) -> Result<()> {
-        HtmlDirRenderer::new(book)?.proofread().render_book(path)?;
-        Ok(())
-    }
-}
+}
\ No newline at end of file
diff --git a/src/lib/html_if.rs b/src/lib/html_if.rs
index 2d749c4..ac35491 100644
--- a/src/lib/html_if.rs
+++ b/src/lib/html_if.rs
@@ -15,7 +15,7 @@
 // You should have received ba copy of the GNU Lesser General Public License
 // along with Crowbook.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::book::{compile_str, Book};
+use crate::book::Book;
 use crate::book_renderer::BookRenderer;
 use crate::error::{Error, Result, Source};
 use crate::html::Highlight;
@@ -261,74 +261,71 @@ return crowbook_return_variable.replace(/<\\/ul><ul>/g, '');\n",
         self.html.render_end_notes(&mut content, "section", "");
 
         // Render the CSS
-        let template_css = compile_str(
-            self.html.book.get_template("html.css")?.as_ref(),
+        let template_css_src = self.html.book.get_template("html.css")?;
+        let template_css = self.html.book.compile_str(
+            template_css_src.as_ref(),
             &self.html.book.source,
             "html.css",
         )?;
         let mut data = self
             .html
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("colors", self.html.book.get_template("html.css.colors")?);
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        data.insert("colors".into(), self.html.book.get_template("html.css.colors")?.into());
         if let Ok(html_css_add) = self.html.book.options.get_str("html.css.add") {
-            data = data.insert_str("additional_code", html_css_add);
+            data.insert("additional_code".into(), html_css_add.into());
         }
-        let data = data.build();
-        let mut res: Vec<u8> = vec![];
-        template_css.render_data(&mut res, &data)?;
-        let css = String::from_utf8_lossy(&res);
+        let css:String = template_css.render(&data).to_string()?;
 
         // Render the JS
-        let template_js = compile_str(
-            self.html.book.get_template("html.if.js")?.as_ref(),
+        let template_js_src = self.html.book.get_template("html.if.js")?;
+        let template_js = self.html.book.compile_str(
+            template_js_src.as_ref(),
             &self.html.book.source,
             "html.standalone.js",
         )?;
-        let data = self
+        let mut data = self
             .html
             .book
-            .get_metadata(|s| Ok(s.to_owned()))?
-            .insert_bool("one_chapter", true)
-            .insert_str("js_prelude", std::mem::take(&mut self.fn_defs))
-            .insert_str(
-                "new_game",
-                self.html.book.get_template("html.if.new_game").unwrap(),
-            )
-            .insert_str(
-                "common_script",
-                self.html.book.get_template("html.js").unwrap().as_ref(),
-            )
-            .build();
-        let mut res: Vec<u8> = vec![];
-        template_js.render_data(&mut res, &data)?;
-        let js = String::from_utf8_lossy(&res);
+            .get_metadata(|s| Ok(s.to_owned()))?;
+        data.insert("one_chapter".into(), true.into());
+        data.insert("js_prelude".into(), self.fn_defs.clone().into());
+        data.insert(
+                "new_game".into(),
+                self.html.book.get_template("html.if.new_game").unwrap().into(),
+        );
+        data.insert(
+                "common_script".into(),
+                self.html.book.get_template("html.js").unwrap().into(),
+        );
+        let js = template_js.render(&data).to_string()?;
+
 
         // Render the HTML document
-        let mut mapbuilder = self
+        let mut data = self
             .html
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("content", content)
-            .insert_str("script", js)
-            .insert_bool(self.html.book.options.get_str("lang").unwrap(), true)
-            .insert_bool("one_chapter", true)
-            .insert_str("style", css.as_ref())
-            .insert_str(
-                "print_style",
-                self.html.book.get_template("html.css.print").unwrap(),
-            )
-            .insert_str("footer", HtmlRenderer::get_footer(self)?)
-            .insert_str("header", HtmlRenderer::get_header(self)?)
-            .insert_bool("has_toc", false);
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        data.insert("content".into(), content.into());
+        data.insert("script".into(), js.into());
+        data.insert(self.html.book.options.get_str("lang").unwrap().into(), true.into());
+        data.insert("one_chapter".into(), true.into());
+        data.insert("style".into(), css.into());
+        data.insert(
+                "print_style".into(),
+                self.html.book.get_template("html.css.print").unwrap().into(),
+        );
+        data.insert("footer".into(), HtmlRenderer::get_footer(self)?.into());
+        data.insert("header".into(), HtmlRenderer::get_header(self)?.into());
+        data.insert("has_toc".into(), false.into());
         if let Ok(favicon) = self.html.book.options.get_path("html.icon") {
             let favicon = self
                 .html
                 .handler
                 .map_image(&self.html.book.source, favicon)?;
-            mapbuilder = mapbuilder.insert_str(
-                "favicon",
-                format!("<link rel = \"icon\" href = \"{favicon}\">"),
+            data.insert(
+                "favicon".into(),
+                format!("<link rel = \"icon\" href = \"{favicon}\">").into(),
             );
         }
         if self.html.highlight == Highlight::Js {
@@ -338,26 +335,20 @@ return crowbook_return_variable.replace(/<\\/ul><ul>/g, '');\n",
                 .get_template("html.highlight.js")?
                 .as_bytes());
             let highlight_js = format!("data:text/javascript;base64,{highlight_js}");
-            mapbuilder = mapbuilder
-                .insert_bool("highlight_code", true)
-                .insert_str(
-                    "highlight_css",
-                    self.html.book.get_template("html.highlight.css")?,
-                )
-                .insert_str("highlight_js", highlight_js);
+            data.insert("highlight_code".into(), true.into());
+            data.insert(
+                    "highlight_css".into(),
+                    self.html.book.get_template("html.highlight.css")?.into(),
+            );
+            data.insert("highlight_js".into(), highlight_js.into());
         }
-        let data = mapbuilder.build();
-        let template = compile_str(
-            self.html
-                .book
-                .get_template("html.standalone.template")?
-                .as_ref(),
+        let template_src = self.html.book.get_template("html.standalone.template")?;
+        let template = self.html.book.compile_str(
+            template_src.as_ref(),
             &self.html.book.source,
             "html.standalone.template",
         )?;
-        let mut res = vec![];
-        template.render_data(&mut res, &data)?;
-        Ok(String::from_utf8_lossy(&res).into_owned())
+        Ok(template.render(&data).to_string()?)
     }
 }
 
diff --git a/src/lib/html_single.rs b/src/lib/html_single.rs
index b4dcc7d..d5bb113 100644
--- a/src/lib/html_single.rs
+++ b/src/lib/html_single.rs
@@ -15,7 +15,7 @@
 // You should have received ba copy of the GNU Lesser General Public License
 // along with Crowbook.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::book::{compile_str, Book};
+use crate::book::Book;
 use crate::book_renderer::BookRenderer;
 use crate::error::{Error, Result, Source};
 use crate::html::Highlight;
@@ -215,93 +215,93 @@ impl<'a> HtmlSingleRenderer<'a> {
         }
 
         // Render the CSS
-        let template_css = compile_str(
-            self.html.book.get_template("html.css")?.as_ref(),
+        let template_css_src = self.html.book.get_template("html.css")?;
+        let template_css = self.html.book.compile_str(
+            template_css_src.as_ref(),
             &self.html.book.source,
             "html.css",
         )?;
         let mut data = self
             .html
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("colors", self.html.book.get_template("html.css.colors")?);
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        data.insert("colors".into(), self.html.book.get_template("html.css.colors")?.into());
         if let Ok(html_css_add) = self.html.book.options.get_str("html.css.add") {
-            data = data.insert_str("additional_code", html_css_add);
+            data.insert("additional_code".into(), html_css_add.into());
+        } else {
+            data.insert("additional_code".into(), "".into());
         }
-        let data = data.build();
-        let mut res: Vec<u8> = vec![];
-        template_css.render_data(&mut res, &data)?;
-        let css = String::from_utf8_lossy(&res);
+        let css = template_css.render(&data).to_string()?;
+
 
         // Render the JS
-        let template_js = compile_str(
-            self.html.book.get_template("html.standalone.js")?.as_ref(),
+        let template_js_src = self.html.book.get_template("html.standalone.js")?;
+        let template_js = self.html.book.compile_str(
+            template_js_src.as_ref(),
             &self.html.book.source,
             "html.standalone.js",
         )?;
-        let data = self
+        let mut data = self
             .html
             .book
-            .get_metadata(|s| Ok(s.to_owned()))?
-            .insert_str("book_svg", book_svg.clone())
-            .insert_str("pages_svg", pages_svg.clone())
-            .insert_bool(
-                "one_chapter",
+            .get_metadata(|s| Ok(s.to_owned()))?;
+        data.insert("book_svg".into(), book_svg.clone().into());
+        data.insert("pages_svg".into(), pages_svg.clone().into());
+        data.insert(
+                "one_chapter".into(),
                 self.html
                     .book
                     .options
                     .get_bool("html.standalone.one_chapter")
-                    .unwrap(),
-            )
-            .insert_str(
-                "common_script",
-                self.html.book.get_template("html.js").unwrap().as_ref(),
-            )
-            .build();
-        let mut res: Vec<u8> = vec![];
-        template_js.render_data(&mut res, &data)?;
-        let js = String::from_utf8_lossy(&res);
+                    .unwrap()
+                    .into(),
+        );
+        data.insert(
+            "common_script".into(),
+            self.html.book.get_template("html.js").unwrap().into(),
+        );
+        let js = template_js.render(&data).to_string()?;
 
         // Render the HTML document
-        let mut mapbuilder = self
+        let mut data = self
             .html
-            .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("content", content)
-            .insert_str("script", js)
-            .insert_bool(self.html.book.options.get_str("lang").unwrap(), true)
-            .insert_bool(
-                "one_chapter",
+            .get_metadata()?;
+        data.insert("content".into(), content.into());
+        data.insert(
+                "one_chapter".into(),
                 self.html
                     .book
                     .options
                     .get_bool("html.standalone.one_chapter")
-                    .unwrap(),
-            )
-            .insert_str("style", css.as_ref())
-            .insert_str(
-                "print_style",
-                self.html.book.get_template("html.css.print").unwrap(),
-            )
-            .insert_str("menu_svg", menu_svg)
-            .insert_str("book_svg", book_svg)
-            .insert_str("pages_svg", pages_svg)
-            .insert_str("json_data", self.html.get_json_ld()?)
-            .insert_str("footer", HtmlRenderer::get_footer(self)?)
-            .insert_str("header", HtmlRenderer::get_header(self)?);
+                    .unwrap()
+                    .into(),
+        );
+        data.insert("style".into(), css.into());
+        data.insert("script".into(), js.into()); // Need to override this for html_single
+        data.insert(
+                "print_style".into(),
+                self.html.book.get_template("html.css.print").unwrap().into(),
+        );
+        data.insert("menu_svg".into(), menu_svg.clone().into());
+        data.insert("book_svg".into(), book_svg.clone().into());
+        data.insert("pages_svg".into(), pages_svg.clone().into());
         if let Ok(favicon) = self.html.book.options.get_path("html.icon") {
             let favicon = self
                 .html
                 .handler
                 .map_image(&self.html.book.source, favicon)?;
-            mapbuilder = mapbuilder.insert_str(
-                "favicon",
-                format!("<link rel = \"icon\" href = \"{favicon}\">"),
+            data.insert(
+                "favicon".into(),
+                format!("<link rel = \"icon\" href = \"{favicon}\">").into(),
             );
+        } else {
+            data.insert("favicon".into(), "".into()); 
         }
         if !self.html.toc.is_empty() {
-            mapbuilder = mapbuilder.insert_bool("has_toc", true);
-            mapbuilder = mapbuilder.insert_str("toc", toc)
+            data.insert("has_toc".into(), true.into());
+            data.insert("toc".into(), toc.into());
+        } else {
+            data.insert("has_toc".into(), false.into());
         }
         if self.html.highlight == Highlight::Js {
             let highlight_js = misc::u8_to_base64(&self
@@ -310,26 +310,20 @@ impl<'a> HtmlSingleRenderer<'a> {
                 .get_template("html.highlight.js")?
                 .as_bytes());
             let highlight_js = format!("data:text/javascript;base64,{highlight_js}");
-            mapbuilder = mapbuilder
-                .insert_bool("highlight_code", true)
-                .insert_str(
-                    "highlight_css",
-                    self.html.book.get_template("html.highlight.css")?,
-                )
-                .insert_str("highlight_js", highlight_js);
-        }
-        let data = mapbuilder.build();
-        let template = compile_str(
-            self.html
-                .book
-                .get_template("html.standalone.template")?
-                .as_ref(),
+            data.insert("highlight_code".into(), true.into());
+            data.insert(
+                    "highlight_css".into(),
+                    self.html.book.get_template("html.highlight.css")?.into(),
+            );
+            data.insert("highlight_js".into(), highlight_js.into());
+        } 
+        let template_src = self.html.book.get_template("html.standalone.template")?;
+        let template = self.html.book.compile_str(
+            template_src.as_ref(),
             &self.html.book.source,
             "html.standalone.template",
         )?;
-        let mut res = vec![];
-        template.render_data(&mut res, &data)?;
-        Ok(String::from_utf8_lossy(&res).into_owned())
+        Ok(template.render(&data).to_string()?)
     }
 }
 
diff --git a/src/lib/latex.rs b/src/lib/latex.rs
index d1fdafa..7f88ee9 100644
--- a/src/lib/latex.rs
+++ b/src/lib/latex.rs
@@ -15,7 +15,7 @@
 // You should have received ba copy of the GNU Lesser General Public License
 // along with Crowbook.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::book::{compile_str, Book};
+use crate::book::Book;
 use crate::book_renderer::BookRenderer;
 use crate::error::{Error, Result, Source};
 use crate::number::Number;
@@ -39,7 +39,7 @@ use std::iter::Iterator;
 
 /// LaTeX renderer
 pub struct LatexRenderer<'a> {
-    book: &'a Book,
+    book: &'a Book<'a>,
     current_chapter: Number,
     handler: ResourceHandler,
     source: Source,
@@ -210,96 +210,87 @@ impl<'a> LatexRenderer<'a> {
             }
         });
 
-        let template = compile_str(
-            self.book.get_template("tex.template")?.as_ref(),
-            &self.book.source,
-            "tex.template",
-        )?;
+        let template_src = self.book.get_template("tex.template")?;
+
+        // We have to use a different template engine because we need different syntax
+        let syntax = upon::Syntax::builder()
+            .expr("<<", ">>")
+            .block("<#", "#>")
+            .comment("<%", "%>")
+            .build(); 
+        let mut engine = upon::Engine::with_syntax(syntax);
+        engine.add_template("tex.template", template_src)?;
+        let template = engine.get_template("tex.template").unwrap();
         let mut data = self
             .book
-            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?
-            .insert_str("content", content)
-            .insert_str("class", self.book.options.get_str("tex.class").unwrap())
-            .insert_bool(
-                "tex_title",
-                self.book.options.get_bool("tex.title").unwrap(),
-            )
-            .insert_str(
-                "papersize",
-                self.book.options.get_str("tex.paper.size").unwrap(),
-            )
-            .insert_bool(
-                "stdpage",
-                self.book.options.get_bool("tex.stdpage").unwrap(),
-            )
-            .insert_bool("use_url", self.book.features.url)
-            .insert_bool("use_taskitem", self.book.features.taskitem)
-            .insert_bool("use_tables", self.book.features.table)
-            .insert_bool("use_codeblocks", self.book.features.codeblock)
-            .insert_bool("use_images", self.book.features.image)
-            .insert_bool("use_strikethrough", self.book.features.strikethrough)
-            .insert_str("tex_lang", tex_lang);
-        if let Ok(tex_tmpl_add) = self.book.options.get_str("tex.template.add") {
-            data = data.insert_str("additional_code", tex_tmpl_add);
-        }
+            .get_metadata(|s| self.render_vec(&Parser::new().parse_inline(s)?))?;
+        data.insert("content".into(), content.into());
+        data.insert("class".into(), self.book.options.get_str("tex.class").unwrap().into());
+        data.insert("tex_title".into(), self.book.options.get_bool("tex.title").unwrap().into());
+        data.insert("papersize".into(), self.book.options.get_str("tex.paper.size").unwrap().into());
+        data.insert("stdpage".into(), self.book.options.get_bool("tex.stdpage").unwrap().into());
+        data.insert("use_url".into(), self.book.features.url.into());
+        data.insert("use_taskitem".into(), self.book.features.taskitem.into());
+        data.insert("use_tables".into(), self.book.features.table.into());
+        data.insert("use_codeblocks".into(), self.book.features.codeblock.into());
+        data.insert("use_images".into(), self.book.features.image.into());
+        data.insert("use_strikethrough".into(), self.book.features.strikethrough.into());
+        data.insert("tex_lang".into(), tex_lang.into());
+        let tex_tmpl_add = self.book.options.get_str("tex.template.add").unwrap_or("".into());
+        data.insert("additional_code".into(), tex_tmpl_add.into());
+
         if let Ok(tex_font_size) = self.book.options.get_i32("tex.font.size") {
-            data = data
-                .insert_bool("has_tex_size", true)
-                .insert_str("tex_size", format!("{tex_font_size}"));
+            data.insert("has_tex_size".into(), true.into());
+            data.insert("tex_size".into(), format!("{tex_font_size}").into());
+        } else {
+            data.insert("has_tex_size".into(), false.into());
         }
 
         // If class isn't book, set open_any to true, so margins are symetric.
         let mut book = false;
         if self.book.options.get_str("tex.class").unwrap() == "book" {
-            data = data.insert_bool("book", true);
             book = true;
         }
-        data = data
-            .insert_str(
-                "margin_left",
+        data.insert("book".into(), book.into());
+        data.insert(
+                "margin_left".into(),
                 self.book
                     .options
                     .get_str("tex.margin.left")
-                    .unwrap_or(if book { "2.5cm" } else { "2cm" }),
-            )
-            .insert_str(
-                "margin_right",
+                    .unwrap_or(if book { "2.5cm" } else { "2cm" }).into(),
+        );
+        data.insert(
+                "margin_right".into(),
                 self.book
                     .options
                     .get_str("tex.margin.right")
-                    .unwrap_or(if book { "1.5cm" } else { "2cm" }),
-            )
-            .insert_str(
-                "margin_bottom",
-                self.book.options.get_str("tex.margin.bottom").unwrap(),
-            )
-            .insert_str(
-                "margin_top",
-                self.book.options.get_str("tex.margin.top").unwrap(),
-            );
+                    .unwrap_or(if book { "1.5cm" } else { "2cm" }).into(),
+        );
+        data.insert(
+                "margin_bottom".into(),
+                self.book.options.get_str("tex.margin.bottom").unwrap().into(),
+        );
+        data.insert(
+                "margin_top".into(),
+                self.book.options.get_str("tex.margin.top").unwrap().into(),
+        );
 
-        if let Ok(chapter_name) = self.book.options.get_str("rendering.chapter") {
-            data = data.insert_str("chapter_name", chapter_name);
-        }
-        if let Ok(part_name) = self.book.options.get_str("rendering.part") {
-            data = data.insert_str("part_name", part_name);
-        }
-        if self.book.options.get_bool("rendering.initials") == Ok(true) {
-            data = data.insert_bool("initials", true);
-        }
+        let chapter_name = self.book.options.get_str("rendering.chapter").unwrap_or("".into());
+        data.insert("chapter_name".into(), chapter_name.into());
+        
+        let part_name = self.book.options.get_str("rendering.part").unwrap_or("".into());
+        data.insert("part_name".into(), part_name.into());
+        data.insert("initials".into(), self.book.options.get_bool("rendering.initials").unwrap().into());
         // Insert xelatex if tex.command is set to xelatex or tectonic
         if (self.book.options.get_str("tex.command") == Ok("xelatex"))
             | (self.book.options.get_str("tex.command") == Ok("tectonic"))
         {
-            data = data.insert_bool("xelatex", true);
-        }
-        let data = data.build();
-        let mut res: Vec<u8> = vec![];
-        template.render_data(&mut res, &data)?;
-        match String::from_utf8(res) {
-            Err(_) => panic!("{}", lformat!("generated LaTeX was not valid utf-8")),
-            Ok(res) => Ok(res),
+            data.insert("xelatex".into(), true.into());
+        } else 
+        { 
+            data.insert("xelatex".into(), false.into());
         }
+        Ok(template.render(&data).to_string()?)
     }
 }
 
diff --git a/src/lib/templates.rs b/src/lib/templates.rs
index 2060b27..bb261c0 100644
--- a/src/lib/templates.rs
+++ b/src/lib/templates.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2016, 2017 Élisabeth HENRY.
+// Copyright (C) 2016-2023 Élisabeth HENRY.
 //
 // This file is part of Crowbook.
 //
@@ -7,7 +7,7 @@
 // by the Free Software Foundation, either version 2.1 of the License, or
 // (at your option) any later version.
 //
-// Caribon is distributed in the hope that it will be useful,
+// Crowbook is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Lesser General Public License for more details.
diff --git a/templates/epub/cover.xhtml b/templates/epub/cover.xhtml
index a7e84d4..0b29671 100644
--- a/templates/epub/cover.xhtml
+++ b/templates/epub/cover.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{{lang}}}">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{lang}}">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -10,7 +10,7 @@
 </head>
 <body>
 <div id="cover">
-<img src="{{{cover}}}" alt="{{{loc_cover}}}" />
+<img src="{{cover}}" alt="{{loc_cover}}" />
 </div>
 </body>
 </html>
diff --git a/templates/epub/stylesheet.css b/templates/epub/stylesheet.css
index 26f49d3..fab97fb 100644
--- a/templates/epub/stylesheet.css
+++ b/templates/epub/stylesheet.css
@@ -188,13 +188,13 @@ table.notes tr td p {
     font-variant: small-caps;
 }
 
-{{#lang_fr}}
+{% if lang | eq: "fr" %}
 /* Make list displays '–' instead of bullets */
 ul li {
     list-style-type: '–';
     padding-left: .5em;
 }
-{{/lang_fr}}
+{% endif %}
 
 span.initial { 
     float: left;
@@ -217,4 +217,4 @@ p.first-para {
     padding: 0;
 }
 
-{{{additional_code}}}
\ No newline at end of file
+{{additional_code}}
\ No newline at end of file
diff --git a/templates/epub/template.xhtml b/templates/epub/template.xhtml
index b604e7c..c86db0b 100644
--- a/templates/epub/template.xhtml
+++ b/templates/epub/template.xhtml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{{lang}}}" lang="{{{lang}}}">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{lang}}" lang="{{lang}}">
   <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -8,9 +8,9 @@
   <title>{{chapter_title_raw}}</title>
   <link rel="stylesheet" type="text/css" href="stylesheet.css" />
   </head>
-  <body xml:lang="{{{lang}}}" lang="{{{lang}}}">
+  <body xml:lang="{{lang}}" lang="{{lang}}">
     <div id = "page">
-      {{{content}}}
+      {{content}}
     </div>
   </body>
 </html>
diff --git a/templates/epub/titlepage.xhtml b/templates/epub/titlepage.xhtml
index 89a8b8a..539d5dd 100644
--- a/templates/epub/titlepage.xhtml
+++ b/templates/epub/titlepage.xhtml
@@ -9,12 +9,12 @@
   <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
 <body>
-  <h2 class="author">{{{author}}}</h2>
-  <h1 class="title">{{{title}}}</h1>
-  {{#has_subtitle}}<h2 class="subtitle">{{{subtitle}}}</h2>{{/has_subtitle}}
+  <h2 class="author">{{author}}</h2>
+  <h1 class="title">{{title}}</h1>
+  {{#has_subtitle}}<h2 class="subtitle">{{subtitle}}</h2>{{/has_subtitle}}
   {{#has_autograph}}
   <div id = "autograph">
-    {{{autograph}}}
+    {{autograph}}
   </div>
   {{/has_autograph}}
 </body>
diff --git a/templates/epub3/cover.xhtml b/templates/epub3/cover.xhtml
index dd55be7..20b4236 100644
--- a/templates/epub3/cover.xhtml
+++ b/templates/epub3/cover.xhtml
@@ -10,7 +10,7 @@
 </head>
 <body>
 <div id="cover">
-<img src="{{{cover}}}" alt="{{{loc_cover}}}" />
+<img src="{{cover}}" alt="{{loc_cover}}" />
 </div>
 </body>
 </html>
diff --git a/templates/epub3/template.xhtml b/templates/epub3/template.xhtml
index b82ee40..15fa830 100644
--- a/templates/epub3/template.xhtml
+++ b/templates/epub3/template.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:epub="http://www.idpf.org/2007/ops" xml:lang = "{{{lang}}}" lang="{{{lang}}}">
+      xmlns:epub="http://www.idpf.org/2007/ops" xml:lang = "{{lang}}" lang="{{lang}}">
   <head>
     <meta charset = "utf-8" />
     <meta name="generator" content="crowbook" />
     <title>{{chapter_title_raw}}</title>
     <link rel="stylesheet" type="text/css" href="stylesheet.css" />
   </head>
-  <body xml:lang="{{{lang}}}" lang="{{{lang}}}">
+  <body xml:lang="{{lang}}" lang="{{lang}}">
     <section class = "level1">
-      {{{content}}}
+      {{content}}
     </section>
   </body>
 </html>
diff --git a/templates/epub3/titlepage.xhtml b/templates/epub3/titlepage.xhtml
index 2436eb9..2a9c264 100644
--- a/templates/epub3/titlepage.xhtml
+++ b/templates/epub3/titlepage.xhtml
@@ -10,14 +10,14 @@
 </head>
 <body>
   <section epub:type = "titlepage">
-    <h2 class="author">{{{author}}}</h2>
-    <h1 class="title">{{{title}}}</h1>
-    {{#has_subtitle}}<h2 class="subtitle">{{{subtitle}}}</h2>{{/has_subtitle}}
-    {{#has_autograph}}
+    <h2 class="author">{{author}}</h2>
+    <h1 class="title">{{title}}</h1>
+    {% if has_subtitle %}<h2 class="subtitle">{{subtitle}}</h2>{% endif %}
+    {% if has_autograph %}
     <div id = "autograph">
-      {{{autograph}}}
+      {{autograph}}
     </div>
-    {{/has_autograph}}
+    {% endif %}
   </section>
 </body>
 </html>
diff --git a/templates/html/template.css b/templates/html/template.css
index 22bfe69..43a1ec5 100644
--- a/templates/html/template.css
+++ b/templates/html/template.css
@@ -1,6 +1,6 @@
 /* Default  HTML CSS file includes default EPUB CSS file */
 
-{{{colors}}}
+{{colors}}
 
 p.first-para:first-letter {
     font-size: 300%;
@@ -199,4 +199,4 @@ footer p, #top p {
     max-width: 33em;
 }
 
-{{{additional_code}}}
+{{additional_code}}
diff --git a/templates/html_dir/template.html b/templates/html_dir/template.html
index f88a97e..fa35ce0 100644
--- a/templates/html_dir/template.html
+++ b/templates/html_dir/template.html
@@ -1,51 +1,51 @@
 <!DOCTYPE html>
-<html lang="{{{lang}}}">
+<html lang="{{lang}}">
   <head>
     <meta charset="utf-8">
     <meta name="generator" content="crowbook">
-    <meta name="author" content="{{{author_raw}}}">
+    <meta name="author" content="{{author_raw}}">
     <meta name="viewport" content="width=device-width">
-    {{{favicon}}}
-    <title>{{title_raw}} - {{chapter_title_raw}}</title>
+    {{favicon}}
+    <title>{{title_raw}}{% if is_chapter %} - {{chapter_title_raw}}{% endif %}</title>
     <link rel = "stylesheet" href = "stylesheet.css" type = "text/css"
           />
     <link rel = "stylesheet" href = "print.css" type = "text/css"
           media = "print" />
-    {{#highlight_code}}
+    {% if highlight_code %}
     <link rel = "stylesheet" href = "highlight.css" type = "text/css"
           />
     <script src = "highlight.js"></script>
     <script>
       hljs.initHighlightingOnLoad();
     </script>
-    {{/highlight_code}}
+    {% endif %}
    <script>
-{{{script}}}
+{{script}}
    </script>
 
 
   </head>  
   <body>
-  {{{json_data}}}
+  {{json_data}}
   <nav id = "nav">
-    <h2><a href = "index.html">{{{title}}}</a></h2>
-    {{{toc}}}
+    <h2><a href = "index.html">{{title}}</a></h2>
+    {{toc}}
   </nav>
 
   <div id = "content">
-    {{{header}}}
+    {{header}}
     <div id = "page">
       <header>
         <div id = "menu">
 	  <img id = "menu-button" onclick="toggle();"
-               src="menu.svg" alt = "{{{loc_toc}}}" title = "{{{loc_toc}}}" />
+               src="menu.svg" alt = "{{loc_toc}}" title = "{{loc_toc}}" />
         </div>
       </header>
-      {{{prev_chapter}}}
-      {{{content}}}
-      {{{next_chapter}}}
+      {% if is_chapter %}{{prev_chapter}}{% endif %}
+      {{content}}
+      {% if is_chapter %}{{next_chapter}}{% endif %}
     </div>
-    {{{footer}}}
+    {{footer}}
   </div>
   </body>
 </html>
diff --git a/templates/html_if/script.js b/templates/html_if/script.js
index efd6b53..f09e829 100644
--- a/templates/html_if/script.js
+++ b/templates/html_if/script.js
@@ -23,13 +23,13 @@ function passageCount(n) {
     return count;
 }
 
-{{{common_script}}}
+{{common_script}}
 
 var initFns = [];
 
-{{{new_game}}}
+{{new_game}}
 
-{{{js_prelude}}}
+{{js_prelude}}
 
 function showChapter(chap, noreset){
     state.current_id = chap;
diff --git a/templates/html_single/script.js b/templates/html_single/script.js
index 6f598a3..46afd62 100644
--- a/templates/html_single/script.js
+++ b/templates/html_single/script.js
@@ -1,6 +1,6 @@
-{{{common_script}}}
+{{common_script}}
 
-{{#one_chapter}}
+{% if one_chapter %}
 function showChapter(chap, noreset){
     if (!displayAll) {
         var chapters = document.getElementsByClassName("chapter");
@@ -62,16 +62,16 @@ function switchAll() {
 	    toc.style.display = "block";
 	}
         displayAllSwitcher = document.getElementById("book-button");
-        displayAllSwitcher.src="{{{pages_svg}}}";
-        displayAllSwitcher.alt="{{{loc_display_one}}}";
-        displayAllSwitcher.title="{{{loc_display_one}}}";
+        displayAllSwitcher.src="{{pages_svg}}";
+        displayAllSwitcher.alt="{{loc_display_one}}";
+        displayAllSwitcher.title="{{loc_display_one}}";
     } else {
         displayAll = false;
         showChapter(0);
         displayAllSwitcher = document.getElementById("book-button");
-        displayAllSwitcher.src="{{{book_svg}}}";
-        displayAllSwitcher.alt="{{{loc_display_all}}}";
-        displayAllSwitcher.title="{{{loc_display_all}}}";
+        displayAllSwitcher.src="{{book_svg}}";
+        displayAllSwitcher.alt="{{loc_display_all}}";
+        displayAllSwitcher.title="{{loc_display_all}}";
     }
 }
 
@@ -99,4 +99,4 @@ window.onload = function(){
 
 };
 
-{{/one_chapter}}
+{% endif %}
diff --git a/templates/html_single/template.html b/templates/html_single/template.html
index 32eddef..4fa06e8 100644
--- a/templates/html_single/template.html
+++ b/templates/html_single/template.html
@@ -1,80 +1,80 @@
 <!DOCTYPE html>
-<html lang="{{{lang}}}">
+<html lang="{{lang}}">
   <head>
     <meta charset="utf-8">
     <meta name="generator" content="crowbook">
     <meta name="viewport" content="width=device-width">
-    <meta name="author" content="{{{author_raw}}}">
-    {{{favicon}}}
+    <meta name="author" content="{{author_raw}}">
+    {{favicon}}
     <title>{{title_raw}}</title>
     <style type = "text/css">
-      {{{style}}}
+      {{style}}
     </style>
     <style type = "text/css" media = "print">
-      {{{print_style}}}
+      {{print_style}}
     </style>
-    {{#highlight_code}}
+    {% if highlight_code %}
     <style>
-      {{{highlight_css}}}
+      {{highlight_css}}
     </style>
-    <script src = "{{{highlight_js}}}"></script>
+    <script src = "{{highlight_js}}"></script>
     <script>
       hljs.initHighlightingOnLoad();
     </script>
-    {{/highlight_code}}
+    {% endif %}
    <script>
-{{{script}}}
+    {{script}}
    </script>
 
 
   </head>
   <body>
-    {{{json_data}}}
-    {{#has_toc}}
+    {{json_data}}
+    {% if has_toc %}
     <nav id = "nav">
-      {{#one_chapter}}
+      {% if one_chapter %}
       <div id = "nav-container">
         <div id="toolbar">
           <img id="book-button" alt="Display mode"
-               title = "{{{loc_display_all}}}"
-               src="{{{book_svg}}}"
+               title = "{{loc_display_all}}"
+               src="{{book_svg}}"
                onclick="javascript:switchAll()">
         </div>
       </div>
-      {{/one_chapter}}
+      {% endif %}
       <div id = "nav-title">
-        <h2><a href = "#link-0">{{{title}}}</a></h2>
+        <h2><a href = "#link-0">{{title}}</a></h2>
       </div>
-      {{{toc}}}
+      {{toc}}
     </nav>
-    {{/has_toc}}
+    {% endif %}
 
     <div id = "content">
-      {{{header}}}
+      {{header}}
       <div id = "page">
         <header>
 
           <div id = "menu">
-	    {{#has_toc}}
+	        {% if has_toc %}
             <img id = "menu-button" onclick="toggle();"
-                 src="{{{menu_svg}}}"
-                 alt = "{{{loc_toc}}}" title = "{{{loc_toc}}}" />
-            {{/has_toc}}
+                 src="{{menu_svg}}"
+                 alt = "{{loc_toc}}" title = "{{loc_toc}}" />
+          {% endif %}
           </div>
-	  <h2 class="author">{{{author}}}</h2>
-          <h1 id = "link-0" class="title" >{{{title}}}</h1>
-	  {{#has_subtitle}}<h2 class = "subtitle">{{{subtitle}}}</h2>{{/has_subtitle}}
-	  {{#has_autograph}}
+	  <h2 class="author">{{author}}</h2>
+          <h1 id = "link-0" class="title" >{{title}}</h1>
+	  {% if has_subtitle %}<h2 class = "subtitle">{{subtitle}}</h2>{% endif %}
+	  {% if has_autograph %}
 	  <div id = "autograph">
-	    {{{autograph}}}
+	    {{autograph}}
 	  </div>
-	  {{/has_autograph}}
+	  {% endif %}
         </header>
 
-        {{{content}}}
+        {{content}}
 
       </div>
-      {{{footer}}}
+      {{footer}}
     </div>
   </body>
 </html>
diff --git a/templates/latex/template.tex b/templates/latex/template.tex
index 9237f96..d7af5fa 100644
--- a/templates/latex/template.tex
+++ b/templates/latex/template.tex
@@ -1,13 +1,11 @@
-{{=<< >>=}} % Use <<&foo>> to include (non HTML-escape) variable foo instead of {{{foo}}}
-\documentclass<<#has_tex_size>>[<<&tex_size>>pt]<</has_tex_size>>{<<&class>>}
+\documentclass<# if has_tex_size #>[<<tex_size>>pt]<# endif #>{<<class>>}
 
-%% Pacake inclusion
-<<#xelatex>>
+%% Package inclusion
+<# if xelatex #>
 % Unicode support if xelatex is used
 \usepackage{fontspec}
 \usepackage{xunicode}
-<</xelatex>>
-<<^xelatex>>
+<# else #>
 % Unicode support if xelatex is not used
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
@@ -21,54 +19,54 @@
 % (e.g. filenames, urls, ...). The result is not necesarily very
 % beautiful, though, but at least it's readable.
 \setlength\emergencystretch{.5\textwidth}
-<</xelatex>>
+<# endif #>
 
-\usepackage[<<&tex_lang>>]{babel} % Language support
+\usepackage[<<tex_lang>>]{babel} % Language support
 \usepackage{fancyhdr} % Headers
 
 % Allows hyphenatations in \texttt
 \usepackage[htt]{hyphenat}
 
-<<#use_strikethrough>>
+<# if use_strikethrough #>
 % Only included if strikethrough is used in the document
 \usepackage[normalem]{ulem}
-<</use_strikethrough>>
-<<#use_taskitem>>
+<# endif #>
+<# if use_taskitem #>
 \usepackage{amssymb}
-<</use_taskitem>>
+<# endif #>
 % Set hyperlinks and metadata 
 \usepackage[colorlinks=true,breaklinks=true,hypertexnames=false]{hyperref}
-\hypersetup{pdfauthor={<<&author>>},
-  pdftitle={<<&title>>},
-  pdfsubject={<<&description>>}
+\hypersetup{pdfauthor={<<author>>},
+  pdftitle={<<title>>},
+  pdfsubject={<<description>>}
 }
-<<^xelatex>>
+<# if xelatex #>
+<# else #>
 \usepackage[anythingbreaks]{breakurl}
-<</xelatex>>
+<# endif #>
 
 
-<<#initials>>
+<# if initials #>
 % Only included if use_initials is set to true
 \usepackage{lettrine}
-<</initials>>
+<# endif #>
 
-<<#stdpage>>
+<# if stdpage #>
 % Only included if the stdpage option is set to true
-\usepackage[<<&papersize>>]{geometry}
+\usepackage[<<papersize>>]{geometry}
 \usepackage[hyphen=false, parskip]{stdpage}
-<</stdpage>>
-<<^stdpage>>
+<# else #>
 % Included if the stdpage option if set to false
-\usepackage[<<&papersize>>, top=<<&margin_top>>, bottom=<<&margin_bottom>>,
-  left=<<&margin_left>>,right=<<&margin_right>>]{geometry} % Set dimensions/margins of the parge
-<</stdpage>>
+\usepackage[<<papersize>>, top=<<margin_top>>, bottom=<<margin_bottom>>,
+  left=<<margin_left>>,right=<<margin_right>>]{geometry} % Set dimensions/margins of the parge
+<# endif #>
 
 
 \makeatletter
-\date{<<&date>>}
+\date{<<date>>}
 
-<<^stdpage>>
-<<#book>>
+<# if not stdpage #>
+  <# if book #>
 % Redefine the \maketitle command, only for book class (not used if stdpage option is set to true)
 \renewcommand{\maketitle}{
   % First page with only the title
@@ -93,7 +91,7 @@
     \rule{\textwidth}{0.4pt}\\[\baselineskip]
     
     {\Huge\scshape \@title   \\[5mm]}
-    {\Large <<&subtitle>>}
+    {\Large <<subtitle>>}
     
     \rule{\textwidth}{0.4pt}\vspace*{-\baselineskip}\vspace{3.2pt}
     \rule{\textwidth}{1.6pt}\\[\baselineskip]
@@ -101,14 +99,14 @@
     \vspace*{4\baselineskip}
 
     {\Large \@author}
-    <<#has_autograph>>
+      <# if has_autograph #>
     
     \vspace*{10\baselineskip}
     
-    <<&autograph>>
-    <</has_autograph>>
+    <<autograph>>
+      <# endif #>
     \vfill
-    <<#has_date>>\@date<</has_date>>
+      <# if has_date #>\@date<# endif #>
   \end{center}
   
   \pagebreak
@@ -118,13 +116,13 @@
   \null\vfill
   \noindent
   \begin{center}
-    {\emph{\@title}<<#has_version>>{, <<&version>>}<</has_version>><<#has_author>>, © \@author<</has_author>>.\\[5mm]}
-    <<#has_license>>{<<&license>>\\[5mm]}<</has_license>>
+    {\emph{\@title}<#if has_version #>{, <<version>>}<# endif #><# if has_author #>, © \@author<# endif #>.\\[5mm]}
+    <# if has_license #>{<<license>>\\[5mm]}<# endif #>
   \end{center}
   \pagebreak
   \newpage
 }
-<</book>>
+  <# endif #>
 
 
 % Redefine headers
@@ -134,7 +132,7 @@
 \fancyfoot{}
 
 
-<</stdpage>>
+<# endif #>
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Command and environment definitions
@@ -189,7 +187,7 @@
 %
 % Only used if syntect is used for syntax highlighting is used, else
 % the spverbatim environment is preferred.
-<<#use_codeblocks>> % This part is only included if document contains code blocks
+<# if use_codeblocks #> % This part is only included if document contains code blocks
 \usepackage{spverbatim}
 \usepackage{color}
 \usepackage[
@@ -202,9 +200,9 @@
 }{%
   \end{mdframed}
 } 
-<</use_codeblocks>>
+<# endif #>
 
-<<#use_images>>
+<# if use_images #>
 % Only included if document contains images
 \usepackage{graphicx}
 
@@ -219,9 +217,9 @@
 % Image
 % (an image embedded in a pagraph or other element)
 \newcommand\mdimage[1]{\includegraphics{#1}}
-<</use_images>>
+<# endif #>
 
-<<#use_tables>>
+<# if use_tables #>
 % Only included if document contains tables
 \usepackage{tabularx}
 
@@ -237,34 +235,34 @@
   \endtabularx
   \endcenter
 }
-<</use_tables>>
+<# endif #>
 
-<<&additional_code>>
+<<additional_code>>
 
 \makeatother
 
-\title{<<&title>>}
-\author{<<&author>>}
+\title{<<title>>}
+\author{<<author>>}
 
 \begin{document}
 
 % Redefine chapter and part names if they needs to be
 % Needs to be after \begin{document} because babel
-<<#chapter_name>>
+<# if chapter_name #>
 \makeatletter
-\renewcommand{\@chapapp}{<<&chapter_name>>}
+\renewcommand{\@chapapp}{<<chapter_name>>}
 \makeatother
-<</chapter_name>>
+<# endif #>
 
-<<#part_name>>
-\renewcommand{\partname}{<<&part_name>>}
-<</part_name>>
+<# if part_name #>
+\renewcommand{\partname}{<<part_name>>}
+<# endif #>
 
 
-<<#tex_title>>
+<# if tex_title #>
 \maketitle
-<</tex_title>>
+<# endif #>
 
-<<&content>>
+<<content>>
 
 \end{document}
diff --git a/templates/odt/content.xml b/templates/odt/content.xml
deleted file mode 100644
index 19abfc3..0000000
--- a/templates/odt/content.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<office:document-content
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:ooo="http://openoffice.org/2004/office"
-    xmlns:ooow="http://openoffice.org/2004/writer"
-    xmlns:oooc="http://openoffice.org/2004/calc"
-    xmlns:dom="http://www.w3.org/2001/xml-events"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    office:version="1.2"> 
-  <office:automatic-styles>
-    {{{automatic_styles}}}
-  </office:automatic-styles>
-  <office:body>
-    <office:text>
-      <text:p text:style-name="Title">{{title}}</text:p>
-      <text:p text:style-name="Heading_20_2.author">{{author}}</text:p>
-    {{{content}}}
-    </office:text>
-  </office:body>
-</office:document-content>
diff --git a/templates/odt/template.odt b/templates/odt/template.odt
deleted file mode 100644
index 3d38072..0000000
Binary files a/templates/odt/template.odt and /dev/null differ