diff --git a/tei2html/tei2html_chapter_utils.xsl b/tei2html/tei2html_chapter_utils.xsl
index 9ed6e0e..888b35f 100644
--- a/tei2html/tei2html_chapter_utils.xsl
+++ b/tei2html/tei2html_chapter_utils.xsl
@@ -122,6 +122,7 @@
 				<main class="main publications publications2">
 					<div class="container">
 						<div class="main-content">
+							<!-- chapter table of contents -->
 							<section class="publications__overview">
 								<div class="accordion">
 									<div class="accordion__item accordion__item--border-top active">
@@ -152,32 +153,13 @@
 									<span class="link__label link__label--outer">Download Chapter</span>
 								</a>
 							</section>
+							<!-- chapter content: -->
 							<section class="publication-detail">
-								<div class="accordion">
-									<!-- publication title -->
-									<h2 class="publication-detail__title">
-										<xsl:if test="@n != 'nonumber'">
-											<xsl:value-of select="@n"/>
-										</xsl:if>
-										<xsl:text> </xsl:text>
-										<xsl:apply-templates select="./tei:head" mode="body"/>
-									</h2>
-									<xsl:if test="@resp">
-										<p>
-											<!-- <a href="/author/2.html">Jürgen Renn</a> -->
-											<xsl:variable name="people" select="@resp"/>
-											<xsl:call-template name="format_string_authors">
-												<xsl:with-param name="authors" select="$people"/>
-											</xsl:call-template>
-										</p>
-									</xsl:if>
-									<a class="accordion__showall show" href="#">Close All</a>
-									<!-- <xsl:call-template name="document-structure"/> -->
-									<xsl:apply-templates mode="body" select="*[not(name() = 'head')]"/>
-									<xsl:call-template name="footnotes"/>
-									<!-- closing elements go here -->
-								</div>
+								<xsl:apply-templates mode="chapter_main" select="."/>
+								<!-- back/forward navigation -->
+								<xsl:apply-templates mode="chapter_navigation" select="."/>
 							</section>
+							<!-- chapter content closed--> 
 						</div>
 					</div>
 				</main>
@@ -233,23 +215,20 @@ tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
 				<div class="accordion__content">
 					<div class="publication-detail__footnotes">
 						<ol>
-							<xsl:for-each select="$chapter//tei:*[name() = $paragraph_elements]">
-								<xsl:variable name="paragraph" select="."/>
-								<xsl:variable name="paragraph_nr">
-									<xsl:number
-										count="tei:*[name() = $paragraph_elements]"
-										from="tei:div[@type = 'chapter']"
-										level="any"
-									/>
+							<xsl:for-each select="$chapter//tei:note[@place = 'bottom']">
+								<xsl:variable name="paragraph_id" as="xs:string?">
+									<xsl:for-each select="parent::tei:*">
+										<xsl:call-template name="paragraph_id"/>
+									</xsl:for-each>
 								</xsl:variable>
-								<xsl:for-each select="$paragraph//tei:note[@place = 'bottom']">
+								<xsl:if test="$paragraph_id">
 									<li id="fn{@n}">
 										<xsl:for-each select="tei:p">
 											<p><xsl:apply-templates mode="html"/></p>
 										</xsl:for-each>
-										<a href="#p{$paragraph_nr}">to paragraph</a>
+										<a href="#{$paragraph_id}">to paragraph</a>
 									</li>
-								</xsl:for-each>
+								</xsl:if>
 							</xsl:for-each>
 						</ol>
 					</div>
diff --git a/tei2html/utils/html_rules.xsl b/tei2html/utils/html_rules.xsl
index 5ea1e5d..9385a56 100644
--- a/tei2html/utils/html_rules.xsl
+++ b/tei2html/utils/html_rules.xsl
@@ -22,36 +22,140 @@
 	<xsl:variable name="series" select="lower-case(/tei:TEI/tei:teiHeader/tei:fileDesc/tei:seriesStmt/tei:title)"/>
 	<xsl:variable name="publication_number" select="/tei:TEI/tei:teiHeader/tei:fileDesc/tei:seriesStmt/tei:idno[@type = 'number']"/>
 
