diff --git a/composer.json b/composer.json
index 74074d3df..e8a790712 100644
--- a/composer.json
+++ b/composer.json
@@ -73,6 +73,7 @@
         "drupal/simple_menu_permissions": "^1.3",
         "drupal/snowball_stemmer": "^2.0",
         "drupal/theme_switcher": "dev-8.x-1.x",
+        "drupal/toc_api": "^1.1",
         "drupal/token": "^1.9",
         "drupal/token_filter": "^1.2",
         "drupal/twig_tweak": "^3.0",
diff --git a/composer.lock b/composer.lock
index 3ca98851d..61250affd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fbe9cec09f9a9c9398880ca84a01d899",
+    "content-hash": "249058922169c229e6aaa76657ce6612",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -1407,26 +1407,26 @@
         },
         {
             "name": "doctrine/collections",
-            "version": "1.6.7",
+            "version": "1.6.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a"
+                "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a",
-                "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af",
+                "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpstan/phpstan-shim": "^0.9.2",
-                "phpunit/phpunit": "^7.0",
-                "vimeo/psalm": "^3.8.1"
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "^0.12",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5",
+                "vimeo/psalm": "^4.2.1"
             },
             "type": "library",
             "autoload": {
@@ -1470,9 +1470,9 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/collections/issues",
-                "source": "https://github.com/doctrine/collections/tree/1.6.7"
+                "source": "https://github.com/doctrine/collections/tree/1.6.8"
             },
-            "time": "2020-07-27T17:53:49+00:00"
+            "time": "2021-08-10T18:51:53+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -4585,6 +4585,56 @@
             },
             "time": "2020-12-29T15:42:43+00:00"
         },
+        {
+            "name": "drupal/toc_api",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/toc_api.git",
+                "reference": "8.x-1.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/toc_api-8.x-1.1.zip",
+                "reference": "8.x-1.1",
+                "shasum": "2a610f4bd29c89084bc68a48ff209db35ec83595"
+            },
+            "require": {
+                "drupal/core": "^8.9 || ^9"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-1.1",
+                    "datestamp": "1628378264",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Jacob Rockowitz (jrockowitz)",
+                    "homepage": "https://www.drupal.org/u/jrockowitz",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "jrockowitz",
+                    "homepage": "https://www.drupal.org/user/371407"
+                }
+            ],
+            "description": "API for building a a hierarchical table of contents from header tags.",
+            "homepage": "https://drupal.org/project/toc_api",
+            "support": {
+                "source": "http://cgit.drupalcode.org/toc_api",
+                "issues": "https://drupal.org/project/issues/toc_api"
+            }
+        },
         {
             "name": "drupal/token",
             "version": "1.9.0",
@@ -6744,16 +6794,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.5",
+            "version": "v4.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
+                "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
+                "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
                 "shasum": ""
             },
             "require": {
@@ -6794,9 +6844,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
             },
-            "time": "2021-05-03T19:11:20+00:00"
+            "time": "2021-09-20T12:20:58+00:00"
         },
         {
             "name": "onelogin/php-saml",
@@ -8183,20 +8233,21 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.4.25",
+            "version": "v4.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9"
+                "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9",
-                "reference": "c1e29de6dc893b130b45d20d8051efbb040560a9",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
+                "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -8228,7 +8279,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v4.4.25"
+                "source": "https://github.com/symfony/css-selector/tree/v4.4.27"
             },
             "funding": [
                 {
@@ -8244,7 +8295,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-07-21T12:19:41+00:00"
         },
         {
             "name": "symfony/debug",
@@ -8469,22 +8520,23 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.25",
+            "version": "v4.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef"
+                "reference": "4632ae3567746c7e915c33c67a2fb6ab746090c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/41d15bb6d6b95d2be763c514bb2494215d9c5eef",
-                "reference": "41d15bb6d6b95d2be763c514bb2494215d9c5eef",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4632ae3567746c7e915c33c67a2fb6ab746090c4",
+                "reference": "4632ae3567746c7e915c33c67a2fb6ab746090c4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0"
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "masterminds/html5": "<2.6"
@@ -8522,7 +8574,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.25"
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.30"
             },
             "funding": [
                 {
@@ -8538,7 +8590,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-08-28T15:40:01+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -8835,20 +8887,21 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.25",
+            "version": "v4.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3"
+                "reference": "70362f1e112280d75b30087c7598b837c1b468b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3",
-                "reference": "ed33314396d968a8936c95f5bd1b88bd3b3e94a3",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6",
+                "reference": "70362f1e112280d75b30087c7598b837c1b468b6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -8876,7 +8929,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.25"
+                "source": "https://github.com/symfony/finder/tree/v4.4.30"
             },
             "funding": [
                 {
@@ -8892,7 +8945,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-08-04T20:31:23+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -9388,16 +9441,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.0",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab"
+                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab",
-                "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
+                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
                 "shasum": ""
             },
             "require": {
@@ -9449,7 +9502,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -9465,7 +9518,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T09:17:38+00:00"
+            "time": "2021-05-27T12:26:48+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
@@ -11386,26 +11439,27 @@
     "packages-dev": [
         {
             "name": "behat/mink",
-            "version": "v1.8.1",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887"
+                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/07c6a9fe3fa98c2de074b25d9ed26c22904e3887",
-                "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e35f4695de8800fc776af34ebf665ad58ebdd996",
+                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.1",
+                "php": ">=5.4",
                 "symfony/css-selector": "^2.7|^3.0|^4.0|^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20",
-                "symfony/debug": "^2.7|^3.0|^4.0",
-                "symfony/phpunit-bridge": "^3.4.38 || ^5.0.5"
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5",
+                "symfony/debug": "^2.7|^3.0|^4.0|^5.0",
+                "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5",
+                "yoast/phpunit-polyfills": "^1.0"
             },
             "suggest": {
                 "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
@@ -11417,7 +11471,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -11437,7 +11491,7 @@
                 }
             ],
             "description": "Browser controller/emulator abstraction for PHP",
-            "homepage": "http://mink.behat.org/",
+            "homepage": "https://mink.behat.org/",
             "keywords": [
                 "browser",
                 "testing",
@@ -11445,37 +11499,36 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/Mink/issues",
-                "source": "https://github.com/minkphp/Mink/tree/v1.8.1"
+                "source": "https://github.com/minkphp/Mink/tree/v1.9.0"
             },
-            "time": "2020-03-11T15:45:53+00:00"
+            "time": "2021-10-11T11:58:47+00:00"
         },
         {
             "name": "behat/mink-goutte-driver",
-            "version": "v1.2.1",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca"
+                "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
+                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8139f520f417c81bf9d2f9a171fff400f6adc9ea",
+                "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea",
                 "shasum": ""
             },
             "require": {
-                "behat/mink": "~1.6@dev",
                 "behat/mink-browserkit-driver": "~1.2@dev",
                 "fabpot/goutte": "~1.0.4|~2.0|~3.1",
-                "php": ">=5.3.1"
+                "php": ">=5.4"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
+                "mink/driver-testsuite": "dev-master"
             },
             "type": "mink-driver",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -11495,7 +11548,7 @@
                 }
             ],
             "description": "Goutte driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
+            "homepage": "https://mink.behat.org/",
             "keywords": [
                 "browser",
                 "goutte",
@@ -11504,9 +11557,9 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/MinkGoutteDriver/issues",
-                "source": "https://github.com/minkphp/MinkGoutteDriver/tree/master"
+                "source": "https://github.com/minkphp/MinkGoutteDriver/tree/v1.3.0"
             },
-            "time": "2016-03-05T09:04:22+00:00"
+            "time": "2021-10-12T11:35:46+00:00"
         },
         {
             "name": "behat/mink-selenium2-driver",
@@ -12864,16 +12917,16 @@
         },
         {
             "name": "mikey179/vfsstream",
-            "version": "v1.6.8",
+            "version": "v1.6.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
+                "reference": "250c0825537d501e327df879fb3d4cd751933b85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/250c0825537d501e327df879fb3d4cd751933b85",
+                "reference": "250c0825537d501e327df879fb3d4cd751933b85",
                 "shasum": ""
             },
             "require": {
@@ -12911,7 +12964,7 @@
                 "source": "https://github.com/bovigo/vfsStream/tree/master",
                 "wiki": "https://github.com/bovigo/vfsStream/wiki"
             },
