diff --git a/composer.json b/composer.json
index 0775c638..83415f2a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "php": "^7.1 || ^8.0",
         "symfony/filesystem": "^4.1 || ^5.0",
         "symfony/finder": "^4.1 || ^5.0",
-        "twig/twig": "^2.5",
+        "twig/twig": "^2.9 || ^3.3",
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
diff --git a/lib/Templates/default/html/definition-list.html.twig b/lib/Templates/default/html/definition-list.html.twig
index 388277dd..bea3bcb7 100644
--- a/lib/Templates/default/html/definition-list.html.twig
+++ b/lib/Templates/default/html/definition-list.html.twig
@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 <dl{% if definitionListNode.classes %} class="{{ definitionListNode.classesString }}"{% endif %}>
     {% for definitionListTerm in definitionList.terms %}
         {% if definitionListTerm.classifiers is empty %}
@@ -31,4 +31,4 @@
         {% endif %}
     {% endfor %}
 </dl>
-{% endspaceless %}
+{% endapply %}
diff --git a/lib/Templates/default/html/figure.html.twig b/lib/Templates/default/html/figure.html.twig
index 1ca778fc..c97df561 100644
--- a/lib/Templates/default/html/figure.html.twig
+++ b/lib/Templates/default/html/figure.html.twig
@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 <figure>
     {{ figureNode.image.render()|raw }}
 
@@ -10,4 +10,4 @@
         {% endif %}
     {% endif %}
 </figure>
-{% endspaceless %}
+{% endapply %}
diff --git a/lib/Templates/default/html/paragraph.html.twig b/lib/Templates/default/html/paragraph.html.twig
index d2670419..00b9a7b7 100644
--- a/lib/Templates/default/html/paragraph.html.twig
+++ b/lib/Templates/default/html/paragraph.html.twig
@@ -1,7 +1,7 @@
-{% spaceless %}
+{% apply spaceless %}
     {% set text = paragraphNode.value.render()|trim %}
 
     {% if text %}
         <p{% if paragraphNode.classes %} class="{{ paragraphNode.classesString }}"{% endif %}>{{ text|raw }}</p>
     {% endif %}
-{% endspaceless %}
+{% endapply %}
diff --git a/lib/Templates/default/html/toc-level.html.twig b/lib/Templates/default/html/toc-level.html.twig
index a0620de5..e8f4d880 100644
--- a/lib/Templates/default/html/toc-level.html.twig
+++ b/lib/Templates/default/html/toc-level.html.twig
@@ -1,7 +1,7 @@
-{% spaceless %}
+{% apply spaceless %}
     <ul>
         {% for tocItem in tocItems %}
             {% include "toc-item.html.twig" %}
         {% endfor %}
     </ul>
-{% endspaceless %}
+{% endapply %}
diff --git a/lib/Templates/default/html/toc.html.twig b/lib/Templates/default/html/toc.html.twig
index e0cccd3c..20ea5932 100644
--- a/lib/Templates/default/html/toc.html.twig
+++ b/lib/Templates/default/html/toc.html.twig
@@ -1,5 +1,5 @@
-{% spaceless %}
+{% apply spaceless %}
     <div class="toc">
         {% include "toc-level.html.twig" %}
     </div>
-{% endspaceless %}
+{% endapply %}
diff --git a/lib/Templates/default/tex/paragraph.tex.twig b/lib/Templates/default/tex/paragraph.tex.twig
index f026e968..4d5b5b5d 100644
--- a/lib/Templates/default/tex/paragraph.tex.twig
+++ b/lib/Templates/default/tex/paragraph.tex.twig
@@ -1,8 +1,8 @@
-{% spaceless %}
+{% apply spaceless %}
 {% set text = paragraphNode.value.render() %}
 
 {% if text|trim %}
 {{ text|raw }}
 
 {% endif %}
-{% endspaceless %}
+{% endapply %}