-	<!-- no mode: just render as text -->
-
-	<!--
-	<xsl:template match="tei:*" priority="-100">
-		<xsl:message>
-			<xsl:text>INFO: text mode for </xsl:text>
+	<!-- default rule: warning -->
+	<xsl:template mode="chapter_main" match="tei:*" priority="-100">
+		<xsl:message>WARNING: in mode 'chapter_main': no template for 
 			<xsl:value-of select="concat('', name(), ': ') "/>
 			<xsl:value-of select="./text()"/>
 		</xsl:message>
+		<!--
 		<xsl:apply-templates/>
+		-->
   </xsl:template>
-	-->
 
-	<!-- default rules with a warning -->
+	<xsl:template mode="chapter_main" match="tei:div[@type='chapter']">
+		<xsl:variable name="chapter" select="self::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html')"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<div class="accordion">
+			<xsl:message>rendering chapter!</xsl:message>
+			<div class="accordion__main">
+				<xsl:call-template name="accordion_row">
+					<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+					<xsl:with-param name="content" as="element()*">
+						<!-- print chapter heading -->
+						<h1 class="publication-detail__title">
+							<xsl:if test="@n != 'nonumber'">
+								<xsl:value-of select="@n"/>
+							</xsl:if>
+							<xsl:text> </xsl:text>
+							<xsl:apply-templates mode="body" select="./tei:head"/>
+						</h1>
+						<!-- print chapter authors, if any -->
+						<xsl:if test="@resp">
+							<p>
+								<xsl:variable name="people" select="@resp"/>
+								<xsl:call-template name="format_string_authors">
+									<xsl:with-param name="authors" select="$people"/>
+								</xsl:call-template>
+							</p>
+						</xsl:if>
+					</xsl:with-param>
+				</xsl:call-template>
+				<xsl:apply-templates mode="chapter_main_paragraphs" select="(if (tei:div[@type = 'section']) then (tei:div[@type = 'section'][1]/preceding-sibling::*) else (*))[not(self::tei:head)]"/>
+				<!--
+				<xsl:apply-templates mode="body" select="tei:*[not(self::tei:head) and not(self::tei:div[@type = 'section']) and not(self::tei:div[@type = 'subsection']) and not(self::tei:div[@type = 'subsubsection'])]"/>
+				-->
+			</div>
+			<a class="accordion__showall show" href="#">Close All</a>
+			<!-- render chapter text -->
+			<xsl:apply-templates mode="body" select="(if (tei:div[@type = 'section']) then (tei:div[@type = 'section'][1]/(. | following-sibling::*)) else (*))[not(self::tei:head)]"/>
+			<xsl:call-template name="footnotes"/>
+		</div>
+	</xsl:template>
 
-	<!-- mode="html": convert inline elements to html -->
-	<xsl:template match="tei:*" mode="html" priority="-100">
-		<xsl:message>
-			<xsl:text>WARNING: unhandled inline element </xsl:text>
+	<xsl:template mode="chapter_navigation" match="tei:div[@type='chapter']">
+		<xsl:variable name="chapter_nr" select="count(preceding-sibling::*)"/>
+		<div class="navigation">
+			<xsl:if test="$chapter_nr > 1">
+				<a class="navigation__button navigation__button--prev" href="{concat('../', $chapter_nr - 1, '/index.html')}">Back</a>
+			</xsl:if>
+			<xsl:if test="following-sibling::*">
+				<a class="navigation__button navigation__button--next" href="{concat('../', $chapter_nr + 1, '/index.html')}">Back</a>
+			</xsl:if>
+		</div>
+	</xsl:template>
+
+	<!-- default rule: warning -->
+	<xsl:template mode="chapter_main_paragraphs" match="tei:*" priority="-100">
+		<xsl:message>WARNING: in mode 'chapter_main_paragraphs': no template for 
 			<xsl:value-of select="concat('', name(), ': ') "/>
 			<xsl:value-of select="./text()"/>
 		</xsl:message>