-            "time": "2019-10-30T15:31:00+00:00"
+            "time": "2021-09-25T08:05:01+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -13190,7 +13243,7 @@
         },
         {
             "name": "os2loop/os2loop_fixtures",
-            "version": "dev-feature/LOOP-1100-paragraph-titles",
+            "version": "dev-feature/toc",
             "dist": {
                 "type": "path",
                 "url": "web/profiles/custom/os2loop/modules/os2loop_fixtures",
@@ -13217,16 +13270,16 @@
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -13271,9 +13324,9 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/master"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "time": "2020-06-27T14:33:11+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
@@ -13437,16 +13490,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
                 "shasum": ""
             },
             "require": {
@@ -13454,7 +13507,8 @@
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "*"
+                "ext-tokenizer": "*",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -13480,39 +13534,39 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
             },
-            "time": "2020-09-17T18:55:26+00:00"
+            "time": "2021-10-02T14:08:47+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.13.0",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
+                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.1",
+                "php": "^7.2 || ~8.0, <8.2",
                 "phpdocumentor/reflection-docblock": "^5.2",
                 "sebastian/comparator": "^3.0 || ^4.0",
                 "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^6.0",
+                "phpspec/phpspec": "^6.0 || ^7.0",
                 "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -13547,9 +13601,9 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
             },
