From 07a904d7a4eb12678476e8cd09fac8ab9afa87a6 Mon Sep 17 00:00:00 2001
From: Clovis <clovis@bdx.town>
Date: Thu, 1 Dec 2022 19:45:43 +0100
Subject: [PATCH] Release Goodcook raccoon (#87)

* [CH] Local timeline logo is now instance logo. Instance logo must be svg only. Remove name from Manifest.json (#64)
* [FIX] Edit chat check (#65)
* [CH] Better UX for polls (#66)
* [FIX] Translate config panel, bookmark,muted words, import data pages in French (#67)
* [FIX] use actualStatus hidden state boosted status with CW are now working correctly (#76)
* [CH] Move custom enlistment directly in the pre-existing onboarding  (#73)
* [CH] Rework the profile directory (#77)
* [ADD][FIX] Add a detailed home description, Show admins and moderators on front page. Fix footer links on mangane settings page. (#83)
* [Fix] translations (#84)
* [CH] Back arrow should stick to the top of the screen (#86)
* [Fix] wrong request on admin dashboard (#85)
* [FIX] Fix translation tone
* [REM] Remove useless onboarding setting
---
 app/icons/bdx.svg                             |   3 -
 app/manifest.json                             |  11 +-
 app/soapbox/__fixtures__/intlMessages.json    |  34 +--
 app/soapbox/actions/admin.ts                  |   5 +-
 app/soapbox/actions/instance.ts               |   4 +-
 app/soapbox/actions/settings.ts               |   1 -
 app/soapbox/components/polls/poll-option.tsx  |   8 +-
 app/soapbox/components/sidebar-navigation.tsx |  24 +-
 app/soapbox/components/sidebar_menu.tsx       |  29 +-
 app/soapbox/components/site-logo.tsx          |  37 +--
 app/soapbox/components/status.tsx             |   2 +-
 app/soapbox/components/status_content.tsx     |   2 +-
 app/soapbox/components/sticky.tsx             |  44 +++
 app/soapbox/components/thumb_navigation.tsx   |  15 +-
 .../components/ui/streamfield/streamfield.tsx |   4 +-
 .../directory/components/account_card.tsx     |  81 ++++--
 app/soapbox/features/directory/index.tsx      |  28 +-
 .../features/enlistment/enlistment.tsx        | 100 -------
 .../features/enlistment/steps/step0.tsx       |  44 ---
 .../features/enlistment/steps/step1.tsx       |  54 ----
 .../features/enlistment/steps/step2.tsx       |  51 ----
 .../features/enlistment/steps/step3.tsx       |  71 -----
 .../features/enlistment/steps/step4.tsx       |  59 ----
 app/soapbox/features/landing_page/index.tsx   |  46 ++-
 .../features/onboarding/onboarding-wizard.tsx |  10 +-
 .../steps/cover-photo-selection-step.tsx      |   6 +-
 .../onboarding/steps/display-name-step.tsx    |   6 +-
 .../features/onboarding/steps/feeds.tsx       |  62 ++++
 .../onboarding/steps/how-it-works.tsx         |  65 +++++
 .../features/onboarding/steps/privacy.tsx     |  80 ++++++
 .../features/onboarding/steps/welcome.tsx     |  57 ++++
 app/soapbox/features/preferences/index.tsx    |   4 -
 .../public_layout/components/header.tsx       |  11 -
 .../components/icon_picker_dropdown.js        |  10 +-
 .../components/site-preview.tsx               |   2 +-
 app/soapbox/features/soapbox_config/index.tsx |  46 ++-
 app/soapbox/features/status/index.tsx         |  11 +-
 .../features/ui/components/link_footer.tsx    |   3 -
 app/soapbox/features/ui/index.tsx             |   3 -
 app/soapbox/hooks/index.ts                    |   1 +
 app/soapbox/hooks/useLogo.ts                  |  32 +++
 app/soapbox/hooks/useTheme.ts                 |   2 +
 app/soapbox/locales/ar.json                   |  54 ++--
 app/soapbox/locales/ast.json                  |  54 ++--
 app/soapbox/locales/bg.json                   |  54 ++--
 app/soapbox/locales/bn.json                   |  54 ++--
 app/soapbox/locales/br.json                   |  54 ++--
 app/soapbox/locales/ca.json                   |  54 ++--
 app/soapbox/locales/co.json                   |  54 ++--
 app/soapbox/locales/cs.json                   |  54 ++--
 app/soapbox/locales/cy.json                   |  54 ++--
 app/soapbox/locales/da.json                   |  54 ++--
 app/soapbox/locales/de.json                   |  54 ++--
 app/soapbox/locales/defaultMessages.json      |  54 ++--
 app/soapbox/locales/el.json                   |  54 ++--
 app/soapbox/locales/en-Shaw.json              |  54 ++--
 app/soapbox/locales/en.json                   |  54 ++--
 app/soapbox/locales/eo.json                   |  54 ++--
 app/soapbox/locales/es-AR.json                |  54 ++--
 app/soapbox/locales/es.json                   |  54 ++--
 app/soapbox/locales/et.json                   |  54 ++--
 app/soapbox/locales/eu.json                   |  54 ++--
 app/soapbox/locales/fa.json                   |  54 ++--
 app/soapbox/locales/fi.json                   |  54 ++--
 app/soapbox/locales/fr.json                   | 270 +++++++++---------
 app/soapbox/locales/ga.json                   |  54 ++--
 app/soapbox/locales/gl.json                   |  54 ++--
 app/soapbox/locales/he.json                   |  54 ++--
 app/soapbox/locales/hi.json                   |  54 ++--
 app/soapbox/locales/hr.json                   |  54 ++--
 app/soapbox/locales/hu.json                   |  54 ++--
 app/soapbox/locales/hy.json                   |  54 ++--
 app/soapbox/locales/id.json                   |  54 ++--
 app/soapbox/locales/io.json                   |  54 ++--
 app/soapbox/locales/is.json                   |  54 ++--
 app/soapbox/locales/it.json                   |  54 ++--
 app/soapbox/locales/ja.json                   |  54 ++--
 app/soapbox/locales/ka.json                   |  54 ++--
 app/soapbox/locales/kk.json                   |  54 ++--
 app/soapbox/locales/ko.json                   |  54 ++--
 app/soapbox/locales/lt.json                   |  54 ++--
 app/soapbox/locales/lv.json                   |  54 ++--
 app/soapbox/locales/mk.json                   |  54 ++--
 app/soapbox/locales/ms.json                   |  54 ++--
 app/soapbox/locales/nl.json                   |  54 ++--
 app/soapbox/locales/nn.json                   |  54 ++--
 app/soapbox/locales/no.json                   |  54 ++--
 app/soapbox/locales/oc.json                   |  54 ++--
 app/soapbox/locales/pl.json                   |  54 ++--
 app/soapbox/locales/pt-BR.json                |  54 ++--
 app/soapbox/locales/pt.json                   |  54 ++--
 app/soapbox/locales/ro.json                   |  54 ++--
 app/soapbox/locales/ru.json                   |  54 ++--
 app/soapbox/locales/sk.json                   |  54 ++--
 app/soapbox/locales/sl.json                   |  54 ++--
 app/soapbox/locales/sq.json                   |  54 ++--
 app/soapbox/locales/sr-Latn.json              |  54 ++--
 app/soapbox/locales/sr.json                   |  54 ++--
 app/soapbox/locales/sv.json                   |  54 ++--
 app/soapbox/locales/ta.json                   |  54 ++--
 app/soapbox/locales/te.json                   |  54 ++--
 app/soapbox/locales/th.json                   |  54 ++--
 app/soapbox/locales/tr.json                   |  54 ++--
 app/soapbox/locales/uk.json                   |  54 ++--
 app/soapbox/locales/zh-CN.json                |  54 ++--
 app/soapbox/locales/zh-HK.json                |  54 ++--
 app/soapbox/locales/zh-TW.json                |  54 ++--
 app/soapbox/normalizers/instance.ts           |   1 +
 .../normalizers/soapbox/soapbox_config.ts     |   1 +
 app/soapbox/reducers/instance.ts              |  10 +-
 app/soapbox/utils/features.ts                 |   4 +-
 app/styles/application.scss                   |   1 +
 app/styles/components/directory.scss          |  57 ++--
 app/styles/components/sticky.scss             |  15 +
 webpack/development.js                        |   6 +-
 webpack/rules/assets.js                       |   4 +-
 116 files changed, 2527 insertions(+), 2466 deletions(-)
 delete mode 100644 app/icons/bdx.svg
 create mode 100644 app/soapbox/components/sticky.tsx
 delete mode 100644 app/soapbox/features/enlistment/enlistment.tsx
 delete mode 100644 app/soapbox/features/enlistment/steps/step0.tsx
 delete mode 100644 app/soapbox/features/enlistment/steps/step1.tsx
 delete mode 100644 app/soapbox/features/enlistment/steps/step2.tsx
 delete mode 100644 app/soapbox/features/enlistment/steps/step3.tsx
 delete mode 100644 app/soapbox/features/enlistment/steps/step4.tsx
 create mode 100644 app/soapbox/features/onboarding/steps/feeds.tsx
 create mode 100644 app/soapbox/features/onboarding/steps/how-it-works.tsx
 create mode 100644 app/soapbox/features/onboarding/steps/privacy.tsx
 create mode 100644 app/soapbox/features/onboarding/steps/welcome.tsx
 create mode 100644 app/soapbox/hooks/useLogo.ts
 create mode 100644 app/styles/components/sticky.scss

diff --git a/app/icons/bdx.svg b/app/icons/bdx.svg
deleted file mode 100644
index 3347559b6..000000000
--- a/app/icons/bdx.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="250" height="250" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13 76.9446C13 106.488 32.5828 131.352 59.1924 138.691C51.1394 149.134 46.3336 162.321 46.3336 176.656C46.3336 210.535 73.1779 238 106.292 238C139.406 238 166.25 210.535 166.25 176.656C166.25 169.655 165.104 162.928 162.993 156.661C167.034 157.5 171.217 157.941 175.5 157.941C210.018 157.941 238 129.312 238 93.9965C238 58.6809 210.018 30.0519 175.5 30.0519C158.35 30.0519 142.814 37.1187 131.521 48.5614C121.301 27.4865 100.054 13 75.5 13C40.9822 13 13 41.629 13 76.9446ZM32.5221 93.9688C36.4832 104.949 44.2983 114.02 54.2882 119.463C60.7835 123.003 68.1982 125.008 76.0707 125.008C94.0516 125.008 109.644 114.545 117.349 99.2455C120.626 92.7378 122.476 85.3549 122.476 77.53C122.476 74.8669 122.262 72.255 121.85 69.7113C118.206 47.21 99.0968 30.0519 76.0707 30.0519C67.7614 30.0519 59.9622 32.2863 53.2157 36.1998C52.1589 36.8129 51.128 37.4671 50.1249 38.1604C37.781 46.6926 29.6652 61.1416 29.6652 77.53C29.6652 80.0594 29.8585 82.5427 30.2309 84.9651C30.7092 88.0771 31.4831 91.0886 32.5221 93.9688ZM78.263 85.3696C87.6701 87.2255 95.3538 87.0262 104.572 85.3696C114.316 82.8885 97.9946 113.419 75.3399 112.048C56.8413 112.048 41.8451 96.7056 41.8451 77.7794C41.8451 74.069 42.7602 66.8502 45.9862 68.0593C56.4567 77.2199 64.5923 82.6727 78.263 85.3696ZM71.564 55.224C71.564 58.6652 68.8374 61.4548 65.474 61.4548C62.1106 61.4548 59.384 58.6652 59.384 55.224C59.384 51.7829 62.1106 48.9933 65.474 48.9933C68.8374 48.9933 71.564 51.7829 71.564 55.224ZM96.6547 71.6731C100.018 71.6731 102.745 68.8835 102.745 65.4424C102.745 62.0013 100.018 59.2117 96.6547 59.2117C93.2913 59.2117 90.5647 62.0013 90.5647 65.4424C90.5647 68.8835 93.2913 71.6731 96.6547 71.6731ZM127.386 113.149C133.477 104.238 137.997 92.9068 137.997 81.2076C137.997 80.2064 138.01 79.2163 138.022 78.2363C138.081 73.4511 138.137 68.9062 136.746 64.4915C145.279 53.8747 158.217 47.1038 172.701 47.1038C198.397 47.1038 219.228 68.4163 219.228 94.7065C219.228 120.997 198.397 142.309 172.701 142.309C153.276 142.309 134.354 130.451 127.386 113.149ZM157.719 108.165C160.746 108.165 163.2 105.654 163.2 102.557C163.2 99.4602 160.746 96.9495 157.719 96.9495C154.692 96.9495 152.238 99.4602 152.238 102.557C152.238 105.654 154.692 108.165 157.719 108.165ZM190.484 118.757C190.484 121.854 188.03 124.365 185.003 124.365C181.975 124.365 179.522 121.854 179.522 118.757C179.522 115.66 181.975 113.149 185.003 113.149C188.03 113.149 190.484 115.66 190.484 118.757ZM156.262 119.584C153.457 116.763 150.921 116.14 149.315 119.584C148.885 120.508 149.448 122.673 150.086 123.462C151.251 124.899 153.628 127.266 157.848 129.326C162.041 131.372 165.23 131.606 167.172 131.687C168.256 131.732 170.163 130.849 170.63 129.848C171.878 127.173 170.991 125.295 167.939 124.741C167.684 124.695 167.428 124.655 167.172 124.616L167.172 124.616C166.652 124.536 166.132 124.456 165.625 124.319C164.204 123.933 162.634 123.378 160.995 122.578C159.078 121.642 157.511 120.59 156.262 119.584ZM62.9977 177.47C62.9977 180.116 63.2204 182.709 63.6476 185.23C65.5103 196.222 71.2619 205.851 79.3997 212.578C86.9683 218.834 96.601 222.581 107.089 222.581C131.44 222.581 151.18 202.384 151.18 177.47C151.18 168.501 148.622 160.143 144.211 153.119C134.357 149.373 125.872 142.748 119.733 134.242C115.9 133.07 111.848 132.417 107.655 132.363C99.4571 138.555 89.4764 142.419 78.6457 143C69.0752 151.275 62.9977 163.646 62.9977 177.47ZM104.262 175.975C103.78 176.471 103.519 176.937 103.238 177.437L103.238 177.437L103.235 177.442C103.169 177.56 103.101 177.681 103.029 177.804C98.6588 185.29 100.66 194.746 107.498 198.925C114.337 203.105 123.423 200.424 127.794 192.939C127.876 192.799 127.957 192.66 128.038 192.523L128.043 192.515L128.049 192.504C129.072 190.768 129.983 189.222 129.925 186.911C129.901 185.928 127.392 185.446 124.258 184.843L124.257 184.843C121.522 184.317 118.311 183.7 115.859 182.579C114.153 181.8 111.719 180.232 109.517 178.814L109.517 178.814L109.517 178.814L109.516 178.813L109.516 178.813C106.885 177.119 104.587 175.639 104.262 175.975ZM108.185 165.008C111.212 165.008 113.666 162.498 113.666 159.401C113.666 156.304 111.212 153.793 108.185 153.793C105.158 153.793 102.704 156.304 102.704 159.401C102.704 162.498 105.158 165.008 108.185 165.008ZM140.462 172.859C140.462 175.956 138.008 178.467 134.981 178.467C131.954 178.467 129.5 175.956 129.5 172.859C129.5 169.762 131.954 167.252 134.981 167.252C138.008 167.252 140.462 169.762 140.462 172.859Z" fill="currentColor"/>
-</svg>
\ No newline at end of file
diff --git a/app/manifest.json b/app/manifest.json
index 1f63ee5be..54bfc019f 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,10 +1,19 @@
 {
-    "name": "Mangane",
     "icons": [
         {
             "src": "/favicon.png",
             "type": "image/png",
             "sizes": "250/250"
+        },
+        {
+            "src": "/favicon.ico",
+            "type": "image/x-icon",
+            "sizes": "250/250"
+        },
+        {
+            "src": "/favicon.svg",
+            "type": "image/svg+xml",
+            "sizes": "250/250"
         }
     ], 
     "start_url": "/",
diff --git a/app/soapbox/__fixtures__/intlMessages.json b/app/soapbox/__fixtures__/intlMessages.json
index 211e777c8..e4d6139a5 100644
--- a/app/soapbox/__fixtures__/intlMessages.json
+++ b/app/soapbox/__fixtures__/intlMessages.json
@@ -797,7 +797,6 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "preferences.fields.auto_play_gif_label": "Auto-play animated GIFs",
-  "preferences.fields.enlisted": "Ignore onboarding",
   "preferences.fields.boost_modal_label": "Show confirmation dialog before reposting",
   "preferences.fields.delete_modal_label": "Show confirmation dialog before deleting a post",
   "preferences.fields.demetricator_label": "Use Demetricator",
@@ -961,20 +960,21 @@
   "who_to_follow.title": "Who To Follow",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.title": "Bienvenue sur Mangane !",
-  "enlistment.step0.body": "Mangane c’est votre porte d’entrée vers un réseau de serveurs indépendants qui communiquent ensemble pour former un réseau social plus large : le fediverse. Chaque serveur est appelé “instance”. Ton instance c’est tout simplement ce site : Bdx.town",
-  "enlistment.step0.username": "ton pseudo complet",
-  "enlistment.step0.explanation": "c’est cet identifiant que tu peux partager sur le fediverse",
-  "enlistment.step1.title": "Comment ça marche ?",
-  "enlistment.step1.left": "Ici tu es sur {title}. Si tu échanges avec des gens de la même instance que toi, tu peux les mentionners avec simplement <span class='font-bold'>@pseudo</span><br/><br />ex: <a href='{contact_url}'>{contact_name}</a>, si tu veux parler à l’admin de {title}",
-  "enlistment.step1.right": "Si tu échanges avec une personne d’une autre instance il faudra la mentionner avec son <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href='https://oslo.town/@matt'>@matt@oslo.town</a>, si tu veux parler à l’admin d’Oslo.town",
-  "enlistment.step1.explanation": "Pas d’inquiétude cependant, lors de la rédaction d’un post, l’autosuggestion t’aidera à trouver la bonne mention ! Par ailleurs si tu réponds à un post, la mention sera automatiquement écrite de la bonne manière.",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Découvrir",
-  "enlistment.step2.col1": "Ici tu es en terrain connu : seules tes publications et celles des personnes que tu suis s’afficheront sur ce fil.",
-  "enlistment.step2.col2": "Ici c’est un peu ton quartier : tu n’y trouveras que des publications venant de membres de cette instance, que tu les suives ou non.",
-  "enlistment.step2.col3": "Sors des sentiers battus et va explorer le reste du monde : ce fil affiche les publications de l’ensemble des instances connues.",
-  "enlistment.step2.explanation1": "Au départ ce sera un peu vide mais pas de souci on peut t’aider à le fournir !",
-  "enlistment.step2.explanation2": "On l’appelle généralementfil “local”.",
-  "enlistment.step2.explanation3": "On l’appelle généralementfil “global” ou “fédéré”."
+  "onboarding.welcome.title": "Bienvenue sur Mangane !",
+  "onboarding.welcome.body1": "Mangane c’est votre porte d’entrée vers un réseau de serveurs indépendants qui communiquent ensemble pour former un réseau social plus large : le fediverse.",
+  "onboarding.welcome.body2": "Ton instance c’est tout simplement ce site :",
+  "onboarding.welcome.username": "ton pseudo complet",
+  "onboarding.welcome.explanation": "c’est cet identifiant que tu peux partager sur le fediverse",
+  "onboarding.how-it-works.title": "Comment ça marche ?",
+  "onboarding.how-it-works.left": "Ici tu es sur {title}. Si tu échanges avec des gens de la même instance que toi, tu peux les mentionners avec simplement <span class='font-bold'>@pseudo</span><br/><br />ex: <a href='{contact_url}'>{contact_name}</a>, si tu veux parler à l’admin de {title}",
+  "onboarding.how-it-works.right": "Si tu échanges avec une personne d’une autre instance il faudra la mentionner avec son <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href='https://oslo.town/@matt'>@matt@oslo.town</a>, si tu veux parler à l’admin d’Oslo.town",
+  "onboarding.how-it-works.explanation": "Pas d’inquiétude cependant, lors de la rédaction d’un post, l’autosuggestion t’aidera à trouver la bonne mention ! Par ailleurs si tu réponds à un post, la mention sera automatiquement écrite de la bonne manière.",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Découvrir",
+  "onboarding.feeds.col1": "Ici tu es en terrain connu : seules tes publications et celles des personnes que tu suis s’afficheront sur ce fil.",
+  "onboarding.feeds.col2": "Ici c’est un peu ton quartier : tu n’y trouveras que des publications venant de membres de cette instance, que tu les suives ou non.",
+  "onboarding.feeds.col3": "Sors des sentiers battus et va explorer le reste du monde : ce fil affiche les publications de l’ensemble des instances connues.",
+  "onboarding.feeds.explanation1": "Au départ ce sera un peu vide mais pas de souci on peut t’aider à le fournir !",
+  "onboarding.feeds.explanation2": "On l’appelle généralementfil “local”.",
+  "onboarding.feeds.explanation3": "On l’appelle généralementfil “global” ou “fédéré”."
 }
diff --git a/app/soapbox/actions/admin.ts b/app/soapbox/actions/admin.ts
index 660b52dce..0227b7773 100644
--- a/app/soapbox/actions/admin.ts
+++ b/app/soapbox/actions/admin.ts
@@ -145,9 +145,12 @@ const fetchReports = (params: Record<string, any> = {}) =>
       return dispatch(fetchMastodonReports(params));
     } else {
       const { resolved } = params;
+      let state: string | undefined = undefined;
+      if (resolved === false) state = 'open';
+      if (resolved) state = 'resolved';
 
       return dispatch(fetchPleromaReports({
-        state: resolved === false ? 'open' : (resolved ? 'resolved' : null),
+        state,
       }));
     }
   };
diff --git a/app/soapbox/actions/instance.ts b/app/soapbox/actions/instance.ts
index 60a6b2e89..317a88e03 100644
--- a/app/soapbox/actions/instance.ts
+++ b/app/soapbox/actions/instance.ts
@@ -42,9 +42,7 @@ export const fetchInstance = createAsyncThunk<void, void, { state: RootState }>(
   async(_arg, { dispatch, getState, rejectWithValue }) => {
     try {
       const { data: instance } = await api(getState).get('/api/v1/instance');
-      if (needsNodeinfo(instance)) {
-        dispatch(fetchNodeinfo());
-      }
+      dispatch(fetchNodeinfo());
       return instance;
     } catch (e) {
       return rejectWithValue(e);
diff --git a/app/soapbox/actions/settings.ts b/app/soapbox/actions/settings.ts
index 322abd5a3..44a22f666 100644
--- a/app/soapbox/actions/settings.ts
+++ b/app/soapbox/actions/settings.ts
@@ -28,7 +28,6 @@ const messages = defineMessages({
 });
 
 const defaultSettings = ImmutableMap({
-  enlisted: false, 
   onboarded: false,
   skinTone: 1,
   reduceMotion: false,
diff --git a/app/soapbox/components/polls/poll-option.tsx b/app/soapbox/components/polls/poll-option.tsx
index 024f01b7b..87af8ac62 100644
--- a/app/soapbox/components/polls/poll-option.tsx
+++ b/app/soapbox/components/polls/poll-option.tsx
@@ -46,9 +46,11 @@ const PollOptionText: React.FC<IPollOptionText> = ({ poll, option, index, active
   return (
     <label
       className={
-        classNames('flex relative p-2 bg-white dark:bg-primary-900 cursor-pointer rounded-3xl border border-solid hover:bg-primary-50 dark:hover:bg-primary-800/50', {
+        classNames('flex relative p-2 bg-white dark:bg-primary-900 cursor-pointer border border-solid hover:bg-primary-50 dark:hover:bg-primary-800/50', {
           'border-primary-600 ring-1 ring-primary-600 bg-primary-50 dark:bg-primary-800/50 dark:border-primary-300 dark:ring-primary-300': active,
           'border-primary-300 dark:border-primary-500': !active,
+          'rounded-3xl': poll.multiple !== true,
+          'rounded-xl': poll.multiple,
         })
       }
     >
@@ -74,9 +76,11 @@ const PollOptionText: React.FC<IPollOptionText> = ({ poll, option, index, active
 
         <div className='col-start-1 row-start-1 justify-self-end flex items-center'>
           <span
-            className={classNames('flex items-center justify-center w-6 h-6 flex-none border border-solid rounded-full', {
+            className={classNames('flex items-center justify-center w-6 h-6 flex-none border border-solid', {
               'bg-primary-600 border-primary-600 dark:bg-primary-300 dark:border-primary-300': active,
               'border-primary-300 bg-white dark:bg-primary-900 dark:border-primary-500': !active,
+              'rounded-full': poll.multiple !== true,
+              'rounded': poll.multiple,
             })}
             tabIndex={0}
             role={poll.multiple ? 'checkbox' : 'radio'}
diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx
index ed015be86..9c2750c41 100644
--- a/app/soapbox/components/sidebar-navigation.tsx
+++ b/app/soapbox/components/sidebar-navigation.tsx
@@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { getSettings } from 'soapbox/actions/settings';
 import DropdownMenu from 'soapbox/containers/dropdown_menu_container';
 import ComposeButton from 'soapbox/features/ui/components/compose-button';
-import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
+import { useAppSelector, useOwnAccount, useLogo } from 'soapbox/hooks';
 import { getFeatures } from 'soapbox/utils/features';
 
 import SidebarNavigationLink from './sidebar-navigation-link';
@@ -19,14 +19,16 @@ const messages = defineMessages({
   dashboard: { id: 'tabs_bar.dashboard', defaultMessage: 'Dashboard' },
   all: { id: 'tabs_bar.all', defaultMessage: 'All' },
   fediverse: { id: 'tabs_bar.fediverse', defaultMessage: 'Fediverse' },
-  settings: { id: 'tabs_bar.settings', defaultMessage: 'Settings'},
+  settings: { id: 'tabs_bar.settings', defaultMessage: 'Settings' },
   direct: { id: 'column.direct', defaultMessage: 'Direct messages' },
+  directory: { id: 'navigation_bar.profile_directory', defaultMessage: 'Profile directory' },
 });
 
 /** Desktop sidebar with links to different views in the app. */
 const SidebarNavigation = () => {
   const intl = useIntl();
 
+  const logo = useLogo();
   const instance = useAppSelector((state) => state.instance);
   const settings = useAppSelector((state) => getSettings(state));
   const account = useOwnAccount();
@@ -72,6 +74,14 @@ const SidebarNavigation = () => {
         });
       }
 
+      if(features.profileDirectory) {
+        menu.push({
+          to: '/directory',
+          text: intl.formatMessage(messages.directory),
+          icon: require('@tabler/icons/folder.svg'),
+        });
+      }
+
       if (settings.get('isDeveloper')) {
         menu.push({
           to: '/developers',
@@ -140,7 +150,7 @@ const SidebarNavigation = () => {
         {
           features.federating ? (
             <SidebarNavigationLink
-              icon={require('icons/bdx.svg')}
+              icon={logo}
               text={<>{instance.get('title')}</>}
               to='/timeline/local'
             />
@@ -156,10 +166,10 @@ const SidebarNavigation = () => {
         {
           features.federating && (
             <SidebarNavigationLink
-            icon={require('icons/fediverse.svg')}
-            text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
-            to='/timeline/fediverse'
-          />
+              icon={require('icons/fediverse.svg')}
+              text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+              to='/timeline/fediverse'
+            />
           )
         }
 
diff --git a/app/soapbox/components/sidebar_menu.tsx b/app/soapbox/components/sidebar_menu.tsx
index a5b23c8b8..9d81b276c 100644
--- a/app/soapbox/components/sidebar_menu.tsx
+++ b/app/soapbox/components/sidebar_menu.tsx
@@ -11,7 +11,7 @@ import Account from 'soapbox/components/account';
 import SiteLogo from 'soapbox/components/site-logo';
 import { Stack } from 'soapbox/components/ui';
 import ProfileStats from 'soapbox/features/ui/components/profile_stats';
-import { useAppSelector, useFeatures } from 'soapbox/hooks';
+import { useAppSelector, useFeatures, useLogo } from 'soapbox/hooks';
 import { makeGetAccount, makeGetOtherAccounts } from 'soapbox/selectors';
 
 import { HStack, Icon, IconButton, Text } from './ui';
@@ -40,6 +40,7 @@ const messages = defineMessages({
   developers: { id: 'navigation.developers', defaultMessage: 'Developers' },
   addAccount: { id: 'profile_dropdown.add_account', defaultMessage: 'Add an existing account' },
   direct: { id: 'column.direct', defaultMessage: 'Direct messages' },
+  directory: { id: 'navigation_bar.profile_directory', defaultMessage: 'Profile directory' },
 });
 
 interface ISidebarLink {
@@ -82,6 +83,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
   const intl = useIntl();
   const dispatch = useDispatch();
 
+  const logo = useLogo();
   const features = useFeatures();
   const getAccount = makeGetAccount();
   const instance = useAppSelector((state) => state.instance);
@@ -218,7 +220,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
 
 
                 <SidebarLink
-                  to={`/messages`}
+                  to={'/messages'}
                   icon={require('@tabler/icons/mail.svg')}
                   text={intl.formatMessage(messages.direct)}
                   onClick={onClose}
@@ -242,6 +244,15 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                   />
                 )}
 
+                {features.profileDirectory && (
+                  <SidebarLink
+                    to='/directory'
+                    icon={require('@tabler/icons/folder.svg')}
+                    text={intl.formatMessage(messages.directory)}
+                    onClick={onClose}
+                  />
+                )}
+
                 {settings.get('isDeveloper') && (
                   <SidebarLink
                     to='/developers'
@@ -256,7 +267,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
 
                   <SidebarLink
                     to='/timeline/local'
-                    icon={features.federating ? require('icons/bdx.svg') : require('@tabler/icons/world.svg')}
+                    icon={features.federating ? logo : require('@tabler/icons/world.svg')}
                     text={features.federating ? instance.title : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
                     onClick={onClose}
                   />
@@ -274,13 +285,13 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                 <hr />
 
                 {
-                  (account.locked || followRequestsCount > 0)  && 
+                  (account.locked || followRequestsCount > 0)  &&
                     <SidebarLink
-                    to='/follow_requests'
-                    icon={require('@tabler/icons/user-plus.svg')}
-                    text={intl.formatMessage(messages.follow_requests)}
-                    onClick={onClose}
-                  />
+                      to='/follow_requests'
+                      icon={require('@tabler/icons/user-plus.svg')}
+                      text={intl.formatMessage(messages.follow_requests)}
+                      onClick={onClose}
+                    />
                 }
 
                 <SidebarLink
diff --git a/app/soapbox/components/site-logo.tsx b/app/soapbox/components/site-logo.tsx
index 1e8751ac5..a1e49aa60 100644
--- a/app/soapbox/components/site-logo.tsx
+++ b/app/soapbox/components/site-logo.tsx
@@ -1,7 +1,10 @@
 import classNames from 'classnames';
 import React from 'react';
 
-import { useSoapboxConfig, useSettings, useTheme } from 'soapbox/hooks';
+import { useLogo } from 'soapbox/hooks';
+
+
+import { Icon } from './ui';
 
 interface ISiteLogo extends React.ComponentProps<'img'> {
   /** Extra class names for the <img> element. */
@@ -12,30 +15,18 @@ interface ISiteLogo extends React.ComponentProps<'img'> {
 
 /** Display the most appropriate site logo based on the theme and configuration. */
 const SiteLogo: React.FC<ISiteLogo> = ({ className, theme, ...rest }) => {
-  const { logo, logoDarkMode } = useSoapboxConfig();
-  const settings = useSettings();
-  const darkMode = useTheme() === 'dark';
-
-  /** Soapbox logo. */
-  const soapboxLogo = darkMode
-    ? require('images/soapbox-logo-white.svg')
-    : require('images/soapbox-logo.svg');
-
-  // Use the right logo if provided, then use fallbacks.
-  const getSrc = () => {
-    // In demo mode, use the Soapbox logo.
-    if (settings.get('demo')) return soapboxLogo;
-
-    return (darkMode && logoDarkMode)
-      ? logoDarkMode
-      : logo || logoDarkMode || soapboxLogo;
-  };
-
+  const logo = useLogo();
   return (
     // eslint-disable-next-line jsx-a11y/alt-text
-    <img
-      className={classNames('object-contain', className)}
-      src={getSrc()}
+    <Icon
+      className={
+        classNames(
+          'text-primary-500',
+          'object-contain',
+          className,
+        )
+      }
+      src={logo}
       {...rest}
     />
   );
diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 020b0756a..9a4037b3d 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -355,7 +355,7 @@ const Status: React.FC<IStatus> = (props) => {
             <StatusContent
               status={actualStatus}
               onClick={handleClick}
-              expanded={!status.hidden}
+              expanded={!actualStatus.hidden}
               onExpandedToggle={handleExpandedToggle}
               collapsable
             />
diff --git a/app/soapbox/components/status_content.tsx b/app/soapbox/components/status_content.tsx
index 138654b3f..3fdfe7ecf 100644
--- a/app/soapbox/components/status_content.tsx
+++ b/app/soapbox/components/status_content.tsx
@@ -279,7 +279,7 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
       output.push(<Poll id={status.poll} key='poll' status={status.url} />);
     }
 
-    return <div className={classNames({ 'bg-gray-100 dark:bg-primary-900 rounded-md p-4': hasPoll })}>{output}</div>;
+    return <div className={classNames({ 'rounded-md p-4': hasPoll })}>{output}</div>;
   } else {
     const output = [
       <div
diff --git a/app/soapbox/components/sticky.tsx b/app/soapbox/components/sticky.tsx
new file mode 100644
index 000000000..062ce07dd
--- /dev/null
+++ b/app/soapbox/components/sticky.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+
+interface ISticky {
+    className?: string,
+    stickyClassName?: string,
+    children: React.ReactElement,
+};
+
+const Sticky: React.FC<ISticky> = ({ className, stickyClassName, children }) => {
+    const root = React.useRef();
+    const node = React.useRef();
+    const [sticky, setSticky] = React.useState(false);
+
+    const onSticky = React.useCallback((e) => {
+        if(e.find((entry) => entry.isIntersecting == false)) setSticky(true);
+        else setSticky(false);
+    }, []);
+
+    React.useEffect(() => {
+        const observer = new IntersectionObserver(onSticky, { threshold: [0, 1.0] })
+
+        observer.observe(root.current);
+        return () => {
+            observer.disconnect();
+        }
+    }, [onSticky]);
+
+    return (
+        <>
+            <div ref={root} className={className}>
+                { children }
+            </div>
+            {
+                sticky && (
+                    <div ref={node} className={`component-sticky__fixed fixed top-0 z-50 ${stickyClassName}`}>
+                        { children }
+                    </div>
+                )
+            }
+        </>
+    )
+};
+
+export default Sticky;
\ No newline at end of file
diff --git a/app/soapbox/components/thumb_navigation.tsx b/app/soapbox/components/thumb_navigation.tsx
index 187c1a213..9ddd93564 100644
--- a/app/soapbox/components/thumb_navigation.tsx
+++ b/app/soapbox/components/thumb_navigation.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import ThumbNavigationLink from 'soapbox/components/thumb_navigation-link';
-import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
+import { useAppSelector, useLogo, useOwnAccount } from 'soapbox/hooks';
 import { getFeatures } from 'soapbox/utils/features';
 
 const ThumbNavigation: React.FC = (): JSX.Element => {
@@ -11,6 +11,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
   const chatsCount = useAppSelector((state) => state.chats.items.reduce((acc, curr) => acc + Math.min(curr.unread || 0, 1), 0));
   const features = getFeatures(useAppSelector((state) => state.instance));
   const instance = useAppSelector((state) => state.instance);
+  const logo = useLogo();
 
   /** Conditionally render the supported messages link */
   const renderMessagesLink = (): React.ReactNode => {
@@ -52,7 +53,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
       {
         features.federating ? (
           <ThumbNavigationLink
-            src={require('icons/bdx.svg')}
+            src={logo}
             text={instance.get('title')}
             to='/timeline/local'
             exact
@@ -70,11 +71,11 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
       {
         features.federating && (
           <ThumbNavigationLink
-          src={require('icons/fediverse.svg')}
-          text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
-          to='/timeline/fediverse'
-          exact
-        />
+            src={require('icons/fediverse.svg')}
+            text={<FormattedMessage id='tabs_bar.fediverse' defaultMessage='Fediverse' />}
+            to='/timeline/fediverse'
+            exact
+          />
         )
       }
 
diff --git a/app/soapbox/components/ui/streamfield/streamfield.tsx b/app/soapbox/components/ui/streamfield/streamfield.tsx
index 140a194b6..96764ed37 100644
--- a/app/soapbox/components/ui/streamfield/streamfield.tsx
+++ b/app/soapbox/components/ui/streamfield/streamfield.tsx
@@ -68,8 +68,8 @@ const Streamfield: React.FC<IStreamfield> = ({
       {(values.length > 0) && (
         <Stack>
           {values.map((value, i) => (
-            <HStack space={2} alignItems='center'>
-              <Component key={i} onChange={handleChange(i)} value={value} />
+            <HStack key={i} space={2} alignItems='center'>
+              <Component  onChange={handleChange(i)} value={value} />
               {onRemoveItem && (
                 <IconButton
                   iconClassName='w-4 h-4'
diff --git a/app/soapbox/features/directory/components/account_card.tsx b/app/soapbox/features/directory/components/account_card.tsx
index 991461f41..7f442d30e 100644
--- a/app/soapbox/features/directory/components/account_card.tsx
+++ b/app/soapbox/features/directory/components/account_card.tsx
@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, FormattedNumber, defineMessages } from 'react-intl';
+
 
 import { getSettings } from 'soapbox/actions/settings';
 import Avatar from 'soapbox/components/avatar';
@@ -11,7 +12,6 @@ import { Text } from 'soapbox/components/ui';
 import ActionButton from 'soapbox/features/ui/components/action-button';
 import { useAppSelector } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
-import { shortNumberFormat } from 'soapbox/utils/numbers';
 
 const getAccount = makeGetAccount();
 
@@ -19,6 +19,13 @@ interface IAccountCard {
   id: string,
 }
 
+const messages = defineMessages({
+  today: { id: 'account.today', defaultMessage: 'Today' },
+  yesterday: { id: 'account.yesterday', defaultMessage: 'Yesterday' },
+  days: { id: 'account.days', defaultMessage: 'Days' },
+});
+
+
 const AccountCard: React.FC<IAccountCard> = ({ id }) => {
   const me = useAppSelector((state) => state.me);
   const account = useAppSelector((state) => getAccount(state, id));
@@ -28,51 +35,71 @@ const AccountCard: React.FC<IAccountCard> = ({ id }) => {
 
   const followedBy = me !== account.id && account.relationship?.followed_by;
 
+  const ago = React.useMemo(() => {
+    const date = new Date(account.last_status_at).valueOf();
+    const today = new Date().valueOf();
+
+    const diffInDays = Math.floor((today - date) / 1000 / 60 / 60 / 24);
+
+    return diffInDays;
+  }, [account]);
+
   return (
-    <div className='directory__card'>
+    <div className='directory__card shadow dark:bg-slate-700 flex flex-col'>
       {followedBy &&
         <div className='directory__card__info'>
-          <span className='relationship-tag'>
+          <span className='bg-white rounded p-1 mt-1 text-[8px] opacity-90 uppercase dark:text-white dark:bg-slate-800'>
             <FormattedMessage id='account.follows_you' defaultMessage='Follows you' />
           </span>
         </div>}
-      <div className='directory__card__action-button'>
-        <ActionButton account={account} small />
-      </div>
       <div className='directory__card__img'>
         <img src={autoPlayGif ? account.header : account.header_static} alt='' className='parallax' />
       </div>
 
-      <div className='directory__card__bar'>
-        <Permalink className='directory__card__bar__name' href={account.url} to={`/@${account.acct}`}>
-          <Avatar account={account} size={48} />
-          <DisplayName account={account} />
+      <div className='px-4 py-3'>
+        <Permalink href={account.url} to={`/@${account.acct}`}>
+          <div className='flex justify-between items-end min-h-[30px]'>
+            <Avatar className="absolute border-solid border-4 border-white dark:border-slate-700" account={account} size={100} />
+            <div className="text-right grow">
+              <ActionButton account={account} small />
+            </div>
+          </div>
+          <Text className='mt-3 leading-5' size="lg">
+            <DisplayName account={account} />
+          </Text>
         </Permalink>
       </div>
 
-      <div className='directory__card__extra'>
+      <div className='h-24 overflow-hidden px-4 py-3 grow'>
         <Text
-          className={classNames('account__header__content', (account.note.length === 0 || account.note === '<p></p>') && 'empty')}
+          size="sm"
+          className={classNames('italic account__header__content', (account.note.length === 0 || account.note === '<p></p>') && 'empty')}
           dangerouslySetInnerHTML={{ __html: account.note_emojified }}
         />
       </div>
 
-      <div className='directory__card__extra'>
-        <div className='accounts-table__count'>
-          <Text theme='primary' size='sm'>
-            {shortNumberFormat(account.statuses_count)}
-          </Text> <small><FormattedMessage id='account.posts' defaultMessage='Posts' /></small>
+      <div className='flex items-center justify-between px-4 py-3 mt-4'>
+        <div>
+          <Text theme='primary' size='xs'>
+            <FormattedMessage id='account.posts' defaultMessage='Posts' />
+          </Text> 
+          <Text weight='bold' size="lg" className='leading-5'><FormattedNumber value={account.statuses_count} /></Text>
         </div>
-        <div className='accounts-table__count'>
-          <Text theme='primary' size='sm'>
-            {shortNumberFormat(account.followers_count)}
-          </Text> <small><FormattedMessage id='account.followers' defaultMessage='Followers' />
-          </small>
-        </div>
-        <div className='accounts-table__count'>
+        <div className='accounts-table__count text-right'>
+          <Text theme='primary' size="xs"><FormattedMessage id='account.last_status' defaultMessage='Last active' /></Text>
           {account.last_status_at === null
-            ? <Text theme='primary' size='sm'><FormattedMessage id='account.never_active' defaultMessage='Never' /></Text>
-            : <RelativeTimestamp className='text-primary-600 dark:text-primary-400' timestamp={account.last_status_at} />} <small><FormattedMessage id='account.last_status' defaultMessage='Last active' /></small>
+            ? <Text weight='bold' size="lg" className='leading-5'><FormattedMessage id='account.never_active' defaultMessage='Never' /></Text>
+            : <Text weight='bold' size="lg" className='leading-5'>
+                {
+                  (ago < 1) && <FormattedMessage { ...messages.today } />
+                }
+                {
+                  (ago >= 1 && ago < 2) && <FormattedMessage { ...messages.days } />
+                }
+                {
+                  ago >= 2 && <>{ ago } <FormattedMessage { ...messages.days } /></>
+                }
+              </Text>}
         </div>
       </div>
     </div>
diff --git a/app/soapbox/features/directory/index.tsx b/app/soapbox/features/directory/index.tsx
index 375e99465..17bfb5a2e 100644
--- a/app/soapbox/features/directory/index.tsx
+++ b/app/soapbox/features/directory/index.tsx
@@ -7,6 +7,7 @@ import { useLocation } from 'react-router-dom';
 import { fetchDirectory, expandDirectory } from 'soapbox/actions/directory';
 import LoadMore from 'soapbox/components/load_more';
 import RadioButton from 'soapbox/components/radio_button';
+import Toggle from 'soapbox/components/ui/toggle/toggle';
 import Column from 'soapbox/features/ui/components/column';
 import { useAppSelector } from 'soapbox/hooks';
 import { getFeatures } from 'soapbox/utils/features';
@@ -28,7 +29,6 @@ const Directory = () => {
   const params = new URLSearchParams(search);
 
   const accountIds = useAppSelector((state) => state.user_lists.directory.items);
-  const isLoading = useAppSelector((state) => state.user_lists.directory.isLoading);
   const title = useAppSelector((state) => state.instance.get('title'));
   const features = useAppSelector((state) => getFeatures(state.instance));
 
@@ -40,11 +40,13 @@ const Directory = () => {
   }, [order, local]);
 
   const handleChangeOrder: React.ChangeEventHandler<HTMLInputElement> = e => {
-    setOrder(e.target.value);
+    if(e.target.checked) setOrder('new');
+    else setOrder('active');
   };
 
   const handleChangeLocal: React.ChangeEventHandler<HTMLInputElement> = e => {
-    setLocal(e.target.value === '1');
+    if(e.target.checked) setLocal(true);
+    else setLocal(false);
   };
 
   const handleLoadMore = () => {
@@ -53,25 +55,25 @@ const Directory = () => {
 
   return (
     <Column icon='address-book-o' label={intl.formatMessage(messages.title)}>
-      <div className='directory__filter-form'>
-        <div className='directory__filter-form__column' role='group'>
-          <RadioButton name='order' value='active' label={intl.formatMessage(messages.recentlyActive)} checked={order === 'active'} onChange={handleChangeOrder} />
-          <RadioButton name='order' value='new' label={intl.formatMessage(messages.newArrivals)} checked={order === 'new'} onChange={handleChangeOrder} />
+      <div className='directory__filter-form flex items-center gap-4 my-3'>
+        <div className='directory__filter-form__column flex items-center gap-2' role='group'>
+          <Toggle id="new-arrivals" checked={order === 'new'} onChange={handleChangeOrder} /> <label htmlFor='new-arrivals'>{ intl.formatMessage(messages.newArrivals) }</label>
         </div>
 
         {features.federating && (
-          <div className='directory__filter-form__column' role='group'>
-            <RadioButton name='local' value='1' label={intl.formatMessage(messages.local, { domain: title })} checked={local} onChange={handleChangeLocal} />
-            <RadioButton name='local' value='0' label={intl.formatMessage(messages.federated)} checked={!local} onChange={handleChangeLocal} />
+          <div className='directory__filter-form__column flex items-center gap-2' role='group'>
+            <Toggle id="local" checked={local} onChange={handleChangeLocal} /> <label htmlFor='new-arrivals'>{intl.formatMessage(messages.local, { domain: title })}</label>
           </div>
         )}
       </div>
 
-      <div className={classNames('directory__list', { loading: isLoading })}>
+      <div className={classNames('directory__list')}>
         {accountIds.map((accountId) => <AccountCard id={accountId} key={accountId} />)}
       </div>
-
-      <LoadMore onClick={handleLoadMore} visible={!isLoading} />
+      
+      <div className="mt-4 pt-3">
+        <LoadMore onClick={handleLoadMore} />
+      </div>
     </Column>
   );
 };
diff --git a/app/soapbox/features/enlistment/enlistment.tsx b/app/soapbox/features/enlistment/enlistment.tsx
deleted file mode 100644
index aa91b0ddb..000000000
--- a/app/soapbox/features/enlistment/enlistment.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React, { useEffect, useState, useCallback } from 'react';
-import { useDispatch } from 'react-redux';
-import { getSettings, changeSettingImmediate } from 'soapbox/actions/settings';
-import { useAppSelector } from 'soapbox/hooks';
-import classNames from 'classnames';
-import { defineMessages, useIntl } from 'react-intl';
-
-
-import Icon from './../../components/icon';
-
-import Step0 from './steps/step0';
-import Step1 from './steps/step1';
-import Step2 from './steps/step2';
-import Step3 from './steps/step3';
-import Step4 from './steps/step4';
-
-const messages = defineMessages({
-    next: { id: 'enlistment.next', defaultMessage: 'Next' },
-    pass: { id: 'enlistment.pass', defaultMessage: 'Ignore' },
-});
-
-const Steps: Array<React.FC> = [
-    Step0,
-    Step1,
-    Step2,
-    Step3,
-    Step4,
-];
-
-const Enlistment: React.FC = () => {
-    const intl = useIntl();
-    const dispatch = useDispatch();
-    const [step, setStep] = useState(0);
-
-    const StepComponent: React.FC = Steps[step];
-
-    const done = useAppSelector(state => getSettings(state).get('enlisted') as boolean);
-
-    useEffect(() => {
-        setStep(0);
-    }, [done]);
-
-    const onPass = useCallback(() => {
-        dispatch(changeSettingImmediate(['enlisted'], true));
-    }, []);
-
-    const onStep = useCallback((nextStep) => {
-        if(nextStep >= Steps.length) {
-            dispatch(changeSettingImmediate(['enlisted'], true));
-            return;
-        }
-        setStep(nextStep);
-    }, [setStep, dispatch]);
-
-    const onNext = useCallback(() => {
-        onStep(step + 1);
-    }, [onStep, step]);
-
-    if(done) return null;
-
-    return (
-        <div className="component-enlistment">
-            <section className="bg-white dark:bg-slate-800 drop-shadow-2xl">
-                <StepComponent />
-                <div className='enlistment__bar flex justify-between items-center p-4'>
-                        <a onClick={onPass} className="text-gray-200 hover:underline opacity-50 cursor-pointer">
-                            {intl.formatMessage(messages.pass)}
-                        </a>
-                        <div className='circles flex items-center'>
-                            {
-                                Steps.map((e, index) => (
-                                    <div 
-                                        className={classNames({
-                                            "cursor-pointer mx-2 border-2 border-solid border-white": true,
-                                            "bg-white": index === step
-                                        })}
-                                        onClick={() => onStep(index)}
-                                        >
-                                    </div>
-                                ))
-                            }
-                        </div>
-                        <button
-                            type="button"
-                            className="flex items-center text-gray-200 hover:text-white"
-                            onClick={onNext}
-                        >
-                            {intl.formatMessage(messages.next)}
-                            <Icon
-                                className="ml-1"
-                                src={require('@tabler/icons/arrow-right.svg')}
-                            />
-                        </button>
-                </div>
-           </section>
-        </div>
-    )
-};
-
-export default Enlistment;
\ No newline at end of file
diff --git a/app/soapbox/features/enlistment/steps/step0.tsx b/app/soapbox/features/enlistment/steps/step0.tsx
deleted file mode 100644
index dfe2f1216..000000000
--- a/app/soapbox/features/enlistment/steps/step0.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
-import { useOwnAccount, useAppSelector } from 'soapbox/hooks';
-
-const messages = defineMessages({
-    title: { id: 'enlistment.step0.title', defaultMessage: "Welcome on the Fediverse"},
-    body: { id: 'enlistment.step0.body', defaultMessage: "This website is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: "},
-    username: { id: 'enlistment.step0.username', defaultMessage: "You full username"},
-    explanation: { id: 'enlistment.step0.explanation', defaultMessage: "It is this identifier that you can share on the fediverse"},
-});
-
-const Step0: React.FC = () => {
-    const intl = useIntl();
-    const account = useOwnAccount();
-    const instance = useAppSelector((state: any) => state.instance);
-
-    return (
-        <div className="enlistment__step0 mx-auto py-10 px-5">
-            <h3 className="text-2xl font-bold">
-                {intl.formatMessage(messages.title)}
-            </h3>
-            <p className="mb-5">
-                <span dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.body)}} />
-                &nbsp;
-                <span className="font-bold">
-                    {instance.get("uri").replace(/https?:\/\//, '')}
-                </span>
-            </p>
-
-            <h4 className="uppercase text-lg mb-2">
-                {intl.formatMessage(messages.username)}
-            </h4>
-
-            <div className="enlisted__step0__username inline-block rounded p-1 text-gray-200 text-lg font-bold">
-                @{account?.acct}@{instance.get("uri").replace(/https?:\/\//, '')}
-            </div>
-            <div className="italic mt-2">
-                {intl.formatMessage(messages.explanation)}
-            </div>
-        </div>
-    )
-};
-
-export default Step0;
\ No newline at end of file
diff --git a/app/soapbox/features/enlistment/steps/step1.tsx b/app/soapbox/features/enlistment/steps/step1.tsx
deleted file mode 100644
index f247bfc55..000000000
--- a/app/soapbox/features/enlistment/steps/step1.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { useMemo } from 'react';
-import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
-import { useAppSelector } from 'soapbox/hooks';
-
-const messages = defineMessages({
-    right: { id: 'enlistment.step1.right', defaultMessage: "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin"},
-});
-
-const Step1: React.FC = () => {
-    const intl = useIntl();
-
-    const instance = useAppSelector((state) => state.instance);
-
-    const contactName = useMemo(() => `@${instance.get("email").replace(/@.+/, '')}`, [instance]);
-    const contactUrl = useMemo(() => `${instance.get("uri")}/${contactName}`, [contactName]);
-
-    return (
-        <div className="enlistment__step1 mx-auto py-10 px-5">
-            <h3 className="text-2xl font-bold">
-                <FormattedMessage id="enlistment.step1.title" defaultMessage="How it works ?" />
-            </h3>
-            <div className="flex gap-12 mt-2">
-                <div className="flex-grow-1">
-                    <p>
-                        <FormattedMessage
-                            id="enlistment.step1.left"
-                            defaultMessage="Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}"
-                            values={{
-                                title: instance.get("title"),
-                                username: (
-                                    <span className="font-bold"><FormattedMessage id="enlistment.step1.username" defaultMessage="@username" /></span> 
-                                ),
-                                contact: (
-                                    <a href={contactUrl} target="_blank">
-                                        {contactName}
-                                    </a>
-                                ),
-                                br: <br />
-                            }}
-                        />
-                    </p>
-                </div>
-                <div className="flex-grow-1">
-                    <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.right)}} />
-                </div>
-            </div>
-            <div className="italic mt-8">
-                <FormattedMessage id="enlistment.step1.explanation" defaultMessage="Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way." />
-            </div>
-        </div>
-    )
-};
-
-export default Step1;
\ No newline at end of file
diff --git a/app/soapbox/features/enlistment/steps/step2.tsx b/app/soapbox/features/enlistment/steps/step2.tsx
deleted file mode 100644
index 9817d18ae..000000000
--- a/app/soapbox/features/enlistment/steps/step2.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
-import { useAppSelector } from 'soapbox/hooks';
-
-const messages = defineMessages({
-    col1: { id: 'enlistment.step2.col1', defaultMessage: "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread."},
-    col2: { id: 'enlistment.step2.col2', defaultMessage: "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not."},
-    col3: { id: 'enlistment.step2.col3', defaultMessage: "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances."},
-});
-
-const Step2: React.FC = () => {
-    const intl = useIntl();
-
-    const instance = useAppSelector((state) => state.instance);
-
-    return (
-        <div className="enlistment__step2 mx-auto py-10 px-5">
-            <div className="flex mt-3 gap-3">
-                <div className="flex-grow-1">
-                    <h3 className="text-xl font-bold">
-                        <FormattedMessage id="enlistment.step2.title1" defaultMessage="Home" />
-                    </h3>
-                    <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.col1)}} />
-                    <p className="mt-4 italic">
-                        <FormattedMessage id="enlistment.step2.explanation1" defaultMessage="At first it will be a little empty but don't worry we can help you fill it!" />
-                    </p>
-                </div>
-                <div className="flex-grow-1">
-                    <h3 className="text-xl font-bold">
-                        {instance.get("title")}
-                    </h3>
-                    <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.col2)}} />
-                    <p className="mt-4 italic">
-                        <FormattedMessage id="enlistment.step2.explanation2" defaultMessage={"We usually call it \"local\" thread"} />
-                    </p>
-                </div>
-                <div className="flex-grow-1">
-                    <h3 className="text-xl font-bold">
-                        <FormattedMessage id="enlistment.step2.title3" defaultMessage="Discover" />
-                    </h3>
-                    <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.col3)}} />
-                    <p className="mt-4 italic">
-                        <FormattedMessage id="enlistment.step2.explanation3" defaultMessage={"We usually call it \"global\" or \"federated\" thread"} />
-                    </p>
-                </div>
-            </div>
-        </div>
-    )
-};
-
-export default Step2;
\ No newline at end of file
diff --git a/app/soapbox/features/enlistment/steps/step3.tsx b/app/soapbox/features/enlistment/steps/step3.tsx
deleted file mode 100644
index 4f57a9fae..000000000
--- a/app/soapbox/features/enlistment/steps/step3.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-
-import Icon from './../../../components/icon';
-
-const Step3: React.FC = () => {
-    return (
-        <div className="enlistment__step3 mx-auto py-10 px-5">
-            <div>
-                <h3 className="text-2xl font-bold">
-                    <FormattedMessage id="enlistment.step3.title" defaultMessage="Privacy" />
-                </h3>
-                <p>
-                    <FormattedMessage id="enlistment.step3.description" defaultMessage="This site offers precise control over who can see your posts and therefore interact with you." />
-                </p>
-            </div>
-            <div className="mt-10">
-                <div className='flex gap-4'>
-                    <div className='flex-grow-1 w-1/2'>
-                        <h4 className="items-center text-xl font-bold">
-                            <Icon className="inline-block align-middle mr-1 w-6 h-6" src={require("@tabler/icons/world.svg")} />
-                            <span className='align-middle'>
-                                <FormattedMessage id="enlistment.step3.public-title" defaultMessage="Public" />
-                            </span>
-                        </h4>
-                        <p>
-                            <FormattedMessage id="enlistment.step3.public-description" defaultMessage="The post is displayed on all feeds, including other instances." />
-                        </p>
-                    </div>
-                    <div className="flex-grow-1 w-1/2">
-                        <h4 className='items-center text-xl font-bold'>
-                            <Icon className='inline-block align-middle mr-1 w-6 h-6' src={require("@tabler/icons/lock-open.svg")} />
-                            <span className='align-middle'>
-                                <FormattedMessage id="enlistment.step3.unlisted-title" defaultMessage="Unlisted" />
-                            </span>
-                        </h4>
-                        <p>
-                            <FormattedMessage id="enlistment.step3.unlisted-description" defaultMessage="The post is public but only appears in your subscribers' feeds and on your profile" />
-                        </p>
-                    </div>
-                </div>
-                <div className='mt-10 flex gap-4'>
-                    <div className='flex-grow-1 w-1/2'>
-                        <h4 className='items-center text-xl font-bold'>
-                            <Icon className='inline-block align-middle mr-1 w-6 h-6' src={require("@tabler/icons/lock.svg")} />
-                            <span className='align-middle'>
-                                <FormattedMessage id="enlistment.step3.followers-title" defaultMessage="Followers only" />
-                            </span>
-                        </h4>
-                        <p>
-                            <FormattedMessage id="enlistment.step3.followers-description" defaultMessage="The post is not displayed on any public feeds and is only visible to people who follow you" />
-                        </p>
-                    </div>
-                    <div className='flex-grow-1 w-1/2'>
-                        <h4 className='items-center text-xl font-bold'>
-                            <Icon className='inline-block align-middle mr-1 w-6 h-6' src={require("@tabler/icons/mail.svg")} />
-                            <span className='align-middle'>
-                                <FormattedMessage id="enlistment.step3.direct-title" defaultMessage="Direct" />
-                            </span>
-                        </h4>
-                        <p>
-                            <FormattedMessage id="enlistment.step3.direct-description" defaultMessage="The post is only visible to people mentioned via @username@instance" />
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    )
-};
-
-export default Step3;
\ No newline at end of file
diff --git a/app/soapbox/features/enlistment/steps/step4.tsx b/app/soapbox/features/enlistment/steps/step4.tsx
deleted file mode 100644
index 815a6e26a..000000000
--- a/app/soapbox/features/enlistment/steps/step4.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import { useAppSelector } from 'soapbox/hooks';
-
-const Step4: React.FC = () => {
-    const instance = useAppSelector((state) => state.instance);
-
-    return (
-        <div className="enlistment__step4 mx-auto py-10 px-5">
-            <h3 className="text-2xl font-bold">
-                <FormattedMessage id="enlistment.step4.title" defaultMessage="What's next ?" />
-            </h3>
-            <p className="font-bold">
-                <FormattedMessage id="enlistment.step4.disclaimer" defaultMessage="You're almost ready to dive into the deep end."/>
-            </p>
-            <ol className="mt-4 pl-4">
-                <li>
-                    <FormattedMessage
-                        id="enlistment.step4.point-1"
-                        defaultMessage="Think of {complete} (profile photo, banner and bio). You can even add hashtags to let people know your interests."
-                        values={{
-                            complete: <span className='font-bold'><FormattedMessage id="enlistment.step4.complete" defaultMessage="complete your profile" /></span>
-                        }}   
-                    />
-                </li>
-                <li className="my-3">
-                    <FormattedMessage 
-                        id="enlistment.step4.point-2"
-                        defaultMessage="It is customary to {publish} to make you discover. Do not forget the hashtags #introduction or #presentation."
-                        values={{
-                            publish: <span className='font-bold'><FormattedMessage id="enlistment.step4.publish" defaultMessage="publish a presentation" /></span>
-                        }}  
-                    />
-                </li>
-                <li>
-                    <FormattedMessage 
-                        id="enlistment.step4.point-3" 
-                        defaultMessage="Let's go, it's up to you to discover and tame the places, find people to follow, share your ideas while respecting the {conduct} and the values of {title}."
-                        values={{
-                            title: instance.get("title"),
-                            conduct: <a target="_blank" href="/about/tos"><FormattedMessage id="enlistment.step4.conduct" defaultMessage="code of conduct" /></a>
-                        }}
-                    />
-                </li>
-            </ol>
-            <p className="mt-4 pt-4 w-2/3 italic">
-                <FormattedMessage 
-                    id="enlistment.step4.informations"
-                    defaultMessage="If you have any questions about this new playground, do not hesitate to ask questions to the people you meet online, the community is quite caring and welcoming. You will also find more comprehensive online resources {wiki}."
-                    values={{
-                        wiki: <a target="_blank" href="https://joinfediverse.wiki"><FormattedMessage id="enlistment.step4.wiki" defaultMessage="on the official wiki" /></a>
-                    }}
-                />
-            </p>
-        </div>
-    )
-};
-
-export default Step4;
\ No newline at end of file
diff --git a/app/soapbox/features/landing_page/index.tsx b/app/soapbox/features/landing_page/index.tsx
index 1e3b01f80..8a7cadaba 100644
--- a/app/soapbox/features/landing_page/index.tsx
+++ b/app/soapbox/features/landing_page/index.tsx
@@ -1,12 +1,16 @@
+import Immutable from 'immutable';
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { fetchAccount } from 'soapbox/actions/accounts';
 import { prepareRequest } from 'soapbox/actions/consumer-auth';
 import { Button, Card, CardBody, Stack, Text } from 'soapbox/components/ui';
+import Account from 'soapbox/components/account';
 import VerificationBadge from 'soapbox/components/verification_badge';
 import RegistrationForm from 'soapbox/features/auth_login/components/registration_form';
 import { useAppDispatch, useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks';
 import { capitalize } from 'soapbox/utils/strings';
+import { List as ImmutableList } from 'immutable';
 
 const LandingPage = () => {
   const dispatch = useAppDispatch();
@@ -15,8 +19,28 @@ const LandingPage = () => {
   const pepeEnabled = soapboxConfig.getIn(['extensions', 'pepe', 'enabled']) === true;
 
   const instance = useAppSelector((state) => state.instance);
+  const accounts = useAppSelector((state) => state.accounts);
   const pepeOpen = useAppSelector(state => state.verification.instance.get('registrations') === true);
 
+  React.useEffect(() => {
+    const staff = (instance.pleroma.getIn(["metadata", "staff_accounts"]) as ImmutableList<string>).map((s) => s.split('/').pop());
+    staff.forEach((s) => dispatch(fetchAccount(s)));
+  }, [instance, dispatch]);
+
+  const staffAccounts = React.useMemo(() => {
+    if(accounts == null) return [];
+    const a =  Object.values(accounts?.toJSON()).filter((a) => a.admin || a.moderator);
+    console.log(a);
+    return a;
+  }, [accounts]);
+
+  const userCount = instance.stats.get('user_count');
+
+  const homeDescription = React.useMemo(() => {
+    const format = new Intl.NumberFormat().format(userCount);
+    return soapboxConfig.homeDescription.replace('[users]', format);
+  }, [userCount, soapboxConfig]);
+
   /** Registrations are closed */
   const renderClosed = () => {
     return (
@@ -107,14 +131,30 @@ const LandingPage = () => {
         <div className='grid grid-cols-1 lg:grid-cols-12 gap-8 py-12'>
           <div className='px-4 sm:px-6 sm:text-center md:max-w-2xl md:mx-auto lg:col-span-6 lg:text-left lg:flex'>
             <div className='w-full'>
-              <Stack space={3}>
+              <Stack space={5}>
                 <h1 className='text-5xl font-extrabold text-transparent text-ellipsis overflow-hidden bg-clip-text bg-gradient-to-br from-accent-500 via-primary-500 to-gradient-end sm:mt-5 sm:leading-none lg:mt-6 lg:text-6xl xl:text-7xl'>
                   {instance.title}
                 </h1>
-
                 <Text size='lg'>
-                  {instance.description}
+                  {
+                    homeDescription ? <span dangerouslySetInnerHTML={{ __html: homeDescription }} /> : instance.description
+                  }
                 </Text>
+                <div>
+                  <div className='flex justify-between'>
+                    <h2 className="text-xl text-gray-800">
+                      <FormattedMessage id='landingPage.admins' defaultMessage='Moderators' />
+                    </h2>
+                  </div>
+                  <a href={`mailto:${instance.email}`}>
+                      {instance.email}
+                    </a>
+                  <Stack space={3} className="mt-4">
+                    {
+                      staffAccounts.map((s) => <Account key={s.id} hideActions={true} account={s} />)
+                    }
+                  </Stack>
+                </div>
               </Stack>
             </div>
           </div>
diff --git a/app/soapbox/features/onboarding/onboarding-wizard.tsx b/app/soapbox/features/onboarding/onboarding-wizard.tsx
index 4929d637e..fa72f7cc9 100644
--- a/app/soapbox/features/onboarding/onboarding-wizard.tsx
+++ b/app/soapbox/features/onboarding/onboarding-wizard.tsx
@@ -12,7 +12,10 @@ import BioStep from './steps/bio-step';
 import CompletedStep from './steps/completed-step';
 import CoverPhotoSelectionStep from './steps/cover-photo-selection-step';
 import DisplayNameStep from './steps/display-name-step';
-import SuggestedAccountsStep from './steps/suggested-accounts-step';
+import Feeds from './steps/feeds';
+import HowItWorks from './steps/how-it-works';
+import Privacy from './steps/privacy';
+import Welcome from './steps/welcome';
 
 const OnboardingWizard = () => {
   const dispatch = useDispatch();
@@ -36,11 +39,14 @@ const OnboardingWizard = () => {
   };
 
   const steps = [
+    <Welcome onNext={handleNextStep} />,
     <AvatarSelectionStep onNext={handleNextStep} />,
     <DisplayNameStep onNext={handleNextStep} />,
     <BioStep onNext={handleNextStep} />,
     <CoverPhotoSelectionStep onNext={handleNextStep} />,
-    <SuggestedAccountsStep onNext={handleNextStep} />,
+    <HowItWorks onNext={handleNextStep} />,
+    <Feeds onNext={handleNextStep} />,
+    <Privacy onNext={handleNextStep} />,
     <CompletedStep onComplete={handleComplete} />,
   ];
 
diff --git a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx
index 0aaa471a3..2b4143fca 100644
--- a/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx
+++ b/app/soapbox/features/onboarding/steps/cover-photo-selection-step.tsx
@@ -138,7 +138,11 @@ const CoverPhotoSelectionStep = ({ onNext }: { onNext: () => void }) => {
 
               <Stack justifyContent='center' space={2}>
                 <Button block theme='primary' type='button' onClick={onNext} disabled={isDefault && isDisabled || isSubmitting}>
-                  {isSubmitting ? 'Saving…' : 'Next'}
+                  {isSubmitting ? (
+                    <FormattedMessage id='onboarding.saving' defaultMessage='Saving…' />
+                  ) : (
+                    <FormattedMessage id='onboarding.next' defaultMessage='Next' />
+                  )}
                 </Button>
 
                 {isDisabled && (
diff --git a/app/soapbox/features/onboarding/steps/display-name-step.tsx b/app/soapbox/features/onboarding/steps/display-name-step.tsx
index e85be85eb..bb057106b 100644
--- a/app/soapbox/features/onboarding/steps/display-name-step.tsx
+++ b/app/soapbox/features/onboarding/steps/display-name-step.tsx
@@ -88,7 +88,11 @@ const DisplayNameStep = ({ onNext }: { onNext: () => void }) => {
                   disabled={isDisabled || isSubmitting}
                   onClick={handleSubmit}
                 >
-                  {isSubmitting ? 'Saving…' : 'Next'}
+                  {isSubmitting ? (
+                    <FormattedMessage id='onboarding.saving' defaultMessage='Saving…' />
+                  ) : (
+                    <FormattedMessage id='onboarding.next' defaultMessage='Next' />
+                  )}
                 </Button>
 
                 <Button block theme='link' type='button' onClick={onNext}>
diff --git a/app/soapbox/features/onboarding/steps/feeds.tsx b/app/soapbox/features/onboarding/steps/feeds.tsx
new file mode 100644
index 000000000..7f5dfa52b
--- /dev/null
+++ b/app/soapbox/features/onboarding/steps/feeds.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Button, Card, CardBody } from 'soapbox/components/ui';
+import { useAppSelector } from 'soapbox/hooks';
+
+const messages = defineMessages({
+  col1: { id: 'onboarding.feeds.col1', defaultMessage: 'Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.' },
+  col2: { id: 'onboarding.feeds.col2', defaultMessage: 'Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.' },
+  col3: { id: 'onboarding.feeds.col3', defaultMessage: 'Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.' },
+});
+
+const Feeds = ({ onNext } : { onNext: () => void }) => {
+  const intl = useIntl();
+
+  const instance = useAppSelector((state) => state.instance);
+
+  return (
+    <Card variant='rounded' size='xl'>
+      <CardBody>
+        <div className='enlistment__step2 mx-auto py-10 px-5'>
+          <div className='flex mt-3 gap-4'>
+            <div className='flex-grow-1'>
+              <h3 className='text-xl font-bold mb-2 text-primary-500'>
+                <FormattedMessage id='onboarding.feeds.title1' defaultMessage='Home' />
+              </h3>
+              <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.col1) }} />
+              <p className='mt-4 italic'>
+                <FormattedMessage id='onboarding.feeds.explanation1' defaultMessage="At first it will be a little empty but don't worry we can help you fill it!" />
+              </p>
+            </div>
+            <div className='flex-grow-1'>
+              <h3 className='text-xl font-bold mb-2 text-primary-500'>
+                {instance.get('title')}
+              </h3>
+              <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.col2) }} />
+              <p className='mt-4 italic'>
+                <FormattedMessage id='onboarding.feeds.explanation2' defaultMessage={'We usually call it "local" thread'} />
+              </p>
+            </div>
+            <div className='flex-grow-1'>
+              <h3 className='text-xl font-bold mb-2 text-primary-500'>
+                <FormattedMessage id='onboarding.feeds.title3' defaultMessage='Discover' />
+              </h3>
+              <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.col3) }} />
+              <p className='mt-4 italic'>
+                <FormattedMessage id='onboarding.feeds.explanation3' defaultMessage={'We usually call it "global" or "federated" thread'} />
+              </p>
+            </div>
+          </div>
+        </div>
+        <div className='sm:pt-10 sm:w-2/3 md:w-1/2 mx-auto'>
+          <Button block theme='primary' type='button' onClick={onNext}>
+            <FormattedMessage id='onboarding.next' defaultMessage='Next' />
+          </Button>
+        </div>
+      </CardBody>
+    </Card>
+  );
+};
+
+export default Feeds;
\ No newline at end of file
diff --git a/app/soapbox/features/onboarding/steps/how-it-works.tsx b/app/soapbox/features/onboarding/steps/how-it-works.tsx
new file mode 100644
index 000000000..aa8ca28fa
--- /dev/null
+++ b/app/soapbox/features/onboarding/steps/how-it-works.tsx
@@ -0,0 +1,65 @@
+import React, { useMemo } from 'react';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Button, Card, CardBody } from 'soapbox/components/ui';
+import { useAppSelector } from 'soapbox/hooks';
+
+const messages = defineMessages({
+  right: { id: 'onboarding.how-it-works.right', defaultMessage: 'If you exchange with a person from another instance, you must mention them with their <span class=\'font-bold\'>@pseudo@instance</span><br/><br/> ex: <a href=\' https://oslo.town/@matt\'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin' },
+});
+
+const HowItWorks = ({ onNext }: { onNext: () => void }) => {
+  const intl = useIntl();
+
+  const instance = useAppSelector((state) => state.instance);
+
+  const contactName = useMemo(() => `@${instance.get('email').replace(/@.+/, '')}`, [instance]);
+  const contactUrl = useMemo(() => `${instance.get('uri')}/${contactName}`, [contactName]);
+
+  return (
+    <Card variant='rounded' size='xl'>
+      <CardBody>
+        <div className='enlistment__step1 mx-auto py-10 px-5'>
+          <h3 className='text-2xl font-bold'>
+            <FormattedMessage id='onboarding.how-it-works.title' defaultMessage='How it works ?' />
+          </h3>
+          <div className='flex gap-12 mt-2'>
+            <div className='flex-grow-1'>
+              <p>
+                <FormattedMessage
+                  id='onboarding.how-it-works.left'
+                  defaultMessage='Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}'
+                  values={{
+                    title: instance.get('title'),
+                    username: (
+                      <span className='font-bold'><FormattedMessage id='onboarding.how-it-works.username' defaultMessage='@username' /></span>
+                    ),
+                    contact: (
+                      <a href={contactUrl} target='_blank'>
+                        {contactName}
+                      </a>
+                    ),
+                    br: <br />,
+                  }}
+                />
+              </p>
+            </div>
+            <div className='flex-grow-1'>
+              <p dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.right) }} />
+            </div>
+          </div>
+          <div className='italic mt-8'>
+            <FormattedMessage id='onboarding.how-it-works.explanation' defaultMessage="Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way." />
+          </div>
+        </div>
+        <div className='sm:pt-10 sm:w-2/3 md:w-1/2 mx-auto'>
+          <Button block theme='primary' type='button' onClick={onNext}>
+            <FormattedMessage id='onboarding.next' defaultMessage='Next' />
+          </Button>
+        </div>
+      </CardBody>
+    </Card>
+  );
+};
+
+export default HowItWorks;
\ No newline at end of file
diff --git a/app/soapbox/features/onboarding/steps/privacy.tsx b/app/soapbox/features/onboarding/steps/privacy.tsx
new file mode 100644
index 000000000..07f2f58bf
--- /dev/null
+++ b/app/soapbox/features/onboarding/steps/privacy.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import { Button, Card, CardBody, Icon } from 'soapbox/components/ui';
+
+const Privacy = ({ onNext } : { onNext : () => void}) => {
+  return (
+    <Card variant='rounded' size='xl'>
+      <CardBody>
+        <div className='enlistment__step3 mx-auto py-10 px-5'>
+          <div>
+            <h3 className='text-2xl font-bold'>
+              <FormattedMessage id='onboarding.privacy.title' defaultMessage='Privacy' />
+            </h3>
+            <p>
+              <FormattedMessage id='onboarding.privacy.description' defaultMessage='This site offers precise control over who can see your posts and therefore interact with you.' />
+            </p>
+          </div>
+          <div className='mt-10'>
+            <div className='flex gap-4'>
+              <div className='flex-grow-1 w-1/2'>
+                <h4 className='items-center text-xl font-bold'>
+                  <Icon className='inline-block text-primary-500 align-middle mr-1 w-6 h-6' src={require('@tabler/icons/world.svg')} />
+                  <span className='align-middle'>
+                    <FormattedMessage id='onboarding.privacy.public-title' defaultMessage='Public' />
+                  </span>
+                </h4>
+                <p>
+                  <FormattedMessage id='onboarding.privacy.public-description' defaultMessage='The post is displayed on all feeds, including other instances.' />
+                </p>
+              </div>
+              <div className='flex-grow-1 w-1/2'>
+                <h4 className='items-center text-xl font-bold'>
+                  <Icon className='inline-block text-primary-500 align-middle mr-1 w-6 h-6' src={require('@tabler/icons/lock-open.svg')} />
+                  <span className='align-middle'>
+                    <FormattedMessage id='onboarding.privacy.unlisted-title' defaultMessage='Unlisted' />
+                  </span>
+                </h4>
+                <p>
+                  <FormattedMessage id='onboarding.privacy.unlisted-description' defaultMessage="The post is public but only appears in your subscribers' feeds and on your profile" />
+                </p>
+              </div>
+            </div>
+            <div className='mt-10 flex gap-4'>
+              <div className='flex-grow-1 w-1/2'>
+                <h4 className='items-center text-xl font-bold'>
+                  <Icon className='inline-block text-primary-500 align-middle mr-1 w-6 h-6' src={require('@tabler/icons/lock.svg')} />
+                  <span className='align-middle'>
+                    <FormattedMessage id='onboarding.privacy.followers-title' defaultMessage='Followers only' />
+                  </span>
+                </h4>
+                <p>
+                  <FormattedMessage id='onboarding.privacy.followers-description' defaultMessage='The post is not displayed on any public feeds and is only visible to people who follow you' />
+                </p>
+              </div>
+              <div className='flex-grow-1 w-1/2'>
+                <h4 className='items-center text-xl font-bold'>
+                  <Icon className='inline-block text-primary-500 align-middle mr-1 w-6 h-6' src={require('@tabler/icons/mail.svg')} />
+                  <span className='align-middle'>
+                    <FormattedMessage id='onboarding.privacy.direct-title' defaultMessage='Direct' />
+                  </span>
+                </h4>
+                <p>
+                  <FormattedMessage id='onboarding.privacy.direct-description' defaultMessage='The post is only visible to people mentioned via @username@instance' />
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className='sm:pt-10 sm:w-2/3 md:w-1/2 mx-auto'>
+          <Button block theme='primary' type='button' onClick={onNext}>
+            <FormattedMessage id='onboarding.next' defaultMessage='Next' />
+          </Button>
+        </div>
+      </CardBody>
+    </Card>
+  );
+};
+
+export default Privacy;
\ No newline at end of file
diff --git a/app/soapbox/features/onboarding/steps/welcome.tsx b/app/soapbox/features/onboarding/steps/welcome.tsx
new file mode 100644
index 000000000..ac058ea66
--- /dev/null
+++ b/app/soapbox/features/onboarding/steps/welcome.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Button, Card, CardBody } from 'soapbox/components/ui';
+import { useOwnAccount, useAppSelector } from 'soapbox/hooks';
+
+const messages = defineMessages({
+  title: { id: 'onboarding.welcome.title', defaultMessage: 'Welcome on the Fediverse' },
+  body1: { id: 'onboarding.welcome.body1', defaultMessage: 'This website is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse.' },
+  body2: { id: 'onboarding.welcome.body2', defaultMessage: 'Each server is called an “instance”. Your instance is simply this site: ' },
+  username: { id: 'onboarding.welcome.username', defaultMessage: 'You full username' },
+  explanation: { id: 'onboarding.welcome.explanation', defaultMessage: 'It is this identifier that you can share on the fediverse' },
+});
+
+const Welcome = ({ onNext }: { onNext: () => void }) => {
+  const intl = useIntl();
+  const account = useOwnAccount();
+  const instance = useAppSelector((state: any) => state.instance);
+
+  return (
+    <Card variant='rounded' size='xl'>
+      <CardBody>
+        <div className='enlistment__step0 mx-auto py-10 px-5'>
+          <h3 className='text-2xl font-bold'>
+            {intl.formatMessage(messages.title)}
+          </h3>
+          <p className='mt-3 mb-5'>
+            <div className='text-gray-400 mb-3' dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.body1) }} />
+            <span dangerouslySetInnerHTML={{ __html: intl.formatMessage(messages.body2) }} />
+                &nbsp;
+            <span className='font-bold'>
+              {instance.get('uri').replace(/https?:\/\//, '')}
+            </span>
+          </p>
+
+          <h4 className='uppercase text-lg'>
+            {intl.formatMessage(messages.username)}
+          </h4>
+
+          <div className='enlisted__step0__username inline-block rounded p-1 text-primary-500 text-lg font-bold'>
+            @{account?.acct}@{instance.get('uri').replace(/https?:\/\//, '')}
+          </div>
+          <div className='italic mt-2'>
+            {intl.formatMessage(messages.explanation)}
+          </div>
+        </div>
+        <div className='sm:pt-10 sm:w-2/3 md:w-1/2 mx-auto'>
+          <Button block theme='primary' type='button' onClick={onNext}>
+            <FormattedMessage id='onboarding.next' defaultMessage='Next' />
+          </Button>
+        </div>
+      </CardBody>
+    </Card>
+  );
+};
+
+export default Welcome;
\ No newline at end of file
diff --git a/app/soapbox/features/preferences/index.tsx b/app/soapbox/features/preferences/index.tsx
index fabe7aea7..bb81eb773 100644
--- a/app/soapbox/features/preferences/index.tsx
+++ b/app/soapbox/features/preferences/index.tsx
@@ -204,10 +204,6 @@ const Preferences = () => {
         <ListItem label={<FormattedMessage id='preferences.fields.autoload_more_label' defaultMessage='Automatically load more items when scrolled to the bottom of the page' />}>
           <SettingToggle settings={settings} settingPath={['autoloadMore']} onChange={onToggleChange} />
         </ListItem>
-
-        <ListItem label={<FormattedMessage id='preferences.fields.enlisted' defaultMessage='Ignore onboarding' />}>
-          <SettingToggle settings={settings} settingPath={['enlisted']} onChange={onToggleChange} />
-        </ListItem>
       </List>
     </Form>
   );
diff --git a/app/soapbox/features/public_layout/components/header.tsx b/app/soapbox/features/public_layout/components/header.tsx
index 51e7f62a6..6308824ce 100644
--- a/app/soapbox/features/public_layout/components/header.tsx
+++ b/app/soapbox/features/public_layout/components/header.tsx
@@ -76,17 +76,6 @@ const Header = () => {
       <nav className='max-w-7xl mx-auto px-4 sm:px-6 lg:px-8' aria-label='Header'>
         <div className='w-full py-6 flex items-center justify-between border-b border-indigo-500 lg:border-none'>
           <div className='flex items-center sm:justify-center relative w-36'>
-            <div className='hidden md:block absolute z-0 -top-24 -left-6'>
-              <Sonar />
-            </div>
-
-            <IconButton
-              title='Open Menu'
-              src={require('@tabler/icons/menu-2.svg')}
-              onClick={open}
-              className='md:hidden mr-4 bg-transparent text-gray-700 dark:text-gray-600 hover:text-gray-600'
-            />
-
             <Link to='/' className='z-10'>
               <SiteLogo alt='Logo' className='h-6 w-auto cursor-pointer' />
               <span className='hidden'>{intl.formatMessage(messages.home)}</span>
diff --git a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
index 8c2bdf473..6fa4a234f 100644
--- a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
+++ b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
@@ -53,8 +53,10 @@ class IconPickerMenu extends React.PureComponent {
   }
 
   componentDidMount() {
-    document.addEventListener('click', this.handleDocumentClick, false);
-    document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    setTimeout(() => {
+      document.addEventListener('click', this.handleDocumentClick, false);
+      document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
+    }, 200);
   }
 
   componentWillUnmount() {
@@ -174,10 +176,8 @@ class IconPickerDropdown extends React.PureComponent {
   }
 
   onShowDropdown = ({ target }) => {
-    this.setState({ active: true });
-
     const { top } = target.getBoundingClientRect();
-    this.setState({ placement: top * 2 < innerHeight ? 'bottom' : 'top' });
+    this.setState({active: true, placement: top * 2 < innerHeight ? 'bottom' : 'top' });
   }
 
   onHideDropdown = () => {
diff --git a/app/soapbox/features/soapbox_config/components/site-preview.tsx b/app/soapbox/features/soapbox_config/components/site-preview.tsx
index 1c4efc92f..06ae8e072 100644
--- a/app/soapbox/features/soapbox_config/components/site-preview.tsx
+++ b/app/soapbox/features/soapbox_config/components/site-preview.tsx
@@ -43,7 +43,7 @@ const SitePreview: React.FC<ISitePreview> = ({ soapbox }) => {
         <FormattedMessage id='site_preview.preview' defaultMessage='Preview' />
       </div>
 
-      <div className={classNames('flex absolute inset-0 shadow z-10 h-12 lg:h-16', {
+      <div className={classNames('flex items-center absolute inset-0 shadow z-10 h-12 lg:h-16', {
         'bg-white': !dark,
         'bg-slate-800': dark,
       })}
diff --git a/app/soapbox/features/soapbox_config/index.tsx b/app/soapbox/features/soapbox_config/index.tsx
index 24ad615a3..fc45cbc31 100644
--- a/app/soapbox/features/soapbox_config/index.tsx
+++ b/app/soapbox/features/soapbox_config/index.tsx
@@ -27,7 +27,6 @@ import { normalizeSoapboxConfig } from 'soapbox/normalizers';
 import Accordion from '../ui/components/accordion';
 
 import ColorWithPicker from './components/color-with-picker';
-import CryptoAddressInput from './components/crypto-address-input';
 import FooterLinkInput from './components/footer-link-input';
 import PromoPanelInput from './components/promo-panel-input';
 import SitePreview from './components/site-preview';
@@ -52,6 +51,7 @@ const messages = defineMessages({
   singleUserModeHint: { id: 'soapbox_config.single_user_mode_hint', defaultMessage: 'Front page will redirect to a given user profile.' },
   singleUserModeProfileLabel: { id: 'soapbox_config.single_user_mode_profile_label', defaultMessage: 'Main user handle' },
   singleUserModeProfileHint: { id: 'soapbox_config.single_user_mode_profile_hint', defaultMessage: '@handle' },
+  homeDescription: { id: 'soapbox_config.home_description', defaultMessage: 'Instance\'s description shown in Home page. Supports HTML. Use [users] to insert the number of current users on the instance.' }
 });
 
 type ValueGetter<T = Element> = (e: React.ChangeEvent<T>) => any;
@@ -155,8 +155,8 @@ const SoapboxConfig: React.FC = () => {
 
   const addStreamItem = (path: ConfigPath, template: Template) => {
     return () => {
-      const items = data.getIn(path);
-      setConfig(path, items.push(template));
+      const items = data.getIn(path) || [];
+      setConfig(path, ImmutableList([...items, template]));
     };
   };
 
@@ -202,7 +202,7 @@ const SoapboxConfig: React.FC = () => {
           >
             <FileInput
               onChange={handleFileChange(['logo'])}
-              accept='image/svg,image/png'
+              accept='image/svg+xml'
             />
           </FormGroup>
 
@@ -293,6 +293,19 @@ const SoapboxConfig: React.FC = () => {
             )}
           </List>
 
+          <CardHeader>
+            <CardTitle title={<FormattedMessage id='soapbox_config.headings.home' defaultMessage='Home' />} />
+          </CardHeader>
+
+          <FormGroup labelText={intl.formatMessage(messages.homeDescription)}>
+            <Textarea
+              placeholder={intl.formatMessage(messages.homeDescription)}
+              isCodeEditor
+              value={soapbox.homeDescription}
+              onChange={handleChange(['homeDescription'], (e) => e.target.value)}
+            />
+          </FormGroup>
+
           <CardHeader>
             <CardTitle title={<FormattedMessage id='soapbox_config.headings.navigation' defaultMessage='Navigation' />} />
           </CardHeader>
@@ -326,31 +339,6 @@ const SoapboxConfig: React.FC = () => {
             />
           </FormGroup>
 
-          <CardHeader>
-            <CardTitle title={<FormattedMessage id='soapbox_config.headings.cryptocurrency' defaultMessage='Cryptocurrency' />} />
-          </CardHeader>
-
-          <Streamfield
-            label={<FormattedMessage id='soapbox_config.fields.crypto_addresses_label' defaultMessage='Cryptocurrency addresses' />}
-            hint={<FormattedMessage id='soapbox_config.hints.crypto_addresses' defaultMessage='Add cryptocurrency addresses so users of your site can donate to you. Order matters, and you must use lowercase ticker values.' />}
-            component={CryptoAddressInput}
-            values={soapbox.cryptoAddresses.toArray()}
-            onChange={handleStreamItemChange(['cryptoAddresses'])}
-            onAddItem={addStreamItem(['cryptoAddresses'], templates.cryptoAddress)}
-            onRemoveItem={deleteStreamItem(['cryptoAddresses'])}
-          />
-
-          <FormGroup labelText={intl.formatMessage(messages.cryptoDonatePanelLimitLabel)}>
-            <Input
-              type='number'
-              min={0}
-              pattern='[0-9]+'
-              placeholder={intl.formatMessage(messages.cryptoDonatePanelLimitLabel)}
-              value={soapbox.cryptoDonatePanel.get('limit')}
-              onChange={handleChange(['cryptoDonatePanel', 'limit'], (e) => Number(e.target.value))}
-            />
-          </FormGroup>
-
           <CardHeader>
             <CardTitle title={<FormattedMessage id='soapbox_config.headings.advanced' defaultMessage='Advanced' />} />
           </CardHeader>
diff --git a/app/soapbox/features/status/index.tsx b/app/soapbox/features/status/index.tsx
index 5410551cd..5ad71b741 100644
--- a/app/soapbox/features/status/index.tsx
+++ b/app/soapbox/features/status/index.tsx
@@ -49,6 +49,7 @@ import type {
   Attachment as AttachmentEntity,
   Status as StatusEntity,
 } from 'soapbox/types/entities';
+import Sticky from 'soapbox/components/sticky';
 
 const messages = defineMessages({
   title: { id: 'status.title', defaultMessage: '@{username}\'s Post' },
@@ -515,10 +516,12 @@ const Thread: React.FC<IThread> = (props) => {
 
   return (
     <Column label={intl.formatMessage(titleMessage, { username })} transparent withHeader={false}>
-      <div className='px-4 pt-4 sm:p-0'>
-        <SubNavigation message={intl.formatMessage(titleMessage, { username })} />
-      </div>
-
+      <Sticky stickyClassName='sm:hidden w-full shadow-lg before:-z-10 before:bg-gradient-sm before:w-full before:h-full before:absolute before:top-0 before:left-0  bg-white dark:bg-slate-900'>
+        <div className='px-4 pt-4 sm:p-0'>
+         <SubNavigation message={intl.formatMessage(titleMessage, { username })} />
+        </div>
+      </Sticky>
+      
       <PullToRefresh onRefresh={handleRefresh}>
         <Stack space={2}>
           <div ref={node} className='thread'>
diff --git a/app/soapbox/features/ui/components/link_footer.tsx b/app/soapbox/features/ui/components/link_footer.tsx
index 7956f6dbb..aa9dd106a 100644
--- a/app/soapbox/features/ui/components/link_footer.tsx
+++ b/app/soapbox/features/ui/components/link_footer.tsx
@@ -40,9 +40,6 @@ const LinkFooter: React.FC = (): JSX.Element => {
     <div className='space-y-2'>
       <div className='flex flex-wrap items-center divide-x-dot text-gray-400'>
         {account && <>
-          {features.profileDirectory && (
-            <FooterLink to='/directory'><FormattedMessage id='navigation_bar.profile_directory' defaultMessage='Profile directory' /></FooterLink>
-          )}
           <FooterLink to='/blocks'><FormattedMessage id='navigation_bar.blocks' defaultMessage='Blocks' /></FooterLink>
           <FooterLink to='/mutes'><FormattedMessage id='navigation_bar.mutes' defaultMessage='Mutes' /></FooterLink>
           {features.filters && (
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 87710cdd2..6f67f5d80 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -38,7 +38,6 @@ import StatusPage from 'soapbox/pages/status_page';
 import { getAccessToken, getVapidKey } from 'soapbox/utils/auth';
 import { isStandalone } from 'soapbox/utils/state';
 // import GroupSidebarPanel from '../groups/sidebar_panel';
-import Enlistment from '../enlistment/enlistment';
 
 import BackgroundShapes from './components/background_shapes';
 import Navbar from './components/navbar';
@@ -655,8 +654,6 @@ const UI: React.FC = ({ children }) => {
 
         <div className='z-10 flex flex-col'>
           <Navbar />
-          <Enlistment />
-
           <Layout>
             <Layout.Sidebar>
               {!standalone && <SidebarNavigation />}
diff --git a/app/soapbox/hooks/index.ts b/app/soapbox/hooks/index.ts
index 4d7417771..4827f2370 100644
--- a/app/soapbox/hooks/index.ts
+++ b/app/soapbox/hooks/index.ts
@@ -12,3 +12,4 @@ export { useSettings } from './useSettings';
 export { useSoapboxConfig } from './useSoapboxConfig';
 export { useSystemTheme } from './useSystemTheme';
 export { useTheme } from './useTheme';
+export { useLogo } from './useLogo';
diff --git a/app/soapbox/hooks/useLogo.ts b/app/soapbox/hooks/useLogo.ts
new file mode 100644
index 000000000..354b3ca2d
--- /dev/null
+++ b/app/soapbox/hooks/useLogo.ts
@@ -0,0 +1,32 @@
+import { useSettings } from './useSettings';
+import { useSoapboxConfig } from './useSoapboxConfig';
+import { useTheme } from './useTheme';
+
+/**
+ * Return the actual logo
+ * @returns
+ */
+const useLogo = (): string => {
+  const settings = useSettings();
+  const { logo, logoDarkMode } = useSoapboxConfig();
+  const darkMode = useTheme() === 'dark';
+
+  /** Soapbox logo. */
+  const soapboxLogo = darkMode
+    ? require('images/soapbox-logo-white.svg')
+    : require('images/soapbox-logo.svg');
+
+  // Use the right logo if provided, then use fallbacks.
+  const getSrc = () => {
+    // In demo mode, use the Soapbox logo.
+    if (settings.get('demo')) return soapboxLogo;
+
+    return (darkMode && logoDarkMode)
+      ? logoDarkMode
+      : logo || logoDarkMode || soapboxLogo;
+  };
+
+  return getSrc();
+};
+
+export { useLogo };
\ No newline at end of file
diff --git a/app/soapbox/hooks/useTheme.ts b/app/soapbox/hooks/useTheme.ts
index 22ececd7a..86016cb58 100644
--- a/app/soapbox/hooks/useTheme.ts
+++ b/app/soapbox/hooks/useTheme.ts
@@ -17,4 +17,6 @@ const useTheme = (): Theme => {
   return darkMode ? 'dark' : 'light';
 };
 
+
+
 export { useTheme };
diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index b279f0593..36291d959 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index f4681a617..8dbb863e9 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index 63707d963..13f00b8ca 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index f61ec58f8..af19e5c32 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index e5dee7007..3976ce190 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index d6eb223e7..0dccb22b6 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 8b7d9f7f1..eaa90f635 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 1103dd86e..80e12d4e3 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index 38f7186a4..4dbb6ef27 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index 0f5efc6b5..764f411ab 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index ae1378e23..6cc9f43e9 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index 7a0f70c45..cb7a739ed 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -3620,19 +3620,19 @@
     "descriptors": [
       {
         "defaultMessage": "Welcome on Mangane",
-        "id": "enlistment.step0.title"
+        "id": "onboarding.welcome.title"
       },
       {
         "defaultMessage": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-        "id": "enlistment.step0.body"
+        "id": "onboarding.welcome.body"
       },
       {
         "defaultMessage": "You full username",
-        "id": "enlistment.step0.username"
+        "id": "onboarding.welcome.username"
       },
       {
         "defaultMessage": "It is this identifier that you can share on the fediverse",
-        "id": "enlistment.step0.explanation"
+        "id": "onboarding.welcome.explanation"
       }
     ],
     "path": "app/soapbox/features/enlistment/steps/step0.json"
@@ -3641,23 +3641,23 @@
     "descriptors": [
       {
         "defaultMessage": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-        "id": "enlistment.step1.right"
+        "id": "onboarding.how-it-works.right"
       },
       {
         "defaultMessage": "How it works ?",
-        "id": "enlistment.step1.title"
+        "id": "onboarding.how-it-works.title"
       },
       {
         "defaultMessage": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-        "id": "enlistment.step1.left"
+        "id": "onboarding.how-it-works.left"
       },
       {
         "defaultMessage": "@username",
-        "id": "enlistment.step1.username"
+        "id": "onboarding.how-it-works.username"
       },
       {
         "defaultMessage": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-        "id": "enlistment.step1.explanation"
+        "id": "onboarding.how-it-works.explanation"
       }
     ],
     "path": "app/soapbox/features/enlistment/steps/step1.json"
@@ -3666,35 +3666,35 @@
     "descriptors": [
       {
         "defaultMessage": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-        "id": "enlistment.step2.col1"
+        "id": "onboarding.feeds.col1"
       },
       {
         "defaultMessage": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-        "id": "enlistment.step2.col2"
+        "id": "onboarding.feeds.col2"
       },
       {
         "defaultMessage": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-        "id": "enlistment.step2.col3"
+        "id": "onboarding.feeds.col3"
       },
       {
         "defaultMessage": "Home",
-        "id": "enlistment.step2.title1"
+        "id": "onboarding.feeds.title1"
       },
       {
         "defaultMessage": "At first it will be a little empty but don't worry we can help you fill it!",
-        "id": "enlistment.step2.explanation1"
+        "id": "onboarding.feeds.explanation1"
       },
       {
         "defaultMessage": "We usually call it \"local\" thread",
-        "id": "enlistment.step2.explanation2"
+        "id": "onboarding.feeds.explanation2"
       },
       {
         "defaultMessage": "Discover",
-        "id": "enlistment.step2.title3"
+        "id": "onboarding.feeds.title3"
       },
       {
         "defaultMessage": "We usually call it \"global\" or \"federated\" thread",
-        "id": "enlistment.step2.explanation3"
+        "id": "onboarding.feeds.explanation3"
       }
     ],
     "path": "app/soapbox/features/enlistment/steps/step2.json"
@@ -3703,43 +3703,43 @@
     "descriptors": [
       {
         "defaultMessage": "Privacy",
-        "id": "enlistment.step3.title"
+        "id": "onboarding.privacy.title"
       },
       {
         "defaultMessage": "This site offers precise control over who can see your posts and therefore interact with you.",
-        "id": "enlistment.step3.description"
+        "id": "onboarding.privacy.description"
       },
       {
         "defaultMessage": "Public",
-        "id": "enlistment.step3.public-title"
+        "id": "onboarding.privacy.public-title"
       },
       {
         "defaultMessage": "The post is displayed on all feeds, including other instances.",
-        "id": "enlistment.step3.public-description"
+        "id": "onboarding.privacy.public-description"
       },
       {
         "defaultMessage": "Unlisted",
-        "id": "enlistment.step3.unlisted-title"
+        "id": "onboarding.privacy.unlisted-title"
       },
       {
         "defaultMessage": "The post is public but only appears in your subscribers' feeds and on your profile",
-        "id": "enlistment.step3.unlisted-description"
+        "id": "onboarding.privacy.unlisted-description"
       },
       {
         "defaultMessage": "Followers only",
-        "id": "enlistment.step3.followers-title"
+        "id": "onboarding.privacy.followers-title"
       },
       {
         "defaultMessage": "The post is not displayed on any public feeds and is only visible to people who follow you",
-        "id": "enlistment.step3.followers-description"
+        "id": "onboarding.privacy.followers-description"
       },
       {
         "defaultMessage": "Direct",
-        "id": "enlistment.step3.direct-title"
+        "id": "onboarding.privacy.direct-title"
       },
       {
         "defaultMessage": "The post is only visible to people mentioned via @username@instance",
-        "id": "enlistment.step3.direct-description"
+        "id": "onboarding.privacy.direct-description"
       }
     ],
     "path": "app/soapbox/features/enlistment/steps/step3.json"
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 07833459e..77f0dfe09 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json
index a9ab91545..4a6341ee4 100644
--- a/app/soapbox/locales/en-Shaw.json
+++ b/app/soapbox/locales/en-Shaw.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index a9e9c38fc..bffed263d 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 67cb57f8e..e4613e9ba 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 3dfb24444..c8a662f1b 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 911eefb79..4e527d5ba 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index 04193c362..feb4db809 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index de642d1b1..36b44686e 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index bfb9e8765..bbc74a769 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index 7a7b81ee2..23ed1269a 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 3209ca5ae..3fce34e31 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -26,7 +26,10 @@
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
   "account.hide_reblogs": "Masquer les partages de @{name}",
-  "account.last_status": "Last active",
+  "account.last_status": "Dernière activité",
+  "account.today": "Aujourd'hui",
+  "account.yesterday": "Hier",
+  "account.days": "Jours",
   "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
   "account.locked_info": "Ce compte est verrouillé. Son propriétaire approuve manuellement qui peut le ou la suivre.",
   "account.login": "Connexion",
@@ -80,7 +83,7 @@
   "admin.dashboard.registration_mode.open_hint": "Anyone can join.",
   "admin.dashboard.registration_mode.open_label": "Open",
   "admin.dashboard.registration_mode_label": "Registrations",
-  "admin.dashboard.settings_saved": "Settings saved!",
+  "admin.dashboard.settings_saved": "Paramètres enregistrés !",
   "admin.dashcounters.domain_count_label": "peers",
   "admin.dashcounters.mau_label": "monthly active users",
   "admin.dashcounters.retention_label": "user retention",
@@ -93,7 +96,7 @@
   "admin.moderation_log.empty_message": "You have not performed any moderation actions yet. When you do, a history will be shown here.",
   "admin.reports.actions.close": "Fermer",
   "admin.reports.actions.view_status": "View post",
-  "admin.reports.empty_message": "There are no open reports. If a user gets reported, they will show up here.",
+  "admin.reports.empty_message": "Aucun signalement n'a été remonté.",
   "admin.reports.report_closed_message": "Report on @{name} was closed",
   "admin.reports.report_title": "Report on {acct}",
   "admin.statuses.actions.delete_status": "Supprimer le statut",
@@ -213,7 +216,7 @@
   "column.crypto_donate": "Donate Cryptocurrency",
   "column.developers": "Developers",
   "column.direct": "Messages privés",
-  "column.directory": "Browse profiles",
+  "column.directory": "Annuaire",
   "column.domain_blocks": "Domaines cachés",
   "column.edit_profile": "Edit profile",
   "column.export_data": "Export data",
@@ -221,24 +224,24 @@
   "column.favourited_statuses": "Liked posts",
   "column.favourites": "Likes",
   "column.federation_restrictions": "Federation Restrictions",
-  "column.filters": "Muted words",
-  "column.filters.add_new": "Add New Filter",
+  "column.filters": "Mots silenciés",
+  "column.filters.add_new": "Ajouter un nouveau filtre",
   "column.filters.conversations": "Conversations",
   "column.filters.create_error": "Error adding filter",
   "column.filters.delete": "Delete",
   "column.filters.delete_error": "Error deleting filter",
-  "column.filters.drop_header": "Drop instead of hide",
-  "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
+  "column.filters.drop_header": "Supprimer au lieu de masquer",
+  "column.filters.drop_hint": "Les statuts filtrés ne seront pas conservés, et seront donc invisibles même si le filtre est supprimé.",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
-  "column.filters.home_timeline": "Home timeline",
-  "column.filters.keyword": "Keyword or phrase",
+  "column.filters.home_timeline": "Accueil",
+  "column.filters.keyword": "Mot-clé ou phrase",
   "column.filters.notifications": "Notifications",
-  "column.filters.public_timeline": "Public timeline",
-  "column.filters.subheading_add_new": "Add New Filter",
-  "column.filters.subheading_filters": "Current Filters",
-  "column.filters.whole_word_header": "Whole word",
-  "column.filters.whole_word_hint": "When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word",
+  "column.filters.public_timeline": "Découvrir",
+  "column.filters.subheading_add_new": "Ajouter le nouveau filtre",
+  "column.filters.subheading_filters": "Filtres actuels",
+  "column.filters.whole_word_header": "Mot entier",
+  "column.filters.whole_word_hint": "Le filtre ne sera appliqué que s'il correspond exactement au mot entier.",
   "column.follow_requests": "Demandes de suivi",
   "column.followers": "Followers",
   "column.following": "Following",
@@ -265,7 +268,7 @@
   "column.scheduled_statuses": "Scheduled Posts",
   "column.search": "Recherche",
   "column.settings_store": "Settings store",
-  "column.soapbox_config": "Soapbox config",
+  "column.soapbox_config": "Configuration de Mangane",
   "column.test": "Test timeline",
   "column_back_button.label": "Retour",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -277,7 +280,7 @@
   "community.column_settings.title": "Local timeline settings",
   "compare_history_modal.header": "Edit history",
   "compose.character_counter.title": "Used {chars} out of {maxChars} characters",
-  "compose.edit_success": "Your post was edited",
+  "compose.edit_success": "Le statut a été édité !",
   "compose.invalid_schedule": "You must schedule a post at least 5 minutes out.",
   "compose.submit_success": "Publication envoyée",
   "compose_form.direct_message_warning": "Ce statut sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
@@ -290,17 +293,17 @@
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
   "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.multiselect": "Multi-Select",
-  "compose_form.poll.multiselect_detail": "Allow users to select multiple answers",
+  "compose_form.poll.multiselect": "Choix multiple",
+  "compose_form.poll.multiselect_detail": "Autoriser plusieurs choix de réponse",
   "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove": "Remove poll",
+  "compose_form.poll.remove": "Supprimer le sondage",
   "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.poll_placeholder": "Add a poll topic...",
+  "compose_form.poll_placeholder": "Ajouter un sujet de sondage...",
   "compose_form.publish": "Publier",
   "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Save changes",
+  "compose_form.save_changes": "Envoyer",
   "compose_form.schedule": "Schedule",
   "compose_form.scheduled_statuses.click_here": "Click here",
   "compose_form.scheduled_statuses.message": "You have scheduled posts. {click_here} to see them.",
@@ -334,9 +337,9 @@
   "confirmations.block.confirm": "Bloquer",
   "confirmations.block.heading": "Block @{name}",
   "confirmations.block.message": "Confirmez-vous le blocage de {name} ?",
-  "confirmations.cancel_editing.confirm": "Cancel editing",
-  "confirmations.cancel_editing.heading": "Cancel post editing",
-  "confirmations.cancel_editing.message": "Are you sure you want to cancel editing this post? All changes will be lost.",
+  "confirmations.cancel_editing.confirm": "Oui, laisser tomber",
+  "confirmations.cancel_editing.heading": "Annuler l'édition",
+  "confirmations.cancel_editing.message": "Êtes-vous sûr de vouloir annuler l'édition de ce statut ? Les modifications seront perdues.",
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.heading": "Supprimer le statut",
   "confirmations.delete.message": "Confirmez-vous la suppression de ce statut ?",
@@ -394,10 +397,10 @@
   "developers.navigation.test_timeline_label": "Test timeline",
   "developers.settings_store.hint": "It is possible to directly edit your user settings here. BE CAREFUL! Editing this section can break your account, and you will only be able to recover through the API.",
   "direct.search_placeholder": "Send a message to…",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "directory.federated": "Tout le fediverse connu",
+  "directory.local": "Uniquement {domain}",
+  "directory.new_arrivals": "Les p'tits nouveaux en premier",
+  "directory.recently_active": "Les plus actifs",
   "edit_email.header": "Change Email",
   "edit_email.placeholder": "me@example.com",
   "edit_federation.followers_only": "Hide posts except to followers",
@@ -423,7 +426,7 @@
   "edit_profile.fields.hide_network_label": "Masquer le réseau",
   "edit_profile.fields.location_label": "Localisation",
   "edit_profile.fields.location_placeholder": "Localisation",
-  "edit_profile.fields.locked_label": "Vérouiller le compte",
+  "edit_profile.fields.locked_label": "Verrouiller le compte",
   "edit_profile.fields.meta_fields.content_placeholder": "Contenu",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
   "edit_profile.fields.meta_fields_label": "Champs du profil",
@@ -434,14 +437,14 @@
   "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
   "edit_profile.hints.avatar": "PNG, GIF or JPG. Sera réduit à {size}",
   "edit_profile.hints.bot": "Ce compte réalise essentiellement des actions automatiques",
-  "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
+  "edit_profile.hints.discoverable": "Afficher votre profil dans l'annuaire",
   "edit_profile.hints.header": "PNG, GIF or JPG. Sera réduit à {size}",
   "edit_profile.hints.hide_network": "Les comptes que vous suivez et qui vous suit ne sont pas visibles sur votre profil",
   "edit_profile.hints.locked": "Vous validez les nouveaux followers",
   "edit_profile.hints.meta_fields": "Vous pouvez afficher jusqu'à {count, plural, one {# champ libre} other {# champs libres}} sur votre profil.",
   "edit_profile.hints.stranger_notifications": "Montrer uniquement les notifications des gens que vous suivez",
   "edit_profile.save": "Enregistrer",
-  "edit_profile.success": "Profile saved!",
+  "edit_profile.success": "Profil sauvegardé !",
   "email_confirmation.success": "Your email has been confirmed!",
   "email_passthru.confirmed.body": "Close this tab and continue the registration process on the {bold} from which you sent this email confirmation.",
   "email_passthru.confirmed.heading": "Email Confirmed!",
@@ -473,13 +476,13 @@
   "empty_column.aliases": "You haven't created any account alias yet.",
   "empty_column.aliases.suggestions": "There are no account suggestions available for the provided term.",
   "empty_column.blocks": "Vous n’avez bloqué aucun·e utilisateur·rice pour le moment.",
-  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
+  "empty_column.bookmarks": "Vous n'avez pas de marque-pages pour le moment.",
   "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
   "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
   "empty_column.domain_blocks": "Il n’y a aucun domaine caché pour le moment.",
   "empty_column.favourited_statuses": "Vous n’avez aucun statut favoris pour le moment. Lorsque vous en mettrez un en favori, il apparaîtra ici.",
   "empty_column.favourites": "Personne n’a encore mis ce statut en favori. Lorsque quelqu’un le fera, il apparaîtra ici.",
-  "empty_column.filters": "You haven't created any muted words yet.",
+  "empty_column.filters": "Vous n'avez pas déclaré de mots silenciés pour le moment.",
   "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
   "empty_column.follow_requests": "Vous n’avez pas encore de demande de suivi. Lorsque vous en recevrez une, elle apparaîtra ici.",
   "empty_column.group": "There is nothing in this group yet. When members of this group make new posts, they will appear here.",
@@ -502,33 +505,34 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Suivant",
   "enlistment.pass": "Passer",
-  "enlistment.step0.body": "Ce site est votre porte d’entrée vers un réseau de serveurs indépendants qui communiquent ensemble pour former un réseau social plus large : le <span class='italic'>fediverse</span>.<br /><br />Chaque serveur est appelé “instance”.<br/>Ton instance c’est tout simplement ce site :",
-  "enlistment.step0.explanation": "C’est cet identifiant que tu peux partager sur le fediverse",
-  "enlistment.step0.title": "Bienvenue sur le Fediverse !",
-  "enlistment.step0.username": "ton pseudo complet",
-  "enlistment.step1.explanation": "Pas d’inquiétude cependant, lors de la rédaction d’un post, l’autosuggestion t’aidera à trouver la bonne mention ! Par ailleurs si tu réponds à un post, la mention sera automatiquement écrite de la bonne manière.",
-  "enlistment.step1.left": "Ici tu es sur {title}. Si tu échanges avec des gens de la même instance que toi, tu peux les mentionners avec simplement {username}{br}{br}ex: {contact}, si tu veux parler à l’admin de {title}",
-  "enlistment.step1.right": "Si tu échanges avec une personne d’une autre instance il faudra la mentionner avec son <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href='https://oslo.town/@matt'>@matt@oslo.town</a>, si tu veux parler à l’admin d’Oslo.town",
-  "enlistment.step1.title": "Comment ça marche ?",
-  "enlistment.step1.username": "@pseudo",
-  "enlistment.step2.col1": "Ici tu es en terrain connu : seules tes publications et celles des personnes que tu suis s’afficheront sur ce fil.",
-  "enlistment.step2.col2": "Ici c’est un peu ton quartier : tu n’y trouveras que des publications venant de membres de cette instance, que tu les suives ou non.",
-  "enlistment.step2.col3": "Sors des sentiers battus et va explorer le reste du monde : ce fil affiche les publications de l’ensemble des instances connues.",
-  "enlistment.step2.explanation1": "Au départ ce sera un peu vide mais pas de souci on peut t’aider à le fournir !",
-  "enlistment.step2.explanation2": "On l’appelle généralement fil “local”.",
-  "enlistment.step2.explanation3": "On l’appelle généralement fil “global” ou “fédéré”.",
-  "enlistment.step2.title1": "Accueil",
-  "enlistment.step2.title3": "Découvrir",
-  "enlistment.step3.description": "Ce site offre un contrôle précis de qui peut voir tes publications et donc interagir avec toi.",
-  "enlistment.step3.direct-description": "La publication n'est visible que par les personnes mentionnées via @pseudo@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "La publication n’est affichée sur aucun fil public et n’est visible que par les personnes qui te suivent",
-  "enlistment.step3.followers-title": "Abonné·e·s seulement",
-  "enlistment.step3.public-description": "La publication est affichée sur l'ensemble des fils, y compris sur les autres instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Confidentialité",
-  "enlistment.step3.unlisted-description": "La publication est publique mais n’apparaît que dans les fils de vos abonnés ainsi que sur ton profil",
-  "enlistment.step3.unlisted-title": "Non-listé",
+  "onboarding.welcome.body1": "Ce site est votre porte d’entrée vers un réseau de serveurs indépendants qui communiquent ensemble pour former un réseau social plus large : le <span class='italic'>fediverse</span>.",
+  "onboarding.welcome.body2": "Chaque serveur est appelé “instance”.<br/>Ton instance c’est tout simplement ce site :",
+  "onboarding.welcome.explanation": "C’est cet identifiant que tu peux partager sur le fediverse",
+  "onboarding.welcome.title": "Bienvenue sur le Fediverse !",
+  "onboarding.welcome.username": "ton pseudo complet",
+  "onboarding.how-it-works.explanation": "Pas d’inquiétude cependant, lors de la rédaction d’un post, l’autosuggestion t’aidera à trouver la bonne mention ! Par ailleurs si tu réponds à un post, la mention sera automatiquement écrite de la bonne manière.",
+  "onboarding.how-it-works.left": "Ici tu es sur {title}. Si tu échanges avec des gens de la même instance que toi, tu peux les mentionners avec simplement {username}{br}{br}ex: {contact}, si tu veux parler à l’admin de {title}",
+  "onboarding.how-it-works.right": "Si tu échanges avec une personne d’une autre instance il faudra la mentionner avec son <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href='https://oslo.town/@matt'>@matt@oslo.town</a>, si tu veux parler à l’admin d’Oslo.town",
+  "onboarding.how-it-works.title": "Comment ça marche ?",
+  "onboarding.how-it-works.username": "@pseudo",
+  "onboarding.feeds.col1": "Ici tu es en terrain connu : seules tes publications et celles des personnes que tu suis s’afficheront sur ce fil.",
+  "onboarding.feeds.col2": "Ici c’est un peu ton quartier : tu n’y trouveras que des publications venant de membres de cette instance, que tu les suives ou non.",
+  "onboarding.feeds.col3": "Sors des sentiers battus et va explorer le reste du monde : ce fil affiche les publications de l’ensemble des instances connues.",
+  "onboarding.feeds.explanation1": "Au départ ce sera un peu vide mais pas de souci on peut t’aider à le fournir !",
+  "onboarding.feeds.explanation2": "On l’appelle généralement fil “local”.",
+  "onboarding.feeds.explanation3": "On l’appelle généralement fil “global” ou “fédéré”.",
+  "onboarding.feeds.title1": "Accueil",
+  "onboarding.feeds.title3": "Découvrir",
+  "onboarding.privacy.description": "Ce site offre un contrôle précis de qui peut voir tes publications et donc interagir avec toi.",
+  "onboarding.privacy.direct-description": "La publication n'est visible que par les personnes mentionnées via @pseudo@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "La publication n’est affichée sur aucun fil public et n’est visible que par les personnes qui te suivent",
+  "onboarding.privacy.followers-title": "Abonné·e·s seulement",
+  "onboarding.privacy.public-description": "La publication est affichée sur l'ensemble des fils, y compris sur les autres instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Confidentialité",
+  "onboarding.privacy.unlisted-description": "La publication est publique mais n’apparaît que dans les fils de vos abonnés ainsi que sur ton profil",
+  "onboarding.privacy.unlisted-title": "Non-listé",
   "enlistment.step4.complete": "compléter ton profil",
   "enlistment.step4.conduct": "code de conduite",
   "enlistment.step4.disclaimer": "Tu es presque prêt·e à plonger dans le grand bain.",
@@ -566,17 +570,17 @@
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
-  "filters.added": "Filter added.",
-  "filters.context_header": "Filter contexts",
-  "filters.context_hint": "One or multiple contexts where the filter should apply",
-  "filters.filters_list_context_label": "Filter contexts:",
-  "filters.filters_list_delete": "Delete",
-  "filters.filters_list_details_label": "Filter settings:",
-  "filters.filters_list_drop": "Drop",
-  "filters.filters_list_hide": "Hide",
-  "filters.filters_list_phrase_label": "Keyword or phrase:",
-  "filters.filters_list_whole-word": "Whole word",
-  "filters.removed": "Filter deleted.",
+  "filters.added": "Filtre ajouté.",
+  "filters.context_header": "Contextes de filtrage",
+  "filters.context_hint": "Où le filtre doit-t'il s'appliquer ?",
+  "filters.filters_list_context_label": "Contextes de filtrage:",
+  "filters.filters_list_delete": "Supprimer",
+  "filters.filters_list_details_label": "Paramètres du filtre:",
+  "filters.filters_list_drop": "Ignorer et supprimer",
+  "filters.filters_list_hide": "Masquer",
+  "filters.filters_list_phrase_label": "Mot clé ou phrase:",
+  "filters.filters_list_whole-word": "Mot entier",
+  "filters.removed": "Filtre supprimé.",
   "followRecommendations.heading": "Suggested profiles",
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
@@ -618,19 +622,19 @@
   "icon_button.icons": "Icons",
   "icon_button.label": "Select icon",
   "icon_button.not_found": "No icons!! (╯°□°）╯︵ ┻━┻",
-  "import_data.actions.import": "Import",
-  "import_data.actions.import_blocks": "Import blocks",
-  "import_data.actions.import_follows": "Import follows",
-  "import_data.actions.import_mutes": "Import mutes",
-  "import_data.blocks_label": "Blocks",
-  "import_data.follows_label": "Follows",
-  "import_data.hints.blocks": "CSV file containing a list of blocked accounts",
-  "import_data.hints.follows": "CSV file containing a list of followed accounts",
-  "import_data.hints.mutes": "CSV file containing a list of muted accounts",
-  "import_data.mutes_label": "Mutes",
-  "import_data.success.blocks": "Blocks imported successfully",
-  "import_data.success.followers": "Followers imported successfully",
-  "import_data.success.mutes": "Mutes imported successfully",
+  "import_data.actions.import": "Importer",
+  "import_data.actions.import_blocks": "Importer les comptes bloqués",
+  "import_data.actions.import_follows": "Importer les comptes suivis",
+  "import_data.actions.import_mutes": "Importer les comptes silenciés",
+  "import_data.blocks_label": "Comptes bloqués",
+  "import_data.follows_label": "Comptes suivis",
+  "import_data.hints.blocks": "Fichier CSV contenant la liste des comptes à bloquer",
+  "import_data.hints.follows": "Fichier CSV contenant la liste des comptes à suivre",
+  "import_data.hints.mutes": "Fichier CSV contenant la listes des comptes à silencier",
+  "import_data.mutes_label": "Comptes silenciés",
+  "import_data.success.blocks": "Comptes bloqués importés avec succès",
+  "import_data.success.followers": "Comptes à suivre importés avec succès",
+  "import_data.success.mutes": "Comptes à silencier importés avec succès",
   "input.password.hide_password": "Hide password",
   "input.password.show_password": "Show password",
   "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
@@ -755,14 +759,14 @@
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots silenciés",
   "navigation_bar.follow_requests": "Demandes de suivi",
-  "navigation_bar.import_data": "Import data",
+  "navigation_bar.import_data": "Importer vos données",
   "navigation_bar.in_reply_to": "In reply to",
   "navigation_bar.invites": "Invites",
   "navigation_bar.logout": "Déconnexion",
   "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.preferences": "Préférences",
-  "navigation_bar.profile_directory": "Profile directory",
-  "navigation_bar.soapbox_config": "Mangane config",
+  "navigation_bar.profile_directory": "Annuaire",
+  "navigation_bar.soapbox_config": "Configuration de Mangane",
   "notification.favourite": "{name} a ajouté à ses favoris :",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
@@ -792,23 +796,23 @@
   "notifications.queue_label": "Click to see {count} new {count, plural, one {notification} other {notifications}}",
   "oauth_consumer.tooltip": "Sign in with {provider}",
   "oauth_consumers.title": "Other ways to sign in",
-  "onboarding.avatar.subtitle": "Just have fun with it.",
-  "onboarding.avatar.title": "Choose a profile picture",
-  "onboarding.display_name.subtitle": "You can always edit this later.",
-  "onboarding.display_name.title": "Choose a display name",
-  "onboarding.done": "Done",
-  "onboarding.finished.message": "We are very excited to welcome you to our community! Tap the button below to get started.",
-  "onboarding.finished.title": "Onboarding complete",
-  "onboarding.header.subtitle": "This will be shown at the top of your profile.",
-  "onboarding.header.title": "Pick a cover image",
-  "onboarding.next": "Next",
-  "onboarding.note.subtitle": "You can always edit this later.",
-  "onboarding.note.title": "Write a short bio",
-  "onboarding.saving": "Saving…",
-  "onboarding.skip": "Skip for now",
+  "onboarding.avatar.subtitle": "Choisis un truc sympa !",
+  "onboarding.avatar.title": "Choisir une photo de profil",
+  "onboarding.display_name.subtitle": "Il est toujours possible d'en changer plus tard.",
+  "onboarding.display_name.title": "Choisir un nom d'affichage",
+  "onboarding.done": "Terminé",
+  "onboarding.finished.message": "On a hâte de discuter avec toi ! Pense néanmoins à consulter les règles de l'instance, et n'hésite pas à poser des questions aux gens que tu croiseras.",
+  "onboarding.finished.title": "Embarquement terminé",
+  "onboarding.header.subtitle": "On affichera ça au dessus de ton profil !",
+  "onboarding.header.title": "Choisir une couverture",
+  "onboarding.next": "Suivant",
+  "onboarding.note.subtitle": "Il est toujours possible d'en changer plus tard.",
+  "onboarding.note.title": "Une courte présentation",
+  "onboarding.saving": "Enregistrement...",
+  "onboarding.skip": "Passer",
   "onboarding.suggestions.subtitle": "Here are a few of the most popular accounts you might like.",
   "onboarding.suggestions.title": "Suggested accounts",
-  "onboarding.view_feed": "View Feed",
+  "onboarding.view_feed": "C'est parti !",
   "password_reset.confirmation": "Check your email for confirmation.",
   "password_reset.fields.username_placeholder": "Email or username",
   "password_reset.header": "Reset Password",
@@ -840,7 +844,6 @@
   "preferences.fields.display_media.hide_all": "Toujours cacher les medias",
   "preferences.fields.display_media.show_all": "Toujours afficher les medias",
   "preferences.fields.dyslexic_font_label": "Mode dyslexique",
-  "preferences.fields.enlisted": "Ignorer l'onboarding",
   "preferences.fields.expand_spoilers_label": "Toujours étendre les publications sensibles",
   "preferences.fields.language_label": "Langage",
   "preferences.fields.media_display_label": "Media",
@@ -848,7 +851,7 @@
   "preferences.fields.privacy_label": "Confidentialité par défaut des publications",
   "preferences.fields.reduce_motion_label": "Reduce motion in animations",
   "preferences.fields.system_font_label": "Use system's default font",
-  "preferences.fields.theme": "Theme",
+  "preferences.fields.theme": "Thème",
   "preferences.fields.underline_links_label": "Always underline links in posts",
   "preferences.fields.unfollow_modal_label": "Show confirmation dialog before unfollowing someone",
   "preferences.hints.demetricator": "Decrease social media anxiety by hiding all numbers from the site.",
@@ -948,7 +951,7 @@
   "report.done": "Done",
   "report.forward": "Transférer à {target}",
   "report.forward_hint": "Le compte provient d’un autre serveur. Envoyez également une copie anonyme du rapport ?",
-  "report.next": "Next",
+  "report.next": "Suivant",
   "report.otherActions.addAdditionl": "Would you like to add additional statuses to this report?",
   "report.otherActions.addMore": "Add more",
   "report.otherActions.furtherActions": "Further actions:",
@@ -1010,34 +1013,34 @@
   "shared.tos": "Terms of Service",
   "signup_panel.subtitle": "S'enregistrer pour causer",
   "signup_panel.title": "Nouveau sur {site_title}?",
-  "site_preview.preview": "Preview",
+  "site_preview.preview": "Aperçu",
   "snackbar.view": "Voir",
-  "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.",
-  "soapbox_config.authenticated_profile_label": "Profiles require authentication",
-  "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_config.authenticated_profile_hint": "Les utilisateurs doivent être connectés pour voir les statuts et média d'un compte de l'instance",
+  "soapbox_config.authenticated_profile_label": "N'afficher les profils qu'aux utilisateurs authentifiés",
+  "soapbox_config.copyright_footer.meta_fields.label_placeholder": "Copyright",
   "soapbox_config.crypto_address.meta_fields.address_placeholder": "Address",
   "soapbox_config.crypto_address.meta_fields.note_placeholder": "Note (optional)",
   "soapbox_config.crypto_address.meta_fields.ticker_placeholder": "Ticker",
   "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Number of items to display in the crypto homepage widget",
   "soapbox_config.custom_css.meta_fields.url_placeholder": "URL",
-  "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.",
-  "soapbox_config.fields.accent_color_label": "Accent color",
-  "soapbox_config.fields.brand_color_label": "Brand color",
+  "soapbox_config.display_fqn_label": "Afficher le domaine de l'instance pour les comptes locaux",
+  "soapbox_config.fields.accent_color_label": "Couleur d'accentuation",
+  "soapbox_config.fields.brand_color_label": "Couleur Principale",
   "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses",
-  "soapbox_config.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_config.fields.home_footer_fields_label": "Pied de page de l'index",
   "soapbox_config.fields.logo_label": "Logo",
-  "soapbox_config.fields.promo_panel_fields_label": "Promo panel items",
-  "soapbox_config.fields.theme_label": "Default theme",
-  "soapbox_config.greentext_label": "Enable greentext support",
-  "soapbox_config.headings.advanced": "Advanced",
+  "soapbox_config.fields.promo_panel_fields_label": "Panneau de promotion",
+  "soapbox_config.fields.theme_label": "Thème par défaut",
+  "soapbox_config.greentext_label": "Activerle support greentext",
+  "soapbox_config.headings.advanced": "Avancé",
   "soapbox_config.headings.cryptocurrency": "Cryptocurrency",
   "soapbox_config.headings.navigation": "Navigation",
   "soapbox_config.headings.options": "Options",
-  "soapbox_config.headings.theme": "Theme",
+  "soapbox_config.headings.theme": "Thème",
   "soapbox_config.hints.crypto_addresses": "Add cryptocurrency addresses so users of your site can donate to you. Order matters, and you must use lowercase ticker values.",
-  "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
-  "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio",
-  "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the right panel of the timelines page.",
+  "soapbox_config.hints.home_footer_fields": "Il est possible d'afficher des liens personnalisés dans le pied des pages statiques.",
+  "soapbox_config.hints.logo": "SVG. 2Mo maximum. Sera affiché avec une hauteur de 50px et conservation du ratio",
+  "soapbox_config.hints.promo_panel_fields": "Il est possible d'afficher des liens personnalisés dans la colonne à droite du fil.",
   "soapbox_config.hints.promo_panel_icons.link": "Soapbox Icons List",
   "soapbox_config.home_footer.meta_fields.label_placeholder": "Label",
   "soapbox_config.home_footer.meta_fields.url_placeholder": "URL",
@@ -1045,14 +1048,17 @@
   "soapbox_config.promo_panel.meta_fields.label_placeholder": "Label",
   "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL",
   "soapbox_config.raw_json_hint": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click Save to apply your changes.",
-  "soapbox_config.raw_json_label": "Advanced: Edit raw JSON data",
+  "soapbox_config.raw_json_label": "Avancé: Editer le fichier JSON",
   "soapbox_config.save": "Enregistrer",
-  "soapbox_config.saved": "Soapbox config saved!",
-  "soapbox_config.single_user_mode_hint": "Front page will redirect to a given user profile.",
-  "soapbox_config.single_user_mode_label": "Single user mode",
+  "soapbox_config.saved": "Configuration sauvegardée !",
+  "soapbox_config.headings.home": "Page d'accueil",
+  "soapbox_config.home_description": "Description de l'instance affichée sur la page d'accueil. Supporte le HTML. Vous pouvez utiliser [users] pour insérer le nombre d'utilisateurs courant dans la description.",
+  "soapbox_config.single_user_mode_hint": "L'index affichera le profil d'un utilisateur donné.",
+  "soapbox_config.single_user_mode_label": "Mode utilisateur unique",
   "soapbox_config.single_user_mode_profile_hint": "@handle",
   "soapbox_config.single_user_mode_profile_label": "Main user handle",
-  "soapbox_config.verified_can_edit_name_label": "Allow verified users to edit their own display name.",
+  "soapbox_config.verified_can_edit_name_label": "Autoriser les utilisateurs vérifiés à modifier leur propre nom d'utilisateur",
+  "landingPage.admins": "Modérateurs",
   "sponsored.info.message": "{siteTitle} displays ads to help fund our service.",
   "sponsored.info.title": "Why am I seeing this ad?",
   "sponsored.subtitle": "Sponsored post",
@@ -1060,8 +1066,8 @@
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_status": "Ouvrir ce statut dans l’interface de modération",
   "status.block": "Bloquer @{name}",
-  "status.bookmark": "Bookmark",
-  "status.bookmarked": "Bookmark added.",
+  "status.bookmark": "Marque-page",
+  "status.bookmarked": "Marque-page ajouté.",
   "status.cancel_reblog_private": "Dé-booster",
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.chat": "Chat with @{name}",
@@ -1069,7 +1075,7 @@
   "status.delete": "Effacer",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Envoyer un message direct à @{name}",
-  "status.edit": "Edit",
+  "status.edit": "Éditer",
   "status.embed": "Intégrer",
   "status.favourite": "Réagir",
   "status.filtered": "Filtré",
@@ -1103,8 +1109,8 @@
   "status.replyAll": "Répondre au fil",
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
-  "status.sensitive_warning.action": "Show content",
-  "status.sensitive_warning.subtitle": "This content may not be suitable for all audiences.",
+  "status.sensitive_warning.action": "Afficher le media",
+  "status.sensitive_warning.subtitle": "Ce media a été marqué comme ne convenant pas à tout public.",
   "status.share": "Partager",
   "status.show_less": "Replier",
   "status.show_less_all": "Tout replier",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index bd80ad98d..0e3f9e33a 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index af7db4f57..754367938 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 438963319..a95c5072e 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index ad87d8443..644011b06 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index 7086678f4..703a629fb 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index 16531ada9..302f6fb78 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index e30a323a8..3884df64c 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index a507e7f44..c46572c8a 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index cf6b1adf8..4311361ba 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/is.json b/app/soapbox/locales/is.json
index 66fe168dd..84faf2b8a 100644
--- a/app/soapbox/locales/is.json
+++ b/app/soapbox/locales/is.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 3a28a9abb..505df91ea 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index 0837d2bdd..e9455b96b 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index e99f271f5..ce1908c9c 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index 91241cfcd..5ecc129d3 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index c664f6e08..708589141 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index ffd55b939..ade9964e0 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index 358b1f2e0..cc2b39908 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index 65aaa249c..43383ded2 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index ee91396de..99321ac58 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index b3344bac6..6b9f228ce 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index addeb8891..8b7e87569 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 9e3bf995a..6f0535cad 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index 37b442276..1f368289c 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 12c93e8e0..d9b36ee2c 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -502,33 +502,33 @@
   "empty_column.test": "Testowa oś czasu jest pusta.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index b621d763e..a31fa7e27 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index 87e6a9609..9e3f5cfbe 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 823d0d34d..8215e6deb 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 6439e2d62..c1488e57a 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index ddf9fef25..e985b49dd 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index 6d7f1523e..e3087a9b5 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index 794eb703d..fd7759c5f 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index 1eb31fddf..3af7bf222 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 748e123f8..c33e84ce4 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index f8930090a..e617dac15 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index 37d1a4d55..3b0e7cac9 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 8d318ca97..66f671cab 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index f6b26bc82..6184d4aae 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index f641913f8..0c196dfae 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index dda4d0736..44f5cb39c 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 2f3b82396..d819798d3 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index d6f6eca64..de9cc4ec0 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index 370949479..be43ebf20 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -502,33 +502,33 @@
   "empty_column.test": "The test timeline is empty.",
   "enlistment.next": "Next",
   "enlistment.pass": "Ignore",
-  "enlistment.step0.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
-  "enlistment.step0.explanation": "It is this identifier that you can share on the fediverse",
-  "enlistment.step0.title": "Welcome on Mangane",
-  "enlistment.step0.username": "You full username",
-  "enlistment.step1.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
-  "enlistment.step1.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
-  "enlistment.step1.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
-  "enlistment.step1.title": "How it works ?",
-  "enlistment.step1.username": "@username",
-  "enlistment.step2.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
-  "enlistment.step2.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
-  "enlistment.step2.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
-  "enlistment.step2.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
-  "enlistment.step2.explanation2": "We usually call it \"local\" thread",
-  "enlistment.step2.explanation3": "We usually call it \"global\" or \"federated\" thread",
-  "enlistment.step2.title1": "Home",
-  "enlistment.step2.title3": "Discover",
-  "enlistment.step3.description": "This site offers precise control over who can see your posts and therefore interact with you.",
-  "enlistment.step3.direct-description": "The post is only visible to people mentioned via @username@instance",
-  "enlistment.step3.direct-title": "Direct",
-  "enlistment.step3.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
-  "enlistment.step3.followers-title": "Followers only",
-  "enlistment.step3.public-description": "The post is displayed on all feeds, including other instances.",
-  "enlistment.step3.public-title": "Public",
-  "enlistment.step3.title": "Privacy",
-  "enlistment.step3.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
-  "enlistment.step3.unlisted-title": "Unlisted",
+  "onboarding.welcome.body": "Mangane is your gateway to a network of independent servers that communicate together to form a larger social network: the fediverse. Each server is called an “instance”. Your instance is simply this site: ",
+  "onboarding.welcome.explanation": "It is this identifier that you can share on the fediverse",
+  "onboarding.welcome.title": "Welcome on Mangane",
+  "onboarding.welcome.username": "You full username",
+  "onboarding.how-it-works.explanation": "Don't worry though, when writing a post, autosuggestion will help you find the right mention! Moreover, if you reply to a post, the mention will automatically be written in the right way.",
+  "onboarding.how-it-works.left": "Here you are on {title}. If you exchange with people from the same instance as you, you can simply mention them with {username}{br}{br}ex: {contact}, if you want to talk to the admin of {title}",
+  "onboarding.how-it-works.right": "If you exchange with a person from another instance, you must mention them with their <span class='font-bold'>@pseudo@instance</span><br/><br/> ex: <a href=' https://oslo.town/@matt'>@matt@oslo.town</a>, if you want to talk to the Oslo.town admin",
+  "onboarding.how-it-works.title": "How it works ?",
+  "onboarding.how-it-works.username": "@username",
+  "onboarding.feeds.col1": "Here you are on familiar ground: only your publications and those of the people you follow will be displayed on this thread.",
+  "onboarding.feeds.col2": "Here is a bit like your neighborhood: you will only find publications from members of this server, whether you follow them or not.",
+  "onboarding.feeds.col3": "Think outside the box and go explore the rest of the world: this thread displays posts from all known instances.",
+  "onboarding.feeds.explanation1": "At first it will be a little empty but don't worry we can help you fill it!",
+  "onboarding.feeds.explanation2": "We usually call it \"local\" thread",
+  "onboarding.feeds.explanation3": "We usually call it \"global\" or \"federated\" thread",
+  "onboarding.feeds.title1": "Home",
+  "onboarding.feeds.title3": "Discover",
+  "onboarding.privacy.description": "This site offers precise control over who can see your posts and therefore interact with you.",
+  "onboarding.privacy.direct-description": "The post is only visible to people mentioned via @username@instance",
+  "onboarding.privacy.direct-title": "Direct",
+  "onboarding.privacy.followers-description": "The post is not displayed on any public feeds and is only visible to people who follow you",
+  "onboarding.privacy.followers-title": "Followers only",
+  "onboarding.privacy.public-description": "The post is displayed on all feeds, including other instances.",
+  "onboarding.privacy.public-title": "Public",
+  "onboarding.privacy.title": "Privacy",
+  "onboarding.privacy.unlisted-description": "The post is public but only appears in your subscribers' feeds and on your profile",
+  "onboarding.privacy.unlisted-title": "Unlisted",
   "enlistment.step4.complete": "complete your profile",
   "enlistment.step4.conduct": "code of conduct",
   "enlistment.step4.disclaimer": "You're almost ready to dive into the deep end.",
diff --git a/app/soapbox/normalizers/instance.ts b/app/soapbox/normalizers/instance.ts
index 6987fc6f5..148073624 100644
--- a/app/soapbox/normalizers/instance.ts
+++ b/app/soapbox/normalizers/instance.ts
@@ -50,6 +50,7 @@ export const InstanceRecord = ImmutableRecord({
         enabled: true,
         exclusions: false,
       }),
+      staff_accounts: [],
     }),
     stats: ImmutableMap(),
   }),
diff --git a/app/soapbox/normalizers/soapbox/soapbox_config.ts b/app/soapbox/normalizers/soapbox/soapbox_config.ts
index d0f778185..2ac19ecdc 100644
--- a/app/soapbox/normalizers/soapbox/soapbox_config.ts
+++ b/app/soapbox/normalizers/soapbox/soapbox_config.ts
@@ -123,6 +123,7 @@ export const SoapboxConfigRecord = ImmutableRecord({
   singleUserModeProfile: '',
   linkFooterMessage: '',
   links: ImmutableMap<string, string>(),
+  homeDescription: '',
 }, 'SoapboxConfig');
 
 type SoapboxConfigMap = ImmutableMap<string, any>;
diff --git a/app/soapbox/reducers/instance.ts b/app/soapbox/reducers/instance.ts
index 4c1456dc4..2d5e3f951 100644
--- a/app/soapbox/reducers/instance.ts
+++ b/app/soapbox/reducers/instance.ts
@@ -17,15 +17,17 @@ import type { AnyAction } from 'redux';
 const initialState = normalizeInstance(ImmutableMap());
 
 const nodeinfoToInstance = (nodeinfo: ImmutableMap<string, any>) => {
+  const data = nodeinfo.get("data");
   // Match Pleroma's develop branch
   return normalizeInstance(ImmutableMap({
     pleroma: ImmutableMap({
       metadata: ImmutableMap({
-        account_activation_required: nodeinfo.getIn(['metadata', 'accountActivationRequired']),
-        features: nodeinfo.getIn(['metadata', 'features']),
-        federation: nodeinfo.getIn(['metadata', 'federation']),
+        account_activation_required: data.getIn(['metadata', 'accountActivationRequired']),
+        features: data.getIn(['metadata', 'features']),
+        staff_accounts: data.getIn(['metadata', 'staffAccounts']),
+        federation: data.getIn(['metadata', 'federation']),
         fields_limits: ImmutableMap({
-          max_fields: nodeinfo.getIn(['metadata', 'fieldsLimits', 'maxFields']),
+          max_fields: data.getIn(['metadata', 'fieldsLimits', 'maxFields']),
         }),
       }),
     }),
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index a782540c4..97613d80a 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -202,13 +202,13 @@ const getInstanceFeatures = (instance: Instance) => {
      * Pleroma chats API.
      * @see {@link https://docs.pleroma.social/backend/development/API/chats/}
      */
-    chats: (v.software === PLEROMA || v.software === AKKOMA) && gte(v.version, '2.1.0'),
+    chats: (v.software === PLEROMA || features.includes('pleroma_chat_messages')) && gte(v.version, '2.1.0'),
 
     /**
      * Paginated chats API.
      * @see GET /api/v2/chats
      */
-    chatsV2: (v.software === PLEROMA || v.software === AKKOMA) && gte(v.version, '2.3.0'),
+    chatsV2: (v.software === PLEROMA || features.includes('pleroma_chat_messages')) && gte(v.version, '2.3.0'),
 
     /**
      * Mastodon's newer solution for direct messaging.
diff --git a/app/styles/application.scss b/app/styles/application.scss
index c503061b3..ec7669778 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -46,6 +46,7 @@
 @import 'components/detailed-status';
 @import 'components/media-gallery';
 @import 'components/notification';
+@import 'components/sticky';
 @import 'components/display-name';
 @import 'components/columns';
 @import 'components/search';
diff --git a/app/styles/components/directory.scss b/app/styles/components/directory.scss
index fa6925df7..432096eb7 100644
--- a/app/styles/components/directory.scss
+++ b/app/styles/components/directory.scss
@@ -31,13 +31,39 @@
   }
 
   &__card {
-    @apply rounded-lg bg-gray-100 dark:bg-slate-700;
+    @apply rounded-lg;
     box-sizing: border-box;
     margin-bottom: 0;
-    box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.1);
     overflow: hidden;
     position: relative;
 
+    .display-name {
+      text-align: left;
+
+      strong {
+        @apply text-black dark:text-white;
+        display: block;
+        font-size: 15px;
+        font-weight: 500;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      span:not(.verified-icon) {
+        @apply text-gray-500 dark:text-gray-400;
+        display: block;
+        font-size: 14px;
+        font-weight: 400;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .verified-icon div,
+      .verified-icon svg {
+        @apply inline;
+      }
+    }
+
     &__info {
       z-index: 1;
       position: absolute;
@@ -97,33 +123,6 @@
           object-fit: cover;
         }
       }
-
-      .display-name {
-        margin-left: 15px;
-        text-align: left;
-
-        strong {
-          @apply text-black dark:text-white;
-          font-size: 15px;
-          font-weight: 500;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        span:not(.verified-icon) {
-          @apply text-gray-500 dark:text-gray-400;
-          display: block;
-          font-size: 14px;
-          font-weight: 400;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .verified-icon div,
-        .verified-icon svg {
-          @apply inline;
-        }
-      }
     }
 
     &__extra {
diff --git a/app/styles/components/sticky.scss b/app/styles/components/sticky.scss
new file mode 100644
index 000000000..7af195d89
--- /dev/null
+++ b/app/styles/components/sticky.scss
@@ -0,0 +1,15 @@
+@keyframes component-sticky__appear {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+.component-sticky__fixed {
+    animation-name: component-sticky__appear;
+    animation-duration: 0.2s;
+    animation-fill-mode: forwards;
+}
\ No newline at end of file
diff --git a/webpack/development.js b/webpack/development.js
index 231f2444b..affa0cbbe 100644
--- a/webpack/development.js
+++ b/webpack/development.js
@@ -1,5 +1,3 @@
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 console.log('Running in development mode'); // eslint-disable-line no-console
 
@@ -114,7 +112,5 @@ module.exports = merge(sharedConfig, {
     },
     proxy: makeProxyConfig(),
   },
-  plugins: [
-    new ForkTsCheckerWebpackPlugin({ typescript: { memoryLimit: 8192 } }),
-  ]
+  plugins: [],
 });
diff --git a/webpack/rules/assets.js b/webpack/rules/assets.js
index b98f26378..fc0fa9193 100644
--- a/webpack/rules/assets.js
+++ b/webpack/rules/assets.js
@@ -85,6 +85,6 @@ module.exports = [{
   type: 'asset/resource',
   include: resolve('app'),
   generator: {
-    filename: 'manifest.json'
-  }
+    filename: 'manifest.json',
+  },
 }];