-		<!--
-		<xsl:apply-templates/>
-		-->
   </xsl:template>
 
-	<!-- mode="body": structural element (div, p, ...) -->
-	<xsl:template match="tei:*" mode="body" priority="-100">
-		<xsl:message>WARNING: unhandled paragraph level element
+	<xsl:template mode="chapter_main_paragraphs" match="tei:p" as="element(div)">
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="paragraph_id" as="xs:string"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:message>paragraph <xsl:value-of select="$paragraph_id"/></xsl:message>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<p id="{$paragraph_id}" class="publication-detail__main-paragraph">
+					<xsl:if test="@corresp">
+						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
+						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
+						<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
+						<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
+
+						<xsl:message>( theorem nr <xsl:value-of select="$theorem_nr"/> )</xsl:message>
+						<b>
+							<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
+						</b>
+					</xsl:if>
+					<xsl:apply-templates mode="html"/>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
+  </xsl:template>
+
+  <xsl:template mode="chapter_main_paragraphs" match="tei:epigraph">
+    <xsl:message>epigraph</xsl:message>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="content" as="element()*">
+				<xsl:for-each select="tei:p">
+					<p id="{$paragraph_id}" class="epigraph">
+						<em>
+							<xsl:apply-templates mode="html"/>
+						</em>
+					</p>
+				</xsl:for-each>
+			</xsl:with-param>
+		</xsl:call-template>
+  </xsl:template>
+
+  <xsl:template mode="chapter_main_paragraphs" match="tei:ab[@type = 'chapterabstract']">
+    <xsl:message>chapter abstract</xsl:message>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="content" as="element()*">
+				<p id="{$paragraph_id}" class="abstract">
+						<xsl:apply-templates mode="html"/>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
+  </xsl:template>
+
+	<!-- section hierarchy -->
+
+	<!-- default rule: warning -->
+	<xsl:template mode="body" match="tei:*" priority="-100">
+		<xsl:message>WARNING: in mode 'body': no template for 
 			<xsl:value-of select="concat('', name(), ': ') "/>
 			<xsl:value-of select="./text()"/>
 		</xsl:message>
@@ -60,54 +164,81 @@
 		-->
   </xsl:template>
 
-	<!-- section hierarchy -->
-
-  <xsl:template match="tei:div[@type='section']" mode="body">
+  <xsl:template mode="body" match="tei:div[@type='section']">
     <xsl:message>section</xsl:message>
+		<div class="accordion__item active">
+			<a class="accordion__title" href="#">
+				<xsl:call-template name="accordion_row">
+					<xsl:with-param name="link" as="xs:string" select="'sectionlink'"/>
+					<xsl:with-param name="content" as="element()*">
+						<h2>
+							<xsl:if test="../@n != 'nonumber'">
+								<xsl:value-of select="concat(../@n, '.', @n, ' ')"/>
+							</xsl:if>
+							<xsl:apply-templates mode="body" select="tei:head"/>
+						</h2>
+					</xsl:with-param>
+				</xsl:call-template>
+			</a>
+			<div class="accordion__content">
+				<xsl:apply-templates mode="body" select="*[not(self::tei:head)]"/>
+				<a class="accordion__pageup" href="#"></a>
+			</div>
+		</div>
+		<!--
 		<div id="{@xml:id}" class="accordion__item active">
 			<a class="accordion__title" href="#">
 				<h2>
 					<xsl:if test="../@n != 'nonumber'">
 						<xsl:value-of select="concat(../@n, '.', @n, ' ')"/>
 					</xsl:if>
-					<xsl:apply-templates select="./tei:head" mode="body"/>
+					<xsl:apply-templates select="tei:head" mode="body"/>
 				</h2>
 			</a>
 			<div class="accordion__content">
