diff --git a/docs/demo/output-chapters.html b/docs/demo/output-chapters.html
index d16bd089..aa8c5bf7 100644
--- a/docs/demo/output-chapters.html
+++ b/docs/demo/output-chapters.html
@@ -388,6 +388,7 @@ <h1 data-number="5" id="sec:chapter-5.-reference-lists"><span
 this:</p>
 <h2 data-number="5.1" id="list-of-figures"><span
 class="header-section-number">5.1</span> List of Figures</h2>
+<div class="list list-of-fig">
 1. A figure<br />
 
 1.1. First figure<br />
@@ -402,18 +403,23 @@ <h2 data-number="5.1" id="list-of-figures"><span
 
 1.4 (b). Subfigure b<br />
 
+</div>
 <h2 data-number="5.2" id="list-of-tables"><span
 class="header-section-number">5.2</span> List of Tables</h2>
+<div class="list list-of-tbl">
 3.1. Table example<br />
 
+</div>
 <h2 data-number="5.3" id="list-of-listings"><span
 class="header-section-number">5.3</span> List of Listings</h2>
+<div class="list list-of-lst">
 4.1. Listing caption<br />
 
 4.2. Listing caption<br />
 
 4.3. Listing caption<br />
 
+</div>
 <h1 data-number="6" label="AppA"
 id="sec:appendix-a.-custom-labels"><span
 class="header-section-number">6</span> Appendix A. Custom labels</h1>
diff --git a/docs/demo/output-chapters.md b/docs/demo/output-chapters.md
index 330cb31b..dff6e55b 100644
--- a/docs/demo/output-chapters.md
+++ b/docs/demo/output-chapters.md
@@ -134,6 +134,7 @@ It's also possible to show lists of figures and tables, like this:
 
 ## List of Figures {#list-of-figures}
 
+::: {.list .list-of-fig}
 1\. A figure\
 
 1.1. First figure\
@@ -147,18 +148,23 @@ It's also possible to show lists of figures and tables, like this:
 1.4 (a). Subfigure a\
 
 1.4 (b). Subfigure b\
+:::
 
 ## List of Tables {#list-of-tables}
 
+::: {.list .list-of-tbl}
 3.1. Table example\
+:::
 
 ## List of Listings {#list-of-listings}
 
+::: {.list .list-of-lst}
 4.1. Listing caption\
 
 4.2. Listing caption\
 
 4.3. Listing caption\
+:::
 
 # Appendix A. Custom labels {#sec:appendix-a.-custom-labels label="AppA"}
 
diff --git a/docs/demo/output-chapters.pdf b/docs/demo/output-chapters.pdf
index 70c93a88..f74aa1ae 100644
Binary files a/docs/demo/output-chapters.pdf and b/docs/demo/output-chapters.pdf differ
diff --git a/docs/demo/output-cref.pdf b/docs/demo/output-cref.pdf
index bf59b61d..6e280eb1 100644
Binary files a/docs/demo/output-cref.pdf and b/docs/demo/output-cref.pdf differ
diff --git a/docs/demo/output-listings.pdf b/docs/demo/output-listings.pdf
index 3e60127b..15456b4b 100644
Binary files a/docs/demo/output-listings.pdf and b/docs/demo/output-listings.pdf differ
diff --git a/docs/demo/output.html b/docs/demo/output.html
index 75b2867a..c4b90a55 100644
--- a/docs/demo/output.html
+++ b/docs/demo/output.html
@@ -384,6 +384,7 @@ <h1 data-number="5" id="sec:chapter-5.-reference-lists"><span
 this:</p>
 <h2 data-number="5.1" id="list-of-figures"><span
 class="header-section-number">5.1</span> List of Figures</h2>
+<div class="list list-of-fig">
 1. A figure<br />
 
 2. First figure<br />
@@ -398,18 +399,23 @@ <h2 data-number="5.1" id="list-of-figures"><span
 
 5 (b). Subfigure b<br />
 
+</div>
 <h2 data-number="5.2" id="list-of-tables"><span
 class="header-section-number">5.2</span> List of Tables</h2>
+<div class="list list-of-tbl">
 1. Table example<br />
 
+</div>
 <h2 data-number="5.3" id="list-of-listings"><span
 class="header-section-number">5.3</span> List of Listings</h2>
+<div class="list list-of-lst">
 1. Listing caption<br />
 
 2. Listing caption<br />
 
 3. Listing caption<br />
 
+</div>
 <h1 data-number="6" label="AppA"
 id="sec:appendix-a.-custom-labels"><span
 class="header-section-number">6</span> Appendix A. Custom labels</h1>
diff --git a/docs/demo/output.md b/docs/demo/output.md
index b8074a7e..8948f0cd 100644
--- a/docs/demo/output.md
+++ b/docs/demo/output.md
@@ -133,6 +133,7 @@ It's also possible to show lists of figures and tables, like this:
 
 ## List of Figures {#list-of-figures}
 
+::: {.list .list-of-fig}
 1\. A figure\
 
 2\. First figure\
@@ -146,18 +147,23 @@ It's also possible to show lists of figures and tables, like this:
 5 (a). Subfigure a\
 
 5 (b). Subfigure b\
+:::
 
 ## List of Tables {#list-of-tables}
 
+::: {.list .list-of-tbl}
 1\. Table example\
+:::
 
 ## List of Listings {#list-of-listings}
 
+::: {.list .list-of-lst}
 1\. Listing caption\
 
 2\. Listing caption\
 
 3\. Listing caption\
+:::
 
 # Appendix A. Custom labels {#sec:appendix-a.-custom-labels label="AppA"}
 
diff --git a/docs/demo/output.pdf b/docs/demo/output.pdf
index fb2d22c4..53e14e72 100644
Binary files a/docs/demo/output.pdf and b/docs/demo/output.pdf differ