diff --git a/package-lock.json b/package-lock.json
index a7ca9945f5..2cf3ab84ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21184,6 +21184,77 @@
         "node": ">=8"
       }
     },
+    "node_modules/hast-util-from-parse5": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-8.0.1.tgz",
+      "integrity": "sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "devlop": "^1.0.0",
+        "hastscript": "^8.0.0",
+        "property-information": "^6.0.0",
+        "vfile": "^6.0.0",
+        "vfile-location": "^5.0.0",
+        "web-namespaces": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-from-parse5/node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/hast-util-from-parse5/node_modules/@types/unist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz",
+      "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="
+    },
+    "node_modules/hast-util-from-parse5/node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-from-parse5/node_modules/vfile": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz",
+      "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-from-parse5/node_modules/vfile-message": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/hast-util-has-property": {
       "version": "2.0.1",
       "license": "MIT",
@@ -21215,6 +21286,287 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/hast-util-parse-selector": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz",
+      "integrity": "sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-parse-selector/node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/hast-util-raw": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/hast-util-raw/-/hast-util-raw-9.0.3.tgz",
+      "integrity": "sha512-ICWvVOF2fq4+7CMmtCPD5CM4QKjPbHpPotE6+8tDooV0ZuyJVUzHsrNX+O5NaRbieTf0F7FfeBOMAwi6Td0+yQ==",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "hast-util-from-parse5": "^8.0.0",
+        "hast-util-to-parse5": "^8.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "parse5": "^7.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/@types/unist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz",
+      "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="
+    },
+    "node_modules/hast-util-raw/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/mdast-util-to-hast": {
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.1.0.tgz",
+      "integrity": "sha512-/e2l/6+OdGp/FB+ctrJ9Avz71AN/GRH3oi/3KAx/kMnoUsD6q0woXlDT8lLEeViVKE7oZxE7RXzvO3T8kF2/sA==",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/micromark-util-character": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz",
+      "integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==",
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/micromark-util-encode": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz",
+      "integrity": "sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==",
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/hast-util-raw/node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz",
+      "integrity": "sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==",
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/micromark-util-symbol": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz",
+      "integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==",
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/hast-util-raw/node_modules/micromark-util-types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz",
+      "integrity": "sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==",
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ]
+    },
+    "node_modules/hast-util-raw/node_modules/parse5": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/unist-util-is": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
+      "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/unist-util-visit": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
+      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/unist-util-visit-parents": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
+      "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/vfile": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz",
+      "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-raw/node_modules/vfile-message": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/hast-util-to-estree": {
       "version": "2.3.3",
       "license": "MIT",