-				<xsl:apply-templates select="*[name() != 'head']" mode="body"/>
-				<!-- the link to close the accordeon: -->
+				<xsl:apply-templates select="*[not(self::tei:head)]" mode="body"/>
+				- the link to close the accordion: -
 				<a class="accordion__pageup" href="#"/>
 			</div>
 		</div>
+			-->
   </xsl:template>
 
-  <xsl:template match="tei:div[@type='subsection']" mode="body">
+  <xsl:template mode="body" match="tei:div[@type='subsection']">
     <xsl:message>subsection</xsl:message>
-    <h4>
-      <xsl:if test="../../@n != 'nonumber'">
-        <xsl:value-of select="concat(../../@n, '.', ../@n, '.', @n, ' ')"/>
-      </xsl:if>
-			<xsl:apply-templates select="./tei:head" mode="body"/>
-    </h4>
-		<xsl:apply-templates select="*[name() != 'head']" mode="body"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="'subsectionlink'"/>
+			<xsl:with-param name="content" as="element()*">
+				<h4>
+					<xsl:if test="../../@n != 'nonumber'">
+						<xsl:value-of select="concat(../../@n, '.', ../@n, '.', @n, ' ')"/>
+					</xsl:if>
+					<xsl:apply-templates mode="body" select="tei:head"/>
+				</h4>
+			</xsl:with-param>
+		</xsl:call-template>
+		<xsl:apply-templates mode="body" select="*[not(self::tei:head)]"/>
   </xsl:template>
 
-  <xsl:template match="tei:div[@type='subsubsection']" mode="body">
+  <xsl:template mode="body" match="tei:div[@type='subsubsection']">
     <xsl:message>subsubsection</xsl:message>
-    <h4>
-      <xsl:apply-templates select="./tei:head" mode="body"/>
-    </h4>
-		<xsl:apply-templates select="*[name() != 'head']" mode="body"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="'subsectionlink'"/>
+			<xsl:with-param name="content" as="element()*">
+				<h4>
+					<xsl:apply-templates mode="body" select="./tei:head"/>
+				</h4>
+			</xsl:with-param>
+		</xsl:call-template>
+		<xsl:apply-templates mode="body" select="*[not(self::tei:head)]"/>
   </xsl:template>
 
 	<!-- paragraph level elements: -->
 
-	<xsl:variable name="paragraph_elements" as="xs:string*" select="('p', 'epigraph', 'ab', 'lg', 'quote', 'list', 'table', 'figure')"/>
-
-	<xsl:template match="tei:body//tei:head" mode="body">
+	<xsl:template mode="body" match="tei:body//tei:head">
 		<xsl:choose>
 			<xsl:when test="tei:choice/tei:expan">
-				<xsl:apply-templates select="tei:choice/tei:expan/node() | tei:choice/tei:expan/text()" mode="html"/>
+				<xsl:apply-templates mode="html" select="tei:choice/tei:expan/node() | tei:choice/tei:expan/text()"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates mode="html"/>
@@ -115,38 +246,36 @@
 		</xsl:choose>
   </xsl:template>
 
-	<xsl:template name="paragraph_nr">
-		<xsl:number
-			count="tei:*[name() = $paragraph_elements]"
-			from="tei:div[@type = 'chapter']"
-			level="any"
-		/>
-	</xsl:template>
-
-	<xsl:template match="tei:body//tei:p" mode="body">
+	<xsl:template mode="body" match="tei:body//tei:p" as="element(div)">
 		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
 		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_nr)"/>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
 		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:message>paragraph <xsl:value-of select="$paragraph_nr"/></xsl:message>
-		<p id="p{$paragraph_nr}">
-			<xsl:if test="@corresp">
-				<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
-				<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
-				<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
-				<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
-
-				<xsl:message>( theorem nr <xsl:value-of select="$theorem_nr"/> )</xsl:message>
-				<b>
-					<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
-				</b>
-			</xsl:if>
-			<xsl:apply-templates mode="html"/>
-		</p>
+		<xsl:message>paragraph <xsl:value-of select="$paragraph_id"/></xsl:message>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<p id="{$paragraph_id}">
+					<xsl:if test="@corresp">
+						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
+						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
+						<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
+						<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
+
+						<xsl:message>( theorem nr <xsl:value-of select="$theorem_nr"/> )</xsl:message>
+						<b>
+							<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
+						</b>
+					</xsl:if>
+					<xsl:apply-templates mode="html"/>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
 
 		<!-- the infobox link: -->
