5 files changed, 26 insertions, 9 deletions

diff --git a/default.epub3 b/default.epub3
index b227149..6428e98 100644
--- a/default.epub3
+++ b/default.epub3
@@ -26,7 +26,7 @@ $for(header-includes)$
   $header-includes$
 $endfor$
 </head>
-<body$if(coverpage)$ id="cover"$endif$>
+<body$if(coverpage)$ id="cover"$endif$$if(body-type)$ epub:type="$body-type$"$endif$>
 $if(titlepage)$
 <section epub:type="titlepage">
 $for(title)$
diff --git a/default.html5 b/default.html5
index 9c15107..c2bf0e0 100644
--- a/default.html5
+++ b/default.html5
@@ -46,7 +46,7 @@ $for(include-before)$
 $include-before$
 $endfor$
 $if(title)$
-<header>
+<header id="title-block-header">
 <h1 class="title">$title$</h1>
 $if(subtitle)$
 <p class="subtitle">$subtitle$</p>
diff --git a/default.latex b/default.latex
index 4d1eeb5..23e47e6 100644
--- a/default.latex
+++ b/default.latex
@@ -183,6 +183,7 @@ $endif$
 $if(colorlinks)$
             colorlinks=true,
             linkcolor=$if(linkcolor)$$linkcolor$$else$Maroon$endif$,
+            filecolor=$if(filecolor)$$filecolor$$else$Maroon$endif$,
             citecolor=$if(citecolor)$$citecolor$$else$Blue$endif$,
             urlcolor=$if(urlcolor)$$urlcolor$$else$Blue$endif$,
 $else$
@@ -359,8 +360,14 @@ $include-before$
 
 $endfor$
 $if(toc)$
+$if(toc-title)$
+\renewcommand*\contentsname{$toc-title$}
+$endif$
 $if(beamer)$
 \begin{frame}
+$if(toc-title)$
+\frametitle{$toc-title$}
+$endif$
 \tableofcontents[hideallsubsections]
 \end{frame}
 $else$
diff --git a/default.opendocument b/default.opendocument
index e0bc5c1..cc7d330 100644
--- a/default.opendocument
+++ b/default.opendocument
@@ -26,9 +26,7 @@ $endfor$
 $if(toc)$
 <text:table-of-content>
   <text:table-of-content-source text:outline-level="10">
-    <text:index-title-template text:style-name="Contents_20_Heading">
-        $toc-title$
-    </text:index-title-template>
+    <text:index-title-template text:style-name="Contents_20_Heading">$toc-title$</text:index-title-template>
     <text:table-of-content-entry-template text:outline-level="1"
     text:style-name="Contents_20_1">
       <text:index-entry-link-start text:style-name="Internet_20_link" />
diff --git a/default.tei b/default.tei
index 3778dcc..7573478 100644
--- a/default.tei
+++ b/default.tei
@@ -3,18 +3,30 @@
 <teiHeader>
   <fileDesc>
     <titleStmt>
-$if(title)$
       <title>$title$</title>
-$endif$
 $for(author)$
-      $author$
+      <author>$author$</author>
 $endfor$
     </titleStmt>
     <publicationStmt>
+$if(publicationStmt)$
       <p>$if(publicationStmt)$$publicationStmt$$endif$</p>
-      $if(license)$
+$endif$
+$if(license)$
       <availability><licence>$license$</licence></availability>
 $endif$
+$if(publisher)$
+      <publisher>$publisher$</publisher>
+$endif$
+$if(pubPlace)$
+      <pubPlace>$pubPlace$</pubPlace>
+$endif$
+$if(address)$
+      <address>$address$</address>
+$endif$
+$if(date)$
+      <date>$date$</date>
+$endif$
     </publicationStmt>
     <sourceDesc>
 $if(sourceDesc)$