-            "time": "2021-03-17T13:42:18+00:00"
+            "time": "2021-09-10T09:02:12+00:00"
         },
         {
             "name": "phpspec/prophecy-phpunit",
@@ -13720,23 +13774,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.6",
+            "version": "9.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde"
+                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
-                "reference": "f6293e1b30a2354e8428e004689671b83871edde",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218",
+                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.10.2",
+                "nikic/php-parser": "^4.12.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -13785,7 +13839,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7"
             },
             "funding": [
                 {
@@ -13793,7 +13847,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-28T07:26:59+00:00"
+            "time": "2021-09-17T05:39:03+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -14038,16 +14092,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.6",
+            "version": "9.5.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
+                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
-                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
+                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
                 "shasum": ""
             },
             "require": {
@@ -14059,11 +14113,11 @@
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
                 "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.1",
+                "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.3",
+                "phpunit/php-code-coverage": "^9.2.7",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
@@ -14125,7 +14179,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10"
             },
             "funding": [
                 {
@@ -14137,7 +14191,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-23T05:14:38+00:00"
+            "time": "2021-09-25T07:38:51+00:00"
         },
         {
             "name": "react/promise",
@@ -15375,21 +15429,22 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.4.25",
+            "version": "v4.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "729b1f0eca3ef18ea4e1a29b166145aff75d8fa1"
+                "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/729b1f0eca3ef18ea4e1a29b166145aff75d8fa1",
-                "reference": "729b1f0eca3ef18ea4e1a29b166145aff75d8fa1",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9629d1524d8ced5a4ec3e94abdbd638b4ec8319b",
+                "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "symfony/dom-crawler": "^3.4|^4.0|^5.0"
+                "symfony/dom-crawler": "^3.4|^4.0|^5.0",
+                "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
                 "symfony/css-selector": "^3.4|^4.0|^5.0",
@@ -15426,7 +15481,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v4.4.25"
+                "source": "https://github.com/symfony/browser-kit/tree/v4.4.27"
             },
             "funding": [
                 {
@@ -15442,7 +15497,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-07-21T12:19:41+00:00"
         },
         {
             "name": "symfony/lock",
@@ -15606,16 +15661,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -15644,7 +15699,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
             "funding": [
                 {
@@ -15652,7 +15707,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         }
     ],
     "aliases": [],
diff --git a/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml
index cc7c9f885..4754e110d 100644
--- a/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml
+++ b/config/sync/core.entity_form_display.node.os2loop_documents_document.default.yml
@@ -31,7 +31,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   os2loop_documents_document_autho:
-    weight: 7
+    weight: 8
     settings:
       size: 60
       placeholder: ''
@@ -48,7 +48,7 @@ content:
     region: content
   os2loop_documents_document_conte:
     type: entity_reference_paragraphs
-    weight: 6
+    weight: 7
     settings:
       title: Paragraph
       title_plural: Paragraphs
@@ -77,7 +77,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   os2loop_shared_profession:
-    weight: 8
+    weight: 9
     settings:
       match_limit: '0'
       min_length: 0
@@ -94,13 +94,13 @@ content:
     type: autocomplete_deluxe
     region: content
   os2loop_shared_rev_date:
-    weight: 26
+    weight: 12
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   os2loop_shared_subject:
-    weight: 9
+    weight: 10
     settings:
       match_limit: '0'
       min_length: 0
@@ -117,7 +117,7 @@ content:
     type: autocomplete_deluxe
     region: content
   os2loop_shared_tags:
-    weight: 10
+    weight: 11
     settings:
       min_length: 0
       delimiter: ''
@@ -135,7 +135,7 @@ content:
     region: content
   path:
     type: path
-    weight: 30
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }
diff --git a/config/sync/core.entity_form_display.paragraph.table_of_contents.default.yml b/config/sync/core.entity_form_display.paragraph.table_of_contents.default.yml
new file mode 100644
index 000000000..87d9c897a
--- /dev/null
+++ b/config/sync/core.entity_form_display.paragraph.table_of_contents.default.yml
@@ -0,0 +1,26 @@
+uuid: 02a1d547-04eb-4283-87cc-5c99b9c54ec4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.table_of_contents.table_of_contents
+    - paragraphs.paragraphs_type.table_of_contents
+  module:
+    - block_field
+id: paragraph.table_of_contents.default
+targetEntityType: paragraph
+bundle: table_of_contents
+mode: default
+content:
+  table_of_contents:
+    weight: 0
+    settings:
+      plugin_id: ''
+      settings: {  }
+      configuration_form: full
+    third_party_settings: {  }
+    type: block_field_default
+    region: content
+hidden:
+  created: true
+  status: true
diff --git a/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml b/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml
index a36907a79..67252a4c6 100644
--- a/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml
+++ b/config/sync/core.entity_view_display.node.os2loop_documents_document.default.yml
@@ -39,7 +39,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   os2loop_documents_document_autho:
-    weight: 4
+    weight: 5
     label: inline
     settings:
       link_to_entity: false
@@ -47,7 +47,7 @@ content:
     type: string
     region: content
   os2loop_documents_document_body:
-    weight: 2
+    weight: 3
     label: hidden
     settings: {  }
     third_party_settings: {  }
@@ -55,7 +55,7 @@ content:
     region: content
   os2loop_documents_document_conte:
     type: entity_reference_revisions_entity_view
-    weight: 3
+    weight: 4
     label: visually_hidden
     settings:
       view_mode: default
@@ -63,7 +63,7 @@ content:
     third_party_settings: {  }
     region: content
   os2loop_documents_info_box:
-    weight: 1
+    weight: 2
     label: hidden
     settings: {  }
     third_party_settings: {  }
@@ -78,7 +78,7 @@ content:
     type: entity_reference_label
     region: content
   os2loop_shared_profession:
-    weight: 5
+    weight: 6
     label: above
     settings:
       link: true
@@ -95,7 +95,7 @@ content:
     type: datetime_default
     region: content
   os2loop_shared_subject:
-    weight: 6
+    weight: 7
     label: above
     settings:
       link: true
diff --git a/config/sync/core.entity_view_display.paragraph.table_of_contents.default.yml b/config/sync/core.entity_view_display.paragraph.table_of_contents.default.yml
new file mode 100644
index 000000000..499a874dd
--- /dev/null
+++ b/config/sync/core.entity_view_display.paragraph.table_of_contents.default.yml
@@ -0,0 +1,26 @@
+uuid: 5f97f68b-d969-428b-a7c5-5b4b2410662d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.table_of_contents.table_of_contents
+    - paragraphs.paragraphs_type.table_of_contents
+  module:
+    - block_field
+id: paragraph.table_of_contents.default
+targetEntityType: paragraph
+bundle: table_of_contents
+mode: default
+content:
+  table_of_contents:
+    weight: 0
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    type: block_field
+    region: content
+hidden:
+  entity_print_view_epub: true
+  entity_print_view_pdf: true
+  entity_print_view_word_docx: true
+  search_api_excerpt: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index d5df0f688..8b7be2e25 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -66,6 +66,7 @@ module:
   os2loop_shared: 0
   os2loop_subscriptions: 0
   os2loop_taxonomy: 0
+  os2loop_toc_block: 0
   os2loop_upvote: 0
   os2loop_user: 0
   os2loop_user_login: 0
@@ -87,6 +88,7 @@ module:
   taxonomy: 0
   text: 0
   theme_switcher: 0
+  toc_api: 0
   token: 0
   token_filter: 0
   toolbar: 0
diff --git a/config/sync/field.field.node.os2loop_documents_document.os2loop_documents_document_conte.yml b/config/sync/field.field.node.os2loop_documents_document.os2loop_documents_document_conte.yml
index 5f6e4d392..93ea31dce 100644
--- a/config/sync/field.field.node.os2loop_documents_document.os2loop_documents_document_conte.yml
+++ b/config/sync/field.field.node.os2loop_documents_document.os2loop_documents_document_conte.yml
@@ -9,6 +9,7 @@ dependencies:
     - paragraphs.paragraphs_type.os2loop_documents_step_by_step
     - paragraphs.paragraphs_type.os2loop_documents_table
     - paragraphs.paragraphs_type.os2loop_documents_text_and_image
+    - paragraphs.paragraphs_type.table_of_contents
   module:
     - entity_reference_revisions
 id: node.os2loop_documents_document.os2loop_documents_document_conte
@@ -30,6 +31,7 @@ settings:
       os2loop_documents_step_by_step: os2loop_documents_step_by_step
       os2loop_documents_text_and_image: os2loop_documents_text_and_image
       os2loop_documents_table: os2loop_documents_table
+      table_of_contents: table_of_contents
     target_bundles_drag_drop:
       os2loop_documents_highlighted_co:
         enabled: true
@@ -46,6 +48,9 @@ settings:
       os2loop_documents_text_and_image:
         enabled: true
         weight: 8
+      os2loop_section_page_free:
+        weight: 16
+        enabled: false
       os2loop_section_page_info_block:
         weight: 14
         enabled: false
@@ -55,4 +60,7 @@ settings:
       os2loop_section_page_views_refer:
         weight: 16
         enabled: false
+      table_of_contents:
+        enabled: true
+        weight: 20
 field_type: entity_reference_revisions
diff --git a/config/sync/field.field.node.os2loop_section_page.os2loop_section_page_paragraph.yml b/config/sync/field.field.node.os2loop_section_page.os2loop_section_page_paragraph.yml
index c5b6b9f36..3d6c6a2f7 100644
--- a/config/sync/field.field.node.os2loop_section_page.os2loop_section_page_paragraph.yml
+++ b/config/sync/field.field.node.os2loop_section_page.os2loop_section_page_paragraph.yml
@@ -9,6 +9,7 @@ dependencies:
     - paragraphs.paragraphs_type.os2loop_section_page_info_block
     - paragraphs.paragraphs_type.os2loop_section_page_search
     - paragraphs.paragraphs_type.os2loop_section_page_views_refer
+    - paragraphs.paragraphs_type.table_of_contents
   module:
     - entity_reference_revisions
 id: node.os2loop_section_page.os2loop_section_page_paragraph
@@ -30,6 +31,7 @@ settings:
       os2loop_section_page_views_refer: os2loop_section_page_views_refer
       os2loop_section_page_info_block: os2loop_section_page_info_block
       os2loop_section_page_search: os2loop_section_page_search
+      table_of_contents: table_of_contents
     target_bundles_drag_drop:
       os2loop_documents_highlighted_co:
         weight: 6
@@ -40,6 +42,9 @@ settings:
       os2loop_documents_step_by_step:
         weight: 8
         enabled: false
+      os2loop_documents_table:
+        weight: 14
+        enabled: false
       os2loop_documents_text_and_image:
         weight: 9
         enabled: false
@@ -55,4 +60,7 @@ settings:
       os2loop_section_page_views_refer:
         enabled: true
         weight: 10
+      table_of_contents:
+        enabled: true
+        weight: 20
 field_type: entity_reference_revisions
diff --git a/config/sync/field.field.paragraph.table_of_contents.table_of_contents.yml b/config/sync/field.field.paragraph.table_of_contents.table_of_contents.yml
new file mode 100644
index 000000000..f374b9a3e
--- /dev/null
+++ b/config/sync/field.field.paragraph.table_of_contents.table_of_contents.yml
@@ -0,0 +1,25 @@
+uuid: bd28a88c-b7de-4d87-b046-cf3de4fd99f4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.table_of_contents
+    - paragraphs.paragraphs_type.table_of_contents
+  module:
+    - block_field
+id: paragraph.table_of_contents.table_of_contents
+field_name: table_of_contents
+entity_type: paragraph
+bundle: table_of_contents
+label: 'Table of contents'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  selection: blocks
+  selection_settings:
+    plugin_ids:
+      os2loop_toc_block: os2loop_toc_block
+field_type: block_field
diff --git a/config/sync/field.storage.paragraph.table_of_contents.yml b/config/sync/field.storage.paragraph.table_of_contents.yml
new file mode 100644
index 000000000..13b1c46ba
--- /dev/null
+++ b/config/sync/field.storage.paragraph.table_of_contents.yml
@@ -0,0 +1,19 @@
+uuid: 291713f1-996b-432c-a0b5-2cd8175129f1
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_field
+    - paragraphs
+id: paragraph.table_of_contents
+field_name: table_of_contents
+entity_type: paragraph
+type: block_field
+settings: {  }
+module: block_field
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/sync/language/da/toc_api.toc_type.default.yml b/config/sync/language/da/toc_api.toc_type.default.yml
new file mode 100644
index 000000000..354ccc65d
--- /dev/null
+++ b/config/sync/language/da/toc_api.toc_type.default.yml
@@ -0,0 +1,3 @@
+label: Standard
+options:
+  title: Indholdsfortegnelse
diff --git a/config/sync/paragraphs.paragraphs_type.table_of_contents.yml b/config/sync/paragraphs.paragraphs_type.table_of_contents.yml
new file mode 100644
index 000000000..ca3babe9f
--- /dev/null
+++ b/config/sync/paragraphs.paragraphs_type.table_of_contents.yml
@@ -0,0 +1,10 @@
+uuid: 3f4bd8ff-bac5-4d4c-aab3-a4a9cb3291bf
+langcode: en
+status: true
+dependencies: {  }
+id: table_of_contents
+label: 'Table of contents'
+icon_uuid: null
+icon_default: null
+description: 'A table of contents'
+behavior_plugins: {  }
diff --git a/config/sync/toc_api.toc_type.default.yml b/config/sync/toc_api.toc_type.default.yml
new file mode 100644
index 000000000..30254c175
--- /dev/null
+++ b/config/sync/toc_api.toc_type.default.yml
@@ -0,0 +1,29 @@
+uuid: 60fa76c2-404e-4f83-a7ec-e073949faf97
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 83pJ_ZhgrmuPELjG0kOnns7gEluWdqcuTj_itSDiHZA
+id: default
+label: Default
+options:
+  template: default
+  title: ''
+  block: false
+  header_count: 1
+  header_min: 2
+  header_max: 4
+  header_allowed_tags: '<em> <b> <del> <i> <mark> <s> <span> <strong> <sup> <sub> <em> <b> <del> <i> <mark> <s> <span> <strong> <sup> <sub>'
+  header_id: title
+  header_id_prefix: section
+  top_min: 1
+  top_max: 1
+  top_label: 'Back to top'
+  default:
+    number_type: none
+    number_prefix: ''
+    number_suffix: ') '
+  number_path_separator: .
+  number_path: true
+  number_path_truncate: true
+  headers: {  }
diff --git a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig
index e678339e5..32bc7c8ff 100644
--- a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig
+++ b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig
@@ -9,14 +9,14 @@
 #}
 <div class="list-group">
   {% if data is empty %}
-    <div class="container list-group-item bg-light border-top mb-2 js-view-empty">
+    <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2 js-view-empty">
       <article class="row">
         {{ 'No content related to your user'|t }}
       </article>
     </div>
   {% else %}
     {% for node in data %}
-      <div class="container list-group-item bg-light border-top mb-2">
+      <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2">
         <article class="row">
           <div class="col-4 col-sm-3 col-md-2 col-lg-1">
             {{ drupal_field('os2loop_user_image', 'user', node.uid.target_id) }}
diff --git a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig
index 8f09377ff..89eb20aac 100644
--- a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig
+++ b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig
@@ -9,14 +9,14 @@
 #}
 <div class="list-group">
   {% if data is empty %}
-    <div class="container list-group-item bg-light border-top mb-2 js-view-empty">
+    <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2 js-view-empty">
       <article class="row">
         {{ 'No content related to your user'|t }}
       </article>
     </div>
   {% else %}
     {% for node in data %}
-      <div class="container list-group-item bg-light border-top mb-2">
+      <div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2">
         <article class="row">
           <div class="col-4 col-sm-3 col-md-2 col-lg-1">
             {{ drupal_field('os2loop_user_image', 'user', node.uid.target_id) }}
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/README.md b/web/profiles/custom/os2loop/modules/os2loop_toc_block/README.md
new file mode 100644
index 000000000..cbc345e1b
--- /dev/null
+++ b/web/profiles/custom/os2loop/modules/os2loop_toc_block/README.md
@@ -0,0 +1,3 @@
+# OS2Loop Toc Block
+
+Adds table of contents block using toc api.
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.info.yml b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.info.yml
new file mode 100644
index 000000000..dd3ff8b8e
--- /dev/null
+++ b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.info.yml
@@ -0,0 +1,9 @@
+name: 'OS2Loop toc block'
+type: module
+description: 'Adds table of contents block'
+core: 8.x
+core_version_requirement: ^8 || ^9
+package: 'OS2Loop'
+
+dependencies:
+  - drupal:toc_api
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.module b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.module
new file mode 100644
index 000000000..8b317999c
--- /dev/null
+++ b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.module
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Hook implementations related to toc block module.
+ */
+
+use Drupal\node\NodeInterface;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\os2loop_toc_block\Helper\Helper;
+
+/**
+ * Implements hook_node_view().
+ *
+ * Change display of node.
+ *
+ * @see \Drupal\os2loop_toc_block\Helper\Helper::nodeView()
+ */
+function os2loop_toc_block_node_view(array &$build, NodeInterface $node, EntityViewDisplayInterface $display, $view_mode) {
+  Drupal::service(Helper::class)->nodeView($build, $node, $display, $view_mode);
+}
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.services.yml b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.services.yml
new file mode 100644
index 000000000..7cb4a72c3
--- /dev/null
+++ b/web/profiles/custom/os2loop/modules/os2loop_toc_block/os2loop_toc_block.services.yml
@@ -0,0 +1,8 @@
+services:
+  Drupal\os2loop_toc_block\Helper\Helper:
+    class: Drupal\os2loop_toc_block\Helper\Helper
+    arguments:
+      - '@toc_api.manager'
+      - '@toc_api.builder'
+      - '@entity_type.manager'
+      - '@renderer'
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/src/Helper/Helper.php b/web/profiles/custom/os2loop/modules/os2loop_toc_block/src/Helper/Helper.php
new file mode 100644
index 000000000..eec9b2080
--- /dev/null
+++ b/web/profiles/custom/os2loop/modules/os2loop_toc_block/src/Helper/Helper.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Drupal\os2loop_toc_block\Helper;
+
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Field\EntityReferenceFieldItemList;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\node\NodeInterface;
+use Drupal\toc_api\TocBuilder;
+use Drupal\toc_api\TocManagerInterface;
+
+/**
+ * A helper.
+ */
+class Helper {
+
+  /**
+   * The toc manager interface.
+   *
+   * @var \Drupal\toc_api\TocManagerInterface
+   */
+  protected $tocManager;
+
+  /**
+   * The toc builder interface.
+   *
+   * @var \Drupal\toc_api\TocBuilderInterface
+   */
+  protected $tocBuilder;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Drupal\Core\Render\RendererInterface definition.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Block constructor for table of contents.
+   *
+   * @param \Drupal\toc_api\TocManagerInterface $tocManager
+   *   Manager service for table of contents.
+   * @param \Drupal\toc_api\TocBuilder $tocBuilder
+   *   Builder service for table of contents.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
+   *   The entity manager.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   Drupals renderer service.
+   */
+  public function __construct(TocManagerInterface $tocManager, TocBuilder $tocBuilder, EntityTypeManagerInterface $entityTypeManager, RendererInterface $renderer) {
+    $this->tocManager = $tocManager;
+    $this->tocBuilder = $tocBuilder;
+    $this->entityTypeManager = $entityTypeManager;
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * Implements hook_node_view().
+   *
+   * Adds Ids to headers related to table of contents.
+   *
+   * @param array $build
+   *   The node build.
+   * @param \Drupal\node\NodeInterface $node
+   *   The node entity.
+   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
+   *   The display of the node.
+   * @param string $view_mode
+   *   The view mode of the node.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
+   * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
+   */
+  public function nodeView(array &$build, NodeInterface $node, EntityViewDisplayInterface $display, $view_mode) {
+    // Add lock to prevent the renderer from calling it self indefinitely.
+    $lock = &drupal_static(__FUNCTION__, FALSE);
+    if (!$lock) {
+      $lock = TRUE;
+      if ('full' === $view_mode) {
+        $hasToc = FALSE;
+        if ($node->hasField('os2loop_documents_document_conte')) {
+          $paragraphsContent = $node->get('os2loop_documents_document_conte');
+          assert($paragraphsContent instanceof EntityReferenceFieldItemList);
+          $paragraphs = $paragraphsContent->referencedEntities();
+
+          foreach ($paragraphs as $paragraph) {
+            if ('table_of_contents' == $paragraph->bundle()) {
+              $hasToc = TRUE;
+              break;
+            }
+          }
+          if ($hasToc) {
+            $node_html = (string) $this->renderer->render($build);
+            $toc = $this->createToc($node_html);
+            if ($toc->isVisible()) {
+              $build['#markup'] = $this->tocBuilder->buildContent($toc)['#markup'];
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Create table of contents from HTML using TOC API.
+   *
+   * @param string $node_html
+   *   HTML to create table of contents from.
+   *
+   * @return \Drupal\toc_api\TocInterface
+   *   The table of contents.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
+   * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
+   */
+  public function createToc(string $node_html) {
+    // Get 'default' TOC type options.
+    $entity_storage = $this->entityTypeManager->getStorage('toc_type');
+
+    /** @var \Drupal\toc_api\Entity\TocType|null $toc_type */
+    $toc_type = $entity_storage->load('default');
+    $options = !is_null($toc_type) ? $toc_type->getOptions() : [];
+
+    return $this->tocManager->create('toc_filter', $node_html, $options);
+  }
+
+}
diff --git a/web/profiles/custom/os2loop/modules/os2loop_toc_block/src/Plugin/Block/TocBlock.php b/web/profiles/custom/os2loop/modules/os2loop_toc_block/src/Plugin/Block/TocBlock.php
new file mode 100644
index 000000000..c27f8f217
--- /dev/null
+++ b/web/profiles/custom/os2loop/modules/os2loop_toc_block/src/Plugin/Block/TocBlock.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Drupal\os2loop_toc_block\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\node\NodeInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\toc_api\TocBuilder;
+use Drupal\toc_api\TocManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\os2loop_toc_block\Helper\Helper;
+
+/**
+ * Provides a 'Table of Contents' Block.
+ *
+ * @Block(
+ *   id = "os2loop_toc_block",
+ *   admin_label = @Translation("Table of contents"),
+ *   category = @Translation("TOC block"),
+ * )
+ */
+class TocBlock extends BlockBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The toc manager interface.
+   *
+   * @var \Drupal\toc_api\TocManagerInterface
+   */
+  protected $tocManager;
+
+  /**
+   * The toc builder interface.
+   *
+   * @var \Drupal\toc_api\TocBuilderInterface
+   */
+  protected $tocBuilder;
+
+  /**
+   * The route match interface.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Drupal\Core\Render\RendererInterface definition.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The helper service.
+   *
+   * @var \Drupal\os2loop_toc_block\Helper\Helper
+   */
+  protected $helper;
+
+  /**
+   * Block constructor for table of contents.
+   *
+   * @param array $configuration
+   *   The block configuration.
+   * @param string $plugin_id
+   *   The block id.
+   * @param mixed $plugin_definition
+   *   The block definition.
+   * @param \Drupal\toc_api\TocManagerInterface $tocManager
+   *   Manager service for table of contents.
+   * @param \Drupal\toc_api\TocBuilder $tocBuilder
+   *   Builder service for table of contents.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
+   *   Route match service.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
+   *   The entity manager.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   Drupals renderer service.
+   * @param \Drupal\os2loop_toc_block\Helper\Helper $helper
+   *   Helper service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, TocManagerInterface $tocManager, TocBuilder $tocBuilder, RouteMatchInterface $routeMatch, EntityTypeManagerInterface $entityTypeManager, RendererInterface $renderer, Helper $helper) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->tocManager = $tocManager;
+    $this->tocBuilder = $tocBuilder;
+    $this->routeMatch = $routeMatch;
+    $this->entityTypeManager = $entityTypeManager;
+    $this->renderer = $renderer;
+    $this->helper = $helper;
+  }
+
+  /**
+   * Create method for block.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The service container.
+   * @param array $configuration
+   *   The block configuration.
+   * @param string $plugin_id
+   *   The block id.
+   * @param mixed $plugin_definition
+   *   The block definition.
+   *
+   * @return static
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('toc_api.manager'),
+      $container->get('toc_api.builder'),
+      $container->get('current_route_match'),
+      $container->get('entity_type.manager'),
+      $container->get('renderer'),
+      $container->get(Helper::class)
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    // Add lock to prevent the renderer from calling it self indefinitely.
+    $lock = &drupal_static(__FUNCTION__, FALSE);
+    $build = [];
+
+    if (!$lock) {
+      $lock = TRUE;
+      $routeName = $this->routeMatch->getRouteName();
+      switch ($routeName) {
+        case 'entity_print.view.debug':
+        case 'entity_print.view':
+          $nodeId = $this->routeMatch->getParameter('entity_id');
+          $node = $this->entityTypeManager->getStorage('node')->load($nodeId);
+          break;
+
+        default:
+          $node = $this->routeMatch->getParameter('node');
+          break;
+      }
+
+      if (!($node instanceof NodeInterface)) {
+        return $build;
+      }
+
+      $view_mode = 'full';
+      $node_view = $this->entityTypeManager->getViewBuilder('node')->view($node, $view_mode);
+
+      // Get the completely render node HTML.
+      $node_html = (string) $this->renderer->render($node_view);
+
+      $toc = $this->helper->createToc($node_html);
+
+      // If the TOC is visible (ie has more than X headers),
+      // prepare the block build.
+      if ($toc->isVisible()) {
+        $build = [
+          'toc' => $this->tocBuilder->buildToc($toc),
+        ];
+
+      }
+
+    }
+    return $build;
+  }
+
+}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss
index 1aac1327d..939b449a2 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss
@@ -19,6 +19,7 @@
 @import "./search";
 @import "./terms";
 @import "./navbar";
+@import "./toc";
 @import "./member-view";
 @import "./media-library";
 @import "./paragraphs/step-by-step";
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/step-by-step.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/step-by-step.scss
index fd33c8ad2..fe520599f 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/step-by-step.scss
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/step-by-step.scss
@@ -1,24 +1,23 @@
 @use "sass:list";
 
+$step-indent: 3em;
+
 /**
  * @file
  * The step-by-step paragraph, complete with numbering.
  */
 .counter {
-  $step-indent: 3em;
-  $room-for-number-border: 0.2em;
-
   ol {
     list-style-type: none;
     counter-reset: item;
     // We use padding for indent because we have a background color on the list.
-    margin: 0;
-    padding: {
-      top: $room-for-number-border;
+    margin: {
+      top: 0;
       bottom: 0;
       left: $step-indent;
       right: 0;
     }
+    padding: 0;
   }
 
   li.paragraph-step {
@@ -26,7 +25,6 @@
 
     &::before {
       position: absolute;
-      top: -$room-for-number-border;
       left: -$step-indent + 0.5em;
       min-width: 2em;
       height: 2em;
@@ -44,44 +42,34 @@
       }
     }
   }
+
+  img {
+    margin-bottom: 1em;
+  }
 }
 
 $steps-level-colors: $gray-100, $gray-200, $gray-300, $gray-400, $gray-500;
 
 .os2loop-documents-steps {
-  // @todo: find a way to automatically generate these selectors.
-  & .step--collapse-toggle,
-  & & {
-    background-color: list.nth($steps-level-colors, 1);
-  }
-
-  & & .step--collapse-toggle,
-  & & & {
-    background-color: list.nth($steps-level-colors, 2);
-  }
-
-  & & & .step--collapse-toggle,
-  & & & & {
-    background-color: list.nth($steps-level-colors, 3);
-  }
-
-  & & & & .step--collapse-toggle,
-  & & & & & {
-    background-color: list.nth($steps-level-colors, 4);
-  }
+  // Add background color to .steps and use negative margin and padding for
+  // making background take up full line width.
+  @for $i from 1 through list.length($steps-level-colors) {
+    $selector: "";
+    @for $j from 1 through $i {
+      $selector: $selector + " .steps";
+    }
+    #{$selector} {
+      margin-left: -$i * $step-indent;
+      background-color: list.nth($steps-level-colors, $i);
 
-  & & & & & .step--collapse-toggle,
-  & & & & & & {
-    background-color: list.nth($steps-level-colors, 5);
+      .steps-content {
+        padding-left: $i * $step-indent;
+      }
+    }
   }
 }
 
 .step {
-  // min-height: $spacer * 4;
-  // padding: $spacer/2 $spacer/2 $spacer/2 $spacer;
-  // background-color: $light-background;
-  // margin-bottom: $spacer/2;
-
   &--collapse-toggle {
     .show-steps,
     .hide-steps {
@@ -97,7 +85,7 @@ $steps-level-colors: $gray-100, $gray-200, $gray-300, $gray-400, $gray-500;
     .collapse-caret {
       position: absolute;
       // Match Bootstrap's collapse transition duration (cf.
-      // node_modules/bootstrap/scss//_variables.scss).
+      // node_modules/bootstrap/scss/_variables.scss).
       transition: transform 0.35s;
     }
 
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/toc.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/toc.scss
new file mode 100644
index 000000000..bf31a9e5e
--- /dev/null
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/toc.scss
@@ -0,0 +1,12 @@
+// Table of contents display.
+.toc {
+  background-color: $light-background;
+  border: 1px solid $gray-300;
+  padding: 2em 1em 1em;
+
+  // Overwrite toc default styling.
+  ol.none {
+    list-style-type: decimal;
+    padding-left: 1.5em;
+  }
+}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/os2loop_theme.theme b/web/profiles/custom/os2loop/themes/os2loop_theme/os2loop_theme.theme
index bb6f541fb..fb24aa6c7 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/os2loop_theme.theme
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/os2loop_theme.theme
@@ -17,6 +17,7 @@ use Drupal\user\Entity\User;
  */
 function os2loop_theme_preprocess(&$variables) {
   $variables['logopath'] = file_url_transform_relative(file_create_url(theme_get_setting('logo.url')));
+  $variables['os2loop_container_class'] = theme_get_setting('container_class') ?: 'container-fluid';
 };
 
 /**
@@ -145,6 +146,22 @@ function os2loop_theme_form_system_theme_settings_alter(&$form, FormStateInterfa
     return;
   }
 
+  $form['layout'] = [
+    '#type' => 'details',
+    '#title' => t('Layout'),
+    '#open' => TRUE,
+  ];
+
+  $form['layout']['container_class'] = [
+    '#type' => 'select',
+    '#title' => t('Page width'),
+    '#options' => [
+      'container' => t('Narrow'),
+      'container-fluid' => t('Full'),
+    ],
+    '#default_value' => theme_get_setting('container_class') ?: 'container-fluid',
+  ];
+
   $form['colors'] = [
     '#type' => 'details',
     '#description' => t('Select a color template or provide your own @todo link to readme. Cache must be cleared before this takes effect.'),
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--os2loop-toc-block.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--os2loop-toc-block.html.twig
new file mode 100644
index 000000000..4c251800d
--- /dev/null
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--os2loop-toc-block.html.twig
@@ -0,0 +1,37 @@
+{#
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ *   - label: The configured label for the block.
+ *   - label_display: The display settings for the label.
+ *   - provider: The module or other provider that provided this block plugin.
+ *   - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
+ *   - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
+#}
+<div{{ attributes }}>
+  {{ title_prefix }}
+  {% if label %}
+    <h2{{ title_attributes.addClass('h4') }}>{{ label }}</h2>
+  {% endif %}
+  {{ title_suffix }}
+  {% block content %}
+    {{ content }}
+  {% endblock %}
+</div>
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-menu-block.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-menu-block.html.twig
index 3cace6d55..59608167f 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-menu-block.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-menu-block.html.twig
@@ -35,7 +35,7 @@
 #}
 {% set heading_id = attributes.id ~ '-menu'|clean_id %}
 <nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes|without('role', 'aria-labelledby') }}>
-  <div class="container">
+  <div class="{{ os2loop_container_class }}">
     {# Label. If not displayed, we still provide it for screen readers. #}
     {% if not configuration.label_display %}
       {% set title_attributes = title_attributes.addClass('visually-hidden') %}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig
index 3f8c41b4d..4246b210f 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig
@@ -67,7 +67,7 @@
             <span class="hide-steps">{{ 'Hide steps'|t }}</span>
             <i class="collapse-caret bi bi-caret-up-fill ml-1"></i>
           </a>
-          <div class="steps collapse" id="paragraph-id-{{ paragraph.id() }}">
+          <div class="steps-content collapse" id="paragraph-id-{{ paragraph.id() }}">
             <ol class="os2loop-documents-steps">
               {{ content.os2loop_documents_steps }}
             </ol>
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig
index 8aafa5a73..8d03aecae 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig
@@ -74,7 +74,7 @@
 #}
 {% set view_id = view is defined ? view.id %}
 
-<div class="container list-group-item bg-light border-top mb-2">
+<div class="{{ os2loop_container_class }} list-group-item bg-light border-top mb-2">
   <article class="row">
     <div class="col-auto icon-list {{ node.bundle }}"></div>
     <div class="col">
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection--pdf.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection--pdf.html.twig
index 71fa54cbe..d15e2a796 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection--pdf.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection--pdf.html.twig
@@ -104,7 +104,7 @@
   {% endif %}
 {% endmacro %}
 
-<article{{ attributes.addClass("container") }}>
+<article{{ attributes.addClass(os2loop_container_class) }}>
   {{ title_prefix }}
   {% if label  %}
     <h1{{ title_attributes }}>
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig
index 2733bf15c..fa98935ac 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig
@@ -127,7 +127,8 @@
         {{ macros.title(os2loop_documents_collection.title.value, "document", os2loop_documents_collection, content, true, {link: true}) }}
         {% if os2loop_documents_collection_tree|default(false) %}
           <div>
-            <h2 class="h5">{{ 'Documents in collection'|t }}</h2>
+            {# We use div here to prevent it from appearing in TOC #}
+            <div class="h5">{{ 'Documents in collection'|t }}</div>
             {{ macros.table_of_contents(os2loop_documents_collection_tree, os2loop_documents_collection, node.id) }}
           </div>
         {% elseif os2loop_documents_collections|default(false) %}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/page.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/page.html.twig
index e7e114f12..98b37816f 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/page.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/page.html.twig
@@ -47,7 +47,7 @@
 <main role="main">
   <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
-  <div class="container-fluid bg-white-loop rounded-lg py-3 mt-3">
+  <div class="{{ os2loop_container_class }} bg-white-loop rounded-lg py-3 mt-3">
     {{ page.content }}
   </div>{# /.layout-content #}
 
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region--header.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region--header.html.twig
index b513d75ee..2b361156c 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region--header.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region--header.html.twig
@@ -16,7 +16,7 @@
 #}
 {% if content %}
   <header{{ attributes.addClass('bg-primary', 'shadow-sm') }}>
-    <div class="container">
+    <div class="{{ os2loop_container_class }}">
       <div class="row navbar navbar-expand-lg justify-content-between">
         {{ content }}
       </div>
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region.html.twig
index 8fede7b6d..de6c43457 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/layout/region.html.twig
@@ -15,7 +15,7 @@
  */
 #}
 {% if content %}
-  <div{{ attributes }} class="container-fluid bg-white pb-2">
+  <div{{ attributes }} class="{{ os2loop_container_class }} bg-white pb-2">
     {{ content }}
   </div>
 {% endif %}