+		<!--
 		<a class="accordion__popap" href="#"></a>
 
 		<div class="infobox infobox- -arrow-left">
@@ -156,46 +285,20 @@
 				<xsl:value-of select="$global_uri"/>
 			</a>
 		</div>
-  </xsl:template>
-
-  <xsl:template match="tei:epigraph" mode="body">
-		<!-- TODO: a single grouping element is needed, to carry the paragraph id -->
-    <xsl:message>epigraph</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
-		<!--
-		<div id="p{$paragraph_nr}">
-		-->
-			<xsl:for-each select="tei:p">
-				<p>
-					<em>
-						<xsl:apply-templates mode="html"/>
-					</em>
-				</p>
-			</xsl:for-each>
-		<!--
-		</div>
 		-->
   </xsl:template>
 
-  <xsl:template match="tei:ab[@type = 'chapterabstract']" mode="body">
-    <xsl:message>chapter abstract</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
-		<p id="p{$paragraph_nr}">
-				<xsl:apply-templates mode="html"/>
-		</p>
-  </xsl:template>
-
-  <xsl:template match="tei:ab[@type='equation']" mode="body">
+  <xsl:template mode="body" match="tei:ab[@type='equation']">
     <xsl:message>block formula</xsl:message>
     <xsl:value-of select="concat('$', ., '$')"/>
   </xsl:template>
 
-  <xsl:template match="tei:ab[@type='subequations']" mode="body">
+  <xsl:template mode="body" match="tei:ab[@type='subequations']">
     <xsl:message>equation array</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:element name="table">
 			<xsl:for-each select="tei:formula">
-				<tr id="p{$paragraph_nr}">
+				<tr id="{$paragraph_id}">
 					<td>
     				<xsl:value-of select="concat('$', ., '$')"/>
 					</td>
@@ -204,12 +307,12 @@
 		</xsl:element>
   </xsl:template>
 
-  <xsl:template match="tei:ab[@type='equationarray']" mode="body">
+  <xsl:template mode="body" match="tei:ab[@type='equationarray']">
     <xsl:message>equation array</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:element name="table">
 			<xsl:for-each select="tei:formula">
-				<tr id="p{$paragraph_nr}">
+				<tr id="{$paragraph_id}">
 					<td>
     				<xsl:value-of select="concat('$', ., '$')"/>
 					</td>
@@ -219,13 +322,13 @@
   </xsl:template>
 
 	<!-- the theorem DECLARATION is not supposed to appear in the text: -->
-	<xsl:template match="tei:ab[@type='theoremdeclaration']" mode="body"/>
+	<xsl:template mode="body" match="tei:ab[@type='theoremdeclaration']"/>
 
-  <xsl:template match="tei:lg[@type='verse']" mode="body">
+  <xsl:template mode="body" match="tei:lg[@type='verse']">
 		<!-- TODO: find a way to indent the poem -->
     <xsl:message>verse</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
-		<p id="p{$paragraph_nr}">
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<p id="{$paragraph_id}">
 			<xsl:for-each select="tei:l">
 				<xsl:apply-templates mode="html"/>
 				<xsl:if test="position() != last()">
@@ -235,18 +338,18 @@
 		</p>
   </xsl:template>
 
-  <xsl:template match="tei:quote" mode="body">
+  <xsl:template mode="body" match="tei:quote">
 		<!-- TODO: find a way to indent the quote -->
     <xsl:message>quote</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
-		<p id="p{$paragraph_nr}">
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<p id="{$paragraph_id}">
 			<xsl:apply-templates mode="html"/>
 		</p>
   </xsl:template>
 