@@ -21319,6 +21671,32 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/hast-util-to-parse5": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz",
+      "integrity": "sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "devlop": "^1.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "web-namespaces": "^2.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-to-parse5/node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
     "node_modules/hast-util-to-string": {
       "version": "2.0.0",
       "license": "MIT",
@@ -21338,6 +21716,30 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/hastscript": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-8.0.0.tgz",
+      "integrity": "sha512-dMOtzCEd3ABUeSIISmrETiKuyydk1w0pa+gE/uormcTpSYuaNJPbX1NU3JLyscSLjwAQM8bWMhhIlnCqnRvDTw==",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-parse-selector": "^4.0.0",
+        "property-information": "^6.0.0",
+        "space-separated-tokens": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hastscript/node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
     "node_modules/he": {
       "version": "1.2.0",
       "license": "MIT",
@@ -21505,6 +21907,15 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/html-void-elements": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/html-webpack-plugin": {
       "version": "5.5.3",
       "license": "MIT",
@@ -37078,6 +37489,72 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/rehype-raw": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/rehype-raw/-/rehype-raw-7.0.0.tgz",
+      "integrity": "sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "hast-util-raw": "^9.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/rehype-raw/node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/rehype-raw/node_modules/@types/unist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz",
+      "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="
+    },
+    "node_modules/rehype-raw/node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/rehype-raw/node_modules/vfile": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz",
+      "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/rehype-raw/node_modules/vfile-message": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/rehype-slug": {
       "version": "5.1.0",
       "license": "MIT",
@@ -41473,6 +41950,63 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/vfile-location": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.2.tgz",
+      "integrity": "sha512-NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-location/node_modules/@types/unist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz",
+      "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="
+    },
+    "node_modules/vfile-location/node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-location/node_modules/vfile": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz",
+      "integrity": "sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-location/node_modules/vfile-message": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz",
+      "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/vfile-message": {
       "version": "3.1.4",
       "license": "MIT",
@@ -42000,6 +42534,15 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/web-namespaces": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",
+      "integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/web-streams-polyfill": {
       "version": "3.2.1",
       "dev": true,
@@ -44540,6 +45083,7 @@
         "react-markdown": "^9.0.0",
         "react-swipeable": "^7.0.1",
         "rehype-external-links": "^2.1.0",
+        "rehype-raw": "^7.0.0",
         "rehype-slug": "^5.1.0",
         "rehype-toc": "^3.0.2",
         "remark-gfm": "^4.0.0",
diff --git a/packages/site/app/contact/ContactForm.tsx b/packages/site/app/contact/ContactForm.tsx
index b4ce422506..e037e46cf6 100644
--- a/packages/site/app/contact/ContactForm.tsx
+++ b/packages/site/app/contact/ContactForm.tsx
@@ -2,10 +2,11 @@
 
 import {ToastFloater} from '@components/floating-ui/ToastFloater';
 import classNames from 'classnames';
-import {useState} from 'react';
+import {useEffect, useState} from 'react';
 import {supabase} from '../initSupabase';
 import {options} from './data';
 import {Button} from '@tet/ui';
+import {useRouter, useSearchParams} from 'next/navigation';
 
 type FormData = {
   categorie: string;
@@ -29,6 +30,11 @@ const ContactForm = () => {
   const [formData, setFormData] = useState<FormData>(initFormData);
   const [status, setStatus] = useState<'success' | 'error' | null>(null);
 
+  const searchParams = useSearchParams();
+  const router = useRouter();
+
+  const isContactPanier = searchParams.get('panier') === 'true' ? true : false;
+
   const handleChange = (
     event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ) => {
@@ -66,6 +72,9 @@ const ContactForm = () => {
     if (data) {
       setStatus('success');
       setFormData(initFormData);
+      if (isContactPanier) {
+        router.push('/contact');
+      }
     } else if (error) {
       console.error(error);
       setStatus('error');
@@ -75,6 +84,29 @@ const ContactForm = () => {
     }
   };
 
+  useEffect(() => {
+    if (isContactPanier) {
+      const stringToFind = "Informations sur le panier d'actions à impact";
+      const optionGroup = options.find(opt =>
+        opt.options.some(o => o.label === stringToFind),
+      );
+      const option = optionGroup?.options.find(
+        opt => opt.label === stringToFind,
+      );
+
+      if (optionGroup && option) {
+        setFormData(prevState => ({
+          ...prevState,
+          categorie: optionGroup.group,
+          objet: option,
+          message:
+            'Bonjour, le panier d’actions à impact m’intéresse. Pourriez vous me recontacter ?',
+        }));
+      }
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
     <>
       <form onSubmit={handleSubmit}>
@@ -89,6 +121,7 @@ const ContactForm = () => {
             required
             onChange={handleChangeSelect}
             value={formData.objet.value}
+            disabled={isContactPanier}
           >
             <option value="" disabled hidden>
               Selectionnez une option
@@ -161,6 +194,7 @@ const ContactForm = () => {
             required
             onChange={handleChange}
             value={formData.message}
+            disabled={isContactPanier}
           />
         </div>
 
diff --git a/packages/site/app/contact/data.ts b/packages/site/app/contact/data.ts
index ff5eb9a675..29c6e8ace8 100644
--- a/packages/site/app/contact/data.ts
+++ b/packages/site/app/contact/data.ts
@@ -37,13 +37,17 @@ export const options = [
         value: 7,
         label: 'Questions sur l’utilisation de la plateforme',
       },
+      {
+        value: 8,
+        label: "Informations sur le panier d'actions à impact",
+      },
     ],
   },
   {
     group: 'Aucun de ces sujets ?',
     options: [
       {
-        value: 8,
+        value: 9,
         label: 'Autre',
       },
     ],
diff --git a/packages/site/app/faq/ListeQuestions.tsx b/packages/site/app/faq/ListeQuestions.tsx
index c0e10d4328..2393356495 100644
--- a/packages/site/app/faq/ListeQuestions.tsx
+++ b/packages/site/app/faq/ListeQuestions.tsx
@@ -1,31 +1,69 @@
 'use client';
 
-import {Accordion} from '@tet/ui';
+import {Accordion, Tab, Tabs} from '@tet/ui';
 import {FaqData} from './page';
 import Markdown from '@components/markdown/Markdown';
+import {useCallback, useEffect, useState} from 'react';
+import {usePathname, useRouter, useSearchParams} from 'next/navigation';
+
+const onglets = [
+  {title: 'Le programme Territoire Engagé', param: 'programme'},
+  {title: "L'outil numérique", param: 'outil-numerique'},
+];
 
 type ListeQuestionsProps = {
   questions: FaqData[];
 };
 
 const ListeQuestions = ({questions}: ListeQuestionsProps) => {
+  const searchParams = useSearchParams();
+  const pathname = usePathname();
+  const router = useRouter();
+
+  const ongletParam = searchParams.get('onglet');
+  const currentTab = ongletParam
+    ? onglets.findIndex(onglet => onglet.param === ongletParam)
+    : 0;
+
+  const handleChangeTab = (activeTab: number) => {
+    router.push(`${pathname}?onglet=${onglets[activeTab].param}`);
+  };
+
+  useEffect(() => {
+    if (currentTab === -1)
+      router.push(`${pathname}?onglet=${onglets[0].param}`);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   return (
-    <div className="flex flex-col gap-4">
-      {questions.map(q => (
-        <div key={q.id}>
-          <Accordion
-            id={q.id.toString()}
-            title={q.titre}
-            content={
-              <Markdown
-                texte={q.contenu}
-                className="px-10 pt-6 border border-t-0 border-grey-4 rounded-b-lg"
-              />
-            }
-          />
-        </div>
+    <Tabs
+      defaultActiveTab={currentTab}
+      onChange={handleChangeTab}
+      tabsListClassName="!flex !w-fit !mx-auto"
+    >
+      {onglets.map((onglet, index) => (
+        <Tab key={index} label={onglet.title}>
+          <div className="flex flex-col gap-4">
+            {questions
+              .filter(question => question.onglet === onglet.title)
+              .map(q => (
+                <div key={q.id}>
+                  <Accordion
+                    id={q.id.toString()}
+                    title={q.titre}
+                    content={
+                      <Markdown
+                        texte={q.contenu}
+                        className="px-10 pt-6 border border-t-0 border-grey-4 rounded-b-lg bg-white"
+                      />
+                    }
+                  />
+                </div>
+              ))}
+          </div>
+        </Tab>
       ))}
-    </div>
+    </Tabs>
   );
 };
 
diff --git a/packages/site/app/faq/page.tsx b/packages/site/app/faq/page.tsx
index 3626ab0c74..35ee4e3358 100644
--- a/packages/site/app/faq/page.tsx
+++ b/packages/site/app/faq/page.tsx
@@ -6,6 +6,7 @@ import {fetchCollection} from 'src/strapi/strapi';
 import {sortByRank} from 'src/utils/sortByRank';
 import ContactEquipe from './ContactEquipe';
 import ListeQuestions from './ListeQuestions';
+import NoResult from '@components/info/NoResult';
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
@@ -17,6 +18,7 @@ export type FaqData = {
   id: number;
   titre: string;
   contenu: string;
+  onglet: string;
 };
 
 const getData = async () => {
@@ -27,6 +29,7 @@ const getData = async () => {
         id: d.id,
         titre: d.attributes.Titre as unknown as string,
         contenu: d.attributes.Contenu as unknown as string,
+        onglet: d.attributes.onglet as unknown as string,
       }))
     : null;
 
@@ -36,14 +39,16 @@ const getData = async () => {
 const Faq = async () => {
   const questions: FaqData[] | null = await getData();
 
-  return (
+  return questions && questions.length > 0 ? (
     <>
-      <Section>
-        <h1>Questions fréquentes</h1>
+      <Section containerClassName="bg-primary-0">
+        <h1 className="text-center">Questions fréquentes</h1>
         {questions && <ListeQuestions questions={questions} />}
       </Section>
       <ContactEquipe />
     </>
+  ) : (
+    <NoResult />
   );
 };
 
diff --git a/packages/site/app/layout.tsx b/packages/site/app/layout.tsx
index 8bf7dd179e..443c7f657a 100644
--- a/packages/site/app/layout.tsx
+++ b/packages/site/app/layout.tsx
@@ -16,10 +16,10 @@ export async function generateMetadata(): Promise<Metadata> {
 
   return {
     title: {
-      default: data.metaTitle ?? 'Territoires en Transitions',
-      template: `%s | ${data.metaTitle ?? 'Territoires en Transitions'}`,
+      default: data?.metaTitle ?? 'Territoires en Transitions',
+      template: `%s | ${data?.metaTitle ?? 'Territoires en Transitions'}`,
     },
-    description: data.metaDescription,
+    description: data?.metaDescription,
     icons: {
       icon: '/favicon.ico',
       other: [
@@ -48,11 +48,11 @@ export async function generateMetadata(): Promise<Metadata> {
       card: 'summary_large_image',
     },
     openGraph: {
-      title: data.metaTitle ?? 'Territoires en Transitions',
-      description: data.metaDescription,
+      title: data?.metaTitle ?? 'Territoires en Transitions',
+      description: data?.metaDescription,
       url: 'https://www.territoiresentransitions.fr',
-      siteName: data.metaTitle ?? 'Territoires en Transitions',
-      images: data.metaImage
+      siteName: data?.metaTitle ?? 'Territoires en Transitions',
+      images: data?.metaImage
         ? [
             {
               url: data.metaImage.url,
diff --git a/packages/site/app/outil-numerique/EquipeCarousel.tsx b/packages/site/app/outil-numerique/EquipeCarousel.tsx
deleted file mode 100644
index 5869a11c7a..0000000000
--- a/packages/site/app/outil-numerique/EquipeCarousel.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-'use client';
-
-import {StrapiItem} from 'src/strapi/StrapiItem';
-import EquipeListe from './EquipeListe';
-import {useCallback, useEffect, useState} from 'react';
-import {useSwipeable} from 'react-swipeable';
-
-type EquipeCarouselProps = {
-  liste: {
-    id: number;
-    titre: string;
-    legende: string;
-    image: StrapiItem;
-  }[];
-  width: number;
-};
-
-const EquipeCarousel = ({liste, width}: EquipeCarouselProps) => {
-  // Constantes à mettre à jour en cas de changement de format des cartes
-  const cardWidth = 169;
-  const gapWidth = 16;
-  const initDelta = cardWidth / 2 - gapWidth;
-  const cardWithGapWidth = cardWidth + gapWidth;
-  // cardWidth / 2 = 84.5 = milieu d'une carte
-  // cardWithGapWidth = 185 = largeur de la carte 169px + largeur du gap 16px
-
-  const [maxPosition, setMaxPosition] = useState(
-    -(width / 2) + initDelta + cardWithGapWidth * (liste.length - 1),
-  );
-  const [minPosition, setMinPosition] = useState(-(width / 2) + initDelta);
-  const [position, setPosition] = useState(minPosition);
-
-  useEffect(() => {
-    setMaxPosition(
-      -(width / 2) + initDelta + cardWithGapWidth * (liste.length - 1),
-    );
-    setMinPosition(-(width / 2) + initDelta);
-    setPosition(-(width / 2) + initDelta);
-  }, [width, liste.length, initDelta, cardWithGapWidth]);
-
-  // Calcul de la nouvelle position dans le carousel
-  const handleChangeCard = useCallback(
-    (increment: 'next' | 'previous') => {
-      const newPosition =
-        position +
-        (increment === 'next' ? cardWithGapWidth : -cardWithGapWidth);
-
-      if (newPosition < minPosition) setPosition(maxPosition);
-      else if (newPosition > maxPosition) setPosition(minPosition);
-      else setPosition(newPosition);
-    },
-    [position, minPosition, maxPosition, cardWithGapWidth],
-  );
-
-  // Changement automatique de la position dans le carousel
-  useEffect(() => {
-    let interval: ReturnType<typeof setInterval>;
-
-    interval = setInterval(() => {
-      handleChangeCard('next');
-    }, 5000);
-
-    return () => clearInterval(interval);
-  }, [position, handleChangeCard]);
-
-  // Swipe dans le carousel
-  const handlers = useSwipeable({
-    onSwipedLeft: () => handleChangeCard('next'),
-    onSwipedRight: () => handleChangeCard('previous'),
-    swipeDuration: 500,
-    preventScrollOnSwipe: true,
-    trackMouse: true,
-  });
-
-  return (
-    <div className="overflow-hidden w-fit my-12 -ml-4 flex items-center">
-      <div
-        {...handlers}
-        className="flex gap-4"
-        style={{
-          transition: 'ease 1000ms',
-          transform: `translate3d(${-position}px, 0, 0)`,
-        }}
-      >
-        <EquipeListe liste={liste} />
-      </div>
-    </div>
-  );
-};
-
-export default EquipeCarousel;
diff --git a/packages/site/app/outil-numerique/EquipeListe.tsx b/packages/site/app/outil-numerique/EquipeListe.tsx
deleted file mode 100644
index 759840bf7f..0000000000
--- a/packages/site/app/outil-numerique/EquipeListe.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import {StrapiImage} from '@components/strapiImage/StrapiImage';
-import {StrapiItem} from 'src/strapi/StrapiItem';
-
-type EquipeListeProps = {
-  liste: {
-    id: number;
-    titre: string;
-    legende: string;
-    image: StrapiItem;
-  }[];
-};
-
-const EquipeListe = ({liste}: EquipeListeProps) => {
-  return (
-    <>
-      {liste.map(l => (
-        <div
-          key={l.id}
-          className="w-[169px] h-[204px] border border-primary-5 rounded-[10px] flex flex-col items-center justify-start gap-4 py-4 px-2"
-        >
-          <StrapiImage
-            data={l.image}
-            className="rounded-full w-[83px] h-[83px] min-w-[83px] min-h-[83px] object-cover border border-primary-4"
-          />
-          <div className="flex flex-col gap-1">
-            <p className="text-primary-9 text-[14px] text-center leading-[19px] font-[500] mb-0">
-              {l.titre}
-            </p>
-            <p className="text-primary-6 text-[12px] text-center leading-[16px] font-[500] mb-0">
-              {l.legende}
-            </p>
-          </div>
-        </div>
-      ))}
-    </>
-  );
-};
-
-export default EquipeListe;
diff --git a/packages/site/app/outil-numerique/EquipePlateforme.tsx b/packages/site/app/outil-numerique/EquipePlateforme.tsx
index e515b6aaa8..2021e357f4 100644
--- a/packages/site/app/outil-numerique/EquipePlateforme.tsx
+++ b/packages/site/app/outil-numerique/EquipePlateforme.tsx
@@ -1,79 +1,45 @@
 'use client';
 
 import Section from '@components/sections/Section';
-import {StrapiItem} from 'src/strapi/StrapiItem';
-import EquipeListe from './EquipeListe';
-import EquipeCarousel from './EquipeCarousel';
-import {useEffect, useRef, useState} from 'react';
 import {Button} from '@tet/ui';
 
 type EquipePlateformeProps = {
   titre: string;
   citation?: string;
   description?: string;
-  liste: {
-    id: number;
-    titre: string;
-    legende: string;
-    image: StrapiItem;
-  }[];
-  cta_contact: string;
+  cta: string;
 };
 
 const EquipePlateforme = ({
   titre,
   citation,
   description,
-  liste,
-  cta_contact,
+  cta,
 }: EquipePlateformeProps) => {
-  const [carouselWidth, setCarouselWidth] = useState(0);
-  const ref = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    // Initialisation de carouselWidth au chargement de la page
-    if (ref && ref.current) {
-      const element = ref.current;
-      setCarouselWidth(element.clientWidth);
-
-      // Détecte le changement de taille de la fenêtre
-      window.addEventListener('resize', () =>
-        setCarouselWidth(element.clientWidth),
-      );
-      return () =>
-        window.removeEventListener('resize', () =>
-          setCarouselWidth(element.clientWidth),
-        );
-    }
-  }, []);
-
   return (
     <Section>
-      <h2 className="md:text-center mb-1 p-">{titre}</h2>
+      <h2 className="text-primary-8 md:text-center mb-1">{titre}</h2>
       {!!citation && (
         <h4 className="text-primary-7 md:text-center text-[24px] leading-[32px] mb-1">
           {citation}
         </h4>
       )}
+
       {!!description && (
         <p className="text-primary-10 md:text-center md:text-[18px] leading-[30px] mb-0">
           {description}
         </p>
       )}
 
-      {/* Affichage de la liste en version desktop */}
-      <div className="max-md:hidden flex gap-4 flex-wrap justify-center my-12">
-        <EquipeListe liste={liste} />
-      </div>
-
-      {/* Affichage de la liste en version mobile */}
-      <div ref={ref} className="md:hidden">
-        <EquipeCarousel liste={liste} width={carouselWidth} />
-      </div>
-
-      <div className="flex gap-8 justify-center">
-        <Button href="/contact">{cta_contact}</Button>
-      </div>
+      <Button
+        href="https://beta.gouv.fr/startups/territoires-en-transitions.html#equipe"
+        variant="outlined"
+        iconPosition="left"
+        external
+        className="!mx-auto"
+      >
+        {cta}
+      </Button>
     </Section>
   );
 };
diff --git a/packages/site/app/outil-numerique/FonctionnalitesPlateforme.tsx b/packages/site/app/outil-numerique/FonctionnalitesPlateforme.tsx
deleted file mode 100644
index 49c49aeca4..0000000000
--- a/packages/site/app/outil-numerique/FonctionnalitesPlateforme.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import Markdown from '@components/markdown/Markdown';
-import Section from '@components/sections/Section';
-import {StrapiImage} from '@components/strapiImage/StrapiImage';
-import {StrapiItem} from 'src/strapi/StrapiItem';
-import './styles.css';
-
-type FonctionnalitesPlateformeProps = {
-  titre: string;
-  contenu: string;
-  image: StrapiItem;
-};
-
-const FonctionnalitesPlateforme = ({
-  titre,
-  contenu,
-  image,
-}: FonctionnalitesPlateformeProps) => {
-  return (
-    <Section>
-      <h2 className="text-center">{titre}</h2>
-      <div className="flex max-lg:flex-col justify-between items-center gap-8 lg:gap-20">
-        <StrapiImage data={image} containerClassName="max-w-[595px]" />
-        <Markdown
-          texte={contenu}
-          className="fonctionnalites text-primary-10 text-[16px] !leading-[20px] md:text-[21px] md:!leading-[32px] font-[500] max-lg:pl-8"
-        />
-      </div>
-    </Section>
-  );
-};
-
-export default FonctionnalitesPlateforme;
diff --git a/packages/site/app/outil-numerique/HeaderPlateforme.tsx b/packages/site/app/outil-numerique/HeaderPlateforme.tsx
index faba0c1ca0..66187a809c 100644
--- a/packages/site/app/outil-numerique/HeaderPlateforme.tsx
+++ b/packages/site/app/outil-numerique/HeaderPlateforme.tsx
@@ -31,10 +31,10 @@ const HeaderPlateforme = ({
 
   return (
     <Section containerClassName="bg-gradient-to-b from-[#F4F5FD] to-[#FFFFFF] !pb-0">
-      <h1 className="text-primary-9 text-center md:text-[52px] md:leading-[72px]">
+      <h1 className="text-primary-9 text-center md:text-[45px] md:leading-[55px] lg:px-20 mb-2">
         {titre}
       </h1>
-      <p className="text-primary-7 text-center text-[22px] leading-[28px] md:text-[24px] md:leading-[32px] font-bold">
+      <p className="text-primary-7 text-center text-[22px] leading-[28px] md:text-[24px] md:leading-[32px] font-bold lg:px-20 mb-4">
         {accroche}
       </p>
       <div className="flex max-md:flex-col gap-y-4 gap-x-8 justify-center items-center">
diff --git a/packages/site/app/outil-numerique/PanierActionsImpact.tsx b/packages/site/app/outil-numerique/PanierActionsImpact.tsx
new file mode 100644
index 0000000000..87535c2350
--- /dev/null
+++ b/packages/site/app/outil-numerique/PanierActionsImpact.tsx
@@ -0,0 +1,46 @@
+'use client';
+
+import {Button} from '@tet/ui';
+import Section from '@components/sections/Section';
+import {StrapiItem} from 'src/strapi/StrapiItem';
+import {StrapiImage} from '@components/strapiImage/StrapiImage';
+import Markdown from '@components/markdown/Markdown';
+import './styles.css';
+
+type PanierActionsImpactProps = {
+  titre: string;
+  description: string;
+  cta: string;
+  image: StrapiItem | undefined;
+};
+
+const PanierActionsImpact = ({
+  titre,
+  description,
+  cta,
+  image,
+}: PanierActionsImpactProps) => {
+  return (
+    <Section className="flex lg:!flex-row justify-between items-center !gap-12">
+      {!!image && (
+        <StrapiImage
+          data={image}
+          containerClassName="w-fit shrink"
+          className="h-64 sm:h-96 w-auto max-w-full sm:max-w-xl lg:max-2xl:max-w-md object-scale-down"
+        />
+      )}
+      <div>
+        <h2 className="text-primary-8 max-lg:text-center">{titre}</h2>
+        <Markdown
+          texte={description}
+          className="paragraphe-primary-10 paragraphe-18 panier"
+        />
+        <Button href="/contact?panier=true" className="mt-6 max-lg:mx-auto">
+          {cta}
+        </Button>
+      </div>
+    </Section>
+  );
+};
+
+export default PanierActionsImpact;
diff --git a/packages/site/app/outil-numerique/QuestionsPlateforme.tsx b/packages/site/app/outil-numerique/QuestionsPlateforme.tsx
index 1567e70d78..45ea435911 100644
--- a/packages/site/app/outil-numerique/QuestionsPlateforme.tsx
+++ b/packages/site/app/outil-numerique/QuestionsPlateforme.tsx
@@ -2,36 +2,43 @@
 
 import Markdown from '@components/markdown/Markdown';
 import Section from '@components/sections/Section';
-import {Accordion} from '@tet/ui';
+import {Button} from '@tet/ui';
 
 type QuestionsPlateformeProps = {
   titre: string;
-  liste: {
-    id: number;
-    titre: string;
-    contenu: string;
-  }[];
+  description?: string;
+  cta_faq: string;
+  cta_contact: string;
 };
 
-const QuestionsPlateforme = ({titre, liste}: QuestionsPlateformeProps) => {
+const QuestionsPlateforme = ({
+  titre,
+  description,
+  cta_faq,
+  cta_contact,
+}: QuestionsPlateformeProps) => {
   return (
-    <Section containerClassName="bg-primary-0">
-      <h2 className="text-center">{titre}</h2>
-      <div className="flex flex-col gap-2">
-        {liste.map(l => (
-          <div key={l.id}>
-            <Accordion
-              id={l.id.toString()}
-              title={l.titre}
-              content={
-                <Markdown
-                  texte={l.contenu}
-                  className="px-10 pt-6 border border-t-0 border-grey-4 rounded-b-lg"
-                />
-              }
-            />
-          </div>
-        ))}
+    <Section containerClassName="bg-primary-7">
+      <h2 className="text-center text-white mb-1">{titre}</h2>
+
+      {!!description && (
+        <Markdown
+          texte={description}
+          className="text-white text-center lg:max-w-2xl mx-auto questions"
+        />
+      )}
+
+      <div className="mx-auto flex max-lg:flex-col gap-8 justify-center items-center">
+        <Button href="/faq?onglet=outil-numerique" variant="outlined">
+          {cta_faq}
+        </Button>
+        <Button
+          href="/contact"
+          variant="outlined"
+          className="!bg-[#FFE8BD] hover:!bg-[#FFE4A8]"
+        >
+          {cta_contact}
+        </Button>
       </div>
     </Section>
   );
diff --git a/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx b/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx
index 12e0716650..155f285c5e 100644
--- a/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx
+++ b/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx
@@ -15,12 +15,12 @@ type TemoignagesPlateformeProps = {
 const TemoignagesPlateforme = ({temoignages}: TemoignagesPlateformeProps) => {
   return (
     <Section
-      containerClassName="md:bg-primary-7 max-md:!p-0"
+      containerClassName="bg-primary-7 max-md:!p-2"
       className="max-md:p-0"
     >
       <TestimonialSlideshow
         contenu={temoignages}
-        className="rounded-[10px] max-md:border-x-[3px] max-md:border-orange-1 md:w-3/4 mx-auto"
+        className="rounded-[10px] max-md:border-x-[3px] max-md:border-orange-1 w-3/4 mx-auto"
         dotsColor="orange"
         displayButtons={false}
         autoSlideDelay={12000}
diff --git a/packages/site/app/outil-numerique/page.tsx b/packages/site/app/outil-numerique/page.tsx
index 0ad764c6be..fe89767d13 100644
--- a/packages/site/app/outil-numerique/page.tsx
+++ b/packages/site/app/outil-numerique/page.tsx
@@ -3,13 +3,13 @@
 import NoResult from '@components/info/NoResult';
 import AvantagesPlateforme from './AvantagesPlateforme';
 import EquipePlateforme from './EquipePlateforme';
-import FonctionnalitesPlateforme from './FonctionnalitesPlateforme';
 import HeaderPlateforme from './HeaderPlateforme';
 import QuestionsPlateforme from './QuestionsPlateforme';
 import TemoignagesPlateforme from './TemoignagesPlateforme';
 import {getStrapiData} from './utils';
 import {Metadata, ResolvingMetadata} from 'next';
 import {getUpdatedMetadata} from 'src/utils/getUpdatedMetadata';
+import PanierActionsImpact from './PanierActionsImpact';
 
 export async function generateMetadata(
   {params}: {params: {}},
@@ -29,13 +29,13 @@ export async function generateMetadata(
 const OutilNumerique = async () => {
   const strapiData = await getStrapiData();
 
-  return strapiData && strapiData.avantages.length > 0 ? (
+  return strapiData ? (
     <div className="grow">
       <HeaderPlateforme {...strapiData.header} />
 
       <AvantagesPlateforme avantages={strapiData.avantages} />
 
-      <FonctionnalitesPlateforme {...strapiData.fonctionnalites} />
+      <PanierActionsImpact {...strapiData.panier} />
 
       {strapiData.temoignages.length > 0 && (
         <TemoignagesPlateforme temoignages={strapiData.temoignages} />
@@ -43,9 +43,7 @@ const OutilNumerique = async () => {
 
       <EquipePlateforme {...strapiData.equipe} />
 
-      {strapiData.questions.liste.length > 0 && (
-        <QuestionsPlateforme {...strapiData.questions} />
-      )}
+      <QuestionsPlateforme {...strapiData.questions} />
     </div>
   ) : (
     <NoResult />
diff --git a/packages/site/app/outil-numerique/styles.css b/packages/site/app/outil-numerique/styles.css
index 6ea6ce7557..d64051aecf 100644
--- a/packages/site/app/outil-numerique/styles.css
+++ b/packages/site/app/outil-numerique/styles.css
@@ -1,12 +1,17 @@
-.fonctionnalites ul {
+.panier ul {
   list-style-position: outside;
-  margin-bottom: 0;
+  @apply pl-5;
 }
 
-.fonctionnalites li:not(:last-of-type) {
-  padding-bottom: 24px;
+.panier li:not(:last-of-type) {
+  @apply pb-6;
 }
 
-.fonctionnalites li::marker {
+.panier li::marker {
   @apply text-primary-6;
 }
+
+.questions * {
+  @apply text-2xl;
+  @apply font-bold;
+}
diff --git a/packages/site/app/outil-numerique/utils.ts b/packages/site/app/outil-numerique/utils.ts
index 278c09c884..116f9213cb 100644
--- a/packages/site/app/outil-numerique/utils.ts
+++ b/packages/site/app/outil-numerique/utils.ts
@@ -6,14 +6,10 @@ export const getStrapiData = async () => {
     ['populate[0]', 'seo'],
     ['populate[1]', 'seo.metaImage'],
     ['populate[2]', 'couverture'],
-    ['populate[3]', 'avantages'],
-    ['populate[4]', 'avantages.image'],
-    ['populate[5]', 'fonctionnalites_image'],
-    ['populate[6]', 'temoignages_liste.temoignage'],
-    ['populate[7]', 'temoignages_liste.temoignage.portrait'],
-    ['populate[8]', 'equipe_liste'],
-    ['populate[9]', 'equipe_liste.image'],
-    ['populate[10]', 'questions_liste'],
+    ['populate[3]', 'avantages.image'],
+    ['populate[4]', 'panier_image'],
+    ['populate[5]', 'temoignages_liste.temoignage'],
+    ['populate[6]', 'temoignages_liste.temoignage.portrait'],
   ]);
 
   if (data) {
@@ -58,10 +54,12 @@ export const getStrapiData = async () => {
         ...av,
         image: av.image.data,
       })),
-      fonctionnalites: {
-        titre: outilData.fonctionnalites_titre as unknown as string,
-        contenu: outilData.fonctionnalites_contenu as unknown as string,
-        image: outilData.fonctionnalites_image.data as unknown as StrapiItem,
+      panier: {
+        titre: outilData.panier_titre as unknown as string,
+        description: outilData.panier_description as unknown as string,
+        image:
+          (outilData.panier_image?.data as unknown as StrapiItem) ?? undefined,
+        cta: outilData.panier_cta as unknown as string,
       },
       temoignages: (
         (outilData.temoignages_liste.data as unknown as StrapiItem[]) ?? []
@@ -78,26 +76,14 @@ export const getStrapiData = async () => {
         titre: outilData.equipe_titre as unknown as string,
         citation: outilData.equipe_citation as unknown as string,
         description: outilData.equipe_description as unknown as string,
-        liste: (
-          outilData.equipe_liste as unknown as {
-            id: number;
-            titre: string;
-            legende: string;
-            image: {data: StrapiItem};
-          }[]
-        ).map(eq => ({
-          ...eq,
-          image: eq.image.data,
-        })),
-        cta_contact: outilData.cta_contact as unknown as string,
+        cta: outilData.equipe_cta as unknown as string,
       },
       questions: {
         titre: outilData.questions_titre as unknown as string,
-        liste: outilData.questions_liste as unknown as {
-          id: number;
-          titre: string;
-          contenu: string;
-        }[],
+        description:
+          (outilData.questions_description as unknown as string) ?? undefined,
+        cta_faq: outilData.cta_faq as unknown as string,
+        cta_contact: outilData.cta_contact as unknown as string,
       },
     };
   } else return null;
diff --git a/packages/site/app/utils.ts b/packages/site/app/utils.ts
index 09a5f3f767..e545f03347 100644
--- a/packages/site/app/utils.ts
+++ b/packages/site/app/utils.ts
@@ -12,26 +12,28 @@ export const getMetaData = async () => {
   const metaImage =
     (data?.attributes?.seo?.metaImage?.data as unknown as StrapiItem)
       ?.attributes ??
-    (data.attributes.Couverture.data as unknown as StrapiItem)?.attributes ??
+    (data?.attributes.Couverture.data as unknown as StrapiItem)?.attributes ??
     undefined;
 
-  return {
-    metaTitle:
-      (data?.attributes?.seo?.metaTitle as unknown as string) ?? undefined,
-    metaDescription:
-      (data?.attributes?.seo?.metaDescription as unknown as string) ??
-      (data.attributes.Titre as unknown as string) ??
-      undefined,
-    metaImage: metaImage
-      ? {
-          url: metaImage.url as unknown as string,
-          width: metaImage.width as unknown as number,
-          height: metaImage.height as unknown as number,
-          type: metaImage.mime as unknown as string,
-          alt: metaImage.alternativeText as unknown as string,
-        }
-      : undefined,
-  };
+  return data
+    ? {
+        metaTitle:
+          (data?.attributes?.seo?.metaTitle as unknown as string) ?? undefined,
+        metaDescription:
+          (data?.attributes?.seo?.metaDescription as unknown as string) ??
+          (data?.attributes.Titre as unknown as string) ??
+          undefined,
+        metaImage: metaImage
+          ? {
+              url: metaImage.url as unknown as string,
+              width: metaImage.width as unknown as number,
+              height: metaImage.height as unknown as number,
+              type: metaImage.mime as unknown as string,
+              alt: metaImage.alternativeText as unknown as string,
+            }
+          : undefined,
+      }
+    : null;
 };
 
 export const getData = async (): Promise<AccueilData | null> => {
@@ -51,7 +53,7 @@ export const getData = async (): Promise<AccueilData | null> => {
     ['populate[11]', 'temoignages_liste.temoignage.portrait'],
   ]);
 
-  const temoignages = data.attributes.temoignages_liste
+  const temoignages = data?.attributes.temoignages_liste
     .data as unknown as StrapiItem[];
 
   // Formattage de la data
diff --git a/packages/site/components/markdown/Markdown.tsx b/packages/site/components/markdown/Markdown.tsx
index bf3519d317..dd26249fe5 100644
--- a/packages/site/components/markdown/Markdown.tsx
+++ b/packages/site/components/markdown/Markdown.tsx
@@ -1,5 +1,6 @@
 import MarkdownBase from 'react-markdown';
 import remarkGfm from 'remark-gfm';
+import rehypeRaw from 'rehype-raw';
 
 type MarkdownProps = {
   texte: string;
@@ -7,7 +8,11 @@ type MarkdownProps = {
 };
 
 const Markdown = ({texte, className}: MarkdownProps) => (
-  <MarkdownBase remarkPlugins={[remarkGfm]} className={className}>
+  <MarkdownBase
+    rehypePlugins={[rehypeRaw]}
+    remarkPlugins={[remarkGfm]}
+    className={className}
+  >
     {texte}
   </MarkdownBase>
 );
diff --git a/packages/site/package.json b/packages/site/package.json
index ec527dd3f2..552f4fe684 100644
--- a/packages/site/package.json
+++ b/packages/site/package.json
@@ -40,6 +40,7 @@
     "react-markdown": "^9.0.0",
     "react-swipeable": "^7.0.1",
     "rehype-external-links": "^2.1.0",
+    "rehype-raw": "^7.0.0",
     "rehype-slug": "^5.1.0",
     "rehype-toc": "^3.0.2",
     "remark-gfm": "^4.0.0",
diff --git a/packages/site/src/strapi/strapi.ts b/packages/site/src/strapi/strapi.ts
index 09ea5c548a..9c761812bc 100644
--- a/packages/site/src/strapi/strapi.ts
+++ b/packages/site/src/strapi/strapi.ts
@@ -35,7 +35,7 @@ export async function fetchCollection(
   params.forEach(p => url.searchParams.append(...p));
 
   const response = await fetch(`${url}`, {
-    cache: 'no-store',
+    next: {revalidate: 3600},
     method: 'GET',
     headers,
   });
@@ -66,8 +66,9 @@ export async function fetchItem(
 ): Promise<StrapiItem> {
   const url = new URL(`${baseURL}/api/${path}/${id}`);
   params.forEach(p => url.searchParams.append(...p));
+
   const response = await fetch(`${url}`, {
-    cache: 'no-store',
+    next: {revalidate: 3600},
     method: 'GET',
     headers,
   });
diff --git a/packages/ui/src/design-system/Accordion/Accordion.tsx b/packages/ui/src/design-system/Accordion/Accordion.tsx
index 19d15397c6..0f641cb9c7 100644
--- a/packages/ui/src/design-system/Accordion/Accordion.tsx
+++ b/packages/ui/src/design-system/Accordion/Accordion.tsx
@@ -58,7 +58,10 @@ export const AccordionControlled = ({
         onClick={() => setExpanded(!expanded)}
         className={classNames(
           'border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1',
-          {'border-primary-2 rounded-b-none bg-primary-2': expanded}
+          {
+            'border-primary-2 rounded-b-none bg-primary-2': expanded,
+            'bg-white': !expanded,
+          }
         )}
       >
         {/** picto indiquant l'état ouvert/fermé */}
diff --git a/packages/ui/src/design-system/Accordion/__snapshots__/Accordion.stories.tsx.snap b/packages/ui/src/design-system/Accordion/__snapshots__/Accordion.stories.tsx.snap
index 6354aead6c..6b98da6c31 100644
--- a/packages/ui/src/design-system/Accordion/__snapshots__/Accordion.stories.tsx.snap
+++ b/packages/ui/src/design-system/Accordion/__snapshots__/Accordion.stories.tsx.snap
@@ -5,7 +5,7 @@ exports[`design-system/Accordion AvecIcone smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -23,7 +23,7 @@ exports[`design-system/Accordion AvecIconeADroite smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -41,7 +41,7 @@ exports[`design-system/Accordion AvecIconeSVG smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -67,7 +67,7 @@ exports[`design-system/Accordion AvecSousTitre smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -88,7 +88,7 @@ exports[`design-system/Accordion CompletTitreLong smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -109,7 +109,7 @@ exports[`design-system/Accordion ContenuPersonnalise smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -125,7 +125,7 @@ exports[`design-system/Accordion ContenuStyle smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
@@ -160,7 +160,7 @@ exports[`design-system/Accordion Default smoke-test 1`] = `
   <div role="button"
        tabindex="0"
        aria-expanded="false"
-       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1"
+       class="border border-grey-4 rounded-lg flex gap-3 px-6 py-4 font-bold text-primary-10 hover:bg-primary-1 bg-white"
   >
     <span class="ri-arrow-right-s-line font-normal text-center h-5 w-5 text-[1.25rem] leading-[1.25rem] text-primary transition-transform">
     </span>
diff --git a/packages/ui/src/global.css b/packages/ui/src/global.css
index 5f1a8e1cc2..f86ec7da39 100644
--- a/packages/ui/src/global.css
+++ b/packages/ui/src/global.css
@@ -164,6 +164,11 @@
     @apply text-primary-9;
   }
 
+  .paragraphe-primary-10,
+  .paragraphe-primary-10 > p {
+    @apply text-primary-10;
+  }
+
   .paragraphe-primary-11,
   .paragraphe-primary-11 > p {
     @apply text-primary-11;
diff --git a/strapi/src/api/faq/content-types/faq/schema.json b/strapi/src/api/faq/content-types/faq/schema.json
index e2e9efe728..a4886beccb 100644
--- a/strapi/src/api/faq/content-types/faq/schema.json
+++ b/strapi/src/api/faq/content-types/faq/schema.json
@@ -23,6 +23,15 @@
     "Contenu": {
       "type": "richtext",
       "required": true
+    },
+    "onglet": {
+      "type": "enumeration",
+      "enum": [
+        "Le programme Territoire Engagé",
+        "L'outil numérique"
+      ],
+      "default": "Le programme Territoire Engagé",
+      "required": true
     }
   }
 }
diff --git a/strapi/src/api/page-outils-numerique/content-types/page-outils-numerique/schema.json b/strapi/src/api/page-outils-numerique/content-types/page-outils-numerique/schema.json
index 028a60a957..ddb165dce5 100644
--- a/strapi/src/api/page-outils-numerique/content-types/page-outils-numerique/schema.json
+++ b/strapi/src/api/page-outils-numerique/content-types/page-outils-numerique/schema.json
@@ -20,12 +20,14 @@
     "titre": {
       "type": "string",
       "required": true,
-      "maxLength": 255
+      "maxLength": 255,
+      "default": "Vous cherchez un outil pour piloter vos plans d’action et suivre vos indicateurs ?"
     },
     "accroche": {
       "type": "string",
       "required": true,
-      "maxLength": 255
+      "maxLength": 255,
+      "default": "Découvrez ce service gratuit dédié à accompagner votre collectivité ! "
     },
     "cta_inscription": {
       "type": "string",
@@ -35,7 +37,8 @@
     },
     "url_inscription": {
       "type": "string",
-      "required": true
+      "required": true,
+      "default": "https://app.territoiresentransitions.fr"
     },
     "cta_demo": {
       "type": "string",
@@ -45,15 +48,14 @@
     },
     "url_demo": {
       "type": "string",
-      "required": true
+      "required": true,
+      "default": "https://calendly.com/territoiresentransitions/demo-fonctionnalite-plans-d-action"
     },
     "couverture": {
       "type": "media",
       "multiple": false,
       "required": true,
-      "allowedTypes": [
-        "images"
-      ]
+      "allowedTypes": ["images"]
     },
     "avantages": {
       "type": "component",
@@ -62,22 +64,45 @@
       "min": 2,
       "max": 4
     },
+    "panier_titre": {
+      "type": "string",
+      "required": true,
+      "maxLength": 255,
+      "default": "Identifiez des actions à impact pour votre collectivité en moins de quelques clics"
+    },
+    "panier_description": {
+      "type": "richtext",
+      "required": true,
+      "default": "Vous avez besoin d'aide pour identifier des actions concrètes adaptées à votre territoire ? Vous souhaitez accélérer votre démarche de transition écologique pour votre commune ou votre intercommunalité ? Vous cherchez à prioriser quelques actions clés à valider avec vos élus ?"
+    },
+    "panier_image": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
+      "allowedTypes": ["images"]
+    },
+    "panier_cta": {
+      "type": "string",
+      "required": true,
+      "maxLength": 50,
+      "default": "Ça m'intéresse"
+    },
     "fonctionnalites_titre": {
       "type": "string",
       "required": true,
-      "maxLength": 255
+      "maxLength": 255,
+      "default": "Organisez le travail et atteignez vos objectifs !"
     },
     "fonctionnalites_contenu": {
       "type": "richtext",
-      "required": true
+      "required": true,
+      "default": "Accélérez votre diagnostic grâce aux actions à impact Centralisez vos données et pilotez vos plans d’actions Bénéficiez d’une aide précieuse dans la collecte de données grâce à l’Open Data Collaborez avec vos collègues pour le suivi des actions et la mise à jour des indicateurs Evaluez la progression et l'impact de vos actions via vos tableaux de bord"
     },
     "fonctionnalites_image": {
       "type": "media",
       "multiple": false,
       "required": true,
-      "allowedTypes": [
-        "images"
-      ]
+      "allowedTypes": ["images"]
     },
     "temoignages_liste": {
       "type": "relation",
@@ -87,13 +112,16 @@
     "equipe_titre": {
       "type": "string",
       "required": true,
-      "maxLength": 255
+      "maxLength": 255,
+      "default": "Qui sommes-nous ?"
     },
     "equipe_citation": {
-      "type": "text"
+      "type": "text",
+      "default": "“Dans un environnement qui change, il n'y a pas de plus grand risque que de rester immobile.”"
     },
     "equipe_description": {
-      "type": "text"
+      "type": "text",
+      "default": "C’est avec cette envie de faire avancer les choses que le projet Territoires en Transitions est né. Nicolas Vallée, intrapreneur et salarié de l’ADEME, a toujours aimé faire bouger les lignes. C’est donc dans cette optique qu’il s’est entouré des meilleurs (évidemment) pour atteindre un objectif : changer le monde. Enfin, déjà changer le quotidien des collectivités pour leur permettre de réussir leur transition écologique."
     },
     "equipe_liste": {
       "type": "component",
@@ -101,22 +129,40 @@
       "component": "shared.vignette-avec-titre",
       "min": 1
     },
-    "cta_contact": {
+    "equipe_cta": {
       "type": "string",
       "required": true,
       "maxLength": 50,
-      "default": "Je contacte l'équipe"
+      "default": "Découvrir les membres de l'équipe"
     },
     "questions_titre": {
       "type": "string",
       "required": true,
-      "maxLength": 255
+      "maxLength": 255,
+      "default": "Vous avez une question ?"
     },
     "questions_liste": {
       "type": "component",
       "repeatable": true,
       "component": "shared.paragraphe",
       "min": 1
+    },
+    "questions_description": {
+      "type": "richtext",
+      "maxLength": 255,
+      "default": "N'hésitez pas à consulter notre FaQ ou à nous contacter. Notre équipe répond via le chat en moins de 20 minutes."
+    },
+    "cta_faq": {
+      "type": "string",
+      "required": true,
+      "maxLength": 50,
+      "default": "Je consulte la FAQ"
+    },
+    "cta_contact": {
+      "type": "string",
+      "required": true,
+      "maxLength": 50,
+      "default": "Je contacte l'équipe"
     }
   }
 }
diff --git a/strapi/types/generated/contentTypes.d.ts b/strapi/types/generated/contentTypes.d.ts
index 987a7891e8..79afd4e691 100644
--- a/strapi/types/generated/contentTypes.d.ts
+++ b/strapi/types/generated/contentTypes.d.ts
@@ -908,6 +908,11 @@ export interface ApiFaqFaq extends Schema.CollectionType {
     Rang: Attribute.Integer & Attribute.Unique;
     Titre: Attribute.String & Attribute.Required;
     Contenu: Attribute.RichText & Attribute.Required;
+    onglet: Attribute.Enumeration<
+      ['Le programme Territoire Engag\u00E9', "L'outil num\u00E9rique"]
+    > &
+      Attribute.Required &
+      Attribute.DefaultTo<'Le programme Territoire Engag\u00E9'>;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;
@@ -1141,38 +1146,63 @@ export interface ApiPageOutilsNumeriquePageOutilsNumerique
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 255;
-      }>;
+      }> &
+      Attribute.DefaultTo<'Vous cherchez un outil pour piloter vos plans d\u2019action et suivre vos indicateurs ?'>;
     accroche: Attribute.String &
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 255;
-      }>;
+      }> &
+      Attribute.DefaultTo<'D\u00E9couvrez ce service gratuit d\u00E9di\u00E9 \u00E0 accompagner votre collectivit\u00E9 ! '>;
     cta_inscription: Attribute.String &
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 50;
       }> &
       Attribute.DefaultTo<'Je m\u2019inscris'>;
-    url_inscription: Attribute.String & Attribute.Required;
+    url_inscription: Attribute.String &
+      Attribute.Required &
+      Attribute.DefaultTo<'https://app.territoiresentransitions.fr'>;
     cta_demo: Attribute.String &
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 50;
       }> &
       Attribute.DefaultTo<'Je participe \u00E0 une d\u00E9mo'>;
-    url_demo: Attribute.String & Attribute.Required;
+    url_demo: Attribute.String &
+      Attribute.Required &
+      Attribute.DefaultTo<'https://calendly.com/territoiresentransitions/demo-fonctionnalite-plans-d-action'>;
     couverture: Attribute.Media & Attribute.Required;
     avantages: Attribute.Component<'shared.vignette', true> &
       Attribute.SetMinMax<{
         min: 2;
         max: 4;
       }>;
+    panier_titre: Attribute.String &
+      Attribute.Required &
+      Attribute.SetMinMaxLength<{
+        maxLength: 255;
+      }> &
+      Attribute.DefaultTo<'Identifiez des actions \u00E0 impact pour votre collectivit\u00E9 en moins de quelques clics'>;
+    panier_description: Attribute.RichText &
+      Attribute.Required &
+      Attribute.DefaultTo<"Vous avez besoin d'aide pour identifier des actions concr\u00E8tes adapt\u00E9es \u00E0 votre territoire ? Vous souhaitez acc\u00E9l\u00E9rer votre d\u00E9marche de transition \u00E9cologique pour votre commune ou votre intercommunalit\u00E9 ? Vous cherchez \u00E0 prioriser quelques actions cl\u00E9s \u00E0 valider avec vos \u00E9lus ?">;
+    panier_image: Attribute.Media;
+    panier_cta: Attribute.String &
+      Attribute.Required &
+      Attribute.SetMinMaxLength<{
+        maxLength: 50;
+      }> &
+      Attribute.DefaultTo<"\u00C7a m'int\u00E9resse">;
     fonctionnalites_titre: Attribute.String &
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 255;
-      }>;
-    fonctionnalites_contenu: Attribute.RichText & Attribute.Required;
+      }> &
+      Attribute.DefaultTo<'Organisez le travail et atteignez vos objectifs !'>;
+    fonctionnalites_contenu: Attribute.RichText &
+      Attribute.Required &
+      Attribute.DefaultTo<"Acc\u00E9l\u00E9rez votre diagnostic gr\u00E2ce aux actions \u00E0 impact Centralisez vos donn\u00E9es et pilotez vos plans d\u2019actions B\u00E9n\u00E9ficiez d\u2019une aide pr\u00E9cieuse dans la collecte de donn\u00E9es gr\u00E2ce \u00E0 l\u2019Open Data Collaborez avec vos coll\u00E8gues pour le suivi des actions et la mise \u00E0 jour des indicateurs Evaluez la progression et l'impact de vos actions via vos tableaux de bord">;
     fonctionnalites_image: Attribute.Media & Attribute.Required;
     temoignages_liste: Attribute.Relation<
       'api::page-outils-numerique.page-outils-numerique',
@@ -1183,28 +1213,49 @@ export interface ApiPageOutilsNumeriquePageOutilsNumerique
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 255;
-      }>;
-    equipe_citation: Attribute.Text;
-    equipe_description: Attribute.Text;
+      }> &
+      Attribute.DefaultTo<'Qui sommes-nous ?'>;
+    equipe_citation: Attribute.Text &
+      Attribute.DefaultTo<"\u201CDans un environnement qui change, il n'y a pas de plus grand risque que de rester immobile.\u201D">;
+    equipe_description: Attribute.Text &
+      Attribute.DefaultTo<'C\u2019est avec cette envie de faire avancer les choses que le projet Territoires en Transitions est n\u00E9. Nicolas Vall\u00E9e, intrapreneur et salari\u00E9 de l\u2019ADEME, a toujours aim\u00E9 faire bouger les lignes. C\u2019est donc dans cette optique qu\u2019il s\u2019est entour\u00E9 des meilleurs (\u00E9videmment) pour atteindre un objectif : changer le monde. Enfin, d\u00E9j\u00E0 changer le quotidien des collectivit\u00E9s pour leur permettre de r\u00E9ussir leur transition \u00E9cologique.'>;
     equipe_liste: Attribute.Component<'shared.vignette-avec-titre', true> &
       Attribute.SetMinMax<{
         min: 1;
       }>;
-    cta_contact: Attribute.String &
+    equipe_cta: Attribute.String &
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 50;
       }> &
-      Attribute.DefaultTo<"Je contacte l'\u00E9quipe">;
+      Attribute.DefaultTo<"D\u00E9couvrir les membres de l'\u00E9quipe">;
     questions_titre: Attribute.String &
       Attribute.Required &
       Attribute.SetMinMaxLength<{
         maxLength: 255;
-      }>;
+      }> &
+      Attribute.DefaultTo<'Vous avez une question ?'>;
     questions_liste: Attribute.Component<'shared.paragraphe', true> &
       Attribute.SetMinMax<{
         min: 1;
       }>;
+    questions_description: Attribute.RichText &
+      Attribute.SetMinMaxLength<{
+        maxLength: 255;
+      }> &
+      Attribute.DefaultTo<"N'h\u00E9sitez pas \u00E0 consulter notre FaQ ou \u00E0 nous contacter. Notre \u00E9quipe r\u00E9pond via le chat en moins de 20 minutes.">;
+    cta_faq: Attribute.String &
+      Attribute.Required &
+      Attribute.SetMinMaxLength<{
+        maxLength: 50;
+      }> &
+      Attribute.DefaultTo<'Je consulte la FAQ'>;
+    cta_contact: Attribute.String &
+      Attribute.Required &
+      Attribute.SetMinMaxLength<{
+        maxLength: 50;
+      }> &
+      Attribute.DefaultTo<"Je contacte l'\u00E9quipe">;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;