diff --git a/.eslintrc.js b/.eslintrc.js
index 8ab899ae5f1..26c86424233 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,13 +24,13 @@ module.exports = defineConfig({
     sourceType: 'module',
     warnOnUnsupportedTypeScriptVersion: false,
   },
-  plugins: ['@typescript-eslint', 'prettier'],
+  plugins: ['@typescript-eslint', 'prettier', 'deprecation'],
   rules: {
     // We may want to use this in the future
     'no-useless-escape': 'off',
+    'deprecation/deprecation': 'error',
     eqeqeq: ['error', 'always', { null: 'ignore' }],
     'prefer-template': 'error',
-
     '@typescript-eslint/array-type': [
       'error',
       { default: 'array-simple', readonly: 'generic' },
@@ -88,6 +88,7 @@ module.exports = defineConfig({
     {
       files: ['test/*.spec.ts'],
       rules: {
+        'deprecation/deprecation': 'off',
         '@typescript-eslint/restrict-template-expressions': [
           'error',
           {
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 988d8cd5a07..8ec56cca333 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,5 @@
-<!-- Please first read https://github.com/faker-js/faker/blob/verify-semantic-pull-requests/CONTRIBUTING.md -->
+<!-- Please run `pnpm run preflight` before opening a Pull Request to ensure that your code fulfills the minimal requirements for our project. -->
 
-<!-- Help us by writing a correct PR title following this guide: https://github.com/faker-js/faker/blob/verify-semantic-pull-requests/CONTRIBUTING.md#committing -->
+<!-- Please first read https://github.com/faker-js/faker/blob/next/CONTRIBUTING.md -->
+
+<!-- Help us by writing a correct PR title following this guide: https://github.com/faker-js/faker/blob/next/CONTRIBUTING.md#committing -->
diff --git a/.github/workflows/commentCodeGeneration.ts b/.github/workflows/commentCodeGeneration.ts
index 74a8092735a..f456e563a4e 100644
--- a/.github/workflows/commentCodeGeneration.ts
+++ b/.github/workflows/commentCodeGeneration.ts
@@ -21,7 +21,7 @@ module.exports = async (
     issue_number: context.issue.number,
   });
 
-  const body = `Uncommitted changes were detected after runnning <code>generate:*</code> commands.\nPlease run <code>pnpm run generate:locales</code>, <code>pnpm run generate:api-docs</code>, and <code>pnpm run test -u</code> to generate/update the related files, and commit them.`;
+  const body = `Uncommitted changes were detected after runnning <code>generate:*</code> commands.\nPlease run <code>pnpm run preflight</code> to generate/update the related files, and commit them.`;
 
   const botComment = comments.find(
     (comment) => comment.user?.type === 'Bot' && comment.body?.includes(body)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 665030879d5..35ed17d11fe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ If you want to make `Faker` a better, please read the following contribution gui
 
 # Important
 
-- Please make sure that you run `pnpm install`, `pnpm run build` and `pnpm run test` before making a PR to ensure that everything is working from the start.
+Please make sure that you run `pnpm run preflight` before making a PR to ensure that everything is working from the start.
 
 ## Good to know
 
@@ -21,6 +21,15 @@ The sources are located in the [src](src) directory.
 All fake data generators are divided into namespaces (each namespace being a separate module).
 Most of the generators use the _definitions_, which are just plain JavaScript objects/arrays/strings that are separate for each [locale](src/locales).
 
+## Sourcing data for definitions
+
+If adding new data definitions to Faker, you'll often need to find source data. Note that:
+
+- Faker must not contain copyrighted materials.
+- Facts cannot be copyrighted, so if you are adding or translating a finite, known, list of things such as the names of chemical elements into another language, that's OK.
+- But if you are compiling a list of, for example, popular personal names or cities, don't copy directly from a single source (Wikipedia, 'most popular' articles, government data sites etc). A compilation of facts [can be copyrighted](https://en.wikipedia.org/wiki/Copyright_in_compilation).
+- It's best to refer to multiple sources and use your own judgement/knowledge to make a sample list of data.
+
 ## Building Faker
 
 The project is being built by [esbuild](https://esbuild.github.io) (see [bundle.ts](scripts/bundle.ts))
diff --git a/README.md b/README.md
index 01cb6d103fc..5aea0cea14f 100644
--- a/README.md
+++ b/README.md
@@ -10,18 +10,17 @@
   [![Chat on Discord](https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord)](https://chat.fakerjs.dev)
   [![Open Collective](https://img.shields.io/opencollective/backers/fakerjs)](https://opencollective.com/fakerjs#section-contributors)
   [![sponsor](https://img.shields.io/opencollective/all/fakerjs?label=sponsors)](https://opencollective.com/fakerjs)
-  
 </div>
 
 ## ⚡️ Try it Online
 
-[![](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://fakerjs.dev/new)
+[Open in StackBlitz](https://fakerjs.dev/new)
 
-[API Documentation](https://fakerjs.dev/guide/)
+## 📙 API Documentation
 
----
+[Guide - Getting started](https://fakerjs.dev/guide/)
 
-Please select the version of the documentation you are looking for.
+For detailed API documentation, please select the version of the documentation you are looking for.
 
 | Version |                         Github                         | Website                   |
 | :-----: | :----------------------------------------------------: | :------------------------ |
@@ -57,10 +56,11 @@ npm install --save-dev @faker-js/faker
 ## 🪄 Usage
 
 ```ts
+// ESM
 import { faker } from '@faker-js/faker';
-// import { faker } from '@faker-js/faker/locale/de';
 
-export const USERS: User[] = [];
+// CJS
+const { faker } = require('@faker-js/faker');
 
 export function createRandomUser(): User {
   return {
@@ -74,8 +74,8 @@ export function createRandomUser(): User {
   };
 }
 
-Array.from({ length: 10 }).forEach(() => {
-  USERS.push(createRandomUser());
+export const USERS: User[] = faker.helpers.multiple(generateRandomUser, {
+  count: 5,
 });
 ```
 
@@ -111,7 +111,6 @@ The API covers the following modules:
 | Music    | `faker.music.genre()`                         | R&B                                                                                                |
 | Person   | `faker.person.firstName()`                    | Cameron                                                                                            |
 | Phone    | `faker.phone.phoneNumber()`                   | +1 291-299-0192                                                                                    |
-| Random   | `faker.random.locale()`                       | fr_CA                                                                                              |
 | Science  | `faker.science.unit()`                        | `{ name: 'meter', symbol: 'm' }`                                                                   |
 | System   | `faker.system.directoryPath()`                | /root                                                                                              |
 | Vehicle  | `faker.vehicle.vehicle()`                     | Lamborghini Camry                                                                                  |
@@ -133,18 +132,30 @@ console.log(
 
 Faker has support for multiple locales.
 
-The default language locale is set to English.
-
-Setting a new locale is simple:
+The main `faker` instance uses the English locale.
+But you can also import instances using other locales.
 
 ```ts
-// sets locale to de
-faker.locale = 'de';
+// ESM
+import { fakerDE as faker } from '@faker-js/faker';
+
+// CJS
+const { fakerDE: faker } = require('@faker-js/faker');
 ```
 
-See our documentation for a list of [provided languages](https://fakerjs.dev/guide/localization.html#available-locales)
+See our documentation for a list of [provided languages](https://fakerjs.dev/guide/localization.html#available-locales).
+
+Please note: Not every locale provides data for every module. In our pre-made faker instances,
+we fall back to English in such a case as this is the most complete and most commonly used language.
+If you don't want that or prefer a different fallback, you can also build your own instances.
 
-Please note: not every locale provides data for every module. In our pre-made locales, we fallback to English in such a case as this is the most complete and most commonly used language.
+```ts
+import { Faker, de, de_CH } from '@faker-js/faker';
+
+export const faker = new Faker({
+  locale: [de_CH, de],
+});
+```
 
 ## ⚙️ Setting a randomness seed
 
diff --git a/docs/.vitepress/components/api-docs/method.ts b/docs/.vitepress/components/api-docs/method.ts
index 52cb24957bf..562d1ecf8d9 100644
--- a/docs/.vitepress/components/api-docs/method.ts
+++ b/docs/.vitepress/components/api-docs/method.ts
@@ -5,7 +5,7 @@ export interface Method {
   readonly parameters: MethodParameter[];
   readonly returns: string;
   readonly examples: string; // HTML
-  readonly deprecated: boolean;
+  readonly deprecated?: string; // HTML
   readonly since: string;
   readonly sourcePath: string; // URL-Suffix
   readonly seeAlsos: string[];
diff --git a/docs/.vitepress/components/api-docs/method.vue b/docs/.vitepress/components/api-docs/method.vue
index 8bff111f36a..6753cefd733 100644
--- a/docs/.vitepress/components/api-docs/method.vue
+++ b/docs/.vitepress/components/api-docs/method.vue
@@ -17,6 +17,7 @@ function seeAlsoToUrl(see: string): string {
     <div v-if="props.method.deprecated" class="warning custom-block">
       <p class="custom-block-title">Deprecated</p>
       <p>This method is deprecated and will be removed in a future version.</p>
+      <span v-html="props.method.deprecated" />
     </div>
 
     <div v-html="props.method.description"></div>
diff --git a/docs/api/ApiIndex.vue b/docs/api/ApiIndex.vue
index 882c4a69e14..048f20fd391 100644
--- a/docs/api/ApiIndex.vue
+++ b/docs/api/ApiIndex.vue
@@ -1,7 +1,7 @@
 <!-- This content is mostly copied over from https://github.com/vuejs/docs/blob/main/src/api/ApiIndex.vue -->
 
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { slugify } from '../.vitepress/shared/utils/slugify';
 import apiSearchIndex from './api-search-index.json';
 import { APIGroup } from './api-types';
@@ -43,6 +43,29 @@ const filtered = computed(() => {
     })
     .filter((i) => i) as APIGroup[];
 });
+
+const apiFilter = ref<HTMLInputElement>();
+
+function apiSearchFocusHandler(event: KeyboardEvent): void {
+  if (event.key === 'Escape') {
+    if (apiFilter.value !== document.activeElement) {
+      query.value = '';
+    } else {
+      apiFilter.value!.blur();
+    }
+  } else if (
+    /^[a-z]$/.test(event.key) &&
+    !event.altKey &&
+    !event.ctrlKey &&
+    !event.shiftKey &&
+    !event.metaKey
+  ) {
+    apiFilter.value!.focus();
+  }
+}
+
+onMounted(() => window.addEventListener('keydown', apiSearchFocusHandler));
+onUnmounted(() => window.removeEventListener('keydown', apiSearchFocusHandler));
 </script>
 
 <template>
@@ -54,6 +77,7 @@ const filtered = computed(() => {
         <input
           type="search"
           placeholder="Enter keyword"
+          ref="apiFilter"
           id="api-filter"
           v-model="query"
         />
diff --git a/docs/guide/localization.md b/docs/guide/localization.md
index b0bfbad8000..167fc5e47cb 100644
--- a/docs/guide/localization.md
+++ b/docs/guide/localization.md
@@ -3,15 +3,20 @@
 ## Switching locales
 
 Did you know Faker supports many different locales?  
-By default, when using `import { faker } from '@faker-js/faker'` actually every available locale that is supported by Faker will be loaded and you can switch the locale at runtime with `faker.setLocale('de')`.
+When using our default instance `import { faker } from '@faker-js/faker'` you get English data.
+However, we also provide pre-built instances for more than 50 other locales.
 
-::: tip
-Alternatively you can also just use `faker.locale = 'de'` instead to switch the locale.
+`import { fakerDE as faker } from '@faker-js/faker'`
+
+See below for a list of available locales.
+
+:::tip Note
+You can also build your own Faker instances, with custom locales/overwrites.
 :::
 
 ## Individual localized packages
 
-By default, Faker will include **all** locale data.  
+Currently, the imports from the main package have a [bug](https://github.com/faker-js/faker/issues/1791) and always cause the entire Faker lib to be imported.
 This might result in loading around 5 MB of data into memory and slow down startup times.
 
 _But we got your back!_  
@@ -33,72 +38,98 @@ Some locales have limited coverage and rely more heavily on the English locale a
 However, in most cases, using a specific locale will be beneficial in the long term as specifying a locale reduces the time necessary for startup, which has a compounding effect on testing frameworks that reload the imports every execution.
 :::
 
+## Custom locales and fallbacks
+
+If our built-in faker instances don't satisfy your needs, you can build your own:
+
+```ts
+import type { LocaleDefinition } from '@faker-js/faker';
+import { Faker, de_CH, de, en } from '@faker-js/faker';
+
+const customLocale: LocaleDefinition = {
+  title: 'My custom locale',
+  internet: {
+    domainSuffix: ['test'],
+  },
+};
+
+export const customFaker = new Faker({
+  locale: [customLocale, de_CH, de, en, global],
+});
+```
+
 ## Available locales
 
 <!-- LOCALES-AUTO-GENERATED-START -->
 
 <!-- Run 'pnpm run generate:locales' to update. -->
 
-| Locale      | Name                      |
-| :---------- | :------------------------ |
-| af_ZA       | Afrikaans                 |
-| ar          | Arabic                    |
-| az          | Azerbaijani               |
-| cz          | Czech                     |
-| de          | German                    |
-| de_AT       | German (Austria)          |
-| de_CH       | German (Switzerland)      |
-| dv          | Dhivehi                   |
-| el          | Greek                     |
-| en          | English                   |
-| en_AU       | English (Australia)       |
-| en_AU_ocker | English (Australia Ocker) |
-| en_BORK     | English (Bork)            |
-| en_CA       | English (Canada)          |
-| en_GB       | English (Great Britain)   |
-| en_GH       | English (Ghana)           |
-| en_IE       | English (Ireland)         |
-| en_IN       | English (India)           |
-| en_NG       | Nigeria (English)         |
-| en_US       | English (United States)   |
-| en_ZA       | English (South Africa)    |
-| es          | Spanish                   |
-| es_MX       | Spanish (Mexico)          |
-| fa          | Farsi                     |
-| fi          | Finnish                   |
-| fr          | French                    |
-| fr_BE       | Français (Belgique)       |
-| fr_CA       | French (Canada)           |
-| fr_CH       | French (Switzerland)      |
-| fr_LU       | French (Luxembourg)       |
-| ge          | Georgian                  |
-| he          | Hebrew                    |
-| hr          | Hrvatski                  |
-| hu          | Hungarian                 |
-| hy          | Armenian                  |
-| id_ID       | Indonesian                |
-| it          | Italian                   |
-| ja          | Japanese                  |
-| ko          | Korean                    |
-| lv          | Latvian                   |
-| mk          | Macedonian                |
-| nb_NO       | Norwegian                 |
-| ne          | Nepalese                  |
-| nl          | Dutch                     |
-| nl_BE       | Dutch (Belgium)           |
-| pl          | Polish                    |
-| pt_BR       | Portuguese (Brazil)       |
-| pt_PT       | Portuguese (Portugal)     |
-| ro          | Romanian                  |
-| ru          | Russian                   |
-| sk          | Slovakian                 |
-| sv          | Swedish                   |
-| tr          | Turkish                   |
-| uk          | Ukrainian                 |
-| ur          | Urdu                      |
-| vi          | Vietnamese                |
-| zh_CN       | Chinese                   |
-| zh_TW       | Chinese (Taiwan)          |
-| zu_ZA       | Zulu (South Africa)       |
+| Locale        | Name                      | Faker              |
+| :------------ | :------------------------ | :----------------- |
+| `af_ZA`       | Afrikaans                 | `fakerAF_ZA`       |
+| `ar`          | Arabic                    | `fakerAR`          |
+| `az`          | Azerbaijani               | `fakerAZ`          |
+| `cz`          | Czech                     | `fakerCZ`          |
+| `de`          | German                    | `fakerDE`          |
+| `de_AT`       | German (Austria)          | `fakerDE_AT`       |
+| `de_CH`       | German (Switzerland)      | `fakerDE_CH`       |
+| `dv`          | Maldivian                 | `fakerDV`          |
+| `el`          | Greek                     | `fakerEL`          |
+| `en`          | English                   | `fakerEN`          |
+| `en_AU`       | English (Australia)       | `fakerEN_AU`       |
+| `en_AU_ocker` | English (Australia Ocker) | `fakerEN_AU_ocker` |
+| `en_BORK`     | English (Bork)            | `fakerEN_BORK`     |
+| `en_CA`       | English (Canada)          | `fakerEN_CA`       |
+| `en_GB`       | English (Great Britain)   | `fakerEN_GB`       |
+| `en_GH`       | English (Ghana)           | `fakerEN_GH`       |
+| `en_IE`       | English (Ireland)         | `fakerEN_IE`       |
+| `en_IN`       | English (India)           | `fakerEN_IN`       |
+| `en_NG`       | English (Nigeria)         | `fakerEN_NG`       |
+| `en_US`       | English (United States)   | `fakerEN_US`       |
+| `en_ZA`       | English (South Africa)    | `fakerEN_ZA`       |
+| `es`          | Spanish                   | `fakerES`          |
+| `es_MX`       | Spanish (Mexico)          | `fakerES_MX`       |
+| `fa`          | Farsi                     | `fakerFA`          |
+| `fi`          | Finnish                   | `fakerFI`          |
+| `fr`          | French                    | `fakerFR`          |
+| `fr_BE`       | French (Belgium)          | `fakerFR_BE`       |
+| `fr_CA`       | French (Canada)           | `fakerFR_CA`       |
+| `fr_CH`       | French (Switzerland)      | `fakerFR_CH`       |
+| `fr_LU`       | French (Luxembourg)       | `fakerFR_LU`       |
+| `ge`          | Georgian                  | `fakerGE`          |
+| `he`          | Hebrew                    | `fakerHE`          |
+| `hr`          | Croatian                  | `fakerHR`          |
+| `hu`          | Hungarian                 | `fakerHU`          |
+| `hy`          | Armenian                  | `fakerHY`          |
+| `id_ID`       | Indonesian                | `fakerID_ID`       |
+| `it`          | Italian                   | `fakerIT`          |
+| `ja`          | Japanese                  | `fakerJA`          |
+| `ko`          | Korean                    | `fakerKO`          |
+| `lv`          | Latvian                   | `fakerLV`          |
+| `mk`          | Macedonian                | `fakerMK`          |
+| `nb_NO`       | Norwegian                 | `fakerNB_NO`       |
+| `ne`          | Nepalese                  | `fakerNE`          |
+| `nl`          | Dutch                     | `fakerNL`          |
+| `nl_BE`       | Dutch (Belgium)           | `fakerNL_BE`       |
+| `pl`          | Polish                    | `fakerPL`          |
+| `pt_BR`       | Portuguese (Brazil)       | `fakerPT_BR`       |
+| `pt_PT`       | Portuguese (Portugal)     | `fakerPT_PT`       |
+| `ro`          | Romanian                  | `fakerRO`          |
+| `ru`          | Russian                   | `fakerRU`          |
+| `sk`          | Slovakian                 | `fakerSK`          |
+| `sv`          | Swedish                   | `fakerSV`          |
+| `tr`          | Turkish                   | `fakerTR`          |
+| `uk`          | Ukrainian                 | `fakerUK`          |
+| `ur`          | Urdu                      | `fakerUR`          |
+| `vi`          | Vietnamese                | `fakerVI`          |
+| `zh_CN`       | Chinese                   | `fakerZH_CN`       |
+| `zh_TW`       | Chinese (Taiwan)          | `fakerZH_TW`       |
+| `zu_ZA`       | Zulu (South Africa)       | `fakerZU_ZA`       |
 
 <!-- LOCALES-AUTO-GENERATED-END -->
+
+The `Locale` (data) and `Faker` columns refer to the respective `import` names:
+
+```ts
+import { de, fakerDE } from '@faker-js/faker';
+```
diff --git a/docs/guide/upgrading.md b/docs/guide/upgrading.md
index 673ab610e82..82bfd2ac18b 100644
--- a/docs/guide/upgrading.md
+++ b/docs/guide/upgrading.md
@@ -14,6 +14,90 @@ Not the version you are looking for?
 
 ## Breaking changes
 
+### Removed ability to change the locale on existing `Faker` instances
+
+:::tip NOTE
+If you are using only the default (`en`) locale, then you don't have to change anything.
+:::
+
+In order to facilitate better and easier locale fallback mechanics, we removed the methods to change the locales on existing `Faker` instances.
+Now, we expose specific faker instances for each locale that you can use:
+
+**Old**
+
+```ts
+import { faker } from '@faker-js/faker';
+
+faker.setLocale('de_CH');
+// or
+faker.locale = 'de_CH';
+faker.fallbackLocale = 'en';
+```
+
+**New**
+
+```ts
+import { fakerDE_CH as faker } from '@faker-js/faker';
+```
+
+This also fixes issues where more than two locales are required:
+
+**Old**
+
+```ts
+import { faker } from '@faker-js/faker';
+
+const customFaker = new Faker({
+  locale: 'de_CH', // the expected locale
+  fallbackLocale: 'de', // ensure we have a German fallbacks for addresses
+  locales: { de_CH, de, en },
+});
+const a = customFaker.internet.email();
+customFaker.locale = 'en'; // neither 'de_CH' nor 'de' have emojis
+const b = customFaker.internet.emoji();
+```
+
+**New**
+
+```ts
+import { Faker, de_CH, de, en, global } from '@faker-js/faker';
+
+// same as fakerDE_CH
+export const customFaker = new Faker({
+  // Now multiple fallbacks are supported
+  locale: [de_CH, de, en, global],
+});
+const a = customFaker.internet.email();
+const b = customFaker.internet.emoji();
+```
+
+If you wish to create entries for multiple locales, you can still do so:
+
+**Old**
+
+```ts
+import { faker } from '@faker-js/faker';
+
+for (let user of users) {
+  const lang = faker.helpers.arrayElement(['de', 'en', 'fr']);
+  faker.locale = lang;
+  user.email = faker.internet.email();
+}
+```
+
+**New**
+
+```ts
+import { faker, fakerDE, fakerEN, fakerFR } from '@faker-js/faker';
+
+for (let user of users) {
+  const currentFaker = faker.helpers.arrayElement([fakerDE, fakerEN, fakerFR]);
+  user.email = currentFaker.internet.email();
+}
+```
+
+For more information refer to our [Localization Guide](localization).
+
 ### `faker.mersenne` and `faker.helpers.repeatString` removed
 
 `faker.mersenne` and `faker.helpers.repeatString` were only ever intended for internal use, and are no longer available.
@@ -124,6 +208,11 @@ faker.number.float({ max: 100, precision: 0.01 }); // 35.21
 | `faker.datatype.float`  | `faker.number.float`                       |
 | `faker.datatype.bigInt` | `faker.number.bigInt`                      |
 
+### Deprecation of `faker.datatype.array`
+
+The method `faker.datatype.array` has been deprecated and will be removed in v9.
+If you need an array of useful values, you are better off creating your own one using `faker.helpers.multiple`.
+
 ### `allowLeadingZeros` behavior change in `faker.string.numeric`
 
 The `allowLeadingZeros` boolean parameter in `faker.string.numeric` (in the new `string` module) now defaults to `true`. `faker.string.numeric` will now generate numeric strings that could have leading zeros by default.
diff --git a/docs/guide/usage.md b/docs/guide/usage.md
index 6d325a0bd9d..26f81c08d22 100644
--- a/docs/guide/usage.md
+++ b/docs/guide/usage.md
@@ -6,18 +6,12 @@ Using Faker is as easy as importing it from `@faker-js/faker`.
 
 ```js
 import { faker } from '@faker-js/faker';
-// or, if desiring only a specific locale
-// import { faker } from '@faker-js/faker/locale/de'
+// or, if desiring a different locale
+// import { fakerDE as faker } from '@faker-js/faker'
 const randomName = faker.person.fullName(); // Rowan Nikolaus
 const randomEmail = faker.internet.email(); // Kassandra.Haley@erich.biz
 ```
 
-:::tip Note
-Using the first import statement will load every locale into memory.
-As such, start-up times and performance may be slow.
-Thus, by declaring a locale in the import, one can increase performance and reduce the time on start-up.
-:::
-
 Or if you're using CommonJS:
 
 ```js
@@ -27,6 +21,8 @@ const randomName = faker.person.fullName(); // Rowan Nikolaus
 const randomEmail = faker.internet.email(); // Kassandra.Haley@erich.biz
 ```
 
+For more information about changing and customizing the locales, please refer to our [Localization Guide](localization).
+
 ## Browser
 
 ```html
@@ -84,6 +80,48 @@ In order to have Faker working properly, you need to check if these `compilerOpt
 }
 ```
 
+## Reproducible results
+
+Normally Faker will give you different random values each time it is used.
+
+```ts
+faker.music.genre(); // "Soul"
+faker.music.genre(); // "Reggae"
+```
+
+If you want consistent results, you can set your own seed:
+
+```ts
+faker.seed(123);
+
+const firstRandom = faker.number.int();
+
+// Setting the seed again resets the sequence.
+faker.seed(123);
+
+const secondRandom = faker.number.int();
+
+console.log(firstRandom === secondRandom);
+```
+
+::: info NOTE
+When upgrading to a new version of Faker, you may get different values for the same seed, as the underlying data (lists of names, words etc) may have changed.
+:::
+
+There are a few methods which use relative dates for which setting a random seed is not sufficient to have reproducible results, for example: `faker.date.past`, `faker.date.future`, `faker.date.birthdate`, `faker.date.recent`, `faker.date.soon` and `faker.git.commitEntry`. This is because these methods default to creating a date before or after "today", and "today" depends on when the code is run. To fix this, you can specify a fixed reference date as a Date or string, for example:
+
+```ts
+// creates a date soon after 2023-01-01
+faker.date.soon({ refDate: '2023-01-01T00:00:00.000Z' });
+```
+
+or alternatively you can set a default reference date for all these methods:
+
+```ts
+// affects all future faker.date.* calls
+faker.defaultRefDate = '2023-01-01T00:00:00.000Z';
+```
+
 ## Create complex objects
 
 Faker mostly generates values for primitives.
@@ -152,7 +190,7 @@ function createRandomUser(): User {
   const sex = faker.person.sexType();
   const firstName = faker.person.firstName(sex);
   const lastName = faker.person.lastName();
-  const email = faker.internet.email(firstName, lastName);
+  const email = faker.internet.email({ firstName, lastName });
 
   return {
     _id: faker.datatype.uuid(),
diff --git a/netlify.toml b/netlify.toml
index 28fcee02b69..31eb56a489b 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -23,14 +23,14 @@
 # Redirect to Discord server
 [[redirects]]
   from = "https://chat.fakerjs.dev"
-  to = "https://discord.gg/faker-js"
-  status = 301
+  to = "https://discord.gg/wq78qyhdSZ"
+  status = 302
   force = true
 
 [[redirects]]
   from = "/chat"
-  to = "https://discord.gg/faker-js"
-  status = 301
+  to = "https://discord.gg/wq78qyhdSZ"
+  status = 302
   force = true
 
 # Redirect to StackBlitz playground
diff --git a/package.json b/package.json
index fb70aa2bd16..4f145156458 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.mjs",
-  "types": "index.d.ts",
+  "types": "dist/types/index.d.ts",
   "typesVersions": {
     ">=4.0": {
       "*": [
@@ -72,62 +72,65 @@
     "ts-check:scripts": "tsc --project tsconfig.check-scripts.json",
     "ts-check:tests": "tsc --project tsconfig.check-tests.json",
     "test": "vitest",
+    "test:update-snapshots": "vitest run -u",
     "coverage": "vitest run --coverage",
     "cypress": "cypress",
     "docs:test:e2e:ci": "run-s docs:build:ci docs:test:e2e:run",
     "docs:test:e2e:run": "run-p --race docs:serve \"cypress run\"",
     "docs:test:e2e:open": "run-p --race docs:serve \"cypress open\"",
     "release": "standard-version",
-    "prepublishOnly": "pnpm run clean && pnpm install && pnpm run build"
+    "prepublishOnly": "pnpm run clean && pnpm install && pnpm run build",
+    "preflight": "pnpm install && run-s format lint build generate:* test:update-snapshots"
   },
   "devDependencies": {
     "@actions/github": "~5.1.1",
-    "@algolia/client-search": "~4.14.3",
-    "@types/glob": "~8.0.1",
+    "@algolia/client-search": "~4.15.0",
+    "@types/glob": "~8.1.0",
     "@types/markdown-it": "~12.2.3",
-    "@types/node": "~18.13.0",
+    "@types/node": "~18.15.3",
     "@types/prettier": "~2.7.2",
     "@types/react": "~18.0.28",
-    "@types/sanitize-html": "~2.8.0",
+    "@types/sanitize-html": "~2.8.1",
     "@types/semver": "~7.3.13",
-    "@types/validator": "~13.7.12",
-    "@typescript-eslint/eslint-plugin": "~5.52.0",
-    "@typescript-eslint/parser": "~5.52.0",
-    "@vitest/coverage-c8": "~0.28.5",
-    "@vitest/ui": "~0.28.5",
-    "@vueuse/core": "~9.12.0",
-    "c8": "~7.12.0",
+    "@types/validator": "~13.7.14",
+    "@typescript-eslint/eslint-plugin": "~5.54.1",
+    "@typescript-eslint/parser": "~5.54.1",
+    "@vitest/coverage-c8": "~0.29.2",
+    "@vitest/ui": "~0.29.2",
+    "@vueuse/core": "~9.13.0",
+    "c8": "~7.13.0",
     "conventional-changelog-cli": "~2.2.2",
-    "cypress": "~12.5.1",
-    "esbuild": "~0.17.8",
-    "eslint": "~8.34.0",
-    "eslint-config-prettier": "~8.6.0",
-    "eslint-define-config": "~1.15.0",
+    "cypress": "~12.7.0",
+    "esbuild": "~0.17.11",
+    "eslint": "~8.36.0",
+    "eslint-config-prettier": "~8.7.0",
+    "eslint-define-config": "~1.16.0",
     "eslint-gitignore": "~0.1.0",
-    "eslint-plugin-jsdoc": "~40.0.0",
+    "eslint-plugin-deprecation": "~1.3.3",
+    "eslint-plugin-jsdoc": "~40.0.2",
     "eslint-plugin-prettier": "~4.2.1",
-    "glob": "~8.1.0",
+    "glob": "~9.2.1",
     "npm-run-all": "~4.1.5",
     "picocolors": "~1.0.0",
     "prettier": "2.8.4",
     "prettier-plugin-organize-imports": "~3.2.2",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "rimraf": "~4.1.2",
-    "sanitize-html": "~2.9.0",
+    "rimraf": "~4.4.0",
+    "sanitize-html": "~2.10.0",
     "semver": "~7.3.8",
     "standard-version": "~9.5.0",
-    "tsx": "~3.12.3",
-    "typedoc": "~0.23.25",
+    "tsx": "~3.12.5",
+    "typedoc": "~0.23.26",
     "typedoc-plugin-missing-exports": "~1.0.0",
     "typescript": "~4.9.5",
     "validator": "~13.9.0",
-    "vite": "~4.1.1",
-    "vitepress": "1.0.0-alpha.46",
-    "vitest": "~0.28.5",
+    "vite": "~4.1.4",
+    "vitepress": "1.0.0-alpha.58",
+    "vitest": "~0.29.2",
     "vue": "~3.2.47"
   },
-  "packageManager": "pnpm@7.27.0",
+  "packageManager": "pnpm@7.29.1",
   "engines": {
     "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
     "npm": ">=6.14.13"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 322333bf537..17f3bc99a68 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2,96 +2,98 @@ lockfileVersion: 5.4
 
 specifiers:
   '@actions/github': ~5.1.1
-  '@algolia/client-search': ~4.14.3
-  '@types/glob': ~8.0.1
+  '@algolia/client-search': ~4.15.0
+  '@types/glob': ~8.1.0
   '@types/markdown-it': ~12.2.3
-  '@types/node': ~18.13.0
+  '@types/node': ~18.15.3
   '@types/prettier': ~2.7.2
   '@types/react': ~18.0.28
-  '@types/sanitize-html': ~2.8.0
+  '@types/sanitize-html': ~2.8.1
   '@types/semver': ~7.3.13
-  '@types/validator': ~13.7.12
-  '@typescript-eslint/eslint-plugin': ~5.52.0
-  '@typescript-eslint/parser': ~5.52.0
-  '@vitest/coverage-c8': ~0.28.5
-  '@vitest/ui': ~0.28.5
-  '@vueuse/core': ~9.12.0
-  c8: ~7.12.0
+  '@types/validator': ~13.7.14
+  '@typescript-eslint/eslint-plugin': ~5.54.1
+  '@typescript-eslint/parser': ~5.54.1
+  '@vitest/coverage-c8': ~0.29.2
+  '@vitest/ui': ~0.29.2
+  '@vueuse/core': ~9.13.0
+  c8: ~7.13.0
   conventional-changelog-cli: ~2.2.2
-  cypress: ~12.5.1
-  esbuild: ~0.17.8
-  eslint: ~8.34.0
-  eslint-config-prettier: ~8.6.0
-  eslint-define-config: ~1.15.0
+  cypress: ~12.7.0
+  esbuild: ~0.17.11
+  eslint: ~8.36.0
+  eslint-config-prettier: ~8.7.0
+  eslint-define-config: ~1.16.0
   eslint-gitignore: ~0.1.0
-  eslint-plugin-jsdoc: ~40.0.0
+  eslint-plugin-deprecation: ~1.3.3
+  eslint-plugin-jsdoc: ~40.0.2
   eslint-plugin-prettier: ~4.2.1
-  glob: ~8.1.0
+  glob: ~9.2.1
   npm-run-all: ~4.1.5
   picocolors: ~1.0.0
   prettier: 2.8.4
   prettier-plugin-organize-imports: ~3.2.2
   react: ~18.2.0
   react-dom: ~18.2.0
-  rimraf: ~4.1.2
-  sanitize-html: ~2.9.0
+  rimraf: ~4.4.0
+  sanitize-html: ~2.10.0
   semver: ~7.3.8
   standard-version: ~9.5.0
-  tsx: ~3.12.3
-  typedoc: ~0.23.25
+  tsx: ~3.12.5
+  typedoc: ~0.23.26
   typedoc-plugin-missing-exports: ~1.0.0
   typescript: ~4.9.5
   validator: ~13.9.0
-  vite: ~4.1.1
-  vitepress: 1.0.0-alpha.46
-  vitest: ~0.28.5
+  vite: ~4.1.4
+  vitepress: 1.0.0-alpha.58
+  vitest: ~0.29.2
   vue: ~3.2.47
 
 devDependencies:
   '@actions/github': 5.1.1
-  '@algolia/client-search': 4.14.3
-  '@types/glob': 8.0.1
+  '@algolia/client-search': 4.15.0
+  '@types/glob': 8.1.0
   '@types/markdown-it': 12.2.3
-  '@types/node': 18.13.0
+  '@types/node': 18.15.3
   '@types/prettier': 2.7.2
   '@types/react': 18.0.28
-  '@types/sanitize-html': 2.8.0
+  '@types/sanitize-html': 2.8.1
   '@types/semver': 7.3.13
-  '@types/validator': 13.7.12
-  '@typescript-eslint/eslint-plugin': 5.52.0_6cfvjsbua5ptj65675bqcn6oza
-  '@typescript-eslint/parser': 5.52.0_7kw3g6rralp5ps6mg3uyzz6azm
-  '@vitest/coverage-c8': 0.28.5_@vitest+ui@0.28.5
-  '@vitest/ui': 0.28.5
-  '@vueuse/core': 9.12.0_vue@3.2.47
-  c8: 7.12.0
+  '@types/validator': 13.7.14
+  '@typescript-eslint/eslint-plugin': 5.54.1_4rfaf6mlw2mmutqjcopwvbftpu
+  '@typescript-eslint/parser': 5.54.1_vgl77cfdswitgr47lm5swmv43m
+  '@vitest/coverage-c8': 0.29.2_vitest@0.29.2
+  '@vitest/ui': 0.29.2
+  '@vueuse/core': 9.13.0_vue@3.2.47
+  c8: 7.13.0
   conventional-changelog-cli: 2.2.2
-  cypress: 12.5.1
-  esbuild: 0.17.8
-  eslint: 8.34.0
-  eslint-config-prettier: 8.6.0_eslint@8.34.0
-  eslint-define-config: 1.15.0
-  eslint-gitignore: 0.1.0_eslint@8.34.0
-  eslint-plugin-jsdoc: 40.0.0_eslint@8.34.0
-  eslint-plugin-prettier: 4.2.1_u5wnrdwibbfomslmnramz52buy
-  glob: 8.1.0
+  cypress: 12.7.0
+  esbuild: 0.17.11
+  eslint: 8.36.0
+  eslint-config-prettier: 8.7.0_eslint@8.36.0
+  eslint-define-config: 1.16.0
+  eslint-gitignore: 0.1.0_eslint@8.36.0
+  eslint-plugin-deprecation: 1.3.3_vgl77cfdswitgr47lm5swmv43m
+  eslint-plugin-jsdoc: 40.0.2_eslint@8.36.0
+  eslint-plugin-prettier: 4.2.1_eqzx3hpkgx5nnvxls3azrcc7dm
+  glob: 9.2.1
   npm-run-all: 4.1.5
   picocolors: 1.0.0
   prettier: 2.8.4
   prettier-plugin-organize-imports: 3.2.2_silln3pw57har7jydmecgzoypa
   react: 18.2.0
   react-dom: 18.2.0_react@18.2.0
-  rimraf: 4.1.2
-  sanitize-html: 2.9.0
+  rimraf: 4.4.0
+  sanitize-html: 2.10.0
   semver: 7.3.8
   standard-version: 9.5.0
-  tsx: 3.12.3
-  typedoc: 0.23.25_typescript@4.9.5
-  typedoc-plugin-missing-exports: 1.0.0_typedoc@0.23.25
+  tsx: 3.12.5
+  typedoc: 0.23.26_typescript@4.9.5
+  typedoc-plugin-missing-exports: 1.0.0_typedoc@0.23.26
   typescript: 4.9.5
   validator: 13.9.0
-  vite: 4.1.1_@types+node@18.13.0
-  vitepress: 1.0.0-alpha.46_hzfxhvcwzectry2x7akkc5uh5a
-  vitest: 0.28.5_@vitest+ui@0.28.5
+  vite: 4.1.4_@types+node@18.15.3
+  vitepress: 1.0.0-alpha.58_6x66empz7tvqv233bjwlvs4b7i
+  vitest: 0.29.2_@vitest+ui@0.29.2
   vue: 3.2.47
 
 packages:
@@ -119,14 +121,14 @@ packages:
       '@algolia/autocomplete-shared': 1.7.4
     dev: true
 
-  /@algolia/autocomplete-preset-algolia/1.7.4_dk4ct527ug5whbfokpeal2wzha:
+  /@algolia/autocomplete-preset-algolia/1.7.4_fu462mkgpjoplgwgf6huevsl4i:
     resolution: {integrity: sha512-s37hrvLEIfcmKY8VU9LsAXgm2yfmkdHT3DnA3SgHaY93yjZ2qL57wzb5QweVkYuEBZkT2PIREvRoLXC2sxTbpQ==}
     peerDependencies:
       '@algolia/client-search': '>= 4.9.1 < 6'
       algoliasearch: '>= 4.9.1 < 6'
     dependencies:
       '@algolia/autocomplete-shared': 1.7.4
-      '@algolia/client-search': 4.14.3
+      '@algolia/client-search': 4.15.0
       algoliasearch: 4.14.3
     dev: true
 
@@ -144,6 +146,10 @@ packages:
     resolution: {integrity: sha512-oZJofOoD9FQOwiGTzyRnmzvh3ZP8WVTNPBLH5xU5JNF7drDbRT0ocVT0h/xB2rPHYzOeXRrLaQQBwRT/CKom0Q==}
     dev: true
 
+  /@algolia/cache-common/4.15.0:
+    resolution: {integrity: sha512-Me3PbI4QurAM+3D+htIE0l1xt6+bl/18SG6Wc7bPQEZAtN7DTGz22HqhKNyLF2lR/cOfpaH7umXZlZEhIHf7gQ==}
+    dev: true
+
   /@algolia/cache-in-memory/4.14.3:
     resolution: {integrity: sha512-ES0hHQnzWjeioLQf5Nq+x1AWdZJ50znNPSH3puB/Y4Xsg4Av1bvLmTJe7SY2uqONaeMTvL0OaVcoVtQgJVw0vg==}
     dependencies:
@@ -174,6 +180,13 @@ packages:
       '@algolia/transporter': 4.14.3
     dev: true
 
+  /@algolia/client-common/4.15.0:
+    resolution: {integrity: sha512-PlsJMObZuYw4JlG5EhYv1PHDOv7n5mD5PzqFyoNfSOYaEPRZepa3W579ya29yOu3FZ0VGMNJmB7Q5v/+/fwvIw==}
+    dependencies:
+      '@algolia/requester-common': 4.15.0
+      '@algolia/transporter': 4.15.0
+    dev: true
+
   /@algolia/client-personalization/4.14.3:
     resolution: {integrity: sha512-UCX1MtkVNgaOL9f0e22x6tC9e2H3unZQlSUdnVaSKpZ+hdSChXGaRjp2UIT7pxmPqNCyv51F597KEX5WT60jNg==}
     dependencies:
@@ -190,10 +203,22 @@ packages:
       '@algolia/transporter': 4.14.3
     dev: true
 
+  /@algolia/client-search/4.15.0:
+    resolution: {integrity: sha512-dTwZD4u53WdmexnMcoO2Qd/+YCP3ESXKOtD2MryQ1a9dHwB2Y3Qob0kyS1PG82idwM3enbznvscI9Sf4o9PUWQ==}
+    dependencies:
+      '@algolia/client-common': 4.15.0
+      '@algolia/requester-common': 4.15.0
+      '@algolia/transporter': 4.15.0
+    dev: true
+
   /@algolia/logger-common/4.14.3:
     resolution: {integrity: sha512-kUEAZaBt/J3RjYi8MEBT2QEexJR2kAE2mtLmezsmqMQZTV502TkHCxYzTwY2dE7OKcUTxi4OFlMuS4GId9CWPw==}
     dev: true
 
+  /@algolia/logger-common/4.15.0:
+    resolution: {integrity: sha512-D8OFwn/HpvQz66goIcjxOKsYBMuxiruxJ3cA/bnc0EiDvSA2P2z6bNQWgS5gbstuTZIJmbhr+53NyOxFkmMNAA==}
+    dev: true
+
   /@algolia/logger-console/4.14.3:
     resolution: {integrity: sha512-ZWqAlUITktiMN2EiFpQIFCJS10N96A++yrexqC2Z+3hgF/JcKrOxOdT4nSCQoEPvU4Ki9QKbpzbebRDemZt/hw==}
     dependencies:
@@ -210,6 +235,10 @@ packages:
     resolution: {integrity: sha512-RrRzqNyKFDP7IkTuV3XvYGF9cDPn9h6qEDl595lXva3YUk9YSS8+MGZnnkOMHvjkrSCKfoLeLbm/T4tmoIeclw==}
     dev: true
 
+  /@algolia/requester-common/4.15.0:
+    resolution: {integrity: sha512-w0UUzxElbo4hrKg4QP/jiXDNbIJuAthxdlkos9nS8KAPK2XI3R9BlUjLz/ZVs4F9TDGI0mhjrNHhZ12KXcoyhg==}
+    dev: true
+
   /@algolia/requester-node-http/4.14.3:
     resolution: {integrity: sha512-O5wnPxtDRPuW2U0EaOz9rMMWdlhwP0J0eSL1Z7TtXF8xnUeeUyNJrdhV5uy2CAp6RbhM1VuC3sOJcIR6Av+vbA==}
     dependencies:
@@ -224,6 +253,14 @@ packages:
       '@algolia/requester-common': 4.14.3
     dev: true
 
+  /@algolia/transporter/4.15.0:
+    resolution: {integrity: sha512-JoWR+ixG3EmA0UPntQFN/FV5TasYcYu93d5+oKzHFeZ6Z7rtW5Im9iy/Oh/ggk1AAN5fTdqKewtbBpdaYDbKsQ==}
+    dependencies:
+      '@algolia/cache-common': 4.15.0
+      '@algolia/logger-common': 4.15.0
+      '@algolia/requester-common': 4.15.0
+    dev: true
+
   /@babel/code-frame/7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
@@ -250,16 +287,16 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/parser/7.20.7:
-    resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
+  /@babel/parser/7.21.1:
+    resolution: {integrity: sha512-JzhBFpkuhBNYUY7qs+wTzNmyCWUHEaAFpQQD2YfU1rPL38/L43Wvid0fFkiOCnHvsGncRZgEPyGnltABLcVDTg==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.20.7
+      '@babel/types': 7.21.0
     dev: true
 
-  /@babel/types/7.20.7:
-    resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
+  /@babel/types/7.21.0:
+    resolution: {integrity: sha512-uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-string-parser': 7.19.4
@@ -278,12 +315,12 @@ packages:
     dev: true
     optional: true
 
-  /@cypress/request/2.88.10:
-    resolution: {integrity: sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==}
+  /@cypress/request/2.88.11:
+    resolution: {integrity: sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==}
     engines: {node: '>= 6'}
     dependencies:
       aws-sign2: 0.7.0
-      aws4: 1.11.0
+      aws4: 1.12.0
       caseless: 0.12.0
       combined-stream: 1.0.8
       extend: 3.0.2
@@ -295,7 +332,7 @@ packages:
       json-stringify-safe: 5.0.1
       mime-types: 2.1.35
       performance-now: 2.1.0
-      qs: 6.5.3
+      qs: 6.10.4
       safe-buffer: 5.2.1
       tough-cookie: 2.5.0
       tunnel-agent: 0.6.0
@@ -311,15 +348,15 @@ packages:
       - supports-color
     dev: true
 
-  /@docsearch/css/3.3.2:
-    resolution: {integrity: sha512-dctFYiwbvDZkksMlsmc7pj6W6By/EjnVXJq5TEPd05MwQe+dcdHJgaIn1c8wfsucxHpIsdrUcgSkACHCq6aIhw==}
+  /@docsearch/css/3.3.3:
+    resolution: {integrity: sha512-6SCwI7P8ao+se1TUsdZ7B4XzL+gqeQZnBc+2EONZlcVa0dVrk0NjETxozFKgMv0eEGH8QzP1fkN+A1rH61l4eg==}
     dev: true
 
-  /@docsearch/js/3.3.2_hf5ijsloe6gzee4vmv74rvas4u:
-    resolution: {integrity: sha512-k2yiB9attFvKoiYswrRtKhIO+qHuzAj1FHYfFWrKz3wSzB2G6s/7EZL9Rf6iytUo1Ok00LUj2C6mWoOnsUTkxg==}
+  /@docsearch/js/3.3.3_4jk4sx5gsa4z6dpons6mwt4w6q:
+    resolution: {integrity: sha512-2xAv2GFuHzzmG0SSZgf8wHX0qZX8n9Y1ZirKUk5Wrdc+vH9CL837x2hZIUdwcPZI9caBA+/CzxsS68O4waYjUQ==}
     dependencies:
-      '@docsearch/react': 3.3.2_hf5ijsloe6gzee4vmv74rvas4u
-      preact: 10.11.3
+      '@docsearch/react': 3.3.3_4jk4sx5gsa4z6dpons6mwt4w6q
+      preact: 10.12.1
     transitivePeerDependencies:
       - '@algolia/client-search'
       - '@types/react'
@@ -327,8 +364,8 @@ packages:
       - react-dom
     dev: true
 
-  /@docsearch/react/3.3.2_hf5ijsloe6gzee4vmv74rvas4u:
-    resolution: {integrity: sha512-ugILab2TYKSh6IEHf6Z9xZbOovsYbsdfo60PBj+Bw+oMJ1MHJ7pBt1TTcmPki1hSgg8mysgKy2hDiVdPm7XWSQ==}
+  /@docsearch/react/3.3.3_4jk4sx5gsa4z6dpons6mwt4w6q:
+    resolution: {integrity: sha512-pLa0cxnl+G0FuIDuYlW+EBK6Rw2jwLw9B1RHIeS4N4s2VhsfJ/wzeCi3CWcs5yVfxLd5ZK50t//TMA5e79YT7Q==}
     peerDependencies:
       '@types/react': '>= 16.8.0 < 19.0.0'
       react: '>= 16.8.0 < 19.0.0'
@@ -342,8 +379,8 @@ packages:
         optional: true
     dependencies:
       '@algolia/autocomplete-core': 1.7.4
-      '@algolia/autocomplete-preset-algolia': 1.7.4_dk4ct527ug5whbfokpeal2wzha
-      '@docsearch/css': 3.3.2
+      '@algolia/autocomplete-preset-algolia': 1.7.4_fu462mkgpjoplgwgf6huevsl4i
+      '@docsearch/css': 3.3.3
       '@types/react': 18.0.28
       algoliasearch: 4.14.3
       react: 18.2.0
@@ -357,33 +394,33 @@ packages:
     engines: {node: ^14 || ^16 || ^17 || ^18 || ^19}
     dependencies:
       comment-parser: 1.3.1
-      esquery: 1.4.0
+      esquery: 1.4.2
       jsdoc-type-pratt-parser: 3.1.0
     dev: true
 
   /@esbuild-kit/cjs-loader/2.4.2:
     resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==}
     dependencies:
-      '@esbuild-kit/core-utils': 3.0.0
+      '@esbuild-kit/core-utils': 3.1.0
       get-tsconfig: 4.4.0
     dev: true
 
-  /@esbuild-kit/core-utils/3.0.0:
-    resolution: {integrity: sha512-TXmwH9EFS3DC2sI2YJWJBgHGhlteK0Xyu1VabwetMULfm3oYhbrsWV5yaSr2NTWZIgDGVLHbRf0inxbjXqAcmQ==}
+  /@esbuild-kit/core-utils/3.1.0:
+    resolution: {integrity: sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==}
     dependencies:
-      esbuild: 0.15.18
+      esbuild: 0.17.11
       source-map-support: 0.5.21
     dev: true
 
   /@esbuild-kit/esm-loader/2.5.5:
     resolution: {integrity: sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==}
     dependencies:
-      '@esbuild-kit/core-utils': 3.0.0
+      '@esbuild-kit/core-utils': 3.1.0
       get-tsconfig: 4.4.0
     dev: true
 
-  /@esbuild/android-arm/0.15.18:
-    resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
+  /@esbuild/android-arm/0.16.17:
+    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -391,8 +428,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm/0.16.16:
-    resolution: {integrity: sha512-BUuWMlt4WSXod1HSl7aGK8fJOsi+Tab/M0IDK1V1/GstzoOpqc/v3DqmN8MkuapPKQ9Br1WtLAN4uEgWR8x64A==}
+  /@esbuild/android-arm/0.17.11:
+    resolution: {integrity: sha512-CdyX6sRVh1NzFCsf5vw3kULwlAhfy9wVt8SZlrhQ7eL2qBjGbFhRBWkkAzuZm9IIEOCKJw4DXA6R85g+qc8RDw==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -400,17 +437,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm/0.17.8:
-    resolution: {integrity: sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm64/0.16.16:
-    resolution: {integrity: sha512-hFHVAzUKp9Tf8psGq+bDVv+6hTy1bAOoV/jJMUWwhUnIHsh6WbFMhw0ZTkqDuh7TdpffFoHOiIOIxmHc7oYRBQ==}
+  /@esbuild/android-arm64/0.16.17:
+    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -418,8 +446,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm64/0.17.8:
-    resolution: {integrity: sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==}
+  /@esbuild/android-arm64/0.17.11:
+    resolution: {integrity: sha512-QnK4d/zhVTuV4/pRM4HUjcsbl43POALU2zvBynmrrqZt9LPcLA3x1fTZPBg2RRguBQnJcnU059yKr+bydkntjg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -427,8 +455,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64/0.16.16:
-    resolution: {integrity: sha512-9WhxJpeb6XumlfivldxqmkJepEcELekmSw3NkGrs+Edq6sS5KRxtUBQuKYDD7KqP59dDkxVbaoPIQFKWQG0KLg==}
+  /@esbuild/android-x64/0.16.17:
+    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -436,8 +464,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64/0.17.8:
-    resolution: {integrity: sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==}
+  /@esbuild/android-x64/0.17.11:
+    resolution: {integrity: sha512-3PL3HKtsDIXGQcSCKtWD/dy+mgc4p2Tvo2qKgKHj9Yf+eniwFnuoQ0OUhlSfAEpKAFzF9N21Nwgnap6zy3L3MQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -445,8 +473,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.16.16:
-    resolution: {integrity: sha512-8Z+wld+vr/prHPi2O0X7o1zQOfMbXWGAw9hT0jEyU/l/Yrg+0Z3FO9pjPho72dVkZs4ewZk0bDOFLdZHm8jEfw==}
+  /@esbuild/darwin-arm64/0.16.17:
+    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -454,8 +482,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.17.8:
-    resolution: {integrity: sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==}
+  /@esbuild/darwin-arm64/0.17.11:
+    resolution: {integrity: sha512-pJ950bNKgzhkGNO3Z9TeHzIFtEyC2GDQL3wxkMApDEghYx5Qers84UTNc1bAxWbRkuJOgmOha5V0WUeh8G+YGw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -463,8 +491,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64/0.16.16:
-    resolution: {integrity: sha512-CYkxVvkZzGCqFrt7EgjFxQKhlUPyDkuR9P0Y5wEcmJqVI8ncerOIY5Kej52MhZyzOBXkYrJgZeVZC9xXXoEg9A==}
+  /@esbuild/darwin-x64/0.16.17:
+    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -472,8 +500,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64/0.17.8:
-    resolution: {integrity: sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==}
+  /@esbuild/darwin-x64/0.17.11:
+    resolution: {integrity: sha512-iB0dQkIHXyczK3BZtzw1tqegf0F0Ab5texX2TvMQjiJIWXAfM4FQl7D909YfXWnB92OQz4ivBYQ2RlxBJrMJOw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -481,8 +509,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.16.16:
-    resolution: {integrity: sha512-fxrw4BYqQ39z/3Ja9xj/a1gMsVq0xEjhSyI4a9MjfvDDD8fUV8IYliac96i7tzZc3+VytyXX+XNsnpEk5sw5Wg==}
+  /@esbuild/freebsd-arm64/0.16.17:
+    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -490,8 +518,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.17.8:
-    resolution: {integrity: sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==}
+  /@esbuild/freebsd-arm64/0.17.11:
+    resolution: {integrity: sha512-7EFzUADmI1jCHeDRGKgbnF5sDIceZsQGapoO6dmw7r/ZBEKX7CCDnIz8m9yEclzr7mFsd+DyasHzpjfJnmBB1Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -499,8 +527,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.16.16:
-    resolution: {integrity: sha512-8p3v1D+du2jiDvSoNVimHhj7leSfST9YlKsAEO7etBfuqjaBMndo0fmjNLp0JCMld+XIx9L80tooOkyUv1a1PQ==}
+  /@esbuild/freebsd-x64/0.16.17:
+    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -508,8 +536,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.17.8:
-    resolution: {integrity: sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==}
+  /@esbuild/freebsd-x64/0.17.11:
+    resolution: {integrity: sha512-iPgenptC8i8pdvkHQvXJFzc1eVMR7W2lBPrTE6GbhR54sLcF42mk3zBOjKPOodezzuAz/KSu8CPyFSjcBMkE9g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -517,8 +545,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm/0.16.16:
-    resolution: {integrity: sha512-bYaocE1/PTMRmkgSckZ0D0Xn2nox8v2qlk+MVVqm+VECNKDdZvghVZtH41dNtBbwADSvA6qkCHGYeWm9LrNCBw==}
+  /@esbuild/linux-arm/0.16.17:
+    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -526,8 +554,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm/0.17.8:
-    resolution: {integrity: sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==}
+  /@esbuild/linux-arm/0.17.11:
+    resolution: {integrity: sha512-M9iK/d4lgZH0U5M1R2p2gqhPV/7JPJcRz+8O8GBKVgqndTzydQ7B2XGDbxtbvFkvIs53uXTobOhv+RyaqhUiMg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -535,8 +563,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64/0.16.16:
-    resolution: {integrity: sha512-N3u6BBbCVY3xeP2D8Db7QY8I+nZ+2AgOopUIqk+5yCoLnsWkcVxD2ay5E9iIdvApFi1Vg1lZiiwaVp8bOpAc4A==}
+  /@esbuild/linux-arm64/0.16.17:
+    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -544,8 +572,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64/0.17.8:
-    resolution: {integrity: sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==}
+  /@esbuild/linux-arm64/0.17.11:
+    resolution: {integrity: sha512-Qxth3gsWWGKz2/qG2d5DsW/57SeA2AmpSMhdg9TSB5Svn2KDob3qxfQSkdnWjSd42kqoxIPy3EJFs+6w1+6Qjg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -553,8 +581,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32/0.16.16:
-    resolution: {integrity: sha512-dxjqLKUW8GqGemoRT9v8IgHk+T4tRm1rn1gUcArsp26W9EkK/27VSjBVUXhEG5NInHZ92JaQ3SSMdTwv/r9a2A==}
+  /@esbuild/linux-ia32/0.16.17:
+    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -562,8 +590,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32/0.17.8:
-    resolution: {integrity: sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==}
+  /@esbuild/linux-ia32/0.17.11:
+    resolution: {integrity: sha512-dB1nGaVWtUlb/rRDHmuDQhfqazWE0LMro/AIbT2lWM3CDMHJNpLckH+gCddQyhhcLac2OYw69ikUMO34JLt3wA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -571,17 +599,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64/0.15.18:
-    resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-loong64/0.16.16:
-    resolution: {integrity: sha512-MdUFggHjRiCCwNE9+1AibewoNq6wf94GLB9Q9aXwl+a75UlRmbRK3h6WJyrSGA6ZstDJgaD2wiTSP7tQNUYxwA==}
+  /@esbuild/linux-loong64/0.16.17:
+    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -589,8 +608,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64/0.17.8:
-    resolution: {integrity: sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==}
+  /@esbuild/linux-loong64/0.17.11:
+    resolution: {integrity: sha512-aCWlq70Q7Nc9WDnormntGS1ar6ZFvUpqr8gXtO+HRejRYPweAFQN615PcgaSJkZjhHp61+MNLhzyVALSF2/Q0g==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -598,8 +617,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.16.16:
-    resolution: {integrity: sha512-CO3YmO7jYMlGqGoeFeKzdwx/bx8Vtq/SZaMAi+ZLDUnDUdfC7GmGwXzIwDJ70Sg+P9pAemjJyJ1icKJ9R3q/Fg==}
+  /@esbuild/linux-mips64el/0.16.17:
+    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -607,8 +626,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.17.8:
-    resolution: {integrity: sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==}
+  /@esbuild/linux-mips64el/0.17.11:
+    resolution: {integrity: sha512-cGeGNdQxqY8qJwlYH1BP6rjIIiEcrM05H7k3tR7WxOLmD1ZxRMd6/QIOWMb8mD2s2YJFNRuNQ+wjMhgEL2oCEw==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -616,8 +635,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.16.16:
-    resolution: {integrity: sha512-DSl5Czh5hCy/7azX0Wl9IdzPHX2H8clC6G87tBnZnzUpNgRxPFhfmArbaHoAysu4JfqCqbB/33u/GL9dUgCBAw==}
+  /@esbuild/linux-ppc64/0.16.17:
+    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -625,8 +644,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.17.8:
-    resolution: {integrity: sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==}
+  /@esbuild/linux-ppc64/0.17.11:
+    resolution: {integrity: sha512-BdlziJQPW/bNe0E8eYsHB40mYOluS+jULPCjlWiHzDgr+ZBRXPtgMV1nkLEGdpjrwgmtkZHEGEPaKdS/8faLDA==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -634,8 +653,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.16.16:
-    resolution: {integrity: sha512-sSVVMEXsqf1fQu0j7kkhXMViroixU5XoaJXl1u/u+jbXvvhhCt9YvA/B6VM3aM/77HuRQ94neS5bcisijGnKFQ==}
+  /@esbuild/linux-riscv64/0.16.17:
+    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -643,8 +662,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.17.8:
-    resolution: {integrity: sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==}
+  /@esbuild/linux-riscv64/0.17.11:
+    resolution: {integrity: sha512-MDLwQbtF+83oJCI1Cixn68Et/ME6gelmhssPebC40RdJaect+IM+l7o/CuG0ZlDs6tZTEIoxUe53H3GmMn8oMA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -652,8 +671,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x/0.16.16:
-    resolution: {integrity: sha512-jRqBCre9gZGoCdCN/UWCCMwCMsOg65IpY9Pyj56mKCF5zXy9d60kkNRdDN6YXGjr3rzcC4DXnS/kQVCGcC4yPQ==}
+  /@esbuild/linux-s390x/0.16.17:
+    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -661,8 +680,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x/0.17.8:
-    resolution: {integrity: sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==}
+  /@esbuild/linux-s390x/0.17.11:
+    resolution: {integrity: sha512-4N5EMESvws0Ozr2J94VoUD8HIRi7X0uvUv4c0wpTHZyZY9qpaaN7THjosdiW56irQ4qnJ6Lsc+i+5zGWnyqWqQ==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -670,8 +689,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64/0.16.16:
-    resolution: {integrity: sha512-G1+09TopOzo59/55lk5Q0UokghYLyHTKKzD5lXsAOOlGDbieGEFJpJBr3BLDbf7cz89KX04sBeExAR/pL/26sA==}
+  /@esbuild/linux-x64/0.16.17:
+    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -679,8 +698,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64/0.17.8:
-    resolution: {integrity: sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==}
+  /@esbuild/linux-x64/0.17.11:
+    resolution: {integrity: sha512-rM/v8UlluxpytFSmVdbCe1yyKQd/e+FmIJE2oPJvbBo+D0XVWi1y/NQ4iTNx+436WmDHQBjVLrbnAQLQ6U7wlw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -688,8 +707,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.16.16:
-    resolution: {integrity: sha512-xwjGJB5wwDEujLaJIrSMRqWkbigALpBNcsF9SqszoNKc+wY4kPTdKrSxiY5ik3IatojePP+WV108MvF6q6np4w==}
+  /@esbuild/netbsd-x64/0.16.17:
+    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -697,8 +716,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.17.8:
-    resolution: {integrity: sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==}
+  /@esbuild/netbsd-x64/0.17.11:
+    resolution: {integrity: sha512-4WaAhuz5f91h3/g43VBGdto1Q+X7VEZfpcWGtOFXnggEuLvjV+cP6DyLRU15IjiU9fKLLk41OoJfBFN5DhPvag==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -706,8 +725,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.16.16:
-    resolution: {integrity: sha512-yeERkoxG2nR2oxO5n+Ms7MsCeNk23zrby2GXCqnfCpPp7KNc0vxaaacIxb21wPMfXXRhGBrNP4YLIupUBrWdlg==}
+  /@esbuild/openbsd-x64/0.16.17:
+    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -715,8 +734,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.17.8:
-    resolution: {integrity: sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==}
+  /@esbuild/openbsd-x64/0.17.11:
+    resolution: {integrity: sha512-UBj135Nx4FpnvtE+C8TWGp98oUgBcmNmdYgl5ToKc0mBHxVVqVE7FUS5/ELMImOp205qDAittL6Ezhasc2Ev/w==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -724,8 +743,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64/0.16.16:
-    resolution: {integrity: sha512-nHfbEym0IObXPhtX6Va3H5GaKBty2kdhlAhKmyCj9u255ktAj0b1YACUs9j5H88NRn9cJCthD1Ik/k9wn8YKVg==}
+  /@esbuild/sunos-x64/0.16.17:
+    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -733,8 +752,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64/0.17.8:
-    resolution: {integrity: sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==}
+  /@esbuild/sunos-x64/0.17.11:
+    resolution: {integrity: sha512-1/gxTifDC9aXbV2xOfCbOceh5AlIidUrPsMpivgzo8P8zUtczlq1ncFpeN1ZyQJ9lVs2hILy1PG5KPp+w8QPPg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -742,8 +761,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64/0.16.16:
-    resolution: {integrity: sha512-pdD+M1ZOFy4hE15ZyPX09fd5g4DqbbL1wXGY90YmleVS6Y5YlraW4BvHjim/X/4yuCpTsAFvsT4Nca2lbyDH/A==}
+  /@esbuild/win32-arm64/0.16.17:
+    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -751,8 +770,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64/0.17.8:
-    resolution: {integrity: sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==}
+  /@esbuild/win32-arm64/0.17.11:
+    resolution: {integrity: sha512-vtSfyx5yRdpiOW9yp6Ax0zyNOv9HjOAw8WaZg3dF5djEHKKm3UnoohftVvIJtRh0Ec7Hso0RIdTqZvPXJ7FdvQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -760,8 +779,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32/0.16.16:
-    resolution: {integrity: sha512-IPEMfU9p0c3Vb8PqxaPX6BM9rYwlTZGYOf9u+kMdhoILZkVKEjq6PKZO0lB+isojWwAnAqh4ZxshD96njTXajg==}
+  /@esbuild/win32-ia32/0.16.17:
+    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -769,8 +788,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32/0.17.8:
-    resolution: {integrity: sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==}
+  /@esbuild/win32-ia32/0.17.11:
+    resolution: {integrity: sha512-GFPSLEGQr4wHFTiIUJQrnJKZhZjjq4Sphf+mM76nQR6WkQn73vm7IsacmBRPkALfpOCHsopSvLgqdd4iUW2mYw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -778,8 +797,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64/0.16.16:
-    resolution: {integrity: sha512-1YYpoJ39WV/2bnShPwgdzJklc+XS0bysN6Tpnt1cWPdeoKOG4RMEY1g7i534QxXX/rPvNx/NLJQTTCeORYzipg==}
+  /@esbuild/win32-x64/0.16.17:
+    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -787,8 +806,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64/0.17.8:
-    resolution: {integrity: sha512-1iuezdyDNngPnz8rLRDO2C/ZZ/emJLb72OsZeqQ6gL6Avko/XCXZw+NuxBSNhBAP13Hie418V7VMt9et1FMvpg==}
+  /@esbuild/win32-x64/0.17.11:
+    resolution: {integrity: sha512-N9vXqLP3eRL8BqSy8yn4Y98cZI2pZ8fyuHx6lKjiG2WABpT2l01TXdzq5Ma2ZUBzfB7tx5dXVhge8X9u0S70ZQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -796,14 +815,29 @@ packages:
     dev: true
     optional: true
 
-  /@eslint/eslintrc/1.4.1:
-    resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
+  /@eslint-community/eslint-utils/4.2.0_eslint@8.36.0:
+    resolution: {integrity: sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+    dependencies:
+      eslint: 8.36.0
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /@eslint-community/regexpp/4.4.0:
+    resolution: {integrity: sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+    dev: true
+
+  /@eslint/eslintrc/2.0.1:
+    resolution: {integrity: sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4
-      espree: 9.4.1
-      globals: 13.19.0
+      espree: 9.5.0
+      globals: 13.20.0
       ignore: 5.2.4
       import-fresh: 3.3.0
       js-yaml: 4.1.0
@@ -813,6 +847,11 @@ packages:
       - supports-color
     dev: true
 
+  /@eslint/js/8.36.0:
+    resolution: {integrity: sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@humanwhocodes/config-array/0.11.8:
     resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
     engines: {node: '>=10.10.0'}
@@ -877,7 +916,7 @@ packages:
     engines: {node: '>= 8'}
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.14.0
+      fastq: 1.15.0
     dev: true
 
   /@octokit/auth-token/2.5.0:
@@ -956,7 +995,7 @@ packages:
       '@octokit/request-error': 2.1.0
       '@octokit/types': 6.41.0
       is-plain-object: 5.0.0
-      node-fetch: 2.6.7
+      node-fetch: 2.6.9
       universal-user-agent: 6.0.0
     transitivePeerDependencies:
       - encoding
@@ -982,11 +1021,11 @@ packages:
     resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==}
     dev: true
 
-  /@types/glob/8.0.1:
-    resolution: {integrity: sha512-8bVUjXZvJacUFkJXHdyZ9iH1Eaj5V7I8c4NdH5sQJsdXkqT4CA5Dhb4yb4VE/3asyx4L9ayZr1NIhTsWHczmMw==}
+  /@types/glob/8.1.0:
+    resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 18.13.0
+      '@types/node': 18.15.3
     dev: true
 
   /@types/istanbul-lib-coverage/2.0.4:
@@ -1020,12 +1059,12 @@ packages:
     resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
     dev: true
 
-  /@types/node/14.18.35:
-    resolution: {integrity: sha512-2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw==}
+  /@types/node/14.18.36:
+    resolution: {integrity: sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==}
     dev: true
 
-  /@types/node/18.13.0:
-    resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==}
+  /@types/node/18.15.3:
+    resolution: {integrity: sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==}
     dev: true
 
   /@types/normalize-package-data/2.4.1:
@@ -1048,8 +1087,8 @@ packages:
       csstype: 3.1.1
     dev: true
 
-  /@types/sanitize-html/2.8.0:
-    resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
+  /@types/sanitize-html/2.8.1:
+    resolution: {integrity: sha512-Q6kMAbBBaXA5IagoipeSr4Y/zuGyh4BZ5lewgb3cYe3OYqy0k/d67iMsC4O895eks676bVAe9G+0y1i0k2ZlnA==}
     dependencies:
       htmlparser2: 8.0.1
     dev: true
@@ -1070,8 +1109,8 @@ packages:
     resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
     dev: true
 
-  /@types/validator/13.7.12:
-    resolution: {integrity: sha512-YVtyAPqpefU+Mm/qqnOANW6IkqKpCSrarcyV269C8MA8Ux0dbkEuQwM/4CjL47kVEM2LgBef/ETfkH+c6+moFA==}
+  /@types/validator/13.7.14:
+    resolution: {integrity: sha512-J6OAed6rhN6zyqL9Of6ZMamhlsOEU/poBVvbHr/dKOYKTeuYYMlDkMv+b6UUV0o2i0tw73cgyv/97WTWaUl0/g==}
     dev: true
 
   /@types/web-bluetooth/0.0.16:
@@ -1082,12 +1121,12 @@ packages:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 18.13.0
+      '@types/node': 18.15.3
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/5.52.0_6cfvjsbua5ptj65675bqcn6oza:
-    resolution: {integrity: sha512-lHazYdvYVsBokwCdKOppvYJKaJ4S41CgKBcPvyd0xjZNbvQdhn/pnJlGtQksQ/NhInzdaeaSarlBjDXHuclEbg==}
+  /@typescript-eslint/eslint-plugin/5.54.1_4rfaf6mlw2mmutqjcopwvbftpu:
+    resolution: {integrity: sha512-a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -1097,12 +1136,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.52.0_7kw3g6rralp5ps6mg3uyzz6azm
-      '@typescript-eslint/scope-manager': 5.52.0
-      '@typescript-eslint/type-utils': 5.52.0_7kw3g6rralp5ps6mg3uyzz6azm
-      '@typescript-eslint/utils': 5.52.0_7kw3g6rralp5ps6mg3uyzz6azm
+      '@typescript-eslint/parser': 5.54.1_vgl77cfdswitgr47lm5swmv43m
+      '@typescript-eslint/scope-manager': 5.54.1
+      '@typescript-eslint/type-utils': 5.54.1_vgl77cfdswitgr47lm5swmv43m
+      '@typescript-eslint/utils': 5.54.1_vgl77cfdswitgr47lm5swmv43m
       debug: 4.3.4
-      eslint: 8.34.0
+      eslint: 8.36.0
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
@@ -1114,8 +1153,21 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.52.0_7kw3g6rralp5ps6mg3uyzz6azm:
-    resolution: {integrity: sha512-e2KiLQOZRo4Y0D/b+3y08i3jsekoSkOYStROYmPUnGMEoA0h+k2qOH5H6tcjIc68WDvGwH+PaOrP1XRzLJ6QlA==}
+  /@typescript-eslint/experimental-utils/5.53.0_vgl77cfdswitgr47lm5swmv43m:
+    resolution: {integrity: sha512-4SklZEwRn0jqkhtW+pPZpbKFXprwGneBndRM0TGzJu/LWdb9QV2hBgFIVU9AREo02BzqFvyG/ypd+xAW5YGhXw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@typescript-eslint/utils': 5.53.0_vgl77cfdswitgr47lm5swmv43m
+      eslint: 8.36.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/parser/5.54.1_vgl77cfdswitgr47lm5swmv43m:
+    resolution: {integrity: sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -1124,26 +1176,34 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.52.0
-      '@typescript-eslint/types': 5.52.0
-      '@typescript-eslint/typescript-estree': 5.52.0_typescript@4.9.5
+      '@typescript-eslint/scope-manager': 5.54.1
+      '@typescript-eslint/types': 5.54.1
+      '@typescript-eslint/typescript-estree': 5.54.1_typescript@4.9.5
       debug: 4.3.4
-      eslint: 8.34.0
+      eslint: 8.36.0
       typescript: 4.9.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.52.0:
-    resolution: {integrity: sha512-AR7sxxfBKiNV0FWBSARxM8DmNxrwgnYMPwmpkC1Pl1n+eT8/I2NAUPuwDy/FmDcC6F8pBfmOcaxcxRHspgOBMw==}
+  /@typescript-eslint/scope-manager/5.53.0:
+    resolution: {integrity: sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.52.0
-      '@typescript-eslint/visitor-keys': 5.52.0
+      '@typescript-eslint/types': 5.53.0
+      '@typescript-eslint/visitor-keys': 5.53.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.52.0_7kw3g6rralp5ps6mg3uyzz6azm:
-    resolution: {integrity: sha512-tEKuUHfDOv852QGlpPtB3lHOoig5pyFQN/cUiZtpw99D93nEBjexRLre5sQZlkMoHry/lZr8qDAt2oAHLKA6Jw==}
+  /@typescript-eslint/scope-manager/5.54.1:
+    resolution: {integrity: sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.54.1
+      '@typescript-eslint/visitor-keys': 5.54.1
+    dev: true
+
+  /@typescript-eslint/type-utils/5.54.1_vgl77cfdswitgr47lm5swmv43m:
+    resolution: {integrity: sha512-WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -1152,23 +1212,28 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.52.0_typescript@4.9.5
-      '@typescript-eslint/utils': 5.52.0_7kw3g6rralp5ps6mg3uyzz6azm
+      '@typescript-eslint/typescript-estree': 5.54.1_typescript@4.9.5
+      '@typescript-eslint/utils': 5.54.1_vgl77cfdswitgr47lm5swmv43m
       debug: 4.3.4
-      eslint: 8.34.0
+      eslint: 8.36.0
       tsutils: 3.21.0_typescript@4.9.5
       typescript: 4.9.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.52.0:
-    resolution: {integrity: sha512-oV7XU4CHYfBhk78fS7tkum+/Dpgsfi91IIDy7fjCyq2k6KB63M6gMC0YIvy+iABzmXThCRI6xpCEyVObBdWSDQ==}
+  /@typescript-eslint/types/5.53.0:
+    resolution: {integrity: sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/types/5.54.1:
+    resolution: {integrity: sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.52.0_typescript@4.9.5:
-    resolution: {integrity: sha512-WeWnjanyEwt6+fVrSR0MYgEpUAuROxuAH516WPjUblIrClzYJj0kBbjdnbQXLpgAN8qbEuGywiQsXUVDiAoEuQ==}
+  /@typescript-eslint/typescript-estree/5.53.0_typescript@4.9.5:
+    resolution: {integrity: sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -1176,8 +1241,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.52.0
-      '@typescript-eslint/visitor-keys': 5.52.0
+      '@typescript-eslint/types': 5.53.0
+      '@typescript-eslint/visitor-keys': 5.53.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -1188,90 +1253,129 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.52.0_7kw3g6rralp5ps6mg3uyzz6azm:
-    resolution: {integrity: sha512-As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==}
+  /@typescript-eslint/typescript-estree/5.54.1_typescript@4.9.5:
+    resolution: {integrity: sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.54.1
+      '@typescript-eslint/visitor-keys': 5.54.1
+      debug: 4.3.4
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.8
+      tsutils: 3.21.0_typescript@4.9.5
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/utils/5.53.0_vgl77cfdswitgr47lm5swmv43m:
+    resolution: {integrity: sha512-VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': 7.0.11
+      '@types/semver': 7.3.13
+      '@typescript-eslint/scope-manager': 5.53.0
+      '@typescript-eslint/types': 5.53.0
+      '@typescript-eslint/typescript-estree': 5.53.0_typescript@4.9.5
+      eslint: 8.36.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@8.36.0
+      semver: 7.3.8
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/utils/5.54.1_vgl77cfdswitgr47lm5swmv43m:
+    resolution: {integrity: sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.52.0
-      '@typescript-eslint/types': 5.52.0
-      '@typescript-eslint/typescript-estree': 5.52.0_typescript@4.9.5
-      eslint: 8.34.0
+      '@typescript-eslint/scope-manager': 5.54.1
+      '@typescript-eslint/types': 5.54.1
+      '@typescript-eslint/typescript-estree': 5.54.1_typescript@4.9.5
+      eslint: 8.36.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.34.0
+      eslint-utils: 3.0.0_eslint@8.36.0
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.52.0:
-    resolution: {integrity: sha512-qMwpw6SU5VHCPr99y274xhbm+PRViK/NATY6qzt+Et7+mThGuFSl/ompj2/hrBlRP/kq+BFdgagnOSgw9TB0eA==}
+  /@typescript-eslint/visitor-keys/5.53.0:
+    resolution: {integrity: sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.52.0
+      '@typescript-eslint/types': 5.53.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-vue/4.0.0_vite@4.1.1+vue@3.2.47:
+  /@typescript-eslint/visitor-keys/5.54.1:
+    resolution: {integrity: sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.54.1
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /@vitejs/plugin-vue/4.0.0_vite@4.1.4+vue@3.2.47:
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.1.1_@types+node@18.13.0
+      vite: 4.1.4_@types+node@18.15.3
       vue: 3.2.47
     dev: true
 
-  /@vitest/coverage-c8/0.28.5_@vitest+ui@0.28.5:
-    resolution: {integrity: sha512-zCNyurjudoG0BAqAgknvlBhkV2V9ZwyYLWOAGtHSDhL/St49MJT+V2p1G0yPaoqBbKOTATVnP5H2p1XL15H75g==}
+  /@vitest/coverage-c8/0.29.2_vitest@0.29.2:
+    resolution: {integrity: sha512-NmD3WirQCeQjjKfHu4iEq18DVOBFbLn9TKVdMpyi5YW2EtnS+K22/WE+9/wRrepOhyeTxuEFgxUVkCAE1GhbnQ==}
+    peerDependencies:
+      vitest: '>=0.29.0 <1'
     dependencies:
-      c8: 7.12.0
+      c8: 7.13.0
       picocolors: 1.0.0
-      std-env: 3.3.1
-      vitest: 0.28.5_@vitest+ui@0.28.5
-    transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - happy-dom
-      - jsdom
-      - less
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
+      std-env: 3.3.2
+      vitest: 0.29.2_@vitest+ui@0.29.2
     dev: true
 
-  /@vitest/expect/0.28.5:
-    resolution: {integrity: sha512-gqTZwoUTwepwGIatnw4UKpQfnoyV0Z9Czn9+Lo2/jLIt4/AXLTn+oVZxlQ7Ng8bzcNkR+3DqLJ08kNr8jRmdNQ==}
+  /@vitest/expect/0.29.2:
+    resolution: {integrity: sha512-wjrdHB2ANTch3XKRhjWZN0UueFocH0cQbi2tR5Jtq60Nb3YOSmakjdAvUa2JFBu/o8Vjhj5cYbcMXkZxn1NzmA==}
     dependencies:
-      '@vitest/spy': 0.28.5
-      '@vitest/utils': 0.28.5
+      '@vitest/spy': 0.29.2
+      '@vitest/utils': 0.29.2
       chai: 4.3.7
     dev: true
 
-  /@vitest/runner/0.28.5:
-    resolution: {integrity: sha512-NKkHtLB+FGjpp5KmneQjTcPLWPTDfB7ie+MmF1PnUBf/tGe2OjGxWyB62ySYZ25EYp9krR5Bw0YPLS/VWh1QiA==}
+  /@vitest/runner/0.29.2:
+    resolution: {integrity: sha512-A1P65f5+6ru36AyHWORhuQBJrOOcmDuhzl5RsaMNFe2jEkoj0faEszQS4CtPU/LxUYVIazlUtZTY0OEZmyZBnA==}
     dependencies:
-      '@vitest/utils': 0.28.5
+      '@vitest/utils': 0.29.2
       p-limit: 4.0.0
       pathe: 1.1.0
     dev: true
 
-  /@vitest/spy/0.28.5:
-    resolution: {integrity: sha512-7if6rsHQr9zbmvxN7h+gGh2L9eIIErgf8nSKYDlg07HHimCxp4H6I/X/DPXktVPPLQfiZ1Cw2cbDIx9fSqDjGw==}
+  /@vitest/spy/0.29.2:
+    resolution: {integrity: sha512-Hc44ft5kaAytlGL2PyFwdAsufjbdOvHklwjNy/gy/saRbg9Kfkxfh+PklLm1H2Ib/p586RkQeNFKYuJInUssyw==}
     dependencies:
-      tinyspy: 1.0.2
+      tinyspy: 1.1.1
     dev: true
 
-  /@vitest/ui/0.28.5:
-    resolution: {integrity: sha512-hzzZzv38mH/LMFh54QEJpWFuGixZZBOD+C0fHU81d1lsvochPwNZhWJbuRJQNyZLSMZYCYW4hF6PpNQJXDHDmg==}
+  /@vitest/ui/0.29.2:
+    resolution: {integrity: sha512-GpCExCMptrS1z3Xf6kz35Xdvjc2eTBy9OIIwW3HjePVxw9Q++ZoEaIBVimRTTGzSe40XiAI/ZyR0H0Ya9brqLA==}
     dependencies:
       fast-glob: 3.2.12
       flatted: 3.2.7
@@ -1280,8 +1384,8 @@ packages:
       sirv: 2.0.2
     dev: true
 
-  /@vitest/utils/0.28.5:
-    resolution: {integrity: sha512-UyZdYwdULlOa4LTUSwZ+Paz7nBHGTT72jKwdFSV4IjHF1xsokp+CabMdhjvVhYwkLfO88ylJT46YMilnkSARZA==}
+  /@vitest/utils/0.29.2:
+    resolution: {integrity: sha512-F14/Uc+vCdclStS2KEoXJlOLAEyqRhnw0gM27iXw9bMTcyKRPJrQ+rlC6XZ125GIPvvKYMPpVxNhiou6PsEeYQ==}
     dependencies:
       cli-truncate: 3.1.0
       diff: 5.1.0
@@ -1293,7 +1397,7 @@ packages:
   /@vue/compiler-core/3.2.47:
     resolution: {integrity: sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==}
     dependencies:
-      '@babel/parser': 7.20.7
+      '@babel/parser': 7.21.1
       '@vue/shared': 3.2.47
       estree-walker: 2.0.2
       source-map: 0.6.1
@@ -1309,7 +1413,7 @@ packages:
   /@vue/compiler-sfc/3.2.47:
     resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==}
     dependencies:
-      '@babel/parser': 7.20.7
+      '@babel/parser': 7.21.1
       '@vue/compiler-core': 3.2.47
       '@vue/compiler-dom': 3.2.47
       '@vue/compiler-ssr': 3.2.47
@@ -1335,7 +1439,7 @@ packages:
   /@vue/reactivity-transform/3.2.47:
     resolution: {integrity: sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==}
     dependencies:
-      '@babel/parser': 7.20.7
+      '@babel/parser': 7.21.1
       '@vue/compiler-core': 3.2.47
       '@vue/shared': 3.2.47
       estree-walker: 2.0.2
@@ -1377,24 +1481,24 @@ packages:
     resolution: {integrity: sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==}
     dev: true
 
-  /@vueuse/core/9.12.0_vue@3.2.47:
-    resolution: {integrity: sha512-h/Di8Bvf6xRcvS/PvUVheiMYYz3U0tH3X25YxONSaAUBa841ayMwxkuzx/DGUMCW/wHWzD8tRy2zYmOC36r4sg==}
+  /@vueuse/core/9.13.0_vue@3.2.47:
+    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
     dependencies:
       '@types/web-bluetooth': 0.0.16
-      '@vueuse/metadata': 9.12.0
-      '@vueuse/shared': 9.12.0_vue@3.2.47
+      '@vueuse/metadata': 9.13.0
+      '@vueuse/shared': 9.13.0_vue@3.2.47
       vue-demi: 0.13.11_vue@3.2.47
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
     dev: true
 
-  /@vueuse/metadata/9.12.0:
-    resolution: {integrity: sha512-9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ==}
+  /@vueuse/metadata/9.13.0:
+    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
     dev: true
 
-  /@vueuse/shared/9.12.0_vue@3.2.47:
-    resolution: {integrity: sha512-TWuJLACQ0BVithVTRbex4Wf1a1VaRuSpVeyEd4vMUWl54PzlE0ciFUshKCXnlLuD0lxIaLK4Ypj3NXYzZh4+SQ==}
+  /@vueuse/shared/9.13.0_vue@3.2.47:
+    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
     dependencies:
       vue-demi: 0.13.11_vue@3.2.47
     transitivePeerDependencies:
@@ -1410,12 +1514,12 @@ packages:
       through: 2.3.8
     dev: true
 
-  /acorn-jsx/5.3.2_acorn@8.8.1:
+  /acorn-jsx/5.3.2_acorn@8.8.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
     dev: true
 
   /acorn-walk/8.2.0:
@@ -1423,8 +1527,8 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /acorn/8.8.1:
-    resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
+  /acorn/8.8.2:
+    resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -1541,8 +1645,8 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      define-properties: 1.2.0
+      es-abstract: 1.21.1
       es-shim-unscopables: 1.0.0
     dev: true
 
@@ -1584,12 +1688,17 @@ packages:
     engines: {node: '>= 4.0.0'}
     dev: true
 
+  /available-typed-arrays/1.0.5:
+    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /aws-sign2/0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
     dev: true
 
-  /aws4/1.11.0:
-    resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
+  /aws4/1.12.0:
+    resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==}
     dev: true
 
   /balanced-match/1.0.2:
@@ -1657,8 +1766,8 @@ packages:
       ieee754: 1.2.1
     dev: true
 
-  /c8/7.12.0:
-    resolution: {integrity: sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==}
+  /c8/7.13.0:
+    resolution: {integrity: sha512-/NL4hQTv1gBL6J6ei80zu3IiTrmePDKXKXOTLpHvcIWZTVYQlDhVWjjWvkhICylE8EwwnMVzDZugCvdx0/DIIA==}
     engines: {node: '>=10.12.0'}
     hasBin: true
     dependencies:
@@ -1671,7 +1780,7 @@ packages:
       istanbul-reports: 3.1.5
       rimraf: 3.0.2
       test-exclude: 6.0.0
-      v8-to-istanbul: 9.0.1
+      v8-to-istanbul: 9.1.0
       yargs: 16.2.0
       yargs-parser: 20.2.9
     dev: true
@@ -1690,7 +1799,7 @@ packages:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
     dev: true
 
   /callsites/3.1.0:
@@ -1755,8 +1864,8 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /ci-info/3.7.0:
-    resolution: {integrity: sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==}
+  /ci-info/3.8.0:
+    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
     engines: {node: '>=8'}
     dev: true
 
@@ -2090,15 +2199,15 @@ packages:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
     dev: true
 
-  /cypress/12.5.1:
-    resolution: {integrity: sha512-ZmCmJ3lsyeOpBfh410m5+AO2CO1AxAzFBt7k6/uVbNcrNZje1vdiwYTpj2ksPKg9mjr9lR6V8tmlDNMvr4H/YQ==}
+  /cypress/12.7.0:
+    resolution: {integrity: sha512-7rq+nmhzz0u6yabCFyPtADU2OOrYt6pvUau9qV7xyifJ/hnsaw/vkr0tnLlcuuQKUAOC1v1M1e4Z0zG7S0IAvA==}
     engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
     hasBin: true
     requiresBuild: true
     dependencies:
-      '@cypress/request': 2.88.10
+      '@cypress/request': 2.88.11
       '@cypress/xvfb': 1.2.4_supports-color@8.1.1
-      '@types/node': 14.18.35
+      '@types/node': 14.18.36
       '@types/sinonjs__fake-timers': 8.1.1
       '@types/sizzle': 2.3.3
       arch: 2.2.0
@@ -2128,7 +2237,7 @@ packages:
       listr2: 3.14.0_enquirer@2.3.6
       lodash: 4.17.21
       log-symbols: 4.1.0
-      minimist: 1.2.7
+      minimist: 1.2.8
       ospath: 1.2.2
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
@@ -2221,13 +2330,13 @@ packages:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
     dev: true
 
-  /deepmerge/4.2.2:
-    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
+  /deepmerge/4.3.0:
+    resolution: {integrity: sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /define-properties/1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
+  /define-properties/1.2.0:
+    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-property-descriptors: 1.0.0
@@ -2357,35 +2466,52 @@ packages:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-abstract/1.20.5:
-    resolution: {integrity: sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==}
+  /es-abstract/1.21.1:
+    resolution: {integrity: sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==}
     engines: {node: '>= 0.4'}
     dependencies:
+      available-typed-arrays: 1.0.5
       call-bind: 1.0.2
+      es-set-tostringtag: 2.0.1
       es-to-primitive: 1.2.1
       function-bind: 1.1.1
       function.prototype.name: 1.1.5
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
       get-symbol-description: 1.0.0
+      globalthis: 1.0.3
       gopd: 1.0.1
       has: 1.0.3
       has-property-descriptors: 1.0.0
+      has-proto: 1.0.1
       has-symbols: 1.0.3
-      internal-slot: 1.0.4
+      internal-slot: 1.0.5
+      is-array-buffer: 3.0.1
       is-callable: 1.2.7
       is-negative-zero: 2.0.2
       is-regex: 1.1.4
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
+      is-typed-array: 1.1.10
       is-weakref: 1.0.2
-      object-inspect: 1.12.2
+      object-inspect: 1.12.3
       object-keys: 1.1.1
       object.assign: 4.1.4
       regexp.prototype.flags: 1.4.3
       safe-regex-test: 1.0.0
       string.prototype.trimend: 1.0.6
       string.prototype.trimstart: 1.0.6
+      typed-array-length: 1.0.4
       unbox-primitive: 1.0.2
+      which-typed-array: 1.1.9
+    dev: true
+
+  /es-set-tostringtag/2.0.1:
+    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.0
+      has: 1.0.3
+      has-tostringtag: 1.0.0
     dev: true
 
   /es-shim-unscopables/1.0.0:
@@ -2403,274 +2529,64 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /esbuild-android-64/0.15.18:
-    resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-android-arm64/0.15.18:
-    resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-darwin-64/0.15.18:
-    resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-darwin-arm64/0.15.18:
-    resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-freebsd-64/0.15.18:
-    resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-freebsd-arm64/0.15.18:
-    resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-32/0.15.18:
-    resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-64/0.15.18:
-    resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-arm/0.15.18:
-    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-arm64/0.15.18:
-    resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-mips64le/0.15.18:
-    resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-ppc64le/0.15.18:
-    resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-riscv64/0.15.18:
-    resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-linux-s390x/0.15.18:
-    resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-netbsd-64/0.15.18:
-    resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-openbsd-64/0.15.18:
-    resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-sunos-64/0.15.18:
-    resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-windows-32/0.15.18:
-    resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-windows-64/0.15.18:
-    resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild-windows-arm64/0.15.18:
-    resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /esbuild/0.15.18:
-    resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
+  /esbuild/0.16.17:
+    resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.15.18
-      '@esbuild/linux-loong64': 0.15.18
-      esbuild-android-64: 0.15.18
-      esbuild-android-arm64: 0.15.18
-      esbuild-darwin-64: 0.15.18
-      esbuild-darwin-arm64: 0.15.18
-      esbuild-freebsd-64: 0.15.18
-      esbuild-freebsd-arm64: 0.15.18
-      esbuild-linux-32: 0.15.18
-      esbuild-linux-64: 0.15.18
-      esbuild-linux-arm: 0.15.18
-      esbuild-linux-arm64: 0.15.18
-      esbuild-linux-mips64le: 0.15.18
-      esbuild-linux-ppc64le: 0.15.18
-      esbuild-linux-riscv64: 0.15.18
-      esbuild-linux-s390x: 0.15.18
-      esbuild-netbsd-64: 0.15.18
-      esbuild-openbsd-64: 0.15.18
-      esbuild-sunos-64: 0.15.18
-      esbuild-windows-32: 0.15.18
-      esbuild-windows-64: 0.15.18
-      esbuild-windows-arm64: 0.15.18
-    dev: true
-
-  /esbuild/0.16.16:
-    resolution: {integrity: sha512-24JyKq10KXM5EBIgPotYIJ2fInNWVVqflv3gicIyQqfmUqi4HvDW1VR790cBgLJHCl96Syy7lhoz7tLFcmuRmg==}
+      '@esbuild/android-arm': 0.16.17
+      '@esbuild/android-arm64': 0.16.17
+      '@esbuild/android-x64': 0.16.17
+      '@esbuild/darwin-arm64': 0.16.17
+      '@esbuild/darwin-x64': 0.16.17
+      '@esbuild/freebsd-arm64': 0.16.17
+      '@esbuild/freebsd-x64': 0.16.17
+      '@esbuild/linux-arm': 0.16.17
+      '@esbuild/linux-arm64': 0.16.17
+      '@esbuild/linux-ia32': 0.16.17
+      '@esbuild/linux-loong64': 0.16.17
+      '@esbuild/linux-mips64el': 0.16.17
+      '@esbuild/linux-ppc64': 0.16.17
+      '@esbuild/linux-riscv64': 0.16.17
+      '@esbuild/linux-s390x': 0.16.17
+      '@esbuild/linux-x64': 0.16.17
+      '@esbuild/netbsd-x64': 0.16.17
+      '@esbuild/openbsd-x64': 0.16.17
+      '@esbuild/sunos-x64': 0.16.17
+      '@esbuild/win32-arm64': 0.16.17
+      '@esbuild/win32-ia32': 0.16.17
+      '@esbuild/win32-x64': 0.16.17
+    dev: true
+
+  /esbuild/0.17.11:
+    resolution: {integrity: sha512-pAMImyokbWDtnA/ufPxjQg0fYo2DDuzAlqwnDvbXqHLphe+m80eF++perYKVm8LeTuj2zUuFXC+xgSVxyoHUdg==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.16.16
-      '@esbuild/android-arm64': 0.16.16
-      '@esbuild/android-x64': 0.16.16
-      '@esbuild/darwin-arm64': 0.16.16
-      '@esbuild/darwin-x64': 0.16.16
-      '@esbuild/freebsd-arm64': 0.16.16
-      '@esbuild/freebsd-x64': 0.16.16
-      '@esbuild/linux-arm': 0.16.16
-      '@esbuild/linux-arm64': 0.16.16
-      '@esbuild/linux-ia32': 0.16.16
-      '@esbuild/linux-loong64': 0.16.16
-      '@esbuild/linux-mips64el': 0.16.16
-      '@esbuild/linux-ppc64': 0.16.16
-      '@esbuild/linux-riscv64': 0.16.16
-      '@esbuild/linux-s390x': 0.16.16
-      '@esbuild/linux-x64': 0.16.16
-      '@esbuild/netbsd-x64': 0.16.16
-      '@esbuild/openbsd-x64': 0.16.16
-      '@esbuild/sunos-x64': 0.16.16
-      '@esbuild/win32-arm64': 0.16.16
-      '@esbuild/win32-ia32': 0.16.16
-      '@esbuild/win32-x64': 0.16.16
-    dev: true
-
-  /esbuild/0.17.8:
-    resolution: {integrity: sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.8
-      '@esbuild/android-arm64': 0.17.8
-      '@esbuild/android-x64': 0.17.8
-      '@esbuild/darwin-arm64': 0.17.8
-      '@esbuild/darwin-x64': 0.17.8
-      '@esbuild/freebsd-arm64': 0.17.8
-      '@esbuild/freebsd-x64': 0.17.8
-      '@esbuild/linux-arm': 0.17.8
-      '@esbuild/linux-arm64': 0.17.8
-      '@esbuild/linux-ia32': 0.17.8
-      '@esbuild/linux-loong64': 0.17.8
-      '@esbuild/linux-mips64el': 0.17.8
-      '@esbuild/linux-ppc64': 0.17.8
-      '@esbuild/linux-riscv64': 0.17.8
-      '@esbuild/linux-s390x': 0.17.8
-      '@esbuild/linux-x64': 0.17.8
-      '@esbuild/netbsd-x64': 0.17.8
-      '@esbuild/openbsd-x64': 0.17.8
-      '@esbuild/sunos-x64': 0.17.8
-      '@esbuild/win32-arm64': 0.17.8
-      '@esbuild/win32-ia32': 0.17.8
-      '@esbuild/win32-x64': 0.17.8
+      '@esbuild/android-arm': 0.17.11
+      '@esbuild/android-arm64': 0.17.11
+      '@esbuild/android-x64': 0.17.11
+      '@esbuild/darwin-arm64': 0.17.11
+      '@esbuild/darwin-x64': 0.17.11
+      '@esbuild/freebsd-arm64': 0.17.11
+      '@esbuild/freebsd-x64': 0.17.11
+      '@esbuild/linux-arm': 0.17.11
+      '@esbuild/linux-arm64': 0.17.11
+      '@esbuild/linux-ia32': 0.17.11
+      '@esbuild/linux-loong64': 0.17.11
+      '@esbuild/linux-mips64el': 0.17.11
+      '@esbuild/linux-ppc64': 0.17.11
+      '@esbuild/linux-riscv64': 0.17.11
+      '@esbuild/linux-s390x': 0.17.11
+      '@esbuild/linux-x64': 0.17.11
+      '@esbuild/netbsd-x64': 0.17.11
+      '@esbuild/openbsd-x64': 0.17.11
+      '@esbuild/sunos-x64': 0.17.11
+      '@esbuild/win32-arm64': 0.17.11
+      '@esbuild/win32-ia32': 0.17.11
+      '@esbuild/win32-x64': 0.17.11
     dev: true
 
   /escalade/3.1.1:
@@ -2688,21 +2604,21 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-config-prettier/8.6.0_eslint@8.34.0:
-    resolution: {integrity: sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==}
+  /eslint-config-prettier/8.7.0_eslint@8.36.0:
+    resolution: {integrity: sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.34.0
+      eslint: 8.36.0
     dev: true
 
-  /eslint-define-config/1.15.0:
-    resolution: {integrity: sha512-p6K61L6HrnDNRF2HzUsTdGaGPohO0TmSX/oQ0ttBhfApWHMyDcX+FCqSziCDywSf0U0bxe4e2HOfYho1nGHTLw==}
+  /eslint-define-config/1.16.0:
+    resolution: {integrity: sha512-0gMi2IIDVDNAcy0nDaRss41cBTRMFFAp83WBcGIPi5S7uMOLhNmvbSPozvOoUxv5dIRuGV6E6l+HUnEoFyEbFg==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13', pnpm: '>= 7.0.0'}
     dev: true
 
-  /eslint-gitignore/0.1.0_eslint@8.34.0:
+  /eslint-gitignore/0.1.0_eslint@8.36.0:
     resolution: {integrity: sha512-VFvY5Wyjuz5xXDC/NeONHzsh4YQNok2Gzg4SftAAuhkbrdHv5CChjfiFyLKhRlgOdCJr5kBquaLXHtuDBTW2/Q==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -2710,14 +2626,29 @@ packages:
     dependencies:
       array.prototype.flatmap: 1.3.1
       debug: 4.3.4
-      eslint: 8.34.0
+      eslint: 8.36.0
       fast-glob: 3.2.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsdoc/40.0.0_eslint@8.34.0:
-    resolution: {integrity: sha512-LOPyIu1vAVvGPkye3ci0moj0iNf3f8bmin6do2DYDj+77NRXWnkmhKRy8swWsatUs3mB5jYPWPUsFg9pyfEiyA==}
+  /eslint-plugin-deprecation/1.3.3_vgl77cfdswitgr47lm5swmv43m:
+    resolution: {integrity: sha512-Bbkv6ZN2cCthVXz/oZKPwsSY5S/CbgTLRG4Q2s2gpPpgNsT0uJ0dB5oLNiWzFYY8AgKX4ULxXFG1l/rDav9QFA==}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: ^3.7.5 || ^4.0.0
+    dependencies:
+      '@typescript-eslint/experimental-utils': 5.53.0_vgl77cfdswitgr47lm5swmv43m
+      eslint: 8.36.0
+      tslib: 2.5.0
+      tsutils: 3.21.0_typescript@4.9.5
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-plugin-jsdoc/40.0.2_eslint@8.36.0:
+    resolution: {integrity: sha512-EjcpQX64+d02kKMlBZbTc7xIkCOa0A9TF2AlB/3NlM7Xl8bywwvJ5Wo7ickEn/EzfauMbZcCCKSZItAH+6Xakg==}
     engines: {node: ^14 || ^16 || ^17 || ^18 || ^19}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -2726,15 +2657,15 @@ packages:
       comment-parser: 1.3.1
       debug: 4.3.4
       escape-string-regexp: 4.0.0
-      eslint: 8.34.0
-      esquery: 1.4.0
+      eslint: 8.36.0
+      esquery: 1.4.2
       semver: 7.3.8
       spdx-expression-parse: 3.0.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-prettier/4.2.1_u5wnrdwibbfomslmnramz52buy:
+  /eslint-plugin-prettier/4.2.1_eqzx3hpkgx5nnvxls3azrcc7dm:
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -2745,8 +2676,8 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.34.0
-      eslint-config-prettier: 8.6.0_eslint@8.34.0
+      eslint: 8.36.0
+      eslint-config-prettier: 8.7.0_eslint@8.36.0
       prettier: 2.8.4
       prettier-linter-helpers: 1.0.0
     dev: true
@@ -2767,13 +2698,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.34.0:
+  /eslint-utils/3.0.0_eslint@8.36.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.34.0
+      eslint: 8.36.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -2787,12 +2718,15 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.34.0:
-    resolution: {integrity: sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==}
+  /eslint/8.36.0:
+    resolution: {integrity: sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.4.1
+      '@eslint-community/eslint-utils': 4.2.0_eslint@8.36.0
+      '@eslint-community/regexpp': 4.4.0
+      '@eslint/eslintrc': 2.0.1
+      '@eslint/js': 8.36.0
       '@humanwhocodes/config-array': 0.11.8
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
@@ -2803,23 +2737,22 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.34.0
       eslint-visitor-keys: 3.3.0
-      espree: 9.4.1
-      esquery: 1.4.0
+      espree: 9.5.0
+      esquery: 1.4.2
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.19.0
+      globals: 13.20.0
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
-      js-sdsl: 4.2.0
+      js-sdsl: 4.3.0
       js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
@@ -2827,7 +2760,6 @@ packages:
       minimatch: 3.1.2
       natural-compare: 1.4.0
       optionator: 0.9.1
-      regexpp: 3.2.0
       strip-ansi: 6.0.1
       strip-json-comments: 3.1.1
       text-table: 0.2.0
@@ -2835,17 +2767,17 @@ packages:
       - supports-color
     dev: true
 
-  /espree/9.4.1:
-    resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
+  /espree/9.5.0:
+    resolution: {integrity: sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.8.1
-      acorn-jsx: 5.3.2_acorn@8.8.1
+      acorn: 8.8.2
+      acorn-jsx: 5.3.2_acorn@8.8.2
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /esquery/1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
+  /esquery/1.4.2:
+    resolution: {integrity: sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
@@ -2953,8 +2885,8 @@ packages:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
     dev: true
 
-  /fastq/1.14.0:
-    resolution: {integrity: sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==}
+  /fastq/1.15.0:
+    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
     dependencies:
       reusify: 1.0.4
     dev: true
@@ -3028,6 +2960,12 @@ packages:
     resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
     dev: true
 
+  /for-each/0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+    dependencies:
+      is-callable: 1.2.7
+    dev: true
+
   /foreground-child/2.0.0:
     resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
     engines: {node: '>=8.0.0'}
@@ -3080,8 +3018,8 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      define-properties: 1.2.0
+      es-abstract: 1.21.1
       functions-have-names: 1.2.3
     dev: true
 
@@ -3098,8 +3036,8 @@ packages:
     resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==}
     dev: true
 
-  /get-intrinsic/1.1.3:
-    resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
+  /get-intrinsic/1.2.0:
+    resolution: {integrity: sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==}
     dependencies:
       function-bind: 1.1.1
       has: 1.0.3
@@ -3129,7 +3067,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
     dev: true
 
   /get-tsconfig/4.4.0:
@@ -3208,15 +3146,14 @@ packages:
       path-is-absolute: 1.0.1
     dev: true
 
-  /glob/8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: '>=12'}
+  /glob/9.2.1:
+    resolution: {integrity: sha512-Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA==}
+    engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
       fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.2
-      once: 1.4.0
+      minimatch: 7.4.2
+      minipass: 4.2.4
+      path-scurry: 1.6.1
     dev: true
 
   /global-dirs/3.0.1:
@@ -3226,13 +3163,20 @@ packages:
       ini: 2.0.0
     dev: true
 
-  /globals/13.19.0:
-    resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
+  /globals/13.20.0:
+    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
     dev: true
 
+  /globalthis/1.0.3:
+    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-properties: 1.2.0
+    dev: true
+
   /globby/11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -3248,7 +3192,7 @@ packages:
   /gopd/1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
     dev: true
 
   /graceful-fs/4.2.10:
@@ -3264,7 +3208,7 @@ packages:
     engines: {node: '>=0.4.7'}
     hasBin: true
     dependencies:
-      minimist: 1.2.7
+      minimist: 1.2.8
       neo-async: 2.6.2
       source-map: 0.6.1
       wordwrap: 1.0.0
@@ -3294,7 +3238,12 @@ packages:
   /has-property-descriptors/1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
+    dev: true
+
+  /has-proto/1.0.1:
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
+    engines: {node: '>= 0.4'}
     dev: true
 
   /has-symbols/1.0.3:
@@ -3401,15 +3350,23 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /internal-slot/1.0.4:
-    resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==}
+  /internal-slot/1.0.5:
+    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
       has: 1.0.3
       side-channel: 1.0.4
     dev: true
 
+  /is-array-buffer/3.0.1:
+    resolution: {integrity: sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.0
+      is-typed-array: 1.1.10
+    dev: true
+
   /is-arrayish/0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
@@ -3437,7 +3394,7 @@ packages:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
     dependencies:
-      ci-info: 3.7.0
+      ci-info: 3.8.0
     dev: true
 
   /is-core-module/2.11.0:
@@ -3560,6 +3517,17 @@ packages:
       text-extensions: 1.9.0
     dev: true
 
+  /is-typed-array/1.1.10:
+    resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-typedarray/1.0.0:
     resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
     dev: true
@@ -3609,8 +3577,8 @@ packages:
       istanbul-lib-report: 3.0.0
     dev: true
 
-  /js-sdsl/4.2.0:
-    resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
+  /js-sdsl/4.3.0:
+    resolution: {integrity: sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==}
     dev: true
 
   /js-tokens/4.0.0:
@@ -3736,8 +3704,8 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /local-pkg/0.4.2:
-    resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==}
+  /local-pkg/0.4.3:
+    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
     engines: {node: '>=14'}
     dev: true
 
@@ -3825,6 +3793,11 @@ packages:
       yallist: 4.0.0
     dev: true
 
+  /lru-cache/7.18.3:
+    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
+    engines: {node: '>=12'}
+    dev: true
+
   /lunr/2.3.9:
     resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==}
     dev: true
@@ -3925,15 +3898,8 @@ packages:
       brace-expansion: 1.1.11
     dev: true
 
-  /minimatch/5.1.2:
-    resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
-  /minimatch/6.2.0:
-    resolution: {integrity: sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==}
+  /minimatch/7.4.2:
+    resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
@@ -3948,17 +3914,22 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /minimist/1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
+  /minimist/1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
     dev: true
 
-  /mlly/1.1.0:
-    resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
+  /minipass/4.2.4:
+    resolution: {integrity: sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /mlly/1.1.1:
+    resolution: {integrity: sha512-Jnlh4W/aI4GySPo6+DyTN17Q75KKbLTyFK8BrGhjNP4rxuUjbRWhE6gHg3bs33URWAF44FRm7gdQA348i3XxRw==}
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
       pathe: 1.1.0
-      pkg-types: 1.0.1
-      ufo: 1.0.1
+      pkg-types: 1.0.2
+      ufo: 1.1.0
     dev: true
 
   /modify-values/1.0.1:
@@ -4001,8 +3972,8 @@ packages:
     resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
     dev: true
 
-  /node-fetch/2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+  /node-fetch/2.6.9:
+    resolution: {integrity: sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==}
     engines: {node: 4.x || >=6.0.0}
     peerDependencies:
       encoding: ^0.1.0
@@ -4044,7 +4015,7 @@ packages:
       minimatch: 3.1.2
       pidtree: 0.3.1
       read-pkg: 3.0.0
-      shell-quote: 1.7.4
+      shell-quote: 1.8.0
       string.prototype.padend: 3.1.4
     dev: true
 
@@ -4055,8 +4026,8 @@ packages:
       path-key: 3.1.1
     dev: true
 
-  /object-inspect/1.12.2:
-    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
+  /object-inspect/1.12.3:
+    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
     dev: true
 
   /object-keys/1.1.1:
@@ -4069,7 +4040,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
+      define-properties: 1.2.0
       has-symbols: 1.0.3
       object-keys: 1.1.1
     dev: true
@@ -4234,6 +4205,14 @@ packages:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
     dev: true
 
+  /path-scurry/1.6.1:
+    resolution: {integrity: sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==}
+    engines: {node: '>=14'}
+    dependencies:
+      lru-cache: 7.18.3
+      minipass: 4.2.4
+    dev: true
+
   /path-type/3.0.0:
     resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
     engines: {node: '>=4'}
@@ -4287,23 +4266,14 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /pkg-types/1.0.1:
-    resolution: {integrity: sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==}
+  /pkg-types/1.0.2:
+    resolution: {integrity: sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.1.0
+      mlly: 1.1.1
       pathe: 1.1.0
     dev: true
 
-  /postcss/8.4.20:
-    resolution: {integrity: sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.4
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
   /postcss/8.4.21:
     resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -4313,8 +4283,8 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /preact/10.11.3:
-    resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
+  /preact/10.12.1:
+    resolution: {integrity: sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==}
     dev: true
 
   /prelude-ls/1.2.1:
@@ -4385,8 +4355,8 @@ packages:
       once: 1.4.0
     dev: true
 
-  /punycode/2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
+  /punycode/2.3.0:
+    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
     dev: true
 
@@ -4395,9 +4365,11 @@ packages:
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
     dev: true
 
-  /qs/6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
+  /qs/6.10.4:
+    resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==}
     engines: {node: '>=0.6'}
+    dependencies:
+      side-channel: 1.0.4
     dev: true
 
   /queue-microtask/1.2.3:
@@ -4500,7 +4472,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
+      define-properties: 1.2.0
       functions-have-names: 1.2.3
     dev: true
 
@@ -4558,14 +4530,16 @@ packages:
       glob: 7.2.3
     dev: true
 
-  /rimraf/4.1.2:
-    resolution: {integrity: sha512-BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ==}
+  /rimraf/4.4.0:
+    resolution: {integrity: sha512-X36S+qpCUR0HjXlkDe4NAOhS//aHH0Z+h8Ckf2auGJk3PTnx5rLmrHkwNdbVQuCSUhOyFrlRvFEllZOYE+yZGQ==}
     engines: {node: '>=14'}
     hasBin: true
+    dependencies:
+      glob: 9.2.1
     dev: true
 
-  /rollup/3.15.0:
-    resolution: {integrity: sha512-F9hrCAhnp5/zx/7HYmftvsNBkMfLfk/dXUh73hPSM2E3CRgap65orDNJbLetoiUFwSAk6iHPLvBrZ5iHYvzqsg==}
+  /rollup/3.17.2:
+    resolution: {integrity: sha512-qMNZdlQPCkWodrAZ3qnJtvCAl4vpQ8q77uEujVCCbC/6CLB7Lcmvjq7HyiOSnf4fxTT9XgsE36oLHJBH49xjqA==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -4581,7 +4555,7 @@ packages:
   /rxjs/7.8.0:
     resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.0
     dev: true
 
   /safe-buffer/5.1.2:
@@ -4596,7 +4570,7 @@ packages:
     resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.0
       is-regex: 1.1.4
     dev: true
 
@@ -4604,15 +4578,15 @@ packages:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
 
-  /sanitize-html/2.9.0:
-    resolution: {integrity: sha512-KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg==}
+  /sanitize-html/2.10.0:
+    resolution: {integrity: sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==}
     dependencies:
-      deepmerge: 4.2.2
+      deepmerge: 4.3.0
       escape-string-regexp: 4.0.0
       htmlparser2: 8.0.1
       is-plain-object: 5.0.0
       parse-srcset: 1.0.2
-      postcss: 8.4.20
+      postcss: 8.4.21
     dev: true
 
   /scheduler/0.23.0:
@@ -4663,8 +4637,8 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /shell-quote/1.7.4:
-    resolution: {integrity: sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==}
+  /shell-quote/1.8.0:
+    resolution: {integrity: sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==}
     dev: true
 
   /shiki/0.14.1:
@@ -4680,8 +4654,8 @@ packages:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      object-inspect: 1.12.2
+      get-intrinsic: 1.2.0
+      object-inspect: 1.12.3
     dev: true
 
   /siginfo/2.0.0:
@@ -4829,8 +4803,8 @@ packages:
       yargs: 16.2.0
     dev: true
 
-  /std-env/3.3.1:
-    resolution: {integrity: sha512-3H20QlwQsSm2OvAxWIYhs+j01MzzqwMwGiiO1NQaJYZgJZFPuAbf95/DiKRBSTYIJ2FeGUc+B/6mPGcWP9dO3Q==}
+  /std-env/3.3.2:
+    resolution: {integrity: sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==}
     dev: true
 
   /string-width/4.2.3:
@@ -4856,24 +4830,24 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      define-properties: 1.2.0
+      es-abstract: 1.21.1
     dev: true
 
   /string.prototype.trimend/1.0.6:
     resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      define-properties: 1.2.0
+      es-abstract: 1.21.1
     dev: true
 
   /string.prototype.trimstart/1.0.6:
     resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.5
+      define-properties: 1.2.0
+      es-abstract: 1.21.1
     dev: true
 
   /string_decoder/1.1.1:
@@ -4929,10 +4903,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /strip-literal/1.0.0:
-    resolution: {integrity: sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==}
+  /strip-literal/1.0.1:
+    resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==}
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
     dev: true
 
   /supports-color/5.5.0:
@@ -5022,8 +4996,8 @@ packages:
     engines: {node: '>=14.0.0'}
     dev: true
 
-  /tinyspy/1.0.2:
-    resolution: {integrity: sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q==}
+  /tinyspy/1.1.1:
+    resolution: {integrity: sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==}
     engines: {node: '>=14.0.0'}
     dev: true
 
@@ -5056,7 +5030,7 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.3.0
     dev: true
 
   /tr46/0.0.3:
@@ -5072,8 +5046,8 @@ packages:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: true
 
-  /tslib/2.4.1:
-    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
+  /tslib/2.5.0:
+    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
     dev: true
 
   /tsutils/3.21.0_typescript@4.9.5:
@@ -5086,12 +5060,12 @@ packages:
       typescript: 4.9.5
     dev: true
 
-  /tsx/3.12.3:
-    resolution: {integrity: sha512-Wc5BFH1xccYTXaQob+lEcimkcb/Pq+0en2s+ruiX0VEIC80nV7/0s7XRahx8NnsoCnpCVUPz8wrqVSPi760LkA==}
+  /tsx/3.12.5:
+    resolution: {integrity: sha512-/TLj30xF1zcN9JkoFCyROtIQUi8cRQG+AFchsg5YkWou3+RXxTZS/ffWB3nCxyZPoBqF2+8ohs07N815dNb1wQ==}
     hasBin: true
     dependencies:
       '@esbuild-kit/cjs-loader': 2.4.2
-      '@esbuild-kit/core-utils': 3.0.0
+      '@esbuild-kit/core-utils': 3.1.0
       '@esbuild-kit/esm-loader': 2.5.5
     optionalDependencies:
       fsevents: 2.3.2
@@ -5149,20 +5123,28 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /typed-array-length/1.0.4:
+    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
+    dependencies:
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      is-typed-array: 1.1.10
+    dev: true
+
   /typedarray/0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
     dev: true
 
-  /typedoc-plugin-missing-exports/1.0.0_typedoc@0.23.25:
+  /typedoc-plugin-missing-exports/1.0.0_typedoc@0.23.26:
     resolution: {integrity: sha512-7s6znXnuAj1eD9KYPyzVzR1lBF5nwAY8IKccP5sdoO9crG4lpd16RoFpLsh2PccJM+I2NASpr0+/NMka6ThwVA==}
     peerDependencies:
       typedoc: 0.22.x || 0.23.x
     dependencies:
-      typedoc: 0.23.25_typescript@4.9.5
+      typedoc: 0.23.26_typescript@4.9.5
     dev: true
 
-  /typedoc/0.23.25_typescript@4.9.5:
-    resolution: {integrity: sha512-O1he153qVyoCgJYSvIyY3bPP1wAJTegZfa6tL3APinSZhJOf8CSd8F/21M6ex8pUY/fuY6n0jAsT4fIuMGA6sA==}
+  /typedoc/0.23.26_typescript@4.9.5:
+    resolution: {integrity: sha512-5m4KwR5tOLnk0OtMaRn9IdbeRM32uPemN9kur7YK9wFqx8U0CYrvO9aVq6ysdZSV1c824BTm+BuQl2Ze/k1HtA==}
     engines: {node: '>= 14.14'}
     hasBin: true
     peerDependencies:
@@ -5170,7 +5152,7 @@ packages:
     dependencies:
       lunr: 2.3.9
       marked: 4.2.12
-      minimatch: 6.2.0
+      minimatch: 7.4.2
       shiki: 0.14.1
       typescript: 4.9.5
     dev: true
@@ -5181,8 +5163,8 @@ packages:
     hasBin: true
     dev: true
 
-  /ufo/1.0.1:
-    resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
+  /ufo/1.1.0:
+    resolution: {integrity: sha512-LQc2s/ZDMaCN3QLpa+uzHUOQ7SdV0qgv3VBXOolQGXTaaZpIur6PwUclF5nN2hNkiTRcUugXd1zFOW3FLJ135Q==}
     dev: true
 
   /uglify-js/3.17.4:
@@ -5219,7 +5201,7 @@ packages:
   /uri-js/4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
-      punycode: 2.1.1
+      punycode: 2.3.0
     dev: true
 
   /util-deprecate/1.0.2:
@@ -5237,8 +5219,8 @@ packages:
     hasBin: true
     dev: true
 
-  /v8-to-istanbul/9.0.1:
-    resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
+  /v8-to-istanbul/9.1.0:
+    resolution: {integrity: sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==}
     engines: {node: '>=10.12.0'}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.17
@@ -5267,19 +5249,17 @@ packages:
       extsprintf: 1.3.0
     dev: true
 
-  /vite-node/0.28.5_@types+node@18.13.0:
-    resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
+  /vite-node/0.29.2_@types+node@18.15.3:
+    resolution: {integrity: sha512-5oe1z6wzI3gkvc4yOBbDBbgpiWiApvuN4P55E8OI131JGrSuo4X3SOZrNmZYo4R8Zkze/dhi572blX0zc+6SdA==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4
-      mlly: 1.1.0
+      mlly: 1.1.1
       pathe: 1.1.0
       picocolors: 1.0.0
-      source-map: 0.6.1
-      source-map-support: 0.5.21
-      vite: 4.1.1_@types+node@18.13.0
+      vite: 4.1.4_@types+node@18.15.3
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -5290,8 +5270,8 @@ packages:
       - terser
     dev: true
 
-  /vite/4.1.1_@types+node@18.13.0:
-    resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==}
+  /vite/4.1.4_@types+node@18.15.3:
+    resolution: {integrity: sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -5315,27 +5295,27 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 18.13.0
-      esbuild: 0.16.16
+      '@types/node': 18.15.3
+      esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
-      rollup: 3.15.0
+      rollup: 3.17.2
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vitepress/1.0.0-alpha.46_hzfxhvcwzectry2x7akkc5uh5a:
-    resolution: {integrity: sha512-HiKiHzC0iTPsRsKs8XcsMeMzCpcCt5LWcX9mpDr288Ju+nQf1G8A2+Wm44ZkBsVv4EHxFK4ChmWyZrL1OJUXpg==}
+  /vitepress/1.0.0-alpha.58_6x66empz7tvqv233bjwlvs4b7i:
+    resolution: {integrity: sha512-aENSAiE2uKMoQPwBTELY8Nig5qSWrmAl+MgsO3l/TE8At6kXii+2rseEId/bVfT700JeucYdqtCgWxu+LwpYIw==}
     hasBin: true
     dependencies:
-      '@docsearch/css': 3.3.2
-      '@docsearch/js': 3.3.2_hf5ijsloe6gzee4vmv74rvas4u
-      '@vitejs/plugin-vue': 4.0.0_vite@4.1.1+vue@3.2.47
+      '@docsearch/css': 3.3.3
+      '@docsearch/js': 3.3.3_4jk4sx5gsa4z6dpons6mwt4w6q
+      '@vitejs/plugin-vue': 4.0.0_vite@4.1.4+vue@3.2.47
       '@vue/devtools-api': 6.5.0
-      '@vueuse/core': 9.12.0_vue@3.2.47
+      '@vueuse/core': 9.13.0_vue@3.2.47
       body-scroll-lock: 4.0.0-beta.0
       shiki: 0.14.1
-      vite: 4.1.1_@types+node@18.13.0
+      vite: 4.1.4_@types+node@18.15.3
       vue: 3.2.47
     transitivePeerDependencies:
       - '@algolia/client-search'
@@ -5351,8 +5331,8 @@ packages:
       - terser
     dev: true
 
-  /vitest/0.28.5_@vitest+ui@0.28.5:
-    resolution: {integrity: sha512-pyCQ+wcAOX7mKMcBNkzDwEHRGqQvHUl0XnoHR+3Pb1hytAHISgSxv9h0gUiSiYtISXUU3rMrKiKzFYDrI6ZIHA==}
+  /vitest/0.29.2_@vitest+ui@0.29.2:
+    resolution: {integrity: sha512-ydK9IGbAvoY8wkg29DQ4ivcVviCaUi3ivuPKfZEVddMTenFHUfB8EEDXQV8+RasEk1ACFLgMUqAaDuQ/Nk+mQA==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:
@@ -5375,28 +5355,28 @@ packages:
     dependencies:
       '@types/chai': 4.3.4
       '@types/chai-subset': 1.3.3
-      '@types/node': 18.13.0
-      '@vitest/expect': 0.28.5
-      '@vitest/runner': 0.28.5
-      '@vitest/spy': 0.28.5
-      '@vitest/ui': 0.28.5
-      '@vitest/utils': 0.28.5
-      acorn: 8.8.1
+      '@types/node': 18.15.3
+      '@vitest/expect': 0.29.2
+      '@vitest/runner': 0.29.2
+      '@vitest/spy': 0.29.2
+      '@vitest/ui': 0.29.2
+      '@vitest/utils': 0.29.2
+      acorn: 8.8.2
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.7
       debug: 4.3.4
-      local-pkg: 0.4.2
+      local-pkg: 0.4.3
       pathe: 1.1.0
       picocolors: 1.0.0
       source-map: 0.6.1
-      std-env: 3.3.1
-      strip-literal: 1.0.0
+      std-env: 3.3.2
+      strip-literal: 1.0.1
       tinybench: 2.3.1
       tinypool: 0.3.1
-      tinyspy: 1.0.2
-      vite: 4.1.1_@types+node@18.13.0
-      vite-node: 0.28.5_@types+node@18.13.0
+      tinyspy: 1.1.1
+      vite: 4.1.4_@types+node@18.15.3
+      vite-node: 0.29.2_@types+node@18.15.3
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -5461,6 +5441,18 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
+  /which-typed-array/1.1.9:
+    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+      is-typed-array: 1.1.10
+    dev: true
+
   /which/1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
diff --git a/scripts/apidoc/signature.ts b/scripts/apidoc/signature.ts
index d9e1cc440cb..7403e492638 100644
--- a/scripts/apidoc/signature.ts
+++ b/scripts/apidoc/signature.ts
@@ -20,11 +20,11 @@ import vitepressConfig from '../../docs/.vitepress/config';
 import { faker } from '../../src';
 import { formatTypescript } from './format';
 import {
+  extractDeprecated,
   extractRawExamples,
   extractSeeAlsos,
   extractSince,
   extractSourcePath,
-  isDeprecated,
   joinTagParts,
 } from './typedoc';
 import { pathOutputDir } from './utils';
@@ -178,7 +178,10 @@ export function analyzeSignature(
   const seeAlsos = extractSeeAlsos(signature).map((seeAlso) =>
     mdToHtml(seeAlso, true)
   );
-
+  const deprecatedMessage = extractDeprecated(signature);
+  const deprecated = deprecatedMessage
+    ? mdToHtml(deprecatedMessage)
+    : undefined;
   return {
     name: methodName,
     title: prettifyMethodName(methodName),
@@ -188,7 +191,7 @@ export function analyzeSignature(
     sourcePath: extractSourcePath(signature),
     returns: typeToText(signature.type),
     examples: mdToHtml(`${code}ts\n${examples}${code}`),
-    deprecated: isDeprecated(signature),
+    deprecated,
     seeAlsos,
   };
 }
diff --git a/scripts/apidoc/typedoc.ts b/scripts/apidoc/typedoc.ts
index cc5132a9a07..b408b7ce0d4 100644
--- a/scripts/apidoc/typedoc.ts
+++ b/scripts/apidoc/typedoc.ts
@@ -94,7 +94,9 @@ export function selectApiModules(
 export function selectApiMethods(
   module: DeclarationReflection
 ): DeclarationReflection[] {
-  return module.getChildrenByKind(ReflectionKind.Method);
+  return module
+    .getChildrenByKind(ReflectionKind.Method)
+    .filter((method) => !method.flags.isPrivate);
 }
 
 /**
@@ -245,10 +247,13 @@ export function joinTagParts(parts?: CommentDisplayPart[]): string | undefined {
  *
  * @param signature The signature to check.
  *
- * @returns `true` if it is deprecated, otherwise `false`.
+ * @returns The message explaining the deprecation if deprecated, otherwise `undefined`.
  */
-export function isDeprecated(signature: SignatureReflection): boolean {
-  return extractTagContent('@deprecated', signature).length > 0;
+export function extractDeprecated(
+  signature: SignatureReflection
+): string | undefined {
+  const deprecated = extractTagContent('@deprecated', signature).join().trim();
+  return deprecated.length === 0 ? undefined : deprecated;
 }
 
 /**
diff --git a/scripts/bundle.ts b/scripts/bundle.ts
index e08b7de4378..b162a32ecfb 100644
--- a/scripts/bundle.ts
+++ b/scripts/bundle.ts
@@ -1,7 +1,7 @@
 import { buildSync } from 'esbuild';
-import { sync as globSync } from 'glob';
+import { globSync } from 'glob';
 import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
-import locales from '../src/locales';
+import { allLocales } from '../src';
 
 console.log('Building dist for node (cjs)...');
 
@@ -14,7 +14,7 @@ if (existsSync(localeDir)) {
 }
 
 mkdirSync(localeDir);
-for (const locale of Object.keys(locales)) {
+for (const locale of Object.keys(allLocales)) {
   writeFileSync(
     `${localeDir}/${locale}.js`,
     `module.exports = require('../dist/cjs/locale/${locale}');\n`,
@@ -43,7 +43,7 @@ console.log('Building dist for node type=module (esm)...');
 buildSync({
   entryPoints: [
     './src/index.ts',
-    ...Object.keys(locales).map((locale) => `./src/locale/${locale}.ts`),
+    ...Object.keys(allLocales).map((locale) => `./src/locale/${locale}.ts`),
   ],
   outdir: './dist/esm',
   bundle: true,
diff --git a/scripts/generateLocales.ts b/scripts/generateLocales.ts
index 571815899c9..d8fa1be13a2 100644
--- a/scripts/generateLocales.ts
+++ b/scripts/generateLocales.ts
@@ -12,7 +12,13 @@
  *
  * Run this script using `pnpm run generate:locales`
  */
-import { lstatSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
+import {
+  existsSync,
+  lstatSync,
+  readdirSync,
+  readFileSync,
+  writeFileSync,
+} from 'node:fs';
 import { resolve } from 'node:path';
 import type { Options } from 'prettier';
 import { format } from 'prettier';
@@ -24,6 +30,7 @@ import type { Definitions, LocaleDefinition } from '../src/definitions';
 const pathRoot = resolve(__dirname, '..');
 const pathLocale = resolve(pathRoot, 'src', 'locale');
 const pathLocales = resolve(pathRoot, 'src', 'locales');
+const pathLocaleIndex = resolve(pathLocale, 'index.ts');
 const pathLocalesIndex = resolve(pathLocales, 'index.ts');
 const pathDocsGuideLocalization = resolve(
   pathRoot,
@@ -108,19 +115,31 @@ function escapeField(parent: string, module: string): string {
 }
 
 function generateLocaleFile(locale: string): void {
+  const parts = locale.split('_');
+  const locales = [locale];
+
+  for (let i = parts.length - 1; i > 0; i--) {
+    const fallback = parts.slice(0, i).join('_');
+    if (existsSync(resolve(pathLocales, fallback))) {
+      locales.push(fallback);
+    }
+  }
+
+  if (locales[locales.length - 1] !== 'en') {
+    locales.push('en');
+  }
+
   let content = `
       ${autoGeneratedCommentHeader}
 
       import { Faker } from '../faker';
-      import ${locale} from '../locales/${locale}';
-      ${locale !== 'en' ? "import en from '../locales/en';" : ''}
+      ${locales
+        .map((imp) => `import ${imp} from '../locales/${imp}';`)
+        .join('\n')}
 
       export const faker = new Faker({
-        locale: '${locale}',
-        localeFallback: 'en',
-        locales: {
-          ${locale},
-          ${locale !== 'en' ? 'en,' : ''}
+        locale: ${
+          locales.length === 1 ? locales[0] : `[${locales.join(', ')}]`
         },
       });
       `;
@@ -275,11 +294,12 @@ function updateLocaleFileHook(
 const locales = readdirSync(pathLocales);
 removeIndexTs(locales);
 
-let localeIndexImports = "import type { LocaleDefinition } from '..';\n";
-let localeIndexType = 'export type KnownLocale =\n';
-let localeIndexLocales = 'const locales: KnownLocales = {\n';
+let localeIndexImports = '';
+let localeIndexExportsIndividual = '';
+let localeIndexExportsGrouped = '';
+let localesIndexExports = '';
 
-let localizationLocales = '| Locale | Name |\n| :--- | :--- |\n';
+let localizationLocales = '| Locale | Name | Faker |\n| :--- | :--- | :--- |\n';
 
 for (const locale of locales) {
   const pathModules = resolve(pathLocales, locale);
@@ -288,10 +308,15 @@ for (const locale of locales) {
   // We use a fallback here to at least generate a working file.
   const localeTitle = localeDef?.title ?? `TODO: Insert Title for ${locale}`;
 
-  localeIndexImports += `import ${locale} from './${locale}';\n`;
-  localeIndexType += `  | '${locale}'\n`;
-  localeIndexLocales += `  ${locale},\n`;
-  localizationLocales += `| ${locale} | ${localeTitle} |\n`;
+  const localizedFaker = `faker${locale.replace(/^([a-z]+)/, (part) =>
+    part.toUpperCase()
+  )}`;
+
+  localeIndexImports += `import { faker as ${localizedFaker} } from './${locale}';\n`;
+  localeIndexExportsIndividual += `  ${localizedFaker},\n`;
+  localeIndexExportsGrouped += `  ${locale}: ${localizedFaker},\n`;
+  localesIndexExports += `export { default as ${locale} } from './${locale}';\n`;
+  localizationLocales += `| \`${locale}\` | ${localeTitle} | \`${localizedFaker}\` |\n`;
 
   // src/locale/<locale>.ts
   generateLocaleFile(locale);
@@ -306,24 +331,35 @@ for (const locale of locales) {
   );
 }
 
-// src/locales/index.ts
+// src/locale/index.ts
 
-let indexContent = `
+let localeIndexContent = `
   ${autoGeneratedCommentHeader}
 
   ${localeIndexImports}
 
-  ${localeIndexType};
+  export {
+  ${localeIndexExportsIndividual}
+  };
+
+  export const allFakers = {
+  ${localeIndexExportsGrouped}
+  } as const;
+  `;
+
+localeIndexContent = format(localeIndexContent, prettierTsOptions);
+writeFileSync(pathLocaleIndex, localeIndexContent);
 
-  export type KnownLocales = Record<KnownLocale, LocaleDefinition>;
+// src/locales/index.ts
 
-  ${localeIndexLocales}};
+let localesIndexContent = `
+  ${autoGeneratedCommentHeader}
 
-  export default locales;
+  ${localesIndexExports}
   `;
 
-indexContent = format(indexContent, prettierTsOptions);
-writeFileSync(pathLocalesIndex, indexContent);
+localesIndexContent = format(localesIndexContent, prettierTsOptions);
+writeFileSync(pathLocalesIndex, localesIndexContent);
 
 // docs/guide/localization.md
 
diff --git a/src/definitions/company.ts b/src/definitions/company.ts
index 6d70cb36802..257a2912292 100644
--- a/src/definitions/company.ts
+++ b/src/definitions/company.ts
@@ -5,27 +5,27 @@ import type { LocaleEntry } from './definitions';
  */
 export type CompanyDefinitions = LocaleEntry<{
   /**
-   * Business/products related adjectives.
+   * Business/products related adjectives that can be used to demonstrate data being viewed by a manager.
    */
-  bs_adjective: string[];
+  buzz_adjective: string[];
 
   /**
-   * Business/products related nouns.
+   * Business/products related nouns that can be used to demonstrate data being viewed by a manager.
    */
-  bs_noun: string[];
+  buzz_noun: string[];
 
   /**
-   * Business/products related verbs.
+   * Business/products related verbs that can be used to demonstrate data being viewed by a manager.
    */
-  bs_verb: string[];
+  buzz_verb: string[];
 
   /**
-   * Catchphrase adjectives.
+   * Catchphrase adjectives that can be displayed to an end user.
    */
   adjective: string[];
 
   /**
-   * Catchphrase descriptors.
+   * Catchphrase descriptors that can be displayed to an end user.
    */
   descriptor: string[];
 
@@ -35,7 +35,7 @@ export type CompanyDefinitions = LocaleEntry<{
   name_patterns: string[];
 
   /**
-   * Catchphrase nouns.
+   * Catchphrase nouns that can be displayed to an end user.
    */
   noun: string[];
 
diff --git a/src/definitions/definitions.ts b/src/definitions/definitions.ts
index 65753ba75c3..afec8b28969 100644
--- a/src/definitions/definitions.ts
+++ b/src/definitions/definitions.ts
@@ -55,7 +55,7 @@ export interface Definitions {
  */
 export type LocaleDefinition = {
   /**
-   * The name of the language.
+   * The English name of the language (and the specific country, if defined).
    */
   title: string;
 } & LocaleEntry<Definitions>;
diff --git a/src/definitions/finance.ts b/src/definitions/finance.ts
index 89fc51ea278..e40648a0f4d 100644
--- a/src/definitions/finance.ts
+++ b/src/definitions/finance.ts
@@ -1,5 +1,5 @@
+import type { Currency } from '../modules/finance';
 import type { LocaleEntry } from './definitions';
-
 /**
  * The possible definitions related to finance.
  */
@@ -18,27 +18,12 @@ export type FinanceDefinitions = LocaleEntry<{
   credit_card: { [issuer: string]: string[] };
 
   /**
-   * Currencies by their full name and their symbols (e.g. `US Dollar` -> `USD` / `$`).
+   * Currencies including their name, code and symbol (e.g. `US Dollar` / `USD` / `$`).
    */
-  currency: { [currencyName: string]: FinanceCurrencyEntryDefinitions };
+  currency: Currency[];
 
   /**
    * Types of transactions (e.g. `deposit`).
    */
   transaction_type: string[];
 }>;
-
-/**
- * The possible definitions related to currency entries.
- */
-export interface FinanceCurrencyEntryDefinitions {
-  /**
-   * The code/short text/abbreviation for the currency (e.g. `USD`).
-   */
-  code: string;
-
-  /**
-   * The symbol for the currency (e.g. `$`).
-   */
-  symbol: string;
-}
diff --git a/src/definitions/index.ts b/src/definitions/index.ts
index 9ba6f21145e..631b0c117d3 100644
--- a/src/definitions/index.ts
+++ b/src/definitions/index.ts
@@ -9,10 +9,7 @@ export type { CompanyDefinitions } from './company';
 export type { DatabaseDefinitions } from './database';
 export type { DateDefinitions, DateEntryDefinition } from './date';
 export type { Definitions, LocaleDefinition } from './definitions';
-export type {
-  FinanceCurrencyEntryDefinitions,
-  FinanceDefinitions,
-} from './finance';
+export type { FinanceDefinitions } from './finance';
 export type { HackerDefinitions } from './hacker';
 export type { InternetDefinitions } from './internet';
 export type { LocationDefinitions } from './location';
diff --git a/src/definitions/location.ts b/src/definitions/location.ts
index 95362eddebc..c0f6dfa94a8 100644
--- a/src/definitions/location.ts
+++ b/src/definitions/location.ts
@@ -39,6 +39,11 @@ export type LocationDefinitions = LocaleEntry<{
    */
   country: string[];
 
+  /**
+   * The [ISO_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1) country codes.
+   */
+  country_code: Array<{ alpha2: string; alpha3: string }>;
+
   /**
    * The names of this country's states.
    */
@@ -111,16 +116,6 @@ export type LocationDefinitions = LocaleEntry<{
    */
   secondary_address: string[];
 
-  /**
-   * The ISO-3166-1 ALPHA-2 country codes related to this locale.
-   */
-  country_code: string[];
-
-  /**
-   * The ISO-3166-1 ALPHA-3 country codes related to this locale.
-   */
-  country_code_alpha_3: string[];
-
   /**
    * A list of timezones names.
    */
diff --git a/src/definitions/person.ts b/src/definitions/person.ts
index b6096e81e2f..7b54860c28e 100644
--- a/src/definitions/person.ts
+++ b/src/definitions/person.ts
@@ -30,6 +30,13 @@ export type PersonDefinitions = LocaleEntry<{
    */
   name: Array<{ value: string; weight: number }>;
 
+  /**
+   * A weighted list of patterns used to generate last names.
+   */
+  last_name_patterns?: Array<{ value: string; weight: number }>;
+  male_last_name_patterns?: Array<{ value: string; weight: number }>;
+  female_last_name_patterns?: Array<{ value: string; weight: number }>;
+
   bio_patterns?: string[];
 
   title: PersonTitleDefinitions;
diff --git a/src/faker.ts b/src/faker.ts
index a4d02e007e5..d27858afbc2 100644
--- a/src/faker.ts
+++ b/src/faker.ts
@@ -2,8 +2,7 @@ import type { LocaleDefinition } from './definitions';
 import { FakerError } from './errors/faker-error';
 import { deprecated } from './internal/deprecated';
 import type { Mersenne } from './internal/mersenne/mersenne';
-import mersenne from './internal/mersenne/mersenne';
-import type { KnownLocale } from './locales';
+import newMersenne from './internal/mersenne/mersenne';
 import { AirlineModule } from './modules/airline';
 import { AnimalModule } from './modules/animal';
 import { ColorModule } from './modules/color';
@@ -32,56 +31,12 @@ import { StringModule } from './modules/string';
 import { SystemModule } from './modules/system';
 import { VehicleModule } from './modules/vehicle';
 import { WordModule } from './modules/word';
-import type { LiteralUnion } from './utils/types';
-
-export type UsableLocale = LiteralUnion<KnownLocale>;
-export type UsedLocales = Partial<Record<UsableLocale, LocaleDefinition>>;
-
-export interface FakerOptions {
-  locales: UsedLocales;
-  locale?: UsableLocale;
-  localeFallback?: UsableLocale;
-  seed?: number;
-  /** @internal */
-  mersenne?: Mersenne;
-}
-
-const metadataKeys: ReadonlyArray<keyof LocaleDefinition> = ['title'];
+import { mergeLocales } from './utils/merge-locales';
 
 export class Faker {
-  locales: UsedLocales;
-  private _locale: UsableLocale;
-  private _localeFallback: UsableLocale;
+  readonly definitions: LocaleDefinition;
   private _defaultRefDate: () => Date = () => new Date();
 
-  get locale(): UsableLocale {
-    return this._locale;
-  }
-
-  set locale(locale: UsableLocale) {
-    if (!this.locales[locale]) {
-      throw new FakerError(
-        `Locale ${locale} is not supported. You might want to add the requested locale first to \`faker.locales\`.`
-      );
-    }
-
-    this._locale = locale;
-  }
-
-  get localeFallback(): UsableLocale {
-    return this._localeFallback;
-  }
-
-  set localeFallback(localeFallback: UsableLocale) {
-    if (!this.locales[localeFallback]) {
-      throw new FakerError(
-        `Locale ${localeFallback} is not supported. You might want to add the requested locale first to \`faker.locales\`.`
-      );
-    }
-
-    this._localeFallback = localeFallback;
-  }
-
   /**
    * Gets a new reference date used to generate relative dates.
    */
@@ -106,8 +61,6 @@ export class Faker {
     }
   }
 
-  readonly definitions: LocaleDefinition = this.initDefinitions();
-
   /** @internal */
   private readonly _mersenne: Mersenne;
 
@@ -164,95 +117,136 @@ export class Faker {
     return this.person;
   }
 
-  constructor(opts: FakerOptions) {
-    if (!opts) {
-      throw new FakerError(
-        'Options with at least one entry in locales must be provided'
-      );
-    }
-
-    if (Object.keys(opts.locales ?? {}).length === 0) {
-      throw new FakerError(
-        'At least one entry in locales must be provided in the locales parameter'
-      );
-    }
-
-    this.locales = opts.locales;
-    this.locale = opts.locale || 'en';
-    this.localeFallback = opts.localeFallback || 'en';
-    this._mersenne = opts.mersenne ?? mersenne();
-    if (opts.seed != null) {
-      this.seed(opts.seed);
-    }
-  }
-
   /**
-   * Creates a Proxy based LocaleDefinition that virtually merges the locales.
+   * Creates a new instance of Faker.
+   *
+   * @param options The options to use.
+   * @param options.locale The locale data to use.
+   */
+  constructor(options: {
+    /**
+     * The locale data to use for this instance.
+     * If an array is provided, the first locale that has a definition for a given property will be used.
+     *
+     * @see mergeLocales
+     */
+    locale: LocaleDefinition | LocaleDefinition[];
+    /**
+     * The initial seed to use for this instance.
+     */
+    seed?: number;
+    /**
+     * The default reference date to use for this instance.
+     */
+    defaultRefDate?: string | Date | number | (() => Date);
+    /** @internal */
+    mersenne?: Mersenne;
+  });
+  /**
+   * Creates a new instance of Faker.
+   *
+   * @param options The options to use.
+   * @param options.locales The locale data to use.
+   * @param options.locale The locale data to use.
+   *
+   * @deprecated Use `new Faker({ locale: [locale, localeFallback] })` instead.
    */
-  private initDefinitions(): LocaleDefinition {
-    // Returns the first LocaleDefinition[key] in any locale
-    const resolveBaseData = (key: keyof LocaleDefinition): unknown =>
-      this.locales[this.locale][key] ?? this.locales[this.localeFallback][key];
+  constructor(options: {
+    locales: Record<string, LocaleDefinition>;
+    locale?: string;
+    localeFallback?: string;
+  });
+  // This is somehow required for `ConstructorParameters<typeof Faker>[0]` to work
+  constructor(
+    options:
+      | {
+          /**
+           * The locale data to use for this instance.
+           * If an array is provided, the first locale that has a definition for a given property will be used.
+           *
+           * @see mergeLocales
+           */
+          locale: LocaleDefinition | LocaleDefinition[];
+          /**
+           * The initial seed to use for this instance.
+           */
+          seed?: number;
+          /**
+           * The default reference date to use for this instance.
+           */
+          defaultRefDate?: string | Date | number | (() => Date);
+          /** @internal */
+          mersenne?: Mersenne;
+        }
+      | {
+          locales: Record<string, LocaleDefinition>;
+          locale?: string;
+          localeFallback?: string;
+        }
+  );
+  constructor(
+    options:
+      | {
+          locale: LocaleDefinition | LocaleDefinition[];
+          seed?: number;
+          defaultRefDate?: string | Date | number | (() => Date);
+          /** @internal */
+          mersenne?: Mersenne;
+        }
+      | {
+          locales: Record<string, LocaleDefinition>;
+          locale?: string;
+          localeFallback?: string;
+          seed?: number;
+          defaultRefDate?: string | Date | number | (() => Date);
+          /** @internal */
+          mersenne?: Mersenne;
+        }
+  ) {
+    const { locales } = options as {
+      locales: Record<string, LocaleDefinition>;
+    };
+    if (locales != null) {
+      deprecated({
+        deprecated:
+          "new Faker({ locales: {a, b}, locale: 'a', localeFallback: 'b' })",
+        proposed:
+          'new Faker({ locale: [a, b, ...] }) or new Faker({ locale: a })',
+        since: '8.0',
+        until: '9.0',
+      });
+      const { locale = 'en', localeFallback = 'en' } = options as {
+        locale: string;
+        localeFallback: string;
+      };
+      options = {
+        locale: [locales[locale], locales[localeFallback]],
+      };
+    }
 
-    // Returns the first LocaleDefinition[module][entry] in any locale
-    const resolveModuleData = (
-      module: keyof LocaleDefinition,
-      entry: string
-    ): unknown =>
-      this.locales[this.locale][module]?.[entry] ??
-      this.locales[this.localeFallback][module]?.[entry];
+    let { locale } = options;
+    const { seed, mersenne, defaultRefDate } = options;
 
-    // Returns a proxy that can return the entries for a module (if it exists)
-    const moduleLoader = (
-      module: keyof LocaleDefinition
-    ): Record<string, unknown> | undefined => {
-      if (resolveBaseData(module)) {
-        return new Proxy(
-          {},
-          {
-            get(target, entry: string): unknown {
-              return resolveModuleData(module, entry);
-            },
-          }
+    if (Array.isArray(locale)) {
+      if (locale.length === 0) {
+        throw new FakerError(
+          'The locale option must contain at least one locale definition.'
         );
-      } else {
-        return undefined;
       }
-    };
 
-    return new Proxy({} as LocaleDefinition, {
-      get(target: LocaleDefinition, module: string): unknown {
-        // Support aliases
-        if (module === 'address') {
-          module = 'location';
-          deprecated({
-            deprecated: `faker.helpers.fake('{{address.*}}') or faker.definitions.address`,
-            proposed: `faker.helpers.fake('{{location.*}}') or faker.definitions.location`,
-            since: '8.0',
-            until: '10.0',
-          });
-        } else if (module === 'name') {
-          module = 'person';
-          deprecated({
-            deprecated: `faker.helpers.fake('{{name.*}}') or faker.definitions.name`,
-            proposed: `faker.helpers.fake('{{person.*}}') or faker.definitions.person`,
-            since: '8.0',
-            until: '10.0',
-          });
-        }
+      locale = mergeLocales(locale);
+    }
 
-        let result = target[module];
-        if (result) {
-          return result;
-        } else if (metadataKeys.includes(module)) {
-          return resolveBaseData(module);
-        } else {
-          result = moduleLoader(module);
-          target[module] = result;
-          return result;
-        }
-      },
-    });
+    this.definitions = locale as LocaleDefinition;
+    this._mersenne = mersenne ?? newMersenne();
+
+    if (seed != null) {
+      this.seed(seed);
+    }
+
+    if (defaultRefDate != null) {
+      this.setDefaultRefDate(defaultRefDate);
+    }
   }
 
   /**
@@ -327,13 +321,83 @@ export class Faker {
     return seed;
   }
 
+  // Pure JS backwards compatibility
+
+  /**
+   * Do NOT use. This property has been removed.
+   *
+   * @deprecated Use the constructor instead.
+   */
+  private get locales(): never {
+    throw new FakerError(
+      'The locales property has been removed. Please use the constructor instead.'
+    );
+  }
+
+  /**
+   * Do NOT use. This property has been removed.
+   *
+   * @deprecated Use the constructor instead.
+   */
+  private set locales(value: never) {
+    throw new FakerError(
+      'The locales property has been removed. Please use the constructor instead.'
+    );
+  }
+
+  /**
+   * Do NOT use. This property has been removed.
+   *
+   * @deprecated Use the constructor instead.
+   */
+  private get locale(): never {
+    throw new FakerError(
+      'The locale property has been removed. Please use the constructor instead.'
+    );
+  }
+
+  /**
+   * Do NOT use. This property has been removed.
+   *
+   * @deprecated Use the constructor instead.
+   */
+  private set locale(value: never) {
+    throw new FakerError(
+      'The locale property has been removed. Please use the constructor instead.'
+    );
+  }
+
   /**
-   * Set Faker's locale
+   * Do NOT use. This property has been removed.
    *
-   * @param locale The locale to set (e.g. `en` or `en_AU`, `en_AU_ocker`).
+   * @deprecated Use the constructor instead.
    */
-  setLocale(locale: UsableLocale): void {
-    this.locale = locale;
+  private get localeFallback(): never {
+    throw new FakerError(
+      'The localeFallback property has been removed. Please use the constructor instead.'
+    );
+  }
+
+  /**
+   * Do NOT use. This property has been removed.
+   *
+   * @deprecated Use the constructor instead.
+   */
+  private set localeFallback(value: never) {
+    throw new FakerError(
+      'The localeFallback property has been removed. Please use the constructor instead.'
+    );
+  }
+
+  /**
+   * Do NOT use. This property has been removed.
+   *
+   * @deprecated Use the constructor instead.
+   */
+  private setLocale(): never {
+    throw new FakerError(
+      'This method has been removed. Please use the constructor instead.'
+    );
   }
 
   /**
@@ -351,9 +415,8 @@ export class Faker {
    */
   fork(): Faker {
     return new Faker({
-      locale: this.locale,
-      localeFallback: this.localeFallback,
-      locales: this.locales,
+      locale: this.definitions,
+      defaultRefDate: this.defaultRefDate,
       mersenne: this._mersenne.fork(),
     });
   }
@@ -380,10 +443,11 @@ export class Faker {
    */
   derive(): Faker {
     return new Faker({
-      locale: this.locale,
-      localeFallback: this.localeFallback,
-      locales: this.locales,
+      locale: this.definitions,
+      defaultRefDate: this.defaultRefDate,
       seed: this._mersenne.next(),
     });
   }
 }
+
+export type FakerOptions = ConstructorParameters<typeof Faker>[0];
diff --git a/src/index.ts b/src/index.ts
index 7fe80026586..dc67c9d501f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,3 @@
-import { Faker } from './faker';
-import allLocales from './locales';
-
 export type {
   AirlineDefinitions,
   AnimalDefinitions,
@@ -11,7 +8,6 @@ export type {
   DatabaseDefinitions,
   DateDefinitions,
   DateEntryDefinition,
-  FinanceCurrencyEntryDefinitions,
   FinanceDefinitions,
   HackerDefinitions,
   InternetDefinitions,
@@ -35,16 +31,26 @@ export type {
   WordDefinitions,
 } from './definitions';
 export { FakerError } from './errors/faker-error';
-export type { FakerOptions, UsableLocale, UsedLocales } from './faker';
+export { Faker } from './faker';
+export type { FakerOptions } from './faker';
+export * from './locale';
+export { fakerEN as faker } from './locale';
+export * from './locales';
+export * as allLocales from './locales';
 export { Aircraft, AircraftType } from './modules/airline';
 export type { AirlineModule } from './modules/airline';
 export type { AnimalModule } from './modules/animal';
+export { CssFunction, CssSpace } from './modules/color';
 export type {
   Casing,
   ColorFormat,
   ColorModule,
-  CSSFunction,
-  CSSSpace,
+  /** @deprecated Use CssFunctionType instead */
+  CssFunctionType as CSSFunction,
+  CssFunctionType,
+  /** @deprecated Use CssSpaceType instead */
+  CssSpaceType as CSSSpace,
+  CssSpaceType,
   NumberColorFormat,
   StringColorFormat,
 } from './modules/color';
@@ -53,7 +59,7 @@ export type { CompanyModule } from './modules/company';
 export type { DatabaseModule } from './modules/database';
 export type { DatatypeModule } from './modules/datatype';
 export type { DateModule } from './modules/date';
-export type { FinanceModule } from './modules/finance';
+export type { Currency, FinanceModule } from './modules/finance';
 export type { GitModule } from './modules/git';
 export type { HackerModule } from './modules/hacker';
 export type { HelpersModule } from './modules/helpers';
@@ -82,9 +88,3 @@ export type { SystemModule } from './modules/system';
 export type { VehicleModule } from './modules/vehicle';
 export type { WordModule } from './modules/word';
 export { mergeLocales } from './utils/merge-locales';
-export { Faker };
-
-// since we are requiring the top level of faker, load all locales by default
-export const faker: Faker = new Faker({
-  locales: allLocales,
-});
diff --git a/src/locale/af_ZA.ts b/src/locale/af_ZA.ts
index 93ac1bcf743..17e0a692a28 100644
--- a/src/locale/af_ZA.ts
+++ b/src/locale/af_ZA.ts
@@ -8,10 +8,5 @@ import af_ZA from '../locales/af_ZA';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'af_ZA',
-  localeFallback: 'en',
-  locales: {
-    af_ZA,
-    en,
-  },
+  locale: [af_ZA, en],
 });
diff --git a/src/locale/ar.ts b/src/locale/ar.ts
index 83eb41683df..2874a6fb69d 100644
--- a/src/locale/ar.ts
+++ b/src/locale/ar.ts
@@ -8,10 +8,5 @@ import ar from '../locales/ar';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'ar',
-  localeFallback: 'en',
-  locales: {
-    ar,
-    en,
-  },
+  locale: [ar, en],
 });
diff --git a/src/locale/az.ts b/src/locale/az.ts
index b7b1fd6fb57..7b11a6a90e8 100644
--- a/src/locale/az.ts
+++ b/src/locale/az.ts
@@ -8,10 +8,5 @@ import az from '../locales/az';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'az',
-  localeFallback: 'en',
-  locales: {
-    az,
-    en,
-  },
+  locale: [az, en],
 });
diff --git a/src/locale/cz.ts b/src/locale/cz.ts
index f6932b0b1dc..c2f85800d7c 100644
--- a/src/locale/cz.ts
+++ b/src/locale/cz.ts
@@ -8,10 +8,5 @@ import cz from '../locales/cz';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'cz',
-  localeFallback: 'en',
-  locales: {
-    cz,
-    en,
-  },
+  locale: [cz, en],
 });
diff --git a/src/locale/de.ts b/src/locale/de.ts
index 47bd5794c37..09ff3bfa986 100644
--- a/src/locale/de.ts
+++ b/src/locale/de.ts
@@ -8,10 +8,5 @@ import de from '../locales/de';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'de',
-  localeFallback: 'en',
-  locales: {
-    de,
-    en,
-  },
+  locale: [de, en],
 });
diff --git a/src/locale/de_AT.ts b/src/locale/de_AT.ts
index 1060b041048..b02b50cb559 100644
--- a/src/locale/de_AT.ts
+++ b/src/locale/de_AT.ts
@@ -4,14 +4,10 @@
  */
 
 import { Faker } from '../faker';
+import de from '../locales/de';
 import de_AT from '../locales/de_AT';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'de_AT',
-  localeFallback: 'en',
-  locales: {
-    de_AT,
-    en,
-  },
+  locale: [de_AT, de, en],
 });
diff --git a/src/locale/de_CH.ts b/src/locale/de_CH.ts
index 2e6b84805a6..5b866437292 100644
--- a/src/locale/de_CH.ts
+++ b/src/locale/de_CH.ts
@@ -4,14 +4,10 @@
  */
 
 import { Faker } from '../faker';
+import de from '../locales/de';
 import de_CH from '../locales/de_CH';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'de_CH',
-  localeFallback: 'en',
-  locales: {
-    de_CH,
-    en,
-  },
+  locale: [de_CH, de, en],
 });
diff --git a/src/locale/dv.ts b/src/locale/dv.ts
index 620cb2b996e..3d996cc14b6 100644
--- a/src/locale/dv.ts
+++ b/src/locale/dv.ts
@@ -8,10 +8,5 @@ import dv from '../locales/dv';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'dv',
-  localeFallback: 'en',
-  locales: {
-    dv,
-    en,
-  },
+  locale: [dv, en],
 });
diff --git a/src/locale/el.ts b/src/locale/el.ts
index 0292c6015ba..119403b622c 100644
--- a/src/locale/el.ts
+++ b/src/locale/el.ts
@@ -8,10 +8,5 @@ import el from '../locales/el';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'el',
-  localeFallback: 'en',
-  locales: {
-    el,
-    en,
-  },
+  locale: [el, en],
 });
diff --git a/src/locale/en.ts b/src/locale/en.ts
index b857f0ae12e..1d7db9f5061 100644
--- a/src/locale/en.ts
+++ b/src/locale/en.ts
@@ -7,9 +7,5 @@ import { Faker } from '../faker';
 import en from '../locales/en';
 
 export const faker = new Faker({
-  locale: 'en',
-  localeFallback: 'en',
-  locales: {
-    en,
-  },
+  locale: en,
 });
diff --git a/src/locale/en_AU.ts b/src/locale/en_AU.ts
index 33d41c4cdaa..01ad19ad394 100644
--- a/src/locale/en_AU.ts
+++ b/src/locale/en_AU.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_AU from '../locales/en_AU';
 
 export const faker = new Faker({
-  locale: 'en_AU',
-  localeFallback: 'en',
-  locales: {
-    en_AU,
-    en,
-  },
+  locale: [en_AU, en],
 });
diff --git a/src/locale/en_AU_ocker.ts b/src/locale/en_AU_ocker.ts
index 735c3e2c825..22c9ae3254e 100644
--- a/src/locale/en_AU_ocker.ts
+++ b/src/locale/en_AU_ocker.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import en_AU from '../locales/en_AU';
 import en_AU_ocker from '../locales/en_AU_ocker';
 
 export const faker = new Faker({
-  locale: 'en_AU_ocker',
-  localeFallback: 'en',
-  locales: {
-    en_AU_ocker,
-    en,
-  },
+  locale: [en_AU_ocker, en_AU, en],
 });
diff --git a/src/locale/en_BORK.ts b/src/locale/en_BORK.ts
index 962f26196e6..d8776851a06 100644
--- a/src/locale/en_BORK.ts
+++ b/src/locale/en_BORK.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_BORK from '../locales/en_BORK';
 
 export const faker = new Faker({
-  locale: 'en_BORK',
-  localeFallback: 'en',
-  locales: {
-    en_BORK,
-    en,
-  },
+  locale: [en_BORK, en],
 });
diff --git a/src/locale/en_CA.ts b/src/locale/en_CA.ts
index 5b64a4eef2f..a1c2d158443 100644
--- a/src/locale/en_CA.ts
+++ b/src/locale/en_CA.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_CA from '../locales/en_CA';
 
 export const faker = new Faker({
-  locale: 'en_CA',
-  localeFallback: 'en',
-  locales: {
-    en_CA,
-    en,
-  },
+  locale: [en_CA, en],
 });
diff --git a/src/locale/en_GB.ts b/src/locale/en_GB.ts
index 7cd2caba336..411c08234e2 100644
--- a/src/locale/en_GB.ts
+++ b/src/locale/en_GB.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_GB from '../locales/en_GB';
 
 export const faker = new Faker({
-  locale: 'en_GB',
-  localeFallback: 'en',
-  locales: {
-    en_GB,
-    en,
-  },
+  locale: [en_GB, en],
 });
diff --git a/src/locale/en_GH.ts b/src/locale/en_GH.ts
index d6effe2a31c..a131a786f03 100644
--- a/src/locale/en_GH.ts
+++ b/src/locale/en_GH.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_GH from '../locales/en_GH';
 
 export const faker = new Faker({
-  locale: 'en_GH',
-  localeFallback: 'en',
-  locales: {
-    en_GH,
-    en,
-  },
+  locale: [en_GH, en],
 });
diff --git a/src/locale/en_IE.ts b/src/locale/en_IE.ts
index 85afdb64dbe..b66c6a45529 100644
--- a/src/locale/en_IE.ts
+++ b/src/locale/en_IE.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_IE from '../locales/en_IE';
 
 export const faker = new Faker({
-  locale: 'en_IE',
-  localeFallback: 'en',
-  locales: {
-    en_IE,
-    en,
-  },
+  locale: [en_IE, en],
 });
diff --git a/src/locale/en_IN.ts b/src/locale/en_IN.ts
index bb7c21d7fc6..28eb2333257 100644
--- a/src/locale/en_IN.ts
+++ b/src/locale/en_IN.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_IN from '../locales/en_IN';
 
 export const faker = new Faker({
-  locale: 'en_IN',
-  localeFallback: 'en',
-  locales: {
-    en_IN,
-    en,
-  },
+  locale: [en_IN, en],
 });
diff --git a/src/locale/en_NG.ts b/src/locale/en_NG.ts
index 32802c49716..a5a9b5b1cf7 100644
--- a/src/locale/en_NG.ts
+++ b/src/locale/en_NG.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_NG from '../locales/en_NG';
 
 export const faker = new Faker({
-  locale: 'en_NG',
-  localeFallback: 'en',
-  locales: {
-    en_NG,
-    en,
-  },
+  locale: [en_NG, en],
 });
diff --git a/src/locale/en_US.ts b/src/locale/en_US.ts
index 558bf4a3dc2..8077c573a56 100644
--- a/src/locale/en_US.ts
+++ b/src/locale/en_US.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_US from '../locales/en_US';
 
 export const faker = new Faker({
-  locale: 'en_US',
-  localeFallback: 'en',
-  locales: {
-    en_US,
-    en,
-  },
+  locale: [en_US, en],
 });
diff --git a/src/locale/en_ZA.ts b/src/locale/en_ZA.ts
index 94f6d76e84c..3e5b31634ed 100644
--- a/src/locale/en_ZA.ts
+++ b/src/locale/en_ZA.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import en_ZA from '../locales/en_ZA';
 
 export const faker = new Faker({
-  locale: 'en_ZA',
-  localeFallback: 'en',
-  locales: {
-    en_ZA,
-    en,
-  },
+  locale: [en_ZA, en],
 });
diff --git a/src/locale/es.ts b/src/locale/es.ts
index cf4d26c2f66..0f5116f2120 100644
--- a/src/locale/es.ts
+++ b/src/locale/es.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import es from '../locales/es';
 
 export const faker = new Faker({
-  locale: 'es',
-  localeFallback: 'en',
-  locales: {
-    es,
-    en,
-  },
+  locale: [es, en],
 });
diff --git a/src/locale/es_MX.ts b/src/locale/es_MX.ts
index 96492e5615b..5a80a0f0028 100644
--- a/src/locale/es_MX.ts
+++ b/src/locale/es_MX.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import es from '../locales/es';
 import es_MX from '../locales/es_MX';
 
 export const faker = new Faker({
-  locale: 'es_MX',
-  localeFallback: 'en',
-  locales: {
-    es_MX,
-    en,
-  },
+  locale: [es_MX, es, en],
 });
diff --git a/src/locale/fa.ts b/src/locale/fa.ts
index 6d5a0944948..9a8c12de9ad 100644
--- a/src/locale/fa.ts
+++ b/src/locale/fa.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import fa from '../locales/fa';
 
 export const faker = new Faker({
-  locale: 'fa',
-  localeFallback: 'en',
-  locales: {
-    fa,
-    en,
-  },
+  locale: [fa, en],
 });
diff --git a/src/locale/fi.ts b/src/locale/fi.ts
index 860ab5adf0f..06844df4eea 100644
--- a/src/locale/fi.ts
+++ b/src/locale/fi.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import fi from '../locales/fi';
 
 export const faker = new Faker({
-  locale: 'fi',
-  localeFallback: 'en',
-  locales: {
-    fi,
-    en,
-  },
+  locale: [fi, en],
 });
diff --git a/src/locale/fr.ts b/src/locale/fr.ts
index d33c5d1c0b4..f9360a7e30c 100644
--- a/src/locale/fr.ts
+++ b/src/locale/fr.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import fr from '../locales/fr';
 
 export const faker = new Faker({
-  locale: 'fr',
-  localeFallback: 'en',
-  locales: {
-    fr,
-    en,
-  },
+  locale: [fr, en],
 });
diff --git a/src/locale/fr_BE.ts b/src/locale/fr_BE.ts
index c9de78dccf7..41e2554de14 100644
--- a/src/locale/fr_BE.ts
+++ b/src/locale/fr_BE.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import fr from '../locales/fr';
 import fr_BE from '../locales/fr_BE';
 
 export const faker = new Faker({
-  locale: 'fr_BE',
-  localeFallback: 'en',
-  locales: {
-    fr_BE,
-    en,
-  },
+  locale: [fr_BE, fr, en],
 });
diff --git a/src/locale/fr_CA.ts b/src/locale/fr_CA.ts
index 573181a3366..77e9a22784e 100644
--- a/src/locale/fr_CA.ts
+++ b/src/locale/fr_CA.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import fr from '../locales/fr';
 import fr_CA from '../locales/fr_CA';
 
 export const faker = new Faker({
-  locale: 'fr_CA',
-  localeFallback: 'en',
-  locales: {
-    fr_CA,
-    en,
-  },
+  locale: [fr_CA, fr, en],
 });
diff --git a/src/locale/fr_CH.ts b/src/locale/fr_CH.ts
index 3a914e43452..fc61a9f512b 100644
--- a/src/locale/fr_CH.ts
+++ b/src/locale/fr_CH.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import fr from '../locales/fr';
 import fr_CH from '../locales/fr_CH';
 
 export const faker = new Faker({
-  locale: 'fr_CH',
-  localeFallback: 'en',
-  locales: {
-    fr_CH,
-    en,
-  },
+  locale: [fr_CH, fr, en],
 });
diff --git a/src/locale/fr_LU.ts b/src/locale/fr_LU.ts
index 8e63bfdbf4a..c7bee2379c0 100644
--- a/src/locale/fr_LU.ts
+++ b/src/locale/fr_LU.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import fr from '../locales/fr';
 import fr_LU from '../locales/fr_LU';
 
 export const faker = new Faker({
-  locale: 'fr_LU',
-  localeFallback: 'en',
-  locales: {
-    fr_LU,
-    en,
-  },
+  locale: [fr_LU, fr, en],
 });
diff --git a/src/locale/ge.ts b/src/locale/ge.ts
index e1f05865403..f33a614acf9 100644
--- a/src/locale/ge.ts
+++ b/src/locale/ge.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ge from '../locales/ge';
 
 export const faker = new Faker({
-  locale: 'ge',
-  localeFallback: 'en',
-  locales: {
-    ge,
-    en,
-  },
+  locale: [ge, en],
 });
diff --git a/src/locale/he.ts b/src/locale/he.ts
index b4c1b9c9b1d..a7dca5f966d 100644
--- a/src/locale/he.ts
+++ b/src/locale/he.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import he from '../locales/he';
 
 export const faker = new Faker({
-  locale: 'he',
-  localeFallback: 'en',
-  locales: {
-    he,
-    en,
-  },
+  locale: [he, en],
 });
diff --git a/src/locale/hr.ts b/src/locale/hr.ts
index d9aa1348012..a210046c9ed 100644
--- a/src/locale/hr.ts
+++ b/src/locale/hr.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import hr from '../locales/hr';
 
 export const faker = new Faker({
-  locale: 'hr',
-  localeFallback: 'en',
-  locales: {
-    hr,
-    en,
-  },
+  locale: [hr, en],
 });
diff --git a/src/locale/hu.ts b/src/locale/hu.ts
index f9d9f55536a..de5613dc295 100644
--- a/src/locale/hu.ts
+++ b/src/locale/hu.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import hu from '../locales/hu';
 
 export const faker = new Faker({
-  locale: 'hu',
-  localeFallback: 'en',
-  locales: {
-    hu,
-    en,
-  },
+  locale: [hu, en],
 });
diff --git a/src/locale/hy.ts b/src/locale/hy.ts
index 724c1406f68..d7d72c3b8e5 100644
--- a/src/locale/hy.ts
+++ b/src/locale/hy.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import hy from '../locales/hy';
 
 export const faker = new Faker({
-  locale: 'hy',
-  localeFallback: 'en',
-  locales: {
-    hy,
-    en,
-  },
+  locale: [hy, en],
 });
diff --git a/src/locale/id_ID.ts b/src/locale/id_ID.ts
index eafc0c528e4..6f481d831f4 100644
--- a/src/locale/id_ID.ts
+++ b/src/locale/id_ID.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import id_ID from '../locales/id_ID';
 
 export const faker = new Faker({
-  locale: 'id_ID',
-  localeFallback: 'en',
-  locales: {
-    id_ID,
-    en,
-  },
+  locale: [id_ID, en],
 });
diff --git a/src/locale/index.ts b/src/locale/index.ts
new file mode 100644
index 00000000000..8131e35546f
--- /dev/null
+++ b/src/locale/index.ts
@@ -0,0 +1,188 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+
+import { faker as fakerAF_ZA } from './af_ZA';
+import { faker as fakerAR } from './ar';
+import { faker as fakerAZ } from './az';
+import { faker as fakerCZ } from './cz';
+import { faker as fakerDE } from './de';
+import { faker as fakerDE_AT } from './de_AT';
+import { faker as fakerDE_CH } from './de_CH';
+import { faker as fakerDV } from './dv';
+import { faker as fakerEL } from './el';
+import { faker as fakerEN } from './en';
+import { faker as fakerEN_AU } from './en_AU';
+import { faker as fakerEN_AU_ocker } from './en_AU_ocker';
+import { faker as fakerEN_BORK } from './en_BORK';
+import { faker as fakerEN_CA } from './en_CA';
+import { faker as fakerEN_GB } from './en_GB';
+import { faker as fakerEN_GH } from './en_GH';
+import { faker as fakerEN_IE } from './en_IE';
+import { faker as fakerEN_IN } from './en_IN';
+import { faker as fakerEN_NG } from './en_NG';
+import { faker as fakerEN_US } from './en_US';
+import { faker as fakerEN_ZA } from './en_ZA';
+import { faker as fakerES } from './es';
+import { faker as fakerES_MX } from './es_MX';
+import { faker as fakerFA } from './fa';
+import { faker as fakerFI } from './fi';
+import { faker as fakerFR } from './fr';
+import { faker as fakerFR_BE } from './fr_BE';
+import { faker as fakerFR_CA } from './fr_CA';
+import { faker as fakerFR_CH } from './fr_CH';
+import { faker as fakerFR_LU } from './fr_LU';
+import { faker as fakerGE } from './ge';
+import { faker as fakerHE } from './he';
+import { faker as fakerHR } from './hr';
+import { faker as fakerHU } from './hu';
+import { faker as fakerHY } from './hy';
+import { faker as fakerID_ID } from './id_ID';
+import { faker as fakerIT } from './it';
+import { faker as fakerJA } from './ja';
+import { faker as fakerKO } from './ko';
+import { faker as fakerLV } from './lv';
+import { faker as fakerMK } from './mk';
+import { faker as fakerNB_NO } from './nb_NO';
+import { faker as fakerNE } from './ne';
+import { faker as fakerNL } from './nl';
+import { faker as fakerNL_BE } from './nl_BE';
+import { faker as fakerPL } from './pl';
+import { faker as fakerPT_BR } from './pt_BR';
+import { faker as fakerPT_PT } from './pt_PT';
+import { faker as fakerRO } from './ro';
+import { faker as fakerRU } from './ru';
+import { faker as fakerSK } from './sk';
+import { faker as fakerSV } from './sv';
+import { faker as fakerTR } from './tr';
+import { faker as fakerUK } from './uk';
+import { faker as fakerUR } from './ur';
+import { faker as fakerVI } from './vi';
+import { faker as fakerZH_CN } from './zh_CN';
+import { faker as fakerZH_TW } from './zh_TW';
+import { faker as fakerZU_ZA } from './zu_ZA';
+
+export {
+  fakerAF_ZA,
+  fakerAR,
+  fakerAZ,
+  fakerCZ,
+  fakerDE,
+  fakerDE_AT,
+  fakerDE_CH,
+  fakerDV,
+  fakerEL,
+  fakerEN,
+  fakerEN_AU,
+  fakerEN_AU_ocker,
+  fakerEN_BORK,
+  fakerEN_CA,
+  fakerEN_GB,
+  fakerEN_GH,
+  fakerEN_IE,
+  fakerEN_IN,
+  fakerEN_NG,
+  fakerEN_US,
+  fakerEN_ZA,
+  fakerES,
+  fakerES_MX,
+  fakerFA,
+  fakerFI,
+  fakerFR,
+  fakerFR_BE,
+  fakerFR_CA,
+  fakerFR_CH,
+  fakerFR_LU,
+  fakerGE,
+  fakerHE,
+  fakerHR,
+  fakerHU,
+  fakerHY,
+  fakerID_ID,
+  fakerIT,
+  fakerJA,
+  fakerKO,
+  fakerLV,
+  fakerMK,
+  fakerNB_NO,
+  fakerNE,
+  fakerNL,
+  fakerNL_BE,
+  fakerPL,
+  fakerPT_BR,
+  fakerPT_PT,
+  fakerRO,
+  fakerRU,
+  fakerSK,
+  fakerSV,
+  fakerTR,
+  fakerUK,
+  fakerUR,
+  fakerVI,
+  fakerZH_CN,
+  fakerZH_TW,
+  fakerZU_ZA,
+};
+
+export const allFakers = {
+  af_ZA: fakerAF_ZA,
+  ar: fakerAR,
+  az: fakerAZ,
+  cz: fakerCZ,
+  de: fakerDE,
+  de_AT: fakerDE_AT,
+  de_CH: fakerDE_CH,
+  dv: fakerDV,
+  el: fakerEL,
+  en: fakerEN,
+  en_AU: fakerEN_AU,
+  en_AU_ocker: fakerEN_AU_ocker,
+  en_BORK: fakerEN_BORK,
+  en_CA: fakerEN_CA,
+  en_GB: fakerEN_GB,
+  en_GH: fakerEN_GH,
+  en_IE: fakerEN_IE,
+  en_IN: fakerEN_IN,
+  en_NG: fakerEN_NG,
+  en_US: fakerEN_US,
+  en_ZA: fakerEN_ZA,
+  es: fakerES,
+  es_MX: fakerES_MX,
+  fa: fakerFA,
+  fi: fakerFI,
+  fr: fakerFR,
+  fr_BE: fakerFR_BE,
+  fr_CA: fakerFR_CA,
+  fr_CH: fakerFR_CH,
+  fr_LU: fakerFR_LU,
+  ge: fakerGE,
+  he: fakerHE,
+  hr: fakerHR,
+  hu: fakerHU,
+  hy: fakerHY,
+  id_ID: fakerID_ID,
+  it: fakerIT,
+  ja: fakerJA,
+  ko: fakerKO,
+  lv: fakerLV,
+  mk: fakerMK,
+  nb_NO: fakerNB_NO,
+  ne: fakerNE,
+  nl: fakerNL,
+  nl_BE: fakerNL_BE,
+  pl: fakerPL,
+  pt_BR: fakerPT_BR,
+  pt_PT: fakerPT_PT,
+  ro: fakerRO,
+  ru: fakerRU,
+  sk: fakerSK,
+  sv: fakerSV,
+  tr: fakerTR,
+  uk: fakerUK,
+  ur: fakerUR,
+  vi: fakerVI,
+  zh_CN: fakerZH_CN,
+  zh_TW: fakerZH_TW,
+  zu_ZA: fakerZU_ZA,
+} as const;
diff --git a/src/locale/it.ts b/src/locale/it.ts
index b6df80e82c0..bff0a521691 100644
--- a/src/locale/it.ts
+++ b/src/locale/it.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import it from '../locales/it';
 
 export const faker = new Faker({
-  locale: 'it',
-  localeFallback: 'en',
-  locales: {
-    it,
-    en,
-  },
+  locale: [it, en],
 });
diff --git a/src/locale/ja.ts b/src/locale/ja.ts
index f24109df83f..8a9a866c08c 100644
--- a/src/locale/ja.ts
+++ b/src/locale/ja.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ja from '../locales/ja';
 
 export const faker = new Faker({
-  locale: 'ja',
-  localeFallback: 'en',
-  locales: {
-    ja,
-    en,
-  },
+  locale: [ja, en],
 });
diff --git a/src/locale/ko.ts b/src/locale/ko.ts
index 64b0b3e7834..eaa9e3ff156 100644
--- a/src/locale/ko.ts
+++ b/src/locale/ko.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ko from '../locales/ko';
 
 export const faker = new Faker({
-  locale: 'ko',
-  localeFallback: 'en',
-  locales: {
-    ko,
-    en,
-  },
+  locale: [ko, en],
 });
diff --git a/src/locale/lv.ts b/src/locale/lv.ts
index 80ed9156cfd..dc9f432729c 100644
--- a/src/locale/lv.ts
+++ b/src/locale/lv.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import lv from '../locales/lv';
 
 export const faker = new Faker({
-  locale: 'lv',
-  localeFallback: 'en',
-  locales: {
-    lv,
-    en,
-  },
+  locale: [lv, en],
 });
diff --git a/src/locale/mk.ts b/src/locale/mk.ts
index 91199ba497c..18981c46d7c 100644
--- a/src/locale/mk.ts
+++ b/src/locale/mk.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import mk from '../locales/mk';
 
 export const faker = new Faker({
-  locale: 'mk',
-  localeFallback: 'en',
-  locales: {
-    mk,
-    en,
-  },
+  locale: [mk, en],
 });
diff --git a/src/locale/nb_NO.ts b/src/locale/nb_NO.ts
index ee4b561ced1..3dcc5a5cc31 100644
--- a/src/locale/nb_NO.ts
+++ b/src/locale/nb_NO.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import nb_NO from '../locales/nb_NO';
 
 export const faker = new Faker({
-  locale: 'nb_NO',
-  localeFallback: 'en',
-  locales: {
-    nb_NO,
-    en,
-  },
+  locale: [nb_NO, en],
 });
diff --git a/src/locale/ne.ts b/src/locale/ne.ts
index ebc47246bb0..e75adb0c0a8 100644
--- a/src/locale/ne.ts
+++ b/src/locale/ne.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ne from '../locales/ne';
 
 export const faker = new Faker({
-  locale: 'ne',
-  localeFallback: 'en',
-  locales: {
-    ne,
-    en,
-  },
+  locale: [ne, en],
 });
diff --git a/src/locale/nl.ts b/src/locale/nl.ts
index c8f6a649dbb..3965b754bd8 100644
--- a/src/locale/nl.ts
+++ b/src/locale/nl.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import nl from '../locales/nl';
 
 export const faker = new Faker({
-  locale: 'nl',
-  localeFallback: 'en',
-  locales: {
-    nl,
-    en,
-  },
+  locale: [nl, en],
 });
diff --git a/src/locale/nl_BE.ts b/src/locale/nl_BE.ts
index dd227f4e7f6..4b6cb7aac83 100644
--- a/src/locale/nl_BE.ts
+++ b/src/locale/nl_BE.ts
@@ -5,13 +5,9 @@
 
 import { Faker } from '../faker';
 import en from '../locales/en';
+import nl from '../locales/nl';
 import nl_BE from '../locales/nl_BE';
 
 export const faker = new Faker({
-  locale: 'nl_BE',
-  localeFallback: 'en',
-  locales: {
-    nl_BE,
-    en,
-  },
+  locale: [nl_BE, nl, en],
 });
diff --git a/src/locale/pl.ts b/src/locale/pl.ts
index 44db8e40ab3..875ac5ec9d9 100644
--- a/src/locale/pl.ts
+++ b/src/locale/pl.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import pl from '../locales/pl';
 
 export const faker = new Faker({
-  locale: 'pl',
-  localeFallback: 'en',
-  locales: {
-    pl,
-    en,
-  },
+  locale: [pl, en],
 });
diff --git a/src/locale/pt_BR.ts b/src/locale/pt_BR.ts
index 3711d3f6d7e..5a4725d4881 100644
--- a/src/locale/pt_BR.ts
+++ b/src/locale/pt_BR.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import pt_BR from '../locales/pt_BR';
 
 export const faker = new Faker({
-  locale: 'pt_BR',
-  localeFallback: 'en',
-  locales: {
-    pt_BR,
-    en,
-  },
+  locale: [pt_BR, en],
 });
diff --git a/src/locale/pt_PT.ts b/src/locale/pt_PT.ts
index 915092abd3a..675e9adaf29 100644
--- a/src/locale/pt_PT.ts
+++ b/src/locale/pt_PT.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import pt_PT from '../locales/pt_PT';
 
 export const faker = new Faker({
-  locale: 'pt_PT',
-  localeFallback: 'en',
-  locales: {
-    pt_PT,
-    en,
-  },
+  locale: [pt_PT, en],
 });
diff --git a/src/locale/ro.ts b/src/locale/ro.ts
index 2903e01dd2f..b9b36836bac 100644
--- a/src/locale/ro.ts
+++ b/src/locale/ro.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ro from '../locales/ro';
 
 export const faker = new Faker({
-  locale: 'ro',
-  localeFallback: 'en',
-  locales: {
-    ro,
-    en,
-  },
+  locale: [ro, en],
 });
diff --git a/src/locale/ru.ts b/src/locale/ru.ts
index 433342216bc..3e3602554de 100644
--- a/src/locale/ru.ts
+++ b/src/locale/ru.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ru from '../locales/ru';
 
 export const faker = new Faker({
-  locale: 'ru',
-  localeFallback: 'en',
-  locales: {
-    ru,
-    en,
-  },
+  locale: [ru, en],
 });
diff --git a/src/locale/sk.ts b/src/locale/sk.ts
index 2816c16e6c9..8f6573a9a6d 100644
--- a/src/locale/sk.ts
+++ b/src/locale/sk.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import sk from '../locales/sk';
 
 export const faker = new Faker({
-  locale: 'sk',
-  localeFallback: 'en',
-  locales: {
-    sk,
-    en,
-  },
+  locale: [sk, en],
 });
diff --git a/src/locale/sv.ts b/src/locale/sv.ts
index 41c8f4e3643..b459b35d91b 100644
--- a/src/locale/sv.ts
+++ b/src/locale/sv.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import sv from '../locales/sv';
 
 export const faker = new Faker({
-  locale: 'sv',
-  localeFallback: 'en',
-  locales: {
-    sv,
-    en,
-  },
+  locale: [sv, en],
 });
diff --git a/src/locale/tr.ts b/src/locale/tr.ts
index 0aa4a51a561..303089520fe 100644
--- a/src/locale/tr.ts
+++ b/src/locale/tr.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import tr from '../locales/tr';
 
 export const faker = new Faker({
-  locale: 'tr',
-  localeFallback: 'en',
-  locales: {
-    tr,
-    en,
-  },
+  locale: [tr, en],
 });
diff --git a/src/locale/uk.ts b/src/locale/uk.ts
index ec40da8f4cc..fe35122d321 100644
--- a/src/locale/uk.ts
+++ b/src/locale/uk.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import uk from '../locales/uk';
 
 export const faker = new Faker({
-  locale: 'uk',
-  localeFallback: 'en',
-  locales: {
-    uk,
-    en,
-  },
+  locale: [uk, en],
 });
diff --git a/src/locale/ur.ts b/src/locale/ur.ts
index f08be161b5c..dd853d28afd 100644
--- a/src/locale/ur.ts
+++ b/src/locale/ur.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import ur from '../locales/ur';
 
 export const faker = new Faker({
-  locale: 'ur',
-  localeFallback: 'en',
-  locales: {
-    ur,
-    en,
-  },
+  locale: [ur, en],
 });
diff --git a/src/locale/vi.ts b/src/locale/vi.ts
index 96c888afea9..2525260a4df 100644
--- a/src/locale/vi.ts
+++ b/src/locale/vi.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import vi from '../locales/vi';
 
 export const faker = new Faker({
-  locale: 'vi',
-  localeFallback: 'en',
-  locales: {
-    vi,
-    en,
-  },
+  locale: [vi, en],
 });
diff --git a/src/locale/zh_CN.ts b/src/locale/zh_CN.ts
index 207ede7716a..11c632652db 100644
--- a/src/locale/zh_CN.ts
+++ b/src/locale/zh_CN.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import zh_CN from '../locales/zh_CN';
 
 export const faker = new Faker({
-  locale: 'zh_CN',
-  localeFallback: 'en',
-  locales: {
-    zh_CN,
-    en,
-  },
+  locale: [zh_CN, en],
 });
diff --git a/src/locale/zh_TW.ts b/src/locale/zh_TW.ts
index dd36aa2e3d0..7eefd1b6e83 100644
--- a/src/locale/zh_TW.ts
+++ b/src/locale/zh_TW.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import zh_TW from '../locales/zh_TW';
 
 export const faker = new Faker({
-  locale: 'zh_TW',
-  localeFallback: 'en',
-  locales: {
-    zh_TW,
-    en,
-  },
+  locale: [zh_TW, en],
 });
diff --git a/src/locale/zu_ZA.ts b/src/locale/zu_ZA.ts
index df595ff2d86..145ff94a684 100644
--- a/src/locale/zu_ZA.ts
+++ b/src/locale/zu_ZA.ts
@@ -8,10 +8,5 @@ import en from '../locales/en';
 import zu_ZA from '../locales/zu_ZA';
 
 export const faker = new Faker({
-  locale: 'zu_ZA',
-  localeFallback: 'en',
-  locales: {
-    zu_ZA,
-    en,
-  },
+  locale: [zu_ZA, en],
 });
diff --git a/src/locales/ar/date/month.ts b/src/locales/ar/date/month.ts
index 9da7bf762b2..af1a43571fb 100644
--- a/src/locales/ar/date/month.ts
+++ b/src/locales/ar/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'تِشْرِين ٱلثَّانِي',
     'كَانُون ٱلْأَوَّل',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'كَانُون ٱلثَّانِي',
-    'شُبَاط',
-    'آذَار',
-    'نَيْسَان',
-    'أَيَّار',
-    'حَزِيرَان',
-    'تَمُّوز',
-    'آب',
-    'أَيْلُول',
-    'تِشْرِين ٱلْأَوَّل',
-    'تِشْرِين ٱلثَّانِي',
-    'كَانُون ٱلْأَوَّل',
-  ],
+
   abbr: [
     'يناير',
     'فبراير',
@@ -43,20 +28,4 @@ export default {
     'نوفمبر',
     'ديسمبر',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'يناير',
-    'فبراير',
-    'مارس',
-    'إبريل',
-    'مايو',
-    'يونيو',
-    'يوليو',
-    'أغسطس',
-    'سبتمبر',
-    'أكتوبر',
-    'نوفمبر',
-    'ديسمبر',
-  ],
 };
diff --git a/src/locales/ar/date/weekday.ts b/src/locales/ar/date/weekday.ts
index 4d727c66a11..7493eff7c2e 100644
--- a/src/locales/ar/date/weekday.ts
+++ b/src/locales/ar/date/weekday.ts
@@ -10,14 +10,4 @@ export default {
     'الجمعة',
     'السبت',
   ],
-
-  wide_context: [
-    'الأحَد',
-    'الإثنين',
-    'الثلاثاء',
-    'الأربعاء',
-    'الخميس',
-    'الجمعة',
-    'السبت',
-  ],
 } as DateEntryDefinition;
diff --git a/src/locales/az/company/name_patterns.ts b/src/locales/az/company/name_patterns.ts
index b9374d22299..2f9fdc29477 100644
--- a/src/locales/az/company/name_patterns.ts
+++ b/src/locales/az/company/name_patterns.ts
@@ -2,9 +2,4 @@ export default [
   '{{company.prefix}} {{person.female_first_name}}',
   '{{company.prefix}} {{person.male_first_name}}',
   '{{company.prefix}} {{person.male_last_name}}',
-  '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/cz/date/month.ts b/src/locales/cz/date/month.ts
index e57767ecf5d..1ee4048b6d2 100644
--- a/src/locales/cz/date/month.ts
+++ b/src/locales/cz/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'Listopad',
     'Prosinec',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Leden',
-    'Únor',
-    'Březen',
-    'Duben',
-    'Květen',
-    'Červen',
-    'Červenec',
-    'Srpen',
-    'Září',
-    'Říjen',
-    'Listopad',
-    'Prosinec',
-  ],
+
   abbr: [
     'Led',
     'Úno',
@@ -43,20 +28,4 @@ export default {
     'Lis',
     'Pro',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Led',
-    'Úno',
-    'Bře',
-    'Dub',
-    'Kvě',
-    'Čer',
-    'Črc',
-    'Srp',
-    'Zář',
-    'Říj',
-    'Lis',
-    'Pro',
-  ],
 };
diff --git a/src/locales/cz/date/weekday.ts b/src/locales/cz/date/weekday.ts
index fa214420953..92bde38227b 100644
--- a/src/locales/cz/date/weekday.ts
+++ b/src/locales/cz/date/weekday.ts
@@ -1,18 +1,5 @@
 export default {
   wide: ['Pondělí', 'Úterý', 'Středa', 'čtvrtek', 'Pátek', 'Sobota', 'Neděle'],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Pondělí',
-    'Úterý',
-    'Středa',
-    'čtvrtek',
-    'Pátek',
-    'Sobota',
-    'Neděle',
-  ],
+
   abbr: ['Po', 'Út', 'St', 'čt', 'Pá', 'So', 'Ne'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['Po', 'Út', 'St', 'čt', 'Pá', 'So', 'Ne'],
 };
diff --git a/src/locales/de/date/month.ts b/src/locales/de/date/month.ts
index 3d647a36aa1..99c3864589a 100644
--- a/src/locales/de/date/month.ts
+++ b/src/locales/de/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'November',
     'Dezember',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Januar',
-    'Februar',
-    'März',
-    'April',
-    'Mai',
-    'Juni',
-    'Juli',
-    'August',
-    'September',
-    'Oktober',
-    'November',
-    'Dezember',
-  ],
+
   abbr: [
     'Jan',
     'Feb',
@@ -43,20 +28,4 @@ export default {
     'Nov',
     'Dez',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Jan',
-    'Feb',
-    'Mrz',
-    'Apr',
-    'Mai',
-    'Jun',
-    'Jul',
-    'Aug',
-    'Sep',
-    'Okt',
-    'Nov',
-    'Dez',
-  ],
 };
diff --git a/src/locales/de/date/weekday.ts b/src/locales/de/date/weekday.ts
index 18c927883b4..614c1093c0d 100644
--- a/src/locales/de/date/weekday.ts
+++ b/src/locales/de/date/weekday.ts
@@ -8,19 +8,6 @@ export default {
     'Freitag',
     'Samstag',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Sonntag',
-    'Montag',
-    'Dienstag',
-    'Mittwoch',
-    'Donnerstag',
-    'Freitag',
-    'Samstag',
-  ],
+
   abbr: ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
 };
diff --git a/src/locales/de_CH/location/country_code.ts b/src/locales/de_CH/location/country_code.ts
index 4f084d961b0..bd629a35036 100644
--- a/src/locales/de_CH/location/country_code.ts
+++ b/src/locales/de_CH/location/country_code.ts
@@ -1 +1,10 @@
-export default ['CH', 'DE', 'AT', 'US', 'LI', 'HK', 'VN'];
+// [ISO_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1)
+export default [
+  { alpha2: 'CH', alpha3: 'CHE' },
+  { alpha2: 'DE', alpha3: 'DEU' },
+  { alpha2: 'AT', alpha3: 'AUT' },
+  { alpha2: 'US', alpha3: 'USA' },
+  { alpha2: 'LI', alpha3: 'LIE' },
+  { alpha2: 'HK', alpha3: 'HKG' },
+  { alpha2: 'VN', alpha3: 'VNM' },
+];
diff --git a/src/locales/dv/index.ts b/src/locales/dv/index.ts
index 9ba28b8a4c4..67314227250 100644
--- a/src/locales/dv/index.ts
+++ b/src/locales/dv/index.ts
@@ -13,7 +13,7 @@ import person from './person';
 import phone_number from './phone_number';
 
 const dv: LocaleDefinition = {
-  title: 'Dhivehi',
+  title: 'Maldivian',
   cell_phone,
   color,
   company,
diff --git a/src/locales/el/company/bs_adjective.ts b/src/locales/el/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/el/company/bs_adjective.ts
rename to src/locales/el/company/buzz_adjective.ts
diff --git a/src/locales/el/company/bs_noun.ts b/src/locales/el/company/buzz_noun.ts
similarity index 100%
rename from src/locales/el/company/bs_noun.ts
rename to src/locales/el/company/buzz_noun.ts
diff --git a/src/locales/el/company/bs_verb.ts b/src/locales/el/company/buzz_verb.ts
similarity index 100%
rename from src/locales/el/company/bs_verb.ts
rename to src/locales/el/company/buzz_verb.ts
diff --git a/src/locales/el/company/index.ts b/src/locales/el/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/el/company/index.ts
+++ b/src/locales/el/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/el/finance/currency.ts b/src/locales/el/finance/currency.ts
index a95bed99a28..a3d06cda8ca 100644
--- a/src/locales/el/finance/currency.ts
+++ b/src/locales/el/finance/currency.ts
@@ -1,6 +1,7 @@
-export default {
-  Ευρώ: {
+export default [
+  {
+    name: 'Ευρώ',
     code: 'EUR',
     symbol: '€',
   },
-};
+];
diff --git a/src/locales/en/company/bs_adjective.ts b/src/locales/en/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/en/company/bs_adjective.ts
rename to src/locales/en/company/buzz_adjective.ts
diff --git a/src/locales/en/company/bs_noun.ts b/src/locales/en/company/buzz_noun.ts
similarity index 100%
rename from src/locales/en/company/bs_noun.ts
rename to src/locales/en/company/buzz_noun.ts
diff --git a/src/locales/en/company/bs_verb.ts b/src/locales/en/company/buzz_verb.ts
similarity index 100%
rename from src/locales/en/company/bs_verb.ts
rename to src/locales/en/company/buzz_verb.ts
diff --git a/src/locales/en/company/index.ts b/src/locales/en/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/en/company/index.ts
+++ b/src/locales/en/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/en/date/month.ts b/src/locales/en/date/month.ts
index 7dc2ca25ddd..815861e529e 100644
--- a/src/locales/en/date/month.ts
+++ b/src/locales/en/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'November',
     'December',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'January',
-    'February',
-    'March',
-    'April',
-    'May',
-    'June',
-    'July',
-    'August',
-    'September',
-    'October',
-    'November',
-    'December',
-  ],
+
   abbr: [
     'Jan',
     'Feb',
@@ -43,20 +28,4 @@ export default {
     'Nov',
     'Dec',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Jan',
-    'Feb',
-    'Mar',
-    'Apr',
-    'May',
-    'Jun',
-    'Jul',
-    'Aug',
-    'Sep',
-    'Oct',
-    'Nov',
-    'Dec',
-  ],
 };
diff --git a/src/locales/en/date/weekday.ts b/src/locales/en/date/weekday.ts
index 8d269aefb5f..fc79009ee17 100644
--- a/src/locales/en/date/weekday.ts
+++ b/src/locales/en/date/weekday.ts
@@ -8,19 +8,6 @@ export default {
     'Friday',
     'Saturday',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Sunday',
-    'Monday',
-    'Tuesday',
-    'Wednesday',
-    'Thursday',
-    'Friday',
-    'Saturday',
-  ],
+
   abbr: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
 };
diff --git a/src/locales/en/finance/currency.ts b/src/locales/en/finance/currency.ts
index a36894b493f..7cccf4fec77 100644
--- a/src/locales/en/finance/currency.ts
+++ b/src/locales/en/finance/currency.ts
@@ -1,682 +1,772 @@
-export default {
-  'UAE Dirham': {
+export default [
+  {
+    name: 'UAE Dirham',
     code: 'AED',
     symbol: '',
   },
-  Afghani: {
+  {
+    name: 'Afghani',
     code: 'AFN',
     symbol: '؋',
   },
-  Lek: {
+  {
+    name: 'Lek',
     code: 'ALL',
     symbol: 'Lek',
   },
-  'Armenian Dram': {
+  {
+    name: 'Armenian Dram',
     code: 'AMD',
     symbol: '',
   },
-  'Netherlands Antillian Guilder': {
+  {
+    name: 'Netherlands Antillian Guilder',
     code: 'ANG',
     symbol: 'ƒ',
   },
-  Kwanza: {
+  {
+    name: 'Kwanza',
     code: 'AOA',
     symbol: '',
   },
-  'Argentine Peso': {
+  {
+    name: 'Argentine Peso',
     code: 'ARS',
     symbol: '$',
   },
-  'Australian Dollar': {
+  {
+    name: 'Australian Dollar',
     code: 'AUD',
     symbol: '$',
   },
-  'Aruban Guilder': {
+  {
+    name: 'Aruban Guilder',
     code: 'AWG',
     symbol: 'ƒ',
   },
-  'Azerbaijanian Manat': {
+  {
+    name: 'Azerbaijanian Manat',
     code: 'AZN',
     symbol: 'ман',
   },
-  'Convertible Marks': {
+  {
+    name: 'Convertible Marks',
     code: 'BAM',
     symbol: 'KM',
   },
-  'Barbados Dollar': {
+  {
+    name: 'Barbados Dollar',
     code: 'BBD',
     symbol: '$',
   },
-  Taka: {
+  {
+    name: 'Taka',
     code: 'BDT',
     symbol: '',
   },
-  'Bulgarian Lev': {
+  {
+    name: 'Bulgarian Lev',
     code: 'BGN',
     symbol: 'лв',
   },
-  'Bahraini Dinar': {
+  {
+    name: 'Bahraini Dinar',
     code: 'BHD',
     symbol: '',
   },
-  'Burundi Franc': {
+  {
+    name: 'Burundi Franc',
     code: 'BIF',
     symbol: '',
   },
-  'Bermudian Dollar (customarily known as Bermuda Dollar)': {
+  {
+    name: 'Bermudian Dollar (customarily known as Bermuda Dollar)',
     code: 'BMD',
     symbol: '$',
   },
-  'Brunei Dollar': {
+  {
+    name: 'Brunei Dollar',
     code: 'BND',
     symbol: '$',
   },
-  'Boliviano boliviano': {
+  {
+    name: 'Boliviano boliviano',
     code: 'BOB',
     symbol: 'Bs',
   },
-  'Brazilian Real': {
+  {
+    name: 'Brazilian Real',
     code: 'BRL',
     symbol: 'R$',
   },
-  'Bahamian Dollar': {
+  {
+    name: 'Bahamian Dollar',
     code: 'BSD',
     symbol: '$',
   },
-  Pula: {
+  {
+    name: 'Pula',
     code: 'BWP',
     symbol: 'P',
   },
-  'Belarusian Ruble': {
+  {
+    name: 'Belarusian Ruble',
     code: 'BYN',
     symbol: 'Rbl',
   },
-  'Belize Dollar': {
+  {
+    name: 'Belize Dollar',
     code: 'BZD',
     symbol: 'BZ$',
   },
-  'Canadian Dollar': {
+  {
+    name: 'Canadian Dollar',
     code: 'CAD',
     symbol: '$',
   },
-  'Congolese Franc': {
+  {
+    name: 'Congolese Franc',
     code: 'CDF',
     symbol: '',
   },
-  'Swiss Franc': {
+  {
+    name: 'Swiss Franc',
     code: 'CHF',
     symbol: 'CHF',
   },
-  'Chilean Peso': {
+  {
+    name: 'Chilean Peso',
     code: 'CLP',
     symbol: '$',
   },
-  'Yuan Renminbi': {
+  {
+    name: 'Yuan Renminbi',
     code: 'CNY',
     symbol: '¥',
   },
-  'Colombian Peso': {
+  {
+    name: 'Colombian Peso',
     code: 'COP',
     symbol: '$',
   },
-  'Costa Rican Colon': {
+  {
+    name: 'Costa Rican Colon',
     code: 'CRC',
     symbol: '₡',
   },
-  'Cuban Peso': {
+  {
+    name: 'Cuban Peso',
     code: 'CUP',
     symbol: '₱',
   },
-  'Cuban Peso Convertible': {
-    code: 'CUC',
-    symbol: '$',
-  },
-  'Cape Verde Escudo': {
+  {
+    name: 'Cape Verde Escudo',
     code: 'CVE',
     symbol: '',
   },
-  'Czech Koruna': {
+  {
+    name: 'Czech Koruna',
     code: 'CZK',
     symbol: 'Kč',
   },
-  'Djibouti Franc': {
+  {
+    name: 'Djibouti Franc',
     code: 'DJF',
     symbol: '',
   },
-  'Danish Krone': {
+  {
+    name: 'Danish Krone',
     code: 'DKK',
     symbol: 'kr',
   },
-  'Dominican Peso': {
+  {
+    name: 'Dominican Peso',
     code: 'DOP',
     symbol: 'RD$',
   },
-  'Algerian Dinar': {
+  {
+    name: 'Algerian Dinar',
     code: 'DZD',
     symbol: '',
   },
-  Kroon: {
-    code: 'EEK',
-    symbol: '',
-  },
-  'Egyptian Pound': {
+  {
+    name: 'Egyptian Pound',
     code: 'EGP',
     symbol: '£',
   },
-  Nakfa: {
+  {
+    name: 'Nakfa',
     code: 'ERN',
     symbol: '',
   },
-  'Ethiopian Birr': {
+  {
+    name: 'Ethiopian Birr',
     code: 'ETB',
     symbol: '',
   },
-  Euro: {
+  {
+    name: 'Euro',
     code: 'EUR',
     symbol: '€',
   },
-  'Fiji Dollar': {
+  {
+    name: 'Fiji Dollar',
     code: 'FJD',
     symbol: '$',
   },
-  'Falkland Islands Pound': {
+  {
+    name: 'Falkland Islands Pound',
     code: 'FKP',
     symbol: '£',
   },
-  'Pound Sterling': {
+  {
+    name: 'Pound Sterling',
     code: 'GBP',
     symbol: '£',
   },
-  Lari: {
+  {
+    name: 'Lari',
     code: 'GEL',
     symbol: '',
   },
-  Cedi: {
+  {
+    name: 'Cedi',
     code: 'GHS',
     symbol: '',
   },
-  'Gibraltar Pound': {
+  {
+    name: 'Gibraltar Pound',
     code: 'GIP',
     symbol: '£',
   },
-  Dalasi: {
+  {
+    name: 'Dalasi',
     code: 'GMD',
     symbol: '',
   },
-  'Guinea Franc': {
+  {
+    name: 'Guinea Franc',
     code: 'GNF',
     symbol: '',
   },
-  Quetzal: {
+  {
+    name: 'Quetzal',
     code: 'GTQ',
     symbol: 'Q',
   },
-  'Guyana Dollar': {
+  {
+    name: 'Guyana Dollar',
     code: 'GYD',
     symbol: '$',
   },
-  'Hong Kong Dollar': {
+  {
+    name: 'Hong Kong Dollar',
     code: 'HKD',
     symbol: '$',
   },
-  Lempira: {
+  {
+    name: 'Lempira',
     code: 'HNL',
     symbol: 'L',
   },
-  'Croatian Kuna': {
-    code: 'HRK',
-    symbol: 'kn',
-  },
-  Gourde: {
+  {
+    name: 'Gourde',
     code: 'HTG',
     symbol: '',
   },
-  Forint: {
+  {
+    name: 'Forint',
     code: 'HUF',
     symbol: 'Ft',
   },
-  Rupiah: {
+  {
+    name: 'Rupiah',
     code: 'IDR',
     symbol: 'Rp',
   },
-  'New Israeli Sheqel': {
+  {
+    name: 'New Israeli Sheqel',
     code: 'ILS',
     symbol: '₪',
   },
-  'Bhutanese Ngultrum': {
+  {
+    name: 'Bhutanese Ngultrum',
     code: 'BTN',
     symbol: 'Nu',
   },
-  'Indian Rupee': {
+  {
+    name: 'Indian Rupee',
     code: 'INR',
     symbol: '₹',
   },
-  'Iraqi Dinar': {
+  {
+    name: 'Iraqi Dinar',
     code: 'IQD',
     symbol: '',
   },
-  'Iranian Rial': {
+  {
+    name: 'Iranian Rial',
     code: 'IRR',
     symbol: '﷼',
   },
-  'Iceland Krona': {
+  {
+    name: 'Iceland Krona',
     code: 'ISK',
     symbol: 'kr',
   },
-  'Jamaican Dollar': {
+  {
+    name: 'Jamaican Dollar',
     code: 'JMD',
     symbol: 'J$',
   },
-  'Jordanian Dinar': {
+  {
+    name: 'Jordanian Dinar',
     code: 'JOD',
     symbol: '',
   },
-  Yen: {
+  {
+    name: 'Yen',
     code: 'JPY',
     symbol: '¥',
   },
-  'Kenyan Shilling': {
+  {
+    name: 'Kenyan Shilling',
     code: 'KES',
     symbol: '',
   },
-  Som: {
+  {
+    name: 'Som',
     code: 'KGS',
     symbol: 'лв',
   },
-  Riel: {
+  {
+    name: 'Riel',
     code: 'KHR',
     symbol: '៛',
   },
-  'Comoro Franc': {
+  {
+    name: 'Comoro Franc',
     code: 'KMF',
     symbol: '',
   },
-  'North Korean Won': {
+  {
+    name: 'North Korean Won',
     code: 'KPW',
     symbol: '₩',
   },
-  Won: {
+  {
+    name: 'Won',
     code: 'KRW',
     symbol: '₩',
   },
-  'Kuwaiti Dinar': {
+  {
+    name: 'Kuwaiti Dinar',
     code: 'KWD',
     symbol: '',
   },
-  'Cayman Islands Dollar': {
+  {
+    name: 'Cayman Islands Dollar',
     code: 'KYD',
     symbol: '$',
   },
-  Tenge: {
+  {
+    name: 'Tenge',
     code: 'KZT',
     symbol: 'лв',
   },
-  Kip: {
+  {
+    name: 'Kip',
     code: 'LAK',
     symbol: '₭',
   },
-  'Lebanese Pound': {
+  {
+    name: 'Lebanese Pound',
     code: 'LBP',
     symbol: '£',
   },
-  'Sri Lanka Rupee': {
+  {
+    name: 'Sri Lanka Rupee',
     code: 'LKR',
     symbol: '₨',
   },
-  'Liberian Dollar': {
+  {
+    name: 'Liberian Dollar',
     code: 'LRD',
     symbol: '$',
   },
-  'Lithuanian Litas': {
-    code: 'LTL',
-    symbol: 'Lt',
-  },
-  'Latvian Lats': {
-    code: 'LVL',
-    symbol: 'Ls',
-  },
-  'Libyan Dinar': {
+  {
+    name: 'Libyan Dinar',
     code: 'LYD',
     symbol: '',
   },
-  'Moroccan Dirham': {
+  {
+    name: 'Moroccan Dirham',
     code: 'MAD',
     symbol: '',
   },
-  'Moldovan Leu': {
+  {
+    name: 'Moldovan Leu',
     code: 'MDL',
     symbol: '',
   },
-  'Malagasy Ariary': {
+  {
+    name: 'Malagasy Ariary',
     code: 'MGA',
     symbol: '',
   },
-  Denar: {
+  {
+    name: 'Denar',
     code: 'MKD',
     symbol: 'ден',
   },
-  Kyat: {
+  {
+    name: 'Kyat',
     code: 'MMK',
     symbol: '',
   },
-  Tugrik: {
+  {
+    name: 'Tugrik',
     code: 'MNT',
     symbol: '₮',
   },
-  Pataca: {
+  {
+    name: 'Pataca',
     code: 'MOP',
     symbol: '',
   },
-  Ouguiya: {
-    code: 'MRO',
+  {
+    name: 'Ouguiya',
+    code: 'MRU',
     symbol: '',
   },
-  'Mauritius Rupee': {
+  {
+    name: 'Mauritius Rupee',
     code: 'MUR',
     symbol: '₨',
   },
-  Rufiyaa: {
+  {
+    name: 'Rufiyaa',
     code: 'MVR',
     symbol: '',
   },
-  Kwacha: {
+  {
+    name: 'Kwacha',
     code: 'MWK',
     symbol: '',
   },
-  'Mexican Peso': {
+  {
+    name: 'Mexican Peso',
     code: 'MXN',
     symbol: '$',
   },
-  'Malaysian Ringgit': {
+  {
+    name: 'Malaysian Ringgit',
     code: 'MYR',
     symbol: 'RM',
   },
-  Metical: {
+  {
+    name: 'Metical',
     code: 'MZN',
     symbol: 'MT',
   },
-  Naira: {
+  {
+    name: 'Naira',
     code: 'NGN',
     symbol: '₦',
   },
-  'Cordoba Oro': {
+  {
+    name: 'Cordoba Oro',
     code: 'NIO',
     symbol: 'C$',
   },
-  'Norwegian Krone': {
+  {
+    name: 'Norwegian Krone',
     code: 'NOK',
     symbol: 'kr',
   },
-  'Nepalese Rupee': {
+  {
+    name: 'Nepalese Rupee',
     code: 'NPR',
     symbol: '₨',
   },
-  'New Zealand Dollar': {
+  {
+    name: 'New Zealand Dollar',
     code: 'NZD',
     symbol: '$',
   },
-  'Rial Omani': {
+  {
+    name: 'Rial Omani',
     code: 'OMR',
     symbol: '﷼',
   },
-  Balboa: {
+  {
+    name: 'Balboa',
     code: 'PAB',
     symbol: 'B/.',
   },
-  'Nuevo Sol': {
+  {
+    name: 'Nuevo Sol',
     code: 'PEN',
     symbol: 'S/.',
   },
-  Kina: {
+  {
+    name: 'Kina',
     code: 'PGK',
     symbol: '',
   },
-  'Philippine Peso': {
+  {
+    name: 'Philippine Peso',
     code: 'PHP',
     symbol: 'Php',
   },
-  'Pakistan Rupee': {
+  {
+    name: 'Pakistan Rupee',
     code: 'PKR',
     symbol: '₨',
   },
-  Zloty: {
+  {
+    name: 'Zloty',
     code: 'PLN',
     symbol: 'zł',
   },
-  Guarani: {
+  {
+    name: 'Guarani',
     code: 'PYG',
     symbol: 'Gs',
   },
-  'Qatari Rial': {
+  {
+    name: 'Qatari Rial',
     code: 'QAR',
     symbol: '﷼',
   },
-  'New Leu': {
+  {
+    name: 'New Leu',
     code: 'RON',
     symbol: 'lei',
   },
-  'Serbian Dinar': {
+  {
+    name: 'Serbian Dinar',
     code: 'RSD',
     symbol: 'Дин.',
   },
-  'Russian Ruble': {
+  {
+    name: 'Russian Ruble',
     code: 'RUB',
     symbol: 'руб',
   },
-  'Rwanda Franc': {
+  {
+    name: 'Rwanda Franc',
     code: 'RWF',
     symbol: '',
   },
-  'Saudi Riyal': {
+  {
+    name: 'Saudi Riyal',
     code: 'SAR',
     symbol: '﷼',
   },
-  'Solomon Islands Dollar': {
+  {
+    name: 'Solomon Islands Dollar',
     code: 'SBD',
     symbol: '$',
   },
-  'Seychelles Rupee': {
+  {
+    name: 'Seychelles Rupee',
     code: 'SCR',
     symbol: '₨',
   },
-  'Sudanese Pound': {
+  {
+    name: 'Sudanese Pound',
     code: 'SDG',
     symbol: '',
   },
-  'Swedish Krona': {
+  {
+    name: 'Swedish Krona',
     code: 'SEK',
     symbol: 'kr',
   },
-  'Singapore Dollar': {
+  {
+    name: 'Singapore Dollar',
     code: 'SGD',
     symbol: '$',
   },
-  'Saint Helena Pound': {
+  {
+    name: 'Saint Helena Pound',
     code: 'SHP',
     symbol: '£',
   },
-  Leone: {
-    code: 'SLL',
+  {
+    name: 'Leone',
+    code: 'SLE',
     symbol: '',
   },
-  'Somali Shilling': {
+  {
+    name: 'Somali Shilling',
     code: 'SOS',
     symbol: 'S',
   },
-  'Surinam Dollar': {
+  {
+    name: 'Surinam Dollar',
     code: 'SRD',
     symbol: '$',
   },
-  Dobra: {
+  {
+    name: 'South Sudanese pound',
+    code: 'SSP',
+    symbol: '',
+  },
+  {
+    name: 'Dobra',
     code: 'STN',
     symbol: 'Db',
   },
-  'El Salvador Colon': {
-    code: 'SVC',
-    symbol: '₡',
-  },
-  'Syrian Pound': {
+  {
+    name: 'Syrian Pound',
     code: 'SYP',
     symbol: '£',
   },
-  Lilangeni: {
+  {
+    name: 'Lilangeni',
     code: 'SZL',
     symbol: '',
   },
-  Baht: {
+  {
+    name: 'Baht',
     code: 'THB',
     symbol: '฿',
   },
-  Somoni: {
+  {
+    name: 'Somoni',
     code: 'TJS',
     symbol: '',
   },
-  Manat: {
+  {
+    name: 'Manat',
     code: 'TMT',
     symbol: '',
   },
-  'Tunisian Dinar': {
+  {
+    name: 'Tunisian Dinar',
     code: 'TND',
     symbol: '',
   },
-  "Pa'anga": {
+  {
+    name: "Pa'anga",
     code: 'TOP',
     symbol: '',
   },
-  'Turkish Lira': {
+  {
+    name: 'Turkish Lira',
     code: 'TRY',
     symbol: '₺',
   },
-  'Trinidad and Tobago Dollar': {
+  {
+    name: 'Trinidad and Tobago Dollar',
     code: 'TTD',
     symbol: 'TT$',
   },
-  'New Taiwan Dollar': {
+  {
+    name: 'New Taiwan Dollar',
     code: 'TWD',
     symbol: 'NT$',
   },
-  'Tanzanian Shilling': {
+  {
+    name: 'Tanzanian Shilling',
     code: 'TZS',
     symbol: '',
   },
-  Hryvnia: {
+  {
+    name: 'Hryvnia',
     code: 'UAH',
     symbol: '₴',
   },
-  'Uganda Shilling': {
+  {
+    name: 'Uganda Shilling',
     code: 'UGX',
     symbol: '',
   },
-  'US Dollar': {
+  {
+    name: 'US Dollar',
     code: 'USD',
     symbol: '$',
   },
-  'Peso Uruguayo': {
+  {
+    name: 'Peso Uruguayo',
     code: 'UYU',
     symbol: '$U',
   },
-  'Uzbekistan Sum': {
+  {
+    name: 'Uzbekistan Sum',
     code: 'UZS',
     symbol: 'лв',
   },
-  'Venezuelan bolívar': {
+  {
+    name: 'Venezuelan bolívar',
     code: 'VES',
     symbol: 'Bs',
   },
-  Dong: {
+  {
+    name: 'Dong',
     code: 'VND',
     symbol: '₫',
   },
-  Vatu: {
+  {
+    name: 'Vatu',
     code: 'VUV',
     symbol: '',
   },
-  Tala: {
+  {
+    name: 'Tala',
     code: 'WST',
     symbol: '',
   },
-  'CFA Franc BEAC': {
+  {
+    name: 'CFA Franc BEAC',
     code: 'XAF',
     symbol: '',
   },
-  Silver: {
-    code: 'XAG',
-    symbol: '',
-  },
-  Gold: {
-    code: 'XAU',
-    symbol: '',
-  },
-  'Bond Markets Units European Composite Unit (EURCO)': {
-    code: 'XBA',
-    symbol: '',
-  },
-  'European Monetary Unit (E.M.U.-6)': {
-    code: 'XBB',
-    symbol: '',
-  },
-  'European Unit of Account 9(E.U.A.-9)': {
-    code: 'XBC',
-    symbol: '',
-  },
-  'European Unit of Account 17(E.U.A.-17)': {
-    code: 'XBD',
-    symbol: '',
-  },
-  'East Caribbean Dollar': {
+  {
+    name: 'East Caribbean Dollar',
     code: 'XCD',
     symbol: '$',
   },
-  SDR: {
-    code: 'XDR',
-    symbol: '',
-  },
-  'UIC-Franc': {
-    code: 'XFU',
-    symbol: '',
-  },
-  'CFA Franc BCEAO': {
+  {
+    name: 'CFA Franc BCEAO',
     code: 'XOF',
     symbol: '',
   },
-  Palladium: {
-    code: 'XPD',
-    symbol: '',
-  },
-  'CFP Franc': {
+  {
+    name: 'CFP Franc',
     code: 'XPF',
     symbol: '',
   },
-  Platinum: {
-    code: 'XPT',
-    symbol: '',
-  },
-  'Codes specifically reserved for testing purposes': {
-    code: 'XTS',
-    symbol: '',
-  },
-  'Yemeni Rial': {
+  {
+    name: 'Yemeni Rial',
     code: 'YER',
     symbol: '﷼',
   },
-  Rand: {
+  {
+    name: 'Rand',
     code: 'ZAR',
     symbol: 'R',
   },
-  'Lesotho Loti': {
+  {
+    name: 'Lesotho Loti',
     code: 'LSL',
     symbol: '',
   },
-  'Namibia Dollar': {
+  {
+    name: 'Namibia Dollar',
     code: 'NAD',
     symbol: 'N$',
   },
-  'Zambian Kwacha': {
+  {
+    name: 'Zambian Kwacha',
     code: 'ZMW',
     symbol: 'K',
   },
-  'Zimbabwe Dollar': {
+  {
+    name: 'Zimbabwe Dollar',
     code: 'ZWL',
     symbol: '',
   },
-};
+];
diff --git a/src/locales/en/location/country_code.ts b/src/locales/en/location/country_code.ts
index 325a7ff81cc..6fe5278c482 100644
--- a/src/locales/en/location/country_code.ts
+++ b/src/locales/en/location/country_code.ts
@@ -1,251 +1,252 @@
+// [ISO_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1)
 export default [
-  'AD',
-  'AE',
-  'AF',
-  'AG',
-  'AI',
-  'AL',
-  'AM',
-  'AO',
-  'AQ',
-  'AR',
-  'AS',
-  'AT',
-  'AU',
-  'AW',
-  'AX',
-  'AZ',
-  'BA',
-  'BB',
-  'BD',
-  'BE',
-  'BF',
-  'BG',
-  'BH',
-  'BI',
-  'BJ',
-  'BL',
-  'BM',
-  'BN',
-  'BO',
-  'BQ',
-  'BR',
-  'BS',
-  'BT',
-  'BV',
-  'BW',
-  'BY',
-  'BZ',
-  'CA',
-  'CC',
-  'CD',
-  'CF',
-  'CG',
-  'CH',
-  'CI',
-  'CK',
-  'CL',
-  'CM',
-  'CN',
-  'CO',
-  'CR',
-  'CU',
-  'CV',
-  'CW',
-  'CX',
-  'CY',
-  'CZ',
-  'DE',
-  'DJ',
-  'DK',
-  'DM',
-  'DO',
-  'DZ',
-  'EC',
-  'EE',
-  'EG',
-  'EH',
-  'ER',
-  'ES',
-  'ET',
-  'FI',
-  'FJ',
-  'FK',
-  'FM',
-  'FO',
-  'FR',
-  'GA',
-  'GB',
-  'GD',
-  'GE',
-  'GF',
-  'GG',
-  'GH',
-  'GI',
-  'GL',
-  'GM',
-  'GN',
-  'GP',
-  'GQ',
-  'GR',
-  'GS',
-  'GT',
-  'GU',
-  'GW',
-  'GY',
-  'HK',
-  'HM',
-  'HN',
-  'HR',
-  'HT',
-  'HU',
-  'ID',
-  'IE',
-  'IL',
-  'IM',
-  'IN',
-  'IO',
-  'IQ',
-  'IR',
-  'IS',
-  'IT',
-  'JE',
-  'JM',
-  'JO',
-  'JP',
-  'KE',
-  'KG',
-  'KH',
-  'KI',
-  'KM',
-  'KN',
-  'KP',
-  'KR',
-  'KW',
-  'KY',
-  'KZ',
-  'LA',
-  'LB',
-  'LC',
-  'LI',
-  'LK',
-  'LR',
-  'LS',
-  'LT',
-  'LU',
-  'LV',
-  'LY',
-  'MA',
-  'MC',
-  'MD',
-  'ME',
-  'MF',
-  'MG',
-  'MH',
-  'MK',
-  'ML',
-  'MM',
-  'MN',
-  'MO',
-  'MP',
-  'MQ',
-  'MR',
-  'MS',
-  'MT',
-  'MU',
-  'MV',
-  'MW',
-  'MX',
-  'MY',
-  'MZ',
-  'NA',
-  'NC',
-  'NE',
-  'NF',
-  'NG',
-  'NI',
-  'NL',
-  'NO',
-  'NP',
-  'NR',
-  'NU',
-  'NZ',
-  'OM',
-  'PA',
-  'PE',
-  'PF',
-  'PG',
-  'PH',
-  'PK',
-  'PL',
-  'PM',
-  'PN',
-  'PR',
-  'PS',
-  'PT',
-  'PW',
-  'PY',
-  'QA',
-  'RE',
-  'RO',
-  'RS',
-  'RU',
-  'RW',
-  'SA',
-  'SB',
-  'SC',
-  'SD',
-  'SE',
-  'SG',
-  'SH',
-  'SI',
-  'SJ',
-  'SK',
-  'SL',
-  'SM',
-  'SN',
-  'SO',
-  'SR',
-  'SS',
-  'ST',
-  'SV',
-  'SX',
-  'SY',
-  'SZ',
-  'TC',
-  'TD',
-  'TF',
-  'TG',
-  'TH',
-  'TJ',
-  'TK',
-  'TL',
-  'TM',
-  'TN',
-  'TO',
-  'TR',
-  'TT',
-  'TV',
-  'TW',
-  'TZ',
-  'UA',
-  'UG',
-  'UM',
-  'US',
-  'UY',
-  'UZ',
-  'VA',
-  'VC',
-  'VE',
-  'VG',
-  'VI',
-  'VN',
-  'VU',
-  'WF',
-  'WS',
-  'YE',
-  'YT',
-  'ZA',
-  'ZM',
-  'ZW',
+  { alpha2: 'AD', alpha3: 'AND' },
+  { alpha2: 'AE', alpha3: 'ARE' },
+  { alpha2: 'AF', alpha3: 'AFG' },
+  { alpha2: 'AG', alpha3: 'ATG' },
+  { alpha2: 'AI', alpha3: 'AIA' },
+  { alpha2: 'AL', alpha3: 'ALB' },
+  { alpha2: 'AM', alpha3: 'ARM' },
+  { alpha2: 'AO', alpha3: 'AGO' },
+  { alpha2: 'AQ', alpha3: 'ATA' },
+  { alpha2: 'AR', alpha3: 'ARG' },
+  { alpha2: 'AS', alpha3: 'ASM' },
+  { alpha2: 'AT', alpha3: 'AUT' },
+  { alpha2: 'AU', alpha3: 'AUS' },
+  { alpha2: 'AW', alpha3: 'ABW' },
+  { alpha2: 'AX', alpha3: 'ALA' },
+  { alpha2: 'AZ', alpha3: 'AZE' },
+  { alpha2: 'BA', alpha3: 'BIH' },
+  { alpha2: 'BB', alpha3: 'BRB' },
+  { alpha2: 'BD', alpha3: 'BGD' },
+  { alpha2: 'BE', alpha3: 'BEL' },
+  { alpha2: 'BF', alpha3: 'BFA' },
+  { alpha2: 'BG', alpha3: 'BGR' },
+  { alpha2: 'BH', alpha3: 'BHR' },
+  { alpha2: 'BI', alpha3: 'BDI' },
+  { alpha2: 'BJ', alpha3: 'BEN' },
+  { alpha2: 'BL', alpha3: 'BLM' },
+  { alpha2: 'BM', alpha3: 'BMU' },
+  { alpha2: 'BN', alpha3: 'BRN' },
+  { alpha2: 'BO', alpha3: 'BOL' },
+  { alpha2: 'BQ', alpha3: 'BES' },
+  { alpha2: 'BR', alpha3: 'BRA' },
+  { alpha2: 'BS', alpha3: 'BHS' },
+  { alpha2: 'BT', alpha3: 'BTN' },
+  { alpha2: 'BV', alpha3: 'BVT' },
+  { alpha2: 'BW', alpha3: 'BWA' },
+  { alpha2: 'BY', alpha3: 'BLR' },
+  { alpha2: 'BZ', alpha3: 'BLZ' },
+  { alpha2: 'CA', alpha3: 'CAN' },
+  { alpha2: 'CC', alpha3: 'CCK' },
+  { alpha2: 'CD', alpha3: 'COD' },
+  { alpha2: 'CF', alpha3: 'CAF' },
+  { alpha2: 'CG', alpha3: 'COG' },
+  { alpha2: 'CH', alpha3: 'CHE' },
+  { alpha2: 'CI', alpha3: 'CIV' },
+  { alpha2: 'CK', alpha3: 'COK' },
+  { alpha2: 'CL', alpha3: 'CHL' },
+  { alpha2: 'CM', alpha3: 'CMR' },
+  { alpha2: 'CN', alpha3: 'CHN' },
+  { alpha2: 'CO', alpha3: 'COL' },
+  { alpha2: 'CR', alpha3: 'CRI' },
+  { alpha2: 'CU', alpha3: 'CUB' },
+  { alpha2: 'CV', alpha3: 'CPV' },
+  { alpha2: 'CW', alpha3: 'CUW' },
+  { alpha2: 'CX', alpha3: 'CXR' },
+  { alpha2: 'CY', alpha3: 'CYP' },
+  { alpha2: 'CZ', alpha3: 'CZE' },
+  { alpha2: 'DE', alpha3: 'DEU' },
+  { alpha2: 'DJ', alpha3: 'DJI' },
+  { alpha2: 'DK', alpha3: 'DNK' },
+  { alpha2: 'DM', alpha3: 'DMA' },
+  { alpha2: 'DO', alpha3: 'DOM' },
+  { alpha2: 'DZ', alpha3: 'DZA' },
+  { alpha2: 'EC', alpha3: 'ECU' },
+  { alpha2: 'EE', alpha3: 'EST' },
+  { alpha2: 'EG', alpha3: 'EGY' },
+  { alpha2: 'EH', alpha3: 'ESH' },
+  { alpha2: 'ER', alpha3: 'ERI' },
+  { alpha2: 'ES', alpha3: 'ESP' },
+  { alpha2: 'ET', alpha3: 'ETH' },
+  { alpha2: 'FI', alpha3: 'FIN' },
+  { alpha2: 'FJ', alpha3: 'FJI' },
+  { alpha2: 'FK', alpha3: 'FLK' },
+  { alpha2: 'FM', alpha3: 'FSM' },
+  { alpha2: 'FO', alpha3: 'FRO' },
+  { alpha2: 'FR', alpha3: 'FRA' },
+  { alpha2: 'GA', alpha3: 'GAB' },
+  { alpha2: 'GB', alpha3: 'GBR' },
+  { alpha2: 'GD', alpha3: 'GRD' },
+  { alpha2: 'GE', alpha3: 'GEO' },
+  { alpha2: 'GF', alpha3: 'GUF' },
+  { alpha2: 'GG', alpha3: 'GGY' },
+  { alpha2: 'GH', alpha3: 'GHA' },
+  { alpha2: 'GI', alpha3: 'GIB' },
+  { alpha2: 'GL', alpha3: 'GRL' },
+  { alpha2: 'GM', alpha3: 'GMB' },
+  { alpha2: 'GN', alpha3: 'GIN' },
+  { alpha2: 'GP', alpha3: 'GLP' },
+  { alpha2: 'GQ', alpha3: 'GNQ' },
+  { alpha2: 'GR', alpha3: 'GRC' },
+  { alpha2: 'GS', alpha3: 'SGS' },
+  { alpha2: 'GT', alpha3: 'GTM' },
+  { alpha2: 'GU', alpha3: 'GUM' },
+  { alpha2: 'GW', alpha3: 'GNB' },
+  { alpha2: 'GY', alpha3: 'GUY' },
+  { alpha2: 'HK', alpha3: 'HKG' },
+  { alpha2: 'HM', alpha3: 'HMD' },
+  { alpha2: 'HN', alpha3: 'HND' },
+  { alpha2: 'HR', alpha3: 'HRV' },
+  { alpha2: 'HT', alpha3: 'HTI' },
+  { alpha2: 'HU', alpha3: 'HUN' },
+  { alpha2: 'ID', alpha3: 'IDN' },
+  { alpha2: 'IE', alpha3: 'IRL' },
+  { alpha2: 'IL', alpha3: 'ISR' },
+  { alpha2: 'IM', alpha3: 'IMN' },
+  { alpha2: 'IN', alpha3: 'IND' },
+  { alpha2: 'IO', alpha3: 'IOT' },
+  { alpha2: 'IQ', alpha3: 'IRQ' },
+  { alpha2: 'IR', alpha3: 'IRN' },
+  { alpha2: 'IS', alpha3: 'ISL' },
+  { alpha2: 'IT', alpha3: 'ITA' },
+  { alpha2: 'JE', alpha3: 'JEY' },
+  { alpha2: 'JM', alpha3: 'JAM' },
+  { alpha2: 'JO', alpha3: 'JOR' },
+  { alpha2: 'JP', alpha3: 'JPN' },
+  { alpha2: 'KE', alpha3: 'KEN' },
+  { alpha2: 'KG', alpha3: 'KGZ' },
+  { alpha2: 'KH', alpha3: 'KHM' },
+  { alpha2: 'KI', alpha3: 'KIR' },
+  { alpha2: 'KM', alpha3: 'COM' },
+  { alpha2: 'KN', alpha3: 'KNA' },
+  { alpha2: 'KP', alpha3: 'PRK' },
+  { alpha2: 'KR', alpha3: 'KOR' },
+  { alpha2: 'KW', alpha3: 'KWT' },
+  { alpha2: 'KY', alpha3: 'CYM' },
+  { alpha2: 'KZ', alpha3: 'KAZ' },
+  { alpha2: 'LA', alpha3: 'LAO' },
+  { alpha2: 'LB', alpha3: 'LBN' },
+  { alpha2: 'LC', alpha3: 'LCA' },
+  { alpha2: 'LI', alpha3: 'LIE' },
+  { alpha2: 'LK', alpha3: 'LKA' },
+  { alpha2: 'LR', alpha3: 'LBR' },
+  { alpha2: 'LS', alpha3: 'LSO' },
+  { alpha2: 'LT', alpha3: 'LTU' },
+  { alpha2: 'LU', alpha3: 'LUX' },
+  { alpha2: 'LV', alpha3: 'LVA' },
+  { alpha2: 'LY', alpha3: 'LBY' },
+  { alpha2: 'MA', alpha3: 'MAR' },
+  { alpha2: 'MC', alpha3: 'MCO' },
+  { alpha2: 'MD', alpha3: 'MDA' },
+  { alpha2: 'ME', alpha3: 'MNE' },
+  { alpha2: 'MF', alpha3: 'MAF' },
+  { alpha2: 'MG', alpha3: 'MDG' },
+  { alpha2: 'MH', alpha3: 'MHL' },
+  { alpha2: 'MK', alpha3: 'MKD' },
+  { alpha2: 'ML', alpha3: 'MLI' },
+  { alpha2: 'MM', alpha3: 'MMR' },
+  { alpha2: 'MN', alpha3: 'MNG' },
+  { alpha2: 'MO', alpha3: 'MAC' },
+  { alpha2: 'MP', alpha3: 'MNP' },
+  { alpha2: 'MQ', alpha3: 'MTQ' },
+  { alpha2: 'MR', alpha3: 'MRT' },
+  { alpha2: 'MS', alpha3: 'MSR' },
+  { alpha2: 'MT', alpha3: 'MLT' },
+  { alpha2: 'MU', alpha3: 'MUS' },
+  { alpha2: 'MV', alpha3: 'MDV' },
+  { alpha2: 'MW', alpha3: 'MWI' },
+  { alpha2: 'MX', alpha3: 'MEX' },
+  { alpha2: 'MY', alpha3: 'MYS' },
+  { alpha2: 'MZ', alpha3: 'MOZ' },
+  { alpha2: 'NA', alpha3: 'NAM' },
+  { alpha2: 'NC', alpha3: 'NCL' },
+  { alpha2: 'NE', alpha3: 'NER' },
+  { alpha2: 'NF', alpha3: 'NFK' },
+  { alpha2: 'NG', alpha3: 'NGA' },
+  { alpha2: 'NI', alpha3: 'NIC' },
+  { alpha2: 'NL', alpha3: 'NLD' },
+  { alpha2: 'NO', alpha3: 'NOR' },
+  { alpha2: 'NP', alpha3: 'NPL' },
+  { alpha2: 'NR', alpha3: 'NRU' },
+  { alpha2: 'NU', alpha3: 'NIU' },
+  { alpha2: 'NZ', alpha3: 'NZL' },
+  { alpha2: 'OM', alpha3: 'OMN' },
+  { alpha2: 'PA', alpha3: 'PAN' },
+  { alpha2: 'PE', alpha3: 'PER' },
+  { alpha2: 'PF', alpha3: 'PYF' },
+  { alpha2: 'PG', alpha3: 'PNG' },
+  { alpha2: 'PH', alpha3: 'PHL' },
+  { alpha2: 'PK', alpha3: 'PAK' },
+  { alpha2: 'PL', alpha3: 'POL' },
+  { alpha2: 'PM', alpha3: 'SPM' },
+  { alpha2: 'PN', alpha3: 'PCN' },
+  { alpha2: 'PR', alpha3: 'PRI' },
+  { alpha2: 'PS', alpha3: 'PSE' },
+  { alpha2: 'PT', alpha3: 'PRT' },
+  { alpha2: 'PW', alpha3: 'PLW' },
+  { alpha2: 'PY', alpha3: 'PRY' },
+  { alpha2: 'QA', alpha3: 'QAT' },
+  { alpha2: 'RE', alpha3: 'REU' },
+  { alpha2: 'RO', alpha3: 'ROU' },
+  { alpha2: 'RS', alpha3: 'SRB' },
+  { alpha2: 'RU', alpha3: 'RUS' },
+  { alpha2: 'RW', alpha3: 'RWA' },
+  { alpha2: 'SA', alpha3: 'SAU' },
+  { alpha2: 'SB', alpha3: 'SLB' },
+  { alpha2: 'SC', alpha3: 'SYC' },
+  { alpha2: 'SD', alpha3: 'SDN' },
+  { alpha2: 'SE', alpha3: 'SWE' },
+  { alpha2: 'SG', alpha3: 'SGP' },
+  { alpha2: 'SH', alpha3: 'SHN' },
+  { alpha2: 'SI', alpha3: 'SVN' },
+  { alpha2: 'SJ', alpha3: 'SJM' },
+  { alpha2: 'SK', alpha3: 'SVK' },
+  { alpha2: 'SL', alpha3: 'SLE' },
+  { alpha2: 'SM', alpha3: 'SMR' },
+  { alpha2: 'SN', alpha3: 'SEN' },
+  { alpha2: 'SO', alpha3: 'SOM' },
+  { alpha2: 'SR', alpha3: 'SUR' },
+  { alpha2: 'SS', alpha3: 'SSD' },
+  { alpha2: 'ST', alpha3: 'STP' },
+  { alpha2: 'SV', alpha3: 'SLV' },
+  { alpha2: 'SX', alpha3: 'SXM' },
+  { alpha2: 'SY', alpha3: 'SYR' },
+  { alpha2: 'SZ', alpha3: 'SWZ' },
+  { alpha2: 'TC', alpha3: 'TCA' },
+  { alpha2: 'TD', alpha3: 'TCD' },
+  { alpha2: 'TF', alpha3: 'ATF' },
+  { alpha2: 'TG', alpha3: 'TGO' },
+  { alpha2: 'TH', alpha3: 'THA' },
+  { alpha2: 'TJ', alpha3: 'TJK' },
+  { alpha2: 'TK', alpha3: 'TKL' },
+  { alpha2: 'TL', alpha3: 'TLS' },
+  { alpha2: 'TM', alpha3: 'TKM' },
+  { alpha2: 'TN', alpha3: 'TUN' },
+  { alpha2: 'TO', alpha3: 'TON' },
+  { alpha2: 'TR', alpha3: 'TUR' },
+  { alpha2: 'TT', alpha3: 'TTO' },
+  { alpha2: 'TV', alpha3: 'TUV' },
+  { alpha2: 'TW', alpha3: 'TWN' },
+  { alpha2: 'TZ', alpha3: 'TZA' },
+  { alpha2: 'UA', alpha3: 'UKR' },
+  { alpha2: 'UG', alpha3: 'UGA' },
+  { alpha2: 'UM', alpha3: 'UMI' },
+  { alpha2: 'US', alpha3: 'USA' },
+  { alpha2: 'UY', alpha3: 'URY' },
+  { alpha2: 'UZ', alpha3: 'UZB' },
+  { alpha2: 'VA', alpha3: 'VAT' },
+  { alpha2: 'VC', alpha3: 'VCT' },
+  { alpha2: 'VE', alpha3: 'VEN' },
+  { alpha2: 'VG', alpha3: 'VGB' },
+  { alpha2: 'VI', alpha3: 'VIR' },
+  { alpha2: 'VN', alpha3: 'VNM' },
+  { alpha2: 'VU', alpha3: 'VUT' },
+  { alpha2: 'WF', alpha3: 'WLF' },
+  { alpha2: 'WS', alpha3: 'WSM' },
+  { alpha2: 'YE', alpha3: 'YEM' },
+  { alpha2: 'YT', alpha3: 'MYT' },
+  { alpha2: 'ZA', alpha3: 'ZAF' },
+  { alpha2: 'ZM', alpha3: 'ZMB' },
+  { alpha2: 'ZW', alpha3: 'ZWE' },
 ];
diff --git a/src/locales/en/location/country_code_alpha_3.ts b/src/locales/en/location/country_code_alpha_3.ts
deleted file mode 100644
index 20708d640bd..00000000000
--- a/src/locales/en/location/country_code_alpha_3.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-export default [
-  'BGD',
-  'BEL',
-  'BFA',
-  'BGR',
-  'BIH',
-  'BRB',
-  'WLF',
-  'BLM',
-  'BMU',
-  'BRN',
-  'BOL',
-  'BHR',
-  'BDI',
-  'BEN',
-  'BTN',
-  'JAM',
-  'BVT',
-  'BWA',
-  'WSM',
-  'BES',
-  'BRA',
-  'BHS',
-  'JEY',
-  'BLR',
-  'BLZ',
-  'RUS',
-  'RWA',
-  'SRB',
-  'TLS',
-  'REU',
-  'TKM',
-  'TJK',
-  'ROU',
-  'TKL',
-  'GNB',
-  'GUM',
-  'GTM',
-  'SGS',
-  'GRC',
-  'GNQ',
-  'GLP',
-  'JPN',
-  'GUY',
-  'GGY',
-  'GUF',
-  'GEO',
-  'GRD',
-  'GBR',
-  'GAB',
-  'SLV',
-  'GIN',
-  'GMB',
-  'GRL',
-  'GIB',
-  'GHA',
-  'OMN',
-  'TUN',
-  'JOR',
-  'HRV',
-  'HTI',
-  'HUN',
-  'HKG',
-  'HND',
-  'HMD',
-  'VEN',
-  'PRI',
-  'PSE',
-  'PLW',
-  'PRT',
-  'SJM',
-  'PRY',
-  'IRQ',
-  'PAN',
-  'PYF',
-  'PNG',
-  'PER',
-  'PAK',
-  'PHL',
-  'PCN',
-  'POL',
-  'SPM',
-  'ZMB',
-  'ESH',
-  'EST',
-  'EGY',
-  'ZAF',
-  'ECU',
-  'ITA',
-  'VNM',
-  'SLB',
-  'ETH',
-  'SOM',
-  'ZWE',
-  'SAU',
-  'ESP',
-  'ERI',
-  'MNE',
-  'MDA',
-  'MDG',
-  'MAF',
-  'MAR',
-  'MCO',
-  'UZB',
-  'MMR',
-  'MLI',
-  'MAC',
-  'MNG',
-  'MHL',
-  'MKD',
-  'MUS',
-  'MLT',
-  'MWI',
-  'MDV',
-  'MTQ',
-  'MNP',
-  'MSR',
-  'MRT',
-  'IMN',
-  'UGA',
-  'TZA',
-  'MYS',
-  'MEX',
-  'ISR',
-  'FRA',
-  'IOT',
-  'SHN',
-  'FIN',
-  'FJI',
-  'FLK',
-  'FSM',
-  'FRO',
-  'NIC',
-  'NLD',
-  'NOR',
-  'NAM',
-  'VUT',
-  'NCL',
-  'NER',
-  'NFK',
-  'NGA',
-  'NZL',
-  'NPL',
-  'NRU',
-  'NIU',
-  'COK',
-  'XKX',
-  'CIV',
-  'CHE',
-  'COL',
-  'CHN',
-  'CMR',
-  'CHL',
-  'CCK',
-  'CAN',
-  'COG',
-  'CAF',
-  'COD',
-  'CZE',
-  'CYP',
-  'CXR',
-  'CRI',
-  'CUW',
-  'CPV',
-  'CUB',
-  'SWZ',
-  'SYR',
-  'SXM',
-  'KGZ',
-  'KEN',
-  'SSD',
-  'SUR',
-  'KIR',
-  'KHM',
-  'KNA',
-  'COM',
-  'STP',
-  'SVK',
-  'KOR',
-  'SVN',
-  'PRK',
-  'KWT',
-  'SEN',
-  'SMR',
-  'SLE',
-  'SYC',
-  'KAZ',
-  'CYM',
-  'SGP',
-  'SWE',
-  'SDN',
-  'DOM',
-  'DMA',
-  'DJI',
-  'DNK',
-  'VGB',
-  'DEU',
-  'YEM',
-  'DZA',
-  'USA',
-  'URY',
-  'MYT',
-  'UMI',
-  'LBN',
-  'LCA',
-  'LAO',
-  'TUV',
-  'TWN',
-  'TTO',
-  'TUR',
-  'LKA',
-  'LIE',
-  'LVA',
-  'TON',
-  'LTU',
-  'LUX',
-  'LBR',
-  'LSO',
-  'THA',
-  'ATF',
-  'TGO',
-  'TCD',
-  'TCA',
-  'LBY',
-  'VAT',
-  'VCT',
-  'ARE',
-  'AND',
-  'ATG',
-  'AFG',
-  'AIA',
-  'VIR',
-  'ISL',
-  'IRN',
-  'ARM',
-  'ALB',
-  'AGO',
-  'ATA',
-  'ASM',
-  'ARG',
-  'AUS',
-  'AUT',
-  'ABW',
-  'IND',
-  'ALA',
-  'AZE',
-  'IRL',
-  'IDN',
-  'UKR',
-  'QAT',
-  'MOZ',
-];
diff --git a/src/locales/en/location/index.ts b/src/locales/en/location/index.ts
index 5fd8af21c1e..e1f68cf9530 100644
--- a/src/locales/en/location/index.ts
+++ b/src/locales/en/location/index.ts
@@ -10,7 +10,6 @@ import city_prefix from './city_prefix';
 import city_suffix from './city_suffix';
 import country from './country';
 import country_code from './country_code';
-import country_code_alpha_3 from './country_code_alpha_3';
 import county from './county';
 import default_country from './default_country';
 import direction from './direction';
@@ -32,7 +31,6 @@ const location: LocationDefinitions = {
   city_suffix,
   country,
   country_code,
-  country_code_alpha_3,
   county,
   default_country,
   direction,
diff --git a/src/locales/en_AU/person/last_name.ts b/src/locales/en_AU/person/last_name.ts
index 2288f061dde..7cd0216410b 100644
--- a/src/locales/en_AU/person/last_name.ts
+++ b/src/locales/en_AU/person/last_name.ts
@@ -45,7 +45,7 @@ export default [
   'Johnston',
   'Moore',
   'Smyth',
-  "O'neill",
+  "O'Neill",
   'Doherty',
   'Stewart',
   'Quinn',
@@ -121,7 +121,7 @@ export default [
   'Crooks',
   'Cruickshank',
   'Cummings',
-  "D'amore",
+  "D'Amore",
   'Daniel',
   'Dare',
   'Daugherty',
@@ -235,12 +235,12 @@ export default [
   'Nader',
   'Nicolas',
   'Nolan',
-  "O'connell",
-  "O'conner",
-  "O'hara",
-  "O'keefe",
+  "O'Connell",
+  "O'Conner",
+  "O'Hara",
+  "O'Keefe",
   'Olson',
-  "O'reilly",
+  "O'Reilly",
   'Parisian',
   'Parker',
   'Quigley',
diff --git a/src/locales/en_GB/index.ts b/src/locales/en_GB/index.ts
index d800b9767ca..11ae9ac658f 100644
--- a/src/locales/en_GB/index.ts
+++ b/src/locales/en_GB/index.ts
@@ -6,6 +6,7 @@ import type { LocaleDefinition } from '../..';
 import cell_phone from './cell_phone';
 import internet from './internet';
 import location from './location';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_GB: LocaleDefinition = {
@@ -13,6 +14,7 @@ const en_GB: LocaleDefinition = {
   cell_phone,
   internet,
   location,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_GB/person/index.ts b/src/locales/en_GB/person/index.ts
new file mode 100644
index 00000000000..e76a78a79a8
--- /dev/null
+++ b/src/locales/en_GB/person/index.ts
@@ -0,0 +1,14 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+import type { PersonDefinitions } from '../../..';
+import last_name_patterns from './last_name_patterns';
+import name_ from './name';
+
+const person: PersonDefinitions = {
+  last_name_patterns,
+  name: name_,
+};
+
+export default person;
diff --git a/src/locales/en_GB/person/last_name_patterns.ts b/src/locales/en_GB/person/last_name_patterns.ts
new file mode 100644
index 00000000000..c5b25524b49
--- /dev/null
+++ b/src/locales/en_GB/person/last_name_patterns.ts
@@ -0,0 +1,4 @@
+export default [
+  { value: '{{person.last_name}}', weight: 9 },
+  { value: '{{person.last_name}}-{{person.last_name}}', weight: 1 },
+];
diff --git a/src/locales/en_GB/person/name.ts b/src/locales/en_GB/person/name.ts
new file mode 100644
index 00000000000..4bc2ba83ee4
--- /dev/null
+++ b/src/locales/en_GB/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  { value: '{{person.firstName}} {{person.lastName}}', weight: 7 },
+  {
+    value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}',
+    weight: 1,
+  },
+];
diff --git a/src/locales/en_GH/person/index.ts b/src/locales/en_GH/person/index.ts
index b0887ae5b87..89be81cc292 100644
--- a/src/locales/en_GH/person/index.ts
+++ b/src/locales/en_GH/person/index.ts
@@ -6,6 +6,7 @@ import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
+import last_name_patterns from './last_name_patterns';
 import male_first_name from './male_first_name';
 import name_ from './name';
 
@@ -13,6 +14,7 @@ const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
+  last_name_patterns,
   male_first_name,
   name: name_,
 };
diff --git a/src/locales/en_GH/person/last_name_patterns.ts b/src/locales/en_GH/person/last_name_patterns.ts
new file mode 100644
index 00000000000..3778cee9190
--- /dev/null
+++ b/src/locales/en_GH/person/last_name_patterns.ts
@@ -0,0 +1,4 @@
+export default [
+  { value: '{{person.last_name}}', weight: 1 },
+  { value: '{{person.last_name}}-{{person.last_name}}', weight: 1 },
+];
diff --git a/src/locales/en_GH/person/name.ts b/src/locales/en_GH/person/name.ts
index b0892e31545..3ed8a80c86e 100644
--- a/src/locales/en_GH/person/name.ts
+++ b/src/locales/en_GH/person/name.ts
@@ -1,7 +1,3 @@
 export default [
   { value: '{{person.firstName}} {{person.lastName}}', weight: 1 },
-  {
-    value: '{{person.firstName}} {{person.lastName}}-{{person.lastName}}',
-    weight: 1,
-  },
 ];
diff --git a/src/locales/en_NG/index.ts b/src/locales/en_NG/index.ts
index 91c1c64fa3e..249b287bf49 100644
--- a/src/locales/en_NG/index.ts
+++ b/src/locales/en_NG/index.ts
@@ -10,7 +10,7 @@ import person from './person';
 import phone_number from './phone_number';
 
 const en_NG: LocaleDefinition = {
-  title: 'Nigeria (English)',
+  title: 'English (Nigeria)',
   company,
   internet,
   location,
diff --git a/src/locales/es/person/index.ts b/src/locales/es/person/index.ts
index 45178928aae..96cc5d1e442 100644
--- a/src/locales/es/person/index.ts
+++ b/src/locales/es/person/index.ts
@@ -7,6 +7,7 @@ import female_first_name from './female_first_name';
 import female_prefix from './female_prefix';
 import first_name from './first_name';
 import last_name from './last_name';
+import last_name_patterns from './last_name_patterns';
 import male_first_name from './male_first_name';
 import male_prefix from './male_prefix';
 import name_ from './name';
@@ -19,6 +20,7 @@ const person: PersonDefinitions = {
   female_prefix,
   first_name,
   last_name,
+  last_name_patterns,
   male_first_name,
   male_prefix,
   name: name_,
diff --git a/src/locales/es/person/last_name_patterns.ts b/src/locales/es/person/last_name_patterns.ts
new file mode 100644
index 00000000000..4ba8e35fb2f
--- /dev/null
+++ b/src/locales/es/person/last_name_patterns.ts
@@ -0,0 +1,6 @@
+export default [
+  {
+    value: '{{person.last_name}} {{person.last_name}}',
+    weight: 1,
+  },
+];
diff --git a/src/locales/es/person/name.ts b/src/locales/es/person/name.ts
index 68a1d1f787b..5b10b8d7a73 100644
--- a/src/locales/es/person/name.ts
+++ b/src/locales/es/person/name.ts
@@ -1,11 +1,10 @@
 export default [
   {
-    value:
-      '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}',
+    value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}',
     weight: 1,
   },
   {
-    value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
+    value: '{{person.firstName}} {{person.lastName}}',
     weight: 9,
   },
 ];
diff --git a/src/locales/es_MX/company/bs_adjective.ts b/src/locales/es_MX/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/es_MX/company/bs_adjective.ts
rename to src/locales/es_MX/company/buzz_adjective.ts
diff --git a/src/locales/es_MX/company/bs_noun.ts b/src/locales/es_MX/company/buzz_noun.ts
similarity index 100%
rename from src/locales/es_MX/company/bs_noun.ts
rename to src/locales/es_MX/company/buzz_noun.ts
diff --git a/src/locales/es_MX/company/bs_verb.ts b/src/locales/es_MX/company/buzz_verb.ts
similarity index 100%
rename from src/locales/es_MX/company/bs_verb.ts
rename to src/locales/es_MX/company/buzz_verb.ts
diff --git a/src/locales/es_MX/company/index.ts b/src/locales/es_MX/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/es_MX/company/index.ts
+++ b/src/locales/es_MX/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/es_MX/person/index.ts b/src/locales/es_MX/person/index.ts
index 45178928aae..96cc5d1e442 100644
--- a/src/locales/es_MX/person/index.ts
+++ b/src/locales/es_MX/person/index.ts
@@ -7,6 +7,7 @@ import female_first_name from './female_first_name';
 import female_prefix from './female_prefix';
 import first_name from './first_name';
 import last_name from './last_name';
+import last_name_patterns from './last_name_patterns';
 import male_first_name from './male_first_name';
 import male_prefix from './male_prefix';
 import name_ from './name';
@@ -19,6 +20,7 @@ const person: PersonDefinitions = {
   female_prefix,
   first_name,
   last_name,
+  last_name_patterns,
   male_first_name,
   male_prefix,
   name: name_,
diff --git a/src/locales/es_MX/person/last_name_patterns.ts b/src/locales/es_MX/person/last_name_patterns.ts
new file mode 100644
index 00000000000..a67c682b7e6
--- /dev/null
+++ b/src/locales/es_MX/person/last_name_patterns.ts
@@ -0,0 +1,10 @@
+export default [
+  {
+    value: '{{person.last_name}} {{person.last_name}}',
+    weight: 5,
+  },
+  {
+    value: '{{person.last_name}} de {{person.last_name}}',
+    weight: 1,
+  },
+];
diff --git a/src/locales/es_MX/person/name.ts b/src/locales/es_MX/person/name.ts
index 7253fc0f04e..011fdfe6282 100644
--- a/src/locales/es_MX/person/name.ts
+++ b/src/locales/es_MX/person/name.ts
@@ -1,20 +1,14 @@
 export default [
   {
-    value:
-      '{{person.prefix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}',
+    value: '{{person.prefix}} {{person.firstName}} {{person.lastName}}',
     weight: 1,
   },
   {
-    value: '{{person.firstName}} {{person.lastName}} de {{person.lastName}}',
-    weight: 3,
+    value: '{{person.firstName}} {{person.lastName}}',
+    weight: 8,
   },
   {
-    value:
-      '{{person.suffix}} {{person.firstName}} {{person.lastName}} {{person.lastName}}',
+    value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}',
     weight: 1,
   },
-  {
-    value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
-    weight: 5,
-  },
 ];
diff --git a/src/locales/fa/company/bs_adjective.ts b/src/locales/fa/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/fa/company/bs_adjective.ts
rename to src/locales/fa/company/buzz_adjective.ts
diff --git a/src/locales/fa/company/bs_noun.ts b/src/locales/fa/company/buzz_noun.ts
similarity index 100%
rename from src/locales/fa/company/bs_noun.ts
rename to src/locales/fa/company/buzz_noun.ts
diff --git a/src/locales/fa/company/bs_verb.ts b/src/locales/fa/company/buzz_verb.ts
similarity index 100%
rename from src/locales/fa/company/bs_verb.ts
rename to src/locales/fa/company/buzz_verb.ts
diff --git a/src/locales/fa/company/index.ts b/src/locales/fa/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/fa/company/index.ts
+++ b/src/locales/fa/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/fa/date/month.ts b/src/locales/fa/date/month.ts
index 7faa95d3023..249d5ec2cda 100644
--- a/src/locales/fa/date/month.ts
+++ b/src/locales/fa/date/month.ts
@@ -13,20 +13,7 @@ export default {
     'بهمن',
     'اسفند',
   ],
-  wide_context: [
-    'فروردین',
-    'اردیبهشت',
-    'خرداد',
-    'تیر',
-    'مرداد',
-    'شهریور',
-    'مهر',
-    'آبان',
-    'آذر',
-    'دی',
-    'بهمن',
-    'اسفند',
-  ],
+
   abbr: [
     'فرو',
     'ارد',
@@ -41,18 +28,4 @@ export default {
     'بهم',
     'اسف',
   ],
-  abbr_context: [
-    'فرو',
-    'ارد',
-    'خرد',
-    'تیر',
-    'مرد',
-    'شهر',
-    'مهر',
-    'آبا',
-    'آذر',
-    'دی',
-    'بهم',
-    'اسف',
-  ],
 };
diff --git a/src/locales/fa/date/weekday.ts b/src/locales/fa/date/weekday.ts
index c30f688462b..a8427b52642 100644
--- a/src/locales/fa/date/weekday.ts
+++ b/src/locales/fa/date/weekday.ts
@@ -1,14 +1,5 @@
 export default {
   wide: ['شنبه', 'یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پتچشنبه', 'جمعه'],
-  wide_context: [
-    'شنبه',
-    'یکشنبه',
-    'دوشنبه',
-    'سه شنبه',
-    'چهارشنبه',
-    'پتچشنبه',
-    'جمعه',
-  ],
+
   abbr: ['ش', 'ی', 'د', 'س', 'چ', 'پ', 'ج'],
-  abbr_context: ['ش', 'ی', 'د', 'س', 'چ', 'پ', 'ج'],
 };
diff --git a/src/locales/fa/finance/currency.ts b/src/locales/fa/finance/currency.ts
index b9633a38ee5..0d11129ae4c 100644
--- a/src/locales/fa/finance/currency.ts
+++ b/src/locales/fa/finance/currency.ts
@@ -1,110 +1,137 @@
-export default {
-  'درهم امارات': {
+export default [
+  {
+    name: 'درهم امارات',
     code: 'AED',
     symbol: '',
   },
-  افغانی: {
+  {
+    name: 'افغانی',
     code: 'AFN',
     symbol: '؋',
   },
-  'پزو آرژانتین': {
+  {
+    name: 'پزو آرژانتین',
     code: 'ARS',
     symbol: '$',
   },
-  'دلار استرالیا': {
+  {
+    name: 'دلار استرالیا',
     code: 'AUD',
     symbol: '$',
   },
-  'مانات آذربایجان': {
+  {
+    name: 'مانات آذربایجان',
     code: 'AZN',
     symbol: 'ман',
   },
-  'دلار کانادا': {
+  {
+    name: 'دلار کانادا',
     code: 'CAD',
     symbol: '$',
   },
-  'فرانک سوئیس': {
+  {
+    name: 'فرانک سوئیس',
     code: 'CHF',
     symbol: 'CHF',
   },
-  'کرون چک': {
+  {
+    name: 'کرون چک',
     code: 'CZK',
     symbol: 'Kč',
   },
-  کرون: {
+  {
+    name: 'کرون',
     code: 'EEK',
     symbol: '',
   },
-  'دینار عراق': {
+  {
+    name: 'دینار عراق',
     code: 'IQD',
     symbol: '',
   },
-  'ریال ایران': {
+  {
+    name: 'ریال ایران',
     code: 'IRR',
     symbol: '﷼',
   },
-  'کرون ایسلند': {
+  {
+    name: 'کرون ایسلند',
     code: 'ISK',
     symbol: 'kr',
   },
-  'دینار اردن': {
+  {
+    name: 'دینار اردن',
     code: 'JOD',
     symbol: '',
   },
-  ین: {
+  {
+    name: 'ین',
     code: 'JPY',
     symbol: '¥',
   },
-  'دینار کویت': {
+  {
+    name: 'دینار کویت',
     code: 'KWD',
     symbol: '',
   },
-  'دینار لیبی': {
+  {
+    name: 'دینار لیبی',
     code: 'LYD',
     symbol: '',
   },
-  'درهم مراکش': {
+  {
+    name: 'درهم مراکش',
     code: 'MAD',
     symbol: '',
   },
-  'روپی نپال': {
+  {
+    name: 'روپی نپال',
     code: 'NPR',
     symbol: '₨',
   },
-  'ریال عمان': {
+  {
+    name: 'ریال عمان',
     code: 'OMR',
     symbol: '﷼',
   },
-  'پزو فیلیپین': {
+  {
+    name: 'پزو فیلیپین',
     code: 'PHP',
     symbol: 'Php',
   },
-  'روپی پاکستان': {
+  {
+    name: 'روپی پاکستان',
     code: 'PKR',
     symbol: '₨',
   },
-  'ریال قطر': {
+  {
+    name: 'ریال قطر',
     code: 'QAR',
     symbol: '﷼',
   },
-  'روبل روسیه': {
+  {
+    name: 'روبل روسیه',
     code: 'RUB',
     symbol: 'руб',
   },
-  'ریال عربستان': {
+  {
+    name: 'ریال عربستان',
     code: 'SAR',
     symbol: '﷼',
   },
-  'پوند سودان': {
+  {
+    name: 'پوند سودان',
     code: 'SDG',
     symbol: '',
   },
-  'کرون سوئد': {
+  {
+    name: 'کرون سوئد',
     code: 'SEK',
     symbol: 'kr',
   },
-  'دلار سنگاپور': {
+  {
+    name: 'دلار سنگاپور',
     code: 'SGD',
     symbol: '$',
   },
-};
+];
diff --git a/src/locales/fr/company/bs_adjective.ts b/src/locales/fr/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/fr/company/bs_adjective.ts
rename to src/locales/fr/company/buzz_adjective.ts
diff --git a/src/locales/fr/company/bs_noun.ts b/src/locales/fr/company/buzz_noun.ts
similarity index 100%
rename from src/locales/fr/company/bs_noun.ts
rename to src/locales/fr/company/buzz_noun.ts
diff --git a/src/locales/fr/company/bs_verb.ts b/src/locales/fr/company/buzz_verb.ts
similarity index 100%
rename from src/locales/fr/company/bs_verb.ts
rename to src/locales/fr/company/buzz_verb.ts
diff --git a/src/locales/fr/company/index.ts b/src/locales/fr/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/fr/company/index.ts
+++ b/src/locales/fr/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/fr/date/month.ts b/src/locales/fr/date/month.ts
index 7edba9e8ea1..a3d77d291a5 100644
--- a/src/locales/fr/date/month.ts
+++ b/src/locales/fr/date/month.ts
@@ -43,20 +43,4 @@ export default {
     'nov.',
     'déc.',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'janv.',
-    'févr.',
-    'mars',
-    'avril',
-    'mai',
-    'juin',
-    'juil.',
-    'août',
-    'sept.',
-    'oct.',
-    'nov.',
-    'déc.',
-  ],
 };
diff --git a/src/locales/fr/finance/currency.ts b/src/locales/fr/finance/currency.ts
index 8bfb36707a1..dea5757cf72 100644
--- a/src/locales/fr/finance/currency.ts
+++ b/src/locales/fr/finance/currency.ts
@@ -1,346 +1,432 @@
-export default {
-  Dollar: {
-    symbol: '$',
+export default [
+  {
+    name: 'Dollar',
     code: 'USD',
-  },
-  'Dollar canadien': {
     symbol: '$',
-    code: 'CAD',
   },
-  'Peso mexicain': {
+  {
+    name: 'Dollar canadien',
+    code: 'CAD',
     symbol: '$',
+  },
+  {
+    name: 'Peso mexicain',
     code: 'MXN',
+    symbol: '$',
   },
-  Florin: {
-    symbol: 'ƒ',
+  {
+    name: 'Florin',
     code: 'AWG',
+    symbol: 'ƒ',
   },
-  'Baisse du dollar': {
-    symbol: '$',
+  {
+    name: 'Baisse du dollar',
     code: 'BBD',
-  },
-  'Dollar bermudien': {
     symbol: '$',
-    code: 'BMD',
   },
-  'Dollar des Bahamas': {
+  {
+    name: 'Dollar bermudien',
+    code: 'BMD',
     symbol: '$',
-    code: 'BSD',
   },
-  'Peso dominicain': {
+  {
+    name: 'Dollar des Bahamas',
+    code: 'BSD',
     symbol: '$',
-    code: 'DOP',
   },
-  'Dollar jamaïcain': {
+  {
+    name: 'Peso dominicain',
+    code: 'DOP',
     symbol: '$',
+  },
+  {
+    name: 'Dollar jamaïcain',
     code: 'JMD',
+    symbol: '$',
   },
-  'Quetzal guatémaltèque': {
-    symbol: 'Q',
+  {
+    name: 'Quetzal guatémaltèque',
     code: 'GTQ',
+    symbol: 'Q',
   },
-  'Balboa panaméen': {
-    symbol: 'B/.',
+  {
+    name: 'Balboa panaméen',
     code: 'PAB',
+    symbol: 'B/.',
   },
-  'Dollar des Caraïbes': {
-    symbol: '$',
+  {
+    name: 'Dollar des Caraïbes',
     code: 'XCD',
+    symbol: '$',
   },
-  euro: {
-    symbol: '€',
+  {
+    name: 'euro',
     code: 'EUR',
+    symbol: '€',
   },
-  'Livre sterling': {
-    symbol: '£',
+  {
+    name: 'Livre sterling',
     code: 'GBP',
+    symbol: '£',
   },
-  'Course géorgienne': {
-    symbol: '₾',
+  {
+    name: 'Course géorgienne',
     code: 'GEL',
+    symbol: '₾',
   },
-  'Lev bulgare': {
-    symbol: 'лв',
+  {
+    name: 'Lev bulgare',
     code: 'BGN',
+    symbol: 'лв',
   },
-  'Franc suisse': {
-    symbol: 'CHF',
+  {
+    name: 'Franc suisse',
     code: 'CHF',
+    symbol: 'CHF',
   },
-  'Couronne danoise': {
-    symbol: 'kr',
+  {
+    name: 'Couronne danoise',
     code: 'DKK',
+    symbol: 'kr',
   },
-  'République tchèque Couronne': {
-    symbol: 'Kč',
+  {
+    name: 'République tchèque Couronne',
     code: 'CZK',
+    symbol: 'Kč',
   },
-  'Kuna croate': {
-    symbol: 'kn',
+  {
+    name: 'Kuna croate',
     code: 'HRK',
+    symbol: 'kn',
   },
-  'Forint hongrois': {
-    symbol: 'ft',
+  {
+    name: 'Forint hongrois',
     code: 'HUF',
+    symbol: 'ft',
   },
-  'couronne norvégienne': {
-    symbol: 'kr',
+  {
+    name: 'couronne norvégienne',
     code: 'NOK',
+    symbol: 'kr',
   },
-  'Rouble russe': {
-    symbol: '₽',
+  {
+    name: 'Rouble russe',
     code: 'RUB',
+    symbol: '₽',
   },
-  'Zloty polonais': {
-    symbol: 'zł',
+  {
+    name: 'Zloty polonais',
     code: 'PLN',
+    symbol: 'zł',
   },
-  'Leu roumain': {
-    symbol: 'lei',
+  {
+    name: 'Leu roumain',
     code: 'RON',
+    symbol: 'lei',
   },
-  'couronne suédoise': {
-    symbol: 'kr',
+  {
+    name: 'couronne suédoise',
     code: 'SEK',
+    symbol: 'kr',
   },
-  'Hryvnia ukrainienne': {
-    symbol: '₴',
+  {
+    name: 'Hryvnia ukrainienne',
     code: 'UAH',
+    symbol: '₴',
   },
-  'lire turque': {
-    symbol: '₺',
+  {
+    name: 'lire turque',
     code: 'TRY',
+    symbol: '₺',
   },
-  'Argentine Peso': {
-    symbol: '$',
+  {
+    name: 'Argentine Peso',
     code: 'ARS',
+    symbol: '$',
   },
-  'Bolivien bolivien': {
-    symbol: 'Bs.',
+  {
+    name: 'Bolivien bolivien',
     code: 'BOB',
+    symbol: 'Bs.',
   },
-  'Real brésilien': {
-    symbol: 'R$',
+  {
+    name: 'Real brésilien',
     code: 'BRL',
+    symbol: 'R$',
   },
-  'Peso chilien': {
-    symbol: '$',
+  {
+    name: 'Peso chilien',
     code: 'CLP',
-  },
-  'Peso colombien': {
     symbol: '$',
+  },
+  {
+    name: 'Peso colombien',
     code: 'COP',
+    symbol: '$',
   },
-  'Nouveau Sol Péruvien': {
-    symbol: 'S/.',
+  {
+    name: 'Nouveau Sol Péruvien',
     code: 'PEN',
+    symbol: 'S/.',
   },
-  'Guarani paraguayen': {
-    symbol: '₲',
+  {
+    name: 'Guarani paraguayen',
     code: 'PYG',
+    symbol: '₲',
   },
-  'Peso uruguayen': {
-    symbol: '$',
+  {
+    name: 'Peso uruguayen',
     code: 'UYU',
+    symbol: '$',
   },
-  'Bolivar vénézuélien': {
-    symbol: 'Bs.',
+  {
+    name: 'Bolivar vénézuélien',
     code: 'VES',
+    symbol: 'Bs.',
   },
-  'Yen japonais': {
-    symbol: '¥',
+  {
+    name: 'Yen japonais',
     code: 'JPY',
+    symbol: '¥',
   },
-  'Bangladesh Taka': {
-    symbol: '৳',
+  {
+    name: 'Bangladesh Taka',
     code: 'BDT',
+    symbol: '৳',
   },
-  'Le yuan chinois': {
-    symbol: '¥',
+  {
+    name: 'Le yuan chinois',
     code: 'CNY',
+    symbol: '¥',
   },
-  'Dollar de Hong Kong': {
-    symbol: '$',
+  {
+    name: 'Dollar de Hong Kong',
     code: 'HKD',
+    symbol: '$',
   },
-  'Roupie indienne': {
-    symbol: '₹',
+  {
+    name: 'Roupie indienne',
     code: 'INR',
+    symbol: '₹',
   },
-  'Riel cambodgien': {
-    symbol: '៛',
+  {
+    name: 'Riel cambodgien',
     code: 'KHR',
+    symbol: '៛',
   },
-  Poulet: {
-    symbol: '₭',
+  {
+    name: 'Poulet',
     code: 'LAK',
+    symbol: '₭',
   },
-  'Roupie sri lankaise': {
-    symbol: 'රු',
+  {
+    name: 'Roupie sri lankaise',
     code: 'LKR',
+    symbol: 'රු',
   },
-  Rufiyaa: {
-    symbol: '.ރ',
+  {
+    name: 'Rufiyaa',
     code: 'MVR',
+    symbol: '.ރ',
   },
-  'cloche malaisienne': {
-    symbol: 'RM',
+  {
+    name: 'cloche malaisienne',
     code: 'MYR',
+    symbol: 'RM',
   },
-  'Roupie népalaise': {
-    symbol: 'रू',
+  {
+    name: 'Roupie népalaise',
     code: 'NPR',
+    symbol: 'रू',
   },
-  'Peso philippin': {
-    symbol: '₱',
+  {
+    name: 'Peso philippin',
     code: 'PHP',
+    symbol: '₱',
   },
-  'Roupie pakistanaise': {
-    symbol: '₨',
+  {
+    name: 'Roupie pakistanaise',
     code: 'PKR',
+    symbol: '₨',
   },
-  'Dollar de Singapour': {
-    symbol: '$',
+  {
+    name: 'Dollar de Singapour',
     code: 'SGD',
+    symbol: '$',
   },
-  'Baht thaïlandais': {
-    symbol: '฿',
+  {
+    name: 'Baht thaïlandais',
     code: 'THB',
+    symbol: '฿',
   },
-  'Nouveau dollar de Taïwan': {
-    symbol: '$',
+  {
+    name: 'Nouveau dollar de Taïwan',
     code: 'TWD',
+    symbol: '$',
   },
-  'Dong vietnamien': {
-    symbol: '₫',
+  {
+    name: 'Dong vietnamien',
     code: 'VND',
+    symbol: '₫',
   },
-  'Dollar australien': {
-    symbol: '$',
+  {
+    name: 'Dollar australien',
     code: 'AUD',
-  },
-  'Dollar fidjien': {
     symbol: '$',
-    code: 'FJD',
   },
-  'Dollar néo-zélandais': {
+  {
+    name: 'Dollar fidjien',
+    code: 'FJD',
     symbol: '$',
+  },
+  {
+    name: 'Dollar néo-zélandais',
     code: 'NZD',
+    symbol: '$',
   },
-  'Franc CFP': {
-    symbol: '₣',
+  {
+    name: 'Franc CFP',
     code: 'XPF',
+    symbol: '₣',
   },
-  'Livre égyptienne': {
-    symbol: '£',
+  {
+    name: 'Livre égyptienne',
     code: 'EGP',
+    symbol: '£',
   },
-  'Cédi ghanéen': {
-    symbol: '₵',
+  {
+    name: 'Cédi ghanéen',
     code: 'GHS',
+    symbol: '₵',
   },
-  Dalasi: {
-    symbol: 'D',
+  {
+    name: 'Dalasi',
     code: 'GMD',
+    symbol: 'D',
   },
-  'Shilling kenyan': {
-    symbol: 'Sh',
+  {
+    name: 'Shilling kenyan',
     code: 'KES',
+    symbol: 'Sh',
   },
-  'Dirham marocain': {
-    symbol: 'DH',
+  {
+    name: 'Dirham marocain',
     code: 'MAD',
+    symbol: 'DH',
   },
-  'Ariary malgache': {
-    symbol: 'Ar',
+  {
+    name: 'Ariary malgache',
     code: 'MGA',
+    symbol: 'Ar',
   },
-  'Roupie mauricienne': {
-    symbol: '₨',
+  {
+    name: 'Roupie mauricienne',
     code: 'MUR',
+    symbol: '₨',
   },
-  'Dollar namibien': {
-    symbol: '$',
+  {
+    name: 'Dollar namibien',
     code: 'NAD',
+    symbol: '$',
   },
-  'Naira nigérian': {
-    symbol: '₦',
+  {
+    name: 'Naira nigérian',
     code: 'NGN',
+    symbol: '₦',
   },
-  Roupie: {
-    symbol: '₨',
+  {
+    name: 'Roupie',
     code: 'SCR',
+    symbol: '₨',
   },
-  'Dinar tunisien': {
-    symbol: 'DT',
+  {
+    name: 'Dinar tunisien',
     code: 'TND',
+    symbol: 'DT',
   },
-  'Shilling ougandais': {
-    symbol: 'Sh',
+  {
+    name: 'Shilling ougandais',
     code: 'UGX',
+    symbol: 'Sh',
   },
-  'CFA Franc BEAC': {
-    symbol: 'Fr',
+  {
+    name: 'CFA Franc BEAC',
     code: 'XAF',
-  },
-  'CFA Franc BCEAO': {
     symbol: 'Fr',
+  },
+  {
+    name: 'CFA Franc BCEAO',
     code: 'XOF',
+    symbol: 'Fr',
   },
-  'Rand sud-africain': {
-    symbol: 'Br',
+  {
+    name: 'Rand sud-africain',
     code: 'ZAR',
+    symbol: 'Br',
   },
-  'Dirham des Émirats arabes unis': {
-    symbol: 'د.إ',
+  {
+    name: 'Dirham des Émirats arabes unis',
     code: 'AED',
+    symbol: 'د.إ',
   },
-  'Nouveau Shekel israélien': {
-    symbol: '₪',
+  {
+    name: 'Nouveau Shekel israélien',
     code: 'ILS',
+    symbol: '₪',
   },
-  'Livre syrienne': {
-    symbol: '£',
+  {
+    name: 'Livre syrienne',
     code: 'SYP',
+    symbol: '£',
   },
-  'Dinar jordanien': {
-    symbol: 'د.ا',
+  {
+    name: 'Dinar jordanien',
     code: 'JOD',
+    symbol: 'د.ا',
   },
-  'Dinar koweïtien': {
-    symbol: 'د.ك',
+  {
+    name: 'Dinar koweïtien',
     code: 'KWD',
+    symbol: 'د.ك',
   },
-  'Livre libanaise': {
-    symbol: 'ل.ل',
+  {
+    name: 'Livre libanaise',
     code: 'LBP',
+    symbol: 'ل.ل',
   },
-  'Rial omanais': {
-    symbol: 'ر.ع.',
+  {
+    name: 'Rial omanais',
     code: 'OMR',
+    symbol: 'ر.ع.',
   },
-  'Rial qatari': {
-    symbol: 'ر.ق',
+  {
+    name: 'Rial qatari',
     code: 'QAR',
+    symbol: 'ر.ق',
   },
-  'Riyal saoudien': {
-    symbol: '',
+  {
+    name: 'Riyal saoudien',
     code: 'SAR',
+    symbol: '',
   },
-  Bitcoin: {
-    symbol: '₿',
+  {
+    name: 'Bitcoin',
     code: 'BTC',
+    symbol: '₿',
   },
-  Ethereum: {
-    symbol: 'Ξ',
+  {
+    name: 'Ethereum',
     code: 'ETH',
+    symbol: 'Ξ',
   },
-  Litecoin: {
-    symbol: 'Ł',
+  {
+    name: 'Litecoin',
     code: 'LTC',
+    symbol: 'Ł',
   },
-  Ripples: {
-    symbol: 'XRP',
+  {
+    name: 'Ripples',
     code: 'XRP',
+    symbol: 'XRP',
   },
-};
+];
diff --git a/src/locales/fr_BE/index.ts b/src/locales/fr_BE/index.ts
index cfbcf64bec2..927ba711fcb 100644
--- a/src/locales/fr_BE/index.ts
+++ b/src/locales/fr_BE/index.ts
@@ -10,7 +10,7 @@ import person from './person';
 import phone_number from './phone_number';
 
 const fr_BE: LocaleDefinition = {
-  title: 'Français (Belgique)',
+  title: 'French (Belgium)',
   cell_phone,
   internet,
   location,
diff --git a/src/locales/fr_CH/date/month.ts b/src/locales/fr_CH/date/month.ts
index 7edba9e8ea1..a3d77d291a5 100644
--- a/src/locales/fr_CH/date/month.ts
+++ b/src/locales/fr_CH/date/month.ts
@@ -43,20 +43,4 @@ export default {
     'nov.',
     'déc.',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'janv.',
-    'févr.',
-    'mars',
-    'avril',
-    'mai',
-    'juin',
-    'juil.',
-    'août',
-    'sept.',
-    'oct.',
-    'nov.',
-    'déc.',
-  ],
 };
diff --git a/src/locales/fr_CH/finance/currency.ts b/src/locales/fr_CH/finance/currency.ts
index 8bfb36707a1..dea5757cf72 100644
--- a/src/locales/fr_CH/finance/currency.ts
+++ b/src/locales/fr_CH/finance/currency.ts
@@ -1,346 +1,432 @@
-export default {
-  Dollar: {
-    symbol: '$',
+export default [
+  {
+    name: 'Dollar',
     code: 'USD',
-  },
-  'Dollar canadien': {
     symbol: '$',
-    code: 'CAD',
   },
-  'Peso mexicain': {
+  {
+    name: 'Dollar canadien',
+    code: 'CAD',
     symbol: '$',
+  },
+  {
+    name: 'Peso mexicain',
     code: 'MXN',
+    symbol: '$',
   },
-  Florin: {
-    symbol: 'ƒ',
+  {
+    name: 'Florin',
     code: 'AWG',
+    symbol: 'ƒ',
   },
-  'Baisse du dollar': {
-    symbol: '$',
+  {
+    name: 'Baisse du dollar',
     code: 'BBD',
-  },
-  'Dollar bermudien': {
     symbol: '$',
-    code: 'BMD',
   },
-  'Dollar des Bahamas': {
+  {
+    name: 'Dollar bermudien',
+    code: 'BMD',
     symbol: '$',
-    code: 'BSD',
   },
-  'Peso dominicain': {
+  {
+    name: 'Dollar des Bahamas',
+    code: 'BSD',
     symbol: '$',
-    code: 'DOP',
   },
-  'Dollar jamaïcain': {
+  {
+    name: 'Peso dominicain',
+    code: 'DOP',
     symbol: '$',
+  },
+  {
+    name: 'Dollar jamaïcain',
     code: 'JMD',
+    symbol: '$',
   },
-  'Quetzal guatémaltèque': {
-    symbol: 'Q',
+  {
+    name: 'Quetzal guatémaltèque',
     code: 'GTQ',
+    symbol: 'Q',
   },
-  'Balboa panaméen': {
-    symbol: 'B/.',
+  {
+    name: 'Balboa panaméen',
     code: 'PAB',
+    symbol: 'B/.',
   },
-  'Dollar des Caraïbes': {
-    symbol: '$',
+  {
+    name: 'Dollar des Caraïbes',
     code: 'XCD',
+    symbol: '$',
   },
-  euro: {
-    symbol: '€',
+  {
+    name: 'euro',
     code: 'EUR',
+    symbol: '€',
   },
-  'Livre sterling': {
-    symbol: '£',
+  {
+    name: 'Livre sterling',
     code: 'GBP',
+    symbol: '£',
   },
-  'Course géorgienne': {
-    symbol: '₾',
+  {
+    name: 'Course géorgienne',
     code: 'GEL',
+    symbol: '₾',
   },
-  'Lev bulgare': {
-    symbol: 'лв',
+  {
+    name: 'Lev bulgare',
     code: 'BGN',
+    symbol: 'лв',
   },
-  'Franc suisse': {
-    symbol: 'CHF',
+  {
+    name: 'Franc suisse',
     code: 'CHF',
+    symbol: 'CHF',
   },
-  'Couronne danoise': {
-    symbol: 'kr',
+  {
+    name: 'Couronne danoise',
     code: 'DKK',
+    symbol: 'kr',
   },
-  'République tchèque Couronne': {
-    symbol: 'Kč',
+  {
+    name: 'République tchèque Couronne',
     code: 'CZK',
+    symbol: 'Kč',
   },
-  'Kuna croate': {
-    symbol: 'kn',
+  {
+    name: 'Kuna croate',
     code: 'HRK',
+    symbol: 'kn',
   },
-  'Forint hongrois': {
-    symbol: 'ft',
+  {
+    name: 'Forint hongrois',
     code: 'HUF',
+    symbol: 'ft',
   },
-  'couronne norvégienne': {
-    symbol: 'kr',
+  {
+    name: 'couronne norvégienne',
     code: 'NOK',
+    symbol: 'kr',
   },
-  'Rouble russe': {
-    symbol: '₽',
+  {
+    name: 'Rouble russe',
     code: 'RUB',
+    symbol: '₽',
   },
-  'Zloty polonais': {
-    symbol: 'zł',
+  {
+    name: 'Zloty polonais',
     code: 'PLN',
+    symbol: 'zł',
   },
-  'Leu roumain': {
-    symbol: 'lei',
+  {
+    name: 'Leu roumain',
     code: 'RON',
+    symbol: 'lei',
   },
-  'couronne suédoise': {
-    symbol: 'kr',
+  {
+    name: 'couronne suédoise',
     code: 'SEK',
+    symbol: 'kr',
   },
-  'Hryvnia ukrainienne': {
-    symbol: '₴',
+  {
+    name: 'Hryvnia ukrainienne',
     code: 'UAH',
+    symbol: '₴',
   },
-  'lire turque': {
-    symbol: '₺',
+  {
+    name: 'lire turque',
     code: 'TRY',
+    symbol: '₺',
   },
-  'Argentine Peso': {
-    symbol: '$',
+  {
+    name: 'Argentine Peso',
     code: 'ARS',
+    symbol: '$',
   },
-  'Bolivien bolivien': {
-    symbol: 'Bs.',
+  {
+    name: 'Bolivien bolivien',
     code: 'BOB',
+    symbol: 'Bs.',
   },
-  'Real brésilien': {
-    symbol: 'R$',
+  {
+    name: 'Real brésilien',
     code: 'BRL',
+    symbol: 'R$',
   },
-  'Peso chilien': {
-    symbol: '$',
+  {
+    name: 'Peso chilien',
     code: 'CLP',
-  },
-  'Peso colombien': {
     symbol: '$',
+  },
+  {
+    name: 'Peso colombien',
     code: 'COP',
+    symbol: '$',
   },
-  'Nouveau Sol Péruvien': {
-    symbol: 'S/.',
+  {
+    name: 'Nouveau Sol Péruvien',
     code: 'PEN',
+    symbol: 'S/.',
   },
-  'Guarani paraguayen': {
-    symbol: '₲',
+  {
+    name: 'Guarani paraguayen',
     code: 'PYG',
+    symbol: '₲',
   },
-  'Peso uruguayen': {
-    symbol: '$',
+  {
+    name: 'Peso uruguayen',
     code: 'UYU',
+    symbol: '$',
   },
-  'Bolivar vénézuélien': {
-    symbol: 'Bs.',
+  {
+    name: 'Bolivar vénézuélien',
     code: 'VES',
+    symbol: 'Bs.',
   },
-  'Yen japonais': {
-    symbol: '¥',
+  {
+    name: 'Yen japonais',
     code: 'JPY',
+    symbol: '¥',
   },
-  'Bangladesh Taka': {
-    symbol: '৳',
+  {
+    name: 'Bangladesh Taka',
     code: 'BDT',
+    symbol: '৳',
   },
-  'Le yuan chinois': {
-    symbol: '¥',
+  {
+    name: 'Le yuan chinois',
     code: 'CNY',
+    symbol: '¥',
   },
-  'Dollar de Hong Kong': {
-    symbol: '$',
+  {
+    name: 'Dollar de Hong Kong',
     code: 'HKD',
+    symbol: '$',
   },
-  'Roupie indienne': {
-    symbol: '₹',
+  {
+    name: 'Roupie indienne',
     code: 'INR',
+    symbol: '₹',
   },
-  'Riel cambodgien': {
-    symbol: '៛',
+  {
+    name: 'Riel cambodgien',
     code: 'KHR',
+    symbol: '៛',
   },
-  Poulet: {
-    symbol: '₭',
+  {
+    name: 'Poulet',
     code: 'LAK',
+    symbol: '₭',
   },
-  'Roupie sri lankaise': {
-    symbol: 'රු',
+  {
+    name: 'Roupie sri lankaise',
     code: 'LKR',
+    symbol: 'රු',
   },
-  Rufiyaa: {
-    symbol: '.ރ',
+  {
+    name: 'Rufiyaa',
     code: 'MVR',
+    symbol: '.ރ',
   },
-  'cloche malaisienne': {
-    symbol: 'RM',
+  {
+    name: 'cloche malaisienne',
     code: 'MYR',
+    symbol: 'RM',
   },
-  'Roupie népalaise': {
-    symbol: 'रू',
+  {
+    name: 'Roupie népalaise',
     code: 'NPR',
+    symbol: 'रू',
   },
-  'Peso philippin': {
-    symbol: '₱',
+  {
+    name: 'Peso philippin',
     code: 'PHP',
+    symbol: '₱',
   },
-  'Roupie pakistanaise': {
-    symbol: '₨',
+  {
+    name: 'Roupie pakistanaise',
     code: 'PKR',
+    symbol: '₨',
   },
-  'Dollar de Singapour': {
-    symbol: '$',
+  {
+    name: 'Dollar de Singapour',
     code: 'SGD',
+    symbol: '$',
   },
-  'Baht thaïlandais': {
-    symbol: '฿',
+  {
+    name: 'Baht thaïlandais',
     code: 'THB',
+    symbol: '฿',
   },
-  'Nouveau dollar de Taïwan': {
-    symbol: '$',
+  {
+    name: 'Nouveau dollar de Taïwan',
     code: 'TWD',
+    symbol: '$',
   },
-  'Dong vietnamien': {
-    symbol: '₫',
+  {
+    name: 'Dong vietnamien',
     code: 'VND',
+    symbol: '₫',
   },
-  'Dollar australien': {
-    symbol: '$',
+  {
+    name: 'Dollar australien',
     code: 'AUD',
-  },
-  'Dollar fidjien': {
     symbol: '$',
-    code: 'FJD',
   },
-  'Dollar néo-zélandais': {
+  {
+    name: 'Dollar fidjien',
+    code: 'FJD',
     symbol: '$',
+  },
+  {
+    name: 'Dollar néo-zélandais',
     code: 'NZD',
+    symbol: '$',
   },
-  'Franc CFP': {
-    symbol: '₣',
+  {
+    name: 'Franc CFP',
     code: 'XPF',
+    symbol: '₣',
   },
-  'Livre égyptienne': {
-    symbol: '£',
+  {
+    name: 'Livre égyptienne',
     code: 'EGP',
+    symbol: '£',
   },
-  'Cédi ghanéen': {
-    symbol: '₵',
+  {
+    name: 'Cédi ghanéen',
     code: 'GHS',
+    symbol: '₵',
   },
-  Dalasi: {
-    symbol: 'D',
+  {
+    name: 'Dalasi',
     code: 'GMD',
+    symbol: 'D',
   },
-  'Shilling kenyan': {
-    symbol: 'Sh',
+  {
+    name: 'Shilling kenyan',
     code: 'KES',
+    symbol: 'Sh',
   },
-  'Dirham marocain': {
-    symbol: 'DH',
+  {
+    name: 'Dirham marocain',
     code: 'MAD',
+    symbol: 'DH',
   },
-  'Ariary malgache': {
-    symbol: 'Ar',
+  {
+    name: 'Ariary malgache',
     code: 'MGA',
+    symbol: 'Ar',
   },
-  'Roupie mauricienne': {
-    symbol: '₨',
+  {
+    name: 'Roupie mauricienne',
     code: 'MUR',
+    symbol: '₨',
   },
-  'Dollar namibien': {
-    symbol: '$',
+  {
+    name: 'Dollar namibien',
     code: 'NAD',
+    symbol: '$',
   },
-  'Naira nigérian': {
-    symbol: '₦',
+  {
+    name: 'Naira nigérian',
     code: 'NGN',
+    symbol: '₦',
   },
-  Roupie: {
-    symbol: '₨',
+  {
+    name: 'Roupie',
     code: 'SCR',
+    symbol: '₨',
   },
-  'Dinar tunisien': {
-    symbol: 'DT',
+  {
+    name: 'Dinar tunisien',
     code: 'TND',
+    symbol: 'DT',
   },
-  'Shilling ougandais': {
-    symbol: 'Sh',
+  {
+    name: 'Shilling ougandais',
     code: 'UGX',
+    symbol: 'Sh',
   },
-  'CFA Franc BEAC': {
-    symbol: 'Fr',
+  {
+    name: 'CFA Franc BEAC',
     code: 'XAF',
-  },
-  'CFA Franc BCEAO': {
     symbol: 'Fr',
+  },
+  {
+    name: 'CFA Franc BCEAO',
     code: 'XOF',
+    symbol: 'Fr',
   },
-  'Rand sud-africain': {
-    symbol: 'Br',
+  {
+    name: 'Rand sud-africain',
     code: 'ZAR',
+    symbol: 'Br',
   },
-  'Dirham des Émirats arabes unis': {
-    symbol: 'د.إ',
+  {
+    name: 'Dirham des Émirats arabes unis',
     code: 'AED',
+    symbol: 'د.إ',
   },
-  'Nouveau Shekel israélien': {
-    symbol: '₪',
+  {
+    name: 'Nouveau Shekel israélien',
     code: 'ILS',
+    symbol: '₪',
   },
-  'Livre syrienne': {
-    symbol: '£',
+  {
+    name: 'Livre syrienne',
     code: 'SYP',
+    symbol: '£',
   },
-  'Dinar jordanien': {
-    symbol: 'د.ا',
+  {
+    name: 'Dinar jordanien',
     code: 'JOD',
+    symbol: 'د.ا',
   },
-  'Dinar koweïtien': {
-    symbol: 'د.ك',
+  {
+    name: 'Dinar koweïtien',
     code: 'KWD',
+    symbol: 'د.ك',
   },
-  'Livre libanaise': {
-    symbol: 'ل.ل',
+  {
+    name: 'Livre libanaise',
     code: 'LBP',
+    symbol: 'ل.ل',
   },
-  'Rial omanais': {
-    symbol: 'ر.ع.',
+  {
+    name: 'Rial omanais',
     code: 'OMR',
+    symbol: 'ر.ع.',
   },
-  'Rial qatari': {
-    symbol: 'ر.ق',
+  {
+    name: 'Rial qatari',
     code: 'QAR',
+    symbol: 'ر.ق',
   },
-  'Riyal saoudien': {
-    symbol: '',
+  {
+    name: 'Riyal saoudien',
     code: 'SAR',
+    symbol: '',
   },
-  Bitcoin: {
-    symbol: '₿',
+  {
+    name: 'Bitcoin',
     code: 'BTC',
+    symbol: '₿',
   },
-  Ethereum: {
-    symbol: 'Ξ',
+  {
+    name: 'Ethereum',
     code: 'ETH',
+    symbol: 'Ξ',
   },
-  Litecoin: {
-    symbol: 'Ł',
+  {
+    name: 'Litecoin',
     code: 'LTC',
+    symbol: 'Ł',
   },
-  Ripples: {
-    symbol: 'XRP',
+  {
+    name: 'Ripples',
     code: 'XRP',
+    symbol: 'XRP',
   },
-};
+];
diff --git a/src/locales/fr_CH/location/country_code.ts b/src/locales/fr_CH/location/country_code.ts
index ce14a4eda24..c92988f14ba 100644
--- a/src/locales/fr_CH/location/country_code.ts
+++ b/src/locales/fr_CH/location/country_code.ts
@@ -1 +1,2 @@
-export default ['CH'];
+// [ISO_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1)
+export default [{ alpha2: 'CH', alpha3: 'CHE' }];
diff --git a/src/locales/he/date/month.ts b/src/locales/he/date/month.ts
index dce72267503..64f530eba7e 100644
--- a/src/locales/he/date/month.ts
+++ b/src/locales/he/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'נובמבר',
     'דצמבר',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'ינואר',
-    'פברואר',
-    'מרץ',
-    'אפריל',
-    'מאי',
-    'יוני',
-    'יולי',
-    'אוגוסט',
-    'ספטמבר',
-    'אוקטובר',
-    'נובמבר',
-    'דצמבר',
-  ],
+
   abbr: [
     'Jan',
     'Feb',
@@ -43,20 +28,4 @@ export default {
     'Nov',
     'Dec',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Jan',
-    'Feb',
-    'Mar',
-    'Apr',
-    'May',
-    'Jun',
-    'Jul',
-    'Aug',
-    'Sep',
-    'Oct',
-    'Nov',
-    'Dec',
-  ],
 };
diff --git a/src/locales/he/date/weekday.ts b/src/locales/he/date/weekday.ts
index 8f2defd1acc..9603396503d 100644
--- a/src/locales/he/date/weekday.ts
+++ b/src/locales/he/date/weekday.ts
@@ -8,27 +8,6 @@ export default {
     'יום שישי',
     'שבת',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'יום ראשון',
-    'יום שני',
-    'יום שלישי',
-    'יום רביעי',
-    'יום חמישי',
-    'יום שישי',
-    'שבת',
-  ],
+
   abbr: ['יום א׳', 'יום ב׳', 'יום ג׳', 'יום ד׳', 'יום ה׳', 'יום ו׳', 'שבת'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'יום א׳',
-    'יום ב׳',
-    'יום ג׳',
-    'יום ד׳',
-    'יום ה׳',
-    'יום ו׳',
-    'שבת',
-  ],
 };
diff --git a/src/locales/hr/date/month.ts b/src/locales/hr/date/month.ts
index 2a0ab6a4b40..5cf4487dc29 100644
--- a/src/locales/hr/date/month.ts
+++ b/src/locales/hr/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'studeni',
     'prosinac',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'siječanj',
-    'veljača',
-    'ožujak',
-    'travanj',
-    'svibanj',
-    'lipanj',
-    'srpanj',
-    'kolovoz',
-    'rujan',
-    'listopad',
-    'studeni',
-    'prosinac',
-  ],
+
   abbr: [
     'sij',
     'vel',
@@ -43,20 +28,4 @@ export default {
     'stu',
     'pro',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'sij',
-    'vel',
-    'ožu',
-    'tra',
-    'svi',
-    'lip',
-    'srp',
-    'kol',
-    'ruj',
-    'lis',
-    'stu',
-    'pro',
-  ],
 };
diff --git a/src/locales/hr/date/weekday.ts b/src/locales/hr/date/weekday.ts
index ad34f674f22..e264dd15a41 100644
--- a/src/locales/hr/date/weekday.ts
+++ b/src/locales/hr/date/weekday.ts
@@ -8,19 +8,6 @@ export default {
     'petak',
     'subota',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'nedjelja',
-    'ponedjeljak',
-    'utorak',
-    'srijeda',
-    'četvrtak',
-    'petak',
-    'subota',
-  ],
+
   abbr: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['ned', 'pon', 'uto', 'sri', 'čet', 'pet', 'sub'],
 };
diff --git a/src/locales/hr/index.ts b/src/locales/hr/index.ts
index 1ef899b500a..1bcbaa1cda8 100644
--- a/src/locales/hr/index.ts
+++ b/src/locales/hr/index.ts
@@ -11,7 +11,7 @@ import person from './person';
 import phone_number from './phone_number';
 
 const hr: LocaleDefinition = {
-  title: 'Hrvatski',
+  title: 'Croatian',
   cell_phone,
   date,
   internet,
diff --git a/src/locales/hu/date/month.ts b/src/locales/hu/date/month.ts
index 65734ea5423..14d0ee05666 100644
--- a/src/locales/hu/date/month.ts
+++ b/src/locales/hu/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'november',
     'december',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'január',
-    'február',
-    'március',
-    'április',
-    'május',
-    'június',
-    'július',
-    'augusztus',
-    'szeptember',
-    'október',
-    'november',
-    'december',
-  ],
+
   abbr: [
     'jan.',
     'febr.',
@@ -43,20 +28,4 @@ export default {
     'nov.',
     'dec.',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'jan.',
-    'febr.',
-    'márc.',
-    'ápr.',
-    'máj.',
-    'jún.',
-    'júl.',
-    'aug.',
-    'szept.',
-    'okt.',
-    'nov.',
-    'dec.',
-  ],
 };
diff --git a/src/locales/hu/date/weekday.ts b/src/locales/hu/date/weekday.ts
index 24e051caace..ca2aa451ff6 100644
--- a/src/locales/hu/date/weekday.ts
+++ b/src/locales/hu/date/weekday.ts
@@ -8,19 +8,6 @@ export default {
     'szombat',
     'vasárnap',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'hétfő',
-    'kedd',
-    'szerda',
-    'csütörtök',
-    'péntek',
-    'szombat',
-    'vasárnap',
-  ],
+
   abbr: ['Hé', 'Ke', 'Sze', 'Csüt', 'Pé', 'Szo', 'Va'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['Hé', 'Ke', 'Sze', 'Csüt', 'Pé', 'Szo', 'Va'],
 };
diff --git a/src/locales/id_ID/date/month.ts b/src/locales/id_ID/date/month.ts
index b5531ca7488..6a34308b020 100644
--- a/src/locales/id_ID/date/month.ts
+++ b/src/locales/id_ID/date/month.ts
@@ -13,20 +13,7 @@ export default {
     'November',
     'Desember',
   ],
-  wide_context: [
-    'Januari',
-    'Februari',
-    'Maret',
-    'April',
-    'Mei',
-    'Juni',
-    'Juli',
-    'Agustus',
-    'September',
-    'Oktober',
-    'November',
-    'Desember',
-  ],
+
   abbr: [
     'Jan',
     'Feb',
@@ -41,18 +28,4 @@ export default {
     'Nov',
     'Des',
   ],
-  abbr_context: [
-    'Jan',
-    'Feb',
-    'Mar',
-    'Apr',
-    'Mei',
-    'Jun',
-    'Jul',
-    'Ags',
-    'Sep',
-    'Okt',
-    'Nov',
-    'Des',
-  ],
 };
diff --git a/src/locales/id_ID/date/weekday.ts b/src/locales/id_ID/date/weekday.ts
index e96999da1cc..5a13f537332 100644
--- a/src/locales/id_ID/date/weekday.ts
+++ b/src/locales/id_ID/date/weekday.ts
@@ -1,14 +1,5 @@
 export default {
   wide: ['Minggu', 'Senin', 'Selasa', 'Rabu', 'Kamis', 'Jumat', 'Sabtu'],
-  wide_context: [
-    'Minggu',
-    'Senin',
-    'Selasa',
-    'Rabu',
-    'Kamis',
-    'Jumat',
-    'Sabtu',
-  ],
+
   abbr: ['Min', 'Sen', 'Sel', 'Rab', 'Kam', 'Jum', 'Sab'],
-  abbr_context: ['Min', 'Sen', 'Sel', 'Rab', 'Kam', 'Jum', 'Sab'],
 };
diff --git a/src/locales/index.ts b/src/locales/index.ts
index 213442d34c5..f5f2ca0fb34 100644
--- a/src/locales/index.ts
+++ b/src/locales/index.ts
@@ -3,190 +3,62 @@
  * Run 'pnpm run generate:locales' to update.
  */
 
-import type { LocaleDefinition } from '..';
-import af_ZA from './af_ZA';
-import ar from './ar';
-import az from './az';
-import cz from './cz';
-import de from './de';
-import de_AT from './de_AT';
-import de_CH from './de_CH';
-import dv from './dv';
-import el from './el';
-import en from './en';
-import en_AU from './en_AU';
-import en_AU_ocker from './en_AU_ocker';
-import en_BORK from './en_BORK';
-import en_CA from './en_CA';
-import en_GB from './en_GB';
-import en_GH from './en_GH';
-import en_IE from './en_IE';
-import en_IN from './en_IN';
-import en_NG from './en_NG';
-import en_US from './en_US';
-import en_ZA from './en_ZA';
-import es from './es';
-import es_MX from './es_MX';
-import fa from './fa';
-import fi from './fi';
-import fr from './fr';
-import fr_BE from './fr_BE';
-import fr_CA from './fr_CA';
-import fr_CH from './fr_CH';
-import fr_LU from './fr_LU';
-import ge from './ge';
-import he from './he';
-import hr from './hr';
-import hu from './hu';
-import hy from './hy';
-import id_ID from './id_ID';
-import it from './it';
-import ja from './ja';
-import ko from './ko';
-import lv from './lv';
-import mk from './mk';
-import nb_NO from './nb_NO';
-import ne from './ne';
-import nl from './nl';
-import nl_BE from './nl_BE';
-import pl from './pl';
-import pt_BR from './pt_BR';
-import pt_PT from './pt_PT';
-import ro from './ro';
-import ru from './ru';
-import sk from './sk';
-import sv from './sv';
-import tr from './tr';
-import uk from './uk';
-import ur from './ur';
-import vi from './vi';
-import zh_CN from './zh_CN';
-import zh_TW from './zh_TW';
-import zu_ZA from './zu_ZA';
-
-export type KnownLocale =
-  | 'af_ZA'
-  | 'ar'
-  | 'az'
-  | 'cz'
-  | 'de'
-  | 'de_AT'
-  | 'de_CH'
-  | 'dv'
-  | 'el'
-  | 'en'
-  | 'en_AU'
-  | 'en_AU_ocker'
-  | 'en_BORK'
-  | 'en_CA'
-  | 'en_GB'
-  | 'en_GH'
-  | 'en_IE'
-  | 'en_IN'
-  | 'en_NG'
-  | 'en_US'
-  | 'en_ZA'
-  | 'es'
-  | 'es_MX'
-  | 'fa'
-  | 'fi'
-  | 'fr'
-  | 'fr_BE'
-  | 'fr_CA'
-  | 'fr_CH'
-  | 'fr_LU'
-  | 'ge'
-  | 'he'
-  | 'hr'
-  | 'hu'
-  | 'hy'
-  | 'id_ID'
-  | 'it'
-  | 'ja'
-  | 'ko'
-  | 'lv'
-  | 'mk'
-  | 'nb_NO'
-  | 'ne'
-  | 'nl'
-  | 'nl_BE'
-  | 'pl'
-  | 'pt_BR'
-  | 'pt_PT'
-  | 'ro'
-  | 'ru'
-  | 'sk'
-  | 'sv'
-  | 'tr'
-  | 'uk'
-  | 'ur'
-  | 'vi'
-  | 'zh_CN'
-  | 'zh_TW'
-  | 'zu_ZA';
-
-export type KnownLocales = Record<KnownLocale, LocaleDefinition>;
-
-const locales: KnownLocales = {
-  af_ZA,
-  ar,
-  az,
-  cz,
-  de,
-  de_AT,
-  de_CH,
-  dv,
-  el,
-  en,
-  en_AU,
-  en_AU_ocker,
-  en_BORK,
-  en_CA,
-  en_GB,
-  en_GH,
-  en_IE,
-  en_IN,
-  en_NG,
-  en_US,
-  en_ZA,
-  es,
-  es_MX,
-  fa,
-  fi,
-  fr,
-  fr_BE,
-  fr_CA,
-  fr_CH,
-  fr_LU,
-  ge,
-  he,
-  hr,
-  hu,
-  hy,
-  id_ID,
-  it,
-  ja,
-  ko,
-  lv,
-  mk,
-  nb_NO,
-  ne,
-  nl,
-  nl_BE,
-  pl,
-  pt_BR,
-  pt_PT,
-  ro,
-  ru,
-  sk,
-  sv,
-  tr,
-  uk,
-  ur,
-  vi,
-  zh_CN,
-  zh_TW,
-  zu_ZA,
-};
-
-export default locales;
+export { default as af_ZA } from './af_ZA';
+export { default as ar } from './ar';
+export { default as az } from './az';
+export { default as cz } from './cz';
+export { default as de } from './de';
+export { default as de_AT } from './de_AT';
+export { default as de_CH } from './de_CH';
+export { default as dv } from './dv';
+export { default as el } from './el';
+export { default as en } from './en';
+export { default as en_AU } from './en_AU';
+export { default as en_AU_ocker } from './en_AU_ocker';
+export { default as en_BORK } from './en_BORK';
+export { default as en_CA } from './en_CA';
+export { default as en_GB } from './en_GB';
+export { default as en_GH } from './en_GH';
+export { default as en_IE } from './en_IE';
+export { default as en_IN } from './en_IN';
+export { default as en_NG } from './en_NG';
+export { default as en_US } from './en_US';
+export { default as en_ZA } from './en_ZA';
+export { default as es } from './es';
+export { default as es_MX } from './es_MX';
+export { default as fa } from './fa';
+export { default as fi } from './fi';
+export { default as fr } from './fr';
+export { default as fr_BE } from './fr_BE';
+export { default as fr_CA } from './fr_CA';
+export { default as fr_CH } from './fr_CH';
+export { default as fr_LU } from './fr_LU';
+export { default as ge } from './ge';
+export { default as he } from './he';
+export { default as hr } from './hr';
+export { default as hu } from './hu';
+export { default as hy } from './hy';
+export { default as id_ID } from './id_ID';
+export { default as it } from './it';
+export { default as ja } from './ja';
+export { default as ko } from './ko';
+export { default as lv } from './lv';
+export { default as mk } from './mk';
+export { default as nb_NO } from './nb_NO';
+export { default as ne } from './ne';
+export { default as nl } from './nl';
+export { default as nl_BE } from './nl_BE';
+export { default as pl } from './pl';
+export { default as pt_BR } from './pt_BR';
+export { default as pt_PT } from './pt_PT';
+export { default as ro } from './ro';
+export { default as ru } from './ru';
+export { default as sk } from './sk';
+export { default as sv } from './sv';
+export { default as tr } from './tr';
+export { default as uk } from './uk';
+export { default as ur } from './ur';
+export { default as vi } from './vi';
+export { default as zh_CN } from './zh_CN';
+export { default as zh_TW } from './zh_TW';
+export { default as zu_ZA } from './zu_ZA';
diff --git a/src/locales/it/company/bs_adjective.ts b/src/locales/it/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/it/company/bs_adjective.ts
rename to src/locales/it/company/buzz_adjective.ts
diff --git a/src/locales/it/company/bs_noun.ts b/src/locales/it/company/buzz_noun.ts
similarity index 100%
rename from src/locales/it/company/bs_noun.ts
rename to src/locales/it/company/buzz_noun.ts
diff --git a/src/locales/it/company/bs_verb.ts b/src/locales/it/company/buzz_verb.ts
similarity index 100%
rename from src/locales/it/company/bs_verb.ts
rename to src/locales/it/company/buzz_verb.ts
diff --git a/src/locales/it/company/index.ts b/src/locales/it/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/it/company/index.ts
+++ b/src/locales/it/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/ko/date/month.ts b/src/locales/ko/date/month.ts
index c5ba13e56a9..500c01f4f8d 100644
--- a/src/locales/ko/date/month.ts
+++ b/src/locales/ko/date/month.ts
@@ -13,9 +13,6 @@ export default {
     '11월',
     '12월',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  // wide_context: [],
   abbr: [
     '1월',
     '2월',
@@ -30,7 +27,4 @@ export default {
     '11월',
     '12월',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  // abbr_context: [],
 };
diff --git a/src/locales/ko/date/weekday.ts b/src/locales/ko/date/weekday.ts
index ad46f425754..af329d64713 100644
--- a/src/locales/ko/date/weekday.ts
+++ b/src/locales/ko/date/weekday.ts
@@ -1,10 +1,4 @@
 export default {
   wide: ['일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  // wide_context: [],
   abbr: ['일', '월', '화', '수', '목', '금', '토'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  // abbr_context: [],
 };
diff --git a/src/locales/lv/person/female_last_name_patterns.ts b/src/locales/lv/person/female_last_name_patterns.ts
new file mode 100644
index 00000000000..b1840442ab1
--- /dev/null
+++ b/src/locales/lv/person/female_last_name_patterns.ts
@@ -0,0 +1,7 @@
+export default [
+  { value: '{{person.female_last_name}}', weight: 8 },
+  {
+    value: '{{person.female_last_name}}-{{person.female_last_name}}',
+    weight: 2,
+  },
+];
diff --git a/src/locales/lv/person/index.ts b/src/locales/lv/person/index.ts
index 42de5bcb140..ac331974baf 100644
--- a/src/locales/lv/person/index.ts
+++ b/src/locales/lv/person/index.ts
@@ -5,10 +5,12 @@
 import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
+import female_last_name_patterns from './female_last_name_patterns';
 import female_prefix from './female_prefix';
 import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
+import male_last_name_patterns from './male_last_name_patterns';
 import male_prefix from './male_prefix';
 import name_ from './name';
 import prefix from './prefix';
@@ -18,10 +20,12 @@ import title from './title';
 const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
+  female_last_name_patterns,
   female_prefix,
   first_name,
   male_first_name,
   male_last_name,
+  male_last_name_patterns,
   male_prefix,
   name: name_,
   prefix,
diff --git a/src/locales/lv/person/male_last_name_patterns.ts b/src/locales/lv/person/male_last_name_patterns.ts
new file mode 100644
index 00000000000..104a5aa1d24
--- /dev/null
+++ b/src/locales/lv/person/male_last_name_patterns.ts
@@ -0,0 +1,4 @@
+export default [
+  { value: '{{person.male_last_name}}', weight: 8 },
+  { value: '{{person.male_last_name}}-{{person.male_last_name}}', weight: 2 },
+];
diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts
index 492a7e6fd3c..845ffaf91ee 100644
--- a/src/locales/lv/person/name.ts
+++ b/src/locales/lv/person/name.ts
@@ -8,13 +8,4 @@ export default [
     weight: 1,
   },
   { value: '{{person.firstName}} {{person.lastName}}', weight: 7 },
-  { value: '{{person.lastName}} {{person.firstName}}', weight: 2 },
-  {
-    value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}',
-    weight: 2,
-  },
-  {
-    value: '{{person.firstName}} {{person.lastName}}-{{person.lastName}}',
-    weight: 2,
-  },
 ];
diff --git a/src/locales/mk/date/month.ts b/src/locales/mk/date/month.ts
index bfd7f911803..34631ccc53c 100644
--- a/src/locales/mk/date/month.ts
+++ b/src/locales/mk/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'ноември',
     'декември',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'јануари',
-    'февруари',
-    'март',
-    'април',
-    'мај',
-    'јуни',
-    'јули',
-    'август',
-    'септември',
-    'октомври',
-    'ноември',
-    'декември',
-  ],
+
   abbr: [
     'јан',
     'фев',
@@ -43,20 +28,4 @@ export default {
     'ное',
     'дек',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'јан',
-    'фев',
-    'мар',
-    'апр',
-    'мај',
-    'јун',
-    'јул',
-    'авг',
-    'сеп',
-    'окт',
-    'ное',
-    'дек',
-  ],
 };
diff --git a/src/locales/mk/date/weekday.ts b/src/locales/mk/date/weekday.ts
index 1c0e35bf9a7..cd829ec64e6 100644
--- a/src/locales/mk/date/weekday.ts
+++ b/src/locales/mk/date/weekday.ts
@@ -8,19 +8,6 @@ export default {
     'петок',
     'сабота',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'недела',
-    'понеделник',
-    'вторник',
-    'среда',
-    'четврток',
-    'петок',
-    'сабота',
-  ],
+
   abbr: ['нед', 'пон', 'вто', 'сре', 'чет', 'пет', 'саб'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['нед', 'пон', 'вто', 'сре', 'чет', 'пет', 'саб'],
 };
diff --git a/src/locales/nb_NO/person/index.ts b/src/locales/nb_NO/person/index.ts
index eb000343bc3..c54bfc4e322 100644
--- a/src/locales/nb_NO/person/index.ts
+++ b/src/locales/nb_NO/person/index.ts
@@ -7,6 +7,7 @@ import female_first_name from './female_first_name';
 import female_prefix from './female_prefix';
 import first_name from './first_name';
 import last_name from './last_name';
+import last_name_patterns from './last_name_patterns';
 import male_first_name from './male_first_name';
 import male_prefix from './male_prefix';
 import name_ from './name';
@@ -18,6 +19,7 @@ const person: PersonDefinitions = {
   female_prefix,
   first_name,
   last_name,
+  last_name_patterns,
   male_first_name,
   male_prefix,
   name: name_,
diff --git a/src/locales/nb_NO/person/last_name_patterns.ts b/src/locales/nb_NO/person/last_name_patterns.ts
new file mode 100644
index 00000000000..8a31eeaee13
--- /dev/null
+++ b/src/locales/nb_NO/person/last_name_patterns.ts
@@ -0,0 +1,4 @@
+export default [
+  { value: '{{person.last_name}}', weight: 8 },
+  { value: '{{person.last_name}} {{person.last_name}}', weight: 2 },
+];
diff --git a/src/locales/nb_NO/person/name.ts b/src/locales/nb_NO/person/name.ts
index 3cfec1ea604..5f37f6ee8c4 100644
--- a/src/locales/nb_NO/person/name.ts
+++ b/src/locales/nb_NO/person/name.ts
@@ -7,13 +7,5 @@ export default [
     value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}',
     weight: 1,
   },
-  {
-    value: '{{person.firstName}} {{person.firstName}} {{person.lastName}}',
-    weight: 1,
-  },
-  {
-    value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
-    weight: 1,
-  },
-  { value: '{{person.firstName}} {{person.lastName}}', weight: 8 },
+  { value: '{{person.firstName}} {{person.lastName}}', weight: 9 },
 ];
diff --git a/src/locales/nl/date/month.ts b/src/locales/nl/date/month.ts
index 131b7574c6c..4fbd01e574f 100644
--- a/src/locales/nl/date/month.ts
+++ b/src/locales/nl/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'november',
     'december',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'januari',
-    'februari',
-    'maart',
-    'april',
-    'mei',
-    'juni',
-    'juli',
-    'augustus',
-    'september',
-    'oktober',
-    'november',
-    'december',
-  ],
+
   abbr: [
     'jan',
     'feb',
@@ -43,20 +28,4 @@ export default {
     'nov',
     'dec',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'jan',
-    'feb',
-    'mrt',
-    'apr',
-    'mei',
-    'jun',
-    'jul',
-    'aug',
-    'sep',
-    'okt',
-    'nov',
-    'dec',
-  ],
 };
diff --git a/src/locales/nl/date/weekday.ts b/src/locales/nl/date/weekday.ts
index 42330684a7f..cef3ba7f017 100644
--- a/src/locales/nl/date/weekday.ts
+++ b/src/locales/nl/date/weekday.ts
@@ -8,19 +8,6 @@ export default {
     'vrijdag',
     'zaterdag',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'zondag',
-    'maandag',
-    'dinsdag',
-    'woensdag',
-    'donderdag',
-    'vrijdag',
-    'zaterdag',
-  ],
+
   abbr: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
 };
diff --git a/src/locales/pl/company/bs_adjective.ts b/src/locales/pl/company/buzz_adjective.ts
similarity index 100%
rename from src/locales/pl/company/bs_adjective.ts
rename to src/locales/pl/company/buzz_adjective.ts
diff --git a/src/locales/pl/company/bs_noun.ts b/src/locales/pl/company/buzz_noun.ts
similarity index 100%
rename from src/locales/pl/company/bs_noun.ts
rename to src/locales/pl/company/buzz_noun.ts
diff --git a/src/locales/pl/company/bs_verb.ts b/src/locales/pl/company/buzz_verb.ts
similarity index 100%
rename from src/locales/pl/company/bs_verb.ts
rename to src/locales/pl/company/buzz_verb.ts
diff --git a/src/locales/pl/company/index.ts b/src/locales/pl/company/index.ts
index 7875f08bdbc..ad4d1c3bbdb 100644
--- a/src/locales/pl/company/index.ts
+++ b/src/locales/pl/company/index.ts
@@ -4,9 +4,9 @@
  */
 import type { CompanyDefinitions } from '../../..';
 import adjective from './adjective';
-import bs_adjective from './bs_adjective';
-import bs_noun from './bs_noun';
-import bs_verb from './bs_verb';
+import buzz_adjective from './buzz_adjective';
+import buzz_noun from './buzz_noun';
+import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
 import name_patterns from './name_patterns';
 import noun from './noun';
@@ -14,9 +14,9 @@ import suffix from './suffix';
 
 const company: CompanyDefinitions = {
   adjective,
-  bs_adjective,
-  bs_noun,
-  bs_verb,
+  buzz_adjective,
+  buzz_noun,
+  buzz_verb,
   descriptor,
   name_patterns,
   noun,
diff --git a/src/locales/pt_BR/date/month.ts b/src/locales/pt_BR/date/month.ts
index 47b3157950e..f2d4bd4bec8 100644
--- a/src/locales/pt_BR/date/month.ts
+++ b/src/locales/pt_BR/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'Novembro',
     'Dezembro',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Janeiro',
-    'Fevereiro',
-    'Março',
-    'Abril',
-    'Maio',
-    'Junho',
-    'Julho',
-    'Agosto',
-    'Setembro',
-    'Outubro',
-    'Novembro',
-    'Dezembro',
-  ],
+
   abbr: [
     'Jan',
     'Fev',
@@ -43,20 +28,4 @@ export default {
     'Nov',
     'Dez',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Jan',
-    'Fev',
-    'Mar',
-    'Abr',
-    'Mai',
-    'Jun',
-    'Jul',
-    'Ago',
-    'Set',
-    'Out',
-    'Nov',
-    'Dez',
-  ],
 };
diff --git a/src/locales/pt_BR/date/weekday.ts b/src/locales/pt_BR/date/weekday.ts
index e7d5069f3cb..b56f75e4a2a 100644
--- a/src/locales/pt_BR/date/weekday.ts
+++ b/src/locales/pt_BR/date/weekday.ts
@@ -1,18 +1,5 @@
 export default {
   wide: ['Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Domingo',
-    'Segunda',
-    'Terça',
-    'Quarta',
-    'Quinta',
-    'Sexta',
-    'Sábado',
-  ],
+
   abbr: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
 };
diff --git a/src/locales/pt_BR/location/city.ts b/src/locales/pt_BR/location/city.ts
index 7375aa8378a..40c397bf553 100644
--- a/src/locales/pt_BR/location/city.ts
+++ b/src/locales/pt_BR/location/city.ts
@@ -1,6 +1,4 @@
 export default [
-  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
-  '{{location.city_prefix}} {{person.firstName}}',
   '{{person.firstName}}{{location.city_suffix}}',
   '{{person.lastName}}{{location.city_suffix}}',
 ];
diff --git a/src/locales/pt_PT/location/index.ts b/src/locales/pt_PT/location/index.ts
index 63674a1f623..7c894b5caef 100644
--- a/src/locales/pt_PT/location/index.ts
+++ b/src/locales/pt_PT/location/index.ts
@@ -12,6 +12,7 @@ import country from './country';
 import default_country from './default_country';
 import direction from './direction';
 import postcode from './postcode';
+import secondary_address from './secondary_address';
 import street from './street';
 import street_address from './street_address';
 import street_prefix from './street_prefix';
@@ -26,6 +27,7 @@ const location: LocationDefinitions = {
   default_country,
   direction,
   postcode,
+  secondary_address,
   street,
   street_address,
   street_prefix,
diff --git a/src/locales/pt_PT/location/secondary_address.ts b/src/locales/pt_PT/location/secondary_address.ts
new file mode 100644
index 00000000000..c7bab4dba47
--- /dev/null
+++ b/src/locales/pt_PT/location/secondary_address.ts
@@ -0,0 +1 @@
+export default ['#Drt.', '#Esq.', '#Frt', 'R/C', 'Cv', '#A', '#B', '#C'];
diff --git a/src/locales/pt_PT/location/street.ts b/src/locales/pt_PT/location/street.ts
index f579edee3d3..2d677549d38 100644
--- a/src/locales/pt_PT/location/street.ts
+++ b/src/locales/pt_PT/location/street.ts
@@ -1,7 +1,3 @@
 export default [
   '{{location.street_prefix}} {{person.first_name}} {{person.last_name}}',
-  'N#',
-  'N##',
-  'N###',
-  'N###-#',
 ];
diff --git a/src/locales/pt_PT/location/street_address.ts b/src/locales/pt_PT/location/street_address.ts
index 437f20dd91a..399457ec58b 100644
--- a/src/locales/pt_PT/location/street_address.ts
+++ b/src/locales/pt_PT/location/street_address.ts
@@ -1,4 +1,4 @@
 export default {
   normal: '{{location.street}} {{location.buildingNumber}}',
-  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+  full: '{{location.street}} {{location.buildingNumber}}-{{location.secondaryAddress}}',
 };
diff --git a/src/locales/ro/date/month.ts b/src/locales/ro/date/month.ts
index 68adc7c8e23..1f059af3534 100644
--- a/src/locales/ro/date/month.ts
+++ b/src/locales/ro/date/month.ts
@@ -13,22 +13,7 @@ export default {
     'Noiembrie',
     'Decembrie',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Ianuarie',
-    'Februarie',
-    'Martie',
-    'Aprilie',
-    'Mai',
-    'Iunie',
-    'Iulie',
-    'August',
-    'Septembrie',
-    'Octombrie',
-    'Noiembrie',
-    'Decembrie',
-  ],
+
   abbr: [
     'Ian',
     'Feb',
@@ -43,20 +28,4 @@ export default {
     'Noi',
     'Dec',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Ian',
-    'Feb',
-    'Mar',
-    'Apr',
-    'Mai',
-    'Iun',
-    'Iul',
-    'Aug',
-    'Sep',
-    'Oct',
-    'Noi',
-    'Dec',
-  ],
 };
diff --git a/src/locales/ro/date/weekday.ts b/src/locales/ro/date/weekday.ts
index ae91f4f0b15..895c8636c0c 100644
--- a/src/locales/ro/date/weekday.ts
+++ b/src/locales/ro/date/weekday.ts
@@ -1,26 +1,5 @@
 export default {
   wide: ['Luni', 'Marți', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă', 'Duminică'],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Luni',
-    'Marți',
-    'Miercuri',
-    'Joi',
-    'Vineri',
-    'Sâmbătă',
-    'Duminică',
-  ],
+
   abbr: ['Luni', 'Marți', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă', 'Duminică'],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Luni',
-    'Marți',
-    'Miercuri',
-    'Joi',
-    'Vineri',
-    'Sâmbătă',
-    'Duminică',
-  ],
 };
diff --git a/src/locales/sv/person/index.ts b/src/locales/sv/person/index.ts
index 8dd6f4d6c14..b12b544e80d 100644
--- a/src/locales/sv/person/index.ts
+++ b/src/locales/sv/person/index.ts
@@ -7,6 +7,7 @@ import female_first_name from './female_first_name';
 import female_prefix from './female_prefix';
 import first_name from './first_name';
 import last_name from './last_name';
+import last_name_patterns from './last_name_patterns';
 import male_first_name from './male_first_name';
 import male_prefix from './male_prefix';
 import name_ from './name';
@@ -18,6 +19,7 @@ const person: PersonDefinitions = {
   female_prefix,
   first_name,
   last_name,
+  last_name_patterns,
   male_first_name,
   male_prefix,
   name: name_,
diff --git a/src/locales/sv/person/last_name_patterns.ts b/src/locales/sv/person/last_name_patterns.ts
new file mode 100644
index 00000000000..8a31eeaee13
--- /dev/null
+++ b/src/locales/sv/person/last_name_patterns.ts
@@ -0,0 +1,4 @@
+export default [
+  { value: '{{person.last_name}}', weight: 8 },
+  { value: '{{person.last_name}} {{person.last_name}}', weight: 2 },
+];
diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts
index 37334af61f1..5f37f6ee8c4 100644
--- a/src/locales/sv/person/name.ts
+++ b/src/locales/sv/person/name.ts
@@ -7,9 +7,5 @@ export default [
     value: '{{person.firstName}} {{person.lastName}} {{person.suffix}}',
     weight: 1,
   },
-  { value: '{{person.firstName}} {{person.lastName}}', weight: 8 },
-  {
-    value: '{{person.firstName}} {{person.lastName}} {{person.lastName}}',
-    weight: 1,
-  },
+  { value: '{{person.firstName}} {{person.lastName}}', weight: 9 },
 ];
diff --git a/src/locales/ur/date/month.ts b/src/locales/ur/date/month.ts
index 98df66f094f..3edd0356366 100644
--- a/src/locales/ur/date/month.ts
+++ b/src/locales/ur/date/month.ts
@@ -15,18 +15,4 @@ export default {
     'نومبر',
     'دسمبر',
   ],
-  wide_context: [
-    'جنوری',
-    'فروری',
-    'مارچ',
-    'اپریل',
-    'مئ',
-    'جون',
-    'جولائ',
-    'اگست',
-    'ستمبر',
-    'اکتوبر',
-    'نومبر',
-    'دسمبر',
-  ],
 } as DateEntryDefinition;
diff --git a/src/locales/ur/date/weekday.ts b/src/locales/ur/date/weekday.ts
index 2df6fb2dc4b..ae8a780afd7 100644
--- a/src/locales/ur/date/weekday.ts
+++ b/src/locales/ur/date/weekday.ts
@@ -2,5 +2,4 @@ import type { DateEntryDefinition } from '../../../definitions';
 
 export default {
   wide: ['اتور', 'پیر', 'منگل', 'بدھ', 'جمعرات', 'جمعہ', 'ہفتہ'],
-  wide_context: ['اتور', 'پیر', 'منگل', 'بدھ', 'جمعرات', 'جمعہ', 'ہفتہ'],
 } as DateEntryDefinition;
diff --git a/src/locales/vi/date/month.ts b/src/locales/vi/date/month.ts
index d576d56a19e..fa899d7565e 100644
--- a/src/locales/vi/date/month.ts
+++ b/src/locales/vi/date/month.ts
@@ -13,22 +13,6 @@ export default {
     'Tháng Mười Một',
     'Tháng Mười Hai',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Tháng Giêng',
-    'Tháng Hai',
-    'Tháng Ba',
-    'Tháng Tư',
-    'Tháng Năm',
-    'Tháng Sáu',
-    'Tháng Bảy',
-    'Tháng Tám',
-    'Tháng Chín',
-    'Tháng Mười',
-    'Tháng Mười Một',
-    'Tháng Mười Hai',
-  ],
   abbr: [
     'Tháng 1',
     'Tháng 2',
@@ -43,20 +27,4 @@ export default {
     'Tháng 11',
     'Tháng 12',
   ],
-  // Property "abbr_context" is optional, if not set then "abbr" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  abbr_context: [
-    'Tháng 1',
-    'Tháng 2',
-    'Tháng 3',
-    'Tháng 4',
-    'Tháng 5',
-    'Tháng 6',
-    'Tháng 7',
-    'Tháng 8',
-    'Tháng 9',
-    'Tháng 10',
-    'Tháng 11',
-    'Tháng 12',
-  ],
 };
diff --git a/src/locales/vi/date/weekday.ts b/src/locales/vi/date/weekday.ts
index 37f8f020b0c..cd45bbbd019 100644
--- a/src/locales/vi/date/weekday.ts
+++ b/src/locales/vi/date/weekday.ts
@@ -8,17 +8,6 @@ export default {
     'Thứ sáu',
     'Thứ bảy',
   ],
-  // Property "wide_context" is optional, if not set then "wide" will be used instead
-  // It is used to specify a word in context, which may differ from a stand-alone word
-  wide_context: [
-    'Chủ nhật',
-    'Thứ hai',
-    'Thứ ba',
-    'Thứ tư',
-    'Thứ năm',
-    'Thứ sáu',
-    'Thứ bảy',
-  ],
   abbr: ['CN', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7'],
   // Property "abbr_context" is optional, if not set then "abbr" will be used instead
   // It is used to specify a word in context, which may differ from a stand-alone word
diff --git a/src/modules/airline/index.ts b/src/modules/airline/index.ts
index 3a5a400c524..aeeb48735e3 100644
--- a/src/modules/airline/index.ts
+++ b/src/modules/airline/index.ts
@@ -66,7 +66,9 @@ const aircraftTypeSeats: Record<AircraftType, string[]> = {
 export class AirlineModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(AirlineModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      AirlineModule.prototype
+    ) as Array<keyof AirlineModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/animal/index.ts b/src/modules/animal/index.ts
index 3cd9d71ef20..90efc7abf61 100644
--- a/src/modules/animal/index.ts
+++ b/src/modules/animal/index.ts
@@ -6,7 +6,9 @@ import type { Faker } from '../..';
 export class AnimalModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(AnimalModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      AnimalModule.prototype
+    ) as Array<keyof AnimalModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/color/index.ts b/src/modules/color/index.ts
index 981dae60555..5100776acaa 100644
--- a/src/modules/color/index.ts
+++ b/src/modules/color/index.ts
@@ -3,32 +3,39 @@ import type { Faker } from '../../faker';
 /**
  * Color space names supported by CSS.
  */
-export const CSS_SPACES = [
-  'sRGB',
-  'display-p3',
-  'rec2020',
-  'a98-rgb',
-  'prophoto-rgb',
-  'rec2020',
-] as const;
+export enum CssSpace {
+  SRGB = 'sRGB',
+  DisplayP3 = 'display-p3',
+  REC2020 = 'rec2020',
+  A98RGB = 'a98-rgb',
+  ProphotoRGB = 'prophoto-rgb',
+}
+
+/**
+ * Color space names supported by CSS.
+ */
+export type CssSpaceType = `${CssSpace}`;
 
 /**
  * Functions supported by CSS to produce color.
  */
-export const CSS_FUNCTIONS = [
-  'rgb',
-  'rgba',
-  'hsl',
-  'hsla',
-  'hwb',
-  'cmyk',
-  'lab',
-  'lch',
-  'color',
-] as const;
-
-export type CSSFunction = (typeof CSS_FUNCTIONS)[number];
-export type CSSSpace = (typeof CSS_SPACES)[number];
+export enum CssFunction {
+  RGB = 'rgb',
+  RGBA = 'rgba',
+  HSL = 'hsl',
+  HSLA = 'hsla',
+  HWB = 'hwb',
+  CMYK = 'cmyk',
+  LAB = 'lab',
+  LCH = 'lch',
+  COLOR = 'color',
+}
+
+/**
+ * Functions supported by CSS to produce color.
+ */
+export type CssFunctionType = `${CssFunction}`;
+
 export type StringColorFormat = 'css' | 'binary';
 export type NumberColorFormat = 'decimal';
 export type ColorFormat = StringColorFormat | NumberColorFormat;
@@ -95,8 +102,8 @@ function toBinary(values: number[]): string {
  */
 function toCSS(
   values: number[],
-  cssFunction: CSSFunction = 'rgb',
-  space: CSSSpace = 'sRGB'
+  cssFunction: CssFunctionType = 'rgb',
+  space: CssSpaceType = 'sRGB'
 ): string {
   const percentage = (value: number) => Math.round(value * 100);
   switch (cssFunction) {
@@ -141,8 +148,8 @@ function toCSS(
 function toColorFormat(
   values: number[],
   format: ColorFormat,
-  cssFunction: CSSFunction = 'rgb',
-  space: CSSSpace = 'sRGB'
+  cssFunction: CssFunctionType = 'rgb',
+  space: CssSpaceType = 'sRGB'
 ): string | number[] {
   switch (format) {
     case 'css':
@@ -160,7 +167,9 @@ function toColorFormat(
 export class ColorModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(ColorModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      ColorModule.prototype
+    ) as Array<keyof ColorModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -203,7 +212,7 @@ export class ColorModule {
    * @since 7.0.0
    */
   cssSupportedFunction(): string {
-    return this.faker.helpers.arrayElement(CSS_FUNCTIONS);
+    return this.faker.helpers.objectValue(CssFunction);
   }
 
   /**
@@ -215,7 +224,7 @@ export class ColorModule {
    * @since 7.0.0
    */
   cssSupportedSpace(): string {
-    return this.faker.helpers.arrayElement(CSS_SPACES);
+    return this.faker.helpers.objectValue(CssSpace);
   }
 
   /**
@@ -365,7 +374,7 @@ export class ColorModule {
     } = options || {};
     options = { format, includeAlpha, prefix, casing };
     let color: string | number[];
-    let cssFunction: CSSFunction = 'rgb';
+    let cssFunction: CssFunctionType = 'rgb';
     if (format === 'hex') {
       color = this.faker.string.hexadecimal({
         length: includeAlpha ? 8 : 6,
@@ -891,7 +900,7 @@ export class ColorModule {
      *
      * @default 'sRGB'
      */
-    space?: CSSSpace;
+    space?: CssSpaceType;
   }): string;
   /**
    * Returns a random color based on CSS color space specified.
@@ -918,7 +927,7 @@ export class ColorModule {
      *
      * @default 'sRGB'
      */
-    space?: CSSSpace;
+    space?: CssSpaceType;
   }): number[];
   /**
    * Returns a random color based on CSS color space specified.
@@ -947,11 +956,11 @@ export class ColorModule {
      *
      * @default 'sRGB'
      */
-    space?: CSSSpace;
+    space?: CssSpaceType;
   }): string | number[];
   colorByCSSColorSpace(options?: {
     format?: ColorFormat;
-    space?: CSSSpace;
+    space?: CssSpaceType;
   }): string | number[] {
     if (options?.format === 'css' && !options?.space) {
       options = { ...options, space: 'sRGB' };
diff --git a/src/modules/commerce/index.ts b/src/modules/commerce/index.ts
index 66f6d02c47d..54d2bce1446 100644
--- a/src/modules/commerce/index.ts
+++ b/src/modules/commerce/index.ts
@@ -7,7 +7,9 @@ import { deprecated } from '../../internal/deprecated';
 export class CommerceModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(CommerceModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      CommerceModule.prototype
+    ) as Array<keyof CommerceModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/company/index.ts b/src/modules/company/index.ts
index 79f2fa8f710..2ced10e9f88 100644
--- a/src/modules/company/index.ts
+++ b/src/modules/company/index.ts
@@ -7,7 +7,9 @@ import { deprecated } from '../../internal/deprecated';
 export class CompanyModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(CompanyModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      CompanyModule.prototype
+    ) as Array<keyof CompanyModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -36,6 +38,7 @@ export class CompanyModule {
       until: '9.0',
     });
     // Don't want the source array exposed to modification, so return a copy
+    // eslint-disable-next-line deprecation/deprecation
     return this.faker.definitions.company.suffix.slice(0);
   }
 
@@ -72,11 +75,14 @@ export class CompanyModule {
       since: '8.0',
       until: '9.0',
     });
-    return this.faker.helpers.arrayElement(this.suffixes());
+    return this.faker.helpers.arrayElement(
+      // eslint-disable-next-line deprecation/deprecation
+      this.suffixes()
+    );
   }
 
   /**
-   * Generates a random business catch phrase.
+   * Generates a random catch phrase that can be displayed to an end user.
    *
    * @example
    * faker.company.catchPhrase() // 'Upgradable systematic flexibility'
@@ -98,13 +104,33 @@ export class CompanyModule {
    * faker.company.bs() // 'cultivate synergistic e-markets'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.company.buzzPhrase` instead.
    */
   bs(): string {
-    return [this.bsBuzz(), this.bsAdjective(), this.bsNoun()].join(' ');
+    deprecated({
+      deprecated: 'faker.company.bs',
+      proposed: 'faker.company.buzzPhrase',
+      since: '8.0',
+      until: '9.0',
+    });
+    return this.buzzPhrase();
   }
 
   /**
-   * Returns a random catch phrase adjective.
+   * Generates a random buzz phrase that can be used to demonstrate data being viewed by a manager.
+   *
+   * @example
+   * faker.company.buzzPhrase() // 'cultivate synergistic e-markets'
+   *
+   * @since 8.0.0
+   */
+  buzzPhrase(): string {
+    return [this.buzzVerb(), this.buzzAdjective(), this.buzzNoun()].join(' ');
+  }
+
+  /**
+   * Returns a random catch phrase adjective that can be displayed to an end user..
    *
    * @example
    * faker.company.catchPhraseAdjective() // 'Multi-tiered'
@@ -118,7 +144,7 @@ export class CompanyModule {
   }
 
   /**
-   * Returns a random catch phrase descriptor.
+   * Returns a random catch phrase descriptor that can be displayed to an end user..
    *
    * @example
    * faker.company.catchPhraseDescriptor() // 'composite'
@@ -132,7 +158,7 @@ export class CompanyModule {
   }
 
   /**
-   * Returns a random catch phrase noun.
+   * Returns a random catch phrase noun that can be displayed to an end user..
    *
    * @example
    * faker.company.catchPhraseNoun() // 'leverage'
@@ -150,10 +176,30 @@ export class CompanyModule {
    * faker.company.bsAdjective() // 'one-to-one'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.company.buzzAdjective` instead.
    */
   bsAdjective(): string {
+    deprecated({
+      deprecated: 'faker.company.bsAdjective',
+      proposed: 'faker.company.buzzAdjective',
+      since: '8.0',
+      until: '9.0',
+    });
+    return this.buzzAdjective();
+  }
+
+  /**
+   * Returns a random buzz adjective that can be used to demonstrate data being viewed by a manager.
+   *
+   * @example
+   * faker.company.buzzAdjective() // 'one-to-one'
+   *
+   * @since 8.0.0
+   */
+  buzzAdjective(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.company.bs_adjective
+      this.faker.definitions.company.buzz_adjective
     );
   }
 
@@ -164,10 +210,30 @@ export class CompanyModule {
    * faker.company.bsBuzz() // 'empower'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.company.buzzVerb` instead.
    */
   bsBuzz(): string {
+    deprecated({
+      deprecated: 'faker.company.bsBuzz',
+      proposed: 'faker.company.buzzVerb',
+      since: '8.0',
+      until: '9.0',
+    });
+    return this.buzzVerb();
+  }
+
+  /**
+   * Returns a random buzz verb that can be used to demonstrate data being viewed by a manager.
+   *
+   * @example
+   * faker.company.buzzVerb() // 'empower'
+   *
+   * @since 8.0.0
+   */
+  buzzVerb(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.company.bs_verb
+      this.faker.definitions.company.buzz_verb
     );
   }
 
@@ -178,10 +244,30 @@ export class CompanyModule {
    * faker.company.bsNoun() // 'paradigms'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.company.buzzNoun` instead.
    */
   bsNoun(): string {
+    deprecated({
+      deprecated: 'faker.company.bsNoun',
+      proposed: 'faker.company.buzzNoun',
+      since: '8.0',
+      until: '9.0',
+    });
+    return this.buzzNoun();
+  }
+
+  /**
+   * Returns a random buzz noun that can be used to demonstrate data being viewed by a manager.
+   *
+   * @example
+   * faker.company.buzzNoun() // 'paradigms'
+   *
+   * @since 8.0.0
+   */
+  buzzNoun(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.company.bs_noun
+      this.faker.definitions.company.buzz_noun
     );
   }
 }
diff --git a/src/modules/database/index.ts b/src/modules/database/index.ts
index 922f4b0ea65..88a7609a83c 100644
--- a/src/modules/database/index.ts
+++ b/src/modules/database/index.ts
@@ -6,7 +6,9 @@ import type { Faker } from '../..';
 export class DatabaseModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(DatabaseModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      DatabaseModule.prototype
+    ) as Array<keyof DatabaseModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/datatype/index.ts b/src/modules/datatype/index.ts
index 25235bb5862..6a03362f486 100644
--- a/src/modules/datatype/index.ts
+++ b/src/modules/datatype/index.ts
@@ -7,7 +7,9 @@ import { deprecated } from '../../internal/deprecated';
 export class DatatypeModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(DatatypeModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      DatatypeModule.prototype
+    ) as Array<keyof DatatypeModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -381,8 +383,17 @@ export class DatatypeModule {
    * faker.datatype.json() // `{"foo":"mxz.v8ISij","bar":29154,"bike":8658,"a":"GxTlw$nuC:","b":40693,"name":"%'<FTou{7X","prop":"X(bd4iT>77"}`
    *
    * @since 5.5.0
+   *
+   * @deprecated Build your own function to generate complex objects.
    */
   json(): string {
+    deprecated({
+      deprecated: 'faker.datatype.json()',
+      proposed: 'your own function to generate complex objects',
+      since: '8.0',
+      until: '9.0',
+    });
+
     const properties = ['foo', 'bar', 'bike', 'a', 'b', 'name', 'prop'];
     const returnObject: Record<string, string | number> = {};
 
@@ -408,6 +419,8 @@ export class DatatypeModule {
    * faker.datatype.array({ min: 3, max: 5 }) // [ 99403, 76924, 42281, "Q'|$&y\\G/9" ]
    *
    * @since 5.5.0
+   *
+   * @deprecated Use your own function to build complex arrays.
    */
   array(
     length:
@@ -423,6 +436,13 @@ export class DatatypeModule {
           max: number;
         } = 10
   ): Array<string | number> {
+    deprecated({
+      deprecated: 'faker.datatype.array()',
+      proposed: 'your own function to build complex arrays',
+      since: '8.0',
+      until: '9.0',
+    });
+
     return this.faker.helpers.multiple(
       () =>
         this.boolean() ? this.faker.string.sample() : this.faker.number.int(),
diff --git a/src/modules/date/index.ts b/src/modules/date/index.ts
index c99a7d19be6..7156bf2248e 100644
--- a/src/modules/date/index.ts
+++ b/src/modules/date/index.ts
@@ -28,7 +28,9 @@ function toDate(
 export class DateModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(DateModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      DateModule.prototype
+    ) as Array<keyof DateModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -947,6 +949,12 @@ export class DateModule {
       refDate?: string | Date | number;
     } = {}
   ): Date {
+    if (options.max < options.min) {
+      throw new FakerError(
+        `Max ${options.max} should be larger than or equal to min ${options.min}.`
+      );
+    }
+
     const mode = options.mode === 'age' ? 'age' : 'year';
     const refDate = toDate(options.refDate, this.faker.defaultRefDate);
     const refYear = refDate.getUTCFullYear();
@@ -971,10 +979,6 @@ export class DateModule {
       );
     }
 
-    if (max < min) {
-      throw new FakerError(`Max ${max} should be larger then min ${min}.`);
-    }
-
     return new Date(this.faker.number.int({ min, max }));
   }
 }
diff --git a/src/modules/finance/index.ts b/src/modules/finance/index.ts
index 8a8d91d27a0..84b42077698 100644
--- a/src/modules/finance/index.ts
+++ b/src/modules/finance/index.ts
@@ -2,13 +2,35 @@ import type { Faker } from '../..';
 import { FakerError } from '../../errors/faker-error';
 import iban from './iban';
 
+/**
+ * The possible definitions related to currency entries.
+ */
+export interface Currency {
+  /**
+   * The full name for the currency (e.g. `US Dollar`).
+   */
+  name: string;
+
+  /**
+   * The code/short text/abbreviation for the currency (e.g. `USD`).
+   */
+  code: string;
+
+  /**
+   * The symbol for the currency (e.g. `$`).
+   */
+  symbol: string;
+}
+
 /**
  * Module to generate finance related entries.
  */
 export class FinanceModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(FinanceModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      FinanceModule.prototype
+    ) as Array<keyof FinanceModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -28,8 +50,86 @@ export class FinanceModule {
    *
    * @since 2.0.1
    */
-  account(length?: number): string {
-    length = length || 8;
+  account(length?: number): string;
+  /**
+   * Generates a random account number.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.length The length of the account number. Defaults to `8`.
+   *
+   * @example
+   * faker.finance.account() // 92842238
+   * faker.finance.account({ length: 5 }) // 32564
+   *
+   * @since 2.0.1
+   */
+  account(options?: {
+    /**
+     * The length of the account number.
+     *
+     * @default 8
+     */
+    length?: number;
+  }): string;
+  /**
+   * Generates a random account number.
+   *
+   * @param optionsOrLength An options object or the length of the account number. Defaults to `{}`.
+   * @param optionsOrLength.length The length of the account number. Defaults to `8`.
+   *
+   * @example
+   * faker.finance.account() // 92842238
+   * faker.finance.account(5) // 28736
+   * faker.finance.account({ length: 5 }) // 32564
+   *
+   * @since 2.0.1
+   */
+  account(
+    optionsOrLength?:
+      | number
+      | {
+          /**
+           * The length of the account number.
+           *
+           * @default 8
+           */
+          length?: number;
+        }
+  ): string;
+  /**
+   * Generates a random account number.
+   *
+   * @param options An options object or the length of the account number. Defaults to `{}`.
+   * @param options.length The length of the account number. Defaults to `8`.
+   *
+   * @example
+   * faker.finance.account() // 92842238
+   * faker.finance.account(5) // 28736
+   * faker.finance.account({ length: 5 }) // 32564
+   *
+   * @since 2.0.1
+   */
+  account(
+    options:
+      | number
+      | {
+          /**
+           * The length of the account number.
+           *
+           * @default 8
+           */
+          length?: number;
+        } = {}
+  ): string {
+    if (typeof options === 'number') {
+      options = { length: options };
+    }
+
+    let { length = 8 } = options;
+    if (length === 0) {
+      length = 8;
+    }
+
     let template = '';
 
     for (let i = 0; i < length; i++) {
@@ -96,11 +196,129 @@ export class FinanceModule {
    *
    * @since 2.0.1
    */
-  mask(length?: number, parens?: boolean, ellipsis?: boolean): string {
+  mask(length?: number, parens?: boolean, ellipsis?: boolean): string;
+  /**
+   * Generates a random masked number.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.length The length of the unmasked number. Defaults to `4`.
+   * @param options.parens Whether to use surrounding parenthesis. Defaults to `true`.
+   * @param options.ellipsis Whether to prefix the numbers with an ellipsis. Defaults to `true`.
+   *
+   * @example
+   * faker.finance.mask() // '(...9711)'
+   * faker.finance.mask({ length: 3 }) // '(...342)'
+   * faker.finance.mask({ length: 3, parens: false }) // '...236'
+   * faker.finance.mask({ length: 3, parens: false, ellipsis: false }) // '298'
+   *
+   * @since 2.0.1
+   */
+  mask(options?: {
+    length?: number;
+    parens?: boolean;
+    ellipsis?: boolean;
+  }): string;
+  /**
+   * Generates a random masked number.
+   *
+   * @param optionsOrLength An options object or the length of the unmask number. Defaults to `{}`.
+   * @param optionsOrLength.length The length of the unmasked number. Defaults to `4`.
+   * @param optionsOrLength.parens Whether to use surrounding parenthesis. Defaults to `true`.
+   * @param optionsOrLength.ellipsis Whether to prefix the numbers with an ellipsis. Defaults to `true`.
+   * @param legacyParens Whether to use surrounding parenthesis. Defaults to `true`.
+   * @param legacyEllipsis Whether to prefix the numbers with an ellipsis. Defaults to `true`.
+   *
+   * @example
+   * faker.finance.mask() // '(...9711)'
+   * faker.finance.mask({ length: 3 }) // '(...342)'
+   * faker.finance.mask({ length: 3, parens: false }) // '...236'
+   * faker.finance.mask({ length: 3, parens: false, ellipsis: false }) // '298'
+   * faker.finance.mask(3) // '(...342)'
+   * faker.finance.mask(3, false) // '...236'
+   * faker.finance.mask(3, false, false) // '298'
+   *
+   * @since 2.0.1
+   */
+  mask(
+    optionsOrLength?:
+      | number
+      | {
+          /**
+           * The length of the unmasked number.
+           *
+           * @default 4
+           */
+          length?: number;
+          /**
+           * Whether to use surrounding parenthesis.
+           *
+           * @default true
+           */
+          parens?: boolean;
+          /**
+           * Whether to prefix the numbers with an ellipsis.
+           *
+           * @default true
+           */
+          ellipsis?: boolean;
+        },
+    legacyParens?: boolean,
+    legacyEllipsis?: boolean
+  ): string;
+  /**
+   * Generates a random masked number.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.length The length of the unmasked number. Defaults to `4`.
+   * @param options.parens Whether to use surrounding parenthesis. Defaults to `true`.
+   * @param options.ellipsis Whether to prefix the numbers with an ellipsis. Defaults to `true`.
+   * @param legacyParens Whether to use surrounding parenthesis. Defaults to `true`.
+   * @param legacyEllipsis Whether to use surrounding parenthesis. Defaults to `true`.
+   *
+   * @example
+   * faker.finance.mask() // '(...9711)'
+   * faker.finance.mask(3) // '(...342)'
+   * faker.finance.mask(3, false) // '...236'
+   * faker.finance.mask(3, false, false) // '298'
+   *
+   * @since 2.0.1
+   */
+  mask(
+    options:
+      | number
+      | {
+          /**
+           * The length of the unmasked number.
+           *
+           * @default 4
+           */
+          length?: number;
+          /**
+           * Whether to use surrounding parenthesis.
+           *
+           * @default true
+           */
+          parens?: boolean;
+          /**
+           * Whether to prefix the numbers with an ellipsis.
+           *
+           * @default true
+           */
+          ellipsis?: boolean;
+        } = {},
+    legacyParens: boolean = true,
+    legacyEllipsis: boolean = true
+  ): string {
+    if (typeof options === 'number') {
+      options = { length: options };
+    }
+
     // set defaults
-    length = length || 4;
-    parens = parens == null ? true : parens;
-    ellipsis = ellipsis == null ? true : ellipsis;
+    const {
+      ellipsis = legacyEllipsis,
+      length = 4,
+      parens = legacyParens,
+    } = options;
 
     // create a template for length
     let template = '';
@@ -139,12 +357,209 @@ export class FinanceModule {
    * @since 2.0.1
    */
   amount(
-    min: number = 0,
-    max: number = 1000,
-    dec: number = 2,
-    symbol: string = '',
+    min?: number,
+    max?: number,
+    dec?: number,
+    symbol?: string,
     autoFormat?: boolean
+  ): string;
+  /**
+   * Generates a random amount between the given bounds (inclusive).
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.min The lower bound for the amount. Defaults to `0`.
+   * @param options.max The upper bound for the amount. Defaults to `1000`.
+   * @param options.dec The number of decimal places for the amount. Defaults to `2`.
+   * @param options.symbol The symbol used to prefix the amount. Defaults to `''`.
+   * @param options.autoFormat If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+   *
+   * @example
+   * faker.finance.amount() // '617.87'
+   * faker.finance.amount({ min: 5, max: 10 }) // '5.53'
+   * faker.finance.amount({ min: 5, max: 10, dec: 0 }) // '8'
+   * faker.finance.amount({ min: 5, max: 10, dec: 2, symbol: '$' }) // '$5.85'
+   * faker.finance.amount({ min: 5, max: 10, dec: 5, symbol: '', autoFormat: true }) // '9,75067'
+   *
+   * @since 2.0.1
+   */
+  amount(options?: {
+    /**
+     * The lower bound for the amount.
+     *
+     * @default 0
+     */
+    min?: number;
+    /**
+     * The upper bound for the amount.
+     *
+     * @default 1000
+     */
+    max?: number;
+    /**
+     * The number of decimal places for the amount.
+     *
+     * @default 2
+     */
+    dec?: number;
+    /**
+     * The symbol used to prefix the amount.
+     *
+     * @default ''
+     */
+    symbol?: string;
+    /**
+     * If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+     *
+     * @default false
+     */
+    autoFormat?: boolean;
+  }): string;
+  /**
+   * Generates a random amount between the given bounds (inclusive).
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.min The lower bound for the amount. Defaults to `0`.
+   * @param options.max The upper bound for the amount. Defaults to `1000`.
+   * @param options.dec The number of decimal places for the amount. Defaults to `2`.
+   * @param options.symbol The symbol used to prefix the amount. Defaults to `''`.
+   * @param options.autoFormat If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+   * @param legacyMax The upper bound for the amount. Defaults to `1000`.
+   * @param legacyDec The number of decimal places for the amount. Defaults to `2`.
+   * @param legacySymbol The symbol used to prefix the amount. Defaults to `''`.
+   * @param legacyAutoFormat If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+   *
+   * @example
+   * faker.finance.amount() // '617.87'
+   * faker.finance.amount({ min: 5, max: 10 }) // '5.53'
+   * faker.finance.amount({ min: 5, max: 10, dec: 0 }) // '8'
+   * faker.finance.amount({ min: 5, max: 10, dec: 2, symbol: '$' }) // '$5.85'
+   * faker.finance.amount({ min: 5, max: 10, dec: 5, symbol: '', autoFormat: true }) // '9,75067'
+   * faker.finance.amount(5, 10) // '5.53'
+   * faker.finance.amount(5, 10, 0) // '8'
+   * faker.finance.amount(5, 10, 2, '$') // '$5.85'
+   * faker.finance.amount(5, 10, 5, '', true) // '9,75067'
+   *
+   * @since 2.0.1
+   */
+  amount(
+    options?:
+      | number
+      | {
+          /**
+           * The lower bound for the amount.
+           *
+           * @default 0
+           */
+          min?: number;
+          /**
+           * The upper bound for the amount.
+           *
+           * @default 1000
+           */
+          max?: number;
+          /**
+           * The number of decimal places for the amount.
+           *
+           * @default 2
+           */
+          dec?: number;
+          /**
+           * The symbol used to prefix the amount.
+           *
+           * @default ''
+           */
+          symbol?: string;
+          /**
+           * If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+           *
+           * @default false
+           */
+          autoFormat?: boolean;
+        },
+    legacyMax?: number,
+    legacyDec?: number,
+    legacySymbol?: string,
+    legacyAutoFormat?: boolean
+  ): string;
+  /**
+   * Generates a random amount between the given bounds (inclusive).
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.min The lower bound for the amount. Defaults to `0`.
+   * @param options.max The upper bound for the amount. Defaults to `1000`.
+   * @param options.dec The number of decimal places for the amount. Defaults to `2`.
+   * @param options.symbol The symbol used to prefix the amount. Defaults to `''`.
+   * @param options.autoFormat If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+   * @param legacyMax The upper bound for the amount. Defaults to `1000`.
+   * @param legacyDec The number of decimal places for the amount. Defaults to `2`.
+   * @param legacySymbol The symbol used to prefix the amount. Defaults to `''`.
+   * @param legacyAutoFormat If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+   *
+   * @example
+   * faker.finance.amount() // '617.87'
+   * faker.finance.amount({ min: 5, max: 10 }) // '5.53'
+   * faker.finance.amount({ min: 5, max: 10, dec: 0 }) // '8'
+   * faker.finance.amount({ min: 5, max: 10, dec: 2, symbol: '$' }) // '$5.85'
+   * faker.finance.amount({ min: 5, max: 10, dec: 5, symbol: '', autoFormat: true }) // '9,75067'
+   * faker.finance.amount(5, 10) // '5.53'
+   * faker.finance.amount(5, 10, 0) // '8'
+   * faker.finance.amount(5, 10, 2, '$') // '$5.85'
+   * faker.finance.amount(5, 10, 5, '', true) // '9,75067'
+   *
+   * @since 2.0.1
+   */
+  amount(
+    options:
+      | number
+      | {
+          /**
+           * The lower bound for the amount.
+           *
+           * @default 0
+           */
+          min?: number;
+          /**
+           * The upper bound for the amount.
+           *
+           * @default 1000
+           */
+          max?: number;
+          /**
+           * The number of decimal places for the amount.
+           *
+           * @default 2
+           */
+          dec?: number;
+          /**
+           * The symbol used to prefix the amount.
+           *
+           * @default ''
+           */
+          symbol?: string;
+          /**
+           * If true this method will use `Number.toLocaleString()`. Otherwise it will use `Number.toFixed()`.
+           *
+           * @default false
+           */
+          autoFormat?: boolean;
+        } = {},
+    legacyMax: number = 1000,
+    legacyDec: number = 2,
+    legacySymbol: string = '',
+    legacyAutoFormat: boolean = false
   ): string {
+    if (typeof options === 'number') {
+      options = { min: options };
+    }
+
+    const {
+      autoFormat = legacyAutoFormat,
+      dec = legacyDec,
+      max = legacyMax,
+      min = 0,
+      symbol = legacySymbol,
+    } = options;
+
     const randValue = this.faker.number.float({
       max,
       min,
@@ -177,6 +592,25 @@ export class FinanceModule {
     );
   }
 
+  /**
+   * Returns a random currency object, containing `code`, `name `and `symbol` properties.
+   *
+   * @see
+   * faker.finance.currencyCode()
+   * faker.finance.currencyName()
+   * faker.finance.currencySymbol()
+   *
+   * @example
+   * faker.finance.currency() // { code: 'USD', name: 'US Dollar', symbol: '$' }
+   *
+   * @since 8.0.0
+   */
+  currency(): Currency {
+    return this.faker.helpers.arrayElement(
+      this.faker.definitions.finance.currency
+    );
+  }
+
   /**
    * Returns a random currency code.
    * (The short text/abbreviation for the currency (e.g. `US Dollar` -> `USD`))
@@ -187,9 +621,7 @@ export class FinanceModule {
    * @since 2.0.1
    */
   currencyCode(): string {
-    return this.faker.helpers.objectValue(
-      this.faker.definitions.finance.currency
-    )['code'];
+    return this.currency().code;
   }
 
   /**
@@ -201,9 +633,7 @@ export class FinanceModule {
    * @since 2.0.1
    */
   currencyName(): string {
-    return this.faker.helpers.objectKey(
-      this.faker.definitions.finance.currency
-    ) as string;
+    return this.currency().name;
   }
 
   /**
@@ -217,9 +647,7 @@ export class FinanceModule {
   currencySymbol(): string {
     let symbol: string;
     while (!symbol) {
-      symbol = this.faker.helpers.objectValue(
-        this.faker.definitions.finance.currency
-      )['symbol'];
+      symbol = this.currency().symbol;
     }
 
     return symbol;
@@ -280,7 +708,86 @@ export class FinanceModule {
    *
    * @since 5.0.0
    */
-  creditCardNumber(issuer = ''): string {
+  creditCardNumber(issuer?: string): string;
+  /**
+   * Generates a random credit card number.
+   *
+   * @param options An options object. Defaults to `''`.
+   * @param options.issuer The name of the issuer (case insensitive) or the format used to generate one.
+   *
+   * @example
+   * faker.finance.creditCardNumber() // '4427163488662'
+   * faker.finance.creditCardNumber({ issuer: 'visa' }) // '4882664999007'
+   * faker.finance.creditCardNumber({ issuer: '63[7-9]#-####-####-###L' }) // '6375-3265-4676-6646'
+   *
+   * @since 5.0.0
+   */
+  creditCardNumber(options?: {
+    /**
+     * The name of the issuer (case insensitive) or the format used to generate one.
+     *
+     * @default ''
+     */
+    issuer?: string;
+  }): string;
+  /**
+   * Generates a random credit card number.
+   *
+   * @param options An options object, the issuer or a custom format. Defaults to `{}`.
+   * @param options.issuer The name of the issuer (case insensitive) or the format used to generate one.
+   *
+   * @example
+   * faker.finance.creditCardNumber() // '4427163488662'
+   * faker.finance.creditCardNumber({ issuer: 'visa' }) // '4882664999007'
+   * faker.finance.creditCardNumber({ issuer: '63[7-9]#-####-####-###L' }) // '6375-3265-4676-6646'
+   * faker.finance.creditCardNumber('visa') // '1226423499765'
+   *
+   * @since 5.0.0
+   */
+  creditCardNumber(
+    options?:
+      | string
+      | {
+          /**
+           * The name of the issuer (case insensitive) or the format used to generate one.
+           *
+           * @default ''
+           */
+          issuer?: string;
+        }
+  ): string;
+  /**
+   * Generates a random credit card number.
+   *
+   * @param options An options object, the issuer or a custom format. Defaults to `{}`.
+   * @param options.issuer The name of the issuer (case insensitive) or the format used to generate one.
+   *
+   * @example
+   * faker.finance.creditCardNumber() // '4427163488662'
+   * faker.finance.creditCardNumber({ issuer: 'visa' }) // '4882664999007'
+   * faker.finance.creditCardNumber({ issuer: '63[7-9]#-####-####-###L' }) // '6375-3265-4676-6646'
+   * faker.finance.creditCardNumber('visa') // '1226423499765'
+   *
+   * @since 5.0.0
+   */
+  creditCardNumber(
+    options:
+      | string
+      | {
+          /**
+           * The name of the issuer (case insensitive) or the format used to generate one.
+           *
+           * @default ''
+           */
+          issuer?: string;
+        } = {}
+  ): string {
+    if (typeof options === 'string') {
+      options = { issuer: options };
+    }
+
+    const { issuer = '' } = options;
+
     let format: string;
     const localeFormat = this.faker.definitions.finance.credit_card;
     const normalizedIssuer = issuer.toLowerCase();
@@ -338,7 +845,86 @@ export class FinanceModule {
    *
    * @since 6.2.0
    */
-  pin(length: number = 4): string {
+  pin(length?: number): string;
+  /**
+   * Generates a random PIN number.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.length The length of the PIN to generate. Defaults to `4`.
+   * @throws Will throw an error if length is less than 1.
+   *
+   * @example
+   * faker.finance.pin() // '5067'
+   * faker.finance.pin({ length: 6 }) // '213789'
+   *
+   * @since 6.2.0
+   */
+  pin(options?: {
+    /**
+     * The length of the PIN to generate.
+     *
+     * @default 4
+     */
+    length?: number;
+  }): string;
+  /**
+   * Generates a random PIN number.
+   *
+   * @param options An options object or the length of the PIN. Defaults to `{}`.
+   * @param options.length The length of the PIN to generate. Defaults to `4`.
+   * @throws Will throw an error if length is less than 1.
+   *
+   * @example
+   * faker.finance.pin() // '5067'
+   * faker.finance.pin({ length: 6 }) // '213789'
+   * faker.finance.pin(6) // '213789'
+   *
+   * @since 6.2.0
+   */
+  pin(
+    options?:
+      | number
+      | {
+          /**
+           * The length of the PIN to generate.
+           *
+           * @default 4
+           */
+          length?: number;
+        }
+  ): string;
+  /**
+   * Generates a random PIN number.
+   *
+   * @param options An options object or the length of the PIN. Defaults to `{}`.
+   * @param options.length The length of the PIN to generate. Defaults to `4`.
+   * @throws Will throw an error if length is less than 1.
+   *
+   * @example
+   * faker.finance.pin() // '5067'
+   * faker.finance.pin({ length: 6 }) // '213789'
+   * faker.finance.pin(6) // '213789'
+   *
+   * @since 6.2.0
+   */
+  pin(
+    options:
+      | number
+      | {
+          /**
+           * The length of the PIN to generate.
+           *
+           * @default 4
+           */
+          length?: number;
+        } = {}
+  ): string {
+    if (typeof options === 'number') {
+      options = { length: options };
+    }
+
+    const { length = 4 } = options;
+
     if (length < 1) {
       throw new FakerError('minimum length is 1');
     }
@@ -378,7 +964,115 @@ export class FinanceModule {
    *
    * @since 4.0.0
    */
-  iban(formatted: boolean = false, countryCode?: string): string {
+  iban(formatted?: boolean, countryCode?: string): string;
+  /**
+   * Generates a random iban.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.formatted Return a formatted version of the generated IBAN. Defaults to `false`.
+   * @param options.countryCode The country code from which you want to generate an IBAN, if none is provided a random country will be used.
+   * @throws Will throw an error if the passed country code is not supported.
+   *
+   * @example
+   * faker.finance.iban() // 'TR736918640040966092800056'
+   * faker.finance.iban({ formatted: true }) // 'FR20 8008 2330 8984 74S3 Z620 224'
+   * faker.finance.iban({ formatted: true, countryCode: 'DE' }) // 'DE84 1022 7075 0900 1170 01'
+   *
+   * @since 4.0.0
+   */
+  iban(options?: {
+    /**
+     * Return a formatted version of the generated IBAN.
+     *
+     * @default false
+     */
+    formatted?: boolean;
+    /**
+     * The country code from which you want to generate an IBAN,
+     * if none is provided a random country will be used.
+     */
+    countryCode?: string;
+  }): string;
+  /**
+   * Generates a random iban.
+   *
+   * @param options An options object or whether the return value should be formatted. Defaults to `{}`.
+   * @param options.formatted Return a formatted version of the generated IBAN. Defaults to `false`.
+   * @param options.countryCode The country code from which you want to generate an IBAN, if none is provided a random country will be used.
+   * @param legacyCountryCode The country code from which you want to generate an IBAN, if none is provided a random country will be used.
+   *
+   * @throws Will throw an error if the passed country code is not supported.
+   *
+   * @example
+   * faker.finance.iban() // 'TR736918640040966092800056'
+   * faker.finance.iban({ formatted: true }) // 'FR20 8008 2330 8984 74S3 Z620 224'
+   * faker.finance.iban({ formatted: true, countryCode: 'DE' }) // 'DE84 1022 7075 0900 1170 01'
+   * faker.finance.iban(true) // 'FR20 8008 2330 8984 74S3 Z620 224'
+   * faker.finance.iban(true, 'DE') // 'DE84 1022 7075 0900 1170 01'
+   *
+   * @since 4.0.0
+   */
+  iban(
+    options?:
+      | boolean
+      | {
+          /**
+           * Return a formatted version of the generated IBAN.
+           *
+           * @default false
+           */
+          formatted?: boolean;
+          /**
+           * The country code from which you want to generate an IBAN,
+           * if none is provided a random country will be used.
+           */
+          countryCode?: string;
+        },
+    legacyCountryCode?: string
+  ): string;
+  /**
+   * Generates a random iban.
+   *
+   * @param options An options object or whether the return value should be formatted. Defaults to `{}`.
+   * @param options.formatted Return a formatted version of the generated IBAN. Defaults to `false`.
+   * @param options.countryCode The country code from which you want to generate an IBAN, if none is provided a random country will be used.
+   * @param legacyCountryCode The country code from which you want to generate an IBAN, if none is provided a random country will be used.
+   *
+   * @throws Will throw an error if the passed country code is not supported.
+   *
+   * @example
+   * faker.finance.iban() // 'TR736918640040966092800056'
+   * faker.finance.iban({ formatted: true }) // 'FR20 8008 2330 8984 74S3 Z620 224'
+   * faker.finance.iban({ formatted: true, countryCode: 'DE' }) // 'DE84 1022 7075 0900 1170 01'
+   * faker.finance.iban(true) // 'FR20 8008 2330 8984 74S3 Z620 224'
+   * faker.finance.iban(true, 'DE') // 'DE84 1022 7075 0900 1170 01'
+   *
+   * @since 4.0.0
+   */
+  iban(
+    options:
+      | boolean
+      | {
+          /**
+           * Return a formatted version of the generated IBAN.
+           *
+           * @default false
+           */
+          formatted?: boolean;
+          /**
+           * The country code from which you want to generate an IBAN,
+           * if none is provided a random country will be used.
+           */
+          countryCode?: string;
+        } = {},
+    legacyCountryCode?: string
+  ): string {
+    if (typeof options === 'boolean') {
+      options = { formatted: options };
+    }
+
+    const { countryCode = legacyCountryCode, formatted = false } = options;
+
     const ibanFormat = countryCode
       ? iban.formats.find((f) => f.country === countryCode)
       : this.faker.helpers.arrayElement(iban.formats);
diff --git a/src/modules/git/index.ts b/src/modules/git/index.ts
index 394f9610461..e35ece2b435 100644
--- a/src/modules/git/index.ts
+++ b/src/modules/git/index.ts
@@ -1,4 +1,5 @@
 import type { Faker } from '../..';
+import { deprecated } from '../../internal/deprecated';
 
 const GIT_DATE_FORMAT_BASE = new Intl.DateTimeFormat('en', {
   weekday: 'short',
@@ -24,7 +25,9 @@ const GIT_TIMEZONE_FORMAT = new Intl.NumberFormat('en', {
 export class GitModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(GitModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(GitModule.prototype) as Array<
+      keyof GitModule | 'constructor'
+    >) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -102,15 +105,19 @@ export class GitModule {
     const lines = [`commit ${this.faker.git.commitSha()}`];
 
     if (merge) {
-      lines.push(`Merge: ${this.shortSha()} ${this.shortSha()}`);
+      lines.push(
+        `Merge: ${this.commitSha({ length: 7 })} ${this.commitSha({
+          length: 7,
+        })}`
+      );
     }
 
     const firstName = this.faker.person.firstName();
     const lastName = this.faker.person.lastName();
     const fullName = this.faker.person.fullName({ firstName, lastName });
-    const username = this.faker.internet.userName(firstName, lastName);
+    const username = this.faker.internet.userName({ firstName, lastName });
     let user = this.faker.helpers.arrayElement([fullName, username]);
-    const email = this.faker.internet.email(firstName, lastName);
+    const email = this.faker.internet.email({ firstName, lastName });
 
     // Normalize user according to https://github.com/libgit2/libgit2/issues/5342
     user = user.replace(/^[\.,:;"\\']|[\<\>\n]|[\.,:;"\\']$/g, '');
@@ -184,16 +191,37 @@ export class GitModule {
   }
 
   /**
-   * Generates a random commit sha (full).
+   * Generates a random commit sha.
+   *
+   * By default, the length of the commit sha is 40 characters.
+   *
+   * For a shorter commit sha, use the `length` option.
+   *
+   * Usual short commit sha length is:
+   * - 7 for GitHub
+   * - 8 for GitLab
+   *
+   * @param options Options for the commit sha.
+   * @param options.length The length of the commit sha. Defaults to 40.
    *
    * @example
    * faker.git.commitSha() // '2c6e3880fd94ddb7ef72d34e683cdc0c47bec6e6'
    *
    * @since 5.0.0
    */
-  commitSha(): string {
+  commitSha(
+    options: {
+      /**
+       * The length of the commit sha.
+       *
+       * @default 40
+       */
+      length?: number;
+    } = {}
+  ): string {
+    const { length = 40 } = options;
     return this.faker.string.hexadecimal({
-      length: 40,
+      length,
       casing: 'lower',
       prefix: '',
     });
@@ -206,12 +234,16 @@ export class GitModule {
    * faker.git.shortSha() // '6155732'
    *
    * @since 5.0.0
+   *
+   * @deprecated Use `faker.git.commitSha({ length: 7 })` instead.
    */
   shortSha(): string {
-    return this.faker.string.hexadecimal({
-      length: 7,
-      casing: 'lower',
-      prefix: '',
+    deprecated({
+      deprecated: 'faker.git.shortSha()',
+      proposed: 'faker.git.commitSha({ length: 7 })',
+      since: '8.0',
+      until: '9.0',
     });
+    return this.commitSha({ length: 7 });
   }
 }
diff --git a/src/modules/hacker/index.ts b/src/modules/hacker/index.ts
index aadf839a779..00b9a686d55 100644
--- a/src/modules/hacker/index.ts
+++ b/src/modules/hacker/index.ts
@@ -6,7 +6,9 @@ import type { Faker } from '../..';
 export class HackerModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(HackerModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      HackerModule.prototype
+    ) as Array<keyof HackerModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts
index c22a3612052..4f1c164d821 100644
--- a/src/modules/helpers/index.ts
+++ b/src/modules/helpers/index.ts
@@ -10,7 +10,9 @@ import * as uniqueExec from './unique';
 export class HelpersModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(HelpersModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      HelpersModule.prototype
+    ) as Array<keyof HelpersModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -804,8 +806,10 @@ export class HelpersModule {
 
     // Search for the requested method or definition
     for (const part of parts) {
-      currentModuleOrMethod = currentModuleOrMethod?.[part];
-      currentDefinitions = currentDefinitions?.[part];
+      currentModuleOrMethod =
+        currentModuleOrMethod?.[part as keyof typeof currentModuleOrMethod];
+      currentDefinitions =
+        currentDefinitions?.[part as keyof typeof currentDefinitions];
     }
 
     // Make method executable
@@ -903,9 +907,15 @@ export class HelpersModule {
    *
    * @since 7.5.0
    */
-  unique<Method extends (...parameters) => RecordKey>(
+  unique<
+    Method extends (
+      // TODO christopher 2023-02-14: This `any` type can be fixed by anyone if they want to.
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      ...parameters: any[]
+    ) => RecordKey
+  >(
     method: Method,
-    args?: Parameters<Method>,
+    args: Parameters<Method> = [] as Parameters<Method>,
     options: {
       /**
        * This parameter does nothing.
diff --git a/src/modules/helpers/unique.ts b/src/modules/helpers/unique.ts
index fd240c2f0de..26f1b6d0d88 100644
--- a/src/modules/helpers/unique.ts
+++ b/src/modules/helpers/unique.ts
@@ -81,7 +81,13 @@ Try adjusting maxTime or maxRetries parameters for faker.helpers.unique().`
  * @param options.compare The function used to determine whether a value was already returned. Defaults to check the existence of the key.
  * @param options.store The store of unique entries. Defaults to `GLOBAL_UNIQUE_STORE`.
  */
-export function exec<Method extends (...parameters) => RecordKey>(
+export function exec<
+  Method extends (
+    // TODO christopher 2023-02-14: This `any` type can be fixed by anyone if they want to.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ...parameters: any[]
+  ) => RecordKey
+>(
   method: Method,
   args: Parameters<Method>,
   options: {
@@ -137,7 +143,7 @@ export function exec<Method extends (...parameters) => RecordKey>(
   }
 
   // Execute the provided method to find a potential satisfied value.
-  const result: ReturnType<Method> = method.apply(this, args);
+  const result: ReturnType<Method> = method(...args) as ReturnType<Method>;
 
   // If the result has not been previously found, add it to the found array and return the value as it's unique.
   if (compare(store, result) === -1 && exclude.indexOf(result) === -1) {
diff --git a/src/modules/image/index.ts b/src/modules/image/index.ts
index 794a9514bde..17d076ccd52 100644
--- a/src/modules/image/index.ts
+++ b/src/modules/image/index.ts
@@ -12,30 +12,40 @@ export class ImageModule {
   /**
    * @deprecated Use `faker.image` instead.
    */
+  // eslint-disable-next-line deprecation/deprecation
   readonly unsplash: Unsplash;
 
   /**
    * @deprecated Use `faker.image` instead.
    */
+  // eslint-disable-next-line deprecation/deprecation
   readonly lorempicsum: LoremPicsum;
 
   /**
    * @deprecated Use `faker.image.urlPlaceholder` instead.
    */
+  // eslint-disable-next-line deprecation/deprecation
   readonly placeholder: Placeholder;
 
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(ImageModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      ImageModule.prototype
+    ) as Array<keyof ImageModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
 
-      this[name] = this[name].bind(this);
+      this[name] =
+        // @ts-expect-error: remove this expect-error when we remove the deprecated sub-modules
+        this[name].bind(this);
     }
 
+    // eslint-disable-next-line deprecation/deprecation
     this.unsplash = new Unsplash(this.faker);
+    // eslint-disable-next-line deprecation/deprecation
     this.lorempicsum = new LoremPicsum(this.faker);
+    // eslint-disable-next-line deprecation/deprecation
     this.placeholder = new Placeholder(this.faker);
   }
 
@@ -497,6 +507,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'abstract', randomize);
   }
 
@@ -523,6 +534,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'animals', randomize);
   }
 
@@ -549,6 +561,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'business', randomize);
   }
 
@@ -575,6 +588,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'cats', randomize);
   }
 
@@ -601,6 +615,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'city', randomize);
   }
 
@@ -627,6 +642,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'food', randomize);
   }
 
@@ -653,6 +669,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'nightlife', randomize);
   }
 
@@ -679,6 +696,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'fashion', randomize);
   }
 
@@ -705,6 +723,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'people', randomize);
   }
 
@@ -731,6 +750,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'nature', randomize);
   }
 
@@ -757,6 +777,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'sports', randomize);
   }
 
@@ -783,6 +804,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'technics', randomize);
   }
 
@@ -809,6 +831,7 @@ export class ImageModule {
       since: '8.0',
       until: '9.0',
     });
+    // eslint-disable-next-line deprecation/deprecation
     return this.imageUrl(width, height, 'transport', randomize);
   }
 }
diff --git a/src/modules/image/providers/lorempicsum.ts b/src/modules/image/providers/lorempicsum.ts
index f2f915eae57..b9189a0fa9c 100644
--- a/src/modules/image/providers/lorempicsum.ts
+++ b/src/modules/image/providers/lorempicsum.ts
@@ -1,3 +1,4 @@
+/* eslint-disable deprecation/deprecation */
 import type { Faker } from '../../..';
 import { deprecated } from '../../../internal/deprecated';
 
diff --git a/src/modules/image/providers/placeholder.ts b/src/modules/image/providers/placeholder.ts
index 9691a9ff7f5..42108c562d0 100644
--- a/src/modules/image/providers/placeholder.ts
+++ b/src/modules/image/providers/placeholder.ts
@@ -1,3 +1,4 @@
+/* eslint-disable deprecation/deprecation */
 import type { Faker } from '../../..';
 import { deprecated } from '../../../internal/deprecated';
 
@@ -9,7 +10,9 @@ import { deprecated } from '../../../internal/deprecated';
 export class Placeholder {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(Placeholder.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      Placeholder.prototype
+    ) as Array<keyof Placeholder | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/image/providers/unsplash.ts b/src/modules/image/providers/unsplash.ts
index aaaae9c7510..236357e2608 100644
--- a/src/modules/image/providers/unsplash.ts
+++ b/src/modules/image/providers/unsplash.ts
@@ -1,3 +1,4 @@
+/* eslint-disable deprecation/deprecation */
 import type { Faker } from '../../..';
 import { deprecated } from '../../../internal/deprecated';
 
diff --git a/src/modules/internet/index.ts b/src/modules/internet/index.ts
index 3287e4048bc..75bebae051d 100644
--- a/src/modules/internet/index.ts
+++ b/src/modules/internet/index.ts
@@ -1,4 +1,5 @@
 import type { Faker } from '../..';
+import { deprecated } from '../../internal/deprecated';
 import { charMapping } from './char-mappings';
 import * as random_ua from './user-agent';
 
@@ -29,7 +30,9 @@ export type HTTPProtocolType = 'http' | 'https';
 export class InternetModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(InternetModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      InternetModule.prototype
+    ) as Array<keyof InternetModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -53,6 +56,48 @@ export class InternetModule {
     )}.jpg`;
   }
 
+  /**
+   * Generates an email address using the given person's name as base.
+   *
+   * @param options The options to use. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param options.provider The mail provider domain to use. If not specified, a random free mail provider will be chosen.
+   * @param options.allowSpecialCharacters Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included
+   * in the email address. Defaults to `false`.
+   *
+   * @example
+   * faker.internet.email() // 'Kassandra4@hotmail.com'
+   * faker.internet.email({ firstName: 'Jeanne', lastName: 'Doe' }) // 'Jeanne63@yahoo.com'
+   * faker.internet.email({ firstName: 'Jeanne', lastName: 'Doe', provider: 'example.fakerjs.dev' }) // 'Jeanne_Doe88@example.fakerjs.dev'
+   * faker.internet.email({ firstName: 'Jeanne', lastName: 'Doe', provider: 'example.fakerjs.dev', allowSpecialCharacters: true }) // 'Jeanne%Doe88@example.fakerjs.dev'
+   *
+   * @since 2.0.1
+   */
+  email(options?: {
+    /**
+     * The optional first name to use.
+     *
+     * @default faker.person.firstName()
+     */
+    firstName?: string;
+    /**
+     * The optional last name to use.
+     *
+     * @default faker.person.lastName()
+     */
+    lastName?: string;
+    /**
+     * The mail provider domain to use. If not specified, a random free mail provider will be chosen.
+     */
+    provider?: string;
+    /**
+     * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+     *
+     * @default false
+     */
+    allowSpecialCharacters?: boolean;
+  }): string;
   /**
    * Generates an email address using the given person's name as base.
    *
@@ -70,6 +115,8 @@ export class InternetModule {
    * faker.internet.email('Jeanne', 'Doe', 'example.fakerjs.dev', { allowSpecialCharacters: true }) // 'Jeanne%Doe88@example.fakerjs.dev'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.internet.email({ firstName, lastName, provider, ... })` instead.
    */
   email(
     firstName?: string,
@@ -83,14 +130,137 @@ export class InternetModule {
        */
       allowSpecialCharacters?: boolean;
     }
+  ): string;
+  /**
+   * Generates an email address using the given person's name as base.
+   *
+   * @param options The options to use. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param options.provider The mail provider domain to use. If not specified, a random free mail provider will be chosen.
+   * @param options.allowSpecialCharacters Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included
+   * in the email address. Defaults to `false`.
+   * @param legacyLastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param legacyProvider The mail provider domain to use. If not specified, a random free mail provider will be chosen.
+   * @param legacyOptions The options to use. Defaults to `{ allowSpecialCharacters: false }`.
+   * @param legacyOptions.allowSpecialCharacters Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included
+   * in the email address. Defaults to `false`.
+   *
+   * @example
+   * faker.internet.email() // 'Kassandra4@hotmail.com'
+   * faker.internet.email({ firstName: 'Jeanne', lastName: 'Doe' }) // 'Jeanne63@yahoo.com'
+   * faker.internet.email({ firstName: 'Jeanne', lastName: 'Doe', provider: 'example.fakerjs.dev' }) // 'Jeanne_Doe88@example.fakerjs.dev'
+   * faker.internet.email({ firstName: 'Jeanne', lastName: 'Doe', provider: 'example.fakerjs.dev', allowSpecialCharacters: true }) // 'Jeanne%Doe88@example.fakerjs.dev'
+   *
+   * @since 2.0.1
+   */
+  email(
+    options?:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+          /**
+           * The mail provider domain to use. If not specified, a random free mail provider will be chosen.
+           */
+          provider?: string;
+          /**
+           * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+           *
+           * @default false
+           */
+          allowSpecialCharacters?: boolean;
+        },
+    legacyLastName?: string,
+    legacyProvider?: string,
+    legacyOptions?: {
+      /**
+       * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+       *
+       * @default false
+       */
+      allowSpecialCharacters?: boolean;
+    }
+  ): string;
+  email(
+    options:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+          /**
+           * The mail provider domain to use. If not specified, a random free mail provider will be chosen.
+           */
+          provider?: string;
+          /**
+           * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+           *
+           * @default false
+           */
+          allowSpecialCharacters?: boolean;
+        } = {},
+    legacyLastName?: string,
+    legacyProvider?: string,
+    legacyOptions?: {
+      /**
+       * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+       *
+       * @default false
+       */
+      allowSpecialCharacters?: boolean;
+    }
   ): string {
-    provider =
-      provider ||
-      this.faker.helpers.arrayElement(
-        this.faker.definitions.internet.free_email
-      );
+    if (
+      typeof options === 'string' ||
+      legacyLastName != null ||
+      legacyProvider != null ||
+      legacyOptions != null
+    ) {
+      deprecated({
+        deprecated:
+          'faker.internet.email(firstName, lastName, provider, options)',
+        proposed:
+          'faker.internet.email({ firstName, lastName, provider, ... })',
+        since: '8.0',
+        until: '9.0',
+      });
+    }
 
-    let localPart: string = this.userName(firstName, lastName);
+    if (typeof options === 'string') {
+      options = { firstName: options };
+    }
+
+    const {
+      firstName = this.faker.person.firstName(),
+      lastName = legacyLastName ?? this.faker.person.lastName(),
+      provider = legacyProvider ??
+        this.faker.helpers.arrayElement(
+          this.faker.definitions.internet.free_email
+        ),
+      allowSpecialCharacters = legacyOptions?.allowSpecialCharacters ?? false,
+    } = options;
+
+    let localPart: string = this.userName({ firstName, lastName });
     // Strip any special characters from the local part of the email address
     // This could happen if invalid chars are passed in manually in the firstName/lastName
     localPart = localPart.replace(/[^A-Za-z0-9._+\-]+/g, '');
@@ -98,7 +268,7 @@ export class InternetModule {
     // The local part of an email address is limited to 64 chars per RFC 3696
     // We limit to 50 chars to be more realistic
     localPart = localPart.substring(0, 50);
-    if (options?.allowSpecialCharacters) {
+    if (allowSpecialCharacters) {
       const usernameChars: string[] = '._-'.split('');
       const specialChars: string[] = ".!#$%&'*+-/=?^_`{|}~".split('');
       localPart = localPart.replace(
@@ -107,9 +277,52 @@ export class InternetModule {
       );
     }
 
+    // local parts may not contain two or more consecutive . characters
+    localPart = localPart.replace(/\.{2,}/g, '.');
+
+    // local parts may not start with or end with a . character
+    localPart = localPart.replace(/^\./, '');
+    localPart = localPart.replace(/\.$/, '');
+
     return `${localPart}@${provider}`;
   }
 
+  /**
+   * Generates an email address using an example mail provider using the given person's name as base.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param options.allowSpecialCharacters Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included
+   * in the email address. Defaults to `false`.
+   *
+   * @example
+   * faker.internet.exampleEmail() // 'Helmer.Graham23@example.com'
+   * faker.internet.exampleEmail({ firstName: 'Jeanne', lastName: 'Doe' }) // 'Jeanne96@example.net'
+   * faker.internet.exampleEmail({ firstName: 'Jeanne', lastName: 'Doe', allowSpecialCharacters: true }) // 'Jeanne%Doe88@example.com'
+   *
+   * @since 3.1.0
+   */
+  exampleEmail(options?: {
+    /**
+     * The optional first name to use.
+     *
+     * @default faker.person.firstName()
+     */
+    firstName?: string;
+    /**
+     * The optional last name to use.
+     *
+     * @default faker.person.lastName()
+     */
+    lastName?: string;
+    /**
+     * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+     *
+     * @default false
+     */
+    allowSpecialCharacters?: boolean;
+  }): string;
   /**
    * Generates an email address using an example mail provider using the given person's name as base.
    *
@@ -125,6 +338,8 @@ export class InternetModule {
    * faker.internet.exampleEmail('Jeanne', 'Doe', { allowSpecialCharacters: true }) // 'Jeanne%Doe88@example.com'
    *
    * @since 3.1.0
+   *
+   * @deprecated Use `faker.internet.exampleEmail({ firstName: lastName, ... })` instead.
    */
   exampleEmail(
     firstName?: string,
@@ -137,15 +352,169 @@ export class InternetModule {
        */
       allowSpecialCharacters?: boolean;
     }
+  ): string;
+  /**
+   * Generates an email address using an example mail provider using the given person's name as base.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param options.allowSpecialCharacters Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included
+   * in the email address. Defaults to `false`.
+   * @param legacyLastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param legacyOptions The options to use. Defaults to `{}`.
+   * @param legacyOptions.allowSpecialCharacters Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included
+   * in the email address. Defaults to `false`.
+   *
+   * @example
+   * faker.internet.exampleEmail() // 'Helmer.Graham23@example.com'
+   * faker.internet.exampleEmail({ firstName: 'Jeanne', lastName: 'Doe' }) // 'Jeanne96@example.net'
+   * faker.internet.exampleEmail({ firstName: 'Jeanne', lastName: 'Doe', allowSpecialCharacters: true }) // 'Jeanne%Doe88@example.com'
+   *
+   * @since 3.1.0
+   */
+  exampleEmail(
+    options?:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+          /**
+           * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+           *
+           * @default false
+           */
+          allowSpecialCharacters?: boolean;
+        },
+    legacyLastName?: string,
+    legacyOptions?: {
+      /**
+       * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+       *
+       * @default false
+       */
+      allowSpecialCharacters?: boolean;
+    }
+  ): string;
+  exampleEmail(
+    options:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+          /**
+           * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+           *
+           * @default false
+           */
+          allowSpecialCharacters?: boolean;
+        } = {},
+    legacyLastName?: string,
+    legacyOptions?: {
+      /**
+       * Whether special characters such as ``.!#$%&'*+-/=?^_`{|}~`` should be included in the email address.
+       *
+       * @default false
+       */
+      allowSpecialCharacters?: boolean;
+    }
   ): string {
+    if (
+      typeof options === 'string' ||
+      legacyLastName != null ||
+      legacyOptions != null
+    ) {
+      deprecated({
+        deprecated: 'faker.internet.exampleEmail(firstName, lastName, options)',
+        proposed: 'faker.internet.exampleEmail({ firstName, lastName, ... })',
+        since: '8.0',
+        until: '9.0',
+      });
+    }
+
+    if (typeof options === 'string') {
+      options = { firstName: options };
+    }
+
+    const {
+      firstName = this.faker.person.firstName(),
+      lastName = legacyLastName ?? this.faker.person.lastName(),
+      allowSpecialCharacters = legacyOptions?.allowSpecialCharacters ?? false,
+    } = options;
+
     const provider = this.faker.helpers.arrayElement(
       this.faker.definitions.internet.example_email
     );
-    return this.email(firstName, lastName, provider, options);
+
+    return this.email({
+      firstName,
+      lastName,
+      provider,
+      allowSpecialCharacters,
+    });
   }
 
   /**
-   * Generates a username using the given person's name as base. The resuling username may use neither, one or both of the names provided. This will always return a plain ASCII string. Some basic stripping of accents and transliteration of characters will be done.
+   * Generates a username using the given person's name as base.
+   * The resuling username may use neither, one or both of the names provided.
+   * This will always return a plain ASCII string.
+   * Some basic stripping of accents and transliteration of characters will be done.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   *
+   * @see faker.internet.displayName()
+   *
+   * @example
+   * faker.internet.userName() // 'Nettie_Zboncak40'
+   * faker.internet.userName({ firstName: 'Jeanne', lastName: 'Doe'}) // 'Jeanne98' - note surname is not used
+   * faker.internet.userName({ firstName: 'John', lastName: 'Doe' }) // 'John.Doe'
+   * faker.internet.userName({ firstName: 'Hélene', lastName: 'Müller' }) // 'Helene_Muller11'
+   * faker.internet.userName({ firstName: 'Фёдор', lastName: 'Достоевский' }) // 'Fedor.Dostoevskii50'
+   * faker.internet.userName({ firstName: '大羽', lastName: '陳' }) // 'hlzp8d.tpv45' - note neither name is used
+   *
+   * @since 2.0.1
+   */
+  userName(options?: {
+    /**
+     * The optional first name to use.
+     *
+     * @default faker.person.firstName()
+     */
+    firstName?: string;
+    /**
+     * The optional last name to use.
+     *
+     * @default faker.person.lastName()
+     */
+    lastName?: string;
+  }): string;
+  /**
+   * Generates a username using the given person's name as base.
+   * The resuling username may use neither, one or both of the names provided.
+   * This will always return a plain ASCII string.
+   * Some basic stripping of accents and transliteration of characters will be done.
    *
    * @param firstName The optional first name to use. If not specified, a random one will be chosen.
    * @param lastName The optional last name to use. If not specified, a random one will be chosen.
@@ -161,11 +530,90 @@ export class InternetModule {
    * faker.internet.userName('大羽', '陳') // 'hlzp8d.tpv45' - note neither name is used
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.internet.userName({ firstName, lastName })` instead.
+   */
+  userName(firstName?: string, lastName?: string): string;
+  /**
+   * Generates a username using the given person's name as base.
+   * The resuling username may use neither, one or both of the names provided.
+   * This will always return a plain ASCII string.
+   * Some basic stripping of accents and transliteration of characters will be done.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param legacyLastName The optional last name to use. If not specified, a random one will be chosen.
+   *
+   * @see faker.internet.displayName()
+   *
+   * @example
+   * faker.internet.userName() // 'Nettie_Zboncak40'
+   * faker.internet.userName({ firstName: 'Jeanne', lastName: 'Doe'}) // 'Jeanne98' - note surname is not used
+   * faker.internet.userName({ firstName: 'John', lastName: 'Doe' }) // 'John.Doe'
+   * faker.internet.userName({ firstName: 'Hélene', lastName: 'Müller' }) // 'Helene_Muller11'
+   * faker.internet.userName({ firstName: 'Фёдор', lastName: 'Достоевский' }) // 'Fedor.Dostoevskii50'
+   * faker.internet.userName({ firstName: '大羽', lastName: '陳' }) // 'hlzp8d.tpv45' - note neither name is used
+   *
+   * @since 2.0.1
    */
-  userName(firstName?: string, lastName?: string): string {
+  userName(
+    options?:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+        },
+    legacyLastName?: string
+  ): string;
+  userName(
+    options:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+        } = {},
+    legacyLastName?: string
+  ): string {
+    if (typeof options === 'string' || legacyLastName != null) {
+      deprecated({
+        deprecated: 'faker.internet.userName(firstName, lastName)',
+        proposed: 'faker.internet.userName({ firstName, lastName })',
+        since: '8.0',
+        until: '9.0',
+      });
+    }
+
+    if (typeof options === 'string') {
+      options = { firstName: options };
+    }
+
+    const {
+      firstName = this.faker.person.firstName(),
+      lastName = legacyLastName ?? this.faker.person.lastName(),
+    } = options;
+
     let result: string;
-    firstName = firstName || this.faker.person.firstName();
-    lastName = lastName || this.faker.person.lastName();
     switch (this.faker.number.int(2)) {
       case 0:
         result = `${firstName}${this.faker.number.int(99)}`;
@@ -212,7 +660,46 @@ export class InternetModule {
   }
 
   /**
-   * Generates a display name using the given person's name as base. The resulting display name may use one or both of the provided names. If the input names include Unicode characters, the resulting display name will contain Unicode characters. It will not contain spaces.
+   * Generates a display name using the given person's name as base.
+   * The resulting display name may use one or both of the provided names.
+   * If the input names include Unicode characters, the resulting display name will contain Unicode characters.
+   * It will not contain spaces.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   *
+   * @see faker.internet.userName()
+   *
+   * @example
+   * faker.internet.displayName() // 'Nettie_Zboncak40'
+   * faker.internet.displayName({ firstname 'Jeanne', lastName: 'Doe' }) // 'Jeanne98' - note surname not used.
+   * faker.internet.displayName({ firstname 'John', lastName: 'Doe' }) // 'John.Doe'
+   * faker.internet.displayName({ firstname 'Hélene', lastName: 'Müller' }) // 'Hélene_Müller11'
+   * faker.internet.displayName({ firstname 'Фёдор', lastName: 'Достоевский' }) // 'Фёдор.Достоевский50'
+   * faker.internet.displayName({ firstname '大羽', lastName: '陳' }) // '大羽.陳'
+   *
+   * @since 8.0.0
+   */
+  displayName(options?: {
+    /**
+     * The optional first name to use.
+     *
+     * @default faker.person.firstName()
+     */
+    firstName?: string;
+    /**
+     * The optional last name to use.
+     *
+     * @default faker.person.lastName()
+     */
+    lastName?: string;
+  }): string;
+  /**
+   * Generates a display name using the given person's name as base.
+   * The resulting display name may use one or both of the provided names.
+   * If the input names include Unicode characters, the resulting display name will contain Unicode characters.
+   * It will not contain spaces.
    *
    * @param firstName The optional first name to use. If not specified, a random one will be chosen.
    * @param lastName The optional last name to use. If not specified, a random one will be chosen.
@@ -221,18 +708,97 @@ export class InternetModule {
    *
    * @example
    * faker.internet.displayName() // 'Nettie_Zboncak40'
-   * faker.internet.displayName('Jeanne', 'Doe') // 'Jeanne98' - note surname not used.
+   * faker.internet.displayName('Jeanne', 'Doe') // 'Jeanne98' - note surname is not used
    * faker.internet.displayName('John', 'Doe') // 'John.Doe'
    * faker.internet.displayName('Hélene', 'Müller') // 'Hélene_Müller11'
    * faker.internet.displayName('Фёдор', 'Достоевский') // 'Фёдор.Достоевский50'
    * faker.internet.displayName('大羽', '陳') // '大羽.陳'
    *
    * @since 8.0.0
+   *
+   * @deprecated Use `faker.internet.displayName({ firstName, lastName })` instead.
    */
-  displayName(firstName?: string, lastName?: string): string {
+  displayName(firstName?: string, lastName?: string): string;
+  /**
+   * Generates a display name using the given person's name as base.
+   * The resulting display name may use one or both of the provided names.
+   * If the input names include Unicode characters, the resulting display name will contain Unicode characters.
+   * It will not contain spaces.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.firstName The optional first name to use. If not specified, a random one will be chosen.
+   * @param options.lastName The optional last name to use. If not specified, a random one will be chosen.
+   * @param legacyLastName The optional last name to use. If not specified, a random one will be chosen.
+   *
+   * @see faker.internet.userName()
+   *
+   * @example
+   * faker.internet.displayName() // 'Nettie_Zboncak40'
+   * faker.internet.displayName({ firstName: 'Jeanne', lastName: 'Doe'}) // 'Jeanne98' - note surname is not used
+   * faker.internet.displayName({ firstName: 'John', lastName: 'Doe' }) // 'John.Doe'
+   * faker.internet.displayName({ firstName: 'Hélene', lastName: 'Müller' }) // 'Hélene_Müller11'
+   * faker.internet.displayName({ firstName: 'Фёдор', lastName: 'Достоевский' }) // 'Фёдор.Достоевский50'
+   * faker.internet.displayName({ firstName: '大羽', lastName: '陳' }) // '大羽.陳'
+   *
+   * @since 8.0.0
+   */
+  displayName(
+    options?:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+        },
+    legacyLastName?: string
+  ): string;
+  displayName(
+    options:
+      | string
+      | {
+          /**
+           * The optional first name to use.
+           *
+           * @default faker.person.firstName()
+           */
+          firstName?: string;
+          /**
+           * The optional last name to use.
+           *
+           * @default faker.person.lastName()
+           */
+          lastName?: string;
+        } = {},
+    legacyLastName?: string
+  ): string {
+    if (typeof options === 'string' || legacyLastName != null) {
+      deprecated({
+        deprecated: 'faker.internet.displayName(firstName, lastName)',
+        proposed: 'faker.internet.displayName({ firstName, lastName })',
+        since: '8.0',
+        until: '9.0',
+      });
+    }
+
+    if (typeof options === 'string') {
+      options = { firstName: options };
+    }
+
+    const {
+      firstName = this.faker.person.firstName(),
+      lastName = legacyLastName ?? this.faker.person.lastName(),
+    } = options;
+
     let result: string;
-    firstName = firstName || this.faker.person.firstName();
-    lastName = lastName || this.faker.person.lastName();
     switch (this.faker.number.int(2)) {
       case 0:
         result = `${firstName}${this.faker.number.int(99)}`;
@@ -475,6 +1041,43 @@ export class InternetModule {
     return random_ua.generate(this.faker);
   }
 
+  /**
+   * Generates a random css hex color code in aesthetically pleasing color palette.
+   *
+   * Based on
+   * http://stackoverflow.com/questions/43044/algorithm-to-randomly-generate-an-aesthetically-pleasing-color-palette
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.redBase The optional base red in range between `0` and `255`. Defaults to `0`.
+   * @param options.greenBase The optional base green in range between `0` and `255`. Defaults to `0`.
+   * @param options.blueBase The optional base blue in range between `0` and `255`. Defaults to `0`.
+   *
+   * @example
+   * faker.internet.color() // '#30686e'
+   * faker.internet.color({ redBase: 100, greenBase: 100, blueBase: 100 }) // '#4e5f8b'
+   *
+   * @since 2.0.1
+   */
+  color(options?: {
+    /**
+     * The optional base red in range between `0` and `255`.
+     *
+     * @default 0
+     */
+    redBase?: number;
+    /**
+     * The optional base green in range between `0` and `255`.
+     *
+     * @default 0
+     */
+    greenBase?: number;
+    /**
+     * The optional base blue in range between `0` and `255`.
+     *
+     * @default 0
+     */
+    blueBase?: number;
+  }): string;
   /**
    * Generates a random css hex color code in aesthetically pleasing color palette.
    *
@@ -490,12 +1093,104 @@ export class InternetModule {
    * faker.internet.color(100, 100, 100) // '#4e5f8b'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.internet.color({ redbase, greenBase, blueBase })` instead.
+   */
+  color(redBase?: number, greenBase?: number, blueBase?: number): string;
+  /**
+   * Generates a random css hex color code in aesthetically pleasing color palette.
+   *
+   * Based on
+   * http://stackoverflow.com/questions/43044/algorithm-to-randomly-generate-an-aesthetically-pleasing-color-palette
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.redBase The optional base red in range between `0` and `255`. Defaults to `0`.
+   * @param options.greenBase The optional base green in range between `0` and `255`. Defaults to `0`.
+   * @param options.blueBase The optional base blue in range between `0` and `255`. Defaults to `0`.
+   * @param legacyGreenBase The optional base green in range between `0` and `255`. Defaults to `0`.
+   * @param legacyBlueBase The optional base blue in range between `0` and `255`. Defaults to `0`.
+   *
+   * @example
+   * faker.internet.color() // '#30686e'
+   * faker.internet.color({ redBase: 100, greenBase: 100, blueBase: 100 }) // '#4e5f8b'
+   *
+   * @since 2.0.1
    */
   color(
-    redBase: number = 0,
-    greenBase: number = 0,
-    blueBase: number = 0
+    options?:
+      | number
+      | {
+          /**
+           * The optional base red in range between `0` and `255`.
+           *
+           * @default 0
+           */
+          redBase?: number;
+          /**
+           * The optional base green in range between `0` and `255`.
+           *
+           * @default 0
+           */
+          greenBase?: number;
+          /**
+           * The optional base blue in range between `0` and `255`.
+           *
+           * @default 0
+           */
+          blueBase?: number;
+        },
+    legacyGreenBase?: number,
+    legacyBlueBase?: number
+  ): string;
+  color(
+    options:
+      | number
+      | {
+          /**
+           * The optional base red in range between `0` and `255`.
+           *
+           * @default 0
+           */
+          redBase?: number;
+          /**
+           * The optional base green in range between `0` and `255`.
+           *
+           * @default 0
+           */
+          greenBase?: number;
+          /**
+           * The optional base blue in range between `0` and `255`.
+           *
+           * @default 0
+           */
+          blueBase?: number;
+        } = {},
+    legacyGreenBase?: number,
+    legacyBlueBase?: number
   ): string {
+    if (
+      typeof options === 'number' ||
+      legacyBlueBase != null ||
+      legacyGreenBase != null
+    ) {
+      deprecated({
+        deprecated: 'faker.internet.color(redBase, greenBase, blueBase)',
+        proposed: 'faker.internet.color({ redBase, greenBase, blueBase })',
+        since: '8.0',
+        until: '9.0',
+      });
+    }
+
+    if (typeof options === 'number') {
+      options = { redBase: options };
+    }
+
+    const {
+      redBase = 0,
+      greenBase = legacyGreenBase ?? 0,
+      blueBase = legacyBlueBase ?? 0,
+    } = options;
+
     const colorFromBase = (base: number): string =>
       Math.floor((this.faker.number.int(256) + base) / 2)
         .toString(16)
@@ -508,6 +1203,25 @@ export class InternetModule {
     return `#${red}${green}${blue}`;
   }
 
+  /**
+   * Generates a random mac address.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param separator The optional separator to use. Can be either `':'`, `'-'` or `''`. Defaults to `':'`.
+   *
+   * @example
+   * faker.internet.mac() // '32:8e:2e:09:c6:05'
+   *
+   * @since 3.0.0
+   */
+  mac(options?: {
+    /**
+     * The optional separator to use. Can be either `':'`, `'-'` or `''`.
+     *
+     * @default ':'
+     */
+    separator?: string;
+  }): string;
   /**
    * Generates a random mac address.
    *
@@ -518,27 +1232,112 @@ export class InternetModule {
    *
    * @since 3.0.0
    */
-  mac(sep?: string): string {
+  mac(sep?: string): string;
+  /**
+   * Generates a random mac address.
+   *
+   * @param options The optional separator or an options object. Defaults to `{}`.
+   * @param separator The optional separator to use. Can be either `':'`, `'-'` or `''`. Defaults to `':'`.
+   *
+   * @example
+   * faker.internet.mac() // '32:8e:2e:09:c6:05'
+   *
+   * @since 3.0.0
+   */
+  mac(
+    options?:
+      | string
+      | {
+          /**
+           * The optional separator to use. Can be either `':'`, `'-'` or `''`.
+           *
+           * @default ':'
+           */
+          separator?: string;
+        }
+  ): string;
+  mac(
+    options:
+      | string
+      | {
+          /**
+           * The optional separator to use. Can be either `':'`, `'-'` or `''`.
+           *
+           * @default ':'
+           */
+          separator?: string;
+        } = {}
+  ): string {
+    if (typeof options === 'string') {
+      options = { separator: options };
+    }
+
+    let { separator = ':' } = options;
+
     let i: number;
     let mac = '';
-    let validSep = ':';
 
-    // if the client passed in a different separator than `:`,
-    // we will use it if it is in the list of acceptable separators (dash or no separator)
-    if (['-', ''].indexOf(sep) !== -1) {
-      validSep = sep;
+    const acceptableSeparators = [':', '-', ''];
+    if (!acceptableSeparators.includes(separator)) {
+      separator = ':';
     }
 
     for (i = 0; i < 12; i++) {
       mac += this.faker.number.hex(15);
       if (i % 2 === 1 && i !== 11) {
-        mac += validSep;
+        mac += separator;
       }
     }
 
     return mac;
   }
 
+  /**
+   * Generates a random password.
+   *
+   * @param options An options object. Defaults to `{}`.
+   * @param options.length The length of the password to generate. Defaults to `15`.
+   * @param options.memorable Whether the generated password should be memorable. Defaults to `false`.
+   * @param options.pattern The pattern that all chars should match should match.
+   * This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
+   * @param options.prefix The prefix to use. Defaults to `''`.
+   *
+   * @example
+   * faker.internet.password() // '89G1wJuBLbGziIs'
+   * faker.internet.password({ length: 20 }) // 'aF55c_8O9kZaPOrysFB_'
+   * faker.internet.password({ length: 20, memorable: true }) // 'lawetimufozujosodedi'
+   * faker.internet.password({ length: 20, memorable: true, pattern: /[A-Z]/ }) // 'HMAQDFFYLDDUTBKVNFVS'
+   * faker.internet.password({ length: 20, memorable: true, pattern: /[A-Z]/, prefix: 'Hello ' }) // 'Hello IREOXTDWPERQSB'
+   *
+   * @since 2.0.1
+   */
+  password(options?: {
+    /**
+     * The length of the password to generate.
+     *
+     * @default 15
+     */
+    length?: number;
+    /**
+     * Whether the generated password should be memorable.
+     *
+     * @default false
+     */
+    memorable?: boolean;
+    /**
+     * The pattern that all chars should match should match.
+     * This option will be ignored, if `memorable` is `true`.
+     *
+     * @default /\w/
+     */
+    pattern?: RegExp;
+    /**
+     * The prefix to use.
+     *
+     * @default ''
+     */
+    prefix?: string;
+  }): string;
   /**
    * Generates a random password.
    *
@@ -556,12 +1355,105 @@ export class InternetModule {
    * faker.internet.password(20, true, /[A-Z]/, 'Hello ') // 'Hello IREOXTDWPERQSB'
    *
    * @since 2.0.1
+   *
+   * @deprecated Use `faker.internet({ length, memorable, pattern, prefix })` instead.
+   */
+  password(
+    len?: number,
+    memorable?: boolean,
+    pattern?: RegExp,
+    prefix?: string
+  ): string;
+  /**
+   * Generates a random password.
+   *
+   * @param options The length of the password or an options object. Defaults to `{}`.
+   * @param options.length The length of the password to generate. Defaults to `15`.
+   * @param options.memorable Whether the generated password should be memorable. Defaults to `false`.
+   * @param options.pattern The pattern that all chars should match should match.
+   * This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
+   * @param options.prefix The prefix to use. Defaults to `''`.
+   * @param legacyMemorable Whether the generated password should be memorable. Defaults to `false`.
+   * @param legacyPattern The pattern that all chars should match should match.
+   * This option will be ignored, if `memorable` is `true`. Defaults to `/\w/`.
+   * @param legacyPrefix The prefix to use. Defaults to `''`.
+   *
+   * @example
+   * faker.internet.password() // '89G1wJuBLbGziIs'
+   * faker.internet.password({ length: 20 }) // 'aF55c_8O9kZaPOrysFB_'
+   * faker.internet.password({ length: 20, memorable: true }) // 'lawetimufozujosodedi'
+   * faker.internet.password({ length: 20, memorable: true, pattern: /[A-Z]/ }) // 'HMAQDFFYLDDUTBKVNFVS'
+   * faker.internet.password({ length: 20, memorable: true, pattern: /[A-Z]/, prefix: 'Hello ' }) // 'Hello IREOXTDWPERQSB'
+   *
+   * @since 2.0.1
    */
   password(
-    len: number = 15,
-    memorable: boolean = false,
-    pattern: RegExp = /\w/,
-    prefix: string = ''
+    options?:
+      | number
+      | {
+          /**
+           * The length of the password to generate.
+           *
+           * @default 15
+           */
+          length?: number;
+          /**
+           * Whether the generated password should be memorable.
+           *
+           * @default false
+           */
+          memorable?: boolean;
+          /**
+           * The pattern that all chars should match should match.
+           * This option will be ignored, if `memorable` is `true`.
+           *
+           * @default /\w/
+           */
+          pattern?: RegExp;
+          /**
+           * The prefix to use.
+           *
+           * @default ''
+           */
+          prefix?: string;
+        },
+    legacyMemorable?: boolean,
+    legacyPattern?: RegExp,
+    legacyPrefix?: string
+  ): string;
+  password(
+    options:
+      | number
+      | {
+          /**
+           * The length of the password to generate.
+           *
+           * @default 15
+           */
+          length?: number;
+          /**
+           * Whether the generated password should be memorable.
+           *
+           * @default false
+           */
+          memorable?: boolean;
+          /**
+           * The pattern that all chars should match should match.
+           * This option will be ignored, if `memorable` is `true`.
+           *
+           * @default /\w/
+           */
+          pattern?: RegExp;
+          /**
+           * The prefix to use.
+           *
+           * @default ''
+           */
+          prefix?: string;
+        } = {},
+    legacyMemorable?: boolean,
+    legacyPattern?: RegExp,
+    legacyPrefix?: string
   ): string {
     /*
      * password-generator ( function )
@@ -601,7 +1493,34 @@ export class InternetModule {
       return _password(length, memorable, pattern, prefix + char);
     };
 
-    return _password(len, memorable, pattern, prefix);
+    if (
+      typeof options === 'string' ||
+      legacyMemorable != null ||
+      legacyPattern != null ||
+      legacyPrefix != null
+    ) {
+      deprecated({
+        deprecated:
+          'faker.internet.password(length, memorable, pattern, prefix)',
+        proposed:
+          'faker.internet.password({ length, memorable, pattern, prefix })',
+        since: '8.0',
+        until: '9.0',
+      });
+    }
+
+    if (typeof options === 'number') {
+      options = { length: options };
+    }
+
+    const {
+      length = 15,
+      memorable = legacyMemorable ?? false,
+      pattern = legacyPattern ?? /\w/,
+      prefix = legacyPrefix ?? '',
+    } = options;
+
+    return _password(length, memorable, pattern, prefix);
   }
 
   /**
diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts
index 5fe542cbbc4..fb902588eb3 100644
--- a/src/modules/location/index.ts
+++ b/src/modules/location/index.ts
@@ -7,7 +7,9 @@ import { deprecated } from '../../internal/deprecated';
 export class LocationModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(LocationModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      LocationModule.prototype
+    ) as Array<keyof LocationModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -70,8 +72,8 @@ export class LocationModule {
    * If not specified, a random zip code is generated according to the locale's zip format.
    *
    * @example
-   * fakerUS.location.zipCodeByState("AK") // '99595'
-   * fakerUS.location.zipCodeByState("??") // '47683-9880'
+   * fakerEN_US.location.zipCodeByState("AK") // '99595'
+   * fakerEN_US.location.zipCodeByState("??") // '47683-9880'
    *
    * @since 8.0.0
    */
@@ -105,7 +107,7 @@ export class LocationModule {
    *
    * @example
    * faker.location.city() // 'East Jarretmouth'
-   * faker.locale = 'de'; faker.location.city() // 'Bad Lilianadorf'
+   * fakerDE.location.city() // 'Bad Lilianadorf'
    *
    * @since 8.0.0
    */
@@ -118,7 +120,7 @@ export class LocationModule {
    *
    * @example
    * faker.location.cityName() // 'San Rafael'
-   * faker.locale = 'de'; faker.location.cityName() // 'Nürnberg'
+   * fakerDE.location.cityName() // 'Nürnberg'
    *
    * @since 8.0.0
    */
@@ -254,10 +256,10 @@ export class LocationModule {
   }
 
   /**
-   * Returns a random country code.
+   * Returns a random [ISO_3166-1](https://en.wikipedia.org/wiki/ISO_3166-1) country code.
    *
    * @param options The code to return or an options object. Defaults to `{}`.
-   * @param options.variant The variant to return. Can be either `'alpha-2'` (2 letter code)
+   * @param options.variant The variant to return. Can be either `'alpha-2'` (two letter code)
    * or `'alpha-3'` (three letter code). Defaults to `'alpha-2'`.
    *
    * @example
@@ -274,7 +276,7 @@ export class LocationModule {
       | {
           /**
            * The code to return.
-           * Can be either `'alpha-2'` (2 letter code)
+           * Can be either `'alpha-2'` (two letter code)
            * or `'alpha-3'` (three letter code).
            *
            * @default 'alpha-2'
@@ -287,11 +289,11 @@ export class LocationModule {
     }
 
     const { variant = 'alpha-2' } = options;
-    const key = variant === 'alpha-3' ? 'country_code_alpha_3' : 'country_code';
+    const key = variant === 'alpha-3' ? 'alpha3' : 'alpha2';
 
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.location[key]
-    );
+      this.faker.definitions.location.country_code
+    )[key];
   }
 
   /**
diff --git a/src/modules/lorem/index.ts b/src/modules/lorem/index.ts
index 9c9b514f4a1..4e124929a38 100644
--- a/src/modules/lorem/index.ts
+++ b/src/modules/lorem/index.ts
@@ -7,7 +7,9 @@ import { filterWordListByLength } from '../word/filterWordListByLength';
 export class LoremModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(LoremModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      LoremModule.prototype
+    ) as Array<keyof LoremModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/music/index.ts b/src/modules/music/index.ts
index e25ade687de..15d282d47dc 100644
--- a/src/modules/music/index.ts
+++ b/src/modules/music/index.ts
@@ -6,7 +6,9 @@ import type { Faker } from '../..';
 export class MusicModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(MusicModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      MusicModule.prototype
+    ) as Array<keyof MusicModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/number/index.ts b/src/modules/number/index.ts
index 96e5067d0c4..3cd35f4061d 100644
--- a/src/modules/number/index.ts
+++ b/src/modules/number/index.ts
@@ -8,7 +8,9 @@ import type { Mersenne } from '../../internal/mersenne/mersenne';
 export class NumberModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(NumberModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      NumberModule.prototype
+    ) as Array<keyof NumberModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/person/index.ts b/src/modules/person/index.ts
index da30fee7c4e..5618110b7db 100644
--- a/src/modules/person/index.ts
+++ b/src/modules/person/index.ts
@@ -11,6 +11,7 @@ export type SexType = `${Sex}`;
  * Select a definition based on given sex.
  *
  * @param faker Faker instance.
+ * @param elementSelectorFn The method used to select the actual element.
  * @param sex Sex.
  * @param param2 Definitions.
  * @param param2.generic Non-sex definitions.
@@ -18,17 +19,14 @@ export type SexType = `${Sex}`;
  * @param param2.male Male definitions.
  * @returns Definition based on given sex.
  */
-function selectDefinition(
+function selectDefinition<T>(
   faker: Faker,
+  elementSelectorFn: (values: T[]) => string,
   sex: SexType | undefined,
   // TODO @Shinigami92 2022-03-21: Remove fallback empty object when `strict: true`
-  {
-    generic,
-    female,
-    male,
-  }: { generic?: string[]; female?: string[]; male?: string[] } = {}
-) {
-  let values: string[] | undefined;
+  { generic, female, male }: { generic?: T[]; female?: T[]; male?: T[] } = {}
+): string {
+  let values: T[] | undefined;
 
   switch (sex) {
     case Sex.Female:
@@ -52,7 +50,7 @@ function selectDefinition(
     }
   }
 
-  return faker.helpers.arrayElement(values);
+  return elementSelectorFn(values);
 }
 
 /**
@@ -61,7 +59,9 @@ function selectDefinition(
 export class PersonModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(PersonModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      PersonModule.prototype
+    ) as Array<keyof PersonModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -87,7 +87,7 @@ export class PersonModule {
     const { first_name, female_first_name, male_first_name } =
       this.faker.definitions.person;
 
-    return selectDefinition(this.faker, sex, {
+    return selectDefinition(this.faker, this.faker.helpers.arrayElement, sex, {
       generic: first_name,
       female: female_first_name,
       male: male_first_name,
@@ -108,14 +108,43 @@ export class PersonModule {
    * @since 8.0.0
    */
   lastName(sex?: SexType): string {
-    const { last_name, female_last_name, male_last_name } =
-      this.faker.definitions.person;
-
-    return selectDefinition(this.faker, sex, {
-      generic: last_name,
-      female: female_last_name,
-      male: male_last_name,
-    });
+    const {
+      last_name,
+      female_last_name,
+      male_last_name,
+      last_name_patterns,
+      male_last_name_patterns,
+      female_last_name_patterns,
+    } = this.faker.definitions.person;
+
+    if (
+      last_name_patterns != null ||
+      male_last_name_patterns != null ||
+      female_last_name_patterns != null
+    ) {
+      const pattern = selectDefinition(
+        this.faker,
+        this.faker.helpers.weightedArrayElement,
+        sex,
+        {
+          generic: last_name_patterns,
+          female: female_last_name_patterns,
+          male: male_last_name_patterns,
+        }
+      );
+      return this.faker.helpers.fake(pattern);
+    } else {
+      return selectDefinition(
+        this.faker,
+        this.faker.helpers.arrayElement,
+        sex,
+        {
+          generic: last_name,
+          female: female_last_name,
+          male: male_last_name,
+        }
+      );
+    }
   }
 
   /**
@@ -135,7 +164,7 @@ export class PersonModule {
     const { middle_name, female_middle_name, male_middle_name } =
       this.faker.definitions.person;
 
-    return selectDefinition(this.faker, sex, {
+    return selectDefinition(this.faker, this.faker.helpers.arrayElement, sex, {
       generic: middle_name,
       female: female_middle_name,
       male: male_middle_name,
@@ -276,7 +305,7 @@ export class PersonModule {
     const { prefix, female_prefix, male_prefix } =
       this.faker.definitions.person;
 
-    return selectDefinition(this.faker, sex, {
+    return selectDefinition(this.faker, this.faker.helpers.arrayElement, sex, {
       generic: prefix,
       female: female_prefix,
       male: male_prefix,
diff --git a/src/modules/phone/index.ts b/src/modules/phone/index.ts
index 437464bff59..d604c44a591 100644
--- a/src/modules/phone/index.ts
+++ b/src/modules/phone/index.ts
@@ -6,7 +6,9 @@ import type { Faker } from '../..';
 export class PhoneModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(PhoneModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      PhoneModule.prototype
+    ) as Array<keyof PhoneModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/random/index.ts b/src/modules/random/index.ts
index 4936fe80e88..a2847bbc3d3 100644
--- a/src/modules/random/index.ts
+++ b/src/modules/random/index.ts
@@ -1,4 +1,5 @@
 import type { Faker } from '../..';
+import { FakerError } from '../../errors/faker-error';
 import { deprecated } from '../../internal/deprecated';
 import type { LiteralUnion } from '../../utils/types';
 import type {
@@ -14,7 +15,9 @@ import type {
 export class RandomModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(RandomModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      RandomModule.prototype
+    ) as Array<keyof RandomModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -50,9 +53,9 @@ export class RandomModule {
       this.faker.commerce.productMaterial,
       this.faker.commerce.productName,
 
-      this.faker.company.bsAdjective,
-      this.faker.company.bsBuzz,
-      this.faker.company.bsNoun,
+      this.faker.company.buzzAdjective,
+      this.faker.company.buzzNoun,
+      this.faker.company.buzzVerb,
       this.faker.company.catchPhraseAdjective,
       this.faker.company.catchPhraseDescriptor,
       this.faker.company.catchPhraseNoun,
@@ -169,16 +172,21 @@ export class RandomModule {
   }
 
   /**
-   * Returns a random locale, that is available in this faker instance.
-   * You can use the returned locale with `faker.setLocale(result)`.
+   * Do NOT use. This property has been removed.
    *
    * @example
-   * faker.random.locale() // 'el'
+   * faker.helpers.objectKey(allLocales)
+   * faker.helpers.objectValue(allFakers)
    *
    * @since 3.1.0
+   *
+   * @deprecated Use `faker.helpers.objectKey(allLocales/allFakers)` instead.
    */
-  locale(): string {
-    return this.faker.helpers.arrayElement(Object.keys(this.faker.locales));
+  private locale(): never {
+    // We cannot invoke this ourselves, because this would link to all locale data and increase the bundle size by a lot.
+    throw new FakerError(
+      'This method has been removed. Please use `faker.helpers.objectKey(allLocales/allFakers)` instead.'
+    );
   }
 
   /**
diff --git a/src/modules/science/index.ts b/src/modules/science/index.ts
index 7dba5d3daf2..754bcbdff3d 100644
--- a/src/modules/science/index.ts
+++ b/src/modules/science/index.ts
@@ -35,7 +35,9 @@ export interface Unit {
 export class ScienceModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(ScienceModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      ScienceModule.prototype
+    ) as Array<keyof ScienceModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/string/index.ts b/src/modules/string/index.ts
index 188c91ebea8..f6180df3271 100644
--- a/src/modules/string/index.ts
+++ b/src/modules/string/index.ts
@@ -91,7 +91,9 @@ const SAMPLE_MAX_LENGTH = 2 ** 20;
 export class StringModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(StringModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      StringModule.prototype
+    ) as Array<keyof StringModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/system/index.ts b/src/modules/system/index.ts
index 2f3ce371f08..35ca2c8d775 100644
--- a/src/modules/system/index.ts
+++ b/src/modules/system/index.ts
@@ -38,7 +38,9 @@ const CRON_DAY_OF_WEEK = [
 export class SystemModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(SystemModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      SystemModule.prototype
+    ) as Array<keyof SystemModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/vehicle/index.ts b/src/modules/vehicle/index.ts
index 9c9841b08be..2b153c793ec 100644
--- a/src/modules/vehicle/index.ts
+++ b/src/modules/vehicle/index.ts
@@ -6,7 +6,9 @@ import type { Faker } from '../..';
 export class VehicleModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(VehicleModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      VehicleModule.prototype
+    ) as Array<keyof VehicleModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/modules/word/index.ts b/src/modules/word/index.ts
index 5548e74f0fe..614c6a592a5 100644
--- a/src/modules/word/index.ts
+++ b/src/modules/word/index.ts
@@ -8,7 +8,9 @@ import { filterWordListByLength } from './filterWordListByLength';
 export class WordModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(WordModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(
+      WordModule.prototype
+    ) as Array<keyof WordModule | 'constructor'>) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 012ad58beb0..afc4c17a3d6 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -8,11 +8,16 @@ export type LiteralUnion<T extends U, U = string> =
   | (U & { zz_IGNORE_ME?: never });
 
 /**
- * Basically a function that returns a value.
+ * A function that returns a value.
  *
- * For some strange reason this is not the same as `Function`.
+ * `Function` cannot be used instead because it doesn't accept class declarations.
+ * These would fail when invoked since they are invoked without the `new` keyword.
  */
-export type Callable = (...args) => unknown;
+export type Callable = (
+  // TODO christopher 2023-02-14: This `any` type can be fixed by anyone if they want to.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ...args: any[]
+) => unknown;
 
 /**
  * Type that represents a single method/function name of the given type.
diff --git a/test/__snapshots__/airline.spec.ts.snap b/test/__snapshots__/airline.spec.ts.snap
index ad5eb625072..0615a83999f 100644
--- a/test/__snapshots__/airline.spec.ts.snap
+++ b/test/__snapshots__/airline.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`airline > 42 > aircraftType 1`] = `"regional"`;
 
diff --git a/test/__snapshots__/animal.spec.ts.snap b/test/__snapshots__/animal.spec.ts.snap
index b6da8129e54..7124e5e9942 100644
--- a/test/__snapshots__/animal.spec.ts.snap
+++ b/test/__snapshots__/animal.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`animal > 42 > bear 1`] = `"Sun bear"`;
 
diff --git a/test/__snapshots__/color.spec.ts.snap b/test/__snapshots__/color.spec.ts.snap
index 36e50b80cc4..a39ce0f3558 100644
--- a/test/__snapshots__/color.spec.ts.snap
+++ b/test/__snapshots__/color.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`color > 42 > cmyk 1`] = `
 [
@@ -19,7 +19,7 @@ exports[`color > 42 > colorByCSSColorSpace 1`] = `
 
 exports[`color > 42 > cssSupportedFunction 1`] = `"hsla"`;
 
-exports[`color > 42 > cssSupportedSpace 1`] = `"rec2020"`;
+exports[`color > 42 > cssSupportedSpace 1`] = `"display-p3"`;
 
 exports[`color > 42 > hsl 1`] = `
 [
@@ -78,7 +78,7 @@ exports[`color > 1211 > colorByCSSColorSpace 1`] = `
 
 exports[`color > 1211 > cssSupportedFunction 1`] = `"color"`;
 
-exports[`color > 1211 > cssSupportedSpace 1`] = `"rec2020"`;
+exports[`color > 1211 > cssSupportedSpace 1`] = `"prophoto-rgb"`;
 
 exports[`color > 1211 > hsl 1`] = `
 [
diff --git a/test/__snapshots__/commerce.spec.ts.snap b/test/__snapshots__/commerce.spec.ts.snap
index 48c8b4ba54d..1dde678565e 100644
--- a/test/__snapshots__/commerce.spec.ts.snap
+++ b/test/__snapshots__/commerce.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`commerce > 42 > department 1`] = `"Tools"`;
 
diff --git a/test/__snapshots__/company.spec.ts.snap b/test/__snapshots__/company.spec.ts.snap
index 97697afa413..b65e2bd48eb 100644
--- a/test/__snapshots__/company.spec.ts.snap
+++ b/test/__snapshots__/company.spec.ts.snap
@@ -1,12 +1,12 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`company > 42 > bs 1`] = `"seize impactful methodologies"`;
+exports[`company > 42 > buzzAdjective 1`] = `"dynamic"`;
 
-exports[`company > 42 > bsAdjective 1`] = `"dynamic"`;
+exports[`company > 42 > buzzNoun 1`] = `"technologies"`;
 
-exports[`company > 42 > bsBuzz 1`] = `"seize"`;
+exports[`company > 42 > buzzPhrase 1`] = `"seize impactful methodologies"`;
 
-exports[`company > 42 > bsNoun 1`] = `"technologies"`;
+exports[`company > 42 > buzzVerb 1`] = `"seize"`;
 
 exports[`company > 42 > catchPhrase 1`] = `"Implemented responsive throughput"`;
 
@@ -29,13 +29,13 @@ exports[`company > 42 > suffixes 1`] = `
 ]
 `;
 
-exports[`company > 1211 > bs 1`] = `"cultivate bleeding-edge experiences"`;
+exports[`company > 1211 > buzzAdjective 1`] = `"plug-and-play"`;
 
-exports[`company > 1211 > bsAdjective 1`] = `"plug-and-play"`;
+exports[`company > 1211 > buzzNoun 1`] = `"methodologies"`;
 
-exports[`company > 1211 > bsBuzz 1`] = `"cultivate"`;
+exports[`company > 1211 > buzzPhrase 1`] = `"cultivate bleeding-edge experiences"`;
 
-exports[`company > 1211 > bsNoun 1`] = `"methodologies"`;
+exports[`company > 1211 > buzzVerb 1`] = `"cultivate"`;
 
 exports[`company > 1211 > catchPhrase 1`] = `"Up-sized high-level success"`;
 
@@ -58,13 +58,13 @@ exports[`company > 1211 > suffixes 1`] = `
 ]
 `;
 
-exports[`company > 1337 > bs 1`] = `"incentivize efficient initiatives"`;
+exports[`company > 1337 > buzzAdjective 1`] = `"global"`;
 
-exports[`company > 1337 > bsAdjective 1`] = `"global"`;
+exports[`company > 1337 > buzzNoun 1`] = `"ROI"`;
 
-exports[`company > 1337 > bsBuzz 1`] = `"incentivize"`;
+exports[`company > 1337 > buzzPhrase 1`] = `"incentivize efficient initiatives"`;
 
-exports[`company > 1337 > bsNoun 1`] = `"ROI"`;
+exports[`company > 1337 > buzzVerb 1`] = `"incentivize"`;
 
 exports[`company > 1337 > catchPhrase 1`] = `"Expanded leading edge capacity"`;
 
diff --git a/test/__snapshots__/database.spec.ts.snap b/test/__snapshots__/database.spec.ts.snap
index 2390eacc8be..f49fc90e580 100644
--- a/test/__snapshots__/database.spec.ts.snap
+++ b/test/__snapshots__/database.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`database > 42 > collation 1`] = `"utf8_bin"`;
 
diff --git a/test/__snapshots__/datatype.spec.ts.snap b/test/__snapshots__/datatype.spec.ts.snap
index 89acf87fce3..41c14158415 100644
--- a/test/__snapshots__/datatype.spec.ts.snap
+++ b/test/__snapshots__/datatype.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`datatype > 42 > array > noArgs 1`] = `
 [
diff --git a/test/__snapshots__/date.spec.ts.snap b/test/__snapshots__/date.spec.ts.snap
index 54d7ae6dde3..ca3b518b630 100644
--- a/test/__snapshots__/date.spec.ts.snap
+++ b/test/__snapshots__/date.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`date > 42 > between > with Date dates 1`] = `2021-03-15T19:30:57.091Z`;
 
diff --git a/test/__snapshots__/finance.spec.ts.snap b/test/__snapshots__/finance.spec.ts.snap
index 937b84efc9b..217bc437858 100644
--- a/test/__snapshots__/finance.spec.ts.snap
+++ b/test/__snapshots__/finance.spec.ts.snap
@@ -1,20 +1,32 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`finance > 42 > account > noArgs 1`] = `"37917755"`;
 
 exports[`finance > 42 > account > with length 1`] = `"3791775514"`;
 
+exports[`finance > 42 > account > with length option 1`] = `"3791775514"`;
+
 exports[`finance > 42 > accountName 1`] = `"Money Market Account"`;
 
 exports[`finance > 42 > amount > noArgs 1`] = `"374.54"`;
 
-exports[`finance > 42 > amount > with dec 1`] = `"374.54011"`;
+exports[`finance > 42 > amount > with leagcy dec 1`] = `"374.54011"`;
 
-exports[`finance > 42 > amount > with max 1`] = `"18.73"`;
+exports[`finance > 42 > amount > with leagcy max 1`] = `"18.73"`;
 
 exports[`finance > 42 > amount > with min 1`] = `"380.79"`;
 
-exports[`finance > 42 > amount > with min and max and dec and symbol 1`] = `"$24.98161"`;
+exports[`finance > 42 > amount > with min and max option 1`] = `"24.98"`;
+
+exports[`finance > 42 > amount > with min option 1`] = `"380.79"`;
+
+exports[`finance > 42 > amount > with min, leagcy max, leagcy dec and leagcy symbol 1`] = `"$24.98161"`;
+
+exports[`finance > 42 > amount > with min, max and dec option 1`] = `"24.98161"`;
+
+exports[`finance > 42 > amount > with min, max, dec and symbol option 1`] = `"#24.98161"`;
+
+exports[`finance > 42 > amount > with min, max, dec, symbol and autoFormat option 1`] = `"#24.98161"`;
 
 exports[`finance > 42 > bic > noArgs 1`] = `"UYETSCLLG53"`;
 
@@ -30,11 +42,21 @@ exports[`finance > 42 > creditCardNumber > noArgs 1`] = `"3581-7755-1410-0484"`;
 
 exports[`finance > 42 > creditCardNumber > with issuer 1`] = `"4791775514102"`;
 
-exports[`finance > 42 > currencyCode 1`] = `"IQD"`;
+exports[`finance > 42 > creditCardNumber > with issuer option 1`] = `"4791775514102"`;
 
-exports[`finance > 42 > currencyName 1`] = `"Iraqi Dinar"`;
+exports[`finance > 42 > currency 1`] = `
+{
+  "code": "ILS",
+  "name": "New Israeli Sheqel",
+  "symbol": "₪",
+}
+`;
 
-exports[`finance > 42 > currencySymbol 1`] = `"₱"`;
+exports[`finance > 42 > currencyCode 1`] = `"ILS"`;
+
+exports[`finance > 42 > currencyName 1`] = `"New Israeli Sheqel"`;
+
+exports[`finance > 42 > currencySymbol 1`] = `"₪"`;
 
 exports[`finance > 42 > ethereumAddress 1`] = `"0x8be4abdd39321ad7d3fe01ffce404f4d6db0906b"`;
 
@@ -44,25 +66,37 @@ exports[`finance > 42 > iban > with formatted 1`] = `"GT03 9751 1086 7098 F1E3 5
 
 exports[`finance > 42 > iban > with formatted and countryCode 1`] = `"DE47 7175 0020 0086 0600 97"`;
 
+exports[`finance > 42 > iban > with formatted and countryCode option 1`] = `"DE47 7175 0020 0086 0600 97"`;
+
+exports[`finance > 42 > iban > with formatted option 1`] = `"GT03 9751 1086 7098 F1E3 5426 12J4"`;
+
 exports[`finance > 42 > litecoinAddress 1`] = `"3XbJMAAara64sSkA9HD24YHQWd1b"`;
 
 exports[`finance > 42 > mask > noArgs 1`] = `"(...3791)"`;
 
-exports[`finance > 42 > mask > with ellipsis 1`] = `"(...3791)"`;
+exports[`finance > 42 > mask > with legacy ellipsis 1`] = `"(...3791)"`;
+
+exports[`finance > 42 > mask > with legacy parenthesis 1`] = `"(...3791)"`;
 
 exports[`finance > 42 > mask > with length 1`] = `"(...37917)"`;
 
-exports[`finance > 42 > mask > with length, parenthesis, and ellipsis 1`] = `"(...37917)"`;
+exports[`finance > 42 > mask > with length and parenthesis option 1`] = `"...37917"`;
 
-exports[`finance > 42 > mask > with parenthesis 1`] = `"(...3791)"`;
+exports[`finance > 42 > mask > with length option 1`] = `"(...37917)"`;
+
+exports[`finance > 42 > mask > with length, legacy parenthesis, and legacy ellipsis 1`] = `"(...37917)"`;
+
+exports[`finance > 42 > mask > with length, parenthesis and ellipsis option 1`] = `"...37917"`;
 
 exports[`finance > 42 > pin > noArgs 1`] = `"3791"`;
 
 exports[`finance > 42 > pin > with length 1`] = `"3791775514"`;
 
+exports[`finance > 42 > pin > with length option 1`] = `"3791775514"`;
+
 exports[`finance > 42 > routingNumber 1`] = `"379177554"`;
 
-exports[`finance > 42 > transactionDescription 1`] = `"invoice transaction at Wiegand, Deckow and Reynolds using card ending with ***(...8361) for SDG 374.54 in account ***55141004"`;
+exports[`finance > 42 > transactionDescription 1`] = `"invoice transaction at Wiegand, Deckow and Reynolds using card ending with ***(...8361) for RSD 374.54 in account ***55141004"`;
 
 exports[`finance > 42 > transactionType 1`] = `"withdrawal"`;
 
@@ -70,17 +104,29 @@ exports[`finance > 1211 > account > noArgs 1`] = `"94872190"`;
 
 exports[`finance > 1211 > account > with length 1`] = `"9487219061"`;
 
+exports[`finance > 1211 > account > with length option 1`] = `"9487219061"`;
+
 exports[`finance > 1211 > accountName 1`] = `"Personal Loan Account"`;
 
 exports[`finance > 1211 > amount > noArgs 1`] = `"928.52"`;
 
-exports[`finance > 1211 > amount > with dec 1`] = `"928.52016"`;
+exports[`finance > 1211 > amount > with leagcy dec 1`] = `"928.52016"`;
 
-exports[`finance > 1211 > amount > with max 1`] = `"46.43"`;
+exports[`finance > 1211 > amount > with leagcy max 1`] = `"46.43"`;
 
 exports[`finance > 1211 > amount > with min 1`] = `"929.24"`;
 
-exports[`finance > 1211 > amount > with min and max and dec and symbol 1`] = `"$47.14081"`;
+exports[`finance > 1211 > amount > with min and max option 1`] = `"47.15"`;
+
+exports[`finance > 1211 > amount > with min option 1`] = `"929.24"`;
+
+exports[`finance > 1211 > amount > with min, leagcy max, leagcy dec and leagcy symbol 1`] = `"$47.14081"`;
+
+exports[`finance > 1211 > amount > with min, max and dec option 1`] = `"47.14081"`;
+
+exports[`finance > 1211 > amount > with min, max, dec and symbol option 1`] = `"#47.14081"`;
+
+exports[`finance > 1211 > amount > with min, max, dec, symbol and autoFormat option 1`] = `"#47.14081"`;
 
 exports[`finance > 1211 > bic > noArgs 1`] = `"LXUFBTZ1"`;
 
@@ -96,11 +142,21 @@ exports[`finance > 1211 > creditCardNumber > noArgs 1`] = `"4872190616274"`;
 
 exports[`finance > 1211 > creditCardNumber > with issuer 1`] = `"4487-2190-6162-7436"`;
 
-exports[`finance > 1211 > currencyCode 1`] = `"XDR"`;
+exports[`finance > 1211 > creditCardNumber > with issuer option 1`] = `"4487-2190-6162-7436"`;
+
+exports[`finance > 1211 > currency 1`] = `
+{
+  "code": "VUV",
+  "name": "Vatu",
+  "symbol": "",
+}
+`;
 
-exports[`finance > 1211 > currencyName 1`] = `"SDR"`;
+exports[`finance > 1211 > currencyCode 1`] = `"VUV"`;
 
-exports[`finance > 1211 > currencySymbol 1`] = `"₭"`;
+exports[`finance > 1211 > currencyName 1`] = `"Vatu"`;
+
+exports[`finance > 1211 > currencySymbol 1`] = `"₩"`;
 
 exports[`finance > 1211 > ethereumAddress 1`] = `"0xeadb42f0e3f4a973fab0aeefce96dfcf49cd438d"`;
 
@@ -110,25 +166,37 @@ exports[`finance > 1211 > iban > with formatted 1`] = `"TN42 8201 6024 1706 7929
 
 exports[`finance > 1211 > iban > with formatted and countryCode 1`] = `"DE41 4700 9026 0417 0679 42"`;
 
+exports[`finance > 1211 > iban > with formatted and countryCode option 1`] = `"DE41 4700 9026 0417 0679 42"`;
+
+exports[`finance > 1211 > iban > with formatted option 1`] = `"TN42 8201 6024 1706 7929 9006"`;
+
 exports[`finance > 1211 > litecoinAddress 1`] = `"MTMe8Z3EaFdLqmaGKP1LEEJQVriSZRZds"`;
 
 exports[`finance > 1211 > mask > noArgs 1`] = `"(...9487)"`;
 
-exports[`finance > 1211 > mask > with ellipsis 1`] = `"(...9487)"`;
+exports[`finance > 1211 > mask > with legacy ellipsis 1`] = `"(...9487)"`;
+
+exports[`finance > 1211 > mask > with legacy parenthesis 1`] = `"(...9487)"`;
 
 exports[`finance > 1211 > mask > with length 1`] = `"(...94872)"`;
 
-exports[`finance > 1211 > mask > with length, parenthesis, and ellipsis 1`] = `"(...94872)"`;
+exports[`finance > 1211 > mask > with length and parenthesis option 1`] = `"...94872"`;
+
+exports[`finance > 1211 > mask > with length option 1`] = `"(...94872)"`;
+
+exports[`finance > 1211 > mask > with length, legacy parenthesis, and legacy ellipsis 1`] = `"(...94872)"`;
 
-exports[`finance > 1211 > mask > with parenthesis 1`] = `"(...9487)"`;
+exports[`finance > 1211 > mask > with length, parenthesis and ellipsis option 1`] = `"...94872"`;
 
 exports[`finance > 1211 > pin > noArgs 1`] = `"9487"`;
 
 exports[`finance > 1211 > pin > with length 1`] = `"9487219061"`;
 
+exports[`finance > 1211 > pin > with length option 1`] = `"9487219061"`;
+
 exports[`finance > 1211 > routingNumber 1`] = `"948721904"`;
 
-exports[`finance > 1211 > transactionDescription 1`] = `"deposit transaction at Trantow - Satterfield using card ending with ***(...4316) for STN 928.52 in account ***19061627"`;
+exports[`finance > 1211 > transactionDescription 1`] = `"deposit transaction at Trantow - Satterfield using card ending with ***(...4316) for SDG 928.52 in account ***19061627"`;
 
 exports[`finance > 1211 > transactionType 1`] = `"invoice"`;
 
@@ -136,17 +204,29 @@ exports[`finance > 1337 > account > noArgs 1`] = `"25122540"`;
 
 exports[`finance > 1337 > account > with length 1`] = `"2512254032"`;
 
+exports[`finance > 1337 > account > with length option 1`] = `"2512254032"`;
+
 exports[`finance > 1337 > accountName 1`] = `"Money Market Account"`;
 
 exports[`finance > 1337 > amount > noArgs 1`] = `"262.02"`;
 
-exports[`finance > 1337 > amount > with dec 1`] = `"262.02467"`;
+exports[`finance > 1337 > amount > with leagcy dec 1`] = `"262.02467"`;
 
-exports[`finance > 1337 > amount > with max 1`] = `"13.10"`;
+exports[`finance > 1337 > amount > with leagcy max 1`] = `"13.10"`;
 
 exports[`finance > 1337 > amount > with min 1`] = `"269.40"`;
 
-exports[`finance > 1337 > amount > with min and max and dec and symbol 1`] = `"$20.48099"`;
+exports[`finance > 1337 > amount > with min and max option 1`] = `"20.48"`;
+
+exports[`finance > 1337 > amount > with min option 1`] = `"269.40"`;
+
+exports[`finance > 1337 > amount > with min, leagcy max, leagcy dec and leagcy symbol 1`] = `"$20.48099"`;
+
+exports[`finance > 1337 > amount > with min, max and dec option 1`] = `"20.48099"`;
+
+exports[`finance > 1337 > amount > with min, max, dec and symbol option 1`] = `"#20.48099"`;
+
+exports[`finance > 1337 > amount > with min, max, dec, symbol and autoFormat option 1`] = `"#20.48099"`;
 
 exports[`finance > 1337 > bic > noArgs 1`] = `"OEFHLYG18IL"`;
 
@@ -162,9 +242,19 @@ exports[`finance > 1337 > creditCardNumber > noArgs 1`] = `"6011-6212-2540-3255-
 
 exports[`finance > 1337 > creditCardNumber > with issuer 1`] = `"4512254032550"`;
 
-exports[`finance > 1337 > currencyCode 1`] = `"FJD"`;
+exports[`finance > 1337 > creditCardNumber > with issuer option 1`] = `"4512254032550"`;
+
+exports[`finance > 1337 > currency 1`] = `
+{
+  "code": "ETB",
+  "name": "Ethiopian Birr",
+  "symbol": "",
+}
+`;
 
-exports[`finance > 1337 > currencyName 1`] = `"Fiji Dollar"`;
+exports[`finance > 1337 > currencyCode 1`] = `"ETB"`;
+
+exports[`finance > 1337 > currencyName 1`] = `"Ethiopian Birr"`;
 
 exports[`finance > 1337 > currencySymbol 1`] = `"$"`;
 
@@ -176,24 +266,36 @@ exports[`finance > 1337 > iban > with formatted 1`] = `"FO56 1005 0250 0903 18"`
 
 exports[`finance > 1337 > iban > with formatted and countryCode 1`] = `"DE04 0200 5032 5009 0304 06"`;
 
+exports[`finance > 1337 > iban > with formatted and countryCode option 1`] = `"DE04 0200 5032 5009 0304 06"`;
+
+exports[`finance > 1337 > iban > with formatted option 1`] = `"FO56 1005 0250 0903 18"`;
+
 exports[`finance > 1337 > litecoinAddress 1`] = `"Madhxs2jewAgkYgJi7No6Cn8JZar"`;
 
 exports[`finance > 1337 > mask > noArgs 1`] = `"(...2512)"`;
 
-exports[`finance > 1337 > mask > with ellipsis 1`] = `"(...2512)"`;
+exports[`finance > 1337 > mask > with legacy ellipsis 1`] = `"(...2512)"`;
+
+exports[`finance > 1337 > mask > with legacy parenthesis 1`] = `"(...2512)"`;
 
 exports[`finance > 1337 > mask > with length 1`] = `"(...25122)"`;
 
-exports[`finance > 1337 > mask > with length, parenthesis, and ellipsis 1`] = `"(...25122)"`;
+exports[`finance > 1337 > mask > with length and parenthesis option 1`] = `"...25122"`;
+
+exports[`finance > 1337 > mask > with length option 1`] = `"(...25122)"`;
 
-exports[`finance > 1337 > mask > with parenthesis 1`] = `"(...2512)"`;
+exports[`finance > 1337 > mask > with length, legacy parenthesis, and legacy ellipsis 1`] = `"(...25122)"`;
+
+exports[`finance > 1337 > mask > with length, parenthesis and ellipsis option 1`] = `"...25122"`;
 
 exports[`finance > 1337 > pin > noArgs 1`] = `"2512"`;
 
 exports[`finance > 1337 > pin > with length 1`] = `"2512254032"`;
 
+exports[`finance > 1337 > pin > with length option 1`] = `"2512254032"`;
+
 exports[`finance > 1337 > routingNumber 1`] = `"251225401"`;
 
-exports[`finance > 1337 > transactionDescription 1`] = `"withdrawal transaction at Cronin - Effertz using card ending with ***(...3927) for GTQ 262.02 in account ***54032552"`;
+exports[`finance > 1337 > transactionDescription 1`] = `"withdrawal transaction at Cronin - Effertz using card ending with ***(...3927) for GIP 262.02 in account ***54032552"`;
 
 exports[`finance > 1337 > transactionType 1`] = `"withdrawal"`;
diff --git a/test/__snapshots__/git.spec.ts.snap b/test/__snapshots__/git.spec.ts.snap
index bdad5290c8a..7ac202f4e94 100644
--- a/test/__snapshots__/git.spec.ts.snap
+++ b/test/__snapshots__/git.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`git > 42 > branch 1`] = `"array-transmit"`;
 
@@ -37,9 +37,11 @@ Date: Tue Dec 31 14:49:14 2019 +0100
 
 exports[`git > 42 > commitMessage 1`] = `"navigate neural capacitor"`;
 
-exports[`git > 42 > commitSha 1`] = `"8be4abdd39321ad7d3fe01ffce404f4d6db0906b"`;
+exports[`git > 42 > commitSha > noArgs 1`] = `"8be4abdd39321ad7d3fe01ffce404f4d6db0906b"`;
 
-exports[`git > 42 > shortSha 1`] = `"8be4abd"`;
+exports[`git > 42 > commitSha > with length 7 1`] = `"8be4abd"`;
+
+exports[`git > 42 > commitSha > with length 8 1`] = `"8be4abdd"`;
 
 exports[`git > 1211 > branch 1`] = `"capacitor-connect"`;
 
@@ -78,9 +80,11 @@ Date: Tue Dec 31 20:11:06 2019 -0600
 
 exports[`git > 1211 > commitMessage 1`] = `"reboot online circuit"`;
 
-exports[`git > 1211 > commitSha 1`] = `"eadb42f0e3f4a973fab0aeefce96dfcf49cd438d"`;
+exports[`git > 1211 > commitSha > noArgs 1`] = `"eadb42f0e3f4a973fab0aeefce96dfcf49cd438d"`;
+
+exports[`git > 1211 > commitSha > with length 7 1`] = `"eadb42f"`;
 
-exports[`git > 1211 > shortSha 1`] = `"eadb42f"`;
+exports[`git > 1211 > commitSha > with length 8 1`] = `"eadb42f0"`;
 
 exports[`git > 1337 > branch 1`] = `"port-quantify"`;
 
@@ -119,6 +123,8 @@ Date: Tue Dec 31 14:05:04 2019 +0800
 
 exports[`git > 1337 > commitMessage 1`] = `"compress multi-byte panel"`;
 
-exports[`git > 1337 > commitSha 1`] = `"5c346ba075bd57f5a62b82d72af39cbbb07a98cb"`;
+exports[`git > 1337 > commitSha > noArgs 1`] = `"5c346ba075bd57f5a62b82d72af39cbbb07a98cb"`;
+
+exports[`git > 1337 > commitSha > with length 7 1`] = `"5c346ba"`;
 
-exports[`git > 1337 > shortSha 1`] = `"5c346ba"`;
+exports[`git > 1337 > commitSha > with length 8 1`] = `"5c346ba0"`;
diff --git a/test/__snapshots__/hacker.spec.ts.snap b/test/__snapshots__/hacker.spec.ts.snap
index 69742770faf..d36739fe5bf 100644
--- a/test/__snapshots__/hacker.spec.ts.snap
+++ b/test/__snapshots__/hacker.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`hacker > 42 > abbreviation 1`] = `"HTTP"`;
 
diff --git a/test/__snapshots__/helpers.spec.ts.snap b/test/__snapshots__/helpers.spec.ts.snap
index 3b149cf65fa..fe9a22884ef 100644
--- a/test/__snapshots__/helpers.spec.ts.snap
+++ b/test/__snapshots__/helpers.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`helpers > 42 > arrayElement > noArgs 1`] = `"b"`;
 
diff --git a/test/__snapshots__/image.spec.ts.snap b/test/__snapshots__/image.spec.ts.snap
index f42ac02f011..77b5a029739 100644
--- a/test/__snapshots__/image.spec.ts.snap
+++ b/test/__snapshots__/image.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`image > 42 > avatar 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/995.jpg"`;
 
diff --git a/test/__snapshots__/internet.spec.ts.snap b/test/__snapshots__/internet.spec.ts.snap
index d18b396b5bf..41106aa978c 100644
--- a/test/__snapshots__/internet.spec.ts.snap
+++ b/test/__snapshots__/internet.spec.ts.snap
@@ -1,10 +1,18 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`internet > 42 > avatar 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/468.jpg"`;
 
 exports[`internet > 42 > color > noArgs 1`] = `"#30667a"`;
 
-exports[`internet > 42 > color > with color base 1`] = `"#6298ac"`;
+exports[`internet > 42 > color > with all options 1`] = `"#6298ac"`;
+
+exports[`internet > 42 > color > with blueBase option 1`] = `"#3066ac"`;
+
+exports[`internet > 42 > color > with greenBase option 1`] = `"#30987a"`;
+
+exports[`internet > 42 > color > with legacy color base 1`] = `"#6298ac"`;
+
+exports[`internet > 42 > color > with redBase option 1`] = `"#62667a"`;
 
 exports[`internet > 42 > displayName > noArgs 1`] = `"Garnet.Schinner73"`;
 
@@ -16,27 +24,55 @@ exports[`internet > 42 > displayName > with Latin names 1`] = `"Jane_Doe"`;
 
 exports[`internet > 42 > displayName > with accented names 1`] = `"Hélene_Müller"`;
 
+exports[`internet > 42 > displayName > with all option 1`] = `"Jane_Doe"`;
+
+exports[`internet > 42 > displayName > with firstName option 1`] = `"Jane_Hirthe18"`;
+
+exports[`internet > 42 > displayName > with lastName option 1`] = `"Garnet_Doe18"`;
+
+exports[`internet > 42 > displayName > with legacy names 1`] = `"Jane_Doe"`;
+
 exports[`internet > 42 > domainName 1`] = `"hasty-sherbet.org"`;
 
 exports[`internet > 42 > domainSuffix 1`] = `"info"`;
 
 exports[`internet > 42 > domainWord 1`] = `"hasty-sherbet"`;
 
-exports[`internet > 42 > email > noArgs 1`] = `"Peyton73@yahoo.com"`;
+exports[`internet > 42 > email > noArgs 1`] = `"Garnet73@hotmail.com"`;
+
+exports[`internet > 42 > email > with all options 1`] = `"Jane_Doe@fakerjs.dev"`;
+
+exports[`internet > 42 > email > with allowSpecialCharacters option 1`] = `"Garnet73@hotmail.com"`;
+
+exports[`internet > 42 > email > with firstName option 1`] = `"Jane.Hirthe73@hotmail.com"`;
+
+exports[`internet > 42 > email > with lastName option 1`] = `"Garnet.Doe73@hotmail.com"`;
 
-exports[`internet > 42 > email > with names 1`] = `"Jane_Doe18@yahoo.com"`;
+exports[`internet > 42 > email > with legacy names 1`] = `"Jane_Doe18@yahoo.com"`;
 
-exports[`internet > 42 > email > with names and provider 1`] = `"Jane_Doe@fakerjs.dev"`;
+exports[`internet > 42 > email > with legacy names and provider 1`] = `"Jane_Doe@fakerjs.dev"`;
 
-exports[`internet > 42 > email > with provider 1`] = `"Garnet.Schinner73@fakerjs.dev"`;
+exports[`internet > 42 > email > with legacy provider 1`] = `"Garnet.Schinner73@fakerjs.dev"`;
+
+exports[`internet > 42 > email > with provider option 1`] = `"Garnet.Schinner73@fakerjs.dev"`;
 
 exports[`internet > 42 > emoji > noArgs 1`] = `"🕸️"`;
 
 exports[`internet > 42 > emoji > with options 1`] = `"🦔"`;
 
-exports[`internet > 42 > exampleEmail > noArgs 1`] = `"Peyton73@example.com"`;
+exports[`internet > 42 > exampleEmail > noArgs 1`] = `"Garnet73@example.net"`;
+
+exports[`internet > 42 > exampleEmail > with all options 1`] = `"Jane_Doe18@example.com"`;
+
+exports[`internet > 42 > exampleEmail > with allowSpecialCharacters option 1`] = `"Garnet73@example.net"`;
+
+exports[`internet > 42 > exampleEmail > with firstName option 1`] = `"Jane.Hirthe73@example.net"`;
+
+exports[`internet > 42 > exampleEmail > with lastName option 1`] = `"Garnet.Doe73@example.net"`;
+
+exports[`internet > 42 > exampleEmail > with legacy names 1`] = `"Jane_Doe18@example.com"`;
 
-exports[`internet > 42 > exampleEmail > with names 1`] = `"Jane_Doe18@example.com"`;
+exports[`internet > 42 > exampleEmail > with legacy names and options 1`] = `"Jane_Doe18@example.com"`;
 
 exports[`internet > 42 > httpMethod 1`] = `"POST"`;
 
@@ -54,9 +90,27 @@ exports[`internet > 42 > mac > noArgs 1`] = `"5c:f2:bc:99:27:21"`;
 
 exports[`internet > 42 > mac > with separator 1`] = `"5c:f2:bc:99:27:21"`;
 
+exports[`internet > 42 > mac > with separator option 1`] = `"5c-f2-bc-99-27-21"`;
+
 exports[`internet > 42 > password > noArgs 1`] = `"Dl2fkYYKLsZdepz"`;
 
-exports[`internet > 42 > password > with length 1`] = `"Dl2fkYYKLs"`;
+exports[`internet > 42 > password > with legacy length 1`] = `"Dl2fkYYKLs"`;
+
+exports[`internet > 42 > password > with legacy length and memorable 1`] = `"Dl2fkYYKLs"`;
+
+exports[`internet > 42 > password > with legacy length, memorable and pattern 1`] = `"2522731671"`;
+
+exports[`internet > 42 > password > with legacy length, memorable, pattern and prefix 1`] = `"test252273"`;
+
+exports[`internet > 42 > password > with length option 1`] = `"Dl2fkYYKLs"`;
+
+exports[`internet > 42 > password > with length, memorable, pattern and prefix option 1`] = `"test252273"`;
+
+exports[`internet > 42 > password > with memorable option 1`] = `"Dl2fkYYKLsZdepz"`;
+
+exports[`internet > 42 > password > with pattern option 1`] = `"252273167192423"`;
+
+exports[`internet > 42 > password > with prefix option 1`] = `"testDl2fkYYKLsZ"`;
 
 exports[`internet > 42 > port 1`] = `24545`;
 
@@ -80,11 +134,27 @@ exports[`internet > 42 > userName > with Latin names 1`] = `"Jane_Doe"`;
 
 exports[`internet > 42 > userName > with accented names 1`] = `"Helene_Muller"`;
 
+exports[`internet > 42 > userName > with all option 1`] = `"Jane_Doe"`;
+
+exports[`internet > 42 > userName > with firstName option 1`] = `"Jane_Hirthe18"`;
+
+exports[`internet > 42 > userName > with lastName option 1`] = `"Garnet_Doe18"`;
+
+exports[`internet > 42 > userName > with legacy names 1`] = `"Jane_Doe"`;
+
 exports[`internet > 1211 > avatar 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/1160.jpg"`;
 
 exports[`internet > 1211 > color > noArgs 1`] = `"#773a72"`;
 
-exports[`internet > 1211 > color > with color base 1`] = `"#a96ca4"`;
+exports[`internet > 1211 > color > with all options 1`] = `"#a96ca4"`;
+
+exports[`internet > 1211 > color > with blueBase option 1`] = `"#773aa4"`;
+
+exports[`internet > 1211 > color > with greenBase option 1`] = `"#776c72"`;
+
+exports[`internet > 1211 > color > with legacy color base 1`] = `"#a96ca4"`;
+
+exports[`internet > 1211 > color > with redBase option 1`] = `"#a93a72"`;
 
 exports[`internet > 1211 > displayName > noArgs 1`] = `"Tito_Koelpin22"`;
 
@@ -96,27 +166,55 @@ exports[`internet > 1211 > displayName > with Latin names 1`] = `"Jane.Doe89"`;
 
 exports[`internet > 1211 > displayName > with accented names 1`] = `"Hélene.Müller89"`;
 
+exports[`internet > 1211 > displayName > with all option 1`] = `"Jane.Doe89"`;
+
+exports[`internet > 1211 > displayName > with firstName option 1`] = `"Jane_Ward"`;
+
+exports[`internet > 1211 > displayName > with lastName option 1`] = `"Tito_Doe"`;
+
+exports[`internet > 1211 > displayName > with legacy names 1`] = `"Jane.Doe89"`;
+
 exports[`internet > 1211 > domainName 1`] = `"vicious-infrastructure.org"`;
 
 exports[`internet > 1211 > domainSuffix 1`] = `"org"`;
 
 exports[`internet > 1211 > domainWord 1`] = `"vicious-infrastructure"`;
 
-exports[`internet > 1211 > email > noArgs 1`] = `"Jadyn.Trantow12@hotmail.com"`;
+exports[`internet > 1211 > email > noArgs 1`] = `"Tito.Koelpin12@hotmail.com"`;
+
+exports[`internet > 1211 > email > with all options 1`] = `"Jane.Doe89@fakerjs.dev"`;
+
+exports[`internet > 1211 > email > with allowSpecialCharacters option 1`] = `"Tito.Koelpin12@hotmail.com"`;
+
+exports[`internet > 1211 > email > with firstName option 1`] = `"Jane_Ward22@yahoo.com"`;
 
-exports[`internet > 1211 > email > with names 1`] = `"Jane_Doe@hotmail.com"`;
+exports[`internet > 1211 > email > with lastName option 1`] = `"Tito_Doe22@yahoo.com"`;
 
-exports[`internet > 1211 > email > with names and provider 1`] = `"Jane.Doe89@fakerjs.dev"`;
+exports[`internet > 1211 > email > with legacy names 1`] = `"Jane_Doe@hotmail.com"`;
 
-exports[`internet > 1211 > email > with provider 1`] = `"Tito_Koelpin22@fakerjs.dev"`;
+exports[`internet > 1211 > email > with legacy names and provider 1`] = `"Jane.Doe89@fakerjs.dev"`;
+
+exports[`internet > 1211 > email > with legacy provider 1`] = `"Tito_Koelpin22@fakerjs.dev"`;
+
+exports[`internet > 1211 > email > with provider option 1`] = `"Tito_Koelpin22@fakerjs.dev"`;
 
 exports[`internet > 1211 > emoji > noArgs 1`] = `"🇮🇸"`;
 
 exports[`internet > 1211 > emoji > with options 1`] = `"🌲"`;
 
-exports[`internet > 1211 > exampleEmail > noArgs 1`] = `"Jadyn.Trantow12@example.net"`;
+exports[`internet > 1211 > exampleEmail > noArgs 1`] = `"Tito.Koelpin12@example.net"`;
+
+exports[`internet > 1211 > exampleEmail > with all options 1`] = `"Jane_Doe@example.net"`;
+
+exports[`internet > 1211 > exampleEmail > with allowSpecialCharacters option 1`] = `"Tito.Koelpin12@example.net"`;
+
+exports[`internet > 1211 > exampleEmail > with firstName option 1`] = `"Jane_Ward22@example.com"`;
 
-exports[`internet > 1211 > exampleEmail > with names 1`] = `"Jane_Doe@example.net"`;
+exports[`internet > 1211 > exampleEmail > with lastName option 1`] = `"Tito_Doe22@example.com"`;
+
+exports[`internet > 1211 > exampleEmail > with legacy names 1`] = `"Jane_Doe@example.net"`;
+
+exports[`internet > 1211 > exampleEmail > with legacy names and options 1`] = `"Jane_Doe@example.net"`;
 
 exports[`internet > 1211 > httpMethod 1`] = `"PATCH"`;
 
@@ -134,9 +232,27 @@ exports[`internet > 1211 > mac > noArgs 1`] = `"e7:ec:32:f0:a2:a3"`;
 
 exports[`internet > 1211 > mac > with separator 1`] = `"e7:ec:32:f0:a2:a3"`;
 
+exports[`internet > 1211 > mac > with separator option 1`] = `"e7-ec-32-f0-a2-a3"`;
+
 exports[`internet > 1211 > password > noArgs 1`] = `"yLuj60b5iHB0bhn"`;
 
-exports[`internet > 1211 > password > with length 1`] = `"yLuj60b5iH"`;
+exports[`internet > 1211 > password > with legacy length 1`] = `"yLuj60b5iH"`;
+
+exports[`internet > 1211 > password > with legacy length and memorable 1`] = `"yLuj60b5iH"`;
+
+exports[`internet > 1211 > password > with legacy length, memorable and pattern 1`] = `"6050530611"`;
+
+exports[`internet > 1211 > password > with legacy length, memorable, pattern and prefix 1`] = `"test605053"`;
+
+exports[`internet > 1211 > password > with length option 1`] = `"yLuj60b5iH"`;
+
+exports[`internet > 1211 > password > with length, memorable, pattern and prefix option 1`] = `"test605053"`;
+
+exports[`internet > 1211 > password > with memorable option 1`] = `"yLuj60b5iHB0bhn"`;
+
+exports[`internet > 1211 > password > with pattern option 1`] = `"605053061176844"`;
+
+exports[`internet > 1211 > password > with prefix option 1`] = `"testyLuj60b5iHB"`;
 
 exports[`internet > 1211 > port 1`] = `60851`;
 
@@ -160,11 +276,27 @@ exports[`internet > 1211 > userName > with Latin names 1`] = `"Jane.Doe89"`;
 
 exports[`internet > 1211 > userName > with accented names 1`] = `"Helene.Muller89"`;
 
+exports[`internet > 1211 > userName > with all option 1`] = `"Jane.Doe89"`;
+
+exports[`internet > 1211 > userName > with firstName option 1`] = `"Jane_Ward"`;
+
+exports[`internet > 1211 > userName > with lastName option 1`] = `"Tito_Doe"`;
+
+exports[`internet > 1211 > userName > with legacy names 1`] = `"Jane.Doe89"`;
+
 exports[`internet > 1337 > avatar 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/327.jpg"`;
 
 exports[`internet > 1337 > color > noArgs 1`] = `"#214814"`;
 
-exports[`internet > 1337 > color > with color base 1`] = `"#537a46"`;
+exports[`internet > 1337 > color > with all options 1`] = `"#537a46"`;
+
+exports[`internet > 1337 > color > with blueBase option 1`] = `"#214846"`;
+
+exports[`internet > 1337 > color > with greenBase option 1`] = `"#217a14"`;
+
+exports[`internet > 1337 > color > with legacy color base 1`] = `"#537a46"`;
+
+exports[`internet > 1337 > color > with redBase option 1`] = `"#534814"`;
 
 exports[`internet > 1337 > displayName > noArgs 1`] = `"Devyn21"`;
 
@@ -176,27 +308,55 @@ exports[`internet > 1337 > displayName > with Latin names 1`] = `"Jane56"`;
 
 exports[`internet > 1337 > displayName > with accented names 1`] = `"Hélene56"`;
 
+exports[`internet > 1337 > displayName > with all option 1`] = `"Jane56"`;
+
+exports[`internet > 1337 > displayName > with firstName option 1`] = `"Jane.Gibson"`;
+
+exports[`internet > 1337 > displayName > with lastName option 1`] = `"Devyn.Doe"`;
+
+exports[`internet > 1337 > displayName > with legacy names 1`] = `"Jane56"`;
+
 exports[`internet > 1337 > domainName 1`] = `"fair-mile.com"`;
 
 exports[`internet > 1337 > domainSuffix 1`] = `"biz"`;
 
 exports[`internet > 1337 > domainWord 1`] = `"fair-mile"`;
 
-exports[`internet > 1337 > email > noArgs 1`] = `"Kellen27@gmail.com"`;
+exports[`internet > 1337 > email > noArgs 1`] = `"Devyn27@gmail.com"`;
 
-exports[`internet > 1337 > email > with names 1`] = `"Jane.Doe@gmail.com"`;
+exports[`internet > 1337 > email > with all options 1`] = `"Jane56@fakerjs.dev"`;
 
-exports[`internet > 1337 > email > with names and provider 1`] = `"Jane56@fakerjs.dev"`;
+exports[`internet > 1337 > email > with allowSpecialCharacters option 1`] = `"Devyn27@gmail.com"`;
 
-exports[`internet > 1337 > email > with provider 1`] = `"Devyn21@fakerjs.dev"`;
+exports[`internet > 1337 > email > with firstName option 1`] = `"Jane21@yahoo.com"`;
+
+exports[`internet > 1337 > email > with lastName option 1`] = `"Devyn21@yahoo.com"`;
+
+exports[`internet > 1337 > email > with legacy names 1`] = `"Jane.Doe@gmail.com"`;
+
+exports[`internet > 1337 > email > with legacy names and provider 1`] = `"Jane56@fakerjs.dev"`;
+
+exports[`internet > 1337 > email > with legacy provider 1`] = `"Devyn21@fakerjs.dev"`;
+
+exports[`internet > 1337 > email > with provider option 1`] = `"Devyn21@fakerjs.dev"`;
 
 exports[`internet > 1337 > emoji > noArgs 1`] = `"💇🏼‍♀️"`;
 
 exports[`internet > 1337 > emoji > with options 1`] = `"🐪"`;
 
-exports[`internet > 1337 > exampleEmail > noArgs 1`] = `"Kellen27@example.org"`;
+exports[`internet > 1337 > exampleEmail > noArgs 1`] = `"Devyn27@example.org"`;
+
+exports[`internet > 1337 > exampleEmail > with all options 1`] = `"Jane&Doe@example.org"`;
 
-exports[`internet > 1337 > exampleEmail > with names 1`] = `"Jane.Doe@example.org"`;
+exports[`internet > 1337 > exampleEmail > with allowSpecialCharacters option 1`] = `"Devyn27@example.org"`;
+
+exports[`internet > 1337 > exampleEmail > with firstName option 1`] = `"Jane21@example.com"`;
+
+exports[`internet > 1337 > exampleEmail > with lastName option 1`] = `"Devyn21@example.com"`;
+
+exports[`internet > 1337 > exampleEmail > with legacy names 1`] = `"Jane.Doe@example.org"`;
+
+exports[`internet > 1337 > exampleEmail > with legacy names and options 1`] = `"Jane&Doe@example.org"`;
 
 exports[`internet > 1337 > httpMethod 1`] = `"POST"`;
 
@@ -214,9 +374,27 @@ exports[`internet > 1337 > mac > noArgs 1`] = `"48:23:48:70:53:89"`;
 
 exports[`internet > 1337 > mac > with separator 1`] = `"48:23:48:70:53:89"`;
 
+exports[`internet > 1337 > mac > with separator option 1`] = `"48-23-48-70-53-89"`;
+
 exports[`internet > 1337 > password > noArgs 1`] = `"9V05TL7RY9fmECg"`;
 
-exports[`internet > 1337 > password > with length 1`] = `"9V05TL7RY9"`;
+exports[`internet > 1337 > password > with legacy length 1`] = `"9V05TL7RY9"`;
+
+exports[`internet > 1337 > password > with legacy length and memorable 1`] = `"9V05TL7RY9"`;
+
+exports[`internet > 1337 > password > with legacy length, memorable and pattern 1`] = `"9057902132"`;
+
+exports[`internet > 1337 > password > with legacy length, memorable, pattern and prefix 1`] = `"test905790"`;
+
+exports[`internet > 1337 > password > with length option 1`] = `"9V05TL7RY9"`;
+
+exports[`internet > 1337 > password > with length, memorable, pattern and prefix option 1`] = `"test905790"`;
+
+exports[`internet > 1337 > password > with memorable option 1`] = `"9V05TL7RY9fmECg"`;
+
+exports[`internet > 1337 > password > with pattern option 1`] = `"905790213209301"`;
+
+exports[`internet > 1337 > password > with prefix option 1`] = `"test9V05TL7RY9f"`;
 
 exports[`internet > 1337 > port 1`] = `17172`;
 
@@ -239,3 +417,11 @@ exports[`internet > 1337 > userName > with Cyrillic names 1`] = `"Fedor56"`;
 exports[`internet > 1337 > userName > with Latin names 1`] = `"Jane56"`;
 
 exports[`internet > 1337 > userName > with accented names 1`] = `"Helene56"`;
+
+exports[`internet > 1337 > userName > with all option 1`] = `"Jane56"`;
+
+exports[`internet > 1337 > userName > with firstName option 1`] = `"Jane.Gibson"`;
+
+exports[`internet > 1337 > userName > with lastName option 1`] = `"Devyn.Doe"`;
+
+exports[`internet > 1337 > userName > with legacy names 1`] = `"Jane56"`;
diff --git a/test/__snapshots__/location.spec.ts.snap b/test/__snapshots__/location.spec.ts.snap
index 8b67230402f..d263703c76d 100644
--- a/test/__snapshots__/location.spec.ts.snap
+++ b/test/__snapshots__/location.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`location > 42 > buildingNumber 1`] = `"7917"`;
 
@@ -16,7 +16,7 @@ exports[`location > 42 > country 1`] = `"Guinea"`;
 
 exports[`location > 42 > countryCode > noArgs 1`] = `"GY"`;
 
-exports[`location > 42 > countryCode > with alphaCode option 1`] = `"SAU"`;
+exports[`location > 42 > countryCode > with alphaCode option 1`] = `"GUY"`;
 
 exports[`location > 42 > countryCode > with string 1`] = `"GY"`;
 
@@ -174,7 +174,7 @@ exports[`location > 1211 > country 1`] = `"Uganda"`;
 
 exports[`location > 1211 > countryCode > noArgs 1`] = `"UM"`;
 
-exports[`location > 1211 > countryCode > with alphaCode option 1`] = `"IRN"`;
+exports[`location > 1211 > countryCode > with alphaCode option 1`] = `"UMI"`;
 
 exports[`location > 1211 > countryCode > with string 1`] = `"UM"`;
 
@@ -332,7 +332,7 @@ exports[`location > 1337 > country 1`] = `"Egypt"`;
 
 exports[`location > 1337 > countryCode > noArgs 1`] = `"EH"`;
 
-exports[`location > 1337 > countryCode > with alphaCode option 1`] = `"PRI"`;
+exports[`location > 1337 > countryCode > with alphaCode option 1`] = `"ESH"`;
 
 exports[`location > 1337 > countryCode > with string 1`] = `"EH"`;
 
diff --git a/test/__snapshots__/lorem.spec.ts.snap b/test/__snapshots__/lorem.spec.ts.snap
index c30488a92e0..80c51c6c113 100644
--- a/test/__snapshots__/lorem.spec.ts.snap
+++ b/test/__snapshots__/lorem.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`lorem > 42 > lines > noArgs 1`] = `
 "A qui tempore quo perspiciatis perspiciatis quia in quia.
diff --git a/test/__snapshots__/mersenne.spec.ts.snap b/test/__snapshots__/mersenne.spec.ts.snap
index 08002528213..f067cbbc054 100644
--- a/test/__snapshots__/mersenne.spec.ts.snap
+++ b/test/__snapshots__/mersenne.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`mersenne twister > seed: [42,1,2] > should return deterministic value for next() 1`] = `0.8562037434894592`;
 
diff --git a/test/__snapshots__/music.spec.ts.snap b/test/__snapshots__/music.spec.ts.snap
index c78bfd6fd61..573391e03fa 100644
--- a/test/__snapshots__/music.spec.ts.snap
+++ b/test/__snapshots__/music.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`music > 42 > genre 1`] = `"Country"`;
 
diff --git a/test/__snapshots__/number.spec.ts.snap b/test/__snapshots__/number.spec.ts.snap
index 71523ecf8bb..3d10ddb4477 100644
--- a/test/__snapshots__/number.spec.ts.snap
+++ b/test/__snapshots__/number.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`number > 42 > bigInt > noArgs 1`] = `379177551410048n`;
 
diff --git a/test/__snapshots__/person.spec.ts.snap b/test/__snapshots__/person.spec.ts.snap
index 5a1ae8ca7d4..3029890615c 100644
--- a/test/__snapshots__/person.spec.ts.snap
+++ b/test/__snapshots__/person.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`person > 42 > bio 1`] = `"public speaker, traveler, designer"`;
 
diff --git a/test/__snapshots__/phone.spec.ts.snap b/test/__snapshots__/phone.spec.ts.snap
index 2fd27bd33e6..a3809065def 100644
--- a/test/__snapshots__/phone.spec.ts.snap
+++ b/test/__snapshots__/phone.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`phone > 42 > imei 1`] = `"37-917755-141004-5"`;
 
diff --git a/test/__snapshots__/random.spec.ts.snap b/test/__snapshots__/random.spec.ts.snap
index b442d3e5d60..824ff3f1477 100644
--- a/test/__snapshots__/random.spec.ts.snap
+++ b/test/__snapshots__/random.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`random > 42 > alpha > noArgs 1`] = `"t"`;
 
@@ -8,8 +8,6 @@ exports[`random > 42 > alphaNumeric > noArgs 1`] = `"n"`;
 
 exports[`random > 42 > alphaNumeric > with length 1`] = `"nNWbJ"`;
 
-exports[`random > 42 > locale 1`] = `"es_MX"`;
-
 exports[`random > 42 > numeric > noArgs 1`] = `"3"`;
 
 exports[`random > 42 > numeric > with length 1`] = `"37917"`;
@@ -30,8 +28,6 @@ exports[`random > 1211 > alphaNumeric > noArgs 1`] = `"V"`;
 
 exports[`random > 1211 > alphaNumeric > with length 1`] = `"VsTMd"`;
 
-exports[`random > 1211 > locale 1`] = `"ur"`;
-
 exports[`random > 1211 > numeric > noArgs 1`] = `"9"`;
 
 exports[`random > 1211 > numeric > with length 1`] = `"94872"`;
@@ -42,7 +38,7 @@ exports[`random > 1211 > words > noArgs 1`] = `"invoice Cyclocross assail"`;
 
 exports[`random > 1211 > words > with length 1`] = `"gah strictly Rustic assail Manager"`;
 
-exports[`random > 1211 > words > with length range 1`] = `"invoice Cyclocross assail Manager New"`;
+exports[`random > 1211 > words > with length range 1`] = `"invoice Cyclocross assail Manager Gourde"`;
 
 exports[`random > 1337 > alpha > noArgs 1`] = `"n"`;
 
@@ -52,8 +48,6 @@ exports[`random > 1337 > alphaNumeric > noArgs 1`] = `"g"`;
 
 exports[`random > 1337 > alphaNumeric > with length 1`] = `"gy9dh"`;
 
-exports[`random > 1337 > locale 1`] = `"en_GH"`;
-
 exports[`random > 1337 > numeric > noArgs 1`] = `"2"`;
 
 exports[`random > 1337 > numeric > with length 1`] = `"25122"`;
diff --git a/test/__snapshots__/science.spec.ts.snap b/test/__snapshots__/science.spec.ts.snap
index a8fb5126b14..bc24e66d08d 100644
--- a/test/__snapshots__/science.spec.ts.snap
+++ b/test/__snapshots__/science.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`science > 42 > chemicalElement 1`] = `
 {
diff --git a/test/__snapshots__/string.spec.ts.snap b/test/__snapshots__/string.spec.ts.snap
index a6b52eda860..cb8487dae59 100644
--- a/test/__snapshots__/string.spec.ts.snap
+++ b/test/__snapshots__/string.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`string > 42 > alpha > noArgs 1`] = `"t"`;
 
diff --git a/test/__snapshots__/system.spec.ts.snap b/test/__snapshots__/system.spec.ts.snap
index 39234738318..9957a455490 100644
--- a/test/__snapshots__/system.spec.ts.snap
+++ b/test/__snapshots__/system.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`system > 42 > commonFileExt 1`] = `"png"`;
 
diff --git a/test/__snapshots__/vehicle.spec.ts.snap b/test/__snapshots__/vehicle.spec.ts.snap
index 96ae881355c..2affc34e1e3 100644
--- a/test/__snapshots__/vehicle.spec.ts.snap
+++ b/test/__snapshots__/vehicle.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`vehicle > 42 > bicycle 1`] = `"Fitness Bicycle"`;
 
diff --git a/test/__snapshots__/word.spec.ts.snap b/test/__snapshots__/word.spec.ts.snap
index 6191f6b98a1..475fd2d67f6 100644
--- a/test/__snapshots__/word.spec.ts.snap
+++ b/test/__snapshots__/word.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`word > 42 > adjective > noArgs 1`] = `"hasty"`;
 
diff --git a/test/airline.spec.ts b/test/airline.spec.ts
index e8f996e1ded..95e4bef0c61 100644
--- a/test/airline.spec.ts
+++ b/test/airline.spec.ts
@@ -1,14 +1,10 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { Aircraft, faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('airline', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'airline', (t) => {
     t.itEach('airport', 'airline', 'airplane', 'aircraftType');
     t.describe('recordLocator', (t) => {
diff --git a/test/all_functional.spec.ts b/test/all_functional.spec.ts
index ae4ac991213..a938b61c972 100644
--- a/test/all_functional.spec.ts
+++ b/test/all_functional.spec.ts
@@ -1,14 +1,12 @@
 import { describe, expect, it } from 'vitest';
-import { faker } from '../src';
-import type { KnownLocale } from '../src/locales';
+import type { allLocales, Faker, RandomModule } from '../src';
+import { allFakers, fakerEN } from '../src';
 
 const IGNORED_MODULES = [
-  'locales',
   'definitions',
   'helpers',
-  '_locale',
-  '_localeFallback',
   '_mersenne',
+  '_defaultRefDate',
 ];
 
 function isTestableModule(mod: string) {
@@ -16,9 +14,13 @@ function isTestableModule(mod: string) {
 }
 
 function isMethodOf(mod: string) {
-  return (meth: string) => typeof faker[mod][meth] === 'function';
+  return (meth: string) => typeof fakerEN[mod][meth] === 'function';
 }
 
+type SkipConfig<Module> = Partial<
+  Record<keyof Module, '*' | ReadonlyArray<keyof typeof allLocales>>
+>;
+
 const BROKEN_LOCALE_METHODS = {
   // TODO ST-DDT 2022-03-28: these are TODOs (usually broken locale files)
   company: {
@@ -29,6 +31,9 @@ const BROKEN_LOCALE_METHODS = {
     state: ['az', 'cz', 'nb_NO', 'sk'],
     stateAbbr: ['cz', 'sk'],
   },
+  random: {
+    locale: '*', // locale() has been pseudo removed
+  } as SkipConfig<RandomModule>,
   string: {
     fromCharacters: '*',
   },
@@ -36,7 +41,9 @@ const BROKEN_LOCALE_METHODS = {
     prefix: ['az', 'id_ID', 'ru', 'zh_CN', 'zh_TW'],
     suffix: ['az', 'it', 'mk', 'pt_PT', 'ru'],
   },
-} satisfies Record<string, Record<string, '*' | KnownLocale[]>>;
+} satisfies {
+  [module in keyof Faker]?: SkipConfig<Faker[module]>;
+};
 
 function isWorkingLocaleForMethod(
   mod: string,
@@ -50,12 +57,12 @@ function isWorkingLocaleForMethod(
 // Basic smoke tests to make sure each method is at least implemented and returns a value.
 
 function modulesList(): { [module: string]: string[] } {
-  const modules = Object.keys(faker)
+  const modules = Object.keys(fakerEN)
     .sort()
     .filter(isTestableModule)
     .reduce((result, mod) => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      const methods = Object.keys(faker[mod]).filter(isMethodOf(mod));
+      const methods = Object.keys(fakerEN[mod]).filter(isMethodOf(mod));
       if (methods.length) {
         result[mod] = methods;
       } else {
@@ -100,13 +107,12 @@ describe('BROKEN_LOCALE_METHODS test', () => {
 });
 
 describe('functional tests', () => {
-  for (const locale in faker.locales) {
+  for (const [locale, faker] of Object.entries(allFakers)) {
     describe(locale, () => {
       Object.keys(modules).forEach((module) => {
         describe(module, () => {
           modules[module].forEach((meth) => {
             const testAssertion = () => {
-              faker.locale = locale;
               // TODO ST-DDT 2022-03-28: Use random seed once there are no more failures
               faker.seed(1);
               const result = faker[module][meth]();
@@ -134,13 +140,12 @@ describe('functional tests', () => {
 });
 
 describe('faker.helpers.fake functional tests', () => {
-  for (const locale in faker.locales) {
+  for (const [locale, faker] of Object.entries(allFakers)) {
     describe(locale, () => {
       Object.keys(modules).forEach((module) => {
         describe(module, () => {
           modules[module].forEach((meth) => {
             const testAssertion = () => {
-              faker.locale = locale;
               // TODO ST-DDT 2022-03-28: Use random seed once there are no more failures
               faker.seed(1);
               const result = faker.helpers.fake(`{{${module}.${meth}}}`);
diff --git a/test/animal.spec.ts b/test/animal.spec.ts
index 26c01e3132b..11532b89cc8 100644
--- a/test/animal.spec.ts
+++ b/test/animal.spec.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
@@ -23,10 +23,6 @@ const functionNames = [
 ] as const;
 
 describe('animal', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'animal', (t) => {
     t.itEach(...functionNames);
   });
diff --git a/test/color.spec.ts b/test/color.spec.ts
index 091d7ff0e37..3f4f04ddf11 100644
--- a/test/color.spec.ts
+++ b/test/color.spec.ts
@@ -1,15 +1,10 @@
-import { afterEach, describe, expect, it } from 'vitest';
-import { faker } from '../src';
-import { CSS_FUNCTIONS, CSS_SPACES } from '../src/modules/color';
+import { describe, expect, it } from 'vitest';
+import { CssFunction, CssSpace, faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('color', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'color', (t) => {
     t.itEach(
       'human',
@@ -48,14 +43,14 @@ describe('color', () => {
       describe(`cssSupportedFunction()`, () => {
         it('should return random css supported color function from css functions array', () => {
           const func = faker.color.cssSupportedFunction();
-          expect(CSS_FUNCTIONS).toContain(func);
+          expect(Object.values(CssFunction)).toContain(func);
         });
       });
 
       describe(`cssSupportedSpace()`, () => {
         it('should return random css supported color space from css spaces array', () => {
           const space = faker.color.cssSupportedSpace();
-          expect(CSS_SPACES).toContain(space);
+          expect(Object.values(CssSpace)).toContain(space);
         });
       });
 
diff --git a/test/commerce.spec.ts b/test/commerce.spec.ts
index 30b7dde1e47..7d081e497e0 100644
--- a/test/commerce.spec.ts
+++ b/test/commerce.spec.ts
@@ -1,14 +1,10 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('commerce', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'commerce', (t) => {
     t.itEach(
       'department',
diff --git a/test/company.spec.ts b/test/company.spec.ts
index 4a57f118a23..703eb960171 100644
--- a/test/company.spec.ts
+++ b/test/company.spec.ts
@@ -1,28 +1,26 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('company', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'company', (t) => {
     t.itEach(
       'suffixes',
       'name',
       'companySuffix',
       'catchPhrase',
-      'bs',
+      'buzzPhrase',
       'catchPhraseAdjective',
       'catchPhraseDescriptor',
       'catchPhraseNoun',
-      'bsAdjective',
-      'bsBuzz',
-      'bsNoun'
+      'buzzAdjective',
+      'buzzVerb',
+      'buzzNoun'
     );
+
+    t.skip('bs').skip('bsAdjective').skip('bsBuzz').skip('bsNoun');
   });
 
   describe(`random seeded tests for seed ${faker.seed()}`, () => {
@@ -68,9 +66,9 @@ describe('company', () => {
         });
       });
 
-      describe('bs()', () => {
-        it('should return phrase comprising of a BS buzz, adjective, and noun', () => {
-          const actual = faker.company.bs();
+      describe('buzzPhrase()', () => {
+        it('should return phrase comprising of a buzz, adjective, and noun', () => {
+          const actual = faker.company.buzzPhrase();
 
           expect(actual).toBeTruthy();
           expect(actual).toBeTypeOf('string');
@@ -111,33 +109,33 @@ describe('company', () => {
         });
       });
 
-      describe('bsAdjective()', () => {
-        it('should return random value from bs_adjective array', () => {
-          const actual = faker.company.bsAdjective();
+      describe('buzzAdjective()', () => {
+        it('should return random value from buzz_adjective array', () => {
+          const actual = faker.company.buzzAdjective();
 
           expect(actual).toBeTruthy();
           expect(actual).toBeTypeOf('string');
-          expect(faker.definitions.company.bs_adjective).toContain(actual);
+          expect(faker.definitions.company.buzz_adjective).toContain(actual);
         });
       });
 
-      describe('bsBuzz()', () => {
-        it('should return random value from bs_verb array', () => {
-          const actual = faker.company.bsBuzz();
+      describe('buzzVerb()', () => {
+        it('should return random value from buzz_verb array', () => {
+          const actual = faker.company.buzzVerb();
 
           expect(actual).toBeTruthy();
           expect(actual).toBeTypeOf('string');
-          expect(faker.definitions.company.bs_verb).toContain(actual);
+          expect(faker.definitions.company.buzz_verb).toContain(actual);
         });
       });
 
-      describe('bsNoun()', () => {
-        it('should return random value from bs_noun array', () => {
-          const actual = faker.company.bsNoun();
+      describe('buzzNoun()', () => {
+        it('should return random value from buzz_noun array', () => {
+          const actual = faker.company.buzzNoun();
 
           expect(actual).toBeTruthy();
           expect(actual).toBeTypeOf('string');
-          expect(faker.definitions.company.bs_noun).toContain(actual);
+          expect(faker.definitions.company.buzz_noun).toContain(actual);
         });
       });
     }
diff --git a/test/database.spec.ts b/test/database.spec.ts
index 80a1e2f1cc9..dacaa5cfd7e 100644
--- a/test/database.spec.ts
+++ b/test/database.spec.ts
@@ -1,14 +1,10 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('database', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'database', (t) => {
     t.itEach('column', 'type', 'collation', 'engine', 'mongodbObjectId');
   });
diff --git a/test/date.spec.ts b/test/date.spec.ts
index a9eaeb732b3..7ed18f4732a 100644
--- a/test/date.spec.ts
+++ b/test/date.spec.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest';
-import { faker, FakerError } from '../src';
+import { faker, fakerAZ, FakerError } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const converterMap = [
@@ -12,10 +12,6 @@ const NON_SEEDED_BASED_RUN = 5;
 const refDate = '2021-02-21T17:09:15.711Z';
 
 describe('date', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'date', (t) => {
     t.describeEach(
       'past',
@@ -438,8 +434,9 @@ describe('date', () => {
         });
 
         it('should return random value from date.month.wide_context array for context option', () => {
-          const month = faker.date.month({ context: true });
-          expect(faker.definitions.date.month.wide_context).toContain(month);
+          // Use a locale which has a wide_context array
+          const month = fakerAZ.date.month({ context: true });
+          expect(fakerAZ.definitions.date.month.wide_context).toContain(month);
         });
 
         it('should return random value from date.month.abbr array for abbr option', () => {
@@ -448,28 +445,21 @@ describe('date', () => {
         });
 
         it('should return random value from date.month.abbr_context array for abbr and context option', () => {
-          const month = faker.date.month({ abbr: true, context: true });
-          expect(faker.definitions.date.month.abbr_context).toContain(month);
+          // Use a locale (e.g. az) which has a wide_context array
+          const month = fakerAZ.date.month({ abbr: true, context: true });
+          expect(fakerAZ.definitions.date.month.abbr_context).toContain(month);
         });
 
         it('should return random value from date.month.wide array for context option when date.month.wide_context array is missing', () => {
-          const backup_wide_context = faker.definitions.date.month.wide_context;
-          faker.definitions.date.month.wide_context = undefined;
-
+          // Use a locale (e.g. the default en) which has no wide_context array
           const month = faker.date.month({ context: true });
           expect(faker.definitions.date.month.wide).toContain(month);
-
-          faker.definitions.date.month.wide_context = backup_wide_context;
         });
 
         it('should return random value from date.month.abbr array for abbr and context option when date.month.abbr_context array is missing', () => {
-          const backup_abbr_context = faker.definitions.date.month.abbr_context;
-          faker.definitions.date.month.abbr_context = undefined;
-
+          // Use a locale (e.g. the default en) which has no abbr_context array
           const month = faker.date.month({ abbr: true, context: true });
           expect(faker.definitions.date.month.abbr).toContain(month);
-
-          faker.definitions.date.month.abbr_context = backup_abbr_context;
         });
       });
 
@@ -480,8 +470,9 @@ describe('date', () => {
         });
 
         it('should return random value from date.weekday.wide_context array for context option', () => {
-          const weekday = faker.date.weekday({ context: true });
-          expect(faker.definitions.date.weekday.wide_context).toContain(
+          // Use a locale (e.g. az) which has a wide_context array
+          const weekday = fakerAZ.date.weekday({ context: true });
+          expect(fakerAZ.definitions.date.weekday.wide_context).toContain(
             weekday
           );
         });
@@ -492,32 +483,23 @@ describe('date', () => {
         });
 
         it('should return random value from date.weekday.abbr_context array for abbr and context option', () => {
-          const weekday = faker.date.weekday({ abbr: true, context: true });
-          expect(faker.definitions.date.weekday.abbr_context).toContain(
+          // Use a locale (e.g. az) which has a abbr_context array
+          const weekday = fakerAZ.date.weekday({ abbr: true, context: true });
+          expect(fakerAZ.definitions.date.weekday.abbr_context).toContain(
             weekday
           );
         });
 
         it('should return random value from date.weekday.wide array for context option when date.weekday.wide_context array is missing', () => {
-          const backup_wide_context =
-            faker.definitions.date.weekday.wide_context;
-          faker.definitions.date.weekday.wide_context = undefined;
-
+          // Use a locale (e.g. the default en) which has no wide_context array
           const weekday = faker.date.weekday({ context: true });
           expect(faker.definitions.date.weekday.wide).toContain(weekday);
-
-          faker.definitions.date.weekday.wide_context = backup_wide_context;
         });
 
         it('should return random value from date.weekday.abbr array for abbr and context option when date.weekday.abbr_context array is missing', () => {
-          const backup_abbr_context =
-            faker.definitions.date.weekday.abbr_context;
-          faker.definitions.date.weekday.abbr_context = undefined;
-
+          // Use a locale (e.g. the default en) which has no abbr_context array
           const weekday = faker.date.weekday({ abbr: true, context: true });
           expect(faker.definitions.date.weekday.abbr).toContain(weekday);
-
-          faker.definitions.date.weekday.abbr_context = backup_abbr_context;
         });
       });
 
@@ -558,6 +540,19 @@ describe('date', () => {
             new Date().getUTCFullYear() - min
           );
         });
+
+        it('should throw an error when the min > max year', () => {
+          const min = 2000;
+          const max = 1990;
+
+          expect(() =>
+            faker.date.birthdate({ min, max, mode: 'year' })
+          ).toThrow(
+            new FakerError(
+              `Max 1990 should be larger than or equal to min 2000.`
+            )
+          );
+        });
       });
 
       describe('deprecated', () => {
diff --git a/test/faker.spec.ts b/test/faker.spec.ts
index d8603592b19..62080cd20c6 100644
--- a/test/faker.spec.ts
+++ b/test/faker.spec.ts
@@ -1,51 +1,13 @@
 import type { SpyInstance } from 'vitest';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 import { faker, Faker } from '../src';
 import { FakerError } from '../src/errors/faker-error';
 
 describe('faker', () => {
-  beforeEach(() => {
-    faker.locale = 'en';
-  });
-
-  it('should throw error if no options passed', () => {
-    expect(
-      () =>
-        // @ts-expect-error: mission options
-        new Faker()
-    ).toThrow(
-      new FakerError(
-        'Options with at least one entry in locales must be provided'
-      )
-    );
-  });
-
   it('should throw error if no locales passed', () => {
-    expect(
-      () =>
-        // @ts-expect-error: missing locales
-        new Faker({})
-    ).toThrow(
+    expect(() => new Faker({ locale: [] })).toThrow(
       new FakerError(
-        'At least one entry in locales must be provided in the locales parameter'
-      )
-    );
-  });
-
-  it('should throw error if locale is not known', () => {
-    const instance = new Faker({ locales: { en: { title: 'English' } } });
-    expect(() => (instance.locale = 'unknown')).toThrow(
-      new FakerError(
-        'Locale unknown is not supported. You might want to add the requested locale first to `faker.locales`.'
-      )
-    );
-  });
-
-  it('should throw error if localeFallback is not known', () => {
-    const instance = new Faker({ locales: { en: { title: 'English' } } });
-    expect(() => (instance.localeFallback = 'unknown')).toThrow(
-      new FakerError(
-        'Locale unknown is not supported. You might want to add the requested locale first to `faker.locales`.'
+        'The locale option must contain at least one locale definition.'
       )
     );
   });
@@ -60,7 +22,7 @@ describe('faker', () => {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     require('..').faker;
 
-    new Faker({ locales: { en: { title: '' } } });
+    new Faker({ locale: { title: '' } });
 
     for (const spy of spies) {
       expect(spy).not.toHaveBeenCalled();
@@ -69,13 +31,6 @@ describe('faker', () => {
   });
 
   describe('definitions', () => {
-    describe('title', () => {
-      it.each(Object.keys(faker.locales))('title (%s)', (locale) => {
-        faker.locale = locale;
-        expect(faker.definitions.title).toBe(faker.locales[locale].title);
-      });
-    });
-
     it('locale definition accessability', () => {
       // Metadata
       expect(faker.definitions.title).toBeDefined();
diff --git a/test/finance.spec.ts b/test/finance.spec.ts
index 7c90a62a1ac..41be4a017ff 100644
--- a/test/finance.spec.ts
+++ b/test/finance.spec.ts
@@ -1,5 +1,5 @@
 import isValidBtcAddress from 'validator/lib/isBtcAddress';
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { FakerError } from '../src/errors/faker-error';
 import ibanLib from '../src/modules/finance/iban';
@@ -9,16 +9,13 @@ import { seededTests } from './support/seededRuns';
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('finance', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'finance', (t) => {
     t.itEach(
       'accountName',
       'routingNumber',
       'transactionType',
       'creditCardIssuer',
+      'currency',
       'currencyCode',
       'currencyName',
       'currencySymbol',
@@ -29,19 +26,46 @@ describe('finance', () => {
       'transactionDescription'
     );
 
-    t.describeEach(
-      'account',
-      'pin'
-    )((t) => {
-      t.it('noArgs').it('with length', 10);
+    t.describe('account', (t) => {
+      t.it('noArgs')
+        .it('with length', 10)
+        .it('with length option', { length: 10 });
+    });
+
+    t.describe('pin', (t) => {
+      t.it('noArgs')
+        .it('with length', 10)
+        .it('with length option', { length: 10 });
     });
 
     t.describe('amount', (t) => {
       t.it('noArgs')
+        .it('with min option', { min: 10 })
+        .it('with min and max option', { min: 10, max: 50 })
+        .it('with min, max and dec option', { min: 10, max: 50, dec: 5 })
+        .it('with min, max, dec and symbol option', {
+          min: 10,
+          max: 50,
+          dec: 5,
+          symbol: '#',
+        })
+        .it('with min, max, dec, symbol and autoFormat option', {
+          min: 10,
+          max: 50,
+          dec: 5,
+          symbol: '#',
+          autoFormat: false,
+        })
         .it('with min', 10)
-        .it('with max', undefined, 50)
-        .it('with dec', undefined, undefined, 5)
-        .it('with min and max and dec and symbol', 10, 50, 5, '$');
+        .it('with leagcy max', undefined, 50)
+        .it('with leagcy dec', undefined, undefined, 5)
+        .it(
+          'with min, leagcy max, leagcy dec and leagcy symbol',
+          10,
+          50,
+          5,
+          '$'
+        );
     });
 
     t.describe('bic', (t) => {
@@ -50,20 +74,39 @@ describe('finance', () => {
 
     t.describe('iban', (t) => {
       t.it('noArgs')
+        .it('with formatted option', { formatted: true })
+        .it('with formatted and countryCode option', {
+          formatted: true,
+          countryCode: 'DE',
+        })
         .it('with formatted', true)
         .it('with formatted and countryCode', true, 'DE');
     });
 
     t.describe('creditCardNumber', (t) => {
-      t.it('noArgs').it('with issuer', 'visa');
+      t.it('noArgs')
+        .it('with issuer', 'visa')
+        .it('with issuer option', { issuer: 'visa' });
     });
 
     t.describe('mask', (t) => {
       t.it('noArgs')
         .it('with length', 5)
-        .it('with parenthesis', undefined, true)
-        .it('with ellipsis', undefined, undefined, true)
-        .it('with length, parenthesis, and ellipsis', 5, true, true);
+        .it('with legacy parenthesis', undefined, true)
+        .it('with legacy ellipsis', undefined, undefined, true)
+        .it(
+          'with length, legacy parenthesis, and legacy ellipsis',
+          5,
+          true,
+          true
+        )
+        .it('with length option', { length: 5 })
+        .it('with length and parenthesis option', { length: 5, parens: false })
+        .it('with length, parenthesis and ellipsis option', {
+          length: 5,
+          parens: false,
+          ellipsis: true,
+        });
     });
   });
 
@@ -121,7 +164,7 @@ describe('finance', () => {
       describe('mask()', () => {
         it('should set a default length', () => {
           const expected = 4; //default account mask length
-          const mask = faker.finance.mask(null, false, false);
+          const mask = faker.finance.mask(undefined, false, false);
 
           expect(
             mask,
@@ -259,6 +302,16 @@ describe('finance', () => {
         });
       });
 
+      describe('currency()', () => {
+        it('should return a valid currency object', () => {
+          const currency = faker.finance.currency();
+          expect(currency.code).toBeTypeOf('string');
+          expect(currency.code).toMatch(/^[A-Z]{3}$/);
+          expect(currency.name).toBeTypeOf('string');
+          expect(currency.symbol).toBeTypeOf('string');
+        });
+      });
+
       describe('currencyCode()', () => {
         it('should return a valid three letter currency code', () => {
           const currencyCode = faker.finance.currencyCode();
diff --git a/test/git.spec.ts b/test/git.spec.ts
index a69b1baa2be..805b6bb6a14 100644
--- a/test/git.spec.ts
+++ b/test/git.spec.ts
@@ -1,5 +1,5 @@
 import validator from 'validator';
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
@@ -8,12 +8,16 @@ const NON_SEEDED_BASED_RUN = 5;
 const refDate = '2020-01-01T00:00:00.000Z';
 
 describe('git', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'git', (t) => {
-    t.itEach('branch', 'commitMessage', 'commitSha', 'shortSha');
+    t.itEach('branch', 'commitMessage');
+
+    t.describe('commitSha', (t) => {
+      t.it('noArgs')
+        .it('with length 7', { length: 7 })
+        .it('with length 8', { length: 8 });
+    });
+
+    t.skip('shortSha');
 
     t.describeEach(
       'commitEntry',
@@ -66,7 +70,7 @@ describe('git', () => {
           }
         });
 
-        it('should return a random commitEntry with a default end of line charcter of "\r\n"', () => {
+        it('should return a random commitEntry with a default end of line character of "\r\n"', () => {
           const commitEntry = faker.git.commitEntry();
           const parts = commitEntry.split('\r\n');
 
@@ -74,7 +78,7 @@ describe('git', () => {
           expect(parts.length).toBeLessThanOrEqual(7);
         });
 
-        it('should return a random commitEntry with a configured end of line charcter of "\r\n" with eol = CRLF', () => {
+        it('should return a random commitEntry with a configured end of line character of "\r\n" with eol = CRLF', () => {
           const commitEntry = faker.git.commitEntry({
             eol: 'CRLF',
           });
@@ -84,7 +88,7 @@ describe('git', () => {
           expect(parts.length).toBeLessThanOrEqual(7);
         });
 
-        it('should return a random commitEntry with a configured end of line charcter of "\n" with eol = LF', () => {
+        it('should return a random commitEntry with a configured end of line character of "\n" with eol = LF', () => {
           const commitEntry = faker.git.commitEntry({
             eol: 'LF',
           });
@@ -122,7 +126,7 @@ describe('git', () => {
       });
 
       describe('commitSha', () => {
-        it('should return a random commitSha', () => {
+        it('should return a random full commitSha', () => {
           const commitSha = faker.git.commitSha();
 
           expect(commitSha).toBeTruthy();
@@ -130,17 +134,21 @@ describe('git', () => {
           expect(commitSha).toSatisfy(validator.isHexadecimal);
           expect(commitSha).toHaveLength(40);
         });
-      });
-
-      describe('shortSha', () => {
-        it('should return a random shortSha', () => {
-          const shortSha = faker.git.shortSha();
 
-          expect(shortSha).toBeTruthy();
-          expect(shortSha).toBeTypeOf('string');
-          expect(shortSha).toSatisfy(validator.isHexadecimal);
-          expect(shortSha).toHaveLength(7);
-        });
+        it.each([
+          ['GitHub', 7],
+          ['GitLab', 8],
+        ])(
+          'should return a random short commitSha for %s',
+          (_provider, length) => {
+            const commitSha = faker.git.commitSha({ length });
+
+            expect(commitSha).toBeTruthy();
+            expect(commitSha).toBeTypeOf('string');
+            expect(commitSha).toSatisfy(validator.isHexadecimal);
+            expect(commitSha).toHaveLength(length);
+          }
+        );
       });
     }
   });
diff --git a/test/hacker.spec.ts b/test/hacker.spec.ts
index 9d40c63cfe6..02316fdf0e0 100644
--- a/test/hacker.spec.ts
+++ b/test/hacker.spec.ts
@@ -1,14 +1,10 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('hacker', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'hacker', (t) => {
     t.itEach('abbreviation', 'adjective', 'noun', 'verb', 'ingverb', 'phrase');
   });
@@ -16,10 +12,6 @@ describe('hacker', () => {
   describe(`random seeded tests for seed ${faker.seed()}`, () => {
     for (let i = 1; i <= NON_SEEDED_BASED_RUN; i++) {
       describe('abbreviation()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random abbreviation from array', () => {
           const abbreviation = faker.hacker.abbreviation();
 
@@ -30,10 +22,6 @@ describe('hacker', () => {
       });
 
       describe('adjective', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random adjective from array', () => {
           const adjective = faker.hacker.adjective();
 
@@ -44,10 +32,6 @@ describe('hacker', () => {
       });
 
       describe('noun', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random noun from array', () => {
           const noun = faker.hacker.noun();
 
@@ -58,10 +42,6 @@ describe('hacker', () => {
       });
 
       describe('verb', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random verb from array', () => {
           const verb = faker.hacker.verb();
 
@@ -72,10 +52,6 @@ describe('hacker', () => {
       });
 
       describe('ingverb', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random ingverb from array', () => {
           const ingverb = faker.hacker.ingverb();
 
@@ -86,10 +62,6 @@ describe('hacker', () => {
       });
 
       describe('phrase', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random phrase from array', () => {
           const phrase = faker.hacker.phrase();
 
diff --git a/test/helpers.spec.ts b/test/helpers.spec.ts
index dcf0e48612f..2334c2a20de 100644
--- a/test/helpers.spec.ts
+++ b/test/helpers.spec.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker, FakerError } from '../src';
 import { luhnCheck } from '../src/modules/helpers/luhn-check';
 import { seededTests } from './support/seededRuns';
@@ -14,10 +14,6 @@ function customUniqueMethod(prefix: string = ''): string {
 }
 
 describe('helpers', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'helpers', (t) => {
     t.describe('slugify', (t) => {
       t.it('noArgs').it('some string', 'hello world');
@@ -904,15 +900,25 @@ describe('helpers', () => {
           delete (faker.string as any).special;
         });
 
-        it('should support deprecated aliases', () => {
-          expect(faker.definitions.person.first_name).toContain(
-            faker.helpers.fake('{{name.first_name}}')
+        it('should support deprecated module aliases', () => {
+          expect(faker.definitions.location.city_name).toContain(
+            faker.helpers.fake('{{address.cityName}}')
           );
           expect(faker.definitions.person.first_name).toContain(
             faker.helpers.fake('{{name.firstName}}')
           );
         });
 
+        // TODO @ST-DDT 2023-01-17: Restore this test when the definitions proxy is restored: #893
+        it.todo('should support deprecated definition aliases', () => {
+          expect(faker.definitions.location.city_name).toContain(
+            faker.helpers.fake('{{address.city_name}}')
+          );
+          expect(faker.definitions.person.first_name).toContain(
+            faker.helpers.fake('{{name.first_name}}')
+          );
+        });
+
         it('should not trim whitespace', () => {
           expect(faker.helpers.fake('   ---   ')).toBe('   ---   ');
         });
diff --git a/test/internet.spec.ts b/test/internet.spec.ts
index 16b6a804196..53c25a8167f 100644
--- a/test/internet.spec.ts
+++ b/test/internet.spec.ts
@@ -1,16 +1,12 @@
 import validator from 'validator';
-import { afterEach, describe, expect, it } from 'vitest';
-import { faker } from '../src';
+import { describe, expect, it } from 'vitest';
+import { allFakers, faker } from '../src';
 import { seededTests } from './support/seededRuns';
 import { times } from './support/times';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('internet', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'internet', (t) => {
     t.itEach(
       'avatar',
@@ -28,33 +24,99 @@ describe('internet', () => {
 
     t.describe('email', (t) => {
       t.it('noArgs')
-        .it('with names', 'Jane', 'Doe')
-        .it('with provider', undefined, undefined, 'fakerjs.dev')
-        .it('with names and provider', 'Jane', 'Doe', 'fakerjs.dev');
+        .it('with firstName option', { firstName: 'Jane' })
+        .it('with lastName option', { lastName: 'Doe' })
+        .it('with provider option', { provider: 'fakerjs.dev' })
+        .it('with allowSpecialCharacters option', {
+          allowSpecialCharacters: true,
+        })
+        .it('with all options', {
+          allowSpecialCharacters: true,
+          firstName: 'Jane',
+          lastName: 'Doe',
+          provider: 'fakerjs.dev',
+        })
+        .it('with legacy names', 'Jane', 'Doe')
+        .it('with legacy provider', undefined, undefined, 'fakerjs.dev')
+        .it('with legacy names and provider', 'Jane', 'Doe', 'fakerjs.dev');
     });
 
     t.describe('exampleEmail', (t) => {
-      t.it('noArgs').it('with names', 'Jane', 'Doe');
+      t.it('noArgs')
+        .it('with firstName option', { firstName: 'Jane' })
+        .it('with lastName option', { lastName: 'Doe' })
+        .it('with allowSpecialCharacters option', {
+          allowSpecialCharacters: true,
+        })
+        .it('with all options', {
+          allowSpecialCharacters: true,
+          firstName: 'Jane',
+          lastName: 'Doe',
+        })
+        .it('with legacy names', 'Jane', 'Doe')
+        .it('with legacy names and options', 'Jane', 'Doe', {
+          allowSpecialCharacters: true,
+        });
     });
 
     t.describe('userName', (t) => {
       t.it('noArgs')
-        .it('with Latin names', 'Jane', 'Doe')
-        .it('with accented names', 'Hélene', 'Müller')
-        .it('with Cyrillic names', 'Фёдор', 'Достоевский')
-        .it('with Chinese names', '大羽', '陳');
+        .it('with firstName option', { firstName: 'Jane' })
+        .it('with lastName option', { lastName: 'Doe' })
+        .it('with all option', { firstName: 'Jane', lastName: 'Doe' })
+        .it('with legacy names', 'Jane', 'Doe')
+        .it('with Latin names', { firstName: 'Jane', lastName: 'Doe' })
+        .it('with accented names', { firstName: 'Hélene', lastName: 'Müller' })
+        .it('with Cyrillic names', {
+          firstName: 'Фёдор',
+          lastName: 'Достоевский',
+        })
+        .it('with Chinese names', { firstName: '大羽', lastName: '陳' });
     });
 
     t.describe('displayName', (t) => {
       t.it('noArgs')
-        .it('with Latin names', 'Jane', 'Doe')
-        .it('with accented names', 'Hélene', 'Müller')
-        .it('with Cyrillic names', 'Фёдор', 'Достоевский')
-        .it('with Chinese names', '大羽', '陳');
+        .it('with firstName option', { firstName: 'Jane' })
+        .it('with lastName option', { lastName: 'Doe' })
+        .it('with all option', { firstName: 'Jane', lastName: 'Doe' })
+        .it('with legacy names', 'Jane', 'Doe')
+        .it('with Latin names', { firstName: 'Jane', lastName: 'Doe' })
+        .it('with accented names', { firstName: 'Hélene', lastName: 'Müller' })
+        .it('with Cyrillic names', {
+          firstName: 'Фёдор',
+          lastName: 'Достоевский',
+        })
+        .it('with Chinese names', { firstName: '大羽', lastName: '陳' });
     });
 
     t.describe('password', (t) => {
-      t.it('noArgs').it('with length', 10);
+      t.it('noArgs')
+        .it('with length option', { length: 10 })
+        .it('with memorable option', {
+          memorable: false,
+        })
+        .it('with pattern option', {
+          pattern: /[0-9]/,
+        })
+        .it('with prefix option', {
+          prefix: 'test',
+        })
+        .it('with length, memorable, pattern and prefix option', {
+          length: 10,
+          memorable: false,
+          pattern: /[0-9]/,
+          prefix: 'test',
+        })
+        .it('with legacy length', 10)
+        .it('with legacy length and memorable', 10, false)
+        .it('with legacy length, memorable and pattern', 10, false, /[0-9]/)
+        .it(
+          'with legacy length, memorable, pattern and prefix',
+          10,
+          false,
+          /[0-9]/,
+          'test'
+        );
     });
 
     t.describe('httpStatusCode', (t) => {
@@ -62,11 +124,22 @@ describe('internet', () => {
     });
 
     t.describe('color', (t) => {
-      t.it('noArgs').it('with color base', 100, 100, 100);
+      t.it('noArgs')
+        .it('with blueBase option', { blueBase: 100 })
+        .it('with greenBase option', { greenBase: 100 })
+        .it('with redBase option', { redBase: 100 })
+        .it('with all options', {
+          redBase: 100,
+          blueBase: 100,
+          greenBase: 100,
+        })
+        .it('with legacy color base', 100, 100, 100);
     });
 
     t.describe('mac', (t) => {
-      t.it('noArgs').it('with separator', ':');
+      t.it('noArgs')
+        .it('with separator', ':')
+        .it('with separator option', { separator: '-' });
     });
 
     t.describe('emoji', (t) => {
@@ -110,22 +183,19 @@ describe('internet', () => {
           expect(faker.definitions.internet.free_email).toContain(suffix);
         });
 
-        it('should return a valid email in every locale', () => {
-          for (const locale of Object.keys(faker.locales)) {
-            faker.setLocale(locale);
-            const email = faker.internet.email();
+        it.each(Object.entries(allFakers))(
+          'should return a valid email in %s',
+          (_, localeFaker) => {
+            const email = localeFaker.internet.email();
 
             expect(email).toBeTruthy();
             expect(email).toBeTypeOf('string');
-            expect(email).toSatisfy(
-              validator.isEmail,
-              `locale: ${locale} has invalid email: ${email}`
-            );
+            expect(email).toSatisfy(validator.isEmail);
           }
-        });
+        );
 
         it('should return an email with given firstName', () => {
-          const email = faker.internet.email('Aiden.Harann55');
+          const email = faker.internet.email({ firstName: 'Aiden.Harann55' });
 
           expect(email).toBeTruthy();
           expect(email).toBeTypeOf('string');
@@ -140,8 +210,35 @@ describe('internet', () => {
           expect(faker.definitions.internet.free_email).toContain(suffix);
         });
 
+        it('should not allow an email that starts or ends with a .', () => {
+          const email = faker.internet.email('...Aiden...', '...Doe...');
+
+          expect(email).toBeTruthy();
+          expect(email).toBeTypeOf('string');
+          expect(email).toSatisfy(validator.isEmail);
+
+          const [prefix] = email.split('@');
+          expect(prefix).not.toMatch(/^\./);
+          expect(prefix).not.toMatch(/\.$/);
+        });
+
+        it('should not allow an email with multiple dots', () => {
+          const email = faker.internet.email('Ai....den');
+
+          expect(email).toBeTruthy();
+          expect(email).toBeTypeOf('string');
+          expect(email).toSatisfy(validator.isEmail);
+
+          const [prefix] = email.split('@');
+          //expect it not to contain multiple .s
+          expect(prefix).not.toMatch(/\.{2,}/);
+        });
+
         it('should return an email with given firstName and lastName', () => {
-          const email = faker.internet.email('Aiden', 'Harann');
+          const email = faker.internet.email({
+            firstName: 'Aiden',
+            lastName: 'Harann',
+          });
 
           expect(email).toBeTruthy();
           expect(email).toBeTypeOf('string');
@@ -160,7 +257,10 @@ describe('internet', () => {
           const longFirstName =
             'Elizabeth Alexandra Mary Jane Annabel Victoria';
           const longSurname = 'Smith Jones Davidson Brown White Greene Black';
-          const email = faker.internet.email(longFirstName, longSurname);
+          const email = faker.internet.email({
+            firstName: longFirstName,
+            lastName: longSurname,
+          });
           // should truncate to 50 chars
           // e.g. ElizabethAlexandraMaryJaneAnnabelVictoria.SmithJon@yahoo.com
           expect(email).toSatisfy(validator.isEmail);
@@ -169,14 +269,19 @@ describe('internet', () => {
         });
 
         it('should return a valid email for names with invalid chars', () => {
-          const email = faker.internet.email('Matthew (Matt)', 'Smith');
+          const email = faker.internet.email({
+            firstName: 'Matthew (Matt)',
+            lastName: 'Smith',
+          });
           // should strip invalid chars
           // e.g. MatthewMatt_Smith@yahoo.com
           expect(email).toSatisfy(validator.isEmail);
         });
 
         it('should return an email with special characters', () => {
-          const email = faker.internet.email('Mike', 'Smith', null, {
+          const email = faker.internet.email({
+            firstName: 'Mike',
+            lastName: 'Smith',
             allowSpecialCharacters: true,
           });
 
@@ -208,7 +313,9 @@ describe('internet', () => {
         });
 
         it('should return an email with the example suffix and given firstName', () => {
-          const email = faker.internet.exampleEmail('Aiden.Harann55');
+          const email = faker.internet.exampleEmail({
+            firstName: 'Aiden.Harann55',
+          });
 
           expect(email).toBeTruthy();
           expect(email).toBeTypeOf('string');
@@ -222,7 +329,10 @@ describe('internet', () => {
         });
 
         it('should return an email with the example suffix and given firstName and lastName', () => {
-          const email = faker.internet.exampleEmail('Aiden', 'Harann');
+          const email = faker.internet.exampleEmail({
+            firstName: 'Aiden',
+            lastName: 'Harann',
+          });
 
           expect(email).toBeTruthy();
           expect(email).toBeTypeOf('string');
@@ -236,7 +346,9 @@ describe('internet', () => {
         });
 
         it('should return an email with special characters', () => {
-          const email = faker.internet.exampleEmail('Mike', 'Smith', {
+          const email = faker.internet.exampleEmail({
+            firstName: 'Mike',
+            lastName: 'Smith',
             allowSpecialCharacters: true,
           });
 
@@ -262,7 +374,7 @@ describe('internet', () => {
         });
 
         it('should return a random username with given firstName', () => {
-          const username = faker.internet.userName('Aiden');
+          const username = faker.internet.userName({ firstName: 'Aiden' });
 
           expect(username).toBeTruthy();
           expect(username).toBeTypeOf('string');
@@ -271,7 +383,10 @@ describe('internet', () => {
         });
 
         it('should return a random username with given firstName and lastName', () => {
-          const username = faker.internet.userName('Aiden', 'Harann');
+          const username = faker.internet.userName({
+            firstName: 'Aiden',
+            lastName: 'Harann',
+          });
 
           expect(username).toBeTruthy();
           expect(username).toBeTypeOf('string');
@@ -282,12 +397,18 @@ describe('internet', () => {
         });
 
         it('should strip accents', () => {
-          const username = faker.internet.userName('Adèle', 'Smith');
+          const username = faker.internet.userName({
+            firstName: 'Adèle',
+            lastName: 'Smith',
+          });
           expect(username).includes('Adele');
         });
 
         it('should transliterate Cyrillic', () => {
-          const username = faker.internet.userName('Амос', 'Васильев');
+          const username = faker.internet.userName({
+            firstName: 'Амос',
+            lastName: 'Васильев',
+          });
           expect(username).includes('Amos');
         });
 
@@ -307,7 +428,9 @@ describe('internet', () => {
         });
 
         it('should return a random display name with given firstName', () => {
-          const displayName = faker.internet.displayName('Aiden');
+          const displayName = faker.internet.displayName({
+            firstName: 'Aiden',
+          });
 
           expect(displayName).toBeTruthy();
           expect(displayName).toBeTypeOf('string');
@@ -316,7 +439,10 @@ describe('internet', () => {
         });
 
         it('should return a random display name with given firstName and lastName', () => {
-          const displayName = faker.internet.displayName('Aiden', 'Harann');
+          const displayName = faker.internet.displayName({
+            firstName: 'Aiden',
+            lastName: 'Harann',
+          });
 
           expect(displayName).toBeTruthy();
           expect(displayName).toBeTypeOf('string');
@@ -533,7 +659,11 @@ describe('internet', () => {
         });
 
         it('should return a random hex value with given values', () => {
-          const color = faker.internet.color(100, 100, 100);
+          const color = faker.internet.color({
+            redBase: 100,
+            greenBase: 100,
+            blueBase: 100,
+          });
 
           expect(color).toBeTruthy();
           expect(color).toBeTypeOf('string');
@@ -599,7 +729,7 @@ describe('internet', () => {
         it.each(times(32))(
           'should return random password with length %i',
           (length) => {
-            const password = faker.internet.password(length);
+            const password = faker.internet.password({ length });
 
             expect(password).toBeTruthy();
             expect(password).toBeTypeOf('string');
@@ -609,7 +739,10 @@ describe('internet', () => {
         );
 
         it('should return memorable password', () => {
-          const password = faker.internet.password(12, true);
+          const password = faker.internet.password({
+            length: 12,
+            memorable: true,
+          });
 
           expect(password).toBeTruthy();
           expect(password).toBeTypeOf('string');
@@ -618,7 +751,10 @@ describe('internet', () => {
         });
 
         it('should return non memorable password', () => {
-          const password = faker.internet.password(12, false);
+          const password = faker.internet.password({
+            length: 12,
+            memorable: false,
+          });
 
           expect(password).toBeTruthy();
           expect(password).toBeTypeOf('string');
@@ -629,11 +765,11 @@ describe('internet', () => {
         });
 
         it('should return non memorable strong password with length 32', () => {
-          const password = faker.internet.password(
-            32,
-            false,
-            /(!|\?|&|\[|\]|%|\$|[a-zA-Z0-9])/
-          );
+          const password = faker.internet.password({
+            length: 32,
+            memorable: false,
+            pattern: /(!|\?|&|\[|\]|%|\$|[a-zA-Z0-9])/,
+          });
 
           expect(password).toBeTruthy();
           expect(password).toBeTypeOf('string');
@@ -643,12 +779,12 @@ describe('internet', () => {
         });
 
         it('should return non memorable strong password with length 32 and given prefix', () => {
-          const password = faker.internet.password(
-            32,
-            false,
-            /(!|\?|&|\[|\]|%|\$|[a-zA-Z0-9])/,
-            'a!G6'
-          );
+          const password = faker.internet.password({
+            length: 32,
+            memorable: false,
+            pattern: /(!|\?|&|\[|\]|%|\$|[a-zA-Z0-9])/,
+            prefix: 'a!G6',
+          });
 
           expect(password).toBeTruthy();
           expect(password).toBeTypeOf('string');
diff --git a/test/locale-data.spec.ts b/test/locale-data.spec.ts
new file mode 100644
index 00000000000..3b9a2dd3879
--- /dev/null
+++ b/test/locale-data.spec.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+import { allLocales } from '../src';
+import './vitest-extensions';
+
+function checkLocaleData(data: unknown) {
+  if (Array.isArray(data)) {
+    it('should not have duplicate entries', () => {
+      expect(data).not.toContainDuplicates();
+    });
+  } else if (typeof data === 'object' && data != null) {
+    for (const [nestedKey, nestedData] of Object.entries(data)) {
+      describe(nestedKey, () => {
+        checkLocaleData(nestedData);
+      });
+    }
+  } else {
+    it.skip(`primitives cannot be tested`);
+  }
+}
+
+describe('locale-data', () => {
+  checkLocaleData(allLocales);
+});
diff --git a/test/locale-imports.spec.ts b/test/locale-imports.spec.ts
index 3fdbeed1d75..260bc65a057 100644
--- a/test/locale-imports.spec.ts
+++ b/test/locale-imports.spec.ts
@@ -1,21 +1,28 @@
 import { describe, expect, it } from 'vitest';
-import allLocales from '../src/locales';
+import type { Faker } from '../src';
+import { allLocales } from '../src';
 
 describe('locale imports', () => {
   for (const locale in allLocales) {
     it(`should be possible to directly require('@faker-js/faker/locale/${locale}')`, () => {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { faker } = require(`../dist/cjs/locale/${locale}`);
+      const { faker } = require(`../dist/cjs/locale/${locale}`) as {
+        faker: Faker;
+      };
 
       expect(faker).toBeDefined();
-      expect(faker.locale).toBe(locale);
+      expect(faker.string.alpha()).toBeTypeOf('string');
+      expect(faker.definitions.title).toBe(allLocales[locale].title);
     });
 
     it(`should be possible to directly import('@faker-js/faker/locale/${locale}')`, async () => {
-      const { faker } = await import(`../dist/esm/locale/${locale}`);
+      const { faker } = (await import(`../dist/esm/locale/${locale}`)) as {
+        faker: Faker;
+      };
 
       expect(faker).toBeDefined();
-      expect(faker.locale).toBe(locale);
+      expect(faker.string.alpha()).toBeTypeOf('string');
+      expect(faker.definitions.title).toBe(allLocales[locale].title);
     });
 
     describe('Internal tests to cover `src/locale/*.ts`', () => {
@@ -24,7 +31,8 @@ describe('locale imports', () => {
         const { faker } = require(`../locale/${locale}`);
 
         expect(faker).toBeDefined();
-        expect(faker.locale).toBe(locale);
+        expect(faker.string.alpha()).toBeTypeOf('string');
+        expect(faker.definitions.title).toBe(allLocales[locale].title);
       });
 
       it(`should be possible to directly import('../src/locale/${locale}')`, async () => {
@@ -32,7 +40,8 @@ describe('locale imports', () => {
         const { faker } = await import(`../src/locale/${locale}`);
 
         expect(faker).toBeDefined();
-        expect(faker.locale).toBe(locale);
+        expect(faker.string.alpha()).toBeTypeOf('string');
+        expect(faker.definitions.title).toBe(allLocales[locale].title);
       });
     });
   }
diff --git a/test/locales.spec.ts b/test/locales.spec.ts
deleted file mode 100644
index 4249f94ded1..00000000000
--- a/test/locales.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { faker } from '../src';
-import allLocales from '../src/locales';
-import './vitest-extensions';
-
-// Remark: actual use of locales functionality is currently tested in all.functional.js test
-
-describe('locale', () => {
-  describe('setLocale()', () => {
-    it('setLocale() changes faker.locale', () => {
-      for (const locale in faker.locales) {
-        faker.setLocale(locale);
-        expect(faker.locale).toBe(locale);
-      }
-    });
-  });
-
-  function checkLocaleData(data: unknown) {
-    if (Array.isArray(data)) {
-      it('should not have duplicate entries', () => {
-        expect(data).not.toContainDuplicates();
-      });
-    } else if (typeof data === 'object' && data != null) {
-      for (const [nestedKey, nestedData] of Object.entries(data)) {
-        describe(nestedKey, () => {
-          checkLocaleData(nestedData);
-        });
-      }
-    } else {
-      it.skip(`primitives cannot be tested`);
-    }
-  }
-
-  checkLocaleData(allLocales);
-});
diff --git a/test/location.spec.ts b/test/location.spec.ts
index 3328f8d0727..3c41d351278 100644
--- a/test/location.spec.ts
+++ b/test/location.spec.ts
@@ -1,5 +1,5 @@
-import { afterEach, describe, expect, it } from 'vitest';
-import { faker } from '../src';
+import { describe, expect, it } from 'vitest';
+import { faker, fakerEN_CA, fakerEN_US } from '../src';
 import { seededTests } from './support/seededRuns';
 import { times } from './support/times';
 
@@ -38,10 +38,6 @@ function haversine(
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('location', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'location', (t) => {
     t.itEach('street', 'streetName');
 
@@ -156,8 +152,7 @@ describe('location', () => {
 
         it('returns zipCode with proper locale format', () => {
           // we'll use the en_CA locale..
-          faker.locale = 'en_CA';
-          const zipCode = faker.location.zipCode();
+          const zipCode = fakerEN_CA.location.zipCode();
 
           expect(zipCode).toMatch(/^[A-Za-z]\d[A-Za-z]\s?\d[A-Za-z]\d$/);
         });
@@ -165,18 +160,17 @@ describe('location', () => {
 
       describe('zipCodeByState()', () => {
         it('returns zipCode valid for specified State', () => {
-          faker.locale = 'en_US';
           const states = ['IL', 'GA', 'WA'];
 
-          const zipCode1 = +faker.location.zipCodeByState(states[0]);
+          const zipCode1 = +fakerEN_US.location.zipCodeByState(states[0]);
           expect(zipCode1).toBeGreaterThanOrEqual(60001);
           expect(zipCode1).toBeLessThanOrEqual(62999);
 
-          const zipCode2 = +faker.location.zipCodeByState(states[1]);
+          const zipCode2 = +fakerEN_US.location.zipCodeByState(states[1]);
           expect(zipCode2).toBeGreaterThanOrEqual(30001);
           expect(zipCode2).toBeLessThanOrEqual(31999);
 
-          const zipCode3 = +faker.location.zipCodeByState(states[2]);
+          const zipCode3 = +fakerEN_US.location.zipCodeByState(states[2]);
           expect(zipCode3).toBeGreaterThanOrEqual(98001);
           expect(zipCode3).toBeLessThanOrEqual(99403);
         });
diff --git a/test/lorem.spec.ts b/test/lorem.spec.ts
index e1d74a4013b..f22cf72f40e 100644
--- a/test/lorem.spec.ts
+++ b/test/lorem.spec.ts
@@ -1,5 +1,5 @@
 import validator from 'validator';
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 import { times } from './support/times';
@@ -7,10 +7,6 @@ import { times } from './support/times';
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('lorem', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'lorem', (t) => {
     t.describe('word', (t) => {
       t.it('noArgs')
diff --git a/test/music.spec.ts b/test/music.spec.ts
index 01274d682ab..aff8af856fc 100644
--- a/test/music.spec.ts
+++ b/test/music.spec.ts
@@ -1,14 +1,10 @@
-import { beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('music', () => {
-  beforeEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'music', (t) => {
     t.itEach('genre', 'songName');
   });
diff --git a/test/number.spec.ts b/test/number.spec.ts
index 78a385b9bac..9a722480c41 100644
--- a/test/number.spec.ts
+++ b/test/number.spec.ts
@@ -1,13 +1,9 @@
 import validator from 'validator';
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker, FakerError } from '../src';
 import { seededTests } from './support/seededRuns';
 
 describe('number', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'number', (t) => {
     t.describeEach(
       'int',
diff --git a/test/person.spec.ts b/test/person.spec.ts
index c232977ff0a..beca664386a 100644
--- a/test/person.spec.ts
+++ b/test/person.spec.ts
@@ -1,15 +1,10 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { faker, Sex } from '../src';
+import { describe, expect, it } from 'vitest';
+import { faker, fakerAZ, fakerMK, fakerUK, Sex } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('person', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-    faker.localeFallback = 'en';
-  });
-
   seededTests(faker, 'person', (t) => {
     t.itEach(
       'sexType',
@@ -48,11 +43,6 @@ describe('person', () => {
   describe(`random seeded tests for seed ${faker.seed()}`, () => {
     for (let i = 1; i <= NON_SEEDED_BASED_RUN; i++) {
       describe('firstName()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a random first name', () => {
           const first_name = faker.person.firstName();
 
@@ -69,23 +59,15 @@ describe('person', () => {
         });
 
         it('should return a sex-specific first name when no sex-specific first name was defined', () => {
-          faker.locale = 'az';
-          faker.localeFallback = 'az';
-
-          const name = faker.person.firstName();
+          const name = fakerAZ.person.firstName();
           expect([
-            ...faker.definitions.person.female_first_name,
-            ...faker.definitions.person.male_first_name,
+            ...fakerAZ.definitions.person.female_first_name,
+            ...fakerAZ.definitions.person.male_first_name,
           ]).toContain(name);
         });
       });
 
       describe('lastName()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a random last name', () => {
           const last_name = faker.person.lastName();
 
@@ -94,22 +76,15 @@ describe('person', () => {
         });
 
         it('should return a sex-specific last name', () => {
-          faker.locale = 'az';
-
-          let name = faker.person.lastName('female');
-          expect(faker.definitions.person.female_last_name).toContain(name);
+          let name = fakerAZ.person.lastName('female');
+          expect(fakerAZ.definitions.person.female_last_name).toContain(name);
 
-          name = faker.person.lastName('male');
-          expect(faker.definitions.person.male_last_name).toContain(name);
+          name = fakerAZ.person.lastName('male');
+          expect(fakerAZ.definitions.person.male_last_name).toContain(name);
         });
       });
 
       describe('middleName()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a random middle name', () => {
           const middle_name = faker.person.middleName();
 
@@ -118,8 +93,6 @@ describe('person', () => {
         });
 
         it('should return a middle name when passed en locale', () => {
-          faker.locale = 'en';
-
           let name = faker.person.middleName();
           expect(faker.definitions.person.middle_name).toContain(name);
 
@@ -131,22 +104,15 @@ describe('person', () => {
         });
 
         it('should return a sex-specific middle name', () => {
-          faker.locale = 'uk';
-
-          let name = faker.person.middleName('female');
-          expect(faker.definitions.person.female_middle_name).toContain(name);
+          let name = fakerUK.person.middleName('female');
+          expect(fakerUK.definitions.person.female_middle_name).toContain(name);
 
-          name = faker.person.middleName('male');
-          expect(faker.definitions.person.male_middle_name).toContain(name);
+          name = fakerUK.person.middleName('male');
+          expect(fakerUK.definitions.person.male_middle_name).toContain(name);
         });
       });
 
       describe('fullName()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a name with firstName and lastName', () => {
           const fullName = faker.person.fullName();
 
@@ -155,16 +121,14 @@ describe('person', () => {
         });
 
         it('should return a female sex-specific name without firstName and lastName', () => {
-          faker.locale = 'mk';
-
           const female_specific = [
-            ...faker.definitions.person.female_prefix,
-            ...faker.definitions.person.female_first_name,
-            ...faker.definitions.person.female_last_name,
-            ...faker.definitions.person.suffix,
+            ...fakerMK.definitions.person.female_prefix,
+            ...fakerMK.definitions.person.female_first_name,
+            ...fakerMK.definitions.person.female_last_name,
+            ...fakerMK.definitions.person.suffix,
           ];
 
-          const fullName = faker.person.fullName({ sex: 'female' });
+          const fullName = fakerMK.person.fullName({ sex: 'female' });
 
           const parts = fullName.split(' ');
           for (const part of parts) {
@@ -173,16 +137,14 @@ describe('person', () => {
         });
 
         it('should return a male sex-specific name without firstName and lastName', () => {
-          faker.locale = 'mk';
-
           const male_specific = [
-            ...faker.definitions.person.male_prefix,
-            ...faker.definitions.person.male_first_name,
-            ...faker.definitions.person.male_last_name,
-            ...faker.definitions.person.suffix,
+            ...fakerMK.definitions.person.male_prefix,
+            ...fakerMK.definitions.person.male_first_name,
+            ...fakerMK.definitions.person.male_last_name,
+            ...fakerMK.definitions.person.suffix,
           ];
 
-          const fullName = faker.person.fullName({ sex: 'male' });
+          const fullName = fakerMK.person.fullName({ sex: 'male' });
 
           const parts = fullName.split(' ');
           for (const part of parts) {
@@ -191,16 +153,14 @@ describe('person', () => {
         });
 
         it('should return a female sex-specific name with given firstName and lastName', () => {
-          faker.locale = 'mk';
-
           const male_specific = [
-            ...faker.definitions.person.female_prefix,
+            ...fakerMK.definitions.person.female_prefix,
             'firstName',
             'lastName',
-            ...faker.definitions.person.suffix,
+            ...fakerMK.definitions.person.suffix,
           ];
 
-          const fullName = faker.person.fullName({
+          const fullName = fakerMK.person.fullName({
             firstName: 'firstName',
             lastName: 'lastName',
             sex: 'female',
@@ -213,16 +173,14 @@ describe('person', () => {
         });
 
         it('should return a male sex-specific name with given firstName and lastName', () => {
-          faker.locale = 'mk';
-
           const male_specific = [
-            ...faker.definitions.person.male_prefix,
+            ...fakerMK.definitions.person.male_prefix,
             'firstName',
             'lastName',
-            ...faker.definitions.person.suffix,
+            ...fakerMK.definitions.person.suffix,
           ];
 
-          const fullName = faker.person.fullName({
+          const fullName = fakerMK.person.fullName({
             firstName: 'firstName',
             lastName: 'lastName',
             sex: 'male',
@@ -236,11 +194,6 @@ describe('person', () => {
       });
 
       describe('gender()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a default gender', () => {
           const gender = faker.person.gender();
 
@@ -250,11 +203,6 @@ describe('person', () => {
       });
 
       describe('sex()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a sex', () => {
           const sex = faker.person.sex();
 
@@ -273,11 +221,6 @@ describe('person', () => {
       });
 
       describe('prefix()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a prefix', () => {
           const prefix = faker.person.prefix();
 
@@ -286,30 +229,21 @@ describe('person', () => {
         });
 
         it('should return a female prefix with given string', () => {
-          faker.locale = 'mk';
-
-          const prefix = faker.person.prefix('female');
+          const prefix = fakerMK.person.prefix('female');
 
           expect(prefix).toBeTypeOf('string');
-          expect(faker.definitions.person.female_prefix).toContain(prefix);
+          expect(fakerMK.definitions.person.female_prefix).toContain(prefix);
         });
 
         it('should return a male prefix with given string', () => {
-          faker.locale = 'mk';
-
-          const prefix = faker.person.prefix('male');
+          const prefix = fakerMK.person.prefix('male');
 
           expect(prefix).toBeTypeOf('string');
-          expect(faker.definitions.person.male_prefix).toContain(prefix);
+          expect(fakerMK.definitions.person.male_prefix).toContain(prefix);
         });
       });
 
       describe('suffix()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a suffix', () => {
           const suffix = faker.person.suffix();
 
@@ -319,11 +253,6 @@ describe('person', () => {
       });
 
       describe('jobTitle()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a job title consisting of a descriptor, area, and type', () => {
           const jobTitle = faker.person.jobTitle();
 
@@ -340,11 +269,6 @@ describe('person', () => {
       });
 
       describe('jobDescriptor()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a descriptor', () => {
           const descriptor = faker.person.jobDescriptor();
 
@@ -357,11 +281,6 @@ describe('person', () => {
       });
 
       describe('jobArea()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a level', () => {
           const level = faker.person.jobArea();
 
@@ -372,11 +291,6 @@ describe('person', () => {
       });
 
       describe('jobType()', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-          faker.localeFallback = 'en';
-        });
-
         it('should return a job', () => {
           const job = faker.person.jobType();
 
diff --git a/test/phone.spec.ts b/test/phone.spec.ts
index 7431476b9bd..11b809ff2f8 100644
--- a/test/phone.spec.ts
+++ b/test/phone.spec.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { luhnCheck } from '../src/modules/helpers/luhn-check';
 import { seededTests } from './support/seededRuns';
@@ -6,10 +6,6 @@ import { seededTests } from './support/seededRuns';
 const NON_SEEDED_BASED_RUN = 25;
 
 describe('phone', () => {
-  beforeEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'phone', (t) => {
     t.it('imei');
 
diff --git a/test/random.spec.ts b/test/random.spec.ts
index e03e74283c5..3818274f516 100644
--- a/test/random.spec.ts
+++ b/test/random.spec.ts
@@ -1,5 +1,5 @@
-import { beforeEach, describe, expect, it } from 'vitest';
-import { faker, FakerError } from '../src';
+import { describe, expect, it } from 'vitest';
+import { faker, FakerError, fakerZH_CN } from '../src';
 import { seededTests } from './support/seededRuns';
 import { times } from './support/times';
 
@@ -7,7 +7,8 @@ const NON_SEEDED_BASED_RUN = 5;
 
 describe('random', () => {
   seededTests(faker, 'random', (t) => {
-    t.itEach('locale', 'word');
+    t.it('word');
+    t.skip('locale' as 'word'); // locale() has been pseudo removed
 
     t.describeEach(
       'alpha',
@@ -52,10 +53,6 @@ describe('random', () => {
           '-',
         ];
 
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return a random word', () => {
           const actual = faker.random.word();
 
@@ -77,9 +74,7 @@ describe('random', () => {
         it.each(times(50))(
           'should only contain a word without undesirable non-alpha characters, locale=zh_CN (run %i)',
           () => {
-            faker.locale = 'zh_CN';
-
-            const actual = faker.random.word();
+            const actual = fakerZH_CN.random.word();
 
             expect(actual).not.satisfy((word: string) =>
               bannedChars.some((char) => word.includes(char))
@@ -89,10 +84,6 @@ describe('random', () => {
       });
 
       describe('words', () => {
-        beforeEach(() => {
-          faker.locale = 'en';
-        });
-
         it('should return random words', () => {
           const actual = faker.random.words();
 
@@ -126,16 +117,6 @@ describe('random', () => {
         });
       });
 
-      describe('locale', () => {
-        it('should return a random locale', () => {
-          const actual = faker.random.locale();
-
-          expect(actual).toBeTruthy();
-          expect(actual).toBeTypeOf('string');
-          expect(Object.keys(faker.locales)).toContain(actual);
-        });
-      });
-
       describe('alpha', () => {
         it('should return single letter when no count provided', () => {
           const actual = faker.random.alpha();
diff --git a/test/science.spec.ts b/test/science.spec.ts
index c6b0a0dc6c5..6ee1585c445 100644
--- a/test/science.spec.ts
+++ b/test/science.spec.ts
@@ -1,14 +1,10 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('science', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'science', (t) => {
     t.itEach('chemicalElement', 'unit');
   });
diff --git a/test/scripts/apidoc/__snapshots__/signature.spec.ts.snap b/test/scripts/apidoc/__snapshots__/signature.spec.ts.snap
index 23b3867a4ca..cfdbce2f196 100644
--- a/test/scripts/apidoc/__snapshots__/signature.spec.ts.snap
+++ b/test/scripts/apidoc/__snapshots__/signature.spec.ts.snap
@@ -1,11 +1,11 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`signature > analyzeSignature() > complexArrayParameter 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Complex array parameter.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">complexArrayParameter</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#FFCB6B\\">T</span><span style=\\"color:#89DDFF\\">&gt;</span><span style=\\"color:#A6ACCD\\">(array: readonly </span><span style=\\"color:#82AAFF\\">Array</span><span style=\\"color:#89DDFF\\">&lt;{</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">complexArrayParameter</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#FFCB6B\\">T</span><span style=\\"color:#89DDFF\\">&gt;</span><span style=\\"color:#A6ACCD\\">(array: readonly </span><span style=\\"color:#82AAFF\\">Array</span><span style=\\"color:#89DDFF\\">&lt;{</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FFCB6B\\">T</span><span style=\\"color:#89DDFF\\">,</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">weight</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FFCB6B\\">number</span></span>
 <span class=\\"line\\"><span style=\\"color:#89DDFF\\">}&gt;</span><span style=\\"color:#A6ACCD\\">): T</span></span>
@@ -51,10 +51,10 @@ exports[`signature > analyzeSignature() > complexArrayParameter 1`] = `
 
 exports[`signature > analyzeSignature() > defaultBooleanParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a default parameter.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">defaultBooleanParamMethod</span><span style=\\"color:#A6ACCD\\">(c: boolean </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FF9CAC\\">true</span><span style=\\"color:#A6ACCD\\">): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">defaultBooleanParamMethod</span><span style=\\"color:#A6ACCD\\">(c: boolean </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FF9CAC\\">true</span><span style=\\"color:#A6ACCD\\">): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "defaultBooleanParamMethod",
@@ -100,10 +100,10 @@ exports[`signature > analyzeSignature() > expected and actual methods are equal
 
 exports[`signature > analyzeSignature() > functionParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a function parameters.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">functionParamMethod</span><span style=\\"color:#A6ACCD\\">(fn: </span><span style=\\"color:#89DDFF\\">(</span><span style=\\"color:#A6ACCD;font-style:italic\\">a</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FFCB6B\\">string</span><span style=\\"color:#89DDFF\\">)</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#C792EA\\">=&gt;</span><span style=\\"color:#A6ACCD\\"> number): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">functionParamMethod</span><span style=\\"color:#A6ACCD\\">(fn: </span><span style=\\"color:#89DDFF\\">(</span><span style=\\"color:#A6ACCD;font-style:italic\\">a</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FFCB6B\\">string</span><span style=\\"color:#89DDFF\\">)</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#C792EA\\">=&gt;</span><span style=\\"color:#A6ACCD\\"> number): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "functionParamMethod",
@@ -126,10 +126,10 @@ exports[`signature > analyzeSignature() > functionParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > literalUnionParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with LiteralUnion.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">literalUnionParamMethod</span><span style=\\"color:#A6ACCD\\">(value: </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> namedValue: AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> array: readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;,</span><span style=\\"color:#A6ACCD\\"> namedArray: readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#A6ACCD\\">AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;,</span><span style=\\"color:#A6ACCD\\"> mixed: </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;,</span><span style=\\"color:#A6ACCD\\"> namedMixed: AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#A6ACCD\\">AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;</span><span style=\\"color:#A6ACCD\\">): string</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">literalUnionParamMethod</span><span style=\\"color:#A6ACCD\\">(value: </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> namedValue: AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> array: readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;,</span><span style=\\"color:#A6ACCD\\"> namedArray: readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#A6ACCD\\">AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;,</span><span style=\\"color:#A6ACCD\\"> mixed: </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;,</span><span style=\\"color:#A6ACCD\\"> namedMixed: AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> readonly Array</span><span style=\\"color:#89DDFF\\">&lt;</span><span style=\\"color:#A6ACCD\\">AB </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">&gt;</span><span style=\\"color:#A6ACCD\\">): string</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "literalUnionParamMethod",
@@ -187,10 +187,11 @@ exports[`signature > analyzeSignature() > literalUnionParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > methodWithDeprecated 1`] = `
 {
-  "deprecated": true,
+  "deprecated": "<p>do something else</p>
+",
   "description": "<p>Test with deprecated and see marker.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithDeprecated</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithDeprecated</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "methodWithDeprecated",
@@ -207,10 +208,10 @@ exports[`signature > analyzeSignature() > methodWithDeprecated 1`] = `
 
 exports[`signature > analyzeSignature() > methodWithExample 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with example marker.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithExample</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithExample</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">test</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#A6ACCD\\">apidoc</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithExample</span><span style=\\"color:#A6ACCD\\">() </span><span style=\\"color:#676E95;font-style:italic\\">// 0</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
@@ -226,10 +227,10 @@ exports[`signature > analyzeSignature() > methodWithExample 1`] = `
 
 exports[`signature > analyzeSignature() > methodWithMultipleSeeMarkers 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with multiple see markers.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithMultipleSeeMarkers</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithMultipleSeeMarkers</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "methodWithMultipleSeeMarkers",
@@ -247,10 +248,10 @@ exports[`signature > analyzeSignature() > methodWithMultipleSeeMarkers 1`] = `
 
 exports[`signature > analyzeSignature() > methodWithMultipleSeeMarkersAndBackticks 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with multiple see markers and backticks.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithMultipleSeeMarkersAndBackticks</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithMultipleSeeMarkersAndBackticks</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "methodWithMultipleSeeMarkersAndBackticks",
@@ -268,10 +269,10 @@ exports[`signature > analyzeSignature() > methodWithMultipleSeeMarkersAndBacktic
 
 exports[`signature > analyzeSignature() > methodWithSinceMarker 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with since marker.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithSinceMarker</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">methodWithSinceMarker</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "methodWithSinceMarker",
@@ -286,10 +287,10 @@ exports[`signature > analyzeSignature() > methodWithSinceMarker 1`] = `
 
 exports[`signature > analyzeSignature() > multiParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with multiple parameters.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">multiParamMethod</span><span style=\\"color:#A6ACCD\\">(a: number</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> b</span><span style=\\"color:#89DDFF\\">?:</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> c: boolean </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FF9CAC\\">true</span><span style=\\"color:#A6ACCD\\">): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">multiParamMethod</span><span style=\\"color:#A6ACCD\\">(a: number</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> b</span><span style=\\"color:#89DDFF\\">?:</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span><span style=\\"color:#A6ACCD\\"> c: boolean </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#FF9CAC\\">true</span><span style=\\"color:#A6ACCD\\">): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "multiParamMethod",
@@ -326,10 +327,10 @@ exports[`signature > analyzeSignature() > multiParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > noParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with no parameters.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">noParamMethod</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">noParamMethod</span><span style=\\"color:#A6ACCD\\">(): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "noParamMethod",
@@ -344,10 +345,10 @@ exports[`signature > analyzeSignature() > noParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > optionalStringParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with an optional parameter.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionalStringParamMethod</span><span style=\\"color:#A6ACCD\\">(b</span><span style=\\"color:#89DDFF\\">?:</span><span style=\\"color:#A6ACCD\\"> string): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionalStringParamMethod</span><span style=\\"color:#A6ACCD\\">(b</span><span style=\\"color:#89DDFF\\">?:</span><span style=\\"color:#A6ACCD\\"> string): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "optionalStringParamMethod",
@@ -370,10 +371,10 @@ exports[`signature > analyzeSignature() > optionalStringParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > optionsInlineParamMethodWithDefaults 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a function parameters (inline types) with defaults.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsInlineParamMethodWithDefaults</span><span style=\\"color:#A6ACCD\\">(a: </span><span style=\\"color:#89DDFF\\">{</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsInlineParamMethodWithDefaults</span><span style=\\"color:#A6ACCD\\">(a: </span><span style=\\"color:#89DDFF\\">{</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> number</span></span>
 <span class=\\"line\\"><span style=\\"color:#89DDFF\\">}</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> b: </span><span style=\\"color:#89DDFF\\">{</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> number</span></span>
@@ -439,10 +440,10 @@ It also has a more complex description.</p>
 
 exports[`signature > analyzeSignature() > optionsInterfaceParamMethodWithDefaults 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a function parameters with defaults.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsInterfaceParamMethodWithDefaults</span><span style=\\"color:#A6ACCD\\">(a: ParameterOptionsInterfaceA </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> b: ParameterOptionsInterfaceB </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> c: ParameterOptionsInterfaceC): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsInterfaceParamMethodWithDefaults</span><span style=\\"color:#A6ACCD\\">(a: ParameterOptionsInterfaceA </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> b: ParameterOptionsInterfaceB </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> c: ParameterOptionsInterfaceC): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "optionsInterfaceParamMethodWithDefaults",
@@ -479,10 +480,10 @@ exports[`signature > analyzeSignature() > optionsInterfaceParamMethodWithDefault
 
 exports[`signature > analyzeSignature() > optionsParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a function parameters.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsParamMethod</span><span style=\\"color:#A6ACCD\\">(options: </span><span style=\\"color:#89DDFF\\">{</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsParamMethod</span><span style=\\"color:#A6ACCD\\">(options: </span><span style=\\"color:#89DDFF\\">{</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">a</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> number</span><span style=\\"color:#89DDFF\\">,</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">b</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> string</span><span style=\\"color:#89DDFF\\">,</span></span>
 <span class=\\"line\\"><span style=\\"color:#A6ACCD\\">  </span><span style=\\"color:#F07178\\">c</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> boolean</span><span style=\\"color:#89DDFF\\">,</span></span>
@@ -538,10 +539,10 @@ exports[`signature > analyzeSignature() > optionsParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > optionsTypeParamMethodWithDefaults 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a function parameters with defaults.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsTypeParamMethodWithDefaults</span><span style=\\"color:#A6ACCD\\">(a: ParameterOptionsTypeA </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> b: ParameterOptionsTypeB </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> c: ParameterOptionsTypeC): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">optionsTypeParamMethodWithDefaults</span><span style=\\"color:#A6ACCD\\">(a: ParameterOptionsTypeA </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> b: ParameterOptionsTypeB </span><span style=\\"color:#89DDFF\\">=</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">{</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F07178\\">value</span><span style=\\"color:#89DDFF\\">:</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#F78C6C\\">1</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">},</span><span style=\\"color:#A6ACCD\\"> c: ParameterOptionsTypeC): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "optionsTypeParamMethodWithDefaults",
@@ -578,10 +579,10 @@ exports[`signature > analyzeSignature() > optionsTypeParamMethodWithDefaults 1`]
 
 exports[`signature > analyzeSignature() > requiredNumberParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with a required parameter.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">requiredNumberParamMethod</span><span style=\\"color:#A6ACCD\\">(a: number): number</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">requiredNumberParamMethod</span><span style=\\"color:#A6ACCD\\">(a: number): number</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "requiredNumberParamMethod",
@@ -604,10 +605,10 @@ exports[`signature > analyzeSignature() > requiredNumberParamMethod 1`] = `
 
 exports[`signature > analyzeSignature() > stringUnionParamMethod 1`] = `
 {
-  "deprecated": false,
+  "deprecated": undefined,
   "description": "<p>Test with string union.</p>
 ",
-  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\" tabindex=\\"0\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">stringUnionParamMethod</span><span style=\\"color:#A6ACCD\\">(value: </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\">): string</span></span>
+  "examples": "<div class=\\"language-ts\\"><button title=\\"Copy Code\\" class=\\"copy\\"></button><span class=\\"lang\\">ts</span><pre v-pre class=\\"shiki material-theme-palenight\\"><code><span class=\\"line\\"><span style=\\"color:#A6ACCD\\">faker</span><span style=\\"color:#89DDFF\\">.</span><span style=\\"color:#82AAFF\\">stringUnionParamMethod</span><span style=\\"color:#A6ACCD\\">(value: </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">a</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">|</span><span style=\\"color:#A6ACCD\\"> </span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#C3E88D\\">b</span><span style=\\"color:#89DDFF\\">'</span><span style=\\"color:#A6ACCD\\">): string</span></span>
 <span class=\\"line\\"></span></code></pre>
 </div>",
   "name": "stringUnionParamMethod",
diff --git a/test/scripts/apidoc/examplesAndDeprecations.spec.ts b/test/scripts/apidoc/examplesAndDeprecations.spec.ts
index 8d6124e0321..5ff635b202c 100644
--- a/test/scripts/apidoc/examplesAndDeprecations.spec.ts
+++ b/test/scripts/apidoc/examplesAndDeprecations.spec.ts
@@ -15,13 +15,12 @@ import {
   initMarkdownRenderer,
 } from '../../../scripts/apidoc/signature';
 import {
+  extractDeprecated,
   extractRawExamples,
   extractSeeAlsos,
   extractSince,
   extractTagContent,
-  isDeprecated,
 } from '../../../scripts/apidoc/typedoc';
-import { faker } from '../../../src';
 import { loadProjectModules } from './utils';
 
 /*
@@ -30,12 +29,6 @@ import { loadProjectModules } from './utils';
  * - and running these do not log anything, unless the method is deprecated
  */
 
-const locales: Record<string, string> = {
-  GH: 'en_GH',
-  US: 'en_US',
-  DE: 'de',
-};
-
 beforeAll(initMarkdownRenderer);
 
 describe('examples and deprecations', () => {
@@ -46,7 +39,6 @@ describe('examples and deprecations', () => {
     .map((methodName) => vi.spyOn(console, methodName as keyof typeof console));
 
   afterAll(() => {
-    faker.locale = 'en';
     for (const spy of consoleSpies) {
       spy.mockRestore();
     }
@@ -54,7 +46,6 @@ describe('examples and deprecations', () => {
 
   describe.each(Object.entries(modules))('%s', (moduleName, methodsByName) => {
     beforeEach(() => {
-      faker.locale = 'en';
       for (const spy of consoleSpies) {
         spy.mockReset();
       }
@@ -65,11 +56,7 @@ describe('examples and deprecations', () => {
       '%s',
       async (methodName, signature) => {
         // Extract examples and make them runnable
-        let examples = extractRawExamples(signature).join('').trim();
-        examples = examples.replace(
-          /faker([A-Z]{2})\./g,
-          (_, locale: string) => `faker.locale = '${locales[locale]}';\nfaker.`
-        );
+        const examples = extractRawExamples(signature).join('').trim();
 
         expect(
           examples,
@@ -80,16 +67,19 @@ describe('examples and deprecations', () => {
         const dir = resolve(__dirname, 'temp', moduleName);
         mkdirSync(dir, { recursive: true });
         const path = resolve(dir, `${methodName}.ts`);
+        const imports = [...new Set(examples.match(/faker[^\.]*(?=\.)/g))];
         writeFileSync(
           path,
-          `import { faker } from '../../../../../src';\n${examples}`
+          `import { ${imports.join(
+            ', '
+          )} } from '../../../../../src';\n\n${examples}`
         );
 
         // Run the examples
         await import(path);
 
         // Verify logging
-        const deprecatedFlag = isDeprecated(signature);
+        const deprecatedFlag = extractDeprecated(signature) !== undefined;
         if (deprecatedFlag) {
           expect(consoleSpies[1]).toHaveBeenCalled();
           expect(
diff --git a/test/scripts/apidoc/signature.example.ts b/test/scripts/apidoc/signature.example.ts
index 26c35923c6e..13372ffb159 100644
--- a/test/scripts/apidoc/signature.example.ts
+++ b/test/scripts/apidoc/signature.example.ts
@@ -249,7 +249,7 @@ export class SignatureTest {
    *
    * @see test.apidoc.methodWithExample()
    *
-   * @deprecated
+   * @deprecated do something else
    */
   methodWithDeprecated(): number {
     return 0;
diff --git a/test/support/seededRuns.ts b/test/support/seededRuns.ts
index 2c1cbab775a..11085ddffa3 100644
--- a/test/support/seededRuns.ts
+++ b/test/support/seededRuns.ts
@@ -130,7 +130,6 @@ class TestGenerator<
    */
   setup(): void {
     this.faker.seed(this.seed);
-    this.faker.locale = 'en';
   }
 
   /**
@@ -201,7 +200,7 @@ class TestGenerator<
     vi_it(method, () =>
       this.callAndVerify(
         method,
-        [] as Parameters<Module[MethodName]>,
+        [] as unknown as Parameters<Module[MethodName]>,
         repetitions
       )
     );
diff --git a/test/system.spec.ts b/test/system.spec.ts
index fc36ce7859a..67d7acf4deb 100644
--- a/test/system.spec.ts
+++ b/test/system.spec.ts
@@ -1,16 +1,12 @@
 import validator from 'validator';
-import { afterEach, describe, expect, it } from 'vitest';
-import { faker } from '../src';
+import { describe, expect, it } from 'vitest';
+import { faker, fakerSK } from '../src';
 import { seededTests } from './support/seededRuns';
 import { times } from './support/times';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('system', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'system', (t) => {
     t.itEach(
       'commonFileExt',
@@ -422,15 +418,10 @@ describe('system', () => {
 
   describe('extra tests', () => {
     describe('commonFileName()', () => {
-      afterEach(() => {
-        faker.locale = 'en';
-      });
-
       it('#770', () => {
-        faker.seed(5423027051750305);
-        faker.setLocale('sk');
-        faker.system.commonFileName('xml');
-        faker.system.commonFileName('xml');
+        fakerSK.seed(5423027051750305);
+        fakerSK.system.commonFileName('xml');
+        fakerSK.system.commonFileName('xml');
       });
     });
   });
diff --git a/test/vehicle.spec.ts b/test/vehicle.spec.ts
index bc86f0bbcfd..282626471df 100644
--- a/test/vehicle.spec.ts
+++ b/test/vehicle.spec.ts
@@ -1,14 +1,10 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { seededTests } from './support/seededRuns';
 
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('vehicle', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'vehicle', (t) => {
     t.itEach(
       'vehicle',
diff --git a/test/word.spec.ts b/test/word.spec.ts
index 14ac3aaebba..adf7f5309aa 100644
--- a/test/word.spec.ts
+++ b/test/word.spec.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { faker } from '../src';
 import { filterWordListByLength } from '../src/modules/word/filterWordListByLength';
 import { seededTests } from './support/seededRuns';
@@ -6,10 +6,6 @@ import { seededTests } from './support/seededRuns';
 const NON_SEEDED_BASED_RUN = 5;
 
 describe('word', () => {
-  afterEach(() => {
-    faker.locale = 'en';
-  });
-
   seededTests(faker, 'word', (t) => {
     t.describeEach(
       'adjective',
diff --git a/tsconfig.json b/tsconfig.json
index f96902ebaf3..d201dfd1ea2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,12 +8,9 @@
     "esModuleInterop": true,
     "allowJs": true,
     "alwaysStrict": true,
-    // "strictNullChecks": true,
-    // "strictBindCallApply": true,
     "strictFunctionTypes": true,
-    // "strictPropertyInitialization": true,
-    // "noImplicitAny": true,
-    // "noImplicitThis": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
     "useUnknownInCatchVariables": true,
     "stripInternal": true,
     "baseUrl": "."