-  <xsl:template match="tei:list[@type='ordered' or @type='unordered' or @type='gloss']" mode="body">
+  <xsl:template mode="body" match="tei:list[@type='ordered' or @type='unordered' or @type='gloss']">
     <xsl:message>list</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:variable name="element_name">
 			<xsl:choose>
 				<xsl:when test="@type = 'ordered'">ol</xsl:when>
@@ -258,7 +361,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element_name}">
-			<xsl:attribute name="id" select="$paragraph_nr"/>
+			<xsl:attribute name="id" select="$paragraph_id"/>
 			<xsl:for-each select="tei:item">
 				<li>
 					<xsl:if test="preceding-sibling::tei:label[1]">
@@ -271,10 +374,10 @@
 		</xsl:element>
   </xsl:template>
 
-  <xsl:template match="tei:table" mode="body">
+  <xsl:template mode="body" match="tei:table">
     <xsl:message>table</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
-		<figure id="p{$paragraph_nr}">
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<figure id="{$paragraph_id}">
 			<xsl:element name="table">
 				<xsl:for-each select="tei:row">
 					<tr>
@@ -288,20 +391,20 @@
 			</xsl:element>
 			<xsl:if test="tei:head">
 				<figcaption>
-					<xsl:apply-templates select="tei:head/node() | text()" mode="html"/>
+					<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
 				</figcaption>
 			</xsl:if>
 		</figure>
   </xsl:template>
 
-  <xsl:template match="tei:figure" mode="body">
+  <xsl:template mode="body" match="tei:figure">
 		<!-- TODO: check/fix path -->
     <xsl:message>figure</xsl:message>
-		<xsl:variable name="paragraph_nr"><xsl:call-template name="paragraph_nr"/></xsl:variable>
+		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:variable name="caption">
-			<xsl:apply-templates select="tei:head/node() | text()" mode="html"/>
+			<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
 		</xsl:variable>
-		<figure class="publication__image" id="p{$paragraph_nr}">
+		<figure class="publication__image" id="{$paragraph_id}">
 			<a href="{@url}" data-lightbox="" title="$caption">
 				<img src="{@url}">image could not</img>
 			</a>
@@ -339,8 +442,21 @@
 -->
 
 	<!-- text inline elements: -->
+	<!-- mode="html": convert inline elements to html -->
 
-  <xsl:template match="tei:hi" mode="html">
+	<!-- default rule: warning -->
+	<xsl:template mode="html" match="tei:*" priority="-100">
+		<xsl:message>
+			<xsl:text>WARNING: in mode 'html': no template for </xsl:text>
+			<xsl:value-of select="concat('', name(), ': ') "/>
+			<xsl:value-of select="./text()"/>
+		</xsl:message>
+		<!--
+		<xsl:apply-templates/>
+		-->
+  </xsl:template>
+
+  <xsl:template mode="html" match="tei:hi">
     <xsl:message>markup</xsl:message>
     <xsl:choose>
       <xsl:when test="@rend='italic'">
@@ -376,27 +492,27 @@
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="tei:lb" mode="html">
+  <xsl:template mode="html" match="tei:lb">
 		<br/>
   </xsl:template>
 
-	<xsl:template match="tei:body//tei:foreign" mode="html">
+	<xsl:template mode="html" match="tei:body//tei:foreign">
 		<span lang="{@xml:lang}">
   		<xsl:apply-templates/>
 		</span>
   </xsl:template>
 
-  <xsl:template match="tei:formula[@rend='inline']" mode="html">
+  <xsl:template mode="html" match="tei:formula[@rend='inline']">
     <xsl:message>inline formula</xsl:message>
     <xsl:value-of select="concat('$', ., '$')"/>
   </xsl:template>
 
-  <xsl:template match="tei:graphic" mode="html">
+  <xsl:template mode="html" match="tei:graphic">
     <xsl:message>inline graphic</xsl:message>
 		<img src="{@url}">(missing pic)</img>
   </xsl:template>
 
