diff --git a/app/components/table-of-contents.hbs b/app/components/table-of-contents.hbs
deleted file mode 100644
index 3662bcb5d..000000000
--- a/app/components/table-of-contents.hbs
+++ /dev/null
@@ -1,62 +0,0 @@
-{{#each @data as |page|}}
-  {{#unless page.skipToc}}
-    {{#if (includes page.id "toc-heading")}}
-      <li class="toc-heading {{this.tocLevel}}">
-        {{page.title}}
-      </li>
-
-    {{else if page.pages}}
-      <li class="toc-group {{this.tocLevel}}">
-        <CpPanel
-          @open={{eq @currentSection.id page.id}}
-          as |panel|
-        >
-          {{#if this.fastboot.isFastBoot}}
-            <LinkTo
-              @activeClass="selected"
-              @model={{page.id}}
-              @route="version.show"
-              class="cp-Panel-toggle"
-              data-test-toc-link={{page.title}}
-            >
-              {{page.title}}
-            </LinkTo>
-          {{else}}
-            <panel.toggle
-              data-test-toc-title={{page.title}}
-            >
-              {{page.title}}
-            </panel.toggle>
-          {{/if}}
-
-          <panel.body>
-            <TableOfContents
-              @currentPage={{@currentPage}}
-              @data={{page.pages}}
-              @level={{inc (or @level 0)}}
-            />
-          </panel.body>
-        </CpPanel>
-      </li>
-
-    {{else}}
-      <li
-        class="
-          toc-link
-          {{this.tocLevel}}
-          {{if (eq @currentPage.url page.url) "selected"}}
-        "
-      >
-        <LinkTo
-          @activeClass="selected"
-          @model={{page.url}}
-          @route="version.show"
-          data-test-toc-link={{page.title}}
-        >
-          {{page.title}}
-        </LinkTo>
-      </li>
-
-    {{/if}}
-  {{/unless}}
-{{/each}}
\ No newline at end of file
diff --git a/app/helpers/includes.js b/app/helpers/includes.js
deleted file mode 100644
index 1ea06f954..000000000
--- a/app/helpers/includes.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { helper } from '@ember/component/helper';
-
-export default helper(function includes([string = '', query]) {
-  return string.includes(query);
-});
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 272eda7e3..daf864dd2 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -188,24 +188,6 @@ code[data-diff] .diff-insertion::before {
   margin-left: 0.05em;
 }
 
-/* ToC heading styles */
-
-li.toc-heading.toc-level-0 {
-  font-size: 0.8em;
-  text-transform: uppercase;
-  color: rgb(155, 41, 24, 0.76);
-  font-weight: bold;
-  margin: 2em 0 1em;
-}
-
-li.toc-heading.toc-level-0:first-of-type {
-  margin-top: 0;
-}
-
-li.toc-group.toc-level-0 {
-  padding-left: 1em;
-}
-
 /* Custom styling of the French app */
 .footer-middle {
   flex: 2;
diff --git a/config/environment.js b/config/environment.js
index f3e838216..db5153a27 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -41,6 +41,12 @@ module.exports = function (environment) {
         discordLink: 'https://discord.com/channels/480462759797063690/486235962700201984'
       },
       sourceRepo: 'https://github.com/DazzlingFugu/ember-fr-guides-source',
+      texts: {
+        searchInputPlaceholder: 'Rechercher dans le Guide',
+        searchResultsPlaceholder: 'Résultats de la recherche',
+        currentChapter: 'Nous avons couvert',
+        nextChapter: 'Chapitre suivant',
+      },
     },
 
     algolia: {
diff --git a/package-lock.json b/package-lock.json
index 0c9ed4ff2..89f617ca5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
         "eslint-plugin-qunit": "^6.2.0",
         "gfm-code-blocks": "^1.0.0",
         "guidemaker": "^2.4.0",
-        "guidemaker-ember-locale-template": "git://github.com/DazzlingFugu/guidemaker-ember-locale-template",
+        "guidemaker-ember-locale-template": "^1.0.0",
         "loader.js": "^4.7.0",
         "lodash": "^4.17.21",
         "markdown-link-extractor": "^1.2.2",
@@ -25984,12 +25984,10 @@
       }
     },
     "node_modules/guidemaker-ember-locale-template": {
-      "name": "guidemaker-default-template",
-      "version": "5.1.0",
-      "resolved": "git+ssh://git@github.com/DazzlingFugu/guidemaker-ember-locale-template.git#82931b5712403349de1ed2853dbbe8c934380a1b",
-      "integrity": "sha512-N10bKCk5fVbhpz8qo934emKNLYKXL4q9tblYEmm6/b9QEtZq656E/2wec7tDgsophHsRKdeWp/KOgpVN8/nYZg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/guidemaker-ember-locale-template/-/guidemaker-ember-locale-template-1.0.0.tgz",
+      "integrity": "sha512-JSfuYf1SP1oBQg3xfH0boWscYMzUVOgPBFREI/YCxrYT1B9k9EC1zJgOf+W8gJ5zLdRAttv/Ghlu3uqWPES1sg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "algoliasearch": "^4.20.0",
         "broccoli-funnel": "^3.0.2",
@@ -25998,7 +25996,7 @@
         "ember-cli-htmlbars": "^5.7.2",
         "ember-cli-sass": "^10.0.1",
         "ember-collapsible-panel": "^5.0.0",
-        "ember-concurrency": "^2.0.2",
+        "ember-concurrency": "^2.3.0",
         "ember-href-to": "^5.0.0",
         "ember-power-select": "^6.0.0",
         "ember-root-url": "^1.0.1",
@@ -26073,19 +26071,6 @@
         "node": "^4.5 || 6.* || >= 7.*"
       }
     },
-    "node_modules/guidemaker-ember-locale-template/node_modules/ember-cli-version-checker": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz",
-      "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.3.3",
-        "semver": "^5.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/guidemaker-ember-locale-template/node_modules/ember-truth-helpers": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/ember-truth-helpers/-/ember-truth-helpers-3.1.1.tgz",
@@ -26098,49 +26083,6 @@
         "node": "10.* || >= 12"
       }
     },
-    "node_modules/guidemaker-ember-locale-template/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/guidemaker-ember-locale-template/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/guidemaker-ember-locale-template/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/guidemaker-ember-locale-template/node_modules/walk-sync": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.4.tgz",
-      "integrity": "sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==",
-      "dev": true,
-      "dependencies": {
-        "ensure-posix-path": "^1.0.0",
-        "matcher-collection": "^1.0.0"
-      }
-    },
     "node_modules/guidemaker/node_modules/@embroider/shared-internals": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-1.8.3.tgz",
diff --git a/package.json b/package.json
index f8765f643..4bfcd8d50 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "eslint-plugin-qunit": "^6.2.0",
     "gfm-code-blocks": "^1.0.0",
     "guidemaker": "^2.4.0",
-    "guidemaker-ember-locale-template": "git://github.com/DazzlingFugu/guidemaker-ember-locale-template",
+    "guidemaker-ember-locale-template": "^1.0.0",
     "loader.js": "^4.7.0",
     "lodash": "^4.17.21",
     "markdown-link-extractor": "^1.2.2",