-  <xsl:template match="tei:note[@place = 'bottom']" mode="html">
+  <xsl:template mode="html" match="tei:note[@place = 'bottom']">
 		<a href="#fn{@n}">
 			<sup>
 				<xsl:value-of select="@n"/>
@@ -404,46 +520,62 @@
 		</a>
   </xsl:template>
 
-  <xsl:template match="tei:bibl" mode="html">
+  <xsl:template mode="html" match="tei:bibl">
     <xsl:message>WARNING: bibliographic reference dummy implementation</xsl:message>
 		(reference to bibl.)
   </xsl:template>
 
-  <xsl:template match="tei:ref" mode="html">
+  <xsl:template mode="html" match="tei:ref">
     <xsl:message>WARNING: internal reference dummy implementation</xsl:message>
 		(internal reference)
   </xsl:template>
 
 	<!-- index elements should not be printed in the text. They are invisible markers from which to generate the index-->
-	<xsl:template match="tei:index" mode="html"/>
+	<xsl:template mode="html" match="tei:index"/>
 
-  <!--
-    <xsl:template match="//tei:div[not(@type='chapter' or @type='part')]/tei:head" mode="document-structure">
-    <xsl:choose>
-    <xsl:when test="../@type='section'">
-    <h2>
-    <xsl:if test="../../@n != 'nonumber'">
-    <xsl:value-of select="concat(../../@n, '.', ../@n, ' ')"/>
-    </xsl:if>
-    <xsl:apply-templates select="."/>
-    </h2>
-    </xsl:when>
-    <xsl:when test="../@type='subsection'">
-    <h4>
-    <xsl:if test="../../../@n != 'nonumber'">
-    <xsl:value-of select="concat(../../../@n, '.', ../../@n, '.', ../@n, ' ')"/>
-    </xsl:if>
-    <xsl:apply-templates select="."/>
-    </h4>
-    </xsl:when>
-    <xsl:when test="../@type='subsubsection'">
-    <h5>
-    <xsl:apply-templates select="."/>
-    </h5>
-    </xsl:when>
-    </xsl:choose>
-    </xsl:template>
--->
+	<xsl:variable name="apos" as="xs:string">'</xsl:variable>
+
+	<xsl:template name="accordion_row">
+		<xsl:param name="link" as="xs:string?"/>
+		<xsl:param name="content" as="element()*"/>
+
+		<div class="row">
+			<xsl:variable name="flags" as="element()*">
+				<xsl:variable name="data_content" as="xs:string"
+					select="concat('If you want to directly link to this paragraphin the text, you can use the following URL:&lt;br/&gt; &lt;a href=', $apos, $link, $apos, '&gt; ', $link,'&lt;/a&gt;')"
+				/>
+				<xsl:if test="$link">
+					<button class="icon-bookmark publications-popup" data-content="{$data_content}" title="" rel="popover" data-title="Permanent Link"></button>
+				</xsl:if>
+				<!-- TODO: eye -->
+			</xsl:variable>
+			<xsl:if test="$flags">
+				<div class="flags">
+					<xsl:copy-of select="$flags"/>
+				</div>
+			</xsl:if>
+			<xsl:copy-of select="$content"/>
+		</div>
+	</xsl:template>
+
+	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
+	<xsl:template name="paragraph_id" as="xs:string?">
+		<xsl:choose>
+			<xsl:when test="(self::tei:p | self::tei:epigraph | self::tei:ab | self::tei:lg | self::tei:quote | self::tei:list | self::tei:table | self::tei:figure)[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]]">
+				<value-of>
+					<xsl:text>p</xsl:text>
+					<xsl:number
+						count="(tei:p | tei:epigraph | tei:ab | tei:lg | tei:quote | tei:list | tei:table | tei:figure)[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]]"
+						from="tei:div[@type = 'chapter']"
+						level="any"
+					/>
+				</value-of>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 
   <xsl:function name="eoa:normalize_reference">
 		<xsl:param name="reference"/>