diff --git a/.eslintignore b/.eslintignore
index ee37d83e1..561aecdcf 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 dist
+dist-*
 node_modules
 public/missing-locales
 public/images/custom
diff --git a/.eslintrc b/.eslintrc
index 9e378cdb1..7e2719fc0 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,10 +1,5 @@
 {
-  "extends": [
-    "airbnb",
-    "airbnb/rules/react",
-    "eslint:recommended",
-    "prettier"
-  ],
+  "extends": ["airbnb", "airbnb/rules/react", "eslint:recommended", "prettier"],
   "parserOptions": {
     "ecmaVersion": "latest"
   },
@@ -74,42 +69,21 @@
   },
   "settings": {
     "node": {
-      "extensions": [
-        ".mjs",
-        ".js",
-        ".jsx",
-        ".ts",
-        ".tsx"
-      ]
+      "extensions": [".mjs", ".js", ".jsx", ".ts", ".tsx"]
     },
     "import/resolver": {
       "alias": {
         "map": [
-          [
-            "@components",
-            "./src/components/"
-          ],
-          [
-            "@services",
-            "./src/services/"
-          ],
-          [
-            "@hooks",
-            "./src/hooks/"
-          ],
-          [
-            "@assets",
-            "./src/assets/"
-          ]
+          ["@components", "./src/components/"],
+          ["@features", "./src/features/"],
+          ["@services", "./src/services/"],
+          ["@hooks", "./src/hooks/"],
+          ["@assets", "./src/assets/"],
+          ["@utils", "./src/utils/"],
+          ["@store", "./src/store/"]
         ],
-        "extensions": [
-          ".mjs",
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx"
-        ]
+        "extensions": [".mjs", ".js", ".jsx", ".ts", ".tsx"]
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/locales.yml b/.github/workflows/locales.yml
index 0d15df175..52880f366 100644
--- a/.github/workflows/locales.yml
+++ b/.github/workflows/locales.yml
@@ -1,5 +1,10 @@
 name: Locales
-on: workflow_call
+on:
+  workflow_call:
+    secrets:
+      OPENAI_API_KEY:
+        required: true
+        description: The API key for OpenAI
 
 permissions: write-all
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c846f5023..e6bce7b59 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,6 +12,8 @@ jobs:
     uses: ./.github/workflows/config.yml
   locales:
     uses: ./.github/workflows/locales.yml
+    secrets:
+      OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
   release:
     if: always()
     uses: ./.github/workflows/release.yml
diff --git a/.gitignore b/.gitignore
index 9f06117f1..25d01c12e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules
 dist
+dist-*
 
 # Config files
 server/src/configs/*
@@ -10,6 +11,8 @@ server/src/configs/koji_backups/*
 !server/src/configs/areas.example.json
 !server/src/configs/local.example.json
 !server/src/configs/custom-environment-variables.json
+!server/src/configs/multi-domain-example/local.json
+!server/src/configs/multi-domain-example
 .env
 
 # Masterfile
diff --git a/.prettierignore b/.prettierignore
index e15880cb6..114b08cf1 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,5 @@
 dist
+dist-*
 node_modules
 public/missing-locales
 public/images/custom
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6030df9e..b09539d5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,47 +1,199 @@
-# [1.30.0](https://github.com/WatWowMap/ReactMap/compare/v1.29.6...v1.30.0) (2024-03-06)
+# [1.31.0-develop.7](https://github.com/WatWowMap/ReactMap/compare/v1.31.0-develop.6...v1.31.0-develop.7) (2024-03-17)
 
 
 ### Bug Fixes
 
-* `onlyShowAvailable` for nests selector ([068dac2](https://github.com/WatWowMap/ReactMap/commit/068dac25f7ffbb0594619202b85fa64801c835c8))
-* 0iv/100iv overrides in a specific scenario ([aebebf1](https://github.com/WatWowMap/ReactMap/commit/aebebf10f86a0562fd4eb098fbe0cf364453dc4b))
-* 0s in gym popup ([2d9bdc1](https://github.com/WatWowMap/ReactMap/commit/2d9bdc1665715d7d3dfa6bd3b6f05b9471b12abe))
-* add missing `key` prop & simplify ([05be65c](https://github.com/WatWowMap/ReactMap/commit/05be65c93537c061c91db870f9f39a59da2684d1))
-* adjust wayfarer line weights ([e6c0696](https://github.com/WatWowMap/ReactMap/commit/e6c0696159c1feceda41aea12b9e16b2a5cd7838))
-* attempt to keep available/masterfile more in sync ([1961af3](https://github.com/WatWowMap/ReactMap/commit/1961af3e3f1953c19f330bec3d191a3b6ef5dca3))
-* cache most things at process exit instead ([56eb47e](https://github.com/WatWowMap/ReactMap/commit/56eb47eca6e05f78e4b0b518b6d7fb6a5c901bc2))
-* config getters ([494639a](https://github.com/WatWowMap/ReactMap/commit/494639a28289fac90e0898cf2d443ba7a2c5c41d))
-* dont log golbat 404 pokemon id errors ([7292d13](https://github.com/WatWowMap/ReactMap/commit/7292d13f9b7460a7b40d1b3bcb45c751d183b953))
-* early version check ([c9d1295](https://github.com/WatWowMap/ReactMap/commit/c9d129597d00fbcc19b4f164f4ea1ca468f09fed))
-* express session augmentation ([35533e9](https://github.com/WatWowMap/ReactMap/commit/35533e9b86518d496e71ff6a3fb93f54ad51864c))
-* favicon error catching for dummies ([b6c0fae](https://github.com/WatWowMap/ReactMap/commit/b6c0fae43ef8e4312bc61c265c8c16cd4a0c1ee5))
-* importing ([89b7fce](https://github.com/WatWowMap/ReactMap/commit/89b7fcebca0a58959ecc29418db4a75390072ffd))
-* improved jsdocs for search method ([5dcf288](https://github.com/WatWowMap/ReactMap/commit/5dcf28810be5ad1063abee7ae234993a3c42be57))
-* less strict searching for `'` ([ca08a69](https://github.com/WatWowMap/ReactMap/commit/ca08a690fca54f90132b4688b5700532958b60f5))
-* map dependency checks ([85c992d](https://github.com/WatWowMap/ReactMap/commit/85c992dc499f0c25dff2ba00ec75e4bb20911bab))
-* Merge pull request [#963](https://github.com/WatWowMap/ReactMap/issues/963) from ReuschelCGN/translation ([cbc0160](https://github.com/WatWowMap/ReactMap/commit/cbc0160f6820a68fed04c9b7b57a287cfaf66f58))
-* more client ts checks ([5028cb2](https://github.com/WatWowMap/ReactMap/commit/5028cb2221ac44e65620927bd69a10f4958f6d9c))
-* more consistent gender filtering ([a3b24cb](https://github.com/WatWowMap/ReactMap/commit/a3b24cb6d4625c23d8d341c4b7cad62846b184c3))
-* nest name memoization ([ec56d7d](https://github.com/WatWowMap/ReactMap/commit/ec56d7d79e0a5d53599307e2e3768b8dddce7852))
-* **nest:** make it compatible with previous tools ([9d97481](https://github.com/WatWowMap/ReactMap/commit/9d97481039356de2c1e6165abbb207a7d7af6cce))
-* **nest:** query only active nests ([ebb5295](https://github.com/WatWowMap/ReactMap/commit/ebb529578207e1d6a11f40a99e942030ec95c3e0))
-* normal form check ([47e358b](https://github.com/WatWowMap/ReactMap/commit/47e358b5cc01d75eb49cfa3b4654adf09b23af28))
-* oops, swap ternary ([bdcfaf4](https://github.com/WatWowMap/ReactMap/commit/bdcfaf4d92fc64d1776e6f87e11713736621874d))
-* pokemon ui inconsistency ([0cb334c](https://github.com/WatWowMap/ReactMap/commit/0cb334c44748dbbe2a591cc5b61c466b7487f3bf))
-* refine ci ([515de64](https://github.com/WatWowMap/ReactMap/commit/515de64e6a7275b6b7afbdb287e18be15f373e4d))
-* respect quest layer when searching ([4b0e0cc](https://github.com/WatWowMap/ReactMap/commit/4b0e0cc273b0e3c4988d4d3f0ded13053e3c75b6)), closes [#950](https://github.com/WatWowMap/ReactMap/issues/950)
-* safe 0 fallback ([45795a8](https://github.com/WatWowMap/ReactMap/commit/45795a80d114f7b638ff6a7a0d0438811dd86511))
-* try/catch on expert filter just in case ([4e430e6](https://github.com/WatWowMap/ReactMap/commit/4e430e6e1e1729ef56095b7a414f9521c6d27d75))
-* various small things ([ada7947](https://github.com/WatWowMap/ReactMap/commit/ada7947313300864da5a524c0233bb8c31d5c1bc))
-* various text fixes ([6eb9c6a](https://github.com/WatWowMap/ReactMap/commit/6eb9c6aed1d0ba557220799560ec498fc6f7e6dc)), closes [#967](https://github.com/WatWowMap/ReactMap/issues/967)
+* better selector tiles for colorblind users ([0256b5b](https://github.com/WatWowMap/ReactMap/commit/0256b5b9b0db60ef9ab1b9e1b922db2030f2575d))
+
+# [1.31.0-develop.6](https://github.com/WatWowMap/ReactMap/compare/v1.31.0-develop.5...v1.31.0-develop.6) (2024-03-16)
+
+
+### Bug Fixes
+
+* mobile friendly :| ([b259e42](https://github.com/WatWowMap/ReactMap/commit/b259e4274cab22bfee450ef950b3c54616dca1e7))
+* no floats ([b8f645e](https://github.com/WatWowMap/ReactMap/commit/b8f645e8847f301be60ebffcc235f047669b48ed))
+* rounding & icon for missing ai ([4ed05ff](https://github.com/WatWowMap/ReactMap/commit/4ed05ff5d53435880d7388eaa11faac69a0ab77f))
+* server side routes ([77eafa9](https://github.com/WatWowMap/ReactMap/commit/77eafa91c492e6a25ce63918ad46226899b96d6c))
 
 
 ### Features
 
-* data management page ([561c031](https://github.com/WatWowMap/ReactMap/commit/561c031e0f290d7c63e17b6a645e8b145cf2e4d1))
-* pkmn filter diagram ([a40b201](https://github.com/WatWowMap/ReactMap/commit/a40b20123a78f3d565a47ed9266c16da3b979bdb))
-* spacial rend range ([374c5eb](https://github.com/WatWowMap/ReactMap/commit/374c5eb09986307fb5e2e59930e18a066b22df47))
-* update polish locales ([#959](https://github.com/WatWowMap/ReactMap/issues/959)) ([d28dc0a](https://github.com/WatWowMap/ReactMap/commit/d28dc0af8445002f0f9b52e87f6eb08966182d24))
+* locales editing page ([bfbd15a](https://github.com/WatWowMap/ReactMap/commit/bfbd15a55605505da7753a664f8257b243f28d18))
+
+# [1.31.0-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.31.0-develop.4...v1.31.0-develop.5) (2024-03-16)
+
+
+### Bug Fixes
+
+* local assets ([615c3b8](https://github.com/WatWowMap/ReactMap/commit/615c3b81244925c1860ea7c48b00f8ee38c697d1))
+* pass ref props for tooltip ([9d55d4c](https://github.com/WatWowMap/ReactMap/commit/9d55d4c445c106626149319df1db8dd3017e99b6))
+
+# [1.31.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.31.0-develop.3...v1.31.0-develop.4) (2024-03-16)
+
+
+### Bug Fixes
+
+* ai generated locales ([2d0e7fb](https://github.com/WatWowMap/ReactMap/commit/2d0e7fb2ab9b33b020a016ce9654338975c18dd7))
+
+# [1.31.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.31.0-develop.2...v1.31.0-develop.3) (2024-03-16)
+
+
+### Bug Fixes
+
+* clipped classname ([2563fb7](https://github.com/WatWowMap/ReactMap/commit/2563fb70e5ef6500e5929325279ad390138f33c0))
+
+# [1.31.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.31.0-develop.1...v1.31.0-develop.2) (2024-03-14)
+
+
+### Bug Fixes
+
+* maybe fix missing ci secret ([15058dc](https://github.com/WatWowMap/ReactMap/commit/15058dc77045fd1db99b543f2c42da724ff54aa7))
+
+# [1.31.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.30.0...v1.31.0-develop.1) (2024-03-14)
+
+
+### Bug Fixes
+
+* add log to indicate config env var ([ba25048](https://github.com/WatWowMap/ReactMap/commit/ba2504890e755aa5a805710be6602e16ec17a051))
+* add new dist folders to lint ignores ([9a870cd](https://github.com/WatWowMap/ReactMap/commit/9a870cd0a8f2ec9669163488cab0d2f77aa163e9))
+* alert state ([a39154d](https://github.com/WatWowMap/ReactMap/commit/a39154d5014d66a5c1a91e6e36e888e5e0c8440c))
+* area selected translation ([bbe49e1](https://github.com/WatWowMap/ReactMap/commit/bbe49e1dc45b93ba52d96c7cf8f70a1b088a27c1))
+* asset options ([e56b0dd](https://github.com/WatWowMap/ReactMap/commit/e56b0dd81e06af23226db73f86481c41cd804bf7))
+* asset updating ([a8f1e9c](https://github.com/WatWowMap/ReactMap/commit/a8f1e9c1ca0ea9df7da4e12a0c48e080a97556c4))
+* check for multidomains in areas ([e5b8a9c](https://github.com/WatWowMap/ReactMap/commit/e5b8a9ccaf2bf00af5784107768dffc68fa2673e))
+* check for networkError null ([e8bcb79](https://github.com/WatWowMap/ReactMap/commit/e8bcb797ac4122ed281981d3aee97009dbcfd5b2))
+* couple of queries ([460f66e](https://github.com/WatWowMap/ReactMap/commit/460f66e0cc6c76d854bf47bce948d91be841b960))
+* css className that got clipped ([1abe5e3](https://github.com/WatWowMap/ReactMap/commit/1abe5e3cce0b111a4a616e530e2ed768f0efb656))
+* custom favicons for each domain ([f470f53](https://github.com/WatWowMap/ReactMap/commit/f470f53fe3995e72391012a54c02ff5661660f5c))
+* fallback obj ([b6470f4](https://github.com/WatWowMap/ReactMap/commit/b6470f43ca5118c11951fec24e7dc735aca4c463))
+* favicon instructions ([1851505](https://github.com/WatWowMap/ReactMap/commit/185150552e47980f91a5a257906ccb9b478a4dce))
+* feedback from naji ([72344a0](https://github.com/WatWowMap/ReactMap/commit/72344a024fff3387fc22c5de9b2780d8264afd93))
+* file caching for multi ([2acf34a](https://github.com/WatWowMap/ReactMap/commit/2acf34a2f014d8b362184554061b709c2bf6abba))
+* logging uncaughtException error ([6848cdc](https://github.com/WatWowMap/ReactMap/commit/6848cdce4d858b2a0e39b33e7998751416c8c3d0))
+* misc icons ([f4423a9](https://github.com/WatWowMap/ReactMap/commit/f4423a9e05f47bf1f59baf0d0d6f753f787ba2b4))
+* reading other config files ([ef30f33](https://github.com/WatWowMap/ReactMap/commit/ef30f33c18146b2f14584e3639162cce16cc78a0))
+* remove log ([86c5854](https://github.com/WatWowMap/ReactMap/commit/86c585472061d9a27d380a335787165c7580f3ea))
+* scan areas ([8dbc1f3](https://github.com/WatWowMap/ReactMap/commit/8dbc1f374bfae204db79d30b9f8989aa86e15d9c))
+* scan cells ([b6b45ca](https://github.com/WatWowMap/ReactMap/commit/b6b45ca1057ebaad06ef794d20fdc486a4ceda0f))
+* simplify ([b48bcb3](https://github.com/WatWowMap/ReactMap/commit/b48bcb31d329b8027fdbfef397fb89ef56c34a5a))
+* some clipped imports ([ed65bc0](https://github.com/WatWowMap/ReactMap/commit/ed65bc059e63c93afa31cf4d84edc9782230c4d8))
+* some incorrect feature imports ([a36ea7c](https://github.com/WatWowMap/ReactMap/commit/a36ea7ccb79684738d43ab7995cb171c03726d18))
+* still define obj though ([e98bb92](https://github.com/WatWowMap/ReactMap/commit/e98bb9280e1f9be998aa59d8003c6949a9bee408))
+* swapped ivOr stores ([98fe335](https://github.com/WatWowMap/ReactMap/commit/98fe3358815b7316ccdd98343390217886b7dd26))
+* throw error at a different point ([825b2d9](https://github.com/WatWowMap/ReactMap/commit/825b2d90494fa354366fdcb8a2b5f683a1d7f4bb))
+* throw error if missing openai key ([de939e2](https://github.com/WatWowMap/ReactMap/commit/de939e2de5e910ea51fad425ce336c9e2ec926f6))
+* types ([4b78846](https://github.com/WatWowMap/ReactMap/commit/4b78846a7b8636031e015902007f9e5f2212821b))
+* user options state ([1e23a55](https://github.com/WatWowMap/ReactMap/commit/1e23a5571c7ef945f7204092628591541ae835f9))
+* webhook gym searching ([dc8ff8b](https://github.com/WatWowMap/ReactMap/commit/dc8ff8bc489bfd55fbd207d71c381ce01a25eb05))
+
+
+### Features
+
+* lots of docs & examples ([1a33c5e](https://github.com/WatWowMap/ReactMap/commit/1a33c5ece9605e4a9c6fc0a10ae0fc2e554962f7))
+* new approach to multi domain ([aa5602b](https://github.com/WatWowMap/ReactMap/commit/aa5602b36bd78f88c75e9f2b0f367ff8da4b997d))
+
+# [1.30.0-develop.28](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.27...v1.30.0-develop.28) (2024-03-14)
+
+
+### Bug Fixes
+
+* scan cells ([b6b45ca](https://github.com/WatWowMap/ReactMap/commit/b6b45ca1057ebaad06ef794d20fdc486a4ceda0f))
+
+# [1.30.0-develop.27](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.26...v1.30.0-develop.27) (2024-03-14)
+
+
+### Bug Fixes
+
+* misc icons ([f4423a9](https://github.com/WatWowMap/ReactMap/commit/f4423a9e05f47bf1f59baf0d0d6f753f787ba2b4))
+
+# [1.30.0-develop.26](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.25...v1.30.0-develop.26) (2024-03-13)
+
+
+### Bug Fixes
+
+* remove log ([86c5854](https://github.com/WatWowMap/ReactMap/commit/86c585472061d9a27d380a335787165c7580f3ea))
+
+# [1.30.0-develop.25](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.24...v1.30.0-develop.25) (2024-03-10)
+
+
+### Bug Fixes
+
+* check for networkError null ([e8bcb79](https://github.com/WatWowMap/ReactMap/commit/e8bcb797ac4122ed281981d3aee97009dbcfd5b2))
+
+# [1.30.0-develop.24](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.23...v1.30.0-develop.24) (2024-03-10)
+
+
+### Bug Fixes
+
+* css className that got clipped ([1abe5e3](https://github.com/WatWowMap/ReactMap/commit/1abe5e3cce0b111a4a616e530e2ed768f0efb656))
+
+# [1.30.0-develop.23](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.22...v1.30.0-develop.23) (2024-03-09)
+
+
+### Bug Fixes
+
+* webhook gym searching ([dc8ff8b](https://github.com/WatWowMap/ReactMap/commit/dc8ff8bc489bfd55fbd207d71c381ce01a25eb05))
+
+# [1.30.0-develop.22](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.21...v1.30.0-develop.22) (2024-03-08)
+
+
+### Bug Fixes
+
+* logging uncaughtException error ([6848cdc](https://github.com/WatWowMap/ReactMap/commit/6848cdce4d858b2a0e39b33e7998751416c8c3d0))
+
+# [1.30.0-develop.21](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.20...v1.30.0-develop.21) (2024-03-08)
+
+
+### Bug Fixes
+
+* throw error at a different point ([825b2d9](https://github.com/WatWowMap/ReactMap/commit/825b2d90494fa354366fdcb8a2b5f683a1d7f4bb))
+* throw error if missing openai key ([de939e2](https://github.com/WatWowMap/ReactMap/commit/de939e2de5e910ea51fad425ce336c9e2ec926f6))
+
+# [1.30.0-develop.20](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.19...v1.30.0-develop.20) (2024-03-08)
+
+
+### Bug Fixes
+
+* add log to indicate config env var ([ba25048](https://github.com/WatWowMap/ReactMap/commit/ba2504890e755aa5a805710be6602e16ec17a051))
+* add new dist folders to lint ignores ([9a870cd](https://github.com/WatWowMap/ReactMap/commit/9a870cd0a8f2ec9669163488cab0d2f77aa163e9))
+* check for multidomains in areas ([e5b8a9c](https://github.com/WatWowMap/ReactMap/commit/e5b8a9ccaf2bf00af5784107768dffc68fa2673e))
+* custom favicons for each domain ([f470f53](https://github.com/WatWowMap/ReactMap/commit/f470f53fe3995e72391012a54c02ff5661660f5c))
+* favicon instructions ([1851505](https://github.com/WatWowMap/ReactMap/commit/185150552e47980f91a5a257906ccb9b478a4dce))
+* file caching for multi ([2acf34a](https://github.com/WatWowMap/ReactMap/commit/2acf34a2f014d8b362184554061b709c2bf6abba))
+* reading other config files ([ef30f33](https://github.com/WatWowMap/ReactMap/commit/ef30f33c18146b2f14584e3639162cce16cc78a0))
+* simplify ([b48bcb3](https://github.com/WatWowMap/ReactMap/commit/b48bcb31d329b8027fdbfef397fb89ef56c34a5a))
+* still define obj though ([e98bb92](https://github.com/WatWowMap/ReactMap/commit/e98bb9280e1f9be998aa59d8003c6949a9bee408))
+
+
+### Features
+
+* lots of docs & examples ([1a33c5e](https://github.com/WatWowMap/ReactMap/commit/1a33c5ece9605e4a9c6fc0a10ae0fc2e554962f7))
+* new approach to multi domain ([aa5602b](https://github.com/WatWowMap/ReactMap/commit/aa5602b36bd78f88c75e9f2b0f367ff8da4b997d))
+
+# [1.30.0-develop.19](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.18...v1.30.0-develop.19) (2024-03-08)
+
+
+### Bug Fixes
+
+* fallback obj ([b6470f4](https://github.com/WatWowMap/ReactMap/commit/b6470f43ca5118c11951fec24e7dc735aca4c463))
+
+# [1.30.0-develop.18](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.17...v1.30.0-develop.18) (2024-03-08)
+
+
+### Bug Fixes
+
+* alert state ([a39154d](https://github.com/WatWowMap/ReactMap/commit/a39154d5014d66a5c1a91e6e36e888e5e0c8440c))
+* area selected translation ([bbe49e1](https://github.com/WatWowMap/ReactMap/commit/bbe49e1dc45b93ba52d96c7cf8f70a1b088a27c1))
+* asset options ([e56b0dd](https://github.com/WatWowMap/ReactMap/commit/e56b0dd81e06af23226db73f86481c41cd804bf7))
+* asset updating ([a8f1e9c](https://github.com/WatWowMap/ReactMap/commit/a8f1e9c1ca0ea9df7da4e12a0c48e080a97556c4))
+* couple of queries ([460f66e](https://github.com/WatWowMap/ReactMap/commit/460f66e0cc6c76d854bf47bce948d91be841b960))
+* feedback from naji ([72344a0](https://github.com/WatWowMap/ReactMap/commit/72344a024fff3387fc22c5de9b2780d8264afd93))
+* scan areas ([8dbc1f3](https://github.com/WatWowMap/ReactMap/commit/8dbc1f374bfae204db79d30b9f8989aa86e15d9c))
+* some clipped imports ([ed65bc0](https://github.com/WatWowMap/ReactMap/commit/ed65bc059e63c93afa31cf4d84edc9782230c4d8))
+* some incorrect feature imports ([a36ea7c](https://github.com/WatWowMap/ReactMap/commit/a36ea7ccb79684738d43ab7995cb171c03726d18))
+* swapped ivOr stores ([98fe335](https://github.com/WatWowMap/ReactMap/commit/98fe3358815b7316ccdd98343390217886b7dd26))
+* types ([4b78846](https://github.com/WatWowMap/ReactMap/commit/4b78846a7b8636031e015902007f9e5f2212821b))
+* user options state ([1e23a55](https://github.com/WatWowMap/ReactMap/commit/1e23a5571c7ef945f7204092628591541ae835f9))
 
 # [1.30.0-develop.17](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.16...v1.30.0-develop.17) (2024-03-05)
 
@@ -136,108 +288,94 @@
 
 # [1.30.0-develop.6](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.5...v1.30.0-develop.6) (2024-02-23)
 
-
 ### Bug Fixes
 
-* refine ci ([515de64](https://github.com/WatWowMap/ReactMap/commit/515de64e6a7275b6b7afbdb287e18be15f373e4d))
+- refine ci ([515de64](https://github.com/WatWowMap/ReactMap/commit/515de64e6a7275b6b7afbdb287e18be15f373e4d))
 
 # [1.30.0-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.4...v1.30.0-develop.5) (2024-02-23)
 
-
 ### Features
 
-* pkmn filter diagram ([a40b201](https://github.com/WatWowMap/ReactMap/commit/a40b20123a78f3d565a47ed9266c16da3b979bdb))
+- pkmn filter diagram ([a40b201](https://github.com/WatWowMap/ReactMap/commit/a40b20123a78f3d565a47ed9266c16da3b979bdb))
 
 # [1.30.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.3...v1.30.0-develop.4) (2024-02-21)
 
-
 ### Bug Fixes
 
-* try/catch on expert filter just in case ([4e430e6](https://github.com/WatWowMap/ReactMap/commit/4e430e6e1e1729ef56095b7a414f9521c6d27d75))
+- try/catch on expert filter just in case ([4e430e6](https://github.com/WatWowMap/ReactMap/commit/4e430e6e1e1729ef56095b7a414f9521c6d27d75))
 
 # [1.30.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.2...v1.30.0-develop.3) (2024-02-21)
 
-
 ### Bug Fixes
 
-* normal form check ([47e358b](https://github.com/WatWowMap/ReactMap/commit/47e358b5cc01d75eb49cfa3b4654adf09b23af28))
+- normal form check ([47e358b](https://github.com/WatWowMap/ReactMap/commit/47e358b5cc01d75eb49cfa3b4654adf09b23af28))
 
 # [1.30.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.1...v1.30.0-develop.2) (2024-02-21)
 
-
 ### Bug Fixes
 
-* early version check ([c9d1295](https://github.com/WatWowMap/ReactMap/commit/c9d129597d00fbcc19b4f164f4ea1ca468f09fed))
+- early version check ([c9d1295](https://github.com/WatWowMap/ReactMap/commit/c9d129597d00fbcc19b4f164f4ea1ca468f09fed))
 
 # [1.30.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.29.7-develop.5...v1.30.0-develop.1) (2024-02-21)
 
-
 ### Features
 
-* update polish locales ([#959](https://github.com/WatWowMap/ReactMap/issues/959)) ([d28dc0a](https://github.com/WatWowMap/ReactMap/commit/d28dc0af8445002f0f9b52e87f6eb08966182d24))
+- update polish locales ([#959](https://github.com/WatWowMap/ReactMap/issues/959)) ([d28dc0a](https://github.com/WatWowMap/ReactMap/commit/d28dc0af8445002f0f9b52e87f6eb08966182d24))
 
 ## [1.29.7-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.29.7-develop.4...v1.29.7-develop.5) (2024-02-12)
 
-
 ### Bug Fixes
 
-* more consistent gender filtering ([a3b24cb](https://github.com/WatWowMap/ReactMap/commit/a3b24cb6d4625c23d8d341c4b7cad62846b184c3))
+- more consistent gender filtering ([a3b24cb](https://github.com/WatWowMap/ReactMap/commit/a3b24cb6d4625c23d8d341c4b7cad62846b184c3))
 
 ## [1.29.7-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.29.7-develop.3...v1.29.7-develop.4) (2024-02-12)
 
-
 ### Bug Fixes
 
-* respect quest layer when searching ([4b0e0cc](https://github.com/WatWowMap/ReactMap/commit/4b0e0cc273b0e3c4988d4d3f0ded13053e3c75b6)), closes [#950](https://github.com/WatWowMap/ReactMap/issues/950)
+- respect quest layer when searching ([4b0e0cc](https://github.com/WatWowMap/ReactMap/commit/4b0e0cc273b0e3c4988d4d3f0ded13053e3c75b6)), closes [#950](https://github.com/WatWowMap/ReactMap/issues/950)
 
 ## [1.29.7-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.29.7-develop.2...v1.29.7-develop.3) (2024-02-12)
 
-
 ### Bug Fixes
 
-* `onlyShowAvailable` for nests selector ([068dac2](https://github.com/WatWowMap/ReactMap/commit/068dac25f7ffbb0594619202b85fa64801c835c8))
-* nest name memoization ([ec56d7d](https://github.com/WatWowMap/ReactMap/commit/ec56d7d79e0a5d53599307e2e3768b8dddce7852))
+- `onlyShowAvailable` for nests selector ([068dac2](https://github.com/WatWowMap/ReactMap/commit/068dac25f7ffbb0594619202b85fa64801c835c8))
+- nest name memoization ([ec56d7d](https://github.com/WatWowMap/ReactMap/commit/ec56d7d79e0a5d53599307e2e3768b8dddce7852))
 
 ## [1.29.7-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.29.7-develop.1...v1.29.7-develop.2) (2024-02-10)
 
-
 ### Bug Fixes
 
-* **nest:** make it compatible with previous tools ([9d97481](https://github.com/WatWowMap/ReactMap/commit/9d97481039356de2c1e6165abbb207a7d7af6cce))
-* **nest:** query only active nests ([ebb5295](https://github.com/WatWowMap/ReactMap/commit/ebb529578207e1d6a11f40a99e942030ec95c3e0))
+- **nest:** make it compatible with previous tools ([9d97481](https://github.com/WatWowMap/ReactMap/commit/9d97481039356de2c1e6165abbb207a7d7af6cce))
+- **nest:** query only active nests ([ebb5295](https://github.com/WatWowMap/ReactMap/commit/ebb529578207e1d6a11f40a99e942030ec95c3e0))
 
 ## [1.29.7-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.29.6...v1.29.7-develop.1) (2024-02-08)
 
-
 ### Bug Fixes
 
-* cache most things at process exit instead ([56eb47e](https://github.com/WatWowMap/ReactMap/commit/56eb47eca6e05f78e4b0b518b6d7fb6a5c901bc2))
-* config getters ([494639a](https://github.com/WatWowMap/ReactMap/commit/494639a28289fac90e0898cf2d443ba7a2c5c41d))
-* dont log golbat 404 pokemon id errors ([7292d13](https://github.com/WatWowMap/ReactMap/commit/7292d13f9b7460a7b40d1b3bcb45c751d183b953))
-* express session augmentation ([35533e9](https://github.com/WatWowMap/ReactMap/commit/35533e9b86518d496e71ff6a3fb93f54ad51864c))
-* favicon error catching for dummies ([b6c0fae](https://github.com/WatWowMap/ReactMap/commit/b6c0fae43ef8e4312bc61c265c8c16cd4a0c1ee5))
-* more client ts checks ([5028cb2](https://github.com/WatWowMap/ReactMap/commit/5028cb2221ac44e65620927bd69a10f4958f6d9c))
+- cache most things at process exit instead ([56eb47e](https://github.com/WatWowMap/ReactMap/commit/56eb47eca6e05f78e4b0b518b6d7fb6a5c901bc2))
+- config getters ([494639a](https://github.com/WatWowMap/ReactMap/commit/494639a28289fac90e0898cf2d443ba7a2c5c41d))
+- dont log golbat 404 pokemon id errors ([7292d13](https://github.com/WatWowMap/ReactMap/commit/7292d13f9b7460a7b40d1b3bcb45c751d183b953))
+- express session augmentation ([35533e9](https://github.com/WatWowMap/ReactMap/commit/35533e9b86518d496e71ff6a3fb93f54ad51864c))
+- favicon error catching for dummies ([b6c0fae](https://github.com/WatWowMap/ReactMap/commit/b6c0fae43ef8e4312bc61c265c8c16cd4a0c1ee5))
+- more client ts checks ([5028cb2](https://github.com/WatWowMap/ReactMap/commit/5028cb2221ac44e65620927bd69a10f4958f6d9c))
 
 ## [1.29.6](https://github.com/WatWowMap/ReactMap/compare/v1.29.5...v1.29.6) (2024-02-06)
 
-
 ### Bug Fixes
 
-* run even when prev is skipped ([78c1404](https://github.com/WatWowMap/ReactMap/commit/78c14040007a33180f5fddf270aa155136ba87c2))
+- run even when prev is skipped ([78c1404](https://github.com/WatWowMap/ReactMap/commit/78c14040007a33180f5fddf270aa155136ba87c2))
 
 ## [1.29.5](https://github.com/WatWowMap/ReactMap/compare/v1.29.4...v1.29.5) (2024-02-06)
 
-
 ### Bug Fixes
 
-* needs both ([e4b7cec](https://github.com/WatWowMap/ReactMap/commit/e4b7cec18ce2b41b04c5813b7a8ece23a3bf5510))
+- needs both ([e4b7cec](https://github.com/WatWowMap/ReactMap/commit/e4b7cec18ce2b41b04c5813b7a8ece23a3bf5510))
 
 ## [1.29.4](https://github.com/WatWowMap/ReactMap/compare/v1.29.3...v1.29.4) (2024-02-06)
 
-
 ### Bug Fixes
 
-* needs & attempt to not run double ([abcaaab](https://github.com/WatWowMap/ReactMap/commit/abcaaab5d65d68b98570727f21879e31f81f622e))
+- needs & attempt to not run double ([abcaaab](https://github.com/WatWowMap/ReactMap/commit/abcaaab5d65d68b98570727f21879e31f81f622e))
 
 ## [1.29.3](https://github.com/WatWowMap/ReactMap/compare/v1.29.2...v1.29.3) (2024-02-06)
 
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index 5d8bf953f..1ded1f9dc 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -41,6 +41,7 @@ services:
       # ARRAY_VALUE_EXAMPLE: "[3, 4, 5]"
 
     volumes:
+      - ./server/.cache:/home/node/server/.cache
       # All of these are optional - comment out whichever ones you aren't using
       - ./server/src/configs/areas.json:/home/node/server/src/configs/areas.json
       - ./server/src/configs/local.json:/home/node/server/src/configs/local.json
diff --git a/jsconfig.json b/jsconfig.json
index eee01f5e6..03d1eb8bb 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -12,9 +12,12 @@
     "paths": {
       "@assets/*": ["./src/assets/*"],
       "@components/*": ["./src/components/*"],
+      "@features/*": ["./src/features/*"],
       "@services/*": ["./src/services/*"],
-      "@hooks/*": ["./src/hooks/*"]
+      "@hooks/*": ["./src/hooks/*"],
+      "@utils/*": ["./src/utils/*"],
+      "@store/*": ["./src/store/*"]
     }
   },
-  "exclude": ["node_modules", "**/node_modules/*", "dist"]
+  "exclude": ["node_modules", "**/node_modules/*", "dist", "dist-*"]
 }
diff --git a/package.json b/package.json
index 8b68e812e..9fb5f8bf6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.30.0",
+  "version": "1.31.0-develop.7",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -175,6 +175,7 @@
     "source-map": "^0.7.4",
     "suncalc": "^1.9.0",
     "supercluster": "^8.0.1",
+    "uicons.js": "^1.1.1",
     "zustand": "4.4.6"
   },
   "devDependencies": {
diff --git a/packages/config/.configref b/packages/config/.configref
index 549ed5e07..dda257080 100644
--- a/packages/config/.configref
+++ b/packages/config/.configref
@@ -1 +1 @@
-24124
\ No newline at end of file
+24070
\ No newline at end of file
diff --git a/packages/config/lib/index.js b/packages/config/lib/index.js
index 6c7ce04d0..79c58862c 100644
--- a/packages/config/lib/index.js
+++ b/packages/config/lib/index.js
@@ -12,6 +12,15 @@ if (!process.env.NODE_CONFIG_DIR) {
   process.env.ALLOW_CONFIG_MUTATIONS = 'true'
 }
 
+if (process.env.NODE_CONFIG_ENV) {
+  if (
+    process.env.NODE_CONFIG_ENV.includes('.') ||
+    process.env.NODE_CONFIG_ENV.includes('/')
+  ) {
+    throw new Error('Invalid NODE_CONFIG_ENV, must not contain "." or "/"')
+  }
+}
+
 const config = require('config')
 
 config.getSafe = config.get
diff --git a/packages/locales/lib/generate.js b/packages/locales/lib/generate.js
index af3814cd3..983712edc 100644
--- a/packages/locales/lib/generate.js
+++ b/packages/locales/lib/generate.js
@@ -1,9 +1,11 @@
+/* eslint-disable prefer-template */
 // @ts-check
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
 
 require('dotenv').config()
 const { OpenAI } = require('openai')
+const { encode } = require('gpt-tokenizer')
 
 const { log, HELPERS } = require('@rm/logger')
 
@@ -15,33 +17,15 @@ const openAI = process.env.OPENAI_API_KEY
     })
   : null
 
+const TOKEN_LIMIT = 1024
+
 /**
  * @typedef {Record<string, string>} I18nObject
  * @typedef {I18nObject | string} Node
  */
 
 /**
- * Recursively estimates the token size of a {@link Node}
- * @param {Node} content
- * @returns {number}
- */
-function estimateTokenCount(content) {
-  if (typeof content === 'string') {
-    return content.split(/[\s.'_A-Z0-9]/).length * 2
-  }
-  if (typeof content === 'object') {
-    let count = 0
-    for (const key in content) {
-      count += estimateTokenCount(content[key])
-      count += key.split(/[_A-Z0-9]/).length * 2
-    }
-    return count
-  }
-  return 1
-}
-
-/**
- * Splits the json into 2048 token chunks
+ * Splits the json into token chunks
  * @param {I18nObject} json
  * @returns {I18nObject[]}
  */
@@ -49,22 +33,33 @@ function splitJson(json) {
   /** @type {I18nObject[]} */
   const chunks = []
   /** @type {I18nObject} */
-  let pool = {}
-  let poolSize = 0
-  for (const key in json) {
-    const nodeSize = estimateTokenCount(json[key]) + estimateTokenCount(key)
-    if (nodeSize + poolSize < 2048) {
-      poolSize += nodeSize
-      pool[key] = json[key]
-    } else {
-      chunks.push(pool)
-      pool = { [key]: json[key] }
-      poolSize = nodeSize
+  let currentChunk = {}
+  let currentTokenCount = 2
+
+  for (const [key, value] of Object.entries(json)) {
+    const string = `  "${key}": ${
+      typeof value === 'string'
+        ? `"${value}"`
+        : typeof value === 'number'
+        ? value
+        : `${value}`
+    },\n`
+    const newLineCount = (string.match(/\n/g) || []).length - 1
+    const tokenCount = encode(string).length
+    const totalTokenCount = tokenCount + newLineCount
+
+    if (currentTokenCount + totalTokenCount >= TOKEN_LIMIT) {
+      chunks.push(currentChunk)
+      currentChunk = {}
+      currentTokenCount = 2
     }
+    currentChunk[key] = value
+    currentTokenCount =
+      newLineCount > 0
+        ? encode(JSON.stringify(currentChunk, null, 2)).length
+        : currentTokenCount + totalTokenCount
   }
-  if (Object.keys(pool).length > 0) {
-    chunks.push(pool)
-  }
+  if (Object.keys(currentChunk).length > 0) chunks.push(currentChunk)
   return chunks
 }
 
@@ -96,18 +91,18 @@ function matchJSON(str) {
 }
 
 /**
- * Sends the result to OpenAI gpt-3.5-turbo model
+ * Sends the result to OpenAI gpt-4-turbo model
  * @param {string} locale
  * @param {Node} missingKeys
  * @returns
  */
 async function sendToGPT(locale, missingKeys) {
   return openAI.chat.completions.create({
-    model: 'gpt-3.5-turbo',
+    model: 'gpt-4-turbo-preview',
     messages: [
       {
         role: 'system',
-        content: `Translate an i18n locale json content to ${locale}. It's a key-value structure, don't translate the key. Consider the context of all of the values together to make better translation. All translations should be related to a Pokemon GO context.`,
+        content: `Translate an i18n English locale json content to ${locale}. It's a key-value structure, don't translate the key. Consider the context of all of the values together to make better translation. All translations should be related to a Pokemon GO context. Ensure that all key value pairs are matched correctly.`,
       },
       {
         role: 'user',
@@ -141,7 +136,10 @@ async function generate() {
         /** @type {I18nObject} */
         const missingKeys = Object.fromEntries(
           Object.entries(englishRef).filter(
-            ([key]) => !(key in merged) && !key.startsWith('locale_selection_'),
+            ([key]) =>
+              !(key in merged) &&
+              !key.startsWith('locale_selection_') &&
+              typeof englishRef[key] !== 'number',
           ),
         )
 
@@ -167,6 +165,7 @@ async function generate() {
               } catch (e) {
                 log.error(e, '\nUnable to parse returned translations\n', {
                   locale,
+                  reason: raw.choices[0].finish_reason,
                   content,
                   clean,
                 })
@@ -174,6 +173,7 @@ async function generate() {
               }
             }),
           )
+
           return [locale, result.reduce((acc, x) => ({ ...acc, ...x }), merged)]
         } catch (error) {
           log.error(HELPERS.locales, error)
@@ -191,6 +191,7 @@ async function generate() {
 module.exports.generate = generate
 
 if (require.main === module) {
+  if (!process.env.OPENAI_API_KEY) throw new Error('OpenAI API key is missing')
   generate()
     .then((locales) => writeAll(locales, false, __dirname, './generated'))
     .then(() =>
diff --git a/packages/locales/lib/generated/de.json b/packages/locales/lib/generated/de.json
index ba6c59baa..27e165239 100644
--- a/packages/locales/lib/generated/de.json
+++ b/packages/locales/lib/generated/de.json
@@ -1,183 +1,190 @@
 {
   "login": "Anmelden",
-  "join": "Beitreten",
-  "click_once": "Klicken Sie nur einmal auf Autorisieren",
-  "save": "speichern",
+  "click_once": "Klicken Sie nur einmal auf 'Autorisieren'",
+  "save": "Speichern",
   "reset": "Zurücksetzen",
-  "close": "schliessen",
+  "close": "Schließen",
   "reset_filters": "Filter zurücksetzen",
-  "pokemon_filters": "Pokemon Filter Einstellungen",
-  "gyms_filters": "Arena Filter Einstellungen",
-  "pokestops_filters": "Pokestop Filter Einstellungen",
-  "nests_filters": "Nest Filter Einstellungen",
+  "pokemon_filters": "Pokémon Filtereinstellungen",
+  "gyms_filters": "Arena Filtereinstellungen",
+  "pokestops_filters": "PokéStop Filtereinstellungen",
+  "nests_filters": "Nest Filtereinstellungen",
   "help": "Hilfe",
   "apply_to_all": "Auf alle anwenden",
-  "disable_all": "alle deaktivieren",
-  "enable_all": "alle aktivieren",
-  "enabled": "aktiviert",
-  "legacy": "Legendär",
+  "disable_all": "Alle deaktivieren",
+  "enable_all": "Alle aktivieren",
+  "enabled": "Aktiviert",
+  "legacy": "Vererbt",
   "id": "ID",
   "location": "Standort",
-  "search_pokemon": "Suche Pokemon",
-  "search_nests": "Suche Nester",
-  "search_gyms": "Suche Arena",
-  "search_pokestops": "Suche Pokestops",
-  "sm": "S",
-  "md": "M",
-  "lg": "L",
+  "search_pokemon": "Pokémon suchen",
+  "search_nests": "Nester suchen",
+  "search_gyms": "Arenen suchen",
+  "search_pokestops": "PokéStops suchen",
+  "search_raids": "Raids suchen",
+  "search_eggs": "Eier suchen",
+  "search_quests": "Quests suchen",
+  "search_lures": "Lockmodule suchen",
+  "search_invasions": "Invasionen suchen",
+  "sm": "sm",
+  "md": "md",
+  "lg": "lg",
   "xl": "XL",
   "min": "Min",
   "max": "Max",
-  "set_size": "Symbolgröße einstellen",
-  "slot_selection": "Platz Auswahl",
-  "generations": "Generation",
-  "types": "Type",
-  "forms": "Form",
-  "rarity": "Seltenheit",
+  "set_size": "Symbolgröße festlegen",
+  "slot_selection": "Slot-Auswahl",
+  "generations": "Generationen",
+  "types": "Typen",
+  "forms": "Formen",
+  "rarity": "Aktuelle Seltenheit",
   "others": "Andere",
   "categories": "Kategorien",
-  "%": "%",
   "rank": "Rang",
-  "slider_iv": "IV Rang",
+  "slider_iv": "IV Bereich",
   "slider_great": "Superliga",
   "slider_ultra": "Hyperliga",
-  "slider_atk_iv": "Attacke",
+  "slider_little": "Kleinstein-Cup",
+  "slider_atk_iv": "Angriff",
   "slider_def_iv": "Verteidigung",
   "slider_sta_iv": "Ausdauer",
   "slider_level": "Level",
+  "slider_size": "Größe",
   "abbreviation_level": "L",
   "lvl": "Lvl",
   "cap": "Cap",
-  "custom": "benutzerdefiniert",
-  "valid": "gültig",
-  "invalid": "ungültig!",
+  "custom": "Benutzerdefiniert",
+  "valid": "Gültig",
+  "invalid": "Ungültig!",
   "overwrites": "Überschreibt alle Filter",
   "valid_filter": "Gültiger Statistikfilter",
   "invalid_filter": "Geben Sie einen gültigen Filter ein",
-  "gyms": "Arena",
+  "gyms": "Arenen",
   "nests": "Nester",
-  "pokestops": "Pokestops",
-  "pokemon": "Pokemon",
+  "pokestops": "PokéStops",
+  "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
-  "scan_areas": "Gebiete",
+  "scan_areas": "Scan-Bereiche",
   "s2cells": "S2 Zellen",
   "weather": "Wetter",
   "admin": "Admin",
   "settings": "Einstellungen",
-  "advanced": "erweitert",
+  "advanced": "Erweitert",
+  "tile_servers": "Tile-Server",
   "icons": "Symbole",
-  "navigation": "navigation",
+  "navigation": "Navigation",
   "drawer": "Drawer",
-  "iconsDefault": "Standard",
+  "tile_servers_default": "Standard",
   "drawer_temporary": "Vorübergehend",
-  "drawer_persistent": "dauerhaft",
-  "locale_selection": "Sprache wählen",
+  "drawer_persistent": "Dauerhaft",
+  "locale_selection": "Sprachauswahl",
   "import": "Importieren",
   "export": "Exportieren",
   "logout": "Abmelden",
-  "local_storage_cleared": "Cache bereinigt!",
-  "iv_or_filter": "IV oder Filter",
+  "local_storage_cleared": "Lokaler Speicher wurde geleert!",
+  "iv_or_filter": "IV ODER Filter",
   "polygons": "Polygone",
   "raids": "Raids",
-  "ex_eligible": "EX Raid",
+  "ex_eligible": "EX Berechtigt",
   "in_battle": "Im Kampf",
-  "all_pokestops": "Alle Pokestops",
-  "all_gyms": "Alle Arenen",
-  "lures": " Lockmodule",
+  "all_pokestops": "Alle PokéStops",
+  "lures": "Lockmodule",
   "quests": "Quests",
   "invasions": "Invasionen",
   "portals": "Portale",
-  "submission_cells": "Einreich-Zellen",
+  "submission_cells": "Einreichungszellen",
   "spawnpoint": "Spawnpunkt",
   "spawnpoints": "Spawnpunkte",
-  "s2_cell_level": "Level {{level}} S2 Zellen",
-  "total_count": "Komplette Anzahl",
-  "submissions": "{{}} ",
-  "next_submission": "Nächster Vorschlag!",
-  "never": "nie",
+  "s2_cell_level": "Level {{level}} S2 Zelle",
+  "total_count": "Gesamtzahl",
+  "next_submission": "Nächste Einreichung!",
+  "never": "Nie",
   "next_gym": "Nächste Arena",
-  "scan_cells": "S2 Zellen",
+  "scan_cells": "Scan-Zellen",
   "devices": "Geräte",
   "use_my_location": "Meinen Standort verwenden",
   "submit_feedback_title": "Feedback/Fehlerbericht senden",
-  "use_the_link_below": "Sie können den unten stehenden Link verwenden, um Feedback oder Fehler, auf die Sie gestoßen sind, zu senden.",
+  "use_the_link_below": "Sie können den unten stehenden Link verwenden, um Feedback oder aufgetretene Fehler zu melden.",
   "feedback_to_devs": "Dieses Feedback wird direkt an die Entwickler gesendet.",
-  "feedback_form": "Feedback-Formular",
-  "unknown_pokestop": "Unbekannter Pokestop-Name",
-  "unknown_gym": "Unbekannter Arena-Name",
+  "feedback_form": "Feedback Formular",
+  "unknown_pokestop": "Unbekannter PokéStop-Name",
+  "unknown_gym": "Unbekannter Arena Name",
   "exclude": "Ausschließen",
   "exclude_quest": "Quest ausschließen",
   "exclude_invasion": "Invasion ausschließen",
   "exclude_team": "Team ausschließen",
   "exclude_raid": "Raid ausschließen",
+  "exclude_lure": "Lockmodul ausschließen",
   "timer": "Timer",
-  "hide": "Ausblenden",
-  "tier": "Level",
+  "hide": "Verbergen",
+  "tier": "Stufe",
   "slots": "Plätze",
   "mega": "Mega",
   "form": "Form",
-  "starts": "Startet",
+  "starts": "Beginnt",
   "ends": "Endet",
   "defender": "Verteidiger",
   "cp": "WP",
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "Gesamt WP",
-  "first_seen": "Zum ersten Mal gesehen",
+  "first_seen": "Erstmals gesehen",
   "last_seen": "Zuletzt gesehen",
-  "last_modified": "Zuletzt bearbeitet",
-  "last_updated": "Letzte Aktualisierung",
+  "last_modified": "Zuletzt geändert",
+  "last_updated": "Zuletzt aktualisiert",
   "imported": "Importiert",
-  "nest_estimated": "Nest-Daten werden geschätzt!",
-  "verify_nests": "Überprüfen Sie dies, indem Sie die aktuellen Spawns überprüfen",
+  "nest_estimated": "Nestdaten sind geschätzt!",
+  "verify_nests": "Überprüfen durch aktuelle Spawns",
   "nest_out_of_date": "Nest ist möglicherweise veraltet!",
-  "nest_check_current": "Überprüfen Sie stattdessen die aktuellen Spawns",
-  "spawns_per_hour": "spawns/h",
+  "nest_check_current": "Aktuelle Spawns prüfen",
+  "spawns_per_hour": "Pro Stunde",
   "teams": "Teams",
   "eggs": "Eier",
   "reverse": "Umkehren",
   "selected": "Ausgewählt",
   "unselected": "Nicht ausgewählt",
   "only_available": "Verfügbar",
-  "common": "häufig",
-  "uncommon": "selten",
-  "rare": "rar",
-  "ultra_rare": "ultra-rar",
+  "common": "Häufig",
+  "uncommon": "Ungewöhnlich",
+  "rare": "Selten",
+  "ultra_rare": "Ultra Selten",
   "regional": "Regional",
   "event": "Event",
   "legendary": "Legendär",
-  "mythical": "Mysteriös",
-  "alt_forms": "alle Formen",
-  "Alola": "Alola",
-  "Galarian": "Galar",
-  "showing": "Zeigen",
+  "mythical": "Mythisch",
+  "ultra_beast": "Ultra Beast",
+  "alt_forms": "Alternative Formen",
+  "alola": "Alola",
+  "galarian": "Galar",
+  "showing": "Anzeigen",
   "instance": "Instanz",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Wetterboost",
-  "pokemon_options": "Pokemon Optionen",
-  "pokestops_options": "Pokestop Optionen",
+  "boosted_types": "Verstärkte Typen",
+  "pokemon_options": "Pokémon Optionen",
+  "pokestops_options": "PokéStop Optionen",
   "gyms_options": "Arena Optionen",
   "nests_options": "Nest Optionen",
   "wayfarer_options": "Wayfarer Optionen",
   "admin_options": "Admin Optionen",
   "weather_options": "Wetter Optionen",
+  "s2cells_options": "S2 Zellen Optionen",
   "clustering": "Clustering",
-  "glow": "Glow",
+  "glow": "Leuchten",
   "legacy_filter": "Legacy Filter",
   "raid_timers": "Alle Raid Timer",
   "invasion_timers": "Alle Invasion Timer",
   "lure_timers": "Alle Lockmodul Timer",
-  "device_path_color": "Geräte Pfadfarbe",
+  "device_path_color": "Gerätepfadfarbe",
   "old_portals": "Alte Portale",
   "new_portals": "Neue Portale",
   "items": "Items",
   "energy": "Energie",
-  "ar_eligible": "AR geeignet",
-  "iv_circles": "IV Marker",
-  "min_iv_circle": "min. IV Marker",
-  "interaction_ranges": "Interaktionsradius",
-  "cannot_connect": "\nVerbindung zum Server derzeit nicht möglich.\nNochmaliges Versuchen führt nur zu mehr Problemen.\nBitte versuche es erneut in ein paar Minuten.\n\n- Map Admin Team",
+  "ar_eligible": "AR Berechtigt",
+  "iv_circles": "IV Indikatoren",
+  "min_iv_circle": "Minimales Kreis IV",
+  "interaction_ranges": "Interaktionsbereiche",
+  "cannot_connect": "\nVerbindung zum Server derzeit nicht möglich.\nEin sofortiger weiterer Versuch verursacht nur mehr Probleme.\nBitte versuchen Sie es in ein paar Minuten erneut.\n\n- Map Admin Team",
   "mad_quest_text": "Native Quests",
   "xs": "XS",
   "primary": "Primär",
@@ -185,154 +192,147 @@
   "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
   "open_menu": "Menü öffnen",
-  "zoom_in": "Hineinzoomen",
-  "zoom_out": "Herauszoomen",
-  "welcome": "Willkommen zu",
+  "zoom_in": "Einzoomen",
+  "zoom_out": "Auszommen",
+  "welcome": "Willkommen bei",
   "back": "Zurück",
   "next": "Weiter",
-  "finish": "Beenden",
-  "start_tutorial": "Starte Tutorial",
-  "view_profile": "Profil anzeigen",
-  "login_optional": "Login (Optional)",
+  "finish": "Fertigstellen",
+  "start_tutorial": "Tutorial starten",
+  "view_profile": "Profil ansehen",
+  "login_optional": "Anmelden (Optional)",
   "tutorial": "Tutorial",
   "tutorial_language": "Wähle deine Sprache",
-  "tutorial_welcome": "Dieses Tutorial ist interaktiv und du solltest unbedingt mit allen angebotenen Optionen herumspielen",
-  "tutorial_categories": "Kategorien, auf die du Zugriff hast",
-  "tutorial_logged_in": "Du kannst Details zu deinen Berechtigungen in deinem Profil anschauen.",
-  "tutorial_logged_out": "Du kannst Details zu deinen Berechtigungen anschauen, wenn du dich eingeloggt hast.",
-  "tutorial_sidebar_0": "All dein Filter und Einstellungen befinden sich hier",
-  "tutorial_sidebar_1": "Für jede Kategorie kannst du mit den Schaltern die gewünschten Daten aktivieren",
-  "tutorial_sidebar_2": "Optionen: Zusätzliche Anpassungen\nErweitert: Werden wir später in diesem Tutorial behandeln",
-  "tutorial_sliders_0": "Verwenden von Schaltern zum Einstellen von Filtern",
-  "tutorial_sliders_1": "Pokémon zwischen:",
+  "tutorial_welcome": "Dieses Tutorial ist interaktiv, und es wird dringend empfohlen, mit den bereitgestellten Optionen zu experimentieren",
+  "tutorial_categories": "Auf diese Kategorien haben Sie Zugriff",
+  "tutorial_logged_in": "Sie können Einzelheiten zu Ihren Berechtigungen sehen, indem Sie Ihr Profil ansehen.",
+  "tutorial_logged_out": "Sie können Einzelheiten zu Ihren Berechtigungen sehen, indem Sie sich anmelden.",
+  "tutorial_sidebar_0": "Hier befinden sich alle Ihre Filter & Einstellungen",
+  "tutorial_sidebar_1": "Für jede Kategorie kannst du genau einstellen, welche Daten du möchtest, indem du die Schalter benutzt",
+  "tutorial_sidebar_2": "Optionen: Zusätzliche Anpassungen\nErweitert: Wir werden das später in diesem Tutorial behandeln",
+  "tutorial_sliders_0": "Verwenden von Schiebereglern zur Anpassung von Filtern",
+  "tutorial_sliders_1": "Pokémon Zwischen:",
   "tutorial_sliders_2": "- IVs {{iv0}}% bis {{iv1}}%",
   "tutorial_sliders_3": "Level {{level0}} bis {{level1}}",
   "tutorial_sliders_3alt": "- UND ist Level {{level0}} bis {{level1}}",
-  "tutorial_sliders_4": "- Superliga Rang {{gl0}} bis {{gl1}}",
-  "tutorial_sliders_4alt": "- ODER Superliga Rang {{gl0}} bis {{gl1}}",
-  "tutorial_sliders_5": "- Hyperliga Rang {{ul0}} bis {{ul1}}",
-  "tutorial_sliders_5alt": "- ODER Hyperliga Rang {{ul0}} bis {{ul1}}",
-  "tutorial_sliders_6": "Verketten mit anderen der gleichen Farbe",
-  "tutorial_sliders_7": "Filter getrennt von anderen Schiebereglern",
+  "tutorial_sliders_4": "- Rang in der Superliga {{gl0}} bis {{gl1}}",
+  "tutorial_sliders_4alt": "- ODER Rang in der Superliga {{gl0}} bis {{gl1}}",
+  "tutorial_sliders_5": "- Rang in der Hyperliga {{ul0}} bis {{ul1}}",
+  "tutorial_sliders_5alt": "- ODER Rang in der Hyperliga {{ul0}} bis {{ul1}}",
+  "tutorial_sliders_6": "Kombiniert mit anderen derselben Farbe",
+  "tutorial_sliders_7": "Filtert unabhängig von anderen Schiebereglern",
   "tutorial_sliders_8": "Ein 'voller' Schieberegler bedeutet, dass er deaktiviert ist:",
-  "tutorial_sliders_9": "Alle Spawns, unabhänig von IV Scan",
+  "tutorial_sliders_9": "Alle Spawns, unabhängig davon, ob sie auf IV geprüft wurden oder nicht",
   "tutorial_help": "Verknüpfung zu diesem Menü",
-  "tutorial_adv_filter": "Nur in der mobilen Ansicht - öffnet die Filteroptionen für das erweiterte Menü",
-  "tutorial_tune": "Setzt den erweiterten Filter für alle Pokémon, die gerade im Menü gefiltert werden",
-  "tutorial_format_size": "Legt die Symbolgröße für alle aktuell gefilterten Einträge im Menü fest",
-  "tutorial_check": "Aktiviert alle aktuell gefilterten Einträge im Menü",
-  "tutorial_clear": "Deaktiviert alle aktuell gefilterten Einträge im Menü",
-  "tutorial_save": "Speichert die aktuelle Auswahl und schließt das Menü",
-  "tutorial_show_all_view": "Pokestops & Arenen umschalten",
-  "tutorial_show_pokemon_view": "Pokémon umschalten",
-  "tutorial_toggle": "Ein Klick auf das Häkchen/X schaltet das Element um",
-  "tutorial_pokemon_caption": "Mit diesem Symbol können Sie Filter für dieses spezielle Pokémon einstellen",
-  "tutorial_all_caption": "Teams haben ein spezielles Slot-Menü\nAlle anderen Elemente ermöglichen die Anpassung der Symbolgröße",
-  "tutorial_popup_0": "Popups sind nun interaktiv!",
-  "tutorial_popup_1": "Die drei Punkte öffnen die Optionen zum Ausblenden, Ausschließen und Umschalten des Timers",
-  "tutorial_popup_2": "Die Symbole auf beiden Seiten des Navigations-Links werden erweitert, um zusätzliche Informationen anzuzeigen. Probier es aus!",
-  "tutorial_popup_3": "Die Icons variieren für jede Kategorie, sehen Sie sich alle an",
-  "tutorial_closing_0": "Zusätzliche Info",
-  "tutorial_closing_1": "Die globalen Pokémon-Schalter in der Seitenleiste funktionieren getrennt vom erweiterten Menü und haben keinen Einfluss aufeinander",
-  "tutorial_closing_2": "Sehen Sie sich unbedingt den Abschnitt Einstellungen in der Seitenleiste an",
-  "tutorial_closing_3": "Es gibt viele ästhetische Optionen für jede Kategorie, aber bedenke, je mehr du deiner Map hinzufügst, desto höher ist die Wahrscheinlichkeit, dass deine Map einfriert",
-  "tutorial_closing_4": "Das Tutorial kann erneut angezeigt werden, indem du es im Bereich Einstellungen in der Seitenleiste auswählst",
-  "tutorial_closing_5": "Bleiben Sie sicher und viel Glück!",
-  "intro": "Einleitung",
+  "tutorial_adv_filter": "Nur mobil, öffnet die Filteroptionen für das erweiterte Menü",
+  "tutorial_tune": "Stellt den erweiterten Filter für alle Pokémon ein, die derzeit im Menü gefiltert werden",
+  "tutorial_format_size": "Legt die Symbolgröße für alle derzeit im Menü gefilterten Elemente fest",
+  "tutorial_check": "Aktiviert alle derzeit im Menü gefilterten Elemente",
+  "tutorial_clear": "Deaktiviert alle derzeit im Menü gefilterten Elemente",
+  "tutorial_save": "Speichert die aktuelle Auswahl und schließt",
+  "tutorial_show_all_view": "Wechsle PokéStops & Arenen",
+  "tutorial_show_pokemon_view": "Wechsle Pokémon",
+  "tutorial_toggle": "Klicken auf das Häkchen/X wechselt das Element",
+  "tutorial_pokemon_caption": "Dieses Symbol ermöglicht es dir, Filter für dieses spezielle Pokémon einzustellen",
+  "tutorial_all_caption": "Teams haben ein spezielles Slot-Menü\nAlle anderen Elemente lassen dich die Symbolgröße anpassen",
+  "tutorial_popup_0": "Popups sind jetzt interaktiv!",
+  "tutorial_popup_1": "Die drei Punkte öffnen die Optionen Verstecken, Ausschließen und Timer umschalten",
+  "tutorial_popup_2": "Symbole auf beiden Seiten des Navigationslinks werden erweitert, um zusätzliche Infos anzuzeigen, probier es aus!",
+  "tutorial_popup_3": "Die Symbole variieren je nach Kategorie, stelle sicher, dass du sie alle ausprobierst",
+  "tutorial_closing_0": "Zusätzliche Infos",
+  "tutorial_closing_1": "Die globalen Pokémon-Schieberegler in der Seitenleiste funktionieren separat vom erweiterten Menü und haben keinen Einfluss aufeinander",
+  "tutorial_closing_2": "Stelle sicher, dass du den Einstellungsbereich in der Seitenleiste ansiehst",
+  "tutorial_closing_3": "Es gibt viele ästhetische Optionen für jede Kategorie, aber bedenke, dass je mehr du deiner Karte hinzufügst, desto höher ist die Wahrscheinlichkeit, dass deine Karte einfriert",
+  "tutorial_closing_4": "Du kannst dieses Tutorial erneut ansehen, indem du es im Einstellungsfeld in der Seitenleiste auswählst",
+  "tutorial_closing_5": "Bleib sicher und viel Glück!",
+  "intro": "Einführung",
   "sidebar": "Seitenleiste",
   "sliders": "Schieberegler",
-  "poups": "Popups",
-  "closing": "Schließen",
+  "popups": "Popups",
+  "closing": "Abschluss",
   "shortcuts": "Verknüpfungen",
   "iv": "IV",
-  "area_restrictions": "Gebietseinschränkungen",
-  "map": "Map",
-  "stats": "Statistik",
+  "area_restrictions": "Gebietsbeschränkungen",
+  "map": "Karte",
+  "stats": "Statistiken",
   "pvp": "PVP",
-  "area_restrictions_subtitle": "Sie haben Zugriff auf diese Gebiete",
-  "devices_subtitle": "Zeigt aktive Gerätestandorte und Routen an",
-  "gyms_subtitle": "Zeigt alle aktiven Arenenstandorte, das aktive Team und wie viele Plätze jede Arena zur Verfügung hat",
-  "invasions_subtitle": "Zeigt Informationen zu Team Rocket-Invasionen, einschließlich Kampfaufstellung, Ablaufzeit und mögliche Belohnungen",
-  "iv_subtitle": "Zeigt IV% und Leuchtoptionen",
-  "lures_subtitle": "Zeigt Lockmodulformationen an, einschließlich Typ und Ablaufzeit",
-  "map_subtitle": "Zeigt die Map",
-  "nests_subtitle": "Zeigt aktiv nestende Pokemon und Nestpolygone",
-  "pokemon_subtitle": "Zeigt alle Pokemon-Standorte und Ablaufzeiten",
-  "pokestops_subtitle": "Zeigt alle Pokestop-Standorte",
+  "area_restrictions_subtitle": "Du hast Zugang zu diesen Bereichen",
+  "devices_subtitle": "Zeigt aktive Gerätestandorte und Routen",
+  "gyms_subtitle": "Zeigt alle aktiven Arenenstandorte, aktives Team und wie viele Plätze jede Arena hat",
+  "invasions_subtitle": "Zeigt Informationen zu Team Rocket Invasionen, einschließlich Kampfaufstellung, Ablaufzeit und möglichen Belohnungen",
+  "iv_subtitle": "Zeigt IV% und Glühoptionen",
+  "lures_subtitle": "Zeigt Lockmodul-Infos, einschließlich Lockmodul-Typ und Ablaufzeit",
+  "map_subtitle": "Zeigt die Karte",
+  "nests_subtitle": "Zeigt aktiv nistende Pokémon und Nistpolygonen",
+  "pokemon_subtitle": "Zeigt alle Pokémon-Standorte und Ablaufzeiten",
+  "pokestops_subtitle": "Zeigt alle PokéStop-Standorte",
   "portals_subtitle": "Zeigt alle Ingress-Portale",
-  "pvp_subtitle": "Zeigt PVP-Rang/WP/Level-Informationen für jedes Pokemon",
-  "quests_subtitle": "Zeigt Quest Belohnung und Aufgabeninformationen an",
-  "raids_subtitle": "Zeigt alle Raid-Informationen, einschließlich des Raid-Bosses, der Eier, der Ablaufzeit und des Movesets",
-  "scan_cells_subtitle": "Zeigt an, wann eine S2-Zelle zuletzt von einem Gerät gescannt wurde",
-  "scan_areas_subtitle": "Zeigt verfügbare Scanbereich Polygone",
-  "spawnpoints_subtitle": "Zeigt Spawnpunkte und deren geschätzte Despawnzeit an",
-  "stats_subtitle": "Zeigt Pokemon-Statistiken und Level an",
-  "submissionCells_subtitle": "Zeigt nützliche Informationen für das Einreichen neuer POIs an",
-  "weather_subtitle": "Zeigt Wetterinformationen im Spiel für jede Zelle an",
-  "s2cells_subtitle": "Zeigt S2-Zellen in verschiedenen Leveln auf der Map an",
-  "backups_subtitle": "Ermöglicht das Sichern und Laden von Einstellungen über verschiedene Geräte hinweg",
+  "pvp_subtitle": "Zeigt PVP-Rang/CP/Level-Infos für jedes Pokémon an",
+  "quests_subtitle": "Zeigt Belohnungen und Aufgabeninformationen von Quests an",
+  "raids_subtitle": "Zeigt alle Raid-Infos einschließlich des Raid-Bosses, Eier, Ablaufzeit und Movesets an",
+  "scan_cells_subtitle": "Zeigt die letzte Scan-Zeit einer S2-Zelle durch ein Gerät an",
+  "scan_areas_subtitle": "Zeigt verfügbare Scan-Bereiche als Polygone an",
+  "spawnpoints_subtitle": "Zeigt Spawnpunkte und ihre geschätzte Despawn-Zeit an",
+  "stats_subtitle": "Zeigt Statistiken und Level von Pokémon an",
+  "submission_cells_subtitle": "Zeigt nützliche Informationen für das Einreichen neuer POIs an",
+  "weather_subtitle": "Zeigt Wetterinfos im Spiel für jede Zelle an",
+  "scanner_subtitle": "Interagiert direkt auf verschiedene Weisen mit dem Scanner",
+  "s2cells_subtitle": "Zeigt S2-Zellen auf der Karte in verschiedenen Ebenen an",
+  "backups_subtitle": "Ermöglicht das Sichern und Laden von Einstellungen über Geräte hinweg",
   "backups": "Sicherungen",
-  "user_profile": "Benutzer-Profil",
+  "user_profile": "Benutzerprofil",
   "user_username": "Benutzername",
-  "candy": "Bonbon",
-  "show_ex_badge": "EX Abzeichen anzeigen",
+  "candy": "Bonbons",
+  "show_ex_badge": "Zeige EX-Abzeichen",
   "search": "Suche",
-  "global_search_quests": "Füge den Namen der Belohnung ein...",
-  "global_search_lures": "Füge den Namen des Lockmoduls ein...",
-  "global_search_pokestops": "Füge den Namen des Pokestop ein...",
-  "global_search_gyms": "Füge den Namen der Arena ein...",
-  "global_search_portals": "Füge den Namen des Portals ein...",
-  "global_search_nests": "Füge den Namen des Nestes ein...",
-  "global_search_raids": "Füge den Namen des Raid Boss ein...",
-  "raid_level_badges": "Raid Level Abzeichen",
+  "global_search_quests": "Belohnungsnamen eingeben...",
+  "global_search_lures": "Lockmodulnamen eingeben...",
+  "global_search_pokestops": "PokéStops-Namen eingeben...",
+  "global_search_gyms": "Arenanamen eingeben...",
+  "global_search_portals": "Portalnamen eingeben...",
+  "global_search_nests": "Namens des Nests Pokémon eingeben...",
+  "global_search_raids": "Raid-Boss-Namen eingeben...",
+  "global_search_pokemon": "Pokémon-Namen eingeben...",
+  "global_search_invasions": "Grunt-Typ, Namen oder Belohnungs-Pokémon-Namen eingeben...",
+  "raid_level_badges": "Raid-Level-Abzeichen",
   "options": "Optionen",
   "profile": "Profil",
-  "pokemon_icons": "Pokemon Icons",
-  "pokestop_icons": "Pokestop Icons",
-  "gym_icons": "Arena Icons",
-  "team_icons": "Team Icons",
-  "egg_icons": "Ei Icons",
-  "raid_icons": "Raid Icons",
-  "nest_icons": "Nest Icons",
-  "reward_icons": "Belohnung Icons",
-  "type_icons": "Typ Icons",
-  "weather_icons": "Wetter Icons",
-  "misc_icons": "Misc Icons",
-  "invasion_icons": "Invasion Icons",
-  "pokemon_timers": "Alle Pokemon Timer",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 7,
-  "popup_gym_seen_timer_width": 5,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 7,
-  "popup_pokestop_seen_timer_width": 5,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 6,
-  "popup_pokemon_seen_timer_width": 5,
-  "popup_pokemon_data_width": 11,
-  "login_button": 10,
-  "join_button": 10,
-  "show_dex_num_in_popup": "Pokedex # in Popup anzeigen",
+  "pokemon_icons": "Pokémon-Symbole",
+  "pokestop_icons": "PokéStop-Symbole",
+  "gym_icons": "Arenen-Symbole",
+  "team_icons": "Team-Symbole",
+  "egg_icons": "Ei-Symbole",
+  "raid_icons": "Raid-Symbole",
+  "nest_icons": "Nest-Symbole",
+  "reward_icons": "Belohnungs-Symbole",
+  "type_icons": "Typ-Symbole",
+  "weather_icons": "Wetter-Symbole",
+  "misc_icons": "Sonstige Symbole",
+  "invasion_icons": "Invasions-Symbole",
+  "spawnpoint_icons": "Spawnpunkt-Symbole",
+  "device_icons": "Geräte-Symbole",
+  "pokemon_audio": "Pokémon-Audio",
+  "pokestop_audio": "PokéStop-Audio",
+  "gym_audio": "Arenen-Audio",
+  "team_audio": "Team-Audio",
+  "egg_audio": "Ei-Audio",
+  "raid_audio": "Raid-Audio",
+  "nest_audio": "Nest-Audio",
+  "reward_audio": "Belohnungs-Audio",
+  "type_audio": "Typ-Audio",
+  "weather_audio": "Wetter-Audio",
+  "misc_audio": "Sonstige Audios",
+  "invasion_audio": "Invasions-Audio",
+  "spawnpoint_audio": "Spawnpunkt-Audio",
+  "device_audio": "Geräte-Audio",
+  "pokemon_timers": "Alle Pokémon Timer",
+  "show_dex_num_in_popup": "Zeige Pokédex-# in Popup",
   "popup": "Popup",
-  "pvp_level": "Level {{level}} PVP Stats",
-  "pvp_mega": "Mega PVP Stats",
-  "webhook_entry": "Füge zu {{name}} hinzu",
-  "distance": "Distanz",
+  "pvp_level": "Level {{level}} PVP-Statistiken",
+  "pvp_mega": "Mega-PVP-Statistiken",
+  "webhook_entry": "Zu {{name}} hinzufügen",
+  "remove_webhook_entry": "Von {{name}} entfernen",
+  "distance": "Entfernung",
   "gym": "Arena",
   "egg": "Ei",
   "raid": "Raid",
@@ -340,32 +340,30 @@
   "quest": "Quest",
   "invasion": "Invasion",
   "nest": "Nest",
-  "pokestop": "Pokestop",
+  "pokestop": "PokéStop",
   "team": "Team",
   "global": "Global",
-  "manage_webhook": "Organisiere {{name}}",
-  "drag_and_drop": "Ziehen Sie die Markierung, um Ihren Standort festzulegen",
-  "click_to_select": "Zum Auswählen klicken",
-  "add_new": "Füge neuen {{category}} Alarm hinzu",
-  "choose_on_map": "Wähle auf der Karte",
-  "select_profile": "Profil auswählen",
-  "distance_radius": "Vorschau der Radiusabstände",
-  "areas": "Gebiete",
-  "select_webhook": "Bot auswählen",
-  "ar_quest_true": "mit AR-Quest",
-  "ar_quest_false": "ohne AR-Quest",
-  "exclude_quest_multi": "{{reward}} ausschließen",
-  "exclude_lure": "Lockmodul ausschließen",
-  "cluster_limit_0": "Limit von {{variable_0}} ({{variable_1}}) wurde erreicht",
-  "cluster_limit_1": "Bitte reinzoomen oder die Filter einschränken",
-  "show_polygons": "Polygone anzeigen",
-  "exclude_invasion_multi": "{{invasion}} ausschließen",
+  "manage_webhook": "{{name}} verwalten",
+  "drag_and_drop": "Verschiebe den Marker, um deinen Standort festzulegen",
+  "click_to_select": "Klicken, um auszuwählen",
+  "add_new": "Neuen {{category}} Alarm hinzufügen",
+  "my_location": "Mein Standort",
+  "choose_on_map": "Auf der Karte wählen",
+  "select_profile": "Profil wählen",
+  "distance_radius": "Entfernungsradius anzeigen",
+  "areas": "Bereiche",
+  "select_webhook": "Bot wählen",
+  "ar_quest_true": "AR-Aufgabe",
+  "ar_quest_false": "Keine AR",
+  "with_ar": "Mit AR",
+  "both": "Beide",
+  "without_ar": "Ohne AR",
+  "exclude_quest_multi": "Ausschließen {{reward}}",
+  "cluster_limit_0": "{{variable_0}} Limit ({{variable_1}}) erreicht",
+  "cluster_limit_1": "Bitte hereinzoomen oder Filter verengen",
+  "show_polygons": "Zeige Polygone",
+  "exclude_invasion_multi": "Ausschließen {{invasion}}",
   "stardust": "Sternenstaub",
-  "webhook_footer_help_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "dialog_filter_footer_next_width": 2,
-  "webhook_advanced_save_width": 2,
   "slider_cp": "WP",
   "pvp_ranking_league": "Liga",
   "pvp_ranking_min_cp": "Min WP",
@@ -373,38 +371,40 @@
   "profile_no": "Profil",
   "template": "Vorlage",
   "gender": "Geschlecht",
-  "clean": "Bereinigen",
+  "clean": "Säubern",
   "all_forms": "Alle Formen",
   "pvp_entry": "PVP Eintrag",
   "no_iv": "Inkl. Keine IV",
-  "by_distance": "nach Entfernung",
+  "by_distance": "Nach Entfernung",
   "min_time": "Min Zeit",
   "add_new_profile": "Neues Profil hinzufügen",
   "slider_none": "Keine",
-  "non_registered_human_title": "Ups, da stimmt etwas nicht!",
-  "non_registered_human_desc": "Du bist möglicherweise nicht bei {{webhook}} registriert\nOder der Server ist derzeit nicht erreichbar",
-  "try_again_later": "Bitte versuche es später nochmal",
-  "selected_areas": "{{amount}} Gebiet ausgewählt",
-  "selected_areas_plural": "{{amount}} Gebiete ausgewählt",
+  "non_registered_human_title": "Ups, etwas ist nicht richtig!",
+  "non_registered_human_desc": "Sie sind möglicherweise nicht bei {{webhook}} registriert\nOder der Server ist derzeit unerreichbar",
+  "try_again_later": "Bitte versuchen Sie es später noch einmal",
+  "selected_areas_one": "{{count}} Bereich ausgewählt",
+  "selected_areas_other": "{{count}} Bereiche ausgewählt",
   "webhook_selection": "{{name}} Auswahl",
   "message_of_the_day": "Nachricht des Tages",
   "has_quest_indicator": "Alternative Farbe für Stops mit Quests",
-  "show_ar_badge": "AR Symbol anzeigen",
-  "general": "Allgemeines",
-  "link_global_and_advanced": "Verknüpfe Global und Erweitert",
-  "normal_forms": "Standardformen",
-  "weather_indicator": "Wetter Symbol",
+  "show_ar_badge": "Zeige AR Abzeichen",
+  "all_gyms": "Alle Arenen",
+  "general": "Allgemein",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "Globales beachtet Ausgewählte",
+  "normal_forms": "Normale Formen",
+  "weather_indicator": "Wetter Boost Anzeiger",
   "page": "Seite {{page}}",
-  "navigation_controls": "Navigations-Steuerungen",
+  "navigation_controls": "Navigationssteuerung",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Exklusiv",
   "all_moves": "Alle Attacken",
   "move": "Attacke",
-  "any": "alle",
+  "any": "Irgendein",
   "min_spawn_average": "Min Spawn Rate",
-  "select_all": "Alle auswählen",
-  "delete_all": "Alle löschen",
+  "select_all": "Alles auswählen",
+  "delete_all": "Ausgewähltes löschen",
   "cancel": "Abbrechen",
   "day_1": "Montag",
   "day_2": "Dienstag",
@@ -414,305 +414,305 @@
   "day_6": "Samstag",
   "day_7": "Sonntag",
   "profile_name": "Profilname",
-  "manage_profiles": "Verwalte Profile",
-  "min_spawn_avg": "Durchschn. Min Spawn",
-  "poke_global": "Alle",
-  "amount": "Anzahl",
-  "specific_gym": "Spezifische Arena",
-  "search_location": "Suche Standorte",
-  "search_specific": "Suche nach spezifischer {{category}}",
-  "webhook_success_gym": "Raids, Eier, und Team Wechsel Alarme wurden hinzugefügt!",
-  "slot_changes": "Platzänderungen",
-  "confirm_delete": "Dadurch wird die Tracking-Funktion für dieses Profil entfernt, bist du sicher?",
-  "confirm_copy": "Wähle das Profil, in das du \"{{profile}}\" kopieren möchtest. Dadurch wird das ausgewählte Profil vollständig überschrieben.",
-  "webhook_error": "{{name}} konnte das nicht verarbeiten.\nBitte versuche es später nochmals.",
+  "manage_profiles": "Profile verwalten",
+  "min_spawn_avg": "Durchschnittliche Min Spawn",
+  "poke_global": "Alles",
+  "amount": "Menge",
+  "specific_gym": "Bestimmte Arena",
+  "search_location": "Standorte suchen",
+  "search_specific": "Suche nach einem bestimmten {{category}}",
+  "webhook_success_gym": "Raids, Eier und Teamwechsel Alarme wurden hinzugefügt!",
+  "slot_changes": "Slot Änderungen",
+  "slot_changes_poracle": "slot_changes",
+  "confirm_delete": "Dies wird alle Tracking für dieses Profil entfernen, sind Sie sicher?",
+  "confirm_copy": "Wählen Sie, zu welchem Profil Sie \"{{profile}}\" kopieren möchten, dies wird das Profil komplett überschreiben.",
+  "webhook_error": "{{name}} konnte das nicht verarbeiten.\nBitte versuchen Sie es später noch einmal.",
   "profile_error": "Muss eindeutig und gültig sein",
-  "team_0": "Neutral",
-  "battle_changes": "im Kampf",
-  "battle_changes_poracle": "wird_angegriffen",
+  "team_0": "Harmonie",
+  "battle_changes": "Im Kampf",
+  "battle_changes_poracle": "battle_changes",
   "auto": "Auto",
-  "webhooks_subtitle": "Verwalte deine Benachrichtigungen für diese Bots, direkt von der Karte aus.",
-  "event_stops_subtitle": "Zeigt spezielle Event Pokestops wie z.B. Kecleon Stops an.",
-  "webhooks": "Benachrichtigungen",
-  "everything_individually": "Individuelle Benachrichtigungen hinzufügen",
-  "individually": "individuell",
-  "errors_404": "Hoppla, diese Seite kann nicht gefunden werden!",
-  "errors_500": "Es ist ein Serverfehler aufgetreten, bitte versuche es später erneut!",
-  "local_username": "Nutzername",
+  "webhooks_subtitle": "Verwalten Sie Ihre Alarme direkt von der Karte für diese Bots",
+  "event_stops_subtitle": "Zeigt spezielle Event-Pokéstops wie Kecleon",
+  "webhooks": "Alarme",
+  "scanner": "Scanner Aktionen",
+  "everything_individually": "Einzelne Alarme hinzufügen",
+  "individually": "einzeln",
+  "join": "Beitreten",
+  "errors_404": "Ups, diese Seite kann nicht gefunden werden!",
+  "errors_500": "Es gab einen Serverfehler, versuchen Sie es später noch einmal!",
+  "local_username": "Benutzername",
   "local_password": "Passwort",
-  "local_error": "Es ist ein Fehler aufgetreten, bitte versuche es später noch einmal!",
-  "no_filter_results": "Keine Ergebnisse gefunden,\nversuche deine Filter zu erweitern!",
+  "local_error": "Es gab einen Fehler, bitte versuchen Sie es später noch einmal!",
+  "no_filter_results": "Keine Ergebnisse gefunden\nVersuchen Sie, Ihre Filter zu erweitern",
   "donor_page": "Spenderseite",
-  "go_back": "zurück",
+  "go_back": "Zurück",
   "access": "Zugriff",
-  "link_discord": "Discord verknüpfen",
-  "select_webhook_strategy": "Alarm Manager",
-  "webhook_strategy_success_0": "Erfolg! Aktualisieren, um Benachrichtigungseinstellungen abzurufen...",
+  "link_discord": "Discord verbinden",
+  "select_webhook_strategy": "Alarmmanager",
+  "webhook_strategy_success_0": "Erfolg! Wird aktualisiert, um Alarminstellungen abzurufen...",
   "register": "Registrieren",
   "invalid_credentials": "Ungültige Anmeldeinformationen",
   "localauth_failed": "Authentifizierung fehlgeschlagen",
   "error_creating_user": "Neuer Benutzer kann derzeit nicht registriert werden",
-  "discord_linked": "Discord Verknüpft",
-  "telegram_linked": "Telegram Verknüpft",
-  "slider_little": "Mini-Cup",
-  "tile_servers": "Tileserver",
-  "tile_servers_default": "Standard Tileserver",
-  "alola": "Alola",
-  "galarian": "Galar",
-  "popups": "Popups",
-  "submission_cells_subtitle": "Zeigt nützliche Informationen zum Einreichen neuer POIs an.",
-  "my_location": "Mein Standort",
-  "server_dev_error_0": "{{variable_0}}",
-  "slot_changes_poracle": "Platzänderung",
+  "discord_linked": "Discord verbunden",
+  "telegram_linked": "Telegram verbunden",
   "level": "Level",
   "km": "km",
   "feedback": "Feedback",
-  "donor_menu": "Spendermenü",
-  "pokemon_cell": "Der Standort des Pokemon kann variieren",
-  "timer_verified": "Die Despawnzeit ist bestätigt",
-  "timer_unverified": "Die Despawnzeit ist nicht bestätigt",
+  "donor_menu": "Spender Menü",
+  "pokemon_cell": "Standort des Pokémons kann variieren",
+  "timer_verified": "Dieser Timer ist verifiziert",
+  "timer_unverified": "Dieser Timer ist nicht verifiziert",
   "all": "Alle",
-  "with_ar": "Mit AR",
-  "without_ar": "Ohne AR",
-  "both": "Beide",
-  "badge_0": "keiner",
+  "badge_0": "Keins",
   "badge_1": "Bronze",
   "badge_2": "Silber",
   "badge_3": "Gold",
-  "gym_badge_menu": "Arenaorden bearbeiten",
-  "gym_badges": "Arenaorden",
-  "gym_badge_diamonds": "Arenaorden anzeigen",
-  "gym_badges_subtitle": "Die Arenaorden auf der Karte und als Liste auf der Profilseite anzeigen.",
+  "gym_badge_menu": "Fitness Abzeichen bearbeiten",
+  "gym_badges": "Fitness Abzeichen",
+  "gym_badge_diamonds": "Zeige Fitness Abzeichen",
+  "gym_badges_subtitle": "Zeigt Fitness Abzeichen auf der Karte und eine Liste auf der Profilseite.",
   "confirm_filters_reset": "Filter zurücksetzen",
-  "filters_reset_text": "Sollen die Einstellungen wirklich auf die Standardwerte zurückgesetzt werden? Das kann nicht rückgängig gemacht werden!",
+  "filters_reset_text": "Sind Sie sicher, dass Sie die Einstellungen auf die Standardwerte zurücksetzen möchten? Dies kann nicht rückgängig gemacht werden!",
   "filters_reset_title": "Filter zurücksetzen",
   "raid_quick_select": "Schnellauswahl",
-  "loading": "laden von {{category}}",
-  "loading_icons": "Icons abrufen",
-  "loading_invasions": "Rocket-Lineup abrufen",
-  "pvp_ranking_cap": "Level",
+  "disabled": "Deaktiviert",
+  "loading": "{{category}} Laden",
+  "loading_icons": "Symbole abrufen",
+  "loading_invasions": "Invasionen abrufen",
   "scan_next": "Standort scannen",
-  "scan_next_choose": "Ziehen Sie die Markierung per Drag & Drop um die Scanposition festzulegen",
-  "scan_zone": "Scanne ein Gebiet",
-  "scan_zone_choose": "Ziehen Sie die Markierung per Drag & Drop um die Scanposition festzulegen und die Größe zu wählen",
+  "scan_next_choose": "Ziehen Sie den Marker, um den Scan-Standort festzulegen",
+  "scan_zone": "Ein Gebiet scannen",
+  "scan_zone_choose": "Ziehen Sie den Marker, um den Scan-Standort festzulegen und die Größe auszuwählen",
   "scan_zone_size": "Größe",
   "scan_zone_range": "Reichweite",
   "scan_zone_spacing": "Abstand",
   "scan_zone_radius": "Radius",
-  "scan_requests": "Scan Anfrage",
+  "scan_requests": "Scan-Anfragen",
   "scan_queue": "Aktuelle Warteschlange",
   "click_to_scan": "Hier scannen",
   "scan_confirmed_title": "Scan-Anfrage bestätigt",
-  "scan_confirmed": "Gerät wurde an den Standort geschickt, das Ergebnis wird bald auf der Karte erscheinen!",
-  "scan_loading_title": "Sende Scan-Anfrage",
-  "scan_loading": "Deine Scan-Anfrage wird bearbeitet und wurde erfolgreich abgeschickt!",
+  "scan_confirmed": "Mitarbeiter wurde zum Standort geschickt, Ergebnis wird bald auf der Karte erscheinen!",
+  "scan_loading_title": "Scan-Anfrage wird gesendet",
+  "scan_loading": "Ihre Scan-Anfrage wird bearbeitet und an das System gesendet!",
   "scan_error_title": "Fehler",
-  "scan_error": "Es ist ein Fehler bei der Verarbeitung der Scan-Anfrage aufgetreten...",
-  "scan_outside_area": "Dieser Standort liegt außerhalb der Grenzen der zugelassenen Gebiete.",
-  "scan_some_outside_area": "Einige Standorte liegen außerhalb der Grenzen der zugelassenen Gebiete.",
-  "scanner": "Scanner",
-  "scanner_subtitle": "Ermöglicht on Demand scannen eines Standorts, innerhalb des Scangebietes",
-  "device_icons": "Gerätesymbole",
-  "spawnpoint_icons": "Spawnpunkt-Symbole",
-  "disabled": "Deaktiviert",
-  "lc_title": "folge deinem Standort",
+  "scan_error": "Es gab einen Fehler bei der Bearbeitung der Scan-Anfrage...",
+  "scan_outside_area": "Diese Lage ist außerhalb der Grenzen der autorisierten Bereiche",
+  "pvp_ranking_cap": "Level",
+  "lc_title": "Ihrem Standort folgen",
   "lc_metersUnit": "Meter",
-  "lc_feetUnit": "Fuss",
-  "lc_popup": "Dein Standort befindet sich innerhalb von {distance} {unit} Abstand zu diesem Punkt.",
-  "lc_outsideMapBoundsMsg": "Dein Standort scheint sich außerhalb der Grenzen der Karte zu befinden.",
-  "loading_settings": "Lade Einstellungen",
-  "refresh_to_continue": "Bitte aktualisiere, bevor du fortfährst",
+  "lc_feetUnit": "Fuß",
+  "lc_popup": "Sie befinden sich innerhalb von {distance} {unit} von diesem Punkt",
+  "lc_outsideMapBoundsMsg": "Sie scheinen sich außerhalb der Kartenbegrenzungen zu befinden",
+  "no_alerts": "Keine Alarme gefunden",
+  "loading_settings": "Einstellungen laden",
+  "refresh_to_continue": "Bitte aktualisieren Sie, bevor Sie fortfahren",
   "session_expired_title": "Sitzung abgelaufen",
-  "session_expired_body": "Deine Sitzung ist abgelaufen",
+  "session_expired_body": "Ihre Sitzung ist abgelaufen",
   "old_client_title": "Veraltet",
-  "old_client_body": "Eine neue Version der Map ist verfügbar",
+  "old_client_body": "Eine neue Version dieser Karte ist verfügbar",
+  "early_old_client_title": "Veraltet",
+  "early_old_client_body": "Eine alte Version dieser App könnte in Ihrem Browser zwischengespeichert sein, Sie müssen Ihren Cache löschen, bevor Sie diese App verwenden können.",
   "refresh": "Aktualisieren",
-  "search_raids": "Suche nach Raids",
-  "search_eggs": "Suche nach Eier",
-  "search_quests": "Suche nach Quests",
-  "search_lures": "Suche nach Lockmodulen",
-  "search_invasions": "Suche nach Invasionen",
-  "no_alerts": "Keine Benachrichtigungen gefunden",
   "points": "Punkte",
   "day": "Tag",
   "days": "Tage",
-  "react_error": "Etwas ist schiefgelaufen",
+  "react_error": "Etwas ist schief gelaufen",
   "clickable_icon": "Icon ist anklickbar",
-  "two_stops_till_next": "2 Stops bis zur nächsten",
-  "one_stop_till_next": "1 Stop bis zur nächsten",
-  "no_more_gyms": "keine weitere Arena",
-  "light_map_border": "heller Kartenrand",
-  "dark_map_border": "dunkler Kartenrand",
-  "cell_blocked": "Zelle ist blockiert",
+  "two_stops_till_next": "2 Stopps bis zum nächsten",
+  "one_stop_till_next": "1 Stopp bis zum nächsten",
+  "no_more_gyms": "Keine weiteren Fitnessstudios",
+  "light_map_border": "Helle Kartenbegrenzung",
+  "dark_map_border": "Dunkle Kartenbegrenzung",
+  "cell_blocked": "Zelle blockiert",
   "poi_color": "POI Farbe",
-  "ultra_beast": "Ultrabestie",
-  "quest_condition": "Questbedingung",
-  "always_show_labels": "Labels immer anzeigen",
-  "scan_areas_options": "Optionen für Scanbereiche",
+  "quest_condition": "Quest-Bedingung",
+  "always_show_labels": "Beschriftungen immer anzeigen",
+  "scan_areas_options": "Scan-Bereiche Optionen",
   "historic_rarity": "Historische Seltenheit",
-  "poi": "Wayspots",
-  "300m_range": "300m Radius",
-  "lure_range": "Lockmodulradius",
-  "custom_range": "individueller Radius",
+  "poi": "Interessante Punkte",
+  "300m_range": "300m Bereich",
+  "lure_range": "Lockmodul-Reichweite",
+  "custom_range": "Benutzerdefinierter Bereich",
   "tap_to_toggle": "Tippen zum Umschalten",
-  "power_up": "Aufladung",
+  "power_up": "Power-Up",
   "never_alt": "Nie",
-  "seen_nearby_stop": "über Nearby gesehen",
-  "seen_nearby_cell": "in dieser S2 Zelle gesehen",
-  "seen_lure_encounter": "getroffen am Lockmodul",
-  "seen_lure_wild": "Spawn am Lockmodul",
-  "seen_wild": "Spawn in der Wildnis",
-  "size_0": "alle",
+  "seen_nearby_stop": "In der Nähe gesehen",
+  "seen_nearby_cell": "In dieser Zelle gesehen",
+  "seen_lure_encounter": "Lockmodul-Begegnung",
+  "seen_lure_wild": "Lockmodul-Wildes Pokémon",
+  "seen_wild": "Wildes Pokémon",
+  "event_stops": "Event-Pokéstops",
+  "event_stop_timers": "Event-Pokéstop Timer",
+  "size_0": "Beliebig",
   "size_1": "XXS",
   "size_2": "XS",
   "size_3": "M",
   "size_4": "XL",
   "size_5": "XXL",
-  "show_size_indicator": "Größen Marker",
+  "show_size_indicator": "Größenindikator anzeigen",
   "size": "Größe",
-  "gold_stop": "Gold Stop",
-  "profile_backups": "Profil Sicherungen",
-  "new_backup": "neue Sicherungen",
-  "create": "erstellen",
-  "load": "laden",
-  "update": "aktualisieren",
-  "delete": "löschen",
+  "gold_stop": "Goldener Stop",
+  "profile_backups": "Profilwechsel",
+  "new_backup": "Neue Sicherung",
+  "create": "Erstellen",
+  "load": "Laden",
+  "update": "Aktualisieren",
+  "delete": "Löschen",
   "name": "Name",
-  "only_confirmed": "nur bestätigte",
-  "rocket_pokemon": "Crypto-Pokemon",
-  "decoy": "Täusch-Rüpel",
+  "only_confirmed": "Nur bestätigte",
+  "rocket_pokemon": "Rocket-Pokémon",
+  "decoy": "Attrappe",
   "s2_cell_limit_0": "Sie haben versucht, mehr als 20.000 Zellen zu generieren ({{variable_0}})",
-  "show_all_pvp_ranks": "alle PVP Ränge anzeigen",
-  "enable_pokemon_popup_coords": "Pokémon Koordinaten anzeigen",
-  "enable_gym_popup_coords": "Arena Koordinaten anzeigen",
-  "enable_pokestop_popup_coords": "Pokéstop Koordinaten anzeigen",
-  "enable_portal_popup_coords": "Portal Koordinaten anzeigen",
-  "on_block_join_discord": "Bitte trete unserem Discord bei, um weitere Informationen zu erhalten.",
-  "on_block_msg": "Du wurdest aufgrund deiner Mitgliedschaft blockiert",
-  "denied": "verweigert",
-  "showcase": "Showcase",
-  "unknown_event": "unbekanntes Event",
-  "scanner_countdown": "verfügbar in {{time}}s",
+  "show_all_pvp_ranks": "Alle PVP-Ränge anzeigen",
+  "enable_pokemon_popup_coords": "Pokémon-Koordinaten anzeigen",
+  "enable_gym_popup_coords": "Arena-Koordinaten anzeigen",
+  "enable_pokestop_popup_coords": "Pokéstop-Koordinaten anzeigen",
+  "enable_portal_popup_coords": "Portal-Koordinaten anzeigen",
+  "on_block_join_discord": "Bitte treten Sie unserem Discord bei, um weitere Informationen zu erhalten.",
+  "on_block_msg": "Sie wurden blockiert, weil Sie Mitglied von",
+  "denied": "Abgelehnt",
+  "showcase": "Schaufenster",
+  "unknown_event": "Unbekanntes Ereignis",
+  "scanner_countdown": "Verfügbar in {{time}}s",
   "success": "Erfolg",
   "contribute": "Beitragen",
-  "mi": "mi",
-  "filter_by_areas": "nach Gebieten filtern",
-  "submit_nest_name": "Nestnamen mitteilen",
-  "nest_submission_menu": "Namen aktualisieren",
-  "nest_submissions": "Nest Einreichungen",
-  "nest_submissions_subtitle": "Ermöglicht neue Namen für Nester einzureichen.",
-  "pokemon_opacity": "dynamische Pokemon Durchsichtigkeit",
-  "invasion_opacity": "dynamische Invasion Durchsichtigkeit",
-  "raid_opacity": "dynamische Raid Durchsichtigkeit",
-  "opacity_ten_minutes": "Durchsichtigkeit ab 10 Minuten",
-  "opacity_five_minutes": "Durchsichtigkeit ab 5 Minuten",
-  "opacity_one_minute": "Durchsichtigkeit ab 1 Minute",
-  "level_circles": "Level Marker",
-  "min_level_circle": "min. Level Marker",
-  "mutation_auth_error": "Die Anfrage war nicht erfolgreich, da Du nicht angemeldet warst.",
+  "mi": "Meilen",
+  "filter_by_areas": "Nach Gebieten filtern",
+  "submit_nest_name": "Nestnamen einreichen",
+  "nest_submission_menu": "Namensaktualisierung",
+  "nest_submissions": "Nesteinreichungen",
+  "nest_submissions_subtitle": "Ermöglicht es Ihnen, neue Namen für Nester einzureichen",
+  "pokemon_opacity": "Dynamische Pokémon-Transparenz",
+  "invasion_opacity": "Dynamische Invasion-Transparenz",
+  "raid_opacity": "Dynamische Raid-Transparenz",
+  "opacity_ten_minutes": "Transparenz bei 10 Minuten",
+  "opacity_five_minutes": "Transparenz bei 5 Minuten",
+  "opacity_one_minute": "Transparenz bei 1 Minute",
+  "level_circles": "Level-Indikatoren",
+  "min_level_circle": "Mindestkreislevel",
+  "mutation_auth_error": "Ihre Anfrage war aufgrund nicht eingeloggten Status' erfolglos",
   "submitted_by": "Eingereicht von",
-  "slider_size": "Größe",
-  "s2cells_options": "S2 Zellen Optionen",
-  "global_search_pokemon": "Gib den Pokemon-Namen ein...",
-  "remove_webhook_entry": "Entferne von {{name}}",
-  "event_stops": "Event Stops",
-  "event_stop_timers": "Event Stop Timer",
-  "reversible": "umkehrbar",
+  "reversible": "Umkehrbar",
   "version": "Version",
-  "route_tags": "Routen Tags",
+  "route_tags": "Routen-Tags",
   "routes": "Routen",
-  "route_type": "Routen Typ",
-  "routes_subtitle": "Zeige Routen und relevante Infos dazu, auf der Map.",
+  "route_type": "Routenart",
+  "routes_subtitle": "Anzeigen von In-Game-Routen und relevanten Informationen dazu auf der Karte",
   "description": "Beschreibung",
-  "additional_info": "zusätzliche Infos",
+  "additional_info": "Zusätzliche Info",
   "duration": "Dauer",
-  "elevation": "Höhenunterschied",
-  "tth": "TTH",
-  "tth_0": "alle",
-  "tth_1": "bekannt",
-  "tth_2": "unbekannt",
-  "contest_category_1": "kleinste Größe",
-  "context_category_2": "größte Größe",
+  "elevation": "Erhebung",
+  "contest_category_1": "Kleinste Größe",
+  "context_category_2": "Größte Größe",
   "total_entries": "Gesamteinträge",
-  "showcase_rankings": "Showcase-Ranking",
-  "showcase_rankings_subtitle": "Zeigt die Top-Rankingliste für einen Showcase an einem Pokestop an.",
+  "showcase_rankings": "Schaufenster Rangliste",
+  "showcase_rankings_subtitle": "Zeigt eine Liste der Top-Rankings für ein Schaufenster bei einem Pokéstop an",
+  "tth": "TTH",
+  "tth_0": "Alle",
+  "tth_1": "Bekannt",
+  "tth_2": "Unbekannt",
   "no_access": "Kein Zugriff",
-  "alerts": "Benachrichtigungen",
-  "alert_manager": "Benachrichtigungs Manager",
+  "cooldown": "Abkühlzeit",
+  "scan_some_outside_area": "Einige Standorte befinden sich außerhalb der autorisierten Grenzen",
+  "alerts": "Alarme",
+  "alert_manager": "Alarm-Manager",
   "menu": "Menü",
-  "theme": "Theme",
-  "exit": "verlassen",
-  "hide_editor": "Editor ausblenden",
-  "show_editor": "Editor anzeigen",
-  "component": "Elemente",
-  "component_login_page": "Login Seite",
-  "component_donation_page": "Spenden Seite",
+  "theme": "Thema",
+  "exit": "Beenden",
+  "component": "Komponente",
+  "component_login_page": "Login-Seite",
+  "component_donation_page": "Spendenseite",
   "component_message_of_the_day": "Nachricht des Tages",
-  "download": "download",
-  "playground": "Playground",
-  "locale": "Sprachen",
-  "admin_subtitle": "codebasierter WYSIWYG-Editor für benutzerdefinierten Komponenten",
-  "reported_error": "Dieser Fehler wurde dem Server mit Kennung gemeldet",
-  "dark_mode": "Dunkelmodus",
-  "load_from_autosave": "Aus Autosave laden",
-  "done": "Erledigt",
-  "fast": "Sofort",
-  "charged": "Lade",
-  "dialog_filter_footer_adv_menu_width": 2,
-  "webhook_footer_feedback_width": 4,
-  "cooldown": "Abkühlen",
+  "download": "Herunterladen",
+  "playground": "Spielplatz",
+  "locale": "Lokalität",
   "saved": "Gespeichert",
-  "offline_mode": "offline Modus",
-  "include_sponsored": "einschließlich gesponserte",
-  "showcase_color": "Showcasefarbe",
+  "show_editor": "Editor anzeigen",
+  "hide_editor": "Editor ausblenden",
+  "reported_error": "Dieser Fehler wurde dem Server mit der Kennung gemeldet",
+  "dark_mode": "Dunkelmodus",
+  "load_from_autosave": "Aus Autospeicherung laden",
+  "done": "Fertig",
+  "fast": "Schnell",
+  "charged": "Aufladen",
+  "offline_mode": "Offline-Modus",
+  "include_sponsored": "Gesponserte einbeziehen",
+  "showcase_color": "Schaufensterfarbe",
   "partner_color": "Partnerfarbe",
-  "disable": "deaktivieren {{- name}}",
-  "profiling": "Profilbearbeitung",
-  "showcase_block": "Gesperrt wegen eines Showcase",
-  "signed_in_as": "eingeloggt als",
-  "missing_map_perm": "Du hast keine Berechtigung, die Karte anzuzeigen.",
-  "pokemon_audio": "Pokémon-Audio",
-  "pokestop_audio": "PokéStop-Audio",
-  "gym_audio": "Arena-Audio",
-  "team_audio": "Team-Audio",
-  "egg_audio": "Ei-Audio",
-  "raid_audio": "Raid-Audio",
-  "nest_audio": "Nest-Audio",
-  "reward_audio": "Belohnungs-Audio",
-  "type_audio": "Typ-Audio",
-  "weather_audio": "Wetter-Audio",
-  "misc_audio": "Sonstiges-Audio",
-  "invasion_audio": "Invasions-Audio",
-  "spawnpoint_audio": "Spawnpoint-Audio",
-  "device_audio": "Geräte-Audio",
+  "disable": "Deaktivieren {{- name}}",
+  "profiling": "Profiling",
+  "showcase_block": "Aufgrund einer Schaufensterdarstellung blockiert",
+  "signed_in_as": "Angemeldet als",
+  "missing_map_perm": "Sie haben keine Berechtigung, um die Karte anzusehen.",
   "access_denied": "Zugriff verweigert",
   "audio": "Audio",
   "desktop_notifications": "Desktop-Benachrichtigungen",
   "notifications_options": "Benachrichtigungsoptionen",
-  "audio_always_on": "Audio immer abspielen",
+  "audio_always_on": "Audio immer an",
   "volume_level": "Lautstärkepegel",
-  "notifications_status": "Benachrichtigungsstatus",
+  "notifications_status": "Status der Benachrichtigungen",
   "granted": "gewährt",
-  "set_all": "alle wählen",
-  "set_filtered": "gefilterte wählen",
-  "only_show_available": "nur verfügbare anzeigen",
-  "easy_mode": "Easy Mode",
+  "set_all": "Alle setzen",
+  "set_filtered": "Gefiltert setzen",
+  "only_show_available": "Nur verfügbare anzeigen",
+  "easy_mode": "Einfacher Modus",
   "quick_select": "Globale Schnellauswahl",
-  "pokemon_filter_mode": "Pokémon Filter Mode",
+  "pokemon_filter_mode": "Pokémon-Filtermodus",
   "basic": "Einfach",
-  "intermediate": "Fortgeschritten",
+  "intermediate": "Mittel",
   "expert": "Experte",
-  "basic_description": "Wähle einfach Pokémon aus und wende einen globalen Filter an",
-  "intermediate_description": "Lege individuelle Filter global und pro Pokémon fest (traditionell)",
-  "expert_description": "Manuelle Eingabeabfragen für größtmögliche Anpassungsfähigkeit",
-  "icon_size": "Icon Größe",
+  "basic_description": "Einfache Auswahl von Pokémon und Anwendung eines globalen Filters",
+  "intermediate_description": "Individuelle Filter global und pro Pokémon setzen (traditionell)",
+  "expert_description": "Manuelle Eingabeabfragen für die meisten Anpassungsmöglichkeiten",
+  "icon_size": "Symbolgröße",
   "developer": "Entwickler",
-  "raid_override": "Raid Override",
-  "search_rocket_pokemon": "Crypto Pokémon suchen",
+  "raid_override": "Raid-Override",
+  "search_rocket_pokemon": "Rocket-Pokémon suchen",
   "main": "Haupt",
   "extra": "Extra",
   "select": "Auswählen",
   "searching": "suche...",
-  "no_options": "Keine Treffer...",
-  "global_search_invasions": "Gib den Grunt-Typ, den Namen oder den Namen der belohnenden Pokémon ein..."
+  "no_options": "Keine Optionen...",
+  "and": "UND",
+  "or": "ODER",
+  "only_global": "Nur global",
+  "global_caption": "Ignoriert alle anderen Filter",
+  "global_and_individual": "Globale & individuelle Filter",
+  "gender_filters_all": "Geschlecht gilt für alle",
+  "and_caption": "Verbunden",
+  "or_caption": "Filtert unabhängig",
+  "filter_help": "Filterhilfe",
+  "kilometers": "Kilometer",
+  "miles": "Meilen",
+  "distance_unit": "Entfernungseinheit",
+  "data_management": "Datenverwaltung",
+  "reset_or_manage_text": "Sie können Ihre Filter entweder zurücksetzen oder die Datenverwaltungsseite aufrufen, um einzelne Kategorien zurückzusetzen.",
+  "reset_audio": "Audio zurücksetzen",
+  "reset_all": "Alles zurücksetzen",
+  "reset_icons": "Symbole zurücksetzen",
+  "reset_position": "Position zurücksetzen",
+  "reset_ui": "Benutzeroberfläche zurücksetzen",
+  "reset_options": "Optionen zurücksetzen",
+  "reset_menus": "Menüs zurücksetzen",
+  "reset_settings": "Einstellungen zurücksetzen",
+  "reset_general_title": "Allgemein",
+  "reset_filters_title": "Filter",
+  "reset_assets": "Ressourcen zurücksetzen",
+  "reset_pokemon": "Pokémon zurücksetzen",
+  "reset_pokestops": "PokéStops zurücksetzen",
+  "reset_gyms": "Arenen zurücksetzen",
+  "reset_nests": "Nester zurücksetzen",
+  "reset_portals": "Portale zurücksetzen",
+  "reset_routes": "Routen zurücksetzen",
+  "reset_scan_areas": "Scanbereiche zurücksetzen",
+  "reset_scan_cells": "Scan-Zellen zurücksetzen",
+  "reset_devices": "Geräte zurücksetzen",
+  "reset_weather": "Wetter zurücksetzen",
+  "reset_s2cells": "S2-Zellen zurücksetzen",
+  "reset_spawnpoints": "Spawnpunkte zurücksetzen",
+  "reset_submission_cells": "Einreichungszellen zurücksetzen",
+  "hisuian": "Hisui-Art",
+  "spacial_rend_range": "Raum-Zeit-Riss-Bereich"
 }
diff --git a/packages/locales/lib/generated/es.json b/packages/locales/lib/generated/es.json
index 4c9da60a9..b4fb0c350 100644
--- a/packages/locales/lib/generated/es.json
+++ b/packages/locales/lib/generated/es.json
@@ -1,384 +1,399 @@
 {
   "login": "Iniciar sesión",
-  "click_once": "Haz clic en 'Autorizar' solo una vez",
+  "click_once": "Solo haz clic en 'Autorizar' una vez",
   "save": "Guardar",
   "reset": "Restablecer",
   "close": "Cerrar",
-  "reset_filters": "Restablecer filtros",
-  "pokemon_filters": "Configuración de filtro de Pokémon",
-  "gyms_filters": "Configuración de filtro de gimnasios",
-  "pokestops_filters": "Configuración de filtro de Poképaradas",
-  "nests_filters": "Configuración de filtro de nidos",
+  "reset_filters": "Restablecer Filtros",
+  "pokemon_filters": "Configuración de Filtros de Pokémon",
+  "gyms_filters": "Configuración de Filtros de Gimnasios",
+  "pokestops_filters": "Configuración de Filtros de PokéParadas",
+  "nests_filters": "Configuración de Filtros de Nidos",
   "help": "Ayuda",
-  "apply_to_all": "Aplicar a todos",
-  "disable_all": "Desactivar todos",
-  "enable_all": "Activar todos",
+  "apply_to_all": "Aplicar a Todos",
+  "disable_all": "Desactivar Todos",
+  "enable_all": "Activar Todos",
   "enabled": "Activado",
-  "legacy": "Legado",
+  "legacy": "Herencia",
   "id": "ID",
   "location": "Ubicación",
   "search_pokemon": "Buscar Pokémon",
-  "search_nests": "Buscar nidos",
-  "search_gyms": "Buscar gimnasios",
-  "search_pokestops": "Buscar Poképaradas",
-  "search_raids": "Buscar incursiones",
-  "search_eggs": "Buscar huevos",
-  "search_quests": "Buscar misiones",
-  "search_lures": "Buscar señuelos",
-  "search_invasions": "Buscar invasiones",
-  "sm": "sm",
+  "search_nests": "Buscar Nidos",
+  "search_gyms": "Buscar Gimnasios",
+  "search_pokestops": "Buscar PokéParadas",
+  "search_raids": "Buscar Incursiones",
+  "search_eggs": "Buscar Huevos",
+  "search_quests": "Buscar Misiones",
+  "search_lures": "Buscar Cebos",
+  "search_invasions": "Buscar Invasiones",
+  "sm": "pe",
   "md": "md",
-  "lg": "lg",
+  "lg": "gr",
   "xl": "XL",
-  "min": "Mínimo",
-  "max": "Máximo",
-  "set_size": "Establecer tamaño de icono",
-  "slot_selection": "Selección de ranura",
+  "min": "Mín",
+  "max": "Máx",
+  "set_size": "Establecer Tamaño de Icono",
+  "slot_selection": "Selección de Espacio",
   "generations": "Generaciones",
   "types": "Tipos",
   "forms": "Formas",
-  "rarity": "Rareza actual",
+  "rarity": "Rareza Actual",
   "others": "Otros",
   "categories": "Categorías",
   "rank": "Rango",
   "slider_iv": "Rango de IV",
   "slider_great": "Liga Super",
   "slider_ultra": "Liga Ultra",
-  "slider_little": "Copa Chica",
+  "slider_little": "Copa Pequeña",
   "slider_atk_iv": "Ataque",
   "slider_def_iv": "Defensa",
-  "slider_sta_iv": "Salud",
+  "slider_sta_iv": "Resistencia",
   "slider_level": "Nivel",
   "slider_size": "Tamaño",
-  "abbreviation_level": "L",
+  "abbreviation_level": "N",
   "lvl": "Nvl",
-  "cap": "Cap",
+  "cap": "Límite",
   "custom": "Personalizado",
   "valid": "Válido",
   "invalid": "¡Inválido!",
-  "overwrites": "Sobrescribe todos los filtros",
-  "valid_filter": "Filtro de estadísticas válido",
-  "invalid_filter": "Ingresa un filtro válido",
+  "overwrites": "Sobrescribe Todos los Filtros",
+  "valid_filter": "Filtro de Estadísticas Válido",
+  "invalid_filter": "Introduce un Filtro Válido",
   "gyms": "Gimnasios",
   "nests": "Nidos",
-  "pokestops": "Poképaradas",
+  "pokestops": "PokéParadas",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
-  "scan_areas": "Áreas escaneadas",
+  "scan_areas": "Áreas de Escaneo",
   "s2cells": "Celdas S2",
   "weather": "Clima",
-  "admin": "Administrador",
+  "admin": "Admin",
   "settings": "Configuración",
   "advanced": "Avanzado",
-  "tile_servers": "Servidores de mosaicos de mapa",
+  "tile_servers": "Servidores de Mapa",
   "icons": "Iconos",
   "navigation": "Navegación",
-  "drawer": "Cajón",
+  "drawer": "Menú",
   "tile_servers_default": "Predeterminado",
   "drawer_temporary": "Temporal",
   "drawer_persistent": "Persistente",
-  "locale_selection": "Selección de idioma",
+  "locale_selection": "Selección de Idioma",
   "import": "Importar",
   "export": "Exportar",
   "logout": "Cerrar sesión",
-  "local_storage_cleared": "¡El almacenamiento local ha sido borrado!",
-  "iv_or_filter": "Filtro OR de IV",
+  "local_storage_cleared": "¡Almacenamiento local ha sido borrado!",
+  "iv_or_filter": "Filtro de IV O",
   "polygons": "Polígonos",
   "raids": "Incursiones",
   "ex_eligible": "Elegible para EX",
-  "in_battle": "En combate",
-  "all_pokestops": "Todas las Poképaradas",
-  "lures": "Módulos Cebo",
+  "in_battle": "En Batalla",
+  "all_pokestops": "Todas las PokéParadas",
+  "lures": "Cebos",
   "quests": "Misiones",
   "invasions": "Invasiones",
   "portals": "Portales",
-  "submission_cells": "Celdas de solicitud",
-  "spawnpoint": "Punto de aparición",
-  "spawnpoints": "Puntos de aparición",
-  "s2_cell_level": "Celda S2 de Nivel {{level}} ",
-  "total_count": "Total",
-  "next_submission": "¡Siguiente solicitud!",
+  "submission_cells": "Celdas de Solicitud",
+  "spawnpoint": "Punto de Aparición",
+  "spawnpoints": "Puntos de Aparición",
+  "s2_cell_level": "Celda S2 de Nivel {{level}}",
+  "total_count": "Cuenta Total",
+  "next_submission": "¡Próxima Solicitud!",
   "never": "Nunca",
-  "next_gym": "Siguiente Gimnasio",
-  "scan_cells": "Escaneo de celdas",
+  "next_gym": "Próximo Gimnasio",
+  "scan_cells": "Escanear Celdas",
   "devices": "Dispositivos",
-  "use_my_location": "Usar mi ubicación",
-  "submit_feedback_title": "Enviar comentarios/Informar de errores",
-  "use_the_link_below": "Puedes usar el enlace de abajo para enviar comentarios o informar cualquier error que hayas encontrado.",
-  "feedback_to_devs": "Estos comentarios se envían directamente a los desarrolladores.",
-  "feedback_form": "Formulario de comentarios",
-  "unknown_pokestop": "Nombre de Poképarada desconocido",
-  "unknown_gym": "Nombre de Gimnasio desconocido",
+  "use_my_location": "Usar Mi Ubicación",
+  "submit_feedback_title": "Enviar Opinión/Reporte de Error",
+  "use_the_link_below": "Puedes usar el enlace de abajo para enviar comentarios o cualquier error que hayas encontrado.",
+  "feedback_to_devs": "Este comentario se envía directamente a los desarrolladores.",
+  "feedback_form": "Formulario de Comentarios",
+  "unknown_pokestop": "Nombre de PokéParada Desconocido",
+  "unknown_gym": "Nombre de Gimnasio Desconocido",
   "exclude": "Excluir",
   "exclude_quest": "Excluir Misión",
   "exclude_invasion": "Excluir Invasión",
   "exclude_team": "Excluir Equipo",
   "exclude_raid": "Excluir Incursión",
-  "exclude_lure": "Excluir Módulos Cebo",
+  "exclude_lure": "Excluir Cebo",
   "timer": "Temporizador",
   "hide": "Ocultar",
   "tier": "Nivel",
-  "slots": "Espacios",
+  "slots": "Huecos",
   "mega": "Mega",
   "form": "Forma",
   "starts": "Comienza",
-  "ends": "Termina",
+  "ends": "Finaliza",
   "defender": "Defensor",
   "cp": "PC",
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "PC Total",
-  "first_seen": "Visto por primera vez",
-  "last_seen": "Visto por última vez",
-  "last_modified": "Última modificación",
-  "last_updated": "Última actualización",
+  "first_seen": "Visto Por Primera Vez",
+  "last_seen": "Visto Por Última Vez",
+  "last_modified": "Última Modificación",
+  "last_updated": "Última Actualización",
   "imported": "Importado",
-  "nest_estimated": "¡Los datos del Nido son estimados!",
-  "verify_nests": "Verificar comprobando las apariciones actuales",
-  "nest_out_of_date": "¡El Nido puede estar desactualizado!",
-  "nest_check_current": "Comprueba las apariciones actuales en su lugar",
-  "spawns_per_hour": "Por hora",
+  "nest_estimated": "¡Datos de Nido Estimados!",
+  "verify_nests": "Verificar Observando las Apariciones Actuales",
+  "nest_out_of_date": "¡Nido Potencialmente Desactualizado!",
+  "nest_check_current": "Comprobar Apariciones Actuales en Su Lugar",
+  "spawns_per_hour": "Por Hora",
   "teams": "Equipos",
   "eggs": "Huevos",
   "reverse": "Invertir",
   "selected": "Seleccionado",
-  "unselected": "No seleccionado",
+  "unselected": "No Seleccionado",
   "only_available": "Disponible",
   "common": "Común",
-  "uncommon": "Poco común",
+  "uncommon": "Poco Común",
   "rare": "Raro",
-  "ultra_rare": "Ultra raro",
+  "ultra_rare": "Ultra Raro",
   "regional": "Regional",
   "event": "Evento",
   "legendary": "Legendario",
   "mythical": "Mítico",
-  "ultra_beast": "Ultraente",
-  "alt_forms": "Formas alternativas",
+  "ultra_beast": "Ultra Ente",
+  "alt_forms": "Formas Alternativas",
   "alola": "Alola",
   "galarian": "Galar",
   "showing": "Mostrando",
   "instance": "Instancia",
-  "online": "En línea",
-  "offline": "Fuera de línea",
-  "boosted_types": "Tipos mejorados",
+  "online": "En Línea",
+  "offline": "Fuera de Línea",
+  "boosted_types": "Tipos Potenciados",
   "pokemon_options": "Opciones de Pokémon",
-  "pokestops_options": "Opciones de Poképarada",
-  "gyms_options": "Opciones de Gimnasio",
-  "nests_options": "Opciones de Nido",
+  "pokestops_options": "Opciones de PokéParadas",
+  "gyms_options": "Opciones de Gimnasios",
+  "nests_options": "Opciones de Nidos",
   "wayfarer_options": "Opciones de Wayfarer",
   "admin_options": "Opciones de Administrador",
   "weather_options": "Opciones de Clima",
-  "s2cells_options": "Opciones de Celda S2",
-  "clustering": "Agrupación",
+  "s2cells_options": "Opciones de Celdas S2",
+  "clustering": "Agrupamiento",
   "glow": "Brillo",
-  "legacy_filter": "Filtro legado",
-  "raid_timers": "Todos los temporizadores de Incursiones",
-  "invasion_timers": "Todos los temporizadores de Invasiones",
-  "lure_timers": "Todos los temporizadores de Módulos Cebo",
-  "device_path_color": "Color de ruta del dispositivo",
-  "old_portals": "Portales antiguos",
-  "new_portals": "Portales nuevos",
+  "legacy_filter": "Filtro Antiguo",
+  "raid_timers": "Todos los Temporizadores de Incursión",
+  "invasion_timers": "Todos los Temporizadores de Invasión",
+  "lure_timers": "Todos los Temporizadores de Cebo",
+  "device_path_color": "Color del Camino del Dispositivo",
+  "old_portals": "Portales Antiguos",
+  "new_portals": "Portales Nuevos",
   "items": "Objetos",
   "energy": "Energía",
-  "ar_eligible": "Elegible para AR",
+  "ar_eligible": "Elegible para RA",
   "iv_circles": "Indicadores de IV",
-  "min_iv_circle": "IV mínimo del círculo",
-  "interaction_ranges": "Rangos de interacción",
-  "cannot_connect": "\nNo se puede conectar al servidor en este momento.\nIntentarlo de nuevo inmediatamente solo causará más problemas.\nPor favor, inténtalo de nuevo en unos minutos.\n\n- Grupo de administradores",
-  "mad_quest_text": "Misiones nativas",
+  "min_iv_circle": "Círculo IV Mínimo",
+  "interaction_ranges": "Rangos de Interacción",
+  "cannot_connect": "\nNo se puede conectar al servidor en este momento.\nIntentarlo de nuevo inmediatamente solo causará más problemas.\nPor favor, inténtalo de nuevo en unos minutos.\n\n- Equipo de Administración del Mapa",
+  "mad_quest_text": "Misiones Nativas",
   "xs": "XS",
-  "primary": "Principal",
+  "primary": "Primario",
   "secondary": "Secundario",
   "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
-  "open_menu": "Abrir menú",
+  "open_menu": "Abrir Menú",
   "zoom_in": "Acercar",
   "zoom_out": "Alejar",
   "welcome": "Bienvenido a",
   "back": "Atrás",
   "next": "Siguiente",
   "finish": "Finalizar",
-  "start_tutorial": "Iniciar tutorial",
-  "view_profile": "Ver perfil",
-  "login_optional": "Iniciar sesión (opcional)",
+  "start_tutorial": "Comenzar Tutorial",
+  "view_profile": "Ver Perfil",
+  "login_optional": "Iniciar Sesión (Opcional)",
   "tutorial": "Tutorial",
-  "tutorial_language": "Elige tu idioma",
-  "tutorial_welcome": "Este tutorial es interactivo y se te anima a jugar con todas las opciones proporcionadas",
-  "tutorial_categories": "Categorías a las que tienes acceso",
-  "tutorial_logged_in": "Puedes ver detalles sobre tus permisos al ver tu perfil.",
-  "tutorial_logged_out": "Puedes ver detalles sobre tus permisos al iniciar sesión.",
-  "tutorial_sidebar_0": "Todos tus filtros y configuraciones están aquí",
-  "tutorial_sidebar_1": "Para cada categoría podrás activar o desactivar exactamente qué datos deseas usando los interruptores",
+  "tutorial_language": "Elige Tu Idioma",
+  "tutorial_welcome": "Este tutorial es interactivo y se te anima encarecidamente a jugar con todas las opciones proporcionadas",
+  "tutorial_categories": "Categorías a las que Tienes Acceso",
+  "tutorial_logged_in": "Puedes ver detalles sobre tus permisos viendo tu perfil.",
+  "tutorial_logged_out": "Puedes ver detalles sobre tus permisos iniciando sesión.",
+  "tutorial_sidebar_0": "Todos tus Filtros y Configuraciones Viven Aquí",
+  "tutorial_sidebar_1": "Para cada categoría podrás activar o desactivar exactamente los datos que desees usando los interruptores",
   "tutorial_sidebar_2": "Opciones: Personalización adicional\nAvanzado: Lo cubriremos más adelante en este tutorial",
-  "tutorial_sliders_0": "Usando deslizadores para ajustar los filtros",
-  "tutorial_sliders_1": "Pokémon entre:",
-  "tutorial_sliders_2": "- IVs {{iv0}}% a {{iv1}}%",
+  "tutorial_sliders_0": "Usando deslizadores para ajustar filtros",
+  "tutorial_sliders_1": "Pokémon Entre:",
+  "tutorial_sliders_2": "- IVs del {{iv0}}% al {{iv1}}%",
   "tutorial_sliders_3": "Nivel {{level0}} a {{level1}}",
-  "tutorial_sliders_3alt": "- Y es nivel {{level0}} a {{level1}}",
-  "tutorial_sliders_4": "- Rango de Gran Liga {{gl0}} a {{gl1}}",
-  "tutorial_sliders_4alt": "- O rango de Gran Liga {{gl0}} a {{gl1}}",
-  "tutorial_sliders_5": "- Rango de Ultra Liga {{ul0}} a {{ul1}}",
-  "tutorial_sliders_5alt": "- O rango de Ultra Liga {{ul0}} a {{ul1}}",
-  "tutorial_sliders_6": "Cadenas con otros del mismo color",
+  "tutorial_sliders_3alt": "- Y es Nivel {{level0}} a {{level1}}",
+  "tutorial_sliders_4": "- Rango en Liga Súper {{gl0}} a {{gl1}}",
+  "tutorial_sliders_4alt": "- O Rango en Liga Súper {{gl0}} a {{gl1}}",
+  "tutorial_sliders_5": "- Rango en Liga Ultra {{ul0}} a {{ul1}}",
+  "tutorial_sliders_5alt": "- O Rango en Liga Ultra {{ul0}} a {{ul1}}",
+  "tutorial_sliders_6": "Se encadena con otros del mismo color",
   "tutorial_sliders_7": "Filtros separados de otros deslizadores",
   "tutorial_sliders_8": "Un deslizador 'completo' significa que está desactivado:",
-  "tutorial_sliders_9": "Todos los encuentros, independientemente de si se ha comprobado el IV o no",
+  "tutorial_sliders_9": "Todos los avistamientos, sin importar si se ha comprobado el IV o no",
   "tutorial_help": "Acceso directo a este menú",
-  "tutorial_adv_filter": "Solo para dispositivos móviles, abre las opciones de filtrado para el menú avanzado",
-  "tutorial_tune": "Establece el filtro avanzado para todos los Pokémon que se están filtrando actualmente en el menú",
-  "tutorial_format_size": "Establece el tamaño del icono para todos los elementos que se están filtrando actualmente en el menú",
-  "tutorial_check": "Habilita todos los elementos que se están filtrando actualmente en el menú",
-  "tutorial_clear": "Deshabilita todos los elementos que se están filtrando actualmente en el menú",
+  "tutorial_adv_filter": "Solo para móviles, abre las opciones de filtrado para el menú avanzado",
+  "tutorial_tune": "Ajusta el filtro avanzado para todos los Pokémon que actualmente se están filtrando en el menú",
+  "tutorial_format_size": "Establece el tamaño de icono para todos los ítems que actualmente se están filtrando en el menú",
+  "tutorial_check": "Habilita todos los ítems que actualmente se están filtrando en el menú",
+  "tutorial_clear": "Deshabilita todos los ítems que actualmente se están filtrando en el menú",
   "tutorial_save": "Guarda la selección actual y sale",
   "tutorial_show_all_view": "Alternar PokéParadas y Gimnasios",
   "tutorial_show_pokemon_view": "Alternar Pokémon",
-  "tutorial_toggle": "Hacer clic en el botón de verificación/X alterna el elemento",
+  "tutorial_toggle": "Hacer clic en el Cheque/X alterna el ítem",
   "tutorial_pokemon_caption": "Este icono te permite establecer filtros para ese Pokémon específico",
-  "tutorial_all_caption": "Los equipos tienen un menú especial de ranuras\nTodos los demás elementos te permiten ajustar el tamaño del icono",
+  "tutorial_all_caption": "Los equipos tienen un menú de slots especial\nTodos los demás ítems te permiten ajustar el tamaño del icono",
   "tutorial_popup_0": "¡Las ventanas emergentes ahora son interactivas!",
-  "tutorial_popup_1": "Los tres puntos abren las opciones de ocultar, excluir y alternar temporizador",
-  "tutorial_popup_2": "Los iconos a ambos lados del enlace de navegación se expandirán para mostrar información adicional, ¡pruébalo!",
-  "tutorial_popup_3": "Los iconos varían para cada categoría, asegúrate de revisarlos todos",
+  "tutorial_popup_1": "Los tres puntos abren las opciones de ocultar, excluir y alternar el temporizador",
+  "tutorial_popup_2": "Los íconos a cada lado del enlace de navegación se expandirán para mostrar información extra, ¡pruébalo!",
+  "tutorial_popup_3": "Los íconos varían para cada categoría, asegúrate de revisarlos todos",
   "tutorial_closing_0": "Información adicional",
-  "tutorial_closing_1": "Los deslizadores globales de Pokémon en la barra lateral funcionan de forma independiente del menú avanzado y no tienen efecto entre sí",
+  "tutorial_closing_1": "Los deslizadores globales de Pokémon en la barra lateral operan de forma independiente del menú avanzado y no tienen efecto entre sí",
   "tutorial_closing_2": "Asegúrate de revisar la sección de Configuración en la barra lateral",
-  "tutorial_closing_3": "Hay muchas opciones estéticas disponibles para cada categoría, pero ten en cuenta que cuanto más agregues a tu mapa, mayor será la probabilidad de que se congele",
-  "tutorial_closing_4": "Puedes ver este tutorial nuevamente seleccionándolo en el panel de Configuración en la barra lateral",
+  "tutorial_closing_3": "Hay muchas opciones estéticas disponibles para cada categoría, pero ten en cuenta que cuanto más agregues a tu mapa, más alta será la probabilidad de que tu mapa se congele",
+  "tutorial_closing_4": "Puedes volver a ver este tutorial seleccionándolo en el panel de Configuración en la barra lateral",
   "tutorial_closing_5": "¡Mantente seguro y buena suerte!",
   "intro": "Introducción",
   "sidebar": "Barra lateral",
   "sliders": "Deslizadores",
   "popups": "Ventanas emergentes",
   "closing": "Cierre",
-  "shortcuts": "Atajos",
+  "shortcuts": "Accesos directos",
   "iv": "IV",
   "area_restrictions": "Restricciones de área",
   "map": "Mapa",
   "stats": "Estadísticas",
   "pvp": "PVP",
   "area_restrictions_subtitle": "Tienes acceso a estas áreas",
-  "devices_subtitle": "Muestra ubicaciones y rutas activas del dispositivo",
-  "gyms_subtitle": "Muestra todas las ubicaciones de gimnasios activos, equipo activo y cuantos espacios tiene cada gimnasio disponible",
-  "invasions_subtitle": "Muestra información de invasión del Team Rocket, incluyendo equipo de combate, el tiempo de expiración y las posibles recompensas",
-  "iv_subtitle": "Muestra opciones de IV% y brillo",
-  "lures_subtitle": "Muestra información de módulo cebo, incluyendo el tipo y el tiempo de expiración",
+  "devices_subtitle": "Muestra las ubicaciones activas de dispositivos y rutas",
+  "gyms_subtitle": "Muestra todas las ubicaciones de gimnasios activos, el equipo activo y cuántos espacios tiene cada gimnasio disponible",
+  "invasions_subtitle": "Muestra la información de invasiones del Equipo Rocket, incluyendo la alineación de batalla, el tiempo de expiración y recompensas posibles",
+  "iv_subtitle": "Muestra los IV% y las opciones de brillo",
+  "lures_subtitle": "Muestra la información de señuelos, incluyendo el tipo de señuelo y el tiempo de expiración",
   "map_subtitle": "Muestra el mapa",
-  "nests_subtitle": "Muestra Pokémon en nidos y polígonos de nidos activos",
+  "nests_subtitle": "Muestra los Pokémon que están anidando activamente y los polígonos de nidos",
   "pokemon_subtitle": "Muestra todas las ubicaciones de Pokémon y los tiempos de expiración",
-  "pokestops_subtitle": "Muestra todas las ubicaciones de Poképaradas",
-  "portals_subtitle": "Muestra todas las ubicaciones de portales de Ingress",
-  "pvp_subtitle": "Muestra información de rango/PC/nivel de PVP para cada Pokémon",
-  "quests_subtitle": "Muestra recompensas de misiones e información de tareas",
-  "raids_subtitle": "Muestra toda la información de incursiones, incluyendo el jefe de incursión, los huevos, el tiempo de expiración y los movimientos",
+  "pokestops_subtitle": "Muestra todas las ubicaciones de PokéParadas",
+  "portals_subtitle": "Muestra todos los portales de Ingress",
+  "pvp_subtitle": "Muestra la información de rango/CP/nivel PVP para cada Pokémon",
+  "quests_subtitle": "Muestra la información de recompensas y tareas de misiones",
+  "raids_subtitle": "Muestra toda la información de incursiones incluyendo el jefe de incursión, huevos, tiempo de expiración y movimientos",
   "scan_cells_subtitle": "Muestra la última vez que una celda S2 fue escaneada por un dispositivo",
-  "scan_areas_subtitle": "Muestra polígonos de áreas de escaneo disponibles",
-  "spawnpoints_subtitle": "Muestra puntos de aparición y su tiempo estimado de desaparición",
-  "stats_subtitle": "Muestra estadísticas y niveles de Pokémon",
-  "submission_cells_subtitle": "Muestra información útil para solicitar nuevos puntos de interés",
-  "weather_subtitle": "Muestra información del clima en el juego para cada celda",
-  "scanner_subtitle": "Interactúa directamente con el escáner de varias formas",
-  "s2cells_subtitle": "Muestra diferentes niveles de celdas S2 en el mapa",
-  "backups_subtitle": "Permite hacer copias de seguridad y cargar configuraciones en diferentes dispositivos",
-  "backups": "Copias de seguridad",
-  "user_profile": "Perfil de usuario",
-  "user_username": "Nombre de usuario",
-  "candy": "Caramelos",
-  "show_ex_badge": "Mostrar insignia EX",
+  "scan_areas_subtitle": "Muestra los polígonos de áreas de escaneo disponibles",
+  "spawnpoints_subtitle": "Muestra los puntos de aparición y su tiempo estimado de desaparición",
+  "stats_subtitle": "Muestra las estadísticas y niveles de los Pokémon",
+  "submission_cells_subtitle": "Muestra información útil para enviar nuevos PDI",
+  "weather_subtitle": "Muestra la información del clima en el juego para cada celda",
+  "scanner_subtitle": "Interactúa directamente con el escáner de varias maneras",
+  "s2cells_subtitle": "Muestra las Celdas S2 en una variedad de niveles en el mapa",
+  "backups_subtitle": "Permite respaldar y cargar configuraciones a través de dispositivos",
+  "backups": "Respaldos",
+  "user_profile": "Perfil de Usuario",
+  "user_username": "Nombre de Usuario",
+  "candy": "Caramelo",
+  "show_ex_badge": "Mostrar Insignia EX",
   "search": "Buscar",
-  "global_search_quests": "Introducir nombre de recompensa...",
-  "global_search_lures": "Introducir nombre de módulo cebo...",
-  "global_search_pokestops": "Introducir nombre de Poképarada...",
-  "global_search_gyms": "Introducir nombre de gimnasio...",
-  "global_search_portals": "Introducir nombre de portal...",
-  "global_search_nests": "Introducir nombre de Pokémon de nido...",
-  "global_search_raids": "Introducir nombre de jefe de incursión...",
-  "global_search_pokemon": "Introducir nombre de Pokémon...",
-  "raid_level_badges": "Insignias de nivel de incursión",
+  "global_search_quests": "Ingresa el Nombre de la Recompensa...",
+  "global_search_lures": "Ingresa el Nombre del Cebo...",
+  "global_search_pokestops": "Ingresa el Nombre de la PokéParada...",
+  "global_search_gyms": "Ingresa el Nombre del Gimnasio...",
+  "global_search_portals": "Ingresa el Nombre del Portal...",
+  "global_search_nests": "Ingresa el Nombre del Pokémon del Nido...",
+  "global_search_raids": "Ingresa el Nombre del Jefe de Incursión...",
+  "global_search_pokemon": "Ingresa el Nombre del Pokémon...",
+  "global_search_invasions": "Ingresa el Tipo de Recluta, Nombre, o nombre de recompensa de Pokémon...",
+  "raid_level_badges": "Insignias de Nivel de Incursión",
   "options": "Opciones",
   "profile": "Perfil",
   "pokemon_icons": "Iconos de Pokémon",
-  "pokestop_icons": "Iconos de Poképaradas",
-  "gym_icons": "Iconos de gimnasio",
-  "team_icons": "Iconos de equipo",
-  "egg_icons": "Iconos de huevo",
-  "raid_icons": "Iconos de incursión",
-  "nest_icons": "Iconos de nido",
-  "reward_icons": "Iconos de recompensa",
-  "type_icons": "Iconos de tipo",
-  "weather_icons": "Iconos de clima",
-  "misc_icons": "Iconos varios",
-  "invasion_icons": "Iconos de invasión",
+  "pokestop_icons": "Iconos de PokéParadas",
+  "gym_icons": "Iconos de Gimnasios",
+  "team_icons": "Iconos de Equipos",
+  "egg_icons": "Iconos de Huevos",
+  "raid_icons": "Iconos de Incursiones",
+  "nest_icons": "Iconos de Nidos",
+  "reward_icons": "Iconos de Recompensas",
+  "type_icons": "Iconos de Tipos",
+  "weather_icons": "Iconos del Clima",
+  "misc_icons": "Iconos Varios",
+  "invasion_icons": "Iconos de Invasiones",
   "spawnpoint_icons": "Iconos de Puntos de Aparición",
   "device_icons": "Iconos de Dispositivos",
-  "pokemon_timers": "Todos los Temporizadores de Pokémon",
-  "show_dex_num_in_popup": "Mostrar N.º de Pokédex en el Popup",
-  "popup": "Ventana emergente",
-  "pvp_level": "Estadísticas de PVP Nivel {{level}}",
-  "pvp_mega": "Estadísticas de PVP Mega",
-  "webhook_entry": "Agregar a {{name}}",
-  "remove_webhook_entry": "Eliminar de {{name}}",
+  "pokemon_audio": "Audio de Pokémon",
+  "pokestop_audio": "Audio de PokéParada",
+  "gym_audio": "Audio de Gimnasio",
+  "team_audio": "Audio de Equipo",
+  "egg_audio": "Audio de Huevo",
+  "raid_audio": "Audio de Incursión",
+  "nest_audio": "Audio de Nido",
+  "reward_audio": "Audio de Recompensa",
+  "type_audio": "Audio de Tipo",
+  "weather_audio": "Audio del Clima",
+  "misc_audio": "Audio Varios",
+  "invasion_audio": "Audio de Invasión",
+  "spawnpoint_audio": "Audio de Punto de Aparición",
+  "device_audio": "Audio de Dispositivo",
+  "pokemon_timers": "Temporizadores de Todos los Pokémon",
+  "show_dex_num_in_popup": "Mostrar # de Pokedex en Pop-up",
+  "popup": "Pop-up",
+  "pvp_level": "Estadísticas PVP de Nivel {{level}}",
+  "pvp_mega": "Estadísticas PVP de Mega",
+  "webhook_entry": "Añadir a {{name}}",
+  "remove_webhook_entry": "Quitar de {{name}}",
   "distance": "Distancia",
   "gym": "Gimnasio",
   "egg": "Huevo",
   "raid": "Incursión",
-  "lure": "Módulo Cebo",
+  "lure": "Cebo",
   "quest": "Misión",
   "invasion": "Invasión",
   "nest": "Nido",
   "pokestop": "Poképarada",
   "team": "Equipo",
   "global": "Global",
-  "manage_webhook": "Administrar {{name}}",
-  "drag_and_drop": "Arrastra y suelta el marcador para establecer tu ubicación",
-  "click_to_select": "Haz clic para seleccionar",
-  "add_new": "Agregar nueva alerta de {{category}}",
-  "my_location": "Mi ubicación",
-  "choose_on_map": "Seleccionar en el mapa",
-  "select_profile": "Seleccionar perfil",
-  "distance_radius": "Vista previa de distancias de radio",
+  "manage_webhook": "Gestionar {{name}}",
+  "drag_and_drop": "Arrastra y Suelta el Marcador para Establecer Tu Ubicación",
+  "click_to_select": "Haz Clic para Seleccionar",
+  "add_new": "Agregar Nueva Alerta de {{category}}",
+  "my_location": "Mi Ubicación",
+  "choose_on_map": "Elegir en el Mapa",
+  "select_profile": "Seleccionar Perfil",
+  "distance_radius": "Vista Previa de Distancias de Radio",
   "areas": "Áreas",
   "select_webhook": "Seleccionar Bot",
-  "ar_quest_true": "Con RA",
-  "ar_quest_false": "Sin RA",
-  "with_ar": "Con RA",
+  "ar_quest_true": "Tarea AR",
+  "ar_quest_false": "Sin AR",
+  "with_ar": "Con AR",
   "both": "Ambos",
-  "without_ar": "Sin RA",
+  "without_ar": "Sin AR",
   "exclude_quest_multi": "Excluir {{reward}}",
   "cluster_limit_0": "Se ha alcanzado el límite de {{variable_0}} ({{variable_1}})",
-  "cluster_limit_1": "Por favor, acerca el zoom o modifica tus filtros",
+  "cluster_limit_1": "Por favor, acerca el zoom o ajusta tus filtros",
   "show_polygons": "Mostrar Polígonos",
   "exclude_invasion_multi": "Excluir {{invasion}}",
-  "stardust": "Polvoestelar",
+  "stardust": "Polvoestelares",
   "slider_cp": "PC",
   "pvp_ranking_league": "Liga",
-  "pvp_ranking_min_cp": "PC Mín.",
+  "pvp_ranking_min_cp": "PC Mín",
   "slider_pvp": "Rangos",
   "profile_no": "Perfil",
   "template": "Plantilla",
   "gender": "Género",
   "clean": "Limpiar",
   "all_forms": "Todas las Formas",
-  "pvp_entry": "Aviso PVP",
-  "no_iv": "Incl. Sin IV",
+  "pvp_entry": "Entrada PVP",
+  "no_iv": "Incl. Sin IVs",
   "by_distance": "Por Distancia",
-  "min_time": "Tiempo Mín.",
-  "add_new_profile": "Crear nuevo perfil",
+  "min_time": "Tiempo Mínimo",
+  "add_new_profile": "Agregar Nuevo Perfil",
   "slider_none": "Ninguno",
   "non_registered_human_title": "¡Ups, algo no está bien!",
-  "non_registered_human_desc": "Es posible que no estés registrado en {{webhook}}\nO el servidor no está disponible en este momento",
-  "try_again_later": "Por favor, inténtalo de nuevo más tarde",
-  "selected_areas": "{{amount}} Área Seleccionada",
-  "selected_areas_plural": "{{amount}} Áreas Seleccionadas",
+  "non_registered_human_desc": "Puede que no estés registrado con {{webhook}}\nO el servidor está actualmente inalcanzable",
+  "try_again_later": "Por favor, intenta nuevamente más tarde",
+  "selected_areas_one": "{{count}} Área Seleccionada",
+  "selected_areas_other": "{{count}} Áreas Seleccionadas",
   "webhook_selection": "Selección de {{name}}",
   "message_of_the_day": "Mensaje del Día",
   "has_quest_indicator": "Color Alternativo para Paradas con Misiones",
-  "show_ar_badge": "Mostrar Insignia de RA",
+  "show_ar_badge": "Mostrar Insignia AR",
   "all_gyms": "Todos los Gimnasios",
   "general": "General",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Vincular Global y Avanzado",
+  "link_global_and_advanced": "Global Respeta Seleccionado",
   "normal_forms": "Formas Normales",
-  "weather_indicator": "Indicador de Mejora por Clima",
+  "weather_indicator": "Indicador de Impulso del Clima",
   "page": "Página {{page}}",
   "navigation_controls": "Controles de Navegación",
   "navigation_controls_react": "React",
@@ -387,9 +402,9 @@
   "all_moves": "Todos los Movimientos",
   "move": "Movimiento",
   "any": "Cualquier",
-  "min_spawn_average": "Ratio Mínimo de Aparición",
+  "min_spawn_average": "Tasa de Aparición Mín",
   "select_all": "Seleccionar Todo",
-  "delete_all": "Eliminar Seleccionados",
+  "delete_all": "Eliminar Seleccionado",
   "cancel": "Cancelar",
   "day_1": "Lunes",
   "day_2": "Martes",
@@ -398,26 +413,26 @@
   "day_5": "Viernes",
   "day_6": "Sábado",
   "day_7": "Domingo",
-  "profile_name": "Nombre de Perfil",
-  "manage_profiles": "Administrar Perfiles",
-  "min_spawn_avg": "Ratio Mínimo de Aparición",
-  "poke_global": "Todos",
+  "profile_name": "Nombre del Perfil",
+  "manage_profiles": "Gestionar Perfiles",
+  "min_spawn_avg": "Promedio Mín de Aparición",
+  "poke_global": "Todo",
   "amount": "Cantidad",
   "specific_gym": "Gimnasio Específico",
   "search_location": "Buscar Ubicaciones",
   "search_specific": "Buscar un {{category}} Específico",
-  "webhook_success_gym": "¡Se han agregado Alertas de Incursiones, Huevos y Cambio de Equipo!",
+  "webhook_success_gym": "¡Las alertas de Incursiones, Huevos y Cambios de Equipo han sido agregadas!",
   "slot_changes": "Cambios de Espacio",
   "slot_changes_poracle": "cambios_de_espacio",
   "confirm_delete": "Esto eliminará todo el seguimiento para este perfil, ¿estás seguro?",
-  "confirm_copy": "Elige a qué perfil quieres copiar \"{{profile}}\", esto sobrescribirá completamente ese perfil.",
-  "webhook_error": "{{name}} no pudo procesar eso.\nPor favor, inténtalo de nuevo más tarde.",
+  "confirm_copy": "Elige a cuál perfil te gustaría copiar \"{{profile}}\", esto sobrescribirá completamente dicho perfil.",
+  "webhook_error": "{{name}} no ha podido procesar eso.\nPor favor, intenta nuevamente más tarde.",
   "profile_error": "Debe ser único y válido",
   "team_0": "Armonía",
   "battle_changes": "En Batalla",
-  "battle_changes_poracle": "cambios_de_batalla",
-  "auto": "Automático",
-  "webhooks_subtitle": "Administra tus alertas directamente desde el mapa para estos bots",
+  "battle_changes_poracle": "cambios_en_batalla",
+  "auto": "Auto",
+  "webhooks_subtitle": "Gestiona tus alertas directamente desde el mapa para estos bots",
   "event_stops_subtitle": "Muestra Poképaradas de eventos especiales como Kecleon",
   "webhooks": "Alertas",
   "scanner": "Acciones del Escáner",
@@ -425,50 +440,51 @@
   "individually": "individualmente",
   "join": "Unirse",
   "errors_404": "¡Ups, esta página no se puede encontrar!",
-  "errors_500": "Ha ocurrido un error en el servidor, ¡inténtalo de nuevo más tarde!",
+  "errors_500": "Ha habido un error de servidor, ¡intenta de nuevo más tarde!",
   "local_username": "Nombre de Usuario",
   "local_password": "Contraseña",
-  "local_error": "Ha ocurrido un error, ¡por favor inténtalo de nuevo más tarde!",
-  "no_filter_results": "No se encontraron resultados\nIntenta ampliar tus filtros",
+  "local_error": "Ha habido un error, por favor intenta de nuevo más tarde.",
+  "no_filter_results": "No se han encontrado Resultados\nIntenta Ampliar tus Filtros",
   "donor_page": "Página de Donantes",
   "go_back": "Volver",
-  "access": "Acceder",
-  "link_discord": "Enlazar Discord",
-  "select_webhook_strategy": "Administrador de Alertas",
-  "webhook_strategy_success_0": "¡Éxito! Actualizando para obtener la configuración de alertas...",
-  "register": "Registrarse",
-  "invalid_credentials": "Credenciales inválidas",
+  "access": "Acceso",
+  "link_discord": "Vincular Discord",
+  "select_webhook_strategy": "Gestor de Alertas",
+  "webhook_strategy_success_0": "¡Éxito! Actualizando para obtener configuraciones de alerta...",
+  "register": "Registrar",
+  "invalid_credentials": "Credenciales Inválidas",
+  "localauth_failed": "La autenticación falló",
   "error_creating_user": "No se puede registrar un nuevo usuario en este momento",
-  "discord_linked": "Discord Enlazado",
-  "telegram_linked": "Telegram Enlazado",
+  "discord_linked": "Discord Vinculado",
+  "telegram_linked": "Telegram Vinculado",
   "level": "nivel",
   "km": "km",
-  "feedback": "Comentarios",
-  "donor_menu": "Menú de Donantes",
-  "pokemon_cell": "La ubicación del Pokémon puede variar",
-  "timer_verified": "Este temporizador está verificado",
-  "timer_unverified": "Este temporizador no está verificado",
+  "feedback": "Retroalimentación",
+  "donor_menu": "Menú de Donante",
+  "pokemon_cell": "La Ubicación del Pokémon Podría Variar",
+  "timer_verified": "Este Temporizador está Verificado",
+  "timer_unverified": "Este Temporizador no está Verificado",
   "all": "Todos",
   "badge_0": "Ninguno",
   "badge_1": "Bronce",
   "badge_2": "Plata",
   "badge_3": "Oro",
-  "gym_badge_menu": "Editar Medalla de Gimnasio",
-  "gym_badges": "Medallas de Gimnasio",
-  "gym_badge_diamonds": "Mostrar Medallas de Gimnasio",
-  "gym_badges_subtitle": "Muestra las Medallas de Gimnasio en el mapa y una lista en la página de perfil.",
+  "gym_badge_menu": "Editar Insignia de Gimnasio",
+  "gym_badges": "Insignias de Gimnasio",
+  "gym_badge_diamonds": "Mostrar Insignias de Gimnasio",
+  "gym_badges_subtitle": "Muestra las Insignias de Gimnasio en el mapa y una lista en la página de perfil.",
   "confirm_filters_reset": "Restablecer filtros",
-  "filters_reset_text": "¿Estás seguro de que quieres restablecer los valores predeterminados de configuración? ¡Esto no se puede deshacer!",
+  "filters_reset_text": "¿Estás seguro de que quieres restablecer los ajustes a los valores predeterminados? ¡Esto no se puede deshacer!",
   "filters_reset_title": "Restablecer filtros",
   "raid_quick_select": "Selección Rápida",
-  "disabled": "Desactivado",
+  "disabled": "Deshabilitado",
   "loading": "Cargando {{category}}",
   "loading_icons": "Obteniendo Iconos",
   "loading_invasions": "Obteniendo Invasiones",
-  "scan_next": "Escanear Ubicación ",
-  "scan_next_choose": "Arrastra y suelta el marcador para establecer la ubicación de escaneo",
-  "scan_zone": "Escanear Área",
-  "scan_zone_choose": "Arrastra y suelta el marcador para establecer la ubicación de escaneo y elegir el tamaño",
+  "scan_next": "Escanear Ubicación",
+  "scan_next_choose": "Arrastra y Suelta el Marcador para Establecer la Ubicación del Escaneo",
+  "scan_zone": "Escanear una Área",
+  "scan_zone_choose": "Arrastra y Suelta el Marcador para Establecer la Ubicación del Escaneo y Elegir el Tamaño",
   "scan_zone_size": "Tamaño",
   "scan_zone_range": "Rango",
   "scan_zone_spacing": "Espaciado",
@@ -477,234 +493,226 @@
   "scan_queue": "Cola Actual",
   "click_to_scan": "Escanear Aquí",
   "scan_confirmed_title": "Demanda de escaneo confirmada",
-  "scan_confirmed": "¡Se ha enviado un trabajador a la ubicación, pronto aparecerá el resultado en el mapa!",
+  "scan_confirmed": "El trabajador ha sido enviado a la ubicación, ¡el resultado aparecerá pronto en el mapa!",
   "scan_loading_title": "Enviando solicitud de escaneo",
-  "scan_loading": "¡Tu solicitud de escaneo se está procesando y enviando al sistema!",
+  "scan_loading": "¡Tu solicitud de escaneo está siendo procesada y enviada al sistema!",
   "scan_error_title": "Error",
-  "scan_error": "Ha ocurrido un error al procesar la solicitud de escaneo...",
+  "scan_error": "Ha habido un error mientras se procesaba la solicitud de escaneo...",
   "scan_outside_area": "Esta ubicación está fuera de los límites de las áreas autorizadas",
   "pvp_ranking_cap": "Nivel",
-  "lc_title": "Sigue tu ubicación",
+  "lc_title": "Sigue Tu Ubicación",
   "lc_metersUnit": "metros",
   "lc_feetUnit": "pies",
   "lc_popup": "Estás a {distance} {unit} de este punto",
-  "lc_outsideMapBoundsMsg": "Parece que te encuentras fuera de los límites del mapa",
-  "no_alerts": "No se encontraron alertas",
-  "loading_settings": "Cargando ajustes",
+  "lc_outsideMapBoundsMsg": "Pareces estar fuera de los límites del mapa",
+  "no_alerts": "No se Encontraron Alertas",
+  "loading_settings": "Cargando Configuraciones",
   "refresh_to_continue": "Por favor, actualiza antes de continuar",
-  "session_expired_title": "Sesión expirada",
+  "session_expired_title": "Sesión Expirada",
   "session_expired_body": "Tu sesión ha expirado",
-  "old_client_title": "Obsoleto",
-  "old_client_body": "Hay una nueva versión de este mapa disponible",
+  "old_client_title": "Desactualizado",
+  "old_client_body": "Una versión nueva de este mapa está disponible",
+  "early_old_client_title": "Desactualizado",
+  "early_old_client_body": "Una versión antigua de esta app podría estar almacenada en caché en tu navegador, necesitarás borrar tu caché antes de que puedas usar esta app.",
   "refresh": "Actualizar",
   "points": "Puntos",
   "day": "Día",
   "days": "Días",
-  "react_error": "Algo salió mal",
-  "clickable_icon": "El icono es clickable",
+  "react_error": "Algo Salió Mal",
+  "clickable_icon": "Icono Clicable",
   "two_stops_till_next": "2 paradas hasta la siguiente",
   "one_stop_till_next": "1 parada hasta la siguiente",
   "no_more_gyms": "No hay más gimnasios",
-  "light_map_border": "Borde del mapa claro",
-  "dark_map_border": "Borde del mapa oscuro",
-  "cell_blocked": "Celda bloqueada",
-  "poi_color": "Color del POI",
-  "quest_condition": "Condición de la misión",
-  "always_show_labels": "Mostrar siempre etiquetas",
-  "scan_areas_options": "Opciones de escaneo de áreas",
-  "historic_rarity": "Rareza histórica",
-  "poi": "Puntos de interés",
-  "300m_range": "Rango de 300m",
-  "lure_range": "Rango de módulo cebo",
-  "custom_range": "Rango personalizado",
-  "tap_to_toggle": "Toca para alternar",
+  "light_map_border": "Borde del Mapa Claro",
+  "dark_map_border": "Borde del Mapa Oscuro",
+  "cell_blocked": "Celda Bloqueada",
+  "poi_color": "Color del PDI",
+  "quest_condition": "Condición de Misión",
+  "always_show_labels": "Mostrar Siempre las Etiquetas",
+  "scan_areas_options": "Opciones de Áreas de Escaneo",
+  "historic_rarity": "Rareza Histórica",
+  "poi": "Puntos de Interés",
+  "300m_range": "Alcance de 300m",
+  "lure_range": "Alcance de Cebo",
+  "custom_range": "Alcance Personalizado",
+  "tap_to_toggle": "Toca para Alternar",
   "power_up": "Potenciar",
   "never_alt": "Nunca",
-  "seen_nearby_stop": "Visto cerca",
-  "seen_nearby_cell": "Visto en esta celda",
-  "seen_lure_encounter": "Encuentro de módulo cebo",
-  "seen_lure_wild": "Aparición de módulo cebo",
-  "seen_wild": "Aparición salvaje",
-  "event_stops": "Paradas de evento",
-  "event_stop_timers": "Temporizadores de paradas de evento",
-  "size_0": "Cualquiera",
+  "seen_nearby_stop": "Visto Cerca",
+  "seen_nearby_cell": "Visto en esta Celda",
+  "seen_lure_encounter": "Encuentro con Cebo",
+  "seen_lure_wild": "Aparición con Cebo",
+  "seen_wild": "Aparición Salvaje",
+  "event_stops": "Paradas de Evento",
+  "event_stop_timers": "Temporizadores de Paradas de Evento",
+  "size_0": "Cualquier",
   "size_1": "XXS",
   "size_2": "XS",
   "size_3": "M",
   "size_4": "XL",
   "size_5": "XXL",
-  "show_size_indicator": "Mostrar indicador de tamaño",
+  "show_size_indicator": "Mostrar Indicador de Tamaño",
   "size": "Tamaño",
-  "gold_stop": "Parada dorada",
-  "profile_backups": "Cambio de perfil",
-  "new_backup": "Nueva copia de seguridad",
+  "gold_stop": "Parada Dorada",
+  "profile_backups": "Intercambio de Perfiles",
+  "new_backup": "Nuevo Respaldo",
   "create": "Crear",
   "load": "Cargar",
   "update": "Actualizar",
   "delete": "Eliminar",
   "name": "Nombre",
-  "only_confirmed": "Solo confirmados",
-  "rocket_pokemon": "Pokémon del Equipo Rocket",
+  "only_confirmed": "Solo Confirmados",
+  "rocket_pokemon": "Pokémon de Team GO Rocket",
   "decoy": "Señuelo",
-  "s2_cell_limit_0": "Has intentado generar más de 20,000 celdas ({{variable_0}})",
-  "show_all_pvp_ranks": "Mostrar todos los rangos PVP",
-  "enable_pokemon_popup_coords": "Mostrar coordenadas de Pokémon",
-  "enable_gym_popup_coords": "Mostrar coordenadas de gimnasios",
-  "enable_pokestop_popup_coords": "Mostrar coordenadas de Poképaradas",
-  "enable_portal_popup_coords": "Mostrar coordenadas de portales",
-  "on_block_join_discord": "Por favor únete a nuestro discord para obtener más información.",
+  "s2_cell_limit_0": "Intentaste generar más de 20,000 celdas ({{variable_0}})",
+  "show_all_pvp_ranks": "Mostrar Todos los Rangos PVP",
+  "enable_pokemon_popup_coords": "Mostrar Coordenadas de Pokémon",
+  "enable_gym_popup_coords": "Mostrar Coordenadas de Gimnasio",
+  "enable_pokestop_popup_coords": "Mostrar Coordenadas de Poképarada",
+  "enable_portal_popup_coords": "Mostrar Coordenadas de Portal",
+  "on_block_join_discord": "Por favor, únete a nuestro discord para más información.",
   "on_block_msg": "Has sido bloqueado por ser miembro de",
   "denied": "Denegado",
-  "showcase": "Mostrar",
-  "unknown_event": "Evento desconocido",
+  "showcase": "Vitrina",
+  "unknown_event": "Evento Desconocido",
   "scanner_countdown": "Disponible en {{time}}s",
   "success": "Éxito",
   "contribute": "Contribuir",
   "mi": "mi",
-  "filter_by_areas": "Filtrar por áreas",
-  "submit_nest_name": "Enviar nombre del nido",
-  "nest_submission_menu": "Actualizar nombre",
-  "nest_submissions": "Envío de nidos",
+  "filter_by_areas": "Filtrar por Áreas",
+  "submit_nest_name": "Enviar Nombre de Nido",
+  "nest_submission_menu": "Actualización de Nombre",
+  "nest_submissions": "Envíos de Nidos",
   "nest_submissions_subtitle": "Te permite enviar nuevos nombres para nidos",
-  "pokemon_opacity": "Opacidad dinámica de Pokémon",
-  "invasion_opacity": "Opacidad dinámica de invasión",
-  "raid_opacity": "Opacidad dinámica de incursión",
+  "pokemon_opacity": "Opacidad Dinámica de Pokémon",
+  "invasion_opacity": "Opacidad Dinámica de Invasión",
+  "raid_opacity": "Opacidad Dinámica de Incursión",
   "opacity_ten_minutes": "Opacidad a los 10 minutos",
   "opacity_five_minutes": "Opacidad a los 5 minutos",
   "opacity_one_minute": "Opacidad a 1 minuto",
-  "level_circles": "Indicadores de nivel",
-  "min_level_circle": "Nivel mínimo del círculo",
-  "mutation_auth_error": "Tu solicitud no se pudo completar debido a que no has iniciado sesión",
-  "submitted_by": "Enviado por",
-  "localauth_failed": "Autenticación fallida",
+  "level_circles": "Indicadores de Nivel",
+  "min_level_circle": "Nivel Mínimo de Círculo",
+  "mutation_auth_error": "Tu solicitud no tuvo éxito por no estar conectado",
+  "submitted_by": "Enviado Por",
   "reversible": "Reversible",
   "version": "Versión",
-  "route_tags": "Etiquetas de ruta",
+  "route_tags": "Etiquetas de Ruta",
   "routes": "Rutas",
-  "route_type": "Tipo de ruta",
-  "routes_subtitle": "Ver rutas en el juego y la información relevante sobre ellas en el mapa",
+  "route_type": "Tipo de Ruta",
+  "routes_subtitle": "Ver rutas en el juego e información relevante sobre ellas en el mapa",
   "description": "Descripción",
-  "additional_info": "Información adicional",
+  "additional_info": "Información Adicional",
   "duration": "Duración",
   "elevation": "Elevación",
-  "contest_category_1": "Tamaño más pequeño",
-  "context_category_2": "Tamaño más grande",
-  "total_entries": "Participantes",
-  "showcase_rankings": "Clasificación de exhibición",
-  "showcase_rankings_subtitle": "Muestra una lista de las mejores clasificaciones para una exhibición en una Pokeparada",
+  "contest_category_1": "Menor Tamaño",
+  "context_category_2": "Mayor Tamaño",
+  "total_entries": "Total de Entradas",
+  "showcase_rankings": "Clasificaciones de Vitrina",
+  "showcase_rankings_subtitle": "Muestra una lista de las clasificaciones más altas para una vitrina en una Poképarada",
   "tth": "TTH",
   "tth_0": "Todos",
   "tth_1": "Conocidos",
   "tth_2": "Desconocidos",
-  "no_access": "Sin acceso",
-  "cooldown": "Cooldown",
-  "scan_some_outside_area": "Some locations are outside the authorized boundaries",
-  "alerts": "Alertas",
-  "alert_manager": "Adminsitrador de Alertas",
+  "no_access": "Sin Acceso",
+  "cooldown": "Tiempo de Recarga",
+  "scan_some_outside_area": "Algunas ubicaciones están fuera de los límites autorizados",
+  "alerts": "alertas",
+  "alert_manager": "Gestor de Alertas",
   "menu": "Menú",
   "theme": "Tema",
   "exit": "Salir",
   "component": "Componente",
   "component_login_page": "Página de Inicio de Sesión",
-  "component_donation_page": "Página de Donaciones",
+  "component_donation_page": "Página de Donación",
   "component_message_of_the_day": "Mensaje del Día",
   "download": "Descargar",
-  "playground": "Playground",
+  "playground": "Patio de Juegos",
   "locale": "Idioma",
   "saved": "Guardado",
   "show_editor": "Mostrar Editor",
   "hide_editor": "Ocultar Editor",
-  "reported_error": "Este error ha sido reportado al servidor con el identificador",
+  "reported_error": "Este error ha sido informado al servidor con identificador",
   "dark_mode": "Modo Oscuro",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": "Iniciar sesión",
-  "join_button": "Unirse",
-  "load_from_autosave": "Cargar desde autosave",
+  "load_from_autosave": "Cargar de autoguardado",
   "done": "Hecho",
   "fast": "Rápido",
   "charged": "Cargado",
-  "offline_mode": "Modo sin conexión",
-  "include_sponsored": "Incluir Patrocinado",
-  "showcase_color": "Color de Destaque",
-  "partner_color": "Color de Socio",
-  "disable": "Deshabilitar {{- name}}",
+  "offline_mode": "Modo Sin Conexión",
+  "include_sponsored": "Incluir Patrocinados",
+  "showcase_color": "Color del Escaparate",
+  "partner_color": "Color del Socio",
+  "disable": "Desactivar {{- name}}",
   "profiling": "Perfilado",
-  "showcase_block": "Bloqueado debido a un destacado",
-  "signed_in_as": "Iniciado como",
+  "showcase_block": "Bloqueado por un escaparate",
+  "signed_in_as": "Conectado Como",
   "missing_map_perm": "No tienes permiso para ver el mapa.",
-  "pokemon_audio": "Audio de Pokémon",
-  "pokestop_audio": "Audio de PokéStop",
-  "gym_audio": "Audio de Gimnasio",
-  "team_audio": "Audio de Equipo",
-  "egg_audio": "Audio de Huevo",
-  "raid_audio": "Audio de Incursión",
-  "nest_audio": "Audio de Nido",
-  "reward_audio": "Audio de Recompensa",
-  "type_audio": "Audio de Tipo",
-  "weather_audio": "Audio de Clima",
-  "misc_audio": "Audio Misceláneo",
-  "invasion_audio": "Audio de Invasión",
-  "spawnpoint_audio": "Audio de Punto de Aparición",
-  "device_audio": "Audio del Dispositivo",
   "access_denied": "Acceso Denegado",
   "audio": "Audio",
   "desktop_notifications": "Notificaciones de Escritorio",
-  "notifications_options": "Opciones de Notificación",
-  "audio_always_on": "Audio Siempre Activo",
+  "notifications_options": "Opciones de Notificaciones",
+  "audio_always_on": "El Audio Siempre Reproduce",
   "volume_level": "Nivel de Volumen",
   "notifications_status": "Estado de Notificaciones",
   "granted": "concedido",
-  "global_search_invasions": "Ingresa el tipo de Equipo Rocket, Nombre o Nombre de Pokémon...",
-  "set_all": "Establecer todo",
-  "set_filtered": "Establecer filtrados",
-  "only_show_available": "Mostrar solo disponibles",
-  "easy_mode": "Modo fácil",
-  "quick_select": "Selecciones rápidas globales",
-  "pokemon_filter_mode": "Modo de filtro de Pokémon",
+  "set_all": "Establecer Todo",
+  "set_filtered": "Establecer Filtrado",
+  "only_show_available": "Mostrar Solo Disponibles",
+  "easy_mode": "Modo Fácil",
+  "quick_select": "Selecciones Rápidas Globales",
+  "pokemon_filter_mode": "Modo de Filtro de Pokémon",
   "basic": "Básico",
   "intermediate": "Intermedio",
   "expert": "Experto",
   "basic_description": "Selecciona fácilmente Pokémon y aplica un filtro global",
-  "intermediate_description": "Establece filtros individuales de forma global y por Pokémon (tradicional)",
-  "expert_description": "Consultas personalizadas para una mayor personalización",
-  "icon_size": "Tamaño de los íconos",
+  "intermediate_description": "Establecer filtros individuales globalmente y por Pokémon (tradicional)",
+  "expert_description": "Entradas manuales para la personalización más detallada",
+  "icon_size": "Tamaño del Icono",
   "developer": "Desarrollador",
-  "raid_override": "Anulación de Incursiones",
-  "search_rocket_pokemon": "Buscar Pokémon del Equipo Rocket",
+  "raid_override": "Anulación de Raid",
+  "search_rocket_pokemon": "Buscar Pokémon de Team Rocket",
   "main": "Principal",
   "extra": "Extra",
   "select": "Seleccionar",
   "searching": "buscando...",
-  "no_options": "Sin opciones..."
+  "no_options": "No hay Opciones...",
+  "and": "Y",
+  "or": "O",
+  "only_global": "Solo Global",
+  "global_caption": "Ignora Todos Los Demás Filtros",
+  "global_and_individual": "Filtros Globales e Individuales",
+  "gender_filters_all": "El Género Se Aplica a Todos",
+  "and_caption": "Enlazados Juntos",
+  "or_caption": "Filtros de Manera Independiente",
+  "filter_help": "Ayuda de Filtro",
+  "kilometers": "Kilómetros",
+  "miles": "Millas",
+  "distance_unit": "Unidad de Distancia",
+  "data_management": "Gestión de Datos",
+  "reset_or_manage_text": "Puedes restablecer completamente tus filtros o puedes ver la página de gestión de datos que te permitirá restablecer categorías individuales.",
+  "reset_audio": "Restablecer Audio",
+  "reset_all": "Restablecer Todo",
+  "reset_icons": "Restablecer Iconos",
+  "reset_position": "Restablecer Posición",
+  "reset_ui": "Restablecer Interfaz de Usuario",
+  "reset_options": "Restablecer Opciones",
+  "reset_menus": "Restablecer Menús",
+  "reset_settings": "Restablecer Ajustes",
+  "reset_general_title": "General",
+  "reset_filters_title": "Filtros",
+  "reset_assets": "Restablecer Recursos",
+  "reset_pokemon": "Restablecer Pokémon",
+  "reset_pokestops": "Restablecer Poképaradas",
+  "reset_gyms": "Restablecer Gimnasios",
+  "reset_nests": "Restablecer Nidos",
+  "reset_portals": "Restablecer Portales",
+  "reset_routes": "Restablecer Rutas",
+  "reset_scan_areas": "Restablecer Áreas de Escaneo",
+  "reset_scan_cells": "Restablecer Celdas de Escaneo",
+  "reset_devices": "Restablecer Dispositivos",
+  "reset_weather": "Restablecer Clima",
+  "reset_s2cells": "Restablecer Celdas S2",
+  "reset_spawnpoints": "Restablecer Puntos de Aparición",
+  "reset_submission_cells": "Restablecer Celdas de Envío",
+  "hisuian": "Hisui",
+  "spacial_rend_range": "Rango de Corte Espacial"
 }
diff --git a/packages/locales/lib/generated/fr.json b/packages/locales/lib/generated/fr.json
index acd242e69..7387b8b08 100644
--- a/packages/locales/lib/generated/fr.json
+++ b/packages/locales/lib/generated/fr.json
@@ -1,406 +1,410 @@
 {
   "login": "Connexion",
-  "click_once": "Ne cliquer 'Autoriser' qu'une fois",
-  "save": "Enregistrer",
+  "click_once": "Cliquez une seule fois sur 'Autoriser'",
+  "save": "Sauvegarder",
   "reset": "Réinitialiser",
   "close": "Fermer",
-  "reset_filters": "Réinitialiser les Filtres",
-  "pokemon_filters": "Filtres de Pokémon",
-  "gyms_filters": "Filtres d'Arènes",
-  "pokestops_filters": "Filtres de Pokéstops",
-  "nests_filters": "Filtres de Nids",
+  "reset_filters": "Réinitialiser les filtres",
+  "pokemon_filters": "Paramètres de filtre Pokémon",
+  "gyms_filters": "Paramètres de filtre de Gym",
+  "pokestops_filters": "Paramètres de filtre de PokéStop",
+  "nests_filters": "Paramètres de filtre de Nid",
   "help": "Aide",
   "apply_to_all": "Appliquer à tous",
-  "disable_all": "Tout Désactiver",
-  "enable_all": "Tout Activer",
+  "disable_all": "Désactiver tout",
+  "enable_all": "Activer tout",
   "enabled": "Activé",
-  "legacy": "Legacy",
+  "legacy": "Héritage",
   "id": "ID",
-  "location": "Position",
-  "search_pokemon": "Recherche Pokémon",
-  "search_nests": "Recherche Nids",
-  "search_gyms": "Recherche Arènes",
-  "search_pokestops": "Recherche Pokéstops",
-  "xs": "XS",
-  "sm": "S",
-  "md": "M",
-  "lg": "L",
-  "xl": "XL",
+  "location": "Emplacement",
+  "search_pokemon": "Rechercher Pokémon",
+  "search_nests": "Rechercher Nids",
+  "search_gyms": "Rechercher Gyms",
+  "search_pokestops": "Rechercher PokéStops",
+  "search_raids": "Rechercher Raids",
+  "search_eggs": "Rechercher Œufs",
+  "search_quests": "Rechercher Quêtes",
+  "search_lures": "Rechercher Leurres",
+  "search_invasions": "Rechercher Invasions",
+  "sm": "Petit",
+  "md": "Moyen",
+  "lg": "Grand",
+  "xl": "Très Grand",
   "min": "Min",
   "max": "Max",
-  "set_size": "Définir Taille d'icône",
-  "slot_selection": "Sélection place libre",
+  "set_size": "Définir la Taille de l'icône",
+  "slot_selection": "Sélection de l'emplacement",
   "generations": "Générations",
   "types": "Types",
   "forms": "Formes",
-  "rarity": "Rareté",
+  "rarity": "Rareté actuelle",
   "others": "Autres",
   "categories": "Catégories",
-  "%": "%",
-  "rank": "Rang",
+  "rank": "Classement",
   "slider_iv": "Plage IV",
   "slider_great": "Ligue Super",
-  "slider_ultra": "Ligue Hyper",
-  "slider_little": "Petite Ligue",
+  "slider_ultra": "Ligue Ultra",
+  "slider_little": "Coupe Petite",
   "slider_atk_iv": "Attaque",
   "slider_def_iv": "Défense",
-  "slider_sta_iv": "Stamina",
+  "slider_sta_iv": "Endurance",
   "slider_level": "Niveau",
+  "slider_size": "Taille",
   "abbreviation_level": "N",
   "lvl": "Niv",
-  "cap": "Cap",
+  "cap": "Limite",
   "custom": "Personnalisé",
   "valid": "Valide",
-  "invalid": "Invalide!",
-  "overwrites": "Écraser tous les filtres",
-  "valid_filter": "Filtres de Stats Valides",
-  "invalid_filter": "Entrer Filtre Valide",
-  "gyms": "Arènes",
+  "invalid": "Invalide !",
+  "overwrites": "Remplace tous les filtres",
+  "valid_filter": "Filtre de stats valide",
+  "invalid_filter": "Entrez un filtre valide",
+  "gyms": "Gyms",
   "nests": "Nids",
-  "pokestops": "Pokéstops",
+  "pokestops": "PokéStops",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
-  "scan_areas": "Villes",
+  "scan_areas": "Zones de scan",
+  "s2cells": "Cellules S2",
   "weather": "Météo",
   "admin": "Admin",
   "settings": "Paramètres",
   "advanced": "Avancé",
+  "tile_servers": "Serveurs de tuiles",
   "icons": "Icônes",
   "navigation": "Navigation",
-  "drawer": "Menu",
-  "iconsDefault": "Défaut",
+  "drawer": "Tiroir",
+  "tile_servers_default": "Par défaut",
   "drawer_temporary": "Temporaire",
   "drawer_persistent": "Persistant",
-  "locale_selection": "Sélection Langue",
+  "locale_selection": "Sélection de langue",
   "import": "Importer",
   "export": "Exporter",
-  "logout": "Déconnecter",
-  "local_storage_cleared": "Le stockage local a été supprimé !",
+  "logout": "Déconnexion",
+  "local_storage_cleared": "Le stockage local a été vidé !",
   "iv_or_filter": "Filtre IV OU",
   "polygons": "Polygones",
   "raids": "Raids",
-  "ex_eligible": "Arène EX",
+  "ex_eligible": "Éligible EX",
   "in_battle": "En Combat",
-  "all_pokestops": "Tous les Pokéstops",
-  "all_gyms": "Toutes les Arènes",
+  "all_pokestops": "Tous les PokéStops",
   "lures": "Leurres",
   "quests": "Quêtes",
   "invasions": "Invasions",
   "portals": "Portails",
-  "submission_cells": "Cellules Wayfarer",
-  "spawnpoint": "Spawnpoint",
-  "spawnpoints": "Spawnpoints",
+  "submission_cells": "Cellules de Soumission",
+  "spawnpoint": "Point d'apparition",
+  "spawnpoints": "Points d'apparition",
   "s2_cell_level": "Cellule S2 Niveau {{level}}",
-  "total_count": "Compte Total",
-  "next_submission": "Prochaine Soumission!",
+  "total_count": "Nombre total",
+  "next_submission": "Prochaine Soumission !",
   "never": "Jamais",
-  "next_gym": "Prochaine Arène",
-  "scan_cells": "Cellules de scan",
+  "next_gym": "Prochain Gym",
+  "scan_cells": "Scanner les Cellules",
   "devices": "Appareils",
   "use_my_location": "Utiliser Ma Position",
-  "submit_feedback_title": "Envoyer Commentaire/Rapport de bug",
-  "use_the_link_below": "Vous pouvez utiliser le lien ci-dessous pour vos commentaires ou bugs rencontrés.",
-  "feedback_to_devs": "Ces commentaires sont envoyés directement aux développeurs.",
-  "feedback_form": "Formulaire Commentaire",
-  "unknown_pokestop": "Pokéstop Inconnu",
-  "unknown_gym": "Arène Inconnue",
+  "submit_feedback_title": "Envoyer un retour/Signaler un bug",
+  "use_the_link_below": "Vous pouvez utiliser le lien ci-dessous pour envoyer un retour ou signaler un bug que vous avez rencontré.",
+  "feedback_to_devs": "Ce retour est envoyé directement aux développeurs.",
+  "feedback_form": "Formulaire de retour",
+  "unknown_pokestop": "Nom de PokéStop inconnu",
+  "unknown_gym": "Nom de Gym Inconnu",
   "exclude": "Exclure",
   "exclude_quest": "Exclure Quête",
   "exclude_invasion": "Exclure Invasion",
   "exclude_team": "Exclure Équipe",
   "exclude_raid": "Exclure Raid",
-  "timer": "Timer",
+  "exclude_lure": "Exclure Leurre",
+  "timer": "Minuteur",
   "hide": "Cacher",
-  "tier": "Niv.",
+  "tier": "Niveau",
   "slots": "Places",
-  "mega": "Méga",
+  "mega": "Mega",
   "form": "Forme",
-  "starts": "Démarre",
-  "ends": "Fin à",
+  "starts": "Débute",
+  "ends": "Termine",
   "defender": "Défenseur",
   "cp": "PC",
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "PC Total",
-  "first_seen": "Découvert à",
-  "last_seen": "Actualisé à",
+  "first_seen": "Première Apparition",
+  "last_seen": "Dernière Apparition",
   "last_modified": "Dernière Modification",
-  "last_updated": "Dernière Mise à jour",
+  "last_updated": "Dernière Mise à Jour",
   "imported": "Importé",
-  "nest_estimated": "Les données de Nids sont estimées!",
-  "verify_nests": "Vérifier avec les Pokémon présents",
-  "nest_out_of_date": "Les Nids sont potentiellement périmés!",
-  "nest_check_current": "Vérifier les Pokémon présents à la place",
-  "spawns_per_hour": "spawns/hr",
+  "nest_estimated": "Données de Nid Estimées !",
+  "verify_nests": "Vérifier en Observant les Apparitions Actuelles",
+  "nest_out_of_date": "Le Nid est Potentiellement Périmé !",
+  "nest_check_current": "Vérifier les Apparitions Actuelles à la Place",
+  "spawns_per_hour": "Par heure",
   "teams": "Équipes",
   "eggs": "Œufs",
-  "reverse": "Inversé",
+  "reverse": "Inverser",
   "selected": "Sélectionné",
-  "unselected": "Déselectionné",
+  "unselected": "Non Sélectionné",
   "only_available": "Disponible",
   "common": "Commun",
-  "uncommon": "Peu commun",
+  "uncommon": "Peu Commun",
   "rare": "Rare",
   "ultra_rare": "Ultra Rare",
   "regional": "Régional",
-  "event": "Évènement",
+  "event": "Événement",
   "legendary": "Légendaire",
   "mythical": "Mythique",
-  "alt_forms": "Autres Formes",
-  "Alola": "Alola",
-  "Galarian": "Galar",
-  "showing": "Affiché ",
+  "ultra_beast": "Ultra-Chimère",
+  "alt_forms": "Formes Alt",
+  "alola": "Alola",
+  "galarian": "Galar",
+  "showing": "Affichage",
   "instance": "Instance",
-  "online": "Online",
-  "offline": "Offline",
+  "online": "En Ligne",
+  "offline": "Hors Ligne",
   "boosted_types": "Types Boostés",
   "pokemon_options": "Options Pokémon",
-  "pokestops_options": "Options Pokéstop",
-  "gyms_options": "Options Arènes",
-  "nests_options": "Options Nids",
+  "pokestops_options": "Options PokéStops",
+  "gyms_options": "Options Gym",
+  "nests_options": "Options Nid",
   "wayfarer_options": "Options Wayfarer",
   "admin_options": "Options Admin",
-  "clustering": "Regrouper",
-  "glow": "Halo",
-  "legacy_filter": "Filtre Legacy",
-  "raid_timers": "Tous les Timers Raid",
-  "invasion_timers": "Tous les Timers Invasion",
-  "lure_timers": "Tous les Timers Leurre",
-  "device_path_color": "Couleur de route",
+  "weather_options": "Options Météo",
+  "s2cells_options": "Options Cellules S2",
+  "clustering": "Regroupement",
+  "glow": "Lueur",
+  "legacy_filter": "Filtre Légendaire",
+  "raid_timers": "Minuteries de Raids",
+  "invasion_timers": "Minuteries d'Invasions",
+  "lure_timers": "Minuteries de Leurres",
+  "device_path_color": "Couleur du Chemin de l'Appareil",
   "old_portals": "Anciens Portails",
   "new_portals": "Nouveaux Portails",
   "items": "Objets",
   "energy": "Énergie",
-  "ar_eligible": "Cartographie RA Active",
-  "iv_circles": "Indicateurs d'IV",
-  "min_iv_circle": "Seuil étiquette IV",
-  "interaction_ranges": "Portée d'interaction",
-  "cannot_connect": "\nImpossible de se connecter au serveur.\nRé-essayer immédiatement ne ferait que surcharger le serveur.\nEssayez à nouveau dans quelques minutes.\n\n- Merci -",
-  "mad_quest_text": "Quêtes Directes",
+  "ar_eligible": "Éligible RA",
+  "iv_circles": "Indicateurs IV",
+  "min_iv_circle": "Cercle IV Minimum",
+  "interaction_ranges": "Plages d'Interaction",
+  "cannot_connect": "\nImpossible de se connecter au serveur pour le moment.\nRéessayer immédiatement ne fera qu'aggraver les problèmes.\nVeuillez réessayer dans quelques minutes.\n\n- Équipe Admin de la Carte",
+  "mad_quest_text": "Quêtes Natives",
+  "xs": "XS",
   "primary": "Primaire",
   "secondary": "Secondaire",
-  "zero_iv": "IV 0%",
-  "open_menu": "Ouvrir le Menu",
-  "zoom_in": "Zoom avant",
-  "zoom_out": "Zoom arrière",
+  "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
-  "welcome": "Bienvenue sur",
-  "back": "retour",
-  "next": "suivant",
+  "open_menu": "Ouvrir le Menu",
+  "zoom_in": "Zoom Avant",
+  "zoom_out": "Zoom Arrière",
+  "welcome": "Bienvenue à",
+  "back": "Retour",
+  "next": "Suivant",
   "finish": "Terminer",
-  "start_tutorial": "Démarrer le Tutoriel",
+  "start_tutorial": "Commencer le Tutoriel",
   "view_profile": "Voir le Profil",
   "login_optional": "Connexion (Optionnel)",
   "tutorial": "Tutoriel",
   "tutorial_language": "Choisissez votre Langue",
-  "tutorial_welcome": "Ce tutoriel est intéractif. Il est fortement recommandé de tester les différentes options proposées.",
-  "tutorial_categories": "Catégories auxquelles vous avez accès",
-  "tutorial_logged_in": "Vous pouvez voir le détail de vos autorisations en visualisant votre profil.",
-  "tutorial_logged_out": "Vous pouvez voir le détail de vos autorisations en vous connectant.",
-  "tutorial_sidebar_0": "Tous vos Filtres et Paramètres se trouvent ici",
-  "tutorial_sidebar_1": "Pour chaque catégorie vous pouvez activer ou désactiver n'importe quelle donnée en utilisant des switchs",
-  "tutorial_sidebar_2": "Options: Personnalisations Supplémentaires\nAvancé: Nous couvrirons cette partie plus loin dans le tutoriel",
-  "tutorial_sliders_0": "Utilisation de curseurs pour ajuster les filtres",
-  "tutorial_sliders_1": "Pokémon Entre:",
-  "tutorial_sliders_2": "- IVs {{iv0}}% et {{iv1}}%",
-  "tutorial_sliders_3": "Niveau {{level0}} et {{level1}}",
-  "tutorial_sliders_3alt": "- ET est Niveau {{level0}} à {{level1}}",
-  "tutorial_sliders_4": "- Ligue Super Rang {{gl0}} à {{gl1}}",
-  "tutorial_sliders_4alt": "- OU Ligue Super Rang {{gl0}} à {{gl1}}",
-  "tutorial_sliders_5": "- Ligue Ultra Rang {{ul0}} à {{ul1}}",
-  "tutorial_sliders_5alt": "- OU Ligue Ultra Rang {{ul0}} à {{ul1}}",
-  "tutorial_sliders_6": "S'ajoute aux autres de la même couleur",
-  "tutorial_sliders_7": "Filtre indépendant des autres curseurs",
-  "tutorial_sliders_8": "Un Curseur 'Complet' signifie que celui-ci est désactivé:",
+  "tutorial_welcome": "Ce tutoriel est interactif et vous êtes fortement encouragé à jouer avec toutes les options fournies",
+  "tutorial_categories": "Catégories auxquelles Vous Avez Accès",
+  "tutorial_logged_in": "Vous pouvez voir les détails sur vos permissions en consultant votre profil.",
+  "tutorial_logged_out": "Vous pouvez voir les détails sur vos permissions en vous connectant.",
+  "tutorial_sidebar_0": "Tous vos Filtres & Paramètres sont Ici",
+  "tutorial_sidebar_1": "Pour chaque catégorie, vous pourrez choisir précisément les données que vous souhaitez à l'aide des interrupteurs",
+  "tutorial_sidebar_2": "Options : Personnalisation supplémentaire\nAvancé : Nous verrons cela plus tard dans ce tutoriel",
+  "tutorial_sliders_0": "Utiliser les curseurs pour ajuster les filtres",
+  "tutorial_sliders_1": "Pokémon entre :",
+  "tutorial_sliders_2": "- IVs de {{iv0}}% à {{iv1}}%",
+  "tutorial_sliders_3": "Niveau {{level0}} à {{level1}}",
+  "tutorial_sliders_3alt": "- ET de Niveau {{level0}} à {{level1}}",
+  "tutorial_sliders_4": "- Classement de la Ligue Super {{gl0}} à {{gl1}}",
+  "tutorial_sliders_4alt": "- OU Classement de la Ligue Super {{gl0}} à {{gl1}}",
+  "tutorial_sliders_5": "- Classement de la Ligue Hyper {{ul0}} à {{ul1}}",
+  "tutorial_sliders_5alt": "- OU Classement de la Ligue Hyper {{ul0}} à {{ul1}}",
+  "tutorial_sliders_6": "Se combine avec d'autres de la même couleur",
+  "tutorial_sliders_7": "Filtres séparés des autres curseurs",
+  "tutorial_sliders_8": "Un curseur 'plein' signifie qu'il est désactivé :",
+  "tutorial_sliders_9": "Toutes les apparitions, qu'elles aient été vérifiées pour les IV ou non",
   "tutorial_help": "Raccourci vers ce menu",
-  "tutorial_sliders_9": "Tous les Pokémon que les IV soient vérifiés ou pas",
-  "tutorial_adv_filter": "Mobile uniquement, ouvre les options de filtres du menu avancé",
-  "tutorial_tune": "Configure le filtre avancé pour tous les Pokémon actuellement filtrés dans le menu",
-  "tutorial_format_size": "Configure la taille des icônes pour tous les éléments actuellement filtrés dans le menu",
-  "tutorial_check": "Active tous les éléments actuellement filtrés dans le menu",
-  "tutorial_clear": "Désactive tous les éléments actuellement filtrés dans le menu",
-  "tutorial_save": "Sauver la sélection actuelle et quitter",
-  "tutorial_show_all_view": "Activer les Pokéstops & Arènes",
-  "tutorial_show_pokemon_view": "Activer les Pokémon",
-  "tutorial_toggle": "Cliquer le ✓/✗ active/désactive cet élément",
-  "tutorial_pokemon_caption": "Cette icône vous permet de configurer les filtres pour ce pokémon spécifique",
-  "tutorial_all_caption": "Les équipes ont un menu spécifique\nLa taille des icônes peut être adaptée pour tous les autres éléments",
-  "tutorial_popup_0": "Les Popups sont à présent interactifs!",
-  "tutorial_popup_1": "Les 3 points ouvrent les options permettant de cacher, exclure ou activer les timers",
-  "tutorial_popup_2": "Les icônes de chaque coté de la navigation s'ouvrent afin de présenter des informations supplémentaires, testez-les!",
-  "tutorial_popup_3": "Les icônes varient pour chaque catégorie, vérifiez les tous",
-  "tutorial_closing_0": "Informations Supplémentaires",
-  "tutorial_closing_1": "Les curseurs Pokémon dans la barre latérale fonctionnent séparément du menu avancé et n'ont pas d'effet l'un sur l'autre",
-  "tutorial_closing_2": "Vérifiez les paramètres dans la section Paramètres de la barre latérale",
-  "tutorial_closing_3": "Il y a beaucoup d'options esthétiques pour chaque catégorie, mais restez conscient qu'au plus vous activez d'options, au plus la carte sera lente",
-  "tutorial_closing_4": "Vous pouvez re-visualiser ce tutoriel depuis le menu Paramètres dans la barre latérale",
-  "tutorial_closing_5": "Restez prudent et Bonne Chance!",
-  "intro": "Introduction",
+  "tutorial_adv_filter": "Mobile uniquement, ouvre les options de filtrage pour le menu avancé",
+  "tutorial_tune": "Définit le filtre avancé pour tous les Pokémon actuellement filtrés dans le menu",
+  "tutorial_format_size": "Définit la taille des icônes pour tous les objets actuellement filtrés dans le menu",
+  "tutorial_check": "Active tous les objets actuellement filtrés dans le menu",
+  "tutorial_clear": "Désactive tous les objets actuellement filtrés dans le menu",
+  "tutorial_save": "Enregistre la sélection courante et quitte",
+  "tutorial_show_all_view": "Afficher/Cacher les PokéStops & Arènes",
+  "tutorial_show_pokemon_view": "Afficher/Cacher les Pokémon",
+  "tutorial_toggle": "Cliquer sur le bouton Vérifier/X bascule l'élément",
+  "tutorial_pokemon_caption": "Cette icône vous permet de définir des filtres pour ce Pokémon spécifique",
+  "tutorial_all_caption": "Les équipes ont un menu spécial pour les emplacements\nTous les autres objets vous permettent d'ajuster la taille de l'icône",
+  "tutorial_popup_0": "Les popups sont maintenant interactifs !",
+  "tutorial_popup_1": "Les trois points ouvrent les options masquer, exclure et basculer le minuteur",
+  "tutorial_popup_2": "Les icônes de chaque côté du lien de navigation s'étendront pour montrer des infos supplémentaires, essayez !",
+  "tutorial_popup_3": "Les icônes varient pour chaque catégorie, assurez-vous de toutes les vérifier",
+  "tutorial_closing_0": "Informations supplémentaires",
+  "tutorial_closing_1": "Les curseurs globaux de Pokémon dans la barre latérale fonctionnent séparément du menu avancé et n'ont aucun effet l'un sur l'autre",
+  "tutorial_closing_2": "Assurez-vous de consulter la section Paramètres dans la barre latérale",
+  "tutorial_closing_3": "Il y a beaucoup d'options esthétiques disponibles pour chaque catégorie, mais gardez à l'esprit que plus vous ajoutez à votre carte, plus vous avez de chances que votre carte se fige",
+  "tutorial_closing_4": "Vous pouvez visionner à nouveau ce tutoriel en le sélectionnant dans le panneau Paramètres dans la barre latérale",
+  "tutorial_closing_5": "Restez en sécurité et bonne chance !",
+  "intro": "Intro",
   "sidebar": "Barre latérale",
   "sliders": "Curseurs",
   "popups": "Popups",
-  "closing": "Conclusion",
+  "closing": "Fermeture",
   "shortcuts": "Raccourcis",
   "iv": "IV",
-  "area_restrictions": "Restrictions de Zones",
+  "area_restrictions": "Restrictions de zone",
   "map": "Carte",
   "stats": "Stats",
   "pvp": "PVP",
   "area_restrictions_subtitle": "Vous avez accès à ces zones",
-  "devices_subtitle": "Affiche la localisation des appareils actifs et leurs routes",
-  "gyms_subtitle": "Affiche la localisation de toutes les Arènes, équipes en contrôle, et nombre de places disponibles",
-  "invasions_subtitle": "Affiche les informations d'invasions de la Team Rocket, y compris les combats, heure d'expiration et récompenses possibles",
-  "iv_subtitle": "Affice les % d'IV et options de mise en évidence",
-  "lures_subtitle": "Affiche les infos des Leurres, y compris les types et heure d'expiration",
-  "map_subtitle": "Affiche la Carte",
-  "nests_subtitle": "Affiche les nids et Polygones de nids actifs",
-  "pokemon_subtitle": "Affiche la localisation de tous les Pokémon et heure d'expiration",
-  "pokestops_subtitle": "Affiche la localisation de tous les Pokéstops",
-  "portals_subtitle": "Affiche tous les Portails Ingress",
-  "pvp_subtitle": "Affiche les infos PVP/PC/Niveau pour chaque Pokémon",
-  "quests_subtitle": "Affiche les récompenses de quêtes et tâches",
-  "raids_subtitle": "Affiche les informations de raids y compris les Boss et leurs attaques, Oeufs et heure d'expiration",
-  "scan_cells_subtitle": "Affiche la dernière fois que la cellule S2 a été scannée",
-  "scan_areas_subtitle": "Affiche les zones de scan",
-  "spawnpoints_subtitle": "Affiche les points d'apparition et les heures d'expiration estimées",
-  "stats_subtitle": "Affiche les Stats et Niveaux des Pokémon",
-  "submissionCells_subtitle": "Affiche les informations utiles à la création de nouveaux Points d'Intérêts",
-  "weather_subtitle": "Affiche les informations météo du jeu pour chaque cellule",
+  "devices_subtitle": "Affiche les emplacements et les itinéraires des appareils actifs",
+  "gyms_subtitle": "Affiche tous les emplacements des arènes, l'équipe active, et combien d'emplacements chaque arène a disponibles",
+  "invasions_subtitle": "Affiche les infos sur les invasions de la Team Rocket, y compris la composition du combat, le temps d'expiration, et les récompenses possibles",
+  "iv_subtitle": "Affiche le pourcentage d'IV et les options de brillance",
+  "lures_subtitle": "Affiche les infos sur les leurres, y compris le type de leurre et le temps d'expiration",
+  "map_subtitle": "Affiche la carte",
+  "nests_subtitle": "Affiche les Pokémon actuellement en nidification et les polygones des nids",
+  "pokemon_subtitle": "Affiche tous les emplacements des Pokémon et les temps d'expiration",
+  "pokestops_subtitle": "Affiche tous les emplacements des PokéStops",
+  "portals_subtitle": "Affiche tous les portails Ingress",
+  "pvp_subtitle": "Affiche les informations de rang/CP/niveau PVP pour chaque Pokémon",
+  "quests_subtitle": "Affiche les informations de récompenses et de tâches des quêtes",
+  "raids_subtitle": "Affiche toutes les informations de raid y compris le boss de raid, les œufs, le temps restant et le set de mouvements",
+  "scan_cells_subtitle": "Affiche la dernière fois qu'une cellule S2 a été scannée par un appareil",
+  "scan_areas_subtitle": "Affiche les polygones des zones disponibles à la numérisation",
+  "spawnpoints_subtitle": "Affiche les points d'apparition et leur temps de disparition estimé",
+  "stats_subtitle": "Affiche les statistiques et les niveaux des Pokémon",
+  "submission_cells_subtitle": "Affiche les informations utiles pour soumettre de nouveaux POI",
+  "weather_subtitle": "Affiche les informations météorologiques du jeu pour chaque cellule",
+  "scanner_subtitle": "Interagit directement avec le scanner de diverses manières",
+  "s2cells_subtitle": "Affiche les cellules S2 à différents niveaux sur la carte",
+  "backups_subtitle": "Permet de sauvegarder et de charger les paramètres sur différents appareils",
+  "backups": "Sauvegardes",
   "user_profile": "Profil Utilisateur",
-  "user_username": "Nom d'utilisateur ",
-  "candy": "Bonbon",
-  "show_ex_badge": "Afficher les Badges EX",
+  "user_username": "Nom d'utilisateur",
+  "candy": "Bonbons",
+  "show_ex_badge": "Afficher le badge EX",
   "search": "Recherche",
-  "global_search_quests": "Entrer le nom de la récompense...",
-  "global_search_pokestops": "Entrer le nom d'un Pokéstop...",
-  "global_search_gyms": "Entrer le nom d'une Arène...",
-  "global_search_portals": "Entrer le nom d'un Portail...",
-  "global_search_nests": "Entrer le nom d'un Nid...",
-  "global_search_raids": "Entrer le nom d'un Boss de Raid...",
+  "global_search_quests": "Entrez le Nom de la Récompense...",
+  "global_search_lures": "Entrez le Nom du Leurre...",
+  "global_search_pokestops": "Entrez le Nom du PokéStop...",
+  "global_search_gyms": "Entrez le Nom du Gym...",
+  "global_search_portals": "Entrez le Nom du Portail...",
+  "global_search_nests": "Entrez le Nom du Pokémon de Nid...",
+  "global_search_raids": "Entrez le Nom du Boss de Raid...",
+  "global_search_pokemon": "Entrez le Nom du Pokémon...",
+  "global_search_invasions": "Entrez le Type de Sbire, Nom, ou le nom de Pokémon récompensé...",
   "raid_level_badges": "Badges de Niveau de Raid",
   "options": "Options",
   "profile": "Profil",
   "pokemon_icons": "Icônes de Pokémon",
-  "pokestop_icons": "Icônes de Pokéstop",
-  "gym_icons": "Icônes d'Arènes",
-  "team_icons": "Icônes d'équipes",
-  "egg_icons": "Icônes d'œufs",
+  "pokestop_icons": "Icônes de PokéStop",
+  "gym_icons": "Icônes de Gym",
+  "team_icons": "Icônes d'Équipe",
+  "egg_icons": "Icônes d'Œuf",
   "raid_icons": "Icônes de Raid",
-  "nest_icons": "Icônes de Nids",
-  "reward_icons": "Icônes de Récompenses",
+  "nest_icons": "Icônes de Nid",
+  "reward_icons": "Icônes de Récompense",
   "type_icons": "Icônes de Type",
-  "weather_icons": "Icônes Météo",
-  "misc_icons": "Icônes Divers",
-  "invasion_icons": "Icônes d'Invasions",
-  "pokemon_timers": "Tous les timers Pokémon",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 6,
-  "popup_gym_seen_timer_width": 6,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 6,
-  "popup_pokestop_seen_timer_width": 6,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 6,
-  "popup_pokemon_seen_timer_width": 5,
-  "popup_pokemon_data_width": 11,
-  "show_dex_num_in_popup": "Visualiser le # de Pokédex en Popup",
+  "weather_icons": "Icônes Météorologiques",
+  "misc_icons": "Icônes Diverses",
+  "invasion_icons": "Icônes d'Invasion",
+  "spawnpoint_icons": "Icônes de Point d'Apparition",
+  "device_icons": "Icônes d'Appareil",
+  "pokemon_audio": "Audio de Pokémon",
+  "pokestop_audio": "Audio de PokéStop",
+  "gym_audio": "Audio de Gym",
+  "team_audio": "Audio d'Équipe",
+  "egg_audio": "Audio d'Œuf",
+  "raid_audio": "Audio de Raid",
+  "nest_audio": "Audio de Nid",
+  "reward_audio": "Audio de Récompense",
+  "type_audio": "Audio de Type",
+  "weather_audio": "Audio Météorologique",
+  "misc_audio": "Audio Divers",
+  "invasion_audio": "Audio d'Invasion",
+  "spawnpoint_audio": "Audio de Point d'Apparition",
+  "device_audio": "Audio d'Appareil",
+  "pokemon_timers": "Tous les Chronomètres de Pokémon",
+  "show_dex_num_in_popup": "Afficher le Numéro du Pokédex dans le Popup",
   "popup": "Popup",
-  "pvp_level": "Stats PvP Niveau {{level}}",
-  "message_of_the_day": "Message du jour",
-  "ar_quest_true": "Avec RA",
-  "ar_quest_false": "Sans RA",
-  "with_ar": "Avec RA",
-  "both": "Tout",
-  "without_ar": "Sans RA",
-  "exclude_quest_multi": "Exclure {{reward}}",
-  "exclude_lure": "Exclure Leurre",
-  "cluster_limit_0": "La limite de {{variable_1}} pour les ({{variable_0}}) est atteinte",
-  "cluster_limit_1": "Veuillez zoomer davantage ou ajouter des filtres",
-  "show_polygons": "Afficher les Polygones",
-  "exclude_invasion_multi": "Exclure {{invasion}}",
-  "stardust": "Poussière d'étoiles",
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "dialog_filter_footer_next_width": 2,
-  "webhook_advanced_save_width": 2,
-  "slider_cp": "PC",
-  "pvp_ranking_league": "Ligue",
-  "pvp_ranking_min_cp": "PC min",
-  "slider_pvp": "Rang",
-  "profile_no": "Profil",
-  "template": "Modèle",
-  "gender": "Sexe",
-  "clean": "Effacer",
-  "all_forms": "Toutes les formes",
-  "pvp_entry": "Entrée PVP",
-  "no_iv": "Sans IV inclus",
-  "by_distance": "Par Distance",
-  "min_time": "Temps min",
-  "add_new_profile": "Ajouter un nouveau profil",
-  "slider_none": "Aucun",
-  "non_registered_human_title": "Oups, quelque chose n'est pas bon !",
-  "non_registered_human_desc": "Vous n'êtes peut-être pas enregistré auprès de {{webhook}}.\nOu le serveur est actuellement inaccessible",
-  "try_again_later": "Veuillez réessayer plus tard",
-  "selected_areas": "{{amount}} zone sélectionnée",
-  "selected_areas_plural": "{{amount}} zones sélectionnées",
-  "webhook_selection": "{{name}} Sélection",
-  "has_quest_indicator": "Couleur alternative pour afficher les Quêtes",
-  "show_ar_badge": "Afficher les Badges RA",
-  "pvp_mega": "Stats PvP Méga",
+  "pvp_level": "Statistiques PVP Niveau {{level}}",
+  "pvp_mega": "Statistiques PVP Mega",
   "webhook_entry": "Ajouter à {{name}}",
+  "remove_webhook_entry": "Retirer de {{name}}",
   "distance": "Distance",
-  "gym": "Arène",
+  "gym": "Gym",
   "egg": "Œuf",
   "raid": "Raid",
   "lure": "Leurre",
   "quest": "Quête",
   "invasion": "Invasion",
   "nest": "Nid",
-  "pokestop": "Pokéstop",
+  "pokestop": "PokéStop",
   "team": "Équipe",
   "global": "Global",
   "manage_webhook": "Gérer {{name}}",
-  "drag_and_drop": "Glisser et déposer le marqueur pour définir votre emplacement",
-  "click_to_select": "Valider",
-  "add_new": "Ajouter une alerte {{category}}",
-  "my_location": "Ma position",
-  "choose_on_map": "Choisir sur la carte",
-  "select_profile": "Sélectionner un profil",
-  "distance_radius": "Aperçu du rayon des distances",
+  "drag_and_drop": "Glissez-Déposez le Marqueur pour Définir votre Emplacement",
+  "click_to_select": "Cliquez pour Sélectionner",
+  "add_new": "Ajouter une Nouvelle Alerte pour {{category}}",
+  "my_location": "Mon Emplacement",
+  "choose_on_map": "Choisir sur la Carte",
+  "select_profile": "Sélectionner le Profil",
+  "distance_radius": "Aperçu des Distances de Rayon",
   "areas": "Zones",
-  "select_webhook": "Sélectionner un bot",
-  "general": "Générale",
-  "link_global_and_advanced": "Lien global et avancé",
-  "normal_forms": "Formes normales",
-  "weather_indicator": "Indicateur météo",
+  "select_webhook": "Sélectionner le Bot",
+  "ar_quest_true": "Tâche AR",
+  "ar_quest_false": "Sans AR",
+  "with_ar": "Avec AR",
+  "both": "Les deux",
+  "without_ar": "Sans RA",
+  "exclude_quest_multi": "Exclure {{reward}}",
+  "cluster_limit_0": "Limite de {{variable_0}} ({{variable_1}}) atteinte",
+  "cluster_limit_1": "Veuillez zoomer ou affiner vos filtres",
+  "show_polygons": "Afficher les Polygones",
+  "exclude_invasion_multi": "Exclure {{invasion}}",
+  "stardust": "Poussière d’Étoile",
+  "slider_cp": "PC",
+  "pvp_ranking_league": "Ligue",
+  "pvp_ranking_min_cp": "CP Min",
+  "slider_pvp": "Classements",
+  "profile_no": "Profil",
+  "template": "Modèle",
+  "gender": "Genre",
+  "clean": "Nettoyer",
+  "all_forms": "Toutes les Formes",
+  "pvp_entry": "Entrée PVP",
+  "no_iv": "Incl. Pas de IV",
+  "by_distance": "Par Distance",
+  "min_time": "Temps Min",
+  "add_new_profile": "Ajouter Nouveau Profil",
+  "slider_none": "Aucun",
+  "non_registered_human_title": "Oups, quelque chose ne va pas !",
+  "non_registered_human_desc": "Vous n'êtes peut-être pas enregistré avec {{webhook}}\nOu le serveur est actuellement inaccessible",
+  "try_again_later": "Veuillez réessayer plus tard",
+  "selected_areas_one": "{{count}} Zone Sélectionnée",
+  "selected_areas_other": "{{count}} Zones Sélectionnées",
+  "webhook_selection": "Sélection de {{name}}",
+  "message_of_the_day": "Message du Jour",
+  "has_quest_indicator": "Couleur alternative pour les arrêts avec quêtes",
+  "show_ar_badge": "Afficher le Badge AR",
+  "all_gyms": "Tous les Gyms",
+  "general": "Général",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "Le Global Respecte Sélectionné",
+  "normal_forms": "Formes Normales",
+  "weather_indicator": "Indicateur de Boost Météo",
   "page": "Page {{page}}",
-  "navigation_controls": "Commandes de navigation",
+  "navigation_controls": "Contrôles de Navigation",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Exclusif",
-  "all_moves": "Toutes les attaques",
-  "move": "Attaque",
-  "any": "Peu importe",
+  "all_moves": "Tous les Mouvements",
+  "move": "Mouvement",
+  "any": "N'importe",
   "min_spawn_average": "Taux d'apparition min",
-  "select_all": "Sélectionner tout",
-  "delete_all": "Effacer sélection",
+  "select_all": "Tout Sélectionner",
+  "delete_all": "Supprimer Sélectionnés",
   "cancel": "Annuler",
   "day_1": "Lundi",
   "day_2": "Mardi",
@@ -409,308 +413,306 @@
   "day_5": "Vendredi",
   "day_6": "Samedi",
   "day_7": "Dimanche",
-  "profile_name": "Nom du profil",
-  "manage_profiles": "Gérer les profils",
-  "min_spawn_avg": "Taux d'apparition min",
-  "poke_global": "Tous",
+  "profile_name": "Nom du Profil",
+  "manage_profiles": "Gérer les Profils",
+  "min_spawn_avg": "Taux d'Apparition Min Moy",
+  "poke_global": "Tout",
   "amount": "Quantité",
-  "specific_gym": "Arène spéficique",
-  "search_location": "Recherche d'adresse",
-  "search_specific": "Chercher un(e) {{category}} spécifique",
-  "webhook_success_gym": "Les alertes d'arènes, œufs et changement d'équipe ont été ajoutées !",
-  "slot_changes": "Changements de places",
-  "slot_changes_poracle": "slot_changes",
-  "confirm_delete": "Toutes les alertes de ce profil seront supprimées, êtes-vous sûr ?",
-  "confirm_copy": "Choisissez le profil vers lequel vous souhaitez copier \"{{profile}}\" (le profil de destination sera écrasé).",
-  "webhook_error": "{{name}} n'a pas pu traiter cette demande.\nMerci de ré-essayer plus tard.",
-  "profile_error": "Doit être unique et valide.",
-  "team_0": "Harmony",
-  "battle_changes": "Attaquée",
-  "battle_changes_poracle": "battle_changes",
+  "specific_gym": "Gym Spécifique",
+  "search_location": "Chercher des Emplacements",
+  "search_specific": "Recherche Spécifique {{category}}",
+  "webhook_success_gym": "Alertes de Raids, Œufs, et Changements d'Équipe Ajoutées !",
+  "slot_changes": "Changements de Slot",
+  "slot_changes_poracle": "changements_de_slot",
+  "confirm_delete": "Cela supprimera tout le suivi pour ce profil, êtes-vous sûr ?",
+  "confirm_copy": "Choisissez quel profil vous aimeriez copier \"{{profile}}\", cela écrasera entièrement ce profil.",
+  "webhook_error": "{{name}} n’a pas pu traiter cela.\nVeuillez réessayer plus tard.",
+  "profile_error": "Doit être unique et valide",
+  "team_0": "Harmonie",
+  "battle_changes": "En Bataille",
+  "battle_changes_poracle": "changements_de_bataille",
   "auto": "Auto",
-  "webhooks_subtitle": "Gérer vos alertes directement depuis la carte pour ces bots",
+  "webhooks_subtitle": "Gérez vos alertes directement depuis la carte pour ces bots",
+  "event_stops_subtitle": "Affiche les Pokéstops d’événements spéciaux comme Kecleon",
   "webhooks": "Alertes",
-  "tile_servers": "Type de cartes",
-  "tile_servers_default": "Défaut",
-  "alola": "Alola",
-  "galarian": "Galarien",
-  "submission_cells_subtitle": "Affiche des informations utiles pour soumettre de nouveaux POI",
-  "server_dev_error_0": "{{variable_0}}",
-  "everything_individually": "Ajouter des alertes individuelles",
+  "scanner": "Actions du Scanner",
+  "everything_individually": "Ajouter des Alertes Individuelles",
   "individually": "individuellement",
   "join": "Rejoindre",
-  "errors_404": "Oups, cette page est introuvable !",
-  "errors_500": "Il y a eu une erreur de serveur, ré-essayez plus tard !",
-  "local_username": "Nom d'utilisateur",
-  "local_password": "Mot de passe",
-  "local_error": "Il y a eu une erreur, veuillez ré-essayer plus tard !",
-  "no_filter_results": "Aucun résultat trouvé\n\nEssayez d'élargir vos filtres",
-  "donor_page": "Donateur",
+  "errors_404": "Oups, cette page ne peut pas être trouvée !",
+  "errors_500": "Il y a eu une erreur de serveur, réessayez plus tard !",
+  "local_username": "Nom d'Utilisateur",
+  "local_password": "Mot de Passe",
+  "local_error": "Il y a eu une erreur, veuillez réessayer plus tard !",
+  "no_filter_results": "Aucun Résultat Trouvé\nEssayez d'élargir Vos Filtres",
+  "donor_page": "Page des Donateurs",
   "go_back": "Retour",
   "access": "Accès",
   "link_discord": "Lier Discord",
   "select_webhook_strategy": "Gestionnaire d'alertes",
-  "webhook_strategy_success_0": "Succès! \nActualisation pour récupérer les paramètres d'alertes...",
+  "webhook_strategy_success_0": "Succès ! Rafraîchissement pour récupérer les paramètres d'alerte...",
   "register": "S'inscrire",
-  "invalid_credentials": "Les informations d'identification sont invalides",
+  "invalid_credentials": "Identifiants invalides",
+  "localauth_failed": "Échec de l'authentification",
   "error_creating_user": "Impossible d'enregistrer un nouvel utilisateur pour le moment",
-  "localauth_failed": "Authentification impossible",
-  "discord_linked": "Discord lié",
-  "telegram_linked": "Télégram lié",
+  "discord_linked": "Discord Lié",
+  "telegram_linked": "Telegram Lié",
   "level": "niveau",
   "km": "km",
   "feedback": "Retour",
-  "donor_menu": "Menu des donateurs",
-  "pokemon_cell": "L'emplacement du Pokémon peut varier",
-  "timer_verified": "Ce timer est vérifié",
-  "timer_unverified": "Ce timer n'est pas vérifié",
+  "donor_menu": "Menu Donateur",
+  "pokemon_cell": "La localisation du Pokémon pourrait varier",
+  "timer_verified": "Ce Minuteur est Vérifié",
+  "timer_unverified": "Ce Minuteur n'est pas Vérifié",
   "all": "Tout",
-  "badge_0": "Sans",
+  "badge_0": "Aucun",
   "badge_1": "Bronze",
   "badge_2": "Argent",
   "badge_3": "Or",
-  "gym_badge_menu": "Editer Badge d'Arène",
-  "gym_badges": "Badges d'Arènes",
-  "gym_badge_diamonds": "Afficher les Badges d'Arènes",
-  "gym_badges_subtitle": "Affiche les badges d'arènes sur la carte et une liste dans la page profile.",
-  "loading": "Chargement {{category}}",
+  "gym_badge_menu": "Modifier le Badge de Salle de Sport",
+  "gym_badges": "Badges de Salle de Sport",
+  "gym_badge_diamonds": "Afficher les Badges de Salle de Sport",
+  "gym_badges_subtitle": "Affiche les Badges de Salle de Sport sur la carte et une liste dans la page de profil.",
+  "confirm_filters_reset": "Réinitialiser les filtres",
+  "filters_reset_text": "Êtes-vous sûr de vouloir réinitialiser les paramètres aux valeurs par défaut ? Ceci ne peut être annulé !",
+  "filters_reset_title": "Réinitialiser les filtres",
+  "raid_quick_select": "Sélection Rapide",
+  "disabled": "Désactivé",
+  "loading": "Chargement de {{category}}",
   "loading_icons": "Récupération des Icônes",
   "loading_invasions": "Récupération des Invasions",
-  "login_button": 12,
-  "join_button": 12,
-  "scan_next": "Scanner un emplacement",
-  "scan_next_choose": "Glisser et déposer le marqueur pour définir l'emplacement de scan",
-  "scan_zone": "Scanner une zone",
-  "scan_zone_choose": "Glisser et déposer le marqueur pour définir l'emplacement et choisissez la taille du scan",
+  "scan_next": "Scanner l'Emplacement",
+  "scan_next_choose": "Glissez et déposez le Marqueur pour définir l'Emplacement du Scan",
+  "scan_zone": "Scanner une Zone",
+  "scan_zone_choose": "Glissez et déposez le Marqueur pour définir l'Emplacement de la Zone et choisir la Taille",
   "scan_zone_size": "Taille",
   "scan_zone_range": "Portée",
   "scan_zone_spacing": "Espacement",
   "scan_zone_radius": "Rayon",
-  "scan_requests": "Demandes de Scan ",
-  "scan_queue": "File d'attente ",
+  "scan_requests": "Demandes de Scan",
+  "scan_queue": "File d'attente actuelle",
   "click_to_scan": "Scanner ici",
   "scan_confirmed_title": "Demande de scan confirmée",
-  "scan_confirmed": "L'appareil a été envoyé à la position de scan, le résultat sera bientôt visible sur la map !",
+  "scan_confirmed": "Un travailleur a été envoyé à l'emplacement, le résultat apparaîtra bientôt sur la carte !",
   "scan_loading_title": "Envoi de la demande de scan",
-  "scan_loading": "Votre demande de scan est analysée et transmise au système !",
+  "scan_loading": "Votre demande de scan est en cours de traitement et envoyée au système !",
   "scan_error_title": "Erreur",
-  "scan_error": "Il y a eu une erreur lors du traitement de la demande de scan...",
-  "scan_outside_area": "Cet emplacement est en dehors des zones autorisées",
+  "scan_error": "Une erreur s'est produite lors du traitement de la demande de scan...",
+  "scan_outside_area": "Cet emplacement est en dehors des limites des zones autorisées",
   "pvp_ranking_cap": "Niveau",
-  "device_icons": "Icônes d'appareils",
-  "spawnpoint_icons": "Icônes de points d'apparition",
-  "confirm_filters_reset": "Réinitialiser les filtres",
-  "filters_reset_text": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ? \nCelà ne peut pas être annulé!",
-  "filters_reset_title": "Réinitialiser les filtres",
-  "raid_quick_select": "Sélection rapide",
-  "disabled": "Désactivé",
-  "search_raids": "Rechercher des raids",
-  "search_eggs": "Rechercher des œufs",
-  "search_quests": "Rechercher des quêtes",
-  "search_lures": "Rechercher des leurres",
-  "search_invasions": "Rechercher des invasions",
-  "lc_title": "Suivez votre position",
+  "lc_title": "Suivre Votre Emplacement",
   "lc_metersUnit": "mètres",
   "lc_feetUnit": "pieds",
   "lc_popup": "Vous êtes à {distance} {unit} de ce point",
   "lc_outsideMapBoundsMsg": "Vous semblez situé en dehors des limites de la carte",
   "no_alerts": "Aucune alerte trouvée",
-  "loading_settings": "Chargement des paramètres",
-  "refresh_to_continue": "Veuillez actualiser avant de continuer",
-  "session_expired_title": "La session a expiré",
+  "loading_settings": "Chargement des Paramètres",
+  "refresh_to_continue": "Veuillez rafraîchir avant de continuer",
+  "session_expired_title": "Session Expirée",
   "session_expired_body": "Votre session a expiré",
-  "old_client_title": "Mise à jour",
+  "old_client_title": "Désuet",
   "old_client_body": "Une nouvelle version de cette carte est disponible",
+  "early_old_client_title": "Désuet",
+  "early_old_client_body": "Une ancienne version de cette application pourrait être mise en cache dans votre navigateur, vous devrez vider votre cache avant de pouvoir utiliser cette application.",
   "refresh": "Rafraîchir",
   "points": "Points",
   "day": "Jour",
   "days": "Jours",
-  "react_error": "Un problème est survenu",
-  "clickable_icon": "L'icône est cliquable",
-  "weather_options": "Options météo",
-  "two_stops_till_next": "2 pokéstops jusqu'à la prochaine",
-  "one_stop_till_next": "1 pokéstops jusqu'à la prochaine",
-  "no_more_gyms": "Plus d'arènes",
-  "light_map_border": "Bordure de carte claire",
-  "dark_map_border": "Bordure de carte sombre",
-  "cell_blocked": "Cellule bloquée",
-  "poi_color": "Couleur du point d'intérêt",
-  "ultra_beast": "Ultra Bête",
-  "quest_condition": "État de la quête",
-  "always_show_labels": "Toujours afficher les étiquettes",
-  "scan_areas_options": "Options des zones de scan",
-  "historic_rarity": "Rareté historique",
-  "poi": "POI",
-  "300m_range": "Portée 300m",
-  "lure_range": "Distance des Leurres",
-  "tap_to_toggle": "Appuyez pour basculer",
-  "power_up": "Boost",
+  "react_error": "Quelque chose s'est Mal Passé",
+  "clickable_icon": "Icône Cliquotable",
+  "two_stops_till_next": "2 arrêts jusqu'au prochain",
+  "one_stop_till_next": "1 arrêt jusqu'au prochain",
+  "no_more_gyms": "Plus de salles de sport",
+  "light_map_border": "Contour de Carte Clair",
+  "dark_map_border": "Contour de Carte Sombre",
+  "cell_blocked": "Cellule Bloquée",
+  "poi_color": "Couleur du POI",
+  "quest_condition": "Condition de Quête",
+  "always_show_labels": "Toujours Afficher les Étiquettes",
+  "scan_areas_options": "Options des Zones de Scan",
+  "historic_rarity": "Rareté Historique",
+  "poi": "Points d'Intérêt",
+  "300m_range": "Portée de 300m",
+  "lure_range": "Portée de leurre",
+  "custom_range": "Portée personnalisée",
+  "tap_to_toggle": "Touchez pour basculer",
+  "power_up": "Renforcer",
   "never_alt": "Jamais",
-  "seen_nearby_stop": "Vus à proximité",
-  "seen_nearby_cell": "Vus dans cette cellule",
-  "seen_lure_encounter": "Pokemon de Leurre",
-  "seen_lure_wild": "Pokemon Sauvage de Leurre",
-  "seen_wild": "Pokemon Sauvage",
-  "event_stops": "Évènements",
-  "event_stop_timers": "Timers Pokéstop Évènement",
-  "size_0": "Tous",
-  "size_1": "XXS",
-  "size_2": "XS",
+  "seen_nearby_stop": "Vu à proximité",
+  "seen_nearby_cell": "Vu dans cette cellule",
+  "seen_lure_encounter": "Rencontre avec leurre",
+  "seen_lure_wild": "Apparition avec leurre",
+  "seen_wild": "Apparition sauvage",
+  "event_stops": "Arrêts événementiels",
+  "event_stop_timers": "Minuteries d'arrêts d'événements",
+  "size_0": "Toute taille",
+  "size_1": "TTP",
+  "size_2": "TP",
   "size_3": "M",
-  "size_4": "XL",
-  "size_5": "XXL",
-  "show_size_indicator": "Afficher les indicateurs de taille",
+  "size_4": "TG",
+  "size_5": "TTG",
+  "show_size_indicator": "Afficher l'indicateur de taille",
   "size": "Taille",
-  "gold_stop": "Pokéstop Doré",
-  "profile_backups": "Changement de profil",
-  "new_backup": "Nouvelle Sauvegarde",
+  "gold_stop": "Arrêt d'or",
+  "profile_backups": "Échange de Profil",
+  "new_backup": "Nouvelle sauvegarde",
   "create": "Créer",
   "load": "Charger",
   "update": "Mettre à jour",
   "delete": "Supprimer",
   "name": "Nom",
-  "only_confirmed": "Confirmé seulement",
-  "rocket_pokemon": "Pokémon Rocket",
+  "only_confirmed": "Uniquement confirmés",
+  "rocket_pokemon": "Pokémon de la Team Rocket",
   "decoy": "Leurre",
-  "s2_cell_limit_0": "Vous avez essayé de générer plus de 20 000 cellules ({{variable_0}})",
-  "show_all_pvp_ranks": "Afficher tous les rangs PVPS",
-  "enable_pokemon_popup_coords": "Afficher les coordonnées Pokémon",
-  "enable_gym_popup_coords": "Afficher les coordonnées Arènes",
-  "enable_pokestop_popup_coords": "Afficher les coordonnées Pokéstop",
-  "enable_portal_popup_coords": "Afficher les coordonnées Portails",
-  "on_block_join_discord": "Rejoignez le serveur Discord pour plus d'informations.",
-  "on_block_msg": "Vous avez été bloqué car membre de",
+  "s2_cell_limit_0": "Vous avez tenté de générer plus de 20 000 cellules ({{variable_0}})",
+  "show_all_pvp_ranks": "Afficher tous les rangs PVP",
+  "enable_pokemon_popup_coords": "Afficher les coordonnées des Pokémon",
+  "enable_gym_popup_coords": "Afficher les coordonnées des Arènes",
+  "enable_pokestop_popup_coords": "Afficher les coordonnées des Pokéstops",
+  "enable_portal_popup_coords": "Afficher les coordonnées des Portails",
+  "on_block_join_discord": "Veuillez rejoindre notre discord pour plus d'informations.",
+  "on_block_msg": "Vous avez été bloqué pour être membre de",
   "denied": "Refusé",
-  "showcase": "Concours",
-  "unknown_event": "Inconnu",
-  "slider_size": "Taille",
-  "s2cells": "Cellules S2",
-  "s2cells_options": "Options des cellules S2",
-  "scanner_subtitle": "Formuler des demandes de scan sur mesure",
-  "s2cells_subtitle": "Afficher les cellules S2 de différents niveaux sur la carte",
-  "backups_subtitle": "Activer des sauvegardes et chargements de paramètres d'un appareil à l'autre",
-  "backups": "Sauvegardes",
-  "global_search_lures": "Entrer le nom d'un Leurre...",
-  "global_search_pokemon": "Entrer le nom d'un Pokémon...",
-  "remove_webhook_entry": "Supprimer de {{name}}",
-  "event_stops_subtitle": "Affiche les Pokéstops d'événements spéciaux comme Kecleon",
-  "scanner": "Actions du Scanner",
-  "custom_range": "Plage Personnalisée",
+  "showcase": "Vitrine",
+  "unknown_event": "Événement inconnu",
   "scanner_countdown": "Disponible dans {{time}}s",
   "success": "Succès",
   "contribute": "Contribuer",
   "mi": "mi",
-  "filter_by_areas": "Filtrer par Zones",
-  "submit_nest_name": "Soumettre un Nom de Nid",
-  "nest_submission_menu": "Mise à Jour du Nom",
-  "nest_submissions": "Soumissions de Nid",
+  "filter_by_areas": "Filtrer par zones",
+  "submit_nest_name": "Soumettre le nom du nid",
+  "nest_submission_menu": "Mise à jour du nom",
+  "nest_submissions": "Soumissions de nid",
   "nest_submissions_subtitle": "Vous permet de soumettre de nouveaux noms pour les nids",
-  "pokemon_opacity": "Opacité Dynamique des Pokémon",
-  "invasion_opacity": "Opacité Dynamique des Invasions",
-  "raid_opacity": "Opacité Dynamique des Raids",
+  "pokemon_opacity": "Opacité dynamique des Pokémon",
+  "invasion_opacity": "Opacité dynamique des invasions",
+  "raid_opacity": "Opacité dynamique des raids",
   "opacity_ten_minutes": "Opacité à 10 minutes",
   "opacity_five_minutes": "Opacité à 5 minutes",
   "opacity_one_minute": "Opacité à 1 minute",
-  "level_circles": "Indicateurs de Niveau",
-  "min_level_circle": "Niveau Minimum de l'indicateur",
-  "mutation_auth_error": "Votre demande n'a pas abouti car vous n'êtes pas connecté",
-  "submitted_by": "Soumis Par",
+  "level_circles": "Indicateurs de niveau",
+  "min_level_circle": "Niveau du cercle minimal",
+  "mutation_auth_error": "Votre demande a échoué car vous n'êtes pas connecté",
+  "submitted_by": "Soumis par",
   "reversible": "Réversible",
   "version": "Version",
-  "route_tags": "Tags de routes",
-  "routes": "Routes",
-  "route_type": "Type de routes",
-  "routes_subtitle": "Voir les routes dans le jeu et les informations pertinentes à leur sujet sur la carte",
+  "route_tags": "Tags de route",
+  "routes": "Itinéraires",
+  "route_type": "Type d'itinéraire",
+  "routes_subtitle": "Voir les itinéraires dans le jeu et les informations pertinentes à leur sujet sur la carte",
   "description": "Description",
-  "additional_info": "Informations supplémentaires",
+  "additional_info": "Infos supplémentaires",
   "duration": "Durée",
-  "elevation": "Dénivelé",
-  "contest_category_1": "Plus petite taille",
-  "contest_category_2": "Plus grande taille",
+  "elevation": "Élévation",
+  "contest_category_1": "Taille la plus petite",
+  "context_category_2": "Taille la plus grande",
   "total_entries": "Total des entrées",
-  "showcase_rankings": "Classement de mise en valeur",
-  "showcase_rankings_subtitle": "Affiche une liste des meilleurs classements pour une mise en valeur à un Pokestop",
+  "showcase_rankings": "Classements de la vitrine",
+  "showcase_rankings_subtitle": "Affiche une liste des meilleurs classements pour une vitrine à un Pokéstop",
   "tth": "TTH",
   "tth_0": "Tous",
   "tth_1": "Connus",
   "tth_2": "Inconnus",
   "no_access": "Pas d'accès",
-  "context_category_2": "Plus grande taille",
-  "dialog_filter_footer_adv_menu_width": 2,
-  "cooldown": "Cool Down",
-  "scan_some_outside_area": "Certaines localisations sont en dehors des limites autorisées",
+  "cooldown": "Temps de recharge",
+  "scan_some_outside_area": "Certains emplacements sont en dehors des limites autorisées",
   "alerts": "alertes",
-  "alert_manager": "Gestionnaire d'alerte",
+  "alert_manager": "Gestionnaire d'alertes",
   "menu": "Menu",
-  "theme": "Thême",
-  "exit": "Sortie",
+  "theme": "Thème",
+  "exit": "Quitter",
   "component": "Composant",
   "component_login_page": "Page de connexion",
-  "component_donation_page": "Page de don",
+  "component_donation_page": "Page de donation",
   "component_message_of_the_day": "Message du jour",
   "download": "Télécharger",
-  "playground": "Playground",
-  "locale": "Langue",
-  "saved": "Sauvegardé",
-  "show_editor": "Montrer l'éditeur",
-  "hide_editor": "Cacher l'éditeur",
-  "reported_error": "Cette erreur a été remontée au serveur avec son identifiant",
+  "playground": "Aire de Jeux",
+  "locale": "Paramètres régionaux",
+  "saved": "Enregistré",
+  "show_editor": "Afficher l'éditeur",
+  "hide_editor": "Masquer l'éditeur",
+  "reported_error": "Cette erreur a été signalée au serveur avec l'identifiant",
   "dark_mode": "Mode Sombre",
-  "load_from_autosave": "Charger la sauvegarde auto",
-  "done": "Fait",
+  "load_from_autosave": "Charger depuis l'auto-enregistrement",
+  "done": "Terminé",
   "fast": "Rapide",
-  "charged": "Chargée",
+  "charged": "Chargé",
   "offline_mode": "Mode Hors Ligne",
-  "include_sponsored": "Inclure Sponsorisé",
-  "showcase_color": "Couleur des Concours",
-  "partner_color": "Couleur Partenaire",
+  "include_sponsored": "Inclure les Sponsorisés",
+  "showcase_color": "Couleur de Vitrine",
+  "partner_color": "Couleur du Partenaire",
   "disable": "Désactiver {{- name}}",
-  "profiling": "Profiling",
-  "showcase_block": "Bloqué à cause d'un concours",
+  "profiling": "Profilage",
+  "showcase_block": "Bloqué en raison d'une vitrine",
   "signed_in_as": "Connecté en tant que",
-  "missing_map_perm": "Vous n'avez pas la permission de voir la carte.",
-  "pokemon_audio": "Audio Pokémon",
-  "pokestop_audio": "Audio PokéStop",
-  "gym_audio": "Audio Arène",
-  "team_audio": "Audio Équipe",
-  "egg_audio": "Audio Œuf",
-  "raid_audio": "Audio Raid",
-  "nest_audio": "Audio Nid",
-  "reward_audio": "Audio Récompense",
-  "type_audio": "Audio Type",
-  "weather_audio": "Audio Météo",
-  "misc_audio": "Audio Divers",
-  "invasion_audio": "Audio Invasion",
-  "spawnpoint_audio": "Audio Point d'apparition",
-  "device_audio": "Audio Appareil",
-  "access_denied": "Accès refusé",
+  "missing_map_perm": "Vous n'avez pas l'autorisation de voir la carte.",
+  "access_denied": "Accès Refusé",
   "audio": "Audio",
-  "desktop_notifications": "Notifications Bureau",
+  "desktop_notifications": "Notifications sur le Bureau",
   "notifications_options": "Options de Notifications",
-  "audio_always_on": "Toujours jouer l'audio",
-  "volume_level": "Niveau du Volume",
+  "audio_always_on": "Audio Toujours Activé",
+  "volume_level": "Niveau de Volume",
   "notifications_status": "Statut des Notifications",
-  "granted": "autorisé",
-  "set_all": "Définir tous",
-  "set_filtered": "Définir filtrés",
-  "only_show_available": "Montrer disponible seulement",
+  "granted": "accordé",
+  "set_all": "Définir Tout",
+  "set_filtered": "Définir Filtré",
+  "only_show_available": "Afficher Uniquement les Disponibles",
   "easy_mode": "Mode Facile",
-  "quick_select": "Sélecteurs rapides globaux",
-  "pokemon_filter_mode": "Mode Filtres de Pokémon",
+  "quick_select": "Sélections Rapides Globales",
+  "pokemon_filter_mode": "Mode de Filtre Pokémon",
   "basic": "Basique",
   "intermediate": "Intermédiaire",
   "expert": "Expert",
   "basic_description": "Sélectionner facilement des Pokémon et appliquer un filtre global",
-  "intermediate_description": "Définir des filtres globaux et individuels par Pokémon (traditionnel)",
-  "expert_description": "Définir des filtres manuels pour des personnalisations avancées",
-  "icon_size": "Taille d'icônes",
-  "developer": "Developpeur",
-  "raid_override": "Raid Override",
-  "search_rocket_pokemon": "Recherche Pokémon de Sbire",
+  "intermediate_description": "Définir des filtres individuels globalement et par Pokémon (traditionnel)",
+  "expert_description": "Entrées manuelles pour le plus de personnalisation",
+  "icon_size": "Taille de l'Icône",
+  "developer": "Développeur",
+  "raid_override": "Substitution de Raid",
+  "search_rocket_pokemon": "Chercher Pokémon Rocket",
   "main": "Principal",
   "extra": "Extra",
-  "select": "Sélection",
-  "global_search_invasions": "Entrez le type de sbire, le nom ou le nom de la récompense du Pokémon...",
+  "select": "Sélectionner",
   "searching": "recherche en cours...",
-  "no_options": "Aucune option..."
+  "no_options": "Pas d'Options...",
+  "and": "ET",
+  "or": "OU",
+  "only_global": "Uniquement Global",
+  "global_caption": "Ignore Tous les Autres Filtres",
+  "global_and_individual": "Filtres Globaux et Individuels",
+  "gender_filters_all": "Le Genre S'Applique à Tous",
+  "and_caption": "Liés Ensemble",
+  "or_caption": "Filtres Indépendamment",
+  "filter_help": "Aide sur le Filtre",
+  "kilometers": "Kilomètres",
+  "miles": "Miles",
+  "distance_unit": "Unité de Distance",
+  "data_management": "Gestion des Données",
+  "reset_or_manage_text": "Vous pouvez soit réinitialiser totalement vos filtres, soit accéder à la page de gestion des données qui vous permettra de réinitialiser les catégories individuellement.",
+  "reset_audio": "Réinitialiser l'Audio",
+  "reset_all": "Tout Réinitialiser",
+  "reset_icons": "Réinitialiser les Icônes",
+  "reset_position": "Réinitialiser la Position",
+  "reset_ui": "Réinitialiser l'UI",
+  "reset_options": "Réinitialiser les Options",
+  "reset_menus": "Réinitialiser les Menus",
+  "reset_settings": "Réinitialiser les Paramètres",
+  "reset_general_title": "Général",
+  "reset_filters_title": "Filtres",
+  "reset_assets": "Réinitialiser les Ressources",
+  "reset_pokemon": "Réinitialiser les Pokémon",
+  "reset_pokestops": "Réinitialiser les PokéStops",
+  "reset_gyms": "Réinitialiser les Salles de Gym",
+  "reset_nests": "Réinitialiser les Nids",
+  "reset_portals": "Réinitialiser les Portails",
+  "reset_routes": "Réinitialiser les Itinéraires",
+  "reset_scan_areas": "Réinitialiser les Zones de Scan",
+  "reset_scan_cells": "Réinitialiser les Cellules de Scan",
+  "reset_devices": "Réinitialiser les Appareils",
+  "reset_weather": "Réinitialiser la Météo",
+  "reset_s2cells": "Réinitialiser les Cellules S2",
+  "reset_spawnpoints": "Réinitialiser les Points de Spawn",
+  "reset_submission_cells": "Réinitialiser les Cellules de Soumission",
+  "hisuian": "Hisui",
+  "spacial_rend_range": "Portée de Spatio-Rift"
 }
diff --git a/packages/locales/lib/generated/hi.json b/packages/locales/lib/generated/hi.json
index e3e311623..9b5f0bcbc 100644
--- a/packages/locales/lib/generated/hi.json
+++ b/packages/locales/lib/generated/hi.json
@@ -1,126 +1,126 @@
 {
   "login": "लॉगिन",
-  "click_once": "केवल 'अधिकृत' पर क्लिक करें एक बार",
+  "click_once": "केवल 'प्राधिकृत करें' एक बार ही क्लिक करें",
   "save": "सहेजें",
-  "reset": "रीसेट",
+  "reset": "रीसेट करें",
   "close": "बंद करें",
   "reset_filters": "फ़िल्टर रीसेट करें",
-  "pokemon_filters": "पोकेमॉन फ़िल्टर सेटिंग्स",
+  "pokemon_filters": "पोकेमोन फ़िल्टर सेटिंग्स",
   "gyms_filters": "जिम फ़िल्टर सेटिंग्स",
-  "pokestops_filters": "पोके स्टॉप फ़िल्टर सेटिंग्स",
+  "pokestops_filters": "पोकेस्टॉप फ़िल्टर सेटिंग्स",
   "nests_filters": "नेस्ट फ़िल्टर सेटिंग्स",
-  "help": "सहायता",
-  "apply_to_all": "सभी पर लागू करें",
+  "help": "मदद",
+  "apply_to_all": "सब पर लागू करें",
   "disable_all": "सभी को अक्षम करें",
   "enable_all": "सभी को सक्षम करें",
-  "enabled": "सक्रिय",
-  "legacy": "पुराना",
+  "enabled": "सक्षम किया गया",
+  "legacy": "लेगेसी",
   "id": "आईडी",
   "location": "स्थान",
-  "search_pokemon": "पोकेमॉन खोजें",
+  "search_pokemon": "पोकेमोन खोजें",
   "search_nests": "नेस्ट खोजें",
   "search_gyms": "जिम खोजें",
-  "search_pokestops": "पोके स्टॉप खोजें",
-  "search_raids": "रेड खोजें",
+  "search_pokestops": "पोकेस्टॉप खोजें",
+  "search_raids": "रेड्स खोजें",
   "search_eggs": "अंडे खोजें",
-  "search_quests": "क्वेस्ट खोजें",
-  "search_lures": "ल्यूर खोजें",
-  "search_invasions": "आक्रमण खोजें",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "search_quests": "क्वेस्ट्स खोजें",
+  "search_lures": "ल्यूर्स खोजें",
+  "search_invasions": "इनवेजन्स खोजें",
+  "sm": "छोटा",
+  "md": "मध्यम",
+  "lg": "बड़ा",
+  "xl": "बहुत बड़ा",
   "min": "न्यूनतम",
   "max": "अधिकतम",
-  "set_size": "आइकन आकार सेट करें",
+  "set_size": "आइकन साइज सेट करें",
   "slot_selection": "स्लॉट चयन",
   "generations": "पीढ़ियाँ",
   "types": "प्रकार",
-  "forms": "फ़ॉर्म",
-  "rarity": "वर्तमान प्रचलता",
+  "forms": "फॉर्म",
+  "rarity": "वर्तमान दुर्लभता",
   "others": "अन्य",
   "categories": "श्रेणियाँ",
   "rank": "रैंक",
-  "slider_iv": "आईवी सीमा",
+  "slider_iv": "IV रेंज",
   "slider_great": "ग्रेट लीग",
   "slider_ultra": "अल्ट्रा लीग",
   "slider_little": "लिटिल कप",
-  "slider_atk_iv": "हमला",
+  "slider_atk_iv": "आक्रमण",
   "slider_def_iv": "रक्षा",
-  "slider_sta_iv": "स्थामना",
-  "slider_level": "स्तर",
+  "slider_sta_iv": "स्टैमिना",
+  "slider_level": "लेवल",
   "slider_size": "आकार",
   "abbreviation_level": "L",
-  "lvl": "स्तर",
+  "lvl": "Lvl",
   "cap": "कैप",
   "custom": "कस्टम",
-  "valid": "मान्य",
+  "valid": "वैध",
   "invalid": "अमान्य!",
-  "overwrites": "सभी फ़िल्टर को अधिलेखित करें",
-  "valid_filter": "मान्य स्टैट्स फ़िल्टर",
-  "invalid_filter": "एक मान्य फ़िल्टर दर्ज करें",
+  "overwrites": "सभी फ़िल्टर्स को ओवरराइट करता है",
+  "valid_filter": "वैध स्टैट्स फ़िल्टर",
+  "invalid_filter": "एक वैध फ़िल्टर दर्ज करें",
   "gyms": "जिम",
   "nests": "नेस्ट",
-  "pokestops": "पोके स्टॉप",
-  "pokemon": "पोकेमॉन",
-  "wayfarer": "वेफ़ेरर",
-  "scan_areas": "स्कैन क्षेत्र",
+  "pokestops": "पोकेस्टॉप्स",
+  "pokemon": "पोकेमोन",
+  "wayfarer": "वेफेयरर",
+  "scan_areas": "स्कैन एरिया",
   "s2cells": "S2 सेल्स",
   "weather": "मौसम",
-  "admin": "व्यवस्थापक",
+  "admin": "एडमिन",
   "settings": "सेटिंग्स",
   "advanced": "उन्नत",
   "tile_servers": "टाइल सर्वर",
-  "icons": "आइकन",
+  "icons": "आइकन्स",
   "navigation": "नेविगेशन",
-  "drawer": "ड्रावर",
+  "drawer": "ड्रॉअर",
   "tile_servers_default": "डिफ़ॉल्ट",
   "drawer_temporary": "अस्थायी",
   "drawer_persistent": "स्थायी",
-  "locale_selection": "स्थानीय चयन",
-  "import": "आयात",
-  "export": "निर्यात",
+  "locale_selection": "लोकेल चयन",
+  "import": "आयात करें",
+  "export": "निर्यात करें",
   "logout": "लॉगआउट",
-  "local_storage_cleared": "स्थानीय संग्रहण साफ़ हो गया है!",
-  "iv_or_filter": "आईवी या फ़िल्टर",
+  "local_storage_cleared": "लोकल स्टोरेज साफ़ कर दिया गया है!",
+  "iv_or_filter": "IV OR फ़िल्टर",
   "polygons": "बहुभुज",
-  "raids": "हमला",
+  "raids": "रेड्स",
   "ex_eligible": "EX योग्य",
-  "in_battle": "लड़ाई में",
-  "all_pokestops": "सभी पोके स्टॉप",
-  "lures": "ल्यूर",
-  "quests": "क्वेस्ट",
-  "invasions": "आक्रमण",
-  "portals": "पोर्टल",
+  "in_battle": "बैटल में",
+  "all_pokestops": "सभी पोकेस्टॉप्स",
+  "lures": "ल्यूर्स",
+  "quests": "क्वेस्ट्स",
+  "invasions": "इनवेजन्स",
+  "portals": "पोर्टल्स",
   "submission_cells": "सबमिशन सेल्स",
-  "spawnpoint": "स्पॉन्टिंग पॉइंट",
-  "spawnpoints": "स्पॉन पॉइंट्स",
-  "s2_cell_level": "स्तर {{level}} एस 2 सेल",
-  "total_count": "कुल गिनती",
-  "next_submission": "अगली सबमिशन!",
+  "spawnpoint": "स्पॉनपॉइंट",
+  "spawnpoints": "स्पॉनपॉइंट्स",
+  "s2_cell_level": "लेवल {{level}} S2 सेल",
+  "total_count": "कुल गणना",
+  "next_submission": "अगला सबमिशन!",
   "never": "कभी नहीं",
   "next_gym": "अगला जिम",
   "scan_cells": "स्कैन सेल्स",
   "devices": "उपकरण",
   "use_my_location": "मेरा स्थान उपयोग करें",
   "submit_feedback_title": "प्रतिक्रिया/बग रिपोर्ट सबमिट करें",
-  "use_the_link_below": "आप नीचे दिए गए लिंक का उपयोग करके प्रतिक्रिया या किसी भी बग को सबमिट कर सकते हैं जिनका आप सामना कर रहे हैं।",
+  "use_the_link_below": "आप नीचे दिए गए लिंक का उपयोग करके प्रतिक्रिया या किसी भी बग को जो आपको आई है, सबमिट कर सकते हैं।",
   "feedback_to_devs": "यह प्रतिक्रिया सीधे डेवलपर्स को भेजी जाती है।",
   "feedback_form": "प्रतिक्रिया फॉर्म",
-  "unknown_pokestop": "अज्ञात पोके स्टॉप नाम",
-  "unknown_gym": "अज्ञात जिम नाम",
-  "exclude": "छोड़ें",
-  "exclude_quest": "क्वेस्ट छोड़ें",
-  "exclude_invasion": "आक्रमण छोड़ें",
-  "exclude_team": "टीम छोड़ें",
-  "exclude_raid": "रेड छोड़ें",
-  "exclude_lure": "ल्यूर छोड़ें",
+  "unknown_pokestop": "अज्ञात पोकेस्टॉप नाम",
+  "unknown_gym": "अज्ञात जिम का नाम",
+  "exclude": "बाहर रखें",
+  "exclude_quest": "क्वेस्ट को बाहर रखें",
+  "exclude_invasion": "आक्रमण को बाहर रखें",
+  "exclude_team": "टीम को बाहर रखें",
+  "exclude_raid": "रेड को बाहर रखें",
+  "exclude_lure": "ल्योर को बाहर रखें",
   "timer": "टाइमर",
-  "hide": "छिपाएँ",
-  "tier": "तिर",
-  "slots": "स्लॉट",
+  "hide": "छिपाएं",
+  "tier": "टियर",
+  "slots": "स्लॉट्स",
   "mega": "मेगा",
-  "form": "फॉर्म",
+  "form": "रूप",
   "starts": "शुरू होता है",
   "ends": "समाप्त होता है",
   "defender": "रक्षक",
@@ -130,191 +130,206 @@
   "total_cp": "कुल सीपी",
   "first_seen": "पहली बार देखा गया",
   "last_seen": "अंतिम बार देखा गया",
-  "last_modified": "अंतिम संशोधित",
+  "last_modified": "अंतिम संशोधन",
   "last_updated": "अंतिम अपडेट",
   "imported": "आयातित",
   "nest_estimated": "नेस्ट डेटा अनुमानित है!",
   "verify_nests": "वर्तमान स्पॉन्स की जांच करके सत्यापित करें",
-  "nest_out_of_date": "नेस्ट संभावित रूप से अद्यतित नहीं है!",
-  "nest_check_current": "वर्तमान स्पॉन्स की जगह जांचें",
+  "nest_out_of_date": "नेस्ट संभवतः पुराना है!",
+  "nest_check_current": "इसके बजाय वर्तमान स्पॉन्स जांचें",
   "spawns_per_hour": "प्रति घंटा",
-  "teams": "टीम",
+  "teams": "टीम्स",
   "eggs": "अंडे",
-  "reverse": "उलटा",
+  "reverse": "उल्टा",
   "selected": "चयनित",
   "unselected": "अचयनित",
-  "only_available": "उपलब्ध",
+  "only_available": "केवल उपलब्ध",
   "common": "सामान्य",
-  "uncommon": "असामान्य",
-  "rare": "दुर्लभ",
-  "ultra_rare": "अत्यंत दुर्लभ",
+  "uncommon": "दुर्लभ",
+  "rare": "विरल",
+  "ultra_rare": "अत्यंत विरल",
   "regional": "क्षेत्रीय",
   "event": "इवेंट",
-  "legendary": "प्रसिद्ध",
-  "mythical": "पौराणिक",
+  "legendary": "लीजेंडरी",
+  "mythical": "मिथकीय",
   "ultra_beast": "अल्ट्रा बीस्ट",
-  "alt_forms": "अलग फॉर्म",
+  "alt_forms": "वैकल्पिक रूप",
   "alola": "अलोला",
-  "galarian": "गालारियन",
+  "galarian": "गैलेरियन",
   "showing": "दिखा रहा है",
   "instance": "इंस्टेंस",
   "online": "ऑनलाइन",
   "offline": "ऑफलाइन",
-  "boosted_types": "बढ़ाया गया प्रकार",
+  "boosted_types": "बूस्टेड प्रकार",
   "pokemon_options": "पोकेमॉन विकल्प",
-  "pokestops_options": "पोके स्टॉप विकल्प",
+  "pokestops_options": "पोकेस्टॉप विकल्प",
   "gyms_options": "जिम विकल्प",
   "nests_options": "नेस्ट विकल्प",
-  "wayfarer_options": "वेफरर विकल्प",
-  "admin_options": "व्यवस्थापक विकल्प",
+  "wayfarer_options": "वेफेयर विकल्प",
+  "admin_options": "एडमिन विकल्प",
   "weather_options": "मौसम विकल्प",
-  "s2cells_options": "एस 2 सेल विकल्प",
+  "s2cells_options": "S2 सेल विकल्प",
   "clustering": "क्लस्टरिंग",
   "glow": "चमक",
-  "legacy_filter": "पुरानी फ़िल्टर",
+  "legacy_filter": "लीगेसी फिल्टर",
   "raid_timers": "सभी रेड टाइमर",
   "invasion_timers": "सभी आक्रमण टाइमर",
-  "lure_timers": "सभी ल्यूर टाइमर",
-  "device_path_color": "उपकरण पथ रंग",
-  "old_portals": "पुराने पोर्टल",
-  "new_portals": "नए पोर्टल",
-  "items": "आइटम",
+  "lure_timers": "सभी ल्योर टाइमर",
+  "device_path_color": "डिवाइस पथ कलर",
+  "old_portals": "पुराने पोर्टल्स",
+  "new_portals": "नए पोर्टल्स",
+  "items": "वस्तुएँ",
   "energy": "ऊर्जा",
   "ar_eligible": "AR योग्य",
   "iv_circles": "IV संकेतक",
   "min_iv_circle": "न्यूनतम सर्कल IV",
-  "interaction_ranges": "इंटरैक्शन रेंज",
-  "cannot_connect": "इस समय सर्वर से कनेक्ट करने में असमर्थ।",
-  "mad_quest_text": "तुरंत पुनः प्रयास करने से अधिक समस्याएं होंगी। कृपया कुछ मिनटों बाद पुनः प्रयास करें।\n\n- मानचित्र प्रशासन टीम",
-  "xs": "मूलभूत क्वेस्ट",
-  "primary": "XS",
-  "secondary": "प्राथमिक",
-  "zero_iv": "द्वितीयक",
-  "hundo_iv": "0% IV",
-  "open_menu": "100% IV",
-  "zoom_in": "मेन्यू खोलें",
-  "zoom_out": "ज़ूम इन करें",
-  "welcome": "ज़ूम आउट करें",
-  "back": "स्वागत है",
-  "next": "पीछे जाएं",
-  "finish": "आगे जाएं",
-  "start_tutorial": "समाप्त करें",
-  "view_profile": "ट्यूटोरियल शुरू करें",
-  "login_optional": "प्रोफ़ाइल देखें",
-  "tutorial": "लॉगिन (वैकल्पिक)",
-  "tutorial_language": "ट्यूटोरियल",
-  "tutorial_welcome": "अपनी भाषा चुनें",
-  "tutorial_categories": "यह ट्यूटोरियल इंटरैक्टिव है और आपको सभी विकल्पों के साथ खेलने की प्रोत्साहना की जाती है",
-  "tutorial_logged_in": "आपके पास पहुंच के श्रेणियाँ",
-  "tutorial_logged_out": "आप अपनी प्रोफ़ाइल देखकर अपनी अनुमतियों के बारे में विवरण देख सकते हैं।",
-  "tutorial_sidebar_0": "आप लॉगिन करके अपनी अनुमतियों के बारे में विवरण देख सकते हैं।",
-  "tutorial_sidebar_1": "आपके सभी फ़िल्टर और सेटिंग्स यहां रहते हैं",
-  "tutorial_sidebar_2": "प्रत्येक श्रेणी के लिए आप स्विच का उपयोग करके विशेष डेटा को टॉगल कर सकेंगे",
-  "tutorial_sliders_0": "विकल्प: अतिरिक्त अनुकूलन\nउन्नत: हम इस ट्यूटोरियल में बाद में चर्चा करेंगे",
-  "tutorial_sliders_1": "फ़िल्टर्स को समायोजित करने के लिए स्लाइडर का उपयोग करना",
-  "tutorial_sliders_2": "पोकेमॉन बीच में:",
-  "tutorial_sliders_3": "- IVs {{iv0}}% से {{iv1}}%",
-  "tutorial_sliders_3alt": "स्तर {{level0}} से {{level1}}",
-  "tutorial_sliders_4": "- और स्तर {{level0}} से {{level1}}",
-  "tutorial_sliders_4alt": "- महान लीग रैंक {{gl0}} से {{gl1}} तक",
-  "tutorial_sliders_5": "- या महान लीग रैंक {{gl0}} से {{gl1}} तक",
-  "tutorial_sliders_5alt": "- अल्ट्रा लीग रैंक {{ul0}} से {{ul1}} तक",
-  "tutorial_sliders_6": "- या अल्ट्रा लीग रैंक {{ul0}} से {{ul1}} तक",
-  "tutorial_sliders_7": "उसी रंग के अन्य के साथ चेन",
-  "tutorial_sliders_8": "अन्य स्लाइडर से अलग फ़िल्टर करें",
-  "tutorial_sliders_9": "'पूर्ण' स्लाइडर का मतलब है कि यह अक्षम है:",
-  "tutorial_help": "सभी स्पॉन, चाहे IV चेक किया गया हो या नहीं",
-  "tutorial_adv_filter": "इस मेनू के लिए शॉर्टकट",
-  "tutorial_tune": "मोबाइल के लिए, उन्नत मेनू के लिए फ़िल्टरिंग विकल्प खोलता है",
-  "tutorial_format_size": "मेनू में फ़िल्टरिंग किए जा रहे सभी पोकेमॉन के लिए उन्नत फ़िल्टर सेट करता है",
-  "tutorial_check": "मेनू में फ़िल्टरिंग किए जा रहे सभी आइटम के लिए आइकन आकार सेट करता है",
-  "tutorial_clear": "मेनू में फ़िल्टरिंग किए जा रहे सभी आइटम को सक्षम करता है",
-  "tutorial_save": "मेनू में फ़िल्टरिंग किए जा रहे सभी आइटम को अक्षम करता है",
-  "tutorial_show_all_view": "वर्तमान चयन को सहेजता है और बाहर निकलता है",
-  "tutorial_show_pokemon_view": "पोके स्टॉप और जिम को टॉगल करें",
-  "tutorial_toggle": "पोकेमॉन को टॉगल करें",
-  "tutorial_pokemon_caption": "चेक/एक्स पर क्लिक करने से आइटम टॉगल होता है",
-  "tutorial_all_caption": "यह आइकन आपको उस विशेष पोकेमॉन के लिए फ़िल्टर सेट करने देता है",
-  "tutorial_popup_0": "टीमों के लिए एक विशेष स्लॉट मेनू होता है\nअन्य सभी आइटम आपको आइकन आकार समायोजित करने देते हैं",
-  "tutorial_popup_1": "पॉपअप अब इंटरैक्टिव हैं!",
-  "tutorial_popup_2": "नेविगेशन लिंक के दोनों ओर आइकन अतिरिक्त जानकारी दिखाने के लिए विस्तारित हो जाएंगे, इसे आज़माएं!",
-  "tutorial_popup_3": "प्रत्येक श्रेणी के लिए प्रतीक भिन्न होते हैं, सभी को जांचने के लिए सुनिश्चित करें",
+  "interaction_ranges": "इंटरेक्शन रेंज",
+  "cannot_connect": "\nइस समय सर्वर से कनेक्ट नहीं हो सकता।\nतुरंत फिर से प्रयास करने से अधिक समस्याएँ होंगी।\nकृपया कुछ मिनटों में पुनः प्रयास करें।\n\n- मैप एडमिन टीम",
+  "mad_quest_text": "मूल क्वेस्ट्स",
+  "xs": "XS",
+  "primary": "प्राथमिक",
+  "secondary": "द्वितीयक",
+  "zero_iv": "0% IV",
+  "hundo_iv": "100% IV",
+  "open_menu": "मेन्यू खोलें",
+  "zoom_in": "ज़ूम इन",
+  "zoom_out": "ज़ूम आउट",
+  "welcome": "आपका स्वागत है",
+  "back": "वापस",
+  "next": "अगला",
+  "finish": "समाप्त",
+  "start_tutorial": "ट्यूटोरियल शुरू करें",
+  "view_profile": "प्रोफ़ाइल देखें",
+  "login_optional": "लॉगिन (वैकल्पिक)",
+  "tutorial": "ट्यूटोरियल",
+  "tutorial_language": "अपनी भाषा चुनें",
+  "tutorial_welcome": "यह ट्यूटोरियल इंटरैक्टिव है और आपसे अनुरोध किया जाता है कि आप प्रदान किए गए सभी विकल्पों के साथ खेलें",
+  "tutorial_categories": "आपकी पहुँच में आने वाली श्रेणियाँ",
+  "tutorial_logged_in": "अपनी प्रोफ़ाइल देखकर आप अपनी अनुमतियों के बारे में विवरण देख सकते हैं।",
+  "tutorial_logged_out": "लॉगिन करके आप अपनी अनुमतियों के बारे में विवरण देख सकते हैं।",
+  "tutorial_sidebar_0": "आपके सभी फिल्टर्स और सेटिंग्स यहाँ रहते हैं",
+  "tutorial_sidebar_1": "प्रत्येक श्रेणी के लिए आप स्विच का उपयोग करके वांछित डेटा को टॉगल कर पाएंगे",
+  "tutorial_sidebar_2": "विकल्प: अधिक अनुकूलन\nउन्नत: हम इस ट्यूटोरियल में बाद में कवर करेंगे",
+  "tutorial_sliders_0": "फिल्टर्स समायोजित करने के लिए स्लाइडर का इस्तेमाल",
+  "tutorial_sliders_1": "पोकेमोन के बीच में:",
+  "tutorial_sliders_2": "- IVs {{iv0}}% से {{iv1}}%",
+  "tutorial_sliders_3": "स्तर {{level0}} से {{level1}} तक",
+  "tutorial_sliders_3alt": "- और है स्तर {{level0}} से {{level1}} तक",
+  "tutorial_sliders_4": "- ग्रेट लीग रैंक {{gl0}} से {{gl1}} तक",
+  "tutorial_sliders_4alt": "- या ग्रेट लीग रैंक {{gl0}} से {{gl1}} तक",
+  "tutorial_sliders_5": "- अल्ट्रा लीग रैंक {{ul0}} से {{ul1}} तक",
+  "tutorial_sliders_5alt": "- या अल्ट्रा लीग रैंक {{ul0}} से {{ul1}} तक",
+  "tutorial_sliders_6": "एक ही रंग के अन्य के साथ श्रृंखला बनाई गई है",
+  "tutorial_sliders_7": "अन्य स्लाइडर्स से पृथक फिल्टर करता है",
+  "tutorial_sliders_8": "एक 'पूर्ण' स्लाइडर का मतलब है कि यह निष्क्रिय है:",
+  "tutorial_sliders_9": "सभी स्पॉन, चाहे वे IV जाँचे गए हों या नहीं",
+  "tutorial_help": "इस मेन्यू के लिए शॉर्टकट",
+  "tutorial_adv_filter": "मोबाइल केवल, उन्नत मेनू के लिए फिल्टरिंग विकल्प खोलता है",
+  "tutorial_tune": "मेन्यू में वर्तमान में फिल्टर किए गए सभी पोकेमोन के लिए उन्नत फिल्टर सेट करता है",
+  "tutorial_format_size": "मेन्यू में वर्तमान में फिल्टर किए गए सभी आइटम्स का आइकन साइज सेट करता है",
+  "tutorial_check": "मेन्यू में वर्तमान में फिल्टर किए गए सभी आइटम्स को सक्षम करता है",
+  "tutorial_clear": "मेन्यू में वर्तमान में फिल्टर किए गए सभी आइटम्स को निष्क्रिय करता है",
+  "tutorial_save": "वर्तमान चयन को सहेजता है और बाहर निकलता है",
+  "tutorial_show_all_view": "पोकेस्टॉप्स और जिम्स को टॉगल करें",
+  "tutorial_show_pokemon_view": "पोकेमोन को टॉगल करें",
+  "tutorial_toggle": "चेक/X पर क्लिक करने से आइटम टॉगल होता है",
+  "tutorial_pokemon_caption": "इस आइकन का इस्तेमाल करके आप उस विशेष पोकेमोन के लिए फिल्टर सेट कर सकते हैं",
+  "tutorial_all_caption": "टीमों के लिए एक विशेष स्लॉट मेनू होता है\nअन्य सभी आइटम्स आपको आइकन साइज समायोजित करने देता है",
+  "tutorial_popup_0": "पॉपअप्स अब इंटरेक्टिव हैं!",
+  "tutorial_popup_1": "तीन बिंदु छिपाने, बहिष्कृत करने और टाइमर विकल्पों को टॉगल करते हैं",
+  "tutorial_popup_2": "नेविगेशन लिंक के दोनों ओर के आइकन्स अतिरिक्त जानकारी दिखाने के लिए विस्तारित होंगे, इसे आजमाकर देखें!",
+  "tutorial_popup_3": "प्रत्येक श्रेणी के लिए आइकन्स विविध होते हैं, सभी को ज़रूर जांचें",
   "tutorial_closing_0": "अतिरिक्त जानकारी",
-  "tutorial_closing_1": "साइडबार में वैश्विक पोकेमॉन स्लाइडर उन्नत मेनू से अलग होते हैं और एक दूसरे पर कोई प्रभाव नहीं डालते",
-  "tutorial_closing_2": "साइडबार में सेटिंग्स खंड जरूर देखें",
-  "tutorial_closing_3": "प्रत्येक श्रेणी के लिए बहुत सारे सौंदर्यिक विकल्प उपलब्ध हैं, लेकिन ध्यान दें कि जितना अधिक आप अपने मानचित्र में जोड़ेंगे, उतनी ही अधिक आपके मानचित्र को जम होने का खतरा होगा",
-  "tutorial_closing_4": "आप सेटिंग्स पैनल में इस ट्यूटोरियल को फिर से देख सकते हैं",
-  "tutorial_closing_5": "सुरक्षित रहें और शुभकामनाएं!",
+  "tutorial_closing_1": "साइडबार में वैश्विक पोकेमोन स्लाइडर्स उन्नत मेनू से स्वतंत्र रूप से काम करते हैं और एक दूसरे पर कोई प्रभाव नहीं डालते",
+  "tutorial_closing_2": "साइडबार में सेटिंग्स अनुभाग को ज़रूर देखें",
+  "tutorial_closing_3": "प्रत्येक श्रेणी के लिए बहुत सारे सौंदर्य विकल्प उपलब्ध हैं, लेकिन ध्यान रखें कि आप अपने मानचित्र में जितना अधिक जोड़ेंगे, आपके मानचित्र के फ्रीज होने की संभावना उतनी ही अधिक होगी",
+  "tutorial_closing_4": "साइडबार में सेटिंग्स पैनल में इसे चुनकर आप इस ट्यूटोरियल को फिर से देख सकते हैं",
+  "tutorial_closing_5": "सुरक्षित रहें और शुभकामनाएँ!",
   "intro": "परिचय",
   "sidebar": "साइडबार",
-  "sliders": "स्लाइडर",
-  "popups": "पॉपअप",
-  "closing": "बंद करना",
-  "shortcuts": "शॉर्टकट",
+  "sliders": "स्लाइडर्स",
+  "popups": "पॉपअप्स",
+  "closing": "समापन",
+  "shortcuts": "शॉर्टकट्स",
   "iv": "IV",
   "area_restrictions": "क्षेत्र प्रतिबंध",
   "map": "मानचित्र",
   "stats": "आँकड़े",
   "pvp": "PVP",
-  "area_restrictions_subtitle": "आपके पास इन क्षेत्रों का पहुंच है",
-  "devices_subtitle": "सक्रिय उपकरण स्थानों और मार्गों को दिखाता है",
-  "gyms_subtitle": "सभी सक्रिय जिम स्थानों, सक्रिय टीम और हर जिम के उपलब्ध स्लॉट्स को दिखाता है",
-  "invasions_subtitle": "टीम रॉकेट आक्रमण जानकारी दिखाता है, युद्ध लाइनअप, समाप्ति समय और संभावित इनाम सहित",
+  "area_restrictions_subtitle": "आपको इन क्षेत्रों तक पहुँच है",
+  "devices_subtitle": "सक्रिय डिवाइस स्थान और मार्ग दिखाता है",
+  "gyms_subtitle": "सभी सक्रिय जिम स्थान, सक्रिय टीम, और प्रत्येक जिम में कितने स्लॉट उपलब्ध हैं दिखाता है",
+  "invasions_subtitle": "टीम रॉकेट आक्रमण जानकारी दिखाता है, जिसमें युद्ध लाइनअप, समाप्ति समय, और संभावित पुरस्कार शामिल हैं",
   "iv_subtitle": "IV% और चमक विकल्प दिखाता है",
-  "lures_subtitle": "ल्यूर जानकारी दिखाता है, ल्यूर प्रकार और समाप्ति समय सहित",
+  "lures_subtitle": "लूर जानकारी दिखाता है, जिसमें लूर प्रकार और समाप्ति समय शामिल है",
   "map_subtitle": "मानचित्र दिखाता है",
-  "nests_subtitle": "सक्रिय रूप से घोसले पोकेमॉन और घोसले के बहुभुज दिखाता है",
-  "pokemon_subtitle": "सभी पोकेमॉन स्थानों और समाप्ति समय दिखाता है",
-  "pokestops_subtitle": "सभी पोके स्थानों की जानकारी दिखाएं",
-  "portals_subtitle": "सभी इंग्रेस पोर्टल दिखाएं",
-  "pvp_subtitle": "प्रत्येक पोकेमॉन के लिए पीवीपी रैंक/सीपी/स्तर की जानकारी दिखाएं",
-  "quests_subtitle": "प्रतियोगिता का पुरस्कार और कार्य जानकारी दिखाएं",
-  "raids_subtitle": "रेड बॉस, अंडे, समाप्ति समय और मूवसेट सहित सभी रेड जानकारी दिखाएं",
-  "scan_cells_subtitle": "एक उपकरण द्वारा एक S2 सेल के द्वारा अंतिम बार स्कैन किया गया समय दिखाएं",
-  "scan_areas_subtitle": "उपलब्ध स्कैन क्षेत्र के बहुभुज दिखाएं",
-  "spawnpoints_subtitle": "स्पॉन पॉइंट्स और उनके अनुमानित डिस्पॉन समय दिखाएं",
-  "stats_subtitle": "पोकेमॉन के आंकड़े और स्तर दिखाएं",
-  "submission_cells_subtitle": "नए पोइंट ऑफ़ इंटरेस्ट सबमिट करने के लिए उपयोगी जानकारी दिखाएं",
-  "weather_subtitle": "प्रत्येक सेल के लिए खेल में मौसम की जानकारी दिखाएं",
-  "scanner_subtitle": "विभिन्न तरीकों से स्कैनर के साथ संवाद करें",
-  "s2cells_subtitle": "मानचित्र पर विभिन्न स्तरों में S2 सेल दिखाएं",
-  "backups_subtitle": "उपकरणों के बीच सेटिंग्स की बैकअप और लोडिंग सक्षम करें",
+  "nests_subtitle": "सक्रिय रूप से घोंसले लगाने वाले पोकेमोन और घोंसले के बहुभुज दिखाता है",
+  "pokemon_subtitle": "सभी पोकेमोन स्थान और समाप्ति समय दिखाता है",
+  "pokestops_subtitle": "सभी पोकेस्टॉप स्थान दिखाता है",
+  "portals_subtitle": "सभी इंग्रेस पोर्टल दिखाता है",
+  "pvp_subtitle": "प्रत्येक पोकेमोन के लिए PVP रैंक/CP/लेवल की जानकारी दिखाता है",
+  "quests_subtitle": "क्वेस्ट इनाम और कार्य की जानकारी दिखाता है",
+  "raids_subtitle": "सभी रेड की जानकारी दिखाता है जिसमें रेड बॉस, अंडे, समय समाप्ति, और मूवसेट शामिल है",
+  "scan_cells_subtitle": "किसी S2 सेल को आखिरी बार किस उपकरण द्वारा स्कैन किया गया था यह दर्शाता है",
+  "scan_areas_subtitle": "उपलब्ध स्कैन क्षेत्रों के बहुभुज दिखाता है",
+  "spawnpoints_subtitle": "स्पॉनपॉइंट्स और उनके अनुमानित डिस्पॉन समय दिखाता है",
+  "stats_subtitle": "पोकेमोन के स्टैट्स और लेवल्स दिखाता है",
+  "submission_cells_subtitle": "नए POI जमा करने के लिए उपयोगी जानकारी दिखाता है",
+  "weather_subtitle": "प्रत्येक सेल के लिए गेम के अंदर के मौसम की जानकारी दिखाता है",
+  "scanner_subtitle": "विभिन्न तरीकों से स्कैनर के साथ सीधे इंटरेक्ट करें",
+  "s2cells_subtitle": "नक्शे पर विभिन्न स्तरों में S2 सेल्स प्रदर्शित करता है",
+  "backups_subtitle": "उपकरणों में सेटिंग्स का बैकअप लेने और लोड करने को सक्षम बनाता है",
   "backups": "बैकअप",
-  "user_profile": "उपयोगकर्ता प्रोफ़ाइल",
+  "user_profile": "उपयोगकर्ता प्रोफाइल",
   "user_username": "उपयोगकर्ता नाम",
   "candy": "कैंडी",
   "show_ex_badge": "EX बैज दिखाएं",
   "search": "खोजें",
-  "global_search_quests": "पुरस्कार का नाम दर्ज करें...",
+  "global_search_quests": "इनाम का नाम दर्ज करें...",
   "global_search_lures": "ल्यूर का नाम दर्ज करें...",
-  "global_search_pokestops": "पोके स्थान का नाम दर्ज करें...",
+  "global_search_pokestops": "पोकेस्टॉप का नाम दर्ज करें...",
   "global_search_gyms": "जिम का नाम दर्ज करें...",
   "global_search_portals": "पोर्टल का नाम दर्ज करें...",
-  "global_search_nests": "नेस्ट पोकेमॉन का नाम दर्ज करें...",
+  "global_search_nests": "नेस्ट पोकेमोन का नाम दर्ज करें...",
   "global_search_raids": "रेड बॉस का नाम दर्ज करें...",
-  "global_search_pokemon": "पोकेमॉन का नाम दर्ज करें...",
+  "global_search_pokemon": "पोकेमोन का नाम दर्ज करें...",
+  "global_search_invasions": "ग्रंट का प्रकार, नाम, या पोकेमोन इनाम का नाम दर्ज करें...",
   "raid_level_badges": "रेड स्तर बैज",
   "options": "विकल्प",
-  "profile": "प्रोफ़ाइल",
-  "pokemon_icons": "पोकेमॉन आइकन",
-  "pokestop_icons": "पोके स्थान आइकन",
+  "profile": "प्रोफाइल",
+  "pokemon_icons": "पोकेमोन आइकन",
+  "pokestop_icons": "पोकेस्टॉप आइकन",
   "gym_icons": "जिम आइकन",
   "team_icons": "टीम आइकन",
-  "egg_icons": "अंडा आइकन",
+  "egg_icons": "अंडे के आइकन",
   "raid_icons": "रेड आइकन",
   "nest_icons": "नेस्ट आइकन",
-  "reward_icons": "पुरस्कार आइकन",
+  "reward_icons": "इनाम के आइकन",
   "type_icons": "प्रकार आइकन",
   "weather_icons": "मौसम आइकन",
   "misc_icons": "विविध आइकन",
   "invasion_icons": "आक्रमण आइकन",
   "spawnpoint_icons": "स्पॉनपॉइंट आइकन",
-  "device_icons": "डिवाइस आइकन",
-  "pokemon_timers": "सभी पोकेमॉन टाइमर",
-  "show_dex_num_in_popup": "पॉपअप में पोकेडेक्स नंबर दिखाएं",
+  "device_icons": "उपकरण आइकन",
+  "pokemon_audio": "पोकेमोन ऑडियो",
+  "pokestop_audio": "पोकेस्टॉप ऑडियो",
+  "gym_audio": "जिम ऑडियो",
+  "team_audio": "टीम ऑडियो",
+  "egg_audio": "अंडे का ऑडियो",
+  "raid_audio": "रेड ऑडियो",
+  "nest_audio": "नेस्ट ऑडियो",
+  "reward_audio": "इनाम का ऑडियो",
+  "type_audio": "प्रकार का ऑडियो",
+  "weather_audio": "मौसम का ऑडियो",
+  "misc_audio": "विविध ऑडियो",
+  "invasion_audio": "आक्रमण का ऑडियो",
+  "spawnpoint_audio": "स्पॉनपॉइंट ऑडियो",
+  "device_audio": "उपकरण ऑडियो",
+  "pokemon_timers": "सभी पोकेमोन टाइमर",
+  "show_dex_num_in_popup": "पॉपअप में पोकेडेक्स # दिखाएं",
   "popup": "पॉपअप",
-  "pvp_level": "स्तर {{level}} पीवीपी स्टैट्स",
-  "pvp_mega": "मेगा पीवीपी स्टैट्स",
+  "pvp_level": "{{level}} लेवल का PVP स्टैट्स",
+  "pvp_mega": "मेगा PVP स्टैट्स",
   "webhook_entry": "{{name}} में जोड़ें",
   "remove_webhook_entry": "{{name}} से हटाएं",
   "distance": "दूरी",
@@ -324,72 +339,72 @@
   "lure": "ल्यूर",
   "quest": "क्वेस्ट",
   "invasion": "आक्रमण",
-  "nest": "घोसला",
+  "nest": "नेस्ट",
   "pokestop": "पोकेस्टॉप",
   "team": "टीम",
   "global": "वैश्विक",
-  "manage_webhook": "{{name}} का प्रबंधन करें",
-  "drag_and_drop": "मार्कर को खींचें और छोड़ें अपनी स्थानता सेट करने के लिए",
+  "manage_webhook": "{{name}} प्रबंधित करें",
+  "drag_and_drop": "अपना स्थान सेट करने के लिए मार्कर को ड्रैग और ड्रॉप करें",
   "click_to_select": "चयन करने के लिए क्लिक करें",
-  "add_new": "नई {{category}} अलर्ट जोड़ें",
-  "my_location": "मेरी स्थानता",
-  "choose_on_map": "मानचित्र पर चुनें",
-  "select_profile": "प्रोफ़ाइल का चयन करें",
-  "distance_radius": "पूर्वावलोकन त्रिज्या दूरियों",
+  "add_new": "नया {{category}} अलर्ट जोड़ें",
+  "my_location": "मेरा स्थान",
+  "choose_on_map": "नक्शे पर चुनें",
+  "select_profile": "प्रोफाइल चुनें",
+  "distance_radius": "पूर्वावलोकन रेडियस दूरियां",
   "areas": "क्षेत्र",
-  "select_webhook": "बॉट का चयन करें",
-  "ar_quest_true": "एआर कार्य",
-  "ar_quest_false": "बिना एआर",
-  "with_ar": "एआर के साथ",
+  "select_webhook": "बॉट चुनें",
+  "ar_quest_true": "AR कार्य",
+  "ar_quest_false": "कोई AR नहीं",
+  "with_ar": "AR के साथ",
   "both": "दोनों",
-  "without_ar": "बिना एआर",
-  "exclude_quest_multi": "{{reward}} को छोड़ें",
-  "cluster_limit_0": "{{variable_0}} सीमा ({{variable_1}}) पर पहुँच गई है",
-  "cluster_limit_1": "कृपया ज़ूम इन करें या अपने फ़िल्टर को संक्षेप्त करें",
-  "show_polygons": "बहुभुज दिखाएं",
-  "exclude_invasion_multi": "{{invasion}} को छोड़ें",
+  "without_ar": "बिना AR के",
+  "exclude_quest_multi": "{{reward}} को बाहर करें",
+  "cluster_limit_0": "{{variable_0}} सीमा ({{variable_1}}) पार हो गई है",
+  "cluster_limit_1": "कृपया ज़ूम इन करें या अपने फिल्टर्स को संकीर्ण करें",
+  "show_polygons": "पॉलीगॉन्स दिखाएं",
+  "exclude_invasion_multi": "{{invasion}} को बाहर करें",
   "stardust": "स्टारडस्ट",
-  "slider_cp": "सीपी",
+  "slider_cp": "CP",
   "pvp_ranking_league": "लीग",
-  "pvp_ranking_min_cp": "न्यूनतम सीपी",
-  "slider_pvp": "रैंक",
+  "pvp_ranking_min_cp": "न्यूनतम CP",
+  "slider_pvp": "रैंक्स",
   "profile_no": "प्रोफ़ाइल",
   "template": "टेम्पलेट",
   "gender": "लिंग",
-  "clean": "साफ़",
-  "all_forms": "सभी फ़ॉर्म",
-  "pvp_entry": "पीवीपी प्रविष्टि",
-  "no_iv": "आईवी शामिल करें",
-  "by_distance": "दूरी के द्वारा",
+  "clean": "साफ करें",
+  "all_forms": "सभी रूप",
+  "pvp_entry": "PVP प्रवेश",
+  "no_iv": "Inc. कोई IV नहीं",
+  "by_distance": "दूरी द्वारा",
   "min_time": "न्यूनतम समय",
   "add_new_profile": "नई प्रोफ़ाइल जोड़ें",
   "slider_none": "कोई नहीं",
-  "non_registered_human_title": "उफ़, कुछ गड़बड़ है!",
-  "non_registered_human_desc": "शायद आप {{webhook}} के साथ पंजीकृत नहीं हैं\nया सर्वर वर्तमान में अनुपलब्ध है",
+  "non_registered_human_title": "ओह्ह, कुछ तो गलत है!",
+  "non_registered_human_desc": "आप {{webhook}} के साथ पंजीकृत नहीं हो सकते हैं\nया सर्वर वर्तमान में पहुँच से बाहर है",
   "try_again_later": "कृपया बाद में पुनः प्रयास करें",
-  "selected_areas": "{{amount}} क्षेत्र चयनित हुआ",
-  "selected_areas_plural": "{{amount}} क्षेत्र चयनित हुए",
+  "selected_areas_one": "{{count}} क्षेत्र चुना गया",
+  "selected_areas_other": "{{count}} क्षेत्र चुने गए",
   "webhook_selection": "{{name}} चयन",
-  "message_of_the_day": "दिन का संदेश",
-  "has_quest_indicator": "क्वेस्ट के साथ स्टॉप के लिए वैकल्पिक रंग",
-  "show_ar_badge": "एआर बैज दिखाएं",
+  "message_of_the_day": "आज का संदेश",
+  "has_quest_indicator": "क्वेस्ट्स वाले स्टॉप्स के लिए वैकल्पिक रंग",
+  "show_ar_badge": "AR बैज दिखाएं",
   "all_gyms": "सभी जिम",
   "general": "सामान्य",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "वैश्विक और उन्नत को लिंक करें",
-  "normal_forms": "सामान्य फ़ॉर्म",
-  "weather_indicator": "मौसम बूस्ट इंडिकेटर",
-  "page": "पेज {{page}}",
-  "navigation_controls": "नेविगेशन कंट्रोल्स",
+  "link_global_and_advanced": "ग्लोबल का चयन किया गया",
+  "normal_forms": "सामान्य रूप",
+  "weather_indicator": "मौसम बूस्ट संकेतक",
+  "page": "पृष्ठ {{page}}",
+  "navigation_controls": "नेविगेशन नियंत्रण",
   "navigation_controls_react": "रिएक्ट",
   "navigation_controls_leaflet": "लीफलेट",
-  "exclusive": "एक्सक्लूसिव",
-  "all_moves": "सभी हमले",
-  "move": "हमला",
+  "exclusive": "विशेष",
+  "all_moves": "सभी मूव",
+  "move": "मूव",
   "any": "कोई भी",
-  "min_spawn_average": "न्यूनतम उत्पन्न दर",
+  "min_spawn_average": "न्यूनतम स्पॉन दर",
   "select_all": "सभी का चयन करें",
-  "delete_all": "चयनित हटाएं",
+  "delete_all": "चयनित को हटाएं",
   "cancel": "रद्द करें",
   "day_1": "सोमवार",
   "day_2": "मंगलवार",
@@ -399,312 +414,305 @@
   "day_6": "शनिवार",
   "day_7": "रविवार",
   "profile_name": "प्रोफ़ाइल नाम",
-  "manage_profiles": "प्रोफ़ाइल प्रबंधित करें",
-  "min_spawn_avg": "औसत न्यूनतम उत्पन्न",
+  "manage_profiles": "प्रोफ़ाइल्स प्रबंधित करें",
+  "min_spawn_avg": "औसत न्यूनतम स्पॉन",
   "poke_global": "सब कुछ",
   "amount": "मात्रा",
-  "specific_gym": "विशेष जिम",
+  "specific_gym": "विशिष्ट जिम",
   "search_location": "स्थान खोजें",
-  "search_specific": "एक विशेष {{category}} खोजें",
-  "webhook_success_gym": "रेड, अंडे और टीम बदलने की चेतावनियाँ जोड़ दी गई हैं!",
+  "search_specific": "विशेष {{category}} की खोज करें",
+  "webhook_success_gym": "रेड्स, एग्स, और टीम चेंज अलर्ट्स जोड़ दिए गए हैं!",
   "slot_changes": "स्लॉट परिवर्तन",
-  "slot_changes_poracle": "slot_changes",
-  "confirm_delete": "यह इस प्रोफ़ाइल के लिए सभी ट्रैकिंग को हटा देगा, क्या आपको यकीन है?",
-  "confirm_copy": "आप किस प्रोफ़ाइल को कॉपी करना चाहेंगे \"{{profile}}\" को, यह पूरी तरह से उस प्रोफ़ाइल को अधिलेखित करेगा।",
-  "webhook_error": "{{name}} ने उसे प्रोसेस करने में असमर्थता दिखाई।\nकृपया बाद में पुनः प्रयास करें।",
-  "profile_error": "अद्वितीय और मान्य होना चाहिए",
+  "slot_changes_poracle": "स्लॉट परिवर्तन",
+  "confirm_delete": "इस प्रोफ़ाइल के लिए सभी ट्रैकिंग हटा दिए जाएँगे, क्या आप सुनिश्चित हैं?",
+  "confirm_copy": "\"{{profile}}\" को किस प्रोफ़ाइल में कॉपी करना चाहेंगे, यह पूरी तरह से उस प्रोफ़ाइल को ओवरराइट कर देगा.",
+  "webhook_error": "{{name}} इसे प्रोसेस करने में असमर्थ था.\nकृपया बाद में पुनः प्रयास करें.",
+  "profile_error": "यह अद्वितीय और मान्य होना चाहिए",
   "team_0": "हार्मोनी",
-  "battle_changes": "लड़ाई में",
-  "battle_changes_poracle": "लड़ाई_परिवर्तन",
+  "battle_changes": "बैटल में",
+  "battle_changes_poracle": "बैटल परिवर्तन",
   "auto": "ऑटो",
-  "webhooks_subtitle": "इन बॉट्स के लिए मानचित्र से अपनी चेतावनियों का प्रबंधन करें",
-  "event_stops_subtitle": "केकलियों जैसे विशेष घटना पोकेस्टॉप दिखाएं",
-  "webhooks": "चेतावनियाँ",
-  "scanner": "स्कैनर क्रियाएँ",
-  "everything_individually": "व्यक्तिगत चेतावनियाँ जोड़ें",
+  "webhooks_subtitle": "इन बॉट्स के लिए मैप से सीधे अपनी अलर्ट्स प्रबंधित करें",
+  "event_stops_subtitle": "जैसे कि केक्लिओन के विशेष इवेंट पोकेस्टॉप्स दिखाएं",
+  "webhooks": "अलर्ट्स",
+  "scanner": "स्कैनर एक्शन्स",
+  "everything_individually": "व्यक्तिगत अलर्ट्स जोड़ें",
   "individually": "व्यक्तिगत रूप से",
   "join": "शामिल हों",
-  "errors_404": "उफ़, यह पृष्ठ नहीं मिल सकता!",
-  "errors_500": "एक सर्वर त्रुटि हुई है, बाद में पुनः प्रयास करें!",
+  "errors_404": "उफ़, यह पृष्ठ नहीं मिला!",
+  "errors_500": "सर्वर त्रुटि हो गई है, बाद में पुनः प्रयास करें!",
   "local_username": "उपयोगकर्ता नाम",
   "local_password": "पासवर्ड",
   "local_error": "एक त्रुटि हुई है, कृपया बाद में पुनः प्रयास करें!",
-  "no_filter_results": "कोई परिणाम नहीं मिला\nअपने फ़िल्टर विस्तारित करने का प्रयास करें",
-  "donor_page": "दाता पृष्ठ",
-  "go_back": "वापस जाएं",
-  "access": "पहुंच",
-  "link_discord": "डिस्कॉर्ड लिंक",
-  "select_webhook_strategy": "अलर्ट प्रबंधक",
-  "webhook_strategy_success_0": "सफलता! अलर्ट सेटिंग्स प्राप्त करने के लिए रीफ्रेश किया जा रहा है...",
+  "no_filter_results": "कोई परिणाम नहीं मिला\nअपने फिल्टर्स को व्यापक बनाएं",
+  "donor_page": "दानकर्ता पृष्ठ",
+  "go_back": "वापस जाओ",
+  "access": "पहुँच",
+  "link_discord": "डिस्कोर्ड लिंक करें",
+  "select_webhook_strategy": "अलर्ट मैनेजर",
+  "webhook_strategy_success_0": "सफलता! अलर्ट सेटिंग्स लाने के लिए रिफ्रेश हो रहा है...",
   "register": "रजिस्टर करें",
-  "invalid_credentials": "अमान्य क्रेडेंशियल्स",
-  "error_creating_user": "इस समय नए उपयोगकर्ता को रजिस्टर करने में असमर्थ",
-  "discord_linked": "डिस्कॉर्ड लिंक किया गया",
+  "invalid_credentials": "अमान्य प्रमाणपत्र",
+  "localauth_failed": "प्रमाणीकरण विफल",
+  "error_creating_user": "इस समय नए उपयोगकर्ता का पंजीकरण नहीं हो सकता",
+  "discord_linked": "डिस्कोर्ड लिंक किया गया",
   "telegram_linked": "टेलीग्राम लिंक किया गया",
   "level": "स्तर",
-  "km": "किलोमीटर",
+  "km": "किमी",
   "feedback": "प्रतिक्रिया",
-  "donor_menu": "दाता मेनू",
-  "pokemon_cell": "पोकेमॉन की स्थान परिवर्तित हो सकती है",
+  "donor_menu": "दानदाता मेनू",
+  "pokemon_cell": "पोकेमोन का स्थान भिन्न हो सकता है",
   "timer_verified": "यह टाइमर सत्यापित है",
-  "timer_unverified": "यह टाइमर सत्यापित नहीं है",
+  "timer_unverified": "यह टाइमर असत्यापित है",
   "all": "सभी",
   "badge_0": "कोई नहीं",
   "badge_1": "कांस्य",
-  "badge_2": "चांदी",
+  "badge_2": "रजत",
   "badge_3": "सोना",
   "gym_badge_menu": "जिम बैज संपादित करें",
   "gym_badges": "जिम बैज",
   "gym_badge_diamonds": "जिम बैज दिखाएं",
-  "gym_badges_subtitle": "मानचित्र पर जिम बैज और प्रोफ़ाइल पृष्ठ में सूची दिखाएं",
-  "confirm_filters_reset": "फ़िल्टर रीसेट करें",
-  "filters_reset_text": "क्या आप सुनिश्चित हैं कि आप डिफ़ॉल्ट मान्यता मान्यता को रीसेट करना चाहते हैं? यह पूर्ववत नहीं किया जा सकता है!",
-  "filters_reset_title": "फ़िल्टर रीसेट करें",
-  "raid_quick_select": "त्वरित चयन करें",
+  "gym_badges_subtitle": "नक्शे पर जिम बैज और प्रोफाइल पेज में एक सूची दिखाता है।",
+  "confirm_filters_reset": "फिल्टर रीसेट करें",
+  "filters_reset_text": "क्या आप वाकई में सेटिंग्स को डिफ़ॉल्ट मानों पर रीसेट करना चाहते हैं? इसे अनकिया नहीं जा सकता!",
+  "filters_reset_title": "फिल्टर्स रीसेट",
+  "raid_quick_select": "त्वरित चयन",
   "disabled": "अक्षम",
-  "loading": "लोड हो रहा है {{category}}",
-  "loading_icons": "आइकन प्राप्त कर रहा है",
-  "loading_invasions": "आक्रमण प्राप्त कर रहा है",
-  "scan_next": "स्कैन स्थान",
-  "scan_next_choose": "मार्कर को खींचें और निर्धारित स्कैन स्थान सेट करें",
+  "loading": "{{category}} लोड हो रहा है",
+  "loading_icons": "आइकन ला रहे हैं",
+  "loading_invasions": "आक्रमण ला रहे हैं",
+  "scan_next": "स्थान स्कैन करें",
+  "scan_next_choose": "स्कैन स्थान सेट करने के लिए मार्कर को ड्रैग और ड्रॉप करें",
   "scan_zone": "क्षेत्र स्कैन करें",
-  "scan_zone_choose": "मार्कर को खींचें और स्कैन स्थान और आकार चुनें",
+  "scan_zone_choose": "स्कैन स्थान और आकार चुनने के लिए मार्कर को ड्रैग और ड्रॉप करें",
   "scan_zone_size": "आकार",
   "scan_zone_range": "रेंज",
   "scan_zone_spacing": "अंतराल",
   "scan_zone_radius": "त्रिज्या",
   "scan_requests": "स्कैन अनुरोध",
   "scan_queue": "वर्तमान कतार",
-  "click_to_scan": "यहां स्कैन करें",
-  "scan_confirmed_title": "स्कैन मांग पुष्टि की गई है",
-  "scan_confirmed": "कर्मचारी को स्थान पर भेजा गया है, परिणाम जल्द ही मानचित्र पर दिखाई देगा!",
-  "scan_loading_title": "स्कैन अनुरोध भेजा जा रहा है",
-  "scan_loading": "आपका स्कैन अनुरोध प्रसंस्करण किया जा रहा है और सिस्टम को भेजा जा रहा है!",
+  "click_to_scan": "यहाँ स्कैन करें",
+  "scan_confirmed_title": "स्कैन डिमांड की पुष्टि की गई",
+  "scan_confirmed": "कार्यकर्ता स्थान पर भेज दिया गया है, परिणाम जल्द ही नक्शे पर आ जाएगा!",
+  "scan_loading_title": "स्कैन अनुरोध भेज रहा है",
+  "scan_loading": "आपके स्कैन अनुरोध को प्रोसेस किया जा रहा है और सिस्टम में भेजा जा रहा है!",
   "scan_error_title": "त्रुटि",
-  "scan_error": "स्कैन अनुरोध को प्रोसेस करते समय त्रुटि हुई है...",
+  "scan_error": "स्कैन अनुरोध को प्रोसेस करते समय एक त्रुटि हुई है...",
   "scan_outside_area": "यह स्थान अधिकृत क्षेत्रों की सीमाओं के बाहर है",
   "pvp_ranking_cap": "स्तर",
-  "lc_title": "अपने स्थान का पालन करें",
+  "lc_title": "अपने स्थान का अनुसरण करें",
   "lc_metersUnit": "मीटर",
-  "lc_feetUnit": "फीट",
+  "lc_feetUnit": "फ़ीट",
   "lc_popup": "आप इस बिंदु से {distance} {unit} के भीतर हैं",
-  "lc_outsideMapBoundsMsg": "आपका स्थान मानचित्र की सीमाओं के बाहर प्रतीत होता है",
-  "no_alerts": "कोई चेतावनी नहीं मिली",
-  "loading_settings": "सेटिंग्स लोड हो रहे हैं",
-  "refresh_to_continue": "जारी रखने से पहले कृपया रीफ्रेश करें",
-  "session_expired_title": "सत्र समाप्त हो गया है",
+  "lc_outsideMapBoundsMsg": "आप नक्शे की सीमाओं के बाहर स्थित प्रतीत होते हैं",
+  "no_alerts": "कोई अलर्ट्स नहीं मिले",
+  "loading_settings": "सेटिंग्स लोड हो रही है",
+  "refresh_to_continue": "जारी रखने से पहले कृपया रिफ्रेश करें",
+  "session_expired_title": "सत्र समाप्त",
   "session_expired_body": "आपका सत्र समाप्त हो गया है",
   "old_client_title": "पुराना",
-  "old_client_body": "इस मानचित्र का एक नया संस्करण उपलब्ध है",
-  "refresh": "रीफ्रेश करें",
-  "points": "बिंदु",
+  "old_client_body": "इस मैप का एक नया संस्करण उपलब्ध है",
+  "early_old_client_title": "पुराना",
+  "early_old_client_body": "आपके ब्राउज़र में इस ऐप का एक पुराना संस्करण कैश में संग्रहीत हो सकता है, आपको इस ऐप का उपयोग करने से पहले अपने कैशे को साफ़ करने की आवश्यकता होगी।",
+  "refresh": "रिफ्रेश",
+  "points": "अंक",
   "day": "दिन",
   "days": "दिन",
   "react_error": "कुछ गलत हो गया",
-  "clickable_icon": "आइकन पर क्लिक कर सकते हैं",
+  "clickable_icon": "आइकन पर क्लिक किया जा सकता है",
   "two_stops_till_next": "अगले तक 2 स्टॉप",
   "one_stop_till_next": "अगले तक 1 स्टॉप",
-  "no_more_gyms": "और कोई जिम नहीं",
-  "light_map_border": "हल्का मानचित्र सीमा",
-  "dark_map_border": "गहरा मानचित्र सीमा",
-  "cell_blocked": "सेल अवरोधित",
-  "poi_color": "पीओआई रंग",
-  "quest_condition": "क्वेस्ट शर्त",
+  "no_more_gyms": "और अधिक जिम नहीं",
+  "light_map_border": "लाइट मैप बॉर्डर",
+  "dark_map_border": "डार्क मैप बॉर्डर",
+  "cell_blocked": "सेल अवरुद्ध",
+  "poi_color": "पॉइंट्स ऑफ इंटरेस्ट रंग",
+  "quest_condition": "क्वेस्ट कंडीशन",
   "always_show_labels": "हमेशा लेबल दिखाएं",
   "scan_areas_options": "स्कैन क्षेत्र विकल्प",
   "historic_rarity": "ऐतिहासिक दुर्लभता",
-  "poi": "दिलचस्प बिंदु",
-  "300m_range": "300m दायरा",
-  "lure_range": "ल्यूर दायरा",
-  "custom_range": "कस्टम दायरा",
-  "tap_to_toggle": "टैप करें टॉगल करने के लिए",
-  "power_up": "पावर अप",
+  "poi": "पॉइंट्स ऑफ इंटरेस्ट",
+  "300m_range": "300 मीटर की रेंज",
+  "lure_range": "ल्योर रेंज",
+  "custom_range": "कस्टम रेंज",
+  "tap_to_toggle": "टॉगल करने के लिए टैप करें",
+  "power_up": "पॉवर अप",
   "never_alt": "कभी नहीं",
-  "seen_nearby_stop": "नजदीकी में देखा गया",
+  "seen_nearby_stop": "पास के स्टॉप पर देखा गया",
   "seen_nearby_cell": "इस सेल में देखा गया",
-  "seen_lure_encounter": "ल्यूर भेंट",
-  "seen_lure_wild": "ल्यूर स्पॉन",
+  "seen_lure_encounter": "ल्योर एनकाउंटर",
+  "seen_lure_wild": "ल्योर स्पॉन",
   "seen_wild": "वाइल्ड स्पॉन",
-  "event_stops": "इवेंट स्टॉप",
-  "event_stop_timers": "इवेंट स्टॉप टाइमर",
+  "event_stops": "इवेंट स्टॉप्स",
+  "event_stop_timers": "इवेंट स्टॉप टाइमर्स",
   "size_0": "कोई भी",
-  "size_1": "XXS",
-  "size_2": "XS",
-  "size_3": "M",
-  "size_4": "XL",
-  "size_5": "XXL",
+  "size_1": "एक्सएक्सएस",
+  "size_2": "एक्सएस",
+  "size_3": "मध्यम",
+  "size_4": "एक्सएल",
+  "size_5": "एक्सएक्सएल",
   "show_size_indicator": "साइज इंडिकेटर दिखाएं",
   "size": "साइज",
   "gold_stop": "गोल्ड स्टॉप",
-  "profile_backups": "प्रोफ़ाइल स्वैपिंग",
+  "profile_backups": "प्रोफाइल स्वैपिंग",
   "new_backup": "नया बैकअप",
-  "create": "बनाएं",
-  "load": "लोड करें",
-  "update": "अपडेट करें",
+  "create": "बनाएँ",
+  "load": "लोड",
+  "update": "अपडेट",
   "delete": "हटाएं",
   "name": "नाम",
-  "only_confirmed": "केवल पुष्टि की गई",
-  "rocket_pokemon": "रॉकेट पोकेमॉन",
-  "decoy": "छल",
-  "s2_cell_limit_0": "आपने 20,000 सेल्स से अधिक उत्पन्न करने का प्रयास किया है ({{variable_0}})",
-  "show_all_pvp_ranks": "सभी पीवीपी रैंक दिखाएं",
-  "enable_pokemon_popup_coords": "पोकेमॉन कोऑर्ड्स दिखाएं",
-  "enable_gym_popup_coords": "जिम कोऑर्ड्स दिखाएं",
-  "enable_pokestop_popup_coords": "पोकेस्टॉप कोऑर्ड्स दिखाएं",
-  "enable_portal_popup_coords": "पोर्टल कोऑर्ड्स दिखाएं",
-  "on_block_join_discord": "कृपया अधिक जानकारी के लिए हमारे डिस्कॉर्ड में शामिल हों।",
-  "on_block_msg": "आपको अवरोधित कर दिया गया है क्योंकि आप सदस्य हैं।",
+  "only_confirmed": "केवल पुष्ट",
+  "rocket_pokemon": "रॉकेट पोकेमोन",
+  "decoy": "डेकॉय",
+  "s2_cell_limit_0": "आपने 20,000 से अधिक सेल्स ({{variable_0}}) बनाने का प्रयास किया",
+  "show_all_pvp_ranks": "सभी PVP रैंक दिखाएं",
+  "enable_pokemon_popup_coords": "पोकेमॉन के कोर्ड्स दिखाएँ",
+  "enable_gym_popup_coords": "जिम के कोर्ड्स दिखाएँ",
+  "enable_pokestop_popup_coords": "पोकेस्टॉप के कोर्ड्स दिखाएँ",
+  "enable_portal_popup_coords": "पोर्टल के कोर्ड्स दिखाएँ",
+  "on_block_join_discord": "अधिक जानकारी के लिए कृपया हमारे डिस्कॉर्ड में शामिल हों।",
+  "on_block_msg": "आपको इसके सदस्य होने के लिए ब्लॉक किया गया है",
   "denied": "अस्वीकृत",
   "showcase": "प्रदर्शनी",
-  "unknown_event": "अज्ञात घटना",
+  "unknown_event": "अज्ञात इवेंट",
   "scanner_countdown": "{{time}} सेकंड में उपलब्ध",
   "success": "सफलता",
   "contribute": "योगदान करें",
-  "mi": "मीटर",
-  "filter_by_areas": "क्षेत्रों द्वारा फ़िल्टर करें",
+  "mi": "मील",
+  "filter_by_areas": "क्षेत्रों के द्वारा फ़िल्टर करें",
   "submit_nest_name": "नेस्ट नाम सबमिट करें",
-  "nest_submission_menu": "नाम अपडेट करें",
-  "nest_submissions": "नेस्ट सबमिशन",
-  "nest_submissions_subtitle": "नए नेस्ट के लिए नए नाम सबमिट करने की अनुमति देता है",
-  "pokemon_opacity": "डायनेमिक पोकेमॉन अस्पष्टता",
-  "invasion_opacity": "डायनेमिक आक्रमण अस्पष्टता",
-  "raid_opacity": "डायनेमिक रेड अस्पष्टता",
-  "opacity_ten_minutes": "10 मिनट पर अस्पष्टता",
-  "opacity_five_minutes": "5 मिनट पर अस्पष्टता",
-  "opacity_one_minute": "1 मिनट पर अस्पष्टता",
-  "level_circles": "स्तर संकेतक",
-  "min_level_circle": "न्यूनतम सर्कल स्तर",
-  "mutation_auth_error": "आपका अनुरोध असफल रहा क्योंकि आप लॉग इन नहीं हुए थे",
+  "nest_submission_menu": "नाम अपडेट",
+  "nest_submissions": "नेस्ट सबमिशन्स",
+  "nest_submissions_subtitle": "नेस्ट्स के लिए नए नाम सबमिट करने की अनुमति देता है",
+  "pokemon_opacity": "डायनामिक पोकेमॉन अंधकार",
+  "invasion_opacity": "डायनामिक इनवेजन अंधकार",
+  "raid_opacity": "डायनामिक रेड अंधकार",
+  "opacity_ten_minutes": "10 मिनट में अंधकार",
+  "opacity_five_minutes": "5 मिनट में अंधकार",
+  "opacity_one_minute": "1 मिनट में अंधकार",
+  "level_circles": "लेवल इंडिकेटर्स",
+  "min_level_circle": "न्यूनतम सर्कल लेवल",
+  "mutation_auth_error": "आपकी अनुरोध असफल रहा क्योंकि आप लॉग इन नहीं थे",
   "submitted_by": "द्वारा सबमिट किया गया",
-  "localauth_failed": "प्रमाणीकरण विफल हुआ",
-  "reversible": "वापसीयोग्य",
+  "reversible": "पलटने योग्य",
   "version": "संस्करण",
-  "route_tags": "मार्ग टैग",
+  "route_tags": "मार्ग टैग्स",
   "routes": "मार्ग",
-  "route_type": "मार्ग प्रकार",
-  "routes_subtitle": "मार्ग को गेम में देखें और उनके बारे में संबंधित जानकारी मैप पर",
+  "route_type": "मार्ग का प्रकार",
+  "routes_subtitle": "गेम मार्ग और उनके बा�रे में संबंधित जानकारी मानचित्र पर देखें",
   "description": "विवरण",
   "additional_info": "अतिरिक्त जानकारी",
-  "duration": "कालावधि",
+  "duration": "अवधि",
   "elevation": "ऊंचाई",
   "contest_category_1": "सबसे छोटा आकार",
   "context_category_2": "सबसे बड़ा आकार",
   "total_entries": "कुल प्रविष्टियाँ",
-  "showcase_rankings": "शोकेज रैंकिंग",
-  "showcase_rankings_subtitle": "एक Pokestop पर शोकेज की शीर्ष रैंकिंग की सूची प्रदर्शित करता है",
+  "showcase_rankings": "प्रदर्शनी रैंकिंग",
+  "showcase_rankings_subtitle": "पोकेस्टॉप में प्रदर्शनी के लिए शीर्ष रैंकिंग ​की सूची प्रदर्शित करता है",
   "tth": "TTH",
   "tth_0": "सभी",
   "tth_1": "ज्ञात",
   "tth_2": "अज्ञात",
-  "no_access": "पहुंच नहीं",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "cooldown": "ठंड",
-  "scan_some_outside_area": "कुछ स्थान स्वीकृत सीमाओं के बाहर हैं",
-  "alerts": "अलर्ट",
-  "alert_manager": "अलर्ट प्रबंधक",
+  "no_access": "कोई पहुँच नहीं",
+  "cooldown": "कूल डाउन",
+  "scan_some_outside_area": "कुछ स्थान अनधिकृत सीमाओं के बाहर हैं",
+  "alerts": "अलर्ट्स",
+  "alert_manager": "अलर्ट मैनेजर",
   "menu": "मेन्यू",
   "theme": "थीम",
-  "exit": "बंद करें",
-  "component": "कंपोनेंट",
+  "exit": "बाहर",
+  "component": "घटक",
   "component_login_page": "लॉगिन पृष्ठ",
-  "component_donation_page": "डोनेशन पृष्ठ",
-  "component_message_of_the_day": "आज का संदेश",
+  "component_donation_page": "दान पृष्ठ",
+  "component_message_of_the_day": "दिन का संदेश",
   "download": "डाउनलोड",
   "playground": "खेल का मैदान",
-  "locale": "स्थान",
+  "locale": "स्थानीय",
   "saved": "सहेजा गया",
   "show_editor": "संपादक दिखाएं",
   "hide_editor": "संपादक छिपाएं",
-  "reported_error": "इस त्रुटि की रिपोर्ट इडेंटिफ़ायर के साथ सर्वर को पहुँचाया गया है",
+  "reported_error": "इस त्रुटि की सूचना सर्वर को दी गई है, पहचानकर्ता के साथ",
   "dark_mode": "डार्क मोड",
   "load_from_autosave": "ऑटोसेव से लोड करें",
-  "done": "हो गया",
-  "fast": "तेज़",
-  "charged": "चार्ज़",
+  "done": "समाप्त",
+  "fast": "तेज",
+  "charged": "चार्ज्ड",
   "offline_mode": "ऑफ़लाइन मोड",
-  "include_sponsored": "स्पॉन्सर शामिल करें",
-  "showcase_color": "दिखावट रंग",
-  "partner_color": "सहयोगी रंग",
-  "disable": "{{- name}} को अक्षम करें",
+  "include_sponsored": "प्रायोजित को शामिल करें",
+  "showcase_color": "प्रदर्शनी का रंग",
+  "partner_color": "साझेदार का रंग",
+  "disable": "{{- name}} को निष्क्रिय करें",
   "profiling": "प्रोफ़ाइलिंग",
-  "showcase_block": "दिखावट के कारण अवरोधित",
-  "signed_in_as": "साइन इन किए जैसा",
-  "missing_map_perm": "आपका मानचित्र देखने की अनुमति नहीं है।",
-  "pokemon_audio": "पोकेमॉन ऑडियो",
-  "pokestop_audio": "पोके स्टॉप ऑडियो",
-  "gym_audio": "जिम ऑडियो",
-  "team_audio": "टीम ऑडियो",
-  "egg_audio": "अंडा ऑडियो",
-  "raid_audio": "रेड ऑडियो",
-  "nest_audio": "नेस्ट ऑडियो",
-  "reward_audio": "पुरस्कार ऑडियो",
-  "type_audio": "प्रकार ऑडियो",
-  "weather_audio": "मौसम ऑडियो",
-  "misc_audio": "मिश्रित ऑडियो",
-  "invasion_audio": "आक्रमण ऑडियो",
-  "spawnpoint_audio": "स्पॉन्पोइंट ऑडियो",
-  "device_audio": "डिवाइस ऑडियो",
-  "access_denied": "पहुंच निषेधित",
+  "showcase_block": "प्रदर्शनी के कारण अवरुद्ध",
+  "signed_in_as": "के रूप में साइन इन किया",
+  "missing_map_perm": "आपको नक्शा देखने की अनुमति नहीं है।",
+  "access_denied": "प्रवेश निषेध",
   "audio": "ऑडियो",
   "desktop_notifications": "डेस्कटॉप सूचनाएँ",
   "notifications_options": "सूचना विकल्प",
-  "audio_always_on": "ऑडियो हमेशा चलता है",
-  "volume_level": "आवाज स्तर",
-  "notifications_status": "सूचनाएँ की स्थिति",
-  "granted": "अनुमति प्राप्त",
-  "global_search_invasions": "ग्रन्ट के प्रकार, नाम, या पोकेमॉन की इनाम नाम दर्ज करें...",
-  "set_all": "सब सेट करें",
-  "set_filtered": "फ़िल्टर करें",
+  "audio_always_on": "ऑडियो हमेशा बजता रहेगा",
+  "volume_level": "वॉल्यूम स्तर",
+  "notifications_status": "सूचनाएँ स्थिति",
+  "granted": "अनुमति दी गई",
+  "set_all": "सभी सेट करें",
+  "set_filtered": "फ़िल्टर्ड सेट करें",
   "only_show_available": "केवल उपलब्ध दिखाएं",
   "easy_mode": "आसान मोड",
-  "quick_select": "वैश्विक त्वरित चयन",
+  "quick_select": "ग्लोबल क्विक चुनें",
   "pokemon_filter_mode": "पोकेमॉन फ़िल्टर मोड",
-  "basic": "बेसिक",
-  "intermediate": "मध्यम",
+  "basic": "मूल",
+  "intermediate": "मध्यवर्ती",
   "expert": "विशेषज्ञ",
   "basic_description": "आसानी से पोकेमॉन का चयन करें और एक वैश्विक फ़िल्टर लागू करें",
-  "intermediate_description": "वैश्विक रूप से और पोकेमॉन के आधार पर व्यक्तिगत फ़िल्टर लागू करें (पारम्परिक)",
-  "expert_description": "सबसे अधिक अनुकूलन के लिए मैनुअल इनपुट क्वेरी",
-  "icon_size": "चिह्न आकार",
+  "intermediate_description": "वैश्विक रूप से और प्रत्येक पोकेमॉन के लिए व्यक्तिगत फ़िल्टर सेट करें (पारंपरिक)",
+  "expert_description": "सबसे अधिक अनुकूलन के लिए मैनुअल इनपुट क्वेरीज़",
+  "icon_size": "आइकॉन आकार",
   "developer": "डेवलपर",
   "raid_override": "रेड ओवरराइड",
   "search_rocket_pokemon": "रॉकेट पोकेमॉन खोजें",
   "main": "मुख्य",
   "extra": "अतिरिक्त",
   "select": "चुनें",
-  "searching": "खोज रहे हैं...",
-  "no_options": "कोई विकल्प नहीं..."
+  "searching": "खोज रहा है...",
+  "no_options": "कोई विकल्प नहीं...",
+  "and": "और",
+  "or": "या",
+  "only_global": "केवल वैश्विक",
+  "global_caption": "अन्य सभी फिल्टर्स को नज़रअंदाज़ करता है",
+  "global_and_individual": "वैश्विक और व्यक्तिगत फ़िल्टर्स",
+  "gender_filters_all": "लिंग सभी पर लागू होता है",
+  "and_caption": "एक साथ जोड़ा गया",
+  "or_caption": "स्वतंत्र रूप से फिल्टर्स करता है",
+  "filter_help": "फ़िल्टर सहायता",
+  "kilometers": "किलोमीटर",
+  "miles": "मील",
+  "distance_unit": "दूरी की इकाई",
+  "data_management": "डेटा प्रबंधन",
+  "reset_or_manage_text": "आप या तो अपने फ़िल्टर्स को कठोर रीसेट कर सकते हैं या आप डेटा प्रबंधन पृष्ठ देख सकते हैं जो आपको व्यक्तिगत श्रेणियों को रीसेट करने की अनुमति देगा।",
+  "reset_audio": "ऑडियो रीसेट करें",
+  "reset_all": "सभी रीसेट करें",
+  "reset_icons": "आइकॉन रीसेट करें",
+  "reset_position": "स्थिति रीसेट करें",
+  "reset_ui": "UI रीसेट करें",
+  "reset_options": "विकल्प रीसेट करें",
+  "reset_menus": "मेनू रीसेट करें",
+  "reset_settings": "सेटिंग्स रीसेट करें",
+  "reset_general_title": "सामान्य",
+  "reset_filters_title": "फिल्टर्स",
+  "reset_assets": "एसेट्स रीसेट करें",
+  "reset_pokemon": "पोकेमॉन रीसेट करें",
+  "reset_pokestops": "पोकेस्टॉप्स रीसेट करें",
+  "reset_gyms": "जिम्स रीसेट करें",
+  "reset_nests": "नेस्ट्स रीसेट करें",
+  "reset_portals": "पोर्टल्स रीसेट करें",
+  "reset_routes": "रूट्स रीसेट करें",
+  "reset_scan_areas": "स्कैन क्षेत्र रीसेट करें",
+  "reset_scan_cells": "स्कैन सेल्स रीसेट करें",
+  "reset_devices": "डिवाइसेज रीसेट करें",
+  "reset_weather": "मौसम रीसेट करें",
+  "reset_s2cells": "S2 सेल्स रीसेट करें",
+  "reset_spawnpoints": "स्पानपॉइंट्स रीसेट करें",
+  "reset_submission_cells": "सबमिशन सेल्स रीसेट करें",
+  "hisuian": "हिसुइयन",
+  "spacial_rend_range": "स्पेशल रेंड रेंज"
 }
diff --git a/packages/locales/lib/generated/id.json b/packages/locales/lib/generated/id.json
index 7926979fa..8d410305b 100644
--- a/packages/locales/lib/generated/id.json
+++ b/packages/locales/lib/generated/id.json
@@ -1,6 +1,6 @@
 {
   "login": "Masuk",
-  "click_once": "Hanya klik 'Otorisasi' sekali",
+  "click_once": "Klik 'Otorisasi' sekali saja",
   "save": "Simpan",
   "reset": "Atur Ulang",
   "close": "Tutup",
@@ -13,7 +13,7 @@
   "apply_to_all": "Terapkan ke Semua",
   "disable_all": "Nonaktifkan Semua",
   "enable_all": "Aktifkan Semua",
-  "enabled": "Aktif",
+  "enabled": "Diaktifkan",
   "legacy": "Warisan",
   "id": "ID",
   "location": "Lokasi",
@@ -23,28 +23,28 @@
   "search_pokestops": "Cari PokéStop",
   "search_raids": "Cari Raid",
   "search_eggs": "Cari Telur",
-  "search_quests": "Cari Tugas",
+  "search_quests": "Cari Misi",
   "search_lures": "Cari Umpan",
   "search_invasions": "Cari Invasi",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "sm": "kecil",
+  "md": "sedang",
+  "lg": "besar",
+  "xl": "sangat besar",
   "min": "Min",
   "max": "Maks",
   "set_size": "Atur Ukuran Ikon",
-  "slot_selection": "Pilihan Slot",
+  "slot_selection": "Pemilihan Slot",
   "generations": "Generasi",
   "types": "Tipe",
   "forms": "Bentuk",
-  "rarity": "Raritas Saat Ini",
+  "rarity": "Keberadaan Saat Ini",
   "others": "Lainnya",
   "categories": "Kategori",
   "rank": "Peringkat",
-  "slider_iv": "Rentang IV",
-  "slider_great": "Great League",
-  "slider_ultra": "Ultra League",
-  "slider_little": "Little Cup",
+  "slider_iv": "Jangkauan IV",
+  "slider_great": "Liga Super",
+  "slider_ultra": "Liga Ultra",
+  "slider_little": "Piala Kecil",
   "slider_atk_iv": "Serangan",
   "slider_def_iv": "Pertahanan",
   "slider_sta_iv": "Stamina",
@@ -52,19 +52,19 @@
   "slider_size": "Ukuran",
   "abbreviation_level": "L",
   "lvl": "Lvl",
-  "cap": "Cap",
+  "cap": "Batas",
   "custom": "Kustom",
   "valid": "Valid",
   "invalid": "Tidak Valid!",
-  "overwrites": "Timpa Semua Filter",
-  "valid_filter": "Filter Statistik Valid",
+  "overwrites": "Menimpa Semua Filter",
+  "valid_filter": "Filter Statistik yang Valid",
   "invalid_filter": "Masukkan Filter yang Valid",
   "gyms": "Gym",
   "nests": "Sarang",
   "pokestops": "PokéStop",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
-  "scan_areas": "Pindai Area",
+  "scan_areas": "Area Pemindaian",
   "s2cells": "Sel S2",
   "weather": "Cuaca",
   "admin": "Admin",
@@ -73,54 +73,54 @@
   "tile_servers": "Server Tile",
   "icons": "Ikon",
   "navigation": "Navigasi",
-  "drawer": "Laci",
-  "tile_servers_default": "Default",
+  "drawer": "Menu Tarik",
+  "tile_servers_default": "Bawaan",
   "drawer_temporary": "Sementara",
-  "drawer_persistent": "Tetap",
-  "locale_selection": "Pilihan Bahasa",
+  "drawer_persistent": "Persisten",
+  "locale_selection": "Pemilihan Lokal",
   "import": "Impor",
   "export": "Ekspor",
   "logout": "Keluar",
-  "local_storage_cleared": "Penyimpanan Lokal telah dihapus!",
+  "local_storage_cleared": "Penyimpanan Lokal telah dibersihkan!",
   "iv_or_filter": "Filter IV ATAU",
   "polygons": "Poligon",
   "raids": "Raid",
-  "ex_eligible": "Berhak EX",
-  "in_battle": "Sedang Bertarung",
+  "ex_eligible": "Memenuhi Syarat EX",
+  "in_battle": "Dalam Pertarungan",
   "all_pokestops": "Semua PokéStop",
   "lures": "Umpan",
-  "quests": "Tugas",
+  "quests": "Misi",
   "invasions": "Invasi",
   "portals": "Portal",
   "submission_cells": "Sel Pengajuan",
   "spawnpoint": "Titik Muncul",
-  "spawnpoints": "Titik Spawn",
-  "s2_cell_level": "Level {{level}} Sel S2",
-  "total_count": "Total Jumlah",
-  "next_submission": "Submisi Selanjutnya!",
+  "spawnpoints": "Titik Muncul",
+  "s2_cell_level": "Sel S2 Level {{level}}",
+  "total_count": "Jumlah Total",
+  "next_submission": "Pengajuan Berikutnya!",
   "never": "Tidak Pernah",
   "next_gym": "Gym Selanjutnya",
   "scan_cells": "Pindai Sel",
   "devices": "Perangkat",
   "use_my_location": "Gunakan Lokasi Saya",
-  "submit_feedback_title": "Kirim Masukan/Laporan Bug",
-  "use_the_link_below": "Anda dapat menggunakan tautan di bawah ini untuk mengirimkan masukan atau laporan bug yang Anda temui.",
-  "feedback_to_devs": "Masukan ini dikirim langsung ke para pengembang.",
-  "feedback_form": "Formulir Masukan",
-  "unknown_pokestop": "Nama PokéStop Tidak Dikenal",
+  "submit_feedback_title": "Kirim Umpan Balik/Laporan Bug",
+  "use_the_link_below": "Anda dapat menggunakan tautan di bawah ini untuk mengirim umpan balik atau bug yang Anda temukan.",
+  "feedback_to_devs": "Umpan balik ini dikirim langsung ke pengembang.",
+  "feedback_form": "Formulir Umpan Balik",
+  "unknown_pokestop": "Nama PokéStop Tidak Diketahui",
   "unknown_gym": "Nama Gym Tidak Dikenal",
   "exclude": "Kecualikan",
-  "exclude_quest": "Kecualikan Tugas",
+  "exclude_quest": "Kecualikan Quest",
   "exclude_invasion": "Kecualikan Invasi",
   "exclude_team": "Kecualikan Tim",
   "exclude_raid": "Kecualikan Raid",
-  "exclude_lure": "Kecualikan Lure",
+  "exclude_lure": "Kecualikan Umpan",
   "timer": "Timer",
   "hide": "Sembunyikan",
   "tier": "Tingkat",
   "slots": "Slot",
   "mega": "Mega",
-  "form": "Bentuk",
+  "form": "Form",
   "starts": "Mulai",
   "ends": "Berakhir",
   "defender": "Pertahanan",
@@ -128,39 +128,39 @@
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "Total CP",
-  "first_seen": "Dilihat Pertama",
-  "last_seen": "Dilihat Terakhir",
+  "first_seen": "Pertama Terlihat",
+  "last_seen": "Terakhir Terlihat",
   "last_modified": "Terakhir Diubah",
   "last_updated": "Terakhir Diperbarui",
-  "imported": "Diimpor",
+  "imported": "Telah Diimpor",
   "nest_estimated": "Data Sarang Diperkirakan!",
-  "verify_nests": "Verifikasi dengan Memeriksa Spawns Saat Ini",
-  "nest_out_of_date": "Sarang Kemungkinan Sudah Tidak Terbaru!",
-  "nest_check_current": "Periksa Spawns Saat Ini Saja",
+  "verify_nests": "Verifikasi dengan Memeriksa Spawn Sekarang",
+  "nest_out_of_date": "Sarang Mungkin Ketinggalan Zaman!",
+  "nest_check_current": "Periksa Spawn Sekarang",
   "spawns_per_hour": "Per Jam",
   "teams": "Tim",
   "eggs": "Telur",
-  "reverse": "Balik",
-  "selected": "Dipilih",
-  "unselected": "Tidak Dipilih",
+  "reverse": "Balikkan",
+  "selected": "Terpilih",
+  "unselected": "Tidak Terpilih",
   "only_available": "Tersedia",
   "common": "Umum",
   "uncommon": "Tidak Umum",
   "rare": "Langka",
-  "ultra_rare": "Ultra Langka",
+  "ultra_rare": "Sangat Langka",
   "regional": "Regional",
-  "event": "Acara",
+  "event": "Event",
   "legendary": "Legendaris",
-  "mythical": "Mitologi",
+  "mythical": "Mitikal",
   "ultra_beast": "Ultra Beast",
-  "alt_forms": "Bentuk Alternatif",
+  "alt_forms": "Form Alternatif",
   "alola": "Alola",
   "galarian": "Galarian",
   "showing": "Menampilkan",
   "instance": "Instansi",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Jenis yang Ditingkatkan",
+  "boosted_types": "Tipe yang Ditingkatkan",
   "pokemon_options": "Opsi Pokémon",
   "pokestops_options": "Opsi PokéStop",
   "gyms_options": "Opsi Gym",
@@ -170,129 +170,130 @@
   "weather_options": "Opsi Cuaca",
   "s2cells_options": "Opsi Sel S2",
   "clustering": "Pengelompokan",
-  "glow": "Bercahaya",
+  "glow": "Bersinar",
   "legacy_filter": "Filter Warisan",
-  "raid_timers": "Semua Timer Raid",
-  "invasion_timers": "Semua Timer Invasi",
-  "lure_timers": "Semua Timer Lure",
-  "device_path_color": "Warna Jalur Perangkat",
+  "raid_timers": "Timer Raid Semua",
+  "invasion_timers": "Timer Invasi Semua",
+  "lure_timers": "Timer Umpan Semua",
+  "device_path_color": "Warna Jalur Peranti",
   "old_portals": "Portal Lama",
   "new_portals": "Portal Baru",
   "items": "Item",
   "energy": "Energi",
-  "ar_eligible": "AR Memenuhi Syarat",
+  "ar_eligible": "Layak AR",
   "iv_circles": "Indikator IV",
-  "min_iv_circle": "IV Lingkaran Minimum",
-  "interaction_ranges": "Jarak Interaksi",
-  "cannot_connect": "\nTidak dapat terhubung ke server saat ini.\nMencoba lagi segera hanya akan menyebabkan masalah lebih lanjut.\nSilakan coba lagi dalam beberapa menit.\n\n- Tim Admin Peta",
+  "min_iv_circle": "Circle IV Minimum",
+  "interaction_ranges": "Jangkauan Interaksi",
+  "cannot_connect": "\nTidak bisa terhubung ke server saat ini.\nMencoba lagi segera hanya akan menyebabkan lebih banyak masalah.\nSilakan coba lagi dalam beberapa menit.\n\n- Tim Admin Peta",
   "mad_quest_text": "Quest Asli",
   "xs": "XS",
   "primary": "Utama",
   "secondary": "Sekunder",
-  "zero_iv": "0% IV",
-  "hundo_iv": "100% IV",
+  "zero_iv": "IV 0%",
+  "hundo_iv": "IV 100%",
   "open_menu": "Buka Menu",
   "zoom_in": "Perbesar",
   "zoom_out": "Perkecil",
   "welcome": "Selamat datang di",
   "back": "Kembali",
-  "next": "Berikutnya",
+  "next": "Selanjutnya",
   "finish": "Selesai",
   "start_tutorial": "Mulai Tutorial",
   "view_profile": "Lihat Profil",
-  "login_optional": "Masuk (Opsional)",
+  "login_optional": "Login (Opsional)",
   "tutorial": "Tutorial",
   "tutorial_language": "Pilih Bahasa Anda",
   "tutorial_welcome": "Tutorial ini interaktif dan Anda sangat dianjurkan untuk bermain dengan semua opsi yang disediakan",
-  "tutorial_categories": "Kategori yang Anda Miliki Aksesnya",
+  "tutorial_categories": "Kategori yang Anda Miliki Akses Kepada",
   "tutorial_logged_in": "Anda dapat melihat detail tentang izin Anda dengan melihat profil Anda.",
-  "tutorial_logged_out": "Anda dapat melihat detail tentang izin Anda dengan masuk.",
-  "tutorial_sidebar_0": "Semua Filter & Pengaturan Anda Berada Di Sini",
-  "tutorial_sidebar_1": "Untuk setiap kategori, Anda akan dapat mengaktifkan atau menonaktifkan data yang Anda inginkan menggunakan tombol",
-  "tutorial_sidebar_2": "Opsi: Penyesuaian tambahan\nLanjutan: Akan kami bahas nanti dalam tutorial ini",
-  "tutorial_sliders_0": "Menggunakan slider untuk menyesuaikan filter",
+  "tutorial_logged_out": "Anda dapat melihat detail tentang izin Anda dengan login.",
+  "tutorial_sidebar_0": "Semua Filter & Pengaturan Anda Ada Di Sini",
+  "tutorial_sidebar_1": "Untuk setiap kategori, Anda dapat mengatur data apa saja yang ingin Anda lihat menggunakan tombol pengalih",
+  "tutorial_sidebar_2": "Opsi: Kustomisasi Tambahan\nLanjutan: Akan kami bahas lebih lanjut dalam tutorial ini",
+  "tutorial_sliders_0": "Menggunakan penggeser untuk menyesuaikan filter",
   "tutorial_sliders_1": "Pokémon Antara:",
-  "tutorial_sliders_2": "- IV {{iv0}}% hingga {{iv1}}%",
-  "tutorial_sliders_3": "Level {{level0}} hingga {{level1}}",
-  "tutorial_sliders_3alt": "- DAN Level {{level0}} hingga {{level1}}",
-  "tutorial_sliders_4": "- Peringkat Great League {{gl0}} hingga {{gl1}}",
-  "tutorial_sliders_4alt": "- ATAU Peringkat Great League {{gl0}} hingga {{gl1}}",
-  "tutorial_sliders_5": "- Peringkat Ultra League {{ul0}} hingga {{ul1}}",
-  "tutorial_sliders_5alt": "- ATAU Peringkat Ultra League {{ul0}} hingga {{ul1}}",
-  "tutorial_sliders_6": "Rantai dengan yang lain dengan warna yang sama",
-  "tutorial_sliders_7": "Filter secara terpisah dari slider lainnya",
-  "tutorial_sliders_8": "Slider 'penuh' berarti dinonaktifkan:",
-  "tutorial_sliders_9": "Semua spawn, terlepas dari sudah diperiksa IV atau belum",
+  "tutorial_sliders_2": "- IVs {{iv0}}% sampai {{iv1}}%",
+  "tutorial_sliders_3": "Level {{level0}} sampai {{level1}}",
+  "tutorial_sliders_3alt": "- DAN berlevel {{level0}} sampai {{level1}}",
+  "tutorial_sliders_4": "- Peringkat Great League {{gl0}} sampai {{gl1}}",
+  "tutorial_sliders_4alt": "- ATAU Peringkat Great League {{gl0}} sampai {{gl1}}",
+  "tutorial_sliders_5": "- Peringkat Ultra League {{ul0}} sampai {{ul1}}",
+  "tutorial_sliders_5alt": "- ATAU Peringkat Ultra League {{ul0}} sampai {{ul1}}",
+  "tutorial_sliders_6": "Bersambung dengan yang lain dengan warna yang sama",
+  "tutorial_sliders_7": "Memfilter secara terpisah dari penggeser lainnya",
+  "tutorial_sliders_8": "Sebuah penggeser 'penuh' berarti itu dinonaktifkan:",
+  "tutorial_sliders_9": "Semua muncul, terlepas dari apakah telah dicek IV-nya atau tidak",
   "tutorial_help": "Pintasan ke menu ini",
-  "tutorial_adv_filter": "Hanya untuk perangkat seluler, membuka opsi penyaringan untuk menu lanjutan",
-  "tutorial_tune": "Mengatur penyaringan lanjutan untuk semua Pokémon yang saat ini sedang disaring di menu",
-  "tutorial_format_size": "Mengatur ukuran ikon untuk semua item yang saat ini sedang disaring di menu",
-  "tutorial_check": "Mengaktifkan semua item yang saat ini sedang disaring di menu",
-  "tutorial_clear": "Menonaktifkan semua item yang saat ini sedang disaring di menu",
+  "tutorial_adv_filter": "Hanya di ponsel, membuka opsi filtering untuk menu lanjutan",
+  "tutorial_tune": "Mengatur filter lanjutan untuk semua Pokémon yang sedang difilter di menu",
+  "tutorial_format_size": "Mengatur ukuran ikon untuk semua item yang sedang difilter di menu",
+  "tutorial_check": "Mengaktifkan semua item yang sedang difilter di menu",
+  "tutorial_clear": "Menonaktifkan semua item yang sedang difilter di menu",
   "tutorial_save": "Menyimpan pilihan saat ini dan keluar",
-  "tutorial_show_all_view": "Toggle PokéStops & Gym",
-  "tutorial_show_pokemon_view": "Toggle Pokémon",
-  "tutorial_toggle": "Klik pada Tanda Centang/X mengaktifkan/menonaktifkan item",
-  "tutorial_pokemon_caption": "Ikon ini memungkinkan Anda mengatur penyaringan untuk Pokémon tertentu tersebut",
-  "tutorial_all_caption": "Tim memiliki menu slot khusus\nSemua item lain memungkinkan Anda mengatur ukuran ikon",
-  "tutorial_popup_0": "Pop-up sekarang interaktif!",
-  "tutorial_popup_1": "Tiga titik membuka opsi menyembunyikan, mengecualikan, dan mengatur timer",
-  "tutorial_popup_2": "Ikon di kedua sisi tautan navigasi akan memperluas untuk menampilkan info tambahan, coba saja!",
-  "tutorial_popup_3": "Ikon-ikon bervariasi untuk setiap kategori, pastikan untuk memeriksanya semua",
-  "tutorial_closing_0": "Informasi tambahan",
-  "tutorial_closing_1": "Slider Pokémon global di sidebar beroperasi secara terpisah dari menu lanjutan dan tidak saling mempengaruhi",
-  "tutorial_closing_2": "Pastikan untuk melihat bagian Pengaturan di sidebar",
-  "tutorial_closing_3": "Terdapat banyak pilihan estetika yang tersedia untuk setiap kategori, tetapi ingatlah bahwa semakin banyak yang Anda tambahkan ke peta Anda, semakin tinggi kemungkinan peta Anda akan membeku",
-  "tutorial_closing_4": "Anda dapat melihat tutorial ini lagi dengan memilihnya di panel Pengaturan di sidebar",
-  "tutorial_closing_5": "Jaga keselamatan dan semoga berhasil!",
-  "intro": "Pengantar",
-  "sidebar": "Sidebar",
-  "sliders": "Slider",
-  "popups": "Pop-up",
-  "closing": "Menutup",
+  "tutorial_show_all_view": "Alihkan PokéStops & Gyms",
+  "tutorial_show_pokemon_view": "Alihkan Pokémon",
+  "tutorial_toggle": "Mengklik Centang/X untuk mengalihkan item",
+  "tutorial_pokemon_caption": "Ikon ini memungkinkan Anda untuk mengatur filter untuk Pokémon tertentu",
+  "tutorial_all_caption": "Tim memiliki menu slot khusus\nItem lainnya memungkinkan Anda menyesuaikan ukuran ikon",
+  "tutorial_popup_0": "Popup kini interaktif!",
+  "tutorial_popup_1": "Tiga titik membuka opsi menyembunyikan, mengecualikan, dan mengalihkan penghitung waktu",
+  "tutorial_popup_2": "Ikon di kedua sisi tautan navigasi akan membesar untuk menampilkan info ekstra, coba saja!",
+  "tutorial_popup_3": "Ikon bervariasi untuk setiap kategori, pastikan untuk memeriksa semuanya",
+  "tutorial_closing_0": "Info tambahan",
+  "tutorial_closing_1": "Penggeser Pokémon global di samping beroperasi secara terpisah dari menu lanjutan dan tidak mempengaruhi satu sama lain",
+  "tutorial_closing_2": "Pastikan untuk memeriksa bagian Pengaturan di samping",
+  "tutorial_closing_3": "Banyak opsi estetik yang tersedia untuk setiap kategori, namun ingat bahwa semakin banyak yang Anda tambahkan ke peta Anda, semakin tinggi kemungkinan peta Anda akan beku",
+  "tutorial_closing_4": "Anda dapat melihat tutorial ini lagi dengan memilihnya di panel Pengaturan di samping",
+  "tutorial_closing_5": "Tetap aman dan semoga beruntung!",
+  "intro": "Intro",
+  "sidebar": "Samping",
+  "sliders": "Penggeser",
+  "popups": "Popup",
+  "closing": "Penutupan",
   "shortcuts": "Pintasan",
   "iv": "IV",
-  "area_restrictions": "Batasan Area",
+  "area_restrictions": "Pembatasan Area",
   "map": "Peta",
   "stats": "Statistik",
   "pvp": "PVP",
-  "area_restrictions_subtitle": "Anda memiliki akses ke area-area ini",
-  "devices_subtitle": "Menampilkan lokasi dan rute perangkat yang aktif",
-  "gyms_subtitle": "Menampilkan semua lokasi gym yang aktif, tim aktif, dan berapa banyak slot yang tersedia di setiap gym",
-  "invasions_subtitle": "Menampilkan informasi invasi Team Rocket, termasuk susunan pertempuran, waktu kedaluwarsa, dan hadiah yang mungkin",
+  "area_restrictions_subtitle": "Anda memiliki akses ke area ini",
+  "devices_subtitle": "Menampilkan lokasi dan rute perangkat aktif",
+  "gyms_subtitle": "Menampilkan semua lokasi gym aktif, tim aktif, dan berapa banyak slot yang tersedia di setiap gym",
+  "invasions_subtitle": "Menampilkan info invasi Team Rocket, termasuk lineup pertarungan, waktu kadaluarsa, dan hadiah yang mungkin",
   "iv_subtitle": "Menampilkan opsi IV% dan kilau",
-  "lures_subtitle": "Menampilkan informasi umpan, termasuk jenis umpan dan waktu kedaluwarsa",
+  "lures_subtitle": "Menampilkan info lure, termasuk tipe lure dan waktu kadaluarsa",
   "map_subtitle": "Menampilkan peta",
-  "nests_subtitle": "Menampilkan Pokémon yang sedang bersarang secara aktif dan poligon sarang",
-  "pokemon_subtitle": "Menampilkan semua lokasi Pokémon dan waktu kedaluwarsa",
-  "pokestops_subtitle": "Menampilkan lokasi semua PokéStop",
-  "portals_subtitle": "Menampilkan lokasi semua portal Ingress",
-  "pvp_subtitle": "Menampilkan info peringkat PVP/CP/Level untuk setiap Pokémon",
-  "quests_subtitle": "Menampilkan info hadiah dan tugas dari misi",
-  "raids_subtitle": "Menampilkan info raid termasuk bos raid, telur, waktu berakhir, dan gerakan",
-  "scan_cells_subtitle": "Menampilkan waktu terakhir sebuah sel S2 dipindai oleh perangkat",
+  "nests_subtitle": "Menampilkan Pokémon yang sedang nesting dan poligon sarang",
+  "pokemon_subtitle": "Menampilkan semua lokasi Pokémon dan waktu kadaluarsanya",
+  "pokestops_subtitle": "Menampilkan semua lokasi PokéStop",
+  "portals_subtitle": "Menampilkan semua portal Ingress",
+  "pvp_subtitle": "Menampilkan informasi Peringkat/CP/Level PVP untuk setiap Pokémon",
+  "quests_subtitle": "Menampilkan informasi hadiah dan tugas quest",
+  "raids_subtitle": "Menampilkan semua informasi raid termasuk boss raid, telur, waktu berakhir, dan moveset",
+  "scan_cells_subtitle": "Menampilkan waktu terakhir sebuah sel S2 dipindai oleh sebuah perangkat",
   "scan_areas_subtitle": "Menampilkan poligon area pemindaian yang tersedia",
-  "spawnpoints_subtitle": "Menampilkan titik spawn dan waktu despawn yang diperkirakan",
+  "spawnpoints_subtitle": "Menampilkan titik spawn dan perkiraan waktu hilangnya",
   "stats_subtitle": "Menampilkan statistik dan level Pokémon",
-  "submission_cells_subtitle": "Menampilkan informasi yang berguna untuk mengirimkan POI baru",
-  "weather_subtitle": "Menampilkan info cuaca dalam permainan untuk setiap sel",
+  "submission_cells_subtitle": "Menampilkan informasi berguna untuk mengajukan POI baru",
+  "weather_subtitle": "Menampilkan informasi cuaca dalam game untuk setiap sel",
   "scanner_subtitle": "Berinteraksi langsung dengan pemindai dengan berbagai cara",
-  "s2cells_subtitle": "Menampilkan Sel S2 dalam berbagai level di peta",
-  "backups_subtitle": "Memungkinkan pencadangan dan pengambilan pengaturan di berbagai perangkat",
-  "backups": "Pencadangan",
+  "s2cells_subtitle": "Menampilkan Sel S2 di berbagai level di peta",
+  "backups_subtitle": "Mengaktifkan pencadangan dan pemuatan pengaturan lintas perangkat",
+  "backups": "Cadangan",
   "user_profile": "Profil Pengguna",
-  "user_username": "Nama Pengguna",
+  "user_username": "Nama pengguna",
   "candy": "Permen",
   "show_ex_badge": "Tampilkan Lencana EX",
   "search": "Cari",
   "global_search_quests": "Masukkan Nama Hadiah...",
-  "global_search_lures": "Masukkan Nama Umpan...",
+  "global_search_lures": "Masukkan Nama Lure...",
   "global_search_pokestops": "Masukkan Nama PokéStop...",
   "global_search_gyms": "Masukkan Nama Gym...",
   "global_search_portals": "Masukkan Nama Portal...",
   "global_search_nests": "Masukkan Nama Pokémon Sarang...",
-  "global_search_raids": "Masukkan Nama Bos Raid...",
+  "global_search_raids": "Masukkan Nama Boss Raid...",
   "global_search_pokemon": "Masukkan Nama Pokémon...",
+  "global_search_invasions": "Masukkan Tipe, Nama, atau Nama hadiah Pokémon Grunt...",
   "raid_level_badges": "Lencana Level Raid",
   "options": "Opsi",
   "profile": "Profil",
@@ -308,9 +309,23 @@
   "weather_icons": "Ikon Cuaca",
   "misc_icons": "Ikon Lainnya",
   "invasion_icons": "Ikon Invasi",
-  "spawnpoint_icons": "Ikon Titik Muncul",
+  "spawnpoint_icons": "Ikon Titik Spawn",
   "device_icons": "Ikon Perangkat",
-  "pokemon_timers": "Semua Timer Pokemon",
+  "pokemon_audio": "Audio Pokémon",
+  "pokestop_audio": "Audio PokéStop",
+  "gym_audio": "Audio Gym",
+  "team_audio": "Audio Tim",
+  "egg_audio": "Audio Telur",
+  "raid_audio": "Audio Raid",
+  "nest_audio": "Audio Sarang",
+  "reward_audio": "Audio Hadiah",
+  "type_audio": "Audio Tipe",
+  "weather_audio": "Audio Cuaca",
+  "misc_audio": "Audio Lainnya",
+  "invasion_audio": "Audio Invasi",
+  "spawnpoint_audio": "Audio Titik Spawn",
+  "device_audio": "Audio Perangkat",
+  "pokemon_timers": "Semua Timer Pokémon",
   "show_dex_num_in_popup": "Tampilkan Nomor Pokedex di Popup",
   "popup": "Popup",
   "pvp_level": "Statistik PVP Level {{level}}",
@@ -321,17 +336,17 @@
   "gym": "Gym",
   "egg": "Telur",
   "raid": "Raid",
-  "lure": "Umpan",
-  "quest": "Tugas",
+  "lure": "Lure",
+  "quest": "Quest",
   "invasion": "Invasi",
   "nest": "Sarang",
-  "pokestop": "Pokestop",
+  "pokestop": "PokéStop",
   "team": "Tim",
   "global": "Global",
   "manage_webhook": "Kelola {{name}}",
-  "drag_and_drop": "Seret dan Lepaskan Penanda untuk Mengatur Lokasi Anda",
+  "drag_and_drop": "Seret dan Lepas Marker untuk Menetapkan Lokasi Anda",
   "click_to_select": "Klik untuk Memilih",
-  "add_new": "Tambahkan Peringatan Baru {{category}}",
+  "add_new": "Tambahkan {{category}} Alert Baru",
   "my_location": "Lokasi Saya",
   "choose_on_map": "Pilih di Peta",
   "select_profile": "Pilih Profil",
@@ -339,19 +354,19 @@
   "areas": "Area",
   "select_webhook": "Pilih Bot",
   "ar_quest_true": "Tugas AR",
-  "ar_quest_false": "Tanpa AR",
+  "ar_quest_false": "Tidak AR",
   "with_ar": "Dengan AR",
   "both": "Keduanya",
   "without_ar": "Tanpa AR",
   "exclude_quest_multi": "Kecualikan {{reward}}",
   "cluster_limit_0": "Batas {{variable_0}} ({{variable_1}}) telah tercapai",
-  "cluster_limit_1": "Silakan perbesar atau perkecil filter Anda",
+  "cluster_limit_1": "Silakan perbesar atau sempitkan filter Anda",
   "show_polygons": "Tampilkan Poligon",
   "exclude_invasion_multi": "Kecualikan {{invasion}}",
   "stardust": "Stardust",
   "slider_cp": "CP",
   "pvp_ranking_league": "Liga",
-  "pvp_ranking_min_cp": "CP Minimum",
+  "pvp_ranking_min_cp": "CP Min",
   "slider_pvp": "Peringkat",
   "profile_no": "Profil",
   "template": "Template",
@@ -361,24 +376,24 @@
   "pvp_entry": "Entri PVP",
   "no_iv": "Termasuk Tanpa IV",
   "by_distance": "Berdasarkan Jarak",
-  "min_time": "Waktu Minimum",
-  "add_new_profile": "Tambahkan Profil Baru",
+  "min_time": "Waktu Min",
+  "add_new_profile": "Tambah Profil Baru",
   "slider_none": "Tidak Ada",
-  "non_registered_human_title": "Ups, ada yang tidak beres!",
-  "non_registered_human_desc": "Anda mungkin belum terdaftar dengan {{webhook}}\nAtau server saat ini tidak dapat dijangkau",
+  "non_registered_human_title": "Oops, ada yang tidak beres!",
+  "non_registered_human_desc": "Anda mungkin belum terdaftar dengan {{webhook}}\nAtau server sedang tidak dapat dijangkau",
   "try_again_later": "Silakan coba lagi nanti",
-  "selected_areas": "{{amount}} Area Dipilih",
-  "selected_areas_plural": "{{amount}} Area Dipilih",
+  "selected_areas_one": "{{count}} Area Terpilih",
+  "selected_areas_other": "{{count}} Area Terpilih",
   "webhook_selection": "Pilihan {{name}}",
   "message_of_the_day": "Pesan Hari Ini",
-  "has_quest_indicator": "Warna Alternatif untuk Pokestop dengan Tugas",
+  "has_quest_indicator": "Warna Alternatif untuk Stops dengan Quest",
   "show_ar_badge": "Tampilkan Lencana AR",
   "all_gyms": "Semua Gym",
   "general": "Umum",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Hubungkan Global & Lanjutan",
+  "link_global_and_advanced": "Menghormati Pilihan Global",
   "normal_forms": "Bentuk Normal",
-  "weather_indicator": "Indikator Peningkatan Cuaca",
+  "weather_indicator": "Indikator Penguatan Cuaca",
   "page": "Halaman {{page}}",
   "navigation_controls": "Kontrol Navigasi",
   "navigation_controls_react": "React",
@@ -387,7 +402,7 @@
   "all_moves": "Semua Gerakan",
   "move": "Gerakan",
   "any": "Sembarang",
-  "min_spawn_average": "Laju Spawn Minimum",
+  "min_spawn_average": "Rata-rata Spawn Min",
   "select_all": "Pilih Semua",
   "delete_all": "Hapus yang Dipilih",
   "cancel": "Batal",
@@ -400,134 +415,137 @@
   "day_7": "Minggu",
   "profile_name": "Nama Profil",
   "manage_profiles": "Kelola Profil",
-  "min_spawn_avg": "Rata-rata Laju Spawn Minimum",
+  "min_spawn_avg": "Rata-rata Spawn Min",
   "poke_global": "Semuanya",
   "amount": "Jumlah",
   "specific_gym": "Gym Tertentu",
   "search_location": "Cari Lokasi",
-  "search_specific": "Cari untuk {{category}} Tertentu",
-  "webhook_success_gym": "Pemberitahuan Raids, Telur, dan Perubahan Tim Telah Ditambahkan!",
+  "search_specific": "Cari {{category}} Tertentu",
+  "webhook_success_gym": "Alert Raid, Eggs, dan Perubahan Tim telah Ditambahkan!",
   "slot_changes": "Perubahan Slot",
   "slot_changes_poracle": "perubahan_slot",
-  "confirm_delete": "Ini akan menghapus semua pelacakan untuk profil ini, apakah Anda yakin?",
-  "confirm_copy": "Pilih profil mana yang ingin Anda salin ke \"{{profile}}\", ini akan menimpa profil tersebut sepenuhnya.",
-  "webhook_error": "{{name}} tidak dapat memprosesnya.\nSilakan coba lagi nanti.",
+  "confirm_delete": "Ini akan menghapus semua pelacakan untuk profil ini, Anda yakin?",
+  "confirm_copy": "Pilih profil mana yang ingin Anda salin \"{{profile}}\" ke, ini akan menimpa profil tersebut sepenuhnya.",
+  "webhook_error": "{{name}} tidak dapat memproses itu.\nSilakan coba lagi nanti.",
   "profile_error": "Harus unik dan valid",
-  "team_0": "Harmony",
-  "battle_changes": "Dalam Pertempuran",
-  "battle_changes_poracle": "perubahan_pertempuran",
+  "team_0": "Harmoni",
+  "battle_changes": "Dalam Pertarungan",
+  "battle_changes_poracle": "perubahan_pertarungan",
   "auto": "Otomatis",
-  "webhooks_subtitle": "Kelola pemberitahuan Anda langsung dari peta untuk bot ini",
-  "event_stops_subtitle": "Menampilkan Pokéstop acara khusus seperti Kecleon",
-  "webhooks": "Pemberitahuan",
-  "scanner": "Tindakan Pemindai",
-  "everything_individually": "Tambahkan Pemberitahuan Individu",
+  "webhooks_subtitle": "Kelola alert Anda langsung dari peta untuk bot ini",
+  "event_stops_subtitle": "Menampilkan Pokéstops acara khusus seperti Kecleon",
+  "webhooks": "Alert",
+  "scanner": "Aksi Scanner",
+  "everything_individually": "Tambahkan Alert Individu",
   "individually": "secara individu",
   "join": "Gabung",
-  "errors_404": "Ups, halaman ini tidak dapat ditemukan!",
-  "errors_500": "Terjadi kesalahan server, coba lagi nanti!",
+  "errors_404": "Oops, halaman ini tidak ditemukan!",
+  "errors_500": "Ada kesalahan server, coba lagi nanti!",
   "local_username": "Nama Pengguna",
   "local_password": "Kata Sandi",
-  "local_error": "Terjadi kesalahan, silakan coba lagi nanti!",
-  "no_filter_results": "Tidak Ada Hasil Ditemukan\nCoba Perluas Filter Anda",
-  "donor_page": "Halaman Donor",
+  "local_error": "Telah terjadi kesalahan, silakan coba lagi nanti!",
+  "no_filter_results": "Tidak Ditemukan Hasil\nCoba Lebarkan Filter Anda",
+  "donor_page": "Halaman Donatur",
   "go_back": "Kembali",
   "access": "Akses",
-  "link_discord": "Tautan Discord",
+  "link_discord": "Hubungkan Discord",
   "select_webhook_strategy": "Manajer Peringatan",
-  "webhook_strategy_success_0": "Berhasil! Memuat ulang untuk mengambil pengaturan peringatan...",
+  "webhook_strategy_success_0": "Sukses! Memuat ulang untuk mengambil pengaturan peringatan...",
   "register": "Daftar",
   "invalid_credentials": "Kredensial Tidak Valid",
+  "localauth_failed": "Autentikasi gagal",
   "error_creating_user": "Tidak dapat mendaftarkan pengguna baru saat ini",
   "discord_linked": "Discord Terhubung",
   "telegram_linked": "Telegram Terhubung",
   "level": "level",
   "km": "km",
   "feedback": "Umpan Balik",
-  "donor_menu": "Menu Donor",
-  "pokemon_cell": "Lokasi Pokemon Dapat Berbeda",
+  "donor_menu": "Menu Donatur",
+  "pokemon_cell": "Lokasi Pokemon Bisa Berbeda",
   "timer_verified": "Timer ini Terverifikasi",
-  "timer_unverified": "Timer ini Belum Terverifikasi",
+  "timer_unverified": "Timer ini Tidak Terverifikasi",
   "all": "Semua",
   "badge_0": "Tidak Ada",
-  "badge_1": "Perunggu",
+  "badge_1": "Bronze",
   "badge_2": "Perak",
   "badge_3": "Emas",
   "gym_badge_menu": "Edit Lencana Gym",
   "gym_badges": "Lencana Gym",
   "gym_badge_diamonds": "Tampilkan Lencana Gym",
-  "gym_badges_subtitle": "Menampilkan Lencana Gym di peta dan daftar di halaman profil.",
-  "confirm_filters_reset": "Reset filter",
+  "gym_badges_subtitle": "Menampilkan Lencana Gym di peta dan sebuah daftar di halaman profil.",
+  "confirm_filters_reset": "Atur Ulang Filter",
   "filters_reset_text": "Apakah Anda yakin ingin mengatur ulang pengaturan ke nilai default? Ini tidak dapat dibatalkan!",
-  "filters_reset_title": "Reset filter",
-  "raid_quick_select": "Pilihan Cepat",
-  "disabled": "Nonaktif",
+  "filters_reset_title": "Atur Ulang Filter",
+  "raid_quick_select": "Pilih Cepat",
+  "disabled": "Dinonaktifkan",
   "loading": "Memuat {{category}}",
   "loading_icons": "Mengambil Ikon",
   "loading_invasions": "Mengambil Invasi",
   "scan_next": "Pindai Lokasi",
-  "scan_next_choose": "Seret dan Lepaskan Penanda untuk Mengatur Lokasi Pemindaian",
+  "scan_next_choose": "Seret dan Lepaskan Penanda untuk Menetapkan Lokasi Pemindaian",
   "scan_zone": "Pindai Area",
-  "scan_zone_choose": "Seret dan Lepaskan Penanda untuk Mengatur Lokasi Pemindaian dan Pilih Ukuran",
+  "scan_zone_choose": "Seret dan Lepaskan Penanda untuk Menetapkan Lokasi Pemindaian dan Memilih Ukuran",
   "scan_zone_size": "Ukuran",
-  "scan_zone_range": "Jarak",
-  "scan_zone_spacing": "Pemisahan",
+  "scan_zone_range": "Jangkauan",
+  "scan_zone_spacing": "Jarak",
   "scan_zone_radius": "Radius",
   "scan_requests": "Permintaan Pemindaian",
   "scan_queue": "Antrian Saat Ini",
-  "click_to_scan": "Pindai di Sini",
+  "click_to_scan": "Pindai Di Sini",
   "scan_confirmed_title": "Permintaan pemindaian dikonfirmasi",
   "scan_confirmed": "Pekerja telah dikirim ke lokasi, hasil akan segera muncul di peta!",
   "scan_loading_title": "Mengirim permintaan pemindaian",
   "scan_loading": "Permintaan pemindaian Anda sedang diproses dan dikirim ke sistem!",
-  "scan_error_title": "Kesalahan",
-  "scan_error": "Terjadi kesalahan saat memproses permintaan pemindaian...",
+  "scan_error_title": "Error",
+  "scan_error": "Telah terjadi kesalahan saat memproses permintaan pemindaian...",
   "scan_outside_area": "Lokasi ini berada di luar batas area yang diizinkan",
   "pvp_ranking_cap": "Level",
   "lc_title": "Ikuti Lokasi Anda",
   "lc_metersUnit": "meter",
   "lc_feetUnit": "kaki",
   "lc_popup": "Anda berada dalam jarak {distance} {unit} dari titik ini",
-  "lc_outsideMapBoundsMsg": "Anda tampak berada di luar batas peta",
-  "no_alerts": "Tidak ada Peringatan Ditemukan",
+  "lc_outsideMapBoundsMsg": "Anda tampaknya berada di luar batas peta",
+  "no_alerts": "Tidak Ada Peringatan",
   "loading_settings": "Memuat Pengaturan",
-  "refresh_to_continue": "Harap segarkan sebelum melanjutkan",
+  "refresh_to_continue": "Silakan segarkan sebelum melanjutkan",
   "session_expired_title": "Sesi Berakhir",
   "session_expired_body": "Sesi Anda telah berakhir",
-  "old_client_title": "Kadaluarsa",
+  "old_client_title": "Ketinggalan Zaman",
   "old_client_body": "Versi baru dari peta ini tersedia",
+  "early_old_client_title": "Ketinggalan Zaman",
+  "early_old_client_body": "Versi lama dari aplikasi ini mungkin tersimpan di cache browser Anda, Anda perlu membersihkan cache sebelum dapat menggunakan aplikasi ini.",
   "refresh": "Segarkan",
   "points": "Poin",
   "day": "Hari",
   "days": "Hari",
-  "react_error": "Ada Kesalahan",
-  "clickable_icon": "Ikon dapat diklik",
-  "two_stops_till_next": "2 berhenti sampai berikutnya",
-  "one_stop_till_next": "1 berhenti sampai berikutnya",
+  "react_error": "Terjadi Kesalahan",
+  "clickable_icon": "Ikon Dapat Diklik",
+  "two_stops_till_next": "2 stop sampai berikutnya",
+  "one_stop_till_next": "1 stop sampai berikutnya",
   "no_more_gyms": "Tidak ada gym lagi",
   "light_map_border": "Batas Peta Terang",
   "dark_map_border": "Batas Peta Gelap",
-  "cell_blocked": "Sel Terblokir",
+  "cell_blocked": "Sel Diblokir",
   "poi_color": "Warna POI",
-  "quest_condition": "Kondisi Tantangan",
+  "quest_condition": "Kondisi Quest",
   "always_show_labels": "Selalu Tampilkan Label",
-  "scan_areas_options": "Pilihan Pindai Area",
+  "scan_areas_options": "Opsi Area Pemindaian",
   "historic_rarity": "Kelangkaan Bersejarah",
-  "poi": "Titik Minat",
-  "300m_range": "Jarak 300m",
-  "lure_range": "Jarak Umpan",
-  "custom_range": "Jarak Kustom",
-  "tap_to_toggle": "Ketuk Untuk Mengaktifkan",
-  "power_up": "Power Up",
+  "poi": "Poin Minat",
+  "300m_range": "Jangkauan 300m",
+  "lure_range": "Jangkauan Umpan",
+  "custom_range": "Jangkauan Kustom",
+  "tap_to_toggle": "Ketuk Untuk Mengganti",
+  "power_up": "Tingkatkan Kekuatan",
   "never_alt": "Tidak Pernah",
-  "seen_nearby_stop": "Terlihat di Sekitar",
-  "seen_nearby_cell": "Terlihat di Sel ini",
+  "seen_nearby_stop": "Terlihat di Stop Terdekat",
+  "seen_nearby_cell": "Terlihat di Sel Ini",
   "seen_lure_encounter": "Pertemuan Umpan",
-  "seen_lure_wild": "Pertemuan Umpan",
-  "seen_wild": "Pertemuan Liar",
-  "event_stops": "Berhenti Acara",
-  "event_stop_timers": "Timer Berhenti Acara",
-  "size_0": "Sembarang",
+  "seen_lure_wild": "Spawn Umpan",
+  "seen_wild": "Spawn Liar",
+  "event_stops": "Stop Event",
+  "event_stop_timers": "Timer Stop Event",
+  "size_0": "Semua",
   "size_1": "XXS",
   "size_2": "XS",
   "size_3": "M",
@@ -535,177 +553,166 @@
   "size_5": "XXL",
   "show_size_indicator": "Tampilkan Indikator Ukuran",
   "size": "Ukuran",
-  "gold_stop": "Berhenti Emas",
+  "gold_stop": "Stop Emas",
   "profile_backups": "Pertukaran Profil",
-  "new_backup": "Cadangan Baru",
+  "new_backup": "Backup Baru",
   "create": "Buat",
   "load": "Muat",
   "update": "Perbarui",
   "delete": "Hapus",
   "name": "Nama",
-  "only_confirmed": "Hanya yang Dikonfirmasi",
+  "only_confirmed": "Hanya Terkonfirmasi",
   "rocket_pokemon": "Pokémon Rocket",
-  "decoy": "Pengalih Perhatian",
-  "s2_cell_limit_0": "Anda mencoba menghasilkan lebih dari 20.000 sel ({{variable_0}})",
+  "decoy": "Umpan",
+  "s2_cell_limit_0": "Anda mencoba untuk menghasilkan lebih dari 20.000 sel ({{variable_0}})",
   "show_all_pvp_ranks": "Tampilkan Semua Peringkat PVP",
   "enable_pokemon_popup_coords": "Tampilkan Koordinat Pokémon",
   "enable_gym_popup_coords": "Tampilkan Koordinat Gym",
   "enable_pokestop_popup_coords": "Tampilkan Koordinat Pokéstop",
   "enable_portal_popup_coords": "Tampilkan Koordinat Portal",
-  "on_block_join_discord": "Silakan bergabung dengan discord kami untuk informasi lebih lanjut.",
-  "on_block_msg": "Anda telah diblokir karena menjadi anggota",
+  "on_block_join_discord": "Silakan gabung dalam discord kami untuk informasi lebih lanjut.",
+  "on_block_msg": "Anda telah diblokir karena menjadi anggota dari",
   "denied": "Ditolak",
-  "showcase": "Tampilkan",
-  "unknown_event": "Acara Tidak Dikenal",
-  "scanner_countdown": "Tersedia dalam {{time}} detik",
+  "showcase": "Pameran",
+  "unknown_event": "Event Tidak Dikenal",
+  "scanner_countdown": "Tersedia dalam {{time}}s",
   "success": "Berhasil",
-  "contribute": "Berpartisipasi",
+  "contribute": "Kontribusi",
   "mi": "mi",
-  "filter_by_areas": "Filter berdasarkan Area",
+  "filter_by_areas": "Filter Berdasarkan Area",
   "submit_nest_name": "Kirim Nama Sarang",
   "nest_submission_menu": "Perbarui Nama",
-  "nest_submissions": "Pengajuan Sarang",
-  "nest_submissions_subtitle": "Memungkinkan Anda untuk mengirimkan nama-nama baru untuk sarang",
-  "pokemon_opacity": "Ketebalan Pokemon Dinamis",
-  "invasion_opacity": "Ketebalan Invasi Dinamis",
-  "raid_opacity": "Ketebalan Raid Dinamis",
-  "opacity_ten_minutes": "Ketebalan pada 10 menit",
-  "opacity_five_minutes": "Ketebalan pada 5 menit",
-  "opacity_one_minute": "Ketebalan pada 1 menit",
+  "nest_submissions": "Kirim Sarang",
+  "nest_submissions_subtitle": "Memungkinkan Anda untuk mengirimkan nama baru untuk sarang",
+  "pokemon_opacity": "Opasitas Pokémon Dinamis",
+  "invasion_opacity": "Opasitas Invasi Dinamis",
+  "raid_opacity": "Opasitas Raid Dinamis",
+  "opacity_ten_minutes": "Opasitas pada 10 menit",
+  "opacity_five_minutes": "Opasitas pada 5 menit",
+  "opacity_one_minute": "Opasitas pada 1 menit",
   "level_circles": "Indikator Level",
   "min_level_circle": "Level Lingkaran Minimum",
-  "mutation_auth_error": "Permintaan Anda tidak berhasil karena tidak masuk",
-  "submitted_by": "Dikirim oleh",
-  "localauth_failed": "Autentikasi gagal",
-  "reversible": "Dapat dibalik",
+  "mutation_auth_error": "Permintaan Anda tidak berhasil karena tidak login",
+  "submitted_by": "Dikirim Oleh",
+  "reversible": "Dapat Dibalik",
   "version": "Versi",
   "route_tags": "Tag Rute",
   "routes": "Rute",
-  "route_type": "Jenis Rute",
-  "routes_subtitle": "Lihat rute dalam permainan dan informasi relevan tentangnya pada peta",
+  "route_type": "Tipe Rute",
+  "routes_subtitle": "Lihat rute dalam game dan informasi relevan tentang mereka di peta",
   "description": "Deskripsi",
-  "additional_info": "Informasi Tambahan",
+  "additional_info": "Info Tambahan",
   "duration": "Durasi",
-  "elevation": "Ketinggian",
+  "elevation": "Elevasi",
   "contest_category_1": "Ukuran Terkecil",
-  "contest_category_2": "Ukuran Terbesar",
+  "context_category_2": "Ukuran Terbesar",
   "total_entries": "Total Entri",
-  "showcase_rankings": "Peringkat Showcase",
-  "showcase_rankings_subtitle": "Menampilkan daftar peringkat teratas untuk showcase di Pokestop",
+  "showcase_rankings": "Peringkat Pameran",
+  "showcase_rankings_subtitle": "Menampilkan daftar peringkat teratas untuk pameran di Pokéstop",
   "tth": "TTH",
   "tth_0": "Semua",
   "tth_1": "Diketahui",
   "tth_2": "Tidak Diketahui",
-  "no_access": "Tidak Bisa Diakses",
-  "context_category_2": "Ukuran Terbesar",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": "Masuk",
-  "join_button": "Gabung",
-  "cooldown": "Waktu Istirahat",
-  "scan_some_outside_area": "Beberapa lokasi di luar batas yang diizinkan",
-  "alerts": "peringatan",
-  "alert_manager": "Pengelola peringatan",
+  "no_access": "Tidak Ada Akses",
+  "cooldown": "Pendinginan",
+  "scan_some_outside_area": "Beberapa lokasi berada di luar batas yang diizinkan",
+  "alerts": "alert",
+  "alert_manager": "Pengelola Alert",
   "menu": "Menu",
   "theme": "Tema",
   "exit": "Keluar",
   "component": "Komponen",
-  "component_login_page": "Halaman Masuk",
+  "component_login_page": "Halaman Login",
   "component_donation_page": "Halaman Donasi",
   "component_message_of_the_day": "Pesan Hari Ini",
   "download": "Unduh",
-  "playground": "Tempat Bermain",
-  "locale": "Bahasa",
+  "playground": "Taman Bermain",
+  "locale": "Lokal",
   "saved": "Tersimpan",
   "show_editor": "Tampilkan Editor",
   "hide_editor": "Sembunyikan Editor",
-  "reported_error": "Kesalahan ini telah dilaporkan ke server dengan kode identifikasi",
+  "reported_error": "Kesalahan ini telah dilaporkan ke server dengan identifier",
   "dark_mode": "Mode Gelap",
-  "load_from_autosave": "Muat dari penyimpanan otomatis",
+  "load_from_autosave": "Muat dari Simpanan Otomatis",
   "done": "Selesai",
   "fast": "Cepat",
-  "charged": "Diisi ulang",
+  "charged": "Mengisi",
   "offline_mode": "Mode Offline",
-  "include_sponsored": "Tampilkan yang Disponsori",
-  "showcase_color": "Warna Showcase",
+  "include_sponsored": "Sertakan Sponsor",
+  "showcase_color": "Warna Sorotan",
   "partner_color": "Warna Mitra",
   "disable": "Nonaktifkan {{- name}}",
-  "profiling": "Profiling",
-  "showcase_block": "Diblokir karena showcase",
-  "signed_in_as": "Masuk sebagai",
+  "profiling": "Profilisasi",
+  "showcase_block": "Diblokir karena sebuah sorotan",
+  "signed_in_as": "Masuk Sebagai",
   "missing_map_perm": "Anda tidak memiliki izin untuk melihat peta.",
-  "pokemon_audio": "Audio Pokémon",
-  "pokestop_audio": "Audio PokéStop",
-  "gym_audio": "Audio Gym",
-  "team_audio": "Audio Tim",
-  "egg_audio": "Audio Egg",
-  "raid_audio": "Audio Raid",
-  "nest_audio": "Audio Nest",
-  "reward_audio": "Audio Hadiah",
-  "type_audio": "Audio Tipe",
-  "weather_audio": "Audio Cuaca",
-  "misc_audio": "Audio Lainnya",
-  "invasion_audio": "Audio Invasi",
-  "spawnpoint_audio": "Audio Titik Spawning",
-  "device_audio": "Audio Perangkat",
   "access_denied": "Akses Ditolak",
   "audio": "Audio",
   "desktop_notifications": "Notifikasi Desktop",
-  "notifications_options": "Pilihan Notifikasi",
-  "audio_always_on": "Audio Selalu Aktif",
+  "notifications_options": "Opsi Notifikasi",
+  "audio_always_on": "Audio Selalu Hidup",
   "volume_level": "Tingkat Volume",
   "notifications_status": "Status Notifikasi",
   "granted": "diberikan",
-  "global_search_invasions": "Masukkan Jenis Grunt, Nama, atau Nama Hadiah Pokemon...",
   "set_all": "Atur Semua",
-  "set_filtered": "Atur yang Difilter",
+  "set_filtered": "Terapkan Filter",
   "only_show_available": "Hanya Tampilkan yang Tersedia",
   "easy_mode": "Mode Mudah",
-  "quick_select": "Pilihan Cepat Global",
+  "quick_select": "Pemilihan Cepat Global",
   "pokemon_filter_mode": "Mode Filter Pokémon",
   "basic": "Dasar",
   "intermediate": "Menengah",
   "expert": "Ahli",
-  "basic_description": "Mudah memilih Pokémon dan menerapkan filter global",
-  "intermediate_description": "Mengatur filter individual secara global dan per Pokémon (tradicional)",
-  "expert_description": "Pencarian manual untuk kustomisasi terbaik",
+  "basic_description": "Pilih Pokémon dengan mudah dan terapkan filter global",
+  "intermediate_description": "Atur filter individu secara global dan per Pokémon (tradisional)",
+  "expert_description": "Masukan kueri manual untuk kustomisasi terbanyak",
   "icon_size": "Ukuran Ikon",
   "developer": "Pengembang",
-  "raid_override": "Override Raid",
-  "search_rocket_pokemon": "Cari Pokémon Tim Rakit",
+  "raid_override": "Penimpaan Raid",
+  "search_rocket_pokemon": "Cari Pokémon Rocket",
   "main": "Utama",
-  "extra": "Tambahan",
+  "extra": "Ekstra",
   "select": "Pilih",
-  "searching": "sedang mencari...",
-  "no_options": "Tidak Ada Pilihan..."
+  "searching": "mencari...",
+  "no_options": "Tidak Ada Opsi...",
+  "and": "DAN",
+  "or": "ATAU",
+  "only_global": "Hanya Global",
+  "global_caption": "Abaikan Semua Filter Lain",
+  "global_and_individual": "Filter Global & Individu",
+  "gender_filters_all": "Jenis Kelamin Berlaku untuk Semua",
+  "and_caption": "Dikaitkan Bersama",
+  "or_caption": "Memfilter Secara Independen",
+  "filter_help": "Bantuan Filter",
+  "kilometers": "Kilometer",
+  "miles": "Mil",
+  "distance_unit": "Satuan Jarak",
+  "data_management": "Manajemen Data",
+  "reset_or_manage_text": "Anda dapat melakukan reset berat pada filter anda atau anda dapat melihat halaman manajemen data yang akan memungkinkan anda untuk reset kategori individu.",
+  "reset_audio": "Reset Audio",
+  "reset_all": "Reset Semua",
+  "reset_icons": "Reset Ikon",
+  "reset_position": "Reset Posisi",
+  "reset_ui": "Reset UI",
+  "reset_options": "Reset Opsi",
+  "reset_menus": "Reset Menu",
+  "reset_settings": "Reset Pengaturan",
+  "reset_general_title": "Umum",
+  "reset_filters_title": "Filter",
+  "reset_assets": "Reset Aset",
+  "reset_pokemon": "Reset Pokémon",
+  "reset_pokestops": "Reset PokéStop",
+  "reset_gyms": "Reset Gym",
+  "reset_nests": "Reset Sarang",
+  "reset_portals": "Reset Portal",
+  "reset_routes": "Reset Rute",
+  "reset_scan_areas": "Reset Area Pemindaian",
+  "reset_scan_cells": "Reset Sel Pemindaian",
+  "reset_devices": "Reset Perangkat",
+  "reset_weather": "Reset Cuaca",
+  "reset_s2cells": "Reset Sel S2",
+  "reset_spawnpoints": "Reset Lokasi Muncul",
+  "reset_submission_cells": "Reset Sel Pengajuan",
+  "hisuian": "Hisuian",
+  "spacial_rend_range": "Jarak Renggut Spasial"
 }
diff --git a/packages/locales/lib/generated/it.json b/packages/locales/lib/generated/it.json
index d48d07dcc..28427095d 100644
--- a/packages/locales/lib/generated/it.json
+++ b/packages/locales/lib/generated/it.json
@@ -1,20 +1,20 @@
 {
   "login": "Accesso",
-  "click_once": "Clicca 'Autorizza' solo una volta",
+  "click_once": "Clicca 'Autorizza' una sola volta",
   "save": "Salva",
-  "reset": "Resetta",
+  "reset": "Reimposta",
   "close": "Chiudi",
-  "reset_filters": "Resetta Filtri",
+  "reset_filters": "Reimposta Filtri",
   "pokemon_filters": "Impostazioni Filtri Pokémon",
   "gyms_filters": "Impostazioni Filtri Palestra",
   "pokestops_filters": "Impostazioni Filtri PokéStop",
   "nests_filters": "Impostazioni Filtri Nido",
   "help": "Aiuto",
-  "apply_to_all": "Applica a tutti",
-  "disable_all": "Disabilita tutti",
-  "enable_all": "Abilita tutti",
-  "enabled": "Abilitato",
-  "legacy": "Legacy",
+  "apply_to_all": "Applica a Tutti",
+  "disable_all": "Disattiva Tutti",
+  "enable_all": "Attiva Tutti",
+  "enabled": "Attivato",
+  "legacy": "Ereditario",
   "id": "ID",
   "location": "Posizione",
   "search_pokemon": "Cerca Pokémon",
@@ -40,40 +40,40 @@
   "rarity": "Rarità Attuale",
   "others": "Altri",
   "categories": "Categorie",
-  "rank": "Classifica",
+  "rank": "Rango",
   "slider_iv": "Intervallo IV",
-  "slider_great": "Grande Lega",
-  "slider_ultra": "Ultra Lega",
-  "slider_little": "Piccola Coppa",
+  "slider_great": "Leg. Super",
+  "slider_ultra": "Leg. Ultra",
+  "slider_little": "Leg. Piccolo",
   "slider_atk_iv": "Attacco",
   "slider_def_iv": "Difesa",
-  "slider_sta_iv": "Stamina",
+  "slider_sta_iv": "Resistenza",
   "slider_level": "Livello",
   "slider_size": "Dimensione",
   "abbreviation_level": "L",
   "lvl": "Liv",
-  "cap": "Cap",
+  "cap": "Limite",
   "custom": "Personalizzato",
   "valid": "Valido",
   "invalid": "Non valido!",
-  "overwrites": "Sovrascrive tutti i filtri",
+  "overwrites": "Sovrascrive Tutti i Filtri",
   "valid_filter": "Filtro Statistiche Valido",
-  "invalid_filter": "Inserisci un filtro valido",
+  "invalid_filter": "Inserisci un Filtro Valido",
   "gyms": "Palestre",
   "nests": "Nidi",
   "pokestops": "PokéStop",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
-  "scan_areas": "Aree di Scansione",
-  "s2cells": "S2 Cells",
+  "scan_areas": "Area di Scansione",
+  "s2cells": "Celle S2",
   "weather": "Meteo",
-  "admin": "Amministrazione",
+  "admin": "Amministratore",
   "settings": "Impostazioni",
-  "advanced": "Avanzate",
-  "tile_servers": "Server di Tile",
+  "advanced": "Avanzato",
+  "tile_servers": "Server Tile",
   "icons": "Icone",
   "navigation": "Navigazione",
-  "drawer": "Cassetto",
+  "drawer": "Menu",
   "tile_servers_default": "Predefinito",
   "drawer_temporary": "Temporaneo",
   "drawer_persistent": "Persistente",
@@ -81,110 +81,110 @@
   "import": "Importa",
   "export": "Esporta",
   "logout": "Esci",
-  "local_storage_cleared": "La Memoria Locale è stata cancellata!",
-  "iv_or_filter": "Filtro IV O",
+  "local_storage_cleared": "Memoria Locale cancellata!",
+  "iv_or_filter": "Filtro IV OR",
   "polygons": "Poligoni",
   "raids": "Raid",
-  "ex_eligible": "Idoneo per EX",
+  "ex_eligible": "Idoneo EX",
   "in_battle": "In Battaglia",
   "all_pokestops": "Tutti i PokéStop",
   "lures": "Esche",
   "quests": "Missioni",
   "invasions": "Invasioni",
   "portals": "Portali",
-  "submission_cells": "Celle di Invio",
-  "spawnpoint": "Punto di Spawn",
-  "spawnpoints": "Punti di spawn",
-  "s2_cell_level": "Livello {{level}} Cellula S2",
-  "total_count": "Conteggio totale",
-  "next_submission": "Prossima sottomissione!",
+  "submission_cells": "Celle di Sottomissione",
+  "spawnpoint": "Punto di Apparizione",
+  "spawnpoints": "Punti di Apparizione",
+  "s2_cell_level": "Cella S2 Livello {{level}}",
+  "total_count": "Conteggio Totale",
+  "next_submission": "Prossima Sottomissione!",
   "never": "Mai",
-  "next_gym": "Prossima palestra",
-  "scan_cells": "Scansiona celle",
+  "next_gym": "Prossima Palestra",
+  "scan_cells": "Scansiona Celle",
   "devices": "Dispositivi",
-  "use_my_location": "Usa la mia posizione",
-  "submit_feedback_title": "Invia feedback/Segnala bug",
-  "use_the_link_below": "Puoi utilizzare il link sottostante per inviare feedback o segnalare eventuali bug che hai riscontrato.",
+  "use_my_location": "Usa la Mia Posizione",
+  "submit_feedback_title": "Invia Feedback/Segnala Bug",
+  "use_the_link_below": "Puoi usare il link sotto per inviare feedback o segnalare bug incontrati.",
   "feedback_to_devs": "Questo feedback viene inviato direttamente agli sviluppatori.",
-  "feedback_form": "Modulo di feedback",
-  "unknown_pokestop": "Nome PokéStop sconosciuto",
-  "unknown_gym": "Nome palestra sconosciuto",
+  "feedback_form": "Modulo di Feedback",
+  "unknown_pokestop": "Nome PokéStop Sconosciuto",
+  "unknown_gym": "Nome Palestra Sconosciuta",
   "exclude": "Escludi",
-  "exclude_quest": "Escludi missione",
-  "exclude_invasion": "Escludi invasione",
-  "exclude_team": "Escludi squadra",
-  "exclude_raid": "Escludi raid",
-  "exclude_lure": "Escludi richiamo",
+  "exclude_quest": "Escludi Missione",
+  "exclude_invasion": "Escludi Invasione",
+  "exclude_team": "Escludi Squadra",
+  "exclude_raid": "Escludi Raid",
+  "exclude_lure": "Escludi Esca",
   "timer": "Timer",
   "hide": "Nascondi",
   "tier": "Livello",
-  "slots": "Slot",
+  "slots": "Posti",
   "mega": "Mega",
   "form": "Forma",
   "starts": "Inizia",
-  "ends": "Termina",
+  "ends": "Finisce",
   "defender": "Difensore",
   "cp": "PC",
   "kilogram": "kg",
   "meter": "m",
-  "total_cp": "PC totale",
-  "first_seen": "Prima vista",
-  "last_seen": "Ultima vista",
-  "last_modified": "Ultima modifica",
-  "last_updated": "Ultimo aggiornamento",
+  "total_cp": "PC Totali",
+  "first_seen": "Visto Prima",
+  "last_seen": "Visto Ultima",
+  "last_modified": "Ultima Modifica",
+  "last_updated": "Ultimo Aggiornamento",
   "imported": "Importato",
-  "nest_estimated": "I dati del nido sono stimati!",
-  "verify_nests": "Verifica controllando gli spawn attuali",
-  "nest_out_of_date": "Il nido potrebbe essere obsoleto!",
-  "nest_check_current": "Controlla gli spawn attuali invece",
-  "spawns_per_hour": "Per ora",
+  "nest_estimated": "Dati del Nido Stimati!",
+  "verify_nests": "Verifica Controllando le Apparizioni Attuali",
+  "nest_out_of_date": "Il Nido Potrebbe Essere Obsoleto!",
+  "nest_check_current": "Controlla le Apparizioni Attuali Invece",
+  "spawns_per_hour": "All'Ora",
   "teams": "Squadre",
   "eggs": "Uova",
   "reverse": "Inverti",
   "selected": "Selezionato",
-  "unselected": "Non selezionato",
-  "only_available": "Disponibile",
+  "unselected": "Deselezionato",
+  "only_available": "Disponibili",
   "common": "Comune",
-  "uncommon": "Non comune",
+  "uncommon": "Non Comune",
   "rare": "Raro",
-  "ultra_rare": "Ultra raro",
+  "ultra_rare": "Ultra Raro",
   "regional": "Regionale",
   "event": "Evento",
   "legendary": "Leggendario",
   "mythical": "Mitico",
-  "ultra_beast": "Ultra Bestia",
-  "alt_forms": "Forme alternative",
+  "ultra_beast": "Ultracreatura",
+  "alt_forms": "Forme Alt",
   "alola": "Alola",
   "galarian": "Galarian",
-  "showing": "Mostra",
+  "showing": "Mostrando",
   "instance": "Istanza",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Tipi potenziati",
+  "boosted_types": "Tipi Potenziati",
   "pokemon_options": "Opzioni Pokémon",
   "pokestops_options": "Opzioni PokéStop",
-  "gyms_options": "Opzioni palestra",
-  "nests_options": "Opzioni nido",
-  "wayfarer_options": "Opzioni Wayfarer",
-  "admin_options": "Opzioni amministratore",
-  "weather_options": "Opzioni meteo",
-  "s2cells_options": "Opzioni cellula S2",
-  "clustering": "Raggruppamento",
-  "glow": "Luminosità",
-  "legacy_filter": "Filtro legacy",
-  "raid_timers": "Tutti i timer raid",
-  "invasion_timers": "Tutti i timer invasione",
-  "lure_timers": "Tutti i timer richiamo",
-  "device_path_color": "Colore percorso dispositivo",
+  "gyms_options": "Opzioni Palestra",
+  "nests_options": "Opzioni Nido",
+  "wayfarer_options": "Opzioni Viandante",
+  "admin_options": "Opzioni Admin",
+  "weather_options": "Opzioni Meteo",
+  "s2cells_options": "Opzioni Celle S2",
+  "clustering": "Clustering",
+  "glow": "Bagliore",
+  "legacy_filter": "Filtro Legacy",
+  "raid_timers": "Tutti i Timer dei Raid",
+  "invasion_timers": "Tutti i Timer delle Invasion",
+  "lure_timers": "Tutti i Timer delle Esche",
+  "device_path_color": "Colore Percorso Dispositivo",
   "old_portals": "Portali Vecchi",
   "new_portals": "Portali Nuovi",
   "items": "Oggetti",
   "energy": "Energia",
-  "ar_eligible": "AR Abilitato",
+  "ar_eligible": "Compatibile con AR",
   "iv_circles": "Indicatori IV",
-  "min_iv_circle": "IV Minimo del Cerchio",
-  "interaction_ranges": "Distanze di Interazione",
-  "cannot_connect": "\nImpossibile connettersi al server in questo momento.\nRiprovarci immediatamente causerà solo ulteriori problemi.\nSi prega di riprovare tra qualche minuto.\n\n- Team Amministrativo della Mappa",
+  "min_iv_circle": "Cerchio IV Minimo",
+  "interaction_ranges": "Range di Interazione",
+  "cannot_connect": "\nImpossibile connettersi al server in questo momento.\nRiprovarci subito potrebbe causare ulteriori problemi.\nSi prega di riprovare tra qualche minuto.\n\n- Team di Amministrazione della Mappa",
   "mad_quest_text": "Missioni Native",
   "xs": "XS",
   "primary": "Primario",
@@ -197,122 +197,137 @@
   "welcome": "Benvenuto in",
   "back": "Indietro",
   "next": "Avanti",
-  "finish": "Fine",
+  "finish": "Finito",
   "start_tutorial": "Inizia Tutorial",
   "view_profile": "Visualizza Profilo",
-  "login_optional": "Accedi (Opzionale)",
+  "login_optional": "Login (Opzionale)",
   "tutorial": "Tutorial",
-  "tutorial_language": "Scegli la tua Lingua",
-  "tutorial_welcome": "Questo tutorial è interattivo e ti incoraggiamo vivamente a giocare con tutte le opzioni fornite",
-  "tutorial_categories": "Categorie a cui hai accesso",
+  "tutorial_language": "Scegli la Tua Lingua",
+  "tutorial_welcome": "Questo tutorial è interattivo e si consiglia vivamente di giocare con tutte le opzioni fornite",
+  "tutorial_categories": "Categorie a Cui Hai Accesso",
   "tutorial_logged_in": "Puoi visualizzare i dettagli sulle tue autorizzazioni visualizzando il tuo profilo.",
-  "tutorial_logged_out": "Puoi visualizzare i dettagli sulle tue autorizzazioni effettuando l'accesso.",
-  "tutorial_sidebar_0": "Tutte le tue Filtri e Impostazioni sono qui",
-  "tutorial_sidebar_1": "Per ogni categoria potrai attivare o disattivare esattamente quali dati desideri utilizzando gli interruttori",
-  "tutorial_sidebar_2": "Opzioni: Personalizzazione aggiuntiva\nAvanzate: Le affronteremo più avanti in questo tutorial",
-  "tutorial_sliders_0": "Utilizzo di slider per regolare i filtri",
-  "tutorial_sliders_1": "Pokémon tra:",
-  "tutorial_sliders_2": "- IV {{iv0}}% a {{iv1}}%",
-  "tutorial_sliders_3": "Livello {{level0}} a {{level1}}",
-  "tutorial_sliders_3alt": "- E il livello è compreso tra {{level0}} e {{level1}}",
-  "tutorial_sliders_4": "- Rango Grande Lega {{gl0}} a {{gl1}}",
-  "tutorial_sliders_4alt": "- O Rango Grande Lega {{gl0}} a {{gl1}}",
-  "tutorial_sliders_5": "- Rango Ultra Lega {{ul0}} a {{ul1}}",
-  "tutorial_sliders_5alt": "- O Rango Ultra Lega {{ul0}} a {{ul1}}",
-  "tutorial_sliders_6": "Catene con altri dello stesso colore",
-  "tutorial_sliders_7": "Filtra separatamente dagli altri slider",
-  "tutorial_sliders_8": "Uno slider 'pieno' significa che è disabilitato:",
-  "tutorial_sliders_9": "Tutte le apparizioni, indipendentemente dal fatto che siano state controllate o meno per l'IV",
-  "tutorial_help": "Scorciatoia per questo menu",
-  "tutorial_adv_filter": "Solo per dispositivi mobili, apre le opzioni di filtraggio per il menu avanzato",
-  "tutorial_tune": "Imposta il filtro avanzato per tutti i Pokémon attualmente filtrati nel menu",
-  "tutorial_format_size": "Imposta la dimensione dell'icona per tutti gli elementi attualmente filtrati nel menu",
-  "tutorial_check": "Abilita tutti gli elementi attualmente filtrati nel menu",
-  "tutorial_clear": "Disabilita tutti gli elementi attualmente filtrati nel menu",
-  "tutorial_save": "Salva la selezione corrente ed esce",
-  "tutorial_show_all_view": "Attiva/Disattiva PokéStop e Palestre",
-  "tutorial_show_pokemon_view": "Attiva/Disattiva Pokémon",
-  "tutorial_toggle": "Cliccando su Check/X si attiva/disattiva l'elemento",
-  "tutorial_pokemon_caption": "Questa icona ti permette di impostare filtri specifici per quel Pokémon",
-  "tutorial_all_caption": "I team hanno un menu con slot speciali\nTutti gli altri elementi ti permettono di regolare la dimensione dell'icona",
-  "tutorial_popup_0": "I popup sono ora interattivi!",
-  "tutorial_popup_1": "I tre puntini aprono le opzioni per nascondere, escludere e attivare/disattivare il timer",
-  "tutorial_popup_2": "Le icone ai lati del link di navigazione si espandono per mostrare informazioni extra, prova!",
-  "tutorial_popup_3": "Le icone variano per ogni categoria, assicurati di controllarle tutte",
-  "tutorial_closing_0": "Informazioni aggiuntive",
-  "tutorial_closing_1": "I cursori globali dei Pokémon nella barra laterale funzionano separatamente dal menu avanzato e non hanno alcun effetto l'uno sull'altro",
-  "tutorial_closing_2": "Assicurati di dare un'occhiata alla sezione Impostazioni nella barra laterale",
-  "tutorial_closing_3": "Ci sono molte opzioni estetiche disponibili per ogni categoria, ma ricorda che più aggiungi alla tua mappa, maggiori sono le possibilità che la mappa si blocchi",
-  "tutorial_closing_4": "Puoi rivedere questo tutorial selezionandolo nel pannello Impostazioni nella barra laterale",
-  "tutorial_closing_5": "Stai al sicuro e buona fortuna!",
-  "intro": "Introduzione",
-  "sidebar": "Barra laterale",
-  "sliders": "Cursori",
-  "popups": "Pop-up",
-  "closing": "Chiusura",
-  "shortcuts": "Scorciatoie",
+  "tutorial_logged_out": "Puoi visualizzare i dettagli sulle tue autorizzazioni effettuando il login.",
+  "tutorial_sidebar_0": "Tutti i Tuoi Filtri & Impostazioni Si Trovano Qui",
+  "tutorial_sidebar_1": "Para cada categoria, poderás alternar exatamente os dados que desejas usar os interruptores",
+  "tutorial_sidebar_2": "Opções: Personalização adicional\nAvançado: Abordaremos mais adiante neste tutorial",
+  "tutorial_sliders_0": "Usando controles deslizantes para ajustar filtros",
+  "tutorial_sliders_1": "Pokémon Entre:",
+  "tutorial_sliders_2": "- IVs de {{iv0}}% a {{iv1}}%",
+  "tutorial_sliders_3": "Nível de {{level0}} a {{level1}}",
+  "tutorial_sliders_3alt": "- E está no Nível de {{level0}} a {{level1}}",
+  "tutorial_sliders_4": "- Classificação na Liga Super de {{gl0}} a {{gl1}}",
+  "tutorial_sliders_4alt": "- OU Classificação na Liga Super de {{gl0}} a {{gl1}}",
+  "tutorial_sliders_5": "- Classificação na Liga Ultra de {{ul0}} a {{ul1}}",
+  "tutorial_sliders_5alt": "- OU Classificação na Liga Ultra de {{ul0}} a {{ul1}}",
+  "tutorial_sliders_6": "Conecta com outros da mesma cor",
+  "tutorial_sliders_7": "Filtra separadamente de outros controles deslizantes",
+  "tutorial_sliders_8": "Um controle deslizante 'cheio' significa que está desativado:",
+  "tutorial_sliders_9": "Todos os spawns, independentemente de terem sido verificados os IVs ou não",
+  "tutorial_help": "Atalho para este menu",
+  "tutorial_adv_filter": "Apenas móvel, abre as opções de filtragem para o menu avançado",
+  "tutorial_tune": "Define o filtro avançado para todos os Pokémon atualmente sendo filtrados no menu",
+  "tutorial_format_size": "Define o tamanho do ícone para todos os itens atualmente sendo filtrados no menu",
+  "tutorial_check": "Ativa todos os itens atualmente sendo filtrados no menu",
+  "tutorial_clear": "Desativa todos os itens atualmente sendo filtrados no menu",
+  "tutorial_save": "Salva a seleção atual e sai",
+  "tutorial_show_all_view": "Alterna PokéParadas & Ginásios",
+  "tutorial_show_pokemon_view": "Alterna Pokémon",
+  "tutorial_toggle": "Clicar na Verificação/X alterna o item",
+  "tutorial_pokemon_caption": "Este ícone permite definir filtros para esse Pokémon específico",
+  "tutorial_all_caption": "Equipes têm um menu de slots especial\nTodos os outros itens permitem ajustar o tamanho do ícone",
+  "tutorial_popup_0": "Os pop-ups agora são interativos!",
+  "tutorial_popup_1": "Os três pontos abrem as opções de ocultar, excluir e alternar temporizador",
+  "tutorial_popup_2": "Os ícones em ambos os lados do link de navegação se expandirão para mostrar informações extras, experimente!",
+  "tutorial_popup_3": "Os ícones variam para cada categoria, certifique-se de conferir todos",
+  "tutorial_closing_0": "Informações adicionais",
+  "tutorial_closing_1": "Os controles deslizantes Pokémon globais na barra lateral operam separadamente do menu avançado e não têm efeito um sobre o outro",
+  "tutorial_closing_2": "Certifique-se de conferir a seção de Configurações na barra lateral",
+  "tutorial_closing_3": "Existem muitas opções estéticas disponíveis para cada categoria, mas tenha em mente que quanto mais você adicionar ao seu mapa, maior a chance de seu mapa congelar",
+  "tutorial_closing_4": "Você pode visualizar este tutorial novamente selecionando-o no painel de Configurações na barra lateral",
+  "tutorial_closing_5": "Fique seguro e boa sorte!",
+  "intro": "Introdução",
+  "sidebar": "Barra Lateral",
+  "sliders": "Controles Deslizantes",
+  "popups": "Pop-ups",
+  "closing": "Conclusão",
+  "shortcuts": "Atalhos",
   "iv": "IV",
-  "area_restrictions": "Limitazioni di area",
-  "map": "Mappa",
-  "stats": "Statistiche",
+  "area_restrictions": "Restrições de Área",
+  "map": "Mapa",
+  "stats": "Estatísticas",
   "pvp": "PVP",
-  "area_restrictions_subtitle": "Hai accesso a queste aree",
-  "devices_subtitle": "Mostra posizioni e percorsi dei dispositivi attivi",
-  "gyms_subtitle": "Mostra tutte le posizioni delle palestre attive, la squadra attiva e quanti slot ha ogni palestra disponibili",
-  "invasions_subtitle": "Mostra informazioni sull'invasione del Team Rocket, inclusa la formazione di battaglia, l'ora di scadenza e le possibili ricompense",
-  "iv_subtitle": "Mostra percentuale di IV e opzioni di luce",
-  "lures_subtitle": "Mostra informazioni sul richiamo, inclusi il tipo di richiamo e l'ora di scadenza",
-  "map_subtitle": "Mostra la mappa",
-  "nests_subtitle": "Mostra i Pokémon che si stanno attivamente nidificando e i poligoni dei nidi",
-  "pokemon_subtitle": "Mostra tutte le posizioni dei Pokémon e gli orari di scadenza",
-  "pokestops_subtitle": "Mostra tutte le posizioni dei PokéStop",
-  "portals_subtitle": "Mostra tutte le posizioni dei portali di Ingress",
-  "pvp_subtitle": "Mostra il rango PVP/CP/Livello per ogni Pokémon",
-  "quests_subtitle": "Mostra le ricompense delle missioni e le informazioni sulle attività",
-  "raids_subtitle": "Mostra tutte le informazioni sulle incursioni, inclusi il capo dell'incursione, le uova, il tempo di scadenza e le mosse",
-  "scan_cells_subtitle": "Mostra l'ultima volta in cui una cella S2 è stata scansionata da un dispositivo",
-  "scan_areas_subtitle": "Mostra le aree di scansione disponibili in forma di poligoni",
-  "spawnpoints_subtitle": "Mostra i punti di spawn e il tempo stimato di scomparsa",
-  "stats_subtitle": "Mostra le statistiche e i livelli dei Pokémon",
-  "submission_cells_subtitle": "Mostra informazioni utili per inviare nuovi POI",
-  "weather_subtitle": "Mostra le informazioni sul meteo di gioco per ogni cella",
+  "area_restrictions_subtitle": "Você tem acesso a estas áreas",
+  "devices_subtitle": "Mostra localizações de dispositivos ativos e rotas",
+  "gyms_subtitle": "Mostra todas as localizações de ginásios ativos, time ativo, e quantas vagas cada ginásio tem disponível",
+  "invasions_subtitle": "Mostra informações de invasões da Equipe Rocket, incluindo lineup de batalha, tempo de expiração e recompensas possíveis",
+  "iv_subtitle": "Mostra IV% e opções de brilho",
+  "lures_subtitle": "Mostra informações de iscas, incluindo tipo de isca e tempo de expiração",
+  "map_subtitle": "Mostra o mapa",
+  "nests_subtitle": "Mostra Pokémon ativamente fazendo ninho e polígonos de ninho",
+  "pokemon_subtitle": "Mostra todas as localizações de Pokémon e tempos de expiração",
+  "pokestops_subtitle": "Mostra todas as localizações de PokéParadas",
+  "portals_subtitle": "Mostra todos os portais do Ingress",
+  "pvp_subtitle": "Mostra informazioni su rango PVP/CP/Livello per ogni Pokémon",
+  "quests_subtitle": "Mostra informazioni su ricompense e compiti delle missioni",
+  "raids_subtitle": "Mostra tutte le informazioni sui raid inclusi il boss del raid, uova, orario di fine e set di mosse",
+  "scan_cells_subtitle": "Mostra l'ultima volta che una cellula S2 è stata scansionata da un dispositivo",
+  "scan_areas_subtitle": "Mostra i poligoni delle aree di scansione disponibili",
+  "spawnpoints_subtitle": "Mostra i punti di spawn e il loro tempo stimato di scomparsa",
+  "stats_subtitle": "Mostra statistiche e livelli dei Pokémon",
+  "submission_cells_subtitle": "Mostra informazioni utili per l'invio di nuovi POI",
+  "weather_subtitle": "Mostra le informazioni meteo in gioco per ogni cellula",
   "scanner_subtitle": "Interagisci direttamente con lo scanner in vari modi",
-  "s2cells_subtitle": "Visualizza le celle S2 in diversi livelli sulla mappa",
-  "backups_subtitle": "Consente il backup e il caricamento delle impostazioni su diversi dispositivi",
+  "s2cells_subtitle": "Mostra le Cellule S2 a vari livelli sulla mappa",
+  "backups_subtitle": "Permette il backup e il caricamento delle impostazioni su dispositivi diversi",
   "backups": "Backup",
-  "user_profile": "Profilo utente",
+  "user_profile": "Profilo Utente",
   "user_username": "Nome utente",
   "candy": "Caramelle",
-  "show_ex_badge": "Mostra distintivo EX",
+  "show_ex_badge": "Mostra il badge EX",
   "search": "Cerca",
   "global_search_quests": "Inserisci il nome della ricompensa...",
-  "global_search_lures": "Inserisci il nome dell'esca...",
+  "global_search_lures": "Inserisci il nome del Richiamo...",
   "global_search_pokestops": "Inserisci il nome del PokéStop...",
-  "global_search_gyms": "Inserisci il nome della palestra...",
-  "global_search_portals": "Inserisci il nome del portale...",
-  "global_search_nests": "Inserisci il nome del Pokémon del nido...",
-  "global_search_raids": "Inserisci il nome del capo dell'incursione...",
+  "global_search_gyms": "Inserisci il nome della Palestra...",
+  "global_search_portals": "Inserisci il nome del Portale...",
+  "global_search_nests": "Inserisci il nome del Pokémon del Nido...",
+  "global_search_raids": "Inserisci il nome del Boss Raid...",
   "global_search_pokemon": "Inserisci il nome del Pokémon...",
-  "raid_level_badges": "Distintivi di livello dell'incursione",
+  "global_search_invasions": "Inserisci il tipo di Recluta, il nome o il nome della ricompensa del Pokémon...",
+  "raid_level_badges": "Badge Livello Raid",
   "options": "Opzioni",
   "profile": "Profilo",
-  "pokemon_icons": "Icone dei Pokémon",
-  "pokestop_icons": "Icone dei PokéStop",
-  "gym_icons": "Icone delle palestre",
-  "team_icons": "Icone delle squadre",
-  "egg_icons": "Icone delle uova",
-  "raid_icons": "Icone delle incursioni",
-  "nest_icons": "Icone dei nidi",
-  "reward_icons": "Icone delle ricompense",
-  "type_icons": "Icone dei tipi",
-  "weather_icons": "Icone del meteo",
-  "misc_icons": "Icone varie",
-  "invasion_icons": "Icone delle invasioni",
-  "spawnpoint_icons": "Icona Punto di Spawn",
-  "device_icons": "Icona Dispositivo",
-  "pokemon_timers": "Tutti i Timer dei Pokemon",
-  "show_dex_num_in_popup": "Mostra il numero Pokedex nella finestra di popup",
-  "popup": "Finestra di popup",
+  "pokemon_icons": "Icone Pokémon",
+  "pokestop_icons": "Icone PokéStop",
+  "gym_icons": "Icone Palestra",
+  "team_icons": "Icone Squadra",
+  "egg_icons": "Icone Uovo",
+  "raid_icons": "Icone Raid",
+  "nest_icons": "Icone Nido",
+  "reward_icons": "Icone Ricompense",
+  "type_icons": "Icone Tipo",
+  "weather_icons": "Icone Meteo",
+  "misc_icons": "Icone Varie",
+  "invasion_icons": "Icone Invasioni",
+  "spawnpoint_icons": "Icone Punti di Spawn",
+  "device_icons": "Icone Dispositivo",
+  "pokemon_audio": "Audio Pokémon",
+  "pokestop_audio": "Audio PokéStop",
+  "gym_audio": "Audio Palestra",
+  "team_audio": "Audio Squadra",
+  "egg_audio": "Audio Uovo",
+  "raid_audio": "Audio Raid",
+  "nest_audio": "Audio Nido",
+  "reward_audio": "Audio Ricompense",
+  "type_audio": "Audio Tipo",
+  "weather_audio": "Audio Meteo",
+  "misc_audio": "Audio Varie",
+  "invasion_audio": "Audio Invasioni",
+  "spawnpoint_audio": "Audio Punti di Spawn",
+  "device_audio": "Audio Dispositivo",
+  "pokemon_timers": "Timer Pokémon Completi",
+  "show_dex_num_in_popup": "Mostra il numero del Pokédex nel Popup",
+  "popup": "Popup",
   "pvp_level": "Statistiche PVP Livello {{level}}",
   "pvp_mega": "Statistiche PVP Mega",
   "webhook_entry": "Aggiungi a {{name}}",
@@ -321,75 +336,75 @@
   "gym": "Palestra",
   "egg": "Uovo",
   "raid": "Raid",
-  "lure": "Esca",
+  "lure": "Richiamo",
   "quest": "Missione",
   "invasion": "Invasione",
   "nest": "Nido",
-  "pokestop": "Pokestop",
+  "pokestop": "PokéStop",
   "team": "Squadra",
   "global": "Globale",
   "manage_webhook": "Gestisci {{name}}",
   "drag_and_drop": "Trascina e rilascia il marcatore per impostare la tua posizione",
   "click_to_select": "Clicca per selezionare",
-  "add_new": "Aggiungi nuova allerta {{category}}",
-  "my_location": "La mia posizione",
-  "choose_on_map": "Scegli sulla mappa",
-  "select_profile": "Seleziona profilo",
-  "distance_radius": "Anteprima distanze raggio",
+  "add_new": "Aggiungi Nuovo Allarme per {{category}}",
+  "my_location": "La Mia Posizione",
+  "choose_on_map": "Scegli sulla Mappa",
+  "select_profile": "Seleziona Profilo",
+  "distance_radius": "Anteprima Distanze Raggio",
   "areas": "Aree",
   "select_webhook": "Seleziona Bot",
   "ar_quest_true": "Compito AR",
-  "ar_quest_false": "Senza AR",
+  "ar_quest_false": "No AR",
   "with_ar": "Con AR",
   "both": "Entrambi",
   "without_ar": "Senza AR",
-  "exclude_quest_multi": "Escludi {{reward}}",
-  "cluster_limit_0": "Limite {{variable_0}} ({{variable_1}}) raggiunto",
-  "cluster_limit_1": "Per favore, ingrandisci o restringi i filtri",
-  "show_polygons": "Mostra poligoni",
-  "exclude_invasion_multi": "Escludi {{invasion}}",
+  "exclude_quest_multi": "Esclusi {{reward}}",
+  "cluster_limit_0": "Limite di {{variable_0}} ({{variable_1}}) raggiunto",
+  "cluster_limit_1": "Effettua lo zoom avanti o restringi i tuoi filtri",
+  "show_polygons": "Mostra Poligoni",
+  "exclude_invasion_multi": "Esclusi {{invasion}}",
   "stardust": "Polvere di stelle",
-  "slider_cp": "PC",
+  "slider_cp": "CP",
   "pvp_ranking_league": "Lega",
-  "pvp_ranking_min_cp": "PC minimo",
+  "pvp_ranking_min_cp": "CP Min",
   "slider_pvp": "Classifiche",
   "profile_no": "Profilo",
   "template": "Modello",
   "gender": "Genere",
   "clean": "Pulisci",
   "all_forms": "Tutte le forme",
-  "pvp_entry": "Inserimento PVP",
+  "pvp_entry": "Voce PVP",
   "no_iv": "Incl. Nessun IV",
-  "by_distance": "Per distanza",
-  "min_time": "Tempo minimo",
-  "add_new_profile": "Aggiungi nuovo profilo",
+  "by_distance": "Per Distanza",
+  "min_time": "Tempo Min",
+  "add_new_profile": "Aggiungi Nuovo Profilo",
   "slider_none": "Nessuno",
-  "non_registered_human_title": "Ops, qualcosa non va!",
-  "non_registered_human_desc": "Potresti non essere registrato con {{webhook}}\nO il server non è al momento raggiungibile",
-  "try_again_later": "Per favore riprova più tardi",
-  "selected_areas": "{{amount}} Area selezionata",
-  "selected_areas_plural": "{{amount}} Aree selezionate",
-  "webhook_selection": "Selezione {{name}}",
-  "message_of_the_day": "Messaggio del giorno",
-  "has_quest_indicator": "Colore alternativo per i Pokestop con missioni",
-  "show_ar_badge": "Mostra distintivo AR",
-  "all_gyms": "Tutte le palestre",
+  "non_registered_human_title": "Oops, qualcosa non va!",
+  "non_registered_human_desc": "Potresti non essere registrato con {{webhook}}\nO il server è attualmente irraggiungibile",
+  "try_again_later": "Si prega di riprovare più tardi",
+  "selected_areas_one": "{{count}} Area Selezionata",
+  "selected_areas_other": "{{count}} Aree Selezionate",
+  "webhook_selection": "Selezione di {{name}}",
+  "message_of_the_day": "Messaggio del Giorno",
+  "has_quest_indicator": "Colore Alternativo per Fermate con Missioni",
+  "show_ar_badge": "Mostra Distintivo AR",
+  "all_gyms": "Tutte le Palestre",
   "general": "Generale",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Collega Globale e Avanzato",
-  "normal_forms": "Forme normali",
-  "weather_indicator": "Indicatore di potenziamento meteo",
+  "link_global_and_advanced": "Il Globale Rispetta Selezionato",
+  "normal_forms": "Forme Normali",
+  "weather_indicator": "Indicatore di Potenziamento Meteo",
   "page": "Pagina {{page}}",
-  "navigation_controls": "Controlli di navigazione",
+  "navigation_controls": "Controlli di Navigazione",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Esclusivo",
-  "all_moves": "Tutte le mosse",
+  "all_moves": "Tutte le Mosse",
   "move": "Mossa",
-  "any": "Qualsiasi",
-  "min_spawn_average": "Tasso minimo di spawn",
-  "select_all": "Seleziona tutto",
-  "delete_all": "Elimina selezionati",
+  "any": "Qualunque",
+  "min_spawn_average": "Frequenza Min di Apparizione",
+  "select_all": "Seleziona Tutto",
+  "delete_all": "Elimina Selezionati",
   "cancel": "Annulla",
   "day_1": "Lunedì",
   "day_2": "Martedì",
@@ -398,256 +413,209 @@
   "day_5": "Venerdì",
   "day_6": "Sabato",
   "day_7": "Domenica",
-  "profile_name": "Nome del profilo",
-  "manage_profiles": "Gestisci profili",
-  "min_spawn_avg": "Media minima di spawn",
+  "profile_name": "Nome Profilo",
+  "manage_profiles": "Gestisci Profili",
+  "min_spawn_avg": "Frequenza Min Media di Apparizione",
   "poke_global": "Tutto",
   "amount": "Quantità",
-  "specific_gym": "Palestra specifica",
-  "search_location": "Cerca posizioni",
-  "search_specific": "Cerca una specifica {{category}}",
-  "webhook_success_gym": "Sono stati aggiunti avvisi per Raid, Uova e Cambio Squadra!",
-  "slot_changes": "Cambiamenti slot",
-  "slot_changes_poracle": "cambiamenti_slot",
-  "confirm_delete": "Ciò rimuoverà tutti i tracciamenti per questo profilo, sei sicuro?",
-  "confirm_copy": "Scegli a quale profilo vuoi copiare \"{{profile}}\", questo sovrascriverà completamente quel profilo.",
-  "webhook_error": "{{name}} non è riuscito a elaborare questa richiesta.\nRiprova più tardi.",
+  "specific_gym": "Palestra Specifica",
+  "search_location": "Cerca Località",
+  "search_specific": "Cerca un {{category}} Specifico",
+  "webhook_success_gym": "Allerte per Raid, Uova e Cambio Squadra sono stati aggiunti!",
+  "slot_changes": "Cambi di Slot",
+  "slot_changes_poracle": "cambi_di_slot",
+  "confirm_delete": "Questo rimuoverà tutto il tracciamento per questo profilo, sei sicuro?",
+  "confirm_copy": "Scegli il profilo a cui vorresti copiare \"{{profile}}\", questo sovrascriverà completamente quel profilo.",
+  "webhook_error": "{{name}} non è stato in grado di elaborare ciò.\nSi prega di riprovare più tardi.",
   "profile_error": "Deve essere unico e valido",
   "team_0": "Armonia",
-  "battle_changes": "In battaglia",
-  "battle_changes_poracle": "cambiamenti_battaglia",
-  "auto": "Automatico",
-  "webhooks_subtitle": "Gestisci i tuoi avvisi direttamente dalla mappa per questi bot",
+  "battle_changes": "In Battaglia",
+  "battle_changes_poracle": "cambiamenti_in_battaglia",
+  "auto": "Auto",
+  "webhooks_subtitle": "Gestisci i tuoi allarmi direttamente dalla mappa per questi bot",
   "event_stops_subtitle": "Mostra Pokéstop speciali per eventi come Kecleon",
-  "webhooks": "Avvisi",
-  "scanner": "Azioni dello scanner",
-  "everything_individually": "Aggiungi avvisi individuali",
-  "individually": "singolarmente",
+  "webhooks": "Allarmi",
+  "scanner": "Azioni Scanner",
+  "everything_individually": "Aggiungi Allarmi Individuali",
+  "individually": "individualmente",
   "join": "Unisciti",
-  "errors_404": "Oops, questa pagina non può essere trovata!",
-  "errors_500": "Si è verificato un errore del server, riprova più tardi!",
-  "local_username": "Nome utente",
+  "errors_404": "Ops, questa pagina non può essere trovata!",
+  "errors_500": "C'è stato un errore del server, riprova più tardi!",
+  "local_username": "Nome Utente",
   "local_password": "Password",
-  "local_error": "Si è verificato un errore, riprova più tardi!",
-  "no_filter_results": "Nessun risultato trovato\nProva ad allargare i filtri.",
-  "donor_page": "Pagina dei donatori",
-  "go_back": "Torna indietro",
-  "access": "Accesso",
-  "link_discord": "Collega Discord",
-  "select_webhook_strategy": "Gestore degli avvisi",
-  "webhook_strategy_success_0": "Successo! Aggiornamento per ottenere le impostazioni degli avvisi...",
-  "register": "Registrati",
-  "invalid_credentials": "Credenziali non valide",
-  "error_creating_user": "Impossibile registrare un nuovo utente in questo momento",
-  "discord_linked": "Discord collegato",
-  "telegram_linked": "Telegram collegato",
-  "level": "livello",
+  "local_error": "C'è stato un errore, si prega di riprovare più tardi!",
+  "no_filter_results": "Nessun Risultato Trovato\nProva ad Allargare i Tuoi Filtri",
+  "donor_page": "Pagina dei Donatori",
+  "go_back": "Voltar",
+  "access": "Acesso",
+  "link_discord": "Vincular Discord",
+  "select_webhook_strategy": "Gerenciador de Alertas",
+  "webhook_strategy_success_0": "Sucesso! Atualizando para buscar as configurações de alerta...",
+  "register": "Registrar",
+  "invalid_credentials": "Credenciais Inválidas",
+  "localauth_failed": "Autenticação falhou",
+  "error_creating_user": "Não foi possível registrar o novo usuário no momento",
+  "discord_linked": "Discord Vinculado",
+  "telegram_linked": "Telegram Vinculado",
+  "level": "nível",
   "km": "km",
   "feedback": "Feedback",
-  "donor_menu": "Menu dei donatori",
-  "pokemon_cell": "La posizione del Pokémon potrebbe variare",
-  "timer_verified": "Questo timer è verificato",
-  "timer_unverified": "Questo timer non è verificato",
-  "all": "Tutti",
-  "badge_0": "Nessuno",
-  "badge_1": "Bronzo",
-  "badge_2": "Argento",
-  "badge_3": "Oro",
-  "gym_badge_menu": "Modifica medaglia palestra",
-  "gym_badges": "Medaglie palestra",
-  "gym_badge_diamonds": "Mostra medaglie palestra",
-  "gym_badges_subtitle": "Mostra le medaglie palestra sulla mappa e una lista nella pagina del profilo.",
-  "confirm_filters_reset": "Ripristina filtri",
-  "filters_reset_text": "Sei sicuro di voler ripristinare le impostazioni ai valori predefiniti? Questa azione non può essere annullata!",
-  "filters_reset_title": "Ripristina filtri",
-  "raid_quick_select": "Selezione rapida",
-  "disabled": "Disabilitato",
-  "loading": "Caricamento {{category}}",
-  "loading_icons": "Recupero icone",
-  "loading_invasions": "Recupero invasioni",
-  "scan_next": "Posizione scansione",
-  "scan_next_choose": "Trascina e rilascia il marcatore per impostare la posizione di scansione",
-  "scan_zone": "Scansiona un'area",
-  "scan_zone_choose": "Trascina e rilascia il marcatore per impostare la posizione di scansione e scegli la dimensione",
-  "scan_zone_size": "Dimensione",
-  "scan_zone_range": "Raggio",
-  "scan_zone_spacing": "Spaziatura",
-  "scan_zone_radius": "Raggio",
-  "scan_requests": "Richieste di scansione",
-  "scan_queue": "Coda attuale",
-  "click_to_scan": "Scansiona qui",
-  "scan_confirmed_title": "Richiesta di scansione confermata",
-  "scan_confirmed": "Il lavoratore è stato inviato alla posizione, il risultato apparirà presto sulla mappa!",
-  "scan_loading_title": "Invio richiesta di scansione",
-  "scan_loading": "La tua richiesta di scansione è in fase di elaborazione e invio al sistema!",
-  "scan_error_title": "Errore",
-  "scan_error": "Si è verificato un errore durante l'elaborazione della richiesta di scansione...",
-  "scan_outside_area": "Questa posizione si trova al di fuori dei confini delle aree autorizzate",
-  "pvp_ranking_cap": "Livello",
-  "lc_title": "Segui la tua posizione",
-  "lc_metersUnit": "metri",
-  "lc_feetUnit": "piedi",
-  "lc_popup": "Ti trovi a {distance} {unit} da questo punto",
-  "lc_outsideMapBoundsMsg": "Sembri trovarti al di fuori dei confini della mappa",
-  "no_alerts": "Nessun avviso trovato",
-  "loading_settings": "Caricamento impostazioni",
-  "refresh_to_continue": "Si prega di aggiornare prima di continuare",
-  "session_expired_title": "Sessione scaduta",
-  "session_expired_body": "La tua sessione è scaduta",
-  "old_client_title": "Obsoleto",
-  "old_client_body": "È disponibile una nuova versione di questa mappa",
-  "refresh": "Aggiorna",
-  "points": "Punti",
-  "day": "Giorno",
-  "days": "Giorni",
-  "react_error": "Qualcosa è andato storto",
-  "clickable_icon": "L'icona è cliccabile",
-  "two_stops_till_next": "2 fermate fino alla prossima",
-  "one_stop_till_next": "1 fermata fino alla prossima",
-  "no_more_gyms": "Nessuna palestra rimasta",
-  "light_map_border": "Bordo mappa chiaro",
-  "dark_map_border": "Bordo mappa scuro",
-  "cell_blocked": "Cella bloccata",
-  "poi_color": "Colore POI",
-  "quest_condition": "Condizione della missione",
-  "always_show_labels": "Mostra sempre le etichette",
-  "scan_areas_options": "Opzioni di scansione delle aree",
-  "historic_rarity": "Rarità storica",
-  "poi": "Punti di interesse",
-  "300m_range": "Raggio di 300m",
-  "lure_range": "Raggio di richiamo",
-  "custom_range": "Raggio personalizzato",
-  "tap_to_toggle": "Tocca per attivare/disattivare",
-  "power_up": "Potenzia",
-  "never_alt": "Mai",
-  "seen_nearby_stop": "Visto nelle vicinanze",
-  "seen_nearby_cell": "Visto in questa cella",
-  "seen_lure_encounter": "Incontro richiamo",
-  "seen_lure_wild": "Spawn richiamo",
-  "seen_wild": "Spawn selvaggio",
-  "event_stops": "Fermate evento",
-  "event_stop_timers": "Timer fermate evento",
-  "size_0": "Qualsiasi",
-  "size_1": "XXS",
-  "size_2": "XS",
+  "donor_menu": "Menu do Doador",
+  "pokemon_cell": "A Localização do Pokémon Pode Variar",
+  "timer_verified": "Este Timer está Verificado",
+  "timer_unverified": "Este Timer não está Verificado",
+  "all": "Todos",
+  "badge_0": "Nenhum",
+  "badge_1": "Bronze",
+  "badge_2": "Prata",
+  "badge_3": "Ouro",
+  "gym_badge_menu": "Editar Insígnia de Ginásio",
+  "gym_badges": "Insígnias de Ginásio",
+  "gym_badge_diamonds": "Mostrar Insígnias de Ginásio",
+  "gym_badges_subtitle": "Exibe Insígnias de Ginásio no mapa e uma lista na página de perfil.",
+  "confirm_filters_reset": "Redefinir filtros",
+  "filters_reset_text": "Você tem certeza que deseja redefinir as configurações para os valores padrão? Isso não pode ser desfeito!",
+  "filters_reset_title": "Redefinir filtros",
+  "raid_quick_select": "Seleção Rápida",
+  "disabled": "Desativado",
+  "loading": "Carregando {{category}}",
+  "loading_icons": "Buscando Ícones",
+  "loading_invasions": "Buscando Invasões",
+  "scan_next": "Escanear Localização",
+  "scan_next_choose": "Arraste e Solte o Marcador para Definir a Localização do Escaneamento",
+  "scan_zone": "Escanear uma Área",
+  "scan_zone_choose": "Arraste e Solte o Marcador para Definir a Localização do Escaneamento e Escolher o Tamanho",
+  "scan_zone_size": "Tamanho",
+  "scan_zone_range": "Alcance",
+  "scan_zone_spacing": "Espaçamento",
+  "scan_zone_radius": "Raio",
+  "scan_requests": "Pedidos de Escaneamento",
+  "scan_queue": "Fila Atual",
+  "click_to_scan": "Escanear Aqui",
+  "scan_confirmed_title": "Demanda de escaneamento confirmada",
+  "scan_confirmed": "Trabalhador foi enviado para a localização, resultado aparecerá no mapa em breve!",
+  "scan_loading_title": "Enviando pedido de escaneamento",
+  "scan_loading": "Seu pedido de escaneamento está sendo processado e enviado ao sistema!",
+  "scan_error_title": "Erro",
+  "scan_error": "Houve um erro ao processar o pedido de escaneamento...",
+  "scan_outside_area": "Esta localização está fora dos limites das áreas autorizadas",
+  "pvp_ranking_cap": "Nível",
+  "lc_title": "Siga Sua Localização",
+  "lc_metersUnit": "metros",
+  "lc_feetUnit": "pés",
+  "lc_popup": "Você está a {distance} {unit} deste ponto",
+  "lc_outsideMapBoundsMsg": "Você parece localizado fora dos limites do mapa",
+  "no_alerts": "Nenhum Alerta Encontrado",
+  "loading_settings": "Carregando Configurações",
+  "refresh_to_continue": "Por favor, atualize antes de continuar",
+  "session_expired_title": "Sessão Expirada",
+  "session_expired_body": "Sua sessão expirou",
+  "old_client_title": "Desatualizado",
+  "old_client_body": "Uma nova versão deste mapa está disponível",
+  "early_old_client_title": "Desatualizado",
+  "early_old_client_body": "Uma versão antiga deste aplicativo pode estar armazenada em cache no seu navegador, você precisará limpar seu cache antes de poder usar este aplicativo.",
+  "refresh": "Atualizar",
+  "points": "Pontos",
+  "day": "Dia",
+  "days": "Dias",
+  "react_error": "Algo Deu Errado",
+  "clickable_icon": "Ícone Clicável",
+  "two_stops_till_next": "2 paradas até a próxima",
+  "one_stop_till_next": "1 parada até a próxima",
+  "no_more_gyms": "Não há mais ginásios",
+  "light_map_border": "Borda do Mapa Clara",
+  "dark_map_border": "Borda do Mapa Escura",
+  "cell_blocked": "Célula Bloqueada",
+  "poi_color": "Cor do Ponto de Interesse",
+  "quest_condition": "Condição de Missão",
+  "always_show_labels": "Sempre Mostrar Rótulos",
+  "scan_areas_options": "Opções de Áreas de Escaneamento",
+  "historic_rarity": "Raridade Histórica",
+  "poi": "Pontos de Interesse",
+  "300m_range": "Alcance de 300m",
+  "lure_range": "Alcance do Lure",
+  "custom_range": "Alcance Personalizado",
+  "tap_to_toggle": "Toque para Alternar",
+  "power_up": "Fortalecer",
+  "never_alt": "Nunca",
+  "seen_nearby_stop": "Visto Próximo",
+  "seen_nearby_cell": "Visto nesta Célula",
+  "seen_lure_encounter": "Encontro com Lure",
+  "seen_lure_wild": "Spawn por Lure",
+  "seen_wild": "Spawn Selvagem",
+  "event_stops": "Poképaradas de Evento",
+  "event_stop_timers": "Contadores de Poképaradas de Evento",
+  "size_0": "Qualquer",
+  "size_1": "XXP",
+  "size_2": "XP",
   "size_3": "M",
-  "size_4": "XL",
-  "size_5": "XXL",
-  "show_size_indicator": "Mostra indicatore di dimensione",
-  "size": "Dimensione",
-  "gold_stop": "Fermata oro",
-  "profile_backups": "Scambio profilo",
-  "new_backup": "Nuovo backup",
-  "create": "Crea",
-  "load": "Carica",
-  "update": "Aggiorna",
-  "delete": "Elimina",
+  "size_4": "XG",
+  "size_5": "XXG",
+  "show_size_indicator": "Mostrar Indicador de Tamanho",
+  "size": "Tamanho",
+  "gold_stop": "Poképarada Ouro",
+  "profile_backups": "Troca de Perfis",
+  "new_backup": "Novo Backup",
+  "create": "Criar",
+  "load": "Carregar",
+  "update": "Atualizar",
+  "delete": "Deletar",
   "name": "Nome",
-  "only_confirmed": "Solo confermati",
-  "rocket_pokemon": "Pokémon del Team Rocket",
-  "decoy": "Esca",
-  "s2_cell_limit_0": "Hai cercato di generare più di 20.000 celle ({{variable_0}})",
-  "show_all_pvp_ranks": "Mostra tutti i ranghi PVP",
-  "enable_pokemon_popup_coords": "Mostra coordinate Pokémon",
-  "enable_gym_popup_coords": "Mostra coordinate palestra",
-  "enable_pokestop_popup_coords": "Mostra coordinate Pokéstop",
-  "enable_portal_popup_coords": "Mostra coordinate portale",
-  "on_block_join_discord": "Per favore unisciti al nostro discord per ulteriori informazioni.",
-  "on_block_msg": "Sei stato bloccato per essere un membro di",
-  "denied": "Negato",
-  "showcase": "Mostra",
-  "unknown_event": "Evento sconosciuto",
-  "scanner_countdown": "Disponibile in {{time}}s",
-  "success": "Successo",
-  "contribute": "Contribuisci",
+  "only_confirmed": "Apenas Confirmados",
+  "rocket_pokemon": "Pokémon da Equipe Rocket",
+  "decoy": "Isca",
+  "s2_cell_limit_0": "Você tentou gerar mais de 20.000 células ({{variable_0}})",
+  "show_all_pvp_ranks": "Mostrar Todos os Rankings de PVP",
+  "enable_pokemon_popup_coords": "Mostrar Coordenadas do Pokémon",
+  "enable_gym_popup_coords": "Mostrar Coordenadas da Ginásio",
+  "enable_pokestop_popup_coords": "Mostrar Coordenadas da Poképarada",
+  "enable_portal_popup_coords": "Mostrar Coordenadas do Portal",
+  "on_block_join_discord": "Por favor, junte-se ao nosso discord para mais informações.",
+  "on_block_msg": "Você foi bloqueado por ser um membro de",
+  "denied": "Negado",
+  "showcase": "Vitrine",
+  "unknown_event": "Evento Desconhecido",
+  "scanner_countdown": "Disponível em {{time}}s",
+  "success": "Sucesso",
+  "contribute": "Contribuir",
   "mi": "mi",
-  "filter_by_areas": "Filtra per aree",
-  "submit_nest_name": "Invia nome del nido",
-  "nest_submission_menu": "Aggiorna nome",
-  "nest_submissions": "Sottomissioni del nido",
-  "nest_submissions_subtitle": "Ti permette di inviare nuovi nomi per i nidi",
-  "pokemon_opacity": "Opacità dinamica dei Pokémon",
-  "invasion_opacity": "Opacità dinamica delle invasioni",
-  "raid_opacity": "Opacità dinamica delle incursioni",
-  "opacity_ten_minutes": "Opacità a 10 minuti",
-  "opacity_five_minutes": "Opacità a 5 minuti",
-  "opacity_one_minute": "Opacità a 1 minuto",
-  "level_circles": "Indicatori di livello",
-  "min_level_circle": "Livello minimo del cerchio",
-  "mutation_auth_error": "La tua richiesta non è andata a buon fine perché non hai effettuato l'accesso",
-  "submitted_by": "Inviato da",
-  "localauth_failed": "Autenticazione fallita",
-  "reversible": "Rovesciabile",
-  "versione": "Versione",
-  "etichette_percorso": "Etichette percorso",
-  "percorsi": "Percorsi",
-  "tipo_percorso": "Tipo percorso",
-  "sottotitolo_percorsi": "Visualizza i percorsi di gioco e le informazioni rilevanti su di essi sulla mappa",
-  "descrizione": "Descrizione",
-  "informazioni_aggiuntive": "Informazioni aggiuntive",
-  "durata": "Durata",
-  "altitudine": "Altitudine",
-  "categoria_concorso_1": "Dimensione più piccola",
-  "categoria_concorso_2": "Dimensione più grande",
-  "totale_voci": "Voci totali",
-  "classifica_vetrina": "Classifica Vetrina",
-  "sottotitolo_classifica_vetrina": "Mostra una lista delle migliori classifiche per una vetrina in un Pokestop",
+  "filter_by_areas": "Filtrar por Áreas",
+  "submit_nest_name": "Submeter Nome do Ninho",
+  "nest_submission_menu": "Atualização de Nome",
+  "nest_submissions": "Submissões de Ninho",
+  "nest_submissions_subtitle": "Permite submeter novos nomes para ninhos",
+  "pokemon_opacity": "Opacidade Dinâmica de Pokémon",
+  "invasion_opacity": "Opacidade Dinâmica de Invasões",
+  "raid_opacity": "Opacidade Dinâmica de Raids",
+  "opacity_ten_minutes": "Opacidade aos 10 minutos",
+  "opacity_five_minutes": "Opacidade aos 5 minutos",
+  "opacity_one_minute": "Opacidade ao 1 minuto",
+  "level_circles": "Indicadores de Nível",
+  "min_level_circle": "Nível Mínimo do Círculo",
+  "mutation_auth_error": "Sua solicitação foi mal-sucedida por não estar logado",
+  "submitted_by": "Submetido Por",
+  "reversible": "Reversível",
+  "version": "Versão",
+  "route_tags": "Tags de Rotas",
+  "routes": "Rotas",
+  "route_type": "Tipo de Rota",
+  "routes_subtitle": "Visualizar rotas no jogo e informações relevantes sobre elas no mapa",
+  "description": "Descrição",
+  "additional_info": "Informações Adicionais",
+  "duration": "Duração",
+  "elevation": "Elevação",
+  "contest_category_1": "Menor Tamanho",
+  "context_category_2": "Maior Tamanho",
+  "total_entries": "Total de Entradas",
+  "showcase_rankings": "Rankings da Vitrine",
+  "showcase_rankings_subtitle": "Exibe uma lista dos rankings mais altos para uma vitrine em uma Poképarada",
   "tth": "TTH",
-  "tth_0": "Tutti",
-  "tth_1": "Noti",
-  "tth_2": "Sconosciuti",
-  "nessun_accesso": "Nessun accesso",
-  "version": "Versione",
-  "route_tags": "Tag Percorsi",
-  "routes": "Percorsi",
-  "route_type": "Tipo Percorso",
-  "routes_subtitle": "Visualizza nel gioco i percorsi e le informazioni rilevanti su di essi sulla mappa",
-  "description": "Descrizione",
-  "additional_info": "Informazioni Aggiuntive",
-  "duration": "Durata",
-  "elevation": "Elevazione",
-  "contest_category_1": "Dimensione più Piccola",
-  "context_category_2": "Dimensione più Grande",
-  "total_entries": "Totale Voci",
-  "showcase_rankings": "Classifica Vetrina",
-  "showcase_rankings_subtitle": "Mostra una lista delle migliori classifiche per una vetrina in un Pokestop",
-  "no_access": "Nessun Accesso",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "cooldown": "Tempo de Recarga",
-  "scan_some_outside_area": "Algumas locações estão fora dos limites autorizados",
+  "tth_0": "Todos",
+  "tth_1": "Conhecido",
+  "tth_2": "Desconhecido",
+  "no_access": "Sem Acesso",
+  "cooldown": "Tempo de Resfriamento",
+  "scan_some_outside_area": "Algumas localizações estão fora dos limites autorizados",
   "alerts": "alertas",
   "alert_manager": "Gerenciador de Alertas",
   "menu": "Menu",
@@ -658,68 +626,93 @@
   "component_donation_page": "Página de Doação",
   "component_message_of_the_day": "Mensagem do Dia",
   "download": "Baixar",
-  "playground": "Playground",
-  "locale": "Localização",
+  "playground": "Parquinho",
+  "locale": "Idioma",
   "saved": "Salvo",
   "show_editor": "Mostrar Editor",
   "hide_editor": "Esconder Editor",
   "reported_error": "Este erro foi reportado ao servidor com o identificador",
   "dark_mode": "Modo Escuro",
-  "load_from_autosave": "Carregar do Salvamento Automático",
+  "load_from_autosave": "Carregar do salvamento automático",
   "done": "Concluído",
   "fast": "Rápido",
   "charged": "Carregado",
   "offline_mode": "Modo Offline",
-  "include_sponsored": "Includi pubblicità",
-  "showcase_color": "Mostra colore in evidenza",
-  "partner_color": "Mostra colore partner",
-  "disable": "Disabilita {{- name}}",
-  "profiling": "Profilazione",
-  "showcase_block": "Bloccato a causa di un'anteprima",
-  "signed_in_as": "Connesso come",
-  "missing_map_perm": "Non hai il permesso di visualizzare la mappa.",
-  "pokemon_audio": "Audio Pokémon",
-  "pokestop_audio": "Audio Pokémon",
-  "gym_audio": "Audio Gimnasio",
-  "team_audio": "Audio Equipo",
-  "egg_audio": "Audio Huevo",
-  "raid_audio": "Audio Incursión",
-  "nest_audio": "Audio Nido",
-  "reward_audio": "Audio Recompensa",
-  "type_audio": "Audio Tipo",
-  "weather_audio": "Audio Clima",
-  "misc_audio": "Audio Varios",
-  "invasion_audio": "Audio Invasión",
-  "spawnpoint_audio": "Audio Punto de Spawn",
-  "device_audio": "Audio Dispositivo",
-  "access_denied": "Acceso Denegado",
-  "audio": "Audio",
-  "desktop_notifications": "Notificaciones de Escritorio",
-  "notifications_options": "Opciones de Notificación",
-  "audio_always_on": "El Audio Siempre se Reproduce",
-  "volume_level": "Nivel de Volumen",
-  "notifications_status": "Estado de las Notificaciones",
+  "include_sponsored": "Incluir Patrocinados",
+  "showcase_color": "Cor de Destaque",
+  "partner_color": "Cor do Parceiro",
+  "disable": "Desativar {{- name}}",
+  "profiling": "Perfilamento",
+  "showcase_block": "Bloqueado devido a um destaque",
+  "signed_in_as": "Logado Como",
+  "missing_map_perm": "Você não tem permissão para visualizar o mapa.",
+  "access_denied": "Acesso Negado",
+  "audio": "Áudio",
+  "desktop_notifications": "Notificações de Desktop",
+  "notifications_options": "Opções de Notificações",
+  "audio_always_on": "Áudio Sempre Ativo",
+  "volume_level": "Nível de Volume",
+  "notifications_status": "Status das Notificações",
   "granted": "concedido",
-  "global_search_invasions": "Inserisci tipo di Grunt, nome o nome della ricompensa del Pokémon...",
-  "set_all": "Imposta tutti",
-  "set_filtered": "Imposta filtrati",
-  "only_show_available": "Mostra solo disponibili",
-  "easy_mode": "Modalità Facile",
-  "quick_select": "Selezione Rapida Globale",
-  "pokemon_filter_mode": "Modalità Filtri Pokémon",
-  "basic": "Base",
-  "intermediate": "Intermedio",
-  "expert": "Esperto",
-  "basic_description": "Seleziona facilmente i Pokémon e applica un filtro globale",
-  "intermediate_description": "Imposta filtri individuali globalmente e per Pokémon (tradizionale)",
-  "expert_description": "Inserimento manuale delle query per la massima personalizzazione",
-  "icon_size": "Dimensione Icona",
-  "developer": "Sviluppatore",
-  "raid_override": "Annulla la battaglia di Raid",
-  "search_rocket_pokemon": "Cerca Pokémon di Team Rocket",
-  "main": "Principale",
+  "set_all": "Definir Todos",
+  "set_filtered": "Definir Filtrados",
+  "only_show_available": "Mostrar Apenas Disponíveis",
+  "easy_mode": "Modo Fácil",
+  "quick_select": "Seleções Rápidas Globais",
+  "pokemon_filter_mode": "Modo de Filtro Pokémon",
+  "basic": "Básico",
+  "intermediate": "Intermediário",
+  "expert": "Especialista",
+  "basic_description": "Selecionar Pokémon facilmente e aplicar um filtro global",
+  "intermediate_description": "Definir filtros individuais globalmente e por Pokémon (tradicional)",
+  "expert_description": "Entrada manual de consultas para a maior personalização",
+  "icon_size": "Tamanho do Ícone",
+  "developer": "Desenvolvedor",
+  "raid_override": "Substituição de Raid",
+  "search_rocket_pokemon": "Buscar Pokémon da Equipe Rocket",
+  "main": "Principal",
   "extra": "Extra",
-  "select": "Seleziona",
-  "searching": "ricerca in corso...",
-  "no_options": "Nessuna opzione..."
+  "select": "Selecionar",
+  "searching": "buscando...",
+  "no_options": "Sem Opções...",
+  "and": "E",
+  "or": "OU",
+  "only_global": "Apenas Global",
+  "global_caption": "Ignora Todos os Outros Filtros",
+  "global_and_individual": "Filtros Globais & Individuais",
+  "gender_filters_all": "Gênero Aplica a Todos",
+  "and_caption": "Ligados Juntos",
+  "or_caption": "Filtros Independentemente",
+  "filter_help": "Ajuda de Filtro",
+  "kilometers": "Quilômetros",
+  "miles": "Milhas",
+  "distance_unit": "Unidade de Distância",
+  "data_management": "Gestão de Dados",
+  "reset_or_manage_text": "Você pode redefinir completamente seus filtros ou acessar a página de gestão de dados, que permite redefinir categorias individuais.",
+  "reset_audio": "Redefinir Áudio",
+  "reset_all": "Redefinir Tudo",
+  "reset_icons": "Redefinir Ícones",
+  "reset_position": "Redefinir Posição",
+  "reset_ui": "Redefinir UI",
+  "reset_options": "Redefinir Opções",
+  "reset_menus": "Redefinir Menus",
+  "reset_settings": "Redefinir Configurações",
+  "reset_general_title": "Geral",
+  "reset_filters_title": "Filtros",
+  "reset_assets": "Redefinir Recursos",
+  "reset_pokemon": "Redefinir Pokémon",
+  "reset_pokestops": "Redefinir PokéStops",
+  "reset_gyms": "Redefinir Ginásios",
+  "reset_nests": "Redefinir Ninhos",
+  "reset_portals": "Redefinir Portais",
+  "reset_routes": "Redefinir Rotas",
+  "reset_scan_areas": "Redefinir Áreas de Varredura",
+  "reset_scan_cells": "Redefinir Células de Varredura",
+  "reset_devices": "Redefinir Dispositivos",
+  "reset_weather": "Redefinir Tempo",
+  "reset_s2cells": "Redefinir Células S2",
+  "reset_spawnpoints": "Redefinir Pontos de Aparecimento",
+  "reset_submission_cells": "Redefinir Células de Submissão",
+  "hisuian": "Hisui",
+  "spacial_rend_range": "Alcance do Corte Espacial"
 }
diff --git a/packages/locales/lib/generated/ja.json b/packages/locales/lib/generated/ja.json
index fecdf394e..584b4ac9d 100644
--- a/packages/locales/lib/generated/ja.json
+++ b/packages/locales/lib/generated/ja.json
@@ -1,49 +1,49 @@
 {
   "login": "ログイン",
-  "click_once": "'Authorize'を1回だけクリックしてください",
+  "click_once": "'Authorize'を一度だけクリックしてください",
   "save": "保存",
   "reset": "リセット",
   "close": "閉じる",
   "reset_filters": "フィルターをリセット",
-  "pokemon_filters": "ポケモンのフィルター設定",
-  "gyms_filters": "ジムのフィルター設定",
-  "pokestops_filters": "ポケストップのフィルター設定",
-  "nests_filters": "巣のフィルター設定",
+  "pokemon_filters": "ポケモン フィルター設定",
+  "gyms_filters": "ジム フィルター設定",
+  "pokestops_filters": "ポケストップ フィルター設定",
+  "nests_filters": "巣 フィルター設定",
   "help": "ヘルプ",
-  "apply_to_all": "全てに適用",
-  "disable_all": "全てを無効にする",
-  "enable_all": "全てを有効にする",
+  "apply_to_all": "すべてに適用",
+  "disable_all": "すべて無効",
+  "enable_all": "すべて有効",
   "enabled": "有効",
   "legacy": "レガシー",
   "id": "ID",
   "location": "場所",
-  "search_pokemon": "ポケモンを検索",
-  "search_nests": "巣を検索",
-  "search_gyms": "ジムを検索",
-  "search_pokestops": "ポケストップを検索",
-  "search_raids": "レイドを検索",
-  "search_eggs": "タマゴを検索",
-  "search_quests": "クエストを検索",
-  "search_lures": "ルアーを検索",
-  "search_invasions": "侵略を検索",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "search_pokemon": "ポケモンを探す",
+  "search_nests": "巣を探す",
+  "search_gyms": "ジムを探す",
+  "search_pokestops": "ポケストップを探す",
+  "search_raids": "レイドを探す",
+  "search_eggs": "エッグを探す",
+  "search_quests": "クエストを探す",
+  "search_lures": "ルアーを探す",
+  "search_invasions": "侵略を探す",
+  "sm": "小",
+  "md": "中",
+  "lg": "大",
+  "xl": "特大",
   "min": "最小",
   "max": "最大",
   "set_size": "アイコンサイズを設定",
   "slot_selection": "スロット選択",
   "generations": "世代",
   "types": "タイプ",
-  "forms": "フォーム",
-  "rarity": "現在のレアリティ",
+  "forms": "フォルム",
+  "rarity": "現在のレア度",
   "others": "その他",
   "categories": "カテゴリー",
   "rank": "ランク",
-  "slider_iv": "IV範囲",
-  "slider_great": "グレートリーグ",
-  "slider_ultra": "ウルトラリーグ",
+  "slider_iv": "IVレンジ",
+  "slider_great": "スーパーリーグ",
+  "slider_ultra": "ハイパーリーグ",
   "slider_little": "リトルカップ",
   "slider_atk_iv": "攻撃",
   "slider_def_iv": "防御",
@@ -51,25 +51,25 @@
   "slider_level": "レベル",
   "slider_size": "サイズ",
   "abbreviation_level": "L",
-  "lvl": "Lv",
-  "cap": "キャップ",
+  "lvl": "Lvl",
+  "cap": "上限",
   "custom": "カスタム",
   "valid": "有効",
-  "invalid": "無効！",
-  "overwrites": "全てのフィルターを上書き",
-  "valid_filter": "有効なステータスフィルター",
+  "invalid": "無効です！",
+  "overwrites": "すべてのフィルターを上書き",
+  "valid_filter": "有効な統計フィルター",
   "invalid_filter": "有効なフィルターを入力してください",
   "gyms": "ジム",
   "nests": "巣",
   "pokestops": "ポケストップ",
   "pokemon": "ポケモン",
-  "wayfarer": "ウェイファラー",
+  "wayfarer": "Wayfarer",
   "scan_areas": "スキャンエリア",
   "s2cells": "S2セル",
   "weather": "天気",
-  "admin": "管理者",
+  "admin": "管理",
   "settings": "設定",
-  "advanced": "高度な設定",
+  "advanced": "詳細設定",
   "tile_servers": "タイルサーバー",
   "icons": "アイコン",
   "navigation": "ナビゲーション",
@@ -77,17 +77,17 @@
   "tile_servers_default": "デフォルト",
   "drawer_temporary": "一時的",
   "drawer_persistent": "永続的",
-  "locale_selection": "ロケールの選択",
+  "locale_selection": "ロケール選択",
   "import": "インポート",
   "export": "エクスポート",
   "logout": "ログアウト",
   "local_storage_cleared": "ローカルストレージがクリアされました！",
-  "iv_or_filter": "IVまたはフィルター",
+  "iv_or_filter": "IV OR フィルター",
   "polygons": "ポリゴン",
   "raids": "レイド",
-  "ex_eligible": "EX対象",
-  "in_battle": "バトル中",
-  "all_pokestops": "全てのポケストップ",
+  "ex_eligible": "EX適格",
+  "in_battle": "戦闘中",
+  "all_pokestops": "すべてのポケストップ",
   "lures": "ルアー",
   "quests": "クエスト",
   "invasions": "侵略",
@@ -95,96 +95,96 @@
   "submission_cells": "提出セル",
   "spawnpoint": "スポーンポイント",
   "spawnpoints": "スポーンポイント",
-  "s2_cell_level": "レベル {{level}} S2 セル",
+  "s2_cell_level": "レベル {{level}} S2セル",
   "total_count": "総数",
   "next_submission": "次の提出！",
   "never": "なし",
   "next_gym": "次のジム",
-  "scan_cells": "セルをスキャン",
+  "scan_cells": "スキャンセル",
   "devices": "デバイス",
-  "use_my_location": "現在地を使用",
-  "submit_feedback_title": "フィードバック/バグ報告を送信",
-  "use_the_link_below": "以下のリンクを使用してフィードバックやバグを報告できます。",
+  "use_my_location": "位置情報を使用",
+  "submit_feedback_title": "フィードバック/バグレポートを送信",
+  "use_the_link_below": "以下のリンクを使用してフィードバックや遭遇したバグを送信できます。",
   "feedback_to_devs": "このフィードバックは開発者に直接送信されます。",
   "feedback_form": "フィードバックフォーム",
-  "unknown_pokestop": "不明なポケストップ名",
-  "unknown_gym": "不明なジム名",
+  "unknown_pokestop": "未知のポケストップ名",
+  "unknown_gym": "未知のジム名",
   "exclude": "除外",
   "exclude_quest": "クエストを除外",
-  "exclude_invasion": "侵入を除外",
+  "exclude_invasion": "侵攻を除外",
   "exclude_team": "チームを除外",
   "exclude_raid": "レイドを除外",
   "exclude_lure": "ルアーを除外",
   "timer": "タイマー",
   "hide": "非表示",
-  "tier": "ティア",
+  "tier": "段階",
   "slots": "スロット",
   "mega": "メガ",
   "form": "フォーム",
   "starts": "開始",
   "ends": "終了",
-  "defender": "防衛者",
+  "defender": "ディフェンダー",
   "cp": "CP",
   "kilogram": "kg",
   "meter": "m",
-  "total_cp": "総合CP",
-  "first_seen": "初めて見た",
-  "last_seen": "最後に見た",
-  "last_modified": "最終更新日時",
-  "last_updated": "最終更新日時",
-  "imported": "インポート済み",
-  "nest_estimated": "巣データは推定です！",
-  "verify_nests": "現在のスポーンを確認して検証してください",
-  "nest_out_of_date": "巣は可能性として最新ではありません！",
-  "nest_check_current": "現在のスポーンを確認してください",
-  "spawns_per_hour": "1時間あたり",
+  "total_cp": "合計 CP",
+  "first_seen": "初めて見た日",
+  "last_seen": "最後に見た日",
+  "last_modified": "最終更新日",
+  "last_updated": "最終更新日",
+  "imported": "インポートされた",
+  "nest_estimated": "巣のデータは推定です！",
+  "verify_nests": "現在のスポーンを確認して検証する",
+  "nest_out_of_date": "巣は古くなっている可能性があります！",
+  "nest_check_current": "現在のスポーンを代わりに確認する",
+  "spawns_per_hour": "1時間あたりの発生数",
   "teams": "チーム",
-  "eggs": "卵",
-  "reverse": "逆",
-  "selected": "選択済み",
+  "eggs": "エッグ",
+  "reverse": "反転",
+  "selected": "選択された",
   "unselected": "未選択",
   "only_available": "利用可能",
-  "common": "一般的",
-  "uncommon": "珍しい",
+  "common": "よくある",
+  "uncommon": "まれ",
   "rare": "レア",
   "ultra_rare": "ウルトラレア",
   "regional": "地域限定",
   "event": "イベント",
-  "legendary": "伝説",
-  "mythical": "神話",
+  "legendary": "伝説の",
+  "mythical": "幻の",
   "ultra_beast": "ウルトラビースト",
-  "alt_forms": "別の形態",
+  "alt_forms": "代替フォーム",
   "alola": "アローラ",
   "galarian": "ガラル",
   "showing": "表示中",
   "instance": "インスタンス",
   "online": "オンライン",
   "offline": "オフライン",
-  "boosted_types": "強化タイプ",
+  "boosted_types": "ブーストされたタイプ",
   "pokemon_options": "ポケモンオプション",
   "pokestops_options": "ポケストップオプション",
   "gyms_options": "ジムオプション",
   "nests_options": "巣オプション",
-  "wayfarer_options": "ウェイファラーオプション",
-  "admin_options": "管理者オプション",
-  "weather_options": "天気オプション",
+  "wayfarer_options": "ウェイフェアオプション",
+  "admin_options": "管理オプション",
+  "weather_options": "天候オプション",
   "s2cells_options": "S2セルオプション",
   "clustering": "クラスタリング",
-  "glow": "輝き",
+  "glow": "発光",
   "legacy_filter": "レガシーフィルター",
   "raid_timers": "すべてのレイドタイマー",
-  "invasion_timers": "すべての侵入タイマー",
+  "invasion_timers": "すべての侵攻タイマー",
   "lure_timers": "すべてのルアータイマー",
   "device_path_color": "デバイスパスの色",
   "old_portals": "古いポータル",
   "new_portals": "新しいポータル",
   "items": "アイテム",
   "energy": "エネルギー",
-  "ar_eligible": "AR対応",
-  "iv_circles": "IV指標",
-  "min_iv_circle": "最小サークルIV",
-  "interaction_ranges": "インタラクション範囲",
-  "cannot_connect": "\n現在サーバーに接続できません。\nすぐに再試行すると問題がさらに発生します。\n数分後に再試行してください。\n\n- マップ管理チーム",
+  "ar_eligible": "AR 対応",
+  "iv_circles": "IV インジケータ",
+  "min_iv_circle": "最小のサークル IV",
+  "interaction_ranges": "交流範囲",
+  "cannot_connect": "\n現時点でサーバーに接続できません。\nすぐに再試行するとさらに問題が生じる可能性があります。\n数分後に再試行してください。\n\n- マップ管理チーム",
   "mad_quest_text": "ネイティブクエスト",
   "xs": "XS",
   "primary": "プライマリ",
@@ -199,440 +199,423 @@
   "next": "次へ",
   "finish": "完了",
   "start_tutorial": "チュートリアルを開始",
-  "view_profile": "プロフィールを表示",
-  "login_optional": "ログイン（任意）",
+  "view_profile": "プロフィールを見る",
+  "login_optional": "ログイン（オプション）",
   "tutorial": "チュートリアル",
-  "tutorial_language": "言語を選択してください",
-  "tutorial_welcome": "このチュートリアルは対話型で、提供されたすべてのオプションを使用することを強くお勧めします",
-  "tutorial_categories": "アクセス可能なカテゴリ",
-  "tutorial_logged_in": "プロフィールを表示することで、権限の詳細を確認できます",
-  "tutorial_logged_out": "ログインすることで、権限の詳細を確認できます",
-  "tutorial_sidebar_0": "すべてのフィルターと設定はここにあります",
-  "tutorial_sidebar_1": "各カテゴリごとに、スイッチを使用して表示するデータを切り替えることができます",
-  "tutorial_sidebar_2": "オプション：追加のカスタマイズ\n高度な設定：後で詳しく説明します",
-  "tutorial_sliders_0": "スライダーを使用してフィルターを調整する",
-  "tutorial_sliders_1": "ポケモンの範囲：",
-  "tutorial_sliders_2": "- IV {{iv0}}% から {{iv1}}%",
+  "tutorial_language": "言語を選択",
+  "tutorial_welcome": "このチュートリアルは対話形式であり、提供されたすべてのオプションを試すことが強く推奨されます",
+  "tutorial_categories": "アクセス可能なカテゴリー",
+  "tutorial_logged_in": "プロフィールを見ることで、あなたの許可についての詳細を見ることができます。",
+  "tutorial_logged_out": "ログインすることで、あなたの許可についての詳細を見ることができます。",
+  "tutorial_sidebar_0": "あなたのすべてのフィルター＆設定はここにあります",
+  "tutorial_sidebar_1": "各カテゴリーで、スイッチを使って表示したいデータを正確に切り替えることができます",
+  "tutorial_sidebar_2": "オプション: 追加のカスタマイズ\n上級: このチュートリアルの後半で説明します",
+  "tutorial_sliders_0": "スライダーを使ってフィルターを調整する",
+  "tutorial_sliders_1": "ポケモンの範囲:",
+  "tutorial_sliders_2": "- IV値 {{iv0}}% から {{iv1}}%",
   "tutorial_sliders_3": "レベル {{level0}} から {{level1}}",
-  "tutorial_sliders_3alt": "- かつレベル {{level0}} から {{level1}}",
-  "tutorial_sliders_4": "- グレートリーグランク {{gl0}} から {{gl1}}",
-  "tutorial_sliders_4alt": "- またはグレートリーグランク {{gl0}} から {{gl1}}",
-  "tutorial_sliders_5": "- ウルトラリーグランク {{ul0}} から {{ul1}}",
-  "tutorial_sliders_5alt": "- またはウルトラリーグランク {{ul0}} から {{ul1}}",
-  "tutorial_sliders_6": "同じ色の他のチェーン",
-  "tutorial_sliders_7": "他のスライダーとは別にフィルタリング",
-  "tutorial_sliders_8": "'フル'スライダーは無効です:",
-  "tutorial_sliders_9": "IVチェック済みかどうかに関係なく、すべてのスポーン",
+  "tutorial_sliders_3alt": "- かつそのレベルが {{level0}} から {{level1}}",
+  "tutorial_sliders_4": "- スーパーリーグのランク {{gl0}} から {{gl1}}",
+  "tutorial_sliders_4alt": "- またはスーパーリーグのランク {{gl0}} から {{gl1}}",
+  "tutorial_sliders_5": "- ハイパーリーグのランク {{ul0}} から {{ul1}}",
+  "tutorial_sliders_5alt": "- またはハイパーリーグのランク {{ul0}} から {{ul1}}",
+  "tutorial_sliders_6": "同じ色の他のスライダーと連動",
+  "tutorial_sliders_7": "他のスライダーとは別にフィルター",
+  "tutorial_sliders_8": "「全て」に設定されたスライダーは、無効化されています:",
+  "tutorial_sliders_9": "IVチェックの有無に関わらず、すべての出現情報",
   "tutorial_help": "このメニューへのショートカット",
   "tutorial_adv_filter": "モバイル専用、詳細メニューのフィルタリングオプションを開く",
-  "tutorial_tune": "現在メニューでフィルタリングされているすべてのポケモンに対して詳細フィルタを設定します",
-  "tutorial_format_size": "現在メニューでフィルタリングされているすべてのアイテムのアイコンサイズを設定します",
-  "tutorial_check": "現在メニューでフィルタリングされているすべてのアイテムを有効にします",
-  "tutorial_clear": "現在メニューでフィルタリングされているすべてのアイテムを無効にします",
-  "tutorial_save": "現在の選択を保存して終了します",
-  "tutorial_show_all_view": "ポケストップとジムの切り替え",
-  "tutorial_show_pokemon_view": "ポケモンの切り替え",
-  "tutorial_toggle": "チェック/×をクリックするとアイテムを切り替えます",
-  "tutorial_pokemon_caption": "このアイコンを使用して特定のポケモンのフィルタを設定できます",
-  "tutorial_all_caption": "チームには特別なスロットメニューがあります\n他のすべてのアイテムはアイコンサイズを調整できます",
-  "tutorial_popup_0": "ポップアップはインタラクティブになりました！",
-  "tutorial_popup_1": "ナビゲーションリンクの両側のアイコンをクリックすると追加情報が表示されます、試してみてください！",
-  "tutorial_popup_2": "各カテゴリーごとにアイコンが異なりますので、すべてをチェックしてください",
-  "tutorial_popup_3": "追加情報",
-  "tutorial_closing_0": "サイドバーのグローバルポケモンスライダーは、高度なメニューとは別に動作し、互いに影響を与えません",
-  "tutorial_closing_1": "サイドバーの設定セクションもチェックしてください",
-  "tutorial_closing_2": "各カテゴリーには多くの見た目のオプションがありますが、マップに追加するほど、マップがフリーズする可能性が高くなりますので、注意してください",
-  "tutorial_closing_3": "サイドバーの設定パネルで選択することで、このチュートリアルを再度表示できます",
-  "tutorial_closing_4": "安全に楽しんでください！",
-  "tutorial_closing_5": "イントロ",
-  "intro": "サイドバー",
-  "sidebar": "スライダー",
-  "sliders": "ポップアップ",
-  "popups": "クロージング",
-  "closing": "ショートカット",
-  "shortcuts": "IV",
-  "iv": "エリア制限",
-  "area_restrictions": "マップ",
-  "map": "統計",
-  "stats": "PVP",
-  "pvp": "これらのエリアにアクセスできます",
-  "area_restrictions_subtitle": "アクティブなデバイスの位置とルートを表示します",
-  "devices_subtitle": "アクティブなジムの位置、所属チーム、および各ジムの利用可能なスロット数を表示します",
-  "gyms_subtitle": "バトルラインナップ、終了時間、および可能な報酬を含む、チームロケットの侵略情報を表示します",
-  "invasions_subtitle": "IV％と発光オプションを表示します",
-  "iv_subtitle": "ルアータイプと終了時間を含むルアー情報を表示します",
-  "lures_subtitle": "マップを表示します",
-  "map_subtitle": "アクティブに巣になっているポケモンと巣のポリゴンを表示します",
-  "nests_subtitle": "すべてのポケモンの位置と終了時間を表示します",
-  "pokemon_subtitle": "すべてのポケストップの場所を表示します",
-  "pokestops_subtitle": "すべてのイングレスポータルを表示します",
-  "portals_subtitle": "各ポケモンのPVPランク/CP/レベル情報を表示します",
-  "pvp_subtitle": "クエストの報酬とタスクの情報を表示します",
-  "quests_subtitle": "レイドボス、卵、終了時間、技セットを含むすべてのレイド情報を表示します",
-  "raids_subtitle": "デバイスによって最後にスキャンされたS2セルの最終時刻を表示します",
-  "scan_cells_subtitle": "利用可能なスキャンエリアのポリゴンを表示します",
-  "scan_areas_subtitle": "スポーンポイントと推定される消滅時間を表示します",
-  "spawnpoints_subtitle": "ポケモンのステータスとレベルを表示します",
-  "stats_subtitle": "新しいPOIの提出に役立つ情報を表示します",
-  "submission_cells_subtitle": "各セルのゲーム内の天気情報を表示します",
-  "weather_subtitle": "さまざまな方法でスキャナーと直接やり取りします",
-  "scanner_subtitle": "マップ上でさまざまなレベルのS2セルを表示します",
-  "s2cells_subtitle": "デバイス間での設定のバックアップとロードを有効にします",
-  "backups_subtitle": "バックアップ",
-  "backups": "ユーザープロファイル",
-  "user_profile": "ユーザー名",
-  "user_username": "キャンディ",
-  "candy": "EXバッジを表示",
-  "show_ex_badge": "検索",
-  "search": "報酬の名前を入力してください...",
-  "global_search_quests": "ルアーの名前を入力してください...",
-  "global_search_lures": "ポケストップの名前を入力してください...",
-  "global_search_pokestops": "ジムの名前を入力してください...",
-  "global_search_gyms": "ポータルの名前を入力してください...",
-  "global_search_portals": "ネストポケモンの名前を入力してください...",
-  "global_search_nests": "レイドボスの名前を入力してください...",
-  "global_search_raids": "ポケモンの名前を入力してください...",
-  "global_search_pokemon": "レイドレベルバッジ",
-  "raid_level_badges": "オプション",
-  "options": "プロフィール",
-  "profile": "ポケモンアイコン",
-  "pokemon_icons": "ポケストップアイコン",
-  "pokestop_icons": "ジムアイコン",
-  "gym_icons": "チームアイコン",
-  "team_icons": "卵アイコン",
-  "egg_icons": "レイドアイコン",
-  "raid_icons": "ネストアイコン",
-  "nest_icons": "報酬アイコン",
-  "reward_icons": "タイプアイコン",
-  "type_icons": "天気アイコン",
-  "weather_icons": "その他のアイコン",
-  "misc_icons": "侵略アイコン",
-  "invasion_icons": "スポーンポイントアイコン",
-  "spawnpoint_icons": "デバイスアイコン",
-  "device_icons": "すべてのポケモンタイマー",
-  "pokemon_timers": "ポップアップにポケモン図鑑番号を表示",
-  "show_dex_num_in_popup": "ポップアップ",
-  "popup": "レベル {{level}} PVP ステータス",
-  "pvp_level": "メガ PVP ステータス",
-  "pvp_mega": "{{name}} に追加",
-  "webhook_entry": "{{name}} から削除",
-  "remove_webhook_entry": "距離",
-  "distance": "ジム",
-  "gym": "タマゴ",
-  "egg": "レイド",
-  "raid": "ルアー",
-  "lure": "クエスト",
-  "quest": "侵略",
-  "invasion": "巣",
-  "nest": "ポケストップ",
-  "pokestop": "チーム",
-  "team": "グローバル",
-  "global": "{{name}} の管理",
-  "manage_webhook": "マーカーをドラッグして位置を設定",
-  "drag_and_drop": "クリックして選択",
-  "click_to_select": "新しい {{category}} アラートを追加",
-  "add_new": "自分の位置",
-  "my_location": "地図上で選択",
-  "choose_on_map": "プロフィールを選択",
-  "select_profile": "半径距離のプレビュー",
-  "distance_radius": "エリア",
-  "areas": "ボットを選択",
-  "select_webhook": "AR タスク",
-  "ar_quest_true": "AR なし",
-  "ar_quest_false": "AR あり",
-  "with_ar": "両方",
-  "both": "AR なし",
-  "without_ar": "{{reward}} を除外",
-  "exclude_quest_multi": "{{variable_0}} の制限 ({{variable_1}}) に達しました",
-  "cluster_limit_0": "ズームインするかフィルターを絞ってください",
-  "cluster_limit_1": "ポリゴンを表示",
-  "show_polygons": "{{invasion}} を除外",
-  "exclude_invasion_multi": "スターダスト",
-  "stardust": "CP",
-  "slider_cp": "リーグ",
-  "pvp_ranking_league": "最小 CP",
-  "pvp_ranking_min_cp": "ランク",
-  "slider_pvp": "プロフィール",
-  "profile_no": "テンプレート",
-  "template": "性別",
-  "gender": "クリーン",
-  "clean": "すべてのフォーム",
-  "all_forms": "PVP エントリー",
-  "pvp_entry": "IV なしを含む",
-  "no_iv": "距離順",
-  "by_distance": "最小時間",
-  "min_time": "新しいプロフィールを追加",
-  "add_new_profile": "なし",
-  "slider_none": "おっと、何かがうまくいきません！",
-  "non_registered_human_title": "{{webhook}} に登録されていない可能性があります\nまたはサーバーに現在アクセスできません",
-  "non_registered_human_desc": "後でもう一度お試しください",
-  "try_again_later": "{{amount}} エリアが選択されました",
-  "selected_areas": "{{amount}} エリアが選択されました",
-  "selected_areas_plural": "{{name}} の選択",
-  "webhook_selection": "今日のメッセージ",
-  "message_of_the_day": "クエストがあるポケストップの代替色を表示",
-  "has_quest_indicator": "AR バッジを表示",
-  "show_ar_badge": "すべてのジム",
-  "all_gyms": "一般",
-  "general": "{{variable_0}}",
-  "server_dev_error_0": "グローバルと詳細をリンク",
-  "link_global_and_advanced": "通常フォーム",
-  "normal_forms": "天候ブーストインジケーター",
-  "weather_indicator": "ページ {{page}}",
-  "page": "ナビゲーションコントロール",
-  "navigation_controls": "リアクト",
-  "navigation_controls_react": "リーフレット",
-  "navigation_controls_leaflet": "独占",
-  "exclusive": "全ての技",
-  "all_moves": "技",
-  "move": "どれでも",
-  "any": "最小出現率",
-  "min_spawn_average": "全て選択",
-  "select_all": "選択したものを削除",
-  "delete_all": "キャンセル",
-  "cancel": "月曜日",
-  "day_1": "火曜日",
-  "day_2": "水曜日",
-  "day_3": "木曜日",
-  "day_4": "金曜日",
-  "day_5": "土曜日",
-  "day_6": "日曜日",
-  "day_7": "プロフィール名",
-  "profile_name": "プロフィールの管理",
-  "manage_profiles": "平均最小出現",
-  "min_spawn_avg": "全て",
-  "poke_global": "量",
-  "amount": "特定のジム",
-  "specific_gym": "場所を検索",
-  "search_location": "特定の{{category}}を検索",
-  "search_specific": "レイド、タマゴ、チーム変更のアラートが追加されました！",
-  "webhook_success_gym": "スロットの変更",
-  "slot_changes": "slot_changes",
-  "slot_changes_poracle": "このプロフィールのすべてのトラッキングが削除されます。よろしいですか？",
-  "confirm_delete": "\"{{profile}}\"をコピーするプロフィールを選択してください。これにより、そのプロフィール全体が上書きされます。",
-  "confirm_copy": "{{name}}はそれを処理できませんでした。\n後でもう一度お試しください。",
-  "webhook_error": "一意で有効なものでなければなりません",
-  "profile_error": "ハーモニー",
-  "team_0": "バトル中",
-  "battle_changes": "battle_changes",
-  "battle_changes_poracle": "自動",
-  "auto": "これらのボットから直接アラートを管理します",
-  "webhooks_subtitle": "ケクレオンなどの特別なイベントポケストップを表示します",
-  "event_stops_subtitle": "アラート",
-  "webhooks": "スキャナーアクション",
-  "scanner": "個別のアラートを追加",
-  "everything_individually": "個別に",
-  "individually": "参加する",
-  "join": "おっと、このページは見つかりません！",
-  "errors_404": "サーバーエラーが発生しました。後でもう一度お試しください！",
-  "errors_500": "ユーザー名",
-  "local_username": "パスワード",
-  "local_password": "エラーが発生しました。後でもう一度お試しください！",
-  "local_error": "結果が見つかりません\nフィルターを広げてみてください",
-  "no_filter_results": "ドナーページ",
-  "donor_page": "戻る",
-  "go_back": "アクセス",
-  "access": "Discordにリンク",
-  "link_discord": "アラートマネージャー",
-  "select_webhook_strategy": "成功！アラート設定を取得するために更新しています...",
-  "webhook_strategy_success_0": "登録",
-  "register": "無効な資格情報",
-  "invalid_credentials": "現在、新しいユーザーを登録することはできません",
-  "error_creating_user": "Discordにリンクされました",
-  "discord_linked": "Telegramにリンクされました",
-  "telegram_linked": "レベル",
-  "level": "km",
-  "km": "フィードバック",
-  "feedback": "ドナーメニュー",
-  "donor_menu": "ポケモンの位置は異なる場合があります",
-  "pokemon_cell": "このタイマーは検証済みです",
-  "timer_verified": "このタイマーは未検証です",
-  "timer_unverified": "すべて",
-  "all": "なし",
-  "badge_0": "ブロンズ",
-  "badge_1": "シルバー",
-  "badge_2": "ゴールド",
-  "badge_3": "ジムバッジを編集",
-  "gym_badge_menu": "ジムバッジ",
-  "gym_badges": "ジムバッジを表示",
-  "gym_badge_diamonds": "マップ上にジムバッジを表示し、プロフィールページにリストを表示します",
-  "gym_badges_subtitle": "フィルターをリセット",
-  "confirm_filters_reset": "設定をデフォルト値にリセットしてもよろしいですか？これは元に戻すことはできません！",
-  "filters_reset_text": "フィルターをリセット",
-  "filters_reset_title": "クイックセレクト",
-  "raid_quick_select": "無効",
-  "disabled": "{{category}}を読み込んでいます",
-  "loading": "アイコンを取得しています",
-  "loading_icons": "侵入を取得しています",
-  "loading_invasions": "スキャン場所",
-  "scan_next": "マーカーをドラッグしてスキャン場所を設定してください",
-  "scan_next_choose": "エリアをスキャン",
-  "scan_zone": "マーカーをドラッグしてスキャン場所を設定し、サイズを選択してください",
-  "scan_zone_choose": "サイズ",
-  "scan_zone_size": "範囲",
-  "scan_zone_range": "間隔",
-  "scan_zone_spacing": "半径",
-  "scan_zone_radius": "スキャンリクエスト",
-  "scan_requests": "現在のキュー",
-  "scan_queue": "ここでスキャン",
-  "click_to_scan": "スキャン要求が確認されました",
-  "scan_confirmed_title": "ワーカーが場所に送信され、結果がまもなくマップ上に表示されます！",
-  "scan_confirmed": "スキャンリクエストを送信中",
-  "scan_loading_title": "スキャンリクエストが処理され、システムに送信されています！",
-  "scan_loading": "エラー",
-  "scan_error_title": "スキャンリクエストの処理中にエラーが発生しました...",
-  "scan_error": "この場所は認可されたエリアの範囲外です",
-  "scan_outside_area": "レベル",
-  "pvp_ranking_cap": "位置情報をフォローする",
-  "lc_title": "メートル",
-  "lc_metersUnit": "フィート",
-  "lc_feetUnit": "この地点から{distance} {unit}以内にいます",
-  "lc_popup": "地図の範囲外に位置しているようです",
-  "lc_outsideMapBoundsMsg": "アラートが見つかりません",
-  "no_alerts": "設定を読み込んでいます",
-  "loading_settings": "続行する前に更新してください",
-  "refresh_to_continue": "セッションが切れました",
-  "session_expired_title": "セッションが切れました",
-  "session_expired_body": "古いバージョンです",
-  "old_client_title": "新しいバージョンの地図が利用可能です",
-  "old_client_body": "更新",
-  "refresh": "ポイント",
-  "points": "日",
+  "tutorial_tune": "メニューで現在フィルタリングされている全てのポケモンの高度なフィルタを設定します",
+  "tutorial_format_size": "メニューで現在フィルタリングされている全項目のアイコンサイズを設定",
+  "tutorial_check": "メニューで現在フィルタリングされている全項目を有効にする",
+  "tutorial_clear": "メニューで現在フィルタリングされている全項目を無効にする",
+  "tutorial_save": "現在の選択を保存して終了",
+  "tutorial_show_all_view": "ポケストップとジムの表示を切り替える",
+  "tutorial_show_pokemon_view": "ポケモンの表示を切り替える",
+  "tutorial_toggle": "チェック/× をクリックすると項目が切り替わります",
+  "tutorial_pokemon_caption": "このアイコンを使って、その特定のポケモンのフィルタを設定できます",
+  "tutorial_all_caption": "チームには特別なスロットメニューがあります\n他の全項目ではアイコンサイズを調整できます",
+  "tutorial_popup_0": "ポップアップがインタラクティブになりました!",
+  "tutorial_popup_1": "三つの点を開くと、非表示、除外、タイマーの切り替えオプションが表示されます",
+  "tutorial_popup_2": "ナビゲーションリンクの両側のアイコンは拡大して追加情報が見られるようになります、試してみてください!",
+  "tutorial_popup_3": "カテゴリーごとにアイコンが異なるので、全てを確認してください",
+  "tutorial_closing_0": "追加情報",
+  "tutorial_closing_1": "サイドバーにある全世界のポケモンスライダーは、詳細メニューとは別に動作し、互いに影響しません",
+  "tutorial_closing_2": "サイドバーの設定セクションも確認してください",
+  "tutorial_closing_3": "各カテゴリーには多くの美観オプションが用意されていますが、マップに追加する項目が多いほど、マップがフリーズする可能性が高まることに注意してください",
+  "tutorial_closing_4": "このチュートリアルを再度見るには、サイドバーの設定パネルで選択してください",
+  "tutorial_closing_5": "安全に、そして幸運を！",
+  "intro": "イントロ",
+  "sidebar": "サイドバー",
+  "sliders": "スライダー",
+  "popups": "ポップアップ",
+  "closing": "終了",
+  "shortcuts": "ショートカット",
+  "iv": "個体値",
+  "area_restrictions": "エリア制限",
+  "map": "マップ",
+  "stats": "統計",
+  "pvp": "PVP",
+  "area_restrictions_subtitle": "これらのエリアにアクセスできます",
+  "devices_subtitle": "アクティブなデバイスの位置とルートを表示",
+  "gyms_subtitle": "アクティブなジムの場所、アクティブなチーム、各ジムに利用可能なスロットの数を表示",
+  "invasions_subtitle": "チームロケットの侵攻情報を表示、バトルラインナップ、失効時間、および可能な報酬を含む",
+  "iv_subtitle": "個体値%と光のオプションを表示",
+  "lures_subtitle": "ルアー情報を表示、ルアータイプと失効時間を含む",
+  "map_subtitle": "マップを表示",
+  "nests_subtitle": "積極的に巣作りをしているポケモンと巣の多角形を表示",
+  "pokemon_subtitle": "全てのポケモンの位置と失効時間を表示",
+  "pokestops_subtitle": "全てのポケストップの位置を表示",
+  "portals_subtitle": "全てのIngressポータルを表示",
+  "pvp_subtitle": "各ポケモンのPVPランク/CP/レベル情報を表示",
+  "quests_subtitle": "クエストの報酬とタスク情報を表示",
+  "raids_subtitle": "レイドボス、卵、終了時間、およびムーブセットを含む全レイド情報を表示",
+  "scan_cells_subtitle": "S2セルがデバイスによって最後にスキャンされた時間を表示",
+  "scan_areas_subtitle": "利用可能なスキャンエリアのポリゴンを表示",
+  "spawnpoints_subtitle": "スポーンポイントとその推定消滅時間を表示",
+  "stats_subtitle": "ポケモンのステータスとレベルを表示",
+  "submission_cells_subtitle": "新しいPOIを提出するための情報を表示",
+  "weather_subtitle": "各セルのゲーム内天気情報を表示",
+  "scanner_subtitle": "様々な方法でスキャナーと直接やり取り",
+  "s2cells_subtitle": "地図上でさまざまなレベルのS2セルを表示",
+  "backups_subtitle": "デバイス間での設定のバックアップと読み込みを可能にする",
+  "backups": "バックアップ",
+  "user_profile": "ユーザープロファイル",
+  "user_username": "ユーザー名",
+  "candy": "キャンディ",
+  "show_ex_badge": "EXバッジを表示",
+  "search": "検索",
+  "global_search_quests": "報酬名を入力...",
+  "global_search_lures": "ルアー名を入力...",
+  "global_search_pokestops": "ポケストップ名を入力...",
+  "global_search_gyms": "ジム名を入力...",
+  "global_search_portals": "ポータル名を入力...",
+  "global_search_nests": "ネストポケモン名を入力...",
+  "global_search_raids": "レイドボス名を入力...",
+  "global_search_pokemon": "ポケモン名を入力...",
+  "global_search_invasions": "グラントのタイプ、名前、またはポケモンの報酬名を入力...",
+  "raid_level_badges": "レイドレベルバッジ",
+  "options": "オプション",
+  "profile": "プロファイル",
+  "pokemon_icons": "ポケモンアイコン",
+  "pokestop_icons": "ポケストップアイコン",
+  "gym_icons": "ジムアイコン",
+  "team_icons": "チームアイコン",
+  "egg_icons": "卵アイコン",
+  "raid_icons": "レイドアイコン",
+  "nest_icons": "ネストアイコン",
+  "reward_icons": "報酬アイコン",
+  "type_icons": "タイプアイコン",
+  "weather_icons": "天気アイコン",
+  "misc_icons": "その他のアイコン",
+  "invasion_icons": "侵略アイコン",
+  "spawnpoint_icons": "スポーンポイントアイコン",
+  "device_icons": "デバイスアイコン",
+  "pokemon_audio": "ポケモンの音",
+  "pokestop_audio": "ポケストップの音",
+  "gym_audio": "ジムの音",
+  "team_audio": "チームの音",
+  "egg_audio": "卵の音",
+  "raid_audio": "レイドの音",
+  "nest_audio": "ネストの音",
+  "reward_audio": "報酬の音",
+  "type_audio": "タイプの音",
+  "weather_audio": "天気の音",
+  "misc_audio": "その他の音",
+  "invasion_audio": "侵略の音",
+  "spawnpoint_audio": "スポーンポイントの音",
+  "device_audio": "デバイスの音",
+  "pokemon_timers": "すべてのポケモンタイマー",
+  "show_dex_num_in_popup": "ポップアップに図鑑番号を表示",
+  "popup": "ポップアップ",
+  "pvp_level": "レベル{{level}}のPVPステータス",
+  "pvp_mega": "メガPVPステータス",
+  "webhook_entry": "{{name}}に追加",
+  "remove_webhook_entry": "{{name}}から削除",
+  "distance": "距離",
+  "gym": "ジム",
+  "egg": "卵",
+  "raid": "レイド",
+  "lure": "ルアー",
+  "quest": "クエスト",
+  "invasion": "侵略",
+  "nest": "ネスト",
+  "pokestop": "ポケストップ",
+  "team": "チーム",
+  "global": "グローバル",
+  "manage_webhook": "{{name}}の管理",
+  "drag_and_drop": "マーカーをドラッグ＆ドロップして位置を設定",
+  "click_to_select": "選択するにはクリック",
+  "add_new": "新しい{{category}}アラートを追加",
+  "my_location": "自分の位置",
+  "choose_on_map": "地図で選択",
+  "select_profile": "プロファイルを選択",
+  "distance_radius": "プレビュー半径距離",
+  "areas": "エリア",
+  "select_webhook": "ボットを選択",
+  "ar_quest_true": "ARタスク",
+  "ar_quest_false": "ARなし",
+  "with_ar": "ARあり",
+  "both": "両方",
+  "without_ar": "ARなし",
+  "exclude_quest_multi": "{{reward}}を除外する",
+  "cluster_limit_0": "{{variable_0}}の限界（{{variable_1}}）に達しました",
+  "cluster_limit_1": "フィルタを狭めるかズームインしてください",
+  "show_polygons": "ポリゴンを表示",
+  "exclude_invasion_multi": "{{invasion}}を除外する",
+  "stardust": "スターダスト",
+  "slider_cp": "CP",
+  "pvp_ranking_league": "リーグ",
+  "pvp_ranking_min_cp": "最小CP",
+  "slider_pvp": "ランキング",
+  "profile_no": "プロファイル番号",
+  "template": "テンプレート",
+  "gender": "性別",
+  "clean": "クリーン",
+  "all_forms": "全フォーム",
+  "pvp_entry": "PVPエントリ",
+  "no_iv": "IVなしも含む",
+  "by_distance": "距離順",
+  "min_time": "最小時間",
+  "add_new_profile": "新しいプロファイルを追加",
+  "slider_none": "なし",
+  "non_registered_human_title": "おっと、何かが正しくありません！",
+  "non_registered_human_desc": "{{webhook}}に登録されていない可能性があります\nまたは現在サーバーにアクセスできません",
+  "try_again_later": "後でもう一度試してください",
+  "selected_areas_one": "{{count}}エリアが選択されました",
+  "selected_areas_other": "{{count}}エリアが選択されました",
+  "webhook_selection": "{{name}}の選択",
+  "message_of_the_day": "今日のメッセージ",
+  "has_quest_indicator": "クエストのあるストップを示す別の色",
+  "show_ar_badge": "ARバッジを表示",
+  "all_gyms": "全ジム",
+  "general": "一般",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "グローバルが選択されています",
+  "normal_forms": "ノーマルフォーム",
+  "weather_indicator": "天候ブーストの指標",
+  "page": "ページ {{page}}",
+  "navigation_controls": "ナビゲーションコントロール",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
+  "exclusive": "エクスクルーシブ",
+  "all_moves": "全てのわざ",
+  "move": "わざ",
+  "any": "任意",
+  "min_spawn_average": "最小出現率",
+  "select_all": "全て選択",
+  "delete_all": "選択したものを削除",
+  "cancel": "キャンセル",
+  "day_1": "月曜日",
+  "day_2": "火曜日",
+  "day_3": "水曜日",
+  "day_4": "木曜日",
+  "day_5": "金曜日",
+  "day_6": "土曜日",
+  "day_7": "日曜日",
+  "profile_name": "プロファイル名",
+  "manage_profiles": "プロファイル管理",
+  "min_spawn_avg": "平均最小出現率",
+  "poke_global": "全て",
+  "amount": "数",
+  "specific_gym": "特定のジム",
+  "search_location": "場所を検索",
+  "search_specific": "特定の{{category}}を検索",
+  "webhook_success_gym": "レイド、タマゴ、チーム変更のアラートが追加されました！",
+  "slot_changes": "スロット変更",
+  "slot_changes_poracle": "スロット変更",
+  "confirm_delete": "このプロファイルの追跡をすべて削除しますが、よろしいですか？",
+  "confirm_copy": "「{{profile}}」をコピーするプロファイルを選択してください、これによりそのプロファイルが完全に上書きされます。",
+  "webhook_error": "{{name}}が処理できませんでした。\n後でもう一度試してください。",
+  "profile_error": "一意で有効な名前でなければなりません",
+  "team_0": "ハーモニー",
+  "battle_changes": "バトル中",
+  "battle_changes_poracle": "バトル変更",
+  "auto": "自動",
+  "webhooks_subtitle": "これらのボットのために直接マップからアラートを管理",
+  "event_stops_subtitle": "ケクレオンのような特別なイベントポケストップを表示",
+  "webhooks": "アラート",
+  "scanner": "スキャナーアクション",
+  "everything_individually": "個別にアラートを追加",
+  "individually": "個別に",
+  "join": "参加",
+  "errors_404": "おっと、このページは見つかりません！",
+  "errors_500": "サーバーエラーが発生しました、後でもう一度試してください！",
+  "local_username": "ユーザー名",
+  "local_password": "パスワード",
+  "local_error": "エラーが発生しました、後でもう一度試してください！",
+  "no_filter_results": "結果が見つかりません\nフィルターを広げてみてください",
+  "donor_page": "ドナーページ",
+  "go_back": "戻る",
+  "access": "アクセス",
+  "link_discord": "Discordをリンクする",
+  "select_webhook_strategy": "アラートマネージャー",
+  "webhook_strategy_success_0": "成功！アラート設定を取得するために更新中...",
+  "register": "登録",
+  "invalid_credentials": "無効な認証情報",
+  "localauth_failed": "認証に失敗しました",
+  "error_creating_user": "現在、新しいユーザーを登録できません",
+  "discord_linked": "Discordがリンクされました",
+  "telegram_linked": "Telegramがリンクされました",
+  "level": "レベル",
+  "km": "km",
+  "feedback": "フィードバック",
+  "donor_menu": "ドナーメニュー",
+  "pokemon_cell": "ポケモンの位置は異なる可能性があります",
+  "timer_verified": "このタイマーは検証済みです",
+  "timer_unverified": "このタイマーは未検証です",
+  "all": "すべて",
+  "badge_0": "なし",
+  "badge_1": "ブロンズ",
+  "badge_2": "シルバー",
+  "badge_3": "ゴールド",
+  "gym_badge_menu": "ジムバッジを編集",
+  "gym_badges": "ジムバッジ",
+  "gym_badge_diamonds": "ジムバッジを表示",
+  "gym_badges_subtitle": "地図上およびプロフィールページのリストにジムバッジを表示します。",
+  "confirm_filters_reset": "フィルターをリセット",
+  "filters_reset_text": "フィルター設定をデフォルト値にリセットしてもよろしいですか？これは取り消しできません！",
+  "filters_reset_title": "フィルターをリセットする",
+  "raid_quick_select": "クイックセレクト",
+  "disabled": "無効",
+  "loading": "{{category}}を読み込み中",
+  "loading_icons": "アイコンを取得中",
+  "loading_invasions": "侵略を取得中",
+  "scan_next": "次の場所をスキャン",
+  "scan_next_choose": "マーカーをドラッグアンドドロップしてスキャン場所を設定する",
+  "scan_zone": "エリアをスキャン",
+  "scan_zone_choose": "マーカーをドラッグアンドドロップしてスキャン場所とサイズを選択する",
+  "scan_zone_size": "サイズ",
+  "scan_zone_range": "範囲",
+  "scan_zone_spacing": "間隔",
+  "scan_zone_radius": "半径",
+  "scan_requests": "スキャンリクエスト",
+  "scan_queue": "現在のキュー",
+  "click_to_scan": "ここをスキャン",
+  "scan_confirmed_title": "スキャン要求が確認されました",
+  "scan_confirmed": "ワーカーが場所に送られ、結果はすぐに地図に表示されます！",
+  "scan_loading_title": "スキャン要求を送信中",
+  "scan_loading": "あなたのスキャン要求が処理され、システムに送信されています！",
+  "scan_error_title": "エラー",
+  "scan_error": "スキャンリクエストを処理する際にエラーが発生しました...",
+  "scan_outside_area": "この場所は承認されたエリアの境界外です",
+  "pvp_ranking_cap": "レベル",
+  "lc_title": "あなたの位置を追跡",
+  "lc_metersUnit": "メートル",
+  "lc_feetUnit": "フィート",
+  "lc_popup": "このポイントから{distance} {unit}以内にいます",
+  "lc_outsideMapBoundsMsg": "地図の境界外に位置しているようです",
+  "no_alerts": "アラートが見つかりません",
+  "loading_settings": "設定を読み込み中",
+  "refresh_to_continue": "続行する前に更新してください",
+  "session_expired_title": "セッションの期限が切れました",
+  "session_expired_body": "あなたのセッションの有効期限が切れました",
+  "old_client_title": "古いバージョン",
+  "old_client_body": "この地図の新しいバージョンが利用可能です",
+  "early_old_client_title": "古いバージョン",
+  "early_old_client_body": "このアプリの古いバージョンがブラウザにキャッシュされている可能性があります。このアプリを使用するにはキャッシュをクリアする必要があります。",
+  "refresh": "更新",
+  "points": "ポイント",
   "day": "日",
-  "days": "何か問題が発生しました",
-  "react_error": "アイコンをクリックできます",
-  "clickable_icon": "次まで2つのストップ",
-  "two_stops_till_next": "次まで1つのストップ",
-  "one_stop_till_next": "ジムがもうありません",
-  "no_more_gyms": "明るい地図の境界線",
-  "light_map_border": "暗い地図の境界線",
-  "dark_map_border": "セルがブロックされています",
-  "cell_blocked": "POIの色",
-  "poi_color": "クエストの条件",
-  "quest_condition": "常にラベルを表示する",
-  "always_show_labels": "スキャンエリアのオプション",
-  "scan_areas_options": "歴史的なレア度",
-  "historic_rarity": "興味のあるポイント",
-  "poi": "300mの範囲",
-  "300m_range": "ルアーの範囲",
-  "lure_range": "カスタムの範囲",
-  "custom_range": "タップして切り替える",
-  "tap_to_toggle": "パワーアップ",
-  "power_up": "決して",
-  "never_alt": "近くで見かけた",
-  "seen_nearby_stop": "このセルで見かけた",
-  "seen_nearby_cell": "ルアーエンカウント",
-  "seen_lure_encounter": "ルアースポーン",
-  "seen_lure_wild": "野生のスポーン",
-  "seen_wild": "イベントストップ",
-  "event_stops": "イベントストップのタイマー",
-  "event_stop_timers": "どれでも",
-  "size_0": "XXS",
-  "size_1": "XS",
-  "size_2": "M",
-  "size_3": "XL",
-  "size_4": "XXL",
-  "size_5": "サイズインジケーターを表示する",
-  "show_size_indicator": "サイズ",
-  "size": "ゴールドストップ",
-  "gold_stop": "プロフィールの切り替え",
-  "profile_backups": "新しいバックアップ",
-  "new_backup": "作成",
-  "create": "ロード",
-  "load": "更新",
-  "update": "削除",
-  "delete": "名前",
-  "name": "確認済みのみ",
-  "only_confirmed": "ロケットポケモン",
-  "rocket_pokemon": "デコイ",
-  "decoy": "20,000セル以上の生成を試みました ({{variable_0}})",
-  "s2_cell_limit_0": "すべてのPVPランクを表示する",
-  "show_all_pvp_ranks": "ポケモンの座標を表示する",
-  "enable_pokemon_popup_coords": "ジムの座標を表示する",
-  "enable_gym_popup_coords": "ポケストップの座標を表示する",
-  "enable_pokestop_popup_coords": "ポータルの座標を表示する",
-  "enable_portal_popup_coords": "詳細情報は、私たちのディスコードに参加してください。",
-  "on_block_join_discord": "あなたはメンバーであるため、ブロックされました。",
-  "on_block_msg": "拒否されました",
-  "denied": "ショーケース",
-  "showcase": "不明なイベント",
-  "unknown_event": "{{time}}秒で利用可能",
-  "scanner_countdown": "成功",
-  "success": "貢献する",
-  "contribute": "mi",
-  "mi": "エリアでフィルタリング",
-  "filter_by_areas": "巣の名前を提出する",
-  "submit_nest_name": "名前の更新",
-  "nest_submission_menu": "巣の提出",
-  "nest_submissions": "新しい巣の名前を提出することができます",
-  "nest_submissions_subtitle": "ダイナミックなポケモンの透明度",
-  "pokemon_opacity": "ダイナミックな侵略の透明度",
-  "invasion_opacity": "ダイナミックなレイドの透明度",
-  "raid_opacity": "10分後の透明度",
-  "opacity_ten_minutes": "5分後の透明度",
-  "opacity_five_minutes": "1分後の透明度",
-  "opacity_one_minute": "レベル指示子",
-  "level_circles": "最小サークルレベル",
-  "min_level_circle": "ログインしていないため、リクエストが失敗しました",
-  "mutation_auth_error": "提出者",
+  "days": "日間",
+  "react_error": "何か問題が発生しました",
+  "clickable_icon": "クリック可能なアイコン",
+  "two_stops_till_next": "次まで2つのストップ",
+  "one_stop_till_next": "次まで1つのストップ",
+  "no_more_gyms": "これ以上ジムはありません",
+  "light_map_border": "ライトマップボーダー",
+  "dark_map_border": "ダークマップボーダー",
+  "cell_blocked": "セルがブロックされました",
+  "poi_color": "POI色",
+  "quest_condition": "クエスト条件",
+  "always_show_labels": "ラベルを常に表示",
+  "scan_areas_options": "スキャンエリアオプション",
+  "historic_rarity": "歴史的な珍しさ",
+  "poi": "興味のあるポイント",
+  "300m_range": "300m範囲",
+  "lure_range": "ルアーの範囲",
+  "custom_range": "カスタム範囲",
+  "tap_to_toggle": "タップして切り替え",
+  "power_up": "パワーアップ",
+  "never_alt": "決して",
+  "seen_nearby_stop": "近くのストップで見た",
+  "seen_nearby_cell": "このセル内で見た",
+  "seen_lure_encounter": "ルアー遭遇",
+  "seen_lure_wild": "ルアー野生",
+  "seen_wild": "野生出現",
+  "event_stops": "イベントストップ",
+  "event_stop_timers": "イベントストップタイマー",
+  "size_0": "どれか",
+  "size_1": "XXS",
+  "size_2": "XS",
+  "size_3": "M",
+  "size_4": "XL",
+  "size_5": "XXL",
+  "show_size_indicator": "サイズ指示器を表示",
+  "size": "サイズ",
+  "gold_stop": "ゴールドストップ",
+  "profile_backups": "プロファイルの切り替え",
+  "new_backup": "新しいバックアップ",
+  "create": "作成",
+  "load": "読み込み",
+  "update": "更新",
+  "delete": "削除",
+  "name": "名前",
+  "only_confirmed": "確認済みのみ",
+  "rocket_pokemon": "ロケットポケモン",
+  "decoy": "デコイ",
+  "s2_cell_limit_0": "20,000セル以上を生成しようとしました ({{variable_0}})",
+  "show_all_pvp_ranks": "全てのPVPランクを表示",
+  "enable_pokemon_popup_coords": "ポケモンの座標を表示",
+  "enable_gym_popup_coords": "ジムの座標を表示",
+  "enable_pokestop_popup_coords": "ポケストップの座標を表示",
+  "enable_portal_popup_coords": "ポータルの座標を表示",
+  "on_block_join_discord": "詳細はDiscordに参加してください。",
+  "on_block_msg": "あなたはメンバーであるためブロックされました",
+  "denied": "拒否されました",
+  "showcase": "ショーケース",
+  "unknown_event": "不明なイベント",
+  "scanner_countdown": "{{time}}秒で利用可能",
+  "success": "成功",
+  "contribute": "寄稿",
+  "mi": "マイル",
+  "filter_by_areas": "エリアでフィルター",
+  "submit_nest_name": "巣の名前を提出",
+  "nest_submission_menu": "名前の更新",
+  "nest_submissions": "巣の提出",
+  "nest_submissions_subtitle": "巣の新しい名前を提出できます",
+  "pokemon_opacity": "動的ポケモン不透明度",
+  "invasion_opacity": "動的侵略の不透明度",
+  "raid_opacity": "動的レイドの不透明度",
+  "opacity_ten_minutes": "10分での不透明度",
+  "opacity_five_minutes": "5分での不透明度",
+  "opacity_one_minute": "1分での不透明度",
+  "level_circles": "レベルインディケータ",
+  "min_level_circle": "最小サークルレベル",
+  "mutation_auth_error": "ログインしていないため、リクエストは失敗しました",
   "submitted_by": "提出者",
-  "localauth_failed": "認証に失敗しました",
   "reversible": "可逆",
   "version": "バージョン",
   "route_tags": "ルートタグ",
   "routes": "ルート",
-  "route_type": "ルートタイプ",
-  "routes_subtitle": "ゲーム内のルートとそれに関する情報を地図上で表示します",
+  "route_type": "ルートのタイプ",
+  "routes_subtitle": "マップ上でゲーム内のルートとそれに関する情報を表示",
   "description": "説明",
   "additional_info": "追加情報",
-  "duration": "所要時間",
-  "elevation": "標高",
+  "duration": "期間",
+  "elevation": "高度",
   "contest_category_1": "最小サイズ",
   "context_category_2": "最大サイズ",
   "total_entries": "総エントリー数",
-  "showcase_rankings": "ランキングを表示",
-  "showcase_rankings_subtitle": "ポケストップのショーケースのトップランキングのリストを表示します",
+  "showcase_rankings": "ショーケースランキング",
+  "showcase_rankings_subtitle": "ポケストップのショーケースのトップランキングのリストを表示",
   "tth": "TTH",
-  "tth_0": "すべて",
+  "tth_0": "全て",
   "tth_1": "既知",
-  "tth_2": "未知",
+  "tth_2": "不明",
   "no_access": "アクセス不可",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
   "cooldown": "クールダウン",
-  "scan_some_outside_area": "一部の場所が許可境界外にあります",
+  "scan_some_outside_area": "一部の場所が認可された境界の外にあります",
   "alerts": "アラート",
   "alert_manager": "アラートマネージャー",
   "menu": "メニュー",
@@ -641,70 +624,95 @@
   "component": "コンポーネント",
   "component_login_page": "ログインページ",
   "component_donation_page": "寄付ページ",
-  "component_message_of_the_day": "本日のメッセージ",
+  "component_message_of_the_day": "今日のメッセージ",
   "download": "ダウンロード",
-  "playground": "プレイグラウンド",
-  "locale": "言語設定",
+  "playground": "遊び場",
+  "locale": "ロケール",
   "saved": "保存済み",
   "show_editor": "エディタを表示",
   "hide_editor": "エディタを非表示",
-  "reported_error": "このエラーはサーバーに通報されました、エラーID：",
+  "reported_error": "このエラーは識別子を持ってサーバーに報告されました",
   "dark_mode": "ダークモード",
-  "load_from_autosave": "オートセーブから読み込む",
+  "load_from_autosave": "自動保存から読み込む",
   "done": "完了",
-  "fast": "速い",
+  "fast": "高速",
   "charged": "チャージ済み",
   "offline_mode": "オフラインモード",
-  "include_sponsored": "スポンサーを含める",
-  "showcase_color": "ショーケースの色",
-  "partner_color": "パートナーの色",
-  "disable": "{{- name}}を無効にする",
+  "include_sponsored": "スポンサーを含む",
+  "showcase_color": "ショーケースカラー",
+  "partner_color": "パートナーカラー",
+  "disable": "{{- name}} を無効化",
   "profiling": "プロファイリング",
-  "showcase_block": "ショーケースによるブロック",
-  "signed_in_as": "ログイン済み",
+  "showcase_block": "ショーケースによりブロックされました",
+  "signed_in_as": "次のアカウントでログイン中",
   "missing_map_perm": "マップを表示する権限がありません。",
-  "pokemon_audio": "ポケモンの音声",
-  "pokestop_audio": "ポケストップの音声",
-  "gym_audio": "ジムの音声",
-  "team_audio": "チームの音声",
-  "egg_audio": "卵の音声",
-  "raid_audio": "レイドの音声",
-  "nest_audio": "巣の音声",
-  "reward_audio": "報酬の音声",
-  "type_audio": "タイプの音声",
-  "weather_audio": "天気の音声",
-  "misc_audio": "その他の音声",
-  "invasion_audio": "侵略の音声",
-  "spawnpoint_audio": "出現ポイントの音声",
-  "device_audio": "デバイスの音声",
-  "access_denied": "アクセスが拒否されました",
-  "audio": "音声",
+  "access_denied": "アクセス拒否",
+  "audio": "オーディオ",
   "desktop_notifications": "デスクトップ通知",
   "notifications_options": "通知オプション",
-  "audio_always_on": "常に音声を再生する",
+  "audio_always_on": "常にオーディオを再生",
   "volume_level": "音量レベル",
   "notifications_status": "通知の状態",
-  "granted": "許可されました",
-  "global_search_invasions": "グラントのタイプ、名前、またはポケモンの報酬名を入力してください...",
+  "granted": "許可済み",
   "set_all": "すべて設定",
-  "set_filtered": "フィルターされたものを設定",
-  "only_show_available": "利用可能なもののみ表示",
+  "set_filtered": "フィルター設定",
+  "only_show_available": "利用可能のみを表示",
   "easy_mode": "簡単モード",
-  "quick_select": "グローバルクイック選択",
+  "quick_select": "グローバルクイックセレクト",
   "pokemon_filter_mode": "ポケモンフィルターモード",
   "basic": "基本",
   "intermediate": "中級",
-  "expert": "上級",
-  "basic_description": "ポケモンを簡単に選択し、グローバルフィルターを適用します",
-  "intermediate_description": "個別のフィルターをグローバルおよびポケモンごとに設定します（従来方式）",
-  "expert_description": "最もカスタマイズ性の高い手動入力クエリ",
-  "icon_size": "アイコンサイズ",
+  "expert": "エキスパート",
+  "basic_description": "簡単にポケモンを選択し、グローバルフィルターを適用",
+  "intermediate_description": "グローバルおよびポケモンごとに個別のフィルターを設定（従来）",
+  "expert_description": "最もカスタマイズ可能な手動入力クエリ",
+  "icon_size": "アイコンのサイズ",
   "developer": "開発者",
   "raid_override": "レイドオーバーライド",
-  "search_rocket_pokemon": "ロケットポケモンを検索",
+  "search_rocket_pokemon": "ロケット団ポケモンを検索",
   "main": "メイン",
   "extra": "エクストラ",
-  "select": "選択する",
+  "select": "選択",
   "searching": "検索中...",
-  "no_options": "オプションなし..."
+  "no_options": "オプションなし...",
+  "and": "AND",
+  "or": "OR",
+  "only_global": "グローバルのみ",
+  "global_caption": "他のすべてのフィルターを無視",
+  "global_and_individual": "グローバル＆個別のフィルター",
+  "gender_filters_all": "性別は全てに適用",
+  "and_caption": "連携",
+  "or_caption": "独立したフィルター",
+  "filter_help": "フィルターヘルプ",
+  "kilometers": "キロメートル",
+  "miles": "マイル",
+  "distance_unit": "距離の単位",
+  "data_management": "データ管理",
+  "reset_or_manage_text": "フィルターをハードリセットするか、個別のカテゴリをリセットできるデータ管理ページを表示できます。",
+  "reset_audio": "オーディオをリセット",
+  "reset_all": "すべてリセット",
+  "reset_icons": "アイコンをリセット",
+  "reset_position": "位置をリセット",
+  "reset_ui": "UIをリセット",
+  "reset_options": "オプションをリセット",
+  "reset_menus": "メニューをリセット",
+  "reset_settings": "設定をリセット",
+  "reset_general_title": "一般",
+  "reset_filters_title": "フィルター",
+  "reset_assets": "アセットをリセット",
+  "reset_pokemon": "ポケモンをリセット",
+  "reset_pokestops": "ポケストップをリセット",
+  "reset_gyms": "ジムをリセット",
+  "reset_nests": "ネストをリセット",
+  "reset_portals": "ポータルをリセット",
+  "reset_routes": "ルートをリセット",
+  "reset_scan_areas": "スキャンエリアをリセット",
+  "reset_scan_cells": "スキャンセルをリセット",
+  "reset_devices": "デバイスをリセット",
+  "reset_weather": "天気をリセット",
+  "reset_s2cells": "S2セルをリセット",
+  "reset_spawnpoints": "スポーンポイントをリセット",
+  "reset_submission_cells": "提出セルをリセット",
+  "hisuian": "ヒスイアン",
+  "spacial_rend_range": "時空のひび割れ範囲"
 }
diff --git a/packages/locales/lib/generated/ko.json b/packages/locales/lib/generated/ko.json
index b336921c0..d0a85e1cc 100644
--- a/packages/locales/lib/generated/ko.json
+++ b/packages/locales/lib/generated/ko.json
@@ -1,6 +1,6 @@
 {
   "login": "로그인",
-  "click_once": "'승인'을 한 번만 클릭하세요",
+  "click_once": "'인증'을 한 번만 클릭하세요",
   "save": "저장",
   "reset": "초기화",
   "close": "닫기",
@@ -24,12 +24,12 @@
   "search_raids": "레이드 검색",
   "search_eggs": "알 검색",
   "search_quests": "퀘스트 검색",
-  "search_lures": "루어 검색",
-  "search_invasions": "침입 검색",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "search_lures": "미끼 검색",
+  "search_invasions": "침략 검색",
+  "sm": "소",
+  "md": "중",
+  "lg": "대",
+  "xl": "특대",
   "min": "최소",
   "max": "최대",
   "set_size": "아이콘 크기 설정",
@@ -42,22 +42,22 @@
   "categories": "카테고리",
   "rank": "순위",
   "slider_iv": "IV 범위",
-  "slider_great": "그레이트 리그",
-  "slider_ultra": "울트라 리그",
-  "slider_little": "리틀 컵",
+  "slider_great": "슈퍼리그",
+  "slider_ultra": "하이퍼리그",
+  "slider_little": "리틀컵",
   "slider_atk_iv": "공격",
   "slider_def_iv": "방어",
-  "slider_sta_iv": "스태미너",
+  "slider_sta_iv": "체력",
   "slider_level": "레벨",
   "slider_size": "크기",
-  "abbreviation_level": "L",
+  "abbreviation_level": "레벨",
   "lvl": "레벨",
   "cap": "캡",
-  "custom": "사용자 정의",
+  "custom": "사용자 설정",
   "valid": "유효함",
   "invalid": "유효하지 않음!",
   "overwrites": "모든 필터 덮어쓰기",
-  "valid_filter": "유효한 스탯 필터",
+  "valid_filter": "유효한 통계 필터",
   "invalid_filter": "유효한 필터를 입력하세요",
   "gyms": "체육관",
   "nests": "둥지",
@@ -72,45 +72,45 @@
   "advanced": "고급",
   "tile_servers": "타일 서버",
   "icons": "아이콘",
-  "navigation": "내비게이션",
-  "drawer": "서랍",
+  "navigation": "네비게이션",
+  "drawer": "드로어",
   "tile_servers_default": "기본",
   "drawer_temporary": "임시",
-  "drawer_persistent": "지속적인",
-  "locale_selection": "로캘 선택",
+  "drawer_persistent": "지속적",
+  "locale_selection": "언어 선택",
   "import": "가져오기",
   "export": "내보내기",
   "logout": "로그아웃",
-  "local_storage_cleared": "로컬 저장소가 지워졌습니다!",
-  "iv_or_filter": "IV 또는 필터",
-  "polygons": "다각형",
+  "local_storage_cleared": "로컬 스토리지가 지워졌습니다!",
+  "iv_or_filter": "IV OR 필터",
+  "polygons": "폴리곤",
   "raids": "레이드",
   "ex_eligible": "EX 가능",
   "in_battle": "전투 중",
   "all_pokestops": "모든 포켓스탑",
-  "lures": "루어",
+  "lures": "미끼",
   "quests": "퀘스트",
-  "invasions": "침입",
+  "invasions": "침략",
   "portals": "포탈",
   "submission_cells": "제출 셀",
-  "spawnpoint": "스폰 지점",
-  "spawnpoints": "스폰 지점",
+  "spawnpoint": "출현 지점",
+  "spawnpoints": "출현 지점",
   "s2_cell_level": "레벨 {{level}} S2 셀",
   "total_count": "총 개수",
   "next_submission": "다음 제출!",
-  "never": "없음",
+  "never": "결코",
   "next_gym": "다음 체육관",
   "scan_cells": "셀 스캔",
   "devices": "장치",
   "use_my_location": "내 위치 사용",
-  "submit_feedback_title": "피드백/버그 보고서 제출",
+  "submit_feedback_title": "피드백/버그 보고 제출",
   "use_the_link_below": "아래 링크를 사용하여 피드백이나 발견한 버그를 제출할 수 있습니다.",
   "feedback_to_devs": "이 피드백은 개발자에게 직접 전송됩니다.",
   "feedback_form": "피드백 양식",
   "unknown_pokestop": "알 수 없는 포켓스탑 이름",
   "unknown_gym": "알 수 없는 체육관 이름",
   "exclude": "제외",
-  "exclude_quest": "임무 제외",
+  "exclude_quest": "퀘스트 제외",
   "exclude_invasion": "침략 제외",
   "exclude_team": "팀 제외",
   "exclude_raid": "레이드 제외",
@@ -123,516 +123,410 @@
   "form": "형태",
   "starts": "시작",
   "ends": "종료",
-  "defender": "수비수",
+  "defender": "방어자",
   "cp": "CP",
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "총 CP",
-  "first_seen": "처음 본 날짜",
-  "last_seen": "마지막으로 본 날짜",
-  "last_modified": "마지막 수정 날짜",
-  "last_updated": "최근 업데이트 날짜",
-  "imported": "가져온 날짜",
-  "nest_estimated": "네스트 데이터는 추정입니다!",
-  "verify_nests": "현재 스폰을 확인하여 확인하세요.",
-  "nest_out_of_date": "네스트가 잠재적으로 오래되었습니다!",
-  "nest_check_current": "현재 스폰을 확인하세요.",
-  "spawns_per_hour": "시간당",
+  "first_seen": "처음 발견",
+  "last_seen": "마지막 발견",
+  "last_modified": "마지막 수정",
+  "last_updated": "마지막 업데이트",
+  "imported": "가져옴",
+  "nest_estimated": "둥지 데이터가 추정됩니다!",
+  "verify_nests": "현재 스폰을 확인하여 둥지 검증",
+  "nest_out_of_date": "둥지 데이터가 최신이 아닐 수 있습니다!",
+  "nest_check_current": "대신 현재 스폰 확인",
+  "spawns_per_hour": "시간당 스폰 수",
   "teams": "팀",
   "eggs": "알",
-  "reverse": "반전",
+  "reverse": "거꾸로",
   "selected": "선택됨",
-  "unselected": "선택 취소됨",
-  "only_available": "사용 가능",
-  "common": "일반",
-  "uncommon": "비통",
-  "rare": "희귀",
-  "ultra_rare": "울트라 희귀",
-  "regional": "지역별",
+  "unselected": "선택되지 않음",
+  "only_available": "가능",
+  "common": "흔함",
+  "uncommon": "드뭄",
+  "rare": "희귀함",
+  "ultra_rare": "극희귀",
+  "regional": "지역 한정",
   "event": "이벤트",
-  "legendary": "전설",
-  "mythical": "신화",
+  "legendary": "전설의",
+  "mythical": "신화의",
   "ultra_beast": "울트라 비스트",
   "alt_forms": "대체 형태",
   "alola": "알로라",
-  "galarian": "가라르",
+  "galarian": "갈라리안",
   "showing": "표시 중",
   "instance": "인스턴스",
   "online": "온라인",
   "offline": "오프라인",
   "boosted_types": "강화된 유형",
   "pokemon_options": "포켓몬 옵션",
-  "pokestops_options": "포켓스탑 옵션",
+  "pokestops_options": "포켓스톱 옵션",
   "gyms_options": "체육관 옵션",
-  "nests_options": "네스트 옵션",
-  "wayfarer_options": "웨이페어 옵션",
+  "nests_options": "둥지 옵션",
+  "wayfarer_options": "웨이페어러 옵션",
   "admin_options": "관리자 옵션",
   "weather_options": "날씨 옵션",
   "s2cells_options": "S2 셀 옵션",
   "clustering": "클러스터링",
   "glow": "반짝임",
-  "legacy_filter": "레거시 필터",
+  "legacy_filter": "구버전 필터",
   "raid_timers": "모든 레이드 타이머",
   "invasion_timers": "모든 침략 타이머",
   "lure_timers": "모든 루어 타이머",
-  "device_path_color": "장치 경로 색상",
-  "old_portals": "구 버전 포탈",
-  "new_portals": "신 버전 포탈",
+  "device_path_color": "디바이스 경로 색상",
+  "old_portals": "옛날 포탈",
+  "new_portals": "새 포탈",
   "items": "아이템",
   "energy": "에너지",
   "ar_eligible": "AR 가능",
-  "iv_circles": "IV 지표",
-  "min_iv_circle": "최소 원형 IV",
+  "iv_circles": "IV 표시",
+  "min_iv_circle": "최소 IV 원",
   "interaction_ranges": "상호작용 범위",
-  "cannot_connect": "\n현재 서버에 연결할 수 없습니다.\n즉시 다시 시도하면 더 많은 문제가 발생할 수 있습니다.\n몇 분 후에 다시 시도해주세요.\n\n- 맵 관리자 팀",
-  "mad_quest_text": "네이티브 퀘스트",
+  "cannot_connect": "\n현재 서버에 연결할 수 없습니다.\n즉시 다시 시도하면 문제만 더 발생할 수 있습니다.\n몇 분 후에 다시 시도해 주십시오.\n\n- 맵 관리자 팀",
+  "mad_quest_text": "기본 퀘스트",
   "xs": "XS",
-  "primary": "기본",
-  "secondary": "보조",
+  "primary": "주",
+  "secondary": "부",
   "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
   "open_menu": "메뉴 열기",
-  "zoom_in": "확대하기",
-  "zoom_out": "축소하기",
+  "zoom_in": "확대",
+  "zoom_out": "축소",
   "welcome": "환영합니다",
   "back": "뒤로",
   "next": "다음",
-  "finish": "완료",
+  "finish": "마침",
   "start_tutorial": "튜토리얼 시작",
   "view_profile": "프로필 보기",
-  "login_optional": "로그인 (선택 사항)",
+  "login_optional": "로그인 (선택사항)",
   "tutorial": "튜토리얼",
   "tutorial_language": "언어 선택",
-  "tutorial_welcome": "이 튜토리얼은 상호작용이 가능하며 제공된 모든 옵션을 사용하는 것을 권장합니다",
+  "tutorial_welcome": "이 튜토리얼은 상호작용이 가능하며 제공된 모든 옵션을 사용해 보는 것이 매우 권장됩니다",
   "tutorial_categories": "접근 가능한 카테고리",
-  "tutorial_logged_in": "프로필을 확인하여 권한에 대한 자세한 내용을 볼 수 있습니다.",
-  "tutorial_logged_out": "로그인하여 권한에 대한 자세한 내용을 볼 수 있습니다.",
-  "tutorial_sidebar_0": "모든 필터 및 설정은 여기에서 관리됩니다",
-  "tutorial_sidebar_1": "각 카테고리마다 스위치를 사용하여 원하는 데이터를 정확하게 토글할 수 있습니다",
-  "tutorial_sidebar_2": "옵션: 추가적인 사용자 정의\n고급: 이 튜토리얼에서 나중에 다룰 예정입니다",
-  "tutorial_sliders_0": "슬라이더를 사용하여 필터 조정하기",
+  "tutorial_logged_in": "프로필을 보면 권한에 대한 세부 정보를 볼 수 있습니다.",
+  "tutorial_logged_out": "로그인하면 권한에 대한 세부 정보를 볼 수 있습니다.",
+  "tutorial_sidebar_0": "여기에 모든 필터 및 설정이 있습니다",
+  "tutorial_sidebar_1": "각 카테고리에서 원하는 데이터를 정확히 토글할 수 있습니다",
+  "tutorial_sidebar_2": "옵션: 추가 사용자 정의\n고급: 이 튜토리얼에서 나중에 다룰 예정입니다",
+  "tutorial_sliders_0": "슬라이더를 사용하여 필터 조정",
   "tutorial_sliders_1": "포켓몬 범위:",
-  "tutorial_sliders_2": "- IV {{iv0}}%에서 {{iv1}}%까지",
+  "tutorial_sliders_2": "- IVs {{iv0}}%에서 {{iv1}}%까지",
   "tutorial_sliders_3": "레벨 {{level0}}에서 {{level1}}까지",
   "tutorial_sliders_3alt": "- 그리고 레벨 {{level0}}에서 {{level1}}까지",
-  "tutorial_sliders_4": "- 그레이트 리그 랭크 {{gl0}}에서 {{gl1}}까지",
-  "tutorial_sliders_4alt": "- 또는 그레이트 리그 랭크 {{gl0}}에서 {{gl1}}까지",
-  "tutorial_sliders_5": "- 울트라 리그 랭크 {{ul0}}에서 {{ul1}}까지",
-  "tutorial_sliders_5alt": "- 또는 울트라 리그 랭크 {{ul0}}에서 {{ul1}}까지",
-  "tutorial_sliders_6": "같은 색상의 다른 것들과 연결",
-  "tutorial_sliders_7": "다른 슬라이더와 별도로 필터링",
-  "tutorial_sliders_8": "'전체' 슬라이더는 비활성화된 것을 의미합니다:",
-  "tutorial_sliders_9": "IV 확인 여부와 상관없이 모든 스폰",
-  "tutorial_help": "이 메뉴로 바로 가기",
-  "tutorial_adv_filter": "모바일 전용, 고급 메뉴의 필터링 옵션을 엽니다",
-  "tutorial_tune": "현재 메뉴에서 필터링되고 있는 모든 포켓몬에 대한 고급 필터를 설정합니다",
-  "tutorial_format_size": "현재 메뉴에서 필터링되고 있는 모든 항목에 대한 아이콘 크기를 설정합니다",
-  "tutorial_check": "현재 메뉴에서 필터링되고 있는 모든 항목을 활성화합니다",
-  "tutorial_clear": "현재 메뉴에서 필터링되고 있는 모든 항목을 비활성화합니다",
-  "tutorial_save": "현재 선택 사항을 저장하고 종료합니다",
-  "tutorial_show_all_view": "포켓스탑 및 체육관 전환",
-  "tutorial_show_pokemon_view": "포켓몬 전환",
-  "tutorial_toggle": "체크/X를 클릭하면 항목을 전환합니다",
-  "tutorial_pokemon_caption": "이 아이콘을 사용하여 해당 포켓몬에 대한 필터를 설정할 수 있습니다",
-  "tutorial_all_caption": "팀은 특별한 슬롯 메뉴를 가지고 있습니다\n다른 모든 항목은 아이콘 크기를 조정할 수 있습니다",
-  "tutorial_popup_0": "팝업은 이제 상호작용이 가능합니다!",
-  "tutorial_popup_1": "내비게이션 링크 양쪽에 있는 아이콘을 클릭하면 추가 정보가 표시됩니다, 한번 해보세요!",
-  "tutorial_popup_2": "각 카테고리마다 아이콘이 다르니 모두 확인해보세요",
-  "tutorial_popup_3": "추가 정보",
-  "tutorial_closing_0": "전역 포켓몬 슬라이더는 고급 메뉴와는 별개로 작동하며 서로에게 영향을 주지 않습니다",
-  "tutorial_closing_1": "사이드바의 설정 섹션도 꼭 확인해보세요",
-  "tutorial_closing_2": "각 카테고리에는 다양한 미적 옵션이 있지만, 지도에 추가할수록 지도가 멈출 확률이 높아집니다",
-  "tutorial_closing_3": "사이드바의 설정 패널에서 다시 이 튜토리얼을 볼 수 있습니다",
-  "tutorial_closing_4": "안전하게 즐기고 행운을 빕니다",
-  "tutorial_closing_5": "소개",
-  "intro": "사이드바",
-  "sidebar": "슬라이더",
-  "sliders": "팝업",
-  "popups": "닫기",
-  "closing": "바로 가기",
-  "shortcuts": "IV",
-  "iv": "지역 제한",
-  "area_restrictions": "지도",
-  "map": "통계",
-  "stats": "PVP",
-  "pvp": "이 지역에 접근할 수 있습니다",
-  "area_restrictions_subtitle": "활성 장치 위치와 경로를 표시합니다",
-  "devices_subtitle": "활성 체육관 위치, 활성 팀 및 각 체육관의 슬롯 수를 표시합니다",
-  "gyms_subtitle": "팀 로켓 침공 정보를 표시합니다. 전투 라인업, 만료 시간 및 가능한 보상을 포함합니다",
-  "invasions_subtitle": "IV% 및 빛나는 옵션을 표시합니다",
-  "iv_subtitle": "루어 유형 및 만료 시간을 포함한 루어 정보를 표시합니다",
-  "lures_subtitle": "지도를 표시합니다",
-  "map_subtitle": "활성 중인 포켓몬과 둥지 폴리곤을 표시합니다",
-  "nests_subtitle": "모든 포켓몬 위치와 만료 시간을 표시합니다",
-  "pokemon_subtitle": "모든 포켓스탑 위치를 보여줍니다",
-  "pokestops_subtitle": "모든 인그레스 포털을 보여줍니다",
-  "portals_subtitle": "각 포켓몬의 PVP 랭크/CP/레벨 정보를 보여줍니다",
-  "pvp_subtitle": "퀘스트 보상 및 과제 정보를 보여줍니다",
-  "quests_subtitle": "레이드 보스, 알, 만료 시간 및 기술 세트를 포함한 모든 레이드 정보를 보여줍니다",
-  "raids_subtitle": "S2 셀이 장치에 의해 마지막으로 스캔된 시간을 보여줍니다",
-  "scan_cells_subtitle": "사용 가능한 스캔 영역 다각형을 보여줍니다",
-  "scan_areas_subtitle": "스폰 포인트와 예상 소멸 시간을 보여줍니다",
-  "spawnpoints_subtitle": "포켓몬의 스탯과 레벨을 보여줍니다",
-  "stats_subtitle": "새로운 POI를 제출하는 데 유용한 정보를 보여줍니다",
-  "submission_cells_subtitle": "각 셀의 게임 내 날씨 정보를 보여줍니다",
-  "weather_subtitle": "다양한 방법으로 스캐너와 상호 작용합니다",
-  "scanner_subtitle": "지도에 다양한 레벨의 S2 셀을 표시합니다",
-  "s2cells_subtitle": "장치 간 설정의 백업 및 로드를 가능하게 합니다",
-  "backups_subtitle": "백업",
-  "backups": "사용자 프로필",
-  "user_profile": "사용자 이름",
-  "user_username": "사탕",
-  "candy": "EX 배지 표시",
-  "show_ex_badge": "검색",
-  "search": "보상 이름 입력...",
-  "global_search_quests": "루어 이름 입력...",
-  "global_search_lures": "포켓스탑 이름 입력...",
-  "global_search_pokestops": "체육관 이름 입력...",
-  "global_search_gyms": "포털 이름 입력...",
-  "global_search_portals": "네스트 포켓몬 이름 입력...",
-  "global_search_nests": "레이드 보스 이름 입력...",
-  "global_search_raids": "포켓몬 이름 입력...",
-  "global_search_pokemon": "레이드 레벨 배지",
-  "raid_level_badges": "옵션",
-  "options": "프로필",
-  "profile": "포켓몬 아이콘",
-  "pokemon_icons": "포켓스탑 아이콘",
-  "pokestop_icons": "체육관 아이콘",
-  "gym_icons": "팀 아이콘",
-  "team_icons": "알 아이콘",
-  "egg_icons": "레이드 아이콘",
-  "raid_icons": "네스트 아이콘",
-  "nest_icons": "보상 아이콘",
-  "reward_icons": "타입 아이콘",
-  "type_icons": "날씨 아이콘",
-  "weather_icons": "기타 아이콘",
-  "misc_icons": "침입 아이콘",
-  "invasion_icons": "스폰 포인트 아이콘",
-  "spawnpoint_icons": "기기 아이콘",
-  "device_icons": "모든 포켓몬 타이머",
-  "pokemon_timers": "팝업에 포켓몬 도감 번호 표시",
-  "show_dex_num_in_popup": "팝업",
-  "popup": "레벨 {{level}} PVP 통계",
-  "pvp_level": "메가 PVP 통계",
-  "pvp_mega": "{{name}}에 추가",
-  "webhook_entry": "{{name}}에서 제거",
-  "remove_webhook_entry": "거리",
-  "distance": "체육관",
-  "gym": "알",
-  "egg": "레이드",
-  "raid": "루어",
-  "lure": "퀘스트",
-  "quest": "침입",
-  "invasion": "둥지",
-  "nest": "포켓스탑",
-  "pokestop": "팀",
-  "team": "글로벌",
-  "global": "{{name}} 관리",
-  "manage_webhook": "마커를 드래그하여 위치 설정",
-  "drag_and_drop": "선택하려면 클릭",
-  "click_to_select": "새로운 {{category}} 알림 추가",
-  "add_new": "내 위치",
-  "my_location": "지도에서 선택",
-  "choose_on_map": "프로필 선택",
-  "select_profile": "반경 거리 미리보기",
-  "distance_radius": "지역",
-  "areas": "봇 선택",
-  "select_webhook": "AR 작업",
-  "ar_quest_true": "AR 없음",
-  "ar_quest_false": "AR 포함",
-  "with_ar": "둘 다",
-  "both": "AR 제외",
-  "without_ar": "{{reward}} 제외",
-  "exclude_quest_multi": "{{variable_0}} 제한 ({{variable_1}})이 도달되었습니다",
-  "cluster_limit_0": "확대하거나 필터를 좁히세요",
-  "cluster_limit_1": "다각형 표시",
-  "show_polygons": "{{invasion}} 제외",
-  "exclude_invasion_multi": "스타더스트",
-  "stardust": "CP",
-  "slider_cp": "리그",
-  "pvp_ranking_league": "최소 CP",
-  "pvp_ranking_min_cp": "순위",
-  "slider_pvp": "프로필",
-  "profile_no": "템플릿",
-  "template": "성별",
-  "gender": "정리",
-  "clean": "모든 형태",
-  "all_forms": "PVP 등록",
-  "pvp_entry": "IV 없이 포함",
-  "no_iv": "거리별 정렬",
-  "by_distance": "최소 시간",
-  "min_time": "새로운 프로필 추가",
-  "add_new_profile": "없음",
-  "slider_none": "죄송합니다, 뭔가 잘못되었습니다!",
-  "non_registered_human_title": "{{webhook}}에 등록되지 않았을 수 있습니다\n또는 서버에 접속할 수 없습니다",
-  "non_registered_human_desc": "나중에 다시 시도해주세요",
-  "try_again_later": "{{amount}}개 지역 선택됨",
-  "selected_areas": "{{amount}}개 지역 선택됨",
-  "selected_areas_plural": "{{name}} 선택",
-  "webhook_selection": "오늘의 메시지",
-  "message_of_the_day": "퀘스트가 있는 스탑을 위한 대체 색상 표시",
-  "has_quest_indicator": "AR 뱃지 표시",
-  "show_ar_badge": "모든 체육관",
-  "all_gyms": "일반",
-  "general": "{{variable_0}}",
-  "server_dev_error_0": "글로벌 및 고급 연결",
-  "link_global_and_advanced": "일반 형태",
-  "normal_forms": "날씨 부스트 표시기",
-  "weather_indicator": "페이지 {{page}}",
-  "page": "내비게이션 컨트롤",
-  "navigation_controls": "리액트",
-  "navigation_controls_react": "리플렛",
-  "navigation_controls_leaflet": "독점",
-  "exclusive": "모든 기술",
-  "all_moves": "기술",
-  "move": "아무거나",
-  "any": "최소 스폰 비율",
-  "min_spawn_average": "모두 선택",
-  "select_all": "선택한 항목 삭제",
-  "delete_all": "취소",
-  "cancel": "월요일",
-  "day_1": "화요일",
-  "day_2": "수요일",
-  "day_3": "목요일",
-  "day_4": "금요일",
-  "day_5": "토요일",
-  "day_6": "일요일",
-  "day_7": "프로필 이름",
-  "profile_name": "프로필 관리",
-  "manage_profiles": "평균 최소 스폰",
-  "min_spawn_avg": "모든 것",
-  "poke_global": "수량",
-  "amount": "특정 체육관",
-  "specific_gym": "위치 검색",
-  "search_location": "특정 {{category}} 검색",
-  "search_specific": "레이드, 알, 팀 변경 알림이 추가되었습니다!",
-  "webhook_success_gym": "슬롯 변경",
-  "slot_changes": "slot_changes",
-  "slot_changes_poracle": "이 프로필의 모든 추적 정보가 삭제됩니다. 계속하시겠습니까?",
-  "confirm_delete": "\"{{profile}}\"을(를) 복사할 프로필을 선택하세요. 이로 인해 해당 프로필이 완전히 덮어씌워집니다.",
-  "confirm_copy": "{{name}}이(가) 처리할 수 없습니다.\n나중에 다시 시도해주세요.",
-  "webhook_error": "고유하고 유효한 값이어야 합니다",
-  "profile_error": "하모니",
-  "team_0": "전투 중",
-  "battle_changes": "battle_changes",
-  "battle_changes_poracle": "자동",
-  "auto": "이 봇들을 통해 맵에서 직접 알림을 관리하세요",
-  "webhooks_subtitle": "켈리몬과 같은 특별 이벤트 포켓스탑을 표시합니다",
-  "event_stops_subtitle": "알림",
-  "webhooks": "스캐너 작업",
-  "scanner": "개별 알림 추가",
-  "everything_individually": "개별로",
-  "individually": "참여",
-  "join": "죄송합니다, 이 페이지를 찾을 수 없습니다!",
-  "errors_404": "서버 오류가 발생했습니다. 나중에 다시 시도하세요!",
-  "errors_500": "사용자 이름",
-  "local_username": "비밀번호",
-  "local_password": "오류가 발생했습니다. 나중에 다시 시도하세요!",
-  "local_error": "결과를 찾을 수 없습니다. 필터를 넓혀보세요",
-  "no_filter_results": "기부 페이지",
-  "donor_page": "뒤로 가기",
-  "go_back": "접근",
-  "access": "디스코드 링크",
-  "link_discord": "알림 관리자",
-  "select_webhook_strategy": "성공! 알림 설정을 가져오기 위해 새로 고침 중...",
-  "webhook_strategy_success_0": "등록",
-  "register": "유효하지 않은 자격 증명",
-  "invalid_credentials": "현재 시간에 새로운 사용자를 등록할 수 없습니다",
-  "error_creating_user": "디스코드 연결됨",
-  "discord_linked": "텔레그램 연결됨",
-  "telegram_linked": "레벨",
-  "level": "킬로미터",
-  "km": "피드백",
-  "feedback": "기부 메뉴",
-  "donor_menu": "포켓몬의 위치는 다를 수 있습니다",
-  "pokemon_cell": "이 타이머는 확인되었습니다",
-  "timer_verified": "이 타이머는 확인되지 않았습니다",
-  "timer_unverified": "모두",
-  "all": "없음",
-  "badge_0": "동상",
-  "badge_1": "은상",
-  "badge_2": "금상",
-  "badge_3": "체육관 뱃지 수정",
-  "gym_badge_menu": "체육관 뱃지",
-  "gym_badges": "체육관 뱃지 표시",
-  "gym_badge_diamonds": "지도에 체육관 뱃지를 표시하고 프로필 페이지에 목록을 표시합니다",
-  "gym_badges_subtitle": "필터 재설정",
-  "confirm_filters_reset": "설정을 기본값으로 재설정하시겠습니까? 이 작업은 되돌릴 수 없습니다!",
-  "filters_reset_text": "필터 재설정",
-  "filters_reset_title": "빠른 선택",
-  "raid_quick_select": "비활성화",
-  "disabled": "{{category}} 로딩 중",
-  "loading": "아이콘 가져오는 중",
-  "loading_icons": "침략 가져오는 중",
-  "loading_invasions": "스캔 위치",
-  "scan_next": "마커를 드래그하여 스캔 위치를 설정하세요",
-  "scan_next_choose": "지역 스캔",
-  "scan_zone": "마커를 드래그하여 스캔 위치와 크기를 선택하세요",
-  "scan_zone_choose": "크기",
-  "scan_zone_size": "범위",
-  "scan_zone_range": "간격",
-  "scan_zone_spacing": "반경",
-  "scan_zone_radius": "스캔 요청",
-  "scan_requests": "현재 대기열",
-  "scan_queue": "여기 스캔",
-  "click_to_scan": "스캔 요청이 확인되었습니다",
-  "scan_confirmed_title": "작업자가 위치로 이동되었으며 결과가 곧 지도에 표시됩니다!",
-  "scan_confirmed": "스캔 요청을 보내는 중",
-  "scan_loading_title": "스캔 요청이 처리되고 시스템으로 전송 중입니다!",
-  "scan_loading": "오류",
-  "scan_error_title": "스캔 요청 처리 중 오류가 발생했습니다...",
-  "scan_error": "이 위치는 허가된 지역의 경계를 벗어납니다",
-  "scan_outside_area": "레벨",
-  "pvp_ranking_cap": "당신의 위치를 따르세요",
-  "lc_title": "미터",
-  "lc_metersUnit": "피트",
-  "lc_feetUnit": "이 지점으로부터 {distance} {unit} 거리에 있습니다",
-  "lc_popup": "지도의 경계를 벗어난 것 같습니다",
-  "lc_outsideMapBoundsMsg": "알림이 없습니다",
-  "no_alerts": "설정을 불러오는 중입니다",
-  "loading_settings": "계속하기 전에 새로고침 해주세요",
-  "refresh_to_continue": "세션이 만료되었습니다",
-  "session_expired_title": "세션이 만료되었습니다",
-  "session_expired_body": "오래된 버전입니다",
-  "old_client_title": "이 지도의 새로운 버전이 있습니다",
-  "old_client_body": "새로고침",
-  "refresh": "포인트",
-  "points": "일",
+  "tutorial_sliders_4": "- 그레이트 리그 순위 {{gl0}}에서 {{gl1}}까지",
+  "tutorial_sliders_4alt": "- 또는 그레이트 리그 순위 {{gl0}}에서 {{gl1}}까지",
+  "tutorial_sliders_5": "- 울트라 리그 순위 {{ul0}}에서 {{ul1}}까지",
+  "tutorial_sliders_5alt": "- 또는 울트라 리그 순위 {{ul0}}에서 {{ul1}}까지",
+  "tutorial_sliders_6": "동일한 색상의 다른 슬라이더와 연계",
+  "tutorial_sliders_7": "다른 슬라이더와 별도로 필터",
+  "tutorial_sliders_8": "‘전체’ 슬라이더는 비활성화된 상태를 의미합니다:",
+  "tutorial_sliders_9": "IV 체크 여부와 관계없이 모든 스폰",
+  "tutorial_help": "이 메뉴로 바로가기",
+  "tutorial_adv_filter": "모바일 전용, 고급 메뉴의 필터링 옵션 열기",
+  "tutorial_tune": "메뉴에서 현재 필터링 중인 모든 포켓몬에 대한 고급 필터 설정",
+  "tutorial_format_size": "메뉴에서 현재 필터링 중인 모든 항목의 아이콘 크기 설정",
+  "tutorial_check": "메뉴에서 현재 필터링 중인 모든 항목 활성화",
+  "tutorial_clear": "메뉴에서 현재 필터링 중인 모든 항목 비활성화",
+  "tutorial_save": "현재 선택 저장하고 종료",
+  "tutorial_show_all_view": "포케스탑 & 체육관 토글",
+  "tutorial_show_pokemon_view": "포켓몬 토글",
+  "tutorial_toggle": "체크/X를 클릭하여 항목 토글",
+  "tutorial_pokemon_caption": "이 아이콘을 사용하면 해당 포켓몬에 대한 필터를 설정할 수 있습니다",
+  "tutorial_all_caption": "팀은 특별한 슬롯 메뉴를 가집니다\n다른 모든 항목은 아이콘 크기를 조정할 수 있게 합니다",
+  "tutorial_popup_0": "팝업이 이제 상호작용 가능합니다!",
+  "tutorial_popup_1": "세 개의 점은 숨기기, 제외하기 및 타이머 토글 옵션을 엽니다",
+  "tutorial_popup_2": "탐색 링크 양쪽의 아이콘은 추가 정보를 보여주기 위해 확장됩니다, 한번 시도해보세요!",
+  "tutorial_popup_3": "각 카테고리마다 아이콘이 다릅니다, 모두 확인해보세요",
+  "tutorial_closing_0": "추가 정보",
+  "tutorial_closing_1": "사이드바의 전역 포켓몬 슬라이더는 고급 메뉴와 별도로 작동하며 서로 영향을 주지 않습니다",
+  "tutorial_closing_2": "사이드바의 설정 섹션을 확인해 보세요",
+  "tutorial_closing_3": "각 카테고리마다 많은 미적 옵션이 있지만, 지도에 추가하는 항목이 많을수록 지도가 멈출 가능성이 높아집니다",
+  "tutorial_closing_4": "사이드바의 설정 패널에서 이 튜토리얼을 다시 볼 수 있습니다",
+  "tutorial_closing_5": "안전하게 대처하시고 행운을 빕니다!",
+  "intro": "소개",
+  "sidebar": "사이드바",
+  "sliders": "슬라이더",
+  "popups": "팝업",
+  "closing": "마무리",
+  "shortcuts": "바로가기",
+  "iv": "IV",
+  "area_restrictions": "지역 제한",
+  "map": "지도",
+  "stats": "통계",
+  "pvp": "PVP",
+  "area_restrictions_subtitle": "이 지역에 대한 접근이 허용됩니다",
+  "devices_subtitle": "활성 장치 위치 및 경로 표시",
+  "gyms_subtitle": "활성 체육관 위치, 활성 팀 및 각 체육관의 사용 가능한 슬롯 수 표시",
+  "invasions_subtitle": "팀 로켓 침략 정보 표시, 전투 라인업, 만료 시간 및 가능한 보상 포함",
+  "iv_subtitle": "IV% 및 빛나는 옵션 표시",
+  "lures_subtitle": "미끼 정보 표시, 미끼 유형과 만료 시간 포함",
+  "map_subtitle": "지도 표시",
+  "nests_subtitle": "활성 포켓몬 둥지 및 둥지 폴리곤 표시",
+  "pokemon_subtitle": "모든 포켓몬 위치와 만료 시간 표시",
+  "pokestops_subtitle": "모든 포케스탑 위치 표시",
+  "portals_subtitle": "모든 Ingress 포털 표시",
+  "pvp_subtitle": "각 포켓몬의 PVP 순위/CP/레벨 정보를 표시합니다",
+  "quests_subtitle": "퀘스트 보상 및 작업 정보를 표시합니다",
+  "raids_subtitle": "레이드 보스, 알, 만료 시간 및 이동 세트를 포함한 모든 레이드 정보를 표시합니다",
+  "scan_cells_subtitle": "S2 셀이 기기에 의해 마지막으로 스캔된 시간을 표시합니다",
+  "scan_areas_subtitle": "사용 가능한 스캔 영역 폴리곤을 표시합니다",
+  "spawnpoints_subtitle": "스폰 포인트와 예상 소멸 시간을 표시합니다",
+  "stats_subtitle": "포켓몬의 스탯과 레벨을 표시합니다",
+  "submission_cells_subtitle": "새로운 POI를 제출하기 위한 유용한 정보를 표시합니다",
+  "weather_subtitle": "각 셀의 게임 내 날씨 정보를 표시합니다",
+  "scanner_subtitle": "다양한 방식으로 스캐너와 직접 상호 작용합니다",
+  "s2cells_subtitle": "지도에 다양한 레벨의 S2 셀을 표시합니다",
+  "backups_subtitle": "기기 간 설정을 백업하고 로드하는 것을 가능하게 합니다",
+  "backups": "백업",
+  "user_profile": "사용자 프로필",
+  "user_username": "사용자 이름",
+  "candy": "사탕",
+  "show_ex_badge": "EX 배지 표시",
+  "search": "검색",
+  "global_search_quests": "보상 이름을 입력하세요...",
+  "global_search_lures": "루어 이름을 입력하세요...",
+  "global_search_pokestops": "포켓스탑 이름을 입력하세요...",
+  "global_search_gyms": "체육관 이름을 입력하세요...",
+  "global_search_portals": "포털 이름을 입력하세요...",
+  "global_search_nests": "포켓몬 둥지 이름을 입력하세요...",
+  "global_search_raids": "레이드 보스 이름을 입력하세요...",
+  "global_search_pokemon": "포켓몬 이름을 입력하세요...",
+  "global_search_invasions": "그런트 유형, 이름 또는 포켓몬 보상 이름을 입력하세요...",
+  "raid_level_badges": "레이드 레벨 배지",
+  "options": "옵션",
+  "profile": "프로필",
+  "pokemon_icons": "포켓몬 아이콘",
+  "pokestop_icons": "포켓스탑 아이콘",
+  "gym_icons": "체육관 아이콘",
+  "team_icons": "팀 아이콘",
+  "egg_icons": "알 아이콘",
+  "raid_icons": "레이드 아이콘",
+  "nest_icons": "둥지 아이콘",
+  "reward_icons": "보상 아이콘",
+  "type_icons": "타입 아이콘",
+  "weather_icons": "날씨 아이콘",
+  "misc_icons": "기타 아이콘",
+  "invasion_icons": "침공 아이콘",
+  "spawnpoint_icons": "스폰 포인트 아이콘",
+  "device_icons": "기기 아이콘",
+  "pokemon_audio": "포켓몬 오디오",
+  "pokestop_audio": "포켓스탑 오디오",
+  "gym_audio": "체육관 오디오",
+  "team_audio": "팀 오디오",
+  "egg_audio": "알 오디오",
+  "raid_audio": "레이드 오디오",
+  "nest_audio": "둥지 오디오",
+  "reward_audio": "보상 오디오",
+  "type_audio": "타입 오디오",
+  "weather_audio": "날씨 오디오",
+  "misc_audio": "기타 오디오",
+  "invasion_audio": "침공 오디오",
+  "spawnpoint_audio": "스폰 포인트 오디오",
+  "device_audio": "기기 오디오",
+  "pokemon_timers": "모든 포켓몬 타이머",
+  "show_dex_num_in_popup": "팝업에 도감 번호 표시",
+  "popup": "팝업",
+  "pvp_level": "{{level}} 레벨 PVP 스탯",
+  "pvp_mega": "메가 PVP 스탯",
+  "webhook_entry": "{{name}}에 추가",
+  "remove_webhook_entry": "{{name}}에서 제거",
+  "distance": "거리",
+  "gym": "체육관",
+  "egg": "알",
+  "raid": "레이드",
+  "lure": "루어",
+  "quest": "퀘스트",
+  "invasion": "침공",
+  "nest": "둥지",
+  "pokestop": "포켓스탑",
+  "team": "팀",
+  "global": "글로벌",
+  "manage_webhook": "{{name}} 관리",
+  "drag_and_drop": "마커를 드래그하여 위치 설정",
+  "click_to_select": "선택하려면 클릭",
+  "add_new": "새로운 {{category}} 알림 추가",
+  "my_location": "내 위치",
+  "choose_on_map": "지도에서 선택",
+  "select_profile": "프로필 선택",
+  "distance_radius": "미리보기 반경 거리",
+  "areas": "지역",
+  "select_webhook": "봇 선택",
+  "ar_quest_true": "AR 작업",
+  "ar_quest_false": "AR 없음",
+  "with_ar": "AR 포함",
+  "both": "둘 다",
+  "go_back": "돌아가기",
+  "access": "접근",
+  "link_discord": "디스코드 연결",
+  "select_webhook_strategy": "알림 관리자",
+  "webhook_strategy_success_0": "성공! 알림 설정을 가져오기 위해 새로고침 중...",
+  "register": "등록",
+  "invalid_credentials": "잘못된 자격 증명",
+  "localauth_failed": "인증 실패",
+  "error_creating_user": "현재 새 사용자를 등록할 수 없습니다",
+  "discord_linked": "디스코드 연결됨",
+  "telegram_linked": "텔레그램 연결됨",
+  "level": "레벨",
+  "km": "킬로미터",
+  "feedback": "피드백",
+  "donor_menu": "기부자 메뉴",
+  "pokemon_cell": "포켓몬 위치는 달라질 수 있습니다",
+  "timer_verified": "이 타이머는 검증됨",
+  "timer_unverified": "이 타이머는 미검증",
+  "all": "모두",
+  "badge_0": "없음",
+  "badge_1": "브론즈",
+  "badge_2": "실버",
+  "badge_3": "골드",
+  "gym_badge_menu": "체육관 배지 편집",
+  "gym_badges": "체육관 배지",
+  "gym_badge_diamonds": "체육관 배지 보기",
+  "gym_badges_subtitle": "지도 및 프로필 페이지에 체육관 배지를 표시합니다.",
+  "confirm_filters_reset": "필터 재설정",
+  "filters_reset_text": "기본값으로 설정을 재설정하시겠습니까? 이 작업은 취소할 수 없습니다!",
+  "filters_reset_title": "필터 재설정",
+  "raid_quick_select": "빠른 선택",
+  "disabled": "비활성화됨",
+  "loading": "{{category}} 로드 중",
+  "loading_icons": "아이콘 가져오기",
+  "loading_invasions": "침공 가져오기",
+  "scan_next": "다음 위치 스캔",
+  "scan_next_choose": "마커를 끌어다 놓아 스캔 위치 설정",
+  "scan_zone": "영역 스캔",
+  "scan_zone_choose": "마커를 끌어다 놓아 스캔 위치와 크기 설정",
+  "scan_zone_size": "크기",
+  "scan_zone_range": "범위",
+  "scan_zone_spacing": "간격",
+  "scan_zone_radius": "반경",
+  "scan_requests": "스캔 요청",
+  "scan_queue": "현재 대기열",
+  "click_to_scan": "여기를 스캔하십시오",
+  "scan_confirmed_title": "스캔 요청 확인됨",
+  "scan_confirmed": "작업자가 위치로 보내졌으며, 결과가 곧 지도에 나타납니다!",
+  "scan_loading_title": "스캔 요청 전송 중",
+  "scan_loading": "스캔 요청이 처리되어 시스템으로 전송 중입니다!",
+  "scan_error_title": "오류",
+  "scan_error": "스캔 요청 처리 중 오류가 발생했습니다...",
+  "scan_outside_area": "이 위치는 승인된 영역의 경계를 벗어났습니다",
+  "pvp_ranking_cap": "레벨",
+  "lc_title": "위치 따라가기",
+  "lc_metersUnit": "미터",
+  "lc_feetUnit": "피트",
+  "lc_popup": "이 지점에서 {distance} {unit} 이내에 있습니다",
+  "lc_outsideMapBoundsMsg": "지도 경계를 벗어난 것 같습니다",
+  "no_alerts": "알림 없음",
+  "loading_settings": "설정 로드 중",
+  "refresh_to_continue": "계속하려면 새로고침하세요",
+  "session_expired_title": "세션 만료됨",
+  "session_expired_body": "세션이 만료되었습니다",
+  "old_client_title": "구버전",
+  "old_client_body": "이 지도의 새 버전이 사용 가능합니다",
+  "early_old_client_title": "구버전",
+  "early_old_client_body": "이 앱의 오래된 버전이 브라우저에 캐시될 수 있습니다, 이 앱을 사용하려면 캐시를 지워야 합니다.",
+  "refresh": "새로고침",
+  "points": "포인트",
   "day": "일",
-  "days": "문제가 발생했습니다",
-  "react_error": "아이콘이 클릭 가능합니다",
-  "clickable_icon": "다음까지 2개의 정거장 남음",
-  "two_stops_till_next": "다음까지 1개의 정거장 남음",
-  "one_stop_till_next": "더 이상 체육관이 없습니다",
-  "no_more_gyms": "밝은 지도 경계",
-  "light_map_border": "어두운 지도 경계",
-  "dark_map_border": "셀이 차단되었습니다",
-  "cell_blocked": "POI 색상",
-  "poi_color": "퀘스트 조건",
-  "quest_condition": "항상 레이블 표시",
-  "always_show_labels": "스캔 영역 옵션",
-  "scan_areas_options": "역사적인 희귀성",
-  "historic_rarity": "관심 지점",
-  "poi": "300m 범위",
-  "300m_range": "미끼 범위",
-  "lure_range": "사용자 정의 범위",
-  "custom_range": "전환하려면 탭하세요",
-  "tap_to_toggle": "강화",
-  "power_up": "절대로",
-  "never_alt": "근처에서 본 적 있음",
-  "seen_nearby_stop": "이 셀에서 본 적 있음",
-  "seen_nearby_cell": "미끼 만남",
-  "seen_lure_encounter": "미끼 스폰",
-  "seen_lure_wild": "야생 스폰",
-  "seen_wild": "이벤트 정거장",
-  "event_stops": "이벤트 정거장 타이머",
-  "event_stop_timers": "아무거나",
-  "size_0": "XXS",
-  "size_1": "XS",
-  "size_2": "M",
-  "size_3": "XL",
-  "size_4": "XXL",
-  "size_5": "크기 표시",
-  "show_size_indicator": "크기",
-  "size": "골드 정거장",
-  "gold_stop": "프로필 전환",
-  "profile_backups": "새로운 백업",
-  "new_backup": "생성",
-  "create": "불러오기",
-  "load": "업데이트",
-  "update": "삭제",
-  "delete": "이름",
-  "name": "확인된 것만",
-  "only_confirmed": "로켓 포켓몬",
-  "rocket_pokemon": "허수아비",
-  "decoy": "20,000개 이상의 셀을 생성하려고 시도했습니다 ({{variable_0}})",
-  "s2_cell_limit_0": "모든 PVP 랭크 표시",
-  "show_all_pvp_ranks": "포켓몬 좌표 표시",
-  "enable_pokemon_popup_coords": "체육관 좌표 표시",
-  "enable_gym_popup_coords": "포켓스탑 좌표 표시",
-  "enable_pokestop_popup_coords": "포탈 좌표 표시",
-  "enable_portal_popup_coords": "더 많은 정보를 위해 우리의 디스코드에 참여해주세요.",
-  "on_block_join_discord": "회원으로 인해 차단되었습니다.",
-  "on_block_msg": "거부됨",
-  "denied": "쇼케이스",
-  "showcase": "알 수 없는 이벤트",
-  "unknown_event": "{{time}}초 후에 이용 가능합니다.",
-  "scanner_countdown": "성공",
-  "success": "기여",
-  "contribute": "mi",
-  "mi": "지역별로 필터링",
-  "filter_by_areas": "네스트 이름 제출",
-  "submit_nest_name": "이름 업데이트",
-  "nest_submission_menu": "네스트 제출",
-  "nest_submissions": "새로운 네스트 이름을 제출할 수 있게 해줍니다.",
-  "nest_submissions_subtitle": "동적 포켓몬 투명도",
-  "pokemon_opacity": "동적 침공 투명도",
-  "invasion_opacity": "동적 레이드 투명도",
-  "raid_opacity": "10분 후 투명도",
-  "opacity_ten_minutes": "5분 후 투명도",
-  "opacity_five_minutes": "1분 후 투명도",
-  "opacity_one_minute": "레벨 표시기",
-  "level_circles": "최소 원 레벨",
-  "min_level_circle": "로그인하지 않아 요청이 실패했습니다.",
-  "mutation_auth_error": "제출자",
+  "days": "일",
+  "react_error": "문제가 발생했습니다",
+  "clickable_icon": "클릭 가능한 아이콘",
+  "two_stops_till_next": "다음까지 2 정류장",
+  "one_stop_till_next": "다음까지 1 정류장",
+  "no_more_gyms": "더 이상 체육관 없음",
+  "light_map_border": "밝은 지도 경계",
+  "dark_map_border": "어두운 지도 경계",
+  "cell_blocked": "블록된 셀",
+  "poi_color": "관심 지점 색상",
+  "quest_condition": "퀘스트 조건",
+  "always_show_labels": "항상 레이블 표시",
+  "scan_areas_options": "스캔 영역 옵션",
+  "historic_rarity": "역사적 희귀도",
+  "poi": "관심 지점",
+  "300m_range": "300m 범위",
+  "lure_range": "루어 범위",
+  "custom_range": "사용자 지정 범위",
+  "tap_to_toggle": "터치하여 전환",
+  "power_up": "파워 업",
+  "never_alt": "절대 없음",
+  "seen_nearby_stop": "근처에 포켓스탑에서 발견",
+  "seen_nearby_cell": "이 셀에서 발견",
+  "seen_lure_encounter": "루어 만남",
+  "seen_lure_wild": "루어에서 발생",
+  "seen_wild": "야생 발생",
+  "event_stops": "이벤트 포켓스탑",
+  "event_stop_timers": "이벤트 포켓스탑 타이머",
+  "size_0": "모든",
+  "size_1": "XXS",
+  "size_2": "XS",
+  "size_3": "M",
+  "size_4": "XL",
+  "size_5": "XXL",
+  "show_size_indicator": "크기 지시기 보기",
+  "size": "크기",
+  "gold_stop": "골드 포켓스탑",
+  "profile_backups": "프로필 전환",
+  "new_backup": "새 백업",
+  "create": "생성",
+  "load": "불러오기",
+  "update": "업데이트",
+  "delete": "삭제",
+  "name": "이름",
+  "only_confirmed": "확인된 것만",
+  "rocket_pokemon": "로켓 포켓몬",
+  "decoy": "위장",
+  "s2_cell_limit_0": "20,000개 이상의 셀을 생성하려고 했습니다 ({{variable_0}})",
+  "show_all_pvp_ranks": "모든 PVP 등급 보기",
+  "enable_pokemon_popup_coords": "포켓몬 좌표 보기",
+  "enable_gym_popup_coords": "체육관 좌표 보기",
+  "enable_pokestop_popup_coords": "포켓스탑 좌표 보기",
+  "enable_portal_popup_coords": "포털 좌표 보기",
+  "on_block_join_discord": "더 많은 정보를 위해 우리의 디스코드에 참여해 주세요.",
+  "on_block_msg": "당신은 멤버로 차단되었습니다",
+  "denied": "거절됨",
+  "showcase": "전시",
+  "unknown_event": "알 수 없는 이벤트",
+  "scanner_countdown": "{{time}}초 후 사용 가능",
+  "success": "성공",
+  "contribute": "기여하기",
+  "mi": "마일",
+  "filter_by_areas": "지역별로 필터",
+  "submit_nest_name": "둥지 이름 제출",
+  "nest_submission_menu": "이름 업데이트",
+  "nest_submissions": "둥지 제출",
+  "nest_submissions_subtitle": "둥지에 새 이름을 제출할 수 있습니다",
+  "pokemon_opacity": "동적 포켓몬 불투명도",
+  "invasion_opacity": "동적 침략 불투명도",
+  "raid_opacity": "동적 습격 불투명도",
+  "opacity_ten_minutes": "10분 후 불투명도",
+  "opacity_five_minutes": "5분 후 불투명도",
+  "opacity_one_minute": "1분 후 불투명도",
+  "level_circles": "레벨 지시기",
+  "min_level_circle": "최소 원 레벨",
+  "mutation_auth_error": "로그인하지 않아 요청이 실패했습니다",
   "submitted_by": "제출자",
-  "localauth_failed": "인증 실패",
-  "reversible": "되돌릴 수 있는",
+  "reversible": "되돌릴 수 있음",
   "version": "버전",
-  "route_tags": "노선 태그",
-  "routes": "노선",
-  "route_type": "노선 유형",
-  "routes_subtitle": "게임 내 노선 및 관련 정보를 맵에서 확인하세요.",
+  "route_tags": "경로 태그",
+  "routes": "경로",
+  "route_type": "경로 유형",
+  "routes_subtitle": "지도에서 게임 내 경로와 관련 정보를 봅니다",
   "description": "설명",
   "additional_info": "추가 정보",
-  "duration": "소요 시간",
+  "duration": "지속 시간",
   "elevation": "고도",
   "contest_category_1": "가장 작은 크기",
   "context_category_2": "가장 큰 크기",
   "total_entries": "총 항목",
-  "showcase_rankings": "쇼케이스 순위",
-  "showcase_rankings_subtitle": "포켓스탑의 쇼케이스에 대한 최고 순위 목록을 표시합니다.",
-  "tth": "거리",
-  "tth_0": "전체",
+  "showcase_rankings": "전시 순위 보기",
+  "showcase_rankings_subtitle": "포켓스탑에서 전시의 상위 순위 목록을 표시합니다",
+  "tth": "TTH",
+  "tth_0": "모든",
   "tth_1": "알려진",
   "tth_2": "알 수 없는",
   "no_access": "접근 불가",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "cooldown": "쿨다운",
-  "scan_some_outside_area": "일부 위치가 허용된 경계를 벗어났습니다.",
+  "cooldown": "쿨 다운",
+  "scan_some_outside_area": "일부 위치가 허가된 경계 밖에 있습니다",
   "alerts": "알림",
   "alert_manager": "알림 관리자",
   "menu": "메뉴",
@@ -643,68 +537,182 @@
   "component_donation_page": "기부 페이지",
   "component_message_of_the_day": "오늘의 메시지",
   "download": "다운로드",
-  "playground": "플레이그라운드",
-  "locale": "로캘",
+  "playground": "놀이터",
+  "locale": "로케일",
   "saved": "저장됨",
-  "show_editor": "에디터 보기",
-  "hide_editor": "에디터 숨기기",
-  "reported_error": "이 오류는 식별자로 서버에 보고되었습니다",
+  "show_editor": "편집기 보기",
+  "hide_editor": "편집기 숨기기",
+  "reported_error": "다음 식별자로 서버에 오류가 보고되었습니다",
   "dark_mode": "다크 모드",
-  "load_from_autosave": "자동 저장에서 불러오기",
+  "load_from_autosave": "자동저장에서 불러오기",
   "done": "완료",
-  "fast": "빠른",
-  "charged": "충전된",
+  "fast": "속공",
+  "charged": "충전기",
   "offline_mode": "오프라인 모드",
-  "include_sponsored": "스폰서 포함하기",
+  "include_sponsored": "스폰서 포함",
   "showcase_color": "쇼케이스 색상",
   "partner_color": "파트너 색상",
-  "disable": "{{- name}} 비활성화하기",
-  "profiling": "프로필링",
+  "disable": "{{- name}} 비활성화",
+  "profiling": "프로파일링",
   "showcase_block": "쇼케이스로 인해 차단됨",
-  "signed_in_as": "로그인한 사용자",
-  "missing_map_perm": "맵을 볼 권한이 없습니다.",
-  "pokemon_audio": "포켓몬 오디오",
-  "pokestop_audio": "포켓스탑 오디오",
-  "gym_audio": "체육관 오디오",
-  "team_audio": "팀 오디오",
-  "egg_audio": "알 오디오",
-  "raid_audio": "레이드 오디오",
-  "nest_audio": "네스트 오디오",
-  "reward_audio": "보상 오디오",
-  "type_audio": "타입 오디오",
-  "weather_audio": "날씨 오디오",
-  "misc_audio": "기타 오디오",
-  "invasion_audio": "침입 오디오",
-  "spawnpoint_audio": "스폰지점 오디오",
-  "device_audio": "장치 오디오",
-  "access_denied": "접근이 거부되었습니다",
+  "signed_in_as": "다음 계정으로 로그인됨",
+  "missing_map_perm": "지도를 보는 권한이 없습니다.",
+  "access_denied": "접근 거부됨",
   "audio": "오디오",
-  "desktop_notifications": "데스크톱 알림",
+  "desktop_notifications": "데스크탑 알림",
   "notifications_options": "알림 옵션",
   "audio_always_on": "오디오 항상 재생",
   "volume_level": "음량 레벨",
   "notifications_status": "알림 상태",
   "granted": "허용됨",
-  "global_search_invasions": "그룬트 유형, 이름 또는 포켓몬 보상 이름을 입력하세요...",
-  "set_all": "모두 설정",
+  "set_all": "전체 설정",
   "set_filtered": "필터 설정",
-  "only_show_available": "사용 가능한 것만 표시",
+  "only_show_available": "이용 가능한 것만 보기",
   "easy_mode": "쉬운 모드",
-  "quick_select": "전체 퀵 선택",
+  "quick_select": "전역 빠른 선택",
   "pokemon_filter_mode": "포켓몬 필터 모드",
   "basic": "기본",
-  "intermediate": "중간",
+  "intermediate": "중급",
   "expert": "고급",
-  "basic_description": "포켓몬을 쉽게 선택하고 전체 필터를 적용합니다",
-  "intermediate_description": "전역적으로 및 각 포켓몬별로 개별 필터를 설정합니다 (전통 방식)",
-  "expert_description": "가장 많은 사용자 정의를 위한 수동 입력 쿼리",
+  "basic_description": "포켓몬을 쉽게 선택하고 전역 필터 적용",
+  "intermediate_description": "전역 및 개별 포켓몬별로 개별 필터 설정 (전통적)",
+  "expert_description": "최대한 사용자 정의를 위한 수동 입력 쿼리",
   "icon_size": "아이콘 크기",
   "developer": "개발자",
-  "raid_override": "레이드 재설정",
-  "search_rocket_pokemon": "로켓 포켓몬 검색",
+  "raid_override": "레이드 오버라이드",
+  "search_rocket_pokemon": "로켓포켓몬 검색",
   "main": "메인",
   "extra": "추가",
   "select": "선택",
   "searching": "검색 중...",
-  "no_options": "옵션이 없습니다..."
+  "no_options": "옵션 없음...",
+  "and": "AND",
+  "or": "OR",
+  "only_global": "전역만",
+  "global_caption": "다른 모든 필터 무시",
+  "global_and_individual": "전역 & 개별 필터",
+  "gender_filters_all": "성별 모두에 적용",
+  "and_caption": "함께 연결됨",
+  "or_caption": "독립적으로 필터링",
+  "filter_help": "필터 도움말",
+  "kilometers": "킬로미터",
+  "miles": "마일",
+  "distance_unit": "거리 단위",
+  "data_management": "데이터 관리",
+  "reset_or_manage_text": "필터를 강제로 재설정하거나 데이터 관리 페이지를 방문해 개별 카테고리를 재설정할 수 있습니다.",
+  "reset_audio": "오디오 재설정",
+  "reset_all": "모두 재설정",
+  "reset_icons": "아이콘 재설정",
+  "reset_position": "위치 재설정",
+  "reset_ui": "UI 재설정",
+  "reset_options": "옵션 재설정",
+  "reset_menus": "메뉴 재설정",
+  "reset_settings": "설정 재설정",
+  "reset_general_title": "일반",
+  "reset_filters_title": "필터",
+  "reset_assets": "자산 재설정",
+  "reset_pokemon": "포켓몬 재설정",
+  "reset_pokestops": "포켓스탑 재설정",
+  "reset_gyms": "체육관 재설정",
+  "reset_nests": "둥지 재설정",
+  "reset_portals": "포털 재설정",
+  "reset_routes": "경로 재설정",
+  "reset_scan_areas": "스캔 영역 재설정",
+  "reset_scan_cells": "스캔 셀 재설정",
+  "reset_devices": "장치 재설정",
+  "reset_weather": "날씨 재설정",
+  "reset_s2cells": "S2 셀 재설정",
+  "reset_spawnpoints": "출현 지점 재설정",
+  "reset_submission_cells": "제출 셀 재설정",
+  "hisuian": "히스이안",
+  "spacial_rend_range": "시공의 렌즈 범위",
+  "without_ar": "AR 없음",
+  "exclude_quest_multi": "{{reward}} 제외",
+  "cluster_limit_0": "{{variable_0}} 제한 ({{variable_1}}) 도달",
+  "cluster_limit_1": "확대하거나 필터를 좁혀주세요",
+  "show_polygons": "폴리곤 표시",
+  "exclude_invasion_multi": "{{invasion}} 제외",
+  "stardust": "별의모래",
+  "slider_cp": "CP",
+  "pvp_ranking_league": "리그",
+  "pvp_ranking_min_cp": "최소 CP",
+  "slider_pvp": "순위",
+  "profile_no": "프로필",
+  "template": "템플릿",
+  "gender": "성별",
+  "clean": "정리",
+  "all_forms": "모든 형태",
+  "pvp_entry": "PVP 등록",
+  "no_iv": "IV 없음 포함",
+  "by_distance": "거리별",
+  "min_time": "최소 시간",
+  "add_new_profile": "새 프로필 추가",
+  "slider_none": "없음",
+  "non_registered_human_title": "이런, 문제가 생겼어요!",
+  "non_registered_human_desc": "{{webhook}}에 등록되지 않았을 수 있습니다\n또는 서버에 접근할 수 없습니다",
+  "try_again_later": "나중에 다시 시도해주세요",
+  "selected_areas_one": "{{count}} 지역 선택됨",
+  "selected_areas_other": "{{count}} 지역 선택됨",
+  "webhook_selection": "{{name}} 선택",
+  "message_of_the_day": "오늘의 메시지",
+  "has_quest_indicator": "퀘스트가 있는 포켓스탑에 대한 대체 색상",
+  "show_ar_badge": "AR 배지 표시",
+  "all_gyms": "모든 체육관",
+  "general": "일반",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "선택된 것에 전역 적용",
+  "normal_forms": "일반 형태",
+  "weather_indicator": "날씨 부스트 지시기",
+  "page": "페이지 {{page}}",
+  "navigation_controls": "내비게이션 컨트롤",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
+  "exclusive": "독점",
+  "all_moves": "모든 기술",
+  "move": "기술",
+  "any": "아무것도",
+  "min_spawn_average": "최소 출현률",
+  "select_all": "모두 선택",
+  "delete_all": "선택한 것 삭제",
+  "cancel": "취소",
+  "day_1": "월요일",
+  "day_2": "화요일",
+  "day_3": "수요일",
+  "day_4": "목요일",
+  "day_5": "금요일",
+  "day_6": "토요일",
+  "day_7": "일요일",
+  "profile_name": "프로필 이름",
+  "manage_profiles": "프로필 관리",
+  "min_spawn_avg": "평균 최소 출현률",
+  "poke_global": "모든 것",
+  "amount": "수량",
+  "specific_gym": "특정 체육관",
+  "search_location": "위치 검색",
+  "search_specific": "특정 {{category}} 검색",
+  "webhook_success_gym": "레이드, 알, 팀 변경 알림이 추가되었습니다!",
+  "slot_changes": "슬롯 변경",
+  "slot_changes_poracle": "슬롯 변경",
+  "confirm_delete": "이 프로필의 모든 추적을 삭제합니다, 확실합니까?",
+  "confirm_copy": "\"{{profile}}\" 프로필을 어느 프로필에 복사할지 선택하세요, 이 작업은 해당 프로필을 전체적으로 덮어씁니다.",
+  "webhook_error": "{{name}}이(가) 처리할 수 없습니다.\n나중에 다시 시도해주세요.",
+  "profile_error": "고유하고 유효해야 합니다",
+  "team_0": "하모니",
+  "battle_changes": "배틀 변화",
+  "battle_changes_poracle": "배틀 변화",
+  "auto": "자동",
+  "webhooks_subtitle": "이 봇들을 위한 알림을 지도에서 직접 관리하세요",
+  "event_stops_subtitle": "Kecleon과 같은 특별 이벤트 포켓스탑 표시",
+  "webhooks": "알림",
+  "scanner": "스캐너 작업",
+  "everything_individually": "개별 알림 추가",
+  "individually": "개별적으로",
+  "join": "참여하기",
+  "errors_404": "이런, 페이지를 찾을 수 없습니다!",
+  "errors_500": "서버 오류가 발생했습니다, 다시 시도해주세요!",
+  "local_username": "사용자 이름",
+  "local_password": "비밀번호",
+  "local_error": "오류가 발생했습니다, 다시 시도해주세요!",
+  "no_filter_results": "결과 없음\n필터를 넓혀보세요",
+  "donor_page": "기부 페이지"
 }
diff --git a/packages/locales/lib/generated/nl.json b/packages/locales/lib/generated/nl.json
index 391a94e4f..c3ae62cb7 100644
--- a/packages/locales/lib/generated/nl.json
+++ b/packages/locales/lib/generated/nl.json
@@ -1,372 +1,410 @@
 {
-  "login": "Login",
-  "click_once": "Klik maar één keer op 'Autoriseren'",
+  "login": "Inloggen",
+  "click_once": "Klik slechts één keer op 'Autoriseren'",
   "save": "Opslaan",
   "reset": "Resetten",
   "close": "Sluiten",
   "reset_filters": "Filters Resetten",
-  "pokemon_filters": "Pokémon Filter Instellingen",
-  "gyms_filters": "Gym Filter Instellingen",
-  "pokestops_filters": "PokéStop Filter Instellingen",
-  "nests_filters": "Nest Filter Instellingen",
-  "help": "Help",
-  "apply_to_all": "Toepassen op alles",
+  "pokemon_filters": "Pokémon Filterinstellingen",
+  "gyms_filters": "Gym Filterinstellingen",
+  "pokestops_filters": "PokéStop Filterinstellingen",
+  "nests_filters": "Nest Filterinstellingen",
+  "help": "Hulp",
+  "apply_to_all": "Op Alles Toepassen",
   "disable_all": "Alles Uitschakelen",
   "enable_all": "Alles Inschakelen",
-  "enabled": "Inschakelen",
+  "enabled": "Ingeschakeld",
   "legacy": "Legacy",
   "id": "ID",
   "location": "Locatie",
   "search_pokemon": "Zoek Pokémon",
-  "search_nests": "Zoek Nests",
+  "search_nests": "Zoek Nesten",
   "search_gyms": "Zoek Gyms",
   "search_pokestops": "Zoek PokéStops",
+  "search_raids": "Zoek Raids",
+  "search_eggs": "Zoek Eieren",
+  "search_quests": "Zoek Quests",
+  "search_lures": "Zoek Lures",
+  "search_invasions": "Zoek Invasies",
   "sm": "sm",
   "md": "md",
   "lg": "lg",
   "xl": "XL",
   "min": "Min",
   "max": "Max",
-  "set_size": "Set Icon Size",
+  "set_size": "Icoonmaat Instellen",
   "slot_selection": "Slotselectie",
   "generations": "Generaties",
-  "types": "Soorten",
-  "forms": "Forms",
-  "rarity": "Rarity",
-  "others": "Andere",
+  "types": "Typen",
+  "forms": "Vormen",
+  "rarity": "Huidige Zeldzaamheid",
+  "others": "Overige",
   "categories": "Categorieën",
-  "rank": "Rank",
-  "slider_iv": "IV Range",
-  "slider_great": "Great League",
-  "slider_ultra": "Ultra League",
-  "slider_little": "Little Cup",
-  "slider_atk_iv": "Attack",
-  "slider_def_iv": "Defense",
-  "slider_sta_iv": "Stamina",
-  "slider_level": "Level",
+  "rank": "Rang",
+  "slider_iv": "IV Bereik",
+  "slider_great": "Grote Liga",
+  "slider_ultra": "Ultra Liga",
+  "slider_little": "Kleine Beker",
+  "slider_atk_iv": "Aanval",
+  "slider_def_iv": "Verdediging",
+  "slider_sta_iv": "Uithoudingsvermogen",
+  "slider_level": "Niveau",
+  "slider_size": "Grootte",
   "abbreviation_level": "L",
-  "lvl": "Lvl",
-  "cap": "Cap",
+  "lvl": "Niv",
+  "cap": "Limiet",
   "custom": "Aangepast",
   "valid": "Geldig",
   "invalid": "Ongeldig!",
   "overwrites": "Overschrijft Alle Filters",
   "valid_filter": "Geldige Statistiekenfilter",
-  "invalid_filter": "Voer een geldig filter in",
+  "invalid_filter": "Voer een Geldige Filter in",
   "gyms": "Gyms",
-  "nests": "Nests",
+  "nests": "Nesten",
   "pokestops": "PokéStops",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
   "scan_areas": "Scan Gebieden",
+  "s2cells": "S2 Cellen",
   "weather": "Weer",
-  "admin": "Admin",
+  "admin": "Beheer",
   "settings": "Instellingen",
   "advanced": "Geavanceerd",
-  "tile_servers": "Tile Servers",
-  "icons": "Icons",
+  "tile_servers": "Tegelservers",
+  "icons": "Iconen",
   "navigation": "Navigatie",
-  "drawer": "Drawer",
+  "drawer": "Lade",
   "tile_servers_default": "Standaard",
   "drawer_temporary": "Tijdelijk",
-  "drawer_persistent": "Persistent",
-  "locale_selection": "Taalinstellingen",
+  "drawer_persistent": "Blijvend",
+  "locale_selection": "Taalkeuze",
   "import": "Importeren",
   "export": "Exporteren",
   "logout": "Uitloggen",
-  "local_storage_cleared": "Lokale opslag van de map is gewist!",
-  "iv_or_filter": "IV Of Filter",
-  "polygons": "Polygons",
+  "local_storage_cleared": "Lokale opslag is geleegd!",
+  "iv_or_filter": "IV OF Filter",
+  "polygons": "Polygonen",
   "raids": "Raids",
-  "ex_eligible": "EX Eligible",
-  "in_battle": "In Battle",
+  "ex_eligible": "EX Geschikt",
+  "in_battle": "In Gevecht",
   "all_pokestops": "Alle PokéStops",
-  "lures": "Lures",
+  "lures": "Lokkertjes",
   "quests": "Quests",
-  "invasions": "Invasions",
-  "portals": "Portals",
-  "submission_cells": "Submission Cells",
+  "invasions": "Invasies",
+  "portals": "Portalen",
+  "submission_cells": "Indieningscellen",
   "spawnpoint": "Spawnpoint",
   "spawnpoints": "Spawnpoints",
-  "s2_cell_level": "Level {{level}} S2 Cell",
-  "total_count": "Totaal",
-  "next_submission": "Volgende Inzending!",
+  "s2_cell_level": "Niveau {{level}} S2 Cel",
+  "total_count": "Totaal Aantal",
+  "next_submission": "Volgende Indiening!",
   "never": "Nooit",
   "next_gym": "Volgende Gym",
-  "scan_cells": "S2 Cells",
+  "scan_cells": "Scan Cellen",
   "devices": "Apparaten",
   "use_my_location": "Gebruik Mijn Locatie",
-  "submit_feedback_title": "Feedback/Bug Rapport Indienen",
-  "use_the_link_below": "U kunt de onderstaande link gebruiken om feedback of eventuele bugs die u bent tegengekomen in te dienen.",
+  "submit_feedback_title": "Feedback/Fout Rapporteren",
+  "use_the_link_below": "Je kunt de onderstaande link gebruiken om feedback of eventuele bugs die je tegenkomt in te dienen.",
   "feedback_to_devs": "Deze feedback wordt rechtstreeks naar de ontwikkelaars gestuurd.",
-  "feedback_form": "Feedback formulier",
+  "feedback_form": "Feedbackformulier",
   "unknown_pokestop": "Onbekende PokéStop Naam",
   "unknown_gym": "Onbekende Gym Naam",
   "exclude": "Uitsluiten",
-  "exclude_quest": "Uitsluiten Quest",
-  "exclude_invasion": "Uitsluiten Invasion",
-  "exclude_team": "Uitsluiten Team",
-  "exclude_raid": "Uitsluiten Raid",
-  "exclude_lure": "Uitsluiten Lure",
+  "exclude_quest": "Sluit Quest Uit",
+  "exclude_invasion": "Sluit Invasie Uit",
+  "exclude_team": "Sluit Team Uit",
+  "exclude_raid": "Sluit Raid Uit",
+  "exclude_lure": "Sluit Lokmiddel Uit",
   "timer": "Timer",
   "hide": "Verbergen",
-  "tier": "Tier",
+  "tier": "Niveau",
   "slots": "Slots",
   "mega": "Mega",
-  "form": "Form",
+  "form": "Vorm",
   "starts": "Begint",
   "ends": "Eindigt",
-  "defender": "Defender",
+  "defender": "Verdediger",
   "cp": "CP",
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "Totale CP",
-  "first_seen": "Eerst gezien",
-  "last_seen": "Laatst gezien",
-  "last_modified": "Laatst Aangepast",
+  "first_seen": "Eerst Gezien",
+  "last_seen": "Laatst Gezien",
+  "last_modified": "Laatst Gewijzigd",
   "last_updated": "Laatst Bijgewerkt",
   "imported": "Geïmporteerd",
-  "nest_estimated": "Nest Gegevens zijn geschat!",
-  "verify_nests": "Gecontroleerd door huidige spawns te controleren",
-  "nest_out_of_date": "Nest is mogelijk verouderd!",
-  "nest_check_current": "Controleer in plaats daarvan de huidige spawns",
-  "spawns_per_hour": "spawns/hr",
+  "nest_estimated": "Nest Gegevens Geschat!",
+  "verify_nests": "Verifieer door Huidige Spawns te Controleren",
+  "nest_out_of_date": "Nest is Mogelijk Verouderd!",
+  "nest_check_current": "Controleer Huidige Spawns in Plaats",
+  "spawns_per_hour": "Per Uur",
   "teams": "Teams",
-  "eggs": "Eggs",
-  "reverse": "Omgekeerd",
-  "selected": "Geselecteerde",
-  "unselected": "Niet Geselecteerde",
+  "eggs": "Eieren",
+  "reverse": "Omkeren",
+  "selected": "Geselecteerd",
+  "unselected": "Niet Geselecteerd",
   "only_available": "Beschikbaar",
-  "common": "Common",
-  "uncommon": "Uncommen",
-  "rare": "Rare",
-  "ultra_rare": "Ultra Rare",
+  "common": "Gemeenschappelijk",
+  "uncommon": "Ongebruikelijk",
+  "rare": "Zeldzaam",
+  "ultra_rare": "Ultra Zeldzaam",
   "regional": "Regionaal",
-  "event": "Event",
-  "legendary": "Legendary",
-  "mythical": "Mythical",
-  "alt_forms": "Alt Forms",
+  "event": "Evenement",
+  "legendary": "Legendarisch",
+  "mythical": "Mythisch",
+  "ultra_beast": "Ultra Beest",
+  "alt_forms": "Alternatieve Vormen",
   "alola": "Alola",
   "galarian": "Galarian",
-  "showing": "Showing",
-  "instance": "Instance",
+  "showing": "Tonen",
+  "instance": "Instantie",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Boosted Types",
+  "boosted_types": "Versterkte Types",
   "pokemon_options": "Pokémon Opties",
   "pokestops_options": "PokéStop Opties",
   "gyms_options": "Gym Opties",
   "nests_options": "Nest Opties",
   "wayfarer_options": "Wayfarer Opties",
   "admin_options": "Admin Opties",
-  "clustering": "Clustering",
-  "glow": "Glow",
-  "legacy_filter": "Legacy Filter",
+  "weather_options": "Weer Opties",
+  "s2cells_options": "S2 Celle Opties",
+  "clustering": "Clusteren",
+  "glow": "Gloeien",
+  "legacy_filter": "Oude Filter",
   "raid_timers": "Alle Raid Timers",
-  "invasion_timers": "Toon alle Invasion Timers",
-  "lure_timers": "Toon alle Lure Timers",
+  "invasion_timers": "Alle Invasie Timers",
+  "lure_timers": "Alle Lokmiddel Timers",
   "device_path_color": "Apparaat Pad Kleur",
-  "old_portals": "Oude Portalen",
-  "new_portals": "Nieuw Portalen",
+  "old_portals": "Oude Portals",
+  "new_portals": "Nieuwe Portals",
   "items": "Items",
-  "energy": "Energy",
-  "ar_eligible": "AR Eligible",
+  "energy": "Energie",
+  "ar_eligible": "AR Geschikt",
   "iv_circles": "IV Indicatoren",
-  "min_iv_circle": "Minimale cirkel IV",
-  "interaction_ranges": "Interaction Ranges",
-  "cannot_connect": "\nKan momenteel geen verbinding maken met de server.\nOnmiddellijk opnieuw proberen zal alleen maar meer problemen veroorzaken.\nProbeer het over een paar minuten opnieuw.\n\n- Bedank namens de Admin",
+  "min_iv_circle": "Minimum Cirkel IV",
+  "interaction_ranges": "Interactie Bereiken",
+  "cannot_connect": "\nKan op dit moment niet verbinden met de server.\nOnmiddellijk opnieuw proberen zal alleen maar meer problemen veroorzaken.\nProbeer het over een paar minuten opnieuw.\n\n- Map Admin Team",
   "mad_quest_text": "Native Quests",
   "xs": "XS",
   "primary": "Primair",
   "secondary": "Secundair",
   "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
-  "open_menu": "Open Menu",
-  "zoom_in": "Inzomen",
-  "zoom_out": "Uitzomen",
+  "open_menu": "Menu Openen",
+  "zoom_in": "Inzoomen",
+  "zoom_out": "Uitzoomen",
   "welcome": "Welkom bij",
   "back": "Terug",
   "next": "Volgende",
-  "finish": "Finish",
+  "finish": "Voltooien",
   "start_tutorial": "Start Tutorial",
-  "view_profile": "Profiel bekijken",
-  "login_optional": "Inloggen (optioneel)",
+  "view_profile": "Bekijk Profiel",
+  "login_optional": "Inloggen (Optioneel)",
   "tutorial": "Tutorial",
-  "tutorial_language": "Kies je taal",
-  "tutorial_welcome": "Deze tutorial is interactief en het wordt aangeraden om met alle opties te spelen.",
-  "tutorial_categories": "Categorieën waartoe je toegang heeft.",
-  "tutorial_logged_in": "Je kunt details over je machtigingen bekijken door je profiel te bekijken.",
-  "tutorial_logged_out": "Je kunt details over je machtigingen bekijken door in te loggen.",
-  "tutorial_sidebar_0": "Alle filters en instellingen die beschikbaar zijn staan hier.",
-  "tutorial_sidebar_1": "Het is mogelijk om elke categorie precies in te stellen welke informatie je wilt zien met behulp van de schakelaars.",
-  "tutorial_sidebar_2": "Opties: Extra aanpassingen\nGeavanceerd: zullen we later in deze tutorial behandelen.",
-  "tutorial_sliders_0": "Gebruik de schuifregelaars om filters aan te passen.",
+  "tutorial_language": "Kies Uw Taal",
+  "tutorial_welcome": "Deze tutorial is interactief en het wordt sterk aangeraden om met alle geboden opties te spelen",
+  "tutorial_categories": "Categorieën Waartoe U Toegang Heeft",
+  "tutorial_logged_in": "U kunt details over uw permissies bekijken door uw profiel te bekijken.",
+  "tutorial_logged_out": "U kunt details over uw permissies bekijken door in te loggen.",
+  "tutorial_sidebar_0": "Al Uw Filters & Instellingen Leven Hier",
+  "tutorial_sidebar_1": "Voor elke categorie kunt u precies bepalen welke gegevens u wilt zien met de schakelaars",
+  "tutorial_sidebar_2": "Opties: Aanvullende aanpassingen\nGeavanceerd: Dit behandelen we later in deze tutorial",
+  "tutorial_sliders_0": "Gebruik schuifregelaars om filters aan te passen",
   "tutorial_sliders_1": "Pokémon Tussen:",
-  "tutorial_sliders_2": "- IVs {{iv0}}% naar {{iv1}}%",
-  "tutorial_sliders_3": "Level {{level0}} naar {{level1}}",
-  "tutorial_sliders_3alt": "- En is Level {{level0}} naar {{level1}}",
-  "tutorial_sliders_4": "- Great League Rank {{gl0}} naar {{gl1}}",
-  "tutorial_sliders_4alt": "- Of Great League Rank {{gl0}} naar {{gl1}}",
-  "tutorial_sliders_5": "- Ultra League Rank {{ul0}} naar {{ul1}}",
-  "tutorial_sliders_5alt": "- Of Ultra League Rank {{ul0}} naar {{ul1}}",
-  "tutorial_sliders_6": "Kettingen met andere van dezelfde kleur.",
-  "tutorial_sliders_7": "Filtert afzonderlijk van andere schuifregelaars.",
+  "tutorial_sliders_2": "- IV's {{iv0}}% tot {{iv1}}%",
+  "tutorial_sliders_3": "Level {{level0}} tot {{level1}}",
+  "tutorial_sliders_3alt": "- EN is Level {{level0}} tot {{level1}}",
+  "tutorial_sliders_4": "- Great League Rang {{gl0}} tot {{gl1}}",
+  "tutorial_sliders_4alt": "- OF Great League Rang {{gl0}} tot {{gl1}}",
+  "tutorial_sliders_5": "- Ultra League Rang {{ul0}} tot {{ul1}}",
+  "tutorial_sliders_5alt": "- OF Ultra League Rang {{ul0}} tot {{ul1}}",
+  "tutorial_sliders_6": "Combineert met andere van dezelfde kleur",
+  "tutorial_sliders_7": "Filtert afzonderlijk van andere schuifregelaars",
   "tutorial_sliders_8": "Een 'volle' schuifregelaar betekent dat deze is uitgeschakeld:",
-  "tutorial_sliders_9": "Alle spawns, ongeacht  of de IV gecontroleerd is of niet.",
-  "tutorial_help": "Snelkoppeling naar dit menu.",
-  "tutorial_adv_filter": "Alleen mobiel, opent de filteropties voor het geavanceerde menu.",
-  "tutorial_tune": "Stelt het geavanceerde filter in voor alle Pokémon die momenteel in het menu worden gefilterd.",
-  "tutorial_format_size": "Stelt de pictogramgrootte in voor alle items die momenteel in het menu worden gefilterd.",
-  "tutorial_check": "Schakelt alle items in die momenteel in het menu worden gefilterd",
-  "tutorial_clear": "Schakelt alle items uit die momenteel in het menu worden gefilterd",
+  "tutorial_sliders_9": "Alle spawns, ongeacht of deze op IV zijn gecontroleerd of niet",
+  "tutorial_help": "Snelkoppeling naar dit menu",
+  "tutorial_adv_filter": "Alleen mobiel, opent de filteropties voor het geavanceerde menu",
+  "tutorial_tune": "Stelt de geavanceerde filter in voor alle Pokémon die momenteel worden gefilterd in het menu",
+  "tutorial_format_size": "Stelt de pictogramgrootte in voor alle items die momenteel worden gefilterd in het menu",
+  "tutorial_check": "Schakelt alle items in die momenteel worden gefilterd in het menu",
+  "tutorial_clear": "Schakelt alle items uit die momenteel worden gefilterd in het menu",
   "tutorial_save": "Slaat de huidige selectie op en sluit af",
-  "tutorial_show_all_view": "Toon PokéStops & Gyms",
-  "tutorial_show_pokemon_view": "Toon Pokémon In",
-  "tutorial_toggle": "Als je op de Check/X klikt, wordt het item omgeschakeld",
-  "tutorial_pokemon_caption": "Met dit pictogram kun je filters instellen voor die specifieke Pokémon.",
-  "tutorial_all_caption": "Teams hebben een speciaal slotmenu\nMet alle andere items kun je de pictogramgrootte aanpassen.",
+  "tutorial_show_all_view": "Schakel PokéStops & Gyms in/uit",
+  "tutorial_show_pokemon_view": "Schakel Pokémon in/uit",
+  "tutorial_toggle": "Klikken op het vinkje/kruisje schakelt het item in/uit",
+  "tutorial_pokemon_caption": "Dit pictogram laat je filters instellen voor die specifieke Pokémon",
+  "tutorial_all_caption": "Teams hebben een speciaal slotsmenu\nAlle andere items laten je de pictogramgrootte aanpassen",
   "tutorial_popup_0": "Pop-ups zijn nu interactief!",
-  "tutorial_popup_1": "De drie stippen openen de opties voor verbergen, uitsluiten en schakelen tussen timers.",
-  "tutorial_popup_2": "Pictogrammen aan weerszijden van de navigatielink worden uitgevouwen om extra informatie weer te geven, probeer het eens!",
-  "tutorial_popup_3": "De pictogrammen verschillen per categorie, zorg ervoor dat u ze allemaal bekijkt.",
-  "tutorial_closing_0": "Extra informatie",
-  "tutorial_closing_1": "De globale Pokémon-schuifregelaars in de zijbalk werken afzonderlijk van het geavanceerde menu en hebben geen effect op elkaar.",
-  "tutorial_closing_2": "Zorg ervoor dat je de gedeelte Instellingen in de zijbalk bekijkt.",
-  "tutorial_closing_3": "Er zijn veel esthetische opties beschikbaar voor elke categorie, maar onthoud dat hoe meer je aan je kaart toevoegt, hoe groter de kans dat je kaart langzamer wordt!",
-  "tutorial_closing_4": "Je kunt deze tutorial opnieuw bekijken door deze te selecteren in het instellingenpaneel in de zijbalk.",
-  "tutorial_closing_5": "Blijf veilig en veel geluk!",
-  "intro": "Introductie",
-  "sidebar": "Sidebar",
+  "tutorial_popup_1": "De drie puntjes openen de opties voor verbergen, uitsluiten en de timer in-/uitschakelen",
+  "tutorial_popup_2": "Pictogrammen aan weerszijden van de navigatielink worden uitgebreid om extra informatie te tonen, probeer het eens!",
+  "tutorial_popup_3": "De pictogrammen variëren per categorie, zorg ervoor dat je ze allemaal bekijkt",
+  "tutorial_closing_0": "Aanvullende info",
+  "tutorial_closing_1": "De globale Pokémon schuifregelaars in de zijbalk werken afzonderlijk van het geavanceerde menu en hebben geen invloed op elkaar",
+  "tutorial_closing_2": "Zorg ervoor dat je het instellingengedeelte in de zijbalk bekijkt",
+  "tutorial_closing_3": "Er zijn veel esthetische opties beschikbaar voor elke categorie, maar houd er rekening mee dat hoe meer je aan je kaart toevoegt, hoe groter de kans dat je kaart vastloopt",
+  "tutorial_closing_4": "Je kunt deze tutorial opnieuw bekijken door deze te selecteren in het instellingenpaneel in de zijbalk",
+  "tutorial_closing_5": "Blijf veilig en succes!",
+  "intro": "Intro",
+  "sidebar": "Zijbalk",
   "sliders": "Schuifregelaars",
-  "popups": "Popups",
-  "closing": "Sluitend",
+  "popups": "Pop-ups",
+  "closing": "Afsluiten",
   "shortcuts": "Sneltoetsen",
   "iv": "IV",
   "area_restrictions": "Gebiedsbeperkingen",
-  "map": "Map",
+  "map": "Kaart",
   "stats": "Statistieken",
   "pvp": "PVP",
-  "area_restrictions_subtitle": "U heeft toegang tot deze gebieden",
+  "area_restrictions_subtitle": "Je hebt toegang tot deze gebieden",
   "devices_subtitle": "Toont actieve apparaatlocaties en routes",
-  "gyms_subtitle": "Toont alle actieve gyms, actieve team en hoeveel slots elke gym beschikbaar heeft",
-  "invasions_subtitle": "Toon informatie over de Team Rocket invasion, inclusief battle lineup, vervaltijd en mogelijke beloningen.",
-  "iv_subtitle": "Toon IV% en gloed opties",
-  "lures_subtitle": "Toont informatie over het Lure, inclusief het type Lure en de vervaltijd",
+  "gyms_subtitle": "Toont alle actieve gymlocaties, actief team en hoeveel slots elke gym beschikbaar heeft",
+  "invasions_subtitle": "Toont Team Rocket invasie info, inclusief gevechtsopstelling, verlooptijd en mogelijke beloningen",
+  "iv_subtitle": "Toont IV% en glow opties",
+  "lures_subtitle": "Toont lure info, inclusief luretype en verlooptijd",
   "map_subtitle": "Toont de kaart",
-  "nests_subtitle": "Toont actief nestelende Pokémon en  polygons",
-  "pokemon_subtitle": "Toont alle Pokémon-locaties en vervaltijden",
-  "pokestops_subtitle": "Toont alle PokéStop-locaties",
-  "portals_subtitle": "Toont all Ingress Portalen",
-  "pvp_subtitle": "Toont PVP rank/CP/Level informatie voor elke Pokémon",
-  "quests_subtitle": "Toont quest reward en task informatie",
-  "raids_subtitle": "Toont alle raid informatie inclusief de raid boss, eggs, vervaltijd, en moveset",
-  "scan_cells_subtitle": "Toont de laatste tijd een S2 cell was bijgewerkt door een scanner.",
-  "scan_areas_subtitle": "Toont beschikbare scan gebieden polygons",
-  "spawnpoints_subtitle": "Toont spawnpoints en hun geschatte despawntijd",
-  "stats_subtitle": "Toont Pokémon Statistieken en levels",
-  "submission_cells_subtitle": "Toont informatie die nuttig is voor het indienen van nieuwe POIs",
-  "weather_subtitle": "Toont op de map de weersinformatie voor elke cel",
-  "user_profile": "Gebruiker Profiel",
-  "candy": "Candy",
+  "nests_subtitle": "Toont actief nestelende Pokémon en nestpolygons",
+  "pokemon_subtitle": "Toont alle Pokémonlocaties en verlooptijden",
+  "pokestops_subtitle": "Toont alle PokéStop locaties",
+  "portals_subtitle": "Toont alle Ingress portals",
+  "pvp_subtitle": "Toont PVP rang/CP/Level info voor elke Pokémon",
+  "quests_subtitle": "Toont informatie over quest beloningen en taken",
+  "raids_subtitle": "Toont alle raid informatie inclusief de raid baas, eieren, verlooptijd en moveset",
+  "scan_cells_subtitle": "Toont de laatste keer dat een S2 cel gescand werd door een apparaat",
+  "scan_areas_subtitle": "Toont beschikbare scan gebieden polygonen",
+  "spawnpoints_subtitle": "Toont spawnpoints en hun geschatte verdwijntijd",
+  "stats_subtitle": "Toont Pokémon statistieken en niveaus",
+  "submission_cells_subtitle": "Toont nuttige informatie voor het indienen van nieuwe POI's",
+  "weather_subtitle": "Toont in-game weer info voor elke cel",
+  "scanner_subtitle": "Interacteer direct met de scanner op verschillende manieren",
+  "s2cells_subtitle": "Toont S2 Cellen op verschillende niveaus op de kaart",
+  "backups_subtitle": "Maakt het mogelijk om instellingen over apparaten heen te back-uppen en te laden",
+  "backups": "Back-ups",
+  "user_profile": "Gebruikersprofiel",
+  "user_username": "Gebruikersnaam",
+  "candy": "Snoepjes",
   "show_ex_badge": "Toon EX Badge",
   "search": "Zoeken",
-  "global_search_quests": "Voer de naam van de Reward in...",
-  "global_search_pokestops": "Voer de naam van de PokéStop in...",
-  "global_search_gyms": "Voer de naam van de Gym in...",
-  "global_search_portals": "Voer de naam van de Portal in...",
-  "global_search_nests": "Voer de naam van de Nest Pokémon in...",
-  "global_search_raids": "Voer de naam van de Raid Boss in...",
-  "raid_level_badges": "Raid Level Badges",
+  "global_search_quests": "Voer Beloningsnaam in...",
+  "global_search_lures": "Voer Lokaas Naam in...",
+  "global_search_pokestops": "Voer PokéStop Naam in...",
+  "global_search_gyms": "Voer Gym Naam in...",
+  "global_search_portals": "Voer Portaal Naam in...",
+  "global_search_nests": "Voer Nest Pokémon Naam in...",
+  "global_search_raids": "Voer Raid Baas Naam in...",
+  "global_search_pokemon": "Voer Pokémon Naam in...",
+  "global_search_invasions": "Voer Grunt Type, Naam, of Pokémon beloningsnaam in...",
+  "raid_level_badges": "Raid Niveau Badges",
   "options": "Opties",
   "profile": "Profiel",
-  "pokemon_icons": "Pokémon Pictogrammen",
-  "pokestop_icons": "PokéStop Pictogrammen",
-  "gym_icons": "Gym Pictogrammen",
-  "team_icons": "Team Pictogrammen",
-  "egg_icons": "Egg Pictogrammen",
-  "raid_icons": "Raid Pictogrammen",
-  "nest_icons": "Nest Pictogrammen",
-  "reward_icons": "Reward Pictogrammen",
-  "type_icons": "Type Pictogrammen",
-  "weather_icons": "Weather Pictogrammen",
-  "misc_icons": "Misc Pictogrammen",
-  "invasion_icons": "Invasion Pictogrammen",
-  "pokemon_timers": "Alle Pokemon Timers",
+  "pokemon_icons": "Pokémon Icoontjes",
+  "pokestop_icons": "PokéStop Icoontjes",
+  "gym_icons": "Gym Icoontjes",
+  "team_icons": "Team Icoontjes",
+  "egg_icons": "Ei Icoontjes",
+  "raid_icons": "Raid Icoontjes",
+  "nest_icons": "Nest Icoontjes",
+  "reward_icons": "Beloningsicoontjes",
+  "type_icons": "Type Icoontjes",
+  "weather_icons": "Weer Icoontjes",
+  "misc_icons": "Diversen Icoontjes",
+  "invasion_icons": "Invasie Icoontjes",
+  "spawnpoint_icons": "Spawnpoint Icoontjes",
+  "device_icons": "Apparaat Icoontjes",
+  "pokemon_audio": "Pokémon Audio",
+  "pokestop_audio": "PokéStop Audio",
+  "gym_audio": "Gym Audio",
+  "team_audio": "Team Audio",
+  "egg_audio": "Ei Audio",
+  "raid_audio": "Raid Audio",
+  "nest_audio": "Nest Audio",
+  "reward_audio": "Beloningsaudio",
+  "type_audio": "Type Audio",
+  "weather_audio": "Weer Audio",
+  "misc_audio": "Diversen Audio",
+  "invasion_audio": "Invasie Audio",
+  "spawnpoint_audio": "Spawnpoint Audio",
+  "device_audio": "Apparaat Audio",
+  "pokemon_timers": "Alle Pokémon Timers",
   "show_dex_num_in_popup": "Toon Pokedex # in Popup",
   "popup": "Popup",
   "pvp_level": "Level {{level}} PVP Statistieken",
   "pvp_mega": "Mega PVP Statistieken",
-  "webhook_entry": "Voeg toe aan {{name}}",
+  "webhook_entry": "Toevoegen aan {{name}}",
+  "remove_webhook_entry": "Verwijderen uit {{name}}",
   "distance": "Afstand",
   "gym": "Gym",
-  "egg": "Egg",
+  "egg": "Ei",
   "raid": "Raid",
-  "lure": "Lure",
+  "lure": "Lokaas",
   "quest": "Quest",
-  "invasion": "Invasion",
+  "invasion": "Invasie",
   "nest": "Nest",
   "pokestop": "Pokestop",
   "team": "Team",
-  "global": "Global",
+  "global": "Globaal",
   "manage_webhook": "Beheer {{name}}",
-  "drag_and_drop": "Sleep de markering en zet deze neer om uw locatie in te stellen.",
-  "click_to_select": "Klik om te selecteren",
-  "add_new": "Nieuwe {{category}} Alert Toevoegen",
-  "my_location": "Mijn locatie",
-  "choose_on_map": "Kies op kaart",
-  "select_profile": "Kies een profiel",
-  "distance_radius": "Voorbeeld Straalafstanden",
+  "drag_and_drop": "Sleep de Marker om Je Locatie In te Stellen",
+  "click_to_select": "Klik om te Selecteren",
+  "add_new": "Nieuwe {{category}} Alarm toevoegen",
+  "my_location": "Mijn Locatie",
+  "choose_on_map": "Kies op Kaart",
+  "select_profile": "Selecteer Profiel",
+  "distance_radius": "Voorbeeld Radius Afstanden",
   "areas": "Gebieden",
   "select_webhook": "Selecteer Bot",
-  "ar_quest_true": "AR Task",
-  "ar_quest_false": "No AR",
-  "exclude_quest_multi": "Sluit {{reward}} Uit",
-  "cluster_limit_0": "{{variable_0}} Limiet ({{variable_1}}) is geraakt.",
-  "cluster_limit_1": "Zoom in of verklein uw filters",
+  "ar_quest_true": "AR Taak",
+  "ar_quest_false": "Geen AR",
+  "with_ar": "Met AR",
+  "both": "Beide",
+  "without_ar": "Zonder AR",
+  "exclude_quest_multi": "Sluit {{reward}} uit",
+  "cluster_limit_0": "{{variable_0}} limiet ({{variable_1}}) is bereikt",
+  "cluster_limit_1": "Zoom in of verfijn je filters",
   "show_polygons": "Toon Polygons",
-  "exclude_invasion_multi": "Sluit {{invasion}} Uit",
-  "stardust": "Stardust",
+  "exclude_invasion_multi": "Sluit {{invasion}} uit",
+  "stardust": "Sterrenstof",
   "slider_cp": "CP",
-  "pvp_ranking_league": "League",
+  "pvp_ranking_league": "Competitie",
   "pvp_ranking_min_cp": "Min CP",
-  "slider_pvp": "Ranks",
+  "slider_pvp": "Rangen",
   "profile_no": "Profiel",
-  "template": "Template",
+  "template": "Sjabloon",
   "gender": "Geslacht",
-  "clean": "Clean",
-  "all_forms": "Alle Forms",
-  "pvp_entry": "PVP Entry",
-  "no_iv": "Incl. No IV",
-  "by_distance": "Op afstand",
+  "clean": "Opschonen",
+  "all_forms": "Alle Vormen",
+  "pvp_entry": "PVP Inschrijving",
+  "no_iv": "Incl. Geen IV",
+  "by_distance": "Op Afstand",
   "min_time": "Min Tijd",
-  "add_new_profile": "Nieuw profiel toevoegen",
+  "add_new_profile": "Voeg Nieuw Profiel Toe",
   "slider_none": "Geen",
   "non_registered_human_title": "Oeps, er klopt iets niet!",
-  "non_registered_human_desc": "You may not be registered with {{webhook}}\nOr the server is currently unreachable",
+  "non_registered_human_desc": "Je bent mogelijk niet geregistreerd bij {{webhook}}\nOf de server is momenteel onbereikbaar",
   "try_again_later": "Probeer het later opnieuw",
-  "selected_areas": "{{amount}} Area Selected",
-  "selected_areas_plural": "{{amount}} Areas Selected",
+  "selected_areas_one": "{{count}} Gebied Geselecteerd",
+  "selected_areas_other": "{{count}} Gebieden Geselecteerd",
   "webhook_selection": "{{name}} Selectie",
-  "message_of_the_day": "Bericht van de dag",
-  "has_quest_indicator": "Alternatieve kleur voor Stops met Quests",
+  "message_of_the_day": "Bericht van de Dag",
+  "has_quest_indicator": "Alternatieve Kleur voor Stops met Quests",
   "show_ar_badge": "Toon AR Badge",
   "all_gyms": "Alle Gyms",
   "general": "Algemeen",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Link Globaal & Geavanceerd",
-  "normal_forms": "Normal Forms",
-  "weather_indicator": "Weather Boost Indicator",
+  "link_global_and_advanced": "Wereldwijde Respecteert Geselecteerd",
+  "normal_forms": "Normale Vormen",
+  "weather_indicator": "Weersboost Indicator",
   "page": "Pagina {{page}}",
   "navigation_controls": "Navigatiebediening",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Exclusief",
-  "all_moves": "Alle Moves",
-  "move": "Move",
-  "any": "Any",
-  "min_spawn_average": "Min Spawn Rate",
-  "select_all": "Selecteer alles",
-  "delete_all": "Verwijder geselecteerde",
+  "all_moves": "Alle Bewegingen",
+  "move": "Beweging",
+  "any": "Elke",
+  "min_spawn_average": "Gem. Min Spawn",
+  "select_all": "Selecteer Alles",
+  "delete_all": "Verwijder Geselecteerd",
   "cancel": "Annuleren",
   "day_1": "Maandag",
   "day_2": "Dinsdag",
@@ -375,203 +413,149 @@
   "day_5": "Vrijdag",
   "day_6": "Zaterdag",
   "day_7": "Zondag",
-  "profile_name": "Profiel Naam",
-  "manage_profiles": "Profielen beheren",
-  "min_spawn_avg": "Gem Min Spawn",
+  "profile_name": "Profielnaam",
+  "manage_profiles": "Beheer Profielen",
+  "min_spawn_avg": "Gem. Min Spawn",
   "poke_global": "Alles",
   "amount": "Aantal",
   "specific_gym": "Specifieke Gym",
   "search_location": "Zoek Locaties",
-  "search_specific": "Zoek voor een specifieke {{category}}",
-  "webhook_success_gym": "Raids, Eggs, en Team Verander Alerts zijn toegevoegd!",
-  "slot_changes": "Slot Changes",
+  "search_specific": "Zoek naar een Specifieke {{category}}",
+  "webhook_success_gym": "Raid-, Ei- en Teamwisselwaarschuwingen zijn toegevoegd!",
+  "slot_changes": "Slot Wijzigingen",
   "slot_changes_poracle": "slot_changes",
-  "confirm_delete": "Hiermee wordt alle tracking voor dit profiel verwijderd, weet u het zeker?",
-  "confirm_copy": "Kies welk profiel je wilt kopiëren \"{{profile}}\" naar, dit zal dat profiel wel volledig overschrijven.",
-  "webhook_error": "{{name}} kon dat niet verwerken.\nProbeer het later opnieuw.",
+  "confirm_delete": "Dit zal alle tracking voor dit profiel verwijderen, weet je het zeker?",
+  "confirm_copy": "Kies welk profiel je \"{{profile}}\" naar wilt kopiëren, dit zal dat profiel volledig overschrijven.",
+  "webhook_error": "{{name}} kon dit niet verwerken.\nProbeer het later opnieuw.",
   "profile_error": "Moet uniek en geldig zijn",
   "team_0": "Harmonie",
-  "battle_changes": "In Battle",
+  "battle_changes": "In Gevecht",
   "battle_changes_poracle": "battle_changes",
   "auto": "Auto",
-  "webhooks_subtitle": "Beheer uw meldingen rechtstreeks vanaf de kaart voor deze bots",
-  "webhooks": "Alerts",
-  "everything_individually": "Voeg individuele Alerts toe",
-  "individually": "Individueel",
-  "join": "Join",
+  "webhooks_subtitle": "Beheer je meldingen direct vanuit de kaart voor deze bots",
+  "event_stops_subtitle": "Toont speciale event PokéStops zoals Kecleon",
+  "webhooks": "Meldingen",
+  "scanner": "Scanner Acties",
+  "everything_individually": "Voeg Individuele Meldingen Toe",
+  "individually": "individueel",
+  "join": "Meedoen",
   "errors_404": "Oeps, deze pagina kan niet gevonden worden!",
-  "errors_500": "Er is een serverfout opgetreden, probeer het later opnieuw!",
+  "errors_500": "Er is een fout op de server, probeer het later opnieuw!",
   "local_username": "Gebruikersnaam",
   "local_password": "Wachtwoord",
-  "local_error": "Er is een fout opgetreden, probeer het later opnieuw!",
-  "no_filter_results": "Geen resultaten gevonden\nProbeer je filters uit te breiden",
-  "donor_page": "Donatie Pagina",
+  "local_error": "Er is een fout opgetreden, probeer het later opnieuw.",
+  "no_filter_results": "Geen Resultaten Gevonden\nProbeer Je Filters te Verbreden",
+  "donor_page": "Donateurspagina",
   "go_back": "Ga Terug",
   "access": "Toegang",
-  "link_discord": "Discord Verbonden",
-  "select_webhook_strategy": "Alarm Manager",
-  "webhook_strategy_success_0": "Succesvol! Vernieuwen om meldingsinstellingen te krijgen...",
-  "register": "Registratie",
-  "invalid_credentials": "Ongeldige inloggegevens",
-  "error_creating_user": "Kan op dit moment geen nieuwe gebruiker registreren",
-  "discord_linked": "Discord Verbonden",
-  "telegram_linked": "Telegram Verbonden",
-  "level": "peil",
+  "link_discord": "Koppel Discord",
+  "select_webhook_strategy": "Alert Manager",
+  "webhook_strategy_success_0": "Gelukt! Vernieuwen om alarminstellingen op te halen...",
+  "register": "Registreren",
+  "invalid_credentials": "Ongeldige Inloggegevens",
+  "localauth_failed": "Authenticatie Mislukt",
+  "error_creating_user": "Het is op dit moment niet mogelijk om een nieuwe gebruiker te registreren",
+  "discord_linked": "Discord Gekoppeld",
+  "telegram_linked": "Telegram Gekoppeld",
+  "level": "niveau",
   "km": "km",
   "feedback": "Feedback",
   "donor_menu": "Donormenu",
-  "pokemon_cell": "De locatie van de Pokemon kan variëren.",
-  "timer_verified": "De despawn-tijd is bevestigd.",
-  "timer_unverified": "De despawn-tijd is niet bevestigd.",
-  "with_ar": "Met AR",
-  "both": "Beide",
-  "without_ar": "Zonder AR",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "all": "Alle",
-  "confirm_filters_reset": "Bevestig filters resetten",
-  "filters_reset_text": "Weet je zeker dat je de filters instellingen terug wilt zetten naar standaardwaarden? Dit kan niet ongedaan gemaakt worden!",
-  "filters_reset_title": "Filters resetten",
+  "pokemon_cell": "Locatie van Pokémon Kan Variëren",
+  "timer_verified": "Deze Timer is Geverifieerd",
+  "timer_unverified": "Deze Timer is Niet Geverifieerd",
+  "all": "Alles",
   "badge_0": "Geen",
-  "badge_1": "Bronze",
-  "badge_2": "Silver",
-  "badge_3": "Gold",
+  "badge_1": "Brons",
+  "badge_2": "Zilver",
+  "badge_3": "Goud",
   "gym_badge_menu": "Bewerk Gym Badge",
   "gym_badges": "Gym Badges",
   "gym_badge_diamonds": "Toon Gym Badges",
   "gym_badges_subtitle": "Toont Gym Badges op de kaart en een lijst op de profielpagina.",
-  "loading": "Loading {{category}}",
-  "loading_icons": "Pictogrammen ophalen",
-  "loading_invasions": "Invasions ophalen",
-  "pvp_ranking_cap": "Level",
-  "spawnpoint_icons": "Spawnpoint Icons",
-  "device_icons": "Device Icons",
-  "raid_quick_select": "Snel Raids Selecteren",
+  "confirm_filters_reset": "Filters Resetten",
+  "filters_reset_text": "Weet je zeker dat je instellingen wilt resetten naar standaardwaarden? Dit kan niet ongedaan gemaakt worden!",
+  "filters_reset_title": "Reset Filters",
+  "raid_quick_select": "Snel Selecteren",
   "disabled": "Uitgeschakeld",
-  "search_raids": "Zoek Raids",
-  "search_eggs": "Zoek Eggs",
-  "search_quests": "Zoek Quests",
-  "search_lures": "Zoek Lures",
-  "search_invasions": "Zoek Invasions",
+  "loading": "{{category}} Laden",
+  "loading_icons": "Icoontjes Ophalen",
+  "loading_invasions": "Invasies Ophalen",
   "scan_next": "Scan Locatie",
-  "scan_next_choose": "Drag en Drop de Markering om de scanlocatie in te stellen",
-  "scan_zone": "Scan een Gebied",
-  "scan_zone_choose": "Sleep de markering en zet deze neer om de scanlocatie in te stellen en het formaat te kiezen",
-  "scan_zone_size": "Maat",
+  "scan_next_choose": "Sleep en Laat de Marker Los om de Scan Locatie In te Stellen",
+  "scan_zone": "Bereik Scannen",
+  "scan_zone_choose": "Sleep en Laat de Marker Los om de Scan Locatie en Grootte te Kiezen",
+  "scan_zone_size": "Grootte",
   "scan_zone_range": "Bereik",
-  "scan_zone_spacing": "Spacing",
+  "scan_zone_spacing": "Afstand",
   "scan_zone_radius": "Straal",
-  "scan_requests": "Scan Verzoek",
-  "scan_queue": "Huidige wachtrij",
-  "click_to_scan": "Scan hier",
-  "scan_confirmed_title": "Scanaanvraag bevestigd",
-  "scan_confirmed": "Worker is naar locatie gestuurd, resultaat verschijnt binnenkort op de kaart!",
-  "scan_loading_title": "Scanverzoek verzenden",
-  "scan_loading": "Je scanverzoek wordt verwerkt en naar het systeem verzonden!",
-  "scan_error_title": "Foutmelding",
-  "scan_error": "Er is een fout opgetreden tijdens het verwerken van het scanverzoek...",
-  "scan_outside_area": "Deze locatie ligt buiten de geautoriseerde gebieden",
-  "lc_title": "Volg je locatie",
-  "lc_metersUnit": "meters",
+  "scan_requests": "Scan Verzoeken",
+  "scan_queue": "Huidige Wachtrij",
+  "click_to_scan": "Hier Scannen",
+  "scan_confirmed_title": "Scanvraag Bevestigd",
+  "scan_confirmed": "Werknemer is naar de locatie gestuurd, resultaat zal binnenkort op de kaart verschijnen!",
+  "scan_loading_title": "Scanverzoek Versturen",
+  "scan_loading": "Je scanverzoek wordt verwerkt en naar het systeem gestuurd!",
+  "scan_error_title": "Fout",
+  "scan_error": "Er is een fout opgetreden bij het verwerken van het scanverzoek...",
+  "scan_outside_area": "Deze locatie ligt buiten de grenzen van de toegestane gebieden",
+  "pvp_ranking_cap": "Niveau",
+  "lc_title": "Volg Je Locatie",
+  "lc_metersUnit": "meter",
   "lc_feetUnit": "voet",
-  "lc_popup": "Je bevindt zich binnen {distance} {unit} vanaf dit punt",
-  "lc_outsideMapBoundsMsg": "Je lijkt locatie blijkt buiten de grenzen van de kaart te bevinden",
-  "no_alerts": "Geen meldingen gevonden",
-  "loading_settings": "Instellingen worden geladen",
-  "refresh_to_continue": "Vernieuw alstublieft voordat je doorgaat",
-  "session_expired_title": "Sessie verlopen",
+  "lc_popup": "Je bent binnen {distance} {unit} van dit punt",
+  "lc_outsideMapBoundsMsg": "Je bevindt je buiten de grenzen van de kaart",
+  "no_alerts": "Geen Meldingen Gevonden",
+  "loading_settings": "Instellingen Laden",
+  "refresh_to_continue": "Vernieuw voordat je doorgaat",
+  "session_expired_title": "Sessie Verlopen",
   "session_expired_body": "Je sessie is verlopen",
   "old_client_title": "Verouderd",
-  "old_client_body": "Er is een nieuwe versie van deze kaart beschikbaar",
-  "refresh": "Vernieuw",
+  "old_client_body": "Een nieuwe versie van deze kaart is beschikbaar",
+  "early_old_client_title": "Verouderd",
+  "early_old_client_body": "Een oude versie van deze app kan in de cache van je browser zijn opgeslagen. Je moet je cache legen voordat je deze app kunt gebruiken.",
+  "refresh": "Vernieuwen",
   "points": "Punten",
   "day": "Dag",
   "days": "Dagen",
-  "react_error": "Er ging iets mis",
-  "clickable_icon": "Icoon is klikbaar",
-  "weather_options": "Weer opties",
-  "two_stops_till_next": "2 haltes tot de volgende",
-  "one_stop_till_next": "1 halte tot de volgende",
-  "no_more_gyms": "Geen sportscholen meer",
-  "light_map_border": "Lichte kaartrand",
-  "dark_map_border": "Donkere kaartrand",
-  "cell_blocked": "Cel geblokkeerd",
-  "poi_color": "POI-kleur",
-  "ultra_beast": "Ultrabeest",
-  "quest_condition": "Quest-voorwaarde",
-  "always_show_labels": "Altijd labels weergeven",
-  "scan_areas_options": "Opties voor scangebieden",
-  "historic_rarity": "Historische zeldzaamheid",
-  "poi": "Nuttige Plaatsen",
-  "300m_range": "300m bereik",
-  "lure_range": "Lokbereik",
-  "tap_to_toggle": "Tik om te wisselen",
-  "power_up": "Opstarten",
-  "never_alt": "Nooit",
-  "seen_nearby_stop": "In de buurt gezien",
-  "seen_nearby_cell": "Gezien in deze cel",
-  "seen_lure_encounter": "Ontmoeting met lokken",
-  "seen_lure_wild": "lokken spawn",
-  "seen_wild": "Wilde spawn",
-  "slider_size": "Grootte",
-  "s2cells": "S2 Cellen",
-  "s2cells_options": "S2 Cel Opties",
-  "scanner_subtitle": "Directe interactie met de scanner op verschillende manieren",
-  "s2cells_subtitle": "Toont S2 Cellen op verschillende niveaus op de kaart",
-  "backups_subtitle": "Maakt het mogelijk om instellingen te backuppen en te laden op verschillende apparaten",
-  "backups": "Back-ups",
-  "user_username": "Gebruikersnaam",
-  "global_search_lures": "Voer Lure Naam in...",
-  "global_search_pokemon": "Voer Pokemon Naam in...",
-  "remove_webhook_entry": "Verwijderen van {{name}}",
-  "event_stops_subtitle": "Toont speciale evenement Pokéstops zoals Kecleon",
-  "scanner": "Scanner Acties",
+  "react_error": "Er Ging Iets Mis",
+  "clickable_icon": "Icoon is Klikbaar",
+  "two_stops_till_next": "2 stops tot de volgende",
+  "one_stop_till_next": "1 stop tot de volgende",
+  "no_more_gyms": "Geen gyms meer",
+  "light_map_border": "Lichte Kaartrand",
+  "dark_map_border": "Donkere Kaartrand",
+  "cell_blocked": "Cel Geblokkeerd",
+  "poi_color": "Kleur van Belangrijke Punten",
+  "quest_condition": "Queeste Voorwaarde",
+  "always_show_labels": "Altijd Labels Tonen",
+  "scan_areas_options": "Scan Gebieden Opties",
+  "historic_rarity": "Historische Zeldzaamheid",
+  "poi": "Punten van Belang",
+  "300m_range": "300m Bereik",
+  "lure_range": "Lokmiddel Bereik",
   "custom_range": "Aangepast Bereik",
-  "event_stops": "Evenement Stops",
-  "event_stop_timers": "Evenement Stop Timers",
+  "tap_to_toggle": "Tik om te Wisselen",
+  "power_up": "Power-up",
+  "never_alt": "Nooit",
+  "seen_nearby_stop": "In de Buurt Gezien",
+  "seen_nearby_cell": "In deze Cel Gezien",
+  "seen_lure_encounter": "Lokmiddel Ontmoeting",
+  "seen_lure_wild": "Lokmiddel Spawn",
+  "seen_wild": "Wild Spawn",
+  "event_stops": "Event Pokéstops",
+  "event_stop_timers": "Event Stop Timers",
   "size_0": "Elk",
   "size_1": "XXS",
   "size_2": "XS",
   "size_3": "M",
   "size_4": "XL",
   "size_5": "XXL",
-  "show_size_indicator": "Toon Grootte Indicator",
-  "size": "Grootte",
+  "show_size_indicator": "Toon Maat Indicator",
+  "size": "Maat",
   "gold_stop": "Gouden Stop",
-  "profile_backups": "Profiel Wisselen",
-  "new_backup": "Nieuwe Backup",
+  "profile_backups": "Profiel Back-ups",
+  "new_backup": "Nieuwe Back-up",
   "create": "Creëren",
   "load": "Laden",
   "update": "Bijwerken",
@@ -579,132 +563,156 @@
   "name": "Naam",
   "only_confirmed": "Alleen Bevestigd",
   "rocket_pokemon": "Rocket Pokémon",
-  "decoy": "Lokvogel",
-  "s2_cell_limit_0": "Je hebt geprobeerd om meer dan 20.000 cellen te genereren ({{variable_0}})",
+  "decoy": "Lokaas",
+  "s2_cell_limit_0": "Je hebt geprobeerd meer dan 20.000 cellen te genereren ({{variable_0}})",
   "show_all_pvp_ranks": "Toon Alle PVP Rangen",
   "enable_pokemon_popup_coords": "Toon Pokémon Coördinaten",
   "enable_gym_popup_coords": "Toon Gym Coördinaten",
   "enable_pokestop_popup_coords": "Toon Pokéstop Coördinaten",
-  "enable_portal_popup_coords": "Toon Portal Coördinaten",
-  "on_block_join_discord": "Ga naar onze discord voor meer informatie.",
+  "enable_portal_popup_coords": "Toon Portaal Coördinaten",
+  "on_block_join_discord": "Sluit je aan bij onze discord voor meer informatie.",
   "on_block_msg": "Je bent geblokkeerd omdat je lid bent van",
   "denied": "Geweigerd",
-  "showcase": "Voorbeeld",
+  "showcase": "Vitrine",
   "unknown_event": "Onbekend Evenement",
   "scanner_countdown": "Beschikbaar in {{time}}s",
   "success": "Succes",
   "contribute": "Bijdragen",
   "mi": "mi",
   "filter_by_areas": "Filteren op Gebieden",
-  "submit_nest_name": "Nest Naam Indienen",
+  "submit_nest_name": "Dien Nestnaam in",
   "nest_submission_menu": "Naam Bijwerken",
   "nest_submissions": "Nest Inzendingen",
-  "nest_submissions_subtitle": "Hiermee kun je nieuwe namen indienen voor nesten",
-  "pokemon_opacity": "Dynamische Pokemon Doorzichtigheid",
-  "invasion_opacity": "Dynamische Invasie Doorzichtigheid",
-  "raid_opacity": "Dynamische Raid Doorzichtigheid",
+  "nest_submissions_subtitle": "Stelt je in staat om nieuwe namen voor nesten in te dienen",
+  "pokemon_opacity": "Dynamische Pokémon Doorzichtigheid",
+  "invasion_opacity": "Dynamische Invallen Doorzichtigheid",
+  "raid_opacity": "Dynamische Raids Doorzichtigheid",
   "opacity_ten_minutes": "Doorzichtigheid na 10 minuten",
   "opacity_five_minutes": "Doorzichtigheid na 5 minuten",
   "opacity_one_minute": "Doorzichtigheid na 1 minuut",
-  "level_circles": "Niveau-indicatoren",
-  "min_level_circle": "Minimale cirkelniveau",
-  "mutation_auth_error": "Uw verzoek is mislukt omdat u niet bent ingelogd",
-  "submitted_by": "Ingezonden door",
-  "localauth_failed": "Authenticatie mislukt",
+  "level_circles": "Niveau Indicatoren",
+  "min_level_circle": "Minimale Cirkel Niveau",
+  "mutation_auth_error": "Je verzoek was niet succesvol omdat je niet ingelogd bent",
+  "submitted_by": "Ingediend Door",
   "reversible": "Omkeerbaar",
   "version": "Versie",
-  "route_tags": "Route Tags",
+  "route_tags": "Routetags",
   "routes": "Routes",
-  "route_type": "Route Type",
-  "routes_subtitle": "Bekijk in-game routes en relevante informatie over hen op de kaart",
+  "route_type": "Routetype",
+  "routes_subtitle": "Bekijk in-game routes en relevante informatie over ze op de kaart",
   "description": "Beschrijving",
-  "additional_info": "Extra informatie",
+  "additional_info": "Extra Info",
   "duration": "Duur",
   "elevation": "Hoogte",
-  "contest_category_1": "Kleinste Grootte",
-  "context_category_2": "Grootste Grootte",
-  "total_entries": "Totale Inzendingen",
-  "showcase_rankings": "Toont de top ranglijsten voor een showcase bij een Pokéstop",
-  "showcase_rankings_subtitle": "Toont een lijst van de top ranglijsten voor een showcase bij een Pokéstop",
+  "contest_category_1": "Kleinste Maat",
+  "context_category_2": "Grootste Maat",
+  "total_entries": "Totaal Aantal Inzendingen",
+  "showcase_rankings": "Vitrine Ranglijsten",
+  "showcase_rankings_subtitle": "Toont een lijst van de top ranglijsten voor een vitrine bij een Pokéstop",
   "tth": "TTH",
   "tth_0": "Alle",
   "tth_1": "Bekend",
   "tth_2": "Onbekend",
-  "no_access": "Geen toegang",
-  "cooldown": "Afname van de Gebruikerstijd",
+  "no_access": "Geen Toegang",
+  "cooldown": "Aftellen",
   "scan_some_outside_area": "Sommige locaties bevinden zich buiten de toegestane grenzen",
   "alerts": "meldingen",
-  "alert_manager": "Meldingsbeheer",
+  "alert_manager": "Meldingenbeheer",
   "menu": "Menu",
   "theme": "Thema",
   "exit": "Afsluiten",
   "component": "Component",
-  "component_login_page": "Inlogpagina",
-  "component_donation_page": "Donatiepagina",
+  "component_login_page": "Login Pagina",
+  "component_donation_page": "Donatie Pagina",
   "component_message_of_the_day": "Bericht van de Dag",
-  "download": "Download",
+  "download": "Downloaden",
   "playground": "Speeltuin",
-  "locale": "Taal",
+  "locale": "Lokaal",
   "saved": "Opgeslagen",
-  "show_editor": "Editor tonen",
-  "hide_editor": "Editor verbergen",
-  "reported_error": "Deze fout is gemeld aan de server met de identifier",
-  "dark_mode": "Donkere modus",
-  "load_from_autosave": "Laden vanuit automatische opslag",
+  "show_editor": "Toon Editor",
+  "hide_editor": "Verberg Editor",
+  "reported_error": "Deze fout is gerapporteerd aan de server met identificatie",
+  "dark_mode": "Donkere Modus",
+  "load_from_autosave": "Laden van autosave",
   "done": "Klaar",
   "fast": "Snel",
   "charged": "Opgeladen",
-  "offline_mode": "Offline modus",
-  "include_sponsored": "Gesponsorde inhoud weergeven",
-  "showcase_color": "Showcase-kleur",
-  "partner_color": "Partnerkleur",
-  "disable": "{{- name}} uitschakelen",
+  "offline_mode": "Offline Modus",
+  "include_sponsored": "Inclusief Gesponsorde",
+  "showcase_color": "Showcase Kleur",
+  "partner_color": "Partner Kleur",
+  "disable": "Uitschakelen {{- name}}",
   "profiling": "Profilering",
   "showcase_block": "Geblokkeerd vanwege een showcase",
-  "signed_in_as": "Ingelogd als",
+  "signed_in_as": "Ingelogd Als",
   "missing_map_perm": "Je hebt geen toestemming om de kaart te bekijken.",
-  "pokemon_audio": "Pokémon audio",
-  "pokestop_audio": "PokéStop audio",
-  "gym_audio": "Gym audio",
-  "team_audio": "Team audio",
-  "egg_audio": "Egg audio",
-  "raid_audio": "Raid audio",
-  "nest_audio": "Nest audio",
-  "reward_audio": "Reward audio",
-  "type_audio": "Type audio",
-  "weather_audio": "Weather audio",
-  "misc_audio": "Misc audio",
-  "invasion_audio": "Invasion audio",
-  "spawnpoint_audio": "Spawnpoint audio",
-  "device_audio": "Device audio",
-  "access_denied": "Toegang geweigerd",
+  "access_denied": "Toegang Geweigerd",
   "audio": "Audio",
-  "desktop_notifications": "Desktopmeldingen",
+  "desktop_notifications": "Bureaubladmeldingen",
   "notifications_options": "Meldingsopties",
-  "audio_always_on": "Audio speelt altijd af",
-  "volume_level": "Volumeniveau",
-  "notifications_status": "Meldingenstatus",
-  "granted": "toegestaan",
-  "global_search_invasions": "Voer Grunt Type, Naam, of naam van de beloning van de Pokémon in...",
-  "set_all": "Alle instellen",
-  "set_filtered": "Gefilterde instellen",
-  "only_show_available": "Alleen beschikbare weergeven",
-  "easy_mode": "Eenvoudige modus",
-  "quick_select": "Wereldwijde snelkeuzes",
-  "pokemon_filter_mode": "Pokémon filtermodus",
+  "audio_always_on": "Audio Altijd Aan",
+  "volume_level": "Volume Niveau",
+  "notifications_status": "Meldingen Status",
+  "granted": "verleend",
+  "set_all": "Stel Alle In",
+  "set_filtered": "Stel Gefilterd In",
+  "only_show_available": "Toon Alleen Beschikbare",
+  "easy_mode": "Eenvoudige Modus",
+  "quick_select": "Globale Snelle Selectie",
+  "pokemon_filter_mode": "Pokémon Filter Modus",
   "basic": "Basis",
-  "intermediate": "Gevorderd",
+  "intermediate": "Gemiddeld",
   "expert": "Expert",
-  "basic_description": "Selecteer Pokémon eenvoudig en pas een globale filter toe",
-  "intermediate_description": "Stel individuele filters in op wereldwijde en per Pokémon-basis (traditioneel)",
-  "expert_description": "Handmatige inputquery's voor de meeste aanpassingsmogelijkheden",
-  "icon_size": "Icoonformaat",
+  "basic_description": "Selecteer gemakkelijk Pokémon en pas een globaal filter toe",
+  "intermediate_description": "Stel individuele filters globaal en per Pokémon in (traditioneel)",
+  "expert_description": "Handmatige invoerquery’s voor de meeste aanpassing",
+  "icon_size": "Pictogramgrootte",
   "developer": "Ontwikkelaar",
-  "raid_override": "Raid Override",
-  "search_rocket_pokemon": "Doorzoek Rocket Pokémon",
+  "raid_override": "Raid Overschrijving",
+  "search_rocket_pokemon": "Zoek Rocket Pokémon",
   "main": "Hoofd",
   "extra": "Extra",
-  "select": "Selecteren",
+  "select": "Selecteer",
   "searching": "zoeken...",
-  "no_options": "Geen opties..."
+  "no_options": "Geen Opties...",
+  "and": "EN",
+  "or": "OF",
+  "only_global": "Alleen Globaal",
+  "global_caption": "Negeert Alle Andere Filters",
+  "global_and_individual": "Globaal & Individuele Filters",
+  "gender_filters_all": "Geslacht Geldt voor Allen",
+  "and_caption": "Samengevoegd",
+  "or_caption": "Filters Onafhankelijk",
+  "filter_help": "Filter Hulp",
+  "kilometers": "Kilometers",
+  "miles": "Mijlen",
+  "distance_unit": "Afstandseenheid",
+  "data_management": "Gegevensbeheer",
+  "reset_or_manage_text": "Je kunt of je filters hard resetten of je kunt de gegevensbeheer pagina bekijken die je toestaat om individuele categorieën te resetten.",
+  "reset_audio": "Reset Audio",
+  "reset_all": "Reset Alles",
+  "reset_icons": "Reset Pictogrammen",
+  "reset_position": "Reset Positie",
+  "reset_ui": "Reset UI",
+  "reset_options": "Reset Opties",
+  "reset_menus": "Reset Menu’s",
+  "reset_settings": "Reset Instellingen",
+  "reset_general_title": "Algemeen",
+  "reset_filters_title": "Filters",
+  "reset_assets": "Reset Middelen",
+  "reset_pokemon": "Reset Pokémon",
+  "reset_pokestops": "Reset PokéStops",
+  "reset_gyms": "Reset Sportscholen",
+  "reset_nests": "Reset Nests",
+  "reset_portals": "Reset Portalen",
+  "reset_routes": "Reset Routes",
+  "reset_scan_areas": "Reset Scan Gebieden",
+  "reset_scan_cells": "Reset Scan Cellen",
+  "reset_devices": "Reset Apparaten",
+  "reset_weather": "Reset Weer",
+  "reset_s2cells": "Reset S2 Cellen",
+  "reset_spawnpoints": "Reset Spawnpunten",
+  "reset_submission_cells": "Reset Indieningscellen",
+  "hisuian": "Hisuian",
+  "spacial_rend_range": "Ruimtelijke Scheur Bereik"
 }
diff --git a/packages/locales/lib/generated/pl.json b/packages/locales/lib/generated/pl.json
index 050476059..9a2b65f95 100644
--- a/packages/locales/lib/generated/pl.json
+++ b/packages/locales/lib/generated/pl.json
@@ -1,392 +1,410 @@
 {
-  "login": "Login",
+  "login": "Logowanie",
   "click_once": "Kliknij 'Autoryzuj' tylko raz",
   "save": "Zapisz",
-  "reset": "Zresestuj",
+  "reset": "Resetuj",
   "close": "Zamknij",
-  "reset_filters": "Zresetuj filtry",
-  "pokemon_filters": "Ustawienia filtrów Pokemonów",
-  "gyms_filters": "Ustawienia filtrów gymów",
-  "pokestops_filters": "Ustawienia filtrów Pokestopów",
-  "nests_filters": "Ustawienia filtrów nestów",
+  "reset_filters": "Resetuj Filtry",
+  "pokemon_filters": "Ustawienia Filtrów Pokémonów",
+  "gyms_filters": "Ustawienia Filtrów Siłowni",
+  "pokestops_filters": "Ustawienia Filtrów PokéStopów",
+  "nests_filters": "Ustawienia Filtrów Gniazd",
   "help": "Pomoc",
-  "apply_to_all": "Zastosuj do wszystkich",
-  "disable_all": "Wyłącz wszystkie",
-  "enable_all": "Włącz wszystkie",
-  "enabled": "Włączony",
-  "legacy": "Legacy",
+  "apply_to_all": "Zastosuj Do Wszystkich",
+  "disable_all": "Wyłącz Wszystko",
+  "enable_all": "Włącz Wszystko",
+  "enabled": "Włączone",
+  "legacy": "Starsze",
   "id": "ID",
   "location": "Lokalizacja",
-  "search_pokemon": "Szukaj Pokemonów",
-  "search_nests": "Szukaj nestów",
-  "search_gyms": "Szukaj gymów",
-  "search_pokestops": "Szukaj Pokestopów",
-  "search_raids": "Szukaj raidów",
-  "search_eggs": "Szukaj jajek",
-  "sm": "SM",
-  "md": "MD",
-  "lg": "LG",
+  "search_pokemon": "Szukaj Pokémonów",
+  "search_nests": "Szukaj Gniazd",
+  "search_gyms": "Szukaj Siłowni",
+  "search_pokestops": "Szukaj PokéStopów",
+  "search_raids": "Szukaj Raidów",
+  "search_eggs": "Szukaj Jaj",
+  "search_quests": "Szukaj Zadań",
+  "search_lures": "Szukaj Przynęt",
+  "search_invasions": "Szukaj Inwazji",
+  "sm": "sm",
+  "md": "md",
+  "lg": "lg",
   "xl": "XL",
   "min": "Min",
-  "max": "Max",
-  "set_size": "Ustaw rozmiar ikon",
-  "slot_selection": "Wybór szczeliny",
+  "max": "Maks",
+  "set_size": "Ustaw Rozmiar Ikony",
+  "slot_selection": "Wybór Slotu",
   "generations": "Generacje",
   "types": "Typy",
   "forms": "Formy",
-  "rarity": "Rzadkość",
+  "rarity": "Obecna Rzadkość",
   "others": "Inne",
   "categories": "Kategorie",
-  "%": "%",
-  "rank": "Rank",
+  "rank": "Ranga",
   "slider_iv": "Zakres IV",
-  "slider_great": "Great League",
-  "slider_ultra": "Ultra League",
-  "slider_little": "Little Cup",
+  "slider_great": "Wielka Liga",
+  "slider_ultra": "Ultra Liga",
+  "slider_little": "Liga Maluchów",
   "slider_atk_iv": "Atak",
   "slider_def_iv": "Obrona",
-  "slider_sta_iv": "Stamina",
+  "slider_sta_iv": "Wytrzymałość",
   "slider_level": "Poziom",
-  "abbreviation_level": "L",
-  "lvl": "LVL",
-  "cap": "Cap",
-  "custom": "Dostosowany",
-  "valid": "Poprawny",
-  "invalid": "Niepoprawny!",
-  "overwrites": "Nadpisuje wszystkie filtry",
-  "valid_filter": "Filtr statystyk poprawny",
-  "invalid_filter": "Wprowadź poprawny filtr",
-  "gyms": "Gymy",
-  "nests": "Nesty",
-  "pokestops": "Pokestopy",
-  "pokemon": "Pokemony",
-  "wayfarer": "Wayfarer",
-  "scan_areas": "Skanowane obszary",
+  "slider_size": "Rozmiar",
+  "abbreviation_level": "P",
+  "lvl": "Poz",
+  "cap": "Maks",
+  "custom": "Niestandardowy",
+  "valid": "Prawidłowy",
+  "invalid": "Nieprawidłowy!",
+  "overwrites": "Zastępuje Wszystkie Filtry",
+  "valid_filter": "Prawidłowy Filtr Statystyk",
+  "invalid_filter": "Wprowadź Prawidłowy Filtr",
+  "gyms": "Siłownie",
+  "nests": "Gniazda",
+  "pokestops": "PokéStopy",
+  "pokemon": "Pokémony",
+  "wayfarer": "Wędrowiec",
+  "scan_areas": "Skanuj Obszary",
+  "s2cells": "Komórki S2",
   "weather": "Pogoda",
-  "admin": "Administrator",
+  "admin": "Admin",
   "settings": "Ustawienia",
   "advanced": "Zaawansowane",
+  "tile_servers": "Serwery Kafelków",
   "icons": "Ikony",
   "navigation": "Nawigacja",
-  "drawer": "Menu nawigacyjne",
-  "iconsDefault": "Domyślne",
-  "drawer_temporary": "Tymaczsowe",
+  "drawer": "Menu",
+  "tile_servers_default": "Domyślny",
+  "drawer_temporary": "Tymczasowe",
   "drawer_persistent": "Stałe",
-  "locale_selection": "Wybór języka",
+  "locale_selection": "Wybór Języka",
   "import": "Importuj",
   "export": "Eksportuj",
   "logout": "Wyloguj",
   "local_storage_cleared": "Lokalna pamięć została wyczyszczona!",
-  "iv_or_filter": "IV OR Filtr",
-  "polygons": "Obszary",
+  "iv_or_filter": "Filtr IV LUB",
+  "polygons": "Poligony",
   "raids": "Raidy",
-  "ex_eligible": "EX Gymy",
-  "in_battle": "W trakcie walki",
-  "all_pokestops": "Pokestopy",
-  "all_gyms": "Gymy",
-  "lures": "Lury",
+  "ex_eligible": "Kwalifikujące się do EX",
+  "in_battle": "W Walce",
+  "all_pokestops": "Wszystkie PokéStopy",
+  "lures": "Przynęty",
   "quests": "Zadania",
   "invasions": "Inwazje",
   "portals": "Portale",
-  "submission_cells": "Komórki do zgłoszenia",
-  "spawnpoint": "Spawnpoint",
-  "spawnpoints": "Spawnpointy",
-  "s2_cell_level": "Poziom {{level}} S2 Cell",
-  "total_count": "Całkowita ilość",
-  "next_submission": "Kolejne zgłoszenie!",
+  "submission_cells": "Komórki Zgłoszeń",
+  "spawnpoint": "Punkt Respawnu",
+  "spawnpoints": "Punkty Respawnu",
+  "s2_cell_level": "Komórka S2 Poziomu {{level}}",
+  "total_count": "Łączna Liczba",
+  "next_submission": "Następne Zgłoszenie!",
   "never": "Nigdy",
-  "next_gym": "Kolejny gym",
-  "scan_cells": "Komórki S2",
+  "next_gym": "Następna Siłownia",
+  "scan_cells": "Skanuj Komórki",
   "devices": "Urządzenia",
-  "use_my_location": "Użyj bieżącej lokalizacji",
-  "submit_feedback_title": "Prześlij komentarz / Zgłoś błąd",
-  "use_the_link_below": "Możesz użyć poniższego linka aby przesłać opinię lub zgłosić napotkane błędy.",
-  "feedback_to_devs": "Opinia przesyłana jest bezpośrednio do programistów.",
-  "feedback_form": "Formularz zgłoszenia",
-  "unknown_pokestop": "Nieznana nazwa Pokestopu",
-  "unknown_gym": "Nieznana nazwa gymu",
+  "use_my_location": "Użyj Mojej Lokalizacji",
+  "submit_feedback_title": "Prześlij Opinię/Zgłoś Problem",
+  "use_the_link_below": "Możesz użyć poniższego linka, aby przesłać opinię lub zgłosić napotkane błędy.",
+  "feedback_to_devs": "Ta opinia jest wysyłana bezpośrednio do programistów.",
+  "feedback_form": "Formularz Opinii",
+  "unknown_pokestop": "Nieznana Nazwa PokéStopu",
+  "unknown_gym": "Nieznana Nazwa Siłowni",
   "exclude": "Wyklucz",
-  "exclude_quest": "Wyklucz zadanie",
-  "exclude_invasion": "Wyklucz inwazję",
-  "exclude_team": "Wyklucz drużynę",
-  "exclude_raid": "Wyklucz raid",
-  "timer": "Licznik",
+  "exclude_quest": "Wyklucz Zadanie",
+  "exclude_invasion": "Wyklucz Inwazję",
+  "exclude_team": "Wyklucz Drużynę",
+  "exclude_raid": "Wyklucz Rajd",
+  "exclude_lure": "Wyklucz Przynętę",
+  "timer": "Stoper",
   "hide": "Ukryj",
   "tier": "Poziom",
-  "slots": "Miejsc",
+  "slots": "Miejsca",
   "mega": "Mega",
   "form": "Forma",
-  "starts": "Początek",
-  "ends": "Koniec",
+  "starts": "Rozpoczyna się",
+  "ends": "Kończy się",
   "defender": "Obrońca",
   "cp": "CP",
   "kilogram": "kg",
   "meter": "m",
-  "total_cp": "Całkowite CP",
-  "first_seen": "Widziany",
-  "last_seen": "Ost. widziany",
-  "last_modified": "Ost. zmodyfikowany",
-  "last_updated": "Ost. zaktualizowany",
+  "total_cp": "Łączne CP",
+  "first_seen": "Pierwszy Raz Widziany",
+  "last_seen": "Ostatnio Widziany",
+  "last_modified": "Ostatnio Zmieniony",
+  "last_updated": "Ostatnio Aktualizowany",
   "imported": "Zaimportowany",
-  "nest_estimated": "Dane nestu są szacunkowe!",
-  "verify_nests": "Potwierdź sprawdzając aktualne spawny",
-  "nest_out_of_date": "Nest może być nieaktualny",
-  "nest_check_current": "Sprawdź aktualne spawny",
-  "spawns_per_hour": "spawny/h",
+  "nest_estimated": "Dane o Gnieździe są Szacunkowe!",
+  "verify_nests": "Weryfikuj, Sprawdzając Obecne Pojawienia się",
+  "nest_out_of_date": "Gniazdo Potencjalnie Nieaktualne!",
+  "nest_check_current": "Sprawdź Obecne Pojawienia się Zamiast",
+  "spawns_per_hour": "Na Godzinę",
   "teams": "Drużyny",
-  "eggs": "Jajka",
-  "reverse": "Odwrotne",
-  "selected": "Zaznaczone",
-  "unselected": "Niezaznaczone",
+  "eggs": "Jaja",
+  "reverse": "Odwrotnie",
+  "selected": "Wybrane",
+  "unselected": "Niewybrane",
   "only_available": "Dostępne",
-  "common": "Pospolity",
-  "uncommon": "Rzadziej spotykany",
-  "rare": "Rzadki",
-  "ultra_rare": "Bardzo rzadki",
-  "regional": "Regionalny",
+  "common": "Pospolite",
+  "uncommon": "Nietypowe",
+  "rare": "Rzadkie",
+  "ultra_rare": "Bardzo Rzadkie",
+  "regional": "Regionalne",
   "event": "Event",
-  "legendary": "Legendarne",
-  "mythical": "Normalne",
-  "alt_forms": "Alternatywne",
-  "Alola": "Alolański",
-  "Galarian": "Galariański",
-  "showing": "Widoczne",
+  "legendary": "Legendarny",
+  "mythical": "Mityczny",
+  "ultra_beast": "Ultra Bestia",
+  "alt_forms": "Alternatywne Formy",
+  "alola": "Alola",
+  "galarian": "Galar",
+  "showing": "Pokazuje",
   "instance": "Instancja",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Typy na booście",
-  "pokemon_options": "Opcje Pokemonów",
-  "pokestops_options": "Opcje Pokestopów",
-  "gyms_options": "Opcje gymów",
-  "nests_options": "Opcje nestów",
+  "boosted_types": "Wzmocnione Typy",
+  "pokemon_options": "Opcje Pokémon",
+  "pokestops_options": "Opcje PokéStop",
+  "gyms_options": "Opcje Siłowni",
+  "nests_options": "Opcje Gniazd",
   "wayfarer_options": "Opcje Wayfarer",
-  "admin_options": "Opcje administracyjne",
-  "clustering": "Scalanie",
-  "glow": "Poświata",
-  "legacy_filter": "Stary filtr",
-  "raid_timers": "Licznik czasu wszystkich raidów",
-  "invasion_timers": "Licznik czasu wszystkich inwazji",
-  "lure_timers": "Licznik czasu wszystkich lurów",
-  "device_path_color": "Kolor ścieżki urządzenia",
-  "old_portals": "Stare portale",
-  "new_portals": "Nowe portale",
+  "admin_options": "Opcje Admina",
+  "weather_options": "Opcje Pogody",
+  "s2cells_options": "Opcje Komórek S2",
+  "clustering": "Klastrowanie",
+  "glow": "Świecenie",
+  "legacy_filter": "Filtr Dziedzictwa",
+  "raid_timers": "Wszystkie Stoper Rajdów",
+  "invasion_timers": "Wszystkie Stoper Inwazji",
+  "lure_timers": "Wszystkie Stoper Przynęt",
+  "device_path_color": "Kolor Ścieżki Urządzenia",
+  "old_portals": "Stare Portale",
+  "new_portals": "Nowe Portale",
   "items": "Przedmioty",
   "energy": "Energia",
-  "ar_eligible": "Zadania AR",
-  "iv_circles": "Znaczniki IV",
-  "min_iv_circle": "Minimalne IV znacznika",
-  "interaction_ranges": "Okręgi interakcji",
-  "cannot_connect": "Nie można połączyć się z serwerem w tej chwili.\nNatychmiastowa ponowna próba spowoduje tylko więcej problemów.\nProszę spróbować ponownie za kilka minut.\n\n- Administracja",
-  "mad_quest_text": "Natywne zadania",
-  "xs": "xs",
-  "primary": "Podstawowe",
-  "secondary": "Rozszerzone",
-  "open_menu": "Otwórz menu",
+  "ar_eligible": "Dostępny w AR",
+  "iv_circles": "Wskaźniki IV",
+  "min_iv_circle": "Minimalny Okrąg IV",
+  "interaction_ranges": "Zasięgi Interakcji",
+  "cannot_connect": "\nNie można połączyć się z serwerem w tej chwili.\nPonowna próba natychmiast tylko spowoduje więcej problemów.\nSpróbuj ponownie za kilka minut.\n\n- Zespół Admina Mapy",
+  "mad_quest_text": "Rodzime Zadania",
+  "xs": "XS",
+  "primary": "Podstawowy",
+  "secondary": "Pomocniczy",
   "zero_iv": "0% IV",
+  "hundo_iv": "100% IV",
+  "open_menu": "Otwórz Menu",
   "zoom_in": "Przybliż",
   "zoom_out": "Oddal",
-  "hundo_iv": "100% IV",
-  "welcome": "Witaj w",
-  "back": "Wstecz",
-  "next": "Dalej",
+  "welcome": "Witamy w",
+  "back": "Wróć",
+  "next": "Następny",
   "finish": "Zakończ",
-  "start_tutorial": "Samouczek początkowy",
-  "view_profile": "Zobacz profil",
-  "login_optional": "Login (opcjonalnie)",
+  "start_tutorial": "Rozpocznij Samouczek",
+  "view_profile": "Zobacz Profil",
+  "login_optional": "Logowanie (Opcjonalne)",
   "tutorial": "Samouczek",
-  "tutorial_language": "Wybierz język",
-  "tutorial_welcome": "To jest interaktywny samouczek i możesz śmiało korzystać ze wszystkich dostępnych opcji",
-  "tutorial_categories": "Kategorie do których masz dostęp",
-  "tutorial_logged_in": "Możesz zobaczyć szczegóły dotyczące uprawnień na swoim profilu.",
-  "tutorial_logged_out": "Możesz zobaczyć szczegóły dotyczące uprawnień po zalogowaniu.",
-  "tutorial_sidebar_0": "Tutaj są wszystkie Twoje filtry i ustawienia",
-  "tutorial_sidebar_1": "Używając suwaków możesz wybrać dokładnie te dane z wybranej kategorii, których potrzebujesz",
-  "tutorial_sidebar_2": "Opcje: Dodatkowe dostosowanie\nZaawansowane: Zostanie omówione w dalszej części tego samouczka",
-  "tutorial_sliders_0": "Użyj suwaków aby dostosować filtry",
-  "tutorial_sliders_1": "Pokemony pomiędzy:",
-  "tutorial_sliders_2": "- IV od {{iv0}}% do {{iv1}}%",
+  "tutorial_language": "Wybierz swój język",
+  "tutorial_welcome": "Ten samouczek jest interaktywny i bardzo zachęcamy do korzystania ze wszystkich dostępnych opcji",
+  "tutorial_categories": "Kategorie, do których masz dostęp",
+  "tutorial_logged_in": "Możesz zobaczyć szczegóły dotyczące swoich uprawnień, przeglądając swój profil.",
+  "tutorial_logged_out": "Możesz zobaczyć szczegóły dotyczące swoich uprawnień, logując się.",
+  "tutorial_sidebar_0": "Wszystkie Twoje Filtry i Ustawienia Znajdują się Tutaj",
+  "tutorial_sidebar_1": "Dla każdej kategorii będziesz mógł dokładnie wybrać, jakie dane chcesz, używając przełączników",
+  "tutorial_sidebar_2": "Opcje: Dodatkowa personalizacja\nZaawansowane: Omówimy to później w tym samouczku",
+  "tutorial_sliders_0": "Używanie suwaków do dostosowywania filtrów",
+  "tutorial_sliders_1": "Pokémony Między:",
+  "tutorial_sliders_2": "- IVs od {{iv0}}% do {{iv1}}%",
   "tutorial_sliders_3": "Poziom od {{level0}} do {{level1}}",
-  "tutorial_sliders_3alt": "- ORAZ Poziom od {{level0}} do {{level1}}",
-  "tutorial_sliders_4": "- Ranking Great League od {{gl0}} do {{gl1}}",
-  "tutorial_sliders_4alt": "- ALBO Ranking Great League od {{gl0}} do {{gl1}}",
-  "tutorial_sliders_5": "- Ranking Ultra League od {{ul0}} do {{ul1}}",
-  "tutorial_sliders_5alt": "- ALBO Ranking Ultra League od {{ul0}} do {{ul1}}",
-  "tutorial_sliders_6": "Łączy się z innymi tego samego koloru",
-  "tutorial_sliders_7": "Filtruje oddzielnie od pozostałych suwaków",
-  "tutorial_sliders_8": "'Pełen' suwak oznacza, że jest nieaktywny:",
-  "tutorial_sliders_9": "Wszystkie spawny, niezależnie od tego, czy posiadają IV czy nie",
+  "tutorial_sliders_3alt": "- I JEST na Poziomie od {{level0}} do {{level1}}",
+  "tutorial_sliders_4": "- Ranga w Great League od {{gl0}} do {{gl1}}",
+  "tutorial_sliders_4alt": "- LUB Ranga w Great League od {{gl0}} do {{gl1}}",
+  "tutorial_sliders_5": "- Ranga w Ultra League od {{ul0}} do {{ul1}}",
+  "tutorial_sliders_5alt": "- LUB Ranga w Ultra League od {{ul0}} do {{ul1}}",
+  "tutorial_sliders_6": "Łączy z innymi o tym samym kolorze",
+  "tutorial_sliders_7": "Filtruje osobno od innych suwaków",
+  "tutorial_sliders_8": "Pełny suwak oznacza, że jest wyłączony:",
+  "tutorial_sliders_9": "Wszystkie pojawienia się, niezależnie od sprawdzenia IV",
   "tutorial_help": "Skrót do tego menu",
-  "tutorial_adv_filter": "Tylko dla urządzeń mobilnych, otwiera opcje filtrowania w menu zaawansowanym",
-  "tutorial_tune": "Ustawia filtr zaawansowany dla wszystkich Pokemonów obecnie filtrowanych w menu",
-  "tutorial_format_size": "Ustawia rozmiar ikony dla wszystkich pozycji obecnie filtrowanych w menu",
-  "tutorial_check": "Włącza wszystkie pozycje obecnie filtrowane w menu",
-  "tutorial_clear": "Wyłącza wszystkie pozycje obecnie filtrowane w menu",
-  "tutorial_save": "Zapisuje wybrane Pokemony i zamyka okno",
-  "tutorial_show_all_view": "Przełącza Pokestopy i gymy",
-  "tutorial_show_pokemon_view": "Przełącza Pokemony",
-  "tutorial_toggle": "Kliknięcię w krzyżyk / X przełącza element",
-  "tutorial_pokemon_caption": "Ta ikona pozwala na ustawienie filtrów dla konkretnego Pokemona",
-  "tutorial_all_caption": "Drużyny mają dostęp do specjalnego menu slotowego\nWszystkie pozostałe przedmioty pozwalają na zmianę rozmiaru ikony",
-  "tutorial_popup_0": "Okienka pop-up są teraz interaktywne!",
-  "tutorial_popup_1": "Trzy kropki otwierają opcje ukryj, wyklucz lub przełącz licznik czasu",
-  "tutorial_popup_2": "Ikony po obydwu stronach linku nawigacyjnego rozwijają się pokazując dodatkowe informacje, wypróbuj jak to działa!",
-  "tutorial_popup_3": "Ikony w każdej kategorii różnią się, upewnij się, że wypróbujesz wszystkie",
+  "tutorial_adv_filter": "Tylko na urządzeniach mobilnych, otwiera opcje filtrowania zaawansowanego menu",
+  "tutorial_tune": "Ustawia zaawansowany filtr dla wszystkich Pokémonów aktualnie filtrowanych w menu",
+  "tutorial_format_size": "Ustawia rozmiar ikon dla wszystkich przedmiotów aktualnie filtrowanych w menu",
+  "tutorial_check": "Włącza wszystkie przedmioty aktualnie filtrowane w menu",
+  "tutorial_clear": "Wyłącza wszystkie przedmioty aktualnie filtrowane w menu",
+  "tutorial_save": "Zapisuje bieżący wybór i wychodzi",
+  "tutorial_show_all_view": "Przełącz PokéStopy i Gymy",
+  "tutorial_show_pokemon_view": "Przełącz Pokémony",
+  "tutorial_toggle": "Kliknięcie znacznika wyboru/krzyżyka przełącza przedmiot",
+  "tutorial_pokemon_caption": "Ta ikona pozwala ustawić filtry dla tego konkretnego Pokémona",
+  "tutorial_all_caption": "Drużyny mają specjalne menu slotów\nWszystkie inne przedmioty pozwalają dostosować rozmiar ikon",
+  "tutorial_popup_0": "Popupy są teraz interaktywne!",
+  "tutorial_popup_1": "Trzy kropki otwierają opcje ukrycia, wykluczenia i przełączania timera",
+  "tutorial_popup_2": "Ikony po obu stronach linku nawigacyjnego rozwiną się, aby pokazać dodatkowe informacje, spróbuj!",
+  "tutorial_popup_3": "Ikony różnią się w zależności od kategorii, koniecznie sprawdź je wszystkie",
   "tutorial_closing_0": "Dodatkowe informacje",
-  "tutorial_closing_1": "Ogólne suwaki Pokemonów na pasku bocznym działają oddzielnie od menu zaawansowanego i nie mają na siebie wpływu",
-  "tutorial_closing_2": "Nie zapomnij sprawdzić sekcji ustawień w menu nawigacyjnym",
-  "tutorial_closing_3": "Istnieje mnóstwo opcji wizualnych dostępnych dla każdej kategorii, ale im więcej z nich pojawi się na Twojej mapie, tym większe będzie prawdopodobieństwo, że mapa będzie działać wolno lub się zawiesi",
-  "tutorial_closing_4": "Mozesz ponownie obejrzeć samouczek wybierając go w panelu ustawień w menu nawigacyjnym",
-  "tutorial_closing_5": "Uważaj na siebie i powodzenia!",
+  "tutorial_closing_1": "Globalne suwaki Pokémonów w pasku bocznym działają niezależnie od zaawansowanego menu i nie wpływają na siebie",
+  "tutorial_closing_2": "Nie zapomnij sprawdzić sekcji Ustawienia w pasku bocznym",
+  "tutorial_closing_3": "Dostępnych jest wiele opcji estetycznych dla każdej kategorii, ale pamiętaj, że im więcej dodajesz do swojej mapy, tym większe ryzyko zamrożenia mapy",
+  "tutorial_closing_4": "Możesz ponownie wyświetlić ten samouczek, wybierając go w panelu Ustawienia w pasku bocznym",
+  "tutorial_closing_5": "Bądź bezpieczny i powodzenia!",
   "intro": "Wprowadzenie",
   "sidebar": "Pasek boczny",
   "sliders": "Suwaki",
-  "popups": "Pop-upy",
-  "closing": "Zamykanie",
+  "popups": "Popupy",
+  "closing": "Zakończenie",
   "shortcuts": "Skróty",
   "iv": "IV",
-  "area_restrictions": "Restrykcje obszarów",
+  "area_restrictions": "Ograniczenia obszarowe",
   "map": "Mapa",
   "stats": "Statystyki",
-  "pvp": "PvP",
-  "area_restrictions_subtitle": "Masz dostęp do następujących obszarów",
-  "devices_subtitle": "Pokazuje lokalizacje i trasy aktywnych urządzeń",
-  "gyms_subtitle": "Pokazuje lokalizację wszystkich aktywnych gymów, aktywne drużyny oraz ilosć dostępnych slotów",
-  "invasions_subtitle": "Pokazuje informacje o inwazji Zespołu R, włącznie z Pokemonami wystawionymi do walki oraz nagrodami, które możesz otrzymać",
-  "iv_subtitle": "Pokazuje IV w procentach oraz opcje poświaty",
-  "lures_subtitle": "Pokazuje informacje o lurach, włącznie z typem oraz czasem zakończenia lura",
+  "pvp": "PVP",
+  "area_restrictions_subtitle": "Masz dostęp do tych obszarów",
+  "devices_subtitle": "Pokazuje aktywne lokalizacje urządzeń i trasy",
+  "gyms_subtitle": "Pokazuje wszystkie aktywne lokalizacje gymów, aktywne drużyny i ile slotów ma każdy gym",
+  "invasions_subtitle": "Pokazuje informacje o inwazji Team Rocket, w tym skład bitwy, czas wygaśnięcia i możliwe nagrody",
+  "iv_subtitle": "Pokazuje IV% oraz opcje świecenia",
+  "lures_subtitle": "Pokazuje informacje o lure, w tym typ lure i czas wygaśnięcia",
   "map_subtitle": "Pokazuje mapę",
-  "nests_subtitle": "Pokazuje obecnie nestujące Pokemony oraz powierzchnie nestów",
-  "pokemon_subtitle": "Pokazuje lokalizacje Pokemonów oraz czas ich zniknięcia",
-  "pokestops_subtitle": "Pokazuje lokalizacje wszystkich Pokestopów",
-  "portals_subtitle": "Pokazuje portale z Ingress",
-  "pvp_subtitle": "Pokazuje rangę PVP/CP/informację o poziomie każdego Pokemona",
-  "quests_subtitle": "Pokazuje nagrodę oraz informację o zadaniu",
-  "raids_subtitle": "Pokazuje dane raidu, takie jak informacja o bossie, jajku, czasie zakończenia czy atakach bossa",
-  "scan_cells_subtitle": "Pokazuje czas ostatniego skanowania komórki S2 przez urządzenie",
-  "scan_areas_subtitle": "Pokazuje dostępne obszary skanowania",
-  "spawnpoints_subtitle": "Pokazuje spawnpointy oraz ich przybliżone czasy despawnu",
-  "stats_subtitle": "Pokazuje statystyki i poziomy Pokemona",
-  "submissionCells_subtitle": "Pokazuje informacje przydatne przy zgłaszaniu nowych portali",
-  "weather_subtitle": "Pokazuje aktualną pogodę w grze w każdej komórce",
+  "nests_subtitle": "Pokazuje aktywnie gniazdujące Pokémony i poligony gniazd",
+  "pokemon_subtitle": "Pokazuje wszystkie lokalizacje Pokémonów i czasy wygaśnięcia",
+  "pokestops_subtitle": "Pokazuje wszystkie lokalizacje PokéStopów",
+  "portals_subtitle": "Pokazuje wszystkie portale Ingress",
+  "pvp_subtitle": "Pokazuje informacje o randze/CP/Poziomie PVP dla każdego Pokemona",
+  "quests_subtitle": "Pokazuje informacje o nagrodach i zadaniach z misji",
+  "raids_subtitle": "Pokazuje wszystkie informacje o rajdach, w tym o bossie raidowym, jajach, czasie zakończenia i secie ruchów",
+  "scan_cells_subtitle": "Pokazuje ostatni czas skanowania komórki S2 przez urządzenie",
+  "scan_areas_subtitle": "Pokazuje dostępne obszary skanowania w formie poligonów",
+  "spawnpoints_subtitle": "Pokazuje punkty pojawiania się i szacowany czas ich zniknięcia",
+  "stats_subtitle": "Pokazuje statystyki i poziomy Pokémonów",
+  "submission_cells_subtitle": "Pokazuje informacje użyteczne przy zgłaszaniu nowych POI",
+  "weather_subtitle": "Pokazuje informacje o pogodzie w grze dla każdej komórki",
+  "scanner_subtitle": "Interakcja bezpośrednia ze skanerem na różne sposoby",
+  "s2cells_subtitle": "Wyświetla komórki S2 na mapie na różnych poziomach",
+  "backups_subtitle": "Umożliwia tworzenie kopii zapasowych i ładowanie ustawień na różnych urządzeniach",
+  "backups": "Kopie zapasowe",
   "user_profile": "Profil użytkownika",
-  "candy": "Candy",
-  "show_ex_badge": "Pokazuje odznakę EX",
+  "user_username": "Nazwa użytkownika",
+  "candy": "Cukierki",
+  "show_ex_badge": "Pokaż odznakę EX",
   "search": "Szukaj",
-  "global_search_quests": "Wprowadź nazwę nagrody...",
-  "global_search_pokestops": "Wprowadź nazwę Pokestopa...",
-  "global_search_gyms": "Wprowadź nazwę Gymu...",
-  "global_search_portals": "Wprowadź nazwę portalu...",
-  "global_search_nests": "Wprowadź nazwę nestującego Pokemona...",
-  "global_search_raids": "Wprowadż nazwę Raid Bossa...",
-  "raid_level_badges": "Odznaki poziomu raidu",
+  "global_search_quests": "Wpisz nazwę nagrody...",
+  "global_search_lures": "Wpisz nazwę przynęty...",
+  "global_search_pokestops": "Wpisz nazwę PokéStopu...",
+  "global_search_gyms": "Wpisz nazwę Sali Gym...",
+  "global_search_portals": "Wpisz nazwę Portalu...",
+  "global_search_nests": "Wpisz nazwę gatunku gniazda...",
+  "global_search_raids": "Wpisz nazwę bossa rajdowego...",
+  "global_search_pokemon": "Wpisz nazwę Pokemona...",
+  "global_search_invasions": "Wpisz typ, nazwę Grunta lub nazwę nagrody Pokemona...",
+  "raid_level_badges": "Odznaki poziomu rajdu",
   "options": "Opcje",
   "profile": "Profil",
-  "pokemon_icons": "Ikony Pokemonów",
-  "pokestop_icons": "Ikony Pokestopów",
-  "gym_icons": "Ikony gymów",
+  "pokemon_icons": "Ikony Pokémonów",
+  "pokestop_icons": "Ikony PokéStopów",
+  "gym_icons": "Ikony Gymów",
   "team_icons": "Ikony drużyn",
-  "egg_icons": "Ikony jajek",
-  "raid_icons": "Ikony raidów",
-  "nest_icons": "Ikony nestów",
+  "egg_icons": "Ikony jaj",
+  "raid_icons": "Ikony rajdów",
+  "nest_icons": "Ikony gniazd",
   "reward_icons": "Ikony nagród",
   "type_icons": "Ikony typów",
   "weather_icons": "Ikony pogody",
-  "misc_icons": "Pozostałe ikony",
+  "misc_icons": "Ikony różne",
   "invasion_icons": "Ikony inwazji",
-  "pokemon_timers": "Licznik czasu wszystkich Pokemonów",
-  "dialog_filter_footer_apply_to_all_width": 3,
-  "dialog_filter_footer_open_filter_width": 1,
-  "drawer_grid_advanced_width": 7,
-  "drawer_grid_options_width": 5,
-  "drawer_settings_tutorial_width": 5,
-  "popup_gym_description_width": 8,
-  "popup_gym_seen_timer_width": 4,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 8,
-  "popup_pokestop_seen_timer_width": 4,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 6,
-  "popup_pokemon_seen_timer_width": 5,
-  "popup_pokemon_data_width": 11,
-  "show_dex_num_in_popup": "Pokaż Pokedex # w Popupie",
-  "popup": "Popup",
-  "pvp_level": "Statystyki PvP poziomu {{level}}",
-  "pvp_mega": "Statystyki PvP Mega",
-  "ar_quest_true": "Zadanie AR",
-  "ar_quest_false": "Bez AR",
-  "exclude_quest_multi": "Wyklucz {{reward}}",
-  "exclude_lure": "Wyklucz lura",
-  "cluster_limit_0": "{{variable_0}} limit ({{variable_1}}) został osiągnięty",
-  "cluster_limit_1": "Proszę przybliż lub zawęź swoje filtry",
-  "show_polygons": "Pokaż Obszary",
-  "exclude_invasion_multi": "Wyklucz {{invasion}}",
-  "message_of_the_day": "Wiadomość Dnia",
-  "has_quest_indicator": "Alternatywny kolor dla Pokestopów z zadaniami",
-  "show_ar_badge": "Pokaż odznakę AR",
-  "general": "Ogólny",
-  "link_global_and_advanced": "Połącz globalne oraz zaawansowane",
-  "normal_forms": "Formy normalne",
-  "weather_indicator": "Wskaźnik pogody",
-  "page": "Strona {{page}}",
-  "tile_servers": "Serwer kafelków",
-  "tile_servers_default": "Domyślny",
-  "alola": "Alola",
-  "galarian": "galarian",
-  "submission_cells_subtitle": "Wyświetla informacje przydatne w dodawaniu nowych POI",
+  "spawnpoint_icons": "Ikony punktów spawnu",
+  "device_icons": "Ikony urządzeń",
+  "pokemon_audio": "Dźwięki Pokémonów",
+  "pokestop_audio": "Dźwięki PokéStopów",
+  "gym_audio": "Dźwięki Gymów",
+  "team_audio": "Dźwięki drużyn",
+  "egg_audio": "Dźwięki jaj",
+  "raid_audio": "Dźwięki rajdów",
+  "nest_audio": "Dźwięki gniazd",
+  "reward_audio": "Dźwięki nagród",
+  "type_audio": "Dźwięki typów",
+  "weather_audio": "Dźwięki pogody",
+  "misc_audio": "Dźwięki różne",
+  "invasion_audio": "Dźwięki inwazji",
+  "spawnpoint_audio": "Dźwięki punktów spawnu",
+  "device_audio": "Dźwięki urządzeń",
+  "pokemon_timers": "Timery wszystkich Pokemonów",
+  "show_dex_num_in_popup": "Pokaż numer Pokedex w oknie",
+  "popup": "Wyskakujące okienko",
+  "pvp_level": "Statystyki PVP na poziomie {{level}}",
+  "pvp_mega": "Statystyki Mega PVP",
   "webhook_entry": "Dodaj do {{name}}",
+  "remove_webhook_entry": "Usuń z {{name}}",
   "distance": "Dystans",
   "gym": "Gym",
-  "egg": "Jajko",
-  "raid": "Raid",
-  "lure": "Lur",
-  "quest": "Quest",
+  "egg": "Jajo",
+  "raid": "Rajd",
+  "lure": "Przynęta",
+  "quest": "Misja",
   "invasion": "Inwazja",
-  "nest": "Nest",
-  "pokestop": "Pokestop",
+  "nest": "Gniazdo",
+  "pokestop": "PokéStop",
   "team": "Drużyna",
-  "global": "Globalny",
+  "global": "Globalne",
   "manage_webhook": "Zarządzaj {{name}}",
   "drag_and_drop": "Przeciągnij i upuść znacznik, aby ustawić swoją lokalizację",
-  "click_to_select": "Kliknij aby wybrać",
-  "my_location": "Moja lokacja",
+  "click_to_select": "Kliknij, aby wybrać",
   "add_new": "Dodaj nowy alert {{category}}",
+  "my_location": "Moja lokalizacja",
   "choose_on_map": "Wybierz na mapie",
   "select_profile": "Wybierz profil",
   "distance_radius": "Podgląd odległości promienia",
   "areas": "Obszary",
   "select_webhook": "Wybierz bota",
-  "stardust": "Stardust",
+  "ar_quest_true": "Zadanie AR",
+  "ar_quest_false": "Brak AR",
+  "with_ar": "Z AR",
+  "both": "Oba",
+  "without_ar": "Bez AR",
+  "exclude_quest_multi": "Wyklucz {{reward}}",
+  "cluster_limit_0": "Limit {{variable_0}} ({{variable_1}}) został osiągnięty",
+  "cluster_limit_1": "Proszę przybliżyć lub zawęzić filtry",
+  "show_polygons": "Pokaż poligony",
+  "exclude_invasion_multi": "Wyklucz {{invasion}}",
+  "stardust": "Gwiezdny pył",
   "slider_cp": "CP",
-  "pvp_ranking_league": "League",
-  "pvp_ranking_min_cp": "Min. CP",
-  "slider_pvp": "Ranking",
+  "pvp_ranking_league": "Liga",
+  "pvp_ranking_min_cp": "Min CP",
+  "slider_pvp": "Rangi",
   "profile_no": "Profil",
   "template": "Szablon",
   "gender": "Płeć",
-  "clean": "Czyść",
+  "clean": "Wyczyść",
   "all_forms": "Wszystkie formy",
   "pvp_entry": "Wpis PVP",
-  "no_iv": "Dołącz bez IV",
+  "no_iv": "Wliczające brak IV",
   "by_distance": "Według odległości",
-  "min_time": "Minimalny czas",
+  "min_time": "Min. czas",
   "add_new_profile": "Dodaj nowy profil",
   "slider_none": "Brak",
   "non_registered_human_title": "Ups, coś poszło nie tak!",
-  "non_registered_human_desc": "Nie możesz być zarejestrowany w {{webhook}}\n\nLub serwer jest obecnie niedostępny",
-  "try_again_later": "Spróbuj ponownie później",
-  "selected_areas": "{{amount}} wybrany obszar",
-  "selected_areas_plural": "{{amount}} wybrane obszary",
-  "webhook_selection": "{{name}} wybór",
+  "non_registered_human_desc": "Możliwe, że nie jesteś zarejestrowany z {{webhook}}\nAlbo serwer jest aktualnie nieosiągalny",
+  "try_again_later": "Proszę spróbować ponownie później",
+  "selected_areas_one": "{{count}} wybrany obszar",
+  "selected_areas_other": "{{count}} wybrane obszary",
+  "webhook_selection": "Wybór {{name}}",
+  "message_of_the_day": "Wiadomość dnia",
+  "has_quest_indicator": "Alternatywny kolor dla przystanków z zadaniami",
+  "show_ar_badge": "Pokaż odznakę AR",
+  "all_gyms": "Wszystkie siłownie",
+  "general": "Ogólne",
   "server_dev_error_0": "{{variable_0}}",
-  "navigation_controls": "Sterowanie nawigacją",
+  "link_global_and_advanced": "Globalne szanuje wybrane",
+  "normal_forms": "Normalne formy",
+  "weather_indicator": "Wskaźnik wzmocnienia pogodowego",
+  "page": "Strona {{page}}",
+  "navigation_controls": "Elementy nawigacyjne",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
-  "exclusive": "Ekskluzywny",
+  "exclusive": "Ekskluzywne",
   "all_moves": "Wszystkie ruchy",
   "move": "Ruch",
-  "any": "Każdy",
-  "select_all": "Zaznacz wszystko",
-  "delete_all": "Usuń zaznaczone",
+  "any": "Dowolne",
+  "min_spawn_average": "Średni min. wskaźnik pojawiania się",
+  "select_all": "Wybierz wszystko",
+  "delete_all": "Usuń wybrane",
   "cancel": "Anuluj",
   "day_1": "Poniedziałek",
   "day_2": "Wtorek",
@@ -397,176 +415,137 @@
   "day_7": "Niedziela",
   "profile_name": "Nazwa profilu",
   "manage_profiles": "Zarządzaj profilami",
-  "min_spawn_avg": "Średnia minimalna liczba spawnów",
-  "min_spawn_average": "Średnia minimalna liczba spawnów",
+  "min_spawn_avg": "Średni min. wskaźnik pojawiania się",
   "poke_global": "Wszystko",
   "amount": "Ilość",
-  "specific_gym": "Określony Gym",
-  "search_location": "Wyszukaj lokalizacje",
-  "search_specific": "Wyszukaj konkretną {{category}}",
-  "webhook_success_gym": "Dodano alerty o raidach, jajkach oraz zmianie drużyny!",
-  "slot_changes": "Zmiany w szczelinach",
-  "slot_changes_poracle": "slot_changes",
-  "confirm_delete": "Spowoduje to usunięcie całego śledzenia dla tego profilu, czy na pewno?",
-  "confirm_copy": "Wybierz profil, do którego chcesz skopiować „{{profile}}”, to całkowicie nadpisze ten profil.",
-  "webhook_error": "{{name}} nie mógł tego przetworzyć.\n\nSpróbuj ponownie później.",
-  "profile_error": "Musi być unikalny i prawidłowy",
-  "team_0": "Harmony",
-  "battle_changes": "W bitwie",
-  "battle_changes_poracle": "battle_changes",
-  "auto": "Automatyczny",
-  "webhooks_subtitle": "Zarządzaj alertami bezpośrednio z mapy dla tych botów",
+  "specific_gym": "Określona siłownia",
+  "search_location": "Szukaj lokalizacji",
+  "search_specific": "Szukaj określonego {{category}}",
+  "webhook_success_gym": "Alerty o rajdach, jajach i zmianach drużyn zostały dodane!",
+  "slot_changes": "Zmiany w miejscach",
+  "slot_changes_poracle": "zmiany_miejsc",
+  "confirm_delete": "To usunie wszystkie śledzenia dla tego profilu, czy jesteś pewien?",
+  "confirm_copy": "Wybierz, do którego profilu chciałbyś skopiować \"{{profile}}\", spowoduje to całkowite nadpisanie tego profilu.",
+  "webhook_error": "{{name}} nie był w stanie tego przetworzyć.\nProszę spróbować ponownie później.",
+  "profile_error": "Musi być unikalne i poprawne",
+  "team_0": "Harmonia",
+  "battle_changes": "W walce",
+  "battle_changes_poracle": "zmiany_walce",
+  "auto": "Auto",
+  "webhooks_subtitle": "Zarządzaj swoimi alertami bezpośrednio z mapy dla tych botów",
+  "event_stops_subtitle": "Wyświetla specjalne przystanki wydarzeń takie jak Kecleon",
   "webhooks": "Alerty",
+  "scanner": "Akcje skanera",
   "everything_individually": "Dodaj indywidualne alerty",
-  "individually": "indywidualne",
+  "individually": "indywidualnie",
   "join": "Dołącz",
-  "errors_404": "Ups, nie można znaleźć tej strony!",
+  "errors_404": "Oops, tej strony nie można znaleźć!",
   "errors_500": "Wystąpił błąd serwera, spróbuj ponownie później!",
   "local_username": "Nazwa użytkownika",
   "local_password": "Hasło",
-  "local_error": "Wystąpił błąd, spróbuj ponownie później!",
-  "no_filter_results": "Nie znaleziono wyników\n\nSpróbuj poszerzyć swoje filtry",
-  "donor_page": "Strona Sponsora",
+  "local_error": "Wystąpił błąd, proszę spróbować ponownie później.",
+  "no_filter_results": "Nie znaleziono wyników\nSpróbuj poszerzyć filtry",
+  "donor_page": "Strona darczyńców",
   "go_back": "Wróć",
   "access": "Dostęp",
-  "link_discord": "Odnośnik do Discorda",
-  "select_webhook_strategy": "Menedżer alertów",
-  "webhook_strategy_success_0": "Sukces! \nOdświeżam, aby pobrać ustawienia alertów...",
-  "register": "Zarejestruj",
-  "invalid_credentials": "Nieprawidłowe dane logowania",
-  "error_creating_user": "W tej chwili nie można zarejestrować nowego użytkownika",
-  "discord_linked": "Dyskord połączony",
-  "telegram_linked": "Połączono z telegramem",
+  "link_discord": "Połącz Discord",
+  "select_webhook_strategy": "Manager Alertów",
+  "webhook_strategy_success_0": "Sukces! Odświeżanie, aby pobrać ustawienia alertów...",
+  "register": "Zarejestruj się",
+  "invalid_credentials": "Nieprawidłowe Dane Logowania",
+  "localauth_failed": "Uwierzytelnianie nieudane",
+  "error_creating_user": "Nie można zarejestrować nowego użytkownika w tym momencie",
+  "discord_linked": "Połączono z Discordem",
+  "telegram_linked": "Połączono z Telegramem",
   "level": "poziom",
   "km": "km",
-  "feedback": "Wyślij opinię",
-  "donor_menu": "Menu Sponsora",
-  "with_ar": "Z AR",
-  "without_ar": "Bez AR",
-  "pokemon_cell": "Lokalizacja Pokemona może się różnić",
-  "timer_verified": "Ten licznik jest zweryfikowany",
-  "timer_unverified": "Ten licznik jest niezweryfikowany",
+  "feedback": "Opinie",
+  "donor_menu": "Menu Darczyńcy",
+  "pokemon_cell": "Lokalizacja Pokemona Może Się Różnić",
+  "timer_verified": "Ten Timer Jest Zweryfikowany",
+  "timer_unverified": "Ten Timer Nie Jest Zweryfikowany",
   "all": "Wszystkie",
-  "both": "Obydwa",
   "badge_0": "Brak",
-  "badge_1": "Brąz",
-  "badge_2": "Srebro",
-  "badge_3": "Złoto",
-  "gym_badge_menu": "Edytuj odznakę gymu",
-  "gym_badges": "Odznaki gymów",
-  "gym_badge_diamonds": "Pokaż odznaki gymów",
-  "gym_badges_subtitle": "Wyświetla odznaki gymów na mapie oraz listę na stronie profilu.",
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "confirm_filters_reset": "Zresetuj ustawienia",
-  "filters_reset_text": "Czy na pewno chcesz zresetować ustawienia do domyślnych wartości? Ta czynność jest nieodwracalna!",
-  "filters_reset_title": "Reset ustawień",
-  "loading": "Ładowanie {{category}}",
-  "loading_icons": "Ładowanie ikon",
-  "loading_invasions": "Ładowanie inwazji",
-  "pvp_ranking_cap": "Poziom",
-  "device_icons": "Ikony urządzeń",
-  "spawnpoint_icons": "Ikony Spawnpointów",
-  "raid_quick_select": "Szybki wybór",
+  "badge_1": "Brązowy",
+  "badge_2": "Srebrny",
+  "badge_3": "Złoty",
+  "gym_badge_menu": "Edytuj Odznaki Siłowni",
+  "gym_badges": "Odznaki Siłowni",
+  "gym_badge_diamonds": "Pokaż Odznaki Siłowni",
+  "gym_badges_subtitle": "Wyświetla odznaki siłowni na mapie oraz listę na stronie profilu.",
+  "confirm_filters_reset": "Zresetuj filtry",
+  "filters_reset_text": "Czy na pewno chcesz zresetować ustawienia do wartości domyślnych? Nie można tego cofnąć!",
+  "filters_reset_title": "Zresetuj filtry",
+  "raid_quick_select": "Szybki Wybór",
   "disabled": "Wyłączone",
-  "no_alerts": "Brak alertów",
-  "search_quests": "Szukaj zadań",
-  "search_lures": "Szukaj lurów",
-  "search_invasions": "Szukaj inwazji",
-  "scan_next": "Lokalizacja skanowania",
-  "scan_next_choose": "Przeciągnij i upuść znacznik, aby ustawić lokalizację skanowania",
-  "scan_zone": "Skanuj obszar",
-  "scan_zone_choose": "Przeciągnij i upuść znacznik, aby ustawić lokalizację skanowania i wybrać rozmiar",
+  "loading": "Ładowanie {{category}}",
+  "loading_icons": "Pobieranie Ikon",
+  "loading_invasions": "Pobieranie Inwazji",
+  "scan_next": "Skanuj Lokalizację",
+  "scan_next_choose": "Przeciągnij i Upuść Znacznik, Aby Ustawić Lokację Skanowania",
+  "scan_zone": "Skanuj Obszar",
+  "scan_zone_choose": "Przeciągnij i Upuść Znacznik, Aby Ustawić Lokację Skanowania i Wybrać Rozmiar",
   "scan_zone_size": "Rozmiar",
-  "scan_zone_range": "Zakres",
-  "scan_zone_spacing": "Rozstaw",
+  "scan_zone_range": "Zasięg",
+  "scan_zone_spacing": "Odstępy",
   "scan_zone_radius": "Promień",
-  "scan_requests": "Żądania skanowania",
-  "scan_queue": "Bieżąca kolejka",
-  "click_to_scan": "Skanuj tutaj",
-  "scan_confirmed_title": "Potwierdzone żądanie skanowania",
-  "scan_confirmed": "Skaner został wysłany do lokalizacji, wynik wkrótce pojawi się na mapie!",
-  "scan_loading_title": "Wysyłanie prośby o skanowanie",
+  "scan_requests": "Żądania Skanowania",
+  "scan_queue": "Aktualna Kolejka",
+  "click_to_scan": "Skanuj Tutaj",
+  "scan_confirmed_title": "Żądanie Skanowania Potwierdzone",
+  "scan_confirmed": "Pracownik został wysłany na lokalizację, wynik wkrótce pojawi się na mapie!",
+  "scan_loading_title": "Wysyłanie żądania skanowania",
   "scan_loading": "Twoje żądanie skanowania jest przetwarzane i wysyłane do systemu!",
   "scan_error_title": "Błąd",
   "scan_error": "Wystąpił błąd podczas przetwarzania żądania skanowania...",
-  "scan_outside_area": "Ta lokalizacja znajduje się poza granicami autoryzowanych obszarów",
-  "lc_title": "Śledź swoją lokalizację",
-  "lc_metersUnit": "m",
-  "lc_feetUnit": "ft",
+  "scan_outside_area": "Ta lokalizacja jest poza granicami autoryzowanych obszarów",
+  "pvp_ranking_cap": "Poziom",
+  "lc_title": "Śledź Swoją Lokalizację",
+  "lc_metersUnit": "metry",
+  "lc_feetUnit": "stopy",
   "lc_popup": "Jesteś w odległości {distance} {unit} od tego punktu",
-  "lc_outsideMapBoundsMsg": "Wydajesz się znajdować poza granicami mapy",
-  "loading_settings": "Ładowanie ustawień",
-  "refresh_to_continue": "Odśwież, zanim przejdziesz dalej",
-  "session_expired_title": "Sesja wygasła",
+  "lc_outsideMapBoundsMsg": "Wygląda na to, że znajdujesz się poza granicami mapy",
+  "no_alerts": "Brak Alertów",
+  "loading_settings": "Ładowanie Ustawień",
+  "refresh_to_continue": "Odśwież przed kontynuowaniem",
+  "session_expired_title": "Sesja Wygasła",
   "session_expired_body": "Twoja sesja wygasła",
-  "old_client_title": "Stara wersja",
-  "old_client_body": "Dostępna jest nowa wersja tej mapy",
+  "old_client_title": "Nieaktualne",
+  "old_client_body": "Nowa wersja tej mapy jest dostępna",
+  "early_old_client_title": "Nieaktualne",
+  "early_old_client_body": "Stara wersja tej aplikacji może być zapisana w pamięci podręcznej przeglądarki, musisz wyczyścić pamięć podręczną, zanim będziesz mógł używać tej aplikacji.",
   "refresh": "Odśwież",
   "points": "Punkty",
   "day": "Dzień",
   "days": "Dni",
-  "react_error": "Coś poszło nie tak",
-  "ultra_beast": "Ultra Beast",
-  "weather_options": "Opcje Pogody",
-  "clickable_icon": "Ikona jest klikalna",
-  "two_stops_till_next": "2 stopy do następnego",
-  "one_stop_till_next": "1 stop do następnego",
-  "no_more_gyms": "Koniec gymów",
-  "light_map_border": "Jasna ramka mapy",
-  "dark_map_border": "Ciemna ramka mapy",
-  "cell_blocked": "Komórka zablokowana",
+  "react_error": "Coś Poszło Nie Tak",
+  "clickable_icon": "Ikona Jest Klikalna",
+  "two_stops_till_next": "2 przystanki do następnego",
+  "one_stop_till_next": "1 przystanek do następnego",
+  "no_more_gyms": "Nie ma więcej siłowni",
+  "light_map_border": "Jasna Granica Mapy",
+  "dark_map_border": "Ciemna Granica Mapy",
+  "cell_blocked": "Komórka Zablokowana",
   "poi_color": "Kolor POI",
-  "quest_condition": "Warunek zadania",
-  "always_show_labels": "Zawsze pokazuj etykiety",
-  "scan_areas_options": "Opcje obszarów skanowania",
-  "historic_rarity": "Rzadkość historyczna",
-  "poi": "Interesujące punkty",
+  "quest_condition": "Warunek Misji",
+  "always_show_labels": "Zawsze Pokazuj Etykiety",
+  "scan_areas_options": "Opcje Skanowania Obszarów",
+  "historic_rarity": "Historyczna Rzadkość",
+  "poi": "Punkty Interesu",
   "300m_range": "Zasięg 300m",
-  "lure_range": "Zasięg Lura",
-  "tap_to_toggle": "Naciśnij, aby przełączyć",
-  "power_up": "Power Up",
-  "never_alt": "Nigdy",
-  "seen_nearby_stop": "Widziany w pobliżu",
-  "seen_nearby_cell": "Widziany w tej komórce",
-  "seen_lure_encounter": "Spotkany z Lura",
-  "seen_lure_wild": "Spawn z Lura",
-  "seen_wild": "Dziki Spawn",
-  "slider_size": "Rozmiar",
-  "s2cells": "Komórki S2",
-  "s2cells_options": "Opcje komórek S2",
-  "scanner_subtitle": "Współpracuj bezpośrednio ze skanerem na różne sposoby",
-  "s2cells_subtitle": "Wyświetla komórki S2 na różnych poziomach na mapie",
-  "backups_subtitle": "Umożliwia tworzenie kopii zapasowych i ładowanie ustawień na różne urządzenia",
-  "backups": "Kopie zapasowe",
-  "user_username": "Nazwa użytkownika",
-  "global_search_lures": "Wprowadź nazwę przynęty...",
-  "global_search_pokemon": "Wprowadź nazwę Pokémona...",
-  "remove_webhook_entry": "Usuń z {{name}}",
-  "event_stops_subtitle": "Wyświetla specjalne Pokéstopki eventowe, takie jak Kecleon",
-  "scanner": "Akcje skanera",
+  "lure_range": "Zasięg przynęty",
   "custom_range": "Niestandardowy zasięg",
-  "event_stops": "Stacje eventowe",
-  "event_stop_timers": "Timery stacji eventowych",
-  "size_0": "Dowolne",
+  "tap_to_toggle": "Dotknij, aby przełączyć",
+  "power_up": "Wzmocnienie",
+  "never_alt": "Nigdy",
+  "seen_nearby_stop": "Dostrzeżono w pobliżu",
+  "seen_nearby_cell": "Dostrzeżono w tej komórce",
+  "seen_lure_encounter": "Spotkanie przy przynęcie",
+  "seen_lure_wild": "Dziki spawn przy przynęcie",
+  "seen_wild": "Dziki spawn",
+  "event_stops": "Przystanki wydarzeń",
+  "event_stop_timers": "Czasomierze przystanków wydarzeń",
+  "size_0": "Dowolny",
   "size_1": "XXS",
   "size_2": "XS",
   "size_3": "M",
@@ -574,142 +553,166 @@
   "size_5": "XXL",
   "show_size_indicator": "Pokaż wskaźnik rozmiaru",
   "size": "Rozmiar",
-  "gold_stop": "Złoty Pokéstop",
-  "profile_backups": "Zamiana profilu",
-  "new_backup": "Nowa kopia zapasowa",
+  "gold_stop": "Złoty przystanek",
+  "profile_backups": "Zarządzanie profilami",
+  "new_backup": "Nowa kopia",
   "create": "Utwórz",
   "load": "Załaduj",
   "update": "Aktualizuj",
   "delete": "Usuń",
   "name": "Nazwa",
   "only_confirmed": "Tylko potwierdzone",
-  "rocket_pokemon": "Pokémony Rocket",
-  "decoy": "Przynęta",
-  "s2_cell_limit_0": "Próbowałeś wygenerować więcej niż 20 000 komórek ({{variable_0}})",
+  "rocket_pokemon": "Pokémon Teamu Rocket",
+  "decoy": "Fałszywka",
+  "s2_cell_limit_0": "Próba wygenerowania więcej niż 20 000 komórek ({{variable_0}})",
   "show_all_pvp_ranks": "Pokaż wszystkie rangi PVP",
   "enable_pokemon_popup_coords": "Pokaż współrzędne Pokémonów",
   "enable_gym_popup_coords": "Pokaż współrzędne siłowni",
   "enable_pokestop_popup_coords": "Pokaż współrzędne Pokéstopów",
-  "enable_portal_popup_coords": "Pokaż współrzędne portalu",
-  "on_block_join_discord": "Proszę dołącz do naszego discorda, aby uzyskać więcej informacji.",
-  "on_block_msg": "Zostałeś zablokowany za bycie członkiem",
-  "denied": "Odmówiono",
-  "showcase": "Prezentacja",
+  "enable_portal_popup_coords": "Pokaż współrzędne portali",
+  "on_block_join_discord": "Dołącz do naszego discorda, aby uzyskać więcej informacji.",
+  "on_block_msg": "Zostałeś zablokowany, ponieważ jesteś członkiem",
+  "denied": "Odmowa",
+  "showcase": "Wystawa",
   "unknown_event": "Nieznane wydarzenie",
   "scanner_countdown": "Dostępne za {{time}}s",
   "success": "Sukces",
-  "contribute": "Współpraca",
+  "contribute": "Przyczyn się",
   "mi": "mi",
   "filter_by_areas": "Filtruj według obszarów",
-  "submit_nest_name": "Prześlij nazwę gniazda",
+  "submit_nest_name": "Zgłoś nazwę gniazda",
   "nest_submission_menu": "Aktualizacja nazwy",
-  "nest_submissions": "Przesyłanie gniazd",
-  "nest_submissions_subtitle": "Pozwala na przesyłanie nowych nazw dla gniazd",
+  "nest_submissions": "Zgłoszenia gniazd",
+  "nest_submissions_subtitle": "Pozwala na zgłaszanie nowych nazw gniazd",
   "pokemon_opacity": "Dynamiczna przezroczystość Pokémonów",
-  "invasion_opacity": "Dynamiczna przezroczystość inwazji",
-  "raid_opacity": "Dynamiczna przezroczystość rajdów",
+  "invasion_opacity": "Dynamiczna przezroczystość Inwazji",
+  "raid_opacity": "Dynamiczna przezroczystość Raidów",
   "opacity_ten_minutes": "Przezroczystość po 10 minutach",
   "opacity_five_minutes": "Przezroczystość po 5 minutach",
   "opacity_one_minute": "Przezroczystość po 1 minucie",
   "level_circles": "Wskaźniki poziomu",
   "min_level_circle": "Minimalny poziom okręgu",
-  "mutation_auth_error": "Twoje żądanie nie powiodło się z powodu braku zalogowania",
-  "submitted_by": "Przesłane przez",
-  "localauth_failed": "Błąd uwierzytelniania",
-  "reversible": "Odwrotny",
+  "mutation_auth_error": "Twoje żądanie nie powiodło się z powodu niezalogowania",
+  "submitted_by": "Zgłoszone przez",
+  "reversible": "Odwracalne",
   "version": "Wersja",
-  "route_tags": "Etykiety trasy",
+  "route_tags": "Tagi trasy",
   "routes": "Trasy",
   "route_type": "Typ trasy",
-  "routes_subtitle": "Wyświetl trasy w grze i związane z nimi informacje na mapie",
+  "routes_subtitle": "Zobacz trasy w grze i odpowiednie informacje o nich na mapie",
   "description": "Opis",
   "additional_info": "Dodatkowe informacje",
   "duration": "Czas trwania",
-  "elevation": "Pochylenie",
+  "elevation": "Wzniesienie",
   "contest_category_1": "Najmniejszy rozmiar",
   "context_category_2": "Największy rozmiar",
-  "total_entries": "Całkowita liczba",
-  "showcase_rankings": "Rankingi prezentacji",
-  "showcase_rankings_subtitle": "Wyświetla listę najlepszych wyników dla prezentacji na Punkcie Przyciągania",
+  "total_entries": "Wszystkie wpisy",
+  "showcase_rankings": "Rankingi wystaw",
+  "showcase_rankings_subtitle": "Wyświetla listę najlepszych rankingów dla wystawy przy Pokéstopie",
   "tth": "TTH",
-  "tth_0": "Wszystko",
+  "tth_0": "Wszystkie",
   "tth_1": "Znane",
   "tth_2": "Nieznane",
   "no_access": "Brak dostępu",
-  "cooldown": "Oziębienie",
-  "scan_some_outside_area": "Niektóre lokalizacje znajdują się poza uprawnionymi granicami",
-  "alerts": "Alerty",
+  "cooldown": "Czas oczekiwania",
+  "scan_some_outside_area": "Niektóre lokalizacje są poza dozwolonymi granicami",
+  "alerts": "alertów",
   "alert_manager": "Menedżer alertów",
   "menu": "Menu",
   "theme": "Motyw",
   "exit": "Wyjście",
-  "component": "Komponent",
+  "component": "Składnik",
   "component_login_page": "Strona logowania",
   "component_donation_page": "Strona dotacji",
-  "component_message_of_the_day": "Komunikat dnia",
+  "component_message_of_the_day": "Wiadomość dnia",
   "download": "Pobierz",
   "playground": "Plac zabaw",
-  "locale": "Lokalizacja",
-  "saved": "Zapisane",
-  "show_editor": "Pokaż edytor",
-  "hide_editor": "Ukryj edytor",
+  "locale": "Ustawienia regionalne",
+  "saved": "Zapisano",
+  "show_editor": "Pokaż Edytor",
+  "hide_editor": "Ukryj Edytor",
   "reported_error": "Ten błąd został zgłoszony do serwera z identyfikatorem",
   "dark_mode": "Tryb ciemny",
-  "load_from_autosave": "Załaduj z automatycznego zapisu",
+  "load_from_autosave": "Wczytaj z automatycznego zapisu",
   "done": "Gotowe",
-  "fast": "Szybko",
-  "charged": "Naładowane",
+  "fast": "Szybki atak",
+  "charged": "Atak ładunkowy",
   "offline_mode": "Tryb offline",
-  "include_sponsored": "Uwzględnij Sponsorowane",
-  "showcase_color": "Kolor Wystawy",
-  "partner_color": "Kolor Partnera",
+  "include_sponsored": "Uwzględnij sponsorowane",
+  "showcase_color": "Kolor wystawowy",
+  "partner_color": "Kolor partnera",
   "disable": "Wyłącz {{- name}}",
-  "profiling": "Tworzenie Profili",
-  "showcase_block": "Zablokowane ze względu na wystawę",
-  "signed_in_as": "Zalogowano jako",
-  "missing_map_perm": "Nie masz uprawnień by wyświetlić mapę.",
-  "access_denied": "Brak dostępu",
-  "pokemon_audio": "Dźwięk Pokémonów",
-  "pokestop_audio": "Dźwięk w okolicy PokéStopu",
-  "gym_audio": "Dźwięk w okolicy siłowni",
-  "team_audio": "Dźwięk związany z drużyną",
-  "egg_audio": "Dźwięk jajka",
-  "raid_audio": "Dźwięk w okolicy rajdu",
-  "nest_audio": "Dźwięk w okolicy gniazda",
-  "reward_audio": "Dźwięk nagrody",
-  "type_audio": "Dźwięk typu",
-  "weather_audio": "Dźwięk związany z pogodą",
-  "misc_audio": "Różne dźwięki",
-  "invasion_audio": "Dźwięk inwazji",
-  "spawnpoint_audio": "Dźwięk w okolicy punktu zrespawnowania",
-  "device_audio": "Dźwięk urządzenia",
+  "profiling": "Profilowanie",
+  "showcase_block": "Zablokowane z powodu wystawy",
+  "signed_in_as": "Zalogowany jako",
+  "missing_map_perm": "Nie masz uprawnień do wyświetlania mapy.",
+  "access_denied": "Dostęp zabroniony",
   "audio": "Dźwięk",
-  "desktop_notifications": "Powiadomienia na komputerze",
+  "desktop_notifications": "Powiadomienia na pulpicie",
   "notifications_options": "Opcje powiadomień",
-  "audio_always_on": "Dźwięk zawsze odtwarzany",
+  "audio_always_on": "Dźwięk zawsze włączony",
   "volume_level": "Poziom głośności",
   "notifications_status": "Status powiadomień",
-  "granted": "udzielono",
-  "global_search_invasions": "Wprowadź typ Grunta, Imię lub nazwę nagrody za pokonanie...",
+  "granted": "przyznano",
   "set_all": "Ustaw wszystko",
   "set_filtered": "Ustaw filtrowane",
   "only_show_available": "Pokaż tylko dostępne",
   "easy_mode": "Tryb łatwy",
-  "quick_select": "Globalne szybkie wybory",
-  "pokemon_filter_mode": "Tryb filtru Pokemonów",
+  "quick_select": "Szybki wybór globalny",
+  "pokemon_filter_mode": "Tryb filtrów Pokémon",
   "basic": "Podstawowy",
   "intermediate": "Średniozaawansowany",
   "expert": "Ekspert",
-  "basic_description": "Łatwe wybieranie Pokémonów i zastosowanie globalnego filtra",
-  "intermediate_description": "Ustawianie indywidualnych filtrów globalnie i dla poszczególnych Pokémonów (tradycyjnie)",
-  "expert_description": "Ręczne wprowadzanie zapytań dla najbardziej zaawansowanych ustawień",
+  "basic_description": "Łatwe wybieranie Pokémonów i stosowanie globalnego filtru",
+  "intermediate_description": "Ustawianie indywidualnych filtrów globalnie i na Pokémona (tradycyjne)",
+  "expert_description": "Ręczne wprowadzanie zapytań dla największej personalizacji",
   "icon_size": "Rozmiar ikony",
   "developer": "Deweloper",
-  "raid_override": "Nadpisywanie rajdu",
-  "search_rocket_pokemon": "Wyszukaj Pokemony Rocket",
-  "main": "Główne",
-  "extra": "Dodatkowe",
+  "raid_override": "Zastąpienie Raidu",
+  "search_rocket_pokemon": "Szukaj Pokemonów Rocket",
+  "main": "Główny",
+  "extra": "Dodatkowy",
   "select": "Wybierz",
-  "searching": "wyszukiwanie...",
-  "no_options": "Brak opcji..."
+  "searching": "szukanie...",
+  "no_options": "Brak opcji...",
+  "and": "I",
+  "or": "LUB",
+  "only_global": "Tylko globalnie",
+  "global_caption": "Ignoruje wszystkie inne filtry",
+  "global_and_individual": "Globalne i indywidualne filtry",
+  "gender_filters_all": "Płeć stosowana do wszystkich",
+  "and_caption": "Połączone razem",
+  "or_caption": "Filtruje niezależnie",
+  "filter_help": "Pomoc w filtracji",
+  "kilometers": "Kilometry",
+  "miles": "Mile",
+  "distance_unit": "Jednostka odległości",
+  "data_management": "Zarządzanie danymi",
+  "reset_or_manage_text": "Możesz zresetować swoje filtry albo przejrzeć stronę zarządzania danymi, która pozwoli Ci na reset poszczególnych kategorii.",
+  "reset_audio": "Resetuj dźwięk",
+  "reset_all": "Resetuj wszystko",
+  "reset_icons": "Resetuj ikony",
+  "reset_position": "Resetuj pozycję",
+  "reset_ui": "Resetuj UI",
+  "reset_options": "Resetuj opcje",
+  "reset_menus": "Resetuj menu",
+  "reset_settings": "Resetuj ustawienia",
+  "reset_general_title": "Ogólne",
+  "reset_filters_title": "Filtry",
+  "reset_assets": "Zasoby",
+  "reset_pokemon": "Resetuj Pokémony",
+  "reset_pokestops": "Resetuj PokéStopsy",
+  "reset_gyms": "Resetuj Siłownie",
+  "reset_nests": "Resetuj Gniazda",
+  "reset_portals": "Resetuj Portale",
+  "reset_routes": "Resetuj Trasy",
+  "reset_scan_areas": "Resetuj Obszary Skanowania",
+  "reset_scan_cells": "Resetuj Komórki Skanowania",
+  "reset_devices": "Resetuj Urządzenia",
+  "reset_weather": "Resetuj Pogodę",
+  "reset_s2cells": "Resetuj Komórki S2",
+  "reset_spawnpoints": "Resetuj Punkty pojawiania się",
+  "reset_submission_cells": "Resetuj Komórki Wysyłania",
+  "hisuian": "Hisuiański",
+  "spacial_rend_range": "Zasięg Pęknięcia Przestrzeni"
 }
diff --git a/packages/locales/lib/generated/pt-br.json b/packages/locales/lib/generated/pt-br.json
index a18ed0e4f..de21610c0 100644
--- a/packages/locales/lib/generated/pt-br.json
+++ b/packages/locales/lib/generated/pt-br.json
@@ -1,6 +1,6 @@
 {
-  "login": "Login",
-  "click_once": "Clique apenas em 'Autorizar' uma vez",
+  "login": "Entrar",
+  "click_once": "Clique em 'Autorizar' apenas uma vez",
   "save": "Salvar",
   "reset": "Redefinir",
   "close": "Fechar",
@@ -11,29 +11,29 @@
   "nests_filters": "Configurações de Filtro de Ninhos",
   "help": "Ajuda",
   "apply_to_all": "Aplicar a Todos",
-  "disable_all": "Desabilitar Todos",
-  "enable_all": "Habilitar Todos",
-  "enabled": "Habilitado",
+  "disable_all": "Desativar Todos",
+  "enable_all": "Ativar Todos",
+  "enabled": "Ativado",
   "legacy": "Legado",
   "id": "ID",
   "location": "Localização",
-  "search_pokemon": "Pesquisar Pokémon",
-  "search_nests": "Pesquisar Ninhos",
-  "search_gyms": "Pesquisar Ginásios",
-  "search_pokestops": "Pesquisar PokéStops",
-  "search_raids": "Pesquisar Raids",
-  "search_eggs": "Pesquisar Ovos",
-  "search_quests": "Pesquisar Missões",
-  "search_lures": "Pesquisar Iscas",
-  "search_invasions": "Pesquisar Invasões",
-  "sm": "sm",
+  "search_pokemon": "Buscar Pokémon",
+  "search_nests": "Buscar Ninhos",
+  "search_gyms": "Buscar Ginásios",
+  "search_pokestops": "Buscar PokéStops",
+  "search_raids": "Buscar Raids",
+  "search_eggs": "Buscar Ovos",
+  "search_quests": "Buscar Missões",
+  "search_lures": "Buscar Iscas",
+  "search_invasions": "Buscar Invasões",
+  "sm": "pe",
   "md": "md",
-  "lg": "lg",
+  "lg": "gr",
   "xl": "XL",
-  "min": "Mínimo",
-  "max": "Máximo",
+  "min": "Mín",
+  "max": "Máx",
   "set_size": "Definir Tamanho do Ícone",
-  "slot_selection": "Seleção de Slot",
+  "slot_selection": "Seleção de Espaço",
   "generations": "Gerações",
   "types": "Tipos",
   "forms": "Formas",
@@ -41,22 +41,22 @@
   "others": "Outros",
   "categories": "Categorias",
   "rank": "Rank",
-  "slider_iv": "Faixa IV",
+  "slider_iv": "Faixa de IV",
   "slider_great": "Liga Grande",
   "slider_ultra": "Liga Ultra",
-  "slider_little": "Copinha",
+  "slider_little": "Copa Pequena",
   "slider_atk_iv": "Ataque",
   "slider_def_iv": "Defesa",
-  "slider_sta_iv": "Stamina",
+  "slider_sta_iv": "Energia",
   "slider_level": "Nível",
   "slider_size": "Tamanho",
-  "abbreviation_level": "L",
-  "lvl": "Nív",
-  "cap": "Lim",
-  "custom": "Customizado",
+  "abbreviation_level": "N",
+  "lvl": "Nvl",
+  "cap": "Cap",
+  "custom": "Personalizado",
   "valid": "Válido",
   "invalid": "Inválido!",
-  "overwrites": "Sobrescreve Todos os Filtros",
+  "overwrites": "Substitui Todos os Filtros",
   "valid_filter": "Filtro de Estatísticas Válido",
   "invalid_filter": "Insira um Filtro Válido",
   "gyms": "Ginásios",
@@ -64,51 +64,51 @@
   "pokestops": "PokéStops",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
-  "scan_areas": "Áreas de Escaneamento",
+  "scan_areas": "Áreas de Varredura",
   "s2cells": "Células S2",
-  "weather": "Clima",
-  "admin": "Administrador",
+  "weather": "Tempo",
+  "admin": "Admin",
   "settings": "Configurações",
   "advanced": "Avançado",
-  "tile_servers": "Servidores de Tile",
+  "tile_servers": "Servidores de Telhas",
   "icons": "Ícones",
   "navigation": "Navegação",
-  "drawer": "Gaveta",
+  "drawer": "Menu Lateral",
   "tile_servers_default": "Padrão",
   "drawer_temporary": "Temporário",
   "drawer_persistent": "Persistente",
-  "locale_selection": "Seleção de Idioma",
+  "locale_selection": "Seleção de Local",
   "import": "Importar",
   "export": "Exportar",
   "logout": "Sair",
-  "local_storage_cleared": "O Armazenamento Local foi limpo!",
-  "iv_or_filter": "IV OU Filtro",
+  "local_storage_cleared": "Armazenamento Local foi limpo!",
+  "iv_or_filter": "Filtro IV OU",
   "polygons": "Polígonos",
   "raids": "Raids",
   "ex_eligible": "Elegível para EX",
   "in_battle": "Em Batalha",
   "all_pokestops": "Todos os PokéStops",
-  "lures": "Isca",
+  "lures": "Iscas",
   "quests": "Missões",
   "invasions": "Invasões",
   "portals": "Portais",
   "submission_cells": "Células de Submissão",
-  "spawnpoint": "Spawnpoint",
-  "spawnpoints": "Spawnpoints",
-  "s2_cell_level": "Célula S2 de Nível {{level}}",
+  "spawnpoint": "Ponto de Aparição",
+  "spawnpoints": "Pontos de Aparição",
+  "s2_cell_level": "Célula S2 Nível {{level}}",
   "total_count": "Contagem Total",
   "next_submission": "Próxima Submissão!",
   "never": "Nunca",
   "next_gym": "Próximo Ginásio",
-  "scan_cells": "Escaneie Células",
+  "scan_cells": "Varredura de Células",
   "devices": "Dispositivos",
   "use_my_location": "Usar Minha Localização",
-  "submit_feedback_title": "Enviar Feedback/Relatório de Bugs",
-  "use_the_link_below": "Você pode usar o link abaixo para enviar feedback ou relatar bugs que você encontrou.",
-  "feedback_to_devs": "Este feedback é enviado diretamente aos desenvolvedores.",
+  "submit_feedback_title": "Enviar Feedback/Relatar Bug",
+  "use_the_link_below": "Você pode usar o link abaixo para enviar feedback ou qualquer bug que você tenha encontrado.",
+  "feedback_to_devs": "Este feedback é enviado diretamente para os desenvolvedores.",
   "feedback_form": "Formulário de Feedback",
   "unknown_pokestop": "Nome de PokéStop Desconhecido",
-  "unknown_gym": "Nome de Ginásio Desconhecido",
+  "unknown_gym": "Ginásio Desconhecido",
   "exclude": "Excluir",
   "exclude_quest": "Excluir Missão",
   "exclude_invasion": "Excluir Invasão",
@@ -116,33 +116,33 @@
   "exclude_raid": "Excluir Raid",
   "exclude_lure": "Excluir Isca",
   "timer": "Temporizador",
-  "hide": "Esconder",
+  "hide": "Ocultar",
   "tier": "Nível",
-  "slots": "Slots",
+  "slots": "Vagas",
   "mega": "Mega",
   "form": "Forma",
-  "starts": "Começa",
-  "ends": "Termina",
+  "starts": "Início",
+  "ends": "Fim",
   "defender": "Defensor",
-  "cp": "CP",
+  "cp": "PC",
   "kilogram": "kg",
   "meter": "m",
-  "total_cp": "CP Total",
-  "first_seen": "Primeira Visualização",
-  "last_seen": "Última Visualização",
+  "total_cp": "PC Total",
+  "first_seen": "Visto Pela Primeira Vez",
+  "last_seen": "Visto Pela Última Vez",
   "last_modified": "Última Modificação",
   "last_updated": "Última Atualização",
   "imported": "Importado",
-  "nest_estimated": "Dados de Ninho são Estimados!",
-  "verify_nests": "Verifique Verificando Spawns Atuais",
-  "nest_out_of_date": "O Ninho está Potencialmente Desatualizado!",
-  "nest_check_current": "Verifique os Spawns Atuais em vez disso",
+  "nest_estimated": "Dados do Ninho Estimados!",
+  "verify_nests": "Verifique Checando Os Atuais Aparecimentos",
+  "nest_out_of_date": "Ninho Potencialmente Desatualizado!",
+  "nest_check_current": "Cheque os Atuais Aparecimentos em Vez disso",
   "spawns_per_hour": "Por Hora",
-  "teams": "Times",
+  "teams": "Equipes",
   "eggs": "Ovos",
   "reverse": "Inverter",
-  "selected": "Selecionados",
-  "unselected": "Não Selecionados",
+  "selected": "Selecionado",
+  "unselected": "Não Selecionado",
   "only_available": "Disponível",
   "common": "Comum",
   "uncommon": "Incomum",
@@ -152,48 +152,48 @@
   "event": "Evento",
   "legendary": "Lendário",
   "mythical": "Mítico",
-  "ultra_beast": "Ultra Beasts",
+  "ultra_beast": "Ultracriatura",
   "alt_forms": "Formas Alternativas",
   "alola": "Alola",
-  "galarian": "Galarian",
+  "galarian": "Galariano",
   "showing": "Mostrando",
   "instance": "Instância",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Tipos Impulsionados",
+  "boosted_types": "Tipos Potencializados",
   "pokemon_options": "Opções de Pokémon",
   "pokestops_options": "Opções de PokéStop",
   "gyms_options": "Opções de Ginásio",
   "nests_options": "Opções de Ninho",
-  "wayfarer_options": "Opções do Wayfarer",
-  "admin_options": "Opções de Administrador",
+  "wayfarer_options": "Opções de Wayfarer",
+  "admin_options": "Opções do Admin",
   "weather_options": "Opções de Clima",
-  "s2cells_options": "Opções de Célula S2",
+  "s2cells_options": "Opções de Células S2",
   "clustering": "Agrupamento",
   "glow": "Brilho",
-  "legacy_filter": "Filtro Legado",
+  "legacy_filter": "Filtro Antigo",
   "raid_timers": "Todos os Temporizadores de Raid",
   "invasion_timers": "Todos os Temporizadores de Invasão",
   "lure_timers": "Todos os Temporizadores de Isca",
-  "device_path_color": "Cor do Caminho do Dispositivo",
+  "device_path_color": "Cor do Trajeto do Dispositivo",
   "old_portals": "Portais Antigos",
-  "new_portals": "Portais Novos",
+  "new_portals": "Novos Portais",
   "items": "Itens",
   "energy": "Energia",
-  "ar_eligible": "Elegível para AR",
+  "ar_eligible": "Eligível para RA",
   "iv_circles": "Indicadores de IV",
-  "min_iv_circle": "Círculo IV Mínimo",
-  "interaction_ranges": "Faixas de Interação",
-  "cannot_connect": "\nNão é possível conectar ao servidor neste momento.\nTentar novamente imediatamente só causará mais problemas.\nPor favor, tente novamente em alguns minutos.\n\n- Equipe de Administração do Mapa",
+  "min_iv_circle": "Círculo Mínimo de IV",
+  "interaction_ranges": "Alcances de Interação",
+  "cannot_connect": "\nNão é possível conectar ao servidor neste momento.\nTentar novamente imediatamente só causará mais problemas.\nPor favor, tente novamente em alguns minutos.\n\n- Equipe Administrativa do Mapa",
   "mad_quest_text": "Missões Nativas",
-  "xs": "XS",
+  "xs": "XP",
   "primary": "Primário",
   "secondary": "Secundário",
-  "zero_iv": "0% IV",
-  "hundo_iv": "100% IV",
+  "zero_iv": "IV 0%",
+  "hundo_iv": "IV 100%",
   "open_menu": "Abrir Menu",
-  "zoom_in": "Aumentar Zoom",
-  "zoom_out": "Diminuir Zoom",
+  "zoom_in": "Ampliar",
+  "zoom_out": "Reduzir",
   "welcome": "Bem-vindo ao",
   "back": "Voltar",
   "next": "Próximo",
@@ -202,54 +202,54 @@
   "view_profile": "Ver Perfil",
   "login_optional": "Login (Opcional)",
   "tutorial": "Tutorial",
-  "tutorial_language": "Escolha seu Idioma",
-  "tutorial_welcome": "Este tutorial é interativo e é altamente recomendado que você experimente todas as opções fornecidas",
+  "tutorial_language": "Escolha Seu Idioma",
+  "tutorial_welcome": "Este tutorial é interativo e você é altamente incentivado a brincar com todas as opções fornecidas",
   "tutorial_categories": "Categorias às Quais Você Tem Acesso",
-  "tutorial_logged_in": "Você pode ver detalhes sobre suas permissões visualizando seu perfil.",
-  "tutorial_logged_out": "Você pode ver detalhes sobre suas permissões fazendo login.",
-  "tutorial_sidebar_0": "Todos os Seus Filtros e Configurações estão Aqui",
-  "tutorial_sidebar_1": "Para cada categoria, você poderá ativar ou desativar exatamente os dados que deseja usando os interruptores",
-  "tutorial_sidebar_2": "Opções: Personalização adicional\nAvançado: Será abordado posteriormente neste tutorial",
+  "tutorial_logged_in": "Você pode ver detalhes sobre suas permissões visitando seu perfil.",
+  "tutorial_logged_out": "Você pode ver detalhes sobre suas permissões ao fazer login.",
+  "tutorial_sidebar_0": "Todos os Seus Filtros & Configurações Estão Aqui",
+  "tutorial_sidebar_1": "Para cada categoria, você poderá alternar exatamente quais dados deseja usar os interruptores",
+  "tutorial_sidebar_2": "Opções: Personalização adicional\nAvançado: Iremos cobrir mais adiante neste tutorial",
   "tutorial_sliders_0": "Usando controles deslizantes para ajustar filtros",
   "tutorial_sliders_1": "Pokémon Entre:",
   "tutorial_sliders_2": "- IVs de {{iv0}}% a {{iv1}}%",
   "tutorial_sliders_3": "Nível {{level0}} a {{level1}}",
-  "tutorial_sliders_3alt": "- E é nível {{level0}} a {{level1}}",
-  "tutorial_sliders_4": "- Classificação na Liga Ótima {{gl0}} a {{gl1}}",
-  "tutorial_sliders_4alt": "- OU Classificação na Liga Ótima {{gl0}} a {{gl1}}",
-  "tutorial_sliders_5": "- Classificação na Liga Ultra {{ul0}} a {{ul1}}",
-  "tutorial_sliders_5alt": "- OU Classificação na Liga Ultra {{ul0}} a {{ul1}}",
-  "tutorial_sliders_6": "Encadeia com outros da mesma cor",
-  "tutorial_sliders_7": "Filtros separadamente de outros controles deslizantes",
+  "tutorial_sliders_3alt": "- E está no Nível {{level0}} a {{level1}}",
+  "tutorial_sliders_4": "- Ranking na Great League de {{gl0}} a {{gl1}}",
+  "tutorial_sliders_4alt": "- OU Ranking na Great League de {{gl0}} a {{gl1}}",
+  "tutorial_sliders_5": "- Ranking na Ultra League de {{ul0}} a {{ul1}}",
+  "tutorial_sliders_5alt": "- OU Ranking na Ultra League de {{ul0}} a {{ul1}}",
+  "tutorial_sliders_6": "Cadeias com outras da mesma cor",
+  "tutorial_sliders_7": "Filtros separados dos outros controles deslizantes",
   "tutorial_sliders_8": "Um controle deslizante 'cheio' significa que está desativado:",
-  "tutorial_sliders_9": "Todos os spawns, independentemente se foram verificados IV ou não",
+  "tutorial_sliders_9": "Todas as aparições, independentemente de terem sido verificadas por IV ou não",
   "tutorial_help": "Atalho para este menu",
-  "tutorial_adv_filter": "Apenas para dispositivos móveis, abre as opções de filtragem para o menu avançado",
-  "tutorial_tune": "Define o filtro avançado para todos os Pokémon atualmente filtrados no menu",
-  "tutorial_format_size": "Define o tamanho do ícone para todos os itens atualmente filtrados no menu",
-  "tutorial_check": "Ativa todos os itens atualmente filtrados no menu",
-  "tutorial_clear": "Desativa todos os itens atualmente filtrados no menu",
+  "tutorial_adv_filter": "Somente móvel, abre as opções de filtragem para o menu avançado",
+  "tutorial_tune": "Define o filtro avançado para todos os Pokémon atualmente sendo filtrados no menu",
+  "tutorial_format_size": "Define o tamanho do ícone para todos os itens atualmente sendo filtrados no menu",
+  "tutorial_check": "Ativa todos os itens atualmente sendo filtrados no menu",
+  "tutorial_clear": "Desativa todos os itens atualmente sendo filtrados no menu",
   "tutorial_save": "Salva a seleção atual e sai",
-  "tutorial_show_all_view": "Alternar PokéStops e Ginásios",
+  "tutorial_show_all_view": "Alternar PokéStops & Ginásios",
   "tutorial_show_pokemon_view": "Alternar Pokémon",
-  "tutorial_toggle": "Clicar em Check/X ativa ou desativa o item",
-  "tutorial_pokemon_caption": "Este ícone permite definir filtros para aquele Pokémon específico",
-  "tutorial_all_caption": "As equipes têm um menu de slots especial\nTodos os outros itens permitem ajustar o tamanho do ícone",
-  "tutorial_popup_0": "Os pop-ups agora são interativos!",
-  "tutorial_popup_1": "Os três pontos abrem as opções de ocultar, excluir e definir temporizador",
-  "tutorial_popup_2": "Os ícones de cada lado do link de navegação se expandem para mostrar informações extras, experimente!",
-  "tutorial_popup_3": "Os ícones variam para cada categoria, não deixe de conferir todos eles",
+  "tutorial_toggle": "Clicar no Verificar/X alterna o item",
+  "tutorial_pokemon_caption": "Este ícone permite que você configure filtros para aquele Pokémon específico",
+  "tutorial_all_caption": "Equipes têm um menu especial de slots\nTodos os outros itens permitem que você ajuste o tamanho do ícone",
+  "tutorial_popup_0": "Pop-ups agora são interativos!",
+  "tutorial_popup_1": "Os três pontos abrem as opções de ocultar, excluir e alternar o timer",
+  "tutorial_popup_2": "Ícones em ambos os lados do link de navegação vão se expandir para mostrar informações extras, experimente!",
+  "tutorial_popup_3": "Os ícones variam para cada categoria, não deixe de conferir todos",
   "tutorial_closing_0": "Informações adicionais",
-  "tutorial_closing_1": "Os controles deslizantes globais de Pokémon na barra lateral funcionam separadamente do menu avançado e não têm efeito entre si",
-  "tutorial_closing_2": "Não deixe de conferir a seção Configurações na barra lateral",
-  "tutorial_closing_3": "Existem muitas opções estéticas disponíveis para cada categoria, mas tenha em mente que quanto mais você adicionar ao seu mapa, maior a chance de o mapa travar",
-  "tutorial_closing_4": "Você pode visualizar este tutorial novamente selecionando-o no painel Configurações na barra lateral",
+  "tutorial_closing_1": "Os controles deslizantes globais de Pokémon na barra lateral operam separadamente do menu avançado e não têm efeito um sobre o outro",
+  "tutorial_closing_2": "Certifique-se de verificar a seção Configurações na barra lateral",
+  "tutorial_closing_3": "Há muitas opções estéticas disponíveis para cada categoria, mas tenha em mente que quanto mais você adicionar ao seu mapa, maior a chance de seu mapa congelar",
+  "tutorial_closing_4": "Você pode visualizar este tutorial novamente selecionando-o no painel de Configurações na barra lateral",
   "tutorial_closing_5": "Mantenha-se seguro e boa sorte!",
   "intro": "Introdução",
   "sidebar": "Barra Lateral",
   "sliders": "Controles Deslizantes",
   "popups": "Pop-ups",
-  "closing": "Encerramento",
+  "closing": "Fechamento",
   "shortcuts": "Atalhos",
   "iv": "IV",
   "area_restrictions": "Restrições de Área",
@@ -257,128 +257,143 @@
   "stats": "Estatísticas",
   "pvp": "PVP",
   "area_restrictions_subtitle": "Você tem acesso a estas áreas",
-  "devices_subtitle": "Mostra locais ativos de dispositivos e rotas",
-  "gyms_subtitle": "Mostra todas as localizações ativas de ginásios, equipe ativa e quantos slots cada ginásio possui disponíveis",
-  "invasions_subtitle": "Mostra informações de invasão da Equipe Rocket, incluindo escalação de batalha, tempo de expiração e possíveis recompensas",
-  "iv_subtitle": "Mostra porcentagem de IV e opções de brilho",
-  "lures_subtitle": "Mostra informações de isca, incluindo tipo de isca e tempo de expiração",
+  "devices_subtitle": "Mostra locais e rotas de dispositivos ativos",
+  "gyms_subtitle": "Mostra todos os locais de ginásios ativos, equipe ativa e quantas vagas cada ginásio tem disponível",
+  "invasions_subtitle": "Mostra informações de invasão do Team Rocket, incluindo formação de batalha, tempo de expiração e possíveis recompensas",
+  "iv_subtitle": "Mostra opções de % de IV e brilho",
+  "lures_subtitle": "Mostra informações sobre iscas, incluindo tipo de isca e tempo de expiração",
   "map_subtitle": "Mostra o mapa",
-  "nests_subtitle": "Mostra Pokémon atualmente em ninhos e polígonos de ninhos",
+  "nests_subtitle": "Mostra Pokémon que estão fazendo ninho ativamente e polígonos de ninho",
   "pokemon_subtitle": "Mostra todas as localizações de Pokémon e tempos de expiração",
   "pokestops_subtitle": "Mostra todas as localizações de PokéStops",
-  "portals_subtitle": "Mostra todos os portais do jogo Ingress",
-  "pvp_subtitle": "Mostra informações sobre classificação/CP/Nível de PVP para cada Pokémon",
-  "quests_subtitle": "Mostra informações de recompensa e tarefas de missões",
-  "raids_subtitle": "Mostra todas as informações sobre raids, incluindo o chefe da raid, ovos, tempo de expiração e conjunto de movimentos",
+  "portals_subtitle": "Mostra todos os portais do Ingress",
+  "pvp_subtitle": "Mostra informações de classificação/CP/Nível PVP para cada Pokémon",
+  "quests_subtitle": "Mostra informações de recompensa e tarefa de quests",
+  "raids_subtitle": "Mostra todas as informações de raid incluindo o chefe da raid, ovos, tempo de expiração e moveset",
   "scan_cells_subtitle": "Mostra a última vez que uma célula S2 foi escaneada por um dispositivo",
-  "scan_areas_subtitle": "Mostra polígonos das áreas de escaneamento disponíveis",
-  "spawnpoints_subtitle": "Mostra os pontos de spawn e o tempo estimado de despawn",
-  "stats_subtitle": "Mostra as estatísticas e os níveis dos Pokémon",
-  "submission_cells_subtitle": "Mostra informações úteis para submissão de novos POIs",
-  "weather_subtitle": "Mostra informações climáticas do jogo para cada célula",
-  "scanner_subtitle": "Interage diretamente com o scanner de diversas maneiras",
-  "s2cells_subtitle": "Mostra as células S2 em diversos níveis no mapa",
-  "backups_subtitle": "Permite fazer cópias de segurança e carregar configurações em diferentes dispositivos",
-  "backups": "Cópias de segurança",
+  "scan_areas_subtitle": "Mostra polígonos de áreas de escaneamento disponíveis",
+  "spawnpoints_subtitle": "Mostra pontos de spawn e seus tempos estimados de desaparecimento",
+  "stats_subtitle": "Mostra estatísticas e níveis dos Pokémon",
+  "submission_cells_subtitle": "Mostra informações úteis para o envio de novos Pontos de Interesse (POIs)",
+  "weather_subtitle": "Mostra informações do tempo no jogo para cada célula",
+  "scanner_subtitle": "Interaja diretamente com o scanner de diversas formas",
+  "s2cells_subtitle": "Exibe Células S2 em vários níveis no mapa",
+  "backups_subtitle": "Permite o backup e o carregamento de configurações entre dispositivos",
+  "backups": "Backups",
   "user_profile": "Perfil do Usuário",
   "user_username": "Nome de Usuário",
   "candy": "Doces",
-  "show_ex_badge": "Mostrar Distintivo EX",
-  "search": "Buscar",
+  "show_ex_badge": "Mostrar Insígnia EX",
+  "search": "Pesquisar",
   "global_search_quests": "Digite o Nome da Recompensa...",
-  "global_search_lures": "Digite o Nome do Módulo...",
+  "global_search_lures": "Digite o Nome do Lure...",
   "global_search_pokestops": "Digite o Nome do PokéStop...",
   "global_search_gyms": "Digite o Nome do Ginásio...",
   "global_search_portals": "Digite o Nome do Portal...",
   "global_search_nests": "Digite o Nome do Pokémon do Ninho...",
   "global_search_raids": "Digite o Nome do Chefe de Raid...",
   "global_search_pokemon": "Digite o Nome do Pokémon...",
-  "raid_level_badges": "Distintivos de Nível de Raid",
+  "global_search_invasions": "Digite o Tipo de Grunt, Nome, ou nome da recompensa do Pokémon...",
+  "raid_level_badges": "Insígnias de Nível de Raid",
   "options": "Opções",
   "profile": "Perfil",
   "pokemon_icons": "Ícones dos Pokémon",
-  "pokestop_icons": "Ícones dos PokéStops",
-  "gym_icons": "Ícones dos Ginásios",
-  "team_icons": "Ícones das Equipes",
-  "egg_icons": "Ícones dos Ovos",
-  "raid_icons": "Ícones de Raid",
-  "nest_icons": "Ícones dos Ninhos",
-  "reward_icons": "Ícones de Recompensa",
-  "type_icons": "Ícones de Tipo",
-  "weather_icons": "Ícones de Clima",
+  "pokestop_icons": "Ícones de PokéStop",
+  "gym_icons": "Ícones de Ginásios",
+  "team_icons": "Ícones de Equipes",
+  "egg_icons": "Ícones de Ovos",
+  "raid_icons": "Ícones de Raids",
+  "nest_icons": "Ícones de Ninhos",
+  "reward_icons": "Ícones de Recompensas",
+  "type_icons": "Ícones de Tipos",
+  "weather_icons": "Ícones do Tempo",
   "misc_icons": "Ícones Diversos",
-  "invasion_icons": "Ícones de Invasão",
-  "spawnpoint_icons": "Ícones dos Pontos de Spawn",
-  "device_icons": "Ícones dos Dispositivos",
+  "invasion_icons": "Ícones de Invasões",
+  "spawnpoint_icons": "Ícones de Pontos de Spawn",
+  "device_icons": "Ícones de Dispositivos",
+  "pokemon_audio": "Áudio Pokémon",
+  "pokestop_audio": "Áudio de PokéStop",
+  "gym_audio": "Áudio de Ginásios",
+  "team_audio": "Áudio das Equipes",
+  "egg_audio": "Áudio de Ovos",
+  "raid_audio": "Áudio de Raids",
+  "nest_audio": "Áudio de Ninhos",
+  "reward_audio": "Áudio de Recompensas",
+  "type_audio": "Áudio dos Tipos",
+  "weather_audio": "Áudio do Tempo",
+  "misc_audio": "Áudio Diverso",
+  "invasion_audio": "Áudio de Invasões",
+  "spawnpoint_audio": "Áudio de Pontos de Spawn",
+  "device_audio": "Áudio de Dispositivos",
   "pokemon_timers": "Todos os Temporizadores de Pokémon",
-  "show_dex_num_in_popup": "Mostrar Número na Pokédex no Pop-up",
-  "popup": "Pop-up",
-  "pvp_level": "Estatísticas do PvP no Nível {{level}}",
-  "pvp_mega": "Estatísticas do PvP em Megaevolução",
-  "webhook_entry": "Adicionar em {{name}}",
-  "remove_webhook_entry": "Remover de {{name}}",
+  "show_dex_num_in_popup": "Mostrar nº do Pokedex no Popup",
+  "popup": "Popup",
+  "pvp_level": "Estátisticas de PVP Nível {{level}}",
+  "pvp_mega": "Estátisticas de PVP Mega",
+  "webhook_entry": "Adicionar ao {{name}}",
+  "remove_webhook_entry": "Remover do {{name}}",
   "distance": "Distância",
   "gym": "Ginásio",
   "egg": "Ovo",
   "raid": "Raid",
-  "lure": "Módulo",
-  "quest": "Tarefa",
+  "lure": "Lure",
+  "quest": "Missão",
   "invasion": "Invasão",
   "nest": "Ninho",
   "pokestop": "PokéStop",
   "team": "Equipe",
   "global": "Global",
   "manage_webhook": "Gerenciar {{name}}",
-  "drag_and_drop": "Arraste e solte o Marcador para Definir sua Localização",
+  "drag_and_drop": "Arraste e solte o Marcador para Definir Sua Localização",
   "click_to_select": "Clique para Selecionar",
-  "add_new": "Adicionar Nova Alerta de {{category}}",
+  "add_new": "Adicionar Novo Alerta de {{category}}",
   "my_location": "Minha Localização",
   "choose_on_map": "Escolher no Mapa",
   "select_profile": "Selecionar Perfil",
-  "distance_radius": "Distâncias de Raio de Visualização",
+  "distance_radius": "Visualizar Distâncias do Raio",
   "areas": "Áreas",
   "select_webhook": "Selecionar Bot",
-  "ar_quest_true": "Tarefa de RA",
-  "ar_quest_false": "Sem RA",
-  "with_ar": "Com RA",
+  "ar_quest_true": "Tarefa AR",
+  "ar_quest_false": "Sem AR",
+  "with_ar": "Com AR",
   "both": "Ambos",
-  "without_ar": "Sem RA",
+  "without_ar": "Sem AR",
   "exclude_quest_multi": "Excluir {{reward}}",
-  "cluster_limit_0": "Foi atingido o limite de {{variable_0}} ({{variable_1}})",
-  "cluster_limit_1": "Por favor, dê zoom ou reduza seus filtros",
+  "cluster_limit_0": "Limite de {{variable_0}} alcançado ({{variable_1}})",
+  "cluster_limit_1": "Aproxime o zoom ou refine seus filtros",
   "show_polygons": "Mostrar Polígonos",
   "exclude_invasion_multi": "Excluir {{invasion}}",
-  "stardust": "Poedstardust",
+  "stardust": "Poeira Estelar",
   "slider_cp": "CP",
   "pvp_ranking_league": "Liga",
   "pvp_ranking_min_cp": "CP Mínimo",
-  "slider_pvp": "Classificações",
+  "slider_pvp": "Posições",
   "profile_no": "Perfil",
-  "template": "Template",
+  "template": "Modelo",
   "gender": "Gênero",
-  "clean": "Limpo",
+  "clean": "Limpar",
   "all_forms": "Todas as Formas",
-  "pvp_entry": "Registro PvP",
+  "pvp_entry": "Entrada PVP",
   "no_iv": "Incl. Sem IV",
   "by_distance": "Por Distância",
   "min_time": "Tempo Mínimo",
   "add_new_profile": "Adicionar Novo Perfil",
   "slider_none": "Nenhum",
   "non_registered_human_title": "Ops, algo não está certo!",
-  "non_registered_human_desc": "Você pode não estar registrado com {{webhook}}\nOu o servidor está inacessível no momento",
+  "non_registered_human_desc": "Você pode não estar registrado com {{webhook}}\nOu o servidor está atualmente inacessível",
   "try_again_later": "Por favor, tente novamente mais tarde",
-  "selected_areas": "Área Selecionada",
-  "selected_areas_plural": "{{amount}} Áreas Selecionadas",
+  "selected_areas_one": "{{count}} Área Selecionada",
+  "selected_areas_other": "{{count}} Áreas Selecionadas",
   "webhook_selection": "Seleção de {{name}}",
   "message_of_the_day": "Mensagem do Dia",
-  "has_quest_indicator": "Cor Alternativa para PokéStops com Tarefas",
-  "show_ar_badge": "Mostrar Distintivo de RA",
-  "all_gyms": "Todos os Ginásios",
+  "has_quest_indicator": "Cor Alternativa para Pokéstops com Quests",
+  "show_ar_badge": "Mostrar Distintivo AR",
+  "all_gyms": "Todas as Academias",
   "general": "Geral",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Vincular Global e Avançado",
+  "link_global_and_advanced": "Selecionados Respeitam Global",
   "normal_forms": "Formas Normais",
-  "weather_indicator": "Indicador de Clima Condições Meteorológicas Favoráveis",
+  "weather_indicator": "Indicador de Impulso Climático",
   "page": "Página {{page}}",
   "navigation_controls": "Controles de Navegação",
   "navigation_controls_react": "React",
@@ -387,8 +402,8 @@
   "all_moves": "Todos os Movimentos",
   "move": "Movimento",
   "any": "Qualquer",
-  "min_spawn_average": "Taxa Mínima de Spawn",
-  "select_all": "Selecionar Tudo",
+  "min_spawn_average": "Taxa Mínima de Aparição",
+  "select_all": "Selecionar Todos",
   "delete_all": "Excluir Selecionados",
   "cancel": "Cancelar",
   "day_1": "Segunda-feira",
@@ -400,162 +415,165 @@
   "day_7": "Domingo",
   "profile_name": "Nome do Perfil",
   "manage_profiles": "Gerenciar Perfis",
-  "min_spawn_avg": "Média Mínima de Spawn",
+  "min_spawn_avg": "Taxa Mín. de Aparição Média",
   "poke_global": "Tudo",
   "amount": "Quantidade",
-  "specific_gym": "Ginásio Específico",
-  "search_location": "Pesquisar Localizações",
-  "search_specific": "Pesquisar um(a) {{category}} Específico(a)",
-  "webhook_success_gym": "Alertas de Raids, Ovos e Mudança de Equipe foram Adicionados!",
-  "slot_changes": "Alterações de Slots",
-  "slot_changes_poracle": "Alterações de Slots",
+  "specific_gym": "Academia Específica",
+  "search_location": "Buscar Locais",
+  "search_specific": "Buscar um(a) {{category}} Específico(a)",
+  "webhook_success_gym": "Alertas de Raids, Ovos e Mudança de Equipe Adicionados!",
+  "slot_changes": "Mudanças de Slot",
+  "slot_changes_poracle": "mudanças_de_slot",
   "confirm_delete": "Isso removerá todo o rastreamento para este perfil, você tem certeza?",
-  "confirm_copy": "Escolha para qual perfil você gostaria de copiar \"{{profile}}\", isso sobrescreverá completamente aquele perfil.",
+  "confirm_copy": "Escolha para qual perfil você gostaria de copiar \"{{profile}}\", isso sobrescreverá totalmente esse perfil.",
   "webhook_error": "{{name}} não conseguiu processar isso.\nPor favor, tente novamente mais tarde.",
   "profile_error": "Deve ser único e válido",
   "team_0": "Harmonia",
   "battle_changes": "Em Batalha",
-  "battle_changes_poracle": "battle_changes",
-  "auto": "Automático",
-  "webhooks_subtitle": "Gerencie seus alertas diretamente no mapa para esses bots",
-  "event_stops_subtitle": "Exibe PokéParadas especiais de eventos, como Kecleon",
+  "battle_changes_poracle": "mudanças_de_batalha",
+  "auto": "Auto",
+  "webhooks_subtitle": "Gerencie seus alertas diretamente do mapa para esses bots",
+  "event_stops_subtitle": "Exibe Pokéstops de eventos especiais como Kecleon",
   "webhooks": "Alertas",
-  "scanner": "Ações do scanner",
-  "everything_individually": "Adicionar alertas individuais",
+  "scanner": "Ações do Scanner",
+  "everything_individually": "Adicionar Alertas Individuais",
   "individually": "individualmente",
-  "join": "Participar",
+  "join": "Entrar",
   "errors_404": "Ops, esta página não pode ser encontrada!",
   "errors_500": "Houve um erro no servidor, tente novamente mais tarde!",
-  "local_username": "Nome de usuário",
+  "local_username": "Nome de Usuário",
   "local_password": "Senha",
-  "local_error": "Houve um erro, tente novamente mais tarde!",
-  "no_filter_results": "Nenhum resultado encontrado\nTente ampliar seus filtros",
-  "donor_page": "Página do doador",
+  "local_error": "Houve um erro, por favor tente novamente mais tarde!",
+  "no_filter_results": "Nenhum Resultado Encontrado\nTente Ampliar Seus Filtros",
+  "donor_page": "Página do Doador",
   "go_back": "Voltar",
   "access": "Acesso",
-  "link_discord": "Link Discord",
-  "select_webhook_strategy": "Gerente de Alertas",
+  "link_discord": "Linkar Discord",
+  "select_webhook_strategy": "Gerenciador de Alertas",
   "webhook_strategy_success_0": "Sucesso! Atualizando para buscar configurações de alerta...",
   "register": "Registrar",
-  "invalid_credentials": "Credenciais inválidas",
-  "error_creating_user": "Não foi possível registrar um novo usuário neste momento",
-  "discord_linked": "Discord vinculado",
-  "telegram_linked": "Telegram vinculado",
+  "invalid_credentials": "Credenciais Inválidas",
+  "localauth_failed": "Autenticação falhou",
+  "error_creating_user": "Não foi possível registrar novo usuário neste momento",
+  "discord_linked": "Discord Vinculado",
+  "telegram_linked": "Telegram Vinculado",
   "level": "nível",
   "km": "km",
   "feedback": "Feedback",
-  "donor_menu": "Menu do doador",
-  "pokemon_cell": "A localização do Pokémon pode variar",
-  "timer_verified": "Este temporizador está verificado",
-  "timer_unverified": "Este temporizador não está verificado",
+  "donor_menu": "Menu Doador",
+  "pokemon_cell": "Localização do Pokémon Pode Variar",
+  "timer_verified": "Este Temporizador está Verificado",
+  "timer_unverified": "Este Temporizador não está Verificado",
   "all": "Todos",
   "badge_0": "Nenhum",
   "badge_1": "Bronze",
   "badge_2": "Prata",
   "badge_3": "Ouro",
-  "gym_badge_menu": "Editar emblema de ginásio",
-  "gym_badges": "Emblemas de ginásio",
-  "gym_badge_diamonds": "Mostrar emblemas de ginásio",
-  "gym_badges_subtitle": "Exibe emblemas de ginásio no mapa e uma lista na página de perfil.",
-  "confirm_filters_reset": "Restaurar filtros",
-  "filters_reset_text": "Tem certeza de que deseja redefinir as configurações para os valores padrão? Isso não pode ser desfeito!",
-  "filters_reset_title": "Restaurar filtros",
-  "raid_quick_select": "Seleção rápida",
+  "gym_badge_menu": "Editar Insígnia de Ginásio",
+  "gym_badges": "Insígnias de Ginásio",
+  "gym_badge_diamonds": "Mostrar Insígnias de Ginásio",
+  "gym_badges_subtitle": "Exibe Insígnias de Ginásio no mapa e uma lista na página de perfil.",
+  "confirm_filters_reset": "Resetar filtros",
+  "filters_reset_text": "Você tem certeza de que deseja redefinir as configurações para os valores padrão? Isto não pode ser desfeito!",
+  "filters_reset_title": "Redefinir filtros",
+  "raid_quick_select": "Seleção Rápida",
   "disabled": "Desativado",
   "loading": "Carregando {{category}}",
-  "loading_icons": "Recuperando ícones",
-  "loading_invasions": "Recuperando Invasões",
-  "scan_next": "Escaneie a localização",
-  "scan_next_choose": "Arraste e solte a marcação para definir a localização do scan",
-  "scan_zone": "Scan em uma área",
-  "scan_zone_choose": "Arraste e solte a marcação para definir a localização do scan e escolher o tamanho",
+  "loading_icons": "Buscando Ícones",
+  "loading_invasions": "Buscando Invasões",
+  "scan_next": "Escanear Localização",
+  "scan_next_choose": "Arraste e Solte o Marcador para Definir a Localização do Escaneamento",
+  "scan_zone": "Escanear uma Área",
+  "scan_zone_choose": "Arraste e Solte o Marcador para Definir a Localização do Escaneamento e Escolher o Tamanho",
   "scan_zone_size": "Tamanho",
   "scan_zone_range": "Alcance",
   "scan_zone_spacing": "Espaçamento",
   "scan_zone_radius": "Raio",
-  "scan_requests": "Solicitações de scan",
-  "scan_queue": "Fila atual",
-  "click_to_scan": "Escaneie aqui",
-  "scan_confirmed_title": "Demanda de scan confirmada",
-  "scan_confirmed": "Um worker foi enviado para a localização e o resultado logo aparecerá no mapa!",
-  "scan_loading_title": "Enviando solicitação de scan",
-  "scan_loading": "Sua solicitação de scan está sendo processada e enviada para o sistema!",
+  "scan_requests": "Pedidos de Escaneamento",
+  "scan_queue": "Fila Atual",
+  "click_to_scan": "Escanear Aqui",
+  "scan_confirmed_title": "Demanda de escaneamento confirmada",
+  "scan_confirmed": "Trabalhador foi enviado para o local, o resultado logo aparecerá no mapa!",
+  "scan_loading_title": "Enviando pedido de escaneamento",
+  "scan_loading": "Seu pedido de escaneamento está sendo processado e enviado para o sistema!",
   "scan_error_title": "Erro",
-  "scan_error": "Houve um erro ao processar a solicitação de scan...",
-  "scan_outside_area": "Essa localização está fora dos limites das áreas autorizadas",
+  "scan_error": "Ocorreu um erro durante o processamento do pedido de escaneamento...",
+  "scan_outside_area": "Esta localização está fora dos limites das áreas autorizadas",
   "pvp_ranking_cap": "Nível",
-  "lc_title": "Siga sua localização",
+  "lc_title": "Acompanhar Sua Localização",
   "lc_metersUnit": "metros",
   "lc_feetUnit": "pés",
   "lc_popup": "Você está a {distance} {unit} deste ponto",
-  "lc_outsideMapBoundsMsg": "Parece que você está localizado fora dos limites do mapa",
-  "no_alerts": "Nenhum alerta encontrado",
-  "loading_settings": "Carregando configurações",
+  "lc_outsideMapBoundsMsg": "Você parece estar fora dos limites do mapa",
+  "no_alerts": "Nenhum Alerta Encontrado",
+  "loading_settings": "Carregando Configurações",
   "refresh_to_continue": "Por favor, atualize antes de continuar",
-  "session_expired_title": "Sessão expirada",
+  "session_expired_title": "Sessão Expirada",
   "session_expired_body": "Sua sessão expirou",
   "old_client_title": "Desatualizado",
   "old_client_body": "Uma nova versão deste mapa está disponível",
+  "early_old_client_title": "Desatualizado",
+  "early_old_client_body": "Uma versão antiga deste aplicativo pode estar armazenada em cache no seu navegador, você precisará limpar o cache antes de poder usar este aplicativo.",
   "refresh": "Atualizar",
   "points": "Pontos",
   "day": "Dia",
   "days": "Dias",
-  "react_error": "Algo deu errado",
-  "clickable_icon": "O ícone é clicável",
+  "react_error": "Algo Deu Errado",
+  "clickable_icon": "Ícone Clicável",
   "two_stops_till_next": "2 paradas até a próxima",
   "one_stop_till_next": "1 parada até a próxima",
-  "no_more_gyms": "Não há mais ginásios",
-  "light_map_border": "Borda do mapa clara",
-  "dark_map_border": "Borda do mapa escura",
-  "cell_blocked": "Célula bloqueada",
-  "poi_color": "Cor do PdI",
-  "quest_condition": "Condição da pesquisa",
-  "always_show_labels": "Sempre mostrar rótulos",
-  "scan_areas_options": "Opções de áreas de scan",
-  "historic_rarity": "Raridade histórica",
+  "no_more_gyms": "Nenhum ginásio restante",
+  "light_map_border": "Borda Clara do Mapa",
+  "dark_map_border": "Borda Escura do Mapa",
+  "cell_blocked": "Célula Bloqueada",
+  "poi_color": "Cor do Ponto de Interesse",
+  "quest_condition": "Condição de Missão",
+  "always_show_labels": "Sempre Mostrar Etiquetas",
+  "scan_areas_options": "Opções de Áreas de Escaneamento",
+  "historic_rarity": "Raridade Histórica",
   "poi": "Pontos de Interesse",
   "300m_range": "Alcance de 300m",
-  "lure_range": "Alcance de atrair",
-  "custom_range": "Alcance personalizado",
-  "tap_to_toggle": "Toque para alternar",
-  "power_up": "Melhorar",
+  "lure_range": "Alcance do Lure",
+  "custom_range": "Alcance Personalizado",
+  "tap_to_toggle": "Toque para Alternar",
+  "power_up": "Aumentar Poder",
   "never_alt": "Nunca",
-  "seen_nearby_stop": "Visto próximo",
-  "seen_nearby_cell": "Visto nesta célula",
-  "seen_lure_encounter": "Encontro de atrair",
-  "seen_lure_wild": "Spawn de atrair",
-  "seen_wild": "Spawn selvagem",
-  "event_stops": "PokéStops de evento",
-  "event_stop_timers": "Temporizadores de PokéStops de eventos",
+  "seen_nearby_stop": "Visto nas Proximidades",
+  "seen_nearby_cell": "Visto nesta Célula",
+  "seen_lure_encounter": "Encontro com Lure",
+  "seen_lure_wild": "Spawn de Lure",
+  "seen_wild": "Spawn Selvagem",
+  "event_stops": "Paradas de Evento",
+  "event_stop_timers": "Temporizadores de Parada de Evento",
   "size_0": "Qualquer",
-  "size_1": "XXS",
-  "size_2": "XS",
+  "size_1": "XXP",
+  "size_2": "XP",
   "size_3": "M",
-  "size_4": "XL",
-  "size_5": "XXL",
-  "show_size_indicator": "Mostrar indicador de tamanho",
+  "size_4": "GG",
+  "size_5": "GGG",
+  "show_size_indicator": "Mostrar Indicador de Tamanho",
   "size": "Tamanho",
-  "gold_stop": "PokéParada dourada",
-  "profile_backups": "Troca de perfis",
-  "new_backup": "Novo backup",
+  "gold_stop": "Parada Ouro",
+  "profile_backups": "Troca de Perfis",
+  "new_backup": "Novo Backup",
   "create": "Criar",
   "load": "Carregar",
   "update": "Atualizar",
-  "delete": "Excluir",
+  "delete": "Deletar",
   "name": "Nome",
-  "only_confirmed": "Apenas confirmados",
-  "rocket_pokemon": "Pokémon dos Rockets",
-  "decoy": "Decoy",
+  "only_confirmed": "Apenas Confirmados",
+  "rocket_pokemon": "Pokémon da Equipe Rocket",
+  "decoy": "Isca",
   "s2_cell_limit_0": "Você tentou gerar mais de 20.000 células ({{variable_0}})",
-  "show_all_pvp_ranks": "Mostrar todas as classificações de PVP",
-  "enable_pokemon_popup_coords": "Mostrar coordenadas de Pokémon",
-  "enable_gym_popup_coords": "Mostrar coordenadas de ginásios",
-  "enable_pokestop_popup_coords": "Mostrar coordenadas de PokéParadas",
+  "show_all_pvp_ranks": "Mostrar Todos os Rankings PVP",
+  "enable_pokemon_popup_coords": "Mostrar Coordenadas Pokémon",
+  "enable_gym_popup_coords": "Mostrar Coordenadas do Ginásio",
+  "enable_pokestop_popup_coords": "Mostrar Coordenadas do Pokéstop",
   "enable_portal_popup_coords": "Mostrar Coordenadas do Portal",
-  "on_block_join_discord": "Por favor, junte-se ao nosso Discord para mais informações.",
-  "on_block_msg": "Você foi bloqueado por ser membro de",
+  "on_block_join_discord": "Por favor, junte-se ao nosso discord para mais informações.",
+  "on_block_msg": "Você foi bloqueado por ser um membro de",
   "denied": "Negado",
-  "showcase": "Mostrar",
+  "showcase": "Vitrine",
   "unknown_event": "Evento Desconhecido",
   "scanner_countdown": "Disponível em {{time}}s",
   "success": "Sucesso",
@@ -564,75 +582,39 @@
   "filter_by_areas": "Filtrar por Áreas",
   "submit_nest_name": "Enviar Nome do Ninho",
   "nest_submission_menu": "Atualização de Nome",
-  "nest_submissions": "Envio de Ninhos",
-  "nest_submissions_subtitle": "Permite você enviar novos nomes para ninhos",
-  "pokemon_opacity": "Opacidade Dinâmica dos Pokémon",
-  "invasion_opacity": "Opacidade Dinâmica da Invasão",
-  "raid_opacity": "Opacidade Dinâmica da Raid",
-  "opacity_ten_minutes": "Opacidade em 10 minutos",
-  "opacity_five_minutes": "Opacidade em 5 minutos",
-  "opacity_one_minute": "Opacidade em 1 minuto",
+  "nest_submissions": "Submissões de Ninho",
+  "nest_submissions_subtitle": "Permite que você envie novos nomes para ninhos",
+  "pokemon_opacity": "Opacidade Dinâmica de Pokémon",
+  "invasion_opacity": "Opacidade Dinâmica de Invasões",
+  "raid_opacity": "Opacidade Dinâmica de Raids",
+  "opacity_ten_minutes": "Opacidade aos 10 minutos",
+  "opacity_five_minutes": "Opacidade aos 5 minutos",
+  "opacity_one_minute": "Opacidade ao 1 minuto",
   "level_circles": "Indicadores de Nível",
   "min_level_circle": "Nível Mínimo do Círculo",
-  "mutation_auth_error": "Sua solicitação não foi bem-sucedida devido a não estar logado",
+  "mutation_auth_error": "Sua solicitação foi malsucedida por não estar logado",
   "submitted_by": "Enviado Por",
-  "localauth_failed": "Autenticação falhou",
   "reversible": "Reversível",
   "version": "Versão",
-  "route_tags": "Tags de Rota",
+  "route_tags": "Tags de Rotas",
   "routes": "Rotas",
   "route_type": "Tipo de Rota",
-  "routes_subtitle": "Visualize no jogo as rotas e informações relevantes sobre elas no mapa",
+  "routes_subtitle": "Visualize no mapa rotas do jogo e informações relevantes sobre elas",
   "description": "Descrição",
   "additional_info": "Informações Adicionais",
   "duration": "Duração",
   "elevation": "Elevação",
   "contest_category_1": "Tamanho Menor",
-  "contest_category_2": "Tamanho Maior",
+  "context_category_2": "Tamanho Maior",
   "total_entries": "Total de Entradas",
-  "showcase_rankings": "Ranking do Showcase",
-  "showcase_rankings_subtitle": "Exibe uma lista dos melhores rankings para um showcase em um Pokestop",
+  "showcase_rankings": "Rankings da Vitrine",
+  "showcase_rankings_subtitle": "Exibe uma lista dos principais rankings para uma vitrine em um Pokéstop",
   "tth": "TTH",
   "tth_0": "Todos",
   "tth_1": "Conhecido",
   "tth_2": "Desconhecido",
   "no_access": "Sem Acesso",
-  "context_category_2": "Maior Tamanho",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "cooldown": "Tempo de Descanso",
+  "cooldown": "Tempo de Recarga",
   "scan_some_outside_area": "Algumas localizações estão fora dos limites autorizados",
   "alerts": "alertas",
   "alert_manager": "Gerenciador de Alertas",
@@ -643,69 +625,94 @@
   "component_login_page": "Página de Login",
   "component_donation_page": "Página de Doação",
   "component_message_of_the_day": "Mensagem do Dia",
-  "download": "Download",
-  "playground": "Playground",
-  "locale": "Localização",
+  "download": "Baixar",
+  "playground": "Parquinho",
+  "locale": "Local",
   "saved": "Salvo",
   "show_editor": "Mostrar Editor",
   "hide_editor": "Esconder Editor",
-  "reported_error": "Este erro foi relatado ao servidor com o identificador",
+  "reported_error": "Este erro foi reportado ao servidor com identificador",
   "dark_mode": "Modo Escuro",
-  "load_from_autosave": "Carregar do autosave",
+  "load_from_autosave": "Carregar do Salvamento Automático",
   "done": "Concluído",
   "fast": "Rápido",
   "charged": "Carregado",
   "offline_mode": "Modo Offline",
-  "include_sponsored": "Incluir Patrocinado",
-  "showcase_color": "Cor da Destaque",
+  "include_sponsored": "Incluir Patrocinados",
+  "showcase_color": "Cor de Destaque",
   "partner_color": "Cor do Parceiro",
   "disable": "Desativar {{- name}}",
   "profiling": "Perfilamento",
-  "showcase_block": "Bloqueado devido ao destaque",
-  "signed_in_as": "Conectado como",
-  "missing_map_perm": "Você não tem permissão para visualizar o mapa.",
-  "pokemon_audio": "Áudio de Pokémon",
-  "pokestop_audio": "Áudio de PokéStop",
-  "gym_audio": "Áudio de Ginásio",
-  "team_audio": "Áudio de Time",
-  "egg_audio": "Áudio de Ovo",
-  "raid_audio": "Áudio de Raid",
-  "nest_audio": "Áudio de Ninho",
-  "reward_audio": "Áudio de Recompensa",
-  "type_audio": "Áudio de Tipo",
-  "weather_audio": "Áudio de Clima",
-  "misc_audio": "Áudio Diversos",
-  "invasion_audio": "Áudio de Invasão",
-  "spawnpoint_audio": "Áudio de Ponto de Spawn",
-  "device_audio": "Áudio de Dispositivo",
+  "showcase_block": "Bloqueado devido a um destaque",
+  "signed_in_as": "Logado Como",
+  "missing_map_perm": "Você não tem permissão para ver o mapa.",
   "access_denied": "Acesso Negado",
   "audio": "Áudio",
   "desktop_notifications": "Notificações na Área de Trabalho",
-  "notifications_options": "Opções de Notificação",
+  "notifications_options": "Opções de Notificações",
   "audio_always_on": "Áudio Sempre Ativo",
-  "volume_level": "Volume do Áudio",
+  "volume_level": "Nível do Volume",
   "notifications_status": "Status das Notificações",
   "granted": "concedido",
-  "global_search_invasions": "Digite o Tipo de Invasão, Nome ou Nome da recompensa do Pokémon...",
-  "set_all": "Selecionar Todos",
-  "set_filtered": "Selecionar Filtrados",
+  "set_all": "Configurar Todos",
+  "set_filtered": "Configurar Filtrados",
   "only_show_available": "Mostrar Apenas Disponíveis",
   "easy_mode": "Modo Fácil",
   "quick_select": "Seleções Rápidas Globais",
-  "pokemon_filter_mode": "Modo de Filtro de Pokémon",
+  "pokemon_filter_mode": "Modo de Filtro Pokémon",
   "basic": "Básico",
   "intermediate": "Intermediário",
-  "expert": "Avançado",
-  "basic_description": "Selecione facilmente Pokémon e aplique um filtro global",
-  "intermediate_description": "Configurar filtros individuais globalmente e por Pokémon (tradicional)",
-  "expert_description": "Consultas de entrada manual para a personalização mais avançada",
+  "expert": "Especialista",
+  "basic_description": "Selecione Pokémon facilmente e aplique um filtro global",
+  "intermediate_description": "Defina filtros individuais globalmente e por Pokémon (tradicional)",
+  "expert_description": "Consultas de entrada manual para a personalização mais detalhada",
   "icon_size": "Tamanho do Ícone",
   "developer": "Desenvolvedor",
-  "raid_override": "Sobrescrever Incursões",
-  "search_rocket_pokemon": "Buscar Pokémon da Equipe Rocket",
+  "raid_override": "Substituição de Raid",
+  "search_rocket_pokemon": "Buscar Pokémon do Team Rocket",
   "main": "Principal",
   "extra": "Extra",
   "select": "Selecionar",
   "searching": "buscando...",
-  "no_options": "Sem Opções..."
+  "no_options": "Sem Opções...",
+  "and": "E",
+  "or": "OU",
+  "only_global": "Apenas Global",
+  "global_caption": "Ignora Todos os Outros Filtros",
+  "global_and_individual": "Filtros Globais & Individuais",
+  "gender_filters_all": "Gênero Aplica-se a Todos",
+  "and_caption": "Ligados Juntos",
+  "or_caption": "Filtros Independentes",
+  "filter_help": "Ajuda de Filtro",
+  "kilometers": "Quilômetros",
+  "miles": "Milhas",
+  "distance_unit": "Unidade de Distância",
+  "data_management": "Gerenciamento de Dados",
+  "reset_or_manage_text": "Você pode tanto resetar seus filtros completamente quanto visitar a página de gerenciamento de dados que permitirá que você resete categorias individuais.",
+  "reset_audio": "Resetar Áudio",
+  "reset_all": "Resetar Tudo",
+  "reset_icons": "Resetar Ícones",
+  "reset_position": "Resetar Posição",
+  "reset_ui": "Resetar UI",
+  "reset_options": "Resetar Opções",
+  "reset_menus": "Resetar Menus",
+  "reset_settings": "Resetar Configurações",
+  "reset_general_title": "Geral",
+  "reset_filters_title": "Filtros",
+  "reset_assets": "Resetar Ativos",
+  "reset_pokemon": "Resetar Pokémon",
+  "reset_pokestops": "Resetar PokéStops",
+  "reset_gyms": "Resetar Ginásios",
+  "reset_nests": "Resetar Ninhos",
+  "reset_portals": "Resetar Portais",
+  "reset_routes": "Resetar Rotas",
+  "reset_scan_areas": "Resetar Áreas de Varredura",
+  "reset_scan_cells": "Resetar Células de Varredura",
+  "reset_devices": "Resetar Dispositivos",
+  "reset_weather": "Resetar Tempo",
+  "reset_s2cells": "Resetar Células S2",
+  "reset_spawnpoints": "Resetar Pontos de Aparecimento",
+  "reset_submission_cells": "Resetar Células de Submissão",
+  "hisuian": "Hisuiano",
+  "spacial_rend_range": "Alcance de Corte Espacial"
 }
diff --git a/packages/locales/lib/generated/ru.json b/packages/locales/lib/generated/ru.json
index 7422197d3..e9c83f932 100644
--- a/packages/locales/lib/generated/ru.json
+++ b/packages/locales/lib/generated/ru.json
@@ -1,114 +1,114 @@
 {
-  "login": "Вход",
-  "click_once": "Нажмите 'Авторизовать' только один раз",
+  "login": "Войти",
+  "click_once": "Нажмите 'Авторизоваться' только один раз",
   "save": "Сохранить",
   "reset": "Сбросить",
   "close": "Закрыть",
-  "reset_filters": "Сбросить фильтры",
-  "pokemon_filters": "Настройки фильтрации покемонов",
-  "gyms_filters": "Настройки фильтрации тренажеров",
-  "pokestops_filters": "Настройки фильтрации покестопов",
-  "nests_filters": "Настройки фильтрации гнезд",
+  "reset_filters": "Сбросить Фильтры",
+  "pokemon_filters": "Настройки Фильтров Покемонов",
+  "gyms_filters": "Настройки Фильтров Спортзалов",
+  "pokestops_filters": "Настройки Фильтров Покестопов",
+  "nests_filters": "Настройки Фильтров Гнёзд",
   "help": "Помощь",
-  "apply_to_all": "Применить ко всем",
-  "disable_all": "Отключить все",
-  "enable_all": "Включить все",
+  "apply_to_all": "Применить ко Всем",
+  "disable_all": "Отключить Все",
+  "enable_all": "Включить Все",
   "enabled": "Включено",
-  "legacy": "Устаревшее",
+  "legacy": "Устаревший",
   "id": "ID",
   "location": "Местоположение",
-  "search_pokemon": "Поиск покемонов",
-  "search_nests": "Поиск гнезд",
-  "search_gyms": "Поиск тренажеров",
-  "search_pokestops": "Поиск покестопов",
-  "search_raids": "Поиск рейдов",
-  "search_eggs": "Поиск яиц",
-  "search_quests": "Поиск заданий",
-  "search_lures": "Поиск приманок",
-  "search_invasions": "Поиск вторжений",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "search_pokemon": "Поиск Покемонов",
+  "search_nests": "Поиск Гнёзд",
+  "search_gyms": "Поиск Спортзалов",
+  "search_pokestops": "Поиск Покестопов",
+  "search_raids": "Поиск Рейдов",
+  "search_eggs": "Поиск Яиц",
+  "search_quests": "Поиск Заданий",
+  "search_lures": "Поиск Приманок",
+  "search_invasions": "Поиск Вторжений",
+  "sm": "Мал",
+  "md": "Сред",
+  "lg": "Бол",
+  "xl": "Оч. Бол",
   "min": "Мин",
   "max": "Макс",
-  "set_size": "Установить размер иконки",
-  "slot_selection": "Выбор слота",
+  "set_size": "Установить Размер Иконки",
+  "slot_selection": "Выбор Слота",
   "generations": "Поколения",
   "types": "Типы",
   "forms": "Формы",
-  "rarity": "Текущая редкость",
+  "rarity": "Текущая Редкость",
   "others": "Другие",
   "categories": "Категории",
   "rank": "Ранг",
   "slider_iv": "Диапазон IV",
-  "slider_great": "Отличная лига",
-  "slider_ultra": "Ультра лига",
-  "slider_little": "Маленькая кубка",
+  "slider_great": "Лига Супер",
+  "slider_ultra": "Лига Ультра",
+  "slider_little": "Кубок Кроха",
   "slider_atk_iv": "Атака",
   "slider_def_iv": "Защита",
   "slider_sta_iv": "Выносливость",
   "slider_level": "Уровень",
   "slider_size": "Размер",
-  "abbreviation_level": "L",
-  "lvl": "Ур.",
-  "cap": "Предел",
+  "abbreviation_level": "Ур",
+  "lvl": "Ур",
+  "cap": "Лимит",
   "custom": "Пользовательский",
   "valid": "Действительный",
-  "invalid": "Недействительный!",
-  "overwrites": "Перезаписывает все фильтры",
-  "valid_filter": "Действительный фильтр статистики",
-  "invalid_filter": "Введите действительный фильтр",
-  "gyms": "Тренажеры",
-  "nests": "Гнезда",
+  "invalid": "Недействительно!",
+  "overwrites": "Заменяет Все Фильтры",
+  "valid_filter": "Допустимый Фильтр Статистик",
+  "invalid_filter": "Введите Допустимый Фильтр",
+  "gyms": "Спортзалы",
+  "nests": "Гнёзда",
   "pokestops": "Покестопы",
   "pokemon": "Покемоны",
-  "wayfarer": "Путеводитель",
-  "scan_areas": "Области сканирования",
-  "s2cells": "S2 ячейки",
+  "wayfarer": "Вэйфарер",
+  "scan_areas": "Области Сканирования",
+  "s2cells": "S2 Ячейки",
   "weather": "Погода",
-  "admin": "Администратор",
+  "admin": "Администрирование",
   "settings": "Настройки",
   "advanced": "Расширенные",
-  "tile_servers": "Серверы тайлов",
+  "tile_servers": "Сервера Тайлов",
   "icons": "Иконки",
   "navigation": "Навигация",
-  "drawer": "Выдвижная панель",
-  "tile_servers_default": "По умолчанию",
-  "drawer_temporary": "Временный",
-  "drawer_persistent": "Постоянный",
-  "locale_selection": "Выбор языка",
+  "drawer": "Меню",
+  "tile_servers_default": "По Умолчанию",
+  "drawer_temporary": "Временное",
+  "drawer_persistent": "Постоянное",
+  "locale_selection": "Выбор Локали",
   "import": "Импорт",
   "export": "Экспорт",
   "logout": "Выйти",
-  "local_storage_cleared": "Локальное хранилище очищено!",
-  "iv_or_filter": "Фильтр ИЛИ IV",
+  "local_storage_cleared": "Локальное Хранилище очищено!",
+  "iv_or_filter": "Фильтр IV ИЛИ",
   "polygons": "Полигоны",
   "raids": "Рейды",
-  "ex_eligible": "Подходит для EX",
-  "in_battle": "В бою",
-  "all_pokestops": "Все покестопы",
+  "ex_eligible": "EX Доступен",
+  "in_battle": "В Бою",
+  "all_pokestops": "Все Покестопы",
   "lures": "Приманки",
   "quests": "Задания",
   "invasions": "Вторжения",
   "portals": "Порталы",
-  "submission_cells": "Ячейки подачи",
-  "spawnpoint": "Точки появления",
-  "spawnpoints": "Точки появления",
-  "s2_cell_level": "Уровень {{level}} S2 ячейка",
-  "total_count": "Общее количество",
-  "next_submission": "Следующая отправка!",
+  "submission_cells": "Ячейки для Заявок",
+  "spawnpoint": "Точка Появления",
+  "spawnpoints": "Точки Появления",
+  "s2_cell_level": "Ячейка Уровня {{level}} S2",
+  "total_count": "Общее Количество",
+  "next_submission": "Следующая Заявка!",
   "never": "Никогда",
-  "next_gym": "Следующий спортзал",
-  "scan_cells": "Сканировать ячейки",
+  "next_gym": "Следующий Спортзал",
+  "scan_cells": "Сканировать Ячейки",
   "devices": "Устройства",
-  "use_my_location": "Использовать мое местоположение",
-  "submit_feedback_title": "Отправить отзыв/сообщить об ошибке",
-  "use_the_link_below": "Вы можете использовать ссылку ниже, чтобы отправить отзыв или сообщить о найденных ошибках.",
-  "feedback_to_devs": "Этот отзыв отправляется непосредственно разработчикам.",
-  "feedback_form": "Форма обратной связи",
-  "unknown_pokestop": "Неизвестное имя Поке-стопа",
-  "unknown_gym": "Неизвестное имя спортзала",
+  "use_my_location": "Использовать Мое Местоположение",
+  "submit_feedback_title": "Отправить Отзыв/Сообщение об Ошибке",
+  "use_the_link_below": "Используйте ссылку ниже, чтобы отправить отзыв или сообщение об ошибке.",
+  "feedback_to_devs": "Этот отзыв отправляется напрямую разработчикам.",
+  "feedback_form": "Форма Обратной Связи",
+  "unknown_pokestop": "Неизвестное Название Покестопа",
+  "unknown_gym": "Неизвестное название зала",
   "exclude": "Исключить",
   "exclude_quest": "Исключить задание",
   "exclude_invasion": "Исключить вторжение",
@@ -118,60 +118,60 @@
   "timer": "Таймер",
   "hide": "Скрыть",
   "tier": "Уровень",
-  "slots": "Слоты",
+  "slots": "Места",
   "mega": "Мега",
   "form": "Форма",
-  "starts": "Начало",
-  "ends": "Конец",
+  "starts": "Начинается",
+  "ends": "Заканчивается",
   "defender": "Защитник",
-  "cp": "CP",
+  "cp": "БО",
   "kilogram": "кг",
   "meter": "м",
-  "total_cp": "Общий CP",
-  "first_seen": "Впервые увиден",
-  "last_seen": "Последний раз увиден",
+  "total_cp": "Общее БО",
+  "first_seen": "Впервые замечен",
+  "last_seen": "Последний раз замечен",
   "last_modified": "Последнее изменение",
   "last_updated": "Последнее обновление",
   "imported": "Импортировано",
-  "nest_estimated": "Данные о гнезде приблизительные!",
-  "verify_nests": "Проверьте, проверив текущие появления",
-  "nest_out_of_date": "Гнездо, возможно, устарело!",
-  "nest_check_current": "Проверьте текущие появления вместо этого",
+  "nest_estimated": "Данные о гнезде оценочные!",
+  "verify_nests": "Проверьте, наблюдая за текущими появлениями",
+  "nest_out_of_date": "Гнездо потенциально устарело!",
+  "nest_check_current": "Проверьте текущие появления",
   "spawns_per_hour": "В час",
   "teams": "Команды",
   "eggs": "Яйца",
-  "reverse": "Обратный",
-  "selected": "Выбранный",
-  "unselected": "Невыбранный",
-  "only_available": "Доступный",
+  "reverse": "В обратном порядке",
+  "selected": "Выбрано",
+  "unselected": "Не выбрано",
+  "only_available": "Доступно",
   "common": "Обычный",
   "uncommon": "Необычный",
   "rare": "Редкий",
-  "ultra_rare": "Ультра-редкий",
+  "ultra_rare": "Сверхредкий",
   "regional": "Региональный",
   "event": "Событие",
   "legendary": "Легендарный",
   "mythical": "Мифический",
-  "ultra_beast": "Ультра-зверь",
-  "alt_forms": "Альтернативные формы",
+  "ultra_beast": "Ультра Существо",
+  "alt_forms": "Другие формы",
   "alola": "Алола",
-  "galarian": "Галарский",
-  "showing": "Показывается",
-  "instance": "Экземпляр",
-  "online": "Онлайн",
-  "offline": "Офлайн",
+  "galarian": "Галарская",
+  "showing": "Показать",
+  "instance": "Инстанс",
+  "online": "В сети",
+  "offline": "Не в сети",
   "boosted_types": "Усиленные типы",
-  "pokemon_options": "Опции Покемонов",
-  "pokestops_options": "Опции Поке-стопов",
-  "gyms_options": "Опции спортзалов",
-  "nests_options": "Опции гнезд",
-  "wayfarer_options": "Опции Wayfarer",
-  "admin_options": "Опции администратора",
-  "weather_options": "Опции погоды",
-  "s2cells_options": "Опции S2 ячеек",
+  "pokemon_options": "Настройки Покемонов",
+  "pokestops_options": "Настройки ПокеСтопов",
+  "gyms_options": "Настройки Залов",
+  "nests_options": "Настройки Гнезд",
+  "wayfarer_options": "Настройки Wayfarer",
+  "admin_options": "Настройки Администратора",
+  "weather_options": "Настройки погоды",
+  "s2cells_options": "Настройки S2-ячеек",
   "clustering": "Кластеризация",
-  "glow": "Сияние",
-  "legacy_filter": "Фильтр наследия",
+  "glow": "Свечение",
+  "legacy_filter": "Устаревший фильтр",
   "raid_timers": "Все таймеры рейдов",
   "invasion_timers": "Все таймеры вторжений",
   "lure_timers": "Все таймеры приманок",
@@ -180,15 +180,15 @@
   "new_portals": "Новые порталы",
   "items": "Предметы",
   "energy": "Энергия",
-  "ar_eligible": "AR доступно",
+  "ar_eligible": "Подходит для AR",
   "iv_circles": "Индикаторы IV",
   "min_iv_circle": "Минимальный круг IV",
-  "interaction_ranges": "Диапазоны взаимодействия",
-  "cannot_connect": "\nНе удалось подключиться к серверу в данный момент.\nПопытка повторного подключения только вызовет больше проблем.\nПожалуйста, попробуйте еще раз через несколько минут.\n\n- Команда администраторов карты",
-  "mad_quest_text": "Местные задания",
+  "interaction_ranges": "Дистанции взаимодействия",
+  "cannot_connect": "\nВ данный момент не удалось соединиться с сервером.\nПовторная попытка сразу только создаст дополнительные проблемы.\nПожалуйста, попробуйте снова через несколько минут.\n\n- Команда администраторов карты",
+  "mad_quest_text": "Оригинальные задания",
   "xs": "XS",
   "primary": "Основной",
-  "secondary": "Второстепенный",
+  "secondary": "Дополнительный",
   "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
   "open_menu": "Открыть меню",
@@ -197,54 +197,54 @@
   "welcome": "Добро пожаловать в",
   "back": "Назад",
   "next": "Далее",
-  "finish": "Завершить",
+  "finish": "Закончить",
   "start_tutorial": "Начать обучение",
   "view_profile": "Просмотр профиля",
   "login_optional": "Вход (необязательно)",
   "tutorial": "Обучение",
-  "tutorial_language": "Выберите свой язык",
-  "tutorial_welcome": "Это интерактивное обучение, и вам настоятельно рекомендуется играть со всеми предоставленными опциями",
+  "tutorial_language": "Выберите ваш язык",
+  "tutorial_welcome": "Это интерактивное обучение, и вам настоятельно рекомендуется попробовать все предоставленные возможности",
   "tutorial_categories": "Категории, к которым у вас есть доступ",
-  "tutorial_logged_in": "Вы можете просмотреть подробности о своих разрешениях, просмотрев свой профиль.",
-  "tutorial_logged_out": "Вы можете просмотреть подробности о своих разрешениях, войдя в систему.",
-  "tutorial_sidebar_0": "Все ваши фильтры и настройки находятся здесь",
-  "tutorial_sidebar_1": "Для каждой категории вы сможете включить или выключить нужные данные, используя переключатели",
-  "tutorial_sidebar_2": "Опции: Дополнительная настройка\nРасширенные: Мы рассмотрим позже в этом обучении",
-  "tutorial_sliders_0": "Использование ползунков для настройки фильтров",
-  "tutorial_sliders_1": "Покемоны с IV:",
-  "tutorial_sliders_2": "- IV от {{iv0}}% до {{iv1}}%",
+  "tutorial_logged_in": "Вы можете просмотреть информацию о своих разрешениях, просматривая свой профиль.",
+  "tutorial_logged_out": "Вы можете просмотреть информацию о своих разрешениях, выполнив вход.",
+  "tutorial_sidebar_0": "Здесь находятся все ваши фильтры и настройки",
+  "tutorial_sidebar_1": "В каждой категории вы сможете настроить отображение данных, используя переключатели",
+  "tutorial_sidebar_2": "Опции: Дополнительная настройка\nПродвинутые: Мы рассмотрим позже в этом руководстве",
+  "tutorial_sliders_0": "Использование ползунков для корректировки фильтров",
+  "tutorial_sliders_1": "Покемон между:",
+  "tutorial_sliders_2": "- IV {{iv0}}% до {{iv1}}%",
   "tutorial_sliders_3": "Уровень {{level0}} до {{level1}}",
-  "tutorial_sliders_3alt": "- И уровень от {{level0}} до {{level1}}",
-  "tutorial_sliders_4": "- Звание великой лиги с {{gl0}} по {{gl1}}",
-  "tutorial_sliders_4alt": "- ИЛИ звание великой лиги с {{gl0}} по {{gl1}}",
-  "tutorial_sliders_5": "- Звание ультра-лиги с {{ul0}} по {{ul1}}",
-  "tutorial_sliders_5alt": "- ИЛИ звание ультра-лиги с {{ul0}} по {{ul1}}",
-  "tutorial_sliders_6": "Связи с другими покемонами того же цвета",
-  "tutorial_sliders_7": "Фильтры отдельно от других ползунков",
-  "tutorial_sliders_8": "'Полный' ползунок означает, что он отключен:",
+  "tutorial_sliders_3alt": "- И Уровень {{level0}} до {{level1}}",
+  "tutorial_sliders_4": "- Рейтинг в Великом Лиге от {{gl0}} до {{gl1}}",
+  "tutorial_sliders_4alt": "- ИЛИ Рейтинг в Великом Лиге от {{gl0}} до {{gl1}}",
+  "tutorial_sliders_5": "- Рейтинг в Ультра Лиге от {{ul0}} до {{ul1}}",
+  "tutorial_sliders_5alt": "- ИЛИ Рейтинг в Ультра Лиге от {{ul0}} до {{ul1}}",
+  "tutorial_sliders_6": "Соединяется с другими того же цвета",
+  "tutorial_sliders_7": "Фильтруется отдельно от других ползунков",
+  "tutorial_sliders_8": "Полный ползунок означает, что он отключен:",
   "tutorial_sliders_9": "Все появления, независимо от проверки IV",
-  "tutorial_help": "Ярлык для этого меню",
-  "tutorial_adv_filter": "Только для мобильных устройств, открывает опции фильтрации для расширенного меню",
-  "tutorial_tune": "Устанавливает расширенный фильтр для всех покемонов, которые в данный момент фильтруются в меню",
-  "tutorial_format_size": "Устанавливает размер иконки для всех элементов, которые в данный момент фильтруются в меню",
-  "tutorial_check": "Включает все элементы, которые в данный момент фильтруются в меню",
-  "tutorial_clear": "Отключает все элементы, которые в данный момент фильтруются в меню",
+  "tutorial_help": "Быстрый доступ к этому меню",
+  "tutorial_adv_filter": "Только для мобильных, открывает опции фильтрации для продвинутого меню",
+  "tutorial_tune": "Устанавливает продвинутый фильтр для всех Покемонов, которые в настоящее время фильтруются в меню",
+  "tutorial_format_size": "Устанавливает размер иконки для всех элементов, которые в настоящее время фильтруются в меню",
+  "tutorial_check": "Включает все элементы, которые в настоящее время фильтруются в меню",
+  "tutorial_clear": "Отключает все элементы, которые в настоящее время фильтруются в меню",
   "tutorial_save": "Сохраняет текущий выбор и выходит",
-  "tutorial_show_all_view": "Переключение Покеостановок и Гимов",
-  "tutorial_show_pokemon_view": "Переключение покемонов",
+  "tutorial_show_all_view": "Переключить ПокеСтопы и Жимы",
+  "tutorial_show_pokemon_view": "Переключить Покемонов",
   "tutorial_toggle": "Нажатие на галочку/крестик переключает элемент",
-  "tutorial_pokemon_caption": "Эта иконка позволяет установить фильтры для конкретного покемона",
-  "tutorial_all_caption": "У команд есть специальное меню слотов\nВсе остальные элементы позволяют настроить размер иконки",
+  "tutorial_pokemon_caption": "Этот значок позволяет установить фильтры для конкретного Покемона",
+  "tutorial_all_caption": "Команды имеют специальное меню слотов\nВсе другие элементы позволяют настраивать размер иконки",
   "tutorial_popup_0": "Всплывающие окна теперь интерактивны!",
   "tutorial_popup_1": "Три точки открывают опции скрытия, исключения и переключения таймера",
-  "tutorial_popup_2": "Иконки по обе стороны от ссылки навигации будут разворачиваться, чтобы показать дополнительную информацию, попробуйте!",
-  "tutorial_popup_3": "Иконки различаются для каждой категории, обязательно проверьте их все",
+  "tutorial_popup_2": "Значки по обеим сторонам ссылки навигации будут расширяться, показывая дополнительную информацию, попробуйте!",
+  "tutorial_popup_3": "Значки различаются для каждой категории, обязательно ознакомьтесь со всеми",
   "tutorial_closing_0": "Дополнительная информация",
-  "tutorial_closing_1": "Глобальные ползунки Pokémon в боковой панели работают независимо от расширенного меню и не влияют друг на друга",
-  "tutorial_closing_2": "Обязательно посмотрите раздел Настройки в боковой панели",
-  "tutorial_closing_3": "Для каждой категории доступно множество вариантов оформления, но помните, что чем больше вы добавляете на карту, тем выше шанс заморозки карты",
-  "tutorial_closing_4": "Вы можете просмотреть этот учебник снова, выбрав его в панели Настройки в боковой панели",
-  "tutorial_closing_5": "Будьте осторожны и удачи!",
+  "tutorial_closing_1": "Глобальные ползунки Покемонов в боковой панели работают отдельно от продвинутого меню и не влияют друг на друга",
+  "tutorial_closing_2": "Обязательно ознакомьтесь с разделом Настройки в боковой панели",
+  "tutorial_closing_3": "Доступно множество эстетических опций для каждой категории, но имейте в виду, что чем больше вы добавляете на свою карту, тем выше шанс того, что карта зависнет",
+  "tutorial_closing_4": "Вы можете просмотреть это руководство снова, выбрав его в панели настроек в боковой панели",
+  "tutorial_closing_5": "Будьте в безопасности и удачи!",
   "intro": "Вступление",
   "sidebar": "Боковая панель",
   "sliders": "Ползунки",
@@ -252,77 +252,92 @@
   "closing": "Закрытие",
   "shortcuts": "Ярлыки",
   "iv": "IV",
-  "area_restrictions": "Ограничения по области",
+  "area_restrictions": "Ограничения по территории",
   "map": "Карта",
   "stats": "Статистика",
   "pvp": "PVP",
-  "area_restrictions_subtitle": "У вас есть доступ к этим областям",
-  "devices_subtitle": "Показывает активные местоположения устройств и маршруты",
-  "gyms_subtitle": "Показывает все активные местоположения тренажерных залов, активную команду и количество доступных слотов в каждом зале",
-  "invasions_subtitle": "Показывает информацию о вторжении команды Ракета, включая боевой состав, время истечения срока и возможные награды",
-  "iv_subtitle": "Показывает процент IV и варианты свечения",
-  "lures_subtitle": "Показывает информацию о приманке, включая тип приманки и время истечения срока",
+  "area_restrictions_subtitle": "У вас есть доступ к этим территориям",
+  "devices_subtitle": "Показывает местоположения и маршруты активных устройств",
+  "gyms_subtitle": "Показывает все активные местоположения жимов, активные команды и сколько слотов доступно в каждом жиме",
+  "invasions_subtitle": "Показывает информацию об вторжениях Команды Ракет, включая состав битвы, время окончания и возможные награды",
+  "iv_subtitle": "Показывает IV% и варианты подсветки",
+  "lures_subtitle": "Показывает информацию о приманках, включая тип приманки и время истечения",
   "map_subtitle": "Показывает карту",
-  "nests_subtitle": "Показывает активно гнездящихся покемонов и полигоны гнезд",
-  "pokemon_subtitle": "Показывает все местоположения покемонов и время истечения срока",
-  "pokestops_subtitle": "Показывает все местоположения Поке-стопов",
+  "nests_subtitle": "Показывает активно гнездующих Покемонов и полигоны гнезд",
+  "pokemon_subtitle": "Показывает все местоположения Покемонов и время истечения",
+  "pokestops_subtitle": "Показывает все местоположения ПокеСтопов",
   "portals_subtitle": "Показывает все порталы Ingress",
-  "pvp_subtitle": "Показывает информацию о ранге/CP/уровне PVP для каждого Покемона",
+  "pvp_subtitle": "Показывает информацию о PVP рейтинге/CP/Уровне для каждого покемона",
   "quests_subtitle": "Показывает информацию о наградах и заданиях квестов",
-  "raids_subtitle": "Показывает всю информацию о рейдах, включая босса, яйца, время и набор атак",
-  "scan_cells_subtitle": "Показывает последнее время сканирования S2-ячейки устройством",
-  "scan_areas_subtitle": "Показывает доступные полигоны областей сканирования",
-  "spawnpoints_subtitle": "Показывает точки появления Покемонов и их предполагаемое время исчезновения",
-  "stats_subtitle": "Показывает статистику и уровни Покемонов",
-  "submission_cells_subtitle": "Показывает информацию, полезную для отправки новых POI",
+  "raids_subtitle": "Показывает всю информацию о рейдах, включая босса рейда, яйца, время окончания и набор движений",
+  "scan_cells_subtitle": "Показывает последний раз, когда S2 ячейка была сканирована устройством",
+  "scan_areas_subtitle": "Показывает доступные полигоны зон сканирования",
+  "spawnpoints_subtitle": "Показывает точки появления и предполагаемое время их исчезновения",
+  "stats_subtitle": "Показывает статистику и уровни покемонов",
+  "submission_cells_subtitle": "Показывает полезную информацию для отправки новых POI",
   "weather_subtitle": "Показывает информацию о погоде в игре для каждой ячейки",
-  "scanner_subtitle": "Взаимодействует непосредственно со сканером различными способами",
-  "s2cells_subtitle": "Отображает ячейки S2 на карте в различных уровнях",
-  "backups_subtitle": "Позволяет создавать резервные копии и загружать настройки на разных устройствах",
+  "scanner_subtitle": "Взаимодействовать непосредственно со сканером различными способами",
+  "s2cells_subtitle": "Отображает S2 ячейки различных уровней на карте",
+  "backups_subtitle": "Позволяет создавать резервные копии настроек и загружать их на разных устройствах",
   "backups": "Резервные копии",
   "user_profile": "Профиль пользователя",
   "user_username": "Имя пользователя",
   "candy": "Конфеты",
-  "show_ex_badge": "Показывает значок EX-знака",
+  "show_ex_badge": "Показать значок EX",
   "search": "Поиск",
   "global_search_quests": "Введите название награды...",
   "global_search_lures": "Введите название приманки...",
-  "global_search_pokestops": "Введите название Поке-стопа...",
-  "global_search_gyms": "Введите название тренажера...",
+  "global_search_pokestops": "Введите название Покестопа...",
+  "global_search_gyms": "Введите название тренажерного зала...",
   "global_search_portals": "Введите название портала...",
-  "global_search_nests": "Введите название Покемона в гнезде...",
-  "global_search_raids": "Введите название босса рейда...",
-  "global_search_pokemon": "Введите название Покемона...",
-  "raid_level_badges": "Значки уровней рейда",
+  "global_search_nests": "Введите имя покемона гнезда...",
+  "global_search_raids": "Введите имя босса рейда...",
+  "global_search_pokemon": "Введите имя покемона...",
+  "global_search_invasions": "Введите тип, имя или название награды покемона для Гранта...",
+  "raid_level_badges": "Значки уровня рейда",
   "options": "Настройки",
   "profile": "Профиль",
-  "pokemon_icons": "Значки Покемонов",
-  "pokestop_icons": "Значки Поке-стопов",
-  "gym_icons": "Значки тренажеров",
-  "team_icons": "Значки команд",
-  "egg_icons": "Значки яиц",
-  "raid_icons": "Значки рейдов",
-  "nest_icons": "Значки гнезд",
-  "reward_icons": "Значки наград",
-  "type_icons": "Значки типов",
-  "weather_icons": "Значки погоды",
-  "misc_icons": "Разные значки",
-  "invasion_icons": "Значки вторжений",
+  "pokemon_icons": "Иконки покемонов",
+  "pokestop_icons": "Иконки Покестопов",
+  "gym_icons": "Иконки тренажерных залов",
+  "team_icons": "Иконки команд",
+  "egg_icons": "Иконки яиц",
+  "raid_icons": "Иконки рейдов",
+  "nest_icons": "Иконки гнезд",
+  "reward_icons": "Иконки наград",
+  "type_icons": "Иконки типов",
+  "weather_icons": "Иконки погоды",
+  "misc_icons": "Разные иконки",
+  "invasion_icons": "Иконки вторжений",
   "spawnpoint_icons": "Иконки точек появления",
   "device_icons": "Иконки устройств",
-  "pokemon_timers": "Все таймеры покемонов",
-  "show_dex_num_in_popup": "Показывать номер в покедексе во всплывающем окне",
+  "pokemon_audio": "Звуки покемонов",
+  "pokestop_audio": "Звуки Покестопов",
+  "gym_audio": "Звуки тренажерных залов",
+  "team_audio": "Звуки команд",
+  "egg_audio": "Звуки яиц",
+  "raid_audio": "Звуки рейдов",
+  "nest_audio": "Звуки гнезд",
+  "reward_audio": "Звуки наград",
+  "type_audio": "Звуки типов",
+  "weather_audio": "Звуки погоды",
+  "misc_audio": "Разные звуки",
+  "invasion_audio": "Звуки вторжений",
+  "spawnpoint_audio": "Звуки точек появления",
+  "device_audio": "Звуки устройств",
+  "pokemon_timers": "Таймеры всех покемонов",
+  "show_dex_num_in_popup": "Показать номер в Покедексе во всплывающем окне",
   "popup": "Всплывающее окно",
   "pvp_level": "Статистика PVP уровня {{level}}",
-  "pvp_mega": "Статистика мега PVP",
+  "pvp_mega": "Статистика Mega PVP",
   "webhook_entry": "Добавить в {{name}}",
   "remove_webhook_entry": "Удалить из {{name}}",
   "distance": "Расстояние",
-  "gym": "Тренажерка",
+  "gym": "Тренажерный зал",
   "egg": "Яйцо",
   "raid": "Рейд",
   "lure": "Приманка",
-  "quest": "Задание",
+  "quest": "Квест",
   "invasion": "Вторжение",
   "nest": "Гнездо",
   "pokestop": "Покестоп",
@@ -331,65 +346,65 @@
   "manage_webhook": "Управление {{name}}",
   "drag_and_drop": "Перетащите маркер, чтобы установить свое местоположение",
   "click_to_select": "Нажмите, чтобы выбрать",
-  "add_new": "Добавить новое оповещение в категории {{category}}",
+  "add_new": "Добавить новое предупреждение {{category}}",
   "my_location": "Мое местоположение",
   "choose_on_map": "Выбрать на карте",
   "select_profile": "Выбрать профиль",
-  "distance_radius": "Предварительный просмотр радиусов",
+  "distance_radius": "Предпросмотр радиусов расстояний",
   "areas": "Области",
   "select_webhook": "Выбрать бота",
-  "ar_quest_true": "AR задание",
+  "ar_quest_true": "Задание AR",
   "ar_quest_false": "Без AR",
   "with_ar": "С AR",
   "both": "Оба",
   "without_ar": "Без AR",
-  "exclude_quest_multi": "Исключить награду {{reward}}",
-  "cluster_limit_0": "Достигнут лимит ({{variable_1}}) {{variable_0}}",
-  "cluster_limit_1": "Пожалуйста, приблизьтесь или уточните фильтры",
-  "show_polygons": "Показывать полигоны",
+  "exclude_quest_multi": "Исключить {{reward}}",
+  "cluster_limit_0": "Лимит {{variable_0}} ({{variable_1}}) достигнут",
+  "cluster_limit_1": "Пожалуйста, увеличьте масштаб или сузьте фильтры",
+  "show_polygons": "Показать полигоны",
   "exclude_invasion_multi": "Исключить {{invasion}}",
-  "stardust": "Звездная пыль",
+  "stardust": "Звездная Пыль",
   "slider_cp": "CP",
   "pvp_ranking_league": "Лига",
-  "pvp_ranking_min_cp": "Минимальный CP",
+  "pvp_ranking_min_cp": "Мин. CP",
   "slider_pvp": "Ранги",
   "profile_no": "Профиль",
   "template": "Шаблон",
   "gender": "Пол",
   "clean": "Очистить",
   "all_forms": "Все формы",
-  "pvp_entry": "PVP запись",
-  "no_iv": "Включая покемонов без IV",
+  "pvp_entry": "Ввод в PVP",
+  "no_iv": "Вкл. без IV",
   "by_distance": "По расстоянию",
-  "min_time": "Минимальное время",
-  "add_new_profile": "Добавить новый профиль",
+  "min_time": "Мин. Время",
+  "add_new_profile": "Добавить Новый Профиль",
   "slider_none": "Нет",
-  "non_registered_human_title": "Упс, что-то не так!",
-  "non_registered_human_desc": "Возможно, вы не зарегистрированы в {{webhook}}\nИли сервер в данный момент недоступен",
+  "non_registered_human_title": "Ой, что-то пошло не так!",
+  "non_registered_human_desc": "Возможно, Вы не зарегистрированы в {{webhook}}\nИли сервер сейчас недоступен",
   "try_again_later": "Пожалуйста, попробуйте позже",
-  "selected_areas": "Выбрано {{amount}} область",
-  "selected_areas_plural": "Выбрано {{amount}} области",
+  "selected_areas_one": "{{count}} Выбранная Область",
+  "selected_areas_other": "{{count}} Выбранных Областей",
   "webhook_selection": "Выбор {{name}}",
-  "message_of_the_day": "Сообщение дня",
-  "has_quest_indicator": "Альтернативный цвет для покестопов с заданиями",
-  "show_ar_badge": "Показывать значок AR",
-  "all_gyms": "Все тренажерки",
-  "general": "Общие",
+  "message_of_the_day": "Сообщение Дня",
+  "has_quest_indicator": "Альтернативный Цвет для Остановок с Заданиями",
+  "show_ar_badge": "Показать Значок AR",
+  "all_gyms": "Все Тренажерные Залы",
+  "general": "Общее",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Связать глобальное и расширенное",
-  "normal_forms": "Обычные формы",
-  "weather_indicator": "Индикатор погодного буста",
+  "link_global_and_advanced": "Выбор Глобально Уважает Выбранные",
+  "normal_forms": "Обычные Формы",
+  "weather_indicator": "Индикатор Погодной Активации",
   "page": "Страница {{page}}",
-  "navigation_controls": "Управление навигацией",
-  "navigation_controls_react": "Реакт",
-  "navigation_controls_leaflet": "Лист",
-  "exclusive": "Эксклюзивный",
-  "all_moves": "Все атаки",
-  "move": "Атака",
-  "any": "Любая",
-  "min_spawn_average": "Минимальная частота появления",
-  "select_all": "Выбрать все",
-  "delete_all": "Удалить выбранные",
+  "navigation_controls": "Навигационные Элементы Управления",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
+  "exclusive": "Эксклюзив",
+  "all_moves": "Все Движения",
+  "move": "Движение",
+  "any": "Любой",
+  "min_spawn_average": "Мин. Среднее Появления",
+  "select_all": "Выбрать Все",
+  "delete_all": "Удалить Выбранные",
   "cancel": "Отмена",
   "day_1": "Понедельник",
   "day_2": "Вторник",
@@ -398,191 +413,193 @@
   "day_5": "Пятница",
   "day_6": "Суббота",
   "day_7": "Воскресенье",
-  "profile_name": "Имя профиля",
-  "manage_profiles": "Управление профилями",
-  "min_spawn_avg": "Среднее минимальное появление",
+  "profile_name": "Имя Профиля",
+  "manage_profiles": "Управление Профилями",
+  "min_spawn_avg": "Сред. Мин. Появление",
   "poke_global": "Все",
   "amount": "Количество",
-  "specific_gym": "Конкретный спортзал",
-  "search_location": "Поиск местоположений",
-  "search_specific": "Поиск конкретной {{category}}",
-  "webhook_success_gym": "Рейды, яйца и смена команды добавлены!",
-  "slot_changes": "Изменения слотов",
-  "slot_changes_poracle": "slot_changes",
-  "confirm_delete": "Это удалит все отслеживание для этого профиля, вы уверены?",
-  "confirm_copy": "Выберите профиль, в который вы хотите скопировать \"{{profile}}\", это полностью перезапишет этот профиль.",
+  "specific_gym": "Конкретный Зал",
+  "search_location": "Поиск Локаций",
+  "search_specific": "Поиск Конкретного {{category}}",
+  "webhook_success_gym": "Оповещения о Рейдах, Яйцах и Смене Команд Добавлены!",
+  "slot_changes": "Изменения Слотов",
+  "slot_changes_poracle": "изменения_слотов",
+  "confirm_delete": "Это уберет все отслеживания для этого профиля, вы уверены?",
+  "confirm_copy": "Выберите, на какой профиль вы хотели бы скопировать \"{{profile}}\", это полностью перезапишет этот профиль.",
   "webhook_error": "{{name}} не смог обработать это.\nПожалуйста, попробуйте позже.",
-  "profile_error": "Должно быть уникальным и действительным",
+  "profile_error": "Должен быть уникальным и действительным",
   "team_0": "Гармония",
-  "battle_changes": "В битве",
-  "battle_changes_poracle": "battle_changes",
+  "battle_changes": "В Бою",
+  "battle_changes_poracle": "изменения_в_бою",
   "auto": "Авто",
-  "webhooks_subtitle": "Управляйте своими оповещениями непосредственно с карты для этих ботов",
-  "event_stops_subtitle": "Отображает специальные покестопы, такие как Кеклеон",
+  "webhooks_subtitle": "Управляйте своими уведомлениями прямо с карты для этих ботов",
+  "event_stops_subtitle": "Отображает специальные ивентовые ПокеСтопы, например, Кецлеон",
   "webhooks": "Оповещения",
-  "scanner": "Действия сканера",
-  "everything_individually": "Добавить отдельные оповещения",
+  "scanner": "Действия Сканера",
+  "everything_individually": "Добавлять Индивидуальные Оповещения",
   "individually": "индивидуально",
   "join": "Присоединиться",
-  "errors_404": "Упс, эта страница не может быть найдена!",
+  "errors_404": "Ой, эту страницу не найти!",
   "errors_500": "Произошла ошибка сервера, попробуйте позже!",
-  "local_username": "Имя пользователя",
+  "local_username": "Имя Пользователя",
   "local_password": "Пароль",
-  "local_error": "Произошла ошибка, пожалуйста, попробуйте позже!",
-  "no_filter_results": "Результаты не найдены\nПопробуйте расширить фильтры",
-  "donor_page": "Страница донора",
+  "local_error": "Произошла ошибка, пожалуйста, попробуйте позже.",
+  "no_filter_results": "Результатов Не Найдено\nПопробуйте Расширить Ваши Фильтры",
+  "donor_page": "Страница Донора",
   "go_back": "Вернуться назад",
   "access": "Доступ",
-  "link_discord": "Ссылка на Discord",
-  "select_webhook_strategy": "Менеджер оповещений",
-  "webhook_strategy_success_0": "Успех! Обновление для получения настроек оповещений...",
-  "register": "Регистрация",
-  "invalid_credentials": "Неверные учетные данные",
-  "error_creating_user": "Не удалось зарегистрировать нового пользователя в данный момент",
-  "discord_linked": "Discord связан",
-  "telegram_linked": "Telegram связан",
+  "link_discord": "Привязать Discord",
+  "select_webhook_strategy": "Менеджер Оповещений",
+  "webhook_strategy_success_0": "Успешно! Обновление для получения настроек оповещений...",
+  "register": "Зарегистрироваться",
+  "invalid_credentials": "Недействительные учетные данные",
+  "localauth_failed": "Ошибка аутентификации",
+  "error_creating_user": "Невозможно зарегистрировать нового пользователя в данный момент",
+  "discord_linked": "Discord Привязан",
+  "telegram_linked": "Telegram Привязан",
   "level": "уровень",
   "km": "км",
-  "feedback": "Обратная связь",
-  "donor_menu": "Меню донора",
-  "pokemon_cell": "Местоположение покемона может варьироваться",
-  "timer_verified": "Этот таймер проверен",
-  "timer_unverified": "Этот таймер не проверен",
+  "feedback": "Отзыв",
+  "donor_menu": "Меню Донора",
+  "pokemon_cell": "Местоположение Покемона Может Варьироваться",
+  "timer_verified": "Этот Таймер Проверен",
+  "timer_unverified": "Этот Таймер Не Проверен",
   "all": "Все",
   "badge_0": "Нет",
   "badge_1": "Бронза",
   "badge_2": "Серебро",
   "badge_3": "Золото",
-  "gym_badge_menu": "Редактировать значок спортзала",
-  "gym_badges": "Значки спортзалов",
-  "gym_badge_diamonds": "Показывать значки спортзалов",
+  "gym_badge_menu": "Редактировать Значок Спортзала",
+  "gym_badges": "Значки Спортзалов",
+  "gym_badge_diamonds": "Показать Значки Спортзала",
   "gym_badges_subtitle": "Отображает значки спортзалов на карте и список на странице профиля.",
-  "confirm_filters_reset": "Сбросить фильтры",
-  "filters_reset_text": "Вы уверены, что хотите сбросить настройки до значений по умолчанию? Это действие нельзя отменить!",
-  "filters_reset_title": "Сбросить фильтры",
-  "raid_quick_select": "Быстрый выбор",
+  "confirm_filters_reset": "Сброс фильтров",
+  "filters_reset_text": "Вы уверены, что хотите сбросить настройки до значений по умолчанию? Это действие необратимо!",
+  "filters_reset_title": "Сброс фильтров",
+  "raid_quick_select": "Быстрый Выбор",
   "disabled": "Отключено",
   "loading": "Загрузка {{category}}",
-  "loading_icons": "Получение иконок",
-  "loading_invasions": "Получение вторжений",
-  "scan_next": "Сканировать местоположение",
-  "scan_next_choose": "Перетащите маркер, чтобы установить местоположение сканирования",
-  "scan_zone": "Сканировать область",
-  "scan_zone_choose": "Перетащите маркер, чтобы установить местоположение сканирования и выбрать размер",
+  "loading_icons": "Загрузка Иконок",
+  "loading_invasions": "Загрузка Вторжений",
+  "scan_next": "Сканировать Следующее Местоположение",
+  "scan_next_choose": "Переместите Маркер, Чтобы Установить Местоположение Сканирования",
+  "scan_zone": "Сканировать Область",
+  "scan_zone_choose": "Переместите Маркер, Чтобы Установить Местоположение Сканирования и Выбрать Размер",
   "scan_zone_size": "Размер",
   "scan_zone_range": "Диапазон",
-  "scan_zone_spacing": "Расстояние",
+  "scan_zone_spacing": "Промежуток",
   "scan_zone_radius": "Радиус",
-  "scan_requests": "Запросы на сканирование",
-  "scan_queue": "Текущая очередь",
-  "click_to_scan": "Сканировать здесь",
-  "scan_confirmed_title": "Подтвержден запрос на сканирование",
-  "scan_confirmed": "Рабочий отправлен на местоположение, результат скоро появится на карте!",
-  "scan_loading_title": "Отправка запроса на сканирование",
+  "scan_requests": "Запросы Сканирования",
+  "scan_queue": "Текущая Очередь",
+  "click_to_scan": "Сканировать Здесь",
+  "scan_confirmed_title": "Запрос На Сканирование Подтвержден",
+  "scan_confirmed": "Оператор отправлен на местоположение, результат скоро появится на карте!",
+  "scan_loading_title": "Отправка Запроса На Сканирование",
   "scan_loading": "Ваш запрос на сканирование обрабатывается и отправляется в систему!",
   "scan_error_title": "Ошибка",
   "scan_error": "Произошла ошибка при обработке запроса на сканирование...",
   "scan_outside_area": "Это местоположение находится за пределами разрешенных зон",
   "pvp_ranking_cap": "Уровень",
-  "lc_title": "Следуйте за вашим местоположением",
-  "lc_metersUnit": "метров",
-  "lc_feetUnit": "футов",
+  "lc_title": "Следите За Своим Местоположением",
+  "lc_metersUnit": "метры",
+  "lc_feetUnit": "футы",
   "lc_popup": "Вы находитесь в пределах {distance} {unit} от этой точки",
-  "lc_outsideMapBoundsMsg": "Похоже, вы находитесь за пределами границ карты",
-  "no_alerts": "Не найдено предупреждений",
-  "loading_settings": "Загрузка настроек",
-  "refresh_to_continue": "Пожалуйста, обновите перед продолжением",
-  "session_expired_title": "Сессия истекла",
+  "lc_outsideMapBoundsMsg": "Похоже, вы находитесь за пределами карты",
+  "no_alerts": "Оповещения Не Найдены",
+  "loading_settings": "Загрузка Настроек",
+  "refresh_to_continue": "Пожалуйста, обновите страницу, прежде чем продолжить",
+  "session_expired_title": "Сессия Истекла",
   "session_expired_body": "Ваша сессия истекла",
   "old_client_title": "Устаревший",
-  "old_client_body": "Доступна новая версия этой карты",
+  "old_client_body": "Новая версия этой карты доступна",
+  "early_old_client_title": "Устаревший",
+  "early_old_client_body": "Устаревшая версия этого приложения может быть сохранена в кеше вашего браузера, вам нужно очистить кеш, прежде чем вы сможете использовать это приложение.",
   "refresh": "Обновить",
   "points": "Очки",
   "day": "День",
   "days": "Дни",
-  "react_error": "Что-то пошло не так",
-  "clickable_icon": "Иконка можно нажать",
-  "two_stops_till_next": "2 остановки до следующей",
-  "one_stop_till_next": "1 остановка до следующей",
-  "no_more_gyms": "Больше нет спортзалов",
-  "light_map_border": "Светлая граница карты",
-  "dark_map_border": "Темная граница карты",
-  "cell_blocked": "Ячейка заблокирована",
+  "react_error": "Что-то Пошло Не Так",
+  "clickable_icon": "Иконка с Возможностью Клика",
+  "two_stops_till_next": "2 остановки до следующего",
+  "one_stop_till_next": "1 остановка до следующего",
+  "no_more_gyms": "Больше Нет Спортзалов",
+  "light_map_border": "Светлая Граница Карты",
+  "dark_map_border": "Темная Граница Карты",
+  "cell_blocked": "Ячейка Заблокирована",
   "poi_color": "Цвет POI",
-  "quest_condition": "Условие задания",
-  "always_show_labels": "Всегда показывать метки",
-  "scan_areas_options": "Параметры сканирования областей",
-  "historic_rarity": "Историческая редкость",
-  "poi": "Точки интереса",
-  "300m_range": "Диапазон 300 м",
+  "quest_condition": "Условие Задания",
+  "always_show_labels": "Всегда Показывать Надписи",
+  "scan_areas_options": "Опции Зон Сканирования",
+  "historic_rarity": "Историческая Редкость",
+  "poi": "Точки Интереса",
+  "300m_range": "Диапазон 300м",
   "lure_range": "Диапазон приманки",
-  "custom_range": "Пользовательский диапазон",
+  "custom_range": "Выбранный диапазон",
   "tap_to_toggle": "Нажмите, чтобы переключить",
-  "power_up": "Усиление",
+  "power_up": "Усилить",
   "never_alt": "Никогда",
-  "seen_nearby_stop": "Видели поблизости",
-  "seen_nearby_cell": "Видели в этой ячейке",
+  "seen_nearby_stop": "Замечено рядом",
+  "seen_nearby_cell": "Замечено в этой ячейке",
   "seen_lure_encounter": "Встреча с приманкой",
-  "seen_lure_wild": "Появление приманки",
-  "seen_wild": "Дикий появление",
+  "seen_lure_wild": "Дикий покемон от приманки",
+  "seen_wild": "Дикий покемон",
   "event_stops": "Остановки событий",
   "event_stop_timers": "Таймеры остановок событий",
   "size_0": "Любой",
-  "size_1": "XXS",
-  "size_2": "XS",
-  "size_3": "M",
-  "size_4": "XL",
-  "size_5": "XXL",
+  "size_1": "ОЧМ",
+  "size_2": "М",
+  "size_3": "С",
+  "size_4": "Б",
+  "size_5": "ОБ",
   "show_size_indicator": "Показать индикатор размера",
   "size": "Размер",
   "gold_stop": "Золотая остановка",
   "profile_backups": "Смена профиля",
-  "new_backup": "Новая резервная копия",
+  "new_backup": "Новая копия",
   "create": "Создать",
   "load": "Загрузить",
   "update": "Обновить",
   "delete": "Удалить",
   "name": "Имя",
   "only_confirmed": "Только подтвержденные",
-  "rocket_pokemon": "Ракетные покемоны",
-  "decoy": "Манекен",
-  "s2_cell_limit_0": "Вы попытались сгенерировать более 20 000 ячеек ({{variable_0}})",
-  "show_all_pvp_ranks": "Показать все ранги PVP",
+  "rocket_pokemon": "Покемон команды Р",
+  "decoy": "Приманка",
+  "s2_cell_limit_0": "Вы попробовали сгенерировать более 20 000 ячеек ({{variable_0}})",
+  "show_all_pvp_ranks": "Показать все PVP рейтинги",
   "enable_pokemon_popup_coords": "Показать координаты покемонов",
-  "enable_gym_popup_coords": "Показать координаты спортзалов",
+  "enable_gym_popup_coords": "Показать координаты тренажерных залов",
   "enable_pokestop_popup_coords": "Показать координаты покестопов",
   "enable_portal_popup_coords": "Показать координаты порталов",
-  "on_block_join_discord": "Пожалуйста, присоединитесь к нашему Discord-серверу для получения дополнительной информации.",
-  "on_block_msg": "Вы были заблокированы за то, что являетесь участником",
+  "on_block_join_discord": "Пожалуйста, присоединяйтесь к нашему дискорду для получения дополнительной информации.",
+  "on_block_msg": "Вы были заблокированы за членство в",
   "denied": "Отклонено",
   "showcase": "Витрина",
   "unknown_event": "Неизвестное событие",
-  "scanner_countdown": "Доступно через {{time}} секунд",
-  "success": "Успех",
+  "scanner_countdown": "Доступно через {{time}}с",
+  "success": "Успешно",
   "contribute": "Внести вклад",
   "mi": "ми",
   "filter_by_areas": "Фильтровать по областям",
-  "submit_nest_name": "Отправить название гнезда",
-  "nest_submission_menu": "Обновление названия",
-  "nest_submissions": "Предложения гнезд",
-  "nest_submissions_subtitle": "Позволяет вам предлагать новые названия для гнезд",
-  "pokemon_opacity": "Динамическая непрозрачность покемонов",
-  "invasion_opacity": "Динамическая непрозрачность вторжений",
-  "raid_opacity": "Динамическая непрозрачность рейдов",
-  "opacity_ten_minutes": "Непрозрачность через 10 минут",
-  "opacity_five_minutes": "Непрозрачность через 5 минут",
-  "opacity_one_minute": "Непрозрачность через 1 минуту",
+  "submit_nest_name": "Предложить название гнезда",
+  "nest_submission_menu": "Обновление имени",
+  "nest_submissions": "Подача гнезд",
+  "nest_submissions_subtitle": "Позволяет предлагать новые названия для гнезд",
+  "pokemon_opacity": "Динамическая прозрачность покемонов",
+  "invasion_opacity": "Динамическая прозрачность вторжений",
+  "raid_opacity": "Динамическая прозрачность рейдов",
+  "opacity_ten_minutes": "Прозрачность через 10 минут",
+  "opacity_five_minutes": "Прозрачность через 5 минут",
+  "opacity_one_minute": "Прозрачность через 1 минуту",
   "level_circles": "Индикаторы уровня",
   "min_level_circle": "Минимальный уровень круга",
-  "mutation_auth_error": "Ваш запрос не удался из-за отсутствия входа в систему",
-  "submitted_by": "Отправлено пользователем",
-  "localauth_failed": "Аутентификация не удалась",
-  "reversible": "Обратимый",
+  "mutation_auth_error": "Ваш запрос не был успешным из-за отсутствия входа в систему",
+  "submitted_by": "Предложено",
+  "reversible": "Обратимо",
   "version": "Версия",
-  "route_tags": "Метки маршрута",
+  "route_tags": "Теги маршрута",
   "routes": "Маршруты",
   "route_type": "Тип маршрута",
-  "routes_subtitle": "Просмотр маршрутов в игре и связанной с ними информации на карте",
+  "routes_subtitle": "Просмотр маршрутов в игре и соответствующая информация о них на карте",
   "description": "Описание",
   "additional_info": "Дополнительная информация",
   "duration": "Продолжительность",
@@ -590,49 +607,15 @@
   "contest_category_1": "Самый маленький размер",
   "context_category_2": "Самый большой размер",
   "total_entries": "Всего записей",
-  "showcase_rankings": "Рейтинг шоукаса",
-  "showcase_rankings_subtitle": "Отображает список лучших рейтингов для шоукаса на ПокеСтоупе",
+  "showcase_rankings": "Рейтинг витрины",
+  "showcase_rankings_subtitle": "Отображает список топ-рангов для витрины на покестопе",
   "tth": "TTH",
   "tth_0": "Все",
-  "tth_1": "Известные",
-  "tth_2": "Неизвестные",
+  "tth_1": "Известно",
+  "tth_2": "Неизвестно",
   "no_access": "Нет доступа",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
   "cooldown": "Перезарядка",
-  "scan_some_outside_area": "Некоторые локации находятся за пределами разрешенных границ",
+  "scan_some_outside_area": "Некоторые места находятся за пределами разрешенных границ",
   "alerts": "оповещения",
   "alert_manager": "Менеджер оповещений",
   "menu": "Меню",
@@ -643,68 +626,93 @@
   "component_donation_page": "Страница пожертвований",
   "component_message_of_the_day": "Сообщение дня",
   "download": "Скачать",
-  "playground": "Площадка",
+  "playground": "Игровая площадка",
   "locale": "Локаль",
   "saved": "Сохранено",
   "show_editor": "Показать редактор",
   "hide_editor": "Скрыть редактор",
-  "reported_error": "Эта ошибка была передана на сервер с идентификатором",
+  "reported_error": "Эта ошибка была отправлена на сервер с идентификатором",
   "dark_mode": "Темный режим",
   "load_from_autosave": "Загрузить из автосохранения",
   "done": "Готово",
-  "fast": "Быстро",
-  "charged": "Заряжено",
-  "offline_mode": "Автономный режим",
-  "include_sponsored": "Включить Рекламу",
-  "showcase_color": "Цвет Витрины",
-  "partner_color": "Цвет Партнера",
+  "fast": "Быстрое",
+  "charged": "Заряженное",
+  "offline_mode": "Офлайн режим",
+  "include_sponsored": "Включая спонсорское",
+  "showcase_color": "Цвет витрины",
+  "partner_color": "Цвет партнера",
   "disable": "Отключить {{- name}}",
   "profiling": "Профилирование",
   "showcase_block": "Заблокировано из-за витрины",
-  "signed_in_as": "Вы вошли как",
-  "missing_map_perm": "У вас нет разрешения на просмотр карты.",
-  "pokemon_audio": "Звук Покемона",
-  "pokestop_audio": "Звук Поке-стопа",
-  "gym_audio": "Звук Гима",
-  "team_audio": "Звук Команды",
-  "egg_audio": "Звук Яйца",
-  "raid_audio": "Звук Рейда",
-  "nest_audio": "Звук Гнезда",
-  "reward_audio": "Звук Награды",
-  "type_audio": "Звук Типа",
-  "weather_audio": "Звук Погоды",
-  "misc_audio": "Прочий Звук",
-  "invasion_audio": "Звук Вторжения",
-  "spawnpoint_audio": "Звук Точки Спауна",
-  "device_audio": "Звук устройства",
+  "signed_in_as": "Вошел как",
+  "missing_map_perm": "У вас нет разрешения для просмотра карты.",
   "access_denied": "Доступ запрещен",
-  "audio": "Звук",
+  "audio": "Аудио",
   "desktop_notifications": "Уведомления на рабочем столе",
   "notifications_options": "Настройки уведомлений",
-  "audio_always_on": "Звук всегда включен",
+  "audio_always_on": "Аудио всегда включено",
   "volume_level": "Уровень громкости",
   "notifications_status": "Статус уведомлений",
   "granted": "разрешено",
-  "global_search_invasions": "Введите тип Гранта, имя или имя вознаграждения за покемона...",
-  "set_all": "Установить все",
-  "set_filtered": "Установить фильтр",
-  "only_show_available": "Показать только доступные",
+  "set_all": "Настроить все",
+  "set_filtered": "Настроить фильтры",
+  "only_show_available": "Показывать только доступное",
   "easy_mode": "Простой режим",
-  "quick_select": "Глобальный быстрый выбор",
-  "pokemon_filter_mode": "Режим фильтрации покемонов",
-  "basic": "Основный",
+  "quick_select": "Быстрый выбор глобально",
+  "pokemon_filter_mode": "Режим фильтрации Pokémon",
+  "basic": "Базовый",
   "intermediate": "Средний",
-  "expert": "Продвинутый",
-  "basic_description": "Легко выбирайте покемонов и применяйте глобальный фильтр",
-  "intermediate_description": "Установите индивидуальные фильтры глобально и для каждого покемона (традиционный)",
-  "expert_description": "Ручное ввод запросов для наибольшей настройки",
+  "expert": "Экспертный",
+  "basic_description": "Легкий выбор Pokémon и применение глобального фильтра",
+  "intermediate_description": "Установка индивидуальных фильтров глобально и для каждого Pokémon (традиционно)",
+  "expert_description": "Ручной ввод запросов для максимальной настройки",
   "icon_size": "Размер иконки",
   "developer": "Разработчик",
-  "raid_override": "Переопределение рейда",
-  "search_rocket_pokemon": "Поиск покемона Ракеты",
-  "main": "Основной",
-  "extra": "Дополнительный",
+  "raid_override": "Переопределение Рейда",
+  "search_rocket_pokemon": "Поиск Pokémon Team GO Rocket",
+  "main": "Основной",
+  "extra": "Дополнительный",
   "select": "Выбрать",
   "searching": "поиск...",
-  "no_options": "Нет вариантов..."
+  "no_options": "Нет вариантов...",
+  "and": "И",
+  "or": "ИЛИ",
+  "only_global": "Только глобально",
+  "global_caption": "Игнорирует все другие фильтры",
+  "global_and_individual": "Глобальные и индивидуальные фильтры",
+  "gender_filters_all": "Пол применяется ко всем",
+  "and_caption": "Связаны вместе",
+  "or_caption": "Фильтрует независимо",
+  "filter_help": "Помощь с фильтрами",
+  "kilometers": "Километры",
+  "miles": "Мили",
+  "distance_unit": "Единица измерения расстояния",
+  "data_management": "Управление данными",
+  "reset_or_manage_text": "Вы можете либо полностью сбросить ваши фильтры, либо посмотреть страницу управления данными, которая позволит вам сбросить отдельные категории.",
+  "reset_audio": "Сбросить аудио",
+  "reset_all": "Сбросить все",
+  "reset_icons": "Сбросить иконки",
+  "reset_position": "Сбросить позицию",
+  "reset_ui": "Сбросить интерфейс пользователя",
+  "reset_options": "Сбросить настройки",
+  "reset_menus": "Сбросить меню",
+  "reset_settings": "Сбросить настройки",
+  "reset_general_title": "Общее",
+  "reset_filters_title": "Фильтры",
+  "reset_assets": "Сбросить ресурсы",
+  "reset_pokemon": "Сбросить Pokémon",
+  "reset_pokestops": "Сбросить PokéStops",
+  "reset_gyms": "Сбросить Gyms",
+  "reset_nests": "Сбросить Nests",
+  "reset_portals": "Сбросить Portals",
+  "reset_routes": "Сбросить Routes",
+  "reset_scan_areas": "Сбросить области сканирования",
+  "reset_scan_cells": "Сбросить ячейки сканирования",
+  "reset_devices": "Сбросить устройства",
+  "reset_weather": "Сбросить погоду",
+  "reset_s2cells": "Сбросить S2 Cells",
+  "reset_spawnpoints": "Сбросить точки появления",
+  "reset_submission_cells": "Сбросить ячейки подачи заявок",
+  "hisuian": "Хисуийский",
+  "spacial_rend_range": "Диапазон Пространственного Разрыва"
 }
diff --git a/packages/locales/lib/generated/sv.json b/packages/locales/lib/generated/sv.json
index 0d4bfad1f..817ef4e12 100644
--- a/packages/locales/lib/generated/sv.json
+++ b/packages/locales/lib/generated/sv.json
@@ -1,6 +1,6 @@
 {
   "login": "Logga in",
-  "click_once": "Klicka bara på 'Godkänn' en gång",
+  "click_once": "Klicka bara på 'Auktorisera' en gång",
   "save": "Spara",
   "reset": "Återställ",
   "close": "Stäng",
@@ -8,7 +8,7 @@
   "pokemon_filters": "Pokémon-filterinställningar",
   "gyms_filters": "Gym-filterinställningar",
   "pokestops_filters": "PokéStop-filterinställningar",
-  "nests_filters": "Näste-filterinställningar",
+  "nests_filters": "Bo-filterinställningar",
   "help": "Hjälp",
   "apply_to_all": "Tillämpa på alla",
   "disable_all": "Inaktivera alla",
@@ -18,14 +18,14 @@
   "id": "ID",
   "location": "Plats",
   "search_pokemon": "Sök Pokémon",
-  "search_nests": "Sök nästen",
+  "search_nests": "Sök bo",
   "search_gyms": "Sök gym",
   "search_pokestops": "Sök PokéStops",
-  "search_raids": "Sök räder",
-  "search_eggs": "Sök ägg",
-  "search_quests": "Sök uppdrag",
-  "search_lures": "Sök lockbeten",
-  "search_invasions": "Sök invasioner",
+  "search_raids": "Sök Raid",
+  "search_eggs": "Sök Ägg",
+  "search_quests": "Sök Uppdrag",
+  "search_lures": "Sök Lockmedel",
+  "search_invasions": "Sök Invasioner",
   "sm": "sm",
   "md": "md",
   "lg": "lg",
@@ -37,8 +37,8 @@
   "generations": "Generationer",
   "types": "Typer",
   "forms": "Former",
-  "rarity": "Nuvarande sällsynthet",
-  "others": "Andra",
+  "rarity": "Nuvarande Sällsynthet",
+  "others": "Övriga",
   "categories": "Kategorier",
   "rank": "Rank",
   "slider_iv": "IV-intervall",
@@ -47,20 +47,20 @@
   "slider_little": "Little Cup",
   "slider_atk_iv": "Attack",
   "slider_def_iv": "Försvar",
-  "slider_sta_iv": "Stamina",
+  "slider_sta_iv": "Uthållighet",
   "slider_level": "Nivå",
   "slider_size": "Storlek",
-  "abbreviation_level": "L",
-  "lvl": "Nivå",
-  "cap": "Cap",
+  "abbreviation_level": "N",
+  "lvl": "Niv",
+  "cap": "Max",
   "custom": "Anpassad",
   "valid": "Giltig",
   "invalid": "Ogiltig!",
-  "overwrites": "Skriv över alla filter",
-  "valid_filter": "Giltigt statistikfilter",
+  "overwrites": "Skriver över alla filter",
+  "valid_filter": "Giltigt statsfilter",
   "invalid_filter": "Ange ett giltigt filter",
   "gyms": "Gym",
-  "nests": "Nästen",
+  "nests": "Bo",
   "pokestops": "PokéStops",
   "pokemon": "Pokémon",
   "wayfarer": "Wayfarer",
@@ -69,11 +69,11 @@
   "weather": "Väder",
   "admin": "Admin",
   "settings": "Inställningar",
-  "advanced": "Avancerat",
-  "tile_servers": "Kartserver",
-  "icons": "Ikon",
-  "navigation": "Navigation",
-  "drawer": "Sidoruta",
+  "advanced": "Avancerad",
+  "tile_servers": "Tile-servrar",
+  "icons": "Ikoner",
+  "navigation": "Navigering",
+  "drawer": "Skjutpanel",
   "tile_servers_default": "Standard",
   "drawer_temporary": "Tillfällig",
   "drawer_persistent": "Bestående",
@@ -82,203 +82,203 @@
   "export": "Exportera",
   "logout": "Logga ut",
   "local_storage_cleared": "Lokal lagring har rensats!",
-  "iv_or_filter": "IV ELLER-filter",
+  "iv_or_filter": "IV ELLER Filter",
   "polygons": "Polygoner",
-  "raids": "Räder",
-  "ex_eligible": "EX-berättigad",
+  "raids": "Raids",
+  "ex_eligible": "EX Berättigad",
   "in_battle": "I strid",
   "all_pokestops": "Alla PokéStops",
-  "lures": "Lockbeten",
+  "lures": "Lockmedel",
   "quests": "Uppdrag",
   "invasions": "Invasioner",
   "portals": "Portaler",
-  "submission_cells": "Inskickningsceller",
+  "submission_cells": "Inlämningsceller",
   "spawnpoint": "Spawnpunkt",
   "spawnpoints": "Spawnpunkter",
-  "s2_cell_level": "Nivå {{level}} S2 Cell",
+  "s2_cell_level": "Nivå {{level}} S2-cell",
   "total_count": "Totalt antal",
   "next_submission": "Nästa inlämning!",
   "never": "Aldrig",
   "next_gym": "Nästa gym",
-  "scan_cells": "Skanna celler",
+  "scan_cells": "Skanningsceller",
   "devices": "Enheter",
   "use_my_location": "Använd min plats",
   "submit_feedback_title": "Skicka feedback/buggrapport",
-  "use_the_link_below": "Du kan använda länken nedan för att skicka in feedback eller rapportera buggar som du har stött på.",
+  "use_the_link_below": "Du kan använda länken nedan för att skicka feedback eller eventuella buggar du har stött på.",
   "feedback_to_devs": "Denna feedback skickas direkt till utvecklarna.",
-  "feedback_form": "Feedbackformulär",
+  "feedback_form": "Feedback-formulär",
   "unknown_pokestop": "Okänt PokéStop-namn",
-  "unknown_gym": "Okänt gymnamn",
+  "unknown_gym": "Okänt Gymnamn",
   "exclude": "Exkludera",
-  "exclude_quest": "Exkludera uppdrag",
-  "exclude_invasion": "Exkludera invasion",
-  "exclude_team": "Exkludera lag",
-  "exclude_raid": "Exkludera raid",
-  "exclude_lure": "Exkludera lockbete",
+  "exclude_quest": "Exkludera Uppdrag",
+  "exclude_invasion": "Exkludera Invasion",
+  "exclude_team": "Exkludera Lag",
+  "exclude_raid": "Exkludera Raid",
+  "exclude_lure": "Exkludera Lockbete",
   "timer": "Timer",
   "hide": "Dölj",
   "tier": "Nivå",
   "slots": "Platser",
   "mega": "Mega",
   "form": "Form",
-  "starts": "Börjar",
+  "starts": "Startar",
   "ends": "Slutar",
   "defender": "Försvarare",
-  "cp": "CP",
+  "cp": "KP",
   "kilogram": "kg",
   "meter": "m",
-  "total_cp": "Total CP",
-  "first_seen": "Första sett",
-  "last_seen": "Senast sett",
-  "last_modified": "Senast ändrad",
-  "last_updated": "Senast uppdaterad",
+  "total_cp": "Total KP",
+  "first_seen": "Först Sett",
+  "last_seen": "Senast Sett",
+  "last_modified": "Senast Ändrad",
+  "last_updated": "Senast Uppdaterad",
   "imported": "Importerad",
-  "nest_estimated": "Nästdata är uppskattad!",
-  "verify_nests": "Verifiera genom att kontrollera aktuella spawnar",
-  "nest_out_of_date": "Nästet kan vara föråldrat!",
-  "nest_check_current": "Kontrollera aktuella spawnar istället",
-  "spawns_per_hour": "Per timme",
+  "nest_estimated": "Bonddata är Uppskattad!",
+  "verify_nests": "Verifiera Genom Att Kolla Nuvarande Spawns",
+  "nest_out_of_date": "Boendet är Potentiellt Utgånget!",
+  "nest_check_current": "Kolla Nuvarande Spawns Istället",
+  "spawns_per_hour": "Per Timme",
   "teams": "Lag",
   "eggs": "Ägg",
   "reverse": "Omvänd",
   "selected": "Vald",
-  "unselected": "Avvald",
+  "unselected": "Ovald",
   "only_available": "Tillgänglig",
   "common": "Vanlig",
   "uncommon": "Ovanlig",
   "rare": "Sällsynt",
-  "ultra_rare": "Ultra sällsynt",
+  "ultra_rare": "Mycket Sällsynt",
   "regional": "Regional",
   "event": "Event",
   "legendary": "Legendarisk",
   "mythical": "Mytisk",
   "ultra_beast": "Ultra Beast",
-  "alt_forms": "Alternativa former",
+  "alt_forms": "Alternativa Former",
   "alola": "Alola",
   "galarian": "Galarian",
   "showing": "Visar",
   "instance": "Instans",
   "online": "Online",
   "offline": "Offline",
-  "boosted_types": "Förstärkta typer",
-  "pokemon_options": "Pokémon-alternativ",
-  "pokestops_options": "PokéStop-alternativ",
-  "gyms_options": "Gym-alternativ",
-  "nests_options": "Näst-alternativ",
-  "wayfarer_options": "Wayfarer-alternativ",
-  "admin_options": "Admin-alternativ",
-  "weather_options": "Väder-alternativ",
-  "s2cells_options": "S2 Cell-alternativ",
-  "clustering": "Kluster",
+  "boosted_types": "Förstärkta Typer",
+  "pokemon_options": "Pokémon Inställningar",
+  "pokestops_options": "PokéStop Inställningar",
+  "gyms_options": "Gym Inställningar",
+  "nests_options": "Bonn Inställningar",
+  "wayfarer_options": "Wayfarer Inställningar",
+  "admin_options": "Admin Inställningar",
+  "weather_options": "Väder Inställningar",
+  "s2cells_options": "S2 Cell Inställningar",
+  "clustering": "Klustering",
   "glow": "Glöd",
-  "legacy_filter": "Legacy-filter",
-  "raid_timers": "Alla raid-timrar",
-  "invasion_timers": "Alla invasionstidtagare",
-  "lure_timers": "Alla lockbetestidtagare",
-  "device_path_color": "Enhetens sökvägsfärg",
-  "old_portals": "Gamla portaler",
-  "new_portals": "Nya portaler",
+  "legacy_filter": "Äldre Filter",
+  "raid_timers": "Alla Raid Timrar",
+  "invasion_timers": "Alla Invasions Timrar",
+  "lure_timers": "Alla Lockbete Timrar",
+  "device_path_color": "Enhetens Vägfärg",
+  "old_portals": "Gamla Portaler",
+  "new_portals": "Nya Portaler",
   "items": "Föremål",
   "energy": "Energi",
-  "ar_eligible": "AR-berättigad",
-  "iv_circles": "IV-indikatorer",
-  "min_iv_circle": "Minsta cirkel-IV",
+  "ar_eligible": "AR Berättigad",
+  "iv_circles": "KP Indikatorer",
+  "min_iv_circle": "Minsta Cirkel KP",
   "interaction_ranges": "Interaktionsområden",
-  "cannot_connect": "\nKan inte ansluta till servern för tillfället.\nAtt försöka igen omedelbart kommer bara att orsaka fler problem.\nFörsök igen om några minuter.\n\n- Karta Admin Team",
-  "mad_quest_text": "Inhemsk uppdrag",
+  "cannot_connect": "\nKan inte ansluta till servern för tillfället.\nAtt försöka igen omedelbart kommer bara att orsaka fler problem.\nVänligen försök igen om några minuter.\n\n- Kartans Admin Team",
+  "mad_quest_text": "Ursprungliga Uppdrag",
   "xs": "XS",
   "primary": "Primär",
   "secondary": "Sekundär",
-  "zero_iv": "0% IV",
-  "hundo_iv": "100% IV",
-  "open_menu": "Öppna meny",
-  "zoom_in": "Zooma in",
-  "zoom_out": "Zooma ut",
+  "zero_iv": "0% KP",
+  "hundo_iv": "100% KP",
+  "open_menu": "Öppna Meny",
+  "zoom_in": "Zooma In",
+  "zoom_out": "Zooma Ut",
   "welcome": "Välkommen till",
   "back": "Tillbaka",
   "next": "Nästa",
   "finish": "Avsluta",
-  "start_tutorial": "Starta handledningen",
-  "view_profile": "Visa profil",
-  "login_optional": "Logga in (valfritt)",
-  "tutorial": "Handledning",
-  "tutorial_language": "Välj ditt språk",
-  "tutorial_welcome": "Denna handledning är interaktiv och du uppmanas starkt att leka med alla tillgängliga alternativ",
-  "tutorial_categories": "Kategorier du har tillgång till",
+  "start_tutorial": "Starta Tutorial",
+  "view_profile": "Visa Profil",
+  "login_optional": "Logga in (Valfritt)",
+  "tutorial": "Tutorial",
+  "tutorial_language": "Välj Ditt Språk",
+  "tutorial_welcome": "Den här guiden är interaktiv och du uppmuntras starkt att leka med alla tillgängliga alternativ",
+  "tutorial_categories": "Kategorier Du Har Tillgång Till",
   "tutorial_logged_in": "Du kan se detaljer om dina behörigheter genom att visa din profil.",
   "tutorial_logged_out": "Du kan se detaljer om dina behörigheter genom att logga in.",
-  "tutorial_sidebar_0": "Alla dina filter och inställningar finns här",
-  "tutorial_sidebar_1": "För varje kategori kan du välja exakt vilka data du vill ha med hjälp av reglagen",
-  "tutorial_sidebar_2": "Alternativ: Ytterligare anpassning\nAvancerat: Vi kommer att gå igenom senare i handledningen",
+  "tutorial_sidebar_0": "Alla Dina Filter & Inställningar Finns Här",
+  "tutorial_sidebar_1": "För varje kategori kommer du att kunna växla exakt vilka data du vill använda med hjälp av omkopplarna",
+  "tutorial_sidebar_2": "Alternativ: Ytterligare anpassning\nAvancerat: Vi kommer att täcka senare i denna handledning",
   "tutorial_sliders_0": "Använda reglage för att justera filter",
-  "tutorial_sliders_1": "Pokémon mellan:",
-  "tutorial_sliders_2": "- IV {{iv0}}% till {{iv1}}%",
+  "tutorial_sliders_1": "Pokémon Mellan:",
+  "tutorial_sliders_2": "- IVs {{iv0}}% till {{iv1}}%",
   "tutorial_sliders_3": "Nivå {{level0}} till {{level1}}",
-  "tutorial_sliders_3alt": "- OCH är nivå {{level0}} till {{level1}}",
-  "tutorial_sliders_4": "- Storligarank {{gl0}} till {{gl1}}",
-  "tutorial_sliders_4alt": "- ELLER Storligarank {{gl0}} till {{gl1}}",
-  "tutorial_sliders_5": "- Ultraligarank {{ul0}} till {{ul1}}",
-  "tutorial_sliders_5alt": "- ELLER Ultraligarank {{ul0}} till {{ul1}}",
-  "tutorial_sliders_6": "Kedjor med andra av samma färg",
+  "tutorial_sliders_3alt": "- OCH är Nivå {{level0}} till {{level1}}",
+  "tutorial_sliders_4": "- Great League Rank {{gl0}} till {{gl1}}",
+  "tutorial_sliders_4alt": "- ELLER Great League Rank {{gl0}} till {{gl1}}",
+  "tutorial_sliders_5": "- Ultra League Rank {{ul0}} till {{ul1}}",
+  "tutorial_sliders_5alt": "- ELLER Ultra League Rank {{ul0}} till {{ul1}}",
+  "tutorial_sliders_6": "Kombinerar med andra av samma färg",
   "tutorial_sliders_7": "Filtrerar separat från andra reglage",
-  "tutorial_sliders_8": "En 'full' reglage betyder att det är inaktiverat:",
-  "tutorial_sliders_9": "Alla förekomster, oavsett om de är IV-kontrollerade eller inte",
-  "tutorial_help": "Genväg till den här menyn",
+  "tutorial_sliders_8": "Ett 'fullt' reglage innebär att det är inaktiverat:",
+  "tutorial_sliders_9": "Alla framträdanden, oavsett om de har IV-kontrollerats eller inte",
+  "tutorial_help": "Genväg till denna meny",
   "tutorial_adv_filter": "Endast mobil, öppnar filtreringsalternativen för den avancerade menyn",
-  "tutorial_tune": "Ställer in den avancerade filtret för alla Pokémon som för närvarande filtreras i menyn",
+  "tutorial_tune": "Ställer in det avancerade filtret för alla Pokémon som för närvarande filtreras i menyn",
   "tutorial_format_size": "Ställer in ikonstorleken för alla objekt som för närvarande filtreras i menyn",
   "tutorial_check": "Aktiverar alla objekt som för närvarande filtreras i menyn",
   "tutorial_clear": "Inaktiverar alla objekt som för närvarande filtreras i menyn",
-  "tutorial_save": "Sparar det aktuella valet och avslutar",
-  "tutorial_show_all_view": "Växla PokéStops & Gyms",
+  "tutorial_save": "Sparar det aktuella urvalet och avslutar",
+  "tutorial_show_all_view": "Växla PokéStops & Gym",
   "tutorial_show_pokemon_view": "Växla Pokémon",
-  "tutorial_toggle": "Genom att klicka på krysset/bocken växlar du objektet",
-  "tutorial_pokemon_caption": "Denna ikon låter dig ställa in filter för den specifika Pokémonen",
-  "tutorial_all_caption": "Lag har en särskild meny för platser\nAlla andra objekt låter dig justera ikonstorleken",
-  "tutorial_popup_0": "Popups är nu interaktiva!",
-  "tutorial_popup_1": "De tre punkterna öppnar göm, exkludera och växla timer-alternativ",
-  "tutorial_popup_2": "Ikonerna på vardera sidan av navigeringslänken kommer att expandera för att visa extra information, prova det!",
-  "tutorial_popup_3": "Ikonerna varierar för varje kategori, se till att kolla igenom dem alla",
-  "tutorial_closing_0": "Ytterligare information",
-  "tutorial_closing_1": "De globala Pokémon-reglagen i sidofältet fungerar separat från den avancerade menyn och påverkar inte varandra",
-  "tutorial_closing_2": "Se till att kolla in avsnittet Inställningar i sidofältet",
-  "tutorial_closing_3": "Det finns många estetiska alternativ tillgängliga för varje kategori, men kom ihåg att ju mer du lägger till på din karta, desto större är chansen att din karta fryser",
-  "tutorial_closing_4": "Du kan se den här handledningen igen genom att välja den i Inställningspanelen i sidofältet",
-  "tutorial_closing_5": "Var försiktig och lycka till!",
+  "tutorial_toggle": "Klick på kryss/bock växlar objektet",
+  "tutorial_pokemon_caption": "Denna ikon låter dig ställa in filter för den specifika Pokémon",
+  "tutorial_all_caption": "Lag har en särskild slotsmeny\nAlla andra objekt låter dig justera ikonstorleken",
+  "tutorial_popup_0": "Popup-fönster är nu interaktiva!",
+  "tutorial_popup_1": "De tre punkterna öppnar alternativen för att dölja, utesluta och växla timer",
+  "tutorial_popup_2": "Ikoner på varje sida om navigeringslänken kommer att expandera för att visa extra info, ge det ett försök!",
+  "tutorial_popup_3": "Ikonerna varierar för varje kategori, se till att kolla in dem alla",
+  "tutorial_closing_0": "Ytterligare info",
+  "tutorial_closing_1": "De globala Pokémon-reglagen i sidofältet fungerar separat från den avancerade menyn och har ingen effekt på varandra",
+  "tutorial_closing_2": "Se till att ta en titt på avsnittet Inställningar i sidofältet",
+  "tutorial_closing_3": "Det finns gott om estetiska alternativ tillgängliga för varje kategori, men kom ihåg att ju mer du lägger till din karta, desto större chans att din karta kommer att frysa",
+  "tutorial_closing_4": "Du kan visa denna handledning igen genom att välja den i inställningspanelen i sidofältet",
+  "tutorial_closing_5": "Var säker och lycka till!",
   "intro": "Introduktion",
   "sidebar": "Sidofält",
   "sliders": "Reglage",
   "popups": "Popup-fönster",
-  "closing": "Stängning",
+  "closing": "Avslutning",
   "shortcuts": "Genvägar",
   "iv": "IV",
-  "area_restrictions": "Områdesbegränsningar",
+  "area_restrictions": "Områdesrestriktioner",
   "map": "Karta",
   "stats": "Statistik",
   "pvp": "PVP",
   "area_restrictions_subtitle": "Du har tillgång till dessa områden",
-  "devices_subtitle": "Visar aktiva enhetspositioner och rutter",
-  "gyms_subtitle": "Visar alla aktiva gympositioner, aktivt lag och hur många platser varje gym har tillgängliga",
-  "invasions_subtitle": "Visar information om Team Rocket-invasion, inklusive stridslinje, utgångstid och möjliga belöningar",
+  "devices_subtitle": "Visar aktiva enhetsplatser och rutter",
+  "gyms_subtitle": "Visar alla aktiva gymplatser, aktiva lag och hur många platser varje gym har tillgängliga",
+  "invasions_subtitle": "Visar info om Team Rocket-invasioner, inklusive stridslinje, utgångstid och möjliga belöningar",
   "iv_subtitle": "Visar IV% och glödalternativ",
-  "lures_subtitle": "Visar information om lockbete, inklusive lockbetestyp och utgångstid",
+  "lures_subtitle": "Visar lockmedelsinfo, inklusive lockmedelstyp och utgångstid",
   "map_subtitle": "Visar kartan",
-  "nests_subtitle": "Visar aktivt häckande Pokémon och häckningspolygoner",
-  "pokemon_subtitle": "Visar alla Pokémon-positioner och utgångstider",
+  "nests_subtitle": "Visar aktivt nästande Pokémon och bo-polygontåg",
+  "pokemon_subtitle": "Visar alla Pokémonplatser och utgångstider",
   "pokestops_subtitle": "Visar alla PokéStop-platser",
   "portals_subtitle": "Visar alla Ingress-portaler",
-  "pvp_subtitle": "Visar PVP-rank/CP/Nivå-information för varje Pokémon",
-  "quests_subtitle": "Visar belöning och uppgiftsinformation för uppdrag",
-  "raids_subtitle": "Visar all raid-information inklusive raidboss, ägg, utgångstid och moveset",
-  "scan_cells_subtitle": "Visar senaste gången en S2-cell skannades av en enhet",
-  "scan_areas_subtitle": "Visar tillgängliga skanningsområden i polygoner",
+  "pvp_subtitle": "Visar PVP-rankning/CP/Nivå info för varje Pokémon",
+  "quests_subtitle": "Visar information om uppdragsbelöningar och uppgifter",
+  "raids_subtitle": "Visar all information om raid inklusive raidboss, ägg, utgångstid och moveset",
+  "scan_cells_subtitle": "Visar den senaste skanningstiden för en S2-cell av en enhet",
+  "scan_areas_subtitle": "Visar tillgängliga skanningsområdespolygoner",
   "spawnpoints_subtitle": "Visar spawnpoints och deras uppskattade försvinnandetid",
   "stats_subtitle": "Visar Pokémon-statistik och nivåer",
-  "submission_cells_subtitle": "Visar information som är användbar för att skicka in nya POI:er",
-  "weather_subtitle": "Visar in-game väderinformation för varje cell",
-  "scanner_subtitle": "Interagerar direkt med skannern på olika sätt",
-  "s2cells_subtitle": "Visar S2-celler i olika nivåer på kartan",
-  "backups_subtitle": "Möjliggör säkerhetskopiering och laddning av inställningar över enheter",
+  "submission_cells_subtitle": "Visar information användbar för att lämna in nya POI:er",
+  "weather_subtitle": "Visar information om spelets väder för varje cell",
+  "scanner_subtitle": "Interagera direkt med skannern på olika sätt",
+  "s2cells_subtitle": "Visar S2-celler på en mängd nivåer på kartan",
+  "backups_subtitle": "Gör det möjligt att säkerhetskopiera och ladda inställningar över enheter",
   "backups": "Säkerhetskopior",
   "user_profile": "Användarprofil",
   "user_username": "Användarnamn",
@@ -286,110 +286,125 @@
   "show_ex_badge": "Visa EX-märke",
   "search": "Sök",
   "global_search_quests": "Ange belöningsnamn...",
-  "global_search_lures": "Ange locknamn...",
+  "global_search_lures": "Ange Lockbete Namn...",
   "global_search_pokestops": "Ange PokéStop-namn...",
   "global_search_gyms": "Ange Gym-namn...",
-  "global_search_portals": "Ange portalnamn...",
-  "global_search_nests": "Ange namn på näst-Pokémon...",
-  "global_search_raids": "Ange namn på raidboss...",
-  "global_search_pokemon": "Ange Pokémon-namn...",
-  "raid_level_badges": "Raidnivåmärken",
+  "global_search_portals": "Ange Portal Namn...",
+  "global_search_nests": "Ange Namn på Nest Pokémon...",
+  "global_search_raids": "Ange Raid Boss Namn...",
+  "global_search_pokemon": "Ange Pokémon Namn...",
+  "global_search_invasions": "Ange Grunt-typ, Namn eller Pokémon belöningsnamn...",
+  "raid_level_badges": "Raidnivå-märken",
   "options": "Alternativ",
   "profile": "Profil",
   "pokemon_icons": "Pokémon-ikoner",
   "pokestop_icons": "PokéStop-ikoner",
   "gym_icons": "Gym-ikoner",
-  "team_icons": "Lag-ikoner",
+  "team_icons": "Team-ikoner",
   "egg_icons": "Ägg-ikoner",
   "raid_icons": "Raid-ikoner",
-  "nest_icons": "Näste-ikoner",
+  "nest_icons": "Nest-ikoner",
   "reward_icons": "Belöningsikoner",
-  "type_icons": "Typikoner",
-  "weather_icons": "Väderikoner",
-  "misc_icons": "Diverse ikoner",
-  "invasion_icons": "Invasionsikoner",
-  "spawnpoint_icons": "Spawnpoint ikoner",
-  "device_icons": "Enhet ikoner",
-  "pokemon_timers": "Alla Pokemon Timers",
-  "show_dex_num_in_popup": "Visa Pokedex # i Popup",
+  "type_icons": "Typ-ikoner",
+  "weather_icons": "Väder-ikoner",
+  "misc_icons": "Diverse-ikoner",
+  "invasion_icons": "Invasions-ikoner",
+  "spawnpoint_icons": "Spawnpoint-ikoner",
+  "device_icons": "Enhetsikoner",
+  "pokemon_audio": "Pokémon-ljud",
+  "pokestop_audio": "PokéStop-ljud",
+  "gym_audio": "Gym-ljud",
+  "team_audio": "Team-ljud",
+  "egg_audio": "Ägg-ljud",
+  "raid_audio": "Raid-ljud",
+  "nest_audio": "Nest-ljud",
+  "reward_audio": "Belöningsljud",
+  "type_audio": "Typ-ljud",
+  "weather_audio": "Väder-ljud",
+  "misc_audio": "Diverse ljud",
+  "invasion_audio": "Invasionsljud",
+  "spawnpoint_audio": "Spawnpoint-ljud",
+  "device_audio": "Enhetsljud",
+  "pokemon_timers": "Alla Pokémon-timer",
+  "show_dex_num_in_popup": "Visa Pokédexnummer i Popup",
   "popup": "Popup",
-  "pvp_level": "Nivå {{level}} PVP Statistik",
-  "pvp_mega": "Mega PVP Statistik",
+  "pvp_level": "Nivå {{level}} PVP-statistik",
+  "pvp_mega": "Mega PVP-statistik",
   "webhook_entry": "Lägg till i {{name}}",
   "remove_webhook_entry": "Ta bort från {{name}}",
   "distance": "Avstånd",
   "gym": "Gym",
   "egg": "Ägg",
   "raid": "Raid",
-  "lure": "Locka",
+  "lure": "Lockbete",
   "quest": "Uppdrag",
   "invasion": "Invasion",
-  "nest": "Näste",
-  "pokestop": "Pokestop",
-  "team": "Lag",
+  "nest": "Nest",
+  "pokestop": "PokéStop",
+  "team": "Team",
   "global": "Global",
   "manage_webhook": "Hantera {{name}}",
-  "drag_and_drop": "Dra och släpp markören för att ställa in din plats",
+  "drag_and_drop": "Dra och släpp markören för att ange din plats",
   "click_to_select": "Klicka för att välja",
-  "add_new": "Lägg till ny {{category}} varning",
-  "my_location": "Min plats",
-  "choose_on_map": "Välj på kartan",
-  "select_profile": "Välj profil",
-  "distance_radius": "Förhandsgranska radieavstånd",
+  "add_new": "Lägg till Nytt {{category}} Larm",
+  "my_location": "Min Plats",
+  "choose_on_map": "Välj på Kartan",
+  "select_profile": "Välj Profil",
+  "distance_radius": "Förhandsgranska Radieavstånd",
   "areas": "Områden",
   "select_webhook": "Välj Bot",
-  "ar_quest_true": "AR Uppgift",
-  "ar_quest_false": "Ingen AR",
+  "ar_quest_true": "AR-uppdrag",
+  "ar_quest_false": "Inget AR",
   "with_ar": "Med AR",
   "both": "Båda",
   "without_ar": "Utan AR",
-  "exclude_quest_multi": "Exkludera {{reward}}",
-  "cluster_limit_0": "{{variable_0}} gräns ({{variable_1}}) har nåtts",
-  "cluster_limit_1": "Zooma in eller begräns dina filter",
+  "exclude_quest_multi": "Uteslut {{reward}}",
+  "cluster_limit_0": "{{variable_0}}-gränsen ({{variable_1}}) har nåtts",
+  "cluster_limit_1": "Vänligen zooma in eller smala av dina filter",
   "show_polygons": "Visa polygoner",
-  "exclude_invasion_multi": "Exkludera {{invasion}}",
-  "stardust": "Stardust",
+  "exclude_invasion_multi": "Uteslut {{invasion}}",
+  "stardust": "Stardamm",
   "slider_cp": "CP",
   "pvp_ranking_league": "Liga",
   "pvp_ranking_min_cp": "Min CP",
-  "slider_pvp": "Rankningar",
-  "profile_no": "Profil",
+  "slider_pvp": "Rankingar",
+  "profile_no": "Profilnummer",
   "template": "Mall",
   "gender": "Kön",
   "clean": "Rensa",
   "all_forms": "Alla former",
-  "pvp_entry": "PVP-inträde",
+  "pvp_entry": "PVP-inslag",
   "no_iv": "Inkl. Ingen IV",
   "by_distance": "Efter avstånd",
-  "min_time": "Min tid",
+  "min_time": "Minst tid",
   "add_new_profile": "Lägg till ny profil",
   "slider_none": "Ingen",
-  "non_registered_human_title": "Hoppsan, något är inte rätt!",
-  "non_registered_human_desc": "Du kanske inte är registrerad med {{webhook}}\nEller servern är för närvarande otillgänglig",
-  "try_again_later": "Försök igen senare",
-  "selected_areas": "{{amount}} område valt",
-  "selected_areas_plural": "{{amount}} områden valda",
-  "webhook_selection": "{{name}} Val",
+  "non_registered_human_title": "Oj, något stämmer inte!",
+  "non_registered_human_desc": "Du kanske inte är registrerad med {{webhook}}\nEller så är servern för närvarande oåtkomlig",
+  "try_again_later": "Var vänlig försök igen senare",
+  "selected_areas_one": "{{count}} område valt",
+  "selected_areas_other": "{{count}} områden valda",
+  "webhook_selection": "{{name}}-val",
   "message_of_the_day": "Dagens meddelande",
   "has_quest_indicator": "Alternativ färg för stops med uppdrag",
   "show_ar_badge": "Visa AR-märke",
   "all_gyms": "Alla gym",
-  "general": "Allmänt",
+  "general": "Allmän",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "Länka Globalt & Avancerat",
+  "link_global_and_advanced": "Global respekterar valt",
   "normal_forms": "Normala former",
-  "weather_indicator": "Väder Boost Indikator",
+  "weather_indicator": "Väderboost-indikator",
   "page": "Sida {{page}}",
   "navigation_controls": "Navigeringskontroller",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Exklusiv",
-  "all_moves": "Alla Rörelser",
-  "move": "Rörelse",
+  "all_moves": "Alla drag",
+  "move": "Drag",
   "any": "Någon",
-  "min_spawn_average": "Minsta Spawnhastighet",
-  "select_all": "Välj Alla",
-  "delete_all": "Ta Bort Markerade",
+  "min_spawn_average": "Minsta spawn-frekvens",
+  "select_all": "Välj alla",
+  "delete_all": "Radera vald",
   "cancel": "Avbryt",
   "day_1": "Måndag",
   "day_2": "Tisdag",
@@ -399,312 +414,305 @@
   "day_6": "Lördag",
   "day_7": "Söndag",
   "profile_name": "Profilnamn",
-  "manage_profiles": "Hantera Profiler",
-  "min_spawn_avg": "Genomsnittlig Minsta Spawn",
-  "poke_global": "Allt",
-  "amount": "Antal",
-  "specific_gym": "Specifik Gym",
-  "search_location": "Sök Platser",
-  "search_specific": "Sök efter en Specifik {{category}}",
-  "webhook_success_gym": "Raid, Ägg och Lagändringsvarningar har lagts till!",
-  "slot_changes": "Platsändringar",
-  "slot_changes_poracle": "platsändringar",
-  "confirm_delete": "Detta kommer att ta bort all spårning för denna profil, är du säker?",
-  "confirm_copy": "Välj vilken profil du vill kopiera \"{{profile}}\" till, detta kommer att skriva över den profilen helt.",
-  "webhook_error": "{{name}} kunde inte bearbeta det.\nFörsök igen senare.",
+  "manage_profiles": "Hantera profiler",
+  "min_spawn_avg": "Genomsnittlig minsta spawn",
+  "poke_global": "Allting",
+  "amount": "Mängd",
+  "specific_gym": "Specifikt gym",
+  "search_location": "Sök platser",
+  "search_specific": "Sök efter en specifik {{category}}",
+  "webhook_success_gym": "Räder, ägg och teamändringsvarningar har lagts till!",
+  "slot_changes": "Platsförändringar",
+  "slot_changes_poracle": "slot_changes",
+  "confirm_delete": "Detta kommer ta bort all spårning för denna profil, är du säker?",
+  "confirm_copy": "Välj vilken profil du vill kopiera \"{{profile}}\" till, detta kommer skriva över den profilen helt.",
+  "webhook_error": "{{name}} kunde inte bearbeta det.\nVar vänlig försök igen senare.",
   "profile_error": "Måste vara unikt och giltigt",
-  "team_0": "Harmony",
-  "battle_changes": "I Strid",
-  "battle_changes_poracle": "stridsändringar",
-  "auto": "Automatisk",
-  "webhooks_subtitle": "Hantera dina varningar direkt från kartan för dessa bots",
-  "event_stops_subtitle": "Visar speciella event Pokéstops som Kecleon",
-  "webhooks": "Varningar",
-  "scanner": "Skanneråtgärder",
-  "everything_individually": "Lägg till Individuella Varningar",
+  "team_0": "Harmoni",
+  "battle_changes": "I strid",
+  "battle_changes_poracle": "battle_changes",
+  "auto": "Auto",
+  "webhooks_subtitle": "Hantera dina larm direkt från kartan för dessa botar",
+  "event_stops_subtitle": "Visar speciella event-Pokéstops såsom Kecleon",
+  "webhooks": "Larm",
+  "scanner": "Scanner-åtgärder",
+  "everything_individually": "Lägg till individuella larm",
   "individually": "individuellt",
   "join": "Gå med",
-  "errors_404": "Hoppsan, den här sidan kan inte hittas!",
-  "errors_500": "Det har uppstått ett serverfel, försök igen senare!",
+  "errors_404": "Oj, den här sidan kan inte hittas!",
+  "errors_500": "Det har skett ett serverfel, försök igen senare!",
   "local_username": "Användarnamn",
   "local_password": "Lösenord",
-  "local_error": "Det har uppstått ett fel, försök igen senare!",
-  "no_filter_results": "Inga resultat hittades\nFörsök att bredda dina filter",
-  "donor_page": "Donatorssida",
+  "local_error": "Det uppstod ett fel, vänligen försök igen senare!",
+  "no_filter_results": "Inga resultat funna\nFörsök vidga dina filter",
+  "donor_page": "Donorsida",
   "go_back": "Gå tillbaka",
-  "access": "Åtkomst",
+  "access": "Tillgång",
   "link_discord": "Länka Discord",
-  "select_webhook_strategy": "Varningshanterare",
-  "webhook_strategy_success_0": "Lyckades! Uppdaterar för att hämta varningsinställningar...",
+  "select_webhook_strategy": "Larmhanterare",
+  "webhook_strategy_success_0": "Lyckades! Uppdaterar för att hämta larminställningar...",
   "register": "Registrera",
-  "invalid_credentials": "Ogiltiga inloggningsuppgifter",
-  "error_creating_user": "Kan inte registrera ny användare för tillfället",
-  "discord_linked": "Discord länkad",
-  "telegram_linked": "Telegram länkad",
+  "invalid_credentials": "Ogiltiga uppgifter",
+  "localauth_failed": "Autentisering misslyckades",
+  "error_creating_user": "Kan inte registrera ny användare just nu",
+  "discord_linked": "Discord Länkat",
+  "telegram_linked": "Telegram Länkat",
   "level": "nivå",
   "km": "km",
   "feedback": "Feedback",
-  "donor_menu": "Donatorsmeny",
-  "pokemon_cell": "Pokémons plats kan variera",
-  "timer_verified": "Denna timer är verifierad",
-  "timer_unverified": "Denna timer är ej verifierad",
+  "donor_menu": "Donator Meny",
+  "pokemon_cell": "Pokemons Plats Kan Variera",
+  "timer_verified": "Denna Timer är Verifierad",
+  "timer_unverified": "Denna Timer är Ej Verifierad",
   "all": "Alla",
   "badge_0": "Ingen",
   "badge_1": "Brons",
   "badge_2": "Silver",
   "badge_3": "Guld",
-  "gym_badge_menu": "Redigera gymmärke",
+  "gym_badge_menu": "Redigera Gymmärke",
   "gym_badges": "Gymmärken",
-  "gym_badge_diamonds": "Visa gymmärken",
-  "gym_badges_subtitle": "Visar gymmärken på kartan och en lista på profilsidan.",
+  "gym_badge_diamonds": "Visa Gymmärken",
+  "gym_badges_subtitle": "Visar Gymmärken på kartan och en lista på profilsidan.",
   "confirm_filters_reset": "Återställ filter",
-  "filters_reset_text": "Är du säker på att du vill återställa inställningarna till standardvärden? Detta kan inte ångras!",
+  "filters_reset_text": "Är du säker på att du vill återställa inställningarna till standardvärden? Detta kan inte göras ogjort!",
   "filters_reset_title": "Återställ filter",
   "raid_quick_select": "Snabbval",
   "disabled": "Inaktiverad",
   "loading": "Laddar {{category}}",
-  "loading_icons": "Hämtar ikoner",
-  "loading_invasions": "Hämtar invasioner",
-  "scan_next": "Skanna plats",
-  "scan_next_choose": "Dra och släpp markören för att ställa in skanningsplatsen",
-  "scan_zone": "Skanna ett område",
-  "scan_zone_choose": "Dra och släpp markören för att ställa in skanningsplatsen och välj storlek",
+  "loading_icons": "Hämtar Ikoner",
+  "loading_invasions": "Hämtar Invasioner",
+  "scan_next": "Skanna Plats",
+  "scan_next_choose": "Dra och Släpp Markören för att Ställa in Skanningsplats",
+  "scan_zone": "Skanna ett Område",
+  "scan_zone_choose": "Dra och Släpp Markören för att Ställa in Skanningsplats och Välj Storlek",
   "scan_zone_size": "Storlek",
-  "scan_zone_range": "Omfång",
+  "scan_zone_range": "Räckvidd",
   "scan_zone_spacing": "Avstånd",
   "scan_zone_radius": "Radie",
   "scan_requests": "Skanningsförfrågningar",
-  "scan_queue": "Nuvarande kö",
-  "click_to_scan": "Skanna här",
+  "scan_queue": "Aktuell Kö",
+  "click_to_scan": "Skanna Här",
   "scan_confirmed_title": "Skanningsförfrågan bekräftad",
-  "scan_confirmed": "En arbetare har skickats till platsen, resultatet kommer snart att visas på kartan!",
+  "scan_confirmed": "Arbetare har skickats till platsen, resultatet kommer snart visas på kartan!",
   "scan_loading_title": "Skickar skanningsförfrågan",
   "scan_loading": "Din skanningsförfrågan bearbetas och skickas till systemet!",
   "scan_error_title": "Fel",
-  "scan_error": "Ett fel uppstod vid bearbetning av skanningsförfrågan...",
-  "scan_outside_area": "Denna plats ligger utanför gränserna för auktoriserade områden",
+  "scan_error": "Det uppstod ett fel vid bearbetningen av skanningsförfrågan...",
+  "scan_outside_area": "Denna plats är utanför gränserna för auktoriserade områden",
   "pvp_ranking_cap": "Nivå",
-  "lc_title": "Följ din plats",
+  "lc_title": "Följ Din Plats",
   "lc_metersUnit": "meter",
-  "lc_feetUnit": "fot",
-  "lc_popup": "Du är inom {distance} {unit} från denna punkt",
+  "lc_feetUnit": "fötter",
+  "lc_popup": "Du befinner dig inom {distance} {unit} från denna punkt",
   "lc_outsideMapBoundsMsg": "Du verkar befinna dig utanför kartans gränser",
-  "no_alerts": "Inga varningar hittades",
-  "loading_settings": "Laddar inställningar",
+  "no_alerts": "Inga Larm Funna",
+  "loading_settings": "Laddar Inställningar",
   "refresh_to_continue": "Vänligen uppdatera innan du fortsätter",
-  "session_expired_title": "Sessionen har löpt ut",
+  "session_expired_title": "Session Utgången",
   "session_expired_body": "Din session har löpt ut",
   "old_client_title": "Föråldrad",
   "old_client_body": "En ny version av denna karta är tillgänglig",
+  "early_old_client_title": "Föråldrad",
+  "early_old_client_body": "En gammal version av denna app kan vara cachad i din webbläsare, du behöver rensa din cache innan du kan använda denna app.",
   "refresh": "Uppdatera",
   "points": "Poäng",
   "day": "Dag",
   "days": "Dagar",
-  "react_error": "Något gick fel",
-  "clickable_icon": "Ikonen är klickbar",
-  "two_stops_till_next": "2 stopp tills nästa",
-  "one_stop_till_next": "1 stopp tills nästa",
+  "react_error": "Något Gick Fel",
+  "clickable_icon": "Ikonen är Klickbar",
+  "two_stops_till_next": "2 stopp till nästa",
+  "one_stop_till_next": "1 stopp till nästa",
   "no_more_gyms": "Inga fler gym",
-  "light_map_border": "Ljus kartgräns",
-  "dark_map_border": "Mörk kartgräns",
-  "cell_blocked": "Cell blockerad",
-  "poi_color": "POI-färg",
+  "light_map_border": "Ljus Kartgräns",
+  "dark_map_border": "Mörk Kartgräns",
+  "cell_blocked": "Cell Blockerad",
+  "poi_color": "POI Färg",
   "quest_condition": "Uppdragsvillkor",
-  "always_show_labels": "Visa alltid etiketter",
-  "scan_areas_options": "Skanna områdesalternativ",
-  "historic_rarity": "Historisk sällsynthet",
-  "poi": "Intressanta platser",
-  "300m_range": "300m räckvidd",
-  "lure_range": "Locka räckvidd",
-  "custom_range": "Anpassad räckvidd",
+  "always_show_labels": "Visa alltid Etiketter",
+  "scan_areas_options": "Skanningsområdesalternativ",
+  "historic_rarity": "Historisk Sällsynthet",
+  "poi": "Intressepunkter",
+  "300m_range": "300m Räckvidd",
+  "lure_range": "Lockmedelsräckvidd",
+  "custom_range": "Anpassad Räckvidd",
   "tap_to_toggle": "Tryck för att växla",
-  "power_up": "Förstärk",
+  "power_up": "Stärka",
   "never_alt": "Aldrig",
   "seen_nearby_stop": "Sett i närheten",
   "seen_nearby_cell": "Sett i denna cell",
-  "seen_lure_encounter": "Locka möte",
-  "seen_lure_wild": "Locka spawn",
-  "seen_wild": "Vild spawn",
-  "event_stops": "Eventstopp",
-  "event_stop_timers": "Eventstopp-timers",
+  "seen_lure_encounter": "Lockmedelsmöte",
+  "seen_lure_wild": "Lockmedelsvilt",
+  "seen_wild": "Vilt Möte",
+  "event_stops": "Event Stop",
+  "event_stop_timers": "Event Stop Tidtagare",
   "size_0": "Alla",
   "size_1": "XXS",
   "size_2": "XS",
   "size_3": "M",
   "size_4": "XL",
   "size_5": "XXL",
-  "show_size_indicator": "Visa storleksindikator",
+  "show_size_indicator": "Visa Storleksindikator",
   "size": "Storlek",
-  "gold_stop": "Guldstop",
-  "profile_backups": "Byta profil",
-  "new_backup": "Ny säkerhetskopia",
+  "gold_stop": "Guld Stop",
+  "profile_backups": "Profilbyte",
+  "new_backup": "Ny Säkerhetskopia",
   "create": "Skapa",
   "load": "Ladda",
   "update": "Uppdatera",
-  "delete": "Ta bort",
+  "delete": "Radera",
   "name": "Namn",
-  "only_confirmed": "Endast bekräftade",
+  "only_confirmed": "Endast Bekräftade",
   "rocket_pokemon": "Rocket Pokémon",
-  "decoy": "Lockbete",
-  "s2_cell_limit_0": "Du försökte generera mer än 20 000 celler ({{variable_0}})",
-  "show_all_pvp_ranks": "Visa alla PVP-rankningar",
-  "enable_pokemon_popup_coords": "Visa Pokémon-koordinater",
-  "enable_gym_popup_coords": "Visa gym-koordinater",
-  "enable_pokestop_popup_coords": "Visa Pokéstop-koordinater",
-  "enable_portal_popup_coords": "Visa portal-koordinater",
-  "on_block_join_discord": "Vänligen gå med i vår discord för mer information.",
-  "on_block_msg": "Du har blivit blockerad för att vara medlem i",
+  "decoy": "Lokförare",
+  "s2_cell_limit_0": "Du försökte generera fler än 20 000 celler ({{variable_0}})",
+  "show_all_pvp_ranks": "Visa Alla PVP Rankningar",
+  "enable_pokemon_popup_coords": "Visa Pokémon Koordinater",
+  "enable_gym_popup_coords": "Visa Gym Koordinater",
+  "enable_pokestop_popup_coords": "Visa Pokéstop Koordinater",
+  "enable_portal_popup_coords": "Visa Portal Koordinater",
+  "on_block_join_discord": "Var god anslut till vår discord för mer information.",
+  "on_block_msg": "Du har blivit blockerad för att vara medlem av",
   "denied": "Nekad",
-  "showcase": "Visa upp",
-  "unknown_event": "Okänt evenemang",
+  "showcase": "Skyltfönster",
+  "unknown_event": "Okänt Event",
   "scanner_countdown": "Tillgänglig om {{time}}s",
   "success": "Lyckades",
   "contribute": "Bidra",
   "mi": "mi",
   "filter_by_areas": "Filtrera efter områden",
-  "submit_nest_name": "Skicka in boendets namn",
+  "submit_nest_name": "Skicka in Bo Namn",
   "nest_submission_menu": "Namnuppdatering",
-  "nest_submissions": "Boendesubmissioner",
-  "nest_submissions_subtitle": "Låter dig skicka in nya namn för boenden",
-  "pokemon_opacity": "Dynamisk Pokemon-opacitet",
-  "invasion_opacity": "Dynamisk Invasion-opacitet",
-  "raid_opacity": "Dynamisk Raid-opacitet",
-  "opacity_ten_minutes": "Opacitet om 10 minuter",
-  "opacity_five_minutes": "Opacitet om 5 minuter",
-  "opacity_one_minute": "Opacitet om 1 minut",
+  "nest_submissions": "Bo Inskickningar",
+  "nest_submissions_subtitle": "Tillåter dig att skicka in nya namn för bon",
+  "pokemon_opacity": "Dynamisk Pokémon Opacitet",
+  "invasion_opacity": "Dynamisk Invasion Opacitet",
+  "raid_opacity": "Dynamisk Raid Opacitet",
+  "opacity_ten_minutes": "Opacitet vid 10 minuter",
+  "opacity_five_minutes": "Opacitet vid 5 minuter",
+  "opacity_one_minute": "Opacitet vid 1 minut",
   "level_circles": "Nivåindikatorer",
-  "min_level_circle": "Minsta cirkelnivå",
+  "min_level_circle": "Minsta Cirkel Nivå",
   "mutation_auth_error": "Din förfrågan misslyckades på grund av att du inte var inloggad",
-  "submitted_by": "Inskickad av",
-  "localauth_failed": "Autentisering misslyckades",
+  "submitted_by": "Inskickad Av",
   "reversible": "Reversibel",
   "version": "Version",
-  "route_tags": "Ruttags",
+  "route_tags": "Ruttetiketter",
   "routes": "Rutter",
-  "route_type": "Ruttyp",
-  "routes_subtitle": "Visa i-spelets rutter och relevant information om dem på kartan",
+  "route_type": "Rutt Typ",
+  "routes_subtitle": "Visa spelrutter och relevant information om dem på kartan",
   "description": "Beskrivning",
-  "additional_info": "Ytterligare information",
+  "additional_info": "Ytterligare Info",
   "duration": "Varaktighet",
   "elevation": "Höjd",
-  "contest_category_1": "Minsta storlek",
-  "context_category_2": "Största storlek",
-  "total_entries": "Totalt antal inlägg",
-  "showcase_rankings": "Visa topprankningar",
-  "showcase_rankings_subtitle": "Visar en lista över topprankningar för en utställning vid en Pokéstop",
+  "contest_category_1": "Minsta Storlek",
+  "context_category_2": "Största Storlek",
+  "total_entries": "Totalt Antal Inlägg",
+  "showcase_rankings": "Skyltfönster Rankings",
+  "showcase_rankings_subtitle": "Visar en lista över de högsta rankningarna för ett skyltfönster vid ett Pokéstop",
   "tth": "TTH",
   "tth_0": "Alla",
-  "tth_1": "Kända",
-  "tth_2": "Okända",
-  "no_access": "Ingen åtkomst",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "cooldown": "Svalna",
-  "scan_some_outside_area": "Vissa platser är utanför behöriga gränser",
-  "alerts": "aviseringar",
-  "alert_manager": "Aviseringshanterare",
+  "tth_1": "Känd",
+  "tth_2": "Okänd",
+  "no_access": "Ingen Tillgång",
+  "cooldown": "Återhämtning",
+  "scan_some_outside_area": "Vissa platser ligger utanför de godkända gränserna",
+  "alerts": "notiser",
+  "alert_manager": "Notishanterare",
   "menu": "Meny",
   "theme": "Tema",
   "exit": "Avsluta",
   "component": "Komponent",
   "component_login_page": "Inloggningssida",
   "component_donation_page": "Donationssida",
-  "component_message_of_the_day": "Dagens meddelande",
+  "component_message_of_the_day": "Dagens Meddelande",
   "download": "Ladda ner",
   "playground": "Lekplats",
   "locale": "Språk",
   "saved": "Sparad",
   "show_editor": "Visa redigerare",
   "hide_editor": "Dölj redigerare",
-  "reported_error": "Det här felet har rapporterats till servern med identifieraren",
+  "reported_error": "Detta fel har rapporterats till servern med identifieraren",
   "dark_mode": "Mörkt läge",
-  "load_from_autosave": "Läs in från autosparning",
+  "load_from_autosave": "Ladda från autosparning",
   "done": "Klar",
   "fast": "Snabb",
   "charged": "Laddad",
   "offline_mode": "Offline-läge",
-  "include_sponsored": "Visa sponsrade",
-  "showcase_color": "Visa färgskyltning",
-  "partner_color": "Visa partnerfärg",
-  "disable": "Inaktivera {{- namn}}",
-  "profiling": "Profilerande",
-  "showcase_block": "Blockerad på grund av skyltning",
+  "include_sponsored": "Inkludera sponsrad",
+  "showcase_color": "Skyltfärg",
+  "partner_color": "Partnerfärg",
+  "disable": "Inaktivera {{- name}}",
+  "profiling": "Profilering",
+  "showcase_block": "Blockerad på grund av en skyltning",
   "signed_in_as": "Inloggad som",
   "missing_map_perm": "Du har inte tillstånd att visa kartan.",
-  "pokemon_audio": "Pokémon ljud",
-  "pokestop_audio": "PokéStop ljud",
-  "gym_audio": "Gym ljud",
-  "team_audio": "Team ljud",
-  "egg_audio": "Ägg ljud",
-  "raid_audio": "Raid ljud",
-  "nest_audio": "Nest ljud",
-  "reward_audio": "Belöning ljud",
-  "type_audio": "Typ ljud",
-  "weather_audio": "Väder ljud",
-  "misc_audio": "Diverse ljud",
-  "invasion_audio": "Invasion ljud",
-  "spawnpoint_audio": "Spawnpunkt ljud",
-  "device_audio": "Enhet ljud",
   "access_denied": "Åtkomst nekad",
   "audio": "Ljud",
-  "desktop_notifications": "Skrivbordsnotiser",
+  "desktop_notifications": "Skrivbordsnotifikationer",
   "notifications_options": "Notifikationsalternativ",
   "audio_always_on": "Ljud spelas alltid",
   "volume_level": "Volymnivå",
   "notifications_status": "Notifikationsstatus",
-  "granted": "godkänt",
-  "global_search_invasions": "Ange Grunt-typ, namn eller Pokémons belöning...",
-  "set_all": "Alla",
-  "set_filtered": "Filtrera",
+  "granted": "beviljad",
+  "set_all": "Ställ in alla",
+  "set_filtered": "Ställ in filtrerat",
   "only_show_available": "Visa endast tillgängliga",
-  "easy_mode": "Lättläst",
-  "quick_select": "Snabbval globalt",
-  "pokemon_filter_mode": "Pokémon-filterläge",
-  "basic": "Grundläge",
-  "intermediate": "Mellanläge",
-  "expert": "Expertläge",
-  "basic_description": "Välj Pokémon enkelt och applicera en global filter",
+  "easy_mode": "Lättläge",
+  "quick_select": "Global snabbval",
+  "pokemon_filter_mode": "Pokémon filterläge",
+  "basic": "Grundläggande",
+  "intermediate": "Mellannivå",
+  "expert": "Expert",
+  "basic_description": "Välj Pokémon enkelt och tillämpa ett globalt filter",
   "intermediate_description": "Ställ in individuella filter globalt och per Pokémon (traditionellt)",
-  "expert_description": "Manuell inmatning av sökningar för största anpassning",
+  "expert_description": "Manuell inmatning för mest anpassning",
   "icon_size": "Ikonstorlek",
   "developer": "Utvecklare",
-  "raid_override": "Rävpåskrivning",
-  "search_rocket_pokemon": "Sök Rocket-Pokémon",
+  "raid_override": "Raid-override",
+  "search_rocket_pokemon": "Sök Rocket Pokémon",
   "main": "Huvud",
   "extra": "Extra",
   "select": "Välj",
   "searching": "söker...",
-  "no_options": "Inga alternativ..."
+  "no_options": "Inga alternativ...",
+  "and": "OCH",
+  "or": "ELLER",
+  "only_global": "Endast global",
+  "global_caption": "Ignorerar alla andra filter",
+  "global_and_individual": "Globala & individuella filter",
+  "gender_filters_all": "Kön gäller alla",
+  "and_caption": "Länkade ihop",
+  "or_caption": "Filter oberoende",
+  "filter_help": "Filterhjälp",
+  "kilometers": "Kilometer",
+  "miles": "Miles",
+  "distance_unit": "Distansenhet",
+  "data_management": "Datahantering",
+  "reset_or_manage_text": "Du kan antingen hårdåterställa dina filter eller du kan se sidan för datahantering som låter dig återställa individuella kategorier.",
+  "reset_audio": "Återställ ljud",
+  "reset_all": "Återställ allt",
+  "reset_icons": "Återställ ikoner",
+  "reset_position": "Återställ position",
+  "reset_ui": "Återställ UI",
+  "reset_options": "Återställ alternativ",
+  "reset_menus": "Återställ menyer",
+  "reset_settings": "Återställ inställningar",
+  "reset_general_title": "Allmänt",
+  "reset_filters_title": "Filter",
+  "reset_assets": "Återställ tillgångar",
+  "reset_pokemon": "Återställ Pokémon",
+  "reset_pokestops": "Återställ Pokéstops",
+  "reset_gyms": "Återställ gym",
+  "reset_nests": "Återställ nästen",
+  "reset_portals": "Återställ portaler",
+  "reset_routes": "Återställ rutter",
+  "reset_scan_areas": "Återställ skanningsområden",
+  "reset_scan_cells": "Återställ skanningsceller",
+  "reset_devices": "Återställ enheter",
+  "reset_weather": "Återställ väder",
+  "reset_s2cells": "Återställ S2-celler",
+  "reset_spawnpoints": "Återställ spawnpoints",
+  "reset_submission_cells": "Återställ inskickningsceller",
+  "hisuian": "Hisuian",
+  "spacial_rend_range": "Räckvidd för rymdbristning"
 }
diff --git a/packages/locales/lib/generated/th.json b/packages/locales/lib/generated/th.json
index 8c5c003a4..360f9d835 100644
--- a/packages/locales/lib/generated/th.json
+++ b/packages/locales/lib/generated/th.json
@@ -1,710 +1,718 @@
 {
   "login": "เข้าสู่ระบบ",
-  "click_once": "กด 'อนุญาต' เพียงครั้งเดียว",
+  "click_once": "คลิก 'อนุญาต' เพียงครั้งเดียว",
   "save": "บันทึก",
   "reset": "รีเซ็ต",
   "close": "ปิด",
   "reset_filters": "รีเซ็ตตัวกรอง",
-  "pokemon_filters": "การตั้งค่าตัวกรองโปเกมอน",
+  "pokemon_filters": "การตั้งค่าตัวกรอง Pokémon",
   "gyms_filters": "การตั้งค่าตัวกรองยิม",
-  "pokestops_filters": "การตั้งค่าตัวกรองโปเกมอนสต็อป",
-  "nests_filters": "การตั้งค่าตัวกรองไนท์เนสต์",
+  "pokestops_filters": "การตั้งค่าตัวกรอง PokéStop",
+  "nests_filters": "การตั้งค่าตัวกรอง Nest",
   "help": "ช่วยเหลือ",
-  "apply_to_all": "ใช้กับทั้งหมด",
+  "apply_to_all": "นำไปใช้กับทั้งหมด",
   "disable_all": "ปิดใช้งานทั้งหมด",
   "enable_all": "เปิดใช้งานทั้งหมด",
-  "enabled": "เปิดใช้งาน",
-  "legacy": "เก่าแก่",
-  "id": "รหัส",
+  "enabled": "เปิดการใช้งาน",
+  "legacy": "เวอร์ชันเก่า",
+  "id": "ไอดี",
   "location": "ตำแหน่ง",
-  "search_pokemon": "ค้นหาโปเกมอน",
-  "search_nests": "ค้นหาไนท์เนสต์",
+  "search_pokemon": "ค้นหา Pokémon",
+  "search_nests": "ค้นหา Nest",
   "search_gyms": "ค้นหายิม",
-  "search_pokestops": "ค้นหาโปเกมอนสต็อป",
-  "search_raids": "ค้นหาเรด",
+  "search_pokestops": "ค้นหา PokéStop",
+  "search_raids": "ค้นหารายการบุกรุก",
   "search_eggs": "ค้นหาไข่",
-  "search_quests": "ค้นหาเควส",
-  "search_lures": "ค้นหาลูร์",
+  "search_quests": "ค้นหาภารกิจ",
+  "search_lures": "ค้นหา Lures",
   "search_invasions": "ค้นหาการบุกรุก",
   "sm": "เล็ก",
   "md": "กลาง",
   "lg": "ใหญ่",
   "xl": "ใหญ่มาก",
-  "min": "น้อยที่สุด",
-  "max": "มากที่สุด",
-  "set_size": "ตั้งขนาดไอคอน",
-  "slot_selection": "เลือกช่อง",
+  "min": "ต่ำสุด",
+  "max": "สูงสุด",
+  "set_size": "ตั้งค่าขนาดไอคอน",
+  "slot_selection": "การเลือกช่อง",
   "generations": "รุ่น",
   "types": "ประเภท",
   "forms": "รูปแบบ",
-  "rarity": "ความหายากปัจจุบัน",
+  "rarity": "ความหายากในปัจจุบัน",
   "others": "อื่นๆ",
   "categories": "หมวดหมู่",
   "rank": "อันดับ",
   "slider_iv": "ช่วง IV",
-  "slider_great": "ลีกใหญ่",
-  "slider_ultra": "ลีกอุลตร้า",
-  "slider_little": "ลีกเล็ก",
+  "slider_great": "ลีกเกรท",
+  "slider_ultra": "ลีกอัลตร้า",
+  "slider_little": "คัพลิตเติ้ล",
   "slider_atk_iv": "โจมตี",
   "slider_def_iv": "ป้องกัน",
-  "slider_sta_iv": "พลังชีวิต",
-  "slider_level": "เลเวล",
+  "slider_sta_iv": "สเตมิน่า",
+  "slider_level": "ชั้นวาง",
   "slider_size": "ขนาด",
-  "abbreviation_level": "ใหญ่",
+  "abbreviation_level": "L",
   "lvl": "ระดับ",
-  "cap": "กำหนดเอง",
-  "custom": "ถูกต้อง",
-  "valid": "ไม่ถูกต้อง!",
-  "invalid": "เขียนทับตัวกรองทั้งหมด",
-  "overwrites": "ตัวกรองสถิติที่ถูกต้อง",
-  "valid_filter": "ป้อนตัวกรองที่ถูกต้อง",
-  "invalid_filter": "ยิม",
-  "gyms": "ไนท์เนสต์",
-  "nests": "โปเกมอนสต็อป",
-  "pokestops": "โปเกมอน",
-  "pokemon": "เวย์เฟอร์",
-  "wayfarer": "สแกนพื้นที่",
-  "scan_areas": "เซลล์ S2",
-  "s2cells": "สภาพอากาศ",
-  "weather": "ผู้ดูแลระบบ",
-  "admin": "การตั้งค่า",
-  "settings": "ขั้นสูง",
-  "advanced": "เซิร์ฟเวอร์ไทล์",
-  "tile_servers": "ไอคอน",
-  "icons": "การนำทาง",
-  "navigation": "ลิ้นชัก",
-  "drawer": "ค่าเริ่มต้น",
-  "tile_servers_default": "ชั่วคราว",
-  "drawer_temporary": "ถาวร",
-  "drawer_persistent": "การเลือกภาษา",
-  "locale_selection": "อังกฤษ",
-  "export": "ออกจากระบบ",
-  "logout": "ล้างพื้นที่จัดเก็บข้อมูลท้องถิ่นแล้ว!",
-  "local_storage_cleared": "ตัวกรอง IV หรือ",
-  "iv_or_filter": "รูปหลายเหลี่ยม",
-  "polygons": "เรด",
-  "raids": "สามารถเข้าร่วมได้",
-  "ex_eligible": "อยู่ในสงคราม",
-  "in_battle": "โปเกมอนสต็อปทั้งหมด",
-  "all_pokestops": "ลูร์",
-  "lures": "เควส",
-  "quests": "การบุกรุก",
-  "invasions": "พอร์ทัล",
-  "portals": "เซลล์การส่ง",
-  "submission_cells": "จุดเกิด",
-  "spawnpoint": "จุดเกิด",
-  "spawnpoints": "เลเวล {{level}} เซลล์ S2",
-  "s2_cell_level": "จำนวนทั้งหมด",
-  "total_count": "ส่งคำขอถัดไป!",
-  "next_submission": "ไม่เคย",
-  "never": "สนามกีฬาถัดไป",
-  "next_gym": "สแกนเซลล์",
-  "scan_cells": "อุปกรณ์",
-  "devices": "ใช้ตำแหน่งของฉัน",
-  "use_my_location": "ส่งคำติชม/รายงานข้อบกพร่อง",
-  "submit_feedback_title": "คุณสามารถใช้ลิงก์ด้านล่างเพื่อส่งคำติชมหรือรายงานข้อบกพร่องที่คุณพบ",
-  "use_the_link_below": "คำติชมนี้ถูกส่งโดยตรงถึงผู้พัฒนา",
-  "feedback_to_devs": "แบบฟอร์มคำติชม",
-  "feedback_form": "ชื่อ PokéStop ที่ไม่รู้จัก",
-  "unknown_pokestop": "ชื่อสนามกีฬาที่ไม่รู้จัก",
-  "unknown_gym": "ยกเว้น",
-  "exclude": "ยกเว้นเควส",
-  "exclude_quest": "ยกเว้นการบุกรุก",
-  "exclude_invasion": "ยกเว้นทีม",
-  "exclude_team": "ยกเว้นการระเบิด",
-  "exclude_raid": "ยกเว้นการดึงดูด",
-  "exclude_lure": "ตัวจับเวลา",
-  "timer": "ซ่อน",
-  "hide": "ระดับ",
-  "tier": "ช่อง",
-  "slots": "เมก้า",
-  "mega": "รูปแบบ",
-  "form": "เริ่ม",
-  "starts": "สิ้นสุด",
-  "ends": "ผู้ป้องกัน",
-  "defender": "CP",
-  "cp": "กิโลกรัม",
-  "kilogram": "เมตร",
-  "meter": "CP ทั้งหมด",
-  "total_cp": "เห็นครั้งแรก",
-  "first_seen": "เห็นครั้งสุดท้าย",
-  "last_seen": "แก้ไขครั้งสุดท้าย",
-  "last_modified": "อัปเดตครั้งสุดท้าย",
-  "last_updated": "นำเข้า",
-  "imported": "ข้อมูลเกี่ยวกับสวนสัตว์ถูกประมาณค่า!",
-  "nest_estimated": "ตรวจสอบโดยการตรวจสอบการเกิดปัจจุบัน",
-  "verify_nests": "สวนสัตว์อาจล้าสมัย!",
-  "nest_out_of_date": "ตรวจสอบการเกิดปัจจุบันแทน",
-  "nest_check_current": "ต่อชั่วโมง",
-  "spawns_per_hour": "ทีม",
-  "teams": "ไข่",
-  "eggs": "กลับด้าน",
-  "reverse": "เลือก",
-  "selected": "ไม่เลือก",
-  "unselected": "ใช้ได้",
-  "only_available": "ธรรมดา",
-  "common": "ไม่ธรรมดา",
-  "uncommon": "หายาก",
-  "rare": "หายากมาก",
-  "ultra_rare": "ภูมิภาค",
-  "regional": "เหตุการณ์",
-  "event": "ตำนาน",
-  "legendary": "ตัวอธิบาย",
-  "mythical": "รูปแบบอัลต์",
-  "ultra_beast": "อโลลา",
-  "alt_forms": "กาลาเรียน",
-  "alola": "แสดง",
-  "galarian": "ตัวอย่าง",
-  "showing": "ออนไลน์",
-  "instance": "ออฟไลน์",
-  "online": "ประเภทที่เพิ่มขึ้น",
-  "offline": "ตัวเลือก Pokémon",
-  "boosted_types": "ตัวเลือก PokéStop",
-  "pokemon_options": "ตัวเลือกสนามกีฬา",
-  "pokestops_options": "ตัวเลือกสวนสัตว์",
-  "gyms_options": "ตัวเลือก Wayfarer",
-  "nests_options": "ตัวเลือกผู้ดูแลระบบ",
-  "wayfarer_options": "ตัวเลือกสภาพอากาศ",
-  "admin_options": "ตัวเลือกเซลล์ S2",
-  "weather_options": "การจัดกลุ่ม",
-  "s2cells_options": "เรืองแสง",
-  "clustering": "ตัวกรองที่เก่า",
-  "glow": "ตัวจับเวลาการระเบิดทั้งหมด",
-  "legacy_filter": "ตัวจับเวลาการบุกรุกทั้งหมด",
-  "raid_timers": "ตัวจับเวลาการดึงดูดทั้งหมด",
-  "invasion_timers": "สีเส้นทางอุปกรณ์",
-  "lure_timers": "พอร์ทัลเก่า",
-  "device_path_color": "พอร์ทัลใหม่",
-  "old_portals": "ไอเท็ม",
-  "new_portals": "พลังงาน",
-  "items": "AR ที่มีคุณสมบัติ",
-  "energy": "ตัวบ่งชี้ IV",
-  "ar_eligible": "วงกลม IV ขั้นต่ำ",
-  "iv_circles": "ระยะการโต้ตอบ",
-  "min_iv_circle": "\nไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้ในขณะนี้\nการลองเชื่อมต่ออีกครั้งทันทีจะทำให้เกิดปัญหามากขึ้นเท่านั้น\nโปรดลองอีกครั้งในอีกไม่กี่นาที\n\n- ทีมผู้ดูแลแผนที่",
-  "interaction_ranges": "เควสเกิร์ตต้นเชื้อ",
-  "cannot_connect": "XS",
-  "mad_quest_text": "หลัก",
-  "xs": "รอง",
-  "primary": "IV 0%",
-  "secondary": "IV 100%",
-  "zero_iv": "เปิดเมนู",
-  "hundo_iv": "ขยายภาพ",
-  "open_menu": "ย่อภาพ",
-  "zoom_in": "ยินดีต้อนรับสู่",
-  "zoom_out": "ย้อนกลับ",
-  "welcome": "ต่อไป",
-  "back": "เสร็จสิ้น",
-  "next": "เริ่มการสอน",
-  "finish": "ดูโปรไฟล์",
-  "start_tutorial": "เข้าสู่ระบบ (ตัวเลือก)",
-  "view_profile": "การสอน",
-  "login_optional": "เลือกภาษาของคุณ",
-  "tutorial": "การสอนนี้เป็นแบบโต้ตอบและคุณสามารถเล่นกับตัวเลือกทั้งหมดที่ให้มาได้",
-  "tutorial_language": "หมวดหมู่ที่คุณสามารถเข้าถึงได้",
-  "tutorial_welcome": "คุณสามารถดูรายละเอียดเกี่ยวกับสิทธิ์ของคุณได้โดยดูโปรไฟล์ของคุณ",
-  "tutorial_categories": "คุณสามารถดูรายละเอียดเกี่ยวกับสิทธิ์ของคุณได้โดยเข้าสู่ระบบ",
-  "tutorial_logged_in": "การตั้งค่าและตัวกรองทั้งหมดของคุณอยู่ที่นี่",
-  "tutorial_logged_out": "สำหรับแต่ละหมวดหมู่คุณจะสามารถเปิด-ปิดข้อมูลที่คุณต้องการได้โดยใช้สวิตช์",
-  "tutorial_sidebar_0": "ตัวเลือก: การปรับแต่งเพิ่มเติม\nขั้นสูง: เราจะพูดถึงในภายหลังในการสอนนี้",
-  "tutorial_sidebar_1": "ใช้ตัวเลื่อนเพื่อปรับตัวกรอง",
-  "tutorial_sidebar_2": "โปเกมอนระหว่าง:",
-  "tutorial_sliders_0": "- IV {{iv0}}% ถึง {{iv1}}%",
-  "tutorial_sliders_1": "เลเวล {{level0}} ถึง {{level1}}",
-  "tutorial_sliders_2": "- และเป็นเลเวล {{level0}} ถึง {{level1}}",
-  "tutorial_sliders_3": "- ระดับลีกยอดเยี่ยม {{gl0}} ถึง {{gl1}}",
-  "tutorial_sliders_3alt": "- หรือระดับลีกยอดเยี่ยม {{gl0}} ถึง {{gl1}}",
-  "tutorial_sliders_4": "- ระดับลีกอัลตร้า {{ul0}} ถึง {{ul1}}",
-  "tutorial_sliders_4alt": "- หรือระดับลีกอัลตร้า {{ul0}} ถึง {{ul1}}",
-  "tutorial_sliders_5": "เชื่อมโยงกับสีเดียวกันอื่น ๆ",
-  "tutorial_sliders_5alt": "กรองแยกจากตัวเลื่อนอื่น ๆ",
-  "tutorial_sliders_6": "ตัวเลื่อน 'เต็ม' หมายถึงว่าถูกปิดใช้งาน:",
-  "tutorial_sliders_7": "การเกิดทั้งหมดไม่ว่าจะได้รับการตรวจสอบ IV หรือไม่",
-  "tutorial_sliders_8": "ทางลัดไปยังเมนูนี้",
-  "tutorial_sliders_9": "เฉพาะมือถือเท่านั้น เปิดตัวเลือกการกรองสำหรับเมนูขั้นสูง",
-  "tutorial_help": "ตั้งค่าตัวกรองขั้นสูงสำหรับโปเกมอนทั้งหมดที่กำลังถูกกรองในเมนู",
-  "tutorial_adv_filter": "ตั้งขนาดไอคอนสำหรับรายการทั้งหมดที่กำลังถูกกรองในเมนู",
-  "tutorial_tune": "เปิดใช้งานรายการทั้งหมดที่กำลังถูกกรองในเมนู",
-  "tutorial_format_size": "ปิดใช้งานรายการทั้งหมดที่กำลังถูกกรองในเมนู",
-  "tutorial_check": "บันทึกการเลือกปัจจุบันและออก",
-  "tutorial_clear": "สลับ PokéStops & Gyms",
-  "tutorial_save": "สลับโปเกมอน",
-  "tutorial_show_all_view": "การคลิกที่เครื่องหมาย Check/X จะสลับรายการ",
-  "tutorial_show_pokemon_view": "ไอคอนนี้ช่วยให้คุณตั้งค่าตัวกรองสำหรับโปเกมอนที่เฉพาะเจาะจงนั้น",
-  "tutorial_toggle": "ทีมมีเมนูช่องพิเศษ\nรายการอื่น ๆ ทั้งหมดช่วยให้คุณปรับขนาดไอคอน",
-  "tutorial_pokemon_caption": "ป๊อปอัพเป็นแบบโต้ตอบแล้ว!",
-  "tutorial_all_caption": "สามจุดจะเปิดตัวเลือกซ่อน ยกเว้น และสลับตัวจับเวลา",
-  "tutorial_popup_0": "ไอคอนที่อยู่ทางด้านข้างของลิงก์การนำทางจะขยายเพื่อแสดงข้อมูลเพิ่มเติม ลองดูสิ!",
-  "tutorial_popup_1": "ไอคอนแตกต่างกันสำหรับแต่ละหมวดหมู่ อย่าลืมตรวจสอบทั้งหมด",
-  "tutorial_popup_2": "ข้อมูลเพิ่มเติม",
-  "tutorial_popup_3": "สไลเดอร์โปเกมอนทั่วโลกในแถบด้านข้างทำงานแยกต่างหากจากเมนูขั้นสูงและไม่มีผลต่อกัน",
-  "tutorial_closing_0": "อย่าลืมเช็คส่วนการตั้งค่าในแถบด้านข้าง",
-  "tutorial_closing_1": "มีตัวเลือกทางสถานีสวยงามมากมายสำหรับแต่ละหมวดหมู่ แต่จำไว้ว่ายิ่งคุณเพิ่มลงในแผนที่มากเท่าไหร่ โอกาสที่แผนที่จะหยุดทำงานจะสูงขึ้น",
-  "tutorial_closing_2": "คุณสามารถดูบทแนะนำนี้อีกครั้งได้โดยเลือกในแผงการตั้งค่าในแถบด้านข้าง",
-  "tutorial_closing_3": "อย่าลืมรักษาความปลอดภัยและโชคดี!",
-  "tutorial_closing_4": "แนะนำตัว",
-  "tutorial_closing_5": "แถบด้านข้าง",
-  "intro": "สไลเดอร์",
-  "sidebar": "ป๊อปอัพ",
-  "sliders": "ปิด",
-  "popups": "ทางลัด",
-  "closing": "IV",
-  "shortcuts": "ข้อจำกัดของพื้นที่",
-  "iv": "แผนที่",
-  "area_restrictions": "สถิติ",
-  "map": "PVP",
-  "stats": "คุณสามารถเข้าถึงพื้นที่เหล่านี้ได้",
-  "pvp": "แสดงตำแหน่งและเส้นทางของอุปกรณ์ที่ใช้งานอยู่",
-  "area_restrictions_subtitle": "แสดงตำแหน่งยิมที่ใช้งานอยู่ทั้งหมด ทีมที่ใช้งานอยู่ และจำนวนช่องว่างที่ยิมแต่ละแห่งมี",
-  "devices_subtitle": "แสดงข้อมูลการบุกทีมโรเค็ต รวมถึงการเรียงลำดับการต่อสู้ เวลาหมดอายุ และรางวัลที่เป็นไปได้",
-  "gyms_subtitle": "แสดง IV% และตัวเลือกการเรืองแสง",
-  "invasions_subtitle": "แสดงข้อมูลล่อ รวมถึงประเภทล่อและเวลาหมดอายุ",
-  "iv_subtitle": "แสดงแผนที่",
-  "lures_subtitle": "แสดงพ็อกมอนที่กำลังอยู่ในรังและรูปหลายเหลี่ยมของรัง",
-  "map_subtitle": "แสดงตำแหน่งและเวลาหมดอายุของพ็อกมอนทั้งหมด",
-  "nests_subtitle": "แสดงตำแหน่งทุก PokéStop",
-  "pokemon_subtitle": "แสดงตำแหน่ง Ingress portals ทั้งหมด",
-  "pokestops_subtitle": "แสดงข้อมูลเกี่ยวกับระดับ PVP/CP/Level ของแต่ละโปเกมอน",
-  "portals_subtitle": "แสดงข้อมูลเกี่ยวกับรางวัลและงานที่ต้องทำของเควส",
-  "pvp_subtitle": "แสดงข้อมูลเกี่ยวกับการรุกทั้งหมดรวมถึงศัตรูรุก ไข่ฟัก ระยะเวลาหมดอายุ และการโจมตี",
-  "quests_subtitle": "แสดงเวลาล่าสุดที่เครื่องสแกนสแกน S2 cell",
-  "raids_subtitle": "แสดงพื้นที่สแกนที่ใช้งานได้",
-  "scan_cells_subtitle": "แสดงจุดเกิดและเวลาที่คาดว่าจะหมดอายุของโปเกมอน",
-  "scan_areas_subtitle": "แสดงสถิติและระดับของโปเกมอน",
-  "spawnpoints_subtitle": "แสดงข้อมูลที่เป็นประโยชน์สำหรับการส่ง POI ใหม่",
-  "stats_subtitle": "แสดงข้อมูลเกี่ยวกับสภาพอากาศในเกมสำหรับแต่ละเซลล์",
-  "submission_cells_subtitle": "ปฏิสัมพันธ์โดยตรงกับสแกนเนอร์ในหลายวิธี",
-  "weather_subtitle": "แสดงเซลล์ S2 ในระดับต่าง ๆ บนแผนที่",
-  "scanner_subtitle": "เปิดใช้งานการสำรองข้อมูลและโหลดการตั้งค่าข้ามอุปกรณ์",
-  "s2cells_subtitle": "การสำรองข้อมูล",
-  "backups_subtitle": "โปรไฟล์ผู้ใช้",
-  "backups": "ชื่อผู้ใช้",
-  "user_profile": "ลูกอม",
-  "user_username": "แสดงเหรียญ EX",
-  "candy": "ค้นหา",
-  "show_ex_badge": "กรอกชื่อรางวัล...",
-  "search": "กรอกชื่อกับดัก...",
-  "global_search_quests": "กรอกชื่อ PokéStop...",
-  "global_search_lures": "กรอกชื่อหอกีฬา...",
-  "global_search_pokestops": "กรอกชื่อพอร์ทัล...",
-  "global_search_gyms": "กรอกชื่อโปเกมอนที่อยู่ในรังสี...",
-  "global_search_portals": "กรอกชื่อศัตรูรุก...",
-  "global_search_nests": "กรอกชื่อโปเกมอน...",
-  "global_search_raids": "เหรียญระดับรุก",
-  "global_search_pokemon": "ตัวเลือก",
-  "raid_level_badges": "โปรไฟล์",
-  "options": "ไอคอนโปเกมอน",
-  "profile": "ไอคอน PokéStop",
-  "pokemon_icons": "ไอคอนหอกีฬา",
-  "pokestop_icons": "ไอคอนทีม",
-  "gym_icons": "ไอคอนไข่ฟัก",
-  "team_icons": "ไอคอนรุก",
-  "egg_icons": "ไอคอนสวนสัตว์",
-  "raid_icons": "ไอคอนรางวัล",
-  "nest_icons": "ไอคอนประเภท",
-  "reward_icons": "ไอคอนสภาพอากาศ",
-  "type_icons": "ไอคอนอื่น ๆ",
-  "weather_icons": "ไอคอนการบุกรุก",
-  "misc_icons": "ไอคอนจุดเกิด",
-  "invasion_icons": "ไอคอนอุปกรณ์",
-  "spawnpoint_icons": "ตัวจับเวลาโปเกมอนทั้งหมด",
-  "device_icons": "แสดงหมายเลขเปโดเกิดในป๊อปอัพ",
-  "pokemon_timers": "ป๊อปอัพ",
-  "show_dex_num_in_popup": "สถิติ PVP ระดับ {{level}}",
-  "popup": "สถิติ PVP แมก้า",
-  "pvp_level": "เพิ่มใน {{name}}",
-  "pvp_mega": "ลบออกจาก {{name}}",
-  "webhook_entry": "ระยะทาง",
-  "remove_webhook_entry": "สนามกีฬา",
-  "distance": "ไข่",
-  "gym": "เรด",
-  "egg": "ล่อ",
-  "raid": "เควส",
-  "lure": "การบุกรุก",
-  "quest": "สวนสัตว์",
-  "invasion": "ป๊อกเสต็อป",
-  "nest": "ทีม",
-  "pokestop": "ทั่วโลก",
-  "team": "จัดการ {{name}}",
-  "global": "ลากและวางเครื่องหมายเพื่อตั้งตำแหน่งของคุณ",
-  "manage_webhook": "คลิกเพื่อเลือก",
-  "drag_and_drop": "เพิ่มการแจ้งเตือน {{category}} ใหม่",
-  "click_to_select": "ตำแหน่งของฉัน",
-  "add_new": "เลือกบนแผนที่",
-  "my_location": "เลือกโปรไฟล์",
-  "choose_on_map": "ดูรัศมีระยะทางตัวอย่าง",
-  "select_profile": "พื้นที่",
-  "distance_radius": "เลือกบอท",
-  "areas": "งาน AR",
-  "select_webhook": "ไม่มี AR",
-  "ar_quest_true": "มี AR",
-  "ar_quest_false": "ทั้งสอง",
-  "with_ar": "ไม่มี AR",
-  "both": "ยกเว้น {{reward}}",
-  "without_ar": "{{variable_0}} ถึงขีดจำกัด ({{variable_1}}) แล้ว",
-  "exclude_quest_multi": "โปรดซูมเข้าหรือแคบตัวกรองของคุณ",
-  "cluster_limit_0": "แสดงรูปหลายเหลี่ยม",
-  "cluster_limit_1": "ยกเว้น {{invasion}}",
-  "show_polygons": "ฝุ่นดาว",
-  "exclude_invasion_multi": "CP",
-  "stardust": "ลีก",
-  "slider_cp": "CP ขั้นต่ำ",
-  "pvp_ranking_league": "อันดับ",
-  "pvp_ranking_min_cp": "โปรไฟล์",
-  "slider_pvp": "เทมเพลต",
-  "profile_no": "เพศ",
-  "template": "สะอาด",
-  "gender": "รูปแบบทั้งหมด",
-  "clean": "การเข้าร่วม PVP",
-  "all_forms": "รวม IV ที่ไม่มี",
-  "pvp_entry": "ตามระยะทาง",
-  "no_iv": "เวลาขั้นต่ำ",
-  "by_distance": "เพิ่มโปรไฟล์ใหม่",
-  "min_time": "ไม่มี",
-  "add_new_profile": "อุ๊ปส์ มีบางอย่างผิดพลาด!",
-  "slider_none": "คุณอาจไม่ได้ลงทะเบียนกับ {{webhook}}\nหรือเซิร์ฟเวอร์ไม่สามารถเชื่อมต่อได้ในขณะนี้",
-  "non_registered_human_title": "โปรดลองอีกครั้งในภายหลัง",
-  "non_registered_human_desc": "เลือกพื้นที่ {{amount}}",
-  "try_again_later": "เลือกพื้นที่ {{amount}} แห่ง",
-  "selected_areas": "การเลือก {{name}}",
-  "selected_areas_plural": "ข้อความของวันนี้",
-  "webhook_selection": "สีทางเลือกสำหรับสถานีที่มีเควส",
-  "message_of_the_day": "แสดงป้ายชื่อ AR",
-  "has_quest_indicator": "สนามกีฬาทั้งหมด",
-  "show_ar_badge": "ทั่วไป",
-  "all_gyms": "{{variable_0}}",
-  "general": "เชื่อมโยงทั่วโลกและขั้นสูง",
-  "server_dev_error_0": "รูปแบบปกติ",
-  "link_global_and_advanced": "ตัวบ่งชี้การเพิ่มพลังสภาพอากาศ",
-  "normal_forms": "หน้า {{page}}",
-  "weather_indicator": "การควบคุมการนำทาง",
-  "page": "React",
-  "navigation_controls": "Leaflet",
-  "navigation_controls_react": "พิเศษ",
-  "navigation_controls_leaflet": "ทุกการเคลื่อนไหว",
-  "exclusive": "การเคลื่อนไหว",
-  "all_moves": "ใดก็ได้",
-  "move": "อัตราการเกิดของต่ำสุด",
-  "any": "เลือกทั้งหมด",
-  "min_spawn_average": "ลบที่เลือกแล้ว",
-  "select_all": "ยกเลิก",
-  "delete_all": "วันจันทร์",
-  "cancel": "วันอังคาร",
-  "day_1": "วันพุธ",
-  "day_2": "วันพฤหัสบดี",
-  "day_3": "วันศุกร์",
-  "day_4": "วันเสาร์",
-  "day_5": "วันอาทิตย์",
-  "day_6": "ชื่อโปรไฟล์",
-  "day_7": "จัดการโปรไฟล์",
-  "profile_name": "อัตราการเกิดเฉลี่ยต่ำสุด",
-  "manage_profiles": "ทุกอย่าง",
-  "min_spawn_avg": "จำนวน",
-  "poke_global": "สนามกีฬาที่เฉพาะเจาะจง",
-  "amount": "ค้นหาตำแหน่ง",
-  "specific_gym": "ค้นหา {{category}} ที่เฉพาะเจาะจง",
-  "search_location": "เพิ่มการแจ้งเตือนเกี่ยวกับการต่อสู้, ไข่และการเปลี่ยนทีม!",
-  "search_specific": "การเปลี่ยนแปลงช่อง",
-  "webhook_success_gym": "การเปลี่ยนแปลงช่อง",
-  "slot_changes": "การดำเนินการนี้จะลบการติดตามทั้งหมดสำหรับโปรไฟล์นี้ คุณแน่ใจหรือไม่?",
-  "slot_changes_poracle": "เลือกโปรไฟล์ที่คุณต้องการคัดลอก \"{{profile}}\" ไปยัง นี้จะเขียนทับโปรไฟล์นั้นทั้งหมด",
-  "confirm_delete": "{{name}} ไม่สามารถประมวลผลได้\nโปรดลองอีกครั้งในภายหลัง",
-  "confirm_copy": "ต้องไม่ซ้ำกันและถูกต้อง",
-  "webhook_error": "ความสอดคล้อง",
-  "profile_error": "ในการต่อสู้",
-  "team_0": "การเปลี่ยนแปลงการต่อสู้",
-  "battle_changes": "อัตโนมัติ",
-  "battle_changes_poracle": "จัดการการแจ้งเตือนของคุณโดยตรงจากแผนที่สำหรับบอทเหล่านี้",
-  "auto": "แสดง Pokéstops ที่เป็นเหตุการณ์พิเศษ เช่น Kecleon",
-  "webhooks_subtitle": "การแจ้งเตือน",
-  "event_stops_subtitle": "การดำเนินการสแกนเพิ่มเติม",
-  "webhooks": "เพิ่มการแจ้งเตือนแต่ละรายการ",
-  "scanner": "แต่ละรายการ",
-  "everything_individually": "เข้าร่วม",
-  "individually": "อุ๊ปส์ หน้านี้ไม่พบได้!",
-  "join": "เกิดข้อผิดพลาดของเซิร์ฟเวอร์ โปรดลองอีกครั้งในภายหลัง!",
-  "errors_404": "ชื่อผู้ใช้",
-  "errors_500": "รหัสผ่าน",
-  "local_username": "เกิดข้อผิดพลาด โปรดลองอีกครั้งในภายหลัง!",
-  "local_password": "ไม่พบผลลัพธ์\nลองขยายของกรองของคุณ",
-  "local_error": "หน้าของผู้บริจาค",
-  "no_filter_results": "ย้อนกลับ",
-  "donor_page": "เข้าถึง",
-  "go_back": "เชื่อมต่อ Discord",
-  "access": "ผู้จัดการการแจ้งเตือน",
-  "link_discord": "สำเร็จ! กำลังรีเฟรชเพื่อดึงการตั้งค่าการแจ้งเตือน...",
-  "select_webhook_strategy": "ลงทะเบียน",
-  "webhook_strategy_success_0": "ข้อมูลเข้าสู่ระบบไม่ถูกต้อง",
-  "register": "ไม่สามารถลงทะเบียนผู้ใช้ใหม่ได้ในขณะนี้",
-  "invalid_credentials": "เชื่อมต่อ Discord แล้ว",
-  "error_creating_user": "เชื่อมต่อ Telegram แล้ว",
-  "discord_linked": "ระดับ",
-  "telegram_linked": "กิโลเมตร",
-  "level": "ข้อเสนอแนะ",
-  "km": "เมนูของผู้บริจาค",
-  "feedback": "ตำแหน่งของโปเกมอนอาจแตกต่างกันไป",
-  "donor_menu": "ตัวจับเวลานี้ได้รับการยืนยันแล้ว",
-  "pokemon_cell": "ตัวจับเวลานี้ยังไม่ได้รับการยืนยัน",
-  "timer_verified": "ทั้งหมด",
-  "timer_unverified": "ไม่มี",
-  "all": "ทองแดง",
-  "badge_0": "เงิน",
-  "badge_1": "ทอง",
-  "badge_2": "แก้ไขป้ายยิ้มในสนามกีฬา",
-  "badge_3": "ป้ายยิ้มในสนามกีฬา",
-  "gym_badge_menu": "แสดงป้ายยิ้มในแผนที่และรายการในหน้าโปรไฟล์",
-  "gym_badges": "รีเซ็ตตัวกรอง",
-  "gym_badge_diamonds": "คุณแน่ใจหรือไม่ว่าต้องการรีเซ็ตการตั้งค่าเป็นค่าเริ่มต้น? ไม่สามารถยกเลิกได้!",
-  "gym_badges_subtitle": "รีเซ็ตตัวกรอง",
-  "confirm_filters_reset": "เลือกด่วน",
-  "filters_reset_text": "ปิดการใช้งาน",
-  "filters_reset_title": "กำลังโหลด {{category}}",
-  "raid_quick_select": "กำลังดึงไอคอน",
-  "disabled": "กำลังดึงการบุกรุก",
-  "loading": "สแกนตำแหน่ง",
-  "loading_icons": "ลากและวางเครื่องหมายเพื่อตั้งค่าตำแหน่งสแกน",
-  "loading_invasions": "สแกนพื้นที่",
-  "scan_next": "ลากและวางเครื่องหมายเพื่อตั้งค่าตำแหน่งสแกนและเลือกขนาด",
-  "scan_next_choose": "ขนาด",
-  "scan_zone": "ระยะห่าง",
-  "scan_zone_choose": "ระยะห่าง",
-  "scan_zone_size": "รัศมี",
-  "scan_zone_range": "คำขอสแกน",
-  "scan_zone_spacing": "คิวปัจจุบัน",
-  "scan_zone_radius": "สแกนที่นี่",
-  "scan_requests": "ยืนยันความต้องการสแกน",
-  "scan_queue": "ส่งคนงานไปยังตำแหน่งแล้ว ผลลัพธ์จะปรากฏบนแผนที่เร็ว ๆ นี้!",
-  "click_to_scan": "กำลังส่งคำขอสแกน",
-  "scan_confirmed_title": "คำขอสแกนของคุณกำลังดำเนินการและถูกส่งไปยังระบบ!",
-  "scan_confirmed": "ข้อผิดพลาด",
-  "scan_loading_title": "เกิดข้อผิดพลาดขณะดำเนินการสแกน...",
-  "scan_loading": "ตำแหน่งนี้อยู่นอกขอบเขตของพื้นที่ที่ได้รับอนุญาต",
-  "scan_error_title": "ระดับ",
-  "scan_error": "ติดตามตำแหน่งของคุณ",
-  "scan_outside_area": "เมตร",
-  "pvp_ranking_cap": "ฟุต",
-  "lc_title": "คุณอยู่ห่างจากจุดนี้ {distance} {unit}",
-  "lc_metersUnit": "คุณดูเหมือนอยู่นอกขอบเขตของแผนที่",
-  "lc_feetUnit": "ไม่พบการแจ้งเตือน",
-  "lc_popup": "กำลังโหลดการตั้งค่า",
-  "lc_outsideMapBoundsMsg": "กรุณารีเฟรชก่อนดำเนินการต่อ",
-  "no_alerts": "เซสชันหมดอายุ",
-  "loading_settings": "เซสชันของคุณหมดอายุแล้ว",
-  "refresh_to_continue": "ล้าสมัย",
-  "session_expired_title": "มีเวอร์ชันใหม่ของแผนที่นี้",
-  "session_expired_body": "รีเฟรช",
-  "old_client_title": "จุด",
-  "old_client_body": "วัน",
-  "refresh": "วัน",
-  "points": "เกิดข้อผิดพลาด",
-  "day": "ไอคอนสามารถคลิกได้",
-  "days": "2 จุดจนถึงต่อไป",
-  "react_error": "1 จุดจนถึงต่อไป",
-  "clickable_icon": "ไม่มียิมเพิ่มเติม",
-  "two_stops_till_next": "เส้นขอบแผนที่สว่าง",
-  "one_stop_till_next": "เส้นขอบแผนที่มืด",
-  "no_more_gyms": "บล็อกเซลล์",
-  "light_map_border": "สี POI",
-  "dark_map_border": "เงื่อนไขเควสต์",
-  "cell_blocked": "แสดงป้ายชื่อเสมอ",
-  "poi_color": "ตัวเลือกสแกนพื้นที่",
-  "quest_condition": "ความหายากในอดีต",
-  "always_show_labels": "จุดสนใจ",
-  "scan_areas_options": "ระยะทาง 300 เมตร",
-  "historic_rarity": "ระยะทางของกับดัก",
-  "poi": "ระยะทางที่กำหนดเอง",
-  "300m_range": "แตะเพื่อสลับ",
-  "lure_range": "เพิ่มพลัง",
-  "custom_range": "ไม่เคย",
-  "tap_to_toggle": "เห็นในบริเวณใกล้เคียง",
-  "power_up": "เห็นในเซลล์นี้",
-  "never_alt": "พบในการใช้กับดัก",
-  "seen_nearby_stop": "พบในการใช้กับดัก",
-  "seen_nearby_cell": "พบในการปล่อยในธรรมชาติ",
-  "seen_lure_encounter": "จุดหยุดกิจกรรม",
-  "seen_lure_wild": "ตัวจับเวลาจุดหยุดกิจกรรม",
-  "seen_wild": "ใดก็ได้",
-  "event_stops": "XXS",
-  "event_stop_timers": "XS",
-  "size_0": "M",
-  "size_1": "XL",
-  "size_2": "XXL",
-  "size_3": "แสดงตัวบ่งชี้ขนาด",
-  "size_4": "ขนาด",
-  "size_5": "จุดหยุดทอง",
-  "show_size_indicator": "สลับโปรไฟล์",
-  "size": "สำรองข้อมูลใหม่",
-  "gold_stop": "สร้าง",
-  "profile_backups": "โหลด",
-  "new_backup": "อัปเดต",
-  "create": "ลบ",
-  "load": "ชื่อ",
-  "update": "เฉพาะที่ยืนยันแล้ว",
-  "delete": "โปเกมอนของโรเค็ต",
-  "name": "ตัวปลอม",
-  "only_confirmed": "คุณพยายามสร้างเซลล์มากกว่า 20,000 ({{variable_0}})",
-  "rocket_pokemon": "แสดงอันดับ PVP ทั้งหมด",
-  "decoy": "แสดงพิกัดโปเกมอน",
-  "s2_cell_limit_0": "แสดงพิกัดยิม",
-  "show_all_pvp_ranks": "แสดงพิกัดโปเกมอนสต็อป",
-  "enable_pokemon_popup_coords": "แสดงพิกัดพอร์ทัล",
-  "enable_gym_popup_coords": "โปรดเข้าร่วมดิสคอร์ดของเราเพื่อข้อมูลเพิ่มเติม",
-  "enable_pokestop_popup_coords": "คุณถูกบล็อกเนื่องจากเป็นสมาชิกของ",
-  "enable_portal_popup_coords": "ถูกปฏิเสธ",
-  "on_block_join_discord": "แสดงผล",
-  "on_block_msg": "เหตุการณ์ที่ไม่รู้จัก",
-  "denied": "พร้อมใช้งานใน {{time}} วินาที",
-  "showcase": "สำเร็จ",
-  "unknown_event": "มีส่วนร่วม",
-  "scanner_countdown": "ไมล์",
-  "success": "กรองตามพื้นที่",
-  "contribute": "ส่งชื่อเพื่อนำเสนอ",
-  "mi": "อัปเดตชื่อ",
-  "filter_by_areas": "การส่งรัง",
-  "submit_nest_name": "ช่วยให้คุณสามารถส่งชื่อใหม่สำหรับรังได้",
-  "nest_submission_menu": "ความทึบของโปเกมอนแบบไดนามิก",
-  "nest_submissions": "ความทึบของการบุกเข้าแบบไดนามิก",
-  "nest_submissions_subtitle": "ความทึบของการเรียกเข้าแบบไดนามิก",
-  "pokemon_opacity": "ความทึบใน 10 นาที",
-  "invasion_opacity": "ความทึบใน 5 นาที",
-  "raid_opacity": "ความทึบใน 1 นาที",
-  "opacity_ten_minutes": "ตัวชี้วัดระดับ",
-  "opacity_five_minutes": "ระดับวงกลมขั้นต่ำ",
-  "opacity_one_minute": "คำขอของคุณไม่สำเร็จเนื่องจากไม่ได้เข้าสู่ระบบ",
-  "level_circles": "ส่งโดย",
-  "min_level_circle": "ระดับวงกลมขั้นต่ำ",
-  "mutation_auth_error": "คำขอของคุณไม่สำเร็จเนื่องจากไม่ได้เข้าสู่ระบบ",
+  "cap": "จำกัด",
+  "custom": "กำหนดเอง",
+  "valid": "ถูกต้อง",
+  "invalid": "ไม่ถูกต้อง!",
+  "overwrites": "เขียนทับตัวกรองทั้งหมด",
+  "valid_filter": "ตัวกรองสถิติที่ถูกต้อง",
+  "invalid_filter": "กรอกตัวกรองที่ถูกต้อง",
+  "gyms": "ยิม",
+  "nests": "Nest",
+  "pokestops": "PokéStops",
+  "pokemon": "Pokémon",
+  "wayfarer": "Wayfarer",
+  "scan_areas": "พื้นที่สแกน",
+  "s2cells": "เซลล์ S2",
+  "weather": "สภาพอากาศ",
+  "admin": "ผู้ดูแลระบบ",
+  "settings": "การตั้งค่า",
+  "advanced": "ขั้นสูง",
+  "tile_servers": "เซิร์ฟเวอร์ Tile",
+  "icons": "ไอคอน",
+  "navigation": "การนำทาง",
+  "drawer": "ลิ้นชัก",
+  "tile_servers_default": "ค่าเริ่มต้น",
+  "drawer_temporary": "ชั่วคราว",
+  "drawer_persistent": "ถาวร",
+  "locale_selection": "การเลือกภาษา",
+  "import": "นำเข้า",
+  "export": "ส่งออก",
+  "logout": "ออกจากระบบ",
+  "local_storage_cleared": "ล้างพื้นที่เก็บข้อมูลในเครื่องเรียบร้อย!",
+  "iv_or_filter": "ตัวกรอง IV OR",
+  "polygons": "รูปหลายเหลี่ยม",
+  "raids": "รายการบุกรุก",
+  "ex_eligible": "มีสิทธิ์รับ EX",
+  "in_battle": "ในการต่อสู้",
+  "all_pokestops": "ทุก PokéStops",
+  "lures": "Lures",
+  "quests": "ภารกิจ",
+  "invasions": "การบุกรุก",
+  "portals": "พอร์ทัล",
+  "submission_cells": "เซลล์ส่งข้อมูล",
+  "spawnpoint": "จุดปรากฏ",
+  "spawnpoints": "จุดปรากฏ",
+  "s2_cell_level": "เซลล์ S2 ชั้น {{level}}",
+  "total_count": "จำนวนรวม",
+  "next_submission": "การส่งครั้งถัดไป!",
+  "never": "ไม่เคย",
+  "next_gym": "ยิมถัดไป",
+  "scan_cells": "สแกนเซลล์",
+  "devices": "อุปกรณ์",
+  "use_my_location": "ใช้ตำแหน่งของฉัน",
+  "submit_feedback_title": "ส่งข้อเสนอแนะ/รายงานข้อผิดพลาด",
+  "use_the_link_below": "คุณสามารถใช้ลิงค์ด้านล่างเพื่อส่งข้อเสนอแนะหรือข้อผิดพลาดที่คุณพบได้",
+  "feedback_to_devs": "ข้อเสนอแนะนี้ส่งตรงไปยังนักพัฒนา",
+  "feedback_form": "ฟอร์มข้อเสนอแนะ",
+  "unknown_pokestop": "ชื่อ PokéStop ไม่ทราบ",
+  "unknown_gym": "ชื่อยิมที่ไม่รู้จัก",
+  "exclude": "ยกเว้น",
+  "exclude_quest": "ยกเว้นภารกิจ",
+  "exclude_invasion": "ยกเว้นการรุกราน",
+  "exclude_team": "ยกเว้นทีม",
+  "exclude_raid": "ยกเว้นการจู่โจม",
+  "exclude_lure": "ยกเว้นล่อ",
+  "timer": "ตัวจับเวลา",
+  "hide": "ซ่อน",
+  "tier": "ระดับ",
+  "slots": "ช่อง",
+  "mega": "เมก้า",
+  "form": "รูปแบบ",
+  "starts": "เริ่ม",
+  "ends": "สิ้นสุด",
+  "defender": "ผู้ป้องกัน",
+  "cp": "CP",
+  "kilogram": "กิโลกรัม",
+  "meter": "เมตร",
+  "total_cp": "CP รวม",
+  "first_seen": "พบครั้งแรก",
+  "last_seen": "พบครั้งล่าสุด",
+  "last_modified": "แก้ไขครั้งล่าสุด",
+  "last_updated": "อัปเดตล่าสุด",
+  "imported": "นำเข้า",
+  "nest_estimated": "ข้อมูลเนสต์เป็นเพียงการประมาณ!",
+  "verify_nests": "ยืนยันโดยตรวจสอบสปอนแบบปัจจุบัน",
+  "nest_out_of_date": "เนสต์อาจล้าสมัย!",
+  "nest_check_current": "ตรวจสอบสปอนแบบปัจจุบันแทน",
+  "spawns_per_hour": "ต่อชั่วโมง",
+  "teams": "ทีม",
+  "eggs": "ไข่",
+  "reverse": "ย้อนกลับ",
+  "selected": "ที่เลือก",
+  "unselected": "ไม่เลือก",
+  "only_available": "ที่มีอยู่",
+  "common": "ทั่วไป",
+  "uncommon": "ไม่ชิน",
+  "rare": "หายาก",
+  "ultra_rare": "หายากมาก",
+  "regional": "ภูมิภาค",
+  "event": "กิจกรรม",
+  "legendary": "ตำนาน",
+  "mythical": "ตำนาน",
+  "ultra_beast": "อัลทร้าบีสต์",
+  "alt_forms": "รูปแบบอื่น",
+  "alola": "อะโลลา",
+  "galarian": "กาลาเรียน",
+  "showing": "แสดง",
+  "instance": "อินสแตนซ์",
+  "online": "ออนไลน์",
+  "offline": "ออฟไลน์",
+  "boosted_types": "ประเภทที่ถูกเพิ่มพลัง",
+  "pokemon_options": "ตัวเลือก Pokémon",
+  "pokestops_options": "ตัวเลือก PokéStop",
+  "gyms_options": "ตัวเลือกยิม",
+  "nests_options": "ตัวเลือกเนสต์",
+  "wayfarer_options": "ตัวเลือก Wayfarer",
+  "admin_options": "ตัวเลือกผู้ดูแลระบบ",
+  "weather_options": "ตัวเลือกสภาพอากาศ",
+  "s2cells_options": "ตัวเลือก S2 Cell",
+  "clustering": "การจัดกลุ่ม",
+  "glow": "เรืองแสง",
+  "legacy_filter": "ตัวกรองเดิม",
+  "raid_timers": "ตัวจับเวลาการจู่โจมทั้งหมด",
+  "invasion_timers": "ตัวจับเวลาการรุกรานทั้งหมด",
+  "lure_timers": "ตัวจับเวลาล่อทั้งหมด",
+  "device_path_color": "สีเส้นทางของอุปกรณ์",
+  "old_portals": "พอร์ทัลเก่า",
+  "new_portals": "พอร์ทัลใหม่",
+  "items": "ไอเทม",
+  "energy": "พลังงาน",
+  "ar_eligible": "มีสิทธิ์ AR",
+  "iv_circles": "ตัวบ่งชี้ IV",
+  "min_iv_circle": "วง IV ขั้นต่ำ",
+  "interaction_ranges": "ช่วงการโต้ตอบ",
+  "cannot_connect": "\nไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ในเวลานี้ได้\nการพยายามเชื่อมต่อทันทีจะทำให้เกิดปัญหามากขึ้น\nกรุณาลองใหม่อีกครั้งในไม่กี่นาที\n\n- ทีมผู้ดูแลแผนที่",
+  "mad_quest_text": "ภารกิจเดิม",
+  "xs": "XS",
+  "primary": "หลัก",
+  "secondary": "รอง",
+  "zero_iv": "0% IV",
+  "hundo_iv": "100% IV",
+  "open_menu": "เปิดเมนู",
+  "zoom_in": "ซูมเข้า",
+  "zoom_out": "ซูมออก",
+  "welcome": "ยินดีต้อนรับสู่",
+  "back": "ย้อนกลับ",
+  "next": "ถัดไป",
+  "finish": "เสร็จสิ้น",
+  "start_tutorial": "เริ่มการสอน",
+  "view_profile": "ดูโปรไฟล์",
+  "login_optional": "เข้าสู่ระบบ (ไม่จำเป็น)",
+  "tutorial": "การสอน",
+  "tutorial_language": "เลือกภาษาของคุณ",
+  "tutorial_welcome": "การสอนนี้เป็นการโต้ตอบและคุณได้รับการสนับสนุนอย่างยิ่งให้เล่นกับตัวเลือกที่ให้ไว้ทั้งหมด",
+  "tutorial_categories": "หมวดหมู่ที่คุณเข้าถึงได้",
+  "tutorial_logged_in": "คุณสามารถดูรายละเอียดเกี่ยวกับสิทธิ์ของคุณโดยการดูโปรไฟล์ของคุณ",
+  "tutorial_logged_out": "คุณสามารถดูรายละเอียดเกี่ยวกับสิทธิ์ของคุณโดยการเข้าสู่ระบบ",
+  "tutorial_sidebar_0": "ตัวกรองและการตั้งค่าทั้งหมดของคุณอยู่ที่นี่",
+  "tutorial_sidebar_1": "สำหรับแต่ละหมวดหมู่คุณสามารถเลือกข้อมูลที่คุณต้องการได้ด้วยการเปิดหรือปิดสวิตช์",
+  "tutorial_sidebar_2": "ตัวเลือก: การปรับแต่งเพิ่มเติม\nขั้นสูง: เราจะครอบคลุมในส่วนถัดไปของบทเรียนนี้",
+  "tutorial_sliders_0": "การใช้สไลเดอร์เพื่อปรับตัวกรอง",
+  "tutorial_sliders_1": "โปเกมอนระหว่าง:",
+  "tutorial_sliders_2": "- IVs {{iv0}}% ถึง {{iv1}}%",
+  "tutorial_sliders_3": "ระดับ {{level0}} ถึง {{level1}}",
+  "tutorial_sliders_3alt": "- และเป็นระดับ {{level0}} ถึง {{level1}}",
+  "tutorial_sliders_4": "- อันดับในลีกเกรท {{gl0}} ถึง {{gl1}}",
+  "tutorial_sliders_4alt": "- หรืออันดับในลีกเกรท {{gl0}} ถึง {{gl1}}",
+  "tutorial_sliders_5": "- อันดับในลีกอัลตร้า {{ul0}} ถึง {{ul1}}",
+  "tutorial_sliders_5alt": "- หรืออันดับในลีกอัลตร้า {{ul0}} ถึง {{ul1}}",
+  "tutorial_sliders_6": "เชื่อมโยงกับสีเดียวกัน",
+  "tutorial_sliders_7": "ตัวกรองแยกต่างหากจากสไลเดอร์อื่น ๆ",
+  "tutorial_sliders_8": "สไลเดอร์ที่ 'เต็ม' หมายถึงว่าถูกปิดใช้งาน:",
+  "tutorial_sliders_9": "การปรากฏของทุกสายพันธุ์, ไม่ว่าจะผ่านการตรวจสอบ IV หรือไม่",
+  "tutorial_help": "ทางลัดไปยังเมนูนี้",
+  "tutorial_adv_filter": "เฉพาะบนมือถือ, เปิดตัวเลือกการกรองสำหรับเมนูขั้นสูง",
+  "tutorial_tune": "ตั้งค่าตัวกรองขั้นสูงสำหรับโปเกมอนทั้งหมดที่กำลังถูกกรองในเมนู",
+  "tutorial_format_size": "ตั้งค่าขนาดไอคอนสำหรับรายการทั้งหมดที่กำลังถูกกรองในเมนู",
+  "tutorial_check": "เปิดใช้งานรายการทั้งหมดที่กำลังถูกกรองในเมนู",
+  "tutorial_clear": "ปิดใช้งานรายการทั้งหมดที่กำลังถูกกรองในเมนู",
+  "tutorial_save": "บันทึกการเลือกปัจจุบันและออก",
+  "tutorial_show_all_view": "เปลี่ยนแปลงการแสดงผล PokéStops & Gyms",
+  "tutorial_show_pokemon_view": "เปลี่ยนแปลงการแสดงผล Pokémon",
+  "tutorial_toggle": "การคลิก Check/X เป็นการสลับรายการ",
+  "tutorial_pokemon_caption": "ไอคอนนี้ช่วยให้คุณตั้งค่าตัวกรองสำหรับโปเกมอนนั้นๆ",
+  "tutorial_all_caption": "ทีมมีเมนูช่องพิเศษ\nรายการอื่นๆ ช่วยให้คุณปรับขนาดไอคอน",
+  "tutorial_popup_0": "ป๊อปอัพตอนนี้สามารถตอบสนองได้!",
+  "tutorial_popup_1": "สามจุดเปิดตัวเลือกการซ่อน, ยกเว้น, และสลับตัวจับเวลา",
+  "tutorial_popup_2": "ไอคอนที่อยู่ทั้งสองข้างลิงก์นำทางจะขยายเพื่อแสดงข้อมูลเพิ่มเติม, ลองดูสิ!",
+  "tutorial_popup_3": "ไอคอนแตกต่างกันไปในแต่ละหมวดหมู่, อย่าลืมตรวจสอบทั้งหมด",
+  "tutorial_closing_0": "ข้อมูลเพิ่มเติม",
+  "tutorial_closing_1": "สไลเดอร์โปเกมอนทั่วโลกในแถบด้านข้างทำงานแยกต่างหากจากเมนูขั้นสูงและไม่มีผลกระทบต่อกัน",
+  "tutorial_closing_2": "อย่าลืมตรวจสอบส่วนการตั้งค่าในแถบด้านข้าง",
+  "tutorial_closing_3": "มีตัวเลือกทางด้านความสวยงามมากมายสำหรับแต่ละหมวดหมู่, แต่จำไว้ว่ายิ่งคุณเพิ่มลงในแมพของคุณ, โอกาสที่แมพของคุณจะค้างก็ยิ่งสูงขึ้น",
+  "tutorial_closing_4": "คุณสามารถดูบทเรียนนี้อีกครั้งโดยการเลือกในแผงการตั้งค่าในแถบด้านข้าง",
+  "tutorial_closing_5": "รักษาสุขภาพและโชคดี!",
+  "intro": "บทนำ",
+  "sidebar": "แถบด้านข้าง",
+  "sliders": "สไลเดอร์",
+  "popups": "ป๊อปอัพ",
+  "closing": "สิ้นสุด",
+  "shortcuts": "ทางลัด",
+  "iv": "IV",
+  "area_restrictions": "การจำกัดพื้นที่",
+  "map": "แมพ",
+  "stats": "สถิติ",
+  "pvp": "PVP",
+  "area_restrictions_subtitle": "คุณมีสิทธิ์เข้าถึงพื้นที่เหล่านี้",
+  "devices_subtitle": "แสดงตำแหน่งและเส้นทางของอุปกรณ์ที่กำลังใช้งาน",
+  "gyms_subtitle": "แสดงตำแหน่งยิมที่กำลังใช้งาน, ทีมที่ครอง, และช่องว่างที่แต่ละยิมมี",
+  "invasions_subtitle": "แสดงข้อมูลการรุกรานของทีมโรเก็ต, รวมถึงไลน์อัพการต่อสู้, เวลาหมดอายุ, และรางวัลที่เป็นไปได้",
+  "iv_subtitle": "แสดง IV% และตัวเลือกแสงเรืองแสง",
+  "lures_subtitle": "แสดงข้อมูลล่อ, รวมถึงประเภทของล่อและเวลาหมดอายุ",
+  "map_subtitle": "แสดงแมพ",
+  "nests_subtitle": "แสดงโปเกมอนที่ทำรังอยู่และรูปปิดรัง",
+  "pokemon_subtitle": "แสดงตำแหน่งโปเกมอนทั้งหมดและเวลาหมดอายุ",
+  "pokestops_subtitle": "แสดงตำแหน่ง PokéStop ทั้งหมด",
+  "portals_subtitle": "แสดงพอร์ทัล Ingress ทั้งหมด",
+  "pvp_subtitle": "แสดงข้อมูลอันดับ PVP/CP/ระดับ สำหรับแต่ละโปเกมอน",
+  "quests_subtitle": "แสดงข้อมูลรางวัลและภารกิจ",
+  "raids_subtitle": "แสดงข้อมูลการโจมตีทั้งหมด รวมถึงบอสในการโจมตี, ไข่, เวลาหมดอายุ และชุดการเคลื่อนไหว",
+  "scan_cells_subtitle": "แสดงเวลาที่เซลล์ S2 ถูกแสกนครั้งสุดท้ายโดยอุปกรณ์",
+  "scan_areas_subtitle": "แสดงพื้นที่สแกนที่มีอยู่",
+  "spawnpoints_subtitle": "แสดงจุดเกิดและเวลาโดยประมาณที่จะหายไป",
+  "stats_subtitle": "แสดงสถิติและระดับของโปเกมอน",
+  "submission_cells_subtitle": "แสดงข้อมูลที่มีประโยชน์สำหรับการเสนอ POI ใหม่",
+  "weather_subtitle": "แสดงข้อมูลอากาศในเกมสำหรับแต่ละเซลล์",
+  "scanner_subtitle": "โต้ตอบโดยตรงกับเครื่องสแกนในหลายวิธี",
+  "s2cells_subtitle": "แสดงเซลล์ S2 ในหลายชั้นบนแผนที่",
+  "backups_subtitle": "เปิดใช้งานการสำรองและโหลดการตั้งค่าข้ามอุปกรณ์",
+  "backups": "การสำรองข้อมูล",
+  "user_profile": "โปรไฟล์ผู้ใช้",
+  "user_username": "ชื่อผู้ใช้",
+  "candy": "ลูกอม",
+  "show_ex_badge": "แสดงเหรียญ EX",
+  "search": "ค้นหา",
+  "global_search_quests": "ใส่ชื่อรางวัล...",
+  "global_search_lures": "ใส่ชื่อล่อ...",
+  "global_search_pokestops": "ใส่ชื่อป้ายโปเกสตอป...",
+  "global_search_gyms": "ใส่ชื่อยิม...",
+  "global_search_portals": "ใส่ชื่อพอร์ทัล...",
+  "global_search_nests": "ใส่ชื่อโปเกมอนที่รัง...",
+  "global_search_raids": "ใส่ชื่อบอสการโจมตี...",
+  "global_search_pokemon": "ใส่ชื่อโปเกมอน...",
+  "global_search_invasions": "ใส่ประเภทมาร, ชื่อ, หรือชื่อรางวัลโปเกมอน...",
+  "raid_level_badges": "เหรียญระดับการโจมตี",
+  "options": "ตัวเลือก",
+  "profile": "โปรไฟล์",
+  "pokemon_icons": "ไอคอนโปเกมอน",
+  "pokestop_icons": "ไอคอนโปเกสตอป",
+  "gym_icons": "ไอคอนยิม",
+  "team_icons": "ไอคอนทีม",
+  "egg_icons": "ไอคอนไข่",
+  "raid_icons": "ไอคอนการโจมตี",
+  "nest_icons": "ไอคอนรัง",
+  "reward_icons": "ไอคอนรางวัล",
+  "type_icons": "ไอคอนประเภท",
+  "weather_icons": "ไอคอนอากาศ",
+  "misc_icons": "ไอคอนอื่นๆ",
+  "invasion_icons": "ไอคอนการบุกรุก",
+  "spawnpoint_icons": "ไอคอนจุดเกิด",
+  "device_icons": "ไอคอนอุปกรณ์",
+  "pokemon_audio": "เสียงโปเกมอน",
+  "pokestop_audio": "เสียงโปเกสตอป",
+  "gym_audio": "เสียงยิม",
+  "team_audio": "เสียงทีม",
+  "egg_audio": "เสียงไข่",
+  "raid_audio": "เสียงการโจมตี",
+  "nest_audio": "เสียงรัง",
+  "reward_audio": "เสียงรางวัล",
+  "type_audio": "เสียงประเภท",
+  "weather_audio": "เสียงอากาศ",
+  "misc_audio": "เสียงอื่นๆ",
+  "invasion_audio": "เสียงการบุกรุก",
+  "spawnpoint_audio": "เสียงจุดเกิด",
+  "device_audio": "เสียงอุปกรณ์",
+  "pokemon_timers": "ตัวจับเวลาโปเกมอนทั้งหมด",
+  "show_dex_num_in_popup": "แสดงเลข Pokedex ในป็อปอัป",
+  "popup": "ป็อปอัป",
+  "pvp_level": "สถิติ PVP ระดับ {{level}}",
+  "pvp_mega": "สถิติ PVP เมก้า",
+  "webhook_entry": "เพิ่มใน {{name}}",
+  "remove_webhook_entry": "ลบออกจาก {{name}}",
+  "distance": "ระยะทาง",
+  "gym": "ยิม",
+  "egg": "ไข่",
+  "raid": "การโจมตี",
+  "lure": "ล่อ",
+  "quest": "ภารกิจ",
+  "invasion": "การบุกรุก",
+  "nest": "รัง",
+  "pokestop": "ป้ายโปเกสตอป",
+  "team": "ทีม",
+  "global": "ทั่วไป",
+  "manage_webhook": "จัดการ {{name}}",
+  "drag_and_drop": "ลากและวางเครื่องหมายเพื่อตั้งค่าตำแหน่งของคุณ",
+  "click_to_select": "คลิกเพื่อเลือก",
+  "add_new": "เพิ่มการแจ้งเตือน{{category}}ใหม่",
+  "my_location": "ตำแหน่งของฉัน",
+  "choose_on_map": "เลือกบนแผนที่",
+  "select_profile": "เลือกโปรไฟล์",
+  "distance_radius": "พรีวิวรัศมีระยะทาง",
+  "areas": "พื้นที่",
+  "select_webhook": "เลือก Bot",
+  "ar_quest_true": "ภารกิจ AR",
+  "ar_quest_false": "ไม่มี AR",
+  "with_ar": "มี AR",
+  "both": "ทั้งสอง",
+  "without_ar": "ไม่ใช้ AR",
+  "exclude_quest_multi": "ไม่รวม {{reward}}",
+  "cluster_limit_0": "จำกัด {{variable_0}} ({{variable_1}}) ถูกบรรลุแล้ว",
+  "cluster_limit_1": "กรุณาซูมเข้าหรือจำกัดตัวกรอง",
+  "show_polygons": "แสดงโพลีกอน",
+  "exclude_invasion_multi": "ไม่รวมการรุกราน {{invasion}}",
+  "stardust": "สตาร์ดัสต์",
+  "slider_cp": "CP",
+  "pvp_ranking_league": "ลีก",
+  "pvp_ranking_min_cp": "CP ต่ำสุด",
+  "slider_pvp": "อันดับ",
+  "profile_no": "โปรไฟล์",
+  "template": "เทมเพลต",
+  "gender": "เพศ",
+  "clean": "ล้าง",
+  "all_forms": "ทุกฟอร์ม",
+  "pvp_entry": "รายการ PVP",
+  "no_iv": "Incl. No IV",
+  "by_distance": "โดยระยะทาง",
+  "min_time": "เวลาขั้นต่ำ",
+  "add_new_profile": "เพิ่มโปรไฟล์ใหม่",
+  "slider_none": "ไม่มี",
+  "non_registered_human_title": "อุปส์, บางอย่างไม่ถูกต้อง!",
+  "non_registered_human_desc": "คุณอาจจะไม่ได้ลงทะเบียนกับ {{webhook}}\nหรือเซิร์ฟเวอร์ไม่สามารถเชื่อมต่อได้ในขณะนี้",
+  "try_again_later": "กรุณาลองอีกครั้งในภายหลัง",
+  "selected_areas_one": "เลือก {{count}} พื้นที่",
+  "selected_areas_other": "เลือก {{count}} พื้นที่",
+  "webhook_selection": "การเลือก {{name}}",
+  "message_of_the_day": "ข้อความประจำวัน",
+  "has_quest_indicator": "สีเลือกสำหรับจุดที่มีเควส",
+  "show_ar_badge": "แสดงแบดจ์ AR",
+  "all_gyms": "ยิมทั้งหมด",
+  "general": "ทั่วไป",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "การเลือกทั่วโลกที่เลือกไว้",
+  "normal_forms": "ฟอร์มปกติ",
+  "weather_indicator": "ตัวบ่งชี้สภาพอากาศเพิ่มพลัง",
+  "page": "หน้า {{page}}",
+  "navigation_controls": "ควบคุมนำทาง",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
+  "exclusive": "พิเศษ",
+  "all_moves": "ทุกการเคลื่อนไหว",
+  "move": "วิธีการเคลื่อนไหว",
+  "any": "ทุก",
+  "min_spawn_average": "อัตราการปรากฏต่ำสุด",
+  "select_all": "เลือกทั้งหมด",
+  "delete_all": "ลบที่เลือก",
+  "cancel": "ยกเลิก",
+  "day_1": "วันจันทร์",
+  "day_2": "วันอังคาร",
+  "day_3": "วันพุธ",
+  "day_4": "วันพฤหัสบดี",
+  "day_5": "วันศุกร์",
+  "day_6": "วันเสาร์",
+  "day_7": "วันอาทิตย์",
+  "profile_name": "ชื่อโปรไฟล์",
+  "manage_profiles": "จัดการโปรไฟล์",
+  "min_spawn_avg": "อัตราการปรากฏโดยเฉลี่ยต่ำ",
+  "poke_global": "ทุกอย่าง",
+  "amount": "จำนวน",
+  "specific_gym": "ยิมเฉพาะ",
+  "search_location": "ค้นหาสถานที่",
+  "search_specific": "ค้นหา {{category}} เฉพาะ",
+  "webhook_success_gym": "การแจ้งเตือนการโจมตี, ไข่, และการเปลี่ยนทีมได้ถูกเพิ่ม!",
+  "slot_changes": "การเปลี่ยนช่อง",
+  "slot_changes_poracle": "การเปลี่ยนช่อง",
+  "confirm_delete": "จะลบการติดตามทั้งหมดสำหรับโปรไฟล์นี้, คุณแน่ใจหรือไม่?",
+  "confirm_copy": "เลือกโปรไฟล์ที่คุณต้องการคัดลอก \"{{profile}}\" มาที่นี่, จะเขียนทับโปรไฟล์นั้นทั้งหมด.",
+  "webhook_error": "{{name}} ไม่สามารถประมวลผลได้.\nกรุณาลองอีกครั้งในภายหลัง.",
+  "profile_error": "ต้องเป็นชื่อที่ไม่ซ้ำและถูกต้อง",
+  "team_0": "ฮาร์โมนี",
+  "battle_changes": "ในการต่อสู้",
+  "battle_changes_poracle": "การเปลี่ยนแปลงการต่อสู้",
+  "auto": "อัตโนมัติ",
+  "webhooks_subtitle": "จัดการการแจ้งเตือนของคุณโดยตรงจากแผนที่สำหรับบอทเหล่านี้",
+  "event_stops_subtitle": "แสดง Pokéstops ของกิจกรรมพิเศษเช่น Kecleon",
+  "webhooks": "การแจ้งเตือน",
+  "scanner": "การกระทำของสแกนเนอร์",
+  "everything_individually": "เพิ่มการแจ้งเตือนแต่ละอย่าง",
+  "individually": "แยก",
+  "join": "เข้าร่วม",
+  "errors_404": "อุปส์, ไม่พบหน้านี้!",
+  "errors_500": "เกิดข้อผิดพลาดของเซิร์ฟเวอร์, กรุณาลองอีกครั้งในภายหลัง!",
+  "local_username": "ชื่อผู้ใช้",
+  "local_password": "รหัสผ่าน",
+  "local_error": "เกิดข้อผิดพลาด, กรุณาลองอีกครั้งในภายหลัง!",
+  "no_filter_results": "ไม่พบผลลัพธ์\nลองขยายตัวกรองของคุณ",
+  "donor_page": "หน้าผู้บริจาค",
+  "go_back": "กลับไป",
+  "access": "เข้าถึง",
+  "link_discord": "เชื่อมต่อ Discord",
+  "select_webhook_strategy": "จัดการการแจ้งเตือน",
+  "webhook_strategy_success_0": "สำเร็จ! กำลังรีเฟรชเพื่อดึงการตั้งค่าการแจ้งเตือน...",
+  "register": "ลงทะเบียน",
+  "invalid_credentials": "ข้อมูลไม่ถูกต้อง",
+  "localauth_failed": "การยืนยันตัวตนล้มเหลว",
+  "error_creating_user": "ไม่สามารถลงทะเบียนผู้ใช้ใหม่ได้ในขณะนี้",
+  "discord_linked": "เชื่อมต่อกับ Discord แล้ว",
+  "telegram_linked": "เชื่อมต่อกับ Telegram แล้ว",
+  "level": "ระดับ",
+  "km": "กิโลเมตร",
+  "feedback": "ข้อเสนอแนะ",
+  "donor_menu": "เมนูผู้บริจาค",
+  "pokemon_cell": "ตำแหน่งของโปเกมอนอาจมีความแตกต่าง",
+  "timer_verified": "ตัวจับเวลานี้ได้รับการยืนยันแล้ว",
+  "timer_unverified": "ตัวจับเวลานี้ยังไม่ได้รับการยืนยัน",
+  "all": "ทั้งหมด",
+  "badge_0": "ไม่มี",
+  "badge_1": "ทองแดง",
+  "badge_2": "เงิน",
+  "badge_3": "ทอง",
+  "gym_badge_menu": "แก้ไขเหรียญยิม",
+  "gym_badges": "เหรียญยิม",
+  "gym_badge_diamonds": "แสดงเหรียญยิม",
+  "gym_badges_subtitle": "แสดงเหรียญยิมบนแผนที่และในหน้าโปรไฟล์",
+  "confirm_filters_reset": "รีเซ็ตตัวกรอง",
+  "filters_reset_text": "คุณแน่ใจหรือไม่ที่จะรีเซ็ตการตั้งค่าเป็นค่าเริ่มต้น? ไม่สามารถยกเลิกได้!",
+  "filters_reset_title": "รีเซ็ตตัวกรอง",
+  "raid_quick_select": "เลือกอย่างรวดเร็ว",
+  "disabled": "ปิดการใช้งาน",
+  "loading": "กำลังโหลด {{category}}",
+  "loading_icons": "กำลังดึงไอคอน",
+  "loading_invasions": "กำลังดึงข้อมูลการบุกรุก",
+  "scan_next": "สแกนที่ตั้งถัดไป",
+  "scan_next_choose": "ลากและวางเครื่องหมายเพื่อตั้งที่ตั้งการสแกน",
+  "scan_zone": "สแกนพื้นที่",
+  "scan_zone_choose": "ลากและวางเครื่องหมายเพื่อตั้งที่ตั้งการสแกนและเลือกขนาด",
+  "scan_zone_size": "ขนาด",
+  "scan_zone_range": "ระยะทาง",
+  "scan_zone_spacing": "ระยะห่าง",
+  "scan_zone_radius": "รัศมี",
+  "scan_requests": "คำขอสแกน",
+  "scan_queue": "คิวปัจจุบัน",
+  "click_to_scan": "สแกนที่นี่",
+  "scan_confirmed_title": "ยืนยันความต้องการสแกน",
+  "scan_confirmed": "คนงานได้ถูกส่งไปยังที่ตั้ง, ผลลัพธ์จะปรากฏบนแผนที่เร็วๆ นี้!",
+  "scan_loading_title": "กำลังส่งคำขอสแกน",
+  "scan_loading": "คำขอสแกนของคุณกำลังถูกประมวลผลและส่งไปยังระบบ!",
+  "scan_error_title": "ข้อผิดพลาด",
+  "scan_error": "มีข้อผิดพลาดขณะประมวลผลคำขอสแกน...",
+  "scan_outside_area": "ที่ตั้งนี้อยู่นอกขอบเขตพื้นที่ที่ได้รับอนุญาต",
+  "pvp_ranking_cap": "ระดับ",
+  "lc_title": "ติดตามตำแหน่งของคุณ",
+  "lc_metersUnit": "เมตร",
+  "lc_feetUnit": "ฟุต",
+  "lc_popup": "คุณอยู่ห่างจากจุดนี้ {distance} {unit}",
+  "lc_outsideMapBoundsMsg": "คุณอยู่นอกขอบเขตของแผนที่",
+  "no_alerts": "ไม่พบการแจ้งเตือน",
+  "loading_settings": "กำลังโหลดการตั้งค่า",
+  "refresh_to_continue": "กรุณารีเฟรชก่อนที่จะดำเนินการต่อ",
+  "session_expired_title": "เซสชันหมดอายุ",
+  "session_expired_body": "เซสชันของคุณหมดอายุแล้ว",
+  "old_client_title": "ล้าสมัย",
+  "old_client_body": "มีเวอร์ชันใหม่ของแผนที่นี้มากว่าที่คุณกำลังใช้",
+  "early_old_client_title": "ล้าสมัย",
+  "early_old_client_body": "อาจมีเวอร์ชันเก่าของแอปนี้ที่ถูกแคชไว้ในเบราว์เซอร์ของคุณ, คุณจำเป็นต้องล้างแคชก่อนที่คุณจะสามารถใช้แอปนี้ได้.",
+  "refresh": "รีเฟรช",
+  "points": "คะแนน",
+  "day": "วัน",
+  "days": "วัน",
+  "react_error": "เกิดข้อผิดพลาดบางอย่าง",
+  "clickable_icon": "ไอคอนที่คลิกได้",
+  "two_stops_till_next": "2 สถานีถัดไป",
+  "one_stop_till_next": "1 สถานีถัดไป",
+  "no_more_gyms": "ไม่มียิมเพิ่มเติม",
+  "light_map_border": "ขอบแผนที่สว่าง",
+  "dark_map_border": "ขอบแผนที่เข้ม",
+  "cell_blocked": "บล็อคเซลล์",
+  "poi_color": "สีจุดที่น่าสนใจ",
+  "quest_condition": "เงื่อนไขภารกิจ",
+  "always_show_labels": "แสดงป้ายกำกับเสมอ",
+  "scan_areas_options": "ตัวเลือกพื้นที่สแกน",
+  "historic_rarity": "ความหายากประวัติศาสตร์",
+  "poi": "จุดที่น่าสนใจ",
+  "300m_range": "ระยะ 300m",
+  "lure_range": "ระยะของเหยื่อ",
+  "custom_range": "ระยะกำหนดเอง",
+  "tap_to_toggle": "แตะเพื่อสลับ",
+  "power_up": "เพิ่มพลัง",
+  "never_alt": "ไม่เคย",
+  "seen_nearby_stop": "พบใกล้ป้าย",
+  "seen_nearby_cell": "พบในช่องนี้",
+  "seen_lure_encounter": "พบจากเหยื่อ",
+  "seen_lure_wild": "เหยื่อสร้าง",
+  "seen_wild": "พบในธรรมชาติ",
+  "event_stops": "ป้ายกิจกรรม",
+  "event_stop_timers": "ตัวจับเวลาป้ายกิจกรรม",
+  "size_0": "ทุกขนาด",
+  "size_1": "XXS",
+  "size_2": "XS",
+  "size_3": "M",
+  "size_4": "XL",
+  "size_5": "XXL",
+  "show_size_indicator": "แสดงตัวบ่งชี้ขนาด",
+  "size": "ขนาด",
+  "gold_stop": "ป้ายโกลด์",
+  "profile_backups": "สลับโปรไฟล์",
+  "new_backup": "สำรองข้อมูลใหม่",
+  "create": "สร้าง",
+  "load": "โหลด",
+  "update": "อัปเดต",
+  "delete": "ลบ",
+  "name": "ชื่อ",
+  "only_confirmed": "เฉพาะที่ยืนยันแล้ว",
+  "rocket_pokemon": "โปเกมอนทีม Rocket",
+  "decoy": "เหยื่อล่อ",
+  "s2_cell_limit_0": "คุณพยายามสร้างเซลล์มากกว่า 20,000 เซลล์ ({{variable_0}})",
+  "show_all_pvp_ranks": "แสดงอันดับ PVP ทั้งหมด",
+  "enable_pokemon_popup_coords": "แสดงพิกัดโปเกมอน",
+  "enable_gym_popup_coords": "แสดงพิกัดยิม",
+  "enable_pokestop_popup_coords": "แสดงพิกัดป้าย",
+  "enable_portal_popup_coords": "แสดงพิกัดพอร์ทัล",
+  "on_block_join_discord": "กรุณาเข้าร่วมดิสคอร์ดของเราเพื่อข้อมูลเพิ่มเติม",
+  "on_block_msg": "คุณถูกบล็อกเนื่องจากเป็นสมาชิกของ",
+  "denied": "ถูกปฏิเสธ",
+  "showcase": "แสดง",
+  "unknown_event": "กิจกรรมไม่ทราบชื่อ",
+  "scanner_countdown": "พร้อมในอีก {{time}}s",
+  "success": "สำเร็จ",
+  "contribute": "มีส่วนร่วม",
+  "mi": "ไมล์",
+  "filter_by_areas": "กรองตามพื้นที่",
+  "submit_nest_name": "ส่งชื่อรัง",
+  "nest_submission_menu": "อัปเดตชื่อ",
+  "nest_submissions": "ส่งชื่อรัง",
+  "nest_submissions_subtitle": "อนุญาตให้คุณส่งชื่อใหม่สำหรับรัง",
+  "pokemon_opacity": "ความทึบแสงของโปเกมอน",
+  "invasion_opacity": "ความทึบแสงของการบุกรุก",
+  "raid_opacity": "ความทึบแสงของการเรด",
+  "opacity_ten_minutes": "ความทึบแสงที่ 10 นาที",
+  "opacity_five_minutes": "ความทึบแสงที่ 5 นาที",
+  "opacity_one_minute": "ความทึบแสงที่ 1 นาที",
+  "level_circles": "ตัวบ่งชี้ระดับ",
+  "min_level_circle": "ระดับวงกลมต่ำสุด",
+  "mutation_auth_error": "คำขอของคุณไม่สำเร็จเนื่องจากคุณไม่ได้เข้าสู่ระบบ",
   "submitted_by": "ส่งโดย",
-  "localauth_failed": "การรับรองความถูกต้องล้มเหลว",
-  "reversible": "สามารถกลับได้",
+  "reversible": "สามารถย้อนกลับได้",
   "version": "เวอร์ชัน",
   "route_tags": "แท็กเส้นทาง",
   "routes": "เส้นทาง",
-  "route_type": "ประเภทของเส้นทาง",
-  "routes_subtitle": "ดูเส้นทางในเกมและข้อมูลที่เกี่ยวข้องเกี่ยวกับเส้นทางบนแผนที่",
+  "route_type": "ประเภทเส้นทาง",
+  "routes_subtitle": "ดูเส้นทางและข้อมูลที่เกี่ยวข้องในเกมบนแผนที่",
   "description": "คำอธิบาย",
   "additional_info": "ข้อมูลเพิ่มเติม",
   "duration": "ระยะเวลา",
-  "elevation": "ระดับความสูง",
+  "elevation": "ความสูง",
   "contest_category_1": "ขนาดเล็กที่สุด",
   "context_category_2": "ขนาดใหญ่ที่สุด",
-  "total_entries": "รายการทั้งหมด",
-  "showcase_rankings": "การจัดอันดับแสดงผลงาน",
-  "showcase_rankings_subtitle": "แสดงรายการอันดับสูงสุดสำหรับการแสดงผลงานที่ Pokestop",
+  "total_entries": "จำนวนการเข้าร่วมทั้งหมด",
+  "showcase_rankings": "แสดงอันดับ",
+  "showcase_rankings_subtitle": "แสดงรายการอันดับสูงสุดสำหรับการแสดงผลที่ป้าย",
   "tth": "TTH",
   "tth_0": "ทั้งหมด",
   "tth_1": "ที่รู้จัก",
-  "tth_2": "ที่ไม่รู้จัก",
-  "no_access": "ไม่สามารถเข้าถึงได้",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": "เข้าสู่ระบบ",
-  "join_button": "เข้าร่วม",
-  "cooldown": "รอระหว่างนับ Cooldown",
-  "scan_some_outside_area": "บางสถานที่อยู่นอกขอบเขตที่ได้รับอนุญาต",
-  "alerts": "แจ้งเตือน",
-  "alert_manager": "ผู้จัดการแจ้งเตือน",
+  "tth_2": "ไม่ทราบ",
+  "no_access": "ไม่มีสิทธิการเข้าถึง",
+  "cooldown": "เวลาหยุดพัก",
+  "scan_some_outside_area": "บางตำแหน่งอยู่นอกขอบเขตที่ได้รับอนุญาต",
+  "alerts": "การแจ้งเตือน",
+  "alert_manager": "การจัดการการแจ้งเตือน",
   "menu": "เมนู",
-  "theme": "รูปแบบ",
+  "theme": "ธีม",
   "exit": "ออก",
-  "component": "คอมโพเนนต์",
+  "component": "ส่วนประกอบ",
   "component_login_page": "หน้าเข้าสู่ระบบ",
   "component_donation_page": "หน้าบริจาค",
   "component_message_of_the_day": "ข้อความประจำวัน",
   "download": "ดาวน์โหลด",
-  "playground": "ลานเล่น",
+  "playground": "สนามเด็กเล่น",
   "locale": "ภาษา",
   "saved": "บันทึกแล้ว",
-  "show_editor": "แสดงเอดิเตอร์",
-  "hide_editor": "ซ่อนเอดิเตอร์",
-  "reported_error": "ข้อผิดพลาดนี้ได้รับการรายงานให้กับเซิร์ฟเวอร์ด้วยรหัส",
-  "dark_mode": "โหมดกลางคืน",
+  "show_editor": "แสดงตัวแก้ไข",
+  "hide_editor": "ซ่อนตัวแก้ไข",
+  "reported_error": "ข้อผิดพลาดนี้ได้รับการรายงานไปยังเซิร์ฟเวอร์พร้อมด้วยรหัสประจำตัว",
+  "dark_mode": "โหมดมืด",
   "load_from_autosave": "โหลดจากการบันทึกอัตโนมัติ",
   "done": "เสร็จสิ้น",
-  "fast": "เร็ว",
-  "charged": "ชาร์จแล้ว",
+  "fast": "ฟาสต์",
+  "charged": "ชาร์จ",
   "offline_mode": "โหมดออฟไลน์",
-  "include_sponsored": "รวมการโฆษณาสปอนเซอร์",
-  "showcase_color": "สีโปรไฟล์ร้านค้า",
+  "include_sponsored": "รวมสปอนเซอร์",
+  "showcase_color": "สีแสดง",
   "partner_color": "สีพันธมิตร",
   "disable": "ปิดใช้งาน {{- name}}",
-  "profiling": "การทำโปรไฟล์",
-  "showcase_block": "ถูกบล็อกเนื่องจากโปรไฟล์ร้านค้า",
-  "import": "นำเข้า",
+  "profiling": "โปรไฟลิง",
+  "showcase_block": "บล็อกเนื่องจากการแสดง",
   "signed_in_as": "เข้าสู่ระบบเป็น",
-  "missing_map_perm": "คุณไม่ได้รับอนุญาตให้ดูแผนที่",
-  "pokemon_audio": "เสียงโปเกมอน",
-  "pokestop_audio": "เสียงโปเกมอนสโตป",
-  "gym_audio": "เสียงโปเกมอนยิม",
-  "team_audio": "เสียงโปเกมอนทีม",
-  "egg_audio": "เสียงโปเกมอนไข่",
-  "raid_audio": "เสียงโปเกมอนเรด",
-  "nest_audio": "เสียงโปเกมอนบริเวณมีเล้านิสิต",
-  "reward_audio": "เสียงโปเกมอนรางวัล",
-  "type_audio": "เสียงโปเกมอนประเภท",
-  "weather_audio": "เสียงโปเกมอนสภาพอากาศ",
-  "misc_audio": "เสียงโปเกมอนเบ็ดเตล็ด",
-  "invasion_audio": "เสียงโปเกมอนการรุกราน",
-  "spawnpoint_audio": "เสียงโปเกมอนจุดเกิด",
-  "device_audio": "เสียงอุปกรณ์",
-  "access_denied": "ไม่อนุญาต",
+  "missing_map_perm": "คุณไม่มีสิทธิ์ดูแผนที่",
+  "access_denied": "การเข้าถึงถูกปฏิเสธ",
   "audio": "เสียง",
-  "desktop_notifications": "การแจ้งเตือนเดสก์ท็อป",
+  "desktop_notifications": "การแจ้งเตือนบนเดสก์ท็อป",
   "notifications_options": "ตัวเลือกการแจ้งเตือน",
-  "audio_always_on": "เสียงเล่นตลอดเวลา",
+  "audio_always_on": "เล่นเสียงตลอดเวลา",
   "volume_level": "ระดับเสียง",
   "notifications_status": "สถานะการแจ้งเตือน",
-  "granted": "ได้รับอนุญาต",
-  "global_search_invasions": "พิมพ์ชื่อปีศาจกรต์หรือลูกเล่นของแก๊ง...",
+  "granted": "อนุญาตแล้ว",
   "set_all": "ตั้งค่าทั้งหมด",
-  "set_filtered": "ตั้งค่าตามฟิลเตอร์",
-  "only_show_available": "แสดงเฉพาะที่ใช้งานได้",
+  "set_filtered": "ตั้งค่าตัวกรอง",
+  "only_show_available": "แสดงเฉพาะที่มี",
   "easy_mode": "โหมดง่าย",
-  "quick_select": "การเลือกที่เร็วทั่วแผนที่",
-  "pokemon_filter_mode": "โหมดตัวกรองปีศาจกรีส่วนตัว",
+  "quick_select": "เลือกเร็วทั่วโลก",
+  "pokemon_filter_mode": "โหมดกรองโปเกมอน",
   "basic": "พื้นฐาน",
-  "intermediate": "ระดับกลาง",
-  "expert": "ขั้นสูง",
-  "basic_description": "เลือกปีศาจกรีได้ง่าย และใช้ตัวกรองโลก",
-  "intermediate_description": "กำหนดตัวกรองถั่วเฉาโลกและตัวกรองต่อตัวปีศาจกรี (แบบดั้งเดิม)",
-  "expert_description": "ค้นหาปีศาจกรีแบบกำหนดเองสำหรับความกำหนดเองที่สุด",
+  "intermediate": "กลาง",
+  "expert": "ผู้เชี่ยวชาญ",
+  "basic_description": "เลือกโปเกมอนได้ง่ายและใช้ตัวกรองทั่วไป",
+  "intermediate_description": "ตั้งค่าตัวกรองทั่วไปและตัวกรองสำหรับแต่ละโปเกมอน (แบบดั้งเดิม)",
+  "expert_description": "คีย์คำค้นสำหรับการปรับแต่งมากที่สุด",
   "icon_size": "ขนาดไอคอน",
   "developer": "นักพัฒนา",
-  "raid_override": "การแทนที่ระบบนัดเลาะ",
-  "search_rocket_pokemon": "ค้นหาปีศาจกรีแก๊ง",
+  "raid_override": "การเข้าควบคุมการโจมตี",
+  "search_rocket_pokemon": "ค้นหาโปเกมอนของทีมโรเก็ต",
   "main": "หลัก",
-  "extra": "เพิ่มเติม",
+  "extra": "เสริม",
   "select": "เลือก",
   "searching": "กำลังค้นหา...",
-  "no_options": "ไม่มีตัวเลือก..."
+  "no_options": "ไม่มีตัวเลือก...",
+  "and": "และ",
+  "or": "หรือ",
+  "only_global": "เฉพาะทั่วถึงทั้งหมด",
+  "global_caption": "ไม่ทางตัวกรองอื่นๆ",
+  "global_and_individual": "ตัวกรองทั่วไปและเฉพาะตัว",
+  "gender_filters_all": "เพศใช้กับทั้งหมด",
+  "and_caption": "เชื่อมต่อกัน",
+  "or_caption": "กรองอย่างอิสระ",
+  "filter_help": "ช่วยเหลือตัวกรอง",
+  "kilometers": "กิโลเมตร",
+  "miles": "ไมล์",
+  "distance_unit": "หน่วยระยะทาง",
+  "data_management": "การจัดการข้อมูล",
+  "reset_or_manage_text": "คุณสามารถรีเซ็ตตัวกรองของคุณหมดเป็นครั้งคราว หรือคุณสามารถดูหน้าการจัดการข้อมูลซึ่งจะช่วยให้คุณรีเซ็ตหมวดหมู่แต่ละรายการ",
+  "reset_audio": "รีเซ็ตเสียง",
+  "reset_all": "รีเซ็ตทั้งหมด",
+  "reset_icons": "รีเซ็ตไอคอน",
+  "reset_position": "รีเซ็ตตำแหน่ง",
+  "reset_ui": "รีเซ็ต UI",
+  "reset_options": "รีเซ็ตตัวเลือก",
+  "reset_menus": "รีเซ็ตเมนู",
+  "reset_settings": "รีเซ็ตการตั้งค่า",
+  "reset_general_title": "ทั่วไป",
+  "reset_filters_title": "ตัวกรอง",
+  "reset_assets": "รีเซ็ตทรัพยากร",
+  "reset_pokemon": "รีเซ็ตโปเกมอน",
+  "reset_pokestops": "รีเซ็ตป้ายโปเกสต็อป",
+  "reset_gyms": "รีเซ็ตยิม",
+  "reset_nests": "รีเซ็ตที่พัก",
+  "reset_portals": "รีเซ็ตประตู",
+  "reset_routes": "รีเซ็ตเส้นทาง",
+  "reset_scan_areas": "รีเซ็ตพื้นที่สแกน",
+  "reset_scan_cells": "รีเซ็ตเซลสแกน",
+  "reset_devices": "รีเซ็ตอุปกรณ์",
+  "reset_weather": "รีเซ็ตสภาพอากาศ",
+  "reset_s2cells": "รีเซ็ตเซล S2",
+  "reset_spawnpoints": "รีเซ็ตจุดปรากฏ",
+  "reset_submission_cells": "รีเซ็ตเซลส่งข้อมูล",
+  "hisuian": "ฮิสุเอี้ยน",
+  "spacial_rend_range": "ระยะห่าง Spacial Rend"
 }
diff --git a/packages/locales/lib/generated/tr.json b/packages/locales/lib/generated/tr.json
index d069031b5..3b9139d44 100644
--- a/packages/locales/lib/generated/tr.json
+++ b/packages/locales/lib/generated/tr.json
@@ -1,69 +1,69 @@
 {
-  "login": "Giriş",
-  "click_once": "Sadece 'Yetkilendir' düğmesine bir kez tıklayın",
+  "login": "Giriş Yap",
+  "click_once": "'Yetkilendir' düğmesine sadece bir kez tıklayın",
   "save": "Kaydet",
   "reset": "Sıfırla",
   "close": "Kapat",
   "reset_filters": "Filtreleri Sıfırla",
   "pokemon_filters": "Pokémon Filtre Ayarları",
-  "gyms_filters": "Gym Filtre Ayarları",
+  "gyms_filters": "Spor Salonu Filtre Ayarları",
   "pokestops_filters": "PokéStop Filtre Ayarları",
   "nests_filters": "Yuva Filtre Ayarları",
   "help": "Yardım",
   "apply_to_all": "Tümüne Uygula",
   "disable_all": "Tümünü Devre Dışı Bırak",
-  "enable_all": "Tümünü Etkinleştir",
-  "enabled": "Etkin",
+  "enable_all": "Tümünü Aktif Et",
+  "enabled": "Aktif",
   "legacy": "Eski",
-  "id": "Kimlik",
+  "id": "ID",
   "location": "Konum",
   "search_pokemon": "Pokémon Ara",
-  "search_nests": "Yuva Ara",
-  "search_gyms": "Gym Ara",
-  "search_pokestops": "PokéStop Ara",
-  "search_raids": "Raid Ara",
-  "search_eggs": "Yumurta Ara",
-  "search_quests": "Görev Ara",
-  "search_lures": "Çekim Ara",
-  "search_invasions": "İstila Ara",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "search_nests": "Yuvaları Ara",
+  "search_gyms": "Spor Salonlarını Ara",
+  "search_pokestops": "PokéStop'ları Ara",
+  "search_raids": "Baskınları Ara",
+  "search_eggs": "Yumurtaları Ara",
+  "search_quests": "Görevleri Ara",
+  "search_lures": "Cezbedicileri Ara",
+  "search_invasions": "İstilaları Ara",
+  "sm": "kçk",
+  "md": "ort",
+  "lg": "büy",
+  "xl": "çbüy",
   "min": "Min",
-  "max": "Max",
+  "max": "Maks",
   "set_size": "Simge Boyutunu Ayarla",
   "slot_selection": "Yuva Seçimi",
   "generations": "Nesiller",
-  "types": "Türler",
+  "types": "Tipler",
   "forms": "Formlar",
-  "rarity": "Mevcut Seyreklik",
+  "rarity": "Mevcut Nadirlik",
   "others": "Diğerleri",
   "categories": "Kategoriler",
   "rank": "Sıralama",
   "slider_iv": "IV Aralığı",
-  "slider_great": "Harika Ligi",
-  "slider_ultra": "Ultra Ligi",
+  "slider_great": "Büyük Lig",
+  "slider_ultra": "Ultra Lig",
   "slider_little": "Küçük Kupa",
   "slider_atk_iv": "Saldırı",
   "slider_def_iv": "Savunma",
   "slider_sta_iv": "Dayanıklılık",
   "slider_level": "Seviye",
   "slider_size": "Boyut",
-  "abbreviation_level": "L",
+  "abbreviation_level": "S",
   "lvl": "Sev",
-  "cap": "Kap",
+  "cap": "Sınır",
   "custom": "Özel",
   "valid": "Geçerli",
   "invalid": "Geçersiz!",
   "overwrites": "Tüm Filtreleri Üzerine Yaz",
   "valid_filter": "Geçerli İstatistik Filtresi",
   "invalid_filter": "Geçerli Bir Filtre Girin",
-  "gyms": "Gymler",
+  "gyms": "Spor Salonları",
   "nests": "Yuvalar",
-  "pokestops": "PokéStoplar",
-  "pokemon": "Pokémonlar",
-  "wayfarer": "Wayfarer",
+  "pokestops": "PokéStop'lar",
+  "pokemon": "Pokémon",
+  "wayfarer": "Göçebe",
   "scan_areas": "Tarama Alanları",
   "s2cells": "S2 Hücreleri",
   "weather": "Hava Durumu",
@@ -71,54 +71,54 @@
   "settings": "Ayarlar",
   "advanced": "Gelişmiş",
   "tile_servers": "Döşeme Sunucuları",
-  "icons": "Simge",
+  "icons": "Simgeler",
   "navigation": "Navigasyon",
   "drawer": "Çekmece",
   "tile_servers_default": "Varsayılan",
   "drawer_temporary": "Geçici",
   "drawer_persistent": "Kalıcı",
-  "locale_selection": "Dil Seçimi",
+  "locale_selection": "Yerel Ayar Seçimi",
   "import": "İçe Aktar",
   "export": "Dışa Aktar",
   "logout": "Çıkış Yap",
   "local_storage_cleared": "Yerel Depolama Temizlendi!",
-  "iv_or_filter": "IV VEYA Filtre",
-  "polygons": "Çokgenler",
-  "raids": "Raidler",
+  "iv_or_filter": "IV YA DA Filtre",
+  "polygons": "Poligonlar",
+  "raids": "Baskınlar",
   "ex_eligible": "EX Uygun",
-  "in_battle": "Savaşta",
-  "all_pokestops": "Tüm PokéStoplar",
-  "lures": "Çekimler",
+  "in_battle": "Mücadelede",
+  "all_pokestops": "Tüm PokéStop'lar",
+  "lures": "Cezbediciler",
   "quests": "Görevler",
   "invasions": "İstilalar",
-  "portals": "Portal",
+  "portals": "Portallar",
   "submission_cells": "Gönderim Hücreleri",
-  "spawnpoint": "Yavru Noktaları",
-  "spawnpoints": "Yerler",
-  "s2_cell_level": "Seviye {{level}} S2 Hücresi",
-  "total_count": "Toplam Sayı",
+  "spawnpoint": "Belirme Noktası",
+  "spawnpoints": "Belirme Noktaları",
+  "s2_cell_level": "{{level}} Seviye S2 Hücresi",
+  "total_count": "Toplam Sayım",
   "next_submission": "Sonraki Gönderim!",
   "never": "Asla",
   "next_gym": "Sonraki Spor Salonu",
-  "scan_cells": "Hücreleri Tara",
+  "scan_cells": "Tarama Hücreleri",
   "devices": "Cihazlar",
   "use_my_location": "Konumumu Kullan",
-  "submit_feedback_title": "Geri Bildirim Gönder/Hata Raporu",
-  "use_the_link_below": "Karşılaştığınız hataları veya hataları göndermek için aşağıdaki bağlantıyı kullanabilirsiniz.",
-  "feedback_to_devs": "Bu geri bildirimler doğrudan geliştiricilere gönderilir.",
-  "feedback_form": "Geri Bildirim Formu",
+  "submit_feedback_title": "Geribildirim/Hata Raporu Gönder",
+  "use_the_link_below": "Aşağıdaki bağlantıyı geribildirim veya karşılaştığınız hataları göndermek için kullanabilirsiniz.",
+  "feedback_to_devs": "Bu geribildirim doğrudan geliştiricilere gönderilir.",
+  "feedback_form": "Geribildirim Formu",
   "unknown_pokestop": "Bilinmeyen PokéStop Adı",
   "unknown_gym": "Bilinmeyen Spor Salonu Adı",
-  "exclude": "Hariç Tut",
-  "exclude_quest": "Görevi Hariç Tut",
-  "exclude_invasion": "İstilayı Hariç Tut",
-  "exclude_team": "Takımı Hariç Tut",
-  "exclude_raid": "Raidi Hariç Tut",
-  "exclude_lure": "Çekimi Hariç Tut",
+  "exclude": "Hariç Tutar",
+  "exclude_quest": "Görevi Hariç Tutar",
+  "exclude_invasion": "İstilayı Hariç Tutar",
+  "exclude_team": "Takımı Hariç Tutar",
+  "exclude_raid": "Baskını Hariç Tutar",
+  "exclude_lure": "Yem'i Hariç Tutar",
   "timer": "Zamanlayıcı",
   "hide": "Gizle",
   "tier": "Seviye",
-  "slots": "Yuva",
+  "slots": "Yuvalar",
   "mega": "Mega",
   "form": "Form",
   "starts": "Başlangıç",
@@ -128,16 +128,16 @@
   "kilogram": "kg",
   "meter": "m",
   "total_cp": "Toplam CP",
-  "first_seen": "İlk Görülen",
-  "last_seen": "Son Görülen",
-  "last_modified": "Son Düzenlenen",
-  "last_updated": "Son Güncellenen",
+  "first_seen": "İlk Kez Görüldü",
+  "last_seen": "Son Kez Görüldü",
+  "last_modified": "Son Değiştirilme",
+  "last_updated": "Son Güncelleme",
   "imported": "İçe Aktarıldı",
-  "nest_estimated": "Yuva Verileri Tahminidir!",
-  "verify_nests": "Geçerli Yavruları Kontrol Ederek Doğrulayın",
+  "nest_estimated": "Yuva Verileri Tahmini!",
+  "verify_nests": "Mevcut Oluşumları Kontrol Ederek Doğrula",
   "nest_out_of_date": "Yuva Potansiyel Olarak Güncel Değil!",
-  "nest_check_current": "Yerine Geçerli Yavruları Kontrol Edin",
-  "spawns_per_hour": "Saat Başına",
+  "nest_check_current": "Mevcut Oluşumları Kontrol Et",
+  "spawns_per_hour": "Saati Başına Oluşum",
   "teams": "Takımlar",
   "eggs": "Yumurtalar",
   "reverse": "Ters",
@@ -145,9 +145,9 @@
   "unselected": "Seçilmemiş",
   "only_available": "Mevcut",
   "common": "Yaygın",
-  "uncommon": "Sıradışı",
-  "rare": "Nadir",
-  "ultra_rare": "Ultra Nadir",
+  "uncommon": "Nadir",
+  "rare": "Seyrek",
+  "ultra_rare": "Çok Seyrek",
   "regional": "Bölgesel",
   "event": "Etkinlik",
   "legendary": "Efsanevi",
@@ -155,7 +155,7 @@
   "ultra_beast": "Ultra Canavar",
   "alt_forms": "Alternatif Formlar",
   "alola": "Alola",
-  "galarian": "Galarian",
+  "galarian": "Galar",
   "showing": "Gösteriliyor",
   "instance": "Örnek",
   "online": "Çevrimiçi",
@@ -169,12 +169,12 @@
   "admin_options": "Yönetici Seçenekleri",
   "weather_options": "Hava Durumu Seçenekleri",
   "s2cells_options": "S2 Hücre Seçenekleri",
-  "clustering": "Kümeleme",
-  "glow": "Parlama",
-  "legacy_filter": "Eski Filtre",
-  "raid_timers": "Tüm Raid Zamanlayıcıları",
+  "clustering": "Kümelenme",
+  "glow": "Parıltı",
+  "legacy_filter": "Klasik Filtre",
+  "raid_timers": "Tüm Baskın Zamanlayıcıları",
   "invasion_timers": "Tüm İstila Zamanlayıcıları",
-  "lure_timers": "Tüm Çekim Zamanlayıcıları",
+  "lure_timers": "Tüm Yem Zamanlayıcıları",
   "device_path_color": "Cihaz Yolu Rengi",
   "old_portals": "Eski Portallar",
   "new_portals": "Yeni Portallar",
@@ -182,529 +182,537 @@
   "energy": "Enerji",
   "ar_eligible": "AR Uygun",
   "iv_circles": "IV Göstergeleri",
-  "min_iv_circle": "Minimum Daire IV",
+  "min_iv_circle": "Minimum IV Dairesi",
   "interaction_ranges": "Etkileşim Aralıkları",
-  "cannot_connect": "\nŞu anda sunucuya bağlanılamıyor.\nHemen tekrar denemek sadece daha fazla soruna neden olur.\nLütfen birkaç dakika sonra tekrar deneyin.\n\n- Harita Yönetim Ekibi",
+  "cannot_connect": "\nBu anda sunucuya bağlanılamıyor. \nHemen tekrar denemek daha fazla soruna neden olacaktır. \nLütfen birkaç dakika sonra tekrar deneyiniz.\n\n- Harita Yönetim Ekibi",
   "mad_quest_text": "Yerel Görevler",
   "xs": "XS",
   "primary": "Birincil",
   "secondary": "İkincil",
-  "zero_iv": "0% IV",
-  "hundo_iv": "100% IV",
+  "zero_iv": "%0 IV",
+  "hundo_iv": "%100 IV",
   "open_menu": "Menüyü Aç",
   "zoom_in": "Yakınlaştır",
   "zoom_out": "Uzaklaştır",
-  "welcome": "Hoş Geldiniz",
+  "welcome": "Hoş geldin",
   "back": "Geri",
   "next": "İleri",
   "finish": "Bitir",
-  "start_tutorial": "Eğitimi Başlat",
-  "view_profile": "Profil Görüntüle",
-  "login_optional": "Giriş Yap (İsteğe Bağlı)",
+  "start_tutorial": "Eğitime Başla",
+  "view_profile": "Profili Görüntüle",
+  "login_optional": "Giriş (İsteğe Bağlı)",
   "tutorial": "Eğitim",
-  "tutorial_language": "Dilinizi Seçin",
-  "tutorial_welcome": "Bu eğitim etkileşimlidir ve sağlanan tüm seçenekleri kullanmanız şiddetle tavsiye edilir",
+  "tutorial_language": "Dilini Seç",
+  "tutorial_welcome": "Bu eğitim etkileşimlidir ve sunulan tüm seçeneklerle oynamanız şiddetle tavsiye edilir",
   "tutorial_categories": "Erişiminiz Olan Kategoriler",
-  "tutorial_logged_in": "Profilinizi görüntüleyerek izinleriniz hakkında ayrıntılı bilgi alabilirsiniz.",
-  "tutorial_logged_out": "Giriş yaparak izinleriniz hakkında ayrıntılı bilgi alabilirsiniz.",
+  "tutorial_logged_in": "Profilinizi görüntüleyerek izinleriniz hakkında detayları görebilirsiniz.",
+  "tutorial_logged_out": "Giriş yaparak izinleriniz hakkında detayları görebilirsiniz.",
   "tutorial_sidebar_0": "Tüm Filtreleriniz ve Ayarlarınız Burada",
-  "tutorial_sidebar_1": "Her kategori için anahtarları kullanarak istediğiniz verileri açıp kapatabilirsiniz",
+  "tutorial_sidebar_1": "Her kategori için hangi veriyi istediğinizi anahtarlarla belirleyebileceksiniz",
   "tutorial_sidebar_2": "Seçenekler: Ek özelleştirme\nGelişmiş: Bu eğitimde daha sonra ele alacağız",
   "tutorial_sliders_0": "Filtreleri ayarlamak için kaydırıcıları kullanma",
-  "tutorial_sliders_1": "Pokémon Aralığı:",
-  "tutorial_sliders_2": "- IV'ler {{iv0}}% ile {{iv1}}% arasında",
-  "tutorial_sliders_3": "Seviye {{level0}} ile {{level1}} arasında",
-  "tutorial_sliders_3alt": "- VEYA Seviye {{level0}} ile {{level1}} arasında",
-  "tutorial_sliders_4": "- Büyük Ligi Sıralaması {{gl0}} - {{gl1}} arası",
-  "tutorial_sliders_4alt": "- VEYA Büyük Ligi Sıralaması {{gl0}} - {{gl1}} arası",
-  "tutorial_sliders_5": "- Ultra Ligi Sıralaması {{ul0}} - {{ul1}} arası",
-  "tutorial_sliders_5alt": "- VEYA Ultra Ligi Sıralaması {{ul0}} - {{ul1}} arası",
-  "tutorial_sliders_6": "Aynı renkteki diğerleriyle zincirleme",
-  "tutorial_sliders_7": "Diğer kaydırma çubuklarından ayrı filtreler",
-  "tutorial_sliders_8": "'Tam' bir kaydırma çubuğu devre dışıdır:",
-  "tutorial_sliders_9": "IV kontrol edilmiş veya edilmemiş tüm çıkışlar",
+  "tutorial_sliders_1": "Arasında Pokémonlar:",
+  "tutorial_sliders_2": "- IV %{{iv0}} ile %{{iv1}} arası",
+  "tutorial_sliders_3": "Seviye {{level0}} ile {{level1}} arası",
+  "tutorial_sliders_3alt": "- VE Seviye {{level0}} ile {{level1}} arası",
+  "tutorial_sliders_4": "- Büyük Lig Sıralaması {{gl0}} ile {{gl1}} arası",
+  "tutorial_sliders_4alt": "- YA DA Büyük Lig Sıralaması {{gl0}} ile {{gl1}} arası",
+  "tutorial_sliders_5": "- Ultra Lig Sıralaması {{ul0}} ile {{ul1}} arası",
+  "tutorial_sliders_5alt": "- YA DA Ultra Lig Sıralaması {{ul0}} ile {{ul1}} arası",
+  "tutorial_sliders_6": "Aynı renkten diğerleri ile zincirleme",
+  "tutorial_sliders_7": "Diğer kaydırıcılardan ayrı filtreler",
+  "tutorial_sliders_8": "'Dolu' bir kaydırıcı, devre dışı bırakıldığı anlamına gelir:",
+  "tutorial_sliders_9": "IV kontrol edilmiş olsun ya da olmasın, tüm yavrular",
   "tutorial_help": "Bu menüye kısayol",
-  "tutorial_adv_filter": "Sadece mobil cihazlarda, gelişmiş menü için filtreleme seçeneklerini açar",
-  "tutorial_tune": "Menüde şu anda filtrelenen tüm Pokémon'lar için gelişmiş filtre ayarlarını yapar",
-  "tutorial_format_size": "Menüde şu anda filtrelenen tüm öğeler için simge boyutunu ayarlar",
-  "tutorial_check": "Menüde şu anda filtrelenen tüm öğeleri etkinleştirir",
-  "tutorial_clear": "Menüde şu anda filtrelenen tüm öğeleri devre dışı bırakır",
+  "tutorial_adv_filter": "Yalnızca mobil, gelişmiş menü için filtreleme seçeneklerini açar",
+  "tutorial_tune": "Menüde şu anda filtrelenmekte olan tüm Pokémonlar için gelişmiş filtreyi ayarlar",
+  "tutorial_format_size": "Menüde şu anda filtrelenmekte olan tüm öğeler için simge büyüklüğünü ayarlar",
+  "tutorial_check": "Menüde şu anda filtrelenmekte olan tüm öğeleri etkinleştirir",
+  "tutorial_clear": "Menüde şu anda filtrelenmekte olan tüm öğeleri devre dışı bırakır",
   "tutorial_save": "Mevcut seçimi kaydeder ve çıkar",
-  "tutorial_show_all_view": "PokéStop ve Gym'leri açıp kapatır",
-  "tutorial_show_pokemon_view": "Pokémon'ları açıp kapatır",
-  "tutorial_toggle": "Tıklanan Onay/Çarpı simgesi öğeyi açıp kapatır",
-  "tutorial_pokemon_caption": "Bu simgeyle belirli bir Pokémon için filtreler ayarlayabilirsiniz",
-  "tutorial_all_caption": "Takımların özel bir slot menüsü vardır\nDiğer tüm öğeler simge boyutunu ayarlamanıza izin verir",
-  "tutorial_popup_0": "Açılır pencereler artık etkileşimlidir!",
-  "tutorial_popup_1": "Navigasyon bağlantısının her iki tarafındaki simgeler ek bilgi göstermek için genişler, deneyin!",
-  "tutorial_popup_2": "Her kategori için simgeler farklılık gösterir, hepsini kontrol etmeyi unutma",
-  "tutorial_popup_3": "Ek bilgi",
-  "tutorial_closing_0": "Genel Pokémon kaydırıcıları yan menüdeki gelişmiş menüden bağımsız olarak çalışır ve birbirleri üzerinde etkisi yoktur",
-  "tutorial_closing_1": "Yan menüdeki Ayarlar bölümünü kontrol etmeyi unutma",
-  "tutorial_closing_2": "Her kategori için birçok estetik seçenek bulunur, ancak haritanıza ekledikçe haritanızın donma olasılığı artar",
-  "tutorial_closing_3": "Bu öğreticiyi yan menüdeki Ayarlar panelinde seçerek tekrar izleyebilirsin",
-  "tutorial_closing_4": "Güvende kal ve iyi şanslar!",
-  "tutorial_closing_5": "Giriş",
-  "intro": "Yan Menü",
-  "sidebar": "Kaydırıcılar",
-  "sliders": "Açılır Pencereler",
-  "popups": "Kapatma",
-  "closing": "Kısayollar",
-  "shortcuts": "IV",
-  "iv": "Alan Kısıtlamaları",
-  "area_restrictions": "Harita",
-  "map": "İstatistikler",
-  "stats": "PVP",
-  "pvp": "Bu alanlara erişiminiz var",
-  "area_restrictions_subtitle": "Aktif cihaz konumlarını ve rotalarını gösterir",
-  "devices_subtitle": "Tüm aktif spor salonu konumlarını, aktif takımı ve her spor salonunda kaç boş slot olduğunu gösterir",
-  "gyms_subtitle": "Takım Rocket istilası bilgilerini, savaş sırasını, süresini ve olası ödülleri gösterir",
-  "invasions_subtitle": "IV% ve parıltı seçeneklerini gösterir",
-  "iv_subtitle": "Yem bilgilerini, yem türünü ve süresini gösterir",
-  "lures_subtitle": "Haritayı gösterir",
-  "map_subtitle": "Aktif yuvalanan Pokémon'ları ve yuva çokgenlerini gösterir",
-  "nests_subtitle": "Tüm Pokémon konumlarını ve sürelerini gösterir",
-  "pokemon_subtitle": "Tüm PokéStop konumlarını gösterir",
-  "pokestops_subtitle": "Tüm Ingress portalını gösterir",
-  "portals_subtitle": "Her Pokémon için PVP sıralama/CP/Seviye bilgisini gösterir",
-  "pvp_subtitle": "Görev ödülü ve görev bilgilerini gösterir",
-  "quests_subtitle": "Raid boss, yumurtalar, bitiş süresi ve hareket seti dahil olmak üzere tüm raid bilgilerini gösterir",
-  "raids_subtitle": "Bir cihaz tarafından taranan son S2 hücresinin zamanını gösterir",
-  "scan_cells_subtitle": "Mevcut tarama alanı çokgenlerini gösterir",
-  "scan_areas_subtitle": "Spawn noktalarını ve tahmini kaybolma sürelerini gösterir",
-  "spawnpoints_subtitle": "Pokémon istatistiklerini ve seviyelerini gösterir",
-  "stats_subtitle": "Yeni POI'lerin gönderilmesi için faydalı bilgileri gösterir",
-  "submission_cells_subtitle": "Her hücre için oyun içi hava durumu bilgisi gösterir",
-  "weather_subtitle": "Çeşitli şekillerde tarayıcıyla doğrudan etkileşim sağlar",
-  "scanner_subtitle": "Haritada çeşitli seviyelerde S2 Hücrelerini gösterir",
-  "s2cells_subtitle": "Ayarların cihazlar arasında yedeklenmesini ve yüklenmesini sağlar",
-  "backups_subtitle": "Yedeklemeler",
-  "backups": "Kullanıcı Profili",
-  "user_profile": "Kullanıcı Adı",
-  "user_username": "Şeker",
-  "candy": "EX Rozeti Göster",
-  "show_ex_badge": "Ara",
-  "search": "Ödül Adını Girin...",
-  "global_search_quests": "Çekicin Adını Girin...",
-  "global_search_lures": "PokéStop Adını Girin...",
-  "global_search_pokestops": "Gym Adını Girin...",
-  "global_search_gyms": "Portal Adını Girin...",
-  "global_search_portals": "Yuva Pokémon Adını Girin...",
-  "global_search_nests": "Raid Boss Adını Girin...",
-  "global_search_raids": "Pokémon Adını Girin...",
-  "global_search_pokemon": "Raid Seviye Rozetleri",
-  "raid_level_badges": "Seçenekler",
-  "options": "Profil",
-  "profile": "Pokémon Simgeleri",
-  "pokemon_icons": "PokéStop Simgeleri",
-  "pokestop_icons": "Gym Simgeleri",
-  "gym_icons": "Takım Simgeleri",
-  "team_icons": "Yumurta Simgeleri",
-  "egg_icons": "Raid Simgeleri",
-  "raid_icons": "Yuva Simgeleri",
-  "nest_icons": "Ödül Simgeleri",
-  "reward_icons": "Tip Simgeleri",
-  "type_icons": "Hava Durumu Simgeleri",
-  "weather_icons": "Çeşitli Simgeler",
-  "misc_icons": "İstila Simgeleri",
-  "invasion_icons": "Yerleşim Noktası İkonları",
-  "spawnpoint_icons": "Cihaz İkonları",
-  "device_icons": "Tüm Pokemon Zamanlayıcıları",
-  "pokemon_timers": "Popup'ta Pokedex # Göster",
-  "show_dex_num_in_popup": "Popup",
-  "popup": "Seviye {{level}} PVP İstatistikleri",
-  "pvp_level": "Mega PVP İstatistikleri",
-  "pvp_mega": "{{name}}'e Ekle",
-  "webhook_entry": "{{name}}'den Kaldır",
-  "remove_webhook_entry": "Mesafe",
-  "distance": "Spor Salonu",
-  "gym": "Yumurta",
-  "egg": "Raid",
-  "raid": "Çekim",
-  "lure": "Görev",
-  "quest": "İstila",
-  "invasion": "Yuva",
-  "nest": "Pokestop",
-  "pokestop": "Takım",
-  "team": "Global",
-  "global": "{{name}}'i Yönet",
-  "manage_webhook": "Konumu Ayarlamak İçin İşaretçiyi Sürükleyin ve Bırakın",
-  "drag_and_drop": "Seçmek İçin Tıklayın",
-  "click_to_select": "Yeni {{category}} Uyarısı Ekle",
-  "add_new": "Konumum",
-  "my_location": "Haritada Seçin",
-  "choose_on_map": "Profil Seçin",
-  "select_profile": "Yarıçap Mesafelerini Önizle",
-  "distance_radius": "Alanlar",
-  "areas": "Bot Seçin",
-  "select_webhook": "AR Görevi",
-  "ar_quest_true": "AR Yok",
-  "ar_quest_false": "AR ile",
-  "with_ar": "Her İkisi",
-  "both": "AR Olmadan",
-  "without_ar": "{{reward}} Hariç Tut",
-  "exclude_quest_multi": "{{variable_0}} limiti ({{variable_1}}) aşıldı",
-  "cluster_limit_0": "Lütfen yakınlaştırın veya filtrelerinizi daraltın",
-  "cluster_limit_1": "Çokgenleri Göster",
-  "show_polygons": "{{invasion}} Hariç Tut",
-  "exclude_invasion_multi": "Stardust",
-  "stardust": "CP",
-  "slider_cp": "Lig",
-  "pvp_ranking_league": "Min CP",
-  "pvp_ranking_min_cp": "Sıralamalar",
-  "slider_pvp": "Profil",
-  "profile_no": "Şablon",
-  "template": "Cinsiyet",
-  "gender": "Temizle",
-  "clean": "Tüm Formlar",
-  "all_forms": "PVP Girişi",
-  "pvp_entry": "IV'siz Dahil",
-  "no_iv": "Mesafeye Göre",
-  "by_distance": "Min Süre",
-  "min_time": "Yeni Profil Ekle",
-  "add_new_profile": "Hiçbiri",
-  "slider_none": "Oops, bir şeyler yanlış gitti!",
-  "non_registered_human_title": "Muhtemelen {{webhook}} ile kayıtlı değilsiniz\nVeya sunucu şu anda erişilemez durumda",
-  "non_registered_human_desc": "Lütfen daha sonra tekrar deneyin",
-  "try_again_later": "{{amount}} Alan Seçildi",
-  "selected_areas": "{{amount}} Alanlar Seçildi",
-  "selected_areas_plural": "{{name}} Seçimi",
-  "webhook_selection": "Günün Mesajı",
-  "message_of_the_day": "Görevleri Olan Duraklar İçin Alternatif Renk Göster",
-  "has_quest_indicator": "AR Rozeti Göster",
-  "show_ar_badge": "Tüm Spor Salonları",
-  "all_gyms": "Genel",
-  "general": "{{variable_0}}",
-  "server_dev_error_0": "Global ve Gelişmiş'i Bağla",
-  "link_global_and_advanced": "Normal Formlar",
-  "normal_forms": "Hava Durumu Artış Göstergesi",
-  "weather_indicator": "Sayfa {{page}}",
-  "page": "Navigasyon Kontrolleri",
-  "navigation_controls": "Tepki",
-  "navigation_controls_react": "Yaprak",
-  "navigation_controls_leaflet": "Özel",
-  "exclusive": "Tüm Hareketler",
-  "all_moves": "Hareket",
-  "move": "Herhangi",
-  "any": "Min. Yayılma Oranı",
-  "min_spawn_average": "Tümünü Seç",
-  "select_all": "Seçilenleri Sil",
-  "delete_all": "İptal",
-  "cancel": "Pazartesi",
-  "day_1": "Salı",
-  "day_2": "Çarşamba",
-  "day_3": "Perşembe",
-  "day_4": "Cuma",
-  "day_5": "Cumartesi",
-  "day_6": "Pazar",
-  "day_7": "Profil Adı",
-  "profile_name": "Profilleri Yönet",
-  "manage_profiles": "Ort. Min. Yayılma",
-  "min_spawn_avg": "Her Şey",
-  "poke_global": "Miktar",
-  "amount": "Belirli Bir Spor Salonu",
-  "specific_gym": "Konumları Ara",
-  "search_location": "Belirli Bir {{category}} Ara",
-  "search_specific": "Raidler, Yumurtalar ve Takım Değişiklik Uyarıları Eklendi!",
-  "webhook_success_gym": "Yuva Değişiklikleri",
-  "slot_changes": "slot_değişiklikleri",
-  "slot_changes_poracle": "Bu profil için tüm takibi kaldıracak, emin misiniz?",
-  "confirm_delete": "\"{{profile}}\" adlı profili kopyalamak istediğiniz profili seçin, bu profilin tamamen üzerine yazacak.",
-  "confirm_copy": "{{name}} bunu işleyemedi.\nLütfen daha sonra tekrar deneyin.",
-  "webhook_error": "Benzersiz ve geçerli olmalıdır",
-  "profile_error": "Uyum",
-  "team_0": "Savaşta",
-  "battle_changes": "savaş_değişiklikleri",
-  "battle_changes_poracle": "Otomatik",
-  "auto": "Uyarılarınızı bu botlar için doğrudan haritadan yönetin",
-  "webhooks_subtitle": "Kecleon gibi özel etkinlik Pokéstop'larını gösterir",
-  "event_stops_subtitle": "Uyarılar",
-  "webhooks": "Tarayıcı İşlemleri",
-  "scanner": "Bireysel Uyarı Ekle",
-  "everything_individually": "bireysel",
-  "individually": "Katıl",
-  "join": "Oops, bu sayfa bulunamıyor!",
-  "errors_404": "Bir sunucu hatası oluştu, daha sonra tekrar deneyin!",
-  "errors_500": "Kullanıcı Adı",
-  "local_username": "Şifre",
-  "local_password": "Bir hata oluştu, lütfen daha sonra tekrar deneyin!",
-  "local_error": "Sonuç Bulunamadı\nFiltrelerinizi genişletmeyi deneyin",
-  "no_filter_results": "Bağış Sayfası",
-  "donor_page": "Geri Dön",
-  "go_back": "Erişim",
-  "access": "Discord Bağlantısı",
-  "link_discord": "Uyarı Yöneticisi",
-  "select_webhook_strategy": "Başarılı! Uyarı ayarlarını almak için yeniden yükleniyor...",
-  "webhook_strategy_success_0": "Kayıt Ol",
-  "register": "Geçersiz Kimlik Bilgileri",
-  "invalid_credentials": "Şu anda yeni bir kullanıcı kaydedilemiyor",
-  "error_creating_user": "Discord Bağlandı",
-  "discord_linked": "Telegram Bağlandı",
-  "telegram_linked": "seviye",
-  "level": "km",
-  "km": "Geri Bildirim",
-  "feedback": "Bağış Menüsü",
-  "donor_menu": "Pokemon'un Konumu Değişebilir",
-  "pokemon_cell": "Bu Zamanlayıcı Doğrulandı",
-  "timer_verified": "Bu Zamanlayıcı Doğrulanmadı",
-  "timer_unverified": "Tümü",
-  "all": "Hiçbiri",
-  "badge_0": "Bronz",
-  "badge_1": "Gümüş",
-  "badge_2": "Altın",
-  "badge_3": "Spor Salonu Rozeti Düzenle",
-  "gym_badge_menu": "Spor Salonu Rozetleri",
-  "gym_badges": "Spor Salonu Rozetlerini Göster",
-  "gym_badge_diamonds": "Haritada Spor Salonu Rozetlerini ve profil sayfasında bir liste olarak gösterir.",
-  "gym_badges_subtitle": "Filtreleri Sıfırla",
-  "confirm_filters_reset": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz? Bu geri alınamaz!",
-  "filters_reset_text": "Filtreleri Sıfırla",
-  "filters_reset_title": "Hızlı Seçim",
-  "raid_quick_select": "Devre Dışı",
-  "disabled": "{{category}} yükleniyor",
-  "loading": "Simgeler Alınıyor",
-  "loading_icons": "İstilalar Alınıyor",
-  "loading_invasions": "Konum Tara",
-  "scan_next": "Tarama Konumunu Ayarlamak İçin İşaretçiyi Sürükleyin ve Bırakın",
-  "scan_next_choose": "Bir Alanı Tara",
-  "scan_zone": "Tarama Konumunu Ayarlamak ve Boyutu Seçmek İçin İşaretçiyi Sürükleyin ve Bırakın",
-  "scan_zone_choose": "Boyut",
-  "scan_zone_size": "Menzil",
+  "tutorial_show_all_view": "PokéStops & Gym'ları göstermeyi değiştir",
+  "tutorial_show_pokemon_view": "Pokémonları göstermeyi değiştir",
+  "tutorial_toggle": "İşaret/X'e tıklamak öğeyi değiştirir",
+  "tutorial_pokemon_caption": "Bu simge, belirli bir Pokémon için filtreleri ayarlamanızı sağlar",
+  "tutorial_all_caption": "Takımların özel yuvalar menüsü vardır\nDiğer tüm öğeler simge büyüklüğünü ayarlamanızı sağlar",
+  "tutorial_popup_0": "Popuplar artık etkileşimli!",
+  "tutorial_popup_1": "Üç nokta, gizleme, hariç tutma ve zamanlayıcıyı değiştirme seçeneklerini açar",
+  "tutorial_popup_2": "Navigasyon bağlantısının her iki yanındaki simgeler, ek bilgi göstermek için genişleyecek, bir deneyin!",
+  "tutorial_popup_3": "Her kategori için simgeler farklılık gösterir, hepsini kontrol ettiğinizden emin olun",
+  "tutorial_closing_0": "Ek bilgi",
+  "tutorial_closing_1": "Kenar çubuğundaki küresel Pokémon kaydırıcıları, gelişmiş menüden ayrı çalışır ve birbirlerini etkilemez",
+  "tutorial_closing_2": "Kenar çubuğundaki Ayarlar bölümünü kontrol ettiğinizden emin olun",
+  "tutorial_closing_3": "Her kategori için çok sayıda estetik seçenek mevcut, ancak haritanıza ne kadar çok şey eklerseniz, haritanızın donma ihtimali o kadar artar",
+  "tutorial_closing_4": "Bu eğitimi, kenar çubuğundaki Ayarlar panelinden seçerek tekrar görebilirsiniz",
+  "tutorial_closing_5": "Kendinize dikkat edin ve iyi şanslar!",
+  "intro": "Giriş",
+  "sidebar": "Kenar Çubuğu",
+  "sliders": "Kaydırıcılar",
+  "popups": "Popuplar",
+  "closing": "Son",
+  "shortcuts": "Kısayollar",
+  "iv": "IV",
+  "area_restrictions": "Alan Kısıtlamaları",
+  "map": "Harita",
+  "stats": "İstatistikler",
+  "pvp": "PVP",
+  "area_restrictions_subtitle": "Bu alanlara erişiminiz var",
+  "devices_subtitle": "Aktif cihaz konumlarını ve rotalarını gösterir",
+  "gyms_subtitle": "Aktif spor salonu konumlarını, aktif takımı ve her spor salonunun kaç yuva sunduğunu gösterir",
+  "invasions_subtitle": "Team Rocket istilası bilgisini, dâhil savaş dizilimi, bitiş zamanı ve olası ödülleri gösterir",
+  "iv_subtitle": "IV% ve parıltı seçeneklerini gösterir",
+  "lures_subtitle": "Oltalar hakkında bilgi gösterir, oltanın tipi ve bitiş zamanı dâhil",
+  "map_subtitle": "Haritayı gösterir",
+  "nests_subtitle": "Aktif şekilde yuvalanan Pokémonları ve yuva poligonlarını gösterir",
+  "pokemon_subtitle": "Tüm Pokémon konumlarını ve bitiş zamanlarını gösterir",
+  "pokestops_subtitle": "Tüm PokéStop konumlarını gösterir",
+  "portals_subtitle": "Tüm Ingress portallarını gösterir",
+  "pvp_subtitle": "Her Pokémon için PVP rütbesi/CP/Seviye bilgisini gösterir",
+  "quests_subtitle": "Görev ödülü ve görev bilgisini gösterir",
+  "raids_subtitle": "Baskın lideri, yumurtalar, bitiş zamanı ve hareket seti dahil olmak üzere tüm baskın bilgilerini gösterir",
+  "scan_cells_subtitle": "Bir S2 hücresinin son taranma zamanını gösterir",
+  "scan_areas_subtitle": "Kullanılabilir tarama alanı poligonlarını gösterir",
+  "spawnpoints_subtitle": "Yaratma noktalarını ve tahmini yok olma zamanlarını gösterir",
+  "stats_subtitle": "Pokémon istatistikleri ve seviyelerini gösterir",
+  "submission_cells_subtitle": "Yeni POI'ler göndermek için yararlı bilgiler gösterir",
+  "weather_subtitle": "Her hücre için oyundaki hava durumu bilgisini gösterir",
+  "scanner_subtitle": "Tarananı çeşitli yollarla doğrudan etkileşim kur",
+  "s2cells_subtitle": "Haritada çeşitli seviyelerde S2 Hücrelerini gösterir",
+  "backups_subtitle": "Ayarları cihazlar arası yedeklemeyi ve yüklemeyi sağlar",
+  "backups": "Yedeklemeler",
+  "user_profile": "Kullanıcı Profili",
+  "user_username": "Kullanıcı Adı",
+  "candy": "Şeker",
+  "show_ex_badge": "EX Rozetini Göster",
+  "search": "Ara",
+  "global_search_quests": "Ödül Adı Gir...",
+  "global_search_lures": "Yem Adı Gir...",
+  "global_search_pokestops": "PokéStop Adı Gir...",
+  "global_search_gyms": "Spor Salonu Adı Gir...",
+  "global_search_portals": "Portal Adı Gir...",
+  "global_search_nests": "Yuva Pokémon Adı Gir...",
+  "global_search_raids": "Baskın Lideri Adı Gir...",
+  "global_search_pokemon": "Pokémon Adı Gir...",
+  "global_search_invasions": "Grunt Türünü, Adını veya Pokémon ödül adını gir...",
+  "raid_level_badges": "Baskın Seviye Rozetleri",
+  "options": "Seçenekler",
+  "profile": "Profil",
+  "pokemon_icons": "Pokémon İkonları",
+  "pokestop_icons": "PokéStop İkonları",
+  "gym_icons": "Spor Salonu İkonları",
+  "team_icons": "Takım İkonları",
+  "egg_icons": "Yumurta İkonları",
+  "raid_icons": "Baskın İkonları",
+  "nest_icons": "Yuva İkonları",
+  "reward_icons": "Ödül İkonları",
+  "type_icons": "Tür İkonları",
+  "weather_icons": "Hava Durumu İkonları",
+  "misc_icons": "Çeşitli İkonlar",
+  "invasion_icons": "İstila İkonları",
+  "spawnpoint_icons": "Yaratma Noktası İkonları",
+  "device_icons": "Cihaz İkonları",
+  "pokemon_audio": "Pokémon Sesi",
+  "pokestop_audio": "PokéStop Sesi",
+  "gym_audio": "Spor Salonu Sesi",
+  "team_audio": "Takım Sesi",
+  "egg_audio": "Yumurta Sesi",
+  "raid_audio": "Baskın Sesi",
+  "nest_audio": "Yuva Sesi",
+  "reward_audio": "Ödül Sesi",
+  "type_audio": "Tür Sesi",
+  "weather_audio": "Hava Durumu Sesi",
+  "misc_audio": "Çeşitli Sesler",
+  "invasion_audio": "İstila Sesi",
+  "spawnpoint_audio": "Yaratma Noktası Sesi",
+  "device_audio": "Cihaz Sesi",
+  "pokemon_timers": "Tüm Pokémon Zamanlayıcıları",
+  "show_dex_num_in_popup": "Açılır Pencerede Pokédex # Numarasını Göster",
+  "popup": "Açılır Pencere",
+  "pvp_level": "{{level}} Seviye PVP İstatistikleri",
+  "pvp_mega": "Mega PVP İstatistikleri",
+  "webhook_entry": "{{name}}'e Ekle",
+  "remove_webhook_entry": "{{name}}'den Kaldır",
+  "distance": "Mesafe",
+  "gym": "Spor Salonu",
+  "egg": "Yumurta",
+  "raid": "Baskın",
+  "lure": "Yem",
+  "quest": "Görev",
+  "invasion": "İstila",
+  "nest": "Yuva",
+  "pokestop": "PokéStop",
+  "team": "Takım",
+  "global": "Global",
+  "manage_webhook": "{{name}} Yönet",
+  "drag_and_drop": "Konumunuzu Belirlemek için İşaretçiyi Sürükleyip Bırakın",
+  "click_to_select": "Seçmek için Tıklayın",
+  "add_new": "Yeni {{category}} Uyarısı Ekle",
+  "my_location": "Benim Konumum",
+  "choose_on_map": "Haritadan Seç",
+  "select_profile": "Profil Seç",
+  "distance_radius": "Mesafe Yarıçapını Önizle",
+  "areas": "Alanlar",
+  "select_webhook": "Bot Seç",
+  "ar_quest_true": "AR Görevi",
+  "ar_quest_false": "AR Yok",
+  "with_ar": "AR ile",
+  "both": "Her İkisi",
+  "without_ar": "AR Olmadan",
+  "exclude_quest_multi": "{{reward}} Hariç Tut",
+  "cluster_limit_0": "{{variable_0}} limiti ({{variable_1}}) aşıldı",
+  "cluster_limit_1": "Lütfen yakınlaştırın veya filtrelerinizi daraltın",
+  "show_polygons": "Poligonları Göster",
+  "exclude_invasion_multi": "{{invasion}} Hariç Tut",
+  "stardust": "Yıldız Tozu",
+  "slider_cp": "CP",
+  "pvp_ranking_league": "Lig",
+  "pvp_ranking_min_cp": "Min CP",
+  "slider_pvp": "Sıralamalar",
+  "profile_no": "Profil",
+  "template": "Şablon",
+  "gender": "Cinsiyet",
+  "clean": "Temizle",
+  "all_forms": "Tüm Formlar",
+  "pvp_entry": "PVP Girişi",
+  "no_iv": "IV'siz",
+  "by_distance": "Mesafeye Göre",
+  "min_time": "Min Süre",
+  "add_new_profile": "Yeni Profil Ekle",
+  "slider_none": "Yok",
+  "non_registered_human_title": "Oops, bir şeyler ters gitti!",
+  "non_registered_human_desc": "{{webhook}} ile kayıtlı olmayabilirsiniz\nVeya sunucu şu anda ulaşılabilir değil",
+  "try_again_later": "Lütfen daha sonra tekrar deneyin",
+  "selected_areas_one": "{{count}} Alan Seçildi",
+  "selected_areas_other": "{{count}} Alan Seçildi",
+  "webhook_selection": "{{name}} Seçimi",
+  "message_of_the_day": "Günün Mesajı",
+  "has_quest_indicator": "Görevleri Olan Duraklar için Alternatif Renk",
+  "show_ar_badge": "AR Rozetini Göster",
+  "all_gyms": "Tüm Spor Salonları",
+  "general": "Genel",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "Seçili Global Ayarları Saygılar",
+  "normal_forms": "Normal Formlar",
+  "weather_indicator": "Hava Durumu Güçlendirme Göstergesi",
+  "page": "Sayfa {{page}}",
+  "navigation_controls": "Navigasyon Kontrolleri",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
+  "exclusive": "Özel",
+  "all_moves": "Tüm Hareketler",
+  "move": "Hareket",
+  "any": "Herhangi",
+  "min_spawn_average": "Min Yavrulama Oranı",
+  "select_all": "Tümünü Seç",
+  "delete_all": "Seçilenleri Sil",
+  "cancel": "İptal",
+  "day_1": "Pazartesi",
+  "day_2": "Salı",
+  "day_3": "Çarşamba",
+  "day_4": "Perşembe",
+  "day_5": "Cuma",
+  "day_6": "Cumartesi",
+  "day_7": "Pazar",
+  "profile_name": "Profil Adı",
+  "manage_profiles": "Profilleri Yönet",
+  "min_spawn_avg": "Ort. Min Yavrulama",
+  "poke_global": "Her Şey",
+  "amount": "Miktar",
+  "specific_gym": "Belirli Spor Salonu",
+  "search_location": "Yerleri Ara",
+  "search_specific": "Belirli Bir {{category}} Ara",
+  "webhook_success_gym": "Baskınlar, Yumurtalar ve Takım Değişikliği Uyarıları Eklendi!",
+  "slot_changes": "Yuva Değişiklikleri",
+  "slot_changes_poracle": "yuva_değişiklikleri",
+  "confirm_delete": "Bu profil için tüm takibi kaldıracaksınız, emin misiniz?",
+  "confirm_copy": "\"{{profile}}\" profilini hangi profile kopyalamak istersiniz, bu profilin tamamını üstüne yazacaktır.",
+  "webhook_error": "{{name}} bunu işleyemedi.\nLütfen daha sonra tekrar deneyin.",
+  "profile_error": "Benzersiz ve geçerli olmalıdır",
+  "team_0": "Harmony",
+  "battle_changes": "Savaşta",
+  "battle_changes_poracle": "savaş_değişiklikleri",
+  "auto": "Otomatik",
+  "webhooks_subtitle": "Bu botlar için uyarılarınızı doğrudan haritadan yönetin",
+  "event_stops_subtitle": "Kecleon gibi özel etkinlik Pokéstops'larını gösterir",
+  "webhooks": "Uyarılar",
+  "scanner": "Tarayıcı Eylemleri",
+  "everything_individually": "Tekil Uyarılar Ekle",
+  "individually": "tekillik",
+  "join": "Katıl",
+  "errors_404": "Oops, bu sayfa bulunamadı!",
+  "errors_500": "Bir sunucu hatası oluştu, daha sonra tekrar deneyin!",
+  "local_username": "Kullanıcı Adı",
+  "local_password": "Şifre",
+  "local_error": "Bir hata oluştu, lütfen daha sonra tekrar deneyin!",
+  "no_filter_results": "Sonuç Bulunamadı\nFiltrelerinizi Genişletmeyi Deneyin",
+  "donor_page": "Bağışçı Sayfası",
+  "go_back": "Geri Dön",
+  "access": "Erişim",
+  "link_discord": "Discord Bağla",
+  "select_webhook_strategy": "Alarm Yöneticisi",
+  "webhook_strategy_success_0": "Başarılı! Alarmların ayarlarını almak için yenileniyor...",
+  "register": "Kayıt Ol",
+  "invalid_credentials": "Geçersiz Bilgiler",
+  "localauth_failed": "Kimlik doğrulama başarısız",
+  "error_creating_user": "Şu anda yeni kullanıcı kaydı yapılamıyor",
+  "discord_linked": "Discord Bağlandı",
+  "telegram_linked": "Telegram Bağlandı",
+  "level": "seviye",
+  "km": "km",
+  "feedback": "Geri Bildirim",
+  "donor_menu": "Bağışçı Menüsü",
+  "pokemon_cell": "Pokemon'un Konumu Değişebilir",
+  "timer_verified": "Bu Zamanlayıcı Doğrulandı",
+  "timer_unverified": "Bu Zamanlayıcı Doğrulanmadı",
+  "all": "Tümü",
+  "badge_0": "Yok",
+  "badge_1": "Bronz",
+  "badge_2": "Gümüş",
+  "badge_3": "Altın",
+  "gym_badge_menu": "Spor Salonu Rozeti Düzenle",
+  "gym_badges": "Spor Salonu Rozetleri",
+  "gym_badge_diamonds": "Spor Salonu Rozetlerini Göster",
+  "gym_badges_subtitle": "Haritada ve profil sayfasında bir liste içinde Spor Salonu Rozetlerini gösterir.",
+  "confirm_filters_reset": "Filtreleri Sıfırla",
+  "filters_reset_text": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz? Bu işlem geri alınamaz!",
+  "filters_reset_title": "Filtreleri Sıfırla",
+  "raid_quick_select": "Hızlı Seçim",
+  "disabled": "Devre Dışı",
+  "loading": "{{category}} Yükleniyor",
+  "loading_icons": "Simgeler Alınıyor",
+  "loading_invasions": "İstilalar Alınıyor",
+  "scan_next": "Sonraki Konumu Tara",
+  "scan_next_choose": "Tarama Konumunu Ayarlamak İçin İşaretçiyi Sürükleyip Bırakın",
+  "scan_zone": "Bir Alanı Tara",
+  "scan_zone_choose": "Tarama Konumunu Belirlemek ve Boyut Seçmek İçin İşaretçiyi Sürükleyip Bırakın",
+  "scan_zone_size": "Boyut",
   "scan_zone_range": "Aralık",
-  "scan_zone_spacing": "Yarıçap",
-  "scan_zone_radius": "Tarama İstekleri",
-  "scan_requests": "Mevcut Sıra",
-  "scan_queue": "Burada Tara",
-  "click_to_scan": "Tarama talebi onaylandı",
-  "scan_confirmed_title": "Çalışan konuma gönderildi, sonuç yakında haritada görünecek!",
-  "scan_confirmed": "Tarama isteği gönderiliyor",
-  "scan_loading_title": "Tarama isteğiniz işleniyor ve sisteme gönderiliyor!",
-  "scan_loading": "Hata",
-  "scan_error_title": "Tarama isteği işlenirken bir hata oluştu...",
-  "scan_error": "Bu konum yetkili alanların sınırları dışında",
-  "scan_outside_area": "Seviye",
-  "pvp_ranking_cap": "Konumunu Takip Et",
-  "lc_title": "metre",
-  "lc_metersUnit": "fit",
-  "lc_feetUnit": "Bu noktaya {distance} {unit} mesafedesiniz",
-  "lc_popup": "Haritanın sınırları dışında gibi görünüyorsunuz",
-  "lc_outsideMapBoundsMsg": "Uyarı Bulunamadı",
-  "no_alerts": "Ayarlar Yükleniyor",
-  "loading_settings": "Devam etmeden önce lütfen yenileyin",
-  "refresh_to_continue": "Oturum Süresi Doldu",
-  "session_expired_title": "Oturumunuz süresi doldu",
-  "session_expired_body": "Güncel değil",
-  "old_client_title": "Bu haritanın yeni bir sürümü mevcut",
-  "old_client_body": "Yenile",
-  "refresh": "Puanlar",
-  "points": "Gün",
-  "day": "Günler",
-  "days": "Bir şeyler yanlış gitti",
-  "react_error": "Simge tıklanabilir",
-  "clickable_icon": "Bir sonraki durak için 2 durak kaldı",
-  "two_stops_till_next": "Bir sonraki durak için 1 durak kaldı",
-  "one_stop_till_next": "Daha fazla spor salonu yok",
-  "no_more_gyms": "Aydınlık Harita Sınırı",
-  "light_map_border": "Karanlık Harita Sınırı",
-  "dark_map_border": "Hücre Engellendi",
-  "cell_blocked": "POI Rengi",
-  "poi_color": "Görev Koşulu",
-  "quest_condition": "Her zaman etiketleri göster",
-  "always_show_labels": "Tarama Alanı Seçenekleri",
-  "scan_areas_options": "Tarihi Nadirlik",
-  "historic_rarity": "İlgi Noktaları",
-  "poi": "300m Menzil",
-  "300m_range": "Çekim Menzili",
-  "lure_range": "Özel Menzil",
-  "custom_range": "Açmak için dokunun",
-  "tap_to_toggle": "Güçlendir",
-  "power_up": "Asla",
-  "never_alt": "Yakında Görülenler",
-  "seen_nearby_stop": "Bu Hücrede Görülenler",
-  "seen_nearby_cell": "Çekim Çağırma",
-  "seen_lure_encounter": "Çekim Yaratma",
-  "seen_lure_wild": "Vahşi Çıkma",
-  "seen_wild": "Etkinlik Durakları",
-  "event_stops": "Etkinlik Durak Zamanlayıcıları",
-  "event_stop_timers": "Herhangi",
-  "size_0": "XXS",
-  "size_1": "XS",
-  "size_2": "M",
-  "size_3": "XL",
-  "size_4": "XXL",
-  "size_5": "Boyut Göstergesini Göster",
-  "show_size_indicator": "Boyut",
-  "size": "Altın Durak",
-  "gold_stop": "Profil Değiştirme",
-  "profile_backups": "Yeni Yedek",
-  "new_backup": "Oluştur",
-  "create": "Yükle",
-  "load": "Güncelle",
-  "update": "Sil",
-  "delete": "İsim",
-  "name": "Sadece Onaylanmış",
-  "only_confirmed": "Rocket Pokémon",
-  "rocket_pokemon": "Yanıltıcı",
-  "decoy": "20.000 hücreden fazla oluşturmayı denediniz ({{variable_0}})",
-  "s2_cell_limit_0": "Tüm PVP Sıralamalarını Göster",
-  "show_all_pvp_ranks": "Pokémon Koordinatlarını Göster",
-  "enable_pokemon_popup_coords": "Spor Salonu Koordinatlarını Göster",
-  "enable_gym_popup_coords": "Pokéstop Koordinatlarını Göster",
-  "enable_pokestop_popup_coords": "Portal Koordinatlarını Göster",
-  "enable_portal_popup_coords": "Daha fazla bilgi için discordumuza katılın lütfen.",
-  "on_block_join_discord": "Üye olduğunuz için engellendiniz.",
-  "on_block_msg": "Reddedildi",
-  "denied": "Vitrin",
-  "showcase": "Bilinmeyen Etkinlik",
-  "unknown_event": "{{time}} saniye içinde kullanılabilir",
-  "scanner_countdown": "Başarılı",
-  "success": "Katkıda bulun",
-  "contribute": "mi",
-  "mi": "Alanlara göre filtrele",
-  "filter_by_areas": "Yuva Adı Gönder",
-  "submit_nest_name": "Ad Güncelleme",
-  "nest_submission_menu": "Yuva Gönderimleri",
-  "nest_submissions": "Yuvalar için yeni adlar göndermenizi sağlar",
-  "nest_submissions_subtitle": "Dinamik Pokemon Saydamlığı",
-  "pokemon_opacity": "Dinamik İstila Saydamlığı",
-  "invasion_opacity": "Dinamik Raid Saydamlığı",
-  "raid_opacity": "10 dakikada saydamlık",
-  "opacity_ten_minutes": "5 dakikada saydamlık",
-  "opacity_five_minutes": "1 dakikada saydamlık",
-  "opacity_one_minute": "Seviye Göstergeleri",
-  "level_circles": "Minimum Daire Seviyesi",
-  "min_level_circle": "Giriş yapmadığınız için isteğiniz başarısız oldu",
-  "mutation_auth_error": "Tarafından gönderildi",
+  "scan_zone_spacing": "Aralıklar",
+  "scan_zone_radius": "Yarıçap",
+  "scan_requests": "Tarama Talepleri",
+  "scan_queue": "Mevcut Kuyruk",
+  "click_to_scan": "Burayı Tara",
+  "scan_confirmed_title": "Tarama talebi onaylandı",
+  "scan_confirmed": "Çalışan konuma gönderildi, sonuç yakında haritada görünecek!",
+  "scan_loading_title": "Tarama isteği gönderiliyor",
+  "scan_loading": "Tarama isteğiniz işleniyor ve sisteme gönderiliyor!",
+  "scan_error_title": "Hata",
+  "scan_error": "Tarama isteği işlenirken bir hata oluştu...",
+  "scan_outside_area": "Bu konum, yetkili alanların sınırlarının dışında",
+  "pvp_ranking_cap": "Seviye",
+  "lc_title": "Konumunuzu Takip Et",
+  "lc_metersUnit": "metre",
+  "lc_feetUnit": "feet",
+  "lc_popup": "Bu noktadan {distance} {unit} içindesiniz",
+  "lc_outsideMapBoundsMsg": "Haritanın sınırları dışında olduğunuz görünüyor",
+  "no_alerts": "Alarm Bulunamadı",
+  "loading_settings": "Ayarlar Yükleniyor",
+  "refresh_to_continue": "Devam etmeden önce lütfen sayfayı yenileyin",
+  "session_expired_title": "Oturum Süresi Doldu",
+  "session_expired_body": "Oturumunuzun süresi doldu",
+  "old_client_title": "Güncel Değil",
+  "old_client_body": "Bu haritanın yeni bir sürümü mevcut",
+  "early_old_client_title": "Güncel Değil",
+  "early_old_client_body": "Bu uygulamanın eski bir sürümü tarayıcınızda önbelleğe alınmış olabilir, bu uygulamayı kullanabilmeniz için önbelleğinizi temizlemeniz gerekecektir.",
+  "refresh": "Yenile",
+  "points": "Puanlar",
+  "day": "Gün",
+  "days": "Günler",
+  "react_error": "Bir Şeyler Yanlış Gitti",
+  "clickable_icon": "İkon Tıklanabilir",
+  "two_stops_till_next": "Sonraki duraklara 2 durak",
+  "one_stop_till_next": "Sonraki duraklara 1 durak",
+  "no_more_gyms": "Başka spor salonu yok",
+  "light_map_border": "Açık Harita Sınırı",
+  "dark_map_border": "Koyu Harita Sınırı",
+  "cell_blocked": "Hücre Engellendi",
+  "poi_color": "İlgi Noktası Rengi",
+  "quest_condition": "Görev Koşulu",
+  "always_show_labels": "Etiketleri Her Zaman Göster",
+  "scan_areas_options": "Tarama Alanları Seçenekleri",
+  "historic_rarity": "Tarihi Nadirlik",
+  "poi": "İlgi Noktaları",
+  "300m_range": "300m Menzil",
+  "lure_range": "Oltalama Menzili",
+  "custom_range": "Özel Menzil",
+  "tap_to_toggle": "Değiştirmek İçin Dokun",
+  "power_up": "Güçlendir",
+  "never_alt": "Asla",
+  "seen_nearby_stop": "Yakında Görüldü",
+  "seen_nearby_cell": "Bu Hücrede Görüldü",
+  "seen_lure_encounter": "Oltalama Karşılaşması",
+  "seen_lure_wild": "Oltalama Yabani",
+  "seen_wild": "Yabani Görüldü",
+  "event_stops": "Etkinlik Durakları",
+  "event_stop_timers": "Etkinlik Durağı Zamanlayıcıları",
+  "size_0": "Herhangi",
+  "size_1": "ÇÇK",
+  "size_2": "ÇK",
+  "size_3": "O",
+  "size_4": "B",
+  "size_5": "ÇB",
+  "show_size_indicator": "Boyut Göstergesini Göster",
+  "size": "Boyut",
+  "gold_stop": "Altın Durak",
+  "profile_backups": "Profil Değişimi",
+  "new_backup": "Yeni Yedek",
+  "create": "Oluştur",
+  "load": "Yükle",
+  "update": "Güncelle",
+  "delete": "Sil",
+  "name": "Ad",
+  "only_confirmed": "Sadece Onaylanmış",
+  "rocket_pokemon": "Roket Pokémon'u",
+  "decoy": "Yem",
+  "s2_cell_limit_0": "20.000'den fazla hücre üretmeye çalıştınız ({{variable_0}})",
+  "show_all_pvp_ranks": "Tüm PVP Sıralamalarını Göster",
+  "enable_pokemon_popup_coords": "Pokémon Koordinatlarını Göster",
+  "enable_gym_popup_coords": "Spor Salonu Koordinatlarını Göster",
+  "enable_pokestop_popup_coords": "Pokéstop Koordinatlarını Göster",
+  "enable_portal_popup_coords": "Portal Koordinatlarını Göster",
+  "on_block_join_discord": "Daha fazla bilgi için lütfen Discord'umuza katılın.",
+  "on_block_msg": "Bir üyesi olduğunuz için engellendiniz",
+  "denied": "Reddedildi",
+  "showcase": "Vitrin",
+  "unknown_event": "Bilinmeyen Etkinlik",
+  "scanner_countdown": "{{time}} saniye sonra kullanılabilir",
+  "success": "Başarılı",
+  "contribute": "Katkıda Bulun",
+  "mi": "mi",
+  "filter_by_areas": "Alanlara Göre Filtrele",
+  "submit_nest_name": "Yuva Adı Gönder",
+  "nest_submission_menu": "Ad Güncelleme",
+  "nest_submissions": "Yuva Gönderimleri",
+  "nest_submissions_subtitle": "Yuvalar için yeni adlar göndermenizi sağlar",
+  "pokemon_opacity": "Dinamik Pokémon Opaklığı",
+  "invasion_opacity": "Dinamik İstila Opaklığı",
+  "raid_opacity": "Dinamik Baskın Opaklığı",
+  "opacity_ten_minutes": "10 dakikada opaklık",
+  "opacity_five_minutes": "5 dakikada opaklık",
+  "opacity_one_minute": "1 dakikada opaklık",
+  "level_circles": "Seviye Göstergeleri",
+  "min_level_circle": "Minimum Çember Seviyesi",
+  "mutation_auth_error": "Giriş yapmadığınız için isteğiniz başarısız oldu",
   "submitted_by": "Gönderen",
-  "localauth_failed": "Kimlik doğrulama başarısız oldu",
-  "reversible": "Tersine dönüştürülebilir",
-  "version": "Sürüm",
+  "reversible": "Geri Alınabilir",
+  "version": "Versiyon",
   "route_tags": "Rota Etiketleri",
   "routes": "Rotalar",
   "route_type": "Rota Türü",
-  "routes_subtitle": "Oyun rotalarını harita üzerinde görüntüleyin ve ilgili bilgileri alın",
+  "routes_subtitle": "Haritada oyun içi rotaları ve bu rotalarla ilgili bilgileri gör",
   "description": "Açıklama",
   "additional_info": "Ek Bilgi",
   "duration": "Süre",
   "elevation": "Yükseklik",
   "contest_category_1": "En Küçük Boyut",
   "context_category_2": "En Büyük Boyut",
-  "total_entries": "Toplam Kayıt",
-  "showcase_rankings": "Sergi Sıralamaları",
-  "showcase_rankings_subtitle": "Bir Pokestop'taki en iyi sıralamaların bir listesini görüntüler",
+  "total_entries": "Toplam Giriş",
+  "showcase_rankings": "Vitrin Sıralamaları",
+  "showcase_rankings_subtitle": "Bir Pokéstop'ta vitrin için en üst sıralamaların bir listesini gösterir",
   "tth": "TTH",
   "tth_0": "Tümü",
   "tth_1": "Bilinen",
   "tth_2": "Bilinmeyen",
   "no_access": "Erişim Yok",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
-  "cooldown": "Soğuma Süresi",
-  "scan_some_outside_area": "Bazı konumlar yetkilendirilmiş sınırların dışında.",
-  "alerts": "bildirimler",
-  "alert_manager": "Bildirim Yöneticisi",
+  "cooldown": "Serinleme Süresi",
+  "scan_some_outside_area": "Bazı konumlar yetkilendirilmiş sınırların dışında",
+  "alerts": "alarmalar",
+  "alert_manager": "Alarm Yöneticisi",
   "menu": "Menü",
   "theme": "Tema",
   "exit": "Çıkış",
   "component": "Bileşen",
-  "component_login_page": "Giriş Sayfası Bileşeni",
-  "component_donation_page": "Bağış Sayfası Bileşeni",
-  "component_message_of_the_day": "Günün Mesajı Bileşeni",
+  "component_login_page": "Giriş Sayfası",
+  "component_donation_page": "Bağış Sayfası",
+  "component_message_of_the_day": "Günün Mesajı",
   "download": "İndir",
   "playground": "Oyun Alanı",
-  "locale": "Dil",
+  "locale": "Yerel Ayar",
   "saved": "Kaydedildi",
-  "show_editor": "Düzenleyiciyi Göster",
-  "hide_editor": "Düzenleyiciyi Gizle",
-  "reported_error": "Bu hata, sunucuya şu kimlikle birlikte bildirildi",
+  "show_editor": "Editörü Göster",
+  "hide_editor": "Editörü Gizle",
+  "reported_error": "Bu hata, şu tanımlayıcı ile sunucuya bildirildi",
   "dark_mode": "Karanlık Mod",
   "load_from_autosave": "Otomatik Kayıttan Yükle",
   "done": "Tamamlandı",
   "fast": "Hızlı",
-  "charged": "Şarj Etme",
+  "charged": "Şarjlı",
   "offline_mode": "Çevrimdışı Mod",
-  "include_sponsored": "Sponsorlu İçerikleri Göster",
+  "include_sponsored": "Sponsorlu İçerikleri Dahil Et",
   "showcase_color": "Vitrin Rengi",
   "partner_color": "Ortak Rengi",
-  "disable": "{{- name}} Devre Dışı",
-  "profiling": "Profillemeler",
-  "showcase_block": "Bir vitrine bağlı olduğu için engellendi",
-  "signed_in_as": "Olarak Oturum Açıldı",
+  "disable": "{{- name}} Devre Dışı Bırak",
+  "profiling": "Profil Oluşturma",
+  "showcase_block": "Vitrin nedeniyle engellendi",
+  "signed_in_as": "Olarak giriş yapıldı",
   "missing_map_perm": "Haritayı görüntüleme izniniz yok.",
-  "pokemon_audio": "Pokémon Ses",
-  "pokestop_audio": "PokéStop Ses",
-  "gym_audio": "Gym Ses",
-  "team_audio": "Takım Ses",
-  "egg_audio": "Yumurta Ses",
-  "raid_audio": "Raid Ses",
-  "nest_audio": "Yuva Ses",
-  "reward_audio": "Ödül Ses",
-  "type_audio": "Tip Ses",
-  "weather_audio": "Hava Ses",
-  "misc_audio": "Çeşitli Ses",
-  "invasion_audio": "İstila Ses",
-  "spawnpoint_audio": "Spawn Noktası Ses",
-  "device_audio": "Cihaz Ses",
   "access_denied": "Erişim Reddedildi",
   "audio": "Ses",
   "desktop_notifications": "Masaüstü Bildirimleri",
   "notifications_options": "Bildirim Seçenekleri",
-  "audio_always_on": "Ses Her Zaman Çalıyor",
+  "audio_always_on": "Ses Her Zaman Çalar",
   "volume_level": "Ses Seviyesi",
   "notifications_status": "Bildirim Durumu",
-  "granted": "onaylandı",
-  "global_search_invasions": "Grunt Türü, İsim veya Pokemon ödül ismi girin...",
-  "set_all": "Tümünü Ayarla",
-  "set_filtered": "Filtrelenmişleri Ayarla",
+  "granted": "verildi",
+  "set_all": "Hepsini Ayarla",
+  "set_filtered": "Filtrelenmişi Ayarla",
   "only_show_available": "Yalnızca Mevcut Olanları Göster",
   "easy_mode": "Kolay Mod",
-  "quick_select": "Global Hızlı Seçimler",
+  "quick_select": "Küresel Hızlı Seçim",
   "pokemon_filter_mode": "Pokémon Filtre Modu",
   "basic": "Temel",
-  "intermediate": "Orta Düzey",
+  "intermediate": "Orta",
   "expert": "Uzman",
-  "basic_description": "Kolayca Pokémon seçin ve global bir filtre uygulayın",
-  "intermediate_description": "Bireysel filtreleri global ve her Pokémon için ayarlayın (geleneksel)",
-  "expert_description": "En özelleştirme için manuel sorgular",
-  "icon_size": "Simge Boyutu",
+  "basic_description": "Kolayca Pokémon seçin ve küresel bir filtre uygulayın",
+  "intermediate_description": "Bireysel filtreleri küresel olarak ve Pokémon başına ayarlayın (geleneksel)",
+  "expert_description": "En fazla özelleştirme için manuel giriş sorguları",
+  "icon_size": "Simgenin Boyutu",
   "developer": "Geliştirici",
-  "raid_override": "Raid Geçersiz Kılma",
-  "search_rocket_pokemon": "Roket Pokémon Ara",
+  "raid_override": "Baskın Geçersiz Kılma",
+  "search_rocket_pokemon": "Roket Pokémon'larını Ara",
   "main": "Ana",
   "extra": "Ekstra",
   "select": "Seç",
-  "searching": "arama yapıyor...",
-  "no_options": "Seçenek yok..."
+  "searching": "arama...",
+  "no_options": "Seçenek Yok...",
+  "and": "VE",
+  "or": "YA DA",
+  "only_global": "Yalnızca Küresel",
+  "global_caption": "Diğer Tüm Filtreleri Yoksayar",
+  "global_and_individual": "Küresel & Bireysel Filtreler",
+  "gender_filters_all": "Cinsiyet Tümüne Uygulanır",
+  "and_caption": "Birlikte Bağlandı",
+  "or_caption": "Bağımsız Filtreler",
+  "filter_help": "Filtre Yardımı",
+  "kilometers": "Kilometre",
+  "miles": "Mil",
+  "distance_unit": "Mesafe Birimi",
+  "data_management": "Veri Yönetimi",
+  "reset_or_manage_text": "Filtrelerinizi sıfırlayabilir veya bireysel kategorileri sıfırlamanıza izin verecek veri yönetimi sayfasını görüntüleyebilirsiniz.",
+  "reset_audio": "Sesi Sıfırla",
+  "reset_all": "Hepsini Sıfırla",
+  "reset_icons": "Simgeleri Sıfırla",
+  "reset_position": "Konumu Sıfırla",
+  "reset_ui": "Kullanıcı Arayüzünü Sıfırla",
+  "reset_options": "Seçenekleri Sıfırla",
+  "reset_menus": "Menüleri Sıfırla",
+  "reset_settings": "Ayarları Sıfırla",
+  "reset_general_title": "Genel",
+  "reset_filters_title": "Filtreler",
+  "reset_assets": "Varlıkları Sıfırla",
+  "reset_pokemon": "Pokémon'ları Sıfırla",
+  "reset_pokestops": "PokéStop'ları Sıfırla",
+  "reset_gyms": "Spor Salonlarını Sıfırla",
+  "reset_nests": "Yuvaları Sıfırla",
+  "reset_portals": "Portalları Sıfırla",
+  "reset_routes": "Rotaları Sıfırla",
+  "reset_scan_areas": "Tarama Alanlarını Sıfırla",
+  "reset_scan_cells": "Tarama Hücrelerini Sıfırla",
+  "reset_devices": "Cihazları Sıfırla",
+  "reset_weather": "Havayı Sıfırla",
+  "reset_s2cells": "S2 Hücrelerini Sıfırla",
+  "reset_spawnpoints": "Doğuş Noktalarını Sıfırla",
+  "reset_submission_cells": "Gönderim Hücrelerini Sıfırla",
+  "hisuian": "Hisuian",
+  "spacial_rend_range": "Uzaysal Yırtma Menzili"
 }
diff --git a/packages/locales/lib/generated/zh-tw.json b/packages/locales/lib/generated/zh-tw.json
index 43a83dec9..01d5b13c1 100644
--- a/packages/locales/lib/generated/zh-tw.json
+++ b/packages/locales/lib/generated/zh-tw.json
@@ -1,76 +1,76 @@
 {
   "login": "登入",
-  "click_once": "只點擊一次授權",
-  "save": "保存",
-  "reset": "重設",
+  "click_once": "請僅點擊一次「授權」",
+  "save": "儲存",
+  "reset": "重置",
   "close": "關閉",
-  "reset_filters": "重設篩選器",
-  "pokemon_filters": "寵物寶可夢篩選設定",
+  "reset_filters": "重置篩選器",
+  "pokemon_filters": "寶可夢篩選設定",
   "gyms_filters": "道館篩選設定",
-  "pokestops_filters": "PokeStop 篩選設定",
-  "nests_filters": "巢區篩選設定",
+  "pokestops_filters": "補給站篩選設定",
+  "nests_filters": "巢穴篩選設定",
   "help": "幫助",
-  "apply_to_all": "全部應用",
-  "disable_all": "全部禁用",
+  "apply_to_all": "全部適用",
+  "disable_all": "全部停用",
   "enable_all": "全部啟用",
-  "enabled": "啟用",
-  "legacy": "傳世",
-  "id": "ID",
+  "enabled": "已啟用",
+  "legacy": "傳承",
+  "id": "編號",
   "location": "位置",
-  "search_pokemon": "搜尋寵物寶可夢",
-  "search_nests": "搜尋巢區",
+  "search_pokemon": "搜尋寶可夢",
+  "search_nests": "搜尋巢穴",
   "search_gyms": "搜尋道館",
-  "search_pokestops": "搜尋 PokeStop",
-  "search_raids": "搜尋團體戰",
+  "search_pokestops": "搜尋補給站",
+  "search_raids": "搜尋突襲戰",
   "search_eggs": "搜尋蛋",
   "search_quests": "搜尋任務",
   "search_lures": "搜尋誘餌",
-  "search_invasions": "搜尋入侵事件",
-  "sm": "sm",
-  "md": "md",
-  "lg": "lg",
-  "xl": "XL",
+  "search_invasions": "搜尋入侵",
+  "sm": "小",
+  "md": "中",
+  "lg": "大",
+  "xl": "特大",
   "min": "最小",
   "max": "最大",
   "set_size": "設定圖示大小",
-  "slot_selection": "插槽選擇",
+  "slot_selection": "選擇欄位",
   "generations": "世代",
-  "types": "屬性",
-  "forms": "外觀",
-  "rarity": "稀有度",
+  "types": "類型",
+  "forms": "形態",
+  "rarity": "目前稀有度",
   "others": "其他",
-  "categories": "類別",
+  "categories": "分類",
   "rank": "排名",
-  "slider_iv": "個體值範圍",
-  "slider_great": "傑出聯盟",
-  "slider_ultra": "超級聯盟",
-  "slider_little": "小盃聯盟",
-  "slider_atk_iv": "攻擊值",
-  "slider_def_iv": "防禦值",
-  "slider_sta_iv": "體力值",
+  "slider_iv": "IV範圍",
+  "slider_great": "超級聯盟",
+  "slider_ultra": "高級聯盟",
+  "slider_little": "小小盃",
+  "slider_atk_iv": "攻擊",
+  "slider_def_iv": "防禦",
+  "slider_sta_iv": "耐力",
   "slider_level": "等級",
   "slider_size": "大小",
-  "abbreviation_level": "L",
+  "abbreviation_level": "等",
   "lvl": "等級",
   "cap": "上限",
-  "custom": "自定義",
+  "custom": "自訂",
   "valid": "有效",
   "invalid": "無效！",
-  "overwrites": "覆寫所有篩選器",
-  "valid_filter": "有效的屬性篩選器",
-  "invalid_filter": "輸入有效的篩選器",
+  "overwrites": "覆蓋所有篩選器",
+  "valid_filter": "有效的統計篩選器",
+  "invalid_filter": "請輸入有效的篩選器",
   "gyms": "道館",
-  "nests": "巢區",
-  "pokestops": "PokeStop",
-  "pokemon": "寵物寶可夢",
-  "wayfarer": "Wayfarer",
+  "nests": "巢穴",
+  "pokestops": "補給站",
+  "pokemon": "寶可夢",
+  "wayfarer": "導遊",
   "scan_areas": "掃描區域",
-  "s2cells": "S2 區域",
+  "s2cells": "S2細胞",
   "weather": "天氣",
-  "admin": "管理員",
-  "settings": "設置",
-  "advanced": "高級",
-  "tile_servers": "地圖伺服器",
+  "admin": "管理",
+  "settings": "設定",
+  "advanced": "進階",
+  "tile_servers": "圖磚服務",
   "icons": "圖示",
   "navigation": "導航",
   "drawer": "抽屜",
@@ -81,279 +81,294 @@
   "import": "導入",
   "export": "導出",
   "logout": "登出",
-  "local_storage_cleared": "本地存儲已清除！",
-  "iv_or_filter": "個體值或篩選器",
+  "local_storage_cleared": "本地儲存已被清除！",
+  "iv_or_filter": "IV或篩選器",
   "polygons": "多邊形",
-  "raids": "團體戰",
-  "ex_eligible": "符合條件的激戰",
+  "raids": "突襲戰",
+  "ex_eligible": "EX合格",
   "in_battle": "戰鬥中",
-  "all_pokestops": "所有 PokeStop",
+  "all_pokestops": "所有補給站",
   "lures": "誘餌",
   "quests": "任務",
-  "invasions": "入侵事件",
-  "portals": "門戶",
-  "submission_cells": "提交區域",
+  "invasions": "入侵",
+  "portals": "傳送門",
+  "submission_cells": "提交細胞",
   "spawnpoint": "生成點",
   "spawnpoints": "生成點",
-  "s2_cell_level": "第 {{level}} 級 S2 區域",
-  "total_count": "總數量",
+  "s2_cell_level": "等級{{level}}的S2細胞",
+  "total_count": "總數",
   "next_submission": "下一次提交！",
-  "never": "永不",
+  "never": "從未",
   "next_gym": "下一個道館",
-  "scan_cells": "掃描區域",
+  "scan_cells": "掃描細胞",
   "devices": "設備",
   "use_my_location": "使用我的位置",
-  "submit_feedback_title": "提交意見/錯誤報告",
-  "use_the_link_below": "您可以使用下方的鏈接提交意見或報告任何錯誤。",
-  "feedback_to_devs": "該意見直接發送至開發人員。",
-  "feedback_form": "意見反饋表格",
-  "unknown_pokestop": "未知 PokeStop 名稱",
+  "submit_feedback_title": "提交反饋/錯誤報告",
+  "use_the_link_below": "您可以使用下面的鏈接提交反饋或您遇到的任何錯誤。",
+  "feedback_to_devs": "這個反饋將直接發送給開發者。",
+  "feedback_form": "反饋表單",
+  "unknown_pokestop": "未知補給站名稱",
   "unknown_gym": "未知道館名稱",
   "exclude": "排除",
   "exclude_quest": "排除任務",
-  "exclude_invasion": "排除入侵事件",
+  "exclude_invasion": "排除入侵",
   "exclude_team": "排除隊伍",
-  "exclude_raid": "排除團體戰",
+  "exclude_raid": "排除突襲",
   "exclude_lure": "排除誘餌",
   "timer": "計時器",
   "hide": "隱藏",
-  "tier": "層級",
-  "slots": "插槽",
-  "mega": "超級寶可夢",
-  "form": "外觀",
+  "tier": "等級",
+  "slots": "空位",
+  "mega": "超級進化",
+  "form": "形態",
   "starts": "開始",
   "ends": "結束",
-  "defender": "守衛者",
-  "cp": "寶可夢 CP",
-  "kilogram": "千克",
-  "meter": "米",
-  "total_cp": "總 CP",
-  "first_seen": "首次出現",
-  "last_seen": "最後出現",
+  "defender": "防守者",
+  "cp": "CP值",
+  "kilogram": "公斤",
+  "meter": "公尺",
+  "total_cp": "總CP值",
+  "first_seen": "首次發現",
+  "last_seen": "最後發現",
   "last_modified": "最後修改",
   "last_updated": "最後更新",
   "imported": "已導入",
-  "nest_estimated": "巢區數據是估計的！",
-  "verify_nests": "通過檢查當前生成點來驗證",
-  "nest_out_of_date": "巢區可能已過時！",
-  "nest_check_current": "檢查當前生成點",
-  "spawns_per_hour": "每小時生成數",
+  "nest_estimated": "巢穴數據為估計值！",
+  "verify_nests": "通過檢查當前的出現驗證",
+  "nest_out_of_date": "巢穴可能已過時！",
+  "nest_check_current": "改為檢查當前的出現",
+  "spawns_per_hour": "每小時出現次數",
   "teams": "隊伍",
   "eggs": "蛋",
   "reverse": "反轉",
   "selected": "已選擇",
   "unselected": "未選擇",
-  "only_available": "可用",
-  "common": "普通",
+  "only_available": "僅可用",
+  "common": "常見",
   "uncommon": "罕見",
   "rare": "稀有",
-  "ultra_rare": "超稀有",
-  "regional": "區域",
+  "ultra_rare": "極罕見",
+  "regional": "地區",
   "event": "活動",
   "legendary": "傳說",
-  "mythical": "神秘",
-  "ultra_beast": "超獸",
-  "alt_forms": "另類形態",
+  "mythical": "神話",
+  "ultra_beast": "究極異獸",
+  "alt_forms": "其他形態",
   "alola": "阿羅拉",
   "galarian": "伽勒爾",
   "showing": "顯示",
   "instance": "實例",
   "online": "在線",
   "offline": "離線",
-  "boosted_types": "增強的屬性",
-  "pokemon_options": "寵物寶可夢選項",
-  "pokestops_options": "PokeStop 選項",
+  "boosted_types": "增強類型",
+  "pokemon_options": "寶可夢選項",
+  "pokestops_options": "寶可夢補給站選項",
   "gyms_options": "道館選項",
-  "nests_options": "巢區選項",
-  "wayfarer_options": "Wayfarer 選項",
-  "admin_options": "管理員選項",
+  "nests_options": "巢穴選項",
+  "wayfarer_options": "探險家選項",
+  "admin_options": "管理選項",
   "weather_options": "天氣選項",
-  "s2cells_options": "S2 區域選項",
-  "clustering": "聚合",
+  "s2cells_options": "S2 Cell選項",
+  "clustering": "聚類",
   "glow": "發光",
-  "legacy_filter": "傳世篩選器",
-  "raid_timers": "所有團體戰計時器",
-  "invasion_timers": "所有入侵事件計時器",
+  "legacy_filter": "傳統過濾器",
+  "raid_timers": "所有突襲計時器",
+  "invasion_timers": "所有入侵計時器",
   "lure_timers": "所有誘餌計時器",
   "device_path_color": "設備路徑顏色",
-  "old_portals": "舊門戶",
-  "new_portals": "新門戶",
-  "items": "道具",
+  "old_portals": "舊傳送門",
+  "new_portals": "新傳送門",
+  "items": "物品",
   "energy": "能量",
-  "ar_eligible": "AR 可用",
-  "iv_circles": "個體值指示器",
-  "min_iv_circle": "最低圓形IV",
+  "ar_eligible": "AR適配",
+  "iv_circles": "IV指示器",
+  "min_iv_circle": "最小IV指示器",
   "interaction_ranges": "互動範圍",
-  "cannot_connect": "\n現在無法連線到伺服器。\n立即重試只會引起更多問題。\n請稍後幾分鐘再試。\n\n- 地圖管理團隊",
-  "mad_quest_text": "本地任務",
-  "xs": "極小",
+  "cannot_connect": "\n目前無法連接伺服器。\n立即重試只會導致更多問題。\n請幾分鐘後再試。\n\n- 地圖管理團隊",
+  "mad_quest_text": "原生任務",
+  "xs": "XS",
   "primary": "主要",
   "secondary": "次要",
   "zero_iv": "0% IV",
   "hundo_iv": "100% IV",
-  "open_menu": "打開菜單",
+  "open_menu": "開啟菜單",
   "zoom_in": "放大",
   "zoom_out": "縮小",
   "welcome": "歡迎來到",
   "back": "返回",
-  "next": "下一步",
+  "next": "下一個",
   "finish": "完成",
   "start_tutorial": "開始教程",
-  "view_profile": "查看個人檔案",
-  "login_optional": "登錄（可選）",
-  "tutorial": "教程",
-  "tutorial_language": "選擇語言",
-  "tutorial_welcome": "這個教程是互動式的，我們鼓勵你使用所有提供的選項進行操作",
-  "tutorial_categories": "你可以使用的類別",
-  "tutorial_logged_in": "你可以通過查看個人檔案了解你的權限詳情",
-  "tutorial_logged_out": "你可以通過登錄了解你的權限詳情",
-  "tutorial_sidebar_0": "你所有的過濾器和設置都在這裡",
-  "tutorial_sidebar_1": "對於每個類別，你可以使用開關精確地控制所需的數據",
-  "tutorial_sidebar_2": "選項: 額外的自定義\n高級功能: 我們稍後會在本教程中介紹",
-  "tutorial_sliders_0": "使用滑塊調整過濾器",
-  "tutorial_sliders_1": "在以下IV值之間的寶可夢：",
-  "tutorial_sliders_2": "- IVs {{iv0}}% 到 {{iv1}}%",
-  "tutorial_sliders_3": "等級 {{level0}} 到 {{level1}}",
-  "tutorial_sliders_3alt": "- 而且等級為 {{level0}} 到 {{level1}}",
-  "tutorial_sliders_4": "- 優秀聯盟名次 {{gl0}} 到 {{gl1}}",
-  "tutorial_sliders_4alt": "- 或優秀聯盟名次 {{gl0}} 到 {{gl1}}",
-  "tutorial_sliders_5": "- 超級聯盟名次 {{ul0}} 到 {{ul1}}",
-  "tutorial_sliders_5alt": "- 或超級聯盟名次 {{ul0}} 到 {{ul1}}",
-  "tutorial_sliders_6": "與相同顏色的其他連鎖",
-  "tutorial_sliders_7": "與其他滑塊分開過濾",
-  "tutorial_sliders_8": "「全」滑塊表示已禁用：",
-  "tutorial_sliders_9": "所有生成物，無論是否進行IV檢查",
-  "tutorial_help": "快捷訪問該菜單",
-  "tutorial_adv_filter": "僅限手機使用，打開高級菜單的過濾選項",
-  "tutorial_tune": "設置菜單中所有目前進行過濾程序的高級過濾器",
-  "tutorial_format_size": "設置菜單中所有目前進行過濾程序的圖示大小",
-  "tutorial_check": "啟用菜單中所有目前進行過濾程序的項目",
-  "tutorial_clear": "禁用菜單中所有目前進行過濾程序的項目",
+  "view_profile": "查看個人資料",
+  "login_optional": "登入（選填）",
+  "tutorial": "教學",
+  "tutorial_language": "選擇您的語言",
+  "tutorial_welcome": "這個教學是互動式的，我們非常鼓勵您使用所有提供的選項",
+  "tutorial_categories": "您可以訪問的分類",
+  "tutorial_logged_in": "您可以通過查看個人資料來查看您的權限詳情。",
+  "tutorial_logged_out": "您可以通過登入來查看您的權限詳情。",
+  "tutorial_sidebar_0": "您所有的過濾器和設置都在這裡",
+  "tutorial_sidebar_1": "在每個類別中，您可以使用開關來精確控制您想要的數據",
+  "tutorial_sidebar_2": "選項：額外的自定義\n進階：我們將在本教程後面介紹",
+  "tutorial_sliders_0": "使用滑桿調整過濾器",
+  "tutorial_sliders_1": "寶可夢範圍：",
+  "tutorial_sliders_2": "- IV值 {{iv0}}% 至 {{iv1}}%",
+  "tutorial_sliders_3": "等級 {{level0}} 至 {{level1}}",
+  "tutorial_sliders_3alt": "- 且等級在 {{level0}} 至 {{level1}}",
+  "tutorial_sliders_4": "- 超級聯盟排名 {{gl0}} 至 {{gl1}}",
+  "tutorial_sliders_4alt": "- 或超級聯盟排名 {{gl0}} 至 {{gl1}}",
+  "tutorial_sliders_5": "- 極限聯盟排名 {{ul0}} 至 {{ul1}}",
+  "tutorial_sliders_5alt": "- 或極限聯盟排名 {{ul0}} 至 {{ul1}}",
+  "tutorial_sliders_6": "與同色的其他滑桿連鎖",
+  "tutorial_sliders_7": "與其他滑桿獨立過濾",
+  "tutorial_sliders_8": "「滿」的滑桿表示它被禁用：",
+  "tutorial_sliders_9": "所有出現的寶可夢，不論是否檢查了IV值",
+  "tutorial_help": "這個菜單的快捷方式",
+  "tutorial_adv_filter": "僅限手機，打開進階菜單的過濾選項",
+  "tutorial_tune": "為目前在菜單中被過濾的所有寶可夢設置進階過濾",
+  "tutorial_format_size": "設置目前在菜單中被過濾的所有項目的圖標大小",
+  "tutorial_check": "啟用目前在菜單中被過濾的所有項目",
+  "tutorial_clear": "禁用目前在菜單中被過濾的所有項目",
   "tutorial_save": "保存當前選擇並退出",
-  "tutorial_show_all_view": "切換顯示 PokéStop 和健身房",
-  "tutorial_show_pokemon_view": "切換顯示寶可夢",
-  "tutorial_toggle": "點擊 勾選/取消 勾選來切換項目",
-  "tutorial_pokemon_caption": "該圖示可讓您為該特定寶可夢設置過濾器",
-  "tutorial_all_caption": "團隊具有特殊的選擇菜單\n所有其他項目可讓您調整圖示大小",
-  "tutorial_popup_0": "現在彈出視窗是互動式的！",
-  "tutorial_popup_1": "三個點打開隱藏，排除和切換計時器選項",
-  "tutorial_popup_2": "導航鏈接兩側的圖示會展開，顯示其他信息，試試看！",
-  "tutorial_popup_3": "每個類別的圖示不同，請一定要查看它們所有的",
-  "tutorial_closing_0": "其他信息",
-  "tutorial_closing_1": "側邊欄中的全局寶可夢滑塊與高級菜單分開操作，彼此不互相影響",
-  "tutorial_closing_2": "請務必查看側邊欄中的設置部分",
-  "tutorial_closing_3": "每個類別都有很多美學選項，但請記住，你添加到地圖上的越多，地圖凍結的機會就越高",
-  "tutorial_closing_4": "你可以在側邊欄的設置面板中選擇此教程重新查看",
-  "tutorial_closing_5": "注意安全，祝你好運！",
+  "tutorial_show_all_view": "切換訓練場 & 道館的顯示",
+  "tutorial_show_pokemon_view": "切換寶可夢的顯示",
+  "tutorial_toggle": "點擊勾選/叉號來切換項目",
+  "tutorial_pokemon_caption": "這個圖標讓你為特定的寶可夢設置過濾條件",
+  "tutorial_all_caption": "隊伍有一個特別的槽位菜單\n所有其他項目讓您調整圖標大小",
+  "tutorial_popup_0": "彈出窗現在可互動了！",
+  "tutorial_popup_1": "三個點開啟隱藏、排除和切換計時器選項",
+  "tutorial_popup_2": "導航鏈接兩邊的圖標會擴展以顯示額外信息，試試看！",
+  "tutorial_popup_3": "每個類別的圖標不同，務必全部查看",
+  "tutorial_closing_0": "附加資訊",
+  "tutorial_closing_1": "側邊欄中的全域寶可夢滑桿操作與進階菜單分開，互不影響",
+  "tutorial_closing_2": "務必查看側邊欄中的設置部分",
+  "tutorial_closing_3": "每個類別都有許多美學選項可用，但請記住，您添加到地圖上的內容越多，地圖凍結的機會就越高",
+  "tutorial_closing_4": "您可以通過在側邊欄的設置面板中選擇來再次查看此教程",
+  "tutorial_closing_5": "保持安全，祝您好運！",
   "intro": "介紹",
   "sidebar": "側邊欄",
-  "sliders": "滑塊",
-  "popups": "彈出視窗",
+  "sliders": "滑桿",
+  "popups": "彈出窗口",
   "closing": "結束",
-  "shortcuts": "快捷方式",
+  "shortcuts": "快捷鍵",
   "iv": "IV",
   "area_restrictions": "區域限制",
   "map": "地圖",
   "stats": "統計",
   "pvp": "PVP",
   "area_restrictions_subtitle": "您可以訪問這些區域",
-  "devices_subtitle": "顯示活躍設備位置和路線",
-  "gyms_subtitle": "顯示所有活躍健身房位置、活躍隊伍和每個健身房可用的欄位數",
+  "devices_subtitle": "顯示活躍的設備位置和路線",
+  "gyms_subtitle": "顯示所有活躍的道館位置、活躍隊伍和每個道館可用的空位數",
   "invasions_subtitle": "顯示火箭隊入侵信息，包括戰鬥陣容、到期時間和可能的獎勵",
   "iv_subtitle": "顯示IV%和發光選項",
   "lures_subtitle": "顯示誘餌信息，包括誘餌類型和到期時間",
   "map_subtitle": "顯示地圖",
-  "nests_subtitle": "顯示正在孵化的寶可夢和巢區範圍",
-  "pokemon_subtitle": "顯示所有寶可夢位置和到期時間",
-  "pokestops_subtitle": "顯示所有 PokéStop 位置",
-  "portals_subtitle": "顯示所有 Ingress 傳送門",
-  "pvp_subtitle": "顯示每個寶可夢的PVP名次/戰力/等級信息",
-  "quests_subtitle": "顯示任務獎勵和任務信息",
-  "raids_subtitle": "顯示所有團體戰信息，包括團體戰首領、蛋、到期時間和招式",
-  "scan_cells_subtitle": "顯示上次S2單元被設備掃描的時間",
-  "scan_areas_subtitle": "顯示可用的掃描區域範圍",
-  "spawnpoints_subtitle": "顯示出現點和預估消失時間",
-  "stats_subtitle": "顯示寶可夢的數據和等級",
-  "submission_cells_subtitle": "顯示有關提交新的 POI 的信息",
-  "weather_subtitle": "顯示遊戲中每個區域的天氣信息",
+  "nests_subtitle": "顯示活躍的寶可夢巢穴和巢穴多邊形",
+  "pokemon_subtitle": "顯示所有寶可夢的位置和到期時間",
+  "pokestops_subtitle": "顯示所有訓練場的位置",
+  "portals_subtitle": "顯示所有入口點",
+  "pvp_subtitle": "顯示每隻寶可夢的PVP排名/CP值/等級資訊",
+  "quests_subtitle": "顯示任務獎勵和任務資訊",
+  "raids_subtitle": "顯示所有的團體戰資訊，包含團體戰首領、蛋、結束時間和招式組合",
+  "scan_cells_subtitle": "顯示S2區域最後一次被掃描的時間",
+  "scan_areas_subtitle": "顯示可用的掃描區域多邊形",
+  "spawnpoints_subtitle": "顯示出現點和它們估計的消失時間",
+  "stats_subtitle": "顯示寶可夢的統計數據和等級",
+  "submission_cells_subtitle": "顯示適用於提交新興趣點的資訊",
+  "weather_subtitle": "顯示每個區域中遊戲內的天氣資訊",
   "scanner_subtitle": "以各種方式直接與掃描器互動",
-  "s2cells_subtitle": "在地圖上顯示不同級別的 S2 單元格",
-  "backups_subtitle": "可以在設備之間進行備份和加載設置",
+  "s2cells_subtitle": "在地圖上以各種等級顯示S2細胞",
+  "backups_subtitle": "允許跨設備備份和載入設定",
   "backups": "備份",
-  "user_profile": "用戶資料",
+  "user_profile": "用戶檔案",
   "user_username": "用戶名",
   "candy": "糖果",
-  "show_ex_badge": "顯示 EX 徽章",
+  "show_ex_badge": "顯示EX徽章",
   "search": "搜索",
   "global_search_quests": "輸入獎勵名稱...",
   "global_search_lures": "輸入誘餌名稱...",
-  "global_search_pokestops": "輸入 PokéStop 名稱...",
-  "global_search_gyms": "輸入 Gym 名稱...",
-  "global_search_portals": "輸入 Portal 名稱...",
+  "global_search_pokestops": "輸入補給站名稱...",
+  "global_search_gyms": "輸入健身房名稱...",
+  "global_search_portals": "輸入傳送門名稱...",
   "global_search_nests": "輸入巢穴寶可夢名稱...",
-  "global_search_raids": "輸入團體戰魔獸名稱...",
+  "global_search_raids": "輸入團體戰首領名稱...",
   "global_search_pokemon": "輸入寶可夢名稱...",
+  "global_search_invasions": "輸入侵略者類型、名稱或寶可夢獎勵名稱...",
   "raid_level_badges": "團體戰等級徽章",
   "options": "選項",
-  "profile": "個人資料",
+  "profile": "檔案",
   "pokemon_icons": "寶可夢圖標",
-  "pokestop_icons": "PokéStop 圖標",
-  "gym_icons": "Gym 圖標",
+  "pokestop_icons": "補給站圖標",
+  "gym_icons": "健身房圖標",
   "team_icons": "隊伍圖標",
   "egg_icons": "蛋圖標",
   "raid_icons": "團體戰圖標",
   "nest_icons": "巢穴圖標",
   "reward_icons": "獎勵圖標",
-  "type_icons": "屬性圖標",
+  "type_icons": "類型圖標",
   "weather_icons": "天氣圖標",
-  "misc_icons": "其他圖標",
-  "invasion_icons": "入侵圖標",
+  "misc_icons": "雜項圖標",
+  "invasion_icons": "侵略圖標",
   "spawnpoint_icons": "出現點圖標",
   "device_icons": "設備圖標",
+  "pokemon_audio": "寶可夢音效",
+  "pokestop_audio": "補給站音效",
+  "gym_audio": "健身房音效",
+  "team_audio": "隊伍音效",
+  "egg_audio": "蛋音效",
+  "raid_audio": "團體戰音效",
+  "nest_audio": "巢穴音效",
+  "reward_audio": "獎勵音效",
+  "type_audio": "類型音效",
+  "weather_audio": "天氣音效",
+  "misc_audio": "雜項音效",
+  "invasion_audio": "侵略音效",
+  "spawnpoint_audio": "出現點音效",
+  "device_audio": "設備音效",
   "pokemon_timers": "所有寶可夢計時器",
-  "show_dex_num_in_popup": "在彈出窗口中顯示圖鑒編號",
-  "popup": "彈出窗口",
-  "pvp_level": "第{{level}}級PVP數據",
-  "pvp_mega": "巨大進化PVP數據",
-  "webhook_entry": "添加到{{name}}",
+  "show_dex_num_in_popup": "在彈出視窗顯示圖鑑編號",
+  "popup": "彈出視窗",
+  "pvp_level": "{{level}} 等級 PVP 統計資料",
+  "pvp_mega": "超級PVP統計資料",
+  "webhook_entry": "添加至{{name}}",
   "remove_webhook_entry": "從{{name}}移除",
   "distance": "距離",
-  "gym": "Gym",
+  "gym": "健身房",
   "egg": "蛋",
   "raid": "團體戰",
   "lure": "誘餌",
   "quest": "任務",
-  "invasion": "入侵",
+  "invasion": "侵略",
   "nest": "巢穴",
-  "pokestop": "PokéStop",
+  "pokestop": "補給站",
   "team": "隊伍",
   "global": "全球",
   "manage_webhook": "管理{{name}}",
-  "drag_and_drop": "拖放標記以設置您的位置",
-  "click_to_select": "點擊選擇",
-  "add_new": "新增{{category}}提醒",
+  "drag_and_drop": "拖曳標記以設置您的位置",
+  "click_to_select": "點擊以選擇",
+  "add_new": "添加新的{{category}}警報",
   "my_location": "我的位置",
   "choose_on_map": "在地圖上選擇",
-  "select_profile": "選擇個人資料",
+  "select_profile": "選擇檔案",
   "distance_radius": "預覽半徑距離",
   "areas": "區域",
   "select_webhook": "選擇機器人",
-  "ar_quest_true": "增強現實任務",
-  "ar_quest_false": "無增強現實",
-  "with_ar": "使用增強現實",
+  "ar_quest_true": "AR任務",
+  "ar_quest_false": "無AR",
+  "with_ar": "包含AR",
   "both": "兩者",
-  "without_ar": "不使用增強現實",
-  "exclude_quest_multi": "排除{{reward}}",
-  "cluster_limit_0": "已達到{{variable_0}}限制（{{variable_1}}）",
-  "cluster_limit_1": "請縮小範圍或縮小篩選條件",
+  "without_ar": "無AR",
+  "exclude_quest_multi": "排除 {{reward}}",
+  "cluster_limit_0": "{{variable_0}} 限制（{{variable_1}}）已達到",
+  "cluster_limit_1": "請放大或縮小篩選條件",
   "show_polygons": "顯示多邊形",
-  "exclude_invasion_multi": "排除{{invasion}}",
+  "exclude_invasion_multi": "排除 {{invasion}}",
   "stardust": "星塵",
-  "slider_cp": "CP",
-  "pvp_ranking_league": "聯賽",
-  "pvp_ranking_min_cp": "最低CP",
+  "slider_cp": "CP值",
+  "pvp_ranking_league": "聯盟",
+  "pvp_ranking_min_cp": "最小CP",
   "slider_pvp": "排名",
-  "profile_no": "無個人資料",
+  "profile_no": "個人檔案",
   "template": "模板",
   "gender": "性別",
   "clean": "清除",
@@ -362,34 +377,34 @@
   "no_iv": "包括無IV",
   "by_distance": "按距離",
   "min_time": "最短時間",
-  "add_new_profile": "新增個人資料",
+  "add_new_profile": "新增個人檔案",
   "slider_none": "無",
-  "non_registered_human_title": "哎呀，出了點問題！",
-  "non_registered_human_desc": "您可能未在{{webhook}}上註冊\n或服務器目前無法訪問",
+  "non_registered_human_title": "哎呀，出了些問題！",
+  "non_registered_human_desc": "您可能未在 {{webhook}} 註冊\n或伺服器目前無法連線",
   "try_again_later": "請稍後再試",
-  "selected_areas": "{{amount}}個區域已選擇",
-  "selected_areas_plural": "已選擇{{amount}}個區域",
-  "webhook_selection": "{{name}}選擇",
-  "message_of_the_day": "每日消息",
-  "has_quest_indicator": "具有任務的 PokéStop 的替代顏色",
+  "selected_areas_one": "{{count}} 個區域已選擇",
+  "selected_areas_other": "{{count}} 個區域已選擇",
+  "webhook_selection": "{{name}} 選擇",
+  "message_of_the_day": "今日消息",
+  "has_quest_indicator": "任務站點使用替代顏色",
   "show_ar_badge": "顯示AR徽章",
-  "all_gyms": "所有Gym",
+  "all_gyms": "所有道館",
   "general": "一般",
   "server_dev_error_0": "{{variable_0}}",
-  "link_global_and_advanced": "鏈接全球和高級",
+  "link_global_and_advanced": "全球選擇尊重",
   "normal_forms": "普通形態",
-  "weather_indicator": "天氣加成指示器",
-  "page": "第{{page}}頁",
+  "weather_indicator": "天氣加成指示",
+  "page": "頁面 {{page}}",
   "navigation_controls": "導航控制",
   "navigation_controls_react": "React",
   "navigation_controls_leaflet": "Leaflet",
-  "exclusive": "專屬",
-  "all_moves": "所有技能",
-  "move": "技能",
-  "any": "任意",
-  "min_spawn_average": "最低刷新率",
-  "select_all": "全選",
-  "delete_all": "刪除所選項目",
+  "exclusive": "獨家",
+  "all_moves": "所有招式",
+  "move": "招式",
+  "any": "任何",
+  "min_spawn_average": "最小生成率",
+  "select_all": "選擇全部",
+  "delete_all": "刪除選定項目",
   "cancel": "取消",
   "day_1": "星期一",
   "day_2": "星期二",
@@ -398,313 +413,306 @@
   "day_5": "星期五",
   "day_6": "星期六",
   "day_7": "星期日",
-  "profile_name": "個人資料名稱",
-  "manage_profiles": "管理個人資料",
-  "min_spawn_avg": "最低平均刷新",
-  "poke_global": "所有寶可夢",
+  "profile_name": "個人檔案名稱",
+  "manage_profiles": "管理個人檔案",
+  "min_spawn_avg": "平均最小生成",
+  "poke_global": "全部",
   "amount": "數量",
-  "specific_gym": "特定 Gym",
+  "specific_gym": "特定道館",
   "search_location": "搜索地點",
-  "search_specific": "搜索特定{{category}}",
-  "webhook_success_gym": "已添加團體戰、蛋和隊伍更改提醒！",
-  "slot_changes": "插槽變化",
-  "slot_changes_poracle": "插槽變化",
-  "confirm_delete": "這將刪除該個人資料的所有追蹤記錄，是否確定？",
-  "confirm_copy": "選擇要將\"{{profile}}\"複製到的個人資料，這將完全覆蓋該個人資料。",
-  "webhook_error": "{{name}}無法處理該請求。\n請稍後再試。",
+  "search_specific": "搜索特定 {{category}}",
+  "webhook_success_gym": "突襲、蛋和隊伍變化提醒已添加！",
+  "slot_changes": "槽位變化",
+  "slot_changes_poracle": "槽位變化",
+  "confirm_delete": "這將移除此個人檔案的所有跟蹤，您確定嗎？",
+  "confirm_copy": "選擇您希望將 \"{{profile}}\" 複製到哪個檔案，這將完全覆蓋那個檔案。",
+  "webhook_error": "{{name}} 無法處理。\n請稍後再試。",
   "profile_error": "必須是唯一且有效的",
   "team_0": "和諧",
   "battle_changes": "戰鬥中",
-  "battle_changes_poracle": "battle_changes",
+  "battle_changes_poracle": "戰鬥變化",
   "auto": "自動",
-  "webhooks_subtitle": "直接從地圖管理您的警報",
-  "event_stops_subtitle": "顯示特殊活動的寶可夢停靠站，如為顫抖",
+  "webhooks_subtitle": "從地圖直接管理您的警報這些機器人",
+  "event_stops_subtitle": "顯示特殊活動的寶可夢補給站，如Kecleon",
   "webhooks": "警報",
   "scanner": "掃描器操作",
   "everything_individually": "添加個別警報",
   "individually": "個別",
   "join": "加入",
-  "errors_404": "哎呀，找不到此頁面！",
-  "errors_500": "伺服器錯誤，請稍後再試！",
-  "local_username": "使用者名稱",
+  "errors_404": "哎呀，找不到這個頁面！",
+  "errors_500": "伺服器出錯，稍後再試！",
+  "local_username": "用戶名",
   "local_password": "密碼",
   "local_error": "出現錯誤，請稍後再試！",
-  "no_filter_results": "找不到結果\n嘗試擴大您的篩選條件",
-  "donor_page": "捐贈者頁面",
+  "no_filter_results": "未找到結果\n嘗試擴大您的篩選條件",
+  "donor_page": "捐贈頁面",
   "go_back": "返回",
-  "access": "存取",
-  "link_discord": "連結Discord",
-  "select_webhook_strategy": "警報管理器",
-  "webhook_strategy_success_0": "成功！正在重新整理以取得警報設定...",
+  "access": "訪問",
+  "link_discord": "連接 Discord",
+  "select_webhook_strategy": "警報管理",
+  "webhook_strategy_success_0": "成功！正在刷新以獲取警報設定...",
   "register": "註冊",
-  "invalid_credentials": "無效的憑證",
-  "error_creating_user": "無法註冊新使用者",
-  "discord_linked": "已連結Discord",
-  "telegram_linked": "已連結Telegram",
+  "invalid_credentials": "憑證無效",
+  "localauth_failed": "認證失敗",
+  "error_creating_user": "目前無法註冊新用戶",
+  "discord_linked": "已連接 Discord",
+  "telegram_linked": "已連接 Telegram",
   "level": "等級",
   "km": "公里",
-  "feedback": "回饋",
-  "donor_menu": "捐贈者選單",
-  "pokemon_cell": "寶可夢的位置可能有所不同",
+  "feedback": "反饋",
+  "donor_menu": "捐贈者菜單",
+  "pokemon_cell": "寶可夢的位置可能會有變化",
   "timer_verified": "此計時器已驗證",
-  "timer_unverified": "此計時器未驗證",
+  "timer_unverified": "此計時器未經驗證",
   "all": "全部",
   "badge_0": "無",
   "badge_1": "銅",
   "badge_2": "銀",
   "badge_3": "金",
-  "gym_badge_menu": "編輯道館徽章",
-  "gym_badges": "道館徽章",
-  "gym_badge_diamonds": "顯示道館徽章",
-  "gym_badges_subtitle": "在地圖上顯示道館徽章以及在個人資料頁面上的清單。",
-  "confirm_filters_reset": "重置篩選條件",
-  "filters_reset_text": "您確定要將設定重置為預設值嗎？此操作無法撤消！",
-  "filters_reset_title": "重置篩選條件",
+  "gym_badge_menu": "編輯健身房徽章",
+  "gym_badges": "健身房徽章",
+  "gym_badge_diamonds": "顯示健身房徽章",
+  "gym_badges_subtitle": "在地圖上和個人資料頁面中顯示健身房徽章。",
+  "confirm_filters_reset": "重置篩選器",
+  "filters_reset_text": "您確定要將設定重置為預設值嗎？這無法撤銷！",
+  "filters_reset_title": "重置篩選器",
   "raid_quick_select": "快速選擇",
-  "disabled": "已停用",
-  "loading": "載入中{{category}}",
-  "loading_icons": "正在取回圖示",
-  "loading_invasions": "正在取回入侵資訊",
+  "disabled": "已禁用",
+  "loading": "正在加載 {{category}}",
+  "loading_icons": "正在獲取圖標",
+  "loading_invasions": "正在獲取入侵信息",
   "scan_next": "掃描位置",
-  "scan_next_choose": "拖放標記以設定掃描位置",
+  "scan_next_choose": "拖放標記以設置掃描位置",
   "scan_zone": "掃描區域",
-  "scan_zone_choose": "拖放標記以設定掃描位置並選擇大小",
+  "scan_zone_choose": "拖放標記以設置掃描位置並選擇大小",
   "scan_zone_size": "大小",
   "scan_zone_range": "範圍",
   "scan_zone_spacing": "間距",
   "scan_zone_radius": "半徑",
   "scan_requests": "掃描請求",
-  "scan_queue": "目前佇列",
-  "click_to_scan": "在此掃描",
-  "scan_confirmed_title": "確認掃描需求",
-  "scan_confirmed": "已派遣工作人員前往該位置，結果將很快顯示在地圖上！",
+  "scan_queue": "當前隊列",
+  "click_to_scan": "在此處掃描",
+  "scan_confirmed_title": "掃描需求已確認",
+  "scan_confirmed": "工人已被派往地點，結果將很快顯示在地圖上！",
   "scan_loading_title": "正在發送掃描請求",
   "scan_loading": "您的掃描請求正在處理並發送至系統！",
   "scan_error_title": "錯誤",
-  "scan_error": "處理掃描請求時發生錯誤...",
-  "scan_outside_area": "此位置超出授權區域的範圍",
+  "scan_error": "處理掃描請求時出現錯誤...",
+  "scan_outside_area": "此位置位於授權區域的邊界之外",
   "pvp_ranking_cap": "等級",
-  "lc_title": "蹤跡位置",
-  "lc_metersUnit": "公尺",
-  "lc_feetUnit": "英呎",
-  "lc_popup": "您距離此點位{distance}{unit}",
-  "lc_outsideMapBoundsMsg": "您似乎位於地圖的邊界之外",
-  "no_alerts": "找不到警報",
-  "loading_settings": "載入設定",
-  "refresh_to_continue": "請先刷新再繼續",
+  "lc_title": "跟隨您的位置",
+  "lc_metersUnit": "米",
+  "lc_feetUnit": "英尺",
+  "lc_popup": "您距離該點 {distance} {unit}",
+  "lc_outsideMapBoundsMsg": "您似乎位於地圖邊界之外",
+  "no_alerts": "未找到警報",
+  "loading_settings": "正在加載設置",
+  "refresh_to_continue": "請刷新後繼續",
   "session_expired_title": "會話已過期",
   "session_expired_body": "您的會話已過期",
-  "old_client_title": "版本已過時",
-  "old_client_body": "有新版本的地圖可用",
+  "old_client_title": "過時",
+  "old_client_body": "此地圖的新版本可用",
+  "early_old_client_title": "過時",
+  "early_old_client_body": "此應用的舊版本可能已經被緩存在您的瀏覽器中，您需要清除緩存才能使用此應用。",
   "refresh": "刷新",
-  "points": "點數",
-  "day": "天",
+  "points": "點",
+  "day": "日",
   "days": "天",
-  "react_error": "發生了一些錯誤",
-  "clickable_icon": "圖示可點擊",
-  "two_stops_till_next": "還有2個停靠站",
-  "one_stop_till_next": "還有1個停靠站",
-  "no_more_gyms": "沒有更多道館",
-  "light_map_border": "亮色地圖邊框",
+  "react_error": "出了點問題",
+  "clickable_icon": "可點擊的圖標",
+  "two_stops_till_next": "距離下一個還有2站",
+  "one_stop_till_next": "距離下一個還有1站",
+  "no_more_gyms": "沒有更多健身房",
+  "light_map_border": "淺色地圖邊框",
   "dark_map_border": "深色地圖邊框",
-  "cell_blocked": "區塊已封鎖",
-  "poi_color": "POI顏色",
+  "cell_blocked": "區塊被封鎖",
+  "poi_color": "興趣點顏色",
   "quest_condition": "任務條件",
   "always_show_labels": "始終顯示標籤",
   "scan_areas_options": "掃描區域選項",
   "historic_rarity": "歷史稀有度",
   "poi": "興趣點",
-  "300m_range": "300公尺範圍",
+  "300m_range": "300m 範圍",
   "lure_range": "誘餌範圍",
   "custom_range": "自訂範圍",
-  "tap_to_toggle": "點按切換",
-  "power_up": "升級",
+  "tap_to_toggle": "點擊切換",
+  "power_up": "提升等級",
   "never_alt": "從不",
-  "seen_nearby_stop": "附近已見",
-  "seen_nearby_cell": "此區塊已見",
-  "seen_lure_encounter": "誘餌遭遇",
-  "seen_lure_wild": "誘餌生成",
-  "seen_wild": "野生生成",
-  "event_stops": "活動停靠站",
-  "event_stop_timers": "活動停靠站計時器",
+  "seen_nearby_stop": "附近發現",
+  "seen_nearby_cell": "此區域內發現",
+  "seen_lure_encounter": "誘餌遇到",
+  "seen_lure_wild": "誘餌野生出現",
+  "seen_wild": "野生出現",
+  "event_stops": "活動補給站",
+  "event_stop_timers": "活動補給站計時器",
   "size_0": "任何",
-  "size_1": "特小",
-  "size_2": "極小",
-  "size_3": "中等",
-  "size_4": "極大",
-  "size_5": "特大",
+  "size_1": "超小",
+  "size_2": "小",
+  "size_3": "中",
+  "size_4": "大",
+  "size_5": "超大",
   "show_size_indicator": "顯示大小指示器",
   "size": "大小",
-  "gold_stop": "金牌停靠站",
-  "profile_backups": "配置檔備份",
-  "new_backup": "新備份",
-  "create": "建立",
+  "gold_stop": "金色補給站",
+  "profile_backups": "資料檔案切換",
+  "new_backup": "新的備份",
+  "create": "創建",
   "load": "載入",
   "update": "更新",
   "delete": "刪除",
-  "name": "名稱",
-  "only_confirmed": "僅已確認",
+  "name": "名字",
+  "only_confirmed": "僅確認的",
   "rocket_pokemon": "火箭隊寶可夢",
   "decoy": "誘餌",
-  "s2_cell_limit_0": "您嘗試生成超過20,000個方格（{{variable_0}}）",
-  "show_all_pvp_ranks": "顯示所有PVP等級",
-  "enable_pokemon_popup_coords": "顯示神奇寶貝座標",
+  "s2_cell_limit_0": "您試圖生成超過20,000個單元格 ({{variable_0}})",
+  "show_all_pvp_ranks": "顯示所有PVP排名",
+  "enable_pokemon_popup_coords": "顯示寶可夢座標",
   "enable_gym_popup_coords": "顯示道館座標",
-  "enable_pokestop_popup_coords": "顯示停靠站座標",
-  "enable_portal_popup_coords": "顯示門戶坐標",
-  "on_block_join_discord": "請加入我們的 Discord 了解更多訊息。",
-  "on_block_msg": "您因為是 {{value}} 的成員而被封鎖。",
+  "enable_pokestop_popup_coords": "顯示補給站座標",
+  "enable_portal_popup_coords": "顯示傳送門座標",
+  "on_block_join_discord": "請加入我們的Discord以獲取更多資訊。",
+  "on_block_msg": "您因為是以下成員而被封鎖",
   "denied": "拒絕",
   "showcase": "展示",
-  "unknown_event": "未知事件",
-  "scanner_countdown": "將在 {{time}} 秒後可用",
+  "unknown_event": "未知活動",
+  "scanner_countdown": "{{time}}秒後可用",
   "success": "成功",
   "contribute": "貢獻",
   "mi": "英里",
-  "filter_by_areas": "按地區篩選",
+  "filter_by_areas": "按區域篩選",
   "submit_nest_name": "提交巢穴名稱",
   "nest_submission_menu": "名稱更新",
   "nest_submissions": "巢穴提交",
-  "nest_submissions_subtitle": "允許您提交新的巢穴名稱",
+  "nest_submissions_subtitle": "允許您為巢穴提交新的名稱",
   "pokemon_opacity": "動態寶可夢透明度",
   "invasion_opacity": "動態入侵透明度",
   "raid_opacity": "動態團體戰透明度",
-  "opacity_ten_minutes": "10 分鐘時透明度",
-  "opacity_five_minutes": "5 分鐘時透明度",
-  "opacity_one_minute": "1 分鐘時透明度",
-  "level_circles": "等級指示器",
-  "min_level_circle": "最小圓圈等級",
-  "mutation_auth_error": "由於未登入，您的請求無法成功。",
+  "opacity_ten_minutes": "10分鐘時的透明度",
+  "opacity_five_minutes": "5分鐘時的透明度",
+  "opacity_one_minute": "1分鐘時的透明度",
+  "level_circles": "等級指示",
+  "min_level_circle": "最低圈等級",
+  "mutation_auth_error": "由於您未登入，您的請求未成功",
   "submitted_by": "提交者",
-  "localauth_failed": "驗證失敗",
   "reversible": "可逆的",
   "version": "版本",
   "route_tags": "路線標籤",
   "routes": "路線",
   "route_type": "路線類型",
-  "routes_subtitle": "在地圖上查看遊戲內的路線和相關信息",
+  "routes_subtitle": "在地圖上查看遊戲內的路線及相關信息",
   "description": "描述",
-  "additional_info": "附加信息",
+  "additional_info": "其他資訊",
   "duration": "持續時間",
-  "elevation": "海拔高度",
+  "elevation": "海拔",
   "contest_category_1": "最小尺寸",
   "context_category_2": "最大尺寸",
-  "total_entries": "總條目數",
+  "total_entries": "總參賽作品",
   "showcase_rankings": "展示排名",
-  "showcase_rankings_subtitle": "顯示某個Pokestop的頂尖排名列表",
-  "tth": "TTH",
-  "tth_0": "全部",
+  "showcase_rankings_subtitle": "在補給站顯示展示排名的頂尖列表",
+  "tth": "到期時間",
+  "tth_0": "所有",
   "tth_1": "已知",
   "tth_2": "未知",
   "no_access": "無法訪問",
-  "dialog_filter_footer_apply_to_all_width": 2,
-  "dialog_filter_footer_adv_menu_width": 2,
-  "dialog_filter_footer_disable_all_width": 2,
-  "dialog_filter_footer_enable_all_width": 2,
-  "dialog_filter_footer_help_width": 2,
-  "dialog_filter_footer_open_filter_width": 2,
-  "dialog_filter_footer_save_width": 2,
-  "dialog_filter_footer_next_width": 2,
-  "drawer_grid_advanced_width": 6,
-  "drawer_grid_options_width": 6,
-  "drawer_settings_export_settings_width": 6,
-  "drawer_settings_feedback_width": 6,
-  "drawer_settings_import_settings_width": 6,
-  "drawer_settings_logout_width": 6,
-  "drawer_settings_profile_width": 6,
-  "drawer_settings_reset_filters_width": 6,
-  "drawer_settings_stats_width": 6,
-  "drawer_settings_tutorial_width": 6,
-  "popup_gym_description_width": 5,
-  "popup_gym_seen_timer_width": 7,
-  "popup_gym_data_width": 12,
-  "popup_pokestop_description_width": 5,
-  "popup_pokestop_seen_timer_width": 7,
-  "popup_pokestop_data_width": 12,
-  "popup_pokemon_description_width": 5,
-  "popup_pokemon_seen_timer_width": 6,
-  "popup_pokemon_data_width": 11,
-  "webhook_footer_help_width": 4,
-  "webhook_footer_feedback_width": 4,
-  "webhook_footer_close_width": 4,
-  "webhook_footer_add_new_width": 4,
-  "webhook_advanced_save_width": 2,
-  "login_button": 5,
-  "join_button": 5,
   "cooldown": "冷卻時間",
-  "scan_some_outside_area": "部分位置超出授權範圍",
+  "scan_some_outside_area": "一些位置超出了授權的界限",
   "alerts": "警報",
-  "alert_manager": "警報管理器",
-  "menu": "選單",
+  "alert_manager": "警報管理",
+  "menu": "菜單",
   "theme": "主題",
   "exit": "退出",
-  "component": "元件",
+  "component": "組件",
   "component_login_page": "登入頁面",
-  "component_donation_page": "捐贈頁面",
+  "component_donation_page": "捐款頁面",
   "component_message_of_the_day": "每日訊息",
   "download": "下載",
   "playground": "遊樂場",
-  "locale": "語言地區",
+  "locale": "地區設定",
   "saved": "已儲存",
   "show_editor": "顯示編輯器",
   "hide_editor": "隱藏編輯器",
-  "reported_error": "此錯誤已向伺服器回報，標示符為",
-  "dark_mode": "深色模式",
-  "load_from_autosave": "從自動儲存載入",
+  "reported_error": "此錯誤已經報告至服務器，識別碼為",
+  "dark_mode": "夜間模式",
+  "load_from_autosave": "從自動儲存加載",
   "done": "完成",
   "fast": "快速",
-  "charged": "已充能",
+  "charged": "蓄力",
   "offline_mode": "離線模式",
-  "include_sponsored": "包括贊助內容",
-  "showcase_color": "專區顏色",
+  "include_sponsored": "包含贊助內容",
+  "showcase_color": "展示顏色",
   "partner_color": "合作夥伴顏色",
-  "disable": "停用 {{- name}}",
-  "profiling": "個人化配置",
-  "showcase_block": "由於專區而被屏蔽",
-  "signed_in_as": "已登入",
-  "missing_map_perm": "您沒有權限查看地圖。",
-  "pokemon_audio": "寶可夢音效",
-  "pokestop_audio": "戰鬥停留音效",
-  "gym_audio": "道館音效",
-  "team_audio": "隊伍音效",
-  "egg_audio": "蛋音效",
-  "raid_audio": "突襲音效",
-  "nest_audio": "巢穴音效",
-  "reward_audio": "獎勵音效",
-  "type_audio": "屬性音效",
-  "weather_audio": "天氣音效",
-  "misc_audio": "其他音效",
-  "invasion_audio": "入侵音效",
-  "spawnpoint_audio": "出現點音效",
-  "device_audio": "設備音效",
+  "disable": "禁用 {{- name}}",
+  "profiling": "分析",
+  "showcase_block": "由於展示被阻擋",
+  "signed_in_as": "登入為",
+  "missing_map_perm": "您沒有查看地圖的權限。",
   "access_denied": "拒絕訪問",
-  "audio": "音效",
+  "audio": "音頻",
   "desktop_notifications": "桌面通知",
   "notifications_options": "通知選項",
-  "audio_always_on": "音效持續播放",
-  "volume_level": "聲音大小",
+  "audio_always_on": "音頻總是開啟",
+  "volume_level": "音量等級",
   "notifications_status": "通知狀態",
-  "granted": "已允許",
-  "global_search_invasions": "輸入小隊成員、小隊名稱或寶可夢獎勵名稱...",
-  "set_all": "全部設置",
-  "set_filtered": "設置過濾條件",
-  "only_show_available": "只顯示可用的",
+  "granted": "已授予",
+  "set_all": "設定全部",
+  "set_filtered": "設定已篩選",
+  "only_show_available": "僅顯示可用的",
   "easy_mode": "簡易模式",
   "quick_select": "全局快速選擇",
-  "pokemon_filter_mode": "寶可夢過濾模式",
-  "basic": "基本",
+  "pokemon_filter_mode": "寶可夢篩選模式",
+  "basic": "基礎",
   "intermediate": "中級",
-  "expert": "高級",
-  "basic_description": "輕鬆選擇寶可夢並應用全局過濾器",
-  "intermediate_description": "在全局和每個寶可夢上設置個別過濾器（傳統方式）",
-  "expert_description": "手動輸入查詢以進行最大程度的自定義",
+  "expert": "專家",
+  "basic_description": "輕鬆選擇寶可夢並應用全局篩選器",
+  "intermediate_description": "全局和每個寶可夢設定個別篩選器（傳統方式）",
+  "expert_description": "手動輸入查詢以獲取最多自定義選項",
   "icon_size": "圖標大小",
-  "developer": "開發人員",
+  "developer": "開發者",
   "raid_override": "突襲覆蓋",
   "search_rocket_pokemon": "搜索火箭隊寶可夢",
   "main": "主要",
   "extra": "額外",
   "select": "選擇",
   "searching": "正在搜索...",
-  "no_options": "無選項..."
+  "no_options": "無可選項...",
+  "and": "與",
+  "or": "或",
+  "only_global": "僅全局",
+  "global_caption": "忽略所有其他篩選器",
+  "global_and_individual": "全局和個別篩選器",
+  "gender_filters_all": "性別適用於所有",
+  "and_caption": "連接在一起",
+  "or_caption": "獨立篩選",
+  "filter_help": "篩選幫助",
+  "kilometers": "公里",
+  "miles": "英里",
+  "distance_unit": "距離單位",
+  "data_management": "資料管理",
+  "reset_or_manage_text": "您可以完全重置您的篩選器，或者您可以查看資料管理頁面，許您重置單獨類別。",
+  "reset_audio": "重置音頻",
+  "reset_all": "重置全部",
+  "reset_icons": "重置圖標",
+  "reset_position": "重置位置",
+  "reset_ui": "重置用戶界面",
+  "reset_options": "重置選項",
+  "reset_menus": "重置菜單",
+  "reset_settings": "重置設定",
+  "reset_general_title": "通用",
+  "reset_filters_title": "篩選器",
+  "reset_assets": "重置資源",
+  "reset_pokemon": "重置寶可夢",
+  "reset_pokestops": "重置補給站",
+  "reset_gyms": "重置健身房",
+  "reset_nests": "重置巢穴",
+  "reset_portals": "重置傳送門",
+  "reset_routes": "重置路徑",
+  "reset_scan_areas": "重置掃描區域",
+  "reset_scan_cells": "重置掃描單元",
+  "reset_devices": "重置設備",
+  "reset_weather": "重置天氣",
+  "reset_s2cells": "重置S2單元",
+  "reset_spawnpoints": "重置生成點",
+  "reset_submission_cells": "重置提交單元",
+  "hisuian": "洗翠",
+  "spacial_rend_range": "空間裂痕範圍"
 }
diff --git a/packages/locales/lib/human/de.json b/packages/locales/lib/human/de.json
index b985b1d0e..6d54dc7b2 100644
--- a/packages/locales/lib/human/de.json
+++ b/packages/locales/lib/human/de.json
@@ -384,8 +384,8 @@
   "non_registered_human_title": "Ups, da stimmt etwas nicht!",
   "non_registered_human_desc": "Du bist möglicherweise nicht bei {{webhook}} registriert\nOder der Server ist derzeit nicht erreichbar",
   "try_again_later": "Bitte versuche es später nochmal",
-  "selected_areas": "{{amount}} Gebiet ausgewählt",
-  "selected_areas_plural": "{{amount}} Gebiete ausgewählt",
+  "selected_areas_one": "{{count}} Gebiet ausgewählt",
+  "selected_areas_other": "{{count}} Gebiete ausgewählt",
   "webhook_selection": "{{name}} Auswahl",
   "message_of_the_day": "Nachricht des Tages",
   "has_quest_indicator": "Alternative Farbe für Stops mit Quests",
diff --git a/packages/locales/lib/human/en.json b/packages/locales/lib/human/en.json
index 884c273cc..97f7f2f70 100644
--- a/packages/locales/lib/human/en.json
+++ b/packages/locales/lib/human/en.json
@@ -399,8 +399,8 @@
   "non_registered_human_title": "Oops, something is not right!",
   "non_registered_human_desc": "You may not be registered with {{webhook}}\nOr the server is currently unreachable",
   "try_again_later": "Please try again later",
-  "selected_areas": "{{amount}} Area Selected",
-  "selected_areas_plural": "{{amount}} Areas Selected",
+  "selected_areas_one": "{{count}} Area Selected",
+  "selected_areas_other": "{{count}} Areas Selected",
   "webhook_selection": "{{name}} Selection",
   "message_of_the_day": "Message of the Day",
   "has_quest_indicator": "Alternative Color for Stops with Quests",
@@ -765,5 +765,20 @@
   "reset_spawnpoints": "Reset Spawnpoints",
   "reset_submission_cells": "Reset Submission Cells",
   "hisuian": "Hisuian",
-  "spacial_rend_range": "Spacial Rend Range"
+  "spacial_rend_range": "Spacial Rend Range",
+  "key": "Key",
+  "ai": "AI",
+  "human": "Human",
+  "locales": "Locales",
+  "instructions": "Instructions",
+  "locale_instructions_1": "Select a language from the dropdown",
+  "locale_instructions_2": "Enter the desired translations in the \"Human\" column",
+  "locale_instructions_3": "Click the \"$t(download)\" button to download a JSON file",
+  "locale_instructions_4": "Fork the GitHub repo link below",
+  "locale_instructions_5": "Create a new branch and name it the language you are translating",
+  "locale_instructions_6": "Replace the contents of \"packages/locales/lib/human/{{lng}}.json\" with the file you downloaded",
+  "locale_instructions_7": "Create a pull request",
+  "locale_instructions_8": "Wait for the pull request to be reviewed and merged",
+  "enter_translation": "Enter Translation",
+  "individual_filters": "Partially Filtered"
 }
diff --git a/packages/locales/lib/human/es.json b/packages/locales/lib/human/es.json
index c1c65dad8..26528d5a6 100644
--- a/packages/locales/lib/human/es.json
+++ b/packages/locales/lib/human/es.json
@@ -367,8 +367,8 @@
   "non_registered_human_title": "¡Ups, algo no está bien!",
   "non_registered_human_desc": "Es posible que no estés registrado en {{webhook}}\nO el servidor no está disponible en este momento",
   "try_again_later": "Por favor, inténtalo de nuevo más tarde",
-  "selected_areas": "{{amount}} Área Seleccionada",
-  "selected_areas_plural": "{{amount}} Áreas Seleccionadas",
+  "selected_areas_one": "{{count}} Área Seleccionada",
+  "selected_areas_other": "{{count}} Áreas Seleccionadas",
   "webhook_selection": "Selección de {{name}}",
   "message_of_the_day": "Mensaje del Día",
   "has_quest_indicator": "Color Alternativo para Paradas con Misiones",
@@ -616,4 +616,4 @@
   "hide_editor": "Ocultar Editor",
   "reported_error": "Este error ha sido reportado al servidor con el identificador",
   "dark_mode": "Modo Oscuro"
-}
\ No newline at end of file
+}
diff --git a/packages/locales/lib/human/fr.json b/packages/locales/lib/human/fr.json
index d4088b951..b34ebdb46 100644
--- a/packages/locales/lib/human/fr.json
+++ b/packages/locales/lib/human/fr.json
@@ -127,11 +127,11 @@
   "last_modified": "Dernière Modification",
   "last_updated": "Dernière Mise à jour",
   "imported": "Importé",
-  "nest_estimated": "Les données de Nids sont estimées!",
-  "verify_nests": "Vérifier avec les Pokémon présents",
-  "nest_out_of_date": "Les Nids sont potentiellement périmés!",
+  "nest_estimated": "Les données de Nids sont estimées !",
+  "verify_nests": "Vérifiez avec les Pokémon présents",
+  "nest_out_of_date": "Les Nids sont potentiellement périmés !",
   "nest_check_current": "Vérifier les Pokémon présents à la place",
-  "spawns_per_hour": "spawns/hr",
+  "spawns_per_hour": "par heure",
   "teams": "Équipes",
   "eggs": "Œufs",
   "reverse": "Inversé",
@@ -358,8 +358,8 @@
   "non_registered_human_title": "Oups, quelque chose n'est pas bon !",
   "non_registered_human_desc": "Vous n'êtes peut-être pas enregistré auprès de {{webhook}}.\nOu le serveur est actuellement inaccessible",
   "try_again_later": "Veuillez réessayer plus tard",
-  "selected_areas": "{{amount}} zone sélectionnée",
-  "selected_areas_plural": "{{amount}} zones sélectionnées",
+  "selected_areas_one": "{{count}} zone sélectionnée",
+  "selected_areas_other": "{{count}} zones sélectionnées",
   "webhook_selection": "{{name}} Sélection",
   "has_quest_indicator": "Couleur alternative pour afficher les Quêtes",
   "show_ar_badge": "Afficher les Badges RA",
diff --git a/packages/locales/lib/human/nl.json b/packages/locales/lib/human/nl.json
index 9e26dfeeb..b9bf73c57 100644
--- a/packages/locales/lib/human/nl.json
+++ b/packages/locales/lib/human/nl.json
@@ -1 +1,473 @@
-{}
\ No newline at end of file
+{
+  "login": "Login",
+  "click_once": "Klik maar één keer op 'Autoriseren'",
+  "save": "Opslaan",
+  "reset": "Resetten",
+  "close": "Sluiten",
+  "reset_filters": "Filters Resetten",
+  "pokemon_filters": "Pokémon Filter Instellingen",
+  "gyms_filters": "Gym Filter Instellingen",
+  "pokestops_filters": "PokéStop Filter Instellingen",
+  "nests_filters": "Nest Filter Instellingen",
+  "help": "Help",
+  "apply_to_all": "Toepassen op alles",
+  "disable_all": "Alles Uitschakelen",
+  "enable_all": "Alles Inschakelen",
+  "enabled": "Inschakelen",
+  "legacy": "Legacy",
+  "id": "ID",
+  "location": "Locatie",
+  "search_pokemon": "Zoek Pokémon",
+  "search_nests": "Zoek Nests",
+  "search_gyms": "Zoek Gyms",
+  "search_pokestops": "Zoek PokéStops",
+  "sm": "sm",
+  "md": "md",
+  "lg": "lg",
+  "xl": "XL",
+  "min": "Min",
+  "max": "Max",
+  "set_size": "Set Icon Size",
+  "slot_selection": "Slotselectie",
+  "e1": "1-Star Eggs",
+  "e2": "2-Star Eggs",
+  "e3": "3-Star Eggs",
+  "e4": "4-Star Eggs",
+  "e5": "Legendary Eggs",
+  "e6": "Mega Eggs",
+  "generations": "Generaties",
+  "types": "Soorten",
+  "forms": "Forms",
+  "rarity": "Rarity",
+  "others": "Andere",
+  "categories": "Categorieën",
+  "rank": "Rank",
+  "slider_iv": "IV Range",
+  "slider_great": "Great League",
+  "slider_ultra": "Ultra League",
+  "slider_little": "Little Cup",
+  "slider_atk_iv": "Attack",
+  "slider_def_iv": "Defense",
+  "slider_sta_iv": "Stamina",
+  "slider_level": "Level",
+  "abbreviation_level": "L",
+  "lvl": "Lvl",
+  "cap": "Cap",
+  "custom": "Aangepast",
+  "valid": "Geldig",
+  "invalid": "Ongeldig!",
+  "overwrites": "Overschrijft Alle Filters",
+  "valid_filter": "Geldige Statistiekenfilter",
+  "invalid_filter": "Voer een geldig filter in",
+  "gyms": "Gyms",
+  "nests": "Nests",
+  "pokestops": "PokéStops",
+  "pokemon": "Pokémon",
+  "wayfarer": "Wayfarer",
+  "scan_areas": "Scan Gebieden",
+  "weather": "Weer",
+  "admin": "Admin",
+  "settings": "Instellingen",
+  "advanced": "Geavanceerd",
+  "tile_servers": "Tile Servers",
+  "icons": "Icons",
+  "navigation": "Navigatie",
+  "drawer": "Drawer",
+  "tile_servers_default": "Standaard",
+  "drawer_temporary": "Tijdelijk",
+  "drawer_persistent": "Persistent",
+  "locale_selection": "Taalinstellingen",
+  "import": "Importeren",
+  "export": "Exporteren",
+  "logout": "Uitloggen",
+  "local_storage_cleared": "Lokale opslag van de map is gewist!",
+  "iv_or_filter": "IV Of Filter",
+  "polygons": "Polygons",
+  "raids": "Raids",
+  "ex_eligible": "EX Eligible",
+  "in_battle": "In Battle",
+  "all_pokestops": "Alle PokéStops",
+  "lures": "Lures",
+  "quests": "Quests",
+  "invasions": "Invasions",
+  "portals": "Portals",
+  "submission_cells": "Submission Cells",
+  "spawnpoint": "Spawnpoint",
+  "spawnpoints": "Spawnpoints",
+  "s2_cell_level": "Level {{level}} S2 Cell",
+  "total_count": "Totaal",
+  "next_submission": "Volgende Inzending!",
+  "never": "Nooit",
+  "next_gym": "Volgende Gym",
+  "s2cells": "S2 Cells",
+  "devices": "Apparaten",
+  "use_my_location": "Gebruik Mijn Locatie",
+  "submit_feedback_title": "Feedback/Bug Rapport Indienen",
+  "use_the_link_below": "U kunt de onderstaande link gebruiken om feedback of eventuele bugs die u bent tegengekomen in te dienen.",
+  "feedback_to_devs": "Deze feedback wordt rechtstreeks naar de ontwikkelaars gestuurd.",
+  "feedback_form": "Feedback formulier",
+  "unknown_pokestop": "Onbekende PokéStop Naam",
+  "unknown_gym": "Onbekende Gym Naam",
+  "exclude": "Uitsluiten",
+  "exclude_quest": "Uitsluiten Quest",
+  "exclude_invasion": "Uitsluiten Invasion",
+  "exclude_team": "Uitsluiten Team",
+  "exclude_raid": "Uitsluiten Raid",
+  "exclude_lure": "Uitsluiten Lure",
+  "timer": "Timer",
+  "hide": "Verbergen",
+  "tier": "Tier",
+  "slots": "Slots",
+  "mega": "Mega",
+  "form": "Form",
+  "starts": "Begint",
+  "ends": "Eindigt",
+  "defender": "Defender",
+  "cp": "CP",
+  "kilogram": "kg",
+  "meter": "m",
+  "total_cp": "Totale CP",
+  "first_seen": "Eerst gezien",
+  "last_seen": "Laatst gezien",
+  "last_modified": "Laatst Aangepast",
+  "last_updated": "Laatst Bijgewerkt",
+  "imported": "Geïmporteerd",
+  "nest_estimated": "Nest Gegevens zijn geschat!",
+  "verify_nests": "Gecontroleerd door huidige spawns te controleren",
+  "nest_out_of_date": "Nest is mogelijk verouderd!",
+  "nest_check_current": "Controleer in plaats daarvan de huidige spawns",
+  "spawns_per_hour": "spawns/hr",
+  "teams": "Teams",
+  "eggs": "Eggs",
+  "reverse": "Omgekeerd",
+  "selected": "Geselecteerde",
+  "unselected": "Niet Geselecteerde",
+  "only_available": "Beschikbaar",
+  "common": "Common",
+  "uncommon": "Uncommen",
+  "rare": "Rare",
+  "ultra_rare": "Ultra Rare",
+  "regional": "Regionaal",
+  "event": "Event",
+  "legendary": "Legendary",
+  "mythical": "Mythical",
+  "alt_forms": "Alt Forms",
+  "alola": "Alola",
+  "galarian": "Galarian",
+  "showing": "Showing",
+  "instance": "Instance",
+  "online": "Online",
+  "offline": "Offline",
+  "boosted_types": "Boosted Types",
+  "pokemon_options": "Pokémon Opties",
+  "pokestops_options": "PokéStop Opties",
+  "gyms_options": "Gym Opties",
+  "nests_options": "Nest Opties",
+  "wayfarer_options": "Wayfarer Opties",
+  "admin_options": "Admin Opties",
+  "clustering": "Clustering",
+  "glow": "Glow",
+  "legacy_filter": "Legacy Filter",
+  "raid_timers": "Alle Raid Timers",
+  "invasion_timers": "Toon alle Invasion Timers",
+  "lure_timers": "Toon alle Lure Timers",
+  "device_path_color": "Apparaat Pad Kleur",
+  "old_portals": "Oude Portalen",
+  "new_portals": "Nieuw Portalen",
+  "items": "Items",
+  "energy": "Energy",
+  "ar_eligible": "AR Eligible",
+  "iv_circles": "IV Indicatoren",
+  "min_iv_circle": "Minimale cirkel IV",
+  "interaction_ranges": "Interaction Ranges",
+  "cannot_connect": "\nKan momenteel geen verbinding maken met de server.\nOnmiddellijk opnieuw proberen zal alleen maar meer problemen veroorzaken.\nProbeer het over een paar minuten opnieuw.\n\n- Bedank namens de Admin",
+  "mad_quest_text": "Native Quests",
+  "xs": "XS",
+  "primary": "Primair",
+  "secondary": "Secundair",
+  "zero_iv": "0% IV",
+  "hundo_iv": "100% IV",
+  "open_menu": "Open Menu",
+  "zoom_in": "Inzomen",
+  "zoom_out": "Uitzomen",
+  "welcome": "Welkom bij",
+  "back": "Terug",
+  "next": "Volgende",
+  "finish": "Finish",
+  "start_tutorial": "Start Tutorial",
+  "view_profile": "Profiel bekijken",
+  "login_optional": "Inloggen (optioneel)",
+  "tutorial": "Tutorial",
+  "tutorial_language": "Kies je taal",
+  "tutorial_welcome": "Deze tutorial is interactief en het wordt aangeraden om met alle opties te spelen.",
+  "tutorial_categories": "Categorieën waartoe je toegang heeft.",
+  "tutorial_logged_in": "Je kunt details over je machtigingen bekijken door je profiel te bekijken.",
+  "tutorial_logged_out": "Je kunt details over je machtigingen bekijken door in te loggen.",
+  "tutorial_sidebar_0": "Alle filters en instellingen die beschikbaar zijn staan hier.",
+  "tutorial_sidebar_1": "Het is mogelijk om elke categorie precies in te stellen welke informatie je wilt zien met behulp van de schakelaars.",
+  "tutorial_sidebar_2": "Opties: Extra aanpassingen\nGeavanceerd: zullen we later in deze tutorial behandelen.",
+  "tutorial_sliders_0": "Gebruik de schuifregelaars om filters aan te passen.",
+  "tutorial_sliders_1": "Pokémon Tussen:",
+  "tutorial_sliders_2": "- IVs {{iv0}}% naar {{iv1}}%",
+  "tutorial_sliders_3": "Level {{level0}} naar {{level1}}",
+  "tutorial_sliders_3alt": "- En is Level {{level0}} naar {{level1}}",
+  "tutorial_sliders_4": "- Great League Rank {{gl0}} naar {{gl1}}",
+  "tutorial_sliders_4alt": "- Of Great League Rank {{gl0}} naar {{gl1}}",
+  "tutorial_sliders_5": "- Ultra League Rank {{ul0}} naar {{ul1}}",
+  "tutorial_sliders_5alt": "- Of Ultra League Rank {{ul0}} naar {{ul1}}",
+  "tutorial_sliders_6": "Kettingen met andere van dezelfde kleur.",
+  "tutorial_sliders_7": "Filtert afzonderlijk van andere schuifregelaars.",
+  "tutorial_sliders_8": "Een 'volle' schuifregelaar betekent dat deze is uitgeschakeld:",
+  "tutorial_sliders_9": "Alle spawns, ongeacht  of de IV gecontroleerd is of niet.",
+  "tutorial_help": "Snelkoppeling naar dit menu.",
+  "tutorial_adv_filter": "Alleen mobiel, opent de filteropties voor het geavanceerde menu.",
+  "tutorial_tune": "Stelt het geavanceerde filter in voor alle Pokémon die momenteel in het menu worden gefilterd.",
+  "tutorial_format_size": "Stelt de pictogramgrootte in voor alle items die momenteel in het menu worden gefilterd.",
+  "tutorial_check": "Schakelt alle items in die momenteel in het menu worden gefilterd",
+  "tutorial_clear": "Schakelt alle items uit die momenteel in het menu worden gefilterd",
+  "tutorial_save": "Slaat de huidige selectie op en sluit af",
+  "tutorial_show_all_view": "Toon PokéStops & Gyms",
+  "tutorial_show_pokemon_view": "Toon Pokémon In",
+  "tutorial_toggle": "Als je op de Check/X klikt, wordt het item omgeschakeld",
+  "tutorial_pokemon_caption": "Met dit pictogram kun je filters instellen voor die specifieke Pokémon.",
+  "tutorial_all_caption": "Teams hebben een speciaal slotmenu\nMet alle andere items kun je de pictogramgrootte aanpassen.",
+  "tutorial_popup_0": "Pop-ups zijn nu interactief!",
+  "tutorial_popup_1": "De drie stippen openen de opties voor verbergen, uitsluiten en schakelen tussen timers.",
+  "tutorial_popup_2": "Pictogrammen aan weerszijden van de navigatielink worden uitgevouwen om extra informatie weer te geven, probeer het eens!",
+  "tutorial_popup_3": "De pictogrammen verschillen per categorie, zorg ervoor dat u ze allemaal bekijkt.",
+  "tutorial_closing_0": "Extra informatie",
+  "tutorial_closing_1": "De globale Pokémon-schuifregelaars in de zijbalk werken afzonderlijk van het geavanceerde menu en hebben geen effect op elkaar.",
+  "tutorial_closing_2": "Zorg ervoor dat je de gedeelte Instellingen in de zijbalk bekijkt.",
+  "tutorial_closing_3": "Er zijn veel esthetische opties beschikbaar voor elke categorie, maar onthoud dat hoe meer je aan je kaart toevoegt, hoe groter de kans dat je kaart langzamer wordt!",
+  "tutorial_closing_4": "Je kunt deze tutorial opnieuw bekijken door deze te selecteren in het instellingenpaneel in de zijbalk.",
+  "tutorial_closing_5": "Blijf veilig en veel geluk!",
+  "intro": "Introductie",
+  "sidebar": "Sidebar",
+  "sliders": "Schuifregelaars",
+  "popups": "Popups",
+  "closing": "Sluitend",
+  "shortcuts": "Sneltoetsen",
+  "iv": "IV",
+  "area_restrictions": "Gebiedsbeperkingen",
+  "map": "Map",
+  "stats": "Statistieken",
+  "pvp": "PVP",
+  "area_restrictions_subtitle": "U heeft toegang tot deze gebieden",
+  "devices_subtitle": "Toont actieve apparaatlocaties en routes",
+  "gyms_subtitle": "Toont alle actieve gyms, actieve team en hoeveel slots elke gym beschikbaar heeft",
+  "invasions_subtitle": "Toon informatie over de Team Rocket invasion, inclusief battle lineup, vervaltijd en mogelijke beloningen.",
+  "iv_subtitle": "Toon IV% en gloed opties",
+  "lures_subtitle": "Toont informatie over het Lure, inclusief het type Lure en de vervaltijd",
+  "map_subtitle": "Toont de kaart",
+  "nests_subtitle": "Toont actief nestelende Pokémon en  polygons",
+  "pokemon_subtitle": "Toont alle Pokémon-locaties en vervaltijden",
+  "pokestops_subtitle": "Toont alle PokéStop-locaties",
+  "portals_subtitle": "Toont all Ingress Portalen",
+  "pvp_subtitle": "Toont PVP rank/CP/Level informatie voor elke Pokémon",
+  "quests_subtitle": "Toont quest reward en task informatie",
+  "raids_subtitle": "Toont alle raid informatie inclusief de raid boss, eggs, vervaltijd, en moveset",
+  "s2cells_subtitle": "Toont de laatste tijd een S2 cell was bijgewerkt door een scanner.",
+  "scanAreas_subtitle": "Toont beschikbare scan gebieden polygons",
+  "spawnpoints_subtitle": "Toont spawnpoints en hun geschatte despawntijd",
+  "stats_subtitle": "Toont Pokémon Statistieken en levels",
+  "submission_cells_subtitle": "Toont informatie die nuttig is voor het indienen van nieuwe POIs",
+  "weather_subtitle": "Toont op de map de weersinformatie voor elke cel",
+  "user_profile": "Gebruiker Profiel",
+  "candy": "Candy",
+  "show_ex_badge": "Toon EX Badge",
+  "search": "Zoeken",
+  "global_search_quests": "Voer de naam van de Reward in...",
+  "global_search_pokestops": "Voer de naam van de PokéStop in...",
+  "global_search_gyms": "Voer de naam van de Gym in...",
+  "global_search_portals": "Voer de naam van de Portal in...",
+  "global_search_nests": "Voer de naam van de Nest Pokémon in...",
+  "global_search_raids": "Voer de naam van de Raid Boss in...",
+  "raid_level_badges": "Raid Level Badges",
+  "options": "Opties",
+  "profile": "Profiel",
+  "pokemon_icons": "Pokémon Pictogrammen",
+  "pokestop_icons": "PokéStop Pictogrammen",
+  "gym_icons": "Gym Pictogrammen",
+  "team_icons": "Team Pictogrammen",
+  "egg_icons": "Egg Pictogrammen",
+  "raid_icons": "Raid Pictogrammen",
+  "nest_icons": "Nest Pictogrammen",
+  "reward_icons": "Reward Pictogrammen",
+  "type_icons": "Type Pictogrammen",
+  "weather_icons": "Weather Pictogrammen",
+  "misc_icons": "Misc Pictogrammen",
+  "invasion_icons": "Invasion Pictogrammen",
+  "pokemon_timers": "Alle Pokemon Timers",
+  "show_dex_num_in_popup": "Toon Pokedex # in Popup",
+  "popup": "Popup",
+  "pvp_level": "Level {{level}} PVP Statistieken",
+  "pvp_mega": "Mega PVP Statistieken",
+  "webhook_entry": "Voeg {{category}} toe aan {{name}}",
+  "distance": "Afstand",
+  "gym": "Gym",
+  "egg": "Egg",
+  "raid": "Raid",
+  "lure": "Lure",
+  "quest": "Quest",
+  "invasion": "Invasion",
+  "nest": "Nest",
+  "pokestop": "Pokestop",
+  "team": "Team",
+  "global": "Global",
+  "manage_webhook": "Beheer {{name}}",
+  "drag_and_drop": "Sleep de markering en zet deze neer om uw locatie in te stellen.",
+  "click_to_select": "Klik om te selecteren",
+  "add_new": "Nieuwe {{category}} Alert Toevoegen",
+  "my_location": "Mijn locatie",
+  "choose_on_map": "Kies op kaart",
+  "select_profile": "Kies een profiel",
+  "distance_radius": "Voorbeeld Straalafstanden",
+  "areas": "Gebieden",
+  "select_webhook": "Selecteer Bot",
+  "ar_quest_true": "AR Task",
+  "ar_quest_false": "No AR",
+  "exclude_quest_multi": "Sluit {{reward}} Uit",
+  "cluster_limit_0": "{{variable_0}} Limiet ({{variable_1}}) is geraakt.",
+  "cluster_limit_1": "Zoom in of verklein uw filters",
+  "show_polygons": "Toon Polygons",
+  "exclude_invasion_multi": "Sluit {{invasion}} Uit",
+  "stardust": "Stardust",
+  "slider_cp": "CP",
+  "pvp_ranking_league": "League",
+  "pvp_ranking_min_cp": "Min CP",
+  "slider_pvp": "Ranks",
+  "profile_no": "Profiel",
+  "template": "Template",
+  "gender": "Geslacht",
+  "clean": "Clean",
+  "all_forms": "Alle Forms",
+  "pvp_entry": "PVP Entry",
+  "no_iv": "Incl. No IV",
+  "by_distance": "Op afstand",
+  "min_time": "Min Tijd",
+  "add_new_profile": "Nieuw profiel toevoegen",
+  "slider_none": "Geen",
+  "non_registered_human_title": "Oeps, er klopt iets niet!",
+  "non_registered_human_desc": "You may not be registered with {{webhook}}\nOr the server is currently unreachable",
+  "try_again_later": "Probeer het later opnieuw",
+  "selected_areas": "{{amount}} Area Selected",
+  "selected_areas_plural": "{{amount}} Areas Selected",
+  "webhook_selection": "{{name}} Selectie",
+  "message_of_the_day": "Bericht van de dag",
+  "has_quest_indicator": "Alternatieve kleur voor Stops met Quests",
+  "show_ar_badge": "Toon AR Badge",
+  "all_gyms": "Alle Gyms",
+  "raids_or": "Filter Raid Bosses apart van Raids",
+  "general": "Algemeen",
+  "server_dev_error_0": "{{variable_0}}",
+  "link_global_and_advanced": "Link Globaal & Geavanceerd",
+  "normal_forms": "Normal Forms",
+  "weather_indicator": "Weather Boost Indicator",
+  "page": "Pagina {{page}}",
+  "navigation_controls": "Navigatiebediening",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
+  "exclusive": "Exclusief",
+  "all_moves": "Alle Moves",
+  "move": "Move",
+  "any": "Any",
+  "min_spawn_average": "Min Spawn Rate",
+  "select_all": "Selecteer alles",
+  "delete_all": "Verwijder geselecteerde",
+  "cancel": "Annuleren",
+  "day_1": "Maandag",
+  "day_2": "Dinsdag",
+  "day_3": "Woensdag",
+  "day_4": "Donderdag",
+  "day_5": "Vrijdag",
+  "day_6": "Zaterdag",
+  "day_7": "Zondag",
+  "profile_name": "Profiel Naam",
+  "manage_profiles": "Profielen beheren",
+  "min_spawn_avg": "Gem Min Spawn",
+  "poke_global": "Alles",
+  "amount": "Aantal",
+  "specific_gym": "Specifieke Gym",
+  "search_location": "Zoek Locaties",
+  "search_specific": "Zoek voor een specifieke {{category}}",
+  "webhook_success_gym": "Raids, Eggs, en Team Verander Alerts zijn toegevoegd!",
+  "slot_changes": "Slot Changes",
+  "slot_changes_poracle": "slot_changes",
+  "confirm_delete": "Hiermee wordt alle tracking voor dit profiel verwijderd, weet u het zeker?",
+  "confirm_copy": "Kies welk profiel je wilt kopiëren \"{{profile}}\" naar, dit zal dat profiel wel volledig overschrijven.",
+  "webhook_error": [
+    "{{name}} kon dat niet verwerken.",
+    "Probeer het later opnieuw."
+  ],
+  "profile_error": "Moet uniek en geldig zijn",
+  "team_0": "Harmonie",
+  "battle_changes": "In Battle",
+  "battle_changes_poracle": "Battle Changes",
+  "auto": "Auto",
+  "webhooks_subtitle": "Beheer uw meldingen rechtstreeks vanaf de kaart voor deze bots",
+  "webhooks": "Alerts",
+  "everything_individually": "Voeg individuele Alerts toe",
+  "individually": "Individueel",
+  "join": "Join",
+  "errors_404": "Oeps, deze pagina kan niet gevonden worden!",
+  "errors_500": "Er is een serverfout opgetreden, probeer het later opnieuw!",
+  "local_username": "Gebruikersnaam",
+  "local_password": "Wachtwoord",
+  "local_error": "Er is een fout opgetreden, probeer het later opnieuw!",
+  "no_filter_results": [
+    "Geen resultaten gevonden",
+    "Probeer je filters uit te breiden"
+  ],
+  "donor_page": "Donatie Pagina",
+  "go_back": "Ga Terug",
+  "access": "Toegang",
+  "link_discord": "Discord Verbonden",
+  "select_webhook_strategy": "Alarm Manager",
+  "webhook_strategy_success_0": "Succesvol! Vernieuwen om meldingsinstellingen te krijgen...",
+  "register": "Registratie",
+  "invalid_credentials": "Ongeldige inloggegevens",
+  "error_creating_user": "Kan op dit moment geen nieuwe gebruiker registreren",
+  "discord_linked": "Discord Verbonden",
+  "telegram_linked": "Telegram Verbonden",
+  "pokemon_cell": "De locatie van de Pokemon kan variëren.",
+  "timer_verified": "De despawn-tijd is bevestigd.",
+  "timer_unverified": "De despawn-tijd is niet bevestigd.",
+  "with_ar": "Met AR",
+  "both": "Beide",
+  "without_ar": "Zonder AR",
+  "dialog_filter_footer_apply_to_all_width": 2,
+  "dialog_filter_footer_adv_menu_width": 2,
+  "dialog_filter_footer_disable_all_width": 2,
+  "dialog_filter_footer_enable_all_width": 2,
+  "dialog_filter_footer_help_width": 2,
+  "dialog_filter_footer_open_filter_width": 2,
+  "dialog_filter_footer_save_width": 2,
+  "dialog_filter_footer_next_width": 2,
+  "drawer_grid_advanced_width": 6,
+  "drawer_grid_options_width": 6,
+  "drawer_settings_export_settings_width": 6,
+  "drawer_settings_feedback_width": 6,
+  "drawer_settings_import_settings_width": 6,
+  "drawer_settings_logout_width": 6,
+  "drawer_settings_profile_width": 6,
+  "drawer_settings_reset_filters_width": 6,
+  "drawer_settings_stats_width": 6,
+  "drawer_settings_tutorial_width": 6,
+  "popup_gym_description_width": 5,
+  "popup_gym_seen_timer_width": 7,
+  "popup_gym_data_width": 12,
+  "popup_pokestop_description_width": 5,
+  "popup_pokestop_seen_timer_width": 7,
+  "popup_pokestop_data_width": 12,
+  "popup_pokemon_description_width": 5,
+  "popup_pokemon_seen_timer_width": 6,
+  "popup_pokemon_data_width": 11,
+  "webhook_footer_help_width": 4,
+  "webhook_footer_feedback_width": 4,
+  "webhook_footer_close_width": 4,
+  "webhook_footer_add_new_width": 4,
+  "webhook_advanced_save_width": 2,
+  "login_button": 5,
+  "join_button": 5,
+  "all": "Alle"
+}
diff --git a/packages/locales/lib/human/pl.json b/packages/locales/lib/human/pl.json
index 700e0e817..15bf2aa51 100644
--- a/packages/locales/lib/human/pl.json
+++ b/packages/locales/lib/human/pl.json
@@ -1,73 +1,770 @@
 {
-  "signed_in_as": "Zalogowano jako",
-  "missing_map_perm": "Nie masz uprawnień by wyświetlić mapę.",
+  "%": "%",
+  "300m_range": "Zasięg 300m",
+  "abbreviation_level": "L",
+  "access": "Dostęp",
   "access_denied": "Brak dostępu",
-  "raid_override": "Nadpisz",
-  "show_ar_badge": "Pokaż odznaki AR",
-  "show_ex_badge": "Pokaż odznaki EX",
-  "set_all": "Ustaw wszystkie",
-  "spawns_per_hour": "Spawny/h",
+  "add_new": "Dodaj nowy alert {{category}}",
+  "add_new_profile": "Dodaj nowy profil",
+  "additional_info": "Dodatkowe informacje",
+  "admin": "Inne",
+  "admin_options": "Inne opcje",
+  "advanced": "Zaawansowane",
+  "ai": "AI",
+  "alert_manager": "Menedżer alertów",
+  "alerts": "Alerty",
+  "all": "Wszystkie",
+  "all_forms": "Wszystkie formy",
+  "all_gyms": "Wszystkie Gymy",
+  "all_moves": "Wszystkie ruchy",
+  "all_pokestops": "Wszystkie Pokéstopy",
+  "alola": "Alola",
+  "alt_forms": "Alternatywne",
+  "always_show_labels": "Zawsze pokazuj etykiety",
+  "amount": "Ilość",
+  "and": "ORAZ",
+  "and_caption": "Filtrowane razem",
+  "any": "Każdy",
+  "apply_to_all": "Zastosuj do wszystkich",
+  "ar_eligible": "Zadania AR",
+  "ar_quest_false": "Bez AR",
+  "ar_quest_true": "Z AR",
+  "area_restrictions": "Restrykcje obszarów",
+  "area_restrictions_subtitle": "Masz dostęp do następujących obszarów",
+  "areas": "Obszary",
+  "audio": "Dźwięk",
+  "audio_always_on": "Dźwięk zawsze odtwarzany",
+  "auto": "Automatyczny",
+  "back": "Wstecz",
+  "backups": "Kopie zapasowe",
+  "backups_subtitle": "Umożliwia tworzenie kopii zapasowych i ładowanie ustawień na różne urządzenia",
+  "badge_0": "Brak",
+  "badge_1": "Brąz",
+  "badge_2": "Srebro",
+  "badge_3": "Złoto",
+  "basic": "Podstawowy",
+  "basic_description": "Łatwe wybieranie Pokémonów i zastosowanie globalnego filtra",
+  "battle_changes": "W bitwie",
+  "battle_changes_poracle": "battle_changes",
+  "boosted_types": "Typy na booście",
+  "both": "Obydwa",
+  "by_distance": "Według odległości",
+  "cancel": "Anuluj",
+  "candy": "Candy",
+  "cannot_connect": "Nie można połączyć się z serwerem w tej chwili.\nNatychmiastowa ponowna próba spowoduje tylko więcej problemów.\nProszę spróbować ponownie za kilka minut.\n\n- Administracja",
+  "cap": "Cap",
+  "categories": "Kategorie",
+  "cell_blocked": "Komórka zablokowana",
+  "charged": "Ładowany",
+  "choose_on_map": "Wybierz na mapie",
+  "clean": "Czyść",
+  "click_once": "Kliknij 'Autoryzuj' tylko raz",
+  "click_to_scan": "Skanuj tutaj",
+  "click_to_select": "Kliknij aby wybrać",
+  "clickable_icon": "Ikona jest klikalna",
+  "close": "Zamknij",
+  "closing": "Zamykanie",
+  "cluster_limit_0": "{{variable_0}} limit ({{variable_1}}) został osiągnięty",
+  "cluster_limit_1": "Proszę przybliż lub zawęź swoje filtry",
+  "clustering": "Scalanie",
+  "common": "Pospolity",
+  "component": "Komponent",
+  "component_donation_page": "Strona dotacji",
+  "component_login_page": "Strona logowania",
+  "component_message_of_the_day": "Komunikat dnia",
+  "confirm_copy": "Wybierz profil, do którego chcesz skopiować „{{profile}}”, to całkowicie nadpisze ten profil.",
+  "confirm_delete": "Spowoduje to usunięcie całego śledzenia dla tego profilu, czy na pewno?",
+  "confirm_filters_reset": "Zresetuj ustawienia",
+  "contest_category_1": "Najmniejszy rozmiar",
+  "context_category_2": "Największy rozmiar",
+  "contribute": "Współpraca",
+  "cooldown": "Cooldown",
+  "cp": "CP",
+  "create": "Utwórz",
+  "custom": "Dostosowany",
+  "custom_range": "Niestandardowy zasięg",
+  "dark_map_border": "Ciemna ramka mapy",
+  "dark_mode": "Tryb ciemny",
+  "data_management": "Zarządzanie danymi",
+  "day": "Dzień",
+  "day_1": "Poniedziałek",
+  "day_2": "Wtorek",
+  "day_3": "Środa",
+  "day_4": "Czwartek",
+  "day_5": "Piątek",
+  "day_6": "Sobota",
+  "day_7": "Niedziela",
+  "days": "Dni",
+  "decoy": "Przynęta",
+  "defender": "Obrońca",
+  "delete": "Usuń",
+  "delete_all": "Usuń zaznaczone",
+  "denied": "Odmówiono",
+  "description": "Opis",
+  "desktop_notifications": "Powiadomienia na komputerze",
+  "developer": "Deweloper",
+  "device_audio": "Dźwięk urządzenia",
+  "device_icons": "Ikony urządzeń",
+  "device_path_color": "Kolor ścieżki urządzenia",
+  "devices": "Urządzenia",
+  "devices_subtitle": "Pokazuje lokalizacje i trasy aktywnych urządzeń",
+  "dialog_filter_footer_adv_menu_width": 2,
+  "dialog_filter_footer_apply_to_all_width": 3,
+  "dialog_filter_footer_disable_all_width": 2,
+  "dialog_filter_footer_enable_all_width": 2,
+  "dialog_filter_footer_help_width": 2,
+  "dialog_filter_footer_next_width": 2,
+  "dialog_filter_footer_open_filter_width": 1,
+  "dialog_filter_footer_save_width": 2,
+  "disable": "Wyłącz {{- name}}",
+  "disable_all": "Wyłącz wszystkie",
+  "disabled": "Wyłączone",
+  "discord_linked": "Dyskord połączony",
+  "distance": "Dystans",
+  "distance_radius": "Podgląd odległości promienia",
+  "distance_unit": "Jednostka odległości",
+  "done": "Gotowe",
+  "donor_menu": "Menu Sponsora",
+  "donor_page": "Strona Sponsora",
+  "download": "Pobierz",
+  "drag_and_drop": "Przeciągnij i upuść znacznik, aby ustawić swoją lokalizację",
+  "drawer": "Menu nawigacyjne",
+  "drawer_grid_advanced_width": 7,
+  "drawer_grid_options_width": 5,
+  "drawer_persistent": "Stałe",
+  "drawer_settings_export_settings_width": 6,
+  "drawer_settings_feedback_width": 6,
+  "drawer_settings_import_settings_width": 6,
+  "drawer_settings_logout_width": 6,
+  "drawer_settings_profile_width": 6,
+  "drawer_settings_reset_filters_width": 6,
+  "drawer_settings_stats_width": 6,
+  "drawer_settings_tutorial_width": 5,
+  "drawer_temporary": "Tymaczsowe",
+  "duration": "Czas trwania",
+  "early_old_client_body": "Stara wersja tej aplikacji może być zapisana w pamięci cache przeglądarki, musisz wyczyścić cache , zanim będziesz mógł używać tej aplikacji.",
+  "early_old_client_title": "Nieaktualne",
+  "easy_mode": "Tryb łatwy",
+  "egg": "Jajko",
+  "egg_audio": "Dźwięk jajka",
+  "egg_icons": "Ikony jajek",
+  "eggs": "Jajka",
+  "elevation": "Pochylenie",
+  "enable_all": "Włącz wszystkie",
+  "enable_gym_popup_coords": "Pokaż współrzędne siłowni",
+  "enable_pokemon_popup_coords": "Pokaż współrzędne Pokémonów",
+  "enable_pokestop_popup_coords": "Pokaż współrzędne Pokéstopów",
+  "enable_portal_popup_coords": "Pokaż współrzędne portalu",
+  "enabled": "Włączone",
+  "ends": "Koniec",
+  "energy": "Energia",
+  "enter_translation": "Wejdź do tłumaczenia",
+  "error_creating_user": "W tej chwili nie można zarejestrować nowego użytkownika",
+  "errors_404": "Ups, nie można znaleźć tej strony!",
+  "errors_500": "Wystąpił błąd serwera, spróbuj ponownie później!",
+  "event": "Event",
+  "event_stop_timers": "Timery stacji eventowych",
   "event_stops": "Eventowe",
+  "event_stops_subtitle": "Wyświetla specjalne Pokéstopki eventowe, takie jak Kecleon",
+  "everything_individually": "Dodaj indywidualne powiadomienia",
+  "ex_eligible": "EX Gymy",
+  "exclude": "Wyklucz",
+  "exclude_invasion": "Wyklucz inwazję",
+  "exclude_invasion_multi": "Wyklucz {{invasion}}",
+  "exclude_lure": "Wyklucz lura",
+  "exclude_quest": "Wyklucz zadanie",
+  "exclude_quest_multi": "Wyklucz {{reward}}",
+  "exclude_raid": "Wyklucz raid",
+  "exclude_team": "Wyklucz drużynę",
+  "exclusive": "Ekskluzywny",
+  "exit": "Wyjście",
+  "expert": "Ekspert",
+  "expert_description": "Ręczne wprowadzanie zapytań dla najbardziej zaawansowanych ustawień",
+  "export": "Eksportuj",
+  "extra": "Dodatkowe",
+  "fast": "Szybki",
+  "feedback": "Wyślij opinię",
+  "feedback_form": "Formularz zgłoszenia",
+  "feedback_to_devs": "Opinia przesyłana jest bezpośrednio do programistów.",
+  "filter_by_areas": "Filtruj według obszarów",
+  "filter_help": "Pomoc",
+  "filters_reset_text": "Czy na pewno chcesz zresetować ustawienia do domyślnych wartości? Ta czynność jest nieodwracalna!",
+  "filters_reset_title": "Reset ustawień",
+  "finish": "Zakończ",
+  "first_seen": "Pierwotnie widziany",
+  "form": "Forma",
+  "forms": "Formy",
+  "galarian": "galarian",
+  "gender": "Płeć",
+  "gender_filters_all": "Płeć dotyczy wszystkich",
+  "general": "Ogólny",
+  "generations": "Generacje",
+  "global": "Globalny",
+  "global_and_individual": "Globalne oraz indiwidualne filtry",
+  "global_caption": "Ignoruje wszystkie inne filtry",
+  "global_search_gyms": "Wprowadź nazwę Gymu...",
+  "global_search_invasions": "Wprowadź typ Grunta, Imię lub nazwę nagrody za pokonanie...",
+  "global_search_lures": "Wprowadź nazwę przynęty...",
+  "global_search_nests": "Wprowadź nazwę nestującego Pokémona...",
+  "global_search_pokemon": "Wprowadź nazwę Pokémona...",
+  "global_search_pokestops": "Wprowadź nazwę Pokéstopa...",
+  "global_search_portals": "Wprowadź nazwę portalu...",
+  "global_search_quests": "Wprowadź nazwę nagrody...",
+  "global_search_raids": "Wprowadż nazwę Raid Bossa...",
+  "glow": "Poświata",
+  "go_back": "Wróć",
+  "gold_stop": "Złoty Pokéstop",
+  "granted": "udzielono",
+  "gym": "Gym",
+  "gym_audio": "Dźwięk w okolicy siłowni",
+  "gym_badge_diamonds": "Pokaż odznaki gymów",
+  "gym_badge_menu": "Edytuj odznakę gymu",
+  "gym_badges": "Odznaki gymów",
+  "gym_badges_subtitle": "Wyświetla odznaki gymów na mapie oraz listę na stronie profilu.",
+  "gym_icons": "Ikony gymów",
+  "gyms": "Gymy",
+  "gyms_filters": "Ustawienia filtrów gymów",
+  "gyms_options": "Opcje gymów",
+  "gyms_subtitle": "Pokazuje lokalizację wszystkich aktywnych gymów, aktywne drużyny oraz ilosć dostępnych slotów",
+  "has_quest_indicator": "Alternatywny kolor dla Pokéstopów z zadaniami",
+  "help": "Pomoc",
+  "hide": "Ukryj",
+  "hide_editor": "Ukryj edytor",
+  "historic_rarity": "Rzadkość historyczna",
+  "hisuian": "Hisuian",
+  "human": "Człowiek",
+  "hundo_iv": "100% IV",
+  "icon_size": "Rozmiar ikony",
+  "icons": "Ikony",
+  "iconsDefault": "Domyślne",
+  "id": "ID",
+  "import": "Importuj",
+  "imported": "Zaimportowany",
+  "in_battle": "W trakcie walki",
+  "include_sponsored": "Pokaż Sponsorowane",
+  "individual_filters": "Częściowo filtrowane",
+  "individually": "indywidualne",
+  "instance": "Instancja",
+  "instructions": "Instrukcje",
+  "interaction_ranges": "Okręgi interakcji",
+  "intermediate": "Średniozaawansowany",
+  "intermediate_description": "Ustawianie indywidualnych filtrów globalnie i dla poszczególnych Pokémonów (tradycyjnie)",
+  "intro": "Wprowadzenie",
+  "invalid": "Niepoprawny!",
+  "invalid_credentials": "Nieprawidłowe dane logowania",
+  "invalid_filter": "Wprowadź poprawny filtr",
+  "invasion": "Inwazja",
+  "invasion_audio": "Dźwięk inwazji",
+  "invasion_icons": "Ikony inwazji",
+  "invasion_opacity": "Dynamiczna przezroczystość inwazji",
+  "invasion_timers": "Licznik czasu wszystkich inwazji",
+  "invasions": "Inwazje",
+  "invasions_subtitle": "Pokazuje informacje o inwazji Zespołu R, włącznie z Pokémonami wystawionymi do walki oraz nagrodami, które możesz otrzymać",
+  "items": "Przedmioty",
+  "iv": "IV",
+  "iv_circles": "Znaczniki IV",
+  "iv_or_filter": "IV OR Filtr",
+  "iv_subtitle": "Pokazuje IV w procentach oraz opcje poświaty",
+  "join": "Dołącz",
+  "join_button": 5,
+  "key": "Klucz",
+  "kilogram": "kg",
+  "kilometers": "Kilometry",
+  "km": "km",
+  "last_modified": "Ostatnio zmodyfikowany",
+  "last_seen": "Ostatnio widziany",
+  "last_updated": "Ostatnio zaktualizowany",
+  "lc_feetUnit": "ft",
+  "lc_metersUnit": "m",
+  "lc_outsideMapBoundsMsg": "Wydajesz się znajdować poza granicami mapy",
+  "lc_popup": "Jesteś w odległości {distance} {unit} od tego punktu",
+  "lc_title": "Śledź swoją lokalizację",
+  "legacy": "Legacy",
+  "legacy_filter": "Stary filtr",
+  "legendary": "Legendarne",
+  "level": "poziom",
+  "level_circles": "Wskaźniki poziomu",
+  "lg": "LG",
+  "light_map_border": "Jasna ramka mapy",
+  "link_discord": "Odnośnik do Discorda",
+  "link_global_and_advanced": "Połącz globalne oraz zaawansowane",
+  "load": "Załaduj",
+  "load_from_autosave": "Załaduj z automatycznego zapisu",
+  "loading": "Ładowanie {{category}}",
+  "loading_icons": "Ładowanie ikon",
+  "loading_invasions": "Ładowanie inwazji",
+  "loading_settings": "Ładowanie ustawień",
+  "local_error": "Wystąpił błąd, spróbuj ponownie później!",
+  "local_password": "Hasło",
+  "local_storage_cleared": "Lokalna pamięć została wyczyszczona!",
+  "local_username": "Nazwa użytkownika",
+  "localauth_failed": "Błąd uwierzytelniania",
+  "locale": "Lokalizacja",
+  "locale_instructions_1": "Wybierz język z listy rozwijanej",
+  "locale_instructions_2": "Wprowadź żądane tłumaczenie w kolumnie \"Człowiek\"",
+  "locale_instructions_3": "Kliknij przycisk \"$t(download)\", aby pobrać plik JSON",
+  "locale_instructions_4": "Link do repozytorium GitHub poniżej",
+  "locale_instructions_5": "Utwórz nowy branch i nadaj mu nazwę tłumaczonego języka.",
+  "locale_instructions_6": "Zastąp zawartość pliku \"packages/locales/lib/human/{{lng}}.json\" pobranym plikiem",
+  "locale_instructions_7": "Utwórz PR",
+  "locale_instructions_8": "Poczekaj, aż PR zostanie sprawdzony i zmergowany.",
+  "locale_selection": "Wybór języka",
+  "locales": "Tłumaczenia",
+  "location": "Lokalizacja",
+  "login": "Login",
+  "login_button": 5,
+  "login_optional": "Login (opcjonalnie)",
+  "logout": "Wyloguj",
+  "lure": "Lur",
+  "lure_range": "Zasięg Lura",
+  "lure_timers": "Licznik czasu wszystkich lurów",
+  "lures": "Lury",
+  "lures_subtitle": "Pokazuje informacje o lurach, włącznie z typem oraz czasem zakończenia lura",
+  "lvl": "LVL",
+  "mad_quest_text": "Natywne zadania",
+  "main": "Główne",
+  "manage_profiles": "Zarządzaj profilami",
+  "manage_webhook": "Zarządzaj {{name}}",
+  "map": "Mapa",
+  "map_subtitle": "Pokazuje mapę",
+  "max": "Max",
+  "md": "MD",
+  "mega": "Mega",
+  "menu": "Menu",
+  "message_of_the_day": "Wiadomość Dnia",
+  "meter": "m",
+  "mi": "mi",
+  "miles": "Mile",
+  "min": "Min",
+  "min_iv_circle": "Minimalne IV znacznika",
+  "min_level_circle": "Minimalny poziom okręgu",
+  "min_spawn_average": "Średnia minimalna liczba spawnów",
+  "min_spawn_avg": "Średnia minimalna liczba spawnów",
+  "min_time": "Minimalny czas",
+  "misc_audio": "Różne dźwięki",
+  "misc_icons": "Pozostałe ikony",
+  "missing_map_perm": "Nie masz uprawnień by wyświetlić mapę.",
+  "move": "Ruch",
+  "mutation_auth_error": "Twoje żądanie nie powiodło się z powodu braku zalogowania",
+  "my_location": "Moja lokacja",
+  "mythical": "Normalne",
+  "name": "Nazwa",
+  "navigation": "Nawigacja",
+  "navigation_controls": "Sterowanie nawigacją",
+  "navigation_controls_leaflet": "Leaflet",
+  "navigation_controls_react": "React",
+  "nest": "Nest",
+  "nest_audio": "Dźwięk w okolicy gniazda",
+  "nest_check_current": "Sprawdź aktualne spawny",
+  "nest_estimated": "Dane nestu są szacunkowe!",
+  "nest_icons": "Ikony nestów",
+  "nest_out_of_date": "Nest może być nieaktualny",
+  "nest_submission_menu": "Aktualizacja nazwy",
+  "nest_submissions": "Przesyłanie nestów",
+  "nest_submissions_subtitle": "Pozwala na przesyłanie nowych nazw dla nestów",
+  "nests": "Nesty",
+  "nests_filters": "Ustawienia filtrów nestów",
+  "nests_options": "Opcje nestów",
+  "nests_subtitle": "Pokazuje obecnie nestujące Pokémony oraz powierzchnie nestów",
+  "never": "Nigdy",
+  "never_alt": "Nigdy",
+  "new_backup": "Nowa kopia zapasowa",
+  "new_portals": "Nowe portale",
+  "next": "Dalej",
+  "next_gym": "Kolejny gym",
+  "next_submission": "Kolejne zgłoszenie!",
+  "no_access": "Brak dostępu",
+  "no_alerts": "Brak alertów",
+  "no_filter_results": "Nie znaleziono wyników\n\nSpróbuj poszerzyć swoje filtry",
+  "no_iv": "Dołącz bez IV",
+  "no_more_gyms": "Koniec gymów",
+  "no_options": "Brak opcji...",
+  "non_registered_human_desc": "Nie możesz być zarejestrowany w {{webhook}}\n\nLub serwer jest obecnie niedostępny",
+  "non_registered_human_title": "Ups, coś poszło nie tak!",
+  "normal_forms": "Formy normalne",
+  "notifications_options": "Opcje powiadomień",
+  "notifications_status": "Status powiadomień",
+  "offline": "Offline",
+  "offline_mode": "Tryb offline",
+  "old_client_body": "Dostępna jest nowa wersja tej mapy",
+  "old_client_title": "Stara wersja",
+  "old_portals": "Stare portale",
+  "on_block_join_discord": "Proszę dołącz do naszego discorda, aby uzyskać więcej informacji.",
+  "on_block_msg": "Zostałeś zablokowany za bycie członkiem",
+  "one_stop_till_next": "1 stop do następnego",
+  "online": "Online",
+  "only_available": "Dostępne",
+  "only_confirmed": "Tylko potwierdzone",
+  "only_global": "Tylko globalne",
+  "only_show_available": "Pokaż tylko dostępne",
+  "opacity_five_minutes": "Przezroczystość po 5 minutach",
+  "opacity_one_minute": "Przezroczystość po 1 minucie",
+  "opacity_ten_minutes": "Przezroczystość po 10 minutach",
+  "open_menu": "Otwórz menu",
+  "options": "Opcje",
+  "or": "LUB",
+  "or_caption": "Filtrowane osobno",
+  "others": "Inne",
+  "overwrites": "Nadpisuje wszystkie filtry",
+  "page": "Strona {{page}}",
+  "partner_color": "Kolor Partnera",
+  "playground": "Plac zabaw",
+  "poi": "Interesujące punkty",
+  "poi_color": "Kolor POI",
+  "points": "Punkty",
+  "poke_global": "Wszystko",
+  "pokemon": "Pokémony",
+  "pokemon_audio": "Dźwięk Pokémonów",
+  "pokemon_cell": "Lokalizacja Pokémona może się różnić",
+  "pokemon_filter_mode": "Tryb filtru Pokémonów",
+  "pokemon_filters": "Ustawienia filtrów Pokémonów",
+  "pokemon_icons": "Ikony Pokémonów",
+  "pokemon_opacity": "Dynamiczna przezroczystość Pokémonów",
+  "pokemon_options": "Opcje Pokémonów",
+  "pokemon_subtitle": "Pokazuje lokalizacje Pokémonów oraz czas ich zniknięcia",
+  "pokemon_timers": "Licznik czasu wszystkich Pokémonów",
+  "pokestop": "Pokéstop",
+  "pokestop_audio": "Dźwięk w okolicy PokéStopu",
+  "pokestop_icons": "Ikony Pokéstopów",
+  "pokestops": "Pokéstopy",
+  "pokestops_filters": "Ustawienia filtrów Pokéstopów",
+  "pokestops_options": "Opcje Pokéstopów",
+  "pokestops_subtitle": "Pokazuje lokalizacje wszystkich Pokéstopów",
+  "polygons": "Obszary",
+  "popup": "Popup",
+  "popup_gym_data_width": 12,
+  "popup_gym_description_width": 8,
+  "popup_gym_seen_timer_width": 4,
+  "popup_pokemon_data_width": 11,
+  "popup_pokemon_description_width": 6,
+  "popup_pokemon_seen_timer_width": 5,
+  "popup_pokestop_data_width": 12,
+  "popup_pokestop_description_width": 8,
+  "popup_pokestop_seen_timer_width": 4,
+  "popups": "Pop-upy",
+  "portals": "Portale",
+  "portals_subtitle": "Pokazuje portale z Ingress",
   "power_up": "PowerUp",
-  "enabled": "Włączone",
+  "primary": "Podstawowe",
+  "profile": "Profil",
+  "profile_backups": "Zamiana profilu",
+  "profile_error": "Musi być unikalny i prawidłowy",
+  "profile_name": "Nazwa profilu",
+  "profile_no": "Profil",
+  "profiling": "Tworzenie Profili",
+  "pvp": "PvP",
+  "pvp_entry": "Wpis PVP",
+  "pvp_level": "Statystyki PvP poziomu {{level}}",
+  "pvp_mega": "Statystyki PvP Mega",
+  "pvp_ranking_cap": "Poziom",
+  "pvp_ranking_league": "League",
+  "pvp_ranking_min_cp": "Min. CP",
+  "pvp_subtitle": "Pokazuje rangę PVP/CP/informację o poziomie każdego Pokémona",
+  "quest": "Quest",
+  "quest_condition": "Warunek zadania",
+  "quests": "Zadania",
+  "quests_subtitle": "Pokazuje nagrodę oraz informację o zadaniu",
+  "quick_select": "Szybkie filtry globalne",
+  "raid": "Raid",
+  "raid_audio": "Dźwięk w okolicy rajdu",
+  "raid_icons": "Ikony raidów",
+  "raid_level_badges": "Odznaki poziomu raidu",
+  "raid_opacity": "Dynamiczna przezroczystość rajdów",
+  "raid_override": "Nadpisz",
+  "raid_quick_select": "Szybki wybór",
+  "raid_timers": "Licznik czasu wszystkich raidów",
+  "raids": "Raidy",
+  "raids_subtitle": "Pokazuje dane raidu, takie jak informacja o bossie, jajku, czasie zakończenia czy atakach bossa",
+  "rank": "Rank",
+  "rare": "Rzadki",
+  "rarity": "Rzadkość",
+  "react_error": "Coś poszło nie tak",
+  "refresh": "Odśwież",
+  "refresh_to_continue": "Odśwież, zanim przejdziesz dalej",
+  "regional": "Regionalny",
+  "register": "Zarejestruj",
+  "remove_webhook_entry": "Usuń z {{name}}",
+  "reported_error": "Ten błąd został zgłoszony do serwera z identyfikatorem",
+  "reset": "Zresestuj",
+  "reset_all": "Resetuj wszystkie",
+  "reset_assets": "Zasoby",
+  "reset_audio": "Resetuj dźwięk",
+  "reset_devices": "Resetuj Urządzenia",
+  "reset_filters": "Zresetuj filtry",
+  "reset_filters_title": "Filtry",
+  "reset_general_title": "Ogólne",
+  "reset_gyms": "Resetuj Gymy",
+  "reset_icons": "Resetuj ikony",
+  "reset_menus": "Resetuj menu",
+  "reset_nests": "Resetuj Nesty",
+  "reset_options": "Resetuj opcje",
+  "reset_or_manage_text": "Możesz zresetować filtry lub wyświetlić stronę zarządzania danymi, która pozwoli ci zresetować poszczególne kategorie.",
+  "reset_pokemon": "Resetuj Pokémony",
+  "reset_pokestops": "Resetuj Pokéstopy",
+  "reset_portals": "Resetuj Portale",
+  "reset_position": "Resetuj pozycję",
+  "reset_routes": "Resetuj ścieżki",
+  "reset_s2cells": "Resetuj Komórki S2",
+  "reset_scan_areas": "Resetuj obszary skanowania",
+  "reset_scan_cells": "Resetuj komórki skanowania",
+  "reset_settings": "Resetuj ustawienia",
+  "reset_spawnpoints": "Resetuj Spawnpointy",
+  "reset_submission_cells": "Resetuj komórki do zgłoszenia",
+  "reset_ui": "Resetuj UI",
+  "reset_weather": "Resetuj pogodę",
+  "reverse": "Odwrotne",
+  "reversible": "Odwrotny",
+  "reward_audio": "Dźwięk nagrody",
+  "reward_icons": "Ikony nagród",
+  "rocket_pokemon": "Pokémony Rocket",
   "route_tags": "Etykiety scieżek",
-  "routes": "Scieżki",
   "route_type": "Typ scieżki",
-  "admin": "Inne",
-  "tth_0": "Wszystkie",
-  "quick_select": "Szybkie filtry globalne",
-  "include_sponsored": "Pokaż Sponsorowane",
+  "routes": "Scieżki",
   "routes_subtitle": "Wyświetl scieżki w grze i związane z nimi informacje na mapie",
-  "pokemon_filters": "Ustawienia filtrów Pokémonów",
-  "gyms_filters": "Ustawienia filtrów gymów",
-  "pokestops_filters": "Ustawienia filtrów Pokéstopów",
+  "s2_cell_level": "Poziom {{level}} S2 Cell",
+  "s2_cell_limit_0": "Próbowałeś wygenerować więcej niż 20 000 komórek ({{variable_0}})",
+  "s2cells": "Komórki S2",
+  "s2cells_options": "Opcje komórek S2",
+  "s2cells_subtitle": "Wyświetla komórki S2 na różnych poziomach na mapie",
+  "save": "Zapisz",
+  "saved": "Zapisane",
+  "scan_areas": "Skanowane obszary",
+  "scan_areas_options": "Opcje obszarów skanowania",
+  "scan_areas_subtitle": "Pokazuje dostępne obszary skanowania",
+  "scan_cells": "Komórki S2",
+  "scan_cells_subtitle": "Pokazuje czas ostatniego skanowania komórki S2 przez urządzenie",
+  "scan_confirmed": "Skaner został wysłany do lokalizacji, wynik wkrótce pojawi się na mapie!",
+  "scan_confirmed_title": "Potwierdzone żądanie skanowania",
+  "scan_error": "Wystąpił błąd podczas przetwarzania żądania skanowania...",
+  "scan_error_title": "Błąd",
+  "scan_loading": "Twoje żądanie skanowania jest przetwarzane i wysyłane do systemu!",
+  "scan_loading_title": "Wysyłanie prośby o skanowanie",
+  "scan_next": "Lokalizacja skanowania",
+  "scan_next_choose": "Przeciągnij i upuść znacznik, aby ustawić lokalizację skanowania",
+  "scan_outside_area": "Ta lokalizacja znajduje się poza granicami autoryzowanych obszarów",
+  "scan_queue": "Bieżąca kolejka",
+  "scan_requests": "Żądania skanowania",
+  "scan_some_outside_area": "Niektóre lokalizacje znajdują się poza uprawnionymi granicami",
+  "scan_zone": "Skanuj obszar",
+  "scan_zone_choose": "Przeciągnij i upuść znacznik, aby ustawić lokalizację skanowania i wybrać rozmiar",
+  "scan_zone_radius": "Promień",
+  "scan_zone_range": "Zakres",
+  "scan_zone_size": "Rozmiar",
+  "scan_zone_spacing": "Rozstaw",
+  "scanner": "Akcje skanera",
+  "scanner_countdown": "Dostępne za {{time}}s",
+  "scanner_subtitle": "Współpracuj bezpośrednio ze skanerem na różne sposoby",
+  "search": "Szukaj",
+  "search_eggs": "Szukaj jajek",
+  "search_gyms": "Szukaj gymów",
+  "search_invasions": "Szukaj inwazji",
+  "search_location": "Wyszukaj lokalizacje",
+  "search_lures": "Szukaj lurów",
+  "search_nests": "Szukaj nestów",
   "search_pokemon": "Szukaj Pokémonów",
   "search_pokestops": "Szukaj Pokéstopów",
-  "pokestops": "Pokéstopy",
-  "pokemon": "Pokémony",
-  "unknown_pokestop": "Nieznana nazwa Pokéstopu",
-  "pokemon_options": "Opcje Pokémonów",
-  "pokestops_options": "Opcje Pokéstopów",
-  "tutorial_sliders_1": "Pokémony pomiędzy:",
-  "tutorial_tune": "Ustawia filtr zaawansowany dla wszystkich Pokémonów obecnie filtrowanych w menu",
+  "search_quests": "Szukaj zadań",
+  "search_raids": "Szukaj raidów",
+  "search_rocket_pokemon": "Wyszukaj Pokémony Rocket",
+  "search_specific": "Wyszukaj konkretną {{category}}",
+  "searching": "wyszukiwanie...",
+  "secondary": "Rozszerzone",
+  "seen_lure_encounter": "Spotkany z Lura",
+  "seen_lure_wild": "Spawn z Lura",
+  "seen_nearby_cell": "Widziany w tej komórce",
+  "seen_nearby_stop": "Widziany w pobliżu",
+  "seen_wild": "Dziki Spawn",
+  "select": "Wybierz",
+  "select_all": "Zaznacz wszystko",
+  "select_profile": "Wybierz profil",
+  "select_webhook": "Wybierz bota",
+  "select_webhook_strategy": "Menedżer alertów",
+  "selected": "Zaznaczone",
+  "selected_areas_one": "{{count}} wybrany obszar",
+  "selected_areas_other": "{{count}} wybrane obszary",
+  "server_dev_error_0": "{{variable_0}}",
+  "session_expired_body": "Twoja sesja wygasła",
+  "session_expired_title": "Sesja wygasła",
+  "set_all": "Ustaw wszystkie",
+  "set_filtered": "Ustaw filtrowane",
+  "set_size": "Ustaw rozmiar ikon",
+  "settings": "Ustawienia",
+  "shortcuts": "Skróty",
+  "show_all_pvp_ranks": "Pokaż wszystkie rangi PVP",
+  "show_ar_badge": "Pokaż odznaki AR",
+  "show_dex_num_in_popup": "Pokaż Pokédex # w Popupie",
+  "show_editor": "Pokaż edytor",
+  "show_ex_badge": "Pokaż odznaki EX",
+  "show_polygons": "Pokaż Obszary",
+  "show_size_indicator": "Pokaż wskaźnik rozmiaru",
+  "showcase": "Prezentacja",
+  "showcase_block": "Zablokowane ze względu na wystawę",
+  "showcase_color": "Kolor Wystawy",
+  "showcase_rankings": "Rankingi prezentacji",
+  "showcase_rankings_subtitle": "Wyświetla listę najlepszych wyników dla prezentacji na Punkcie Przyciągania",
+  "showing": "Widoczne",
+  "sidebar": "Pasek boczny",
+  "signed_in_as": "Zalogowano jako",
+  "size": "Rozmiar",
+  "size_0": "Dowolne",
+  "size_1": "XXS",
+  "size_2": "XS",
+  "size_3": "M",
+  "size_4": "XL",
+  "size_5": "XXL",
+  "slider_atk_iv": "Atak",
+  "slider_cp": "CP",
+  "slider_def_iv": "Obrona",
+  "slider_great": "Great League",
+  "slider_iv": "Zakres IV",
+  "slider_level": "Poziom",
+  "slider_little": "Little Cup",
+  "slider_none": "Brak",
+  "slider_pvp": "Ranking",
+  "slider_size": "Rozmiar",
+  "slider_sta_iv": "Stamina",
+  "slider_ultra": "Ultra League",
+  "sliders": "Suwaki",
+  "slot_changes": "Zmiany w szczelinach",
+  "slot_changes_poracle": "slot_changes",
+  "slot_selection": "Wybór szczeliny",
+  "slots": "Miejsc",
+  "sm": "SM",
+  "spacial_rend_range": "Zasięg Rysowania Rend.",
+  "spawnpoint": "Spawnpoint",
+  "spawnpoint_audio": "Dźwięk w okolicy punktu zrespawnowania",
+  "spawnpoint_icons": "Ikony Spawnpointów",
+  "spawnpoints": "Spawnpointy",
+  "spawnpoints_subtitle": "Pokazuje spawnpointy oraz ich przybliżone czasy despawnu",
+  "spawns_per_hour": "Spawny/h",
+  "specific_gym": "Określony Gym",
+  "stardust": "Stardust",
+  "start_tutorial": "Samouczek początkowy",
+  "starts": "Początek",
+  "stats": "Statystyki",
+  "stats_subtitle": "Pokazuje statystyki i poziomy Pokémona",
+  "submissionCells_subtitle": "Pokazuje informacje przydatne przy zgłaszaniu nowych portali",
+  "submission_cells": "Komórki do zgłoszenia",
+  "submission_cells_subtitle": "Wyświetla informacje przydatne w dodawaniu nowych POI",
+  "submit_feedback_title": "Prześlij komentarz / Zgłoś błąd",
+  "submit_nest_name": "Prześlij nazwę nesta",
+  "submitted_by": "Przesłane przez",
+  "success": "Sukces",
+  "tap_to_toggle": "Naciśnij, aby przełączyć",
+  "team": "Drużyna",
+  "team_0": "Harmony",
+  "team_audio": "Dźwięk związany z drużyną",
+  "team_icons": "Ikony drużyn",
+  "teams": "Drużyny",
+  "telegram_linked": "Połączono z telegramem",
+  "template": "Szablon",
+  "theme": "Motyw",
+  "tier": "Poziom",
+  "tile_servers": "Serwer kafelków",
+  "tile_servers_default": "Domyślny",
+  "timer": "Licznik",
+  "timer_unverified": "Ten licznik jest niezweryfikowany",
+  "timer_verified": "Ten licznik jest zweryfikowany",
+  "total_count": "Całkowita ilość",
+  "total_cp": "Całkowite CP",
+  "total_entries": "Całkowita liczba",
+  "try_again_later": "Spróbuj ponownie później",
+  "tth": "TTH",
+  "tth_0": "Wszystkie",
+  "tth_1": "Znane",
+  "tth_2": "Nieznane",
+  "tutorial": "Samouczek",
+  "tutorial_adv_filter": "Tylko dla urządzeń mobilnych, otwiera opcje filtrowania w menu zaawansowanym",
+  "tutorial_all_caption": "Drużyny mają dostęp do specjalnego menu slotowego\nWszystkie pozostałe przedmioty pozwalają na zmianę rozmiaru ikony",
+  "tutorial_categories": "Kategorie do których masz dostęp",
+  "tutorial_check": "Włącza wszystkie pozycje obecnie filtrowane w menu",
+  "tutorial_clear": "Wyłącza wszystkie pozycje obecnie filtrowane w menu",
+  "tutorial_closing_0": "Dodatkowe informacje",
+  "tutorial_closing_1": "Ogólne suwaki Pokémonów na pasku bocznym działają oddzielnie od menu zaawansowanego i nie mają na siebie wpływu",
+  "tutorial_closing_2": "Nie zapomnij sprawdzić sekcji ustawień w menu nawigacyjnym",
+  "tutorial_closing_3": "Istnieje mnóstwo opcji wizualnych dostępnych dla każdej kategorii, ale im więcej z nich pojawi się na Twojej mapie, tym większe będzie prawdopodobieństwo, że mapa będzie działać wolno lub się zawiesi",
+  "tutorial_closing_4": "Mozesz ponownie obejrzeć samouczek wybierając go w panelu ustawień w menu nawigacyjnym",
+  "tutorial_closing_5": "Uważaj na siebie i powodzenia!",
+  "tutorial_format_size": "Ustawia rozmiar ikony dla wszystkich pozycji obecnie filtrowanych w menu",
+  "tutorial_help": "Skrót do tego menu",
+  "tutorial_language": "Wybierz język",
+  "tutorial_logged_in": "Możesz zobaczyć szczegóły dotyczące uprawnień na swoim profilu.",
+  "tutorial_logged_out": "Możesz zobaczyć szczegóły dotyczące uprawnień po zalogowaniu.",
+  "tutorial_pokemon_caption": "Ta ikona pozwala na ustawienie filtrów dla konkretnego Pokémona",
+  "tutorial_popup_0": "Okienka pop-up są teraz interaktywne!",
+  "tutorial_popup_1": "Trzy kropki otwierają opcje ukryj, wyklucz lub przełącz licznik czasu",
+  "tutorial_popup_2": "Ikony po obydwu stronach linku nawigacyjnego rozwijają się pokazując dodatkowe informacje, wypróbuj jak to działa!",
+  "tutorial_popup_3": "Ikony w każdej kategorii różnią się, upewnij się, że wypróbujesz wszystkie",
   "tutorial_save": "Zapisuje wybrane Pokémony i zamyka okno",
   "tutorial_show_all_view": "Przełącza Pokéstopy i gymy",
   "tutorial_show_pokemon_view": "Przełącza Pokémony",
-  "tutorial_pokemon_caption": "Ta ikona pozwala na ustawienie filtrów dla konkretnego Pokémona",
-  "tutorial_closing_1": "Ogólne suwaki Pokémonów na pasku bocznym działają oddzielnie od menu zaawansowanego i nie mają na siebie wpływu",
-  "invasions_subtitle": "Pokazuje informacje o inwazji Zespołu R, włącznie z Pokémonami wystawionymi do walki oraz nagrodami, które możesz otrzymać",
-  "nests_subtitle": "Pokazuje obecnie nestujące Pokémony oraz powierzchnie nestów",
-  "pokemon_subtitle": "Pokazuje lokalizacje Pokémonów oraz czas ich zniknięcia",
-  "pokestops_subtitle": "Pokazuje lokalizacje wszystkich Pokéstopów",
-  "pvp_subtitle": "Pokazuje rangę PVP/CP/informację o poziomie każdego Pokémona",
-  "stats_subtitle": "Pokazuje statystyki i poziomy Pokémona",
-  "global_search_pokestops": "Wprowadź nazwę Pokéstopa...",
-  "global_search_nests": "Wprowadź nazwę nestującego Pokémona...",
-  "pokemon_icons": "Ikony Pokémonów",
-  "pokestop_icons": "Ikony Pokéstopów",
-  "pokemon_timers": "Licznik czasu wszystkich Pokémonów",
-  "show_dex_num_in_popup": "Pokaż Pokédex # w Popupie",
-  "has_quest_indicator": "Alternatywny kolor dla Pokéstopów z zadaniami",
-  "pokestop": "Pokéstop",
-  "pokemon_cell": "Lokalizacja Pokémona może się różnić",
-  "pokemon_filter_mode": "Tryb filtru Pokémonów",
-  "search_rocket_pokemon": "Wyszukaj Pokémony Rocket",
-  "fast": "Szybki",
-  "charged": "Ładowany",
-  "first_seen": "Pierwotnie widziany",
-  "last_seen": "Ostatnio widziany",
-  "last_modified": "Ostatnio zmodyfikowany",
-  "last_updated": "Ostatnio zaktualizowany",
+  "tutorial_sidebar_0": "Tutaj są wszystkie Twoje filtry i ustawienia",
+  "tutorial_sidebar_1": "Używając suwaków możesz wybrać dokładnie te dane z wybranej kategorii, których potrzebujesz",
+  "tutorial_sidebar_2": "Opcje: Dodatkowe dostosowanie\nZaawansowane: Zostanie omówione w dalszej części tego samouczka",
+  "tutorial_sliders_0": "Użyj suwaków aby dostosować filtry",
+  "tutorial_sliders_1": "Pokémony pomiędzy:",
+  "tutorial_sliders_2": "- IV od {{iv0}}% do {{iv1}}%",
+  "tutorial_sliders_3": "Poziom od {{level0}} do {{level1}}",
+  "tutorial_sliders_3alt": "- ORAZ Poziom od {{level0}} do {{level1}}",
+  "tutorial_sliders_4": "- Ranking Great League od {{gl0}} do {{gl1}}",
+  "tutorial_sliders_4alt": "- ALBO Ranking Great League od {{gl0}} do {{gl1}}",
+  "tutorial_sliders_5": "- Ranking Ultra League od {{ul0}} do {{ul1}}",
+  "tutorial_sliders_5alt": "- ALBO Ranking Ultra League od {{ul0}} do {{ul1}}",
+  "tutorial_sliders_6": "Łączy się z innymi tego samego koloru",
+  "tutorial_sliders_7": "Filtruje oddzielnie od pozostałych suwaków",
+  "tutorial_sliders_8": "'Pełen' suwak oznacza, że jest nieaktywny:",
+  "tutorial_sliders_9": "Wszystkie spawny, niezależnie od tego, czy posiadają IV czy nie",
+  "tutorial_toggle": "Kliknięcię w krzyżyk / X przełącza element",
+  "tutorial_tune": "Ustawia filtr zaawansowany dla wszystkich Pokémonów obecnie filtrowanych w menu",
+  "tutorial_welcome": "To jest interaktywny samouczek i możesz śmiało korzystać ze wszystkich dostępnych opcji",
+  "two_stops_till_next": "2 stopy do następnego",
+  "type_audio": "Dźwięk typu",
+  "type_icons": "Ikony typów",
+  "types": "Typy",
+  "ultra_beast": "Ultra Beast",
+  "ultra_rare": "Bardzo rzadki",
+  "uncommon": "Rzadziej spotykany",
+  "unknown_event": "Nieznane wydarzenie",
+  "unknown_gym": "Nieznana nazwa gymu",
+  "unknown_pokestop": "Nieznana nazwa Pokéstopu",
+  "unselected": "Niezaznaczone",
+  "update": "Aktualizuj",
+  "use_my_location": "Użyj bieżącej lokalizacji",
+  "use_the_link_below": "Możesz użyć poniższego linka aby przesłać opinię lub zgłosić napotkane błędy.",
+  "user_profile": "Profil użytkownika",
+  "user_username": "Nazwa użytkownika",
+  "valid": "Poprawny",
+  "valid_filter": "Filtr statystyk poprawny",
+  "verify_nests": "Potwierdź sprawdzając aktualne spawny",
+  "version": "Wersja",
+  "view_profile": "Zobacz profil",
+  "volume_level": "Poziom głośności",
+  "wayfarer": "Wayfarer",
+  "wayfarer_options": "Opcje Wayfarer",
+  "weather": "Pogoda",
+  "weather_audio": "Dźwięk związany z pogodą",
+  "weather_icons": "Ikony pogody",
+  "weather_indicator": "Wskaźnik pogody",
+  "weather_options": "Opcje Pogody",
+  "weather_subtitle": "Pokazuje aktualną pogodę w grze w każdej komórce",
+  "webhook_advanced_save_width": 2,
+  "webhook_entry": "Dodaj do {{name}}",
+  "webhook_error": "{{name}} nie mógł tego przetworzyć.\n\nSpróbuj ponownie później.",
+  "webhook_footer_add_new_width": 4,
+  "webhook_footer_close_width": 4,
+  "webhook_footer_feedback_width": 4,
+  "webhook_footer_help_width": 4,
+  "webhook_selection": "{{name}} wybór",
+  "webhook_strategy_success_0": "Sukces! \nOdświeżam, aby pobrać ustawienia alertów...",
+  "webhook_success_gym": "Dodano alerty o raidach, jajkach oraz zmianie drużyny!",
   "webhooks": "Powiadomienia",
-  "everything_individually": "Dodaj indywidualne powiadomienia",
-  "submit_nest_name": "Prześlij nazwę nesta",
-  "nest_submissions": "Przesyłanie nestów",
-  "nest_submissions_subtitle": "Pozwala na przesyłanie nowych nazw dla nestów",
-  "ar_quest_true": "Z AR",
-  "ar_quest_false": "Bez AR",
+  "webhooks_subtitle": "Zarządzaj alertami bezpośrednio z mapy dla tych botów",
+  "welcome": "Witaj w",
   "with_ar": "Z AR",
   "without_ar": "Bez AR",
-  "both": "Obydwa",
-  "all_pokestops": "Wszystkie Pokéstopy",
-  "all_gyms": "Wszystkie Gymy"
+  "xl": "XL",
+  "xs": "xs",
+  "zero_iv": "0% IV",
+  "zoom_in": "Przybliż",
+  "zoom_out": "Oddal"
 }
diff --git a/packages/locales/lib/index.js b/packages/locales/lib/index.js
index bb43fbc49..900005dde 100644
--- a/packages/locales/lib/index.js
+++ b/packages/locales/lib/index.js
@@ -1,12 +1,20 @@
 const { create } = require('./create')
 const { missing } = require('./missing')
 const { generate } = require('./generate')
-const { readLocaleDirectory, writeAll } = require('./utils')
+const {
+  readLocaleDirectory,
+  writeAll,
+  getStatus,
+  readAndParseJson,
+} = require('./utils')
 
 const locales = readLocaleDirectory(true).map((x) => x.replace('.json', ''))
+const status = getStatus()
 
 module.exports.locales = locales
+module.exports.status = status
 module.exports.create = create
 module.exports.missing = missing
 module.exports.generate = generate
 module.exports.writeAll = writeAll
+module.exports.readAndParseJson = readAndParseJson
diff --git a/packages/locales/lib/missing.js b/packages/locales/lib/missing.js
index ed6591b22..bec46ef0b 100644
--- a/packages/locales/lib/missing.js
+++ b/packages/locales/lib/missing.js
@@ -5,27 +5,34 @@ const { resolve } = require('path')
 const { log, HELPERS } = require('@rm/logger')
 const { readAndParseJson, readLocaleDirectory } = require('./utils')
 
-async function missing() {
-  const localTranslations = readLocaleDirectory(true)
+/**
+ *
+ * @param {string} fileName
+ * @returns {Promise<import('./generate').I18nObject>}
+ */
+async function missing(fileName) {
   const englishRef = await readAndParseJson('en.json', true)
+  const humanLocales = await readAndParseJson(fileName, true)
+  /** @type {import('./generate').I18nObject} */
+  const missingKeys = {}
 
-  await Promise.allSettled(
-    localTranslations.map(async (fileName) => {
-      const humanLocales = await readAndParseJson(fileName, true)
-      const aiLocales = await readAndParseJson(fileName, false)
-      const combined = {
-        ...aiLocales,
-        ...humanLocales,
+  Object.keys(englishRef)
+    .sort()
+    .forEach((key) => {
+      if (!humanLocales[key] && !key.startsWith('locale_selection_')) {
+        missingKeys[key] = process.argv.includes('--ally')
+          ? `t('${key}')`
+          : englishRef[key]
       }
-      const missingKeys = {}
+    })
+  return missingKeys
+}
 
-      Object.keys(englishRef).forEach((key) => {
-        if (!combined[key] && !key.startsWith('locale_selection_')) {
-          missingKeys[key] = process.argv.includes('--ally')
-            ? `t('${key}')`
-            : englishRef[key]
-        }
-      })
+async function missingAll() {
+  const localTranslations = readLocaleDirectory(true)
+  await Promise.allSettled(
+    localTranslations.map(async (fileName) => {
+      const missingKeys = await missing(fileName)
       await fs.writeFile(
         resolve(
           __dirname,
@@ -44,5 +51,5 @@ async function missing() {
 module.exports.missing = missing
 
 if (require.main === module) {
-  missing().then(() => process.exit(0))
+  missingAll().then(() => process.exit(0))
 }
diff --git a/packages/locales/lib/utils.js b/packages/locales/lib/utils.js
index 93e54e31d..14a150917 100644
--- a/packages/locales/lib/utils.js
+++ b/packages/locales/lib/utils.js
@@ -1,5 +1,5 @@
 // @ts-check
-const { promises: fs, readdirSync } = require('fs')
+const { promises: fs, readdirSync, readFileSync } = require('fs')
 const { resolve } = require('path')
 const { default: fetch } = require('node-fetch')
 
@@ -99,9 +99,57 @@ async function writeAll(locales, i18nFormat, ...directories) {
   )
 }
 
+/** @param {import('./generate').I18nObject} json */
+function filter(json) {
+  return Object.fromEntries(
+    Object.entries(json).filter(
+      ([key, value]) =>
+        typeof value !== 'number' && !key.startsWith('locale_selection_'),
+    ),
+  )
+}
+
+function getStatus() {
+  const humanEnglish = JSON.parse(
+    readFileSync(resolve(__dirname, HUMAN_LOCALES, 'en.json'), 'utf-8'),
+  )
+  const filtered = filter(humanEnglish)
+  const total = Object.keys(filtered).length
+
+  return Object.fromEntries(
+    readLocaleDirectory(true).map((locale) => {
+      const humanJson = filter(
+        JSON.parse(
+          readFileSync(resolve(__dirname, HUMAN_LOCALES, locale), 'utf-8'),
+        ),
+      )
+      const humanHas = Object.keys(filtered).filter(
+        (key) => key in humanJson,
+      ).length
+      const aiJson = filter(
+        JSON.parse(
+          readFileSync(resolve(__dirname, AI_LOCALES, locale), 'utf-8'),
+        ),
+      )
+      const mergedSize = Object.keys({ ...aiJson, ...humanJson }).length
+      const human = (humanHas / total) * 100
+      const localeTotal = (mergedSize / total) * 100
+      return [
+        locale.replace('.json', ''),
+        {
+          human: Math.round(human),
+          ai: Math.round(localeTotal - human),
+          total: Math.round(localeTotal),
+        },
+      ]
+    }),
+  )
+}
+
 module.exports = {
   fetchRemote,
   readAndParseJson,
   readLocaleDirectory,
   writeAll,
+  getStatus,
 }
diff --git a/packages/locales/package.json b/packages/locales/package.json
index 53417e4c3..8a932ba42 100644
--- a/packages/locales/package.json
+++ b/packages/locales/package.json
@@ -18,8 +18,9 @@
     "@rm/config": "*",
     "@rm/logger": "*",
     "dotenv": "^16.3.1",
+    "gpt-tokenizer": "^2.1.2",
     "node-fetch": "2.6.7",
-    "openai": "^4.24.1"
+    "openai": "4.29.0"
   },
   "devDependencies": {
     "@types/node-fetch": "2.6.1"
diff --git a/packages/types/lib/augmentations.d.ts b/packages/types/lib/augmentations.d.ts
index 1ea6c14ed..4615a932c 100644
--- a/packages/types/lib/augmentations.d.ts
+++ b/packages/types/lib/augmentations.d.ts
@@ -1,7 +1,8 @@
-import { ButtonProps } from '@mui/material'
+import { Request } from 'express'
+import type { ButtonProps } from '@mui/material'
+
 import { Config, GetSafeConfig } from './config'
 import { ExpressUser, Permissions } from './server'
-import { Request } from 'express'
 
 declare module 'config' {
   interface IConfig extends Config {
diff --git a/packages/types/lib/client.d.ts b/packages/types/lib/client.d.ts
index b1a455e5f..fcbb7c9f0 100644
--- a/packages/types/lib/client.d.ts
+++ b/packages/types/lib/client.d.ts
@@ -1,9 +1,11 @@
 import * as React from 'react'
-import { Config } from './config'
-import UAssets from '@services/Icons'
-import { ButtonProps, SxProps, Theme } from '@mui/material'
+import type { ButtonProps, SxProps, Theme } from '@mui/material'
 import { SystemStyleObject } from '@mui/system'
 
+import { UAssets } from '@services/Assets'
+import { Config } from './config'
+import { AdvCategories, Permissions } from '@rm/types'
+
 declare global {
   declare const CONFIG: Config<true>
 
@@ -19,6 +21,16 @@ export interface CustomI extends React.HTMLProps<HTMLLIElement> {
 
 export type TimesOfDay = 'day' | 'night' | 'dawn' | 'dusk'
 
+export type Theme = 'light' | 'dark'
+
+export type TileLayer = {
+  name: string
+  style: import('@rm/types').Theme
+  attribution?: string
+  url?: string
+  background?: string
+} & { [key in TimesOfDay]?: string }
+
 export type MarginProps = {
   [Key in
     | 'm'
@@ -51,3 +63,26 @@ export interface MultiSelectorProps<V> {
     newValue: V,
   ) => (e?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void
 }
+
+export interface FilterObj {
+  name: string
+  perms: (keyof Permissions)[]
+  webhookOnly?: boolean
+  searchMeta?: string
+  category?: AdvCategories
+  pokedexId?: number
+  formId?: number
+  defaultFormId?: number
+  pokeName?: string
+  formName?: string
+  formTypes?: string[]
+  rarity?: string
+  historic?: string
+  legendary?: boolean
+  mythical?: boolean
+  ultraBeast?: boolean
+  genId?: string
+  family?: number
+}
+
+export type ClientFilterObj = Record<string, Record<string, FilterObj>>
diff --git a/packages/types/lib/config.d.ts b/packages/types/lib/config.d.ts
index ceff80824..856fbc874 100644
--- a/packages/types/lib/config.d.ts
+++ b/packages/types/lib/config.d.ts
@@ -1,9 +1,19 @@
 import type { LogLevelNames } from 'loglevel'
+import type {
+  ButtonProps,
+  DialogProps,
+  DividerProps,
+  Grid2Props,
+  SxProps,
+} from '@mui/material'
+
 import config = require('server/src/configs/default.json')
 import example = require('server/src/configs/local.example.json')
 
 import type { Schema } from './server'
-import type { DialogProps } from '@mui/material'
+import { TypographyProps } from '@mui/system'
+import { OnlyType } from './utility'
+import { Props as ImgProps } from '@components/Img'
 
 type BaseConfig = typeof config
 type ExampleConfig = typeof example
@@ -25,6 +35,9 @@ export interface Config<Client extends boolean = false>
     ? {
         version: string
         locales: string[]
+        localeStatus: ReturnType<
+          typeof import('@rm/locales/lib/utils')['getStatus']
+        >
         hasCustom: boolean
         title: string
       }
@@ -154,15 +167,87 @@ export interface Webhook {
   local: []
 }
 
-export interface CustomComponent {
-  type?: string
-  components?: CustomComponent[]
+export interface GridSizes {
+  xs?: number
+  sm?: number
+  md?: number
+  lg?: number
+  xl?: number
+}
+
+export interface BaseBlock {
+  gridSizes?: GridSizes
+  gridStyle?: React.CSSProperties
+  gridSx?: SxProps
   donorOnly?: boolean
   freeloaderOnly?: boolean
   loggedInOnly?: boolean
   loggedOutOnly?: boolean
+  text?: string | null
+  content?: string | null
+  link?: string | null
+  href?: string | null
+}
+export interface CustomText
+  extends Omit<OnlyType<TypographyProps, Function, false>>,
+    BaseBlock {
+  type: 'text'
+}
+
+export interface CustomDivider
+  extends Omit<OnlyDType<DividerProps, Function, false>>,
+    BaseBlock {
+  type: 'divider'
 }
 
+export interface CustomButton
+  extends Omit<OnlyType<ButtonProps, Function, false>>,
+    BaseBlock {
+  type: 'button'
+}
+
+export interface CustomImg extends ImgProps, BaseBlock {
+  type: 'img'
+}
+
+export interface CustomDiscord extends BaseBlock {
+  type: 'discord'
+  link: string
+}
+
+export interface CustomTelegram extends BaseBlock {
+  type: 'telegram'
+  telegramBotName: string
+  telegramAuthUrl: string
+}
+
+export interface CustomLocal extends BaseBlock {
+  type: 'localLogin'
+  localAuthUrl: string
+  link: string
+  style: React.CSSProperties
+}
+
+export interface CustomLocale extends BaseBlock {
+  type: 'localeSelection'
+}
+
+export interface ParentBlock extends BaseBlock, Grid2Props {
+  type: 'parent'
+  components: CustomComponent[]
+}
+
+export type CustomComponent =
+  | CustomText
+  | CustomDivider
+  | CustomButton
+  | CustomImg
+  | CustomDiscord
+  | CustomTelegram
+  | CustomLocal
+  | CustomLocale
+  | ParentBlock
+
 export type DeepKeys<T, P extends string = ''> = {
   [K in keyof T]-?: K extends string
     ? P extends ''
diff --git a/packages/types/lib/general.d.ts b/packages/types/lib/general.d.ts
index 779808f1f..9511fd8d2 100644
--- a/packages/types/lib/general.d.ts
+++ b/packages/types/lib/general.d.ts
@@ -1,4 +1,6 @@
+import type { SliderProps } from '@mui/material'
 import type { Feature, Polygon, MultiPolygon } from '@turf/helpers'
+import { Config } from './config'
 
 export type HttpMethod = 'GET' | 'PUT' | 'POST' | 'PATCH' | 'DELETE'
 
@@ -27,9 +29,6 @@ export type RMGeoJSON = {
   features: RMFeature[]
 }
 
-import { Config } from './config'
-import { SliderProps } from '@mui/material'
-
 export type Strategy = 'discord' | 'telegram' | 'local'
 
 export type S2Polygon = [number, number][]
diff --git a/packages/types/lib/scanner.d.ts b/packages/types/lib/scanner.d.ts
index 6ccb67af5..f6c2216a4 100644
--- a/packages/types/lib/scanner.d.ts
+++ b/packages/types/lib/scanner.d.ts
@@ -12,6 +12,8 @@ import WeatherModel = require('server/src/models/Weather')
 import RouteModel = require('server/src/models/Route')
 import { S2Polygon } from './general'
 
+export type Gender = 0 | 1 | 2 | 3
+
 export interface Device {
   id: string
   instance_name: string
@@ -55,7 +57,7 @@ export interface Gym {
   sponsor_id: number
   partner_id: number
   raid_pokemon_costume: number
-  raid_pokemon_gender: number
+  raid_pokemon_gender: Gender
   raid_pokemon_evolution: number
   ar_scan_eligible: boolean
   badge: number
@@ -102,7 +104,7 @@ export interface Quest {
   stardust_amount: number
   quest_pokemon_id: number
   quest_form_id: number
-  quest_gender_id: number
+  quest_gender_id: Gender
   quest_costume_id: number
   quest_shiny: number
   mega_pokemon_id: number
@@ -133,7 +135,7 @@ export interface ShowcaseEntry {
   pokemon_id: number
   form: number
   costume: number
-  gender: number
+  gender: Gender
   score: number
 }
 
@@ -207,7 +209,7 @@ export interface Pokemon {
   pokemon_id: number
   form: number
   costume: number
-  gender: number
+  gender: Gender
   display_pokemon_id: number
   ditto_form: number
   weight: number
diff --git a/packages/types/lib/utility.d.ts b/packages/types/lib/utility.d.ts
index 34bf628fd..5fabda50b 100644
--- a/packages/types/lib/utility.d.ts
+++ b/packages/types/lib/utility.d.ts
@@ -13,7 +13,9 @@ export type SpecificValueType<T, U, V> = {
 /*
  * OnlyType<T, U, V> - returns a type with only the keys of T that have a value of U
  */
-export type OnlyType<T, U, V = true> = { [k in SpecificValueType<T, U, V>]: U }
+export type OnlyType<T, U, V = true> = {
+  [K in SpecificValueType<T, U, V>]: T[K]
+}
 
 export type StoreNoFn<T> = keyof OnlyType<T, Function, false>
 
diff --git a/packages/vite-plugins/lib/favicon.js b/packages/vite-plugins/lib/favicon.js
index 108d1c4d1..33e1f5f06 100644
--- a/packages/vite-plugins/lib/favicon.js
+++ b/packages/vite-plugins/lib/favicon.js
@@ -9,36 +9,36 @@ const { log, HELPERS } = require('@rm/logger')
  * @returns {import('vite').Plugin}
  */
 const faviconPlugin = (isDevelopment) => {
-  try {
-    const favicon = fs.existsSync(
-      resolve(__dirname, '../../../public/favicon/favicon.ico'),
-    )
-      ? resolve(__dirname, '../../../public/favicon/favicon.ico')
-      : resolve(__dirname, '../../../public/favicon/fallback.ico')
-    return {
-      name: 'vite-plugin-favicon',
-      generateBundle() {
-        if (isDevelopment) return
+  const basePath = resolve(__dirname, '../../../public/favicon')
+  const fallback = resolve(basePath, `fallback.ico`)
+  const custom = process.env.NODE_CONFIG_ENV
+    ? resolve(basePath, `${process.env.NODE_CONFIG_ENV}.ico`)
+    : resolve(basePath, `favicon.ico`)
+  const favicon = fs.existsSync(custom) ? custom : fallback
+  return {
+    name: 'vite-plugin-favicon',
+    generateBundle() {
+      if (isDevelopment) return
+      try {
         this.emitFile({
           type: 'asset',
           fileName: 'favicon.ico',
           source: fs.readFileSync(favicon),
         })
-      },
-      configureServer(server) {
-        server.middlewares.use((req, res, next) => {
-          if (req.url === '/favicon.ico') {
-            res.writeHead(200, { 'Content-Type': 'image/x-icon' })
-            res.end(fs.readFileSync(favicon))
-            return
-          }
-          next()
-        })
-      },
-    }
-  } catch (e) {
-    log.error(HELPERS.build, 'Error loading favicon', e)
-    return { name: 'vite-plugin-favicon' }
+      } catch (e) {
+        log.error(HELPERS.build, 'Error loading favicon', e)
+      }
+    },
+    configureServer(server) {
+      server.middlewares.use((req, res, next) => {
+        if (req.url === '/favicon.ico') {
+          res.writeHead(200, { 'Content-Type': 'image/x-icon' })
+          res.end(fs.readFileSync(favicon))
+          return
+        }
+        next()
+      })
+    },
   }
 }
 
diff --git a/server/src/configs/custom-environment-variables.json b/server/src/configs/custom-environment-variables.json
index 6bf665442..d02eb975c 100644
--- a/server/src/configs/custom-environment-variables.json
+++ b/server/src/configs/custom-environment-variables.json
@@ -19,7 +19,6 @@
       "__name": "DEV_OPTIONS_QUERY_DEBUG",
       "__format": "boolean"
     },
-    "clientPath": "DEV_OPTIONS_CLIENT_PATH",
     "logLevel": "DEV_OPTIONS_LOG_LEVEL",
     "skipMinified": {
       "__name": "DEV_OPTIONS_SKIP_MINIFIED",
@@ -299,10 +298,6 @@
       "bearerToken": "API_KOJI_OPTIONS_BEARER_TOKEN"
     }
   },
-  "multiDomains": {
-    "__name": "MULTI_DOMAINS",
-    "__format": "json"
-  },
   "map": {
     "general": {
       "title": "MAP_GENERAL_TITLE",
diff --git a/server/src/configs/default.json b/server/src/configs/default.json
index fdc81766d..f77f8b29c 100644
--- a/server/src/configs/default.json
+++ b/server/src/configs/default.json
@@ -7,7 +7,6 @@
     "enabled": false,
     "graphiql": false,
     "queryDebug": false,
-    "clientPath": "../../dist",
     "logLevel": "info",
     "skipMinified": false
   },
@@ -117,7 +116,6 @@
       "bearerToken": "KOJI_SECRET"
     }
   },
-  "multiDomains": [],
   "map": {
     "general": {
       "title": "ReactMap",
diff --git a/server/src/configs/local.example.json b/server/src/configs/local.example.json
index dec49e922..e13d14c87 100644
--- a/server/src/configs/local.example.json
+++ b/server/src/configs/local.example.json
@@ -23,27 +23,26 @@
   "database": {
     "schemas": [
       {
-        "note": "Scanner Database",
+        "note": "Golbat Database",
         "host": "127.0.0.1",
         "port": 3306,
-        "username": "scanner_user",
-        "password": "scanner_paw",
-        "database": "scanner_db",
+        "username": "golbat_user",
+        "password": "golbat_pw",
+        "database": "golbat_db",
         "useFor": [
-          "device",
           "gym",
-          "pokemon",
           "pokestop",
           "scanCell",
           "spawnpoint",
           "weather",
-          "route"
+          "route",
+          "nest"
         ]
       },
       {
-        "note": "This is only if you are using golbat and in memory, if you do not know what that is, remove this whole section. If you are using it, you should remove 'device' and 'pokemon' from the scanner database useFor array",
+        "note": "This is only if you are using golbat and in memory, if you do not know what that is, remove this whole section.",
         "type": "golbat",
-        "endpoint": "http://127.0.0.1:9001",
+        "endpoint": "http://{golbat_address}:{golbat_port}",
         "secret": "",
         "useFor": [
           "pokemon",
@@ -62,14 +61,13 @@
         ]
       },
       {
-        "note": "Manual Database generally used for storing nests or portal tables, more info on the Wiki",
+        "note": "Manual Database generally used for storing external nests or portal tables, more info on the Wiki",
         "host": "127.0.0.1",
         "port": 3306,
         "username": "manual_user",
         "password": "manual_pw",
         "database": "manual_db",
         "useFor": [
-          "nest",
           "portal"
         ]
       }
diff --git a/server/src/configs/multi-domain-example/README.md b/server/src/configs/multi-domain-example/README.md
new file mode 100644
index 000000000..45c3d25bf
--- /dev/null
+++ b/server/src/configs/multi-domain-example/README.md
@@ -0,0 +1,74 @@
+# Multi Domain Setup
+
+## Overview
+- This makes use of the `NODE_CONFIG_ENV` env variable to determine which `local.json` files to load
+- Loads `default.json` => `local.json` => `local-{NODE_CONFIG_ENV}`.json
+- You set all of your base defaults in `local.json` still, then set things that are unique to those domains, such `geoJsonFilename` or authentication strategies in each of the domain specifics jsons
+- The `NODE_CONFIG_ENV` var names should not contain `/` or `.`
+
+## File System
+```js 
+// please note that this all goes in the parent `config` folder, not this example folder
+local.json
+local-applemap.json
+local-orangemap.json
+```
+
+## Explanation of Config Files
+- `local.json` is the base config file that all other configs will inherit from, it can also be its own map instance if do not set the `NODE_CONFIG_ENV` env variable
+- The other files will inherit everything you set in `local.json` and then override any values that are set in the domain specific file
+- Such as in `local-applemap.json`, we have set a new title, a separate Discord strategy, and a different geoJsonFilename
+- Only config setting you must set in each file is the port, since separate instances of the app will be generated
+- In `local-orangemap.json`, we also set a different start Latitude and Longitude and have disabled some various features that we do not want on that map. In `local.json`, we had set `alwaysEnabledPerms = ["map"]`, however, for orangemap we have overridden that by providing an empty array. 
+- The databases specified in `local.json` will be used in all 3 maps, as will all of the permissions.
+
+## New PM2 `ecosystem.config.js` Example
+```js
+module.exports = {
+  apps: [
+    {
+      name: 'ReactMap',
+      script: 'ReactMap.js',
+      instances: 1,
+      autorestart: true,
+      exec_mode: 'fork',
+      max_memory_restart: '2G',
+    },
+    {
+      name: 'AppleMap',
+      script: 'ReactMap.js',
+      instances: 1,
+      autorestart: true,
+      exec_mode: 'fork',
+      max_memory_restart: '2G',
+      env: {
+        NODE_CONFIG_ENV: 'applemap',
+      },
+    },
+    {
+      name: 'OrangeMap',
+      script: 'ReactMap.js',
+      instances: 1,
+      autorestart: true,
+      exec_mode: 'fork',
+      max_memory_restart: '2G',
+      env: {
+        NODE_CONFIG_ENV: 'orangemap',
+      },
+    },
+  ],
+}
+```
+
+```sh
+# Start the app with the following command
+pm2 start ecosystem.config.js
+```
+
+## Other Notes
+
+- Be sure to view the `nginx` file to see how to set up the reverse proxy for the different domains
+- The domains do not have to be subdomains of each other, they can be whatever you want, they are just used to differentitate the different configs
+- The `NODE_CONFIG_ENV` var names should not contain `/` or `.`
+- The `NODE_CONFIG_ENV` value does not have to be related to the domain its representing. The URL for the map could be `https://www.my-super-map.com` and the `NODE_CONFIG_ENV` could be `applemap` or `orangemap` or `bananamap` or whatever you want, as long as you point the nginx reverse proxy to the correct instance of the app
+- Custom favicons can be set by putting the respective `{NODE_CONFIG_ENV}.ico` in the `public/favicon` folder
\ No newline at end of file
diff --git a/server/src/configs/multi-domain-example/local-applemap.json b/server/src/configs/multi-domain-example/local-applemap.json
new file mode 100644
index 000000000..57a7d442b
--- /dev/null
+++ b/server/src/configs/multi-domain-example/local-applemap.json
@@ -0,0 +1,33 @@
+{
+  "port": 8081,
+  "map": {
+    "general": {
+      "title": "Apple Map",
+      "headerTitle": "Apple Map PoGo",
+      "geoJsonFilName": "http://koji.map.com/api/v1/geofence/feature-collection/apple"
+    },
+    "links": {
+      "discordInvite": "apple map invite",
+      "rolesLink": "apple map roles link"
+    }
+  },
+  "authentication": {
+    "strategies": [
+      {
+        "name": "this is your discord strategy for apple map",
+        "enabled": false,
+        "type": "discord",
+        "logChannelId": "",
+        "presence": "Map Status: Online",
+        "presenceType": 3,
+        "botToken": "",
+        "clientId": "",
+        "clientSecret": "",
+        "redirectUri": "http://localhost:8081/auth/discord/callback",
+        "allowedGuilds": [],
+        "blockedGuilds": [],
+        "allowedUsers": []
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/server/src/configs/multi-domain-example/local-orangemap.json b/server/src/configs/multi-domain-example/local-orangemap.json
new file mode 100644
index 000000000..559f54420
--- /dev/null
+++ b/server/src/configs/multi-domain-example/local-orangemap.json
@@ -0,0 +1,39 @@
+{
+  "port": 8082,
+  "map": {
+    "general": {
+      "title": "Orange Map",
+      "headerTitle": "Orange Map",
+      "startLat": 67.2512,
+      "startLon": -25.9667,
+      "geoJsonFilName": "http://koji.map.com/api/v1/geofence/feature-collection/orange"
+    },
+    "misc": {
+      "enableMapJsFilter": false,
+      "enablePokemonPopupCoordsSelector": false,
+      "enableGymPopupCoordsSelector": false,
+      "enablePokestopPopupCoordsSelector": false,
+      "enablePortalPopupCoordsSelector": false
+    }
+  },
+  "authentication": {
+    "strategies": [
+      {
+        "name": "this is your discord strategy for orange map",
+        "enabled": false,
+        "type": "discord",
+        "logChannelId": "",
+        "presence": "Map Status: Online",
+        "presenceType": 3,
+        "botToken": "",
+        "clientId": "",
+        "clientSecret": "",
+        "redirectUri": "http://localhost:8082/auth/discord/callback",
+        "allowedGuilds": [],
+        "blockedGuilds": [],
+        "allowedUsers": []
+      }
+    ],
+    "alwaysEnabledPerms": []
+  }
+}
\ No newline at end of file
diff --git a/server/src/configs/multi-domain-example/local.json b/server/src/configs/multi-domain-example/local.json
new file mode 100644
index 000000000..fd7c7d379
--- /dev/null
+++ b/server/src/configs/multi-domain-example/local.json
@@ -0,0 +1,150 @@
+{
+  "interface": "0.0.0.0",
+  "port": 8080,
+  "api": {
+    "reactMapSecret": "very-secure-secret",
+    "maxSessions": 5,
+    "pvp": {
+      "reactMapHandlesPvp": false
+    }
+  },
+  "map": {
+    "general": {
+      "title": "ReactMap",
+      "headerTitle": "ReactMap",
+      "startLat": 2.5014,
+      "startLon": 5.6362
+    },
+    "misc": {
+      "enableMapJsFilter": true,
+      "enablePokemonPopupCoordsSelector": true,
+      "enableGymPopupCoordsSelector": true,
+      "enablePokestopPopupCoordsSelector": true,
+      "enablePortalPopupCoordsSelector": true
+    }
+  },
+  "database": {
+    "schemas": [
+      {
+        "note": "Scanner Database",
+        "host": "127.0.0.1",
+        "port": 3306,
+        "username": "scanner_user",
+        "password": "scanner_paw",
+        "database": "scanner_db",
+        "useFor": [
+          "device",
+          "gym",
+          "pokemon",
+          "pokestop",
+          "scanCell",
+          "spawnpoint",
+          "weather",
+          "route"
+        ]
+      },
+      {
+        "type": "golbat",
+        "endpoint": "http://127.0.0.1:9001",
+        "secret": "",
+        "useFor": [
+          "pokemon",
+          "device"
+        ]
+      },
+      {
+        "host": "127.0.0.1",
+        "port": 3306,
+        "username": "reactmap_user",
+        "password": "reactmap_paw",
+        "database": "reactmap_db",
+        "useFor": [
+          "user"
+        ]
+      },
+      {
+        "host": "127.0.0.1",
+        "port": 3306,
+        "username": "manual_user",
+        "password": "manual_pw",
+        "database": "manual_db",
+        "useFor": [
+          "nest",
+          "portal"
+        ]
+      }
+    ]
+  },
+  "authentication": {
+    "strategies": [
+      {
+        "name": "this is your discord strategy for the base config (no NODE_CONFIG_ENV set)",
+        "enabled": false,
+        "type": "discord",
+        "logChannelId": "",
+        "presence": "Map Status: Online",
+        "presenceType": 3,
+        "botToken": "",
+        "clientId": "",
+        "clientSecret": "",
+        "redirectUri": "http://localhost:8080/auth/discord/callback",
+        "allowedGuilds": [],
+        "blockedGuilds": [],
+        "allowedUsers": []
+      }
+    ],
+    "alwaysEnabledPerms": [
+      "map"
+    ],
+    "perms": {
+      "map": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": []
+      },
+      "pokemon": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": [
+          "role1",
+          "role2",
+          "role3"
+        ]
+      },
+      "iv": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": [
+          "role1",
+          "role2",
+          "role3"
+        ]
+      },
+      "pvp": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": [
+          "role1",
+          "role2"
+        ]
+      },
+      "gyms": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": [
+          "role1",
+          "role2",
+          "role3",
+          "role4"
+        ]
+      },
+      "raids": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": [
+          "role3"
+        ]
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/server/src/configs/multi-domain-example/nginx b/server/src/configs/multi-domain-example/nginx
new file mode 100644
index 000000000..a9b0ad698
--- /dev/null
+++ b/server/src/configs/multi-domain-example/nginx
@@ -0,0 +1,47 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    mymap.com;
+
+    location / {
+        proxy_pass              http://127.0.0.1:8080/;
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_request_buffering off;
+        proxy_buffering         off;
+        proxy_set_header        Connection keep-alive;
+    }
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    applemap.com;
+
+    location / {
+        proxy_pass              http://127.0.0.1:8081/;
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_request_buffering off;
+        proxy_buffering         off;
+        proxy_set_header        Connection keep-alive;
+    }
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    orangemap.com;
+
+    location / {
+        proxy_pass              http://127.0.0.1:8082/;
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_request_buffering off;
+        proxy_buffering         off;
+        proxy_set_header        Connection keep-alive;
+    }
+}
diff --git a/server/src/graphql/resolvers.js b/server/src/graphql/resolvers.js
index 1d58dea88..0b4ad74fa 100644
--- a/server/src/graphql/resolvers.js
+++ b/server/src/graphql/resolvers.js
@@ -3,6 +3,7 @@ const { resolve } = require('path')
 const { GraphQLJSON } = require('graphql-type-json')
 const { S2LatLng, S2RegionCoverer, S2LatLngRect } = require('nodes2ts')
 const config = require('@rm/config')
+const { missing, readAndParseJson } = require('@rm/locales')
 
 const buildDefaultFilters = require('../services/filters/builder/base')
 const filterComponents = require('../services/functions/filterComponents')
@@ -198,6 +199,16 @@ const resolvers = {
       }
       return {}
     },
+    locales: async (_, { locale }) => {
+      const missingLocales = await missing(`${locale}.json`)
+      return locale
+        ? {
+            missing: Object.keys(missingLocales),
+            human: await readAndParseJson(`${locale}.json`, true),
+            ai: await readAndParseJson(`${locale}.json`, false),
+          }
+        : { missing: null, human: null, ai: null }
+    },
     motdCheck: (_, { clientIndex }, { req, perms }) => {
       const motd = config.getMapConfig(req).messageOfTheDay
       return (
@@ -388,8 +399,8 @@ const resolvers = {
       }
       return null
     },
-    search: async (_, args, { Event, perms, Db }) => {
-      const { category, webhookName, search } = args
+    search: async (_, args, { Event, perms, Db, req }) => {
+      const { category, search } = args
       if (!search || !search.trim()) {
         return []
       }
@@ -403,8 +414,8 @@ const resolvers = {
         case 'gyms': {
           if (!perms.gyms) return []
           const results = await Db.search('Gym', perms, args)
-          const webhook = webhookName ? Event.webhookObj[webhookName] : null
-          if (webhook && results.length) {
+          const webhook = Event.webhookObj[req.user.selectedWebhook]
+          if (webhook?.nominatimUrl && results.length) {
             const withFormatted = await Promise.all(
               results.map(async (result) => ({
                 ...result,
@@ -412,6 +423,7 @@ const resolvers = {
                   webhook.nominatimUrl,
                   { lat: result.lat, lon: result.lon },
                   true,
+                  webhook.addressFormat,
                 ),
               })),
             )
diff --git a/server/src/graphql/typeDefs/index.graphql b/server/src/graphql/typeDefs/index.graphql
index db050f00c..6afeb5b2a 100644
--- a/server/src/graphql/typeDefs/index.graphql
+++ b/server/src/graphql/typeDefs/index.graphql
@@ -23,6 +23,7 @@ type Query {
     filters: JSON
   ): [Gym]
   gymsSingle(id: ID, perm: String): Gym
+  locales(locale: String): Locales
   motdCheck(clientIndex: Int): Boolean
   nests(
     minLat: Float
diff --git a/server/src/graphql/typeDefs/map.graphql b/server/src/graphql/typeDefs/map.graphql
index b91f4195d..5840c517e 100644
--- a/server/src/graphql/typeDefs/map.graphql
+++ b/server/src/graphql/typeDefs/map.graphql
@@ -55,7 +55,7 @@ type Search {
   lat: Float
   lon: Float
   distance: Float
-  formatted: Geocoder
+  formatted: String
   nest_pokemon_id: Int
   nest_pokemon_form: Int
   raid_pokemon_id: Int
@@ -216,3 +216,9 @@ type ValidUserObj {
   loggedIn: Boolean
   admin: Boolean
 }
+
+type Locales {
+  human: JSON
+  ai: JSON
+  missing: JSON
+}
diff --git a/server/src/index.js b/server/src/index.js
index 973b8da26..3a2459ac8 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -141,10 +141,14 @@ app.use(compression())
 
 app.use(express.json({ limit: '50mb' }))
 
-app.use(
-  express.static(path.join(__dirname, config.getSafe('devOptions.clientPath'))),
+const distDir = path.join(
+  __dirname,
+  '../../',
+  `dist${process.env.NODE_CONFIG_ENV ? `-${process.env.NODE_CONFIG_ENV}` : ''}`,
 )
 
+app.use(express.static(distDir))
+
 app.use(
   session({
     name: 'reactmap1',
@@ -172,7 +176,7 @@ passport.deserializeUser(async (user, done) => {
   }
 })
 
-const localePath = path.resolve(__dirname, '../../dist/locales')
+const localePath = path.resolve(distDir, 'locales')
 if (fs.existsSync(localePath)) {
   require('./services/i18n')
 } else {
@@ -240,12 +244,13 @@ startApollo(httpServer).then((server) => {
         const definition = parse(req.body.query).definitions.find(
           (d) => d.kind === 'OperationDefinition',
         )
+        const endpoint = definition?.name?.value || ''
         const errorCtx = {
           id,
           user,
           clientV,
           serverV,
-          endpoint: definition.name?.value || '',
+          endpoint,
         }
 
         if (clientV && serverV && clientV !== serverV) {
@@ -258,7 +263,7 @@ startApollo(httpServer).then((server) => {
           })
         }
 
-        if (!perms) {
+        if (!perms && endpoint !== 'Locales') {
           throw new GraphQLError('session_expired', {
             extensions: {
               ...errorCtx,
@@ -271,7 +276,7 @@ startApollo(httpServer).then((server) => {
         if (
           definition?.operation === 'mutation' &&
           !id &&
-          definition?.name?.value !== 'SetTutorial'
+          endpoint !== 'SetTutorial'
         ) {
           throw new GraphQLError('unauthenticated', {
             extensions: {
diff --git a/server/src/models/Weather.js b/server/src/models/Weather.js
index de7c9f180..c10abde2e 100644
--- a/server/src/models/Weather.js
+++ b/server/src/models/Weather.js
@@ -13,19 +13,26 @@ class Weather extends Model {
     return 'weather'
   }
 
+  /**
+   * @param {import("@rm/types").Permissions} perms
+   * @param {import('@rm/types').Bounds & { filters: { onlyAreas: string[] } } } args
+   * @param {import('@rm/types').DbContext} ctx
+   */
   static async getAll(perms, args, { isMad }) {
     const query = this.query().select([
-      '*',
       ref(isMad ? 's2_cell_id' : 'id')
         .castTo('CHAR')
         .as('id'),
     ])
     if (isMad) {
       query.select([
+        'latitude',
+        'longitude',
         'gameplay_weather AS gameplay_condition',
         raw('UNIX_TIMESTAMP(last_updated)').as('updated'),
       ])
     } else {
+      query.select(['latitude', 'longitude', 'gameplay_condition', 'updated'])
       const ts = Math.floor(Date.now() / 1000)
       const ms = ts - config.getSafe('api.weatherCellLimit') * 60 * 60 * 24
       query.where('updated', '>=', ms)
diff --git a/server/src/routes/clientRouter.js b/server/src/routes/clientRouter.js
index 7eb3d0571..703774df2 100644
--- a/server/src/routes/clientRouter.js
+++ b/server/src/routes/clientRouter.js
@@ -1,7 +1,6 @@
 // @ts-check
 const express = require('express')
 const path = require('path')
-const config = require('@rm/config')
 
 const router = express.Router()
 
@@ -16,13 +15,17 @@ const CLIENT_ROUTES = [
   '/500',
   '/reset',
   '/playground',
+  '/locales',
+  '/data-management',
 ]
 
 router.get(CLIENT_ROUTES, (req, res) => {
   res.sendFile(
     path.join(
       __dirname,
-      `../${config.getSafe('devOptions.clientPath')}/index.html`,
+      `../../../dist${
+        process.env.NODE_CONFIG_ENV ? `-${process.env.NODE_CONFIG_ENV}` : ''
+      }/index.html`,
     ),
   )
 })
diff --git a/server/src/services/areas.js b/server/src/services/areas.js
index cbed30be7..edfcb4e0f 100644
--- a/server/src/services/areas.js
+++ b/server/src/services/areas.js
@@ -333,16 +333,20 @@ const loadLatestAreas = async () => {
   /** @type {Record<string, import("@rm/types").RMGeoJSON>} */
   const scanAreas = {
     main: await loadScanPolygons(fileName),
-    ...Object.fromEntries(
-      await Promise.all(
-        config
-          .getSafe('multiDomains')
-          .map(async (d) => [
-            d.general?.geoJsonFileName ? d.domain.replaceAll('.', '_') : 'main',
-            await loadScanPolygons(d.general?.geoJsonFileName || fileName),
-          ]),
-      ),
-    ),
+    ...(config.has('multiDomains')
+      ? Object.fromEntries(
+          await Promise.all(
+            config
+              .getSafe('multiDomains')
+              .map(async (d) => [
+                d.general?.geoJsonFileName
+                  ? d.domain.replaceAll('.', '_')
+                  : 'main',
+                await loadScanPolygons(d.general?.geoJsonFileName || fileName),
+              ]),
+          ),
+        )
+      : {}),
   }
   return buildAreas(scanAreas)
 }
@@ -353,14 +357,18 @@ const loadCachedAreas = () => {
   /** @type {Record<string, import("@rm/types").RMGeoJSON>} */
   const scanAreas = {
     main: loadFromFile(fileName),
-    ...Object.fromEntries(
-      config
-        .getSafe('multiDomains')
-        .map((d) => [
-          d.general?.geoJsonFileName ? d.domain.replaceAll('.', '_') : 'main',
-          loadFromFile(d.general?.geoJsonFileName || fileName),
-        ]),
-    ),
+    ...(config.has('multiDomains')
+      ? Object.fromEntries(
+          config
+            .getSafe('multiDomains')
+            .map((d) => [
+              d.general?.geoJsonFileName
+                ? d.domain.replaceAll('.', '_')
+                : 'main',
+              loadFromFile(d.general?.geoJsonFileName || fileName),
+            ]),
+        )
+      : {}),
   }
   return buildAreas(scanAreas)
 }
diff --git a/server/src/services/cache.js b/server/src/services/cache.js
index 648bf0de6..4096cc29f 100644
--- a/server/src/services/cache.js
+++ b/server/src/services/cache.js
@@ -4,7 +4,9 @@ const path = require('path')
 
 const { log, HELPERS } = require('@rm/logger')
 
-const CACHE_DIR = path.join(__dirname, '../../.cache')
+const CACHE_DIR = process.env.NODE_CONFIG_ENV
+  ? path.join(__dirname, '../../.cache', process.env.NODE_CONFIG_ENV)
+  : path.join(__dirname, '../../.cache')
 
 /** @param {string} str */
 const fsFriendlyName = (str) =>
@@ -42,7 +44,9 @@ const getCache = (unsafeName, fallback = null) => {
 const setCache = async (unsafeName, data) => {
   const fileName = fsFriendlyName(unsafeName)
   try {
-    if (!fs.existsSync(CACHE_DIR)) await fs.promises.mkdir(CACHE_DIR)
+    if (!fs.existsSync(CACHE_DIR)) {
+      await fs.promises.mkdir(CACHE_DIR, { recursive: true })
+    }
     await fs.promises.writeFile(
       path.resolve(CACHE_DIR, fileName),
       typeof data === 'string' ? data : JSON.stringify(data),
diff --git a/server/src/services/config.js b/server/src/services/config.js
index b8aeef982..10003c23f 100644
--- a/server/src/services/config.js
+++ b/server/src/services/config.js
@@ -7,6 +7,9 @@ const { log, HELPERS } = require('@rm/logger')
 const checkConfigJsons = require('./functions/checkConfigJsons')
 const { loadCachedAreas } = require('./areas')
 
+if (process.env.NODE_CONFIG_ENV) {
+  log.info(HELPERS.config, `Using config for ${process.env.NODE_CONFIG_ENV}`)
+}
 const allowedMenuItems = [
   'gyms',
   'nests',
@@ -214,13 +217,21 @@ const mergeMapConfig = (input = {}) => {
 
 config.map = mergeMapConfig()
 
-// Create multiDomain Objects
-config.multiDomainsObj = Object.fromEntries(
-  config.multiDomains.map((d) => [
-    d.domain.replaceAll('.', '_'),
-    mergeMapConfig(d),
-  ]),
-)
+if (config.has('multiDomains')) {
+  log.warn(
+    HELPERS.config,
+    '`multiDomains` has been deprecated and will be removed in the next major release. Please switch to the new format that makes use of `NODE_CONFIG_ENV`',
+  )
+  // Create multiDomain Objects
+  config.multiDomainsObj = Object.fromEntries(
+    config.multiDomains.map((d) => [
+      d.domain.replaceAll('.', '_'),
+      mergeMapConfig(d),
+    ]),
+  )
+} else {
+  config.multiDomainsObj = {}
+}
 
 // Check if empty
 ;['tileServers', 'navigation'].forEach((opt) => {
diff --git a/server/src/services/functions/checkConfigJsons.js b/server/src/services/functions/checkConfigJsons.js
index 63dc9b904..06b9fbb11 100644
--- a/server/src/services/functions/checkConfigJsons.js
+++ b/server/src/services/functions/checkConfigJsons.js
@@ -10,7 +10,10 @@ const { log, HELPERS } = require('@rm/logger')
  * @param {string} [domain]
  * @returns
  */
-function checkConfigJsons(fileName, domain = '') {
+function checkConfigJsons(
+  fileName,
+  domain = process.env.NODE_CONFIG_ENV || '',
+) {
   const generalJson = fs.existsSync(
     resolve(`${__dirname}/../../configs/${fileName}.json`),
   )
diff --git a/server/src/services/functions/filterComponents.js b/server/src/services/functions/filterComponents.js
index 774449934..47b413dee 100644
--- a/server/src/services/functions/filterComponents.js
+++ b/server/src/services/functions/filterComponents.js
@@ -8,7 +8,7 @@
  */
 function filterComponents(components, loggedIn, donor) {
   return (Array.isArray(components) ? components : []).filter((component) => {
-    if (component.components) {
+    if ('components' in component && Array.isArray(component.components)) {
       return filterComponents(component.components, loggedIn, donor).length > 0
     }
     if (
diff --git a/server/src/services/geocoder.js b/server/src/services/geocoder.js
index c1e7bbf9d..a13167ac0 100644
--- a/server/src/services/geocoder.js
+++ b/server/src/services/geocoder.js
@@ -1,12 +1,15 @@
-/* eslint-disable no-nested-ternary */
 const NodeGeocoder = require('node-geocoder')
 const { log, HELPERS } = require('@rm/logger')
 
+/**
+ * @param {string} addressFormat
+ * @param {NodeGeocoder.Entry} result
+ */
 function formatter(addressFormat, result) {
   return addressFormat
     .replace(
       /{{(streetNumber|streetName|city|state|country|zipcode|latitude|longitude|countryCode|neighborhoods|suburb|town|village)}}/g,
-      (_, p1) => result[p1] || '',
+      (a, b) => result[b] || '',
     )
     .trim()
     .replace(/^,|,$/g, '')
@@ -14,10 +17,10 @@ function formatter(addressFormat, result) {
 }
 
 /**
- *
+ * @template {boolean} T
  * @param {string} nominatimUrl
- * @param {string} search
- * @param {boolean} reverse
+ * @param {T extends true ? { lat: number, lon: number } : string} search
+ * @param {T} reverse
  * @param {string} format
  * @returns
  */
@@ -37,11 +40,12 @@ async function geocoder(nominatimUrl, search, reverse, format) {
       town: result.address.town || '',
       village: result.address.village || '',
     }))(stockGeocoder._geocoder._formatResult)
-    const results = reverse
-      ? await stockGeocoder.reverse(search)
-      : await stockGeocoder.geocode(search)
+    const results =
+      typeof search === 'object'
+        ? await stockGeocoder.reverse(search)
+        : await stockGeocoder.geocode(search)
     return reverse
-      ? results[0]
+      ? formatter(format, results[0])
       : format
       ? results.map((result) => ({
           formatted: formatter(format, result),
diff --git a/server/src/services/i18n.js b/server/src/services/i18n.js
index 094efd298..f3b8a4928 100644
--- a/server/src/services/i18n.js
+++ b/server/src/services/i18n.js
@@ -17,7 +17,9 @@ i18next.use(Backend).init(
     backend: {
       loadPath: path.resolve(
         __dirname,
-        `../../../dist/locales/{{lng}}/{{ns}}.json`,
+        `../../../dist${
+          process.env.NODE_CONFIG_ENV ? `-${process.env.NODE_CONFIG_ENV}` : ''
+        }/locales/{{lng}}/{{ns}}.json`,
       ),
     },
   },
diff --git a/server/src/services/initialization.js b/server/src/services/initialization.js
index 094b99154..6c839df46 100644
--- a/server/src/services/initialization.js
+++ b/server/src/services/initialization.js
@@ -59,7 +59,8 @@ process.on('SIGUSR2', async (e) => {
   await onShutdown(e)
   process.exit(0)
 })
-process.on('uncaughtException', async () => {
+process.on('uncaughtException', async (e) => {
+  log.error(HELPERS.ReactMap, e)
   await onShutdown('SIGBREAK')
   process.exit(99)
 })
diff --git a/server/src/services/ui/primary.js b/server/src/services/ui/primary.js
index cbc0b6036..34f29b86d 100644
--- a/server/src/services/ui/primary.js
+++ b/server/src/services/ui/primary.js
@@ -90,7 +90,7 @@ leagues.forEach((league) =>
 )
 
 // TODO this will be used later in the config
-const BLOCKED = undefined
+const BLOCKED = /** @type {undefined} */ (undefined)
 
 /**
  *
diff --git a/src/components/App.jsx b/src/App.jsx
similarity index 77%
rename from src/components/App.jsx
rename to src/App.jsx
index 0e8f581c5..799951547 100644
--- a/src/components/App.jsx
+++ b/src/App.jsx
@@ -6,19 +6,19 @@ import 'leaflet/dist/leaflet.css'
 import * as React from 'react'
 import { BrowserRouter } from 'react-router-dom'
 import CssBaseline from '@mui/material/CssBaseline'
-import { ThemeProvider } from '@mui/material/styles'
+import ThemeProvider from '@mui/material/styles/ThemeProvider'
 import { ApolloProvider } from '@apollo/client'
 
-import useCustomTheme from '@assets/mui/theme'
-import { globalStyles } from '@assets/mui/global'
+import { useCustomTheme } from '@assets/theme'
+import { globalStyles } from '@components/Global'
 import { apolloClient } from '@services/apollo'
-import { isLocalStorageEnabled } from '@services/functions/isLocalStorageEnabled'
-import { setLoadingText } from '@services/functions/setLoadingText'
+import { isLocalStorageEnabled } from '@utils/isLocalStorageEnabled'
+import { setLoadingText } from '@utils/setLoadingText'
 import '@services/events'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { HolidayEffects } from '@features/holiday'
 
-import ErrorBoundary from './ErrorBoundary'
-import ReactRouter from './ReactRouter'
-import HolidayEffects from './HolidayEffects'
+import { Pages } from './pages'
 
 const LOADING_LOCALES = {
   de: 'Übersetzungen werden geladen',
@@ -44,7 +44,7 @@ function SetText() {
   return <div />
 }
 
-export default function App() {
+export function App() {
   const theme = useCustomTheme()
 
   const isValid = isLocalStorageEnabled()
@@ -61,7 +61,7 @@ export default function App() {
           {globalStyles}
           <ApolloProvider client={apolloClient}>
             <BrowserRouter>
-              <ReactRouter />
+              <Pages />
             </BrowserRouter>
             <HolidayEffects />
           </ApolloProvider>
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index f7025d4ae..a2fa23534 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -521,6 +521,15 @@ input[type='time']::-webkit-calendar-picker-indicator {
   align-self: start;
 }
 
+.vgrid-color-blind-icon {
+  margin: 3px;
+  grid-column: 1;
+  grid-row: 1;
+  justify-self: start;
+  align-self: start;
+  z-index: 500;
+}
+
 .vgrid-image {
   grid-column: 1 / 4;
   grid-row: 1 / 3;
@@ -554,3 +563,9 @@ input[type='time']::-webkit-calendar-picker-indicator {
   opacity: 90%;
   z-index: 9;
 }
+
+.locales-layout {
+  display: grid;
+  grid-template-rows: auto 1fr auto; /* Header, table, footer */
+  min-height: 100svh;
+}
diff --git a/src/components/markers/fallback.js b/src/assets/fallbackMarker.js
similarity index 82%
rename from src/components/markers/fallback.js
rename to src/assets/fallbackMarker.js
index 774f29d21..2ef3d56a3 100644
--- a/src/components/markers/fallback.js
+++ b/src/assets/fallbackMarker.js
@@ -1,7 +1,7 @@
 import markerIconPng from 'leaflet/dist/images/marker-icon.png'
 import { Icon } from 'leaflet'
 
-export default new Icon({
+export const fallbackMarker = new Icon({
   iconUrl: markerIconPng,
   iconSize: [25, 41],
   iconAnchor: [12, 35],
diff --git a/src/assets/mui/theme.js b/src/assets/theme.js
similarity index 97%
rename from src/assets/mui/theme.js
rename to src/assets/theme.js
index c56cd60a5..280cfc9b5 100644
--- a/src/assets/mui/theme.js
+++ b/src/assets/theme.js
@@ -1,9 +1,10 @@
 // @ts-check
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemo } from 'react'
 import { createTheme, responsiveFontSizes, darken } from '@mui/material/styles'
 import dlv from 'dlv'
-import { useMemo } from 'react'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 const VALID_COLOR =
   /^#([A-Fa-f0-9]{3,4}){1,2}$|^rgb\((\s*\d{1,3}\s*,){2}\s*\d{1,3}\s*\)$|^rgba\((\s*\d{1,3}\s*,){3}\s*(0?\.\d+|1\.0|1|\d{1,2}%)\s*\)$|^hsl\(\s*\d{1,3}(\s*,\s*\d{1,3}%){2}\s*\)$|^hsla\(\s*\d{1,3}(\s*,\s*\d{1,3}%){2}\s*,\s*(0?\.\d+|1\.0|1|\d{1,2}%)\s*\)$/
@@ -151,7 +152,7 @@ const components = {
 /**
  * @returns {import('@mui/material').Theme}
  */
-export default function useCustomTheme() {
+export function useCustomTheme() {
   const { primary, secondary } = useMemory((s) => s.theme)
   const darkMode = useStorage((s) => s.darkMode)
 
diff --git a/src/components/BasicAccordion.jsx b/src/components/BasicAccordion.jsx
new file mode 100644
index 000000000..ea932df7e
--- /dev/null
+++ b/src/components/BasicAccordion.jsx
@@ -0,0 +1,48 @@
+// @ts-check
+import * as React from 'react'
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
+import Typography from '@mui/material/Typography'
+import Accordion from '@mui/material/Accordion'
+import AccordionSummary from '@mui/material/AccordionSummary'
+import AccordionDetails from '@mui/material/AccordionDetails'
+
+import { useStorage } from '@store/useStorage'
+
+const expandIcon = <ExpandMoreIcon />
+
+/**
+ * A basic accordion component that already has the expand icon and state management
+ * @param {{
+ *  stateKey?: string
+ *  title: string
+ *  children: React.ReactNode
+ * } & import('@mui/material').AccordionDetailsProps} props
+ * @returns
+ */
+export function BasicAccordion({
+  title,
+  stateKey = title,
+  children,
+  ...props
+}) {
+  const expanded = useStorage((s) => !!s.expanded[stateKey])
+
+  /** @type {(e: unknown, isExpanded: boolean )=> void} */
+  const handleChange = React.useCallback(
+    (_, isExpanded) =>
+      useStorage.setState((prev) => ({
+        expanded: { ...prev.expanded, [stateKey]: isExpanded },
+      })),
+    [stateKey],
+  )
+  return (
+    <Accordion expanded={expanded} onChange={handleChange}>
+      <AccordionSummary expandIcon={expandIcon}>
+        <Typography variant="h6">{title}</Typography>
+      </AccordionSummary>
+      <AccordionDetails sx={{ p: 0 }} {...props}>
+        {children}
+      </AccordionDetails>
+    </Accordion>
+  )
+}
diff --git a/src/components/Config.jsx b/src/components/Config.jsx
index fc58e674e..2fce99826 100644
--- a/src/components/Config.jsx
+++ b/src/components/Config.jsx
@@ -1,21 +1,21 @@
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { setUser } from '@sentry/react'
-
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import Fetch from '@services/Fetch'
-import { setLoadingText } from '@services/functions/setLoadingText'
-import Utility from '@services/Utility'
-import { deepMerge } from '@services/functions/deepMerge'
 import { Navigate } from 'react-router-dom'
-import { checkHoliday } from '@services/functions/checkHoliday'
-import { useHideElement } from '@hooks/useHideElement'
-import { getGlowRules } from '@services/functions/getGlowRules'
 
-import { useScannerSessionStorage } from './layout/dialogs/scanner/store'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { getSettings } from '@services/fetches'
+import { setLoadingText } from '@utils/setLoadingText'
+import { deepMerge } from '@utils/deepMerge'
+import { useHideElement } from '@hooks/useHideElement'
+import { getGlowRules } from '@utils/getGlowRules'
+import { useScannerSessionStorage } from '@features/scanner'
+import { timeCheck } from '@utils/timeCheck'
+import { analytics } from '@utils/analytics'
+import { checkHoliday } from '@features/holiday'
 
-export default function Config({ children }) {
+export function Config({ children }) {
   const { t } = useTranslation()
   const [serverSettings, setServerSettings] = React.useState({
     error: false,
@@ -26,12 +26,12 @@ export default function Config({ children }) {
   useHideElement(serverSettings.fetched)
 
   const getServerSettings = async () => {
-    const data = await Fetch.getSettings()
+    const data = await getSettings()
 
     if (data) {
       document.title = data?.map?.general.headerTitle || document.title
 
-      Utility.analytics(
+      analytics(
         'User',
         data.user ? `${data.user.username} (${data.user.id})` : 'Not Logged In',
         'Permissions',
@@ -44,7 +44,7 @@ export default function Config({ children }) {
         })
       }
 
-      /** @type {{ state: import('@hooks/useStorage').UseStorage}} */
+      /** @type {{ state: import('@store/useStorage').UseStorage}} */
       const localState = JSON.parse(
         localStorage.getItem('local-state') || '{ "state": {} }',
       )
@@ -124,7 +124,7 @@ export default function Config({ children }) {
         userSettings: data.userSettings,
         clientMenus: data.clientMenus,
         glowRules: getGlowRules(data.clientMenus.pokemon.glow.sub),
-        timeOfDay: Utility.timeCheck(...location),
+        timeOfDay: timeCheck(...location),
         config: {
           ...data.map,
           holidayEffects: (data.map.holidayEffects || []).filter(checkHoliday),
diff --git a/src/components/ErrorBoundary.jsx b/src/components/ErrorBoundary.jsx
index 014a7e8ae..4a7c2b262 100644
--- a/src/components/ErrorBoundary.jsx
+++ b/src/components/ErrorBoundary.jsx
@@ -1,9 +1,8 @@
-/* eslint-disable no-bitwise */
 // @ts-check
-/* eslint-disable no-console */
+/* eslint-disable no-bitwise */
 /* eslint-disable react/destructuring-assignment */
 import * as React from 'react'
-import Grid from '@mui/material/Grid'
+import Grid from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
 import Button from '@mui/material/Button'
 import Refresh from '@mui/icons-material/Refresh'
@@ -11,8 +10,9 @@ import CopyIcon from '@mui/icons-material/FileCopy'
 import IconButton from '@mui/material/IconButton'
 import { withTranslation } from 'react-i18next'
 
-import Fetch from '@services/Fetch'
-import Notification from './layout/general/Notification'
+import { sendError } from '@services/fetches'
+
+import { Notification } from './Notification'
 
 /** @type {React.CSSProperties} */
 const defaultStyle = {
@@ -24,7 +24,7 @@ const defaultStyle = {
 // This component uses React Classes due to componentDidCatch() not being available in React Hooks
 // Do not use this as a base for other components
 
-class ErrorBoundary extends React.Component {
+class ErrorCatcher extends React.Component {
   static uuidv4() {
     return 'xxxxxxxx-r2m4-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
       const r = (Math.random() * 16) | 0
@@ -39,13 +39,13 @@ class ErrorBoundary extends React.Component {
       message: '',
       errorCount: 0,
       reported: false,
-      uuid: ErrorBoundary.uuidv4(),
+      uuid: ErrorCatcher.uuidv4(),
     }
   }
 
   async componentDidCatch(error) {
     if (!this.state.reported && process.env.NODE_ENV !== 'development') {
-      await Fetch.sendError({
+      await sendError({
         cause: error.cause,
         message: error.message,
         stack: error?.stack?.replace(
@@ -72,7 +72,7 @@ class ErrorBoundary extends React.Component {
         alignItems="center"
         style={this.props.style ?? defaultStyle}
       >
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Typography variant={this.props.variant || 'h3'} align="center">
             {this.props.t('react_error')}
           </Typography>
@@ -138,4 +138,4 @@ class ErrorBoundary extends React.Component {
   }
 }
 
-export default withTranslation()(ErrorBoundary)
+export const ErrorBoundary = withTranslation()(ErrorCatcher)
diff --git a/src/assets/mui/global.jsx b/src/components/Global.jsx
similarity index 98%
rename from src/assets/mui/global.jsx
rename to src/components/Global.jsx
index df39a0e2e..1ce7dc8a6 100644
--- a/src/assets/mui/global.jsx
+++ b/src/components/Global.jsx
@@ -2,9 +2,10 @@
 import * as React from 'react'
 import GlobalStyles from '@mui/material/GlobalStyles'
 import { darken, lighten } from '@mui/material/styles'
-import { useMemory } from '@hooks/useMemory'
 
-export function ApplyGlobal() {
+import { useMemory } from '@store/useMemory'
+
+function ApplyGlobal() {
   const online = useMemory((s) => s.online)
 
   return (
diff --git a/src/components/HolidayEffects.jsx b/src/components/HolidayEffects.jsx
deleted file mode 100644
index a0e6be2cc..000000000
--- a/src/components/HolidayEffects.jsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import HolidayAnimations from '@services/HolidayAnimations'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-
-/**
- *
- * @param {import("@rm/types").Config['map']['holidayEffects'][number]} props
- * @returns
- */
-export function HolidayEffect({ images, name, css, imageScale }) {
-  const [element, setElement] = React.useState(
-    /** @type {React.ReactNode} */ (null),
-  )
-  const userDisabled = useStorage((s) => s.holidayEffects[name] === true)
-
-  React.useLayoutEffect(() => {
-    if (userDisabled) {
-      setElement(null)
-      return () => {}
-    }
-    switch (css) {
-      case 'snow':
-        setElement(
-          <div className="winter-is-coming">
-            <div className="snow snow--near" />
-            <div className="snow snow--near snow--alt" />
-            <div className="snow snow--mid" />
-            <div className="snow snow--mid snow--alt" />
-            <div className="snow snow--far" />
-            <div className="snow snow--far snow--alt" />
-          </div>,
-        )
-        return () => setElement(null)
-      case 'fireworks':
-        setElement(
-          <div className="pyro">
-            <div className="before" />
-            <div className="after" />
-          </div>,
-        )
-        return () => setElement(null)
-      default: {
-        if (images?.length) {
-          const animation = new HolidayAnimations(images, imageScale)
-          animation.initialize()
-          return () => {
-            animation.stop()
-          }
-        }
-      }
-    }
-  }, [userDisabled])
-
-  return element
-}
-
-export default function HolidayEffects() {
-  const holidayEffects = useMemory((s) => s?.config?.holidayEffects || [])
-
-  return (
-    <>
-      {(Array.isArray(holidayEffects) ? holidayEffects : []).map((holiday) => (
-        <HolidayEffect key={holiday.name} {...holiday} />
-      ))}
-    </>
-  )
-}
diff --git a/src/components/layout/general/I.jsx b/src/components/I.jsx
similarity index 100%
rename from src/components/layout/general/I.jsx
rename to src/components/I.jsx
diff --git a/src/components/layout/general/Img.jsx b/src/components/Img.jsx
similarity index 100%
rename from src/components/layout/general/Img.jsx
rename to src/components/Img.jsx
diff --git a/src/components/layout/general/Loading.jsx b/src/components/Loading.jsx
similarity index 100%
rename from src/components/layout/general/Loading.jsx
rename to src/components/Loading.jsx
diff --git a/src/components/layout/general/Menu.jsx b/src/components/Menu.jsx
similarity index 53%
rename from src/components/layout/general/Menu.jsx
rename to src/components/Menu.jsx
index 7c004e42e..f4216f506 100644
--- a/src/components/layout/general/Menu.jsx
+++ b/src/components/Menu.jsx
@@ -6,77 +6,47 @@ import { useTranslation } from 'react-i18next'
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 import Collapse from '@mui/material/Collapse'
 import IconButton from '@mui/material/IconButton'
-import Utility from '@services/Utility'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import useFilter from '@hooks/useFilter'
-import Header from '@components/layout/general/Header'
-import Footer from '@components/layout/general/Footer'
-import { applyToAll } from '@services/filtering/applyToAll'
-import useGetAvailable from '@hooks/useGetAvailable'
 
-import OptionsContainer from '../dialogs/filters/OptionsContainer'
-import { VirtualGrid } from './VirtualGrid'
-import { GenericSearch } from '../drawer/ItemSearch'
-import { applyToAllWebhooks, useWebhookStore } from '../dialogs/webhooks/store'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useFilter } from '@hooks/useFilter'
+import { Footer } from '@components/dialogs/Footer'
+import { applyToAll } from '@utils/applyToAll'
+import { useGetAvailable } from '@hooks/useGetAvailable'
+import { applyToAllWebhooks, useWebhookStore } from '@store/useWebhookStore'
+import { useAnalytics } from '@hooks/useAnalytics'
+
+import { OptionsContainer } from './filters/OptionsContainer'
+import { VirtualGrid } from './virtual/VirtualGrid'
+import { GenericSearch } from './inputs/GenericSearch'
 
 /**
  * @template {import('@rm/types').AdvCategories} T
  * @param {{
  *  category: T
  *  webhookCategory?: string
- *  tempFilters: import('@rm/types').AllFilters[T]
  *  children: (index: number, key: string) => React.ReactNode
  *  categories?: import('@rm/types').Available[]
- *  title: string
- *  titleAction: () => void
- *  extraButtons?: import('@components/layout/general/Footer').FooterButton[]
+ *  extraButtons?: import('@components/dialogs/Footer').FooterButton[]
  * }} props
  */
-export default function Menu({
+export function Menu({
   category,
   webhookCategory,
-  tempFilters,
   children,
   categories,
-  title,
-  titleAction,
   extraButtons,
 }) {
   useGetAvailable(category)
-
-  Utility.analytics(`/advanced/${category}`)
-
+  useAnalytics(`/advanced/${category}`)
   const isMobile = useMemory((s) => s.isMobile)
   const { t } = useTranslation()
-  const menus = useStorage((state) => state.menus)
 
   const [filterDrawer, setFilterDrawer] = React.useState(false)
 
-  const { filteredArr, count } = useFilter(
-    tempFilters,
-    menus,
-    category,
-    webhookCategory,
-    categories,
-  )
-
-  const Options = React.useMemo(
-    () => (
-      <OptionsContainer
-        countTotal={count.total}
-        countShow={count.show}
-        category={category}
-        categories={categories}
-      />
-    ),
-    [category, categories, count.total, count.show],
-  )
-
   const footerButtons = React.useMemo(
     () =>
-      /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
+      /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
         {
           name: 'help',
           action: () =>
@@ -95,7 +65,7 @@ export default function Menu({
                 open: true,
                 id: 'global',
                 category: webhookCategory || category,
-                selectedIds: filteredArr,
+                selectedIds: useMemory.getState().advMenuFiltered[category],
               },
             }),
           icon:
@@ -105,8 +75,15 @@ export default function Menu({
           name: 'disable_all',
           action: () =>
             webhookCategory
-              ? applyToAllWebhooks(false, filteredArr)
-              : applyToAll({ enabled: false }, category, filteredArr),
+              ? applyToAllWebhooks(
+                  false,
+                  useMemory.getState().advMenuFiltered[category],
+                )
+              : applyToAll(
+                  { enabled: false },
+                  category,
+                  useMemory.getState().advMenuFiltered[category],
+                ),
           icon: 'Clear',
           color: 'error',
         },
@@ -114,11 +91,14 @@ export default function Menu({
           name: 'enable_all',
           action: () =>
             webhookCategory
-              ? applyToAllWebhooks(true, filteredArr)
+              ? applyToAllWebhooks(
+                  true,
+                  useMemory.getState().advMenuFiltered[category],
+                )
               : applyToAll(
                   { enabled: true },
                   category,
-                  filteredArr,
+                  useMemory.getState().advMenuFiltered[category],
                   !webhookCategory,
                 ),
           icon: 'Check',
@@ -126,18 +106,17 @@ export default function Menu({
         },
         ...(extraButtons ?? []),
       ]),
-    [category, webhookCategory, extraButtons, filteredArr, tempFilters],
+    [category, webhookCategory, extraButtons],
   )
 
   return (
     <>
-      <Header
-        titles={title}
-        action={titleAction}
-        names={[webhookCategory || category]}
-      />
       <DialogContent className="container" sx={{ p: 0, minHeight: '75vh' }}>
-        {!isMobile && <Box className="column-25">{Options}</Box>}
+        {!isMobile && (
+          <Box className="column-25">
+            <OptionsContainer category={category} categories={categories} />
+          </Box>
+        )}
         <Box p={1} className="column-75">
           <Box pb={1} display="flex">
             <GenericSearch
@@ -153,22 +132,18 @@ export default function Menu({
             )}
           </Box>
           <Box>
-            {isMobile && <Collapse in={filterDrawer}>{Options}</Collapse>}
-            {filteredArr.length ? (
-              <VirtualGrid data={filteredArr} xs={4} md={2}>
-                {children}
-              </VirtualGrid>
-            ) : (
-              <Box
-                className="flex-center"
-                flex="1 1 auto"
-                whiteSpace="pre-line"
-              >
-                <Typography variant="h6" align="center">
-                  {t('no_filter_results')}
-                </Typography>
-              </Box>
+            {isMobile && (
+              <Collapse in={filterDrawer}>
+                <OptionsContainer category={category} categories={categories} />
+              </Collapse>
             )}
+            <Results
+              category={category}
+              webhookCategory={webhookCategory}
+              categories={categories}
+            >
+              {children}
+            </Results>
           </Box>
         </Box>
       </DialogContent>
@@ -176,3 +151,19 @@ export default function Menu({
     </>
   )
 }
+
+function Results({ category, webhookCategory, categories, children }) {
+  const { t } = useTranslation()
+  const filteredArr = useFilter(category, webhookCategory, categories)
+  return filteredArr.length ? (
+    <VirtualGrid data={filteredArr} xs={4} md={2}>
+      {children}
+    </VirtualGrid>
+  ) : (
+    <Box className="flex-center" flex="1 1 auto" whiteSpace="pre-line">
+      <Typography variant="h6" align="center">
+        {t('no_filter_results')}
+      </Typography>
+    </Box>
+  )
+}
diff --git a/src/components/layout/general/Notification.jsx b/src/components/Notification.jsx
similarity index 93%
rename from src/components/layout/general/Notification.jsx
rename to src/components/Notification.jsx
index 04048f2f7..9afd2190d 100644
--- a/src/components/layout/general/Notification.jsx
+++ b/src/components/Notification.jsx
@@ -3,9 +3,10 @@ import * as React from 'react'
 import Alert from '@mui/material/Alert'
 import Snackbar from '@mui/material/Snackbar'
 import Slide from '@mui/material/Slide'
+import AlertTitle from '@mui/material/AlertTitle'
 import { useTranslation, Trans } from 'react-i18next'
-import { AlertTitle } from '@mui/material'
 
+/** @param {import('@mui/material').SlideProps} props */
 function SlideTransition(props) {
   // eslint-disable-next-line react/jsx-props-no-spreading
   return <Slide {...props} direction="up" />
@@ -28,7 +29,7 @@ const alertStyle = { textAlign: 'center', color: 'white' }
  * }} props
  * @returns
  */
-export default function Notification({
+export function Notification({
   open,
   severity,
   i18nKey,
diff --git a/src/components/layout/general/QuestTitle.jsx b/src/components/QuestTitle.jsx
similarity index 87%
rename from src/components/layout/general/QuestTitle.jsx
rename to src/components/QuestTitle.jsx
index fcce57693..47373741d 100644
--- a/src/components/layout/general/QuestTitle.jsx
+++ b/src/components/QuestTitle.jsx
@@ -1,12 +1,12 @@
 // @ts-check
 import * as React from 'react'
-import { Typography } from '@mui/material'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
 /**
  * @param {{ questTitle: string, questTarget: number }} props
  */
-export default function QuestTitle(props) {
+export function QuestTitle(props) {
   return (
     <Typography variant="caption">
       <RawQuestTitle {...props} />
diff --git a/src/components/ReactRouter.jsx b/src/components/ReactRouter.jsx
deleted file mode 100644
index 6981b81c6..000000000
--- a/src/components/ReactRouter.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import { Route, Routes } from 'react-router-dom'
-
-import Auth from './layout/auth/Auth'
-import LoginPage from '../features/login'
-import Blocked from './layout/auth/Blocked'
-import Errors from './Errors'
-import DataManagement from '../features/data'
-import Config from './Config'
-import ResetAll from './Reset'
-
-const Playground = React.lazy(() => import('../features/playground'))
-
-const authRoute = (
-  <Config>
-    <Auth />
-  </Config>
-)
-const loginRoute = (
-  <Config>
-    <LoginPage />
-  </Config>
-)
-const dataRoute = (
-  <Config>
-    <DataManagement />
-  </Config>
-)
-const blockedRoute = (
-  <Config>
-    <Blocked />
-  </Config>
-)
-const playgroundRoute = (
-  <Config>
-    <Playground />
-  </Config>
-)
-const errorRoute = <Errors />
-const resetRoute = <ResetAll />
-
-export default function ReactRouter() {
-  return (
-    <Routes>
-      <Route path="/" element={authRoute} />
-      <Route path="reset" element={resetRoute} />
-      <Route path="login" element={loginRoute} />
-      <Route path="data-management" element={dataRoute} />
-      <Route path="playground" element={playgroundRoute} />
-      <Route path="blocked/:info" element={blockedRoute} />
-      <Route path="@/:lat/:lon" element={authRoute} />
-      <Route path="@/:lat/:lon/:zoom" element={authRoute} />
-      <Route path="id/:category/:id" element={authRoute} />
-      <Route path="id/:category/:id/:zoom" element={authRoute} />
-      <Route path="*" element={errorRoute} />
-    </Routes>
-  )
-}
diff --git a/src/components/StatusIcon.jsx b/src/components/StatusIcon.jsx
new file mode 100644
index 000000000..648e244d1
--- /dev/null
+++ b/src/components/StatusIcon.jsx
@@ -0,0 +1,36 @@
+// @ts-check
+import * as React from 'react'
+import CheckIcon from '@mui/icons-material/Check'
+import ClearIcon from '@mui/icons-material/Clear'
+import RuleIcon from '@mui/icons-material/Rule'
+
+/**
+ * @typedef {{
+ *  status: boolean | null,
+ *  partialColor?: import('@mui/material').SvgIconProps['color']
+ *  checkColor?: import('@mui/material').SvgIconProps['color']
+ *  clearColor?: import('@mui/material').SvgIconProps['color']
+ * } & import('@mui/material').SvgIconProps} StatusIconProps
+ */
+
+/** @type {React.ForwardRefExoticComponent<StatusIconProps>} */
+export const StatusIcon = React.forwardRef(
+  (
+    {
+      status,
+      color,
+      partialColor = color || 'info',
+      checkColor = color || 'success',
+      clearColor = color || 'error',
+      ...props
+    },
+    ref,
+  ) =>
+    status === null ? (
+      <RuleIcon color={partialColor} ref={ref} {...props} />
+    ) : status ? (
+      <CheckIcon color={checkColor} ref={ref} {...props} />
+    ) : (
+      <ClearIcon color={clearColor} ref={ref} {...props} />
+    ),
+)
diff --git a/src/components/layout/general/StyledDivider.jsx b/src/components/StyledDivider.jsx
similarity index 100%
rename from src/components/layout/general/StyledDivider.jsx
rename to src/components/StyledDivider.jsx
diff --git a/src/components/layout/general/TabPanel.jsx b/src/components/TabPanel.jsx
similarity index 82%
rename from src/components/layout/general/TabPanel.jsx
rename to src/components/TabPanel.jsx
index 56b049f99..a1ecfbd4d 100644
--- a/src/components/layout/general/TabPanel.jsx
+++ b/src/components/TabPanel.jsx
@@ -10,7 +10,7 @@ import Box from '@mui/material/Box'
  *  disablePadding?: boolean
  * }} props
  */
-export default function TabPanel({ children, value, index, disablePadding }) {
+export function TabPanel({ children, value, index, disablePadding }) {
   return (
     <Box
       role="tabpanel"
diff --git a/src/components/layout/general/ToggleTypography.jsx b/src/components/ToggleTypography.jsx
similarity index 100%
rename from src/components/layout/general/ToggleTypography.jsx
rename to src/components/ToggleTypography.jsx
diff --git a/src/components/tiles/Timer.jsx b/src/components/ToolTipWrapper.jsx
similarity index 68%
rename from src/components/tiles/Timer.jsx
rename to src/components/ToolTipWrapper.jsx
index 08af70423..51f86b59a 100644
--- a/src/components/tiles/Timer.jsx
+++ b/src/components/ToolTipWrapper.jsx
@@ -1,17 +1,17 @@
-import React, { useState, useEffect } from 'react'
+// @ts-check
+import * as React from 'react'
 import { Tooltip } from 'react-leaflet'
 import { useTranslation } from 'react-i18next'
-import Utility from '@services/Utility'
+
+import { getTimeUntil } from '@utils/getTimeUntil'
 
 const Timer = ({ timestamp }) => {
   const { t } = useTranslation()
-  const [timer, setTimer] = useState(
-    Utility.getTimeUntil(new Date(timestamp * 1000), true),
-  )
+  const [timer, setTimer] = React.useState(getTimeUntil(timestamp * 1000, true))
 
-  useEffect(() => {
+  React.useEffect(() => {
     const timer2 = setTimeout(() => {
-      setTimer(Utility.getTimeUntil(new Date(timestamp * 1000), true))
+      setTimer(getTimeUntil(timestamp * 1000, true))
     }, 1000)
     return () => clearTimeout(timer2)
   })
@@ -26,7 +26,7 @@ const Timer = ({ timestamp }) => {
  * @param {{ timers: number[], offset?: [number, number], children?: React.ReactNode }} props
  * @returns
  */
-export default function TooltipWrapper({ timers, offset, children }) {
+export function TooltipWrapper({ timers, offset, children }) {
   return (
     <Tooltip direction="bottom" permanent offset={offset}>
       {children}
@@ -35,7 +35,6 @@ export default function TooltipWrapper({ timers, offset, children }) {
           // eslint-disable-next-line react/no-array-index-key
           key={timer + i * 123}
           timestamp={timer}
-          multi={timers.length > 1}
         />
       ))}
     </Tooltip>
diff --git a/src/components/layout/auth/Discord.jsx b/src/components/auth/Discord.jsx
similarity index 90%
rename from src/components/layout/auth/Discord.jsx
rename to src/components/auth/Discord.jsx
index 0e608b751..954c4071d 100644
--- a/src/components/layout/auth/Discord.jsx
+++ b/src/components/auth/Discord.jsx
@@ -2,14 +2,14 @@ import * as React from 'react'
 import Button from '@mui/material/Button'
 import { useTranslation } from 'react-i18next'
 
-import { I } from '../general/I'
+import { I } from '../I'
 
 /**
  *
  * @param {{ children?: string, bgcolor?: string } & import('@mui/material/Button').ButtonProps} props
  * @returns {JSX.Element}
  */
-export default function DiscordButton({
+export function DiscordButton({
   href = '/auth/discord/callback',
   children = 'login',
   size = 'large',
diff --git a/src/components/layout/auth/Local.jsx b/src/components/auth/Local.jsx
similarity index 94%
rename from src/components/layout/auth/Local.jsx
rename to src/components/auth/Local.jsx
index 85d41a75b..1875cd6ad 100644
--- a/src/components/layout/auth/Local.jsx
+++ b/src/components/auth/Local.jsx
@@ -11,19 +11,18 @@ import InputLabel from '@mui/material/InputLabel'
 import OutlinedInput from '@mui/material/OutlinedInput'
 import InputAdornment from '@mui/material/InputAdornment'
 import IconButton from '@mui/material/IconButton'
-
 import { useTranslation } from 'react-i18next'
 import { useLazyQuery } from '@apollo/client'
 
-import Fetch from '@services/Fetch'
-import Query from '@services/Query'
+import { login } from '@services/fetches'
+import { Query } from '@services/queries'
 
 /**
  *
  * @param {{ href?: string, sx?: import("@mui/material").SxProps, style?: React.CSSProperties }} props
  * @returns
  */
-export default function LocalLogin({ href, sx, style }) {
+export function LocalLogin({ href, sx, style }) {
   const { t } = useTranslation()
   const [user, setUser] = React.useState({
     username: '',
@@ -32,7 +31,7 @@ export default function LocalLogin({ href, sx, style }) {
   })
   const [error, setError] = React.useState('')
   const [submitted, setSubmitted] = React.useState(false)
-  const [checkUsername, { data }] = useLazyQuery(Query.user('checkUsername'))
+  const [checkUsername, { data }] = useLazyQuery(Query.user('CHECK_USERNAME'))
 
   const handleChange = (e) => {
     if (e.target.name === 'username') {
@@ -44,7 +43,7 @@ export default function LocalLogin({ href, sx, style }) {
   const handleSubmit = async (e) => {
     e.preventDefault()
     setSubmitted(true)
-    const resp = await Fetch.login(user, href)
+    const resp = await login(user, href)
     if (!resp.ok) {
       setError(t('localauth_failed'))
       setSubmitted(false)
diff --git a/src/components/layout/auth/Telegram.jsx b/src/components/auth/Telegram.jsx
similarity index 93%
rename from src/components/layout/auth/Telegram.jsx
rename to src/components/auth/Telegram.jsx
index 5e90f67f4..afce98bbc 100644
--- a/src/components/layout/auth/Telegram.jsx
+++ b/src/components/auth/Telegram.jsx
@@ -6,7 +6,7 @@ import * as React from 'react'
  * @param {{ botName: string, authUrl: string }} props
  * @returns
  */
-export default function TelegramWidget({ botName, authUrl }) {
+export function TelegramWidget({ botName, authUrl }) {
   const ref = React.useRef(null)
 
   React.useEffect(() => {
diff --git a/src/components/layout/dialogs/BadgeSelection.jsx b/src/components/dialogs/BadgeSelection.jsx
similarity index 73%
rename from src/components/layout/dialogs/BadgeSelection.jsx
rename to src/components/dialogs/BadgeSelection.jsx
index bde2af3a1..90f00edae 100644
--- a/src/components/layout/dialogs/BadgeSelection.jsx
+++ b/src/components/dialogs/BadgeSelection.jsx
@@ -3,15 +3,15 @@ import * as React from 'react'
 import DialogContent from '@mui/material/DialogContent'
 import Dialog from '@mui/material/Dialog'
 import { useMutation } from '@apollo/client'
-import { apolloClient, apolloCache } from '@services/apollo'
 
-import Query from '@services/Query'
+import { apolloClient, apolloCache } from '@services/apollo'
+import { Query } from '@services/queries'
 import { ENUM_BADGES } from '@assets/constants'
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { MultiSelector } from '@components/inputs/MultiSelector'
 
-import Header from '../general/Header'
-import Footer from '../general/Footer'
-import { MultiSelector } from '../drawer/MultiSelector'
+import { Header } from './Header'
+import { Footer } from './Footer'
 
 const handleClose = () =>
   useLayoutStore.setState({
@@ -22,19 +22,18 @@ const handleClose = () =>
     },
   })
 
-const footerOptions =
-  /** @type {import('../general/Footer').FooterButton[]} */ ([
-    {
-      name: 'close',
-      action: handleClose,
-      color: 'primary',
-      align: 'right',
-    },
-  ])
+const footerOptions = /** @type {import('./Footer').FooterButton[]} */ ([
+  {
+    name: 'close',
+    action: handleClose,
+    color: 'primary',
+    align: 'right',
+  },
+])
 
-export default function BadgeSelection() {
+export function BadgeSelection() {
   const { gymId, badge, open } = useLayoutStore((s) => s.gymBadge)
-  const [setBadgeInDb] = useMutation(Query.user('setGymBadge'), {
+  const [setBadgeInDb] = useMutation(Query.user('SET_GYM_BADGE'), {
     refetchQueries: ['GetBadgeInfo', 'Gyms', 'Raids', 'GymsRaids'],
   })
 
diff --git a/src/components/layout/dialogs/ClientError.jsx b/src/components/dialogs/ClientError.jsx
similarity index 89%
rename from src/components/layout/dialogs/ClientError.jsx
rename to src/components/dialogs/ClientError.jsx
index a1fb4552a..cbee541f8 100644
--- a/src/components/layout/dialogs/ClientError.jsx
+++ b/src/components/dialogs/ClientError.jsx
@@ -5,13 +5,13 @@ import Dialog from '@mui/material/Dialog'
 import DialogContent from '@mui/material/DialogContent'
 import Typography from '@mui/material/Typography'
 import Button from '@mui/material/Button'
-
 import { useTranslation } from 'react-i18next'
-import { useMemory } from '@hooks/useMemory'
 
-import Header from '../general/Header'
+import { useMemory } from '@store/useMemory'
+
+import { Header } from './Header'
 
-export default function ClientError() {
+export function ClientError() {
   const { t } = useTranslation()
   const error = useMemory((s) => s.clientError)
 
diff --git a/src/components/layout/dialogs/DialogWrapper.jsx b/src/components/dialogs/DialogWrapper.jsx
similarity index 90%
rename from src/components/layout/dialogs/DialogWrapper.jsx
rename to src/components/dialogs/DialogWrapper.jsx
index 5f2e1ed60..cd5203df0 100644
--- a/src/components/layout/dialogs/DialogWrapper.jsx
+++ b/src/components/dialogs/DialogWrapper.jsx
@@ -1,8 +1,9 @@
 // @ts-check
 import * as React from 'react'
 import Dialog from '@mui/material/Dialog'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
+
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
 
 /**
  *
diff --git a/src/components/layout/dialogs/Feedback.jsx b/src/components/dialogs/Feedback.jsx
similarity index 88%
rename from src/components/layout/dialogs/Feedback.jsx
rename to src/components/dialogs/Feedback.jsx
index 515de03c8..2d1d1822b 100644
--- a/src/components/layout/dialogs/Feedback.jsx
+++ b/src/components/dialogs/Feedback.jsx
@@ -7,14 +7,14 @@ import Button from '@mui/material/Button'
 import Divider from '@mui/material/Divider'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
 
-import Header from '../general/Header'
-import Footer from '../general/Footer'
+import { Header } from './Header'
+import { Footer } from './Footer'
 import { DialogWrapper } from './DialogWrapper'
 
-export default function Feedback() {
+export function Feedback() {
   const { t } = useTranslation()
 
   const link = useMemory((s) => s.config.links.feedbackLink)
diff --git a/src/components/layout/general/Footer.jsx b/src/components/dialogs/Footer.jsx
similarity index 78%
rename from src/components/layout/general/Footer.jsx
rename to src/components/dialogs/Footer.jsx
index b4a0638f1..f66d73b4f 100644
--- a/src/components/layout/general/Footer.jsx
+++ b/src/components/dialogs/Footer.jsx
@@ -1,9 +1,35 @@
 // @ts-check
 import * as React from 'react'
-import { IconButton, Button, Typography, Grid } from '@mui/material'
+import IconButton from '@mui/material/IconButton'
+import Button from '@mui/material/Button'
+import Typography from '@mui/material/Typography'
+import Grid from '@mui/material/Unstable_Grid2'
+import Replay from '@mui/icons-material/Replay'
+import Save from '@mui/icons-material/Save'
+import Add from '@mui/icons-material/Add'
+import People from '@mui/icons-material/People'
+import BugReport from '@mui/icons-material/BugReport'
+import Help from '@mui/icons-material/HelpOutline'
+import Ballot from '@mui/icons-material/Ballot'
+import Tune from '@mui/icons-material/Tune'
+import FormatSize from '@mui/icons-material/FormatSize'
+import Clear from '@mui/icons-material/Clear'
+import Check from '@mui/icons-material/Check'
 import { useTranslation } from 'react-i18next'
 
-import * as MuiIcons from './Icons'
+const MuiIcons = {
+  Replay,
+  Save,
+  Add,
+  People,
+  BugReport,
+  Help,
+  Ballot,
+  Tune,
+  FormatSize,
+  Clear,
+  Check,
+}
 
 /**
  * @typedef {{
@@ -30,7 +56,7 @@ import * as MuiIcons from './Icons'
  * }} props
  * @returns
  */
-export default function Footer({ options, role }) {
+export function Footer({ options, role }) {
   const { t } = useTranslation()
 
   return (
@@ -49,7 +75,6 @@ export default function Footer({ options, role }) {
         if (button.component) {
           return (
             <Grid
-              item
               key={button.key}
               xs={actualSize}
               style={{ textAlign: button.align || 'center' }}
@@ -67,16 +92,11 @@ export default function Footer({ options, role }) {
 
         return (
           <Grid
-            item
             xs={actualSize}
             sm={+t(`${role}_key_width`) || actualSize}
             key={key}
-            style={{
-              textAlign: button.align || 'center',
-              display: 'flex',
-              justifyContent: 'center',
-              alignItems: 'center',
-            }}
+            textAlign={button.align || 'center'}
+            className="flex-center"
           >
             {MuiIcon && (
               <IconButton
diff --git a/src/components/layout/general/Header.jsx b/src/components/dialogs/Header.jsx
similarity index 79%
rename from src/components/layout/general/Header.jsx
rename to src/components/dialogs/Header.jsx
index dfc7ea91f..1eea8e589 100644
--- a/src/components/layout/general/Header.jsx
+++ b/src/components/dialogs/Header.jsx
@@ -1,8 +1,8 @@
 // @ts-check
 import * as React from 'react'
 import Clear from '@mui/icons-material/Clear'
-import { IconButton, DialogTitle } from '@mui/material'
-
+import DialogTitle from '@mui/material/DialogTitle'
+import IconButton from '@mui/material/IconButton'
 import { Trans, useTranslation } from 'react-i18next'
 
 /**
@@ -10,17 +10,17 @@ import { Trans, useTranslation } from 'react-i18next'
  * @param {{
  *  names?: string[],
  *  titles: string | string[],
- *  action?: () => void,
+ *  action?: () => void
  * }} props
  * @returns
  */
-export default function Header({ names, titles, action }) {
+export function Header({ names, titles, action }) {
   const { t } = useTranslation()
 
   return (
     <DialogTitle sx={{ bgcolor: 'secondary.main', color: 'white' }}>
       {(Array.isArray(titles) ? titles : [titles]).map((title, index) =>
-        names?.[index] ? (
+        names?.[index] !== undefined ? (
           <Trans i18nKey={title} key={title}>
             {{ name: t(names[index]) }}
           </Trans>
diff --git a/src/components/layout/dialogs/Help.jsx b/src/components/dialogs/Help.jsx
similarity index 67%
rename from src/components/layout/dialogs/Help.jsx
rename to src/components/dialogs/Help.jsx
index 85bbc433e..918d7324a 100644
--- a/src/components/layout/dialogs/Help.jsx
+++ b/src/components/dialogs/Help.jsx
@@ -1,9 +1,9 @@
 // @ts-check
 import * as React from 'react'
 
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { TutorialAdvanced } from '@features/tutorial'
 
-import Help from './tutorial/Advanced'
 import { DialogWrapper } from './DialogWrapper'
 
 export function HelpDialog() {
@@ -12,7 +12,7 @@ export function HelpDialog() {
     useLayoutStore.setState({ help: { open: false, category: '' } })
   return (
     <DialogWrapper open={open} onClose={handleClose}>
-      <Help toggleHelp={handleClose} category={category} />
+      <TutorialAdvanced toggleHelp={handleClose} category={category} />
     </DialogWrapper>
   )
 }
diff --git a/src/components/layout/dialogs/NestSubmission.jsx b/src/components/dialogs/NestSubmission.jsx
similarity index 80%
rename from src/components/layout/dialogs/NestSubmission.jsx
rename to src/components/dialogs/NestSubmission.jsx
index ad33de4e2..bd295ba81 100644
--- a/src/components/layout/dialogs/NestSubmission.jsx
+++ b/src/components/dialogs/NestSubmission.jsx
@@ -1,3 +1,4 @@
+// @ts-check
 import * as React from 'react'
 import Dialog from '@mui/material/Dialog'
 import DialogContent from '@mui/material/DialogContent'
@@ -5,14 +6,18 @@ import TextField from '@mui/material/TextField'
 import { useMutation } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
 
-import Query from '@services/Query'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { Query } from '@services/queries'
+import { useWebhookStore } from '@store/useWebhookStore'
+import { useLayoutStore } from '@store/useLayoutStore'
 
-import Header from '../general/Header'
-import Footer from '../general/Footer'
+import { Header } from './Header'
+import { Footer } from './Footer'
 
-export default function NestSubmission({ id, name }) {
+/**
+ * @param {{ id: number, name: string }} props
+ * @returns
+ */
+export function NestSubmission({ id, name }) {
   const open = useLayoutStore((s) => s.nestSubmissions)
   const [newName, setNewName] = React.useState(name)
   const { t } = useTranslation()
@@ -44,11 +49,13 @@ export default function NestSubmission({ id, name }) {
 
   React.useEffect(() => {
     if (error) {
-      useMemory.setState({
-        webhookAlert: {
+      useWebhookStore.setState({
+        alert: {
           open: true,
           severity: 'error',
           message:
+            error?.networkError &&
+            'statusCode' in error.networkError &&
             error.networkError?.statusCode === 401
               ? t('mutation_auth_error')
               : error.message,
diff --git a/src/components/layout/dialogs/ResetFilters.jsx b/src/components/dialogs/ResetFilters.jsx
similarity index 82%
rename from src/components/layout/dialogs/ResetFilters.jsx
rename to src/components/dialogs/ResetFilters.jsx
index a27aa7176..2b2ea1b10 100644
--- a/src/components/layout/dialogs/ResetFilters.jsx
+++ b/src/components/dialogs/ResetFilters.jsx
@@ -7,25 +7,24 @@ import Button from '@mui/material/Button'
 import { useNavigate } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { useLayoutStore } from '@store/useLayoutStore'
 
-import Header from '../general/Header'
-import Footer from '../general/Footer'
+import { Header } from './Header'
+import { Footer } from './Footer'
 import { DialogWrapper } from './DialogWrapper'
 
 const handleClose = () => useLayoutStore.setState({ resetFilters: false })
 
-const FOOTER_OPTIONS =
-  /** @type {import('../general/Footer').FooterButton[]} */ ([
-    {
-      name: 'close',
-      action: handleClose,
-      color: 'primary',
-      align: 'right',
-    },
-  ])
+const FOOTER_OPTIONS = /** @type {import('./Footer').FooterButton[]} */ ([
+  {
+    name: 'close',
+    action: handleClose,
+    color: 'primary',
+    align: 'right',
+  },
+])
 
-export default function ResetFilters() {
+export function ResetFilters() {
   const { t } = useTranslation()
   const navigate = useNavigate()
 
diff --git a/src/components/dialogs/UserOptions.jsx b/src/components/dialogs/UserOptions.jsx
new file mode 100644
index 000000000..83a8c30d4
--- /dev/null
+++ b/src/components/dialogs/UserOptions.jsx
@@ -0,0 +1,210 @@
+import * as React from 'react'
+import DialogContent from '@mui/material/DialogContent'
+import Input from '@mui/material/Input'
+import List from '@mui/material/List'
+import ListItem from '@mui/material/ListItem'
+import ListItemText from '@mui/material/ListItemText'
+import Switch from '@mui/material/Switch'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { toggleDialog, useLayoutStore } from '@store/useLayoutStore'
+import { setDeepStore, useDeepStore, useStorage } from '@store/useStorage'
+import { getPermission } from '@services/desktopNotification'
+import { analytics } from '@utils/analytics'
+import { getProperName, camelToSnake } from '@utils/strings'
+
+import { Header } from './Header'
+import { Footer } from './Footer'
+import { DialogWrapper } from './DialogWrapper'
+
+/**
+ * @template {keyof import('@store/useStorage').UseStorage['userSettings']} T
+ * @param {{
+ *  category: T
+ *  option: keyof import('@store/useStorage').UseStorage['userSettings'][T]
+ *  subOption?: string
+ *  localState: Record<string, any>
+ *  handleChange: (event: React.ChangeEvent<HTMLInputElement>) => void
+ * }} props
+ */
+function InputType({ option, subOption, category }) {
+  const staticSetting = useMemory((s) =>
+    subOption
+      ? s.clientMenus[category]?.[option]?.sub?.[subOption]
+      : s.clientMenus[category]?.[option],
+  )
+  const [userValue, setUserValue] = useDeepStore(
+    `userSettings.${category}.${subOption || option}`,
+    staticSetting?.type === 'bool',
+  )
+  const handleChange = ({ target }) => {
+    if (target.type === 'checkbox') {
+      setUserValue(target.checked)
+    } else {
+      setUserValue(
+        staticSetting?.type === 'number'
+          ? +target.value || 0
+          : target.value || '',
+      )
+    }
+    analytics(
+      'User Options',
+      `Name: ${option} New Value: ${target.checked ?? target.value}`,
+      category,
+    )
+  }
+
+  switch (staticSetting.type) {
+    case 'bool':
+      return (
+        <Switch
+          color="secondary"
+          checked={!!userValue}
+          onChange={handleChange}
+          disabled={staticSetting?.disabled}
+        />
+      )
+    default:
+      return (
+        <Input
+          color="secondary"
+          style={{ width: 50 }}
+          value={userValue ?? ''}
+          onChange={handleChange}
+          size="small"
+          type={staticSetting.type}
+          disabled={staticSetting.disabled}
+          endAdornment={staticSetting.label || ''}
+          inputProps={
+            staticSetting.type === 'number'
+              ? {
+                  min: staticSetting.min || 0,
+                  max: staticSetting.max || 100,
+                }
+              : undefined
+          }
+        />
+      )
+  }
+}
+
+const MemoInputType = React.memo(
+  InputType,
+  (prev, next) =>
+    prev.localState?.[prev.subOption || prev.option] ===
+    next.localState?.[next.subOption || next.option],
+)
+
+function BaseUserOptions() {
+  const { t } = useTranslation()
+  const { open, category, type } = useLayoutStore((s) => s.dialog)
+
+  const staticUserSettings = useMemory((s) => s.clientMenus[category])
+
+  /** @param {string} label */
+  const getLabel = (label) => {
+    if (label.startsWith('pvp') && !label.includes('Mega')) {
+      return t('pvp_level', { level: label.substring(3) })
+    }
+    return t(camelToSnake(label), getProperName(label))
+  }
+
+  const footerOptions = React.useMemo(
+    () =>
+      /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
+        {
+          name: 'reset',
+          action: () => {
+            const existing = useStorage.getState().userSettings
+            if (category in existing) {
+              const newSettings = {
+                ...existing[category],
+              }
+              Object.entries(staticUserSettings || {}).forEach(
+                ([key, value]) => {
+                  if (value.sub) {
+                    Object.entries(value.sub).forEach(([subKey, subValue]) => {
+                      newSettings[subKey] = subValue.value
+                    })
+                  } else {
+                    newSettings[key] = value.value
+                  }
+                },
+              )
+              setDeepStore(`userSettings.${category}`, newSettings)
+            }
+          },
+          color: 'primary',
+        },
+        {
+          name: 'close',
+          action: toggleDialog(false),
+          color: 'secondary',
+        },
+      ]),
+    [category, staticUserSettings],
+  )
+
+  return (
+    <DialogWrapper
+      open={open && type === 'options'}
+      maxWidth="md"
+      onClose={toggleDialog(false)}
+      fullWidth={false}
+    >
+      <Header
+        titles={[`${camelToSnake(category)}_options`]}
+        action={toggleDialog(false)}
+      />
+      <DialogContent sx={{ minWidth: 'min(100%, 350px)' }}>
+        <List>
+          {category === 'notifications' && (
+            <ListItem>
+              <ListItemText primaryTypographyProps={{ variant: 'h6' }}>
+                {t('notifications_status')}: {t(getPermission())}
+              </ListItemText>
+            </ListItem>
+          )}
+          {Object.entries(staticUserSettings || {}).map(([option, values]) => (
+            <React.Fragment key={option}>
+              <ListItem
+                key={option}
+                disableGutters
+                disablePadding
+                style={{ minHeight: 38 }}
+              >
+                <ListItemText
+                  primary={getLabel(option)}
+                  primaryTypographyProps={{
+                    style: { maxWidth: '80%' },
+                  }}
+                />
+                <MemoInputType category={category} option={option} />
+              </ListItem>
+              {values.sub &&
+                Object.keys(values.sub).map((subOption) => (
+                  <ListItem
+                    key={subOption}
+                    disableGutters
+                    disablePadding
+                    style={{ minHeight: 38 }}
+                  >
+                    <ListItemText primary={getLabel(subOption)} />
+                    <MemoInputType
+                      category={category}
+                      option={option}
+                      subOption={subOption}
+                    />
+                  </ListItem>
+                ))}
+            </React.Fragment>
+          ))}
+        </List>
+      </DialogContent>
+      <Footer options={footerOptions} />
+    </DialogWrapper>
+  )
+}
+
+export const UserOptions = React.memo(BaseUserOptions)
diff --git a/src/components/layout/dialogs/filters/Advanced.jsx b/src/components/filters/Advanced.jsx
similarity index 86%
rename from src/components/layout/dialogs/filters/Advanced.jsx
rename to src/components/filters/Advanced.jsx
index 8d86f440e..0bbf3de00 100644
--- a/src/components/layout/dialogs/filters/Advanced.jsx
+++ b/src/components/filters/Advanced.jsx
@@ -1,31 +1,31 @@
 // @ts-check
 import * as React from 'react'
-import { DialogContent, List, ListItem, Dialog } from '@mui/material'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import List from '@mui/material/List'
+import ListItem from '@mui/material/ListItem'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useDeepStore, useStorage } from '@hooks/useStorage'
-import Header from '@components/layout/general/Header'
-import Footer from '@components/layout/general/Footer'
-import {
-  BoolToggle,
-  DualBoolToggle,
-} from '@components/layout/drawer/BoolToggle'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useDeepStore, useStorage } from '@store/useStorage'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
+import { BoolToggle, DualBoolToggle } from '@components/inputs/BoolToggle'
 import { ENABLED_ALL, XXS_XXL } from '@assets/constants'
 import { useTranslateById } from '@hooks/useTranslateById'
-import { STANDARD_BACKUP, applyToAll } from '@services/filtering/applyToAll'
-import { checkIfHasAll } from '@services/functions/hasAll'
+import { STANDARD_BACKUP, applyToAll } from '@utils/applyToAll'
+import { checkIfHasAll } from '@utils/hasAll'
+import { useAnalytics } from '@hooks/useAnalytics'
 
 import { StringFilter } from './StringFilter'
-import SliderTile from './SliderTile'
-import Size from './Size'
+import { SliderTile } from '../inputs/SliderTile'
+import { Size } from './Size'
 import { GenderListItem } from './Gender'
 import { QuestConditionSelector } from './QuestConditions'
 
-export default function AdvancedFilter() {
+export function AdvancedFilter() {
   const { category, id, selectedIds, open } = useLayoutStore(
     (s) => s.advancedFilter,
   )
@@ -48,8 +48,8 @@ export default function AdvancedFilter() {
   )
   const backup = React.useRef(filters)
 
-  Utility.analytics(`/${category}/${id}`)
-  Utility.analytics(
+  useAnalytics(`/${category}/${id}`)
+  useAnalytics(
     'Advanced Filtering',
     `ID: ${id} Size: ${filters?.size || 'md'}`,
     category,
@@ -82,7 +82,7 @@ export default function AdvancedFilter() {
     }
   }
 
-  /** @type {import('@components/layout/general/Footer').FooterButton[]} */
+  /** @type {import('@components/dialogs/Footer').FooterButton[]} */
   const footerOptions = React.useMemo(
     () => [
       {
diff --git a/src/components/filters/FilterMenu.jsx b/src/components/filters/FilterMenu.jsx
new file mode 100644
index 000000000..f3bb4499c
--- /dev/null
+++ b/src/components/filters/FilterMenu.jsx
@@ -0,0 +1,43 @@
+// @ts-check
+import * as React from 'react'
+
+import { toggleDialog, useLayoutStore } from '@store/useLayoutStore'
+import { StandardItem } from '@components/virtual/StandardItem'
+import { Menu } from '@components/Menu'
+import { Header } from '@components/dialogs/Header'
+
+import { DialogWrapper } from '../dialogs/DialogWrapper'
+
+/** @type {import('@components/dialogs/Footer').FooterButton[]} */
+const EXTRA_BUTTONS = [
+  {
+    name: 'close',
+    action: toggleDialog(false),
+    color: 'secondary',
+  },
+]
+
+export function FilterMenu() {
+  const { open, category, type } = useLayoutStore((s) => s.dialog)
+
+  return (category === 'pokemon' ||
+    category === 'gyms' ||
+    category === 'pokestops' ||
+    category === 'nests') &&
+    type === 'filters' ? (
+    <DialogWrapper
+      open={open && type === 'filters'}
+      onClose={toggleDialog(false)}
+      maxWidth="md"
+    >
+      <Header
+        titles={`${category}_filters`}
+        action={toggleDialog(false)}
+        names={[category]}
+      />
+      <Menu category={category} extraButtons={EXTRA_BUTTONS}>
+        {(_, key) => <StandardItem id={key} category={category} caption />}
+      </Menu>
+    </DialogWrapper>
+  ) : null
+}
diff --git a/src/components/layout/dialogs/filters/Gender.jsx b/src/components/filters/Gender.jsx
similarity index 90%
rename from src/components/layout/dialogs/filters/Gender.jsx
rename to src/components/filters/Gender.jsx
index 393bc1e3f..7d212feae 100644
--- a/src/components/layout/dialogs/filters/Gender.jsx
+++ b/src/components/filters/Gender.jsx
@@ -4,7 +4,7 @@ import ListItem from '@mui/material/ListItem'
 import ListItemText from '@mui/material/ListItemText'
 import { useTranslation } from 'react-i18next'
 
-import { MultiSelectorStore } from '@components/layout/drawer/MultiSelector'
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
 import { ENUM_GENDER } from '@assets/constants'
 
 /**
diff --git a/src/components/filters/Options.jsx b/src/components/filters/Options.jsx
new file mode 100644
index 000000000..3de7fc726
--- /dev/null
+++ b/src/components/filters/Options.jsx
@@ -0,0 +1,110 @@
+// @ts-check
+import * as React from 'react'
+import ExpandMore from '@mui/icons-material/ExpandMore'
+import Typography from '@mui/material/Typography'
+import Accordion from '@mui/material/Accordion'
+import AccordionSummary from '@mui/material/AccordionSummary'
+import AccordionDetails from '@mui/material/AccordionDetails'
+import FormControlLabel from '@mui/material/FormControlLabel'
+import Checkbox from '@mui/material/Checkbox'
+import ListItem from '@mui/material/ListItem'
+import List from '@mui/material/List'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { setDeepStore, useStorage } from '@store/useStorage'
+import { analytics } from '@utils/analytics'
+import { camelToSnake } from '@utils/strings'
+
+/**
+ * @typedef {keyof import('@store/useStorage').UseStorage['menus']} MenuCategories
+ * @typedef {'others' | 'categories' | 'generations' | 'types' | 'rarity' | 'historicRarity' | 'forms'} MenuSubcategories
+ */
+
+/**
+ * @param {MenuCategories} category
+ * @param {MenuSubcategories} subCategory
+ * @returns {import('@mui/material').CheckboxProps['onChange']}
+ */
+const handleChange = (category, subCategory) => (event) => {
+  analytics(
+    'Filtering Options',
+    `New Value: ${event.target.checked}`,
+    `Category: ${category} Name: ${subCategory}.${event.target.name}`,
+  )
+  setDeepStore(
+    // @ts-ignore
+    `menus.${category}.filters.${subCategory}.${event.target.name}`,
+    event.target.checked,
+  )
+}
+
+/**
+ * @param {MenuCategories} category
+ * @param {MenuSubcategories} subCategory
+ * @returns {import('@mui/material').AccordionProps['onChange']}
+ */
+const handleAccordion = (category, subCategory) => (_, isExpanded) => {
+  useStorage.setState((prev) => ({
+    advMenu: { ...prev.advMenu, [category]: isExpanded ? subCategory : false },
+  }))
+}
+
+/**
+ * @param {{ category: MenuCategories, subCategory: MenuSubcategories, option: string }} props
+ */
+export function OptionCheckbox({ category, subCategory, option }) {
+  const { t } = useTranslation()
+  const checked = useStorage(
+    (s) => s.menus[category].filters[subCategory][option] || false,
+  )
+  return (
+    <ListItem disablePadding disableGutters>
+      <FormControlLabel
+        control={
+          <Checkbox
+            checked={checked}
+            onChange={handleChange(category, subCategory)}
+            name={option}
+          />
+        }
+        value={option}
+        label={t(camelToSnake(option))}
+      />
+    </ListItem>
+  )
+}
+
+const OptionsCheckboxMemo = React.memo(OptionCheckbox, () => true)
+
+/**
+ * @param {{ category: MenuCategories, subCategory: MenuSubcategories }} props
+ */
+export function OptionsGroup({ category, subCategory }) {
+  const { t } = useTranslation()
+  const options = useMemory((s) => s.menus[category].filters[subCategory])
+  const expanded = useStorage((s) => s.advMenu[category] === subCategory)
+
+  return (
+    <Accordion
+      expanded={expanded}
+      onChange={handleAccordion(category, subCategory)}
+    >
+      <AccordionSummary expandIcon={<ExpandMore />}>
+        <Typography>{t(camelToSnake(subCategory))}</Typography>
+      </AccordionSummary>
+      <AccordionDetails>
+        <List>
+          {Object.keys(options || {}).map((option) => (
+            <OptionsCheckboxMemo
+              key={`${category}-${subCategory}-${option}`}
+              category={category}
+              subCategory={subCategory}
+              option={option}
+            />
+          ))}
+        </List>
+      </AccordionDetails>
+    </Accordion>
+  )
+}
diff --git a/src/components/layout/dialogs/filters/OptionsContainer.jsx b/src/components/filters/OptionsContainer.jsx
similarity index 65%
rename from src/components/layout/dialogs/filters/OptionsContainer.jsx
rename to src/components/filters/OptionsContainer.jsx
index dc101bd60..0e8b77cd7 100644
--- a/src/components/layout/dialogs/filters/OptionsContainer.jsx
+++ b/src/components/filters/OptionsContainer.jsx
@@ -1,3 +1,4 @@
+// @ts-check
 import * as React from 'react'
 import Chip from '@mui/material/Chip'
 import List from '@mui/material/List'
@@ -6,16 +7,25 @@ import ListItemText from '@mui/material/ListItemText'
 import { useTranslation } from 'react-i18next'
 import ReplayIcon from '@mui/icons-material/Replay'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import { BasicListButton } from '@components/layout/general/BasicListButton'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { BasicListButton } from '@components/inputs/BasicListButton'
+import { camelToSnake } from '@utils/strings'
 
-import Options from './Options'
+import { OptionsGroup } from './Options'
 
 /** @type {React.CSSProperties} */
 const CHIP_STYLE = { margin: 3 }
 
+/**
+ *
+ * @param {{
+ *  category: import('./Options').MenuCategories
+ *  subCategory: import('./Options').MenuSubcategories
+ *  option: string
+ * }} props
+ * @returns
+ */
 function AppliedChip({ category, subCategory, option }) {
   const { t } = useTranslation()
   const reverse = useStorage(
@@ -28,7 +38,7 @@ function AppliedChip({ category, subCategory, option }) {
   if (!valid) return null
   return (
     <Chip
-      label={t(Utility.camelToSnake(option))}
+      label={t(camelToSnake(option))}
       variant="outlined"
       size="small"
       color={reverse ? 'secondary' : 'primary'}
@@ -39,6 +49,11 @@ function AppliedChip({ category, subCategory, option }) {
 
 const AppliedChipMemo = React.memo(AppliedChip, () => true)
 
+/**
+ *
+ * @param {{ category: import('./Options').MenuCategories }} props
+ * @returns
+ */
 function Applied({ category }) {
   return Object.entries(useStorage.getState().menus[category].filters).map(
     ([subCategory, options]) =>
@@ -46,6 +61,7 @@ function Applied({ category }) {
         <AppliedChipMemo
           key={`${subCategory}-${option}`}
           category={category}
+          // @ts-ignore
           subCategory={subCategory}
           option={option}
         />
@@ -53,6 +69,11 @@ function Applied({ category }) {
   )
 }
 
+/**
+ *
+ * @param {import('./Options').MenuCategories} category
+ * @returns
+ */
 const handleReset = (category) => () => {
   const { menus } = useStorage.getState()
   const resetPayload = {}
@@ -70,13 +91,13 @@ const handleReset = (category) => () => {
   }))
 }
 
-export default function OptionsContainer({
-  categories,
-  category,
-  countTotal,
-  countShow,
-}) {
-  const { t } = useTranslation()
+/**
+ * @param {{
+ *  category: import('./Options').MenuCategories,
+ *  categories: string[],
+ * }} props
+ */
+function OptContainer({ categories, category }) {
   return (
     <>
       {Object.entries(useMemory.getState().menus[category].filters).map(
@@ -89,9 +110,10 @@ export default function OptionsContainer({
               : Object.keys(options).length > 1
           ) {
             return (
-              <Options
+              <OptionsGroup
                 key={subCategory}
                 category={category}
+                // @ts-ignore
                 subCategory={subCategory}
               />
             )
@@ -99,13 +121,8 @@ export default function OptionsContainer({
           return null
         },
       )}
-      <List key="resetShowing">
-        <ListItem>
-          <ListItemText
-            primary={t('showing')}
-            secondary={`${countShow}/${countTotal}`}
-          />
-        </ListItem>
+      <List>
+        <CountDisplay category={category} />
         <ListItem className="flex-center" sx={{ flexWrap: 'wrap' }}>
           <Applied category={category} />
         </ListItem>
@@ -116,3 +133,24 @@ export default function OptionsContainer({
     </>
   )
 }
+
+export const OptionsContainer = React.memo(
+  OptContainer,
+  (prev, next) => prev.category === next.category,
+)
+
+/**
+ *
+ * @param {{ category: import('./Options').MenuCategories }} props
+ * @returns
+ */
+function CountDisplay({ category }) {
+  const { t } = useTranslation()
+  const show = useMemory((s) => s.advMenuCounts[category]?.show || 0)
+  const total = useMemory((s) => s.advMenuCounts[category]?.total || 0)
+  return (
+    <ListItem>
+      <ListItemText primary={t('showing')} secondary={`${show}/${total}`} />
+    </ListItem>
+  )
+}
diff --git a/src/components/filters/QuestConditions.jsx b/src/components/filters/QuestConditions.jsx
new file mode 100644
index 000000000..dbf18b166
--- /dev/null
+++ b/src/components/filters/QuestConditions.jsx
@@ -0,0 +1,109 @@
+// @ts-check
+import * as React from 'react'
+import Typography from '@mui/material/Typography'
+import MenuItem from '@mui/material/MenuItem'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { useDeepStore, useStorage } from '@store/useStorage'
+import { QuestTitle } from '@components/QuestTitle'
+import { FCSelect } from '@components/inputs/FCSelect'
+
+/**
+ *
+ * @param {{ id: string }} props
+ * @returns
+ */
+export function QuestConditionSelector({ id }) {
+  const { t } = useTranslation()
+  const [value, setValue] = useDeepStore(
+    `filters.pokestops.filter.${id}.adv`,
+    '',
+  )
+  const all = useStorage((s) => !!s.filters.pokestops.filter[id].all)
+  const questConditions = useMemory((s) => s.available.questConditions[id])
+  const hasQuests = useMemory((s) => s.ui.pokestops?.quests)
+
+  const [open, setOpen] = React.useState(false)
+
+  // Provides a reset if that condition is no longer available
+  React.useEffect(() => {
+    if (hasQuests) {
+      // user has quest permissions
+      if (!questConditions && value) {
+        // condition is no longer available
+        setValue('')
+      } else {
+        // check if the value is still valid
+        const filtered = questConditions
+          ? value
+              .split(',')
+              .filter((each) =>
+                questConditions.find(({ title }) => title === each),
+              )
+          : []
+        setValue(filtered.length ? filtered.join(',') : '')
+      }
+    } else {
+      // user does not have quest permissions
+      setValue('')
+    }
+  }, [questConditions, id, hasQuests])
+
+  const handleClose = () => {
+    setOpen(false)
+  }
+
+  const handleOpen = () => {
+    setOpen(true)
+  }
+
+  if (!questConditions) return null
+
+  return (
+    <FCSelect
+      label={t('quest_condition')}
+      value={value.split(',')}
+      disabled={all}
+      fullWidth
+      open={open}
+      onOpen={handleOpen}
+      onClose={handleClose}
+      multiple
+      renderValue={(selected) =>
+        Array.isArray(selected)
+          ? `${selected.length} ${t('selected')}`
+          : selected
+      }
+      onChange={(e, child) => {
+        if (
+          typeof child === 'object' &&
+          'props' in child &&
+          child.props.value === ''
+        ) {
+          setValue('')
+          handleClose()
+        } else {
+          setValue(
+            Array.isArray(e.target.value)
+              ? e.target.value.filter(Boolean).join(',')
+              : e.target.value,
+          )
+        }
+      }}
+      fcSx={{ my: 1 }}
+    >
+      <MenuItem value="">
+        <Typography variant="caption">{t('all')}</Typography>
+      </MenuItem>
+      {questConditions
+        .slice()
+        .sort((a, b) => a.title.localeCompare(b.title))
+        .map(({ title, target }) => (
+          <MenuItem key={`${title}-${target}`} value={title}>
+            <QuestTitle questTitle={title} questTarget={target} />
+          </MenuItem>
+        ))}
+    </FCSelect>
+  )
+}
diff --git a/src/components/layout/dialogs/filters/Size.jsx b/src/components/filters/Size.jsx
similarity index 85%
rename from src/components/layout/dialogs/filters/Size.jsx
rename to src/components/filters/Size.jsx
index 41ccf2e89..214951e78 100644
--- a/src/components/layout/dialogs/filters/Size.jsx
+++ b/src/components/filters/Size.jsx
@@ -4,7 +4,7 @@ import ListItem from '@mui/material/ListItem'
 import ListItemText from '@mui/material/ListItemText'
 import { useTranslation } from 'react-i18next'
 
-import { MultiSelectorStore } from '@components/layout/drawer/MultiSelector'
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
 import { ICON_SIZES } from '@assets/constants'
 
 /**
@@ -15,7 +15,7 @@ import { ICON_SIZES } from '@assets/constants'
  *  onClick?: SizeOnClick
  * } & Omit<import('@mui/material/ListItem').ListItemProps, 'onClick'>} props
  */
-export default function Size({ field, noLabel = false, onClick, ...props }) {
+export function Size({ field, noLabel = false, onClick, ...props }) {
   const { t } = useTranslation()
 
   return (
diff --git a/src/components/layout/dialogs/filters/SlotSelection.jsx b/src/components/filters/SlotSelection.jsx
similarity index 84%
rename from src/components/layout/dialogs/filters/SlotSelection.jsx
rename to src/components/filters/SlotSelection.jsx
index 5efa9fab8..5978fe7f6 100644
--- a/src/components/layout/dialogs/filters/SlotSelection.jsx
+++ b/src/components/filters/SlotSelection.jsx
@@ -1,25 +1,24 @@
 // @ts-check
 import * as React from 'react'
-import Clear from '@mui/icons-material/Clear'
-import Check from '@mui/icons-material/Check'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
 import DialogContent from '@mui/material/DialogContent'
 import IconButton from '@mui/material/IconButton'
 import Divider from '@mui/material/Divider'
 
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage, useDeepStore } from '@hooks/useStorage'
-import { Img } from '@components/layout/general/Img'
-import { DualBoolToggle } from '@components/layout/drawer/BoolToggle'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useStorage, useDeepStore } from '@store/useStorage'
+import { Img } from '@components/Img'
+import { DualBoolToggle } from '@components/inputs/BoolToggle'
 import { ENABLED_ALL } from '@assets/constants'
-import Header from '@components/layout/general/Header'
-import Footer from '@components/layout/general/Footer'
-import Size from './Size'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
+import { StatusIcon } from '@components/StatusIcon'
 
-import { DialogWrapper } from '../DialogWrapper'
+import { Size } from './Size'
+import { DialogWrapper } from '../dialogs/DialogWrapper'
 
-export default function SlotSelection() {
+export function SlotSelection() {
   const [id, teamId, open] = useLayoutStore((s) => {
     const team = s.slotSelection.slice(1).split('-', 1)[0]
     return [s.slotSelection, team, !!s.slotSelection]
@@ -67,7 +66,7 @@ export default function SlotSelection() {
 
   const footerOptions = React.useMemo(
     () =>
-      /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
+      /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
         {
           name: 'disable_all',
           action: () => handleSizeChange(false, id),
@@ -164,11 +163,10 @@ function Enabled({ id, disabled }) {
       onClick={() => setFilter((prev) => !prev)}
       size="large"
     >
-      {filter || disabled ? (
-        <Check color={disabled ? 'disabled' : 'success'} />
-      ) : (
-        <Clear color="error" />
-      )}
+      <StatusIcon
+        status={filter}
+        checkColor={disabled ? 'disabled' : 'success'}
+      />
     </IconButton>
   )
 }
diff --git a/src/components/layout/dialogs/filters/StringFilter.jsx b/src/components/filters/StringFilter.jsx
similarity index 84%
rename from src/components/layout/dialogs/filters/StringFilter.jsx
rename to src/components/filters/StringFilter.jsx
index 9b69116fe..a345741cc 100644
--- a/src/components/layout/dialogs/filters/StringFilter.jsx
+++ b/src/components/filters/StringFilter.jsx
@@ -1,12 +1,14 @@
 // @ts-check
 import * as React from 'react'
-import { ListItem, TextField } from '@mui/material'
+import ListItem from '@mui/material/ListItem'
+import TextField from '@mui/material/TextField'
 import { useTranslation } from 'react-i18next'
 import dlv from 'dlv'
 
-import { useStorage } from '@hooks/useStorage'
-import { setDeep } from '@services/functions/setDeep'
-import Utility from '@services/Utility'
+import { useStorage } from '@store/useStorage'
+import { setDeep } from '@utils/setDeep'
+import { analytics } from '@utils/analytics'
+import { checkIVFilterValid } from '@utils/checkAdvFilter'
 
 /**
  * Expert string input field for filters
@@ -29,8 +31,8 @@ export function StringFilter({ field, ...props }) {
         (event) => {
           try {
             const newValue = event.target.value
-            Utility.analytics('Filtering', newValue, 'Legacy')
-            if (Utility.checkAdvFilter(newValue)) {
+            analytics('Filtering', newValue, 'Legacy')
+            if (checkIVFilterValid(newValue)) {
               setValidation({
                 label: t('valid'),
                 status: false,
diff --git a/src/components/layout/general/BasicListButton.jsx b/src/components/inputs/BasicListButton.jsx
similarity index 100%
rename from src/components/layout/general/BasicListButton.jsx
rename to src/components/inputs/BasicListButton.jsx
diff --git a/src/components/layout/drawer/BoolToggle.jsx b/src/components/inputs/BoolToggle.jsx
similarity index 89%
rename from src/components/layout/drawer/BoolToggle.jsx
rename to src/components/inputs/BoolToggle.jsx
index c43e0d614..9bb34f0da 100644
--- a/src/components/layout/drawer/BoolToggle.jsx
+++ b/src/components/inputs/BoolToggle.jsx
@@ -4,16 +4,15 @@ import ListItem from '@mui/material/ListItem'
 import ListItemText from '@mui/material/ListItemText'
 import Switch from '@mui/material/Switch'
 import List from '@mui/material/List'
-
-import { useDeepStore } from '@hooks/useStorage'
-import { useTranslation } from 'react-i18next'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
-import Utility from '@services/Utility'
-import { fromSnakeCase } from '@services/functions/fromSnakeCase'
+import { useTranslation } from 'react-i18next'
+
+import { useDeepStore } from '@store/useStorage'
+import { camelToSnake, fromSnakeCase } from '@utils/strings'
 
 /**
  * @typedef {{
- *  field: import('@hooks/useStorage').UseStoragePaths,
+ *  field: import('@store/useStorage').UseStoragePaths,
  *  label?: string,
  *  disabled?: boolean,
  *  children?: React.ReactNode,
@@ -52,7 +51,7 @@ export function BoolBase({
       {children}
       {label && (
         <ListItemText inset={inset} primaryTypographyProps={{ align }}>
-          {t(label, t(Utility.camelToSnake(label), fromSnakeCase(label)))}
+          {t(label, t(camelToSnake(label), fromSnakeCase(label)))}
         </ListItemText>
       )}
       <Switch
diff --git a/src/components/inputs/FCSelect.jsx b/src/components/inputs/FCSelect.jsx
new file mode 100644
index 000000000..fad838f66
--- /dev/null
+++ b/src/components/inputs/FCSelect.jsx
@@ -0,0 +1,54 @@
+// @ts-check
+import * as React from 'react'
+import FormControl from '@mui/material/FormControl'
+import InputLabel from '@mui/material/InputLabel'
+import ListItem from '@mui/material/ListItem'
+import ListItemIcon from '@mui/material/ListItemIcon'
+import Select from '@mui/material/Select'
+
+/** @type {import('@mui/material').SxProps} */
+const SX = { margin: '3px 0' }
+
+/**
+ * @typedef {import('@mui/material').SelectProps & { variant?: import('@mui/material').FormControlProps['variant'], fcSx?: import('@mui/material').SxProps }} FCSelectProps
+ * @typedef {FCSelectProps & { icon?: React.ReactElement }} FCSelectListItemProps
+ */
+
+/** @type {React.ForwardRefExoticComponent<FCSelectProps>} */
+export const FCSelect = React.forwardRef(
+  (
+    {
+      children,
+      value,
+      label,
+      size = 'small',
+      fcSx = SX,
+      fullWidth = true,
+      ...props
+    },
+    ref,
+  ) => (
+    <FormControl size={size} fullWidth={fullWidth} sx={fcSx}>
+      <InputLabel>{label}</InputLabel>
+      <Select
+        autoFocus
+        ref={ref}
+        value={value ?? ''}
+        fullWidth={fullWidth}
+        label={label}
+        size={size}
+        {...props}
+      >
+        {children}
+      </Select>
+    </FormControl>
+  ),
+)
+
+/** @type {React.ForwardRefExoticComponent<FCSelectListItemProps>} */
+export const FCSelectListItem = React.forwardRef(({ icon, ...props }, ref) => (
+  <ListItem dense>
+    {icon && <ListItemIcon>{icon}</ListItemIcon>}
+    <FCSelect {...props} ref={ref} />
+  </ListItem>
+))
diff --git a/src/components/layout/drawer/ItemSearch.jsx b/src/components/inputs/GenericSearch.jsx
similarity index 94%
rename from src/components/layout/drawer/ItemSearch.jsx
rename to src/components/inputs/GenericSearch.jsx
index 86dd32510..64749d7a5 100644
--- a/src/components/layout/drawer/ItemSearch.jsx
+++ b/src/components/inputs/GenericSearch.jsx
@@ -5,11 +5,11 @@ import TextField from '@mui/material/TextField'
 import IconButton from '@mui/material/IconButton'
 import HighlightOffIcon from '@mui/icons-material/HighlightOff'
 
-import { useDeepStore } from '@hooks/useStorage'
+import { useDeepStore } from '@store/useStorage'
 
 /**
  * @typedef {{
- *  field?: import('@hooks/useStorage').UseStoragePaths,
+ *  field?: import('@store/useStorage').UseStoragePaths,
  *  value?: string,
  *  setValue?: (value: string) => void,
  *  label?: string,
diff --git a/src/components/inputs/LocaleSelection.jsx b/src/components/inputs/LocaleSelection.jsx
new file mode 100644
index 000000000..805406a49
--- /dev/null
+++ b/src/components/inputs/LocaleSelection.jsx
@@ -0,0 +1,75 @@
+// @ts-check
+import * as React from 'react'
+import { useTranslation } from 'react-i18next'
+import MenuItem from '@mui/material/MenuItem'
+import Typography from '@mui/material/Typography'
+import PermIdentityIcon from '@mui/icons-material/PermIdentity'
+import PrecisionManufacturingIcon from '@mui/icons-material/PrecisionManufacturing'
+import RuleIcon from '@mui/icons-material/Rule'
+import ClearIcon from '@mui/icons-material/Clear'
+import CheckIcon from '@mui/icons-material/Check'
+
+import { useStorage } from '@store/useStorage'
+
+import { FCSelect } from './FCSelect'
+
+const human = <PermIdentityIcon fontSize="small" color="info" />
+const ai = <PrecisionManufacturingIcon fontSize="small" color="error" />
+const partial = <RuleIcon fontSize="small" color="warning" />
+const error = <ClearIcon fontSize="small" color="error" />
+const success = <CheckIcon fontSize="small" color="success" />
+
+export function LocaleSelection() {
+  const { t, i18n } = useTranslation()
+  const selectRef = React.useRef(/** @type {HTMLDivElement | null} */ (null))
+
+  return (
+    <FCSelect
+      ref={selectRef}
+      renderValue={(v) => t(`locale_selection_${v}`)}
+      label={t('locale_selection')}
+      value={i18n.language}
+      onChange={(event) => {
+        i18n.changeLanguage(event.target.value)
+        useStorage.setState((prev) => ({
+          settings: { ...prev.settings, locale: event.target.value },
+        }))
+      }}
+    >
+      {CONFIG.client.locales.map((option) => {
+        const status = CONFIG.client.localeStatus[option]
+        return (
+          <MenuItem
+            key={option}
+            value={option}
+            dense
+            className="flex-center"
+            sx={{
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'flex-start',
+              whiteSpace: 'normal',
+              width: selectRef.current?.clientWidth || 'auto',
+            }}
+          >
+            {t(`locale_selection_${option}`)}
+            <Typography
+              variant="caption"
+              className="flex-center"
+              justifyContent="space-between"
+              width="100%"
+            >
+              {status.total === 100
+                ? success
+                : status.total > 50
+                ? partial
+                : error}
+              &nbsp;{status.total}%&nbsp;{human}&nbsp;{status.human}
+              %&nbsp;{ai}&nbsp;{status.ai}%
+            </Typography>
+          </MenuItem>
+        )
+      })}
+    </FCSelect>
+  )
+}
diff --git a/src/components/layout/drawer/MultiSelector.jsx b/src/components/inputs/MultiSelector.jsx
similarity index 86%
rename from src/components/layout/drawer/MultiSelector.jsx
rename to src/components/inputs/MultiSelector.jsx
index f80c59146..0de44ccd4 100644
--- a/src/components/layout/drawer/MultiSelector.jsx
+++ b/src/components/inputs/MultiSelector.jsx
@@ -1,8 +1,10 @@
 // @ts-check
 import * as React from 'react'
-import { ButtonGroup, Button } from '@mui/material'
+import Button from '@mui/material/Button'
+import ButtonGroup from '@mui/material/ButtonGroup'
 import { useTranslation } from 'react-i18next'
-import { useDeepStore } from '@hooks/useStorage'
+
+import { useDeepStore } from '@store/useStorage'
 
 const SX = /** @type {import('@mui/material').SxProps} */ ({ mx: 'auto' })
 
@@ -29,8 +31,8 @@ export function MultiSelector({ items, value, disabled, onClick, tKey }) {
 }
 
 /**
- * @template {import('@hooks/useStorage').UseStoragePaths} T
- * @template {import('@rm/types').ConfigPathValue<import('@hooks/useStorage').UseStorage, T>} V
+ * @template {import('@store/useStorage').UseStoragePaths} T
+ * @template {import('@rm/types').ConfigPathValue<import('@store/useStorage').UseStorage, T>} V
  * @param {{
  *  field: T,
  *  defaultValue?: V,
diff --git a/src/components/layout/dialogs/filters/SliderTile.jsx b/src/components/inputs/SliderTile.jsx
similarity index 97%
rename from src/components/layout/dialogs/filters/SliderTile.jsx
rename to src/components/inputs/SliderTile.jsx
index 81521d662..09e3be395 100644
--- a/src/components/layout/dialogs/filters/SliderTile.jsx
+++ b/src/components/inputs/SliderTile.jsx
@@ -6,7 +6,8 @@ import TextField from '@mui/material/TextField'
 import Slider from '@mui/material/Slider'
 import { styled } from '@mui/material/styles'
 import { useTranslation } from 'react-i18next'
-import { ToggleTypography } from '@components/layout/general/ToggleTypography'
+
+import { ToggleTypography } from '@components/ToggleTypography'
 import { MIN_MAX } from '@assets/constants'
 
 const StyledTextField =
@@ -25,7 +26,7 @@ const StyledSlider = styled(Slider)(() => ({ width: '100%' }))
  * @typedef {('' | number)[]} Value
  * @param {import('@rm/types').RMSliderProps} props
  */
-export default function SliderTile({
+export function SliderTile({
   slide: {
     name,
     min,
diff --git a/src/components/layout/general/ThemeToggle.jsx b/src/components/inputs/ThemeToggle.jsx
similarity index 86%
rename from src/components/layout/general/ThemeToggle.jsx
rename to src/components/inputs/ThemeToggle.jsx
index 0982d4440..a1f4e9c10 100644
--- a/src/components/layout/general/ThemeToggle.jsx
+++ b/src/components/inputs/ThemeToggle.jsx
@@ -4,12 +4,13 @@ import IconButton from '@mui/material/IconButton'
 import useTheme from '@mui/material/styles/useTheme'
 import DarkModeIcon from '@mui/icons-material/DarkMode'
 import LightModeIcon from '@mui/icons-material/LightMode'
-import { useStorage } from '@hooks/useStorage'
+
+import { useStorage } from '@store/useStorage'
 
 const handleClick = () =>
   useStorage.setState((prev) => ({ darkMode: !prev.darkMode }))
 
-export default function ThemeToggle() {
+export function ThemeToggle() {
   const theme = useTheme()
 
   return (
diff --git a/src/components/layout/Nav.jsx b/src/components/layout/Nav.jsx
deleted file mode 100644
index 6b2b740fc..000000000
--- a/src/components/layout/Nav.jsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import * as React from 'react'
-
-import { useMemory } from '@hooks/useMemory'
-
-import { FloatingButtonsMemo } from './FloatingBtn'
-import Sidebar from './drawer/Drawer'
-import FilterMenu from './dialogs/filters/FilterMenu'
-import UserOptions from './dialogs/UserOptions'
-import Tutorial from './dialogs/tutorial/Tutorial'
-import UserProfile from './dialogs/profile'
-import Search from './dialogs/search'
-import MessageOfTheDay from './dialogs/Motd'
-import DonorPage from './dialogs/DonorPage'
-import Feedback from './dialogs/Feedback'
-import ResetFilters from './dialogs/ResetFilters'
-import ScanDialog from './dialogs/scanner/ScanDialog'
-import Webhook from './dialogs/webhooks/Webhook'
-import ClientError from './dialogs/ClientError'
-import { WebhookNotification } from './dialogs/webhooks/Notification'
-import AdvancedFilter from './dialogs/filters/Advanced'
-import BadgeSelection from './dialogs/BadgeSelection'
-import WebhookAdvanced from './dialogs/webhooks/WebhookAdv'
-import SlotSelection from './dialogs/filters/SlotSelection'
-import { HelpDialog } from './dialogs/Help'
-import { PkmnFilterHelp } from './dialogs/filters/PkmnFilterHelp'
-
-export const Nav = React.memo(
-  () => {
-    const iconsIsReady = useMemory((s) => !!s.Icons)
-    return (
-      <>
-        <ClientError />
-        {iconsIsReady && (
-          <>
-            <Sidebar />
-            <FloatingButtonsMemo />
-            <UserProfile />
-            <Tutorial />
-            <FilterMenu />
-            <UserOptions />
-            <Webhook />
-            <Search />
-            <MessageOfTheDay />
-            <DonorPage />
-            <Feedback />
-            <ResetFilters />
-            <ScanDialog />
-            <WebhookNotification />
-            <AdvancedFilter />
-            <BadgeSelection />
-            <WebhookAdvanced />
-            <SlotSelection />
-            <HelpDialog />
-            <PkmnFilterHelp />
-          </>
-        )}
-      </>
-    )
-  },
-  () => true,
-)
diff --git a/src/components/layout/dialogs/UserOptions.jsx b/src/components/layout/dialogs/UserOptions.jsx
deleted file mode 100644
index da0bd7714..000000000
--- a/src/components/layout/dialogs/UserOptions.jsx
+++ /dev/null
@@ -1,205 +0,0 @@
-import * as React from 'react'
-import {
-  Switch,
-  Input,
-  DialogContent,
-  List,
-  ListItem,
-  ListItemText,
-} from '@mui/material'
-import { useTranslation, Trans } from 'react-i18next'
-
-import Utility from '@services/Utility'
-import { useMemory } from '@hooks/useMemory'
-import { toggleDialog, useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import { getPermission } from '@services/desktopNotification'
-
-import Header from '../general/Header'
-import Footer from '../general/Footer'
-import { DialogWrapper } from './DialogWrapper'
-
-function InputType({ option, subOption, localState, handleChange, category }) {
-  const staticUserSettings = useMemory.getState().clientMenus[category] || {}
-  const fullOption = subOption
-    ? staticUserSettings[option].sub[subOption]
-    : staticUserSettings[option]
-
-  switch (fullOption.type) {
-    case 'bool':
-      return (
-        <Switch
-          color="secondary"
-          checked={!!localState?.[subOption || option] || false}
-          name={subOption || option}
-          onChange={handleChange}
-          disabled={fullOption.disabled}
-        />
-      )
-    default:
-      return (
-        <Input
-          color="secondary"
-          id={subOption || option}
-          label={subOption || option}
-          name={subOption || option}
-          style={{ width: 50 }}
-          value={localState?.[subOption || option] || ''}
-          onChange={handleChange}
-          variant="outlined"
-          size="small"
-          type={fullOption.type}
-          disabled={fullOption.disabled}
-          endAdornment={fullOption.label || ''}
-          inputProps={{
-            min: fullOption.min || 0,
-            max: fullOption.max || 100,
-          }}
-        />
-      )
-  }
-}
-
-const MemoInputType = React.memo(
-  InputType,
-  (prev, next) =>
-    prev.localState?.[prev.subOption || prev.option] ===
-    next.localState?.[next.subOption || next.option],
-)
-
-function UserOptions() {
-  const { t } = useTranslation()
-  const { open, category, type } = useLayoutStore((s) => s.dialog)
-
-  const staticUserSettings = useMemory((s) => s.clientMenus[category] || {})
-  const userSettings = useStorage((s) => s.userSettings)
-
-  const [localState, setLocalState] = React.useState(userSettings[category])
-
-  const handleChange = (event) => {
-    const { name, value, checked, type: eType } = event.target
-    if (eType === 'checkbox') {
-      setLocalState((prev) => ({ ...prev, [name]: checked }))
-    } else if (value) {
-      setLocalState((prev) => ({ ...prev, [name]: value }))
-    } else {
-      setLocalState((prev) => ({ ...prev, [name]: !localState[name] }))
-    }
-    Utility.analytics(
-      'User Options',
-      `Name: ${name} New Value: ${value || !localState[name]}`,
-      category,
-    )
-  }
-
-  const getLabel = (label) => {
-    if (label.startsWith('pvp') && !label.includes('Mega')) {
-      return <Trans i18nKey="pvp_level">{{ level: label.substring(3) }}</Trans>
-    }
-    return t(Utility.camelToSnake(label), Utility.getProperName(label))
-  }
-
-  const footerOptions = React.useMemo(
-    () =>
-      /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
-        {
-          name: 'reset',
-          action: () => {
-            const newSettings = { ...userSettings[category] }
-            Object.entries(staticUserSettings || {}).forEach(([key, value]) => {
-              if (value.sub) {
-                Object.entries(value.sub).forEach(([subKey, subValue]) => {
-                  newSettings[subKey] = subValue.value
-                })
-              } else {
-                newSettings[key] = value.value
-              }
-            })
-            setLocalState(newSettings)
-          },
-          icon: 'Replay',
-          color: 'primary',
-        },
-        {
-          name: 'save',
-          action: toggleDialog(false, category, 'options', localState),
-          icon: 'Save',
-          color: 'secondary',
-        },
-      ]),
-    [category, userSettings, staticUserSettings, localState],
-  )
-
-  React.useEffect(() => {
-    setLocalState(userSettings[category])
-  }, [category, userSettings[category]])
-
-  return (
-    <DialogWrapper
-      open={open && type === 'options'}
-      maxWidth="md"
-      onClose={toggleDialog(false, category, type)}
-      fullWidth={false}
-    >
-      <Header
-        titles={[`${Utility.camelToSnake(category)}_options`]}
-        action={toggleDialog(false, category, 'options')}
-      />
-      <DialogContent sx={{ minWidth: 'min(100vw, 350px)' }}>
-        <List>
-          {category === 'notifications' && (
-            <ListItem>
-              <ListItemText primaryTypographyProps={{ variant: 'h6' }}>
-                {t('notifications_status')}: {t(getPermission())}
-              </ListItemText>
-            </ListItem>
-          )}
-          {Object.entries(staticUserSettings).map(([option, values]) => (
-            <React.Fragment key={option}>
-              <ListItem
-                key={option}
-                disableGutters
-                disablePadding
-                style={{ minHeight: 38 }}
-              >
-                <ListItemText
-                  primary={getLabel(option)}
-                  primaryTypographyProps={{
-                    style: { maxWidth: '80%' },
-                  }}
-                />
-                <MemoInputType
-                  option={option}
-                  localState={localState}
-                  handleChange={handleChange}
-                  category={category}
-                />
-              </ListItem>
-              {values.sub &&
-                Object.keys(values.sub).map((subOption) => (
-                  <ListItem
-                    key={subOption}
-                    disableGutters
-                    disablePadding
-                    style={{ minHeight: 38 }}
-                  >
-                    <ListItemText primary={getLabel(subOption)} />
-                    <MemoInputType
-                      option={option}
-                      subOption={subOption}
-                      localState={localState}
-                      handleChange={handleChange}
-                      category={category}
-                    />
-                  </ListItem>
-                ))}
-            </React.Fragment>
-          ))}
-        </List>
-      </DialogContent>
-      <Footer options={footerOptions} />
-    </DialogWrapper>
-  )
-}
-
-export default React.memo(UserOptions)
diff --git a/src/components/layout/dialogs/filters/FilterMenu.jsx b/src/components/layout/dialogs/filters/FilterMenu.jsx
deleted file mode 100644
index c6c6e246e..000000000
--- a/src/components/layout/dialogs/filters/FilterMenu.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import Menu from '@components/layout/general/Menu'
-
-import { toggleDialog, useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import { StandardItem } from '@components/layout/drawer/SelectorItem'
-
-import { DialogWrapper } from '../DialogWrapper'
-
-export default function FilterMenu() {
-  const { open, category, type } = useLayoutStore((s) => s.dialog)
-  const filters = useStorage((s) => s.filters?.[category])
-
-  const [tempFilters, setTempFilters] = React.useState(filters?.filter)
-
-  const extraButtons = React.useMemo(
-    () =>
-      /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
-        {
-          name: 'close',
-          action: toggleDialog(false, category, 'filters'),
-          color: 'secondary',
-        },
-      ]),
-    [category],
-  )
-
-  React.useEffect(() => {
-    setTempFilters(filters?.filter)
-  }, [category, filters?.filter])
-
-  if (!category || !type) return null
-  return (
-    <DialogWrapper
-      open={open && type === 'filters' && !!tempFilters}
-      onClose={toggleDialog(false, category, type)}
-      maxWidth="md"
-    >
-      <Menu
-        category={category}
-        title={`${category}_filters`}
-        titleAction={toggleDialog(false, category, 'filters')}
-        tempFilters={tempFilters}
-        extraButtons={extraButtons}
-      >
-        {(_, key) => <StandardItem id={key} category={category} caption />}
-      </Menu>
-    </DialogWrapper>
-  )
-}
diff --git a/src/components/layout/dialogs/filters/MenuTile.jsx b/src/components/layout/dialogs/filters/MenuTile.jsx
deleted file mode 100644
index c203c4fa7..000000000
--- a/src/components/layout/dialogs/filters/MenuTile.jsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import React, { useState } from 'react'
-import Check from '@mui/icons-material/Check'
-import Clear from '@mui/icons-material/Clear'
-import Tune from '@mui/icons-material/Tune'
-import FormatSize from '@mui/icons-material/FormatSize'
-import Settings from '@mui/icons-material/Settings'
-import { Grid, IconButton, Typography } from '@mui/material'
-import Utility from '@services/Utility'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-
-export default function MenuTile({ data, rowIndex, columnIndex, style }) {
-  const [name, setName] = useState(true)
-  const {
-    tileItem,
-    columnCount,
-    tempFilters,
-    setTempFilters,
-    isMobile,
-    type,
-    toggleSlotsMenu,
-    standard,
-    Icons,
-  } = data
-
-  const item = tileItem[rowIndex * columnCount + columnIndex]
-
-  if (!item) {
-    return ''
-  }
-
-  const handleFilterChange = () => {
-    const newFilter = tempFilters[item.id]
-      ? { ...tempFilters[item.id], enabled: !tempFilters[item.id].enabled }
-      : { ...standard, enabled: true }
-    setTempFilters({
-      ...tempFilters,
-      [item.id]: newFilter,
-    })
-    Utility.analytics(
-      'Filtering',
-      `${item.name} Status: ${!tempFilters[item.id]?.enabled}`,
-      type,
-    )
-  }
-
-  const image =
-    item.id.startsWith('a') || item.id.startsWith('f') ? (
-      <div style={{ position: 'relative' }}>
-        <img
-          alt={item.url}
-          src={item.url}
-          style={{
-            maxHeight: isMobile ? 50 : 75,
-            maxWidth: isMobile ? 50 : 75,
-          }}
-        />
-        <img
-          alt="shadow"
-          style={{
-            height: isMobile ? 30 : 40,
-            width: isMobile ? 30 : 40,
-            position: 'absolute',
-            bottom: 0,
-            left: isMobile ? 'auto' : 0,
-          }}
-          src={Icons.getMisc(item.id.startsWith('a') ? 'shadow' : 'showcase')}
-        />
-      </div>
-    ) : (
-      <img
-        className="grid-item"
-        alt={item.url}
-        src={item.url}
-        style={{
-          maxHeight: isMobile ? 50 : 75,
-          maxWidth: isMobile ? 50 : 75,
-        }}
-        onClick={handleFilterChange}
-      />
-    )
-  const selection = (
-    <IconButton onClick={handleFilterChange} size="large">
-      {tempFilters[item.id]?.enabled ? (
-        <Check color="success" />
-      ) : (
-        <Clear color="error" />
-      )}
-    </IconButton>
-  )
-
-  const getAdvMenuIcon = () => {
-    if (type === 'pokemon') {
-      return <Tune />
-    }
-    if (
-      (type === 'pokestops' &&
-        !item.id.startsWith('l') &&
-        !item.id.startsWith('i')) ||
-      (item.id.startsWith('t') && parseInt(item.id.charAt(1)) > 0)
-    ) {
-      return <Settings />
-    }
-    return <FormatSize />
-  }
-  const advMenu = (
-    <IconButton
-      onClick={
-        item.id.startsWith('t') && parseInt(item.id.charAt(1)) > 0
-          ? toggleSlotsMenu(true, item.id.charAt(1))
-          : () =>
-              useLayoutStore.setState({
-                advancedFilter: {
-                  id: item.id,
-                  open: true,
-                  category: type,
-                  selectedIds: [],
-                },
-              })
-      }
-      size="large"
-    >
-      {getAdvMenuIcon()}
-    </IconButton>
-  )
-
-  const nameTitle = (
-    <Typography
-      variant="subtitle2"
-      align="center"
-      noWrap={name}
-      onClick={() => setName(!name)}
-    >
-      {item.name}
-    </Typography>
-  )
-
-  return (
-    <Grid
-      style={{
-        ...style,
-        backgroundColor: Utility.getTileBackground(columnIndex, rowIndex),
-        textAlign: 'center',
-      }}
-      container
-      justifyContent="center"
-      alignItems="center"
-      spacing={isMobile ? 2 : 0}
-    >
-      <Grid item xs={3} sm={7}>
-        {image}
-      </Grid>
-      <Grid item xs={5}>
-        {isMobile ? nameTitle : selection}
-        {!isMobile && advMenu}
-      </Grid>
-      <Grid item xs={2} sm={12}>
-        {isMobile ? advMenu : nameTitle}
-      </Grid>
-      {isMobile && (
-        <Grid item xs={2}>
-          {selection}
-        </Grid>
-      )}
-    </Grid>
-  )
-}
diff --git a/src/components/layout/dialogs/filters/Options.jsx b/src/components/layout/dialogs/filters/Options.jsx
deleted file mode 100644
index 1f02a1601..000000000
--- a/src/components/layout/dialogs/filters/Options.jsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React from 'react'
-import ExpandMore from '@mui/icons-material/ExpandMore'
-import Typography from '@mui/material/Typography'
-import Accordion from '@mui/material/Accordion'
-import AccordionSummary from '@mui/material/AccordionSummary'
-import AccordionDetails from '@mui/material/AccordionDetails'
-import FormControl from '@mui/material/FormControl'
-import FormGroup from '@mui/material/FormGroup'
-import FormControlLabel from '@mui/material/FormControlLabel'
-import Checkbox from '@mui/material/Checkbox'
-import { useTranslation } from 'react-i18next'
-
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-
-const handleChange = (category, subCategory) => (event) => {
-  Utility.analytics(
-    'Filtering Options',
-    `New Value: ${event.target.checked}`,
-    `Category: ${category} Name: ${subCategory}.${event.target.name}`,
-  )
-  useStorage.setState((prev) => ({
-    menus: {
-      ...prev.menus,
-      [category]: {
-        ...prev.menus[category],
-        filters: {
-          ...prev.menus[category].filters,
-          [subCategory]: {
-            ...prev.menus[category].filters[subCategory],
-            [event.target.name]: event.target.checked,
-          },
-        },
-      },
-    },
-  }))
-}
-
-const handleAccordion = (category, subCategory) => (event, isExpanded) => {
-  useStorage.setState((prev) => ({
-    advMenu: { ...prev.advMenu, [category]: isExpanded ? subCategory : false },
-  }))
-}
-
-export function OptionCheckbox({ category, subCategory, option }) {
-  const { t } = useTranslation()
-
-  const checked = useStorage(
-    (state) => state.menus[category].filters[subCategory][option] || false,
-  )
-
-  return (
-    <FormControlLabel
-      control={
-        <Checkbox
-          checked={checked}
-          onChange={handleChange(category, subCategory)}
-          name={option}
-        />
-      }
-      value={option}
-      label={t(Utility.camelToSnake(option))}
-    />
-  )
-}
-
-const OptionsCheckboxMemo = React.memo(OptionCheckbox, () => true)
-
-export default function OptionsGroup({ category, subCategory }) {
-  const { t } = useTranslation()
-  const options = useMemory((s) =>
-    Object.keys(s.menus[category].filters[subCategory] || {}),
-  )
-  const expanded = useStorage((s) => s.advMenu[category] === subCategory)
-
-  return (
-    <Accordion
-      expanded={expanded}
-      onChange={handleAccordion(category, subCategory)}
-    >
-      <AccordionSummary expandIcon={<ExpandMore />}>
-        <Typography>{t(Utility.camelToSnake(subCategory))}</Typography>
-      </AccordionSummary>
-      <AccordionDetails>
-        <FormControl component="fieldset">
-          <FormGroup>
-            {options.map((option) => (
-              <OptionsCheckboxMemo
-                key={`${category}-${subCategory}-${option}`}
-                category={category}
-                subCategory={subCategory}
-                option={option}
-              />
-            ))}
-          </FormGroup>
-        </FormControl>
-      </AccordionDetails>
-    </Accordion>
-  )
-}
diff --git a/src/components/layout/dialogs/filters/QuestConditions.jsx b/src/components/layout/dialogs/filters/QuestConditions.jsx
deleted file mode 100644
index 67df5f22b..000000000
--- a/src/components/layout/dialogs/filters/QuestConditions.jsx
+++ /dev/null
@@ -1,114 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import ListItem from '@mui/material/ListItem'
-import { useTranslation } from 'react-i18next'
-import { useMemory } from '@hooks/useMemory'
-import { useDeepStore, useStorage } from '@hooks/useStorage'
-import { FormControl, InputLabel, Select, MenuItem } from '@mui/material'
-import Typography from '@mui/material/Typography'
-import QuestTitle from '@components/layout/general/QuestTitle'
-
-/**
- *
- * @param {{ id: string }} props
- * @returns
- */
-export function QuestConditionSelector({ id }) {
-  const { t } = useTranslation()
-  const [value, setValue] = useDeepStore(
-    `filters.pokestops.filter.${id}.adv`,
-    '',
-  )
-  const all = useStorage((s) => !!s.filters.pokestops.filter[id].all)
-  const questConditions = useMemory((s) => s.available.questConditions[id])
-  const hasQuests = useMemory((s) => s.ui.pokestops?.quests)
-
-  const [open, setOpen] = React.useState(false)
-
-  // Provides a reset if that condition is no longer available
-  React.useEffect(() => {
-    if (hasQuests) {
-      // user has quest permissions
-      if (!questConditions && value) {
-        // condition is no longer available
-        setValue('')
-      } else {
-        // check if the value is still valid
-        const filtered = questConditions
-          ? value
-              .split(',')
-              .filter((each) =>
-                questConditions.find(({ title }) => title === each),
-              )
-          : []
-        setValue(filtered.length ? filtered.join(',') : '')
-      }
-    } else {
-      // user does not have quest permissions
-      setValue('')
-    }
-  }, [questConditions, id, hasQuests])
-
-  const handleClose = () => {
-    setOpen(false)
-  }
-
-  const handleOpen = () => {
-    setOpen(true)
-  }
-
-  if (!questConditions) return null
-
-  return (
-    <ListItem>
-      <FormControl variant="outlined" size="small" fullWidth sx={{ my: 1 }}>
-        <InputLabel>{t('quest_condition')}</InputLabel>
-        <Select
-          name="adv"
-          value={value.split(',')}
-          disabled={all}
-          fullWidth
-          open={open}
-          onOpen={handleOpen}
-          onClose={handleClose}
-          multiple
-          renderValue={(selected) =>
-            Array.isArray(selected)
-              ? `${selected.length} ${t('selected')}`
-              : selected
-          }
-          size="small"
-          label={t('quest_condition')}
-          onChange={(e, child) => {
-            if (
-              typeof child === 'object' &&
-              'props' in child &&
-              child.props.value === ''
-            ) {
-              setValue('')
-              handleClose()
-            } else {
-              setValue(
-                Array.isArray(e.target.value)
-                  ? e.target.value.filter(Boolean).join(',')
-                  : e.target.value,
-              )
-            }
-          }}
-        >
-          <MenuItem value="">
-            <Typography variant="caption">{t('all')}</Typography>
-          </MenuItem>
-          {questConditions
-            .slice()
-            .sort((a, b) => a.title.localeCompare(b.title))
-            .map(({ title, target }) => (
-              <MenuItem key={`${title}-${target}`} value={title}>
-                <QuestTitle questTitle={title} questTarget={target} />
-              </MenuItem>
-            ))}
-        </Select>
-      </FormControl>
-    </ListItem>
-  )
-}
diff --git a/src/components/layout/dialogs/webhooks/Notification.jsx b/src/components/layout/dialogs/webhooks/Notification.jsx
deleted file mode 100644
index 0944db2df..000000000
--- a/src/components/layout/dialogs/webhooks/Notification.jsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import Notification from '@components/layout/general/Notification'
-
-import { resetAlert, useWebhookStore } from './store'
-
-export function WebhookNotification() {
-  const webhookAlert = useWebhookStore((s) => s.alert)
-  return (
-    <Notification
-      open={!!webhookAlert.open}
-      cb={resetAlert}
-      severity={webhookAlert.severity}
-    >
-      {webhookAlert.message}
-    </Notification>
-  )
-}
diff --git a/src/components/layout/dialogs/webhooks/human/area/AreaChip.jsx b/src/components/layout/dialogs/webhooks/human/area/AreaChip.jsx
deleted file mode 100644
index 0edfaa277..000000000
--- a/src/components/layout/dialogs/webhooks/human/area/AreaChip.jsx
+++ /dev/null
@@ -1,92 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import Done from '@mui/icons-material/Done'
-import Clear from '@mui/icons-material/Clear'
-import Chip from '@mui/material/Chip'
-import { apolloClient } from '@services/apollo'
-import { WEBHOOK_AREAS, setHuman } from '@services/queries/webhook'
-
-import { useWebhookStore } from '../../store'
-
-/** @param {string} areaName @param {string} [groupName] */
-export const handleClick =
-  (areaName, groupName = '') =>
-  async () => {
-    /** @type {{ group: string, children: string[] }[]} */
-    const areas =
-      apolloClient.cache.readQuery({
-        query: WEBHOOK_AREAS,
-      }).webhookAreas || []
-    const incomingArea = areaName.toLowerCase()
-    const { human } = useWebhookStore.getState()
-    const existing = human.area || []
-    const foundGroup = areas.find((group) => group.group === groupName) || {
-      children: [],
-      group: '',
-    }
-    const withLowerCase = {
-      group: foundGroup.group,
-      children: foundGroup.children.map((a) => a.toLowerCase()),
-    }
-
-    let newAreas = []
-    if (incomingArea === 'all') {
-      newAreas = withLowerCase.group
-        ? [...existing, ...withLowerCase.children]
-        : areas.flatMap((group) => group.children)
-    } else if (incomingArea === 'none') {
-      newAreas = groupName
-        ? existing.filter((a) => !withLowerCase.children.includes(a))
-        : []
-    } else {
-      newAreas = existing.includes(incomingArea)
-        ? existing.filter((a) => a !== incomingArea)
-        : [...existing, incomingArea]
-    }
-    newAreas = [...new Set(newAreas)]
-
-    await apolloClient
-      .mutate({
-        mutation: setHuman,
-        variables: {
-          category: 'setAreas',
-          data: newAreas,
-          status: 'POST',
-        },
-      })
-      .then(({ data }) => {
-        if (data?.webhook?.human) {
-          useWebhookStore.setState({ human: data.webhook.human })
-        }
-      })
-    return newAreas
-  }
-
-const ICON = {
-  true: <Done />,
-  false: <Clear />,
-}
-
-const AreaChip = ({ name }) => {
-  const selected = useWebhookStore((s) =>
-    s.human.area.includes(name.toLowerCase()),
-  )
-  return (
-    <Chip
-      label={name}
-      clickable
-      variant={selected ? 'filled' : 'outlined'}
-      deleteIcon={ICON[selected]}
-      size="small"
-      color={selected ? 'secondary' : 'primary'}
-      onClick={handleClick(name)}
-      onDelete={handleClick(name)}
-      style={{ margin: 3 }}
-    />
-  )
-}
-
-export const MemoAreaChip = React.memo(
-  AreaChip,
-  (prev, next) => prev.name === next.name,
-)
diff --git a/src/components/layout/dialogs/webhooks/human/area/AreaGroup.jsx b/src/components/layout/dialogs/webhooks/human/area/AreaGroup.jsx
deleted file mode 100644
index cb673710a..000000000
--- a/src/components/layout/dialogs/webhooks/human/area/AreaGroup.jsx
+++ /dev/null
@@ -1,88 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import Grid2 from '@mui/material/Unstable_Grid2'
-import Typography from '@mui/material/Typography'
-import Divider from '@mui/material/Divider'
-import Button from '@mui/material/Button'
-import { useTranslation } from 'react-i18next'
-
-import { Loading } from '@components/layout/general/Loading'
-
-import { useGetAreas } from '../../hooks'
-import { MemoAreaChip, handleClick } from './AreaChip'
-
-export const AreaGroup = () => {
-  const { data, loading } = useGetAreas()
-  const { t } = useTranslation()
-
-  return loading ? (
-    <Loading>{t('loading', { category: t('areas') })}</Loading>
-  ) : (
-    data.map(({ group, children }) => (
-      <GroupTile key={group} group={group}>
-        {children.map((child) => (
-          <MemoAreaChip key={`${group}_${child}`} name={child} />
-        ))}
-      </GroupTile>
-    ))
-  )
-}
-
-/**
- *
- * @param {{ group: string, children: React.ReactNode[] }} props
- * @returns
- */
-const GroupTile = ({ group, children }) => {
-  const { t } = useTranslation()
-  if (children.length === 0) return null
-  return (
-    <Grid2 container xs={12}>
-      <Divider
-        flexItem
-        style={{ margin: '20px 0', width: '100%', height: 2 }}
-      />
-      <Grid2 xs={group ? 4 : 12} textAlign="center">
-        <Typography variant="h4" gutterBottom>
-          {group}
-        </Typography>
-      </Grid2>
-      {group && (
-        <Grid2 xs={4} textAlign="center">
-          <AreaAction action="none" group={group} color="primary">
-            {t('disable_all')}
-          </AreaAction>
-        </Grid2>
-      )}
-      {group && (
-        <Grid2 xs={4} textAlign="center">
-          <AreaAction action="all" group={group} color="secondary">
-            {t('enable_all')}
-          </AreaAction>
-        </Grid2>
-      )}
-      {children}
-    </Grid2>
-  )
-}
-
-/**
- *
- * @param {{
- *  action: string,
- *  children: React.ReactNode,
- *  color: import('@mui/material').ButtonProps['color']
- *  group?: string
- * }} props
- * @returns
- */
-export const AreaAction = ({ action, children, color, group }) => (
-  <Button
-    size="small"
-    variant="contained"
-    color={color}
-    onClick={handleClick(action, group)}
-  >
-    {children}
-  </Button>
-)
diff --git a/src/components/layout/dialogs/webhooks/human/area/Selected.jsx b/src/components/layout/dialogs/webhooks/human/area/Selected.jsx
deleted file mode 100644
index d03de6589..000000000
--- a/src/components/layout/dialogs/webhooks/human/area/Selected.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import Typography from '@mui/material/Typography'
-import { Trans } from 'react-i18next'
-import { useWebhookStore } from '../../store'
-
-export const Selected = () => {
-  const selectedAreas = useWebhookStore((s) => s.human.area || [])
-  return (
-    <Typography variant="h6" align="center">
-      <Trans i18nKey="selected_areas" count={selectedAreas.length}>
-        {{ amount: selectedAreas.length }}
-      </Trans>
-    </Typography>
-  )
-}
diff --git a/src/components/layout/dialogs/webhooks/human/status/HookSelection.jsx b/src/components/layout/dialogs/webhooks/human/status/HookSelection.jsx
deleted file mode 100644
index 535108834..000000000
--- a/src/components/layout/dialogs/webhooks/human/status/HookSelection.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import Select from '@mui/material/Select'
-import MenuItem from '@mui/material/MenuItem'
-import InputLabel from '@mui/material/InputLabel'
-import FormControl from '@mui/material/FormControl'
-import { useTranslation } from 'react-i18next'
-import { useMutation } from '@apollo/client'
-
-import {
-  WEBHOOK_AREAS,
-  WEBHOOK_CATEGORIES,
-  WEBHOOK_CHANGE,
-  WEBHOOK_CONTEXT,
-  WEBHOOK_USER,
-  allProfiles,
-} from '@services/queries/webhook'
-import { Loading } from '@components/layout/general/Loading'
-
-import { useGetWebhookData } from '../../hooks'
-import { useWebhookStore } from '../../store'
-
-export function HookSelection() {
-  const { t } = useTranslation()
-
-  const {
-    data: { selected, webhooks },
-    loading,
-  } = useGetWebhookData('human')
-  const multipleHooks = useWebhookStore((s) => s.multipleHooks)
-
-  const [save] = useMutation(WEBHOOK_CHANGE, {
-    refetchQueries: [
-      WEBHOOK_CONTEXT,
-      WEBHOOK_USER,
-      WEBHOOK_CATEGORIES,
-      WEBHOOK_AREAS,
-      allProfiles,
-    ],
-    fetchPolicy: 'no-cache',
-  })
-
-  if (!multipleHooks) return null
-
-  return loading ? (
-    <Loading>{t('loading', { category: t('webhooks') })}</Loading>
-  ) : (
-    <FormControl sx={{ m: 1 }}>
-      <InputLabel id="hook-select">{t('select_webhook')}</InputLabel>
-      <Select
-        id="hook-select"
-        label={t('select_webhook')}
-        value={selected}
-        onChange={(e) => {
-          save({ variables: { webhook: e.target.value } }).then(
-            ({ data }) =>
-              data?.webhook?.human &&
-              useWebhookStore.setState({ human: data.webhook.human }),
-          )
-        }}
-        style={{ minWidth: 100 }}
-      >
-        {webhooks.map((webhook) => (
-          <MenuItem key={webhook} value={webhook}>
-            {webhook}
-          </MenuItem>
-        ))}
-      </Select>
-    </FormControl>
-  )
-}
diff --git a/src/components/layout/drawer/Extras.jsx b/src/components/layout/drawer/Extras.jsx
deleted file mode 100644
index 925f440b8..000000000
--- a/src/components/layout/drawer/Extras.jsx
+++ /dev/null
@@ -1,449 +0,0 @@
-/* eslint-disable no-fallthrough */
-/* eslint-disable default-case */
-// @ts-check
-import * as React from 'react'
-import Box from '@mui/material/Box'
-import ListItem from '@mui/material/ListItem'
-import ListItemText from '@mui/material/ListItemText'
-import Select from '@mui/material/Select'
-import MenuItem from '@mui/material/MenuItem'
-import { useTranslation } from 'react-i18next'
-
-import { useMemory } from '@hooks/useMemory'
-import { useStorage, useDeepStore } from '@hooks/useStorage'
-import {
-  BADGES,
-  FORT_LEVELS,
-  QUEST_SETS,
-  S2_LEVELS,
-  ENUM_TTH,
-  WAYFARER_OPTIONS,
-} from '@assets/constants'
-
-import { MultiSelectorStore } from './MultiSelector'
-import SliderTile from '../dialogs/filters/SliderTile'
-import { CollapsibleItem } from './CollapsibleItem'
-import { MultiSelectorList, SelectorListMemo } from './SelectorList'
-import { BoolToggle } from './BoolToggle'
-
-const BaseNestSlider = () => {
-  const slider = useMemory((s) => s.ui.nests?.sliders?.secondary?.[0])
-  const [filters, setFilters] = useDeepStore(`filters.nests.avgFilter`)
-  if (!filters || !slider) return null
-  return (
-    <ListItem>
-      <SliderTile
-        slide={slider}
-        handleChange={(_, values) => setFilters(values)}
-        values={filters}
-      />
-    </ListItem>
-  )
-}
-const NestSlider = React.memo(BaseNestSlider)
-
-const BaseS2Cells = () => {
-  const { t } = useTranslation()
-  const enabled = useStorage((s) => !!s.filters.s2cells.enabled)
-  const [filters, setFilters] = useDeepStore('filters.s2cells.cells')
-  const safe = React.useMemo(
-    () =>
-      Array.isArray(filters)
-        ? filters
-        : typeof filters === 'string'
-        ? // @ts-ignore
-          filters.split(',')
-        : [],
-    [filters],
-  )
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem>
-        <Select
-          sx={{ mx: 'auto', width: '90%' }}
-          value={safe}
-          renderValue={(selected) =>
-            Array.isArray(selected) ? selected.join(', ') : selected
-          }
-          multiple
-          onChange={({ target }) =>
-            setFilters(
-              typeof target.value === 'string'
-                ? target.value.split(',')
-                : target.value,
-            )
-          }
-        >
-          {S2_LEVELS.map((level) => (
-            <MenuItem key={level} value={level}>
-              {t('level')} {level}
-            </MenuItem>
-          ))}
-        </Select>
-      </ListItem>
-    </CollapsibleItem>
-  )
-}
-const S2Cells = React.memo(BaseS2Cells)
-
-/** @param {{ category: 'pokestops' | 'gyms', subItem: string }} props */
-const BaseAllForts = ({ category, subItem }) => {
-  const { t } = useTranslation()
-  const enabled = useStorage((s) => !!s.filters?.[category]?.[subItem])
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem>
-        <ListItemText primary={t('power_up')} />
-        <MultiSelectorStore
-          field={`filters.${category}.levels`}
-          items={FORT_LEVELS}
-        />
-      </ListItem>
-      {category === 'gyms' && (
-        <Box px={2}>
-          <SelectorListMemo category={category} height={175} />
-        </Box>
-      )}
-    </CollapsibleItem>
-  )
-}
-const AllForts = React.memo(BaseAllForts)
-
-const BaseGymBadges = () => {
-  const enabled = useStorage((s) => !!s.filters?.gyms?.gymBadges)
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem>
-        <MultiSelectorStore
-          field="filters.gyms.badge"
-          allowNone
-          items={BADGES}
-        />
-      </ListItem>
-    </CollapsibleItem>
-  )
-}
-const GymBadges = React.memo(BaseGymBadges)
-
-const RaidOverride = () => {
-  const { t } = useTranslation()
-  const available = useMemory((s) => s.available.gyms)
-  const enabled = useStorage((s) => !!s.filters?.gyms?.raids)
-  const [filters, setFilters] = useDeepStore('filters.gyms.raidTier', 'all')
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem
-        secondaryAction={
-          <Select
-            value={filters}
-            fullWidth
-            size="small"
-            onChange={(e) =>
-              setFilters(e.target.value === 'all' ? 'all' : +e.target.value)
-            }
-          >
-            {[
-              'all',
-              ...available
-                .filter((x) => x.startsWith('r'))
-                .map((y) => +y.slice(1)),
-            ].map((tier, i) => (
-              <MenuItem key={tier} dense value={tier}>
-                {t(i ? `raid_${tier}_plural` : 'disabled')}
-              </MenuItem>
-            ))}
-          </Select>
-        }
-      >
-        <ListItemText primary={t('raid_override')} />
-      </ListItem>
-    </CollapsibleItem>
-  )
-}
-
-const RaidQuickSelect = () => {
-  const enabled = useStorage(
-    (s) => !!(s.filters?.gyms?.raids && s.filters?.gyms?.raidTier === 'all'),
-  )
-  return (
-    <CollapsibleItem open={enabled}>
-      <MultiSelectorList tabKey="raids">
-        <SelectorListMemo
-          key="eggs"
-          category="gyms"
-          subCategory="raids"
-          label="search_eggs"
-          height={350}
-        />
-        <SelectorListMemo
-          key="raids"
-          category="gyms"
-          subCategory="pokemon"
-          label="search_raids"
-          height={350}
-        />
-      </MultiSelectorList>
-    </CollapsibleItem>
-  )
-}
-
-const BaseRaids = () => (
-  <>
-    <RaidOverride />
-    <RaidQuickSelect />
-  </>
-)
-const Raids = React.memo(BaseRaids)
-
-const BaseQuestSet = () => {
-  const enabled = useStorage((s) => !!s.filters?.pokestops?.quests)
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem>
-        <MultiSelectorStore
-          field="filters.pokestops.showQuestSet"
-          items={QUEST_SETS}
-        />
-      </ListItem>
-      <MultiSelectorList tabKey="quests">
-        <SelectorListMemo
-          key="items"
-          category="pokestops"
-          subCategory="quests"
-          label="search_quests"
-          height={350}
-        />
-        <SelectorListMemo
-          key="pokemon"
-          category="pokestops"
-          subCategory="pokemon"
-          label="search_quests"
-          height={350}
-        />
-      </MultiSelectorList>
-    </CollapsibleItem>
-  )
-}
-const QuestSet = React.memo(BaseQuestSet)
-
-const BaseInvasion = () => {
-  const enabled = useStorage((s) => !!s.filters?.pokestops?.invasions)
-  const hasConfirmed = useMemory((s) =>
-    s.available.pokestops.some((x) => x.startsWith('a')),
-  )
-  const confirmedEnabled = useStorage((s) => !!s.filters?.pokestops?.confirmed)
-  return (
-    <CollapsibleItem open={enabled}>
-      {(confirmedEnabled || hasConfirmed) && (
-        <BoolToggle
-          inset
-          field="filters.pokestops.confirmed"
-          label="only_confirmed"
-        />
-      )}
-      {confirmedEnabled || hasConfirmed ? (
-        <MultiSelectorList tabKey="invasions">
-          <SelectorListMemo
-            key="invasions"
-            category="pokestops"
-            subCategory="invasions"
-            label="search_invasions"
-            height={350}
-          />
-          <SelectorListMemo
-            key="rocket_pokemon"
-            category="pokestops"
-            subCategory="rocketPokemon"
-            label="search_rocket_pokemon"
-            height={350}
-          />
-        </MultiSelectorList>
-      ) : (
-        <Box px={2}>
-          <SelectorListMemo
-            key="invasions"
-            category="pokestops"
-            subCategory="invasions"
-            label="search_invasions"
-            height={350}
-          />
-        </Box>
-      )}
-    </CollapsibleItem>
-  )
-}
-const Invasion = React.memo(BaseInvasion)
-
-const BaseEventStops = () => {
-  const enabled = useStorage((s) => !!s.filters?.pokestops?.eventStops)
-  return (
-    <CollapsibleItem open={enabled}>
-      <Box px={2}>
-        <SelectorListMemo
-          category="pokestops"
-          subCategory="showcase"
-          height={175}
-        />
-      </Box>
-    </CollapsibleItem>
-  )
-}
-const EventStops = React.memo(BaseEventStops)
-
-/** @param {{ item: (typeof WAYFARER_OPTIONS)[number], index: number, disabled: boolean }} props */
-const WayfarerOption = ({ item, index, disabled }) => {
-  const { t } = useTranslation()
-  return (
-    <BoolToggle
-      field={`filters.submissionCells.${item}`}
-      disabled={disabled}
-      label=""
-    >
-      <ListItemText inset>
-        {index > 1
-          ? t('s2_cell_level', { level: item.substring(1, 3) })
-          : t(index ? 'include_sponsored' : 'poi')}
-      </ListItemText>
-    </BoolToggle>
-  )
-}
-const SubmissionCells = () => {
-  const enabled = useStorage((s) => !!s.filters?.submissionCells?.enabled)
-  return (
-    <CollapsibleItem open={enabled}>
-      {WAYFARER_OPTIONS.map((item, i) => (
-        <WayfarerOption key={item} item={item} index={i} disabled={!enabled} />
-      ))}
-    </CollapsibleItem>
-  )
-}
-const BaseSubmissionCells = React.memo(SubmissionCells)
-
-const BaseRouteSlider = () => {
-  const enabled = useStorage((s) => !!s.filters?.routes?.enabled)
-  const [filters, setFilters] = useDeepStore('filters.routes.distance')
-  const baseDistance = useMemory.getState().filters?.routes?.distance
-
-  /** @type {import('@rm/types').RMSlider} */
-  const slider = React.useMemo(() => {
-    const min = baseDistance?.[0] || 0
-    const max = baseDistance?.[1] || 25
-    return {
-      color: 'secondary',
-      disabled: false,
-      min,
-      max,
-      i18nKey: 'distance',
-      step: 0.5,
-      name: 'distance',
-      label: 'km',
-    }
-  }, [baseDistance])
-
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem>
-        <SliderTile
-          slide={slider}
-          handleChange={(_, values) => setFilters(values)}
-          values={filters}
-        />
-      </ListItem>
-    </CollapsibleItem>
-  )
-}
-const RouteSlider = React.memo(BaseRouteSlider)
-
-const BaseSpawnpointTTH = () => {
-  const enabled = useStorage((s) => !!s.filters?.spawnpoints?.enabled)
-  return (
-    <CollapsibleItem open={enabled}>
-      <ListItem>
-        <MultiSelectorStore
-          field="filters.spawnpoints.tth"
-          items={ENUM_TTH}
-          tKey="tth_"
-        />
-      </ListItem>
-    </CollapsibleItem>
-  )
-}
-const SpawnpointTTH = React.memo(BaseSpawnpointTTH)
-
-const BaseNestQuickSelector = () => {
-  const enabled = useStorage((s) => !!s.filters?.nests?.pokemon)
-  return (
-    <CollapsibleItem open={enabled}>
-      <Box px={2}>
-        <SelectorListMemo category="nests" label="search_nests" height={350} />
-      </Box>
-    </CollapsibleItem>
-  )
-}
-const NestQuickSelector = React.memo(BaseNestQuickSelector)
-
-const BaseLureQuickSelector = () => {
-  const enabled = useStorage((s) => !!s.filters?.pokestops?.lures)
-  return (
-    <CollapsibleItem open={enabled}>
-      <Box px={2}>
-        <SelectorListMemo
-          category="pokestops"
-          subCategory="lures"
-          label="search_lures"
-          height={175}
-        />
-      </Box>
-    </CollapsibleItem>
-  )
-}
-const LureQuickSelector = React.memo(BaseLureQuickSelector)
-
-function Extras({ category, subItem }) {
-  switch (category) {
-    case 'nests':
-      return subItem === 'sliders' ? (
-        <NestSlider />
-      ) : subItem === 'pokemon' ? (
-        <NestQuickSelector />
-      ) : null
-    case 's2cells':
-      return subItem === 'enabled' ? <S2Cells /> : null
-    case 'pokestops':
-      switch (subItem) {
-        case 'allPokestops':
-          return <AllForts category={category} subItem={subItem} />
-        case 'quests':
-          return <QuestSet />
-        case 'invasions':
-          return <Invasion />
-        case 'eventStops':
-          return <EventStops />
-        case 'lures':
-          return <LureQuickSelector />
-      }
-    case 'gyms':
-      switch (subItem) {
-        case 'allGyms':
-          return <AllForts category={category} subItem={subItem} />
-        case 'gymBadges':
-          return <GymBadges />
-        case 'raids':
-          return <Raids />
-      }
-    case 'wayfarer':
-      return subItem === 'submissionCells' ? <BaseSubmissionCells /> : null
-    case 'routes':
-      return subItem === 'enabled' ? <RouteSlider /> : null
-    case 'admin':
-      return subItem === 'spawnpoints' ? <SpawnpointTTH /> : null
-    default:
-      return null
-  }
-}
-
-export default React.memo(
-  Extras,
-  (prev, next) =>
-    prev.category === next.category && prev.subItem === next.subItem,
-)
diff --git a/src/components/layout/drawer/Pokemon.jsx b/src/components/layout/drawer/Pokemon.jsx
deleted file mode 100644
index 30aec3565..000000000
--- a/src/components/layout/drawer/Pokemon.jsx
+++ /dev/null
@@ -1,182 +0,0 @@
-// @ts-check
-/* eslint-disable react/no-unstable-nested-components */
-import * as React from 'react'
-import {
-  Typography,
-  AppBar,
-  Tab,
-  Tabs,
-  List,
-  ListItem,
-  Collapse,
-  Divider,
-  ListSubheader,
-  Select,
-  MenuItem,
-  FormControl,
-  InputLabel,
-} from '@mui/material'
-import { useTranslation } from 'react-i18next'
-import Help from '@mui/icons-material/HelpOutline'
-
-import { useMemory } from '@hooks/useMemory'
-import { useStorage, useDeepStore } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import { XXS_XXL, NUNDO_HUNDO } from '@assets/constants'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-
-import { StringFilterMemo } from '../dialogs/filters/StringFilter'
-import SliderTile from '../dialogs/filters/SliderTile'
-import TabPanel from '../general/TabPanel'
-import { BoolToggle, DualBoolToggle } from './BoolToggle'
-import { GenderListItem } from '../dialogs/filters/Gender'
-import { SelectorListMemo } from './SelectorList'
-import { BasicListButton } from '../general/BasicListButton'
-
-function PokemonDrawer() {
-  const filterMode = useStorage((s) => s.getPokemonFilterMode())
-  const [ivOr, setIvOr] = useDeepStore('filters.pokemon.ivOr')
-  const { t } = useTranslation()
-  const [openTab, setOpenTab] = useDeepStore(`tabs.pokemon`, 0)
-  const ui = useMemory((s) => s.ui.pokemon)
-  const selectRef = React.useRef(/** @type {HTMLDivElement | null} */ (null))
-
-  /** @type {import('@rm/types').RMSliderHandleChange<keyof import('@rm/types').PokemonFilter>} */
-  const handleChange = React.useCallback((name, values) => {
-    if (name in ivOr) {
-      setIvOr(name, values)
-    }
-    Utility.analytics('Global Pokemon', `${name}: ${values}`, `Pokemon Text`)
-  }, [])
-
-  /** @type {import('@mui/material').TabsProps['onChange']} */
-  const handleTabChange = React.useCallback(
-    (_e, newValue) => setOpenTab(newValue),
-    [],
-  )
-
-  return (
-    <>
-      <BoolToggle field="filters.pokemon.enabled" label="enabled" />
-      <ListItem>
-        <FormControl fullWidth>
-          <InputLabel id="pokemon-filter-mode">
-            {t('pokemon_filter_mode')}
-          </InputLabel>
-          <Select
-            ref={selectRef}
-            labelId="pokemon-filter-mode"
-            id="demo-simple-select"
-            value={filterMode}
-            fullWidth
-            size="small"
-            label={t('pokemon_filter_mode')}
-            renderValue={(selected) => t(selected)}
-            onChange={(e) => {
-              const { setPokemonFilterMode } = useStorage.getState()
-              switch (e.target.value) {
-                case 'basic':
-                  return setPokemonFilterMode(false, true)
-                case 'intermediate':
-                  return setPokemonFilterMode(false, false)
-                case 'expert':
-                  return setPokemonFilterMode(true, false)
-                default:
-              }
-            }}
-          >
-            {['basic', 'intermediate', ...(ui.legacy ? ['expert'] : [])].map(
-              (tier) => (
-                <MenuItem
-                  key={tier}
-                  dense
-                  value={tier}
-                  sx={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'flex-start',
-                    whiteSpace: 'normal',
-                    width: selectRef.current?.clientWidth || 'auto',
-                  }}
-                >
-                  <Typography variant="subtitle2">{t(tier)}</Typography>
-                  <Typography variant="caption" flexWrap="wrap">
-                    {t(`${tier}_description`)}
-                  </Typography>
-                </MenuItem>
-              ),
-            )}
-          </Select>
-        </FormControl>
-      </ListItem>
-      <Collapse in={filterMode === 'intermediate'}>
-        <BoolToggle
-          field="userSettings.pokemon.linkGlobalAndAdvanced"
-          label="link_global_and_advanced"
-        />
-      </Collapse>
-      {filterMode === 'expert' && ui.legacy ? (
-        <StringFilterMemo field="filters.pokemon.ivOr" />
-      ) : (
-        <>
-          <AppBar position="static">
-            <Tabs value={openTab} onChange={handleTabChange}>
-              <Tab label={t('main')} />
-              <Tab label={t('extra')} />
-              <Tab label={t('select')} />
-            </Tabs>
-          </AppBar>
-          {Object.entries(ui.sliders).map(([sType, sliders], index) => (
-            <TabPanel value={openTab} index={index} key={sType}>
-              <List>
-                {sliders.map((slider) => (
-                  <ListItem key={slider.name} disablePadding>
-                    <SliderTile
-                      slide={slider}
-                      handleChange={handleChange}
-                      values={ivOr[slider.name]}
-                    />
-                  </ListItem>
-                ))}
-                {index ? (
-                  <DualBoolToggle
-                    items={XXS_XXL}
-                    field="filters.pokemon.ivOr"
-                    label="size_1-size_5"
-                  />
-                ) : (
-                  <>
-                    <GenderListItem
-                      disablePadding
-                      field="filters.pokemon.ivOr"
-                      sx={{ pt: 1 }}
-                    />
-                    <Divider sx={{ mt: 2, mb: 1 }} />
-                    <ListSubheader disableGutters>
-                      {t('quick_select')}
-                    </ListSubheader>
-                    <DualBoolToggle
-                      field="filters.pokemon"
-                      items={NUNDO_HUNDO}
-                    />
-                  </>
-                )}
-              </List>
-            </TabPanel>
-          ))}
-          <TabPanel value={openTab} index={2} disablePadding>
-            <SelectorListMemo category="pokemon" />
-          </TabPanel>
-        </>
-      )}
-      <BasicListButton
-        label="filter_help"
-        onClick={() => useLayoutStore.setState({ pkmnFilterHelp: true })}
-      >
-        <Help />
-      </BasicListButton>
-    </>
-  )
-}
-
-export const PokemonDrawerMemo = React.memo(PokemonDrawer)
diff --git a/src/components/layout/drawer/Settings.jsx b/src/components/layout/drawer/Settings.jsx
deleted file mode 100644
index aa5cf16d7..000000000
--- a/src/components/layout/drawer/Settings.jsx
+++ /dev/null
@@ -1,250 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import FormControl from '@mui/material/FormControl'
-import InputLabel from '@mui/material/InputLabel'
-import ListItem from '@mui/material/ListItem'
-import ListItemIcon from '@mui/material/ListItemIcon'
-import ListItemText from '@mui/material/ListItemText'
-import ListSubheader from '@mui/material/ListSubheader'
-import MenuItem from '@mui/material/MenuItem'
-import Select from '@mui/material/Select'
-import ListItemButton from '@mui/material/ListItemButton'
-import TranslateIcon from '@mui/icons-material/Translate'
-import MapIcon from '@mui/icons-material/Map'
-import NavIcon from '@mui/icons-material/Navigation'
-import StyleIcon from '@mui/icons-material/Style'
-import DevicesOtherIcon from '@mui/icons-material/DevicesOther'
-import Brightness7Icon from '@mui/icons-material/Brightness7'
-import CakeIcon from '@mui/icons-material/Cake'
-import InsightsIcon from '@mui/icons-material/Insights'
-import NotificationsActiveIcon from '@mui/icons-material/NotificationsActive'
-import NotificationsOffIcon from '@mui/icons-material/NotificationsOff'
-import LogoDevIcon from '@mui/icons-material/LogoDev'
-import SquareFootIcon from '@mui/icons-material/SquareFoot'
-
-import { useTranslation } from 'react-i18next'
-
-import { useMemory } from '@hooks/useMemory'
-import { toggleDialog } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import {
-  HAS_API,
-  getPermission,
-  requestPermission,
-} from '@services/desktopNotification'
-
-import DrawerActions from './Actions'
-import { BoolToggle } from './BoolToggle'
-import LocaleSelection from '../general/LocaleSelection'
-import { DividerWithMargin } from '../general/StyledDivider'
-
-function FCSelect({ name, label, value, onChange, children, icon }) {
-  return (
-    <ListItem dense>
-      {icon && <ListItemIcon>{icon}</ListItemIcon>}
-      <FormControl size="small" fullWidth style={{ margin: '3px 0' }}>
-        <InputLabel>{label}</InputLabel>
-        <Select
-          autoFocus
-          name={name}
-          value={value || ''}
-          onChange={onChange}
-          fullWidth
-          label={label}
-        >
-          {children}
-        </Select>
-      </FormControl>
-    </ListItem>
-  )
-}
-
-/**
- *
- * @param {{ asset: 'icons' | 'audio' }} param0
- * @returns
- */
-function UniAssetSelect({ asset }) {
-  const instanceName = asset === 'icons' ? 'Icons' : 'Audio'
-  const { t } = useTranslation()
-  const userSettings = useStorage((s) => s[asset])
-  const Asset = useMemory((s) => s[instanceName])
-  const darkMode = useStorage((s) => s.darkMode)
-  const Icons = useMemory((s) => s.Icons)
-
-  if (Asset.customizable.length === 0) return null
-  return (
-    <>
-      <ListSubheader>{t(asset)}</ListSubheader>
-      {Asset.customizable.map((category) => (
-        <FCSelect
-          key={category}
-          name={category}
-          value={userSettings[category]}
-          label={t(`${category}_${asset}`, `${category} ${instanceName}`)}
-          onChange={({ target }) => {
-            Asset.setSelection(target.name, target.value)
-            useMemory.setState({ [instanceName]: Asset })
-            useStorage.setState({
-              [asset]: { ...userSettings, [target.name]: target.value },
-            })
-          }}
-          icon={
-            <img
-              src={Icons.getMisc(category)}
-              alt={category}
-              width={24}
-              className={darkMode ? '' : 'darken-image'}
-            />
-          }
-        >
-          {[...Asset[category]].map((option) => (
-            <MenuItem key={option} value={option}>
-              {t(
-                `${category.toLowerCase()}_${option.toLowerCase()}`,
-                Utility.getProperName(option),
-              )}
-            </MenuItem>
-          ))}
-        </FCSelect>
-      ))}
-      <DividerWithMargin />
-    </>
-  )
-}
-
-const ICON_MAP = {
-  navigation: <NavIcon />,
-  navigationControls: <StyleIcon />,
-  tileServers: <MapIcon />,
-  distanceUnit: <SquareFootIcon />,
-}
-const FALLBACK = <DevicesOtherIcon />
-
-function GeneralSetting({ setting }) {
-  const { t } = useTranslation()
-  const staticSettings = useMemory((s) => s.settings)
-  const value = useStorage((s) => s.settings[setting])
-  return (
-    <FCSelect
-      key={setting}
-      name={setting}
-      value={staticSettings[setting][value]?.name || ''}
-      label={t(Utility.camelToSnake(setting))}
-      onChange={({ target }) => {
-        useStorage.setState((prev) => ({
-          settings: {
-            ...prev.settings,
-            [target.name]: staticSettings[target.name][target.value].name,
-          },
-        }))
-      }}
-      icon={ICON_MAP[setting] || FALLBACK}
-    >
-      {Object.keys(staticSettings[setting]).map((option) => (
-        <MenuItem key={option} value={option}>
-          {t(
-            `${Utility.camelToSnake(setting)}_${option.toLowerCase()}`,
-            t(option.toLowerCase(), Utility.getProperName(option)),
-          )}
-        </MenuItem>
-      ))}
-    </FCSelect>
-  )
-}
-
-export default function Settings() {
-  const { t } = useTranslation()
-
-  const separateDrawerActions = useMemory(
-    (s) => s.config.general.separateDrawerActions,
-  )
-  const holidayEffects = useMemory((s) => s.config.holidayEffects) || []
-  const staticSettings = useMemory((s) => s.settings)
-
-  const darkMode = useStorage((s) => s.darkMode)
-
-  return (
-    <>
-      <ListSubheader>{t('general')}</ListSubheader>
-      {Object.keys(staticSettings).map((setting) => (
-        <GeneralSetting key={setting} setting={setting} />
-      ))}
-      <ListItem dense>
-        <ListItemIcon>
-          <TranslateIcon />
-        </ListItemIcon>
-        <LocaleSelection />
-      </ListItem>
-      <BoolToggle field="darkMode">
-        <ListItemIcon>
-          <Brightness7Icon />
-        </ListItemIcon>
-      </BoolToggle>
-      {HAS_API && (
-        <ListItemButton
-          disabled={!HAS_API}
-          onClick={async (event) => {
-            await requestPermission()
-            toggleDialog(true, 'notifications', 'options')(event)
-          }}
-        >
-          <ListItemIcon>
-            {getPermission() === 'granted' ? (
-              <NotificationsActiveIcon />
-            ) : (
-              <NotificationsOffIcon color="error" />
-            )}
-          </ListItemIcon>
-          <ListItemText primary={t('desktop_notifications')} />
-        </ListItemButton>
-      )}
-      {holidayEffects.map(({ name, images }) => (
-        <BoolToggle
-          key={name}
-          field={`holidayEffects.${name}`}
-          label={t('disable', { name })}
-        >
-          <ListItemIcon>
-            {images?.length > 0 ? (
-              <img
-                src={images[0]}
-                alt={name}
-                width={24}
-                className={darkMode ? '' : 'darken-image'}
-              />
-            ) : (
-              <CakeIcon />
-            )}
-          </ListItemIcon>
-        </BoolToggle>
-      ))}
-      <DividerWithMargin />
-      <UniAssetSelect asset="icons" />
-      <UniAssetSelect asset="audio" />
-      {process.env.NODE_ENV === 'development' && (
-        <>
-          <ListSubheader>{t('developer')}</ListSubheader>
-          <BoolToggle field="profiling">
-            <ListItemIcon>
-              <InsightsIcon />
-            </ListItemIcon>
-          </BoolToggle>
-          <BoolToggle field="stateTraceLog">
-            <ListItemIcon>
-              <LogoDevIcon />
-            </ListItemIcon>
-          </BoolToggle>
-          <DividerWithMargin />
-        </>
-      )}
-      {!separateDrawerActions && (
-        <>
-          <DividerWithMargin />
-          <DrawerActions />
-        </>
-      )}
-    </>
-  )
-}
diff --git a/src/components/layout/general/Icons.jsx b/src/components/layout/general/Icons.jsx
deleted file mode 100644
index 4dd4dda00..000000000
--- a/src/components/layout/general/Icons.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import Replay from '@mui/icons-material/Replay'
-import Save from '@mui/icons-material/Save'
-import Add from '@mui/icons-material/Add'
-import People from '@mui/icons-material/People'
-import BugReport from '@mui/icons-material/BugReport'
-import Help from '@mui/icons-material/HelpOutline'
-import Ballot from '@mui/icons-material/Ballot'
-import Tune from '@mui/icons-material/Tune'
-import FormatSize from '@mui/icons-material/FormatSize'
-import Clear from '@mui/icons-material/Clear'
-import Check from '@mui/icons-material/Check'
-
-export {
-  Replay,
-  Save,
-  Add,
-  People,
-  BugReport,
-  Help,
-  Ballot,
-  Tune,
-  FormatSize,
-  Clear,
-  Check,
-}
diff --git a/src/components/layout/general/LocaleSelection.jsx b/src/components/layout/general/LocaleSelection.jsx
deleted file mode 100644
index 977129a0c..000000000
--- a/src/components/layout/general/LocaleSelection.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-// @ts-check
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-import FormControl from '@mui/material/FormControl'
-import InputLabel from '@mui/material/InputLabel'
-import Select from '@mui/material/Select'
-import MenuItem from '@mui/material/MenuItem'
-
-import { useStorage } from '@hooks/useStorage'
-
-const STYLE = { margin: '3px 0' }
-
-export default function LocaleSelection() {
-  const { t, i18n } = useTranslation()
-  return (
-    <FormControl size="small" fullWidth style={STYLE}>
-      <InputLabel>{t('locale_selection')}</InputLabel>
-      <Select
-        autoFocus
-        label={t('locale_selection')}
-        value={i18n.language}
-        onChange={(event) => {
-          i18n.changeLanguage(event.target.value)
-          useStorage.setState((prev) => ({
-            settings: { ...prev.settings, locale: event.target.value },
-          }))
-        }}
-        fullWidth
-      >
-        {CONFIG.client.locales.map((option) => (
-          <MenuItem key={option} value={option} dense>
-            {t(`locale_selection_${option}`)}
-          </MenuItem>
-        ))}
-      </Select>
-    </FormControl>
-  )
-}
diff --git a/src/components/popups/Coords.jsx b/src/components/popups/Coords.jsx
new file mode 100644
index 000000000..0ebbfe858
--- /dev/null
+++ b/src/components/popups/Coords.jsx
@@ -0,0 +1,16 @@
+// @ts-check
+import * as React from 'react'
+import Typography from '@mui/material/Typography'
+
+/**
+ *
+ * @param {{ lat: number, lon: number }} props
+ * @returns
+ */
+export function Coords({ lat, lon }) {
+  return (
+    <Typography variant="caption" textAlign="center">
+      🎯 {lat}, {lon}
+    </Typography>
+  )
+}
diff --git a/src/components/popups/common/Dropdown.jsx b/src/components/popups/Dropdown.jsx
similarity index 75%
rename from src/components/popups/common/Dropdown.jsx
rename to src/components/popups/Dropdown.jsx
index 9381eaeab..0fc654291 100644
--- a/src/components/popups/common/Dropdown.jsx
+++ b/src/components/popups/Dropdown.jsx
@@ -1,8 +1,10 @@
-import React from 'react'
-import { Menu, MenuItem } from '@mui/material'
+// @ts-check
+import * as React from 'react'
+import Menu from '@mui/material/Menu'
+import MenuItem from '@mui/material/MenuItem'
 import { useTranslation } from 'react-i18next'
 
-export default function Dropdown({ options, anchorEl, handleClose }) {
+export function Dropdown({ options, anchorEl, handleClose }) {
   const { t } = useTranslation()
   return (
     <Menu
diff --git a/src/components/popups/common/ExtraInfo.jsx b/src/components/popups/ExtraInfo.jsx
similarity index 80%
rename from src/components/popups/common/ExtraInfo.jsx
rename to src/components/popups/ExtraInfo.jsx
index 25c8e1113..a24a3bfd9 100644
--- a/src/components/popups/common/ExtraInfo.jsx
+++ b/src/components/popups/ExtraInfo.jsx
@@ -1,8 +1,7 @@
 // @ts-check
 import * as React from 'react'
-import Grid from '@mui/material/Grid'
+import Grid from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
-
 import { useTranslation } from 'react-i18next'
 
 /**
@@ -14,14 +13,14 @@ export const ExtraInfo = ({ title, data, children }) => {
   const { t } = useTranslation()
 
   return (
-    <Grid container item xs={6} direction="column" textAlign="center">
+    <Grid container xs={6} direction="column" textAlign="center">
       {title && (
-        <Grid item>
+        <Grid>
           <Typography variant="subtitle2">{t(title)}:</Typography>
         </Grid>
       )}
       {data && (
-        <Grid item>
+        <Grid>
           <Typography variant="caption">{data}</Typography>
         </Grid>
       )}
diff --git a/src/components/popups/common/GenderIcon.jsx b/src/components/popups/GenderIcon.jsx
similarity index 87%
rename from src/components/popups/common/GenderIcon.jsx
rename to src/components/popups/GenderIcon.jsx
index 76d4377a4..951749103 100644
--- a/src/components/popups/common/GenderIcon.jsx
+++ b/src/components/popups/GenderIcon.jsx
@@ -1,7 +1,7 @@
+// @ts-check
 import * as React from 'react'
 import SvgIcon from '@mui/material/SvgIcon'
-
-import { useTheme } from '@mui/material'
+import useTheme from '@mui/material/styles/useTheme'
 
 const PATH = {
   0: '',
@@ -10,7 +10,8 @@ const PATH = {
   3: 'M12 8c1.93 0 3.5 1.57 3.5 3.5S13.93 15 12 15s-3.5-1.57-3.5-3.5S10.07 8 12 8zm4.53.38 3.97-3.96V7h2V1h-6v2h2.58l-3.97 3.97C14.23 6.36 13.16 6 12 6s-2.23.36-3.11.97l-.65-.65 1.41-1.41-1.41-1.42L6.82 4.9 4.92 3H7.5V1h-6v6h2V4.42l1.91 1.9-1.42 1.42L5.4 9.15l1.41-1.41.65.65c-.6.88-.96 1.95-.96 3.11 0 2.7 1.94 4.94 4.5 5.41V19H9v2h2v2h2v-2h2v-2h-2v-2.09c2.56-.47 4.5-2.71 4.5-5.41 0-1.16-.36-2.23-.97-3.12z',
 }
 
-export default function GenderIcon({ gender }) {
+/** @param {{ gender: keyof typeof PATH }} props */
+export function GenderIcon({ gender }) {
   const theme = useTheme()
 
   return (
diff --git a/src/components/popups/common/HeaderImage.jsx b/src/components/popups/HeaderImage.jsx
similarity index 88%
rename from src/components/popups/common/HeaderImage.jsx
rename to src/components/popups/HeaderImage.jsx
index c32e1c256..68d112c65 100644
--- a/src/components/popups/common/HeaderImage.jsx
+++ b/src/components/popups/HeaderImage.jsx
@@ -1,9 +1,11 @@
 // @ts-check
 import * as React from 'react'
-import { Avatar, Link } from '@mui/material'
-import { useMemory } from '@hooks/useMemory'
+import Avatar from '@mui/material/Avatar'
+import Link from '@mui/material/Link'
 
-export default function HeaderImage({
+import { useMemory } from '@store/useMemory'
+
+export function HeaderImage({
   url,
   exEligible = false,
   arScanEligible = false,
diff --git a/src/components/popups/common/NameTT.jsx b/src/components/popups/NameTT.jsx
similarity index 68%
rename from src/components/popups/common/NameTT.jsx
rename to src/components/popups/NameTT.jsx
index db5d10f77..3d347c676 100644
--- a/src/components/popups/common/NameTT.jsx
+++ b/src/components/popups/NameTT.jsx
@@ -1,8 +1,14 @@
+// @ts-check
 import * as React from 'react'
-import { Tooltip } from '@mui/material'
+import Tooltip from '@mui/material/Tooltip'
 import { useTranslation } from 'react-i18next'
 
-export default function NameTT({ id, children }) {
+/**
+ *
+ * @param {{ id: string | string[], children: React.ReactElement }} props
+ * @returns
+ */
+export function NameTT({ id, children }) {
   const { t } = useTranslation()
 
   return (
diff --git a/src/components/popups/Navigation.jsx b/src/components/popups/Navigation.jsx
new file mode 100644
index 000000000..cd4605a8a
--- /dev/null
+++ b/src/components/popups/Navigation.jsx
@@ -0,0 +1,27 @@
+// @ts-check
+import * as React from 'react'
+import Map from '@mui/icons-material/Map'
+import IconButton from '@mui/material/IconButton'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+
+/**
+ * @param {{ lat: number, lon: number, size?: import('@mui/material').IconButtonProps['size'] }} props
+ * @returns
+ */
+export function Navigation({ lat, lon, size = 'large' }) {
+  const nav = useStorage((s) => s.settings.navigation)
+  const url = useMemory((s) => s.settings.navigation[nav]?.url)
+  return (
+    <IconButton
+      href={url.replace('{x}', lat.toString()).replace('{y}', lon.toString())}
+      target="_blank"
+      rel="noreferrer"
+      size={size}
+      style={{ color: 'inherit' }}
+    >
+      <Map />
+    </IconButton>
+  )
+}
diff --git a/src/components/popups/common/PowerUp.jsx b/src/components/popups/PowerUp.jsx
similarity index 59%
rename from src/components/popups/common/PowerUp.jsx
rename to src/components/popups/PowerUp.jsx
index dea9412d7..b117f1f8b 100644
--- a/src/components/popups/common/PowerUp.jsx
+++ b/src/components/popups/PowerUp.jsx
@@ -1,12 +1,19 @@
-import React from 'react'
-import { Grid, Typography, Divider } from '@mui/material'
+// @ts-check
+import * as React from 'react'
+import Divider from '@mui/material/Divider'
+import Grid from '@mui/material/Unstable_Grid2'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
+import { capitalize } from '@mui/material/utils'
 
-import Utility from '@services/Utility'
+import { TimeTile } from './TimeTile'
 
-import TimeTile from './TimeTile'
-
-export default function PowerUp({
+/**
+ *
+ * @param {{ power_up_level: number, power_up_points: number, power_up_end_timestamp: number, divider?: boolean }} props
+ * @returns
+ */
+export function PowerUp({
   power_up_level,
   power_up_points,
   power_up_end_timestamp,
@@ -23,7 +30,7 @@ export default function PowerUp({
         icon={
           <>
             <Typography align="center" variant="subtitle2">
-              {Utility.capitalize(t('level'))} {power_up_level}
+              {capitalize(t('level'))} {power_up_level}
             </Typography>
             <Typography variant="caption">
               {power_up_points} {t('points')}
diff --git a/src/components/popups/common/TimeStamps.jsx b/src/components/popups/TimeStamps.jsx
similarity index 86%
rename from src/components/popups/common/TimeStamps.jsx
rename to src/components/popups/TimeStamps.jsx
index 5472c2773..4303017b0 100644
--- a/src/components/popups/common/TimeStamps.jsx
+++ b/src/components/popups/TimeStamps.jsx
@@ -1,9 +1,9 @@
 // @ts-check
 import * as React from 'react'
-import Grid from '@mui/material/Grid'
-
+import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
-import TimeSince from './Timer'
+
+import { TimeSince } from './Timer'
 import { ExtraInfo } from './ExtraInfo'
 
 /**
@@ -24,7 +24,7 @@ export const TimeStamp = ({ time, children }) => {
 
   return (
     <ExtraInfo title={children} data={formatter.format(time * 1000)}>
-      <Grid item>
+      <Grid>
         <TimeSince expireTime={time} />
       </Grid>
     </ExtraInfo>
diff --git a/src/components/popups/common/TimeTile.jsx b/src/components/popups/TimeTile.jsx
similarity index 81%
rename from src/components/popups/common/TimeTile.jsx
rename to src/components/popups/TimeTile.jsx
index aaf224e36..6983c431e 100644
--- a/src/components/popups/common/TimeTile.jsx
+++ b/src/components/popups/TimeTile.jsx
@@ -1,12 +1,15 @@
 // @ts-check
 import * as React from 'react'
-import { Collapse, Grid, IconButton, Typography } from '@mui/material'
+import Collapse from '@mui/material/Collapse'
+import Grid from '@mui/material/Unstable_Grid2'
+import IconButton from '@mui/material/IconButton'
+import Typography from '@mui/material/Typography'
 import ExpandMore from '@mui/icons-material/ExpandMore'
 
-import { useStorage } from '@hooks/useStorage'
+import { useStorage } from '@store/useStorage'
 
-import Timer from './Timer'
-import NameTT from './NameTT'
+import { TimeSince } from './Timer'
+import { NameTT } from './NameTT'
 
 /**
  *
@@ -23,7 +26,7 @@ import NameTT from './NameTT'
  * }} param0
  * @returns
  */
-export default function TimeTile({
+export function TimeTile({
   expireTime,
   icon,
   until,
@@ -35,12 +38,12 @@ export default function TimeTile({
   disabled = '',
 }) {
   const endTime = new Date(expireTime * 1000)
-  const expanded = useStorage((state) => !!state.popups[expandKey])
+  const expanded = useStorage((s) => !!s.popups[expandKey])
 
   return (
     <>
       {icon && (
-        <Grid item xs={size} style={{ textAlign: 'center' }}>
+        <Grid xs={size} textAlign="center">
           {typeof icon === 'string' ? (
             <NameTT id={disabled || tt}>
               <img
@@ -66,11 +69,10 @@ export default function TimeTile({
       )}
       {endTime && (
         <Grid
-          item
           xs={icon ? (children ? 10 : 12) - size : children ? 10 : 12}
-          style={{ textAlign: 'center' }}
+          textAlign="center"
         >
-          <Timer
+          <TimeSince
             expireTime={expireTime}
             until={until}
             color={disabled ? 'GrayText' : 'inherit'}
@@ -87,7 +89,7 @@ export default function TimeTile({
       )}
       {expandKey && children && (
         <>
-          <Grid item xs={2}>
+          <Grid xs={2}>
             <IconButton
               disabled={!!disabled}
               className={expanded ? 'expanded' : 'closed'}
diff --git a/src/components/popups/common/Timer.jsx b/src/components/popups/Timer.jsx
similarity index 66%
rename from src/components/popups/common/Timer.jsx
rename to src/components/popups/Timer.jsx
index cffb82242..b3e1160c5 100644
--- a/src/components/popups/common/Timer.jsx
+++ b/src/components/popups/Timer.jsx
@@ -1,27 +1,25 @@
 // @ts-check
 import * as React from 'react'
-import { Typography } from '@mui/material'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
+import { getTimeUntil } from '@utils/getTimeUntil'
 
 /** @param {TimerProps} props */
 export function RawTimeSince({ expireTime, until = false }) {
   const { t } = useTranslation()
-  const endTime = new Date(expireTime * 1000)
-  const [timerEnd, setTimerEnd] = React.useState(
-    Utility.getTimeUntil(endTime, until),
-  )
+  const endTime = expireTime * 1000
+  const [timerEnd, setTimerEnd] = React.useState(getTimeUntil(endTime, until))
 
   React.useEffect(() => {
     const timer = setTimeout(() => {
-      setTimerEnd(Utility.getTimeUntil(endTime, until))
+      setTimerEnd(getTimeUntil(endTime, until))
     }, 1000)
     return () => clearTimeout(timer)
   })
 
   React.useEffect(() => {
-    setTimerEnd(Utility.getTimeUntil(endTime, until))
+    setTimerEnd(getTimeUntil(endTime, until))
   }, [expireTime])
 
   return expireTime
@@ -37,7 +35,7 @@ export function RawTimeSince({ expireTime, until = false }) {
  * @param {TimerProps & import('@mui/material').TypographyProps} props
  * @returns
  */
-export default function TimeSince({ expireTime, until = false, ...props }) {
+export function TimeSince({ expireTime, until = false, ...props }) {
   return (
     <Typography variant="subtitle2" {...props}>
       <RawTimeSince expireTime={expireTime} until={until} />
diff --git a/src/components/popups/common/Title.jsx b/src/components/popups/Title.jsx
similarity index 71%
rename from src/components/popups/common/Title.jsx
rename to src/components/popups/Title.jsx
index c1a149abc..0d4b5d31a 100644
--- a/src/components/popups/common/Title.jsx
+++ b/src/components/popups/Title.jsx
@@ -1,7 +1,8 @@
+// @ts-check
 import * as React from 'react'
-import { Typography } from '@mui/material'
+import Typography from '@mui/material/Typography'
 
-import { useStorage } from '@hooks/useStorage'
+import { useStorage } from '@store/useStorage'
 
 /**
  *
@@ -13,8 +14,8 @@ import { useStorage } from '@hooks/useStorage'
  * }} props
  * @returns
  */
-export default function Title({ children, variant = 'subtitle2', backup, sx }) {
-  const names = useStorage((state) => !!state.popups.names)
+export function Title({ children, variant = 'subtitle2', backup, sx }) {
+  const names = useStorage((s) => !!s.popups.names)
 
   return (
     <Typography
diff --git a/src/components/popups/common/Coords.jsx b/src/components/popups/common/Coords.jsx
deleted file mode 100644
index ad85149f4..000000000
--- a/src/components/popups/common/Coords.jsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react'
-import { Typography } from '@mui/material'
-
-export default function Coords({ lat, lon }) {
-  return (
-    <Typography variant="caption" style={{ textAlign: 'center' }}>
-      🎯 {lat}, {lon}
-    </Typography>
-  )
-}
diff --git a/src/components/popups/common/Navigation.jsx b/src/components/popups/common/Navigation.jsx
deleted file mode 100644
index a9c962329..000000000
--- a/src/components/popups/common/Navigation.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react'
-import Map from '@mui/icons-material/Map'
-import { IconButton } from '@mui/material'
-
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-
-export default function Navigation({ lat, lon, size = 'large' }) {
-  const nav = useStorage((s) => s.settings.navigation)
-  const url = useMemory((s) => s.settings.navigation[nav]?.url)
-  return (
-    <IconButton
-      href={url.replace('{x}', lat).replace('{y}', lon)}
-      target="_blank"
-      rel="noreferrer"
-      size={size}
-      style={{ color: 'inherit' }}
-    >
-      <Map />
-    </IconButton>
-  )
-}
diff --git a/src/components/tiles/index.js b/src/components/tiles/index.js
deleted file mode 100644
index 850e8fd93..000000000
--- a/src/components/tiles/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import devices from './Device'
-import gyms from './Gym'
-import nests from './Nest'
-import pokemon from './Pokemon'
-import pokestops from './Pokestop'
-import portals from './Portal'
-import scanCells from './ScanCell'
-import scanAreas from './ScanArea'
-import spawnpoints from './Spawnpoint'
-import submissionCells from './submissionCells/SubmissionCell'
-import weather from './Weather'
-import s2cells from './S2Cell'
-import routes from './Route'
-
-export {
-  devices,
-  gyms,
-  nests,
-  pokemon,
-  pokestops,
-  portals,
-  scanAreas,
-  scanCells,
-  submissionCells,
-  spawnpoints,
-  weather,
-  s2cells,
-  routes,
-}
diff --git a/src/components/layout/general/ColoredTile.jsx b/src/components/virtual/ColoredTile.jsx
similarity index 100%
rename from src/components/layout/general/ColoredTile.jsx
rename to src/components/virtual/ColoredTile.jsx
diff --git a/src/components/layout/drawer/SelectorItem.jsx b/src/components/virtual/SelectorItem.jsx
similarity index 54%
rename from src/components/layout/drawer/SelectorItem.jsx
rename to src/components/virtual/SelectorItem.jsx
index c2aab5fcd..aa1780978 100644
--- a/src/components/layout/drawer/SelectorItem.jsx
+++ b/src/components/virtual/SelectorItem.jsx
@@ -6,16 +6,12 @@ import Tooltip from '@mui/material/Tooltip'
 import Box from '@mui/material/Box'
 
 import { useTranslateById } from '@hooks/useTranslateById'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useDeepStore, useStorage } from '@hooks/useStorage'
-import { checkIfHasAll } from '@services/functions/hasAll'
-import Poracle from '@services/Poracle'
-
-import { ColoredTile } from '../general/ColoredTile'
-import { useWebhookStore } from '../dialogs/webhooks/store'
-import { ToggleTypography } from '../general/ToggleTypography'
-import { SQUARE_ITEM } from '../general/VirtualGrid'
+import { useMemory } from '@store/useMemory'
+import { ColoredTile } from '@components/virtual/ColoredTile'
+import { ToggleTypography } from '@components/ToggleTypography'
+import { SQUARE_ITEM } from '@components/virtual/VirtualGrid'
+import { StatusIcon } from '@components/StatusIcon'
+import { useTranslation } from 'react-i18next'
 
 /**
  * @template {string} T
@@ -38,76 +34,15 @@ import { SQUARE_ITEM } from '../general/VirtualGrid'
  * }} FullProps
  */
 
-/** @param {BaseProps<keyof import('@rm/types').Available>} props */
-export function StandardItem({ id, category, ...props }) {
-  const [filter, setFilter] = useDeepStore(`filters.${category}.filter.${id}`)
-  const hasAll = checkIfHasAll(category, id)
-  const easyMode = useStorage((s) => !!s.filters?.[category]?.easyMode)
-  return (
-    <SelectorItem
-      {...props}
-      id={id}
-      filter={filter}
-      setFilter={setFilter}
-      hasAll={hasAll}
-      easyMode={easyMode}
-      onClick={() =>
-        useLayoutStore.setState(
-          id.startsWith('t')
-            ? { slotSelection: id }
-            : {
-                advancedFilter: {
-                  open: true,
-                  id,
-                  category,
-                  selectedIds: [],
-                },
-              },
-        )
-      }
-    />
-  )
-}
-
-/** @param {BaseProps<import('@rm/types').AllButHuman>} props */
-export function WebhookItem({ id, category, ...props }) {
-  const filter = useWebhookStore((s) => s.tempFilters[id])
-
-  const setFilter = (newFilter) => {
-    useWebhookStore.setState((prev) => ({
-      tempFilters: {
-        ...prev.tempFilters,
-        [id]: newFilter
-          ? {
-              ...newFilter,
-              enabled: newFilter.enabled,
-            }
-          : { enabled: true, ...Poracle.getOtherData(id) },
-      },
-    }))
-  }
-  return (
-    <SelectorItem
-      {...props}
-      id={id}
-      filter={filter}
-      setFilter={setFilter}
-      onClick={() =>
-        useWebhookStore.setState({
-          advanced: {
-            id,
-            open: true,
-            category,
-            selectedIds: [],
-          },
-        })
-      }
-    />
-  )
-}
-
 /** @param {FullProps} props */
-function SelectorItem({ id, filter, setFilter, onClick, hasAll, easyMode }) {
+export function SelectorItem({
+  id,
+  filter,
+  setFilter,
+  onClick,
+  hasAll,
+  easyMode,
+}) {
   const { t } = useTranslateById({ alt: true, newLine: true })
   const title = t(id)
   const url = useMemory((s) => s.Icons.getIconById(id))
@@ -142,6 +77,15 @@ function SelectorItem({ id, filter, setFilter, onClick, hasAll, easyMode }) {
     [onClick],
   )
 
+  const status =
+    hasAll && !easyMode
+      ? filter?.all || filter.enabled
+        ? filter?.all && filter?.enabled
+          ? true
+          : null
+        : false
+      : filter?.enabled
+
   return (
     <Box
       className="vgrid-item"
@@ -170,6 +114,7 @@ function SelectorItem({ id, filter, setFilter, onClick, hasAll, easyMode }) {
       <IconButton className="vgrid-icon" size="small" onClick={handleIconClick}>
         <TuneIcon fontSize="small" />
       </IconButton>
+      <Status status={status} />
       <ToggleTypography
         className="vgrid-caption"
         variant="caption"
@@ -183,3 +128,26 @@ function SelectorItem({ id, filter, setFilter, onClick, hasAll, easyMode }) {
     </Box>
   )
 }
+
+/** @param {{ status: null | boolean }} props */
+function Status({ status }) {
+  const { t } = useTranslation()
+  return (
+    <Tooltip
+      title={
+        status === null
+          ? t('individual_filters')
+          : status
+          ? t('enabled')
+          : t('disabled')
+      }
+    >
+      <StatusIcon
+        className="vgrid-color-blind-icon"
+        fontSize="small"
+        color="action"
+        status={status}
+      />
+    </Tooltip>
+  )
+}
diff --git a/src/components/virtual/StandardItem.jsx b/src/components/virtual/StandardItem.jsx
new file mode 100644
index 000000000..1a380a9b5
--- /dev/null
+++ b/src/components/virtual/StandardItem.jsx
@@ -0,0 +1,39 @@
+// @ts-check
+import * as React from 'react'
+
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useDeepStore, useStorage } from '@store/useStorage'
+import { checkIfHasAll } from '@utils/hasAll'
+
+import { SelectorItem } from './SelectorItem'
+
+/** @param {import('./SelectorItem').BaseProps<keyof import('@rm/types').Available>} props */
+export function StandardItem({ id, category, ...props }) {
+  const [filter, setFilter] = useDeepStore(`filters.${category}.filter.${id}`)
+  const hasAll = checkIfHasAll(category, id)
+  const easyMode = useStorage((s) => !!s.filters?.[category]?.easyMode)
+  return (
+    <SelectorItem
+      {...props}
+      id={id}
+      filter={filter}
+      setFilter={setFilter}
+      hasAll={hasAll}
+      easyMode={easyMode}
+      onClick={() =>
+        useLayoutStore.setState(
+          id.startsWith('t')
+            ? { slotSelection: id }
+            : {
+                advancedFilter: {
+                  open: true,
+                  id,
+                  category,
+                  selectedIds: [],
+                },
+              },
+        )
+      }
+    />
+  )
+}
diff --git a/src/components/virtual/Table.jsx b/src/components/virtual/Table.jsx
new file mode 100644
index 000000000..590e7b124
--- /dev/null
+++ b/src/components/virtual/Table.jsx
@@ -0,0 +1,31 @@
+import * as React from 'react'
+import Table from '@mui/material/Table'
+import TableBody from '@mui/material/TableBody'
+import TableContainer from '@mui/material/TableContainer'
+import TableHead from '@mui/material/TableHead'
+import TableRow from '@mui/material/TableRow'
+import Paper from '@mui/material/Paper'
+import { TableVirtuoso } from 'react-virtuoso'
+
+const COMPONENTS = {
+  Scroller: React.forwardRef((props, ref) => (
+    <TableContainer component={Paper} {...props} ref={ref} />
+  )),
+  Table: (props) => (
+    <Table
+      {...props}
+      sx={{ borderCollapse: 'separate', tableLayout: 'fixed' }}
+    />
+  ),
+  TableHead,
+  // eslint-disable-next-line no-unused-vars
+  TableRow: ({ item: _, ...props }) => <TableRow {...props} />,
+  TableBody: React.forwardRef((props, ref) => (
+    <TableBody {...props} ref={ref} />
+  )),
+}
+
+/** @param {import('react-virtuoso').TableVirtuosoProps} props */
+export function VirtualTable(props) {
+  return <TableVirtuoso components={COMPONENTS} {...props} />
+}
diff --git a/src/components/layout/general/VirtualGrid.jsx b/src/components/virtual/VirtualGrid.jsx
similarity index 100%
rename from src/components/layout/general/VirtualGrid.jsx
rename to src/components/virtual/VirtualGrid.jsx
diff --git a/src/components/layout/dialogs/DonorPage.jsx b/src/features/builder/DonorPage.jsx
similarity index 77%
rename from src/components/layout/dialogs/DonorPage.jsx
rename to src/features/builder/DonorPage.jsx
index 10f840330..62b973772 100644
--- a/src/components/layout/dialogs/DonorPage.jsx
+++ b/src/features/builder/DonorPage.jsx
@@ -5,12 +5,12 @@ import { useQuery } from '@apollo/client'
 import Dialog from '@mui/material/Dialog'
 
 import { CUSTOM_COMPONENT } from '@services/queries/config'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { Loading } from '@components/Loading'
 
-import DialogWrapper from '../custom/DialogWrapper'
-import CustomTile from '../custom/CustomTile'
-import { Loading } from '../general/Loading'
+import { CustomDialog } from './components/CustomDialog'
+import { CustomTile } from './components/CustomTile'
 
 const DEFAULT = {
   settings: {},
@@ -21,7 +21,7 @@ const DEFAULT = {
 
 const handleClose = () => useLayoutStore.setState({ donorPage: false })
 
-export default function DonorPage() {
+export function DonorPage() {
   const open = useLayoutStore((s) => s.donorPage)
   const isMobile = useMemory((s) => s.isMobile)
 
@@ -37,7 +37,7 @@ export default function DonorPage() {
 
   return (
     <Dialog open={open} fullScreen={isMobile} onClose={handleClose}>
-      <DialogWrapper
+      <CustomDialog
         configObj={donorPage}
         defaultTitle="donor_page"
         handleClose={handleClose}
@@ -49,7 +49,7 @@ export default function DonorPage() {
             <CustomTile key={i} block={block} />
           ))
         )}
-      </DialogWrapper>
+      </CustomDialog>
     </Dialog>
   )
 }
diff --git a/src/features/login/CustomPage.jsx b/src/features/builder/LoginPage.jsx
similarity index 90%
rename from src/features/login/CustomPage.jsx
rename to src/features/builder/LoginPage.jsx
index 7e43e35ae..0bb9daa3a 100644
--- a/src/features/login/CustomPage.jsx
+++ b/src/features/builder/LoginPage.jsx
@@ -6,8 +6,9 @@ import Grid from '@mui/material/Unstable_Grid2'
 import { useQuery } from '@apollo/client'
 
 import { CUSTOM_COMPONENT } from '@services/queries/config'
-import CustomTile from '@components/layout/custom/CustomTile'
-import { Loading } from '@components/layout/general/Loading'
+import { Loading } from '@components/Loading'
+
+import { CustomTile } from './components/CustomTile'
 
 export function CustomLoginPage() {
   const { t, i18n } = useTranslation()
diff --git a/src/components/layout/dialogs/Motd.jsx b/src/features/builder/Motd.jsx
similarity index 81%
rename from src/components/layout/dialogs/Motd.jsx
rename to src/features/builder/Motd.jsx
index af758a928..25e42037d 100644
--- a/src/components/layout/dialogs/Motd.jsx
+++ b/src/features/builder/Motd.jsx
@@ -6,14 +6,14 @@ import Dialog from '@mui/material/Dialog'
 import Box from '@mui/material/Box'
 import { useQuery } from '@apollo/client'
 
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useStorage } from '@store/useStorage'
 import { CUSTOM_COMPONENT, MOTD_CHECK } from '@services/queries/config'
-import Utility from '@services/Utility'
+import { Loading } from '@components/Loading'
 
-import DialogWrapper from '../custom/DialogWrapper'
-import CustomTile from '../custom/CustomTile'
-import { Loading } from '../general/Loading'
+import { CustomTile } from './components/CustomTile'
+import { CustomDialog } from './components/CustomDialog'
+import { getBlockContent } from './utils'
 
 const DEFAULT =
   /** @type {import('@rm/types').Config['map']['messageOfTheDay']} */ ({
@@ -24,7 +24,7 @@ const DEFAULT =
     index: 0,
   })
 
-export default function MessageOfTheDay() {
+export function MessageOfTheDay() {
   const clientIndex = useStorage((s) => s.motdIndex)
   const tutorial = useStorage((s) => s.tutorial)
 
@@ -62,7 +62,7 @@ export default function MessageOfTheDay() {
       maxWidth={motd.dialogMaxWidth || 'sm'}
       onClose={handleMotdClose}
     >
-      <DialogWrapper
+      <CustomDialog
         configObj={motd}
         defaultTitle="message_of_the_day"
         handleClose={handleMotdClose}
@@ -78,7 +78,7 @@ export default function MessageOfTheDay() {
             />
           ))
         )}
-      </DialogWrapper>
+      </CustomDialog>
     </Dialog>
   )
 }
@@ -91,18 +91,16 @@ const DefaultMotD = ({ block }) =>
   ) : (
     <Box whiteSpace="pre-line" margin={3} textAlign="center">
       {block.title && (
-        <Typography variant="h6">
-          {Utility.getBlockContent(block.title)}
-        </Typography>
+        <Typography variant="h6">{getBlockContent(block.title)}</Typography>
       )}
       {block.body && (
         <Typography variant="subtitle1">
-          {Utility.getBlockContent(block.body)}
+          {getBlockContent(block.body)}
         </Typography>
       )}
       {block.footer && (
         <Typography variant="caption">
-          {Utility.getBlockContent(block.footer)}
+          {getBlockContent(block.footer)}
         </Typography>
       )}
     </Box>
diff --git a/src/components/layout/custom/CustomButton.jsx b/src/features/builder/components/CustomButton.jsx
similarity index 91%
rename from src/components/layout/custom/CustomButton.jsx
rename to src/features/builder/components/CustomButton.jsx
index 06588afee..f9ecf7fa8 100644
--- a/src/components/layout/custom/CustomButton.jsx
+++ b/src/features/builder/components/CustomButton.jsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import Button from '@mui/material/Button'
 
-import { I } from '../general/I'
+import { I } from '@components/I'
 
 const THEME_COLORS = new Set([
   'success',
@@ -14,7 +14,7 @@ const THEME_COLORS = new Set([
 ])
 
 /** @param {import('@mui/material').ButtonProps & { icon?: string }} */
-export default function CustomButton({
+export function CustomButton({
   size,
   color = 'inherit',
   variant = 'text',
diff --git a/src/components/layout/custom/DialogWrapper.jsx b/src/features/builder/components/CustomDialog.jsx
similarity index 87%
rename from src/components/layout/custom/DialogWrapper.jsx
rename to src/features/builder/components/CustomDialog.jsx
index 5d7564a15..249484070 100644
--- a/src/components/layout/custom/DialogWrapper.jsx
+++ b/src/features/builder/components/CustomDialog.jsx
@@ -1,14 +1,15 @@
+// @ts-check
 import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import DialogContent from '@mui/material/DialogContent'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
 
-import Header from '../general/Header'
-import Footer from '../general/Footer'
+import { getBlockContent } from '../utils'
 
-export default function DialogWrapper({
+export function CustomDialog({
   configObj,
   defaultTitle,
   handleClose,
@@ -26,7 +27,7 @@ export default function DialogWrapper({
   const [footerOptions, setFooterOptions] = React.useState([
     ...(configObj.footerButtons || []).map((b) => ({
       ...b,
-      name: Utility.getBlockContent(b.name),
+      name: getBlockContent(b.name),
     })),
     {
       name: `${t('close')}${countdown ? ` (${countdown})` : ''}`,
@@ -40,7 +41,7 @@ export default function DialogWrapper({
     setFooterOptions([
       ...(configObj.footerButtons || []).map((b) => ({
         ...b,
-        name: Utility.getBlockContent(b.name),
+        name: getBlockContent(b.name),
       })),
       {
         name: `${t('close')}${countdown ? ` (${countdown})` : ''}`,
@@ -77,7 +78,7 @@ export default function DialogWrapper({
       <Header
         titles={
           configObj.titles?.length
-            ? configObj.titles.map((title) => Utility.getBlockContent(title))
+            ? configObj.titles.map((title) => getBlockContent(title))
             : [defaultTitle]
         }
       />
diff --git a/src/components/layout/custom/CustomText.jsx b/src/features/builder/components/CustomText.jsx
similarity index 77%
rename from src/components/layout/custom/CustomText.jsx
rename to src/features/builder/components/CustomText.jsx
index 353a0a35b..a2ded8a4c 100644
--- a/src/components/layout/custom/CustomText.jsx
+++ b/src/features/builder/components/CustomText.jsx
@@ -7,14 +7,7 @@ import Typography from '@mui/material/Typography'
  * @param {import('@mui/material').TypographyProps} props
  * @returns
  */
-export default function CustomText({
-  className,
-  variant,
-  sx,
-  color,
-  style,
-  children,
-}) {
+export function CustomText({ className, variant, sx, color, style, children }) {
   return (
     <Typography
       className={className}
diff --git a/src/components/layout/custom/CustomTile.jsx b/src/features/builder/components/CustomTile.jsx
similarity index 67%
rename from src/components/layout/custom/CustomTile.jsx
rename to src/features/builder/components/CustomTile.jsx
index 0385c8917..e1ebeec02 100644
--- a/src/components/layout/custom/CustomTile.jsx
+++ b/src/features/builder/components/CustomTile.jsx
@@ -1,23 +1,21 @@
 // @ts-check
-/* eslint-disable react/jsx-props-no-spreading */
 import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 
-import Utility from '@services/Utility'
-
-import Generator from './Generator'
+import { Generator } from './Generator'
+import { getGridSizes } from '../utils'
 
 /**
  *
  * @param {{ block: object, defaultReturn?: React.ReactNode | null }} props
  * @returns
  */
-export default function CustomTile({ block, defaultReturn }) {
+export function CustomTile({ block, defaultReturn }) {
   return block.type === 'parent' ? (
     <Generator block={block} defaultReturn={defaultReturn} />
   ) : (
     <Grid
-      {...Utility.getSizes(block.gridSizes)}
+      {...getGridSizes(block.gridSizes)}
       className={block.className}
       style={block.gridStyle}
       sx={block.sx}
diff --git a/src/components/layout/custom/Generator.jsx b/src/features/builder/components/Generator.jsx
similarity index 70%
rename from src/components/layout/custom/Generator.jsx
rename to src/features/builder/components/Generator.jsx
index 28bae18f2..7e6dcd82c 100644
--- a/src/components/layout/custom/Generator.jsx
+++ b/src/features/builder/components/Generator.jsx
@@ -1,24 +1,28 @@
 /* eslint-disable react/no-array-index-key */
-/* eslint-disable react/jsx-props-no-spreading */
 import React from 'react'
 import Divider from '@mui/material/Divider'
 import Grid from '@mui/material/Unstable_Grid2'
-import Utility from '@services/Utility'
 
-import DiscordButton from '../auth/Discord'
-import LocalLogin from '../auth/Local'
-import Telegram from '../auth/Telegram'
-import CustomText from './CustomText'
-import CustomButton from './CustomButton'
-import { Img } from '../general/Img'
-import LocaleSelection from '../general/LocaleSelection'
-import LinkWrapper from './LinkWrapper'
+import { DiscordButton } from '@components/auth/Discord'
+import { LocalLogin } from '@components/auth/Local'
+import { TelegramWidget } from '@components/auth/Telegram'
+import { Img } from '@components/Img'
+import { LocaleSelection } from '@components/inputs/LocaleSelection'
 
-export default function Generator({ block = {}, defaultReturn = null }) {
-  // eslint-disable-next-line no-unused-vars
-  const { content = null, text = null, gridSizes, ...props } = block
-  const children = Utility.getBlockContent(content || text)
-  switch (block.type) {
+import { LinkWrapper } from './LinkWrapper'
+import { CustomText } from './CustomText'
+import { CustomButton } from './CustomButton'
+import { getGridSizes, getBlockContent } from '../utils'
+
+/**
+ *
+ * @param {{ block: import('@rm/types').CustomComponent, defaultReturn: React.ReactNode }} props
+ * @returns
+ */
+export function Generator({ block, defaultReturn = null }) {
+  const { content = null, text = null, gridSizes, type, ...props } = block
+  const children = getBlockContent(content || text)
+  switch (type) {
     case 'img':
       return (
         <LinkWrapper {...props}>
@@ -41,7 +45,7 @@ export default function Generator({ block = {}, defaultReturn = null }) {
       return <Divider {...props} />
     case 'telegram':
       return (
-        <Telegram
+        <TelegramWidget
           botName={block.telegramBotName}
           authUrl={block.telegramAuthUrl}
         />
@@ -61,7 +65,7 @@ export default function Generator({ block = {}, defaultReturn = null }) {
       return (
         <Grid
           container
-          {...Utility.getSizes(block.gridSizes)}
+          {...getGridSizes(gridSizes)}
           className={block.className}
           alignItems={block.alignItems}
           justifyContent={block.justifyContent}
@@ -80,7 +84,7 @@ export default function Generator({ block = {}, defaultReturn = null }) {
               ) : (
                 <Grid
                   key={i}
-                  {...Utility.getSizes(subBlock.gridSizes)}
+                  {...getGridSizes(subBlock.gridSizes)}
                   className={block.className}
                   style={subBlock.gridStyle}
                   sx={subBlock.gridSx}
diff --git a/src/components/layout/custom/LinkWrapper.jsx b/src/features/builder/components/LinkWrapper.jsx
similarity index 96%
rename from src/components/layout/custom/LinkWrapper.jsx
rename to src/features/builder/components/LinkWrapper.jsx
index 05c0e8f57..b216c6ee0 100644
--- a/src/components/layout/custom/LinkWrapper.jsx
+++ b/src/features/builder/components/LinkWrapper.jsx
@@ -19,7 +19,7 @@ import Link from '@mui/material/Link'
  * }} props
  * @returns {React.ReactNode}
  */
-export default function LinkWrapper({
+export function LinkWrapper({
   link,
   href,
   target,
diff --git a/src/features/builder/index.js b/src/features/builder/index.js
new file mode 100644
index 000000000..efd07a51f
--- /dev/null
+++ b/src/features/builder/index.js
@@ -0,0 +1,5 @@
+export * from './DonorPage'
+export * from './Motd'
+export * from './LoginPage'
+export * from './components/CustomTile'
+export * from './components/CustomDialog'
diff --git a/src/features/builder/utils.js b/src/features/builder/utils.js
new file mode 100644
index 000000000..3ede067b6
--- /dev/null
+++ b/src/features/builder/utils.js
@@ -0,0 +1,31 @@
+// @ts-check
+
+/**
+ *
+ * @param {string | Record<string, string>} content
+ * @returns
+ */
+export function getBlockContent(content) {
+  if (!content) return ''
+  if (typeof content === 'string') return content
+  return typeof content === 'object'
+    ? content[localStorage.getItem('i18nextLng')] || Object.values(content)[0]
+    : ''
+}
+
+/** @param {import("@rm/types").GridSizes} sizeObj */
+export function getGridSizes(sizeObj) {
+  return {
+    xs: sizeObj?.xs || 12,
+    sm: sizeObj?.sm || sizeObj?.xs || 12,
+    md: sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
+    lg: sizeObj?.lg || sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
+    xl:
+      sizeObj?.xl ||
+      sizeObj?.lg ||
+      sizeObj?.md ||
+      sizeObj?.sm ||
+      sizeObj?.xs ||
+      12,
+  }
+}
diff --git a/src/components/popups/DevicePoly.jsx b/src/features/device/DevicePath.jsx
similarity index 89%
rename from src/components/popups/DevicePoly.jsx
rename to src/features/device/DevicePath.jsx
index b1e249a5a..1593ddf13 100644
--- a/src/components/popups/DevicePoly.jsx
+++ b/src/features/device/DevicePath.jsx
@@ -3,14 +3,14 @@
 import * as React from 'react'
 import { Polyline, Polygon, Circle } from 'react-leaflet'
 
-import { useStorage } from '@hooks/useStorage'
+import { useStorage } from '@store/useStorage'
 
 /**
  *
  * @param {import('@rm/types').Device} props
  * @returns
  */
-const DevicePoly = ({ route, type, radius }) => {
+const BaseDevicePath = ({ route, type, radius }) => {
   const color = useStorage((s) => s.userSettings.admin.devicePathColor)
 
   const safeRoute = React.useMemo(() => {
@@ -59,9 +59,7 @@ const DevicePoly = ({ route, type, radius }) => {
       ))
 }
 
-const MemoDevicePoly = React.memo(
-  DevicePoly,
+export const DevicePath = React.memo(
+  BaseDevicePath,
   (prev, next) => prev.type === next.type,
 )
-
-export default MemoDevicePoly
diff --git a/src/components/popups/Device.jsx b/src/features/device/DevicePopup.jsx
similarity index 61%
rename from src/components/popups/Device.jsx
rename to src/features/device/DevicePopup.jsx
index dff1f48e9..21ffb6dae 100644
--- a/src/components/popups/Device.jsx
+++ b/src/features/device/DevicePopup.jsx
@@ -1,17 +1,22 @@
 // @ts-check
 import * as React from 'react'
-import { Typography } from '@mui/material'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { getTimeUntil } from '@utils/getTimeUntil'
+import { dayCheck } from '@utils/dayCheck'
 
-export default function DevicePopup({ isOnline, ts, ...device }) {
+/**
+ *
+ * @param {{ isOnline: boolean, ts: number } & import('@rm/types').Device} props
+ * @returns
+ */
+export function DevicePopup({ isOnline, ts, ...device }) {
   const { t } = useTranslation()
 
-  React.useEffect(() => {
-    Utility.analytics('Popup', 'Popup Clicked', 'Device')
-  }, [])
+  useAnalytics('Popup', 'Popup Clicked', 'Device')
 
   return (
     <ErrorBoundary noRefresh variant="h5">
@@ -37,19 +42,19 @@ export default function DevicePopup({ isOnline, ts, ...device }) {
 
 const Timer = ({ device, t, ts }) => {
   const { updated } = device
-  const lastSeen = new Date(updated * 1000)
-  const [since, setSince] = React.useState(Utility.getTimeUntil(lastSeen))
+  const lastSeen = updated * 1000
+  const [since, setSince] = React.useState(getTimeUntil(lastSeen))
 
   React.useEffect(() => {
     const timer = setTimeout(() => {
-      setSince(Utility.getTimeUntil(lastSeen))
+      setSince(getTimeUntil(lastSeen))
     }, 1000)
     return () => clearTimeout(timer)
   })
 
   return (
     <Typography variant="caption">
-      {t('last_seen')}: {Utility.dayCheck(ts, updated)} (
+      {t('last_seen')}: {dayCheck(ts, updated)} (
       {since.str.replace('days', t('days')).replace('day', t('day'))})
     </Typography>
   )
diff --git a/src/components/tiles/Device.jsx b/src/features/device/DeviceTile.jsx
similarity index 73%
rename from src/components/tiles/Device.jsx
rename to src/features/device/DeviceTile.jsx
index d4a8e7a00..c15b47c96 100644
--- a/src/components/tiles/Device.jsx
+++ b/src/features/device/DeviceTile.jsx
@@ -1,21 +1,21 @@
 // @ts-check
 /* eslint-disable react/destructuring-assignment */
-import ErrorBoundary from '@components/ErrorBoundary'
 import * as React from 'react'
 import { Marker, Popup } from 'react-leaflet'
 
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { ErrorBoundary } from '@components/ErrorBoundary'
 
-import deviceMarker from '../markers/device'
-import PopupContent from '../popups/Device'
-import DevicePoly from '../popups/DevicePoly'
+import { deviceMarker } from './deviceMarker'
+import { DevicePath } from './DevicePath'
+import { DevicePopup } from './DevicePopup'
 
 /**
  *
  * @param {import('@rm/types').Device} device
  * @returns
  */
-const DeviceTile = (device) => {
+const BaseDeviceTile = (device) => {
   const ts = Math.floor(Date.now() / 1000)
   const [poly, setPoly] = React.useState(false)
   const markerRef = React.useRef(null)
@@ -51,20 +51,18 @@ const DeviceTile = (device) => {
       }}
     >
       <Popup position={[device.lat, device.lon]}>
-        <PopupContent {...device} isOnline={isOnline} ts={ts} />
+        <DevicePopup {...device} isOnline={isOnline} ts={ts} />
       </Popup>
       {poly && !device.isMad && (
         <ErrorBoundary>
-          <DevicePoly {...device} />
+          <DevicePath {...device} />
         </ErrorBoundary>
       )}
     </Marker>
   )
 }
 
-const MemoDevice = React.memo(
-  DeviceTile,
+export const DeviceTile = React.memo(
+  BaseDeviceTile,
   (prev, next) => prev.updated === next.updated,
 )
-
-export default MemoDevice
diff --git a/src/components/markers/device.js b/src/features/device/deviceMarker.js
similarity index 82%
rename from src/components/markers/device.js
rename to src/features/device/deviceMarker.js
index 8caca3604..180da1b70 100644
--- a/src/components/markers/device.js
+++ b/src/features/device/deviceMarker.js
@@ -1,6 +1,6 @@
 import { Icon } from 'leaflet'
 
-export default function getDeviceMarkers(iconUrl, iconSize, modifiers) {
+export function deviceMarker(iconUrl, iconSize, modifiers) {
   const { sizeMultiplier, offsetX, offsetY, popupX, popupY } = modifiers
   return new Icon({
     iconUrl,
diff --git a/src/features/device/index.js b/src/features/device/index.js
new file mode 100644
index 000000000..271026bec
--- /dev/null
+++ b/src/features/device/index.js
@@ -0,0 +1,4 @@
+export * from './DevicePath'
+export * from './DevicePopup'
+export * from './deviceMarker'
+export * from './DeviceTile'
diff --git a/src/features/drawer/Admin.jsx b/src/features/drawer/Admin.jsx
new file mode 100644
index 000000000..b598a79a2
--- /dev/null
+++ b/src/features/drawer/Admin.jsx
@@ -0,0 +1,33 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { useStorage } from '@store/useStorage'
+import { ENUM_TTH } from '@assets/constants'
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
+
+import { CollapsibleItem } from './components/CollapsibleItem'
+
+const SpawnpointTTH = () => {
+  const enabled = useStorage((s) => !!s.filters?.spawnpoints?.enabled)
+  return (
+    <CollapsibleItem open={enabled}>
+      <ListItem>
+        <MultiSelectorStore
+          field="filters.spawnpoints.tth"
+          items={ENUM_TTH}
+          tKey="tth_"
+        />
+      </ListItem>
+    </CollapsibleItem>
+  )
+}
+
+function AdminComponent({ subItem }) {
+  return subItem === 'spawnpoints' ? <SpawnpointTTH /> : null
+}
+
+export const AdminDrawer = React.memo(
+  AdminComponent,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/features/drawer/Extras.jsx b/src/features/drawer/Extras.jsx
new file mode 100644
index 000000000..5fb14f5f5
--- /dev/null
+++ b/src/features/drawer/Extras.jsx
@@ -0,0 +1,37 @@
+// @ts-check
+import * as React from 'react'
+
+import { PokestopDrawer } from './pokestops'
+import { GymDrawer } from './gyms'
+import { NestsDrawer } from './nests'
+import { RoutesDrawer } from './Routes'
+import { WayfarerDrawer } from './Wayfarer'
+import { S2CellsDrawer } from './S2Cells'
+import { AdminDrawer } from './Admin'
+
+function ExtrasComponent({ category, subItem }) {
+  switch (category) {
+    case 'nests':
+      return <NestsDrawer subItem={subItem} />
+    case 's2cells':
+      return <S2CellsDrawer subItem={subItem} />
+    case 'pokestops':
+      return <PokestopDrawer subItem={subItem} />
+    case 'gyms':
+      return <GymDrawer subItem={subItem} />
+    case 'wayfarer':
+      return <WayfarerDrawer subItem={subItem} />
+    case 'routes':
+      return <RoutesDrawer subItem={subItem} />
+    case 'admin':
+      return <AdminDrawer subItem={subItem} />
+    default:
+      return null
+  }
+}
+
+export const Extras = React.memo(
+  ExtrasComponent,
+  (prev, next) =>
+    prev.category === next.category && prev.subItem === next.subItem,
+)
diff --git a/src/features/drawer/Routes.jsx b/src/features/drawer/Routes.jsx
new file mode 100644
index 000000000..008238457
--- /dev/null
+++ b/src/features/drawer/Routes.jsx
@@ -0,0 +1,52 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage, useDeepStore } from '@store/useStorage'
+import { SliderTile } from '@components/inputs/SliderTile'
+
+import { CollapsibleItem } from './components/CollapsibleItem'
+
+const RouteSlider = () => {
+  const enabled = useStorage((s) => !!s.filters?.routes?.enabled)
+  const [filters, setFilters] = useDeepStore('filters.routes.distance')
+  const baseDistance = useMemory.getState().filters?.routes?.distance
+
+  /** @type {import('@rm/types').RMSlider} */
+  const slider = React.useMemo(() => {
+    const min = baseDistance?.[0] || 0
+    const max = baseDistance?.[1] || 25
+    return {
+      color: 'secondary',
+      disabled: false,
+      min,
+      max,
+      i18nKey: 'distance',
+      step: 0.5,
+      name: 'distance',
+      label: 'km',
+    }
+  }, [baseDistance])
+
+  return (
+    <CollapsibleItem open={enabled}>
+      <ListItem>
+        <SliderTile
+          slide={slider}
+          handleChange={(_, values) => setFilters(values)}
+          values={filters}
+        />
+      </ListItem>
+    </CollapsibleItem>
+  )
+}
+
+function BaseRoutesDrawer({ subItem }) {
+  return subItem === 'enabled' ? <RouteSlider /> : null
+}
+
+export const RoutesDrawer = React.memo(
+  BaseRoutesDrawer,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/features/drawer/S2Cells.jsx b/src/features/drawer/S2Cells.jsx
new file mode 100644
index 000000000..4db3f602f
--- /dev/null
+++ b/src/features/drawer/S2Cells.jsx
@@ -0,0 +1,60 @@
+// @ts-check
+import * as React from 'react'
+import MenuItem from '@mui/material/MenuItem'
+import { useTranslation } from 'react-i18next'
+
+import { useStorage, useDeepStore } from '@store/useStorage'
+import { S2_LEVELS } from '@assets/constants'
+import { FCSelectListItem } from '@components/inputs/FCSelect'
+
+import { CollapsibleItem } from './components/CollapsibleItem'
+
+const S2Cells = () => {
+  const { t } = useTranslation()
+  const enabled = useStorage((s) => !!s.filters.s2cells.enabled)
+  const [filters, setFilters] = useDeepStore('filters.s2cells.cells')
+  const safe = React.useMemo(
+    () =>
+      Array.isArray(filters)
+        ? filters
+        : typeof filters === 'string'
+        ? // @ts-ignore
+          filters.split(',')
+        : [],
+    [filters],
+  )
+  return (
+    <CollapsibleItem open={enabled}>
+      <FCSelectListItem
+        sx={{ mx: 'auto', width: '90%' }}
+        value={safe}
+        renderValue={(selected) =>
+          Array.isArray(selected) ? selected.join(', ') : selected
+        }
+        multiple
+        onChange={({ target }) =>
+          setFilters(
+            typeof target.value === 'string'
+              ? target.value.split(',')
+              : target.value,
+          )
+        }
+      >
+        {S2_LEVELS.map((level) => (
+          <MenuItem key={level} value={level}>
+            {t('level')} {level}
+          </MenuItem>
+        ))}
+      </FCSelectListItem>
+    </CollapsibleItem>
+  )
+}
+
+function S2CellsComponent({ subItem }) {
+  return subItem === 'enabled' ? <S2Cells /> : null
+}
+
+export const S2CellsDrawer = React.memo(
+  S2CellsComponent,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/features/drawer/Wayfarer.jsx b/src/features/drawer/Wayfarer.jsx
new file mode 100644
index 000000000..b1d85a0ba
--- /dev/null
+++ b/src/features/drawer/Wayfarer.jsx
@@ -0,0 +1,47 @@
+// @ts-check
+import * as React from 'react'
+import ListItemText from '@mui/material/ListItemText'
+import { useTranslation } from 'react-i18next'
+
+import { useStorage } from '@store/useStorage'
+import { WAYFARER_OPTIONS } from '@assets/constants'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+
+import { CollapsibleItem } from './components/CollapsibleItem'
+
+/** @param {{ item: (typeof WAYFARER_OPTIONS)[number], index: number, disabled: boolean }} props */
+const WayfarerOption = ({ item, index, disabled }) => {
+  const { t } = useTranslation()
+  return (
+    <BoolToggle
+      field={`filters.submissionCells.${item}`}
+      disabled={disabled}
+      label=""
+    >
+      <ListItemText inset>
+        {index > 1
+          ? t('s2_cell_level', { level: item.substring(1, 3) })
+          : t(index ? 'include_sponsored' : 'poi')}
+      </ListItemText>
+    </BoolToggle>
+  )
+}
+const SubmissionCells = () => {
+  const enabled = useStorage((s) => !!s.filters?.submissionCells?.enabled)
+  return (
+    <CollapsibleItem open={enabled}>
+      {WAYFARER_OPTIONS.map((item, i) => (
+        <WayfarerOption key={item} item={item} index={i} disabled={!enabled} />
+      ))}
+    </CollapsibleItem>
+  )
+}
+
+function BaseWayfarerDrawer({ subItem }) {
+  return subItem === 'submissionCells' ? <SubmissionCells /> : null
+}
+
+export const WayfarerDrawer = React.memo(
+  BaseWayfarerDrawer,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/components/layout/drawer/areas/AreaTable.jsx b/src/features/drawer/areas/AreaTable.jsx
similarity index 91%
rename from src/components/layout/drawer/areas/AreaTable.jsx
rename to src/features/drawer/areas/AreaTable.jsx
index b68e08a0c..9bd65221d 100644
--- a/src/components/layout/drawer/areas/AreaTable.jsx
+++ b/src/features/drawer/areas/AreaTable.jsx
@@ -1,17 +1,15 @@
 // @ts-check
 import * as React from 'react'
 import { useQuery } from '@apollo/client'
-import {
-  TableContainer,
-  Table,
-  TableBody,
-  TableRow,
-  Paper,
-} from '@mui/material'
+import Paper from '@mui/material/Paper'
+import Table from '@mui/material/Table'
+import TableBody from '@mui/material/TableBody'
+import TableRow from '@mui/material/TableRow'
+import TableContainer from '@mui/material/TableContainer'
 
-import Query from '@services/Query'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { Query } from '@services/queries'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 import { AreaParent } from './Parent'
 import { AreaChild } from './Child'
diff --git a/src/components/layout/drawer/areas/Child.jsx b/src/features/drawer/areas/Child.jsx
similarity index 97%
rename from src/components/layout/drawer/areas/Child.jsx
rename to src/features/drawer/areas/Child.jsx
index ac6315d3b..a22f72aa8 100644
--- a/src/components/layout/drawer/areas/Child.jsx
+++ b/src/features/drawer/areas/Child.jsx
@@ -7,11 +7,11 @@ import IconButton from '@mui/material/IconButton'
 import Button from '@mui/material/Button'
 import Grid2 from '@mui/material/Unstable_Grid2'
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
-
-import { useDeepStore, useStorage } from '@hooks/useStorage'
-import { useMemory } from '@hooks/useMemory'
 import { useMap } from 'react-leaflet'
 
+import { useDeepStore, useStorage } from '@store/useStorage'
+import { useMemory } from '@store/useMemory'
+
 /**
  * @param {{
  *  name?: string
diff --git a/src/components/layout/drawer/areas/Parent.jsx b/src/features/drawer/areas/Parent.jsx
similarity index 73%
rename from src/components/layout/drawer/areas/Parent.jsx
rename to src/features/drawer/areas/Parent.jsx
index d22545501..47f8dda5d 100644
--- a/src/components/layout/drawer/areas/Parent.jsx
+++ b/src/features/drawer/areas/Parent.jsx
@@ -1,8 +1,12 @@
 // @ts-check
 import * as React from 'react'
-import { Table, TableBody, Collapse, TableCell } from '@mui/material'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import TableCell from '@mui/material/TableCell'
+import Collapse from '@mui/material/Collapse'
+import Table from '@mui/material/Table'
+import TableBody from '@mui/material/TableBody'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 /**
  * @param {{
diff --git a/src/components/layout/drawer/areas/index.jsx b/src/features/drawer/areas/index.jsx
similarity index 70%
rename from src/components/layout/drawer/areas/index.jsx
rename to src/features/drawer/areas/index.jsx
index 8642da9b4..571a91751 100644
--- a/src/components/layout/drawer/areas/index.jsx
+++ b/src/features/drawer/areas/index.jsx
@@ -3,15 +3,15 @@ import * as React from 'react'
 import ListItem from '@mui/material/ListItem'
 import RestartAltIcon from '@mui/icons-material/RestartAlt'
 
-import { useStorage } from '@hooks/useStorage'
-import { BasicListButton } from '@components/layout/general/BasicListButton'
+import { useStorage } from '@store/useStorage'
+import { BasicListButton } from '@components/inputs/BasicListButton'
+import { GenericSearch } from '@components/inputs/GenericSearch'
 
-import { GenericSearch } from '../ItemSearch'
 import { ScanAreasTable } from './AreaTable'
 
 const onClick = () => useStorage.getState().setAreas()
 
-function AreaDropDown() {
+function Area() {
   return (
     <>
       <BasicListButton label="reset" onClick={onClick}>
@@ -27,4 +27,4 @@ function AreaDropDown() {
   )
 }
 
-export default React.memo(AreaDropDown)
+export const AreaSection = React.memo(Area)
diff --git a/src/components/layout/drawer/Actions.jsx b/src/features/drawer/components/Actions.jsx
similarity index 90%
rename from src/components/layout/drawer/Actions.jsx
rename to src/features/drawer/components/Actions.jsx
index 53c891dbd..6370ba786 100644
--- a/src/components/layout/drawer/Actions.jsx
+++ b/src/features/drawer/components/Actions.jsx
@@ -12,15 +12,15 @@ import ImportExportIcon from '@mui/icons-material/ImportExport'
 import TrendingUpIcon from '@mui/icons-material/TrendingUp'
 import FeedbackIcon from '@mui/icons-material/Feedback'
 import HeartIcon from '@mui/icons-material/Favorite'
-import { downloadJson } from '@services/functions/downloadJson'
-import { deepMerge } from '@services/functions/deepMerge'
-import { useMapStore } from '@hooks/useMapStore'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import { I } from '../general/I'
-import { BasicListButton } from '../general/BasicListButton'
+import { downloadJson } from '@utils/downloadJson'
+import { deepMerge } from '@utils/deepMerge'
+import { useMapStore } from '@store/useMapStore'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useStorage } from '@store/useStorage'
+import { I } from '@components/I'
+import { BasicListButton } from '@components/inputs/BasicListButton'
 
 /** @type {React.ChangeEventHandler<HTMLInputElement>} */
 const importSettings = (e) => {
@@ -53,7 +53,7 @@ const renderLink = React.forwardRef(({ to, ...itemProps }, ref) => (
   <Link to={to} ref={ref} {...itemProps} />
 ))
 
-export default function DrawerActions() {
+export function DrawerActions() {
   const {
     auth: { loggedIn, methods },
     config,
diff --git a/src/features/drawer/components/AllForts.jsx b/src/features/drawer/components/AllForts.jsx
new file mode 100644
index 000000000..e30db94cc
--- /dev/null
+++ b/src/features/drawer/components/AllForts.jsx
@@ -0,0 +1,37 @@
+// @ts-check
+import * as React from 'react'
+import Box from '@mui/material/Box'
+import ListItem from '@mui/material/ListItem'
+import ListItemText from '@mui/material/ListItemText'
+import { useTranslation } from 'react-i18next'
+
+import { useStorage } from '@store/useStorage'
+import { FORT_LEVELS } from '@assets/constants'
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
+
+import { CollapsibleItem } from './CollapsibleItem'
+import { SelectorListMemo } from './SelectorList'
+
+/** @param {{ category: 'pokestops' | 'gyms', subItem: string }} props */
+const BaseAllForts = ({ category, subItem }) => {
+  const { t } = useTranslation()
+  const enabled = useStorage((s) => !!s.filters?.[category]?.[subItem])
+  return (
+    <CollapsibleItem open={enabled}>
+      <ListItem>
+        <ListItemText primary={t('power_up')} />
+        <MultiSelectorStore
+          field={`filters.${category}.levels`}
+          items={FORT_LEVELS}
+        />
+      </ListItem>
+      {category === 'gyms' && (
+        <Box px={2}>
+          <SelectorListMemo category={category} height={175} />
+        </Box>
+      )}
+    </CollapsibleItem>
+  )
+}
+
+export const AllForts = React.memo(BaseAllForts)
diff --git a/src/components/layout/drawer/CollapsibleItem.jsx b/src/features/drawer/components/CollapsibleItem.jsx
similarity index 100%
rename from src/components/layout/drawer/CollapsibleItem.jsx
rename to src/features/drawer/components/CollapsibleItem.jsx
diff --git a/src/components/layout/drawer/Section.jsx b/src/features/drawer/components/Section.jsx
similarity index 84%
rename from src/components/layout/drawer/Section.jsx
rename to src/features/drawer/components/Section.jsx
index 7c8f4480a..2cf5441f0 100644
--- a/src/components/layout/drawer/Section.jsx
+++ b/src/features/drawer/components/Section.jsx
@@ -8,20 +8,19 @@ import Accordion from '@mui/material/Accordion'
 import AccordionSummary from '@mui/material/AccordionSummary'
 import AccordionDetails from '@mui/material/AccordionDetails'
 import List from '@mui/material/List'
-
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { toggleDialog, useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { toggleDialog, useLayoutStore } from '@store/useLayoutStore'
+import { useStorage } from '@store/useStorage'
+import { BasicListButton } from '@components/inputs/BasicListButton'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+import { camelToSnake } from '@utils/strings'
 
-import SettingsMenu from './Settings'
-import { PokemonDrawerMemo } from './Pokemon'
-import Areas from './areas'
-import Extras from './Extras'
-import { BoolToggle } from './BoolToggle'
-import { BasicListButton } from '../general/BasicListButton'
+import { Settings } from '../settings'
+import { PokemonDrawerMemo } from '../pokemon'
+import { AreaSection } from '../areas'
+import { Extras } from '../Extras'
 
 const ADV_CATEGORIES = new Set(['pokemon', 'gyms', 'pokestops', 'nests'])
 
@@ -59,14 +58,14 @@ const DrawerSection = ({ category }) => {
       TransitionProps={{ unmountOnExit }}
     >
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
-        <Typography>{t(Utility.camelToSnake(category))}</Typography>
+        <Typography>{t(camelToSnake(category))}</Typography>
       </AccordionSummary>
       <AccordionDetails sx={{ p: 0 }}>
         <List>
           {category === 'pokemon' ? (
             <PokemonDrawerMemo />
           ) : category === 'settings' ? (
-            <SettingsMenu />
+            <Settings />
           ) : (
             Object.keys(value).map((subItem) => {
               const hasSubSubCategories =
@@ -103,7 +102,7 @@ const DrawerSection = ({ category }) => {
               <TuneIcon color="primary" />
             </BasicListButton>
           )}
-          {category === 'scanAreas' && <Areas />}
+          {category === 'scanAreas' && <AreaSection />}
         </List>
       </AccordionDetails>
     </Accordion>
diff --git a/src/components/layout/drawer/SelectorList.jsx b/src/features/drawer/components/SelectorList.jsx
similarity index 93%
rename from src/components/layout/drawer/SelectorList.jsx
rename to src/features/drawer/components/SelectorList.jsx
index a4ba63dab..800cb3bb6 100644
--- a/src/components/layout/drawer/SelectorList.jsx
+++ b/src/features/drawer/components/SelectorList.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-fallthrough */
 // @ts-check
 import * as React from 'react'
 import TuneIcon from '@mui/icons-material/Tune'
@@ -18,16 +17,15 @@ import { capitalize } from '@mui/material/utils'
 import { useTranslation } from 'react-i18next'
 
 import { useTranslateById } from '@hooks/useTranslateById'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useDeepStore, useStorage } from '@hooks/useStorage'
-import useGetAvailable from '@hooks/useGetAvailable'
-
-import { BoolToggle } from './BoolToggle'
-import { GenericSearchMemo } from './ItemSearch'
-import { StandardItem } from './SelectorItem'
-import { VirtualGrid } from '../general/VirtualGrid'
-import TabPanel from '../general/TabPanel'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useDeepStore, useStorage } from '@store/useStorage'
+import { useGetAvailable } from '@hooks/useGetAvailable'
+import { VirtualGrid } from '@components/virtual/VirtualGrid'
+import { TabPanel } from '@components/TabPanel'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+import { GenericSearchMemo } from '@components/inputs/GenericSearch'
+import { StandardItem } from '@components/virtual/StandardItem'
 
 /**
  * @template {keyof import('@rm/types').Available} T
diff --git a/src/features/drawer/gyms/GymBadges.jsx b/src/features/drawer/gyms/GymBadges.jsx
new file mode 100644
index 000000000..b3109c3dd
--- /dev/null
+++ b/src/features/drawer/gyms/GymBadges.jsx
@@ -0,0 +1,26 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { useStorage } from '@store/useStorage'
+import { BADGES } from '@assets/constants'
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+
+const BaseGymBadges = () => {
+  const enabled = useStorage((s) => !!s.filters?.gyms?.gymBadges)
+  return (
+    <CollapsibleItem open={enabled}>
+      <ListItem>
+        <MultiSelectorStore
+          field="filters.gyms.badge"
+          allowNone
+          items={BADGES}
+        />
+      </ListItem>
+    </CollapsibleItem>
+  )
+}
+
+export const GymBadges = React.memo(BaseGymBadges)
diff --git a/src/features/drawer/gyms/Raids.jsx b/src/features/drawer/gyms/Raids.jsx
new file mode 100644
index 000000000..1997a681b
--- /dev/null
+++ b/src/features/drawer/gyms/Raids.jsx
@@ -0,0 +1,84 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+import ListItemText from '@mui/material/ListItemText'
+import MenuItem from '@mui/material/MenuItem'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage, useDeepStore } from '@store/useStorage'
+import { FCSelect } from '@components/inputs/FCSelect'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+import { MultiSelectorList, SelectorListMemo } from '../components/SelectorList'
+
+const RaidOverride = () => {
+  const { t } = useTranslation()
+  const available = useMemory((s) => s.available.gyms)
+  const enabled = useStorage((s) => !!s.filters?.gyms?.raids)
+  const [filters, setFilters] = useDeepStore('filters.gyms.raidTier', 'all')
+  return (
+    <CollapsibleItem open={enabled}>
+      <ListItem
+        secondaryAction={
+          <FCSelect
+            value={filters}
+            fullWidth
+            size="small"
+            onChange={(e) =>
+              setFilters(e.target.value === 'all' ? 'all' : +e.target.value)
+            }
+          >
+            {[
+              'all',
+              ...available
+                .filter((x) => x.startsWith('r'))
+                .map((y) => +y.slice(1)),
+            ].map((tier, i) => (
+              <MenuItem key={tier} dense value={tier}>
+                {t(i ? `raid_${tier}_plural` : 'disabled')}
+              </MenuItem>
+            ))}
+          </FCSelect>
+        }
+      >
+        <ListItemText primary={t('raid_override')} />
+      </ListItem>
+    </CollapsibleItem>
+  )
+}
+
+const RaidQuickSelect = () => {
+  const enabled = useStorage(
+    (s) => !!(s.filters?.gyms?.raids && s.filters?.gyms?.raidTier === 'all'),
+  )
+  return (
+    <CollapsibleItem open={enabled}>
+      <MultiSelectorList tabKey="raids">
+        <SelectorListMemo
+          key="eggs"
+          category="gyms"
+          subCategory="raids"
+          label="search_eggs"
+          height={350}
+        />
+        <SelectorListMemo
+          key="raids"
+          category="gyms"
+          subCategory="pokemon"
+          label="search_raids"
+          height={350}
+        />
+      </MultiSelectorList>
+    </CollapsibleItem>
+  )
+}
+
+const BaseRaids = () => (
+  <>
+    <RaidOverride />
+    <RaidQuickSelect />
+  </>
+)
+
+export const Raids = React.memo(BaseRaids)
diff --git a/src/features/drawer/gyms/index.jsx b/src/features/drawer/gyms/index.jsx
new file mode 100644
index 000000000..3d80c618e
--- /dev/null
+++ b/src/features/drawer/gyms/index.jsx
@@ -0,0 +1,24 @@
+// @ts-check
+import * as React from 'react'
+
+import { AllForts } from '../components/AllForts'
+import { GymBadges } from './GymBadges'
+import { Raids } from './Raids'
+
+function ExtrasComponent({ subItem }) {
+  switch (subItem) {
+    case 'allGyms':
+      return <AllForts category="gyms" subItem={subItem} />
+    case 'gymBadges':
+      return <GymBadges />
+    case 'raids':
+      return <Raids />
+    default:
+      return null
+  }
+}
+
+export const GymDrawer = React.memo(
+  ExtrasComponent,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/components/layout/drawer/Drawer.jsx b/src/features/drawer/index.jsx
similarity index 77%
rename from src/components/layout/drawer/Drawer.jsx
rename to src/features/drawer/index.jsx
index 3964753fd..bc93323a3 100644
--- a/src/components/layout/drawer/Drawer.jsx
+++ b/src/features/drawer/index.jsx
@@ -2,19 +2,19 @@
 import * as React from 'react'
 import Clear from '@mui/icons-material/Clear'
 import List from '@mui/material/List'
-import Drawer from '@mui/material/Drawer'
+import MuiDrawer from '@mui/material/Drawer'
 import IconButton from '@mui/material/IconButton'
 import ListItem from '@mui/material/ListItem'
 import ListItemText from '@mui/material/ListItemText'
 import ListItemIcon from '@mui/material/ListItemIcon'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { Img } from '@components/Img'
+import { DividerWithMargin } from '@components/StyledDivider'
 
-import Actions from './Actions'
-import { DrawerSectionMemo } from './Section'
-import { Img } from '../general/Img'
-import { DividerWithMargin } from '../general/StyledDivider'
+import { DrawerActions } from './components/Actions'
+import { DrawerSectionMemo } from './components/Section'
 
 const handleClose = () => useLayoutStore.setState({ drawer: false })
 
@@ -48,12 +48,12 @@ const listItemSx = /** @type {import('@mui/material').SxProps} */ ({
   display: 'block',
 })
 
-export default function Sidebar() {
+export function Drawer() {
   const drawer = useLayoutStore((s) => s.drawer)
   const { config, ui } = useMemory.getState()
 
   return (
-    <Drawer
+    <MuiDrawer
       anchor="left"
       variant="temporary"
       open={drawer}
@@ -70,7 +70,9 @@ export default function Sidebar() {
           </React.Fragment>
         ))}
       </List>
-      {config.general.separateDrawerActions && <Actions />}
-    </Drawer>
+      {config.general.separateDrawerActions && <DrawerActions />}
+    </MuiDrawer>
   )
 }
+
+export * from './pokemon/FilterHelp'
diff --git a/src/features/drawer/nests/AvgSlider.jsx b/src/features/drawer/nests/AvgSlider.jsx
new file mode 100644
index 000000000..37ffdd619
--- /dev/null
+++ b/src/features/drawer/nests/AvgSlider.jsx
@@ -0,0 +1,24 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { useMemory } from '@store/useMemory'
+import { useDeepStore } from '@store/useStorage'
+import { SliderTile } from '@components/inputs/SliderTile'
+
+const BaseNestSlider = () => {
+  const slider = useMemory((s) => s.ui.nests?.sliders?.secondary?.[0])
+  const [filters, setFilters] = useDeepStore(`filters.nests.avgFilter`)
+  if (!filters || !slider) return null
+  return (
+    <ListItem>
+      <SliderTile
+        slide={slider}
+        handleChange={(_, values) => setFilters(values)}
+        values={filters}
+      />
+    </ListItem>
+  )
+}
+
+export const NestSlider = React.memo(BaseNestSlider)
diff --git a/src/features/drawer/nests/NestSelector.jsx b/src/features/drawer/nests/NestSelector.jsx
new file mode 100644
index 000000000..894369e5e
--- /dev/null
+++ b/src/features/drawer/nests/NestSelector.jsx
@@ -0,0 +1,21 @@
+// @ts-check
+import * as React from 'react'
+import Box from '@mui/material/Box'
+
+import { useStorage } from '@store/useStorage'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+import { SelectorListMemo } from '../components/SelectorList'
+
+const BaseNestQuickSelect = () => {
+  const enabled = useStorage((s) => !!s.filters?.nests?.pokemon)
+  return (
+    <CollapsibleItem open={enabled}>
+      <Box px={2}>
+        <SelectorListMemo category="nests" label="search_nests" height={350} />
+      </Box>
+    </CollapsibleItem>
+  )
+}
+
+export const NestQuickSelect = React.memo(BaseNestQuickSelect)
diff --git a/src/features/drawer/nests/index.jsx b/src/features/drawer/nests/index.jsx
new file mode 100644
index 000000000..38757c59f
--- /dev/null
+++ b/src/features/drawer/nests/index.jsx
@@ -0,0 +1,21 @@
+// @ts-check
+import * as React from 'react'
+
+import { NestSlider } from './AvgSlider'
+import { NestQuickSelect } from './NestSelector'
+
+function BaseNestDrawer({ subItem }) {
+  switch (subItem) {
+    case 'sliders':
+      return <NestSlider />
+    case 'pokemon':
+      return <NestQuickSelect />
+    default:
+      return null
+  }
+}
+
+export const NestsDrawer = React.memo(
+  BaseNestDrawer,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/components/layout/dialogs/filters/PkmnFilterHelp.jsx b/src/features/drawer/pokemon/FilterHelp.jsx
similarity index 92%
rename from src/components/layout/dialogs/filters/PkmnFilterHelp.jsx
rename to src/features/drawer/pokemon/FilterHelp.jsx
index ca9fd855a..85cee043a 100644
--- a/src/components/layout/dialogs/filters/PkmnFilterHelp.jsx
+++ b/src/features/drawer/pokemon/FilterHelp.jsx
@@ -5,14 +5,15 @@ import Box from '@mui/material/Box'
 import Typography from '@mui/material/Typography'
 import Grid2 from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
-import { Chip, Divider, useMediaQuery } from '@mui/material'
+import useMediaQuery from '@mui/material/useMediaQuery'
+import Divider from '@mui/material/Divider'
+import Chip from '@mui/material/Chip'
 
-import Header from '@components/layout/general/Header'
-import Footer from '@components/layout/general/Footer'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-
-import { DialogWrapper } from '../DialogWrapper'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { DialogWrapper } from '@components/dialogs/DialogWrapper'
 
 const GAP = 2
 
@@ -94,7 +95,7 @@ function Card({ title, children, bgcolor, fullSize }) {
 const handleClose = () => useLayoutStore.setState({ pkmnFilterHelp: false })
 
 const OPTIONS =
-  /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
+  /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
     { name: 'close', color: 'error', action: handleClose },
   ])
 
diff --git a/src/features/drawer/pokemon/ModeSelector.jsx b/src/features/drawer/pokemon/ModeSelector.jsx
new file mode 100644
index 000000000..2f1b7c7da
--- /dev/null
+++ b/src/features/drawer/pokemon/ModeSelector.jsx
@@ -0,0 +1,61 @@
+// @ts-check
+import * as React from 'react'
+import MenuItem from '@mui/material/MenuItem'
+import Typography from '@mui/material/Typography'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { FCSelectListItem } from '@components/inputs/FCSelect'
+
+export function PokemonModeSelector() {
+  const filterMode = useStorage((s) => s.getPokemonFilterMode())
+  const { t } = useTranslation()
+  const ui = useMemory((s) => s.ui.pokemon)
+  const selectRef = React.useRef(/** @type {HTMLDivElement | null} */ (null))
+
+  return (
+    <FCSelectListItem
+      label={t('pokemon_filter_mode')}
+      ref={selectRef}
+      value={filterMode}
+      fullWidth
+      size="small"
+      renderValue={(selected) => t(selected)}
+      onChange={(e) => {
+        const { setPokemonFilterMode } = useStorage.getState()
+        switch (e.target.value) {
+          case 'basic':
+            return setPokemonFilterMode(false, true)
+          case 'intermediate':
+            return setPokemonFilterMode(false, false)
+          case 'expert':
+            return setPokemonFilterMode(true, false)
+          default:
+        }
+      }}
+    >
+      {['basic', 'intermediate', ...(ui.legacy ? ['expert'] : [])].map(
+        (tier) => (
+          <MenuItem
+            key={tier}
+            dense
+            value={tier}
+            sx={{
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'flex-start',
+              whiteSpace: 'normal',
+              width: selectRef.current?.clientWidth || 'auto',
+            }}
+          >
+            <Typography variant="subtitle2">{t(tier)}</Typography>
+            <Typography variant="caption" flexWrap="wrap">
+              {t(`${tier}_description`)}
+            </Typography>
+          </MenuItem>
+        ),
+      )}
+    </FCSelectListItem>
+  )
+}
diff --git a/src/features/drawer/pokemon/PokemonSlider.jsx b/src/features/drawer/pokemon/PokemonSlider.jsx
new file mode 100644
index 000000000..ac4bfe6d9
--- /dev/null
+++ b/src/features/drawer/pokemon/PokemonSlider.jsx
@@ -0,0 +1,27 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage, setDeepStore } from '@store/useStorage'
+import { SliderTile } from '@components/inputs/SliderTile'
+import { analytics } from '@utils/analytics'
+
+/** @type {import('@rm/types').RMSliderHandleChange<keyof import('@rm/types').PokemonFilter>} */
+const handleChange = (name, values) => {
+  const { ivOr } = useMemory.getState().filters.pokemon
+  if (name in ivOr) {
+    setDeepStore(`filters.pokemon.ivOr.${name}`, values)
+  }
+  analytics('Global Pokemon', `${name}: ${values}`, `Pokemon Text`)
+}
+
+/** @param {{ slider: import('@rm/types').RMSlider }} props */
+export function PokemonSlider({ slider }) {
+  const values = useStorage((s) => s.filters.pokemon.ivOr[slider.name])
+  return (
+    <ListItem disablePadding>
+      <SliderTile slide={slider} handleChange={handleChange} values={values} />
+    </ListItem>
+  )
+}
diff --git a/src/features/drawer/pokemon/PokemonTab.jsx b/src/features/drawer/pokemon/PokemonTab.jsx
new file mode 100644
index 000000000..1daf30820
--- /dev/null
+++ b/src/features/drawer/pokemon/PokemonTab.jsx
@@ -0,0 +1,52 @@
+// @ts-check
+import * as React from 'react'
+import Divider from '@mui/material/Divider'
+import List from '@mui/material/List'
+import ListSubheader from '@mui/material/ListSubheader'
+import { useTranslation } from 'react-i18next'
+
+import { XXS_XXL, NUNDO_HUNDO } from '@assets/constants'
+import { TabPanel } from '@components/TabPanel'
+import { GenderListItem } from '@components/filters/Gender'
+import { DualBoolToggle } from '@components/inputs/BoolToggle'
+import { PokemonSlider } from './PokemonSlider'
+
+/**
+ *
+ * @param {{
+ *  openTab: number,
+ *  index: number,
+ *  sliders: import('@rm/types').RMSlider[],
+ * }} param0
+ * @returns
+ */
+export function PokemonTabPanel({ openTab, index, sliders }) {
+  const { t } = useTranslation()
+  return (
+    <TabPanel value={openTab} index={index}>
+      <List>
+        {sliders.map((slider) => (
+          <PokemonSlider key={slider.name} slider={slider} />
+        ))}
+        {index ? (
+          <DualBoolToggle
+            items={XXS_XXL}
+            field="filters.pokemon.ivOr"
+            label="size_1-size_5"
+          />
+        ) : (
+          <>
+            <GenderListItem
+              disablePadding
+              field="filters.pokemon.ivOr"
+              sx={{ pt: 1 }}
+            />
+            <Divider sx={{ mt: 2, mb: 1 }} />
+            <ListSubheader disableGutters>{t('quick_select')}</ListSubheader>
+            <DualBoolToggle field="filters.pokemon" items={NUNDO_HUNDO} />
+          </>
+        )}
+      </List>
+    </TabPanel>
+  )
+}
diff --git a/src/features/drawer/pokemon/index.jsx b/src/features/drawer/pokemon/index.jsx
new file mode 100644
index 000000000..f60946800
--- /dev/null
+++ b/src/features/drawer/pokemon/index.jsx
@@ -0,0 +1,77 @@
+// @ts-check
+import * as React from 'react'
+import AppBar from '@mui/material/AppBar'
+import Tab from '@mui/material/Tab'
+import Tabs from '@mui/material/Tabs'
+import Collapse from '@mui/material/Collapse'
+import { useTranslation } from 'react-i18next'
+import Help from '@mui/icons-material/HelpOutline'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage, useDeepStore } from '@store/useStorage'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { StringFilterMemo } from '@components/filters/StringFilter'
+import { TabPanel } from '@components/TabPanel'
+import { BasicListButton } from '@components/inputs/BasicListButton'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+
+import { SelectorListMemo } from '../components/SelectorList'
+import { PokemonTabPanel } from './PokemonTab'
+import { PokemonModeSelector } from './ModeSelector'
+
+function PokemonDrawer() {
+  const { t } = useTranslation()
+  const filterMode = useStorage((s) => s.getPokemonFilterMode())
+  const [openTab, setOpenTab] = useDeepStore(`tabs.pokemon`, 0)
+  const ui = useMemory((s) => s.ui.pokemon)
+
+  /** @type {import('@mui/material').TabsProps['onChange']} */
+  const handleTabChange = React.useCallback(
+    (_e, newValue) => setOpenTab(newValue),
+    [],
+  )
+
+  return (
+    <>
+      <BoolToggle field="filters.pokemon.enabled" label="enabled" />
+      <PokemonModeSelector />
+      <Collapse in={filterMode === 'intermediate'}>
+        <BoolToggle
+          field="userSettings.pokemon.linkGlobalAndAdvanced"
+          label="link_global_and_advanced"
+        />
+      </Collapse>
+      <Collapse in={filterMode === 'expert' && ui.legacy}>
+        <StringFilterMemo field="filters.pokemon.ivOr" />
+      </Collapse>
+      <Collapse in={filterMode !== 'expert'}>
+        <AppBar position="static">
+          <Tabs value={openTab} onChange={handleTabChange}>
+            <Tab label={t('main')} />
+            <Tab label={t('extra')} />
+            <Tab label={t('select')} />
+          </Tabs>
+        </AppBar>
+        {Object.entries(ui.sliders).map(([sType, sliders], index) => (
+          <PokemonTabPanel
+            key={sType}
+            openTab={openTab}
+            index={index}
+            sliders={sliders}
+          />
+        ))}
+        <TabPanel value={openTab} index={2} disablePadding>
+          <SelectorListMemo category="pokemon" />
+        </TabPanel>
+      </Collapse>
+      <BasicListButton
+        label="filter_help"
+        onClick={() => useLayoutStore.setState({ pkmnFilterHelp: true })}
+      >
+        <Help />
+      </BasicListButton>
+    </>
+  )
+}
+
+export const PokemonDrawerMemo = React.memo(PokemonDrawer)
diff --git a/src/features/drawer/pokestops/EventStops.jsx b/src/features/drawer/pokestops/EventStops.jsx
new file mode 100644
index 000000000..8e9e27adc
--- /dev/null
+++ b/src/features/drawer/pokestops/EventStops.jsx
@@ -0,0 +1,25 @@
+// @ts-check
+import * as React from 'react'
+import Box from '@mui/material/Box'
+
+import { useStorage } from '@store/useStorage'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+import { SelectorListMemo } from '../components/SelectorList'
+
+const BaseEventsQuickSelect = () => {
+  const enabled = useStorage((s) => !!s.filters?.pokestops?.eventStops)
+  return (
+    <CollapsibleItem open={enabled}>
+      <Box px={2}>
+        <SelectorListMemo
+          category="pokestops"
+          subCategory="showcase"
+          height={175}
+        />
+      </Box>
+    </CollapsibleItem>
+  )
+}
+
+export const EventsQuickSelect = React.memo(BaseEventsQuickSelect)
diff --git a/src/features/drawer/pokestops/Invasions.jsx b/src/features/drawer/pokestops/Invasions.jsx
new file mode 100644
index 000000000..112a3781f
--- /dev/null
+++ b/src/features/drawer/pokestops/Invasions.jsx
@@ -0,0 +1,59 @@
+// @ts-check
+import * as React from 'react'
+import Box from '@mui/material/Box'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+import { MultiSelectorList, SelectorListMemo } from '../components/SelectorList'
+
+const BaseInvasion = () => {
+  const enabled = useStorage((s) => !!s.filters?.pokestops?.invasions)
+  const hasConfirmed = useMemory((s) =>
+    s.available.pokestops.some((x) => x.startsWith('a')),
+  )
+  const confirmedEnabled = useStorage((s) => !!s.filters?.pokestops?.confirmed)
+  return (
+    <CollapsibleItem open={enabled}>
+      {(confirmedEnabled || hasConfirmed) && (
+        <BoolToggle
+          inset
+          field="filters.pokestops.confirmed"
+          label="only_confirmed"
+        />
+      )}
+      {confirmedEnabled || hasConfirmed ? (
+        <MultiSelectorList tabKey="invasions">
+          <SelectorListMemo
+            key="invasions"
+            category="pokestops"
+            subCategory="invasions"
+            label="search_invasions"
+            height={350}
+          />
+          <SelectorListMemo
+            key="rocket_pokemon"
+            category="pokestops"
+            subCategory="rocketPokemon"
+            label="search_rocket_pokemon"
+            height={350}
+          />
+        </MultiSelectorList>
+      ) : (
+        <Box px={2}>
+          <SelectorListMemo
+            key="invasions"
+            category="pokestops"
+            subCategory="invasions"
+            label="search_invasions"
+            height={350}
+          />
+        </Box>
+      )}
+    </CollapsibleItem>
+  )
+}
+
+export const InvasionQuickSelect = React.memo(BaseInvasion)
diff --git a/src/features/drawer/pokestops/Lures.jsx b/src/features/drawer/pokestops/Lures.jsx
new file mode 100644
index 000000000..b8f03ea06
--- /dev/null
+++ b/src/features/drawer/pokestops/Lures.jsx
@@ -0,0 +1,25 @@
+// @ts-check
+import * as React from 'react'
+import Box from '@mui/material/Box'
+
+import { useStorage } from '@store/useStorage'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+import { SelectorListMemo } from '../components/SelectorList'
+
+const BaseLureQuickSelect = () => {
+  const enabled = useStorage((s) => !!s.filters?.pokestops?.lures)
+  return (
+    <CollapsibleItem open={enabled}>
+      <Box px={2}>
+        <SelectorListMemo
+          category="pokestops"
+          subCategory="lures"
+          label="search_lures"
+          height={175}
+        />
+      </Box>
+    </CollapsibleItem>
+  )
+}
+export const LureQuickSelect = React.memo(BaseLureQuickSelect)
diff --git a/src/features/drawer/pokestops/Quests.jsx b/src/features/drawer/pokestops/Quests.jsx
new file mode 100644
index 000000000..bb127fe32
--- /dev/null
+++ b/src/features/drawer/pokestops/Quests.jsx
@@ -0,0 +1,41 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+
+import { useStorage } from '@store/useStorage'
+import { QUEST_SETS } from '@assets/constants'
+import { MultiSelectorStore } from '@components/inputs/MultiSelector'
+
+import { CollapsibleItem } from '../components/CollapsibleItem'
+import { MultiSelectorList, SelectorListMemo } from '../components/SelectorList'
+
+const BaseQuestQuickSelect = () => {
+  const enabled = useStorage((s) => !!s.filters?.pokestops?.quests)
+  return (
+    <CollapsibleItem open={enabled}>
+      <ListItem>
+        <MultiSelectorStore
+          field="filters.pokestops.showQuestSet"
+          items={QUEST_SETS}
+        />
+      </ListItem>
+      <MultiSelectorList tabKey="quests">
+        <SelectorListMemo
+          key="items"
+          category="pokestops"
+          subCategory="quests"
+          label="search_quests"
+          height={350}
+        />
+        <SelectorListMemo
+          key="pokemon"
+          category="pokestops"
+          subCategory="pokemon"
+          label="search_quests"
+          height={350}
+        />
+      </MultiSelectorList>
+    </CollapsibleItem>
+  )
+}
+export const QuestQuickSelect = React.memo(BaseQuestQuickSelect)
diff --git a/src/features/drawer/pokestops/index.jsx b/src/features/drawer/pokestops/index.jsx
new file mode 100644
index 000000000..526b69429
--- /dev/null
+++ b/src/features/drawer/pokestops/index.jsx
@@ -0,0 +1,30 @@
+// @ts-check
+import * as React from 'react'
+
+import { AllForts } from '../components/AllForts'
+import { LureQuickSelect } from './Lures'
+import { InvasionQuickSelect } from './Invasions'
+import { QuestQuickSelect } from './Quests'
+import { EventsQuickSelect } from './EventStops'
+
+function ExtrasComponent({ subItem }) {
+  switch (subItem) {
+    case 'allPokestops':
+      return <AllForts category="pokestops" subItem={subItem} />
+    case 'quests':
+      return <QuestQuickSelect />
+    case 'invasions':
+      return <InvasionQuickSelect />
+    case 'eventStops':
+      return <EventsQuickSelect />
+    case 'lures':
+      return <LureQuickSelect />
+    default:
+      return null
+  }
+}
+
+export const PokestopDrawer = React.memo(
+  ExtrasComponent,
+  (prev, next) => prev.subItem === next.subItem,
+)
diff --git a/src/features/drawer/settings/General.jsx b/src/features/drawer/settings/General.jsx
new file mode 100644
index 000000000..43995111a
--- /dev/null
+++ b/src/features/drawer/settings/General.jsx
@@ -0,0 +1,54 @@
+// @ts-check
+import * as React from 'react'
+import MenuItem from '@mui/material/MenuItem'
+import MapIcon from '@mui/icons-material/Map'
+import NavIcon from '@mui/icons-material/Navigation'
+import StyleIcon from '@mui/icons-material/Style'
+import DevicesOtherIcon from '@mui/icons-material/DevicesOther'
+import SquareFootIcon from '@mui/icons-material/SquareFoot'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { getProperName, camelToSnake } from '@utils/strings'
+import { FCSelectListItem } from '@components/inputs/FCSelect'
+
+const ICON_MAP = {
+  navigation: <NavIcon />,
+  navigationControls: <StyleIcon />,
+  tileServers: <MapIcon />,
+  distanceUnit: <SquareFootIcon />,
+}
+const FALLBACK = <DevicesOtherIcon />
+
+export function GeneralSetting({ setting }) {
+  const { t } = useTranslation()
+  const staticSettings = useMemory((s) => s.settings)
+  const value = useStorage((s) => s.settings[setting])
+  return (
+    <FCSelectListItem
+      key={setting}
+      name={setting}
+      value={staticSettings[setting][value]?.name || ''}
+      label={t(camelToSnake(setting))}
+      onChange={({ target }) => {
+        useStorage.setState((prev) => ({
+          settings: {
+            ...prev.settings,
+            [target.name]: staticSettings[target.name][target.value].name,
+          },
+        }))
+      }}
+      icon={ICON_MAP[setting] || FALLBACK}
+    >
+      {Object.keys(staticSettings[setting]).map((option) => (
+        <MenuItem key={option} value={option}>
+          {t(
+            `${camelToSnake(setting)}_${option.toLowerCase()}`,
+            t(option.toLowerCase(), getProperName(option)),
+          )}
+        </MenuItem>
+      ))}
+    </FCSelectListItem>
+  )
+}
diff --git a/src/features/drawer/settings/Holiday.jsx b/src/features/drawer/settings/Holiday.jsx
new file mode 100644
index 000000000..296a1d593
--- /dev/null
+++ b/src/features/drawer/settings/Holiday.jsx
@@ -0,0 +1,31 @@
+// @ts-check
+import * as React from 'react'
+import ListItemIcon from '@mui/material/ListItemIcon'
+import CakeIcon from '@mui/icons-material/Cake'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+
+import { SettingIcon } from './Icon'
+
+export function HolidaySetting() {
+  const { t } = useTranslation()
+  const holidayEffects = useMemory((s) => s.config.holidayEffects)
+
+  return (holidayEffects || []).map(({ name, images }) => (
+    <BoolToggle
+      key={name}
+      field={`holidayEffects.${name}`}
+      label={t('disable', { name })}
+    >
+      <ListItemIcon>
+        {images?.length > 0 ? (
+          <SettingIcon src={images[0]} alt={name} />
+        ) : (
+          <CakeIcon />
+        )}
+      </ListItemIcon>
+    </BoolToggle>
+  ))
+}
diff --git a/src/features/drawer/settings/Icon.jsx b/src/features/drawer/settings/Icon.jsx
new file mode 100644
index 000000000..0db8710a5
--- /dev/null
+++ b/src/features/drawer/settings/Icon.jsx
@@ -0,0 +1,18 @@
+// @ts-check
+import * as React from 'react'
+
+import { useStorage } from '@store/useStorage'
+
+/** @param {React.ImgHTMLAttributes<HTMLImageElement>} props */
+export function SettingIcon({ src, alt, ...props }) {
+  const darkMode = useStorage((s) => s.darkMode)
+  return (
+    <img
+      src={src}
+      alt={alt}
+      width={24}
+      className={darkMode ? '' : 'darken-image'}
+      {...props}
+    />
+  )
+}
diff --git a/src/features/drawer/settings/UAssets.jsx b/src/features/drawer/settings/UAssets.jsx
new file mode 100644
index 000000000..3f03a02a6
--- /dev/null
+++ b/src/features/drawer/settings/UAssets.jsx
@@ -0,0 +1,79 @@
+// @ts-check
+import * as React from 'react'
+import ListSubheader from '@mui/material/ListSubheader'
+import MenuItem from '@mui/material/MenuItem'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { DividerWithMargin } from '@components/StyledDivider'
+import { getProperName } from '@utils/strings'
+import { FCSelectListItem } from '@components/inputs/FCSelect'
+import { SettingIcon } from './Icon'
+
+/**
+ *
+ * @param {{ asset: 'icons' | 'audio' }} param0
+ * @returns
+ */
+export function UAssetSetting({ asset }) {
+  const { t } = useTranslation()
+  const customizable = useMemory(
+    (s) => s[asset === 'icons' ? 'Icons' : 'Audio'].customizable,
+  )
+
+  if (customizable.length === 0) return null
+  return (
+    <>
+      <ListSubheader>{t(asset)}</ListSubheader>
+      {customizable.map((category) => (
+        <UAssetSelect
+          key={`${asset}${category}`}
+          asset={asset}
+          category={category}
+        />
+      ))}
+      <DividerWithMargin />
+    </>
+  )
+}
+
+/**
+ *
+ * @param {{ asset: 'icons' | 'audio', category: string }} props
+ * @returns
+ */
+function UAssetSelect({ asset, category }) {
+  const { t } = useTranslation()
+  const value = useStorage((s) => s[asset][category])
+  const iconUrl = useMemory((s) => s.Icons.getMisc(category))
+  const instanceName = asset === 'icons' ? 'Icons' : 'Audio'
+  const options = useMemory((s) => s[instanceName][category])
+
+  return (
+    <FCSelectListItem
+      name={category}
+      value={options?.has(value) ? value : ''}
+      label={t(`${category}_${asset}`, `${category} ${instanceName}`)}
+      onChange={({ target }) => {
+        useMemory.setState((prev) => {
+          prev[instanceName].setSelection(target.name, target.value)
+          return { [instanceName]: prev[instanceName] }
+        })
+        useStorage.setState((prev) => ({
+          [asset]: { ...prev[asset], [target.name]: target.value },
+        }))
+      }}
+      icon={<SettingIcon src={iconUrl} alt={category} />}
+    >
+      {[...(options || [])].map((option) => (
+        <MenuItem key={option} value={option}>
+          {t(
+            `${category.toLowerCase()}_${option.toLowerCase()}`,
+            getProperName(option),
+          )}
+        </MenuItem>
+      ))}
+    </FCSelectListItem>
+  )
+}
diff --git a/src/features/drawer/settings/index.jsx b/src/features/drawer/settings/index.jsx
new file mode 100644
index 000000000..69254ecb8
--- /dev/null
+++ b/src/features/drawer/settings/index.jsx
@@ -0,0 +1,100 @@
+// @ts-check
+import * as React from 'react'
+import ListItem from '@mui/material/ListItem'
+import ListItemIcon from '@mui/material/ListItemIcon'
+import ListSubheader from '@mui/material/ListSubheader'
+import TranslateIcon from '@mui/icons-material/Translate'
+import Brightness7Icon from '@mui/icons-material/Brightness7'
+import InsightsIcon from '@mui/icons-material/Insights'
+import NotificationsActiveIcon from '@mui/icons-material/NotificationsActive'
+import NotificationsOffIcon from '@mui/icons-material/NotificationsOff'
+import LogoDevIcon from '@mui/icons-material/LogoDev'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+import { toggleDialog } from '@store/useLayoutStore'
+import {
+  HAS_API,
+  getPermission,
+  requestPermission,
+} from '@services/desktopNotification'
+import { LocaleSelection } from '@components/inputs/LocaleSelection'
+import { DividerWithMargin } from '@components/StyledDivider'
+import { BoolToggle } from '@components/inputs/BoolToggle'
+import { BasicListButton } from '@components/inputs/BasicListButton'
+
+import { DrawerActions } from '../components/Actions'
+import { GeneralSetting } from './General'
+import { UAssetSetting } from './UAssets'
+import { HolidaySetting } from './Holiday'
+
+export function Settings() {
+  const { t } = useTranslation()
+
+  const separateDrawerActions = useMemory(
+    (s) => s.config.general.separateDrawerActions,
+  )
+  const staticSettings = useMemory((s) => s.settings)
+
+  return (
+    <>
+      <ListSubheader>{t('general')}</ListSubheader>
+      {Object.keys(staticSettings).map((setting) => (
+        <GeneralSetting key={setting} setting={setting} />
+      ))}
+      <ListItem dense>
+        <ListItemIcon>
+          <TranslateIcon />
+        </ListItemIcon>
+        <LocaleSelection />
+      </ListItem>
+      <BoolToggle field="darkMode">
+        <ListItemIcon>
+          <Brightness7Icon />
+        </ListItemIcon>
+      </BoolToggle>
+      {HAS_API && (
+        <BasicListButton
+          disabled={!HAS_API}
+          onClick={async () => {
+            await requestPermission()
+            toggleDialog(true, 'notifications', 'options')()
+          }}
+          label="desktop_notifications"
+        >
+          {getPermission() === 'granted' ? (
+            <NotificationsActiveIcon />
+          ) : (
+            <NotificationsOffIcon color="error" />
+          )}
+        </BasicListButton>
+      )}
+      <HolidaySetting />
+      <DividerWithMargin />
+      <UAssetSetting asset="icons" />
+      <UAssetSetting asset="audio" />
+      {process.env.NODE_ENV === 'development' && (
+        <>
+          <ListSubheader>{t('developer')}</ListSubheader>
+          <BoolToggle field="profiling">
+            <ListItemIcon>
+              <InsightsIcon />
+            </ListItemIcon>
+          </BoolToggle>
+          <BoolToggle field="stateTraceLog">
+            <ListItemIcon>
+              <LogoDevIcon />
+            </ListItemIcon>
+          </BoolToggle>
+          <DividerWithMargin />
+        </>
+      )}
+      {!separateDrawerActions && (
+        <>
+          <DividerWithMargin />
+          <DrawerActions />
+        </>
+      )}
+    </>
+  )
+}
diff --git a/src/components/popups/Gym.jsx b/src/features/gym/GymPopup.jsx
similarity index 80%
rename from src/components/popups/Gym.jsx
rename to src/features/gym/GymPopup.jsx
index f75ce4c44..923c3202b 100644
--- a/src/components/popups/Gym.jsx
+++ b/src/features/gym/GymPopup.jsx
@@ -2,34 +2,33 @@
 import * as React from 'react'
 import ExpandMore from '@mui/icons-material/ExpandMore'
 import MoreVert from '@mui/icons-material/MoreVert'
-import {
-  Grid,
-  Typography,
-  Collapse,
-  IconButton,
-  Divider,
-  MenuItem,
-  Menu,
-} from '@mui/material'
-
+import Grid from '@mui/material/Unstable_Grid2'
+import IconButton from '@mui/material/IconButton'
+import Menu from '@mui/material/Menu'
+import MenuItem from '@mui/material/MenuItem'
+import Divider from '@mui/material/Divider'
+import Collapse from '@mui/material/Collapse'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import { useSyncData } from '@components/layout/dialogs/webhooks/hooks'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { setDeepStore, useStorage } from '@hooks/useStorage'
-import useWebhook from '@hooks/useWebhook'
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
-import { TextWithIcon } from '@components/layout/general/Img'
-
-import Title from './common/Title'
-import PowerUp from './common/PowerUp'
-import GenderIcon from './common/GenderIcon'
-import Navigation from './common/Navigation'
-import Coords from './common/Coords'
-import { TimeStamp } from './common/TimeStamps'
-import { ExtraInfo } from './common/ExtraInfo'
+import { useSyncData } from '@features/webhooks'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { setDeepStore, useStorage } from '@store/useStorage'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { Img, TextWithIcon } from '@components/Img'
+import { Title } from '@components/popups/Title'
+import { PowerUp } from '@components/popups/PowerUp'
+import { GenderIcon } from '@components/popups/GenderIcon'
+import { Navigation } from '@components/popups/Navigation'
+import { Coords } from '@components/popups/Coords'
+import { TimeStamp } from '@components/popups/TimeStamps'
+import { ExtraInfo } from '@components/popups/ExtraInfo'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { getTimeUntil } from '@utils/getTimeUntil'
+import { formatInterval } from '@utils/formatInterval'
+
+import { useWebhook } from './useWebhook'
 
 /**
  *
@@ -40,19 +39,13 @@ import { ExtraInfo } from './common/ExtraInfo'
  * } & import('@rm/types').Gym} props
  * @returns
  */
-export default function GymPopup({ hasRaid, hasHatched, raidIconUrl, ...gym }) {
+export function GymPopup({ hasRaid, hasHatched, raidIconUrl, ...gym }) {
   const { t } = useTranslation()
-  const { perms } = useMemory((state) => state.auth)
-  const popups = useStorage((state) => state.popups)
+  const { perms } = useMemory((s) => s.auth)
+  const popups = useStorage((s) => s.popups)
   const ts = Math.floor(Date.now() / 1000)
 
-  React.useEffect(() => {
-    Utility.analytics(
-      'Popup',
-      `Team ID: ${gym.team_id} Has Raid: ${hasRaid}`,
-      'Gym',
-    )
-  }, [])
+  useAnalytics('Popup', `Team ID: ${gym.team_id} Has Raid: ${hasRaid}`, 'Gym')
 
   return (
     <ErrorBoundary noRefresh style={{}} variant="h5">
@@ -63,12 +56,12 @@ export default function GymPopup({ hasRaid, hasHatched, raidIconUrl, ...gym }) {
         alignItems="center"
         width={200}
       >
-        <Grid item xs={10}>
+        <Grid xs={10}>
           <Title backup={t('unknown_gym')}>{gym.name}</Title>
         </Grid>
         <MenuActions hasRaid={hasRaid} {...gym} />
         {perms.gyms && (
-          <Grid item xs={12}>
+          <Grid xs={12}>
             <Collapse
               in={!popups.raids || !hasRaid}
               timeout="auto"
@@ -88,7 +81,7 @@ export default function GymPopup({ hasRaid, hasHatched, raidIconUrl, ...gym }) {
           </Grid>
         )}
         {perms.raids && (
-          <Grid item xs={12}>
+          <Grid xs={12}>
             <Collapse in={popups.raids && hasRaid} timeout="auto" unmountOnExit>
               <Grid
                 container
@@ -140,7 +133,7 @@ const MenuActions = ({ hasRaid, ...gym }) => {
   const handleClose = React.useCallback(() => setAnchorEl(null), [])
 
   return (
-    <Grid item xs={2} textAlign="right">
+    <Grid xs={2} textAlign="right">
       <IconButton aria-haspopup="true" onClick={handleClick} size="large">
         <MoreVert />
       </IconButton>
@@ -173,7 +166,7 @@ const DropdownOptions = ({
   const { t } = useTranslation()
 
   const { gyms, raids, gymBadges, webhooks } = useMemory((s) => s.auth.perms)
-  const gymValidDataLimit = useMemory((state) => state.gymValidDataLimit)
+  const gymValidDataLimit = useMemory((s) => s.gymValidDataLimit)
 
   const { data: raidHooks } = useSyncData('raid')
   const { data: gymHooks } = useSyncData('gym')
@@ -271,21 +264,19 @@ const DropdownOptions = ({
  * @returns
  */
 const PoiImage = ({ url, team_id, name, badge }) => {
-  const Icons = useMemory((state) => state.Icons)
+  const Icons = useMemory((s) => s.Icons)
   const src = url ? url.replace('http://', 'https://') : Icons.getTeams(team_id)
 
   return (
-    <Grid item xs={6}>
-      <img
+    <Grid xs={6}>
+      <Img
         src={src}
         alt={name || 'unknown'}
         className={`${
           badge ? `badge badge-${badge}` : `circle-image team-${team_id}`
         }`}
-        style={{
-          maxHeight: 75,
-          maxWidth: 75,
-        }}
+        maxHeight={75}
+        maxWidth={75}
       />
     </Grid>
   )
@@ -304,8 +295,8 @@ const RaidImage = ({
   raid_pokemon_gender,
 }) => {
   const { t } = useTranslation()
-  const Icons = useMemory((state) => state.Icons)
-  const pokemon = useMemory((state) => state.masterfile.pokemon)
+  const Icons = useMemory((s) => s.Icons)
+  const pokemon = useMemory((s) => s.masterfile.pokemon)
 
   /**
    *
@@ -321,24 +312,11 @@ const RaidImage = ({
   }
 
   return (
-    <Grid container item xs={5} justifyContent="center" alignItems="center">
-      <Grid
-        item
-        xs={12}
-        style={{
-          textAlign: 'center',
-        }}
-      >
-        <img
-          src={raidIconUrl}
-          alt={raidIconUrl}
-          style={{
-            maxHeight: 50,
-            maxWidth: 50,
-          }}
-        />
+    <Grid container xs={5} justifyContent="center" alignItems="center">
+      <Grid xs={12} textAlign="center">
+        <Img src={raidIconUrl} alt={raidIconUrl} maxHeight={50} maxWidth={50} />
       </Grid>
-      <Grid item xs={12} style={{ textAlign: 'center' }}>
+      <Grid xs={12} textAlign="center">
         <Typography variant="caption">
           {t(`raid_${raid_level}`)} ({raid_level})
         </Typography>
@@ -346,19 +324,16 @@ const RaidImage = ({
       {raid_pokemon_id > 0 &&
         getRaidTypes(raid_pokemon_id, raid_pokemon_form).map((type) => (
           <Grid
-            item
             key={type}
             xs={4}
             className="grid-item"
-            style={{
-              height: 15,
-              width: 15,
-              backgroundImage: `url(${Icons.getTypes(type)})`,
-            }}
+            height={15}
+            width={15}
+            style={{ backgroundImage: `url(${Icons.getTypes(type)})` }}
           />
         ))}
       {!!raid_pokemon_gender && (
-        <Grid item xs={4} style={{ textAlign: 'center' }}>
+        <Grid xs={4} textAlign="center">
           <GenderIcon gender={raid_pokemon_gender} />
         </Grid>
       )}
@@ -380,12 +355,11 @@ const GymInfo = ({
   badge,
 }) => {
   const { t } = useTranslation()
-  const Icons = useMemory((state) => state.Icons)
-  const gymValidDataLimit = useMemory((state) => state.gymValidDataLimit)
+  const Icons = useMemory((s) => s.Icons)
+  const gymValidDataLimit = useMemory((s) => s.gymValidDataLimit)
 
   return (
     <Grid
-      item
       xs={5}
       container
       direction="row"
@@ -393,20 +367,20 @@ const GymInfo = ({
       alignItems="center"
     >
       {!!badge && (
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Typography variant="h6" align="center" className={`badge_${badge}`}>
             {t(`badge_${badge}`)}
           </Typography>
         </Grid>
       )}
       {updated > gymValidDataLimit && (
-          <Grid item xs={12}>
+          <Grid xs={12}>
             <Typography variant="h6" align="center">
               {t(`team_${team_id}`)}
             </Typography>
           </Grid>
         ) && (
-          <Grid item xs={12}>
+          <Grid xs={12}>
             <Typography variant="h6" align="center">
               {available_slots} {t('slots')}
             </Typography>
@@ -414,7 +388,6 @@ const GymInfo = ({
         )}
       {ex_raid_eligible && (
         <Grid
-          item
           xs={4}
           className="grid-item"
           style={{
@@ -426,7 +399,6 @@ const GymInfo = ({
       )}
       {ar_scan_eligible && (
         <Grid
-          item
           xs={4}
           className="grid-item"
           style={{
@@ -437,7 +409,6 @@ const GymInfo = ({
         />
       )}
       <Grid
-        item
         xs={4}
         style={{
           height: 24,
@@ -463,9 +434,9 @@ const RaidInfo = ({
   raid_pokemon_move_2,
 }) => {
   const { t } = useTranslation()
-  const Icons = useMemory((state) => state.Icons)
+  const Icons = useMemory((s) => s.Icons)
 
-  const moves = useMemory((state) => state.masterfile.moves)
+  const moves = useMemory((s) => s.masterfile.moves)
 
   const getRaidName = (raidLevel, id) => {
     if (id) {
@@ -488,19 +459,13 @@ const RaidInfo = ({
   }
 
   return (
-    <Grid
-      item
-      xs={6}
-      container
-      justifyContent="space-around"
-      alignItems="center"
-    >
-      <Grid item xs={12}>
+    <Grid xs={6} container justifyContent="space-around" alignItems="center">
+      <Grid xs={12}>
         <Typography variant="h6" align="center">
           {getRaidName(raid_level, raid_pokemon_id)}
         </Typography>
       </Grid>
-      <Grid item xs={12} style={{ paddingBottom: 4, textAlign: 'center' }}>
+      <Grid xs={12} style={{ paddingBottom: 4, textAlign: 'center' }}>
         <Typography variant="caption" align="center">
           {getRaidForm(
             raid_pokemon_id,
@@ -511,7 +476,6 @@ const RaidInfo = ({
       </Grid>
       {raid_pokemon_move_1 && raid_pokemon_move_1 !== 1 && (
         <Grid
-          item
           xs={2}
           className="grid-item"
           style={{
@@ -524,14 +488,13 @@ const RaidInfo = ({
           }}
         />
       )}
-      <Grid item xs={10} style={{ textAlign: 'center' }}>
+      <Grid xs={10} textAlign="center">
         <Typography variant="caption" align="center">
           {t(`move_${raid_pokemon_move_1}`)}
         </Typography>
       </Grid>
       {raid_pokemon_move_2 && raid_pokemon_move_2 !== 2 && (
         <Grid
-          item
           xs={2}
           className="grid-item"
           style={{
@@ -544,7 +507,7 @@ const RaidInfo = ({
           }}
         />
       )}
-      <Grid item xs={10} style={{ textAlign: 'center' }}>
+      <Grid xs={10} textAlign="center">
         <Typography variant="caption" align="center">
           {t(`move_${raid_pokemon_move_2}`)}
         </Typography>
@@ -576,8 +539,8 @@ const Timer = ({
   const target = (start ? raid_battle_timestamp : raid_end_timestamp) * 1000
   const update = () =>
     start || hasHatched || raid_pokemon_id
-      ? Utility.getTimeUntil(target, true)
-      : Utility.formatInterval(target - raid_battle_timestamp * 1000)
+      ? getTimeUntil(target, true)
+      : formatInterval(target - raid_battle_timestamp * 1000)
 
   const [display, setDisplay] = React.useState(update)
 
@@ -587,11 +550,7 @@ const Timer = ({
   })
 
   return target ? (
-    <Grid
-      item
-      xs={start && !raid_pokemon_id ? 6 : 12}
-      style={{ textAlign: 'center' }}
-    >
+    <Grid xs={start && !raid_pokemon_id ? 6 : 12} textAlign="center">
       <Typography variant="subtitle1">
         {t(start ? 'starts' : 'ends')}:{' '}
         {new Date(target).toLocaleTimeString(
@@ -616,8 +575,8 @@ const Timer = ({
  */
 const GymFooter = ({ lat, lon, hasRaid }) => {
   const darkMode = useStorage((s) => s.darkMode)
-  const popups = useStorage((state) => state.popups)
-  const perms = useMemory((state) => state.auth.perms)
+  const popups = useStorage((s) => s.popups)
+  const perms = useMemory((s) => s.auth.perms)
 
   const handleExpandClick = (category) => {
     useStorage.setState((prev) => ({
@@ -631,7 +590,7 @@ const GymFooter = ({ lat, lon, hasRaid }) => {
   return (
     <>
       {hasRaid && perms.raids && perms.gyms && (
-        <Grid item xs={4}>
+        <Grid xs={4}>
           <IconButton onClick={() => handleExpandClick('raids')} size="large">
             <img
               src={useMemory
@@ -645,11 +604,11 @@ const GymFooter = ({ lat, lon, hasRaid }) => {
           </IconButton>
         </Grid>
       )}
-      <Grid item xs={4} style={{ textAlign: 'center' }}>
+      <Grid xs={4} textAlign="center">
         <Navigation lat={lat} lon={lon} />
       </Grid>
       {perms.gyms && (
-        <Grid item xs={4}>
+        <Grid xs={4}>
           <IconButton
             className={popups.extras ? 'expanded' : 'closed'}
             onClick={() => handleExpandClick('extras')}
@@ -678,9 +637,9 @@ const ExtraGymInfo = ({
 }) => {
   const { t, i18n } = useTranslation()
   const Icons = useMemory((s) => s.Icons)
-  const gymValidDataLimit = useMemory((state) => state.gymValidDataLimit)
+  const gymValidDataLimit = useMemory((s) => s.gymValidDataLimit)
   const enableGymPopupCoords = useStorage(
-    (state) => state.userSettings.gyms.enableGymPopupCoords,
+    (s) => s.userSettings.gyms.enableGymPopupCoords,
   )
 
   const numFormatter = new Intl.NumberFormat(i18n.language)
@@ -704,7 +663,7 @@ const ExtraGymInfo = ({
       <TimeStamp time={updated}>last_seen</TimeStamp>
       <TimeStamp time={last_modified_timestamp}>last_modified</TimeStamp>
       {enableGymPopupCoords && (
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           <Coords lat={lat} lon={lon} />
         </Grid>
       )}
diff --git a/src/components/tiles/Gym.jsx b/src/features/gym/GymTile.jsx
similarity index 90%
rename from src/components/tiles/Gym.jsx
rename to src/features/gym/GymTile.jsx
index f7d19b264..4442e158a 100644
--- a/src/components/tiles/Gym.jsx
+++ b/src/features/gym/GymTile.jsx
@@ -4,17 +4,17 @@ import * as React from 'react'
 import { Marker, Popup, Circle } from 'react-leaflet'
 import { t } from 'i18next'
 
-import useMarkerTimer from '@hooks/useMarkerTimer'
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import useOpacity from '@hooks/useOpacity'
-import useForcePopup from '@hooks/useForcePopup'
+import { useMarkerTimer } from '@hooks/useMarkerTimer'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useOpacity } from '@hooks/useOpacity'
+import { useForcePopup } from '@hooks/useForcePopup'
 import { sendNotification } from '@services/desktopNotification'
-import Utility from '@services/Utility'
+import { TooltipWrapper } from '@components/ToolTipWrapper'
+import { getTimeUntil } from '@utils/getTimeUntil'
 
-import gymMarker from '../markers/gym'
-import PopupContent from '../popups/Gym'
-import ToolTipWrapper from './Timer'
+import { gymMarker } from './gymMarker'
+import { GymPopup } from './GymPopup'
 
 /** @param {number} team */
 const getColor = (team) => {
@@ -35,7 +35,7 @@ const getColor = (team) => {
  * @param {import('@rm/types').Gym} gym
  * @returns
  */
-const GymTile = (gym) => {
+const BaseGymTile = (gym) => {
   const [markerRef, setMarkerRef] = React.useState(null)
   const [stateChange, setStateChange] = React.useState(false)
 
@@ -160,7 +160,7 @@ const GymTile = (gym) => {
       }${gym.raid_pokemon_id ? t(`poke_${gym.raid_pokemon_id}`) : ''}${
         gym.raid_pokemon_form ? t(`form_${gym.raid_pokemon_form}`) : ''
       }${gym.raid_pokemon_id ? '\n' : ''}${
-        Utility.getTimeUntil(new Date(timerToDisplay * 1000), true).str
+        getTimeUntil(timerToDisplay * 1000, true).str
       }`,
       icon: raidIconUrl,
     })
@@ -183,7 +183,7 @@ const GymTile = (gym) => {
       })}
     >
       <Popup position={[gym.lat, gym.lon]}>
-        <PopupContent
+        <GymPopup
           hasRaid={hasRaid}
           hasHatched={hasHatched}
           raidIconUrl={raidIconUrl}
@@ -191,7 +191,7 @@ const GymTile = (gym) => {
         />
       </Popup>
       {showTimer && (
-        <ToolTipWrapper timers={[timerToDisplay]} offset={[0, 5]} />
+        <TooltipWrapper timers={[timerToDisplay]} offset={[0, 5]} />
       )}
       {showInteractionRange && (
         <Circle
@@ -221,8 +221,8 @@ const GymTile = (gym) => {
   )
 }
 
-const MemoGym = React.memo(
-  GymTile,
+export const GymTile = React.memo(
+  BaseGymTile,
   (prev, next) =>
     prev.raid_pokemon_id === next.raid_pokemon_id &&
     prev.raid_level === next.raid_level &&
@@ -232,5 +232,3 @@ const MemoGym = React.memo(
     prev.available_slots === next.available_slots &&
     prev.updated === next.updated,
 )
-
-export default MemoGym
diff --git a/src/components/markers/gym.js b/src/features/gym/gymMarker.js
similarity index 98%
rename from src/components/markers/gym.js
rename to src/features/gym/gymMarker.js
index b8e98a6c2..6f156cd01 100644
--- a/src/components/markers/gym.js
+++ b/src/features/gym/gymMarker.js
@@ -1,6 +1,6 @@
 // @ts-check
 import { divIcon } from 'leaflet'
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
 
 const getBadgeColor = (raidLevel) => {
   switch (raidLevel) {
@@ -34,7 +34,7 @@ const getBadgeColor = (raidLevel) => {
  * } & import('@rm/types').Gym} params
  * @returns
  */
-export default function gymMarker({
+export function gymMarker({
   gymIconUrl,
   gymIconSize,
   raidIconUrl,
diff --git a/src/features/gym/index.js b/src/features/gym/index.js
new file mode 100644
index 000000000..dfd7d966f
--- /dev/null
+++ b/src/features/gym/index.js
@@ -0,0 +1,3 @@
+export * from './GymPopup'
+export * from './GymTile'
+export * from './gymMarker'
diff --git a/src/hooks/useWebhook.js b/src/features/gym/useWebhook.js
similarity index 74%
rename from src/hooks/useWebhook.js
rename to src/features/gym/useWebhook.js
index 08a483858..d2f31943e 100644
--- a/src/hooks/useWebhook.js
+++ b/src/features/gym/useWebhook.js
@@ -1,15 +1,16 @@
 import { useEffect } from 'react'
 import { useMutation } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
-import Query from '@services/Query'
-import { useWebhookStore } from '@components/layout/dialogs/webhooks/store'
-import { allProfiles } from '@services/queries/webhook'
 
-export default function useWebhook({ category }) {
+import { Query } from '@services/queries'
+import { useWebhookStore } from '@store/useWebhookStore'
+import { ALL_PROFILES } from '@services/queries/webhook'
+
+export function useWebhook({ category }) {
   const [syncWebhook, { data, error }] = useMutation(
-    Query.webhook('quickAdd'),
+    Query.webhook('QUICK_ADD'),
     {
-      refetchQueries: [allProfiles],
+      refetchQueries: [ALL_PROFILES],
     },
   )
   const { t } = useTranslation()
diff --git a/src/services/HolidayAnimations.js b/src/features/holiday/HolidayAnimations.js
similarity index 97%
rename from src/services/HolidayAnimations.js
rename to src/features/holiday/HolidayAnimations.js
index ce8f58e87..ec566e39d 100644
--- a/src/services/HolidayAnimations.js
+++ b/src/features/holiday/HolidayAnimations.js
@@ -1,5 +1,5 @@
 // @ts-check
-class HolidayAnimations {
+export class HolidayAnimations {
   /**
    * @param {string[]} images
    * @param {number} scale
@@ -78,5 +78,3 @@ class HolidayAnimations {
     this.ctx.clearRect(0, 0, this.w, this.h)
   }
 }
-
-export default HolidayAnimations
diff --git a/src/features/holiday/HolidayEffect.jsx b/src/features/holiday/HolidayEffect.jsx
new file mode 100644
index 000000000..475d53f04
--- /dev/null
+++ b/src/features/holiday/HolidayEffect.jsx
@@ -0,0 +1,50 @@
+// @ts-check
+import * as React from 'react'
+
+import { useStorage } from '@store/useStorage'
+
+import { HolidayAnimations } from './HolidayAnimations'
+
+/**
+ *
+ * @param {import("@rm/types").Config['map']['holidayEffects'][number]} props
+ * @returns
+ */
+export function HolidayEffect({ images, name, css, imageScale }) {
+  const userDisabled = useStorage((s) => s.holidayEffects[name] === true)
+
+  React.useLayoutEffect(() => {
+    if (images?.length && !userDisabled) {
+      const animation = new HolidayAnimations(images, imageScale)
+      animation.initialize()
+      return () => {
+        animation.stop()
+      }
+    }
+  }, [userDisabled])
+
+  if (userDisabled) return null
+
+  switch (css) {
+    case 'snow':
+      return (
+        <div className="winter-is-coming">
+          <div className="snow snow--near" />
+          <div className="snow snow--near snow--alt" />
+          <div className="snow snow--mid" />
+          <div className="snow snow--mid snow--alt" />
+          <div className="snow snow--far" />
+          <div className="snow snow--far snow--alt" />
+        </div>
+      )
+    case 'fireworks':
+      return (
+        <div className="pyro">
+          <div className="before" />
+          <div className="after" />
+        </div>
+      )
+    default:
+      return null
+  }
+}
diff --git a/src/features/holiday/index.jsx b/src/features/holiday/index.jsx
new file mode 100644
index 000000000..1183354c2
--- /dev/null
+++ b/src/features/holiday/index.jsx
@@ -0,0 +1,21 @@
+// @ts-check
+import * as React from 'react'
+
+import { useMemory } from '@store/useMemory'
+
+import { HolidayEffect } from './HolidayEffect'
+import { checkHoliday } from './utils'
+
+export function HolidayEffects() {
+  const holidayEffects = useMemory((s) => s?.config?.holidayEffects)
+
+  return (
+    <>
+      {(Array.isArray(holidayEffects) ? holidayEffects : []).map((holiday) => (
+        <HolidayEffect key={holiday.name} {...holiday} />
+      ))}
+    </>
+  )
+}
+
+export { checkHoliday }
diff --git a/src/features/holiday/utils.js b/src/features/holiday/utils.js
new file mode 100644
index 000000000..54c1e80fd
--- /dev/null
+++ b/src/features/holiday/utils.js
@@ -0,0 +1,51 @@
+// @ts-check
+
+/**
+ * @param {import("@rm/types").Config['map']['holidayEffects'][number]} holiday
+ * @param {Date} [now]
+ */
+function getStart(holiday, now = new Date()) {
+  return new Date(
+    now.getFullYear() - (holiday.startMonth > holiday.endMonth ? 1 : 0),
+    holiday.startMonth - 1,
+    holiday.startDay,
+    0,
+    0,
+    0,
+  )
+}
+
+/**
+ * @param {import("@rm/types").Config['map']['holidayEffects'][number]} holiday
+ * @param {Date} [now]
+ */
+function getEnd(holiday, now = new Date()) {
+  return new Date(
+    now.getFullYear(),
+    holiday.endMonth - 1,
+    holiday.endDay,
+    23,
+    59,
+    59,
+  )
+}
+
+/**
+ * @param {import("@rm/types").Config['map']['holidayEffects'][number]} holiday
+ */
+export function checkHoliday(holiday) {
+  if (!holiday.enabled) return false
+  const date = new Date()
+  const start = getStart(holiday, date)
+  const end = getEnd(holiday, date)
+  return date >= start && date <= end
+}
+
+/**
+ * @param {import("@rm/types").Config['map']['holidayEffects'][number]} holiday
+ */
+export function countdownUntilEnd(holiday) {
+  const date = new Date()
+  const end = getEnd(holiday, date)
+  return end.getMilliseconds() - date.getMilliseconds()
+}
diff --git a/src/components/popups/Nest.jsx b/src/features/nest/NestPopup.jsx
similarity index 68%
rename from src/components/popups/Nest.jsx
rename to src/features/nest/NestPopup.jsx
index ee844a4da..b955dda57 100644
--- a/src/components/popups/Nest.jsx
+++ b/src/features/nest/NestPopup.jsx
@@ -1,25 +1,24 @@
 // @ts-check
-import React, { useState, useEffect } from 'react'
+import * as React from 'react'
 import MoreVert from '@mui/icons-material/MoreVert'
-import {
-  Grid,
-  Typography,
-  IconButton,
-  Divider,
-  Menu,
-  MenuItem,
-  Button,
-} from '@mui/material'
-
+import Grid from '@mui/material/Unstable_Grid2'
+import Typography from '@mui/material/Typography'
+import IconButton from '@mui/material/IconButton'
+import Menu from '@mui/material/Menu'
+import MenuItem from '@mui/material/MenuItem'
+import Divider from '@mui/material/Divider'
+import Button from '@mui/material/Button'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { setDeepStore } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
-import NestSubmission from '@components/layout/dialogs/NestSubmission'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { setDeepStore } from '@store/useStorage'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { NestSubmission } from '@components/dialogs/NestSubmission'
+import { getTimeUntil } from '@utils/getTimeUntil'
+import { useAnalytics } from '@hooks/useAnalytics'
 
+/** @param {number} timeSince */
 const getColor = (timeSince) => {
   let color = 'success'
   if (timeSince > 604800) {
@@ -39,7 +38,7 @@ const getColor = (timeSince) => {
  * }} props
  * @returns
  */
-export default function NestPopup({
+export function NestPopup({
   recent,
   iconUrl,
   pokemon_id,
@@ -51,12 +50,12 @@ export default function NestPopup({
   submitted_by = '',
 }) {
   const { t } = useTranslation()
-  const { perms, loggedIn } = useMemory((s) => s.auth)
+  const { perms } = useMemory((s) => s.auth)
 
-  const [parkName, setParkName] = useState(true)
-  const [anchorEl, setAnchorEl] = useState(null)
+  const [parkName, setParkName] = React.useState(true)
+  const [anchorEl, setAnchorEl] = React.useState(null)
 
-  const lastUpdated = Utility.getTimeUntil(new Date(updated * 1000))
+  const lastUpdated = getTimeUntil(updated * 1000)
 
   const handleClick = (event) => {
     setAnchorEl(event.currentTarget)
@@ -77,13 +76,12 @@ export default function NestPopup({
     setDeepStore(`filters.nests.filter.${key}.enabled`, false)
   }
 
+  useAnalytics('Popup', `Name: ${name} Pokemon: ${pokemon_id}`, 'Nest')
+
   const options = [
     { name: 'hide', action: handleHide },
     { name: 'exclude', action: handleExclude },
   ]
-  useEffect(() => {
-    Utility.analytics('Popup', `Name: ${name} Pokemon: ${pokemon_id}`, 'Nest')
-  }, [])
 
   return (
     <ErrorBoundary noRefresh variant="h5">
@@ -94,7 +92,7 @@ export default function NestPopup({
         style={{ width: 200 }}
         spacing={1}
       >
-        <Grid item xs={9} style={{ textAlign: 'center' }}>
+        <Grid xs={9} textAlign="center">
           <Typography
             variant={name.length > 20 ? 'subtitle2' : 'h6'}
             align="center"
@@ -114,7 +112,7 @@ export default function NestPopup({
             </Typography>
           )}
         </Grid>
-        <Grid item xs={3}>
+        <Grid xs={3}>
           <IconButton aria-haspopup="true" onClick={handleClick} size="large">
             <MoreVert />
           </IconButton>
@@ -137,7 +135,7 @@ export default function NestPopup({
             </MenuItem>
           ))}
         </Menu>
-        <Grid item xs={6} style={{ textAlign: 'center' }}>
+        <Grid xs={6} textAlign="center">
           <img
             src={iconUrl}
             alt={iconUrl}
@@ -149,7 +147,7 @@ export default function NestPopup({
           <br />
           <Typography variant="caption">{t(`poke_${pokemon_id}`)}</Typography>
         </Grid>
-        <Grid item xs={6} style={{ textAlign: 'center' }}>
+        <Grid xs={6} textAlign="center">
           <Typography variant="subtitle2">{t('last_updated')}</Typography>
           <Typography
             variant={lastUpdated.str.includes('D') ? 'h6' : 'subtitle2'}
@@ -160,13 +158,13 @@ export default function NestPopup({
               .replace('day', t('day'))}
           </Typography>
           <Typography variant="subtitle2">
-            ~{pokemon_avg} {t('spawns_per_hour')}
+            ~{pokemon_avg?.toFixed(2) || 0} {t('spawns_per_hour')}
           </Typography>
         </Grid>
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Divider style={{ margin: 4 }} />
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           {recent ? (
             <Typography variant="caption">
               {t('nest_estimated')}
@@ -181,19 +179,20 @@ export default function NestPopup({
             </Typography>
           )}
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
-          <Button
-            color="secondary"
-            variant="outlined"
-            size="small"
-            disabled={!perms.nestSubmissions || !loggedIn}
-            onClick={() =>
-              useLayoutStore.setState({ nestSubmissions: `${id}` })
-            }
-          >
-            {t('submit_nest_name')}
-          </Button>
-        </Grid>
+        {perms.nestSubmissions && (
+          <Grid xs={12} textAlign="center">
+            <Button
+              color="secondary"
+              variant="outlined"
+              size="small"
+              onClick={() =>
+                useLayoutStore.setState({ nestSubmissions: `${id}` })
+              }
+            >
+              {t('submit_nest_name')}
+            </Button>
+          </Grid>
+        )}
       </Grid>
       <NestSubmission id={id} name={name} />
     </ErrorBoundary>
diff --git a/src/components/tiles/Nest.jsx b/src/features/nest/NestTile.jsx
similarity index 84%
rename from src/components/tiles/Nest.jsx
rename to src/features/nest/NestTile.jsx
index 87231c578..0df893242 100644
--- a/src/components/tiles/Nest.jsx
+++ b/src/features/nest/NestTile.jsx
@@ -3,19 +3,19 @@
 import * as React from 'react'
 import { GeoJSON, Marker, Popup } from 'react-leaflet'
 
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import useForcePopup from '@hooks/useForcePopup'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useForcePopup } from '@hooks/useForcePopup'
 
-import nestMarker from '../markers/nest'
-import PopupContent from '../popups/Nest'
+import { nestMarker } from './nestMarker'
+import { NestPopup } from './NestPopup'
 
 /**
  *
  * @param {import('@rm/types').Nest} nest
  * @returns
  */
-const NestTile = (nest) => {
+const BaseNestTile = (nest) => {
   const recent = Date.now() / 1000 - nest.updated < 172800000
   const internalId = `${nest.pokemon_id}-${nest.pokemon_form}`
 
@@ -46,7 +46,7 @@ const NestTile = (nest) => {
     <>
       <NestMarker icon={icon} id={nest.id} lat={nest.lat} lon={nest.lon}>
         <Popup position={[nest.lat, nest.lon]}>
-          <PopupContent iconUrl={iconUrl} recent={recent} {...nest} />
+          <NestPopup iconUrl={iconUrl} recent={recent} {...nest} />
         </Popup>
       </NestMarker>
       <NestGeoJSON polygon_path={nest.polygon_path} />
@@ -104,9 +104,7 @@ const NestGeoJSON = ({ polygon_path }) => {
   return <GeoJSON data={geometry} />
 }
 
-const MemoNestTile = React.memo(
-  NestTile,
+export const NestTile = React.memo(
+  BaseNestTile,
   (prev, next) => prev.updated === next.updated && prev.name === next.name,
 )
-
-export default MemoNestTile
diff --git a/src/features/nest/index.js b/src/features/nest/index.js
new file mode 100644
index 000000000..5bfa3ffd5
--- /dev/null
+++ b/src/features/nest/index.js
@@ -0,0 +1,3 @@
+export * from './NestPopup'
+export * from './NestTile'
+export * from './nestMarker'
diff --git a/src/components/markers/nest.js b/src/features/nest/nestMarker.js
similarity index 93%
rename from src/components/markers/nest.js
rename to src/features/nest/nestMarker.js
index b10f08617..fcb8f53c9 100644
--- a/src/components/markers/nest.js
+++ b/src/features/nest/nestMarker.js
@@ -1,6 +1,7 @@
 // @ts-check
 import { divIcon } from 'leaflet'
-import { useMemory } from '@hooks/useMemory'
+
+import { useMemory } from '@store/useMemory'
 
 /**
  *
@@ -13,13 +14,7 @@ import { useMemory } from '@hooks/useMemory'
  * }} props
  * @returns
  */
-export default function nestMarker({
-  iconUrl,
-  pokemonId,
-  formId,
-  iconSize,
-  recent,
-}) {
+export function nestMarker({ iconUrl, pokemonId, formId, iconSize, recent }) {
   const { Icons, masterfile } = useMemory.getState()
   const { types } = masterfile.pokemon[pokemonId]?.forms?.[formId]?.types
     ? masterfile.pokemon[pokemonId].forms[formId]
diff --git a/src/components/popups/Pokemon.jsx b/src/features/pokemon/PokemonPopup.jsx
similarity index 82%
rename from src/components/popups/Pokemon.jsx
rename to src/features/pokemon/PokemonPopup.jsx
index e10fc8d53..5f061103c 100644
--- a/src/components/popups/Pokemon.jsx
+++ b/src/features/pokemon/PokemonPopup.jsx
@@ -1,35 +1,31 @@
-/* eslint-disable no-nested-ternary */
-import React, { useState, useEffect } from 'react'
-import Check from '@mui/icons-material/Check'
-import Clear from '@mui/icons-material/Clear'
+// @ts-check
+import * as React from 'react'
 import ExpandMore from '@mui/icons-material/ExpandMore'
 import MoreVert from '@mui/icons-material/MoreVert'
-import {
-  Grid,
-  Avatar,
-  Typography,
-  Collapse,
-  IconButton,
-  Divider,
-  Menu,
-  MenuItem,
-  Tooltip,
-} from '@mui/material'
-
+import Grid from '@mui/material/Unstable_Grid2'
+import Typography from '@mui/material/Typography'
+import IconButton from '@mui/material/IconButton'
+import Menu from '@mui/material/Menu'
+import MenuItem from '@mui/material/MenuItem'
+import Divider from '@mui/material/Divider'
+import Avatar from '@mui/material/Avatar'
+import Tooltip from '@mui/material/Tooltip'
+import Collapse from '@mui/material/Collapse'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { setDeepStore, useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
-import { TextWithIcon } from '@components/layout/general/Img'
-
-import NameTT from './common/NameTT'
-import GenderIcon from './common/GenderIcon'
-import Navigation from './common/Navigation'
-import Coords from './common/Coords'
-import { TimeStamp } from './common/TimeStamps'
-import { ExtraInfo } from './common/ExtraInfo'
+import { useMemory } from '@store/useMemory'
+import { setDeepStore, useStorage } from '@store/useStorage'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { TextWithIcon } from '@components/Img'
+import { NameTT } from '@components/popups/NameTT'
+import { GenderIcon } from '@components/popups/GenderIcon'
+import { Navigation } from '@components/popups/Navigation'
+import { Coords } from '@components/popups/Coords'
+import { TimeStamp } from '@components/popups/TimeStamps'
+import { ExtraInfo } from '@components/popups/ExtraInfo'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { getTimeUntil } from '@utils/getTimeUntil'
+import { StatusIcon } from '@components/StatusIcon'
 
 const rowClass = { width: 30, fontWeight: 'bold' }
 
@@ -39,11 +35,14 @@ const leagueLookup = {
   master: '9000',
 }
 
+/** @param {number} ivPercent */
 const getColor = (ivPercent) => {
   switch (true) {
-    case ivPercent < 50:
-      return 'error.main'
-    case ivPercent < 80:
+    case ivPercent < 51:
+      return 'error.dark'
+    case ivPercent < 66:
+      return 'error.light'
+    case ivPercent < 82:
       return 'warning.main'
     case ivPercent < 100:
       return 'info.main'
@@ -54,13 +53,13 @@ const getColor = (ivPercent) => {
   }
 }
 
-export default function PokemonPopup({ pokemon, iconUrl, isTutorial = false }) {
+export function PokemonPopup({ pokemon, iconUrl, isTutorial = false }) {
   const { t } = useTranslation()
   const { pokemon_id, cleanPvp, iv, cp } = pokemon
-  const perms = useMemory((state) => state.auth.perms)
+  const perms = useMemory((s) => s.auth.perms)
   const timeOfDay = useMemory((s) => s.timeOfDay)
-  const metaData = useMemory((state) => state.masterfile.pokemon[pokemon_id])
-  const Icons = useMemory((state) => state.Icons)
+  const metaData = useMemory((s) => s.masterfile.pokemon[pokemon_id])
+  const Icons = useMemory((s) => s.Icons)
 
   const userSettings = useStorage((s) => s.userSettings.pokemon)
   const pokePerms = isTutorial
@@ -69,18 +68,16 @@ export default function PokemonPopup({ pokemon, iconUrl, isTutorial = false }) {
         iv: true,
       }
     : perms
-  const popups = useStorage((state) => state.popups)
+  const popups = useStorage((s) => s.popups)
 
   const hasLeagues = cleanPvp ? Object.keys(cleanPvp) : []
   const hasStats = iv || cp
 
-  useEffect(() => {
-    Utility.analytics(
-      'Popup',
-      `ID: ${pokemon.pokemon_id} IV: ${pokemon.iv}% PVP: #${pokemon.bestPvp}`,
-      'Pokemon',
-    )
-  }, [])
+  useAnalytics(
+    'Popup',
+    `ID: ${pokemon.pokemon_id} IV: ${pokemon.iv}% PVP: #${pokemon.bestPvp}`,
+    'Pokemon',
+  )
 
   return (
     <ErrorBoundary noRefresh style={{}} variant="h5">
@@ -96,12 +93,11 @@ export default function PokemonPopup({ pokemon, iconUrl, isTutorial = false }) {
           metaData={metaData}
           iconUrl={iconUrl}
           t={t}
-          perms={perms}
           userSettings={userSettings}
           isTutorial={isTutorial}
         />
         {pokemon.seen_type !== 'encounter' && (
-          <Grid item xs={12} style={{ textAlign: 'center' }}>
+          <Grid xs={12} textAlign="center">
             <Typography variant="caption">
               {t(`seen_${pokemon.seen_type}`, '')}
             </Typography>
@@ -115,7 +111,7 @@ export default function PokemonPopup({ pokemon, iconUrl, isTutorial = false }) {
         )}
         {hasStats && pokePerms.iv && (
           <>
-            <Stats pokemon={pokemon} metaData={metaData} t={t} />
+            <Stats pokemon={pokemon} t={t} />
             <Divider orientation="vertical" flexItem />
           </>
         )}
@@ -167,9 +163,9 @@ const Header = ({
   userSettings,
   isTutorial,
 }) => {
-  const filters = useStorage((state) => state.filters)
+  const filters = useStorage((s) => s.filters)
 
-  const [anchorEl, setAnchorEl] = useState(false)
+  const [anchorEl, setAnchorEl] = React.useState(null)
   const { id, pokemon_id, form, ditto_form, display_pokemon_id } = pokemon
 
   const handleClick = (event) => {
@@ -221,7 +217,7 @@ const Header = ({
 
   return (
     <>
-      <Grid item xs={3}>
+      <Grid xs={3}>
         {userSettings.showDexNumInPopup ? (
           <Avatar>{metaData.pokedexId}</Avatar>
         ) : (
@@ -232,7 +228,7 @@ const Header = ({
           />
         )}
       </Grid>
-      <Grid item xs={6} style={{ textAlign: 'center' }}>
+      <Grid xs={6} textAlign="center">
         <Typography variant={pokeName.length > 8 ? 'h6' : 'h5'}>
           {pokeName}
         </Typography>
@@ -244,7 +240,7 @@ const Header = ({
           <Typography variant="caption">{formName}</Typography>
         )}
       </Grid>
-      <Grid item xs={3}>
+      <Grid xs={3}>
         <IconButton aria-haspopup="true" onClick={handleClick} size="large">
           <MoreVert />
         </IconButton>
@@ -276,7 +272,6 @@ const Stats = ({ pokemon, t }) => {
 
   return (
     <Grid
-      item
       xs={8}
       container
       direction="column"
@@ -284,7 +279,7 @@ const Stats = ({ pokemon, t }) => {
       alignItems="center"
     >
       {iv !== null && (
-        <Grid item>
+        <Grid>
           <Typography variant="h5" align="center" color={getColor(iv)}>
             {iv.toFixed(2)}
             {t('%')}
@@ -292,14 +287,14 @@ const Stats = ({ pokemon, t }) => {
         </Grid>
       )}
       {atk_iv !== null && (
-        <Grid item>
+        <Grid>
           <Typography variant="subtitle1" align="center">
             {atk_iv} | {def_iv} | {sta_iv} {inactive_stats ? '*' : ''}
           </Typography>
         </Grid>
       )}
       {level !== null && (
-        <Grid item>
+        <Grid>
           <Typography variant="subtitle1" align="center">
             {t('cp')} {cp} | {t('abbreviation_level')}
             {level}
@@ -316,7 +311,6 @@ const Info = ({ pokemon, metaData, perms, Icons, timeOfDay, t }) => {
   const darkMode = useStorage((s) => s.darkMode)
   return (
     <Grid
-      item
       xs={perms.iv ? 3 : 11}
       container
       direction={perms.iv ? 'column' : 'row'}
@@ -325,7 +319,6 @@ const Info = ({ pokemon, metaData, perms, Icons, timeOfDay, t }) => {
     >
       {weather != 0 && perms.iv && (
         <Grid
-          item
           className={`grid-item ${darkMode ? '' : 'darken-image'}`}
           style={{
             height: 24,
@@ -335,13 +328,12 @@ const Info = ({ pokemon, metaData, perms, Icons, timeOfDay, t }) => {
         />
       )}
       {!!gender && (
-        <Grid item style={{ textAlign: 'center' }}>
+        <Grid textAlign="center">
           <GenderIcon gender={gender} />
         </Grid>
       )}
       {!!size && Number.isInteger(size) && (
         <Grid
-          item
           style={{
             height: 24,
             width: 24,
@@ -354,7 +346,6 @@ const Info = ({ pokemon, metaData, perms, Icons, timeOfDay, t }) => {
 
       {formTypes.map((type) => (
         <Grid
-          item
           key={type}
           className="grid-item"
           style={{
@@ -371,29 +362,29 @@ const Info = ({ pokemon, metaData, perms, Icons, timeOfDay, t }) => {
 
 const Timer = ({ pokemon, hasStats, t }) => {
   const { expire_timestamp, expire_timestamp_verified } = pokemon
-  const despawnTimer = new Date(expire_timestamp * 1000)
-  const [timer, setTimer] = useState(Utility.getTimeUntil(despawnTimer, true))
+  const despawnTimer = expire_timestamp * 1000
+  const [timer, setTimer] = React.useState(getTimeUntil(despawnTimer, true))
 
-  useEffect(() => {
+  React.useEffect(() => {
     const timer2 = setTimeout(() => {
-      setTimer(Utility.getTimeUntil(despawnTimer, true))
+      setTimer(getTimeUntil(despawnTimer, true))
     }, 1000)
     return () => clearTimeout(timer2)
   })
 
   return (
     <>
-      <Grid item xs={hasStats ? 9 : 6}>
+      <Grid xs={hasStats ? 9 : 6}>
         <Typography variant="h6" align="center">
           {timer.str}
         </Typography>
         <Typography variant="subtitle2" align="center">
-          {despawnTimer.toLocaleTimeString(
+          {new Date(despawnTimer).toLocaleTimeString(
             localStorage.getItem('i18nextLng') || 'en',
           )}
         </Typography>
       </Grid>
-      <Grid item xs={hasStats ? 3 : 2}>
+      <Grid xs={hasStats ? 3 : 2}>
         <Tooltip
           title={
             expire_timestamp_verified
@@ -403,11 +394,7 @@ const Timer = ({ pokemon, hasStats, t }) => {
           arrow
           enterTouchDelay={0}
         >
-          {expire_timestamp_verified ? (
-            <Check fontSize="large" color="success" />
-          ) : (
-            <Clear fontSize="large" color="error" />
-          )}
+          <StatusIcon status={expire_timestamp_verified} />
         </Tooltip>
       </Grid>
     </>
@@ -432,7 +419,7 @@ const Footer = ({ pokemon, popups, hasPvp, Icons }) => {
   return (
     <>
       {hasPvp && (
-        <Grid item xs={4}>
+        <Grid xs={4}>
           <IconButton
             className={popups.pvp ? 'expanded' : 'closed'}
             name="pvp"
@@ -449,10 +436,10 @@ const Footer = ({ pokemon, popups, hasPvp, Icons }) => {
           </IconButton>
         </Grid>
       )}
-      <Grid item xs={4} style={{ textAlign: 'center' }}>
+      <Grid xs={4} textAlign="center">
         <Navigation lat={lat} lon={lon} />
       </Grid>
-      <Grid item xs={4}>
+      <Grid xs={4}>
         <IconButton
           className={popups.extras ? 'expanded' : 'closed'}
           onClick={() => handleExpandClick('extras')}
@@ -466,7 +453,7 @@ const Footer = ({ pokemon, popups, hasPvp, Icons }) => {
 }
 
 const ExtraPokemonInfo = ({ pokemon, perms, userSettings, t, Icons }) => {
-  const moves = useMemory((state) => state.masterfile.moves)
+  const moves = useMemory((s) => s.masterfile.moves)
 
   const { move_1, move_2, first_seen_timestamp, updated, iv } = pokemon
 
@@ -492,14 +479,14 @@ const ExtraPokemonInfo = ({ pokemon, perms, userSettings, t, Icons }) => {
       <TimeStamp time={updated}>last_seen</TimeStamp>
 
       {process.env.NODE_ENV === 'development' && (
-        <Grid item xs={12} style={{ paddingTop: 10 }}>
+        <Grid xs={12} style={{ paddingTop: 10 }}>
           <Typography variant="subtitle1" align="center">
             {pokemon.id}
           </Typography>
         </Grid>
       )}
       {userSettings.enablePokemonPopupCoords && (
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           <Coords lat={pokemon.lat.toFixed(6)} lon={pokemon.lon.toFixed(6)} />
         </Grid>
       )}
diff --git a/src/components/tiles/Pokemon.jsx b/src/features/pokemon/PokemonTile.jsx
similarity index 85%
rename from src/components/tiles/Pokemon.jsx
rename to src/features/pokemon/PokemonTile.jsx
index 8ec0d1c5f..bba76ab8c 100644
--- a/src/components/tiles/Pokemon.jsx
+++ b/src/features/pokemon/PokemonTile.jsx
@@ -4,20 +4,20 @@ import * as React from 'react'
 import { Marker, Popup, Circle } from 'react-leaflet'
 import { t } from 'i18next'
 
-import useMarkerTimer from '@hooks/useMarkerTimer'
-import { getOffset } from '@services/functions/offset'
-import { getBadge } from '@services/functions/getBadge'
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import useOpacity from '@hooks/useOpacity'
-import useForcePopup from '@hooks/useForcePopup'
-import Utility from '@services/Utility'
+import { useMarkerTimer } from '@hooks/useMarkerTimer'
+import { getOffset } from '@utils/offset'
+import { getBadge } from '@utils/getBadge'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useOpacity } from '@hooks/useOpacity'
+import { useForcePopup } from '@hooks/useForcePopup'
 import { sendNotification } from '@services/desktopNotification'
-import { useMapStore } from '@hooks/useMapStore'
+import { useMapStore } from '@store/useMapStore'
+import { TooltipWrapper } from '@components/ToolTipWrapper'
+import { getTimeUntil } from '@utils/getTimeUntil'
 
-import PopupContent from '../popups/Pokemon'
-import { basicMarker, fancyMarker } from '../markers/pokemon'
-import ToolTipWrapper from './Timer'
+import { PokemonPopup } from './PokemonPopup'
+import { basicPokemonMarker, fancyPokemonMarker } from './pokemonMarker'
 
 /**
  *
@@ -38,7 +38,7 @@ const getGlowStatus = (pkmn, userSettings) => {
  * @param {import('@rm/types').Pokemon & { force?: boolean }} pkmn
  * @returns
  */
-const PokemonTile = (pkmn) => {
+const BasePokemonTile = (pkmn) => {
   const internalId = `${pkmn.pokemon_id}-${pkmn.form}`
 
   const [markerRef, setMarkerRef] = React.useState(null)
@@ -149,7 +149,7 @@ const PokemonTile = (pkmn) => {
       body: `A${pkmn.atk_iv || '?'} | D${pkmn.def_iv || '?'} | S${
         pkmn.sta_iv || '?'
       } | L${pkmn.level || '?'} | CP${pkmn.cp || '?'}\n${
-        Utility.getTimeUntil(new Date(pkmn.expire_timestamp * 1000), true).str
+        getTimeUntil(pkmn.expire_timestamp * 1000, true).str
       }`,
       lat: pkmn.lat,
       lon: pkmn.lon,
@@ -176,7 +176,7 @@ const PokemonTile = (pkmn) => {
         showWeather ||
         opacity < 1 ||
         pkmn.seen_type === 'nearby_cell'
-          ? fancyMarker({
+          ? fancyPokemonMarker({
               pkmn,
               iconUrl,
               iconSize,
@@ -186,14 +186,14 @@ const PokemonTile = (pkmn) => {
               opacity,
               timeOfDay,
             })
-          : basicMarker({ iconUrl, iconSize })
+          : basicPokemonMarker({ iconUrl, iconSize })
       }
     >
       <Popup position={finalLocation}>
-        <PopupContent pokemon={pkmn} iconUrl={iconUrl} />
+        <PokemonPopup pokemon={pkmn} iconUrl={iconUrl} />
       </Popup>
       {(showTimer || timerOverride || extras.length > 0) && (
-        <ToolTipWrapper
+        <TooltipWrapper
           timers={showTimer || timerOverride ? [pkmn.expire_timestamp] : []}
           offset={[0, 14]}
         >
@@ -210,7 +210,7 @@ const PokemonTile = (pkmn) => {
               ))}
             </div>
           )}
-        </ToolTipWrapper>
+        </TooltipWrapper>
       )}
       {showInteractionRange && configZoom && (
         <Circle center={finalLocation} radius={40} color="#BA42F6" weight={1} />
@@ -228,9 +228,7 @@ const PokemonTile = (pkmn) => {
   )
 }
 
-const MemoPokemonTile = React.memo(
-  PokemonTile,
+export const PokemonTile = React.memo(
+  BasePokemonTile,
   (prev, next) => prev.updated === next.updated,
 )
-
-export default MemoPokemonTile
diff --git a/src/features/pokemon/index.js b/src/features/pokemon/index.js
new file mode 100644
index 000000000..89dc7d4d4
--- /dev/null
+++ b/src/features/pokemon/index.js
@@ -0,0 +1,3 @@
+export * from './PokemonPopup'
+export * from './PokemonTile'
+export * from './pokemonMarker'
diff --git a/src/components/markers/pokemon.js b/src/features/pokemon/pokemonMarker.js
similarity index 95%
rename from src/components/markers/pokemon.js
rename to src/features/pokemon/pokemonMarker.js
index 2540948ad..c6e01d3ec 100644
--- a/src/components/markers/pokemon.js
+++ b/src/features/pokemon/pokemonMarker.js
@@ -1,12 +1,13 @@
 import { Icon, divIcon } from 'leaflet'
-import { useMemory } from '@hooks/useMemory'
+
+import { useMemory } from '@store/useMemory'
 
 /**
  *
  * @param {{ iconUrl: string, iconSize: number }} props
  * @returns
  */
-export const basicMarker = ({ iconUrl, iconSize }) =>
+export const basicPokemonMarker = ({ iconUrl, iconSize }) =>
   new Icon({
     iconUrl,
     iconSize: [iconSize, iconSize],
@@ -15,7 +16,7 @@ export const basicMarker = ({ iconUrl, iconSize }) =>
     className: 'marker',
   })
 
-export const fancyMarker = ({
+export const fancyPokemonMarker = ({
   pkmn,
   iconUrl,
   iconSize,
diff --git a/src/components/popups/Pokestop.jsx b/src/features/pokestop/PokestopPopup.jsx
similarity index 88%
rename from src/components/popups/Pokestop.jsx
rename to src/features/pokestop/PokestopPopup.jsx
index 3068ef69e..92f10f7f4 100644
--- a/src/components/popups/Pokestop.jsx
+++ b/src/features/pokestop/PokestopPopup.jsx
@@ -2,40 +2,38 @@
 import * as React from 'react'
 import ExpandMore from '@mui/icons-material/ExpandMore'
 import MoreVert from '@mui/icons-material/MoreVert'
-import {
-  Grid,
-  Typography,
-  Collapse,
-  IconButton,
-  Divider,
-  TableRow,
-  TableCell,
-  Table,
-  TableBody,
-  styled,
-} from '@mui/material'
-
+import Divider from '@mui/material/Divider'
+import Grid from '@mui/material/Unstable_Grid2'
+import IconButton from '@mui/material/IconButton'
+import Collapse from '@mui/material/Collapse'
+import Typography from '@mui/material/Typography'
+import TableCell from '@mui/material/TableCell'
+import TableRow from '@mui/material/TableRow'
+import Table from '@mui/material/Table'
+import TableBody from '@mui/material/TableBody'
+import styled from '@mui/material/styles/styled'
+import Check from '@mui/icons-material/Check'
+import Help from '@mui/icons-material/Help'
 import { useTranslation, Trans } from 'react-i18next'
 
-import ErrorBoundary from '@components/ErrorBoundary'
-import { Check, Help } from '@components/layout/general/Icons'
-import { useMemory } from '@hooks/useMemory'
-import { setDeepStore, useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import { getBadge } from '@services/functions/getBadge'
-import getRewardInfo from '@services/functions/getRewardInfo'
-import { getGruntReward } from '@services/functions/getGruntReward'
-
-import Dropdown from './common/Dropdown'
-import TimeTile from './common/TimeTile'
-import Navigation from './common/Navigation'
-import Coords from './common/Coords'
-import Title from './common/Title'
-import HeaderImage from './common/HeaderImage'
-import Timer from './common/Timer'
-import PowerUp from './common/PowerUp'
-import NameTT from './common/NameTT'
-import { TimeStamp } from './common/TimeStamps'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { useMemory } from '@store/useMemory'
+import { setDeepStore, useStorage } from '@store/useStorage'
+import { getBadge } from '@utils/getBadge'
+import { getRewardInfo } from '@utils/getRewardInfo'
+import { getGruntReward } from '@utils/getGruntReward'
+import { Dropdown } from '@components/popups/Dropdown'
+import { TimeTile } from '@components/popups/TimeTile'
+import { Navigation } from '@components/popups/Navigation'
+import { Coords } from '@components/popups/Coords'
+import { Title } from '@components/popups/Title'
+import { HeaderImage } from '@components/popups/HeaderImage'
+import { TimeSince } from '@components/popups/Timer'
+import { PowerUp } from '@components/popups/PowerUp'
+import { NameTT } from '@components/popups/NameTT'
+import { TimeStamp } from '@components/popups/TimeStamps'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { parseQuestConditions } from '@utils/parseConditions'
 
 /**
  *
@@ -47,7 +45,7 @@ import { TimeStamp } from './common/TimeStamps'
  * }} props
  * @returns
  */
-export default function PokestopPopup({
+export function PokestopPopup({
   hasLure,
   hasInvasion,
   hasQuest,
@@ -55,19 +53,17 @@ export default function PokestopPopup({
   ...pokestop
 }) {
   const { t } = useTranslation()
-  const Icons = useMemory((state) => state.Icons)
+  const Icons = useMemory((s) => s.Icons)
   const { lure_expire_timestamp, lure_id, invasions, events } = pokestop
 
-  React.useEffect(() => {
-    const has = { hasLure, hasQuest, hasInvasion }
-    Utility.analytics(
-      'Popup',
-      Object.keys(has)
-        .filter((a) => Boolean(has[a]))
-        .join(','),
-      'Pokestop',
-    )
-  }, [])
+  useAnalytics(
+    'Popup',
+    Object.entries({ hasLure, hasQuest, hasInvasion })
+      .filter(([, v]) => v)
+      .map(([k]) => k)
+      .join(','),
+    'Pokestop',
+  )
 
   const plainPokestop = !hasLure && !hasQuest && !hasInvasion && !hasEvent
 
@@ -81,7 +77,7 @@ export default function PokestopPopup({
         width={200}
       >
         {!plainPokestop && (
-          <Grid item xs={3} style={{ textAlign: 'center' }}>
+          <Grid xs={3} textAlign="center">
             <HeaderImage
               alt={pokestop.name}
               url={pokestop.url}
@@ -89,7 +85,7 @@ export default function PokestopPopup({
             />
           </Grid>
         )}
-        <Grid item xs={plainPokestop ? 10 : 7}>
+        <Grid xs={plainPokestop ? 10 : 7}>
           <Title backup={t('unknown_pokestop')}>{pokestop.name}</Title>
         </Grid>
         <MenuActions
@@ -98,7 +94,7 @@ export default function PokestopPopup({
           hasLure={hasLure}
           {...pokestop}
         />
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           {plainPokestop ? (
             <>
               <HeaderImage
@@ -311,8 +307,8 @@ const MenuActions = ({
   invasions,
 }) => {
   const { t } = useTranslation()
-  const masterfile = useMemory((state) => state.masterfile)
-  const filters = useStorage((state) => state.filters)
+  const masterfile = useMemory((s) => s.masterfile)
+  const filters = useStorage((s) => s.filters)
 
   const [anchorEl, setAnchorEl] = React.useState(false)
 
@@ -329,6 +325,7 @@ const MenuActions = ({
     useMemory.setState((prev) => ({ hideList: new Set(prev.hideList).add(id) }))
   }
 
+  /** @param {string} key */
   const setState = (key) =>
     setDeepStore(`filters.pokestops.filter.${key}.enabled`, false)
 
@@ -463,7 +460,7 @@ const MenuActions = ({
     options.push({ name: 'timer', action: handleTimer })
   }
   return (
-    <Grid item xs={2} style={{ textAlign: 'right' }}>
+    <Grid xs={2} textAlign="right">
       <IconButton aria-haspopup="true" onClick={handleClick} size="large">
         <MoreVert />
       </IconButton>
@@ -487,7 +484,7 @@ const RewardInfo = ({ with_ar, ...quest }) => {
   const questMessage = useMemory((s) => s.config.misc.questMessage)
 
   return (
-    <Grid item xs={3} style={{ textAlign: 'center', position: 'relative' }}>
+    <Grid xs={3} style={{ textAlign: 'center', position: 'relative' }}>
       <NameTT id={tt}>
         <img
           src={src}
@@ -534,7 +531,7 @@ const QuestConditions = ({
 
   if (madQuestText && quest_task) {
     return (
-      <Grid item xs={9} textAlign="center">
+      <Grid xs={9} textAlign="center">
         <Typography variant="caption">{quest_task}</Typography>
       </Grid>
     )
@@ -544,7 +541,7 @@ const QuestConditions = ({
     const normalized = `quest_title_${quest_title.toLowerCase()}`
     if (i18n.exists(normalized)) {
       return (
-        <Grid item xs={9} textAlign="center">
+        <Grid xs={9} textAlign="center">
           <Typography variant="caption">
             <Trans i18nKey={normalized}>{{ amount_0: quest_target }}</Trans>
           </Typography>
@@ -553,7 +550,7 @@ const QuestConditions = ({
     }
   }
 
-  const [type1, type2] = Utility.parseConditions(quest_conditions)
+  const [type1, type2] = parseQuestConditions(quest_conditions)
   const primaryCondition = (
     <Typography variant="caption">
       <Trans i18nKey={`quest_${quest_type}`}>{{ amount: quest_target }}</Trans>
@@ -621,7 +618,6 @@ const QuestConditions = ({
   }
   return (
     <Grid
-      item
       xs={9}
       style={{ textAlign: 'center', maxHeight: 150, overflow: 'auto' }}
     >
@@ -652,20 +648,14 @@ const QuestConditions = ({
  * @returns
  */
 const Footer = ({ lat, lon }) => {
-  const open = useStorage((state) => !!state.popups.extras)
+  const open = useStorage((s) => !!s.popups.extras)
 
   return (
-    <Grid
-      container
-      item
-      xs={12}
-      justifyContent="space-evenly"
-      alignItems="center"
-    >
-      <Grid item xs={3}>
+    <Grid container xs={12} justifyContent="space-evenly" alignItems="center">
+      <Grid xs={3}>
         <Navigation lat={lat} lon={lon} />
       </Grid>
-      <Grid item xs={3} textAlign="center">
+      <Grid xs={3} textAlign="center">
         <IconButton
           className={open ? 'expanded' : 'closed'}
           onClick={() =>
@@ -688,9 +678,9 @@ const Footer = ({ lat, lon }) => {
  * @returns
  */
 const ExtraInfo = ({ last_modified_timestamp, updated, lat, lon }) => {
-  const open = useStorage((state) => state.popups.extras)
+  const open = useStorage((s) => s.popups.extras)
   const enablePokestopPopupCoords = useStorage(
-    (state) => state.userSettings.pokestops.enablePokestopPopupCoords,
+    (s) => s.userSettings.pokestops.enablePokestopPopupCoords,
   )
 
   return (
@@ -699,7 +689,7 @@ const ExtraInfo = ({ last_modified_timestamp, updated, lat, lon }) => {
         <TimeStamp time={updated}>last_seen</TimeStamp>
         <TimeStamp time={last_modified_timestamp}>last_modified</TimeStamp>
         {enablePokestopPopupCoords && (
-          <Grid item xs={12} textAlign="center">
+          <Grid xs={12} textAlign="center">
             <Coords lat={lat} lon={lon} />
           </Grid>
         )}
@@ -745,23 +735,23 @@ const ENCOUNTER_NUM = { first: '#1', second: '#2', third: '#3' }
 const Invasion = ({ grunt_type, confirmed, ...invasion }) => {
   const Icons = useMemory((s) => s.Icons)
   const { t } = useTranslation()
-  const info = useMemory((state) => state.masterfile.invasions[grunt_type])
+  const info = useMemory((s) => s.masterfile.invasions[grunt_type])
 
   return (
     <Grid container>
-      <Grid item xs={9}>
+      <Grid xs={9}>
         <Typography variant="h6" align="center">
           {t(`grunt_a_${grunt_type}`)}
         </Typography>
       </Grid>
-      <Grid item xs={3} style={{ alignItems: 'center', display: 'flex' }}>
+      <Grid xs={3} style={{ alignItems: 'center', display: 'flex' }}>
         {confirmed ? (
           <Check fontSize="medium" color="success" />
         ) : (
           <Help fontSize="medium" />
         )}
       </Grid>
-      <Grid item xs={12}>
+      <Grid xs={12}>
         <table className="table-invasion">
           <tbody>
             {Object.entries(info?.encounters || {}).map(
@@ -816,7 +806,7 @@ const Showcase = ({
   const { t } = useTranslation()
   return (
     <Grid container>
-      <Grid item xs={12}>
+      <Grid xs={12}>
         <Typography variant="h6" align="center">
           {t(
             `context_category_${showcase_ranking_standard}`,
@@ -824,26 +814,24 @@ const Showcase = ({
           )}
         </Typography>
       </Grid>
-      <Grid item xs={12}>
-        {children}
-      </Grid>
-      <Grid item xs={6}>
+      <Grid xs={12}>{children}</Grid>
+      <Grid xs={6}>
         <Typography variant="subtitle2" align="center">
           {t(`total_entries`, 'Total Entries')}:
         </Typography>
       </Grid>
-      <Grid item xs={6}>
+      <Grid xs={6}>
         <Typography variant="subtitle2" align="center">
           {total_entries} / 200 {/* TODO: Read from GM */}
         </Typography>
       </Grid>
-      <Grid item xs={6}>
+      <Grid xs={6}>
         <Typography variant="subtitle2" align="center">
           {t(`last_updated`, 'Last Updated')}:
         </Typography>
       </Grid>
-      <Grid item xs={6}>
-        <Timer expireTime={last_update} />
+      <Grid xs={6}>
+        <TimeSince expireTime={last_update} />
       </Grid>
     </Grid>
   )
diff --git a/src/components/tiles/Pokestop.jsx b/src/features/pokestop/PokestopTile.jsx
similarity index 89%
rename from src/components/tiles/Pokestop.jsx
rename to src/features/pokestop/PokestopTile.jsx
index 0dc6137ba..9ecae29e1 100644
--- a/src/components/tiles/Pokestop.jsx
+++ b/src/features/pokestop/PokestopTile.jsx
@@ -3,21 +3,21 @@
 import * as React from 'react'
 import { Marker, Popup, Circle } from 'react-leaflet'
 
-import useMarkerTimer from '@hooks/useMarkerTimer'
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import useForcePopup from '@hooks/useForcePopup'
+import { useMarkerTimer } from '@hooks/useMarkerTimer'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useForcePopup } from '@hooks/useForcePopup'
+import { TooltipWrapper } from '@components/ToolTipWrapper'
 
-import PopupContent from '../popups/Pokestop'
-import ToolTipWrapper from './Timer'
-import usePokestopMarker from '../markers/usePokestopMarker'
+import { PokestopPopup } from './PokestopPopup'
+import { usePokestopMarker } from './usePokestopMarker'
 
 /**
  *
  * @param {import('@rm/types').Pokestop} pokestop
  * @returns
  */
-const PokestopTile = (pokestop) => {
+const BasePokestopTile = (pokestop) => {
   const [stateChange, setStateChange] = React.useState(false)
   const [markerRef, setMarkerRef] = React.useState(null)
 
@@ -126,7 +126,7 @@ const PokestopTile = (pokestop) => {
       icon={icon}
     >
       <Popup position={[pokestop.lat, pokestop.lon]}>
-        <PopupContent
+        <PokestopPopup
           hasLure={hasLure}
           hasInvasion={hasInvasion}
           hasQuest={hasQuest}
@@ -135,7 +135,7 @@ const PokestopTile = (pokestop) => {
         />
       </Popup>
       {Boolean(timers.length) && (
-        <ToolTipWrapper timers={timers} offset={[0, 4]} />
+        <TooltipWrapper timers={timers} offset={[0, 4]} />
       )}
       {interactionRange && (
         <Circle
@@ -162,8 +162,8 @@ const PokestopTile = (pokestop) => {
   ) : null
 }
 
-const MemoPokestopTile = React.memo(
-  PokestopTile,
+export const PokestopTile = React.memo(
+  BasePokestopTile,
   (prev, next) =>
     prev.id === next.id &&
     prev.lure_expire_timestamp === next.lure_expire_timestamp &&
@@ -182,5 +182,3 @@ const MemoPokestopTile = React.memo(
       : true) &&
     prev.events?.length === next.events?.length,
 )
-
-export default MemoPokestopTile
diff --git a/src/features/pokestop/index.js b/src/features/pokestop/index.js
new file mode 100644
index 000000000..ac0a3777e
--- /dev/null
+++ b/src/features/pokestop/index.js
@@ -0,0 +1,3 @@
+export * from './PokestopPopup'
+export * from './PokestopTile'
+export * from './usePokestopMarker'
diff --git a/src/components/markers/usePokestopMarker.js b/src/features/pokestop/usePokestopMarker.js
similarity index 97%
rename from src/components/markers/usePokestopMarker.js
rename to src/features/pokestop/usePokestopMarker.js
index 27ad01448..da93e1e4b 100644
--- a/src/components/markers/usePokestopMarker.js
+++ b/src/features/pokestop/usePokestopMarker.js
@@ -1,9 +1,9 @@
 // @ts-check
-/* eslint-disable no-nested-ternary */
 import { divIcon } from 'leaflet'
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import useOpacity from '@hooks/useOpacity'
+
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useOpacity } from '@hooks/useOpacity'
 
 /**
  *
@@ -15,7 +15,7 @@ import useOpacity from '@hooks/useOpacity'
  * } & import('@rm/types').Pokestop} param0
  * @returns
  */
-export default function usePokestopMarker({
+export function usePokestopMarker({
   hasQuest,
   hasLure,
   hasInvasion,
@@ -42,7 +42,7 @@ export default function usePokestopMarker({
         hasInvasion,
         hasQuest && userSettings.pokestops.hasQuestIndicator,
         ar_scan_eligible &&
-          (userSettings.pokestops.showArBadge || power_up_level),
+          (userSettings.pokestops.showArBadge || !!power_up_level),
         power_up_level,
         hasEvent
           ? Math.max(...events.map((event) => event.display_type)).toString()
diff --git a/src/components/popups/Portal.jsx b/src/features/portal/PortalPopup.jsx
similarity index 65%
rename from src/components/popups/Portal.jsx
rename to src/features/portal/PortalPopup.jsx
index be050f9ac..f1c928dca 100644
--- a/src/components/popups/Portal.jsx
+++ b/src/features/portal/PortalPopup.jsx
@@ -1,30 +1,23 @@
 // @ts-check
 import * as React from 'react'
-import Grid from '@mui/material/Grid'
+import Grid from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-
-import Navigation from './common/Navigation'
-import Coords from './common/Coords'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Navigation } from '@components/popups/Navigation'
+import { Coords } from '@components/popups/Coords'
+import { dayCheck } from '@utils/dayCheck'
+import { useAnalytics } from '@hooks/useAnalytics'
 
 /**
  *
  * @param {import('@rm/types').Portal} props
  * @returns
  */
-export default function PortalPopup({
-  url,
-  name,
-  lat,
-  lon,
-  updated,
-  imported,
-}) {
+export function PortalPopup({ url, name, lat, lon, updated, imported }) {
   const { t } = useTranslation()
   const Icons = useMemory((s) => s.Icons)
   const enablePortalPopupCoords = useStorage(
@@ -38,17 +31,15 @@ export default function PortalPopup({
   const extraMetaData = [
     {
       description: t('last_updated'),
-      data: Utility.dayCheck(Date.now() / 1000, updated),
+      data: dayCheck(Date.now() / 1000, updated),
     },
     {
       description: t('imported'),
-      data: Utility.dayCheck(Date.now() / 1000, imported),
+      data: dayCheck(Date.now() / 1000, imported),
     },
   ]
 
-  React.useEffect(() => {
-    Utility.analytics('Popup', `Name: ${name}`, 'Portal')
-  }, [])
+  useAnalytics('Popup', `Name: ${name}`, 'Portal')
 
   return (
     <ErrorBoundary noRefresh style={{}} variant="h5">
@@ -60,7 +51,7 @@ export default function PortalPopup({
         alignItems="center"
         spacing={1}
       >
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Typography
             variant={name.length > 20 ? 'subtitle2' : 'h6'}
             align="center"
@@ -70,7 +61,7 @@ export default function PortalPopup({
             {name}
           </Typography>
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           <a href={url} target="_blank" rel="noreferrer">
             <img
               src={src}
@@ -83,23 +74,23 @@ export default function PortalPopup({
             />
           </a>
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           {extraMetaData.map((meta) => (
             <React.Fragment key={meta.description}>
-              <Typography variant="subtitle1" style={{ textAlign: 'center' }}>
+              <Typography variant="subtitle1" textAlign="center">
                 {meta.description}
               </Typography>
-              <Typography variant="caption" style={{ textAlign: 'center' }}>
+              <Typography variant="caption" textAlign="center">
                 {meta.data}
               </Typography>
             </React.Fragment>
           ))}
         </Grid>
-        <Grid item xs={4} style={{ textAlign: 'center' }}>
+        <Grid xs={4} textAlign="center">
           <Navigation lat={lat} lon={lon} />
         </Grid>
         {enablePortalPopupCoords && (
-          <Grid item xs={12} style={{ textAlign: 'center' }}>
+          <Grid xs={12} textAlign="center">
             <Coords lat={lat} lon={lon} />
           </Grid>
         )}
diff --git a/src/components/tiles/Portal.jsx b/src/features/portal/PortalTile.jsx
similarity index 74%
rename from src/components/tiles/Portal.jsx
rename to src/features/portal/PortalTile.jsx
index 95f4b229c..ac19de2f2 100644
--- a/src/components/tiles/Portal.jsx
+++ b/src/features/portal/PortalTile.jsx
@@ -3,17 +3,17 @@
 import * as React from 'react'
 import { Circle, Popup } from 'react-leaflet'
 
-import { useStorage } from '@hooks/useStorage'
-import useForcePopup from '@hooks/useForcePopup'
+import { useStorage } from '@store/useStorage'
+import { useForcePopup } from '@hooks/useForcePopup'
 
-import PopupContent from '../popups/Portal'
+import { PortalPopup } from './PortalPopup'
 
 /**
  *
  * @param {{ force?: boolean } & import('@rm/types').Portal} portal
  * @returns
  */
-const PortalTile = (portal) => {
+const BasePortalTile = (portal) => {
   const [markerRef, setMarkerRef] = React.useState(null)
   const color = useStorage((s) =>
     Date.now() / 1000 - portal.imported > 86400
@@ -34,15 +34,13 @@ const PortalTile = (portal) => {
       fillColor={color}
     >
       <Popup position={[portal.lat, portal.lon]}>
-        <PopupContent {...portal} />
+        <PortalPopup {...portal} />
       </Popup>
     </Circle>
   )
 }
 
-const MemoPortalTile = React.memo(
-  PortalTile,
+export const PortalTile = React.memo(
+  BasePortalTile,
   (prev, next) => prev.updated === next.updated,
 )
-
-export default MemoPortalTile
diff --git a/src/features/portal/index.js b/src/features/portal/index.js
new file mode 100644
index 000000000..5f0ff2f40
--- /dev/null
+++ b/src/features/portal/index.js
@@ -0,0 +1,2 @@
+export * from './PortalPopup'
+export * from './PortalTile'
diff --git a/src/components/layout/dialogs/profile/Backups.jsx b/src/features/profile/Backups.jsx
similarity index 90%
rename from src/components/layout/dialogs/profile/Backups.jsx
rename to src/features/profile/Backups.jsx
index e39f3a0f4..55a0c9c87 100644
--- a/src/components/layout/dialogs/profile/Backups.jsx
+++ b/src/features/profile/Backups.jsx
@@ -11,18 +11,18 @@ import Button from '@mui/material/Button'
 import ButtonGroup from '@mui/material/ButtonGroup'
 import Typography from '@mui/material/Typography'
 import Divider from '@mui/material/Divider'
+import Box from '@mui/material/Box'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import Query from '@services/Query'
-import { Box } from '@mui/material'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Query } from '@services/queries'
 
 export function UserBackups() {
   const { t } = useTranslation()
   const hasPerm = useMemory((s) => s.auth.perms.backups)
 
   /** @type {import('@apollo/client').QueryResult<{ backups: import('@rm/types').Backup[] }>} */
-  const { data } = useQuery(Query.user('getBackups'), {
+  const { data } = useQuery(Query.user('GET_BACKUPS'), {
     fetchPolicy: 'no-cache',
     skip: !hasPerm,
   })
@@ -53,7 +53,7 @@ function CreateNew({ backups }) {
   const userBackupLimits = useMemory((s) => s.auth.userBackupLimits)
   const [name, setName] = React.useState('')
 
-  const [create, { loading }] = useMutation(Query.user('createBackup'), {
+  const [create, { loading }] = useMutation(Query.user('CREATE_BACKUP'), {
     refetchQueries: ['GetBackups'],
   })
   return (
@@ -91,14 +91,14 @@ function BackupItem({ backup }) {
   const [name, setName] = React.useState(backup.name)
   const [loading, setLoading] = React.useState(false)
 
-  const [update, { loading: l1 }] = useMutation(Query.user('updateBackup'), {
+  const [update, { loading: l1 }] = useMutation(Query.user('UPDATE_BACKUP'), {
     refetchQueries: ['GetBackups'],
   })
-  const [remove, { loading: l2 }] = useMutation(Query.user('deleteBackup'), {
+  const [remove, { loading: l2 }] = useMutation(Query.user('DELETE_BACKUP'), {
     refetchQueries: ['GetBackups'],
   })
   const [load, { data: fullBackup, loading: l3 }] = useLazyQuery(
-    Query.user('getFullBackup'),
+    Query.user('GET_FULL_BACKUP'),
   )
 
   React.useEffect(() => setName(backup.name), [backup])
diff --git a/src/components/layout/dialogs/profile/ExtraFields.jsx b/src/features/profile/ExtraFields.jsx
similarity index 91%
rename from src/components/layout/dialogs/profile/ExtraFields.jsx
rename to src/features/profile/ExtraFields.jsx
index ac9c4a697..715cf7ff0 100644
--- a/src/components/layout/dialogs/profile/ExtraFields.jsx
+++ b/src/features/profile/ExtraFields.jsx
@@ -3,11 +3,11 @@ import * as React from 'react'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
 import TextField from '@mui/material/TextField'
 import { useMutation } from '@apollo/client'
-
-import { useMemory } from '@hooks/useMemory'
-import Query from '@services/Query'
 import { useTranslation } from 'react-i18next'
 
+import { useMemory } from '@store/useMemory'
+import { Query } from '@services/queries'
+
 export function ExtraUserFields() {
   const fields = useMemory((s) => s.extraUserFields)
   return fields?.length ? (
@@ -31,7 +31,7 @@ export function FieldValue({ field }) {
   const disabled = typeof field === 'string' ? false : field.disabled
 
   const value = useMemory((s) => s.auth.data?.[key] || '')
-  const [setField] = useMutation(Query.user('setExtraFields'))
+  const [setField] = useMutation(Query.user('SET_EXTRA_FIELDS'))
 
   if (!key || !label) return null
   return (
diff --git a/src/components/layout/dialogs/profile/GymBadges.jsx b/src/features/profile/GymBadges.jsx
similarity index 84%
rename from src/components/layout/dialogs/profile/GymBadges.jsx
rename to src/features/profile/GymBadges.jsx
index d09377125..46225da6f 100644
--- a/src/components/layout/dialogs/profile/GymBadges.jsx
+++ b/src/features/profile/GymBadges.jsx
@@ -1,18 +1,21 @@
 // @ts-check
 import * as React from 'react'
-import { Grid, Typography, IconButton, Button, Box } from '@mui/material'
+import Grid from '@mui/material/Unstable_Grid2'
+import Box from '@mui/material/Box'
+import Typography from '@mui/material/Typography'
+import IconButton from '@mui/material/IconButton'
+import Button from '@mui/material/Button'
 import Edit from '@mui/icons-material/Edit'
 import { useTranslation } from 'react-i18next'
 import { useQuery } from '@apollo/client'
 import { useMap } from 'react-leaflet'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import Query from '@services/Query'
-
-import { VirtualGrid } from '@components/layout/general/VirtualGrid'
-import { Img } from '@components/layout/general/Img'
-import { ToggleTypography } from '@components/layout/general/ToggleTypography'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { Query } from '@services/queries'
+import { VirtualGrid } from '@components/virtual/VirtualGrid'
+import { Img } from '@components/Img'
+import { ToggleTypography } from '@components/ToggleTypography'
 
 export function UserGymBadges() {
   const { t } = useTranslation()
@@ -50,7 +53,7 @@ export function UserGymBadges() {
       </Typography>
       <Grid container pt={1} pb={2}>
         {Object.entries(counts).map(([key, count], i) => (
-          <Grid key={key} item xs={4}>
+          <Grid key={key} xs={4}>
             <Typography
               variant="subtitle2"
               align="center"
diff --git a/src/components/layout/dialogs/profile/LinkAccounts.jsx b/src/features/profile/LinkAccounts.jsx
similarity index 83%
rename from src/components/layout/dialogs/profile/LinkAccounts.jsx
rename to src/features/profile/LinkAccounts.jsx
index 0265e8225..946367500 100644
--- a/src/components/layout/dialogs/profile/LinkAccounts.jsx
+++ b/src/features/profile/LinkAccounts.jsx
@@ -7,25 +7,24 @@ import Select from '@mui/material/Select'
 import MenuItem from '@mui/material/MenuItem'
 import Typography from '@mui/material/Typography'
 
-import { useMemory } from '@hooks/useMemory'
-import Utility from '@services/Utility'
-import Query from '@services/Query'
+import { useMemory } from '@store/useMemory'
+import { Query } from '@services/queries'
 import { METHODS } from '@assets/constants'
-
-import DiscordButton from '../../auth/Discord'
-import Telegram from '../../auth/Telegram'
-import Notification from '../../general/Notification'
+import { DiscordButton } from '@components/auth/Discord'
+import { TelegramWidget } from '@components/auth/Telegram'
+import { Notification } from '@components/Notification'
+import { getProperName } from '@utils/strings'
 
 export function LinkAccounts() {
   const { t } = useTranslation()
   const auth = useMemory((s) => s.auth)
   const { discordAuthUrl, telegramAuthUrl, telegramBotName } = useMemory(
-    (state) => state.config.customRoutes,
+    (s) => s.config.customRoutes,
   )
 
   const [refreshing, setRefreshing] = React.useState(false)
 
-  const [setWebhookStrategy] = useMutation(Query.user('setWebhookStrategy'))
+  const [setWebhookStrategy] = useMutation(Query.user('SET_WEBHOOK_STRATEGY'))
 
   if (refreshing) {
     setTimeout(() => window.location.reload(), 2000)
@@ -37,7 +36,10 @@ export function LinkAccounts() {
         {METHODS.map((method, i) => {
           if (!auth.methods.includes(method)) return null
           const Component = i ? (
-            <Telegram authUrl={telegramAuthUrl} botName={telegramBotName} />
+            <TelegramWidget
+              authUrl={telegramAuthUrl}
+              botName={telegramBotName}
+            />
           ) : (
             <DiscordButton href={discordAuthUrl} size="medium">
               {t('link_discord')}
@@ -80,7 +82,7 @@ export function LinkAccounts() {
                 {METHODS.map((x) =>
                   auth[`${x}Id`] ? (
                     <MenuItem key={x} value={x}>
-                      {Utility.getProperName(x)}
+                      {getProperName(x)}
                     </MenuItem>
                   ) : null,
                 )}
diff --git a/src/components/layout/dialogs/profile/Permissions.jsx b/src/features/profile/Permissions.jsx
similarity index 90%
rename from src/components/layout/dialogs/profile/Permissions.jsx
rename to src/features/profile/Permissions.jsx
index 4afb39790..e6ca2bdff 100644
--- a/src/components/layout/dialogs/profile/Permissions.jsx
+++ b/src/features/profile/Permissions.jsx
@@ -8,9 +8,9 @@ import CardContent from '@mui/material/CardContent'
 import CardMedia from '@mui/material/CardMedia'
 import Typography from '@mui/material/Typography'
 
-import { useMemory } from '@hooks/useMemory'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
 import { ALWAYS_EXCLUDED } from '@assets/constants'
+import { getProperName, camelToSnake } from '@utils/strings'
 
 export function UserPermissions() {
   const perms = useMemory((s) => s.auth.perms)
@@ -75,11 +75,7 @@ function PermCard({ perm }) {
 
   const component = React.useCallback(() => {
     if (Array.isArray(value) && !permArrayImages)
-      return (
-        <PermMedia>
-          {value.map((item) => Utility.getProperName(item))}
-        </PermMedia>
-      )
+      return <PermMedia>{value.map((item) => getProperName(item))}</PermMedia>
     if (value)
       return (
         <Box
@@ -101,10 +97,10 @@ function PermCard({ perm }) {
       <CardMedia component={component} />
       <CardContent style={{ minHeight: 100 }}>
         <Typography gutterBottom variant="h6" color={textColor}>
-          {t(Utility.camelToSnake(perm))}
+          {t(camelToSnake(perm))}
         </Typography>
         <Typography variant="body2" color={textColor}>
-          {t(`${Utility.camelToSnake(perm)}_subtitle`)}
+          {t(`${camelToSnake(perm)}_subtitle`)}
         </Typography>
       </CardContent>
     </Card>
diff --git a/src/components/layout/dialogs/profile/index.jsx b/src/features/profile/index.jsx
similarity index 84%
rename from src/components/layout/dialogs/profile/index.jsx
rename to src/features/profile/index.jsx
index 778af9abf..cb19c5015 100644
--- a/src/components/layout/dialogs/profile/index.jsx
+++ b/src/features/profile/index.jsx
@@ -7,24 +7,24 @@ import Tab from '@mui/material/Tab'
 import Box from '@mui/material/Box'
 import DialogContent from '@mui/material/DialogContent'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
+import { DialogWrapper } from '@components/dialogs/DialogWrapper'
+import { useAnalytics } from '@hooks/useAnalytics'
 
-import Header from '../../general/Header'
-import Footer from '../../general/Footer'
-import { DialogWrapper } from '../DialogWrapper'
 import { UserBackups } from './Backups'
 import { UserPermissions } from './Permissions'
 import { UserGymBadges } from './GymBadges'
 import { LinkAccounts } from './LinkAccounts'
 import { ExtraUserFields } from './ExtraFields'
 
-export default function UserProfile() {
-  Utility.analytics('/user-profile')
+export function UserProfile() {
+  useAnalytics('/user-profile')
   const { t } = useTranslation()
-  const auth = useMemory((state) => state.auth)
-  const { rolesLinkName, rolesLink } = useMemory((state) => state.config.links)
+  const auth = useMemory((s) => s.auth)
+  const { rolesLinkName, rolesLink } = useMemory((s) => s.config.links)
 
   const locale = localStorage.getItem('i18nextLng') || 'en'
 
diff --git a/src/components/popups/Route.jsx b/src/features/route/RoutePopup.jsx
similarity index 95%
rename from src/components/popups/Route.jsx
rename to src/features/route/RoutePopup.jsx
index c45bf477a..955142287 100644
--- a/src/components/popups/Route.jsx
+++ b/src/features/route/RoutePopup.jsx
@@ -21,15 +21,15 @@ import ArrowDropUp from '@mui/icons-material/ArrowDropUp'
 import Typography from '@mui/material/Typography'
 import DownloadIcon from '@mui/icons-material/Download'
 
-import Query from '@services/Query'
-import formatInterval from '@services/functions/formatInterval'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import { useFormatDistance } from '@hooks/useFormatDistance'
+import { Query } from '@services/queries'
+import { formatInterval } from '@utils/formatInterval'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Title } from '@components/popups/Title'
+import { TimeSince } from '@components/popups/Timer'
+import { Navigation } from '@components/popups/Navigation'
 
-import Title from './common/Title'
-import TimeSince from './common/Timer'
-import Navigation from './common/Navigation'
+import { useFormatDistance } from './useFormatDistance'
 
 const IMAGE_SIZE = 80
 
@@ -130,7 +130,7 @@ function ExpandableWrapper({ disabled = false, children, expandKey, primary }) {
  * @param {import("@rm/types").Route & { end?: boolean }} props
  * @returns
  */
-export default function RoutePopup({ end, ...props }) {
+export function RoutePopup({ end, ...props }) {
   const [route, setRoute] = React.useState({ ...props, tags: [] })
   const { config } = useMemory.getState()
   const formatDistance = useFormatDistance()
diff --git a/src/components/tiles/Route.jsx b/src/features/route/RouteTile.jsx
similarity index 91%
rename from src/components/tiles/Route.jsx
rename to src/features/route/RouteTile.jsx
index f26cb9043..c54baf6c4 100644
--- a/src/components/tiles/Route.jsx
+++ b/src/features/route/RouteTile.jsx
@@ -1,14 +1,13 @@
 /* eslint-disable react/destructuring-assignment */
-/* eslint-disable no-nested-ternary */
 // @ts-check
 import * as React from 'react'
 import { Marker, Polyline, useMapEvents } from 'react-leaflet'
-import { darken } from '@mui/material'
+import { darken } from '@mui/material/styles'
 
-import RoutePopup from '@components/popups/Route'
-import useForcePopup from '@hooks/useForcePopup'
+import { useForcePopup } from '@hooks/useForcePopup'
 
-import routeMarker from '../markers/route'
+import { routeMarker } from './routeMarker'
+import { RoutePopup } from './RoutePopup'
 
 const POSITIONS = /** @type {const} */ (['start', 'end'])
 
@@ -20,7 +19,7 @@ const MARKER_OPACITY = LINE_OPACITY * 2
  * @param {import("@rm/types").Route} route
  * @returns
  */
-const RouteTile = (route) => {
+const BaseRouteTile = (route) => {
   const [clicked, setClicked] = React.useState(false)
   const [hover, setHover] = React.useState('')
 
@@ -131,9 +130,7 @@ const RouteTile = (route) => {
   )
 }
 
-const MemoRouteTile = React.memo(
-  RouteTile,
+export const RouteTile = React.memo(
+  BaseRouteTile,
   (prev, next) => prev.updated === next.updated,
 )
-
-export default MemoRouteTile
diff --git a/src/features/route/index.js b/src/features/route/index.js
new file mode 100644
index 000000000..4fdc571cb
--- /dev/null
+++ b/src/features/route/index.js
@@ -0,0 +1,3 @@
+export * from './routeMarker'
+export * from './RoutePopup'
+export * from './RouteTile'
diff --git a/src/components/markers/route.js b/src/features/route/routeMarker.js
similarity index 79%
rename from src/components/markers/route.js
rename to src/features/route/routeMarker.js
index 5199fb4a0..321b6e919 100644
--- a/src/components/markers/route.js
+++ b/src/features/route/routeMarker.js
@@ -1,13 +1,13 @@
 // @ts-check
 import { Icon } from 'leaflet'
 
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
 
 /**
  * @param {'start' | 'end'} position
  * @returns
  */
-export default function getRouteMarker(position) {
+export function routeMarker(position) {
   const iconUrl = useMemory.getState().Icons.getMisc(`route-${position}`)
   return new Icon({
     iconUrl,
diff --git a/src/hooks/useFormatDistance.js b/src/features/route/useFormatDistance.js
similarity index 73%
rename from src/hooks/useFormatDistance.js
rename to src/features/route/useFormatDistance.js
index 34a8d0059..53f02d6e4 100644
--- a/src/hooks/useFormatDistance.js
+++ b/src/features/route/useFormatDistance.js
@@ -1,9 +1,8 @@
 // @ts-check
 import { useTranslation } from 'react-i18next'
 
-import { formatDistance } from '@services/functions/formatDistance'
-
-import { useStorage } from './useStorage'
+import { formatDistance } from '@utils/formatDistance'
+import { useStorage } from '@store/useStorage'
 
 /** @returns {(meters: number) => string} */
 export function useFormatDistance() {
diff --git a/src/features/s2cell/BaseCell.jsx b/src/features/s2cell/BaseCell.jsx
new file mode 100644
index 000000000..3cb0cee54
--- /dev/null
+++ b/src/features/s2cell/BaseCell.jsx
@@ -0,0 +1,24 @@
+// @ts-check
+import * as React from 'react'
+import { Polyline } from 'react-leaflet'
+
+/**
+ *
+ * @param {{ coords: import('@rm/types').S2Polygon, color: string }} props
+ * @returns
+ */
+function Cell({ coords, color }) {
+  return (
+    <Polyline
+      key={color}
+      positions={[...coords, coords[0]]}
+      color={color}
+      weight={0.5}
+    />
+  )
+}
+
+export const BaseCell = React.memo(
+  Cell,
+  (prev, next) => prev.color === next.color,
+)
diff --git a/src/components/tiles/S2Cell.jsx b/src/features/s2cell/GenerateCells.jsx
similarity index 73%
rename from src/components/tiles/S2Cell.jsx
rename to src/features/s2cell/GenerateCells.jsx
index 2dd40f74e..e84fe64a4 100644
--- a/src/components/tiles/S2Cell.jsx
+++ b/src/features/s2cell/GenerateCells.jsx
@@ -1,6 +1,5 @@
 // @ts-check
 import * as React from 'react'
-import { Polyline } from 'react-leaflet'
 import {
   S2LatLng,
   S2RegionCoverer,
@@ -9,34 +8,12 @@ import {
   S2Point,
 } from 'nodes2ts'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Notification } from '@components/Notification'
+import { getQueryArgs } from '@utils/getQueryArgs'
 
-import Notification from '@components/layout/general/Notification'
-import { getQueryArgs } from '@services/functions/getQueryArgs'
-
-/**
- *
- * @param {{ coords: import('@rm/types').S2Polygon, color: string }} props
- * @returns
- */
-function BaseCell({ coords, color }) {
-  return (
-    <Polyline
-      key={color}
-      positions={[...coords, coords[0]]}
-      color={color}
-      weight={0.5}
-    />
-  )
-}
-
-const MemoBaseCell = React.memo(
-  BaseCell,
-  (prev, next) => prev.color === next.color,
-)
-
-export default MemoBaseCell
+import { BaseCell } from './BaseCell'
 
 export function GenerateCells() {
   const darkTiles = useMemory((s) => s.tileStyle === 'dark')
@@ -83,7 +60,7 @@ export function GenerateCells() {
       {cells
         .filter((_, i) => i < 20_000)
         .map((cell) => (
-          <MemoBaseCell key={cell.id} {...cell} color={color} />
+          <BaseCell key={cell.id} {...cell} color={color} />
         ))}
       <Notification
         open={cells.length > 20_000}
diff --git a/src/features/s2cell/index.js b/src/features/s2cell/index.js
new file mode 100644
index 000000000..1eb0283ce
--- /dev/null
+++ b/src/features/s2cell/index.js
@@ -0,0 +1,2 @@
+export * from './GenerateCells'
+export * from './BaseCell'
diff --git a/src/components/tiles/ScanArea.jsx b/src/features/scanArea/ScanAreaTile.jsx
similarity index 78%
rename from src/components/tiles/ScanArea.jsx
rename to src/features/scanArea/ScanAreaTile.jsx
index 45b10941a..1cbfcb03d 100644
--- a/src/components/tiles/ScanArea.jsx
+++ b/src/features/scanArea/ScanAreaTile.jsx
@@ -1,34 +1,32 @@
-/* eslint-disable react/destructuring-assignment */
 // @ts-check
+/* eslint-disable react/destructuring-assignment */
 import * as React from 'react'
 import { GeoJSON } from 'react-leaflet'
-
-import { useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import { useWebhookStore } from '@components/layout/dialogs/webhooks/store'
-import { handleClick } from '@components/layout/dialogs/webhooks/human/area/AreaChip'
 import { Polygon } from 'leaflet'
 
+import { useWebhookStore, handleClick } from '@store/useWebhookStore'
+import { useStorage } from '@store/useStorage'
+import { getProperName } from '@utils/strings'
+
 /**
  *
  * @param {import('@rm/types').RMGeoJSON} featureCollection
  * @returns
  */
-export function ScanAreaTile(featureCollection) {
+function ScanArea(featureCollection) {
   const search = useStorage((s) => s.filters.scanAreas?.filter?.search)
   const tapToToggle = useStorage((s) => s.userSettings.scanAreas.tapToToggle)
   const alwaysShowLabels = useStorage(
     (s) => s.userSettings.scanAreas.alwaysShowLabels,
   )
-
-  const webhookMode = useWebhookStore((s) => s.mode)
+  const webhook = useWebhookStore((s) => !!s.mode)
 
   return (
     <GeoJSON
       key={`${search}${tapToToggle}${alwaysShowLabels}`}
       data={featureCollection}
       filter={(f) =>
-        webhookMode ||
+        webhook ||
         search === '' ||
         f.properties.key.toLowerCase().includes(search.toLowerCase())
       }
@@ -36,7 +34,7 @@ export function ScanAreaTile(featureCollection) {
         click: ({ propagatedFrom: layer }) => {
           if (!layer.feature) return
           const { name, key, manual = false } = layer.feature.properties
-          if (webhookMode && name) {
+          if (webhook && name && handleClick) {
             handleClick(name)().then((newAreas) => {
               layer.setStyle({
                 fillOpacity: newAreas.some(
@@ -62,7 +60,7 @@ export function ScanAreaTile(featureCollection) {
       onEachFeature={(feature, layer) => {
         if (feature.properties?.name) {
           const { name, key } = feature.properties
-          const popupContent = Utility.getProperName(name)
+          const popupContent = getProperName(name)
           if (layer instanceof Polygon) {
             layer
               .setStyle({
@@ -77,7 +75,7 @@ export function ScanAreaTile(featureCollection) {
                   feature.properties.fill ||
                   '#3388ff',
                 fillOpacity: (
-                  webhookMode === 'areas'
+                  webhook
                     ? useWebhookStore
                         .getState()
                         .human?.area?.some(
@@ -86,13 +84,13 @@ export function ScanAreaTile(featureCollection) {
                     : (
                         useStorage.getState().filters?.scanAreas?.filter
                           ?.areas || []
-                      ).includes(webhookMode ? name : key)
+                      ).includes(webhook ? name : key)
                 )
                   ? 0.8
                   : 0.2,
               })
               .bindTooltip(popupContent, {
-                permanent: webhookMode ? true : alwaysShowLabels,
+                permanent: webhook ? true : alwaysShowLabels,
                 direction: 'top',
                 className: 'area-tooltip',
               })
@@ -106,10 +104,11 @@ export function ScanAreaTile(featureCollection) {
   )
 }
 
-const MemoScanAreaTile = React.memo(ScanAreaTile, (prev, next) =>
-  prev.features.every(
-    (feat, i) => feat.properties.key === next.features[i].properties.key,
-  ),
+export const ScanAreaTile = React.memo(
+  ScanArea,
+  (prev, next) =>
+    prev.features.length === next.features.length &&
+    prev.features.every(
+      (feat, i) => feat.properties.key === next.features[i].properties.key,
+    ),
 )
-
-export default MemoScanAreaTile
diff --git a/src/features/scanArea/index.js b/src/features/scanArea/index.js
new file mode 100644
index 000000000..f6843c23c
--- /dev/null
+++ b/src/features/scanArea/index.js
@@ -0,0 +1 @@
+export * from './ScanAreaTile'
diff --git a/src/components/popups/ScanCell.jsx b/src/features/scanCell/ScanCellPopup.jsx
similarity index 60%
rename from src/components/popups/ScanCell.jsx
rename to src/features/scanCell/ScanCellPopup.jsx
index 242913d81..38bcec73c 100644
--- a/src/components/popups/ScanCell.jsx
+++ b/src/features/scanCell/ScanCellPopup.jsx
@@ -1,24 +1,25 @@
 // @ts-check
 import * as React from 'react'
-import { Typography } from '@mui/material'
-import { Trans, useTranslation } from 'react-i18next'
+import Typography from '@mui/material/Typography'
+import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { getTimeUntil } from '@utils/getTimeUntil'
+import { dayCheck } from '@utils/dayCheck'
 
 /**
  *
  * @param {import('@rm/types').ScanCell} props
  * @returns
  */
-function ScanCellPopup({ id, updated }) {
+export function ScanCellPopup({ id, updated }) {
   const { t } = useTranslation()
-  const lastUpdated = new Date(updated * 1000)
-  const [timer, setTimer] = React.useState(Utility.getTimeUntil(lastUpdated))
+  const lastUpdated = updated * 1000
+  const [timer, setTimer] = React.useState(getTimeUntil(lastUpdated))
 
   React.useEffect(() => {
     const timer2 = setTimeout(() => {
-      setTimer(Utility.getTimeUntil(lastUpdated))
+      setTimer(getTimeUntil(lastUpdated))
     }, 1000)
     return () => clearTimeout(timer2)
   })
@@ -26,7 +27,7 @@ function ScanCellPopup({ id, updated }) {
   return (
     <ErrorBoundary noRefresh variant="h5">
       <Typography variant="h6" align="center">
-        <Trans i18nKey="s2_cell_level">{{ level: 15 }}</Trans>
+        {t('s2_cell_level', { level: 15 })}
       </Typography>
       <Typography variant="subtitle2" align="center">
         {timer.str.replace('days', t('days')).replace('day', t('day'))}
@@ -35,7 +36,7 @@ function ScanCellPopup({ id, updated }) {
         {t('last_updated')}:
       </Typography>
       <Typography variant="subtitle1" align="center">
-        {Utility.dayCheck(Date.now() / 1000, updated)}
+        {dayCheck(Date.now() / 1000, updated)}
       </Typography>
       <Typography variant="subtitle1" align="center">
         {t('id')}: {id}
@@ -43,5 +44,3 @@ function ScanCellPopup({ id, updated }) {
     </ErrorBoundary>
   )
 }
-
-export default ScanCellPopup
diff --git a/src/components/tiles/ScanCell.jsx b/src/features/scanCell/ScanCellTile.jsx
similarity index 57%
rename from src/components/tiles/ScanCell.jsx
rename to src/features/scanCell/ScanCellTile.jsx
index 67f8e0cd5..77435536c 100644
--- a/src/components/tiles/ScanCell.jsx
+++ b/src/features/scanCell/ScanCellTile.jsx
@@ -3,28 +3,26 @@
 import * as React from 'react'
 import { Polygon, Popup } from 'react-leaflet'
 
-import PopupContent from '../popups/ScanCell'
-import marker from '../markers/scanCell'
+import { ScanCellPopup } from './ScanCellPopup'
+import { scanCellMarker } from './scanCellMarker'
 
 /**
  *
  * @param {import('@rm/types').ScanCell} scanCell
  * @returns
  */
-const ScanCellTile = (scanCell) => (
+const BaseScanCellTile = (scanCell) => (
   <Polygon
     positions={scanCell.polygon}
-    pathOptions={marker(Date.now() / 1000 - scanCell.updated)}
+    {...scanCellMarker(Date.now() / 1000 - scanCell.updated)}
   >
     <Popup position={[scanCell.center_lat, scanCell.center_lon]}>
-      <PopupContent {...scanCell} />
+      <ScanCellPopup {...scanCell} />
     </Popup>
   </Polygon>
 )
 
-const ScanCellMemo = React.memo(
-  ScanCellTile,
+export const ScanCellTile = React.memo(
+  BaseScanCellTile,
   (prev, next) => prev.updated === next.updated,
 )
-
-export default ScanCellMemo
diff --git a/src/features/scanCell/index.js b/src/features/scanCell/index.js
new file mode 100644
index 000000000..309e8a3e9
--- /dev/null
+++ b/src/features/scanCell/index.js
@@ -0,0 +1,3 @@
+export * from './ScanCellTile'
+export * from './ScanCellPopup'
+export * from './scanCellMarker'
diff --git a/src/components/markers/scanCell.js b/src/features/scanCell/scanCellMarker.js
similarity index 58%
rename from src/components/markers/scanCell.js
rename to src/features/scanCell/scanCellMarker.js
index 97456d0d7..9bccef6b9 100644
--- a/src/components/markers/scanCell.js
+++ b/src/features/scanCell/scanCellMarker.js
@@ -1,9 +1,14 @@
-export default function scanCellMarker(ago) {
+// @ts-check
+
+/**
+ * @param {number} ago
+ * @returns {L.PathOptions}
+ */
+export function scanCellMarker(ago) {
   const value = ago <= 1050 ? 0 : Math.min((ago - 1050) / 750, 1)
   const hue = ((1 - value) * 120).toString(10)
-
   return {
-    fillColor: ['hsl(', hue, ',100%, 50%)'].join(''),
+    fillColor: `hsl(${hue}, 100%, 50%)`,
     color: 'black',
     opacity: 0.75,
     fillOpacity: 0.5,
diff --git a/src/components/layout/dialogs/scanner/ContextProvider.jsx b/src/features/scanner/ContextProvider.jsx
similarity index 80%
rename from src/components/layout/dialogs/scanner/ContextProvider.jsx
rename to src/features/scanner/ContextProvider.jsx
index 509c40bf0..bb89597b5 100644
--- a/src/components/layout/dialogs/scanner/ContextProvider.jsx
+++ b/src/features/scanner/ContextProvider.jsx
@@ -1,7 +1,7 @@
 // @ts-check
 import { createContext } from 'react'
 
-export const DEFAULT = /** @type {import('./store').ScanConfig} */ ({
+export const DEFAULT = /** @type {import('./hooks/store').ScanConfig} */ ({
   scannerType: '',
   showScanCount: false,
   showScanQueue: false,
diff --git a/src/components/layout/dialogs/scanner/Marker.jsx b/src/features/scanner/Marker.jsx
similarity index 85%
rename from src/components/layout/dialogs/scanner/Marker.jsx
rename to src/features/scanner/Marker.jsx
index c2d231acd..c177c0eab 100644
--- a/src/components/layout/dialogs/scanner/Marker.jsx
+++ b/src/features/scanner/Marker.jsx
@@ -2,8 +2,9 @@
 import * as React from 'react'
 import { Marker, useMap } from 'react-leaflet'
 
-import fallbackIcon from '@components/markers/fallback'
-import { useScanStore } from './store'
+import { fallbackMarker } from '@assets/fallbackMarker'
+
+import { useScanStore } from './hooks/store'
 
 /**
  * @param {{ children: React.ReactNode }} props
@@ -25,7 +26,7 @@ export function ScanOnDemandMarker({ children }) {
           }
         },
       }}
-      icon={fallbackIcon}
+      icon={fallbackMarker}
       position={scanLocation}
       ref={(ref) => {
         if (ref && !ref.isPopupOpen()) ref.openPopup()
diff --git a/src/components/layout/dialogs/scanner/Popup.jsx b/src/features/scanner/Popup.jsx
similarity index 86%
rename from src/components/layout/dialogs/scanner/Popup.jsx
rename to src/features/scanner/Popup.jsx
index 799045c94..4fcd65e49 100644
--- a/src/components/layout/dialogs/scanner/Popup.jsx
+++ b/src/features/scanner/Popup.jsx
@@ -4,7 +4,7 @@ import List from '@mui/material/List'
 import { Popup } from 'react-leaflet'
 import { useTranslation } from 'react-i18next'
 
-import { DividerWithMargin } from '@components/layout/general/StyledDivider'
+import { DividerWithMargin } from '@components/StyledDivider'
 
 import {
   InAllowedArea,
@@ -18,7 +18,7 @@ import { ConfigContext } from './ContextProvider'
 
 /**
  *
- * @param {{ children: React.ReactNode, mode: import('./store').ScanMode }} props
+ * @param {{ children: React.ReactNode, mode: import('./hooks/store').ScanMode }} props
  * @returns
  */
 export function ScanOnDemandPopup({ children, mode }) {
diff --git a/src/components/layout/dialogs/scanner/ScanDialog.jsx b/src/features/scanner/ScanDialog.jsx
similarity index 76%
rename from src/components/layout/dialogs/scanner/ScanDialog.jsx
rename to src/features/scanner/ScanDialog.jsx
index 73092d48f..79dc52836 100644
--- a/src/components/layout/dialogs/scanner/ScanDialog.jsx
+++ b/src/features/scanner/ScanDialog.jsx
@@ -1,17 +1,19 @@
 // @ts-check
 import * as React from 'react'
-import { Dialog, DialogContent, Typography } from '@mui/material'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import Header from '@components/layout/general/Header'
-import Footer from '@components/layout/general/Footer'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
 import { SCAN_MODES } from '@assets/constants'
 
-import { useScanStore } from './store'
+import { useScanStore } from './hooks/store'
 
 const { setScanMode } = useScanStore.getState()
 
-export default function ScanDialog() {
+export function ScanDialog() {
   const { t } = useTranslation()
   const scanNext = useScanStore((s) => s.scanNextMode)
   const scanZone = useScanStore((s) => s.scanZoneMode)
@@ -28,7 +30,7 @@ export default function ScanDialog() {
 
   const footerOptions = React.useMemo(
     () =>
-      /** @type {import('@components/layout/general/Footer').FooterButton[]} */ ([
+      /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
         {
           name: 'close',
           icon: 'Clear',
diff --git a/src/components/layout/dialogs/scanner/ScanOnDemand.jsx b/src/features/scanner/ScanOnDemand.jsx
similarity index 92%
rename from src/components/layout/dialogs/scanner/ScanOnDemand.jsx
rename to src/features/scanner/ScanOnDemand.jsx
index c3b401d79..9214f2209 100644
--- a/src/components/layout/dialogs/scanner/ScanOnDemand.jsx
+++ b/src/features/scanner/ScanOnDemand.jsx
@@ -2,17 +2,17 @@
 import * as React from 'react'
 import { useQuery, useLazyQuery } from '@apollo/client'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 import { SCANNER_CONFIG, SCANNER_STATUS } from '@services/queries/scanner'
 
-import ScanNext from './scanNext'
-import ScanZone from './scanZone'
+import { ScanNext } from './scanNext'
+import { ScanZone } from './scanZone'
 import { getScanNextCoords } from './scanNext/getCoords'
 import { getScanZoneCoords } from './scanZone/getCoords'
 import { ConfigContext, DEFAULT } from './ContextProvider'
-import { useScanStore, useScannerSessionStorage } from './store'
+import { useScanStore, useScannerSessionStorage } from './hooks/store'
 
 const { setScanMode } = useScanStore.getState()
 
@@ -21,7 +21,7 @@ const { setScanMode } = useScanStore.getState()
  * @param {{ mode: 'scanNext' | 'scanZone' }} props
  * @returns {JSX.Element}
  */
-function ScanOnDemand({ mode }) {
+function BaseScanOnDemand({ mode }) {
   const scanMode = useScanStore((s) => s[`${mode}Mode`])
   const location = useStorage((s) => s.location)
   const online = useMemory((s) => s.online)
@@ -156,9 +156,7 @@ function ScanOnDemand({ mode }) {
   )
 }
 
-const MemoizedScanOnDemand = React.memo(
-  ScanOnDemand,
+export const ScanOnDemand = React.memo(
+  BaseScanOnDemand,
   (prev, next) => prev.mode === next.mode,
 )
-
-export default MemoizedScanOnDemand
diff --git a/src/components/layout/dialogs/scanner/Shared.jsx b/src/features/scanner/Shared.jsx
similarity index 96%
rename from src/components/layout/dialogs/scanner/Shared.jsx
rename to src/features/scanner/Shared.jsx
index ec3d35f25..efa86d0cf 100644
--- a/src/components/layout/dialogs/scanner/Shared.jsx
+++ b/src/features/scanner/Shared.jsx
@@ -6,13 +6,12 @@ import ListItemText from '@mui/material/ListItemText'
 import ListItemButton from '@mui/material/ListItemButton'
 import ListItemIcon from '@mui/material/ListItemIcon'
 import ListSubheader from '@mui/material/ListSubheader'
-
 import { Trans, useTranslation } from 'react-i18next'
 import { Circle } from 'react-leaflet'
 import PermScanWifiIcon from '@mui/icons-material/PermScanWifi'
 import ClearIcon from '@mui/icons-material/Clear'
 
-import { useScanStore, useScannerSessionStorage } from './store'
+import { useScanStore, useScannerSessionStorage } from './hooks/store'
 
 const StyledListItem = styled(ListItem)(() => ({
   padding: '2px 16px',
@@ -63,7 +62,7 @@ export function ScanQueue() {
 
 /**
  *
- * @param {{ mode: import('./store').ScanMode }} props
+ * @param {{ mode: import('./hooks/store').ScanMode }} props
  * @returns
  */
 export function ScanConfirm({ mode }) {
@@ -123,7 +122,7 @@ export function InAllowedArea() {
 
 /**
  *
- * @param {{ mode: import('./store').ScanMode}} props
+ * @param {{ mode: import('./hooks/store').ScanMode}} props
  * @returns
  */
 export function ScanCancel({ mode }) {
diff --git a/src/components/layout/dialogs/scanner/store.js b/src/features/scanner/hooks/store.js
similarity index 100%
rename from src/components/layout/dialogs/scanner/store.js
rename to src/features/scanner/hooks/store.js
diff --git a/src/components/layout/dialogs/scanner/useCheckValid.js b/src/features/scanner/hooks/useCheckValid.js
similarity index 95%
rename from src/components/layout/dialogs/scanner/useCheckValid.js
rename to src/features/scanner/hooks/useCheckValid.js
index 4e1ff0c14..3c83fa840 100644
--- a/src/components/layout/dialogs/scanner/useCheckValid.js
+++ b/src/features/scanner/hooks/useCheckValid.js
@@ -1,8 +1,10 @@
 // @ts-check
+import { useContext, useEffect } from 'react'
 import { useQuery } from '@apollo/client'
+
 import { CHECK_VALID_SCAN } from '@services/queries/scanner'
-import { useContext, useEffect } from 'react'
-import { ConfigContext } from './ContextProvider'
+
+import { ConfigContext } from '../ContextProvider'
 import { useScanStore } from './store'
 
 /**
diff --git a/src/features/scanner/index.js b/src/features/scanner/index.js
new file mode 100644
index 000000000..626e10d50
--- /dev/null
+++ b/src/features/scanner/index.js
@@ -0,0 +1,4 @@
+export * from './ScanDialog'
+export * from './ScanOnDemand'
+export * from './hooks/store'
+export * from './hooks/useCheckValid'
diff --git a/src/components/layout/dialogs/scanner/scanNext/PopupContent.jsx b/src/features/scanner/scanNext/PopupContent.jsx
similarity index 82%
rename from src/components/layout/dialogs/scanner/scanNext/PopupContent.jsx
rename to src/features/scanner/scanNext/PopupContent.jsx
index cb68e69d1..59060996f 100644
--- a/src/components/layout/dialogs/scanner/scanNext/PopupContent.jsx
+++ b/src/features/scanner/scanNext/PopupContent.jsx
@@ -1,11 +1,13 @@
 // @ts-check
 import * as React from 'react'
-import { Button, ButtonGroup, ListItem } from '@mui/material'
+import Button from '@mui/material/Button'
+import ButtonGroup from '@mui/material/ButtonGroup'
+import ListItem from '@mui/material/ListItem'
 import { useTranslation } from 'react-i18next'
 
 import { SCAN_SIZES } from '@assets/constants'
 
-import { useScanStore } from '../store'
+import { useScanStore } from '../hooks/store'
 
 export function ScanNextPopup() {
   const { t } = useTranslation()
diff --git a/src/components/layout/dialogs/scanner/scanNext/getCoords.js b/src/features/scanner/scanNext/getCoords.js
similarity index 84%
rename from src/components/layout/dialogs/scanner/scanNext/getCoords.js
rename to src/features/scanner/scanNext/getCoords.js
index c4f79ab66..04c4ff491 100644
--- a/src/components/layout/dialogs/scanner/scanNext/getCoords.js
+++ b/src/features/scanner/scanNext/getCoords.js
@@ -14,8 +14,8 @@ const DISTANCE = {
 /**
  * Get scan next coords
  * @param {[number, number]} center
- * @param {import('../store').UseScanStore['scanNextSize']} size
- * @returns {import('../store').UseScanStore['scanCoords']}
+ * @param {import('../hooks/store').UseScanStore['scanNextSize']} size
+ * @returns {import('../hooks/store').UseScanStore['scanCoords']}
  */
 export const getScanNextCoords = (center, size) => {
   const coords = [center]
diff --git a/src/components/layout/dialogs/scanner/scanNext/index.jsx b/src/features/scanner/scanNext/index.jsx
similarity index 87%
rename from src/components/layout/dialogs/scanner/scanNext/index.jsx
rename to src/features/scanner/scanNext/index.jsx
index efda31a14..d3dcc898a 100644
--- a/src/components/layout/dialogs/scanner/scanNext/index.jsx
+++ b/src/features/scanner/scanNext/index.jsx
@@ -2,11 +2,11 @@
 import * as React from 'react'
 
 import { ScanCircle, ScanCircles } from '../Shared'
-import { useCheckValid } from '../useCheckValid'
+import { useCheckValid } from '../hooks/useCheckValid'
 import { ScanNextPopup } from './PopupContent'
 import { ScanOnDemandMarker } from '../Marker'
 import { ScanOnDemandPopup } from '../Popup'
-import { useScanStore } from '../store'
+import { useScanStore } from '../hooks/store'
 
 const POKEMON_RADIUS = 70
 const GYM_RADIUS = 750
@@ -14,7 +14,7 @@ const GYM_RADIUS = 750
 /**
  * @returns {JSX.Element}
  */
-export default function ScanNext() {
+export function ScanNext() {
   useCheckValid('scanNext')
 
   const scanLocation = useScanStore((s) => s.scanLocation)
diff --git a/src/components/layout/custom/AdvancedAccordion.jsx b/src/features/scanner/scanZone/AdvAccordion.jsx
similarity index 72%
rename from src/components/layout/custom/AdvancedAccordion.jsx
rename to src/features/scanner/scanZone/AdvAccordion.jsx
index b9ee147de..22edc4fd0 100644
--- a/src/components/layout/custom/AdvancedAccordion.jsx
+++ b/src/features/scanner/scanZone/AdvAccordion.jsx
@@ -1,10 +1,10 @@
-import React from 'react'
+// @ts-check
+import * as React from 'react'
 import ExpandMore from '@mui/icons-material/ExpandMore'
 import Accordion from '@mui/material/Accordion'
 import AccordionSummary from '@mui/material/AccordionSummary'
 import AccordionDetails from '@mui/material/AccordionDetails'
 import Typography from '@mui/material/Typography'
-import Grid from '@mui/material/Grid'
 import { styled } from '@mui/material/styles'
 import { useTranslation } from 'react-i18next'
 
@@ -34,27 +34,15 @@ const StyledAccordionSummary = styled(AccordionSummary)((/* { theme } */) => ({
   },
 }))
 
-export default function AdvancedAccordion({ block = null, children }) {
+/** @param {{ children: React.ReactNode }} props */
+export function AdvAccordion({ children }) {
   const { t } = useTranslation()
   return (
     <StyledAccordion>
       <StyledAccordionSummary expandIcon={<ExpandMore />}>
         <Typography variant="caption">{t('advanced')}</Typography>
       </StyledAccordionSummary>
-      <AccordionDetails sx={{ py: 0 }}>
-        {block ? (
-          <Grid
-            container
-            direction="row"
-            justifyContent="center"
-            alignItems="center"
-          >
-            {block}
-          </Grid>
-        ) : (
-          children
-        )}
-      </AccordionDetails>
+      <AccordionDetails sx={{ py: 0 }}>{children} </AccordionDetails>
     </StyledAccordion>
   )
 }
diff --git a/src/components/layout/dialogs/scanner/scanZone/PopupContent.jsx b/src/features/scanner/scanZone/PopupContent.jsx
similarity index 85%
rename from src/components/layout/dialogs/scanner/scanZone/PopupContent.jsx
rename to src/features/scanner/scanZone/PopupContent.jsx
index 16640fdb6..550df604c 100644
--- a/src/components/layout/dialogs/scanner/scanZone/PopupContent.jsx
+++ b/src/features/scanner/scanZone/PopupContent.jsx
@@ -1,15 +1,19 @@
 // @ts-check
 import * as React from 'react'
-import { Button, ButtonGroup, Slider, List, ListItem } from '@mui/material'
+import Button from '@mui/material/Button'
+import ButtonGroup from '@mui/material/ButtonGroup'
+import List from '@mui/material/List'
+import ListItem from '@mui/material/ListItem'
+import Slider from '@mui/material/Slider'
 import { useTranslation } from 'react-i18next'
 import { debounce } from 'lodash'
 
-import AdvancedAccordion from '@components/layout/custom/AdvancedAccordion'
 import { RADIUS_CHOICES } from '@assets/constants'
 
 import { StyledSubHeader } from '../Shared'
 import { ConfigContext } from '../ContextProvider'
-import { useScanStore } from '../store'
+import { useScanStore } from '../hooks/store'
+import { AdvAccordion } from './AdvAccordion'
 
 /**
  *
@@ -31,7 +35,7 @@ export function ScanZonePopup() {
       </ListItem>
       {advancedOptions && (
         <ListItem style={{ padding: '10px 0' }} disableGutters disablePadding>
-          <AdvancedAccordion>
+          <AdvAccordion>
             <List
               style={{
                 textAlign: 'center',
@@ -43,7 +47,7 @@ export function ScanZonePopup() {
               <StyledSubHeader>{t('scan_zone_radius')}</StyledSubHeader>
               <ScanZoneSlider name="userRadius" min={50} max={900} />
             </List>
-          </AdvancedAccordion>
+          </AdvAccordion>
         </ListItem>
       )}
     </>
@@ -53,7 +57,7 @@ export function ScanZonePopup() {
 /**
  *
  * @param {{
- *  name: keyof import("@rm/types").OnlyType<import('../store').UseScanStore, number>,
+ *  name: keyof import("@rm/types").OnlyType<import('../hooks/store').UseScanStore, number>,
  * } & import('@mui/material').SliderProps} props
  * @returns
  */
diff --git a/src/components/layout/dialogs/scanner/scanZone/getCoords.js b/src/features/scanner/scanZone/getCoords.js
similarity index 93%
rename from src/components/layout/dialogs/scanner/scanZone/getCoords.js
rename to src/features/scanner/scanZone/getCoords.js
index a9bc34f21..6264523ee 100644
--- a/src/components/layout/dialogs/scanner/scanZone/getCoords.js
+++ b/src/features/scanner/scanZone/getCoords.js
@@ -18,7 +18,7 @@ const BEARINGS = {
  * @param {[number, number]} center
  * @param {number} radius
  * @param {number} spacing
- * @param {import('../store').UseScanStore['scanZoneSize']} scanZoneSize
+ * @param {import('../hooks/store').UseScanStore['scanZoneSize']} scanZoneSize
  * @returns
  */
 export const getScanZoneCoords = (center, radius, spacing, scanZoneSize) => {
diff --git a/src/components/layout/dialogs/scanner/scanZone/index.jsx b/src/features/scanner/scanZone/index.jsx
similarity index 84%
rename from src/components/layout/dialogs/scanner/scanZone/index.jsx
rename to src/features/scanner/scanZone/index.jsx
index f41fc7bd1..672ad77ad 100644
--- a/src/components/layout/dialogs/scanner/scanZone/index.jsx
+++ b/src/features/scanner/scanZone/index.jsx
@@ -2,7 +2,7 @@
 import * as React from 'react'
 
 import { ScanCircles } from '../Shared'
-import { useCheckValid } from '../useCheckValid'
+import { useCheckValid } from '../hooks/useCheckValid'
 import { ScanZonePopup } from './PopupContent'
 import { ScanOnDemandMarker } from '../Marker'
 import { ScanOnDemandPopup } from '../Popup'
@@ -11,7 +11,7 @@ import { ScanOnDemandPopup } from '../Popup'
  *
  * @returns
  */
-export default function ScanZone() {
+export function ScanZone() {
   useCheckValid('scanZone')
 
   return (
diff --git a/src/components/layout/dialogs/search/OptionImage.jsx b/src/features/search/OptionImage.jsx
similarity index 95%
rename from src/components/layout/dialogs/search/OptionImage.jsx
rename to src/features/search/OptionImage.jsx
index 75b154e5f..a158b9dc8 100644
--- a/src/components/layout/dialogs/search/OptionImage.jsx
+++ b/src/features/search/OptionImage.jsx
@@ -3,12 +3,12 @@
 import * as React from 'react'
 import Box from '@mui/material/Box'
 
-import NameTT from '@components/popups/common/NameTT'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import getRewardInfo from '@services/functions/getRewardInfo'
+import { NameTT } from '@components/popups/NameTT'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { getRewardInfo } from '@utils/getRewardInfo'
 import { useTranslateById } from '@hooks/useTranslateById'
-import { Img } from '@components/layout/general/Img'
+import { Img } from '@components/Img'
 
 /** @param {Partial<import('@rm/types').Quest>} props */
 function QuestImage(props) {
diff --git a/src/components/layout/dialogs/search/index.jsx b/src/features/search/index.jsx
similarity index 85%
rename from src/components/layout/dialogs/search/index.jsx
rename to src/features/search/index.jsx
index a2df51a3a..d79486c8d 100644
--- a/src/components/layout/dialogs/search/index.jsx
+++ b/src/features/search/index.jsx
@@ -6,14 +6,14 @@ import Popper from '@mui/material/Popper'
 import Autocomplete from '@mui/material/Autocomplete'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import Utility from '@services/Utility'
-import { fromSearchCategory } from '@services/functions/fromSearchCategory'
-import { useMapStore } from '@hooks/useMapStore'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useStorage } from '@store/useStorage'
+import { fromSearchCategory } from '@utils/fromSearchCategory'
+import { useMapStore } from '@store/useMapStore'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { Header } from '@components/dialogs/Header'
 
-import Header from '../../general/Header'
 import { renderInput } from './renderInput'
 import { renderOption } from './renderOption'
 import { useSendSearch } from './useSendSearch'
@@ -78,12 +78,12 @@ const STATIC_PROPS =
     open: true,
   })
 
-export default function Search() {
-  Utility.analytics('/search')
+export function Search() {
+  useAnalytics('/search')
 
   const { t } = useTranslation()
 
-  const search = useStorage((state) => state.search)
+  const search = useStorage((s) => s.search)
   const isMobile = useMemory((s) => s.isMobile)
   const open = useLayoutStore((s) => s.search)
 
diff --git a/src/components/layout/dialogs/search/renderInput.jsx b/src/features/search/renderInput.jsx
similarity index 96%
rename from src/components/layout/dialogs/search/renderInput.jsx
rename to src/features/search/renderInput.jsx
index 9a2bc7765..94910ba89 100644
--- a/src/components/layout/dialogs/search/renderInput.jsx
+++ b/src/features/search/renderInput.jsx
@@ -12,10 +12,10 @@ import HighlightOffIcon from '@mui/icons-material/HighlightOff'
 import { useTranslation } from 'react-i18next'
 import { useQuery } from '@apollo/client'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 import { SEARCHABLE } from '@services/queries/config'
-import { Img } from '../../general/Img'
+import { Img } from '@components/Img'
 
 const SearchImage = React.memo(
   /** @param {{ name: string }} props */ ({ name }) => {
diff --git a/src/components/layout/dialogs/search/renderOption.jsx b/src/features/search/renderOption.jsx
similarity index 88%
rename from src/components/layout/dialogs/search/renderOption.jsx
rename to src/features/search/renderOption.jsx
index 75ca913a5..6db3b8e0c 100644
--- a/src/components/layout/dialogs/search/renderOption.jsx
+++ b/src/features/search/renderOption.jsx
@@ -5,17 +5,17 @@ import ListItem from '@mui/material/ListItem'
 import ListItemIcon from '@mui/material/ListItemIcon'
 import ListItemText from '@mui/material/ListItemText'
 import Grid2 from '@mui/material/Unstable_Grid2/Grid2'
+import Divider from '@mui/material/Divider'
+import Typography from '@mui/material/Typography'
 
-import { Img } from '@components/layout/general/Img'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import { RawQuestTitle } from '@components/layout/general/QuestTitle'
-
-import { Divider, Typography } from '@mui/material'
-import Utility from '@services/Utility'
-import { RawTimeSince } from '@components/popups/common/Timer'
-import { getGruntReward } from '@services/functions/getGruntReward'
-import { formatDistance } from '@services/functions/formatDistance'
+import { Img } from '@components/Img'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { RawQuestTitle } from '@components/QuestTitle'
+import { RawTimeSince } from '@components/popups/Timer'
+import { getGruntReward } from '@utils/getGruntReward'
+import { formatDistance } from '@utils/formatDistance'
+import { getTimeUntil } from '@utils/getTimeUntil'
 
 import { OptionImageMemo } from './OptionImage'
 
@@ -46,7 +46,7 @@ const InvasionSubtitle = ({
   slot_3_form,
   incident_expire_timestamp,
 }) => {
-  const expire = Utility.getTimeUntil(incident_expire_timestamp * 1000, true)
+  const expire = getTimeUntil(incident_expire_timestamp * 1000, true)
   if (!confirmed) return expire.str
   const { masterfile } = useMemory.getState()
   const reward = getGruntReward(masterfile.invasions[grunt_type])
diff --git a/src/components/layout/dialogs/search/useSendSearch.js b/src/features/search/useSendSearch.js
similarity index 90%
rename from src/components/layout/dialogs/search/useSendSearch.js
rename to src/features/search/useSendSearch.js
index 2e5fe2c94..d9bdfc018 100644
--- a/src/components/layout/dialogs/search/useSendSearch.js
+++ b/src/features/search/useSendSearch.js
@@ -4,11 +4,11 @@ import { useLazyQuery } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
 import { debounce } from 'lodash'
 
-import Query from '@services/Query'
-import Utility from '@services/Utility'
-import { useStorage } from '@hooks/useStorage'
-import { useMemory } from '@hooks/useMemory'
-import { useMapStore } from '@hooks/useMapStore'
+import { Query } from '@services/queries'
+import { useStorage } from '@store/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useMapStore } from '@store/useMapStore'
+import { analytics } from '@utils/analytics'
 
 /**
  * @param {string} search
@@ -85,7 +85,7 @@ export function useSendSearch(search, open) {
           ).map((option, index) => ({ ...option, index }))
         : [],
     )
-    Utility.analytics('Global Search', `Search Value: ${search}`, searchTab)
+    analytics('Global Search', `Search Value: ${search}`, searchTab)
   }, [data])
 
   useEffect(() => {
diff --git a/src/components/popups/Spawnpoint.jsx b/src/features/spawnpoint/SpawnpointPopup.jsx
similarity index 78%
rename from src/components/popups/Spawnpoint.jsx
rename to src/features/spawnpoint/SpawnpointPopup.jsx
index 865824dc7..74fe4363d 100644
--- a/src/components/popups/Spawnpoint.jsx
+++ b/src/features/spawnpoint/SpawnpointPopup.jsx
@@ -1,17 +1,17 @@
 // @ts-check
 import * as React from 'react'
-import { Typography } from '@mui/material'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { dayCheck } from '@utils/dayCheck'
 
 /**
  *
  * @param {import('@rm/types').Spawnpoint} props
  * @returns
  */
-function SpawnpointPopup({ despawn_sec, lat, lon, updated }) {
+export function SpawnpointPopup({ despawn_sec, lat, lon, updated }) {
   const { t } = useTranslation()
 
   const minute = despawn_sec > 60 ? Math.round(despawn_sec / 60) : despawn_sec
@@ -29,7 +29,7 @@ function SpawnpointPopup({ despawn_sec, lat, lon, updated }) {
         {t('last_updated')}
       </Typography>
       <Typography variant="subtitle2" align="center">
-        {Utility.dayCheck(Date.now() / 1000, updated)}
+        {dayCheck(Date.now() / 1000, updated)}
       </Typography>
       <br />
       <Typography variant="subtitle1" align="center">
@@ -42,5 +42,3 @@ function SpawnpointPopup({ despawn_sec, lat, lon, updated }) {
     </ErrorBoundary>
   )
 }
-
-export default SpawnpointPopup
diff --git a/src/components/tiles/Spawnpoint.jsx b/src/features/spawnpoint/SpawnpointTile.jsx
similarity index 70%
rename from src/components/tiles/Spawnpoint.jsx
rename to src/features/spawnpoint/SpawnpointTile.jsx
index 8067d29a4..6477f7c41 100644
--- a/src/components/tiles/Spawnpoint.jsx
+++ b/src/features/spawnpoint/SpawnpointTile.jsx
@@ -1,19 +1,20 @@
 // @ts-check
 /* eslint-disable react/destructuring-assignment */
 import * as React from 'react'
-import spawnpointMarker from '@components/markers/spawnpoints'
 import { Marker, Circle, Popup } from 'react-leaflet'
 
-import { useMemory } from '@hooks/useMemory'
-import PopupContent from '../popups/Spawnpoint'
+import { useMemory } from '@store/useMemory'
+
+import { SpawnpointPopup } from './SpawnpointPopup'
+import { spawnpointMarker } from './spawnpointMarker'
 
 /**
  *
  * @param {import('@rm/types').Spawnpoint} item
  * @returns
  */
-const SpawnpointTile = (item) => {
-  const Icons = useMemory((state) => state.Icons)
+const BaseSpawnpointTile = (item) => {
+  const Icons = useMemory((s) => s.Icons)
   const [modifiers] = Icons.getModifiers('spawnpoint')
   const size = Icons.getSize('spawnpoint') * modifiers.sizeMultiplier
 
@@ -27,7 +28,7 @@ const SpawnpointTile = (item) => {
       )}
     >
       <Popup position={[item.lat, item.lon]}>
-        <PopupContent {...item} />
+        <SpawnpointPopup {...item} />
       </Popup>
     </Marker>
   ) : (
@@ -37,15 +38,13 @@ const SpawnpointTile = (item) => {
       color={item.despawn_sec ? 'green' : 'red'}
     >
       <Popup position={[item.lat, item.lon]}>
-        <PopupContent {...item} />
+        <SpawnpointPopup {...item} />
       </Popup>
     </Circle>
   )
 }
-const MemoSpawnpoint = React.memo(
-  SpawnpointTile,
+export const SpawnpointTile = React.memo(
+  BaseSpawnpointTile,
   (prev, next) =>
     prev.despawn_sec === next.despawn_sec && prev.updated === next.updated,
 )
-
-export default MemoSpawnpoint
diff --git a/src/features/spawnpoint/index.js b/src/features/spawnpoint/index.js
new file mode 100644
index 000000000..99cfa9933
--- /dev/null
+++ b/src/features/spawnpoint/index.js
@@ -0,0 +1,3 @@
+export * from './spawnpointMarker'
+export * from './SpawnpointPopup'
+export * from './SpawnpointTile'
diff --git a/src/components/markers/spawnpoints.js b/src/features/spawnpoint/spawnpointMarker.js
similarity index 53%
rename from src/components/markers/spawnpoints.js
rename to src/features/spawnpoint/spawnpointMarker.js
index 951a333ce..b7249ed33 100644
--- a/src/components/markers/spawnpoints.js
+++ b/src/features/spawnpoint/spawnpointMarker.js
@@ -1,6 +1,14 @@
+// @ts-check
 import { Icon } from 'leaflet'
 
-export default function spawnpointMarker(iconUrl, size, modifiers) {
+/**
+ *
+ * @param {string} iconUrl
+ * @param {number} size
+ * @param {{ offsetX: number, offsetY: number, popupX: number, popupY: number }} modifiers
+ * @returns
+ */
+export function spawnpointMarker(iconUrl, size, modifiers) {
   return new Icon({
     iconUrl,
     iconSize: [size, size],
diff --git a/src/components/layout/dialogs/tutorial/Advanced.jsx b/src/features/tutorial/Advanced.jsx
similarity index 71%
rename from src/components/layout/dialogs/tutorial/Advanced.jsx
rename to src/features/tutorial/Advanced.jsx
index 719814e22..5860506a2 100644
--- a/src/components/layout/dialogs/tutorial/Advanced.jsx
+++ b/src/features/tutorial/Advanced.jsx
@@ -6,26 +6,22 @@ import Clear from '@mui/icons-material/Clear'
 import Save from '@mui/icons-material/Save'
 import HelpOutline from '@mui/icons-material/HelpOutline'
 import FormatSize from '@mui/icons-material/FormatSize'
-
-import {
-  Grid,
-  DialogContent,
-  Typography,
-  Divider,
-  Button,
-  Box,
-} from '@mui/material'
-
+import DialogContent from '@mui/material/DialogContent'
+import Typography from '@mui/material/Typography'
+import Divider from '@mui/material/Divider'
+import Button from '@mui/material/Button'
+import Grid from '@mui/material/Unstable_Grid2'
+import Box from '@mui/material/Box'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
+import { VirtualGrid } from '@components/virtual/VirtualGrid'
+import { StandardItem } from '@components/virtual/StandardItem'
+import { generateSlots } from '@utils/generateSlots'
 
-import { VirtualGrid } from '@components/layout/general/VirtualGrid'
-import { StandardItem } from '@components/layout/drawer/SelectorItem'
-import data from './data'
+import { tutorialData } from './data'
 
-export default function TutAdvanced({ toggleHelp, category }) {
+export function TutorialAdvanced({ toggleHelp, category }) {
   const { t } = useTranslation()
   const isMobile = useMemory((s) => s.isMobile)
   const [localCategory, setLocalCategory] = useState(category)
@@ -36,11 +32,11 @@ export default function TutAdvanced({ toggleHelp, category }) {
   const handleSwitch = () => {
     if (isPokemon) {
       setTempFilters({
-        ...data.filters.gyms.filter,
-        ...Utility.generateSlots('t3-0', true, tempFilters),
+        ...tutorialData.filters.gyms.filter,
+        ...generateSlots('t3-0', true, tempFilters),
       })
     } else {
-      setTempFilters(data.filters.pokemon.filter)
+      setTempFilters(tutorialData.filters.pokemon.filter)
     }
     setLocalCategory(isPokemon ? 'gyms' : 'pokemon')
     setIsPokemon((prev) => !prev)
@@ -50,8 +46,8 @@ export default function TutAdvanced({ toggleHelp, category }) {
     const newCategory = category ?? isPokemon ? 'pokemon' : 'gyms'
     setLocalCategory(newCategory)
     setTempFilters({
-      ...data.filters[newCategory].filter,
-      ...Utility.generateSlots('t3-0', true, {}),
+      ...tutorialData.filters[newCategory].filter,
+      ...generateSlots('t3-0', true, {}),
     })
   }, [category])
 
@@ -65,56 +61,56 @@ export default function TutAdvanced({ toggleHelp, category }) {
         spacing={1}
         height="100%"
       >
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
-          <Typography variant="caption" style={{ whiteSpace: 'pre-line' }}>
+        <Grid xs={12} textAlign="center">
+          <Typography variant="caption" whiteSpace="pre-line">
             {t('tutorial_toggle')}
           </Typography>
         </Grid>
-        <Grid item xs={12} sm={8}>
+        <Grid xs={12} sm={8}>
           <Box height={135}>
-            <VirtualGrid data={data.tiles[localCategory]} xs={6}>
+            <VirtualGrid data={tutorialData.tiles[localCategory]} xs={6}>
               {(_, key) => (
                 <StandardItem id={key} category={localCategory} caption />
               )}
             </VirtualGrid>
           </Box>
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
-          <Typography variant="caption" style={{ whiteSpace: 'pre-line' }}>
+        <Grid xs={12} textAlign="center">
+          <Typography variant="caption" whiteSpace="pre-line">
             {isPokemon
               ? t('tutorial_pokemon_caption')
               : t('tutorial_all_caption')}
           </Typography>
         </Grid>
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Divider light />
         </Grid>
-        <Grid item xs={3} sm={4} style={{ textAlign: 'center' }}>
+        <Grid xs={3} sm={4} textAlign="center">
           {isMobile ? <HelpOutline /> : <Typography>{t('help')}</Typography>}
         </Grid>
-        <Grid item xs={9} sm={8}>
+        <Grid xs={9} sm={8}>
           <Typography variant="subtitle2" align="center">
             {t('tutorial_help')}
           </Typography>
         </Grid>
-        <Grid item xs={3} sm={4} style={{ textAlign: 'center' }}>
+        <Grid xs={3} sm={4} textAlign="center">
           <Ballot />
         </Grid>
-        <Grid item xs={9} sm={8}>
+        <Grid xs={9} sm={8}>
           <Typography variant="subtitle2" align="center">
             {t('tutorial_adv_filter')}
           </Typography>
         </Grid>
         {isPokemon ? (
           <>
-            <Grid item xs={3} sm={4} style={{ textAlign: 'center' }}>
+            <Grid xs={3} sm={4} textAlign="center">
               {isMobile ? (
                 <Tune />
               ) : (
                 <Typography>{t('apply_to_all')}</Typography>
               )}
             </Grid>
-            <Grid item xs={9} sm={8}>
+            <Grid xs={9} sm={8}>
               <Typography variant="subtitle2" align="center">
                 {t('tutorial_tune')}
               </Typography>
@@ -122,14 +118,14 @@ export default function TutAdvanced({ toggleHelp, category }) {
           </>
         ) : (
           <>
-            <Grid item xs={3} sm={4} style={{ textAlign: 'center' }}>
+            <Grid xs={3} sm={4} textAlign="center">
               {isMobile ? (
                 <FormatSize />
               ) : (
                 <Typography>{t('apply_to_all')}</Typography>
               )}
             </Grid>
-            <Grid item xs={9} sm={8}>
+            <Grid xs={9} sm={8}>
               <Typography variant="subtitle2" align="center">
                 {t('tutorial_format_size')}
               </Typography>
@@ -137,7 +133,6 @@ export default function TutAdvanced({ toggleHelp, category }) {
           </>
         )}
         <Grid
-          item
           xs={3}
           sm={4}
           sx={(theme) => ({
@@ -147,13 +142,12 @@ export default function TutAdvanced({ toggleHelp, category }) {
         >
           {isMobile ? <Clear /> : <Typography>{t('disable_all')}</Typography>}
         </Grid>
-        <Grid item xs={9} sm={8}>
+        <Grid xs={9} sm={8}>
           <Typography variant="subtitle2" align="center">
             {t('tutorial_clear')}
           </Typography>
         </Grid>
         <Grid
-          item
           xs={3}
           sm={4}
           sx={(theme) => ({
@@ -163,31 +157,31 @@ export default function TutAdvanced({ toggleHelp, category }) {
         >
           {isMobile ? <Check /> : <Typography>{t('enable_all')}</Typography>}
         </Grid>
-        <Grid item xs={9} sm={8}>
+        <Grid xs={9} sm={8}>
           <Typography variant="subtitle2" align="center">
             {t('tutorial_check')}
           </Typography>
         </Grid>
-        <Grid item xs={3} sm={4} style={{ textAlign: 'center' }}>
+        <Grid xs={3} sm={4} textAlign="center">
           {isMobile ? (
             <Save color="secondary" />
           ) : (
             <Typography color="secondary">{t('save')}</Typography>
           )}
         </Grid>
-        <Grid item xs={9} sm={8}>
+        <Grid xs={9} sm={8}>
           <Typography variant="subtitle2" align="center">
             {t('tutorial_save')}
           </Typography>
         </Grid>
         {toggleHelp ? (
-          <Grid item xs={12} style={{ textAlign: 'right' }}>
+          <Grid xs={12} textAlign="right">
             <Button onClick={toggleHelp} color="secondary" size="small">
               {t('close')}
             </Button>
           </Grid>
         ) : (
-          <Grid item xs={12} style={{ textAlign: 'center' }}>
+          <Grid xs={12} textAlign="center">
             <Button
               onClick={handleSwitch}
               variant="contained"
diff --git a/src/components/layout/dialogs/tutorial/Closing.jsx b/src/features/tutorial/Closing.jsx
similarity index 75%
rename from src/components/layout/dialogs/tutorial/Closing.jsx
rename to src/features/tutorial/Closing.jsx
index f28051dc2..c55f1dda5 100644
--- a/src/components/layout/dialogs/tutorial/Closing.jsx
+++ b/src/features/tutorial/Closing.jsx
@@ -1,8 +1,11 @@
-import React from 'react'
-import { DialogContent, Typography, Divider } from '@mui/material'
+// @ts-check
+import * as React from 'react'
+import DialogContent from '@mui/material/DialogContent'
+import Divider from '@mui/material/Divider'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-export default function TutClosing() {
+export function TutorialClosing() {
   const { t } = useTranslation()
 
   return (
diff --git a/src/components/layout/dialogs/tutorial/Popups.jsx b/src/features/tutorial/Popups.jsx
similarity index 64%
rename from src/components/layout/dialogs/tutorial/Popups.jsx
rename to src/features/tutorial/Popups.jsx
index fe8b85b4f..18cd462dc 100644
--- a/src/components/layout/dialogs/tutorial/Popups.jsx
+++ b/src/features/tutorial/Popups.jsx
@@ -1,15 +1,19 @@
+// @ts-check
 import React from 'react'
-import { Grid, DialogContent, Typography, Divider } from '@mui/material'
+import DialogContent from '@mui/material/DialogContent'
+import Divider from '@mui/material/Divider'
+import Typography from '@mui/material/Typography'
+import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import PokemonPopup from '@components/popups/Pokemon'
-import data from './data'
+import { useMemory } from '@store/useMemory'
+import { PokemonPopup } from '@features/pokemon'
 
-export default function TutPopup({ isMobile }) {
+import { tutorialData } from './data'
+
+export function TutorialPopup({ isMobile }) {
   const { t } = useTranslation()
-  const Icons = useMemory((state) => state.Icons)
-  const { startLat, startLon } = useMemory((state) => state.config.general)
+  const { startLat, startLon } = useMemory((s) => s.config.general)
   const ts = Math.floor(new Date().getTime() / 1000)
   const size = isMobile ? 'subtitle2' : 'subtitle1'
 
@@ -20,9 +24,9 @@ export default function TutPopup({ isMobile }) {
         justifyContent="center"
         alignItems="center"
         spacing={2}
-        style={{ height: '100%' }}
+        height="100%"
       >
-        <Grid item xs={12} style={{ whiteSpace: 'pre-line' }}>
+        <Grid xs={12} whiteSpace="pre-line">
           <Typography variant="h6" align="center" gutterBottom>
             {t('tutorial_popup_0')}
           </Typography>
@@ -31,22 +35,12 @@ export default function TutPopup({ isMobile }) {
             {t('tutorial_popup_1')}
           </Typography>
         </Grid>
-        <Grid
-          item
-          xs={12}
-          sm={10}
-          style={{
-            textAlign: 'center',
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
-          }}
-        >
+        <Grid xs={12} sm={10} className="flex-center" textAlign="center">
           <div className="leaflet-popup-content-wrapper" style={{ width: 230 }}>
             <div className="leaflet-popup-content">
               <PokemonPopup
                 pokemon={{
-                  ...data.pokemon,
+                  ...tutorialData.pokemon,
                   expire_timestamp: ts + 1800,
                   updated: ts + 100,
                   first_seen_timestamp: ts,
@@ -54,14 +48,12 @@ export default function TutPopup({ isMobile }) {
                   lon: startLon,
                 }}
                 iconUrl="https://raw.githubusercontent.com/WatWowMap/wwm-uicons-webp/main/pokemon/16.webp"
-                userSettings={{ prioritizePvpInfo: false }}
                 isTutorial
-                Icons={Icons}
               />
             </div>
           </div>
         </Grid>
-        <Grid item xs={12} style={{ whiteSpace: 'pre-line' }}>
+        <Grid xs={12} whiteSpace="pre-line">
           <Typography variant={size} align="center" gutterBottom>
             {t('tutorial_popup_2')}
           </Typography>
diff --git a/src/components/layout/dialogs/tutorial/Sidebar.jsx b/src/features/tutorial/Sidebar.jsx
similarity index 65%
rename from src/components/layout/dialogs/tutorial/Sidebar.jsx
rename to src/features/tutorial/Sidebar.jsx
index 335ac18de..509bcb60b 100644
--- a/src/components/layout/dialogs/tutorial/Sidebar.jsx
+++ b/src/features/tutorial/Sidebar.jsx
@@ -2,37 +2,36 @@ import * as React from 'react'
 import Menu from '@mui/icons-material/Menu'
 import Settings from '@mui/icons-material/Settings'
 import TuneIcon from '@mui/icons-material/Tune'
-
-import {
-  Grid,
-  DialogContent,
-  Typography,
-  Fab,
-  Divider,
-  List,
-  ListItemButton,
-  ListItemIcon,
-  ListItemText,
-  ListItem,
-  Switch,
-} from '@mui/material'
-
+import Grid from '@mui/material/Unstable_Grid2'
+import Fab from '@mui/material/Fab'
+import Divider from '@mui/material/Divider'
+import List from '@mui/material/List'
+import ListItem from '@mui/material/ListItem'
+import ListItemIcon from '@mui/material/ListItemIcon'
+import ListItemText from '@mui/material/ListItemText'
+import ListItemButton from '@mui/material/ListItemButton'
+import Switch from '@mui/material/Switch'
+import DialogContent from '@mui/material/DialogContent'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { toggleDialog } from '@hooks/useLayoutStore'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { toggleDialog } from '@store/useLayoutStore'
+import { camelToSnake } from '@utils/strings'
 
-import data from './data'
+import { tutorialData } from './data'
 
-export default function TutSidebar() {
+export function TutorialSidebar() {
   const { t } = useTranslation()
-  const { perms } = useMemory((state) => state.auth)
-  const isMobile = useMemory((state) => state.isMobile)
+  const { perms } = useMemory((s) => s.auth)
+  const isMobile = useMemory((s) => s.isMobile)
 
   const [tempFilters, setTempFilters] = React.useState(
     Object.fromEntries(
-      Object.keys(data.filters).map((x) => [x, !!Math.round(Math.random())]),
+      Object.keys(tutorialData.filters).map((x) => [
+        x,
+        !!Math.round(Math.random()),
+      ]),
     ),
   )
 
@@ -47,35 +46,35 @@ export default function TutSidebar() {
         alignItems="center"
         justifyContent="center"
         spacing={2}
-        style={{ height: '100%' }}
+        height="100%"
       >
-        <Grid item xs={8} style={{ textAlign: 'center' }}>
+        <Grid xs={8} textAlign="center">
           <Typography variant={isMobile ? 'subtitle2' : 'h6'} align="center">
             {t('tutorial_sidebar_0')}
           </Typography>
         </Grid>
-        <Grid item xs={4} style={{ textAlign: 'center' }}>
+        <Grid xs={4} textAlign="center">
           <Fab color="primary">
             <Menu />
           </Fab>
         </Grid>
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Divider light />
         </Grid>
-        <Grid item xs={12} style={{ whiteSpace: 'pre-line' }}>
+        <Grid xs={12} whiteSpace="pre-line">
           <Typography variant="subtitle1" align="center" gutterBottom>
             {t('tutorial_sidebar_1')}
           </Typography>
         </Grid>
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <List disablePadding>
-            {Object.keys(data.filters).map((subItem) => {
+            {Object.keys(tutorialData.filters).map((subItem) => {
               if (subItem === 'filter') {
                 return null
               }
               return (
                 <ListItem key={subItem}>
-                  <ListItemText primary={t(Utility.camelToSnake(subItem))} />
+                  <ListItemText primary={t(camelToSnake(subItem))} />
                   <Switch
                     checked={tempFilters[subItem]}
                     onChange={() => {
@@ -108,7 +107,7 @@ export default function TutSidebar() {
             </ListItemButton>
           </List>
         </Grid>
-        <Grid item xs={12} style={{ whiteSpace: 'pre-line' }}>
+        <Grid xs={12} whiteSpace="pre-line">
           <Typography variant="subtitle1" align="center" gutterBottom>
             {t('tutorial_sidebar_2')}
           </Typography>
diff --git a/src/components/layout/dialogs/tutorial/Sliders.jsx b/src/features/tutorial/Sliders.jsx
similarity index 85%
rename from src/components/layout/dialogs/tutorial/Sliders.jsx
rename to src/features/tutorial/Sliders.jsx
index a70c03d32..192c9a67f 100644
--- a/src/components/layout/dialogs/tutorial/Sliders.jsx
+++ b/src/features/tutorial/Sliders.jsx
@@ -1,14 +1,18 @@
 import React, { useState } from 'react'
-import { Grid, DialogContent, Typography, Divider } from '@mui/material'
+import DialogContent from '@mui/material/DialogContent'
+import Typography from '@mui/material/Typography'
+import Grid from '@mui/material/Unstable_Grid2'
+import Divider from '@mui/material/Divider'
 import { useTranslation, Trans } from 'react-i18next'
 
-import SliderTile from '../filters/SliderTile'
-import data from './data'
+import { SliderTile } from '@components/inputs/SliderTile'
+
+import { tutorialData } from './data'
 
 const relevant = ['iv', 'level', 'great', 'ultra']
-const { ivOr } = data.filters.pokemon
+const { ivOr } = tutorialData.filters.pokemon
 
-export default function TutSliders() {
+export function TutorialSliders() {
   const { t } = useTranslation()
 
   const [temp, setTemp] = useState({ ...ivOr, iv: [80, 100], great: [1, 10] })
@@ -28,7 +32,7 @@ export default function TutSliders() {
     }
   }
   const fullCheck = {}
-  const slidersToUse = data.sliders.filter((slider) =>
+  const slidersToUse = tutorialData.sliders.filter((slider) =>
     relevant.includes(slider.name),
   )
   const arrayCheck = (filter, key) =>
@@ -45,9 +49,9 @@ export default function TutSliders() {
         direction="row"
         alignItems="center"
         justifyContent="center"
-        style={{ height: '100%' }}
+        height="100%"
       >
-        <Grid item xs={12} style={{ margin: 5 }}>
+        <Grid xs={12} m={5}>
           <Typography variant="h6" align="center" gutterBottom>
             {t('tutorial_sliders_0')}
           </Typography>
@@ -57,10 +61,10 @@ export default function TutSliders() {
           direction="row"
           justifyContent="center"
           alignItems="center"
-          style={{ width: 300 }}
+          width={300}
         >
           {slidersToUse.map((slider) => (
-            <Grid item xs={12} key={slider.name}>
+            <Grid xs={12} key={slider.name}>
               <SliderTile
                 slide={slider}
                 handleChange={handleChange}
@@ -69,7 +73,7 @@ export default function TutSliders() {
             </Grid>
           ))}
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           <Typography variant="h6">{t('tutorial_sliders_1')}</Typography>
           {fullCheck.iv && (
             <Typography variant="subtitle2" color="secondary">
@@ -123,10 +127,10 @@ export default function TutSliders() {
             <Typography variant="caption">{t('tutorial_sliders_9')}</Typography>
           )}
         </Grid>
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Divider light style={{ margin: 10 }} />
         </Grid>
-        <Grid item xs={12} style={{ textAlign: 'center' }}>
+        <Grid xs={12} textAlign="center">
           <Typography variant="subtitle2" color="secondary">
             {t('tutorial_sliders_6')}
           </Typography>
diff --git a/src/components/layout/dialogs/tutorial/Welcome.jsx b/src/features/tutorial/Welcome.jsx
similarity index 74%
rename from src/components/layout/dialogs/tutorial/Welcome.jsx
rename to src/features/tutorial/Welcome.jsx
index 1b91cc744..0e711c248 100644
--- a/src/components/layout/dialogs/tutorial/Welcome.jsx
+++ b/src/features/tutorial/Welcome.jsx
@@ -1,17 +1,19 @@
 import React from 'react'
 import Person from '@mui/icons-material/Person'
 import LockOpen from '@mui/icons-material/LockOpen'
-import { DialogContent, Grid, Typography, Fab } from '@mui/material'
-
+import Grid from '@mui/material/Unstable_Grid2'
+import Fab from '@mui/material/Fab'
+import Typography from '@mui/material/Typography'
+import DialogContent from '@mui/material/DialogContent'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import LocaleSelection from '@components/layout/general/LocaleSelection'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { LocaleSelection } from '@components/inputs/LocaleSelection'
 
-export default function TutWelcome() {
+export function TutorialWelcome() {
   const { t } = useTranslation()
-  const { methods, loggedIn } = useMemory((state) => state.auth)
+  const { methods, loggedIn } = useMemory((s) => s.auth)
   const permStatus = useMemory((s) => {
     let have = 0
     let total = 0
@@ -38,9 +40,7 @@ export default function TutWelcome() {
     })
     return `${have} / ${total}`
   })
-  const enableUserProfile = useMemory(
-    (state) => state.config.misc.enableUserProfile,
-  )
+  const enableUserProfile = useMemory((s) => s.config.misc.enableUserProfile)
 
   return (
     <DialogContent>
@@ -50,21 +50,21 @@ export default function TutWelcome() {
         alignItems="center"
         justifyContent="space-evenly"
         spacing={2}
-        style={{ height: '100%' }}
+        height="100%"
       >
-        <Grid item xs={12}>
-          <Typography variant="h4" align="center" style={{ margin: 10 }}>
+        <Grid xs={12}>
+          <Typography variant="h4" align="center" margin={2}>
             {t('welcome')} {document.title}!
           </Typography>
         </Grid>
 
-        <Grid item xs={6}>
+        <Grid xs={6}>
           <Typography variant="subtitle2" align="center">
             {t('tutorial_categories')}:
           </Typography>
         </Grid>
         {enableUserProfile && (
-          <Grid item xs={6}>
+          <Grid xs={6}>
             <Typography variant="h6" gutterBottom align="center">
               {!loggedIn && methods.length
                 ? t('login_optional')
@@ -72,12 +72,12 @@ export default function TutWelcome() {
             </Typography>
           </Grid>
         )}
-        <Grid item xs={6}>
+        <Grid xs={6}>
           <Typography variant="h3" align="center">
             {permStatus}
           </Typography>
         </Grid>
-        <Grid item xs={6} style={{ textAlign: 'center' }}>
+        <Grid xs={6} textAlign="center">
           {(() => {
             if (!loggedIn && methods.length) {
               return (
@@ -97,7 +97,7 @@ export default function TutWelcome() {
           })()}
         </Grid>
         {enableUserProfile && (
-          <Grid item xs={12} sm={10} style={{ marginTop: 10 }}>
+          <Grid xs={12} sm={10} marginTop={2}>
             <Typography variant="subtitle1" align="center">
               {!loggedIn && methods.length
                 ? t('tutorial_logged_out')
@@ -105,15 +105,15 @@ export default function TutWelcome() {
             </Typography>
           </Grid>
         )}
-        <Grid item xs={12} sm={10} style={{ marginTop: 10 }}>
+        <Grid xs={12} sm={10} marginTop={2}>
           <Typography variant="subtitle1" align="center">
             {t('tutorial_language')}
           </Typography>
         </Grid>
-        <Grid item xs={12} sm={10} style={{ textAlign: 'center' }}>
+        <Grid xs={12} sm={10} textAlign="center">
           <LocaleSelection />
         </Grid>
-        <Grid item xs={12} sm={10} style={{ marginTop: 10 }}>
+        <Grid xs={12} sm={10} marginTop={2}>
           <Typography variant="subtitle1" align="center">
             {t('tutorial_welcome')}
           </Typography>
diff --git a/src/components/layout/dialogs/tutorial/data.js b/src/features/tutorial/data.js
similarity index 99%
rename from src/components/layout/dialogs/tutorial/data.js
rename to src/features/tutorial/data.js
index 29b24bf99..cf9f52299 100644
--- a/src/components/layout/dialogs/tutorial/data.js
+++ b/src/features/tutorial/data.js
@@ -1,4 +1,4 @@
-export default {
+export const tutorialData = {
   pokemon: {
     id: '1479791170343952100',
     pokemon_id: 16,
diff --git a/src/components/layout/dialogs/tutorial/Tutorial.jsx b/src/features/tutorial/index.jsx
similarity index 77%
rename from src/components/layout/dialogs/tutorial/Tutorial.jsx
rename to src/features/tutorial/index.jsx
index 60db2043a..8007d04af 100644
--- a/src/components/layout/dialogs/tutorial/Tutorial.jsx
+++ b/src/features/tutorial/index.jsx
@@ -1,7 +1,9 @@
 import React, { useState } from 'react'
 import KeyboardArrowLeft from '@mui/icons-material/KeyboardArrowLeft'
 import KeyboardArrowRight from '@mui/icons-material/KeyboardArrowRight'
-import { Box, Dialog, useMediaQuery } from '@mui/material'
+import Box from '@mui/material/Box'
+import Dialog from '@mui/material/Dialog'
+import useMediaQuery from '@mui/material/useMediaQuery'
 import DialogActions from '@mui/material/DialogActions'
 import Button from '@mui/material/Button'
 import MobileStepper from '@mui/material/MobileStepper'
@@ -10,21 +12,21 @@ import { useTheme } from '@mui/material/styles'
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import Query from '@services/Query'
-import Header from '@components/layout/general/Header'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Query } from '@services/queries'
+import { Header } from '@components/dialogs/Header'
 
-import Welcome from './Welcome'
-import Advanced from './Advanced'
-import Closing from './Closing'
-import Sidebar from './Sidebar'
-import Sliders from './Sliders'
-import Popups from './Popups'
+import { TutorialWelcome } from './Welcome'
+import { TutorialAdvanced } from './Advanced'
+import { TutorialClosing } from './Closing'
+import { TutorialSidebar } from './Sidebar'
+import { TutorialSliders } from './Sliders'
+import { TutorialPopup } from './Popups'
 
 const steps = ['intro', 'sidebar', 'sliders', 'advanced', 'popups', 'closing']
 
-export default function Tutorial() {
+export function Tutorial() {
   const theme = useTheme()
   const { t } = useTranslation()
   const isMobile = useMediaQuery(theme.breakpoints.only('xs'))
@@ -34,7 +36,7 @@ export default function Tutorial() {
   const [activeStep, setActiveStep] = useState(0)
   const [prevStep, setPrevStep] = useState(0)
 
-  const [setTutorialInDb] = useMutation(Query.user('setTutorial'))
+  const [setTutorialInDb] = useMutation(Query.user('SET_TUTORIAL'))
 
   const handleNext = () => {
     setPrevStep(activeStep)
@@ -81,12 +83,12 @@ export default function Tutorial() {
           >
             {
               {
-                0: <Welcome />,
-                1: <Sidebar />,
-                2: <Sliders />,
-                3: <Advanced category="pokemon" />,
-                4: <Popups />,
-                5: <Closing />,
+                0: <TutorialWelcome />,
+                1: <TutorialSidebar />,
+                2: <TutorialSliders />,
+                3: <TutorialAdvanced category="pokemon" />,
+                4: <TutorialPopup />,
+                5: <TutorialClosing />,
               }[step]
             }
           </Box>
@@ -132,3 +134,5 @@ export default function Tutorial() {
     </Dialog>
   )
 }
+
+export * from './Advanced'
diff --git a/src/components/tiles/submissionCells/PoI.jsx b/src/features/wayfarer/PoI.jsx
similarity index 67%
rename from src/components/tiles/submissionCells/PoI.jsx
rename to src/features/wayfarer/PoI.jsx
index 1e5cc812e..b0a8c2f20 100644
--- a/src/components/tiles/submissionCells/PoI.jsx
+++ b/src/features/wayfarer/PoI.jsx
@@ -7,7 +7,7 @@ import { Circle } from 'react-leaflet'
  * @param {import('@rm/types').PoI & { color: string }} param0
  * @returns
  */
-const PoITile = ({ lat, lon, color }) => (
+const PoI = ({ lat, lon, color }) => (
   <Circle
     key={color}
     center={[lat, lon]}
@@ -18,6 +18,7 @@ const PoITile = ({ lat, lon, color }) => (
   />
 )
 
-const MemoPoI = React.memo(PoITile, (prev, next) => prev.color === next.color)
-
-export default MemoPoI
+export const PoITile = React.memo(
+  PoI,
+  (prev, next) => prev.color === next.color,
+)
diff --git a/src/components/tiles/submissionCells/S14Cell.jsx b/src/features/wayfarer/S14Cell.jsx
similarity index 77%
rename from src/components/tiles/submissionCells/S14Cell.jsx
rename to src/features/wayfarer/S14Cell.jsx
index d1daf638b..da63aef47 100644
--- a/src/components/tiles/submissionCells/S14Cell.jsx
+++ b/src/features/wayfarer/S14Cell.jsx
@@ -2,8 +2,8 @@
 import * as React from 'react'
 import { Polygon, Popup, Tooltip } from 'react-leaflet'
 
-import PopupContent from '../../popups/SubmissionCell'
-import typeStyle from '../../markers/typeCell'
+import { WayfarerPopup } from './WayfarerPopup'
+import { getPathOptions } from './typeCell'
 
 /**
  *
@@ -24,10 +24,16 @@ const S14Cell = ({
       positions={cell.polygon}
       color={cellColor}
       weight={4}
-      {...typeStyle(cell, total, oneStopTillNext, twoStopsTillNext, noMoreGyms)}
+      {...getPathOptions(
+        cell,
+        total,
+        oneStopTillNext,
+        twoStopsTillNext,
+        noMoreGyms,
+      )}
     >
       <Popup>
-        <PopupContent {...cell} total={total} />
+        <WayfarerPopup {...cell} total={total} />
       </Popup>
       <Tooltip direction="center" permanent className="round-tt">
         {total || '0'}
@@ -36,7 +42,7 @@ const S14Cell = ({
   )
 }
 
-const MemoS14Cell = React.memo(
+export const S14CellTile = React.memo(
   S14Cell,
   (prev, next) =>
     prev.cellColor === next.cellColor &&
@@ -46,5 +52,3 @@ const MemoS14Cell = React.memo(
     prev.count_gyms === next.count_gyms &&
     prev.count_pokestops === next.count_pokestops,
 )
-
-export default MemoS14Cell
diff --git a/src/components/tiles/submissionCells/S17Cell.jsx b/src/features/wayfarer/S17Cell.jsx
similarity index 91%
rename from src/components/tiles/submissionCells/S17Cell.jsx
rename to src/features/wayfarer/S17Cell.jsx
index 4dad46be7..796e12aa8 100644
--- a/src/components/tiles/submissionCells/S17Cell.jsx
+++ b/src/features/wayfarer/S17Cell.jsx
@@ -22,12 +22,10 @@ const S17Cell = ({ cellColor, blockedColor, polygon, blocked }) => (
   />
 )
 
-const MemoS17Cell = React.memo(
+export const S17CellTile = React.memo(
   S17Cell,
   (prev, next) =>
     prev.blocked === next.blocked &&
     prev.blockedColor === next.blockedColor &&
     prev.cellColor === next.cellColor,
 )
-
-export default MemoS17Cell
diff --git a/src/components/popups/SubmissionCell.jsx b/src/features/wayfarer/WayfarerPopup.jsx
similarity index 80%
rename from src/components/popups/SubmissionCell.jsx
rename to src/features/wayfarer/WayfarerPopup.jsx
index afbbb94f4..8da8cdbe3 100644
--- a/src/components/popups/SubmissionCell.jsx
+++ b/src/features/wayfarer/WayfarerPopup.jsx
@@ -3,8 +3,8 @@ import * as React from 'react'
 import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { useAnalytics } from '@hooks/useAnalytics'
 
 const GYM_THRESHOLD = [2, 6, 20]
 
@@ -13,11 +13,7 @@ const GYM_THRESHOLD = [2, 6, 20]
  * @param {import('@rm/types/lib').Level14Cell & { total: number }} props
  * @returns
  */
-export default function SubmissionCellPopup({
-  count_gyms,
-  count_pokestops,
-  total,
-}) {
+export function WayfarerPopup({ count_gyms, count_pokestops, total }) {
   const { t } = useTranslation()
   let untilNextGym =
     count_gyms < 3
@@ -31,9 +27,7 @@ export default function SubmissionCellPopup({
     untilNextGym = t('next_submission')
   }
 
-  React.useEffect(() => {
-    Utility.analytics('Popup', `Total Count: ${total}`, 'Submission Cell')
-  }, [])
+  useAnalytics('Popup', `Total Count: ${total}`, 'Submission Cell')
 
   return (
     <ErrorBoundary noRefresh style={{}} variant="h5">
diff --git a/src/components/tiles/submissionCells/SubmissionCell.jsx b/src/features/wayfarer/WayfarerTile.jsx
similarity index 81%
rename from src/components/tiles/submissionCells/SubmissionCell.jsx
rename to src/features/wayfarer/WayfarerTile.jsx
index df0438cf5..e1ff2427f 100644
--- a/src/components/tiles/submissionCells/SubmissionCell.jsx
+++ b/src/features/wayfarer/WayfarerTile.jsx
@@ -1,19 +1,19 @@
 // @ts-check
 import * as React from 'react'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
-import Level14Tile from './S14Cell'
-import Level17Tile from './S17Cell'
-import PoITile from './PoI'
+import { S14CellTile } from './S14Cell'
+import { S17CellTile } from './S17Cell'
+import { PoITile } from './PoI'
 
 /**
  *
  * @param {import('@rm/types').SubmissionCell} props
  * @returns
  */
-const SubmissionCellTile = ({ level14Cells, level17Cells, pois }) => {
+const Wayfarer = ({ level14Cells, level17Cells, pois }) => {
   const poiColor = useStorage((s) => s.userSettings.wayfarer.poiColor)
   const showcaseColor = useStorage((s) => s.userSettings.wayfarer.showcaseColor)
   const partnerColor = useStorage((s) => s.userSettings.wayfarer.partnerColor)
@@ -47,7 +47,7 @@ const SubmissionCellTile = ({ level14Cells, level17Cells, pois }) => {
         />
       ))}
       {level17Cells?.map((cell) => (
-        <Level17Tile
+        <S17CellTile
           key={`pc${cell.id}-${cell.polygon.join('-')}`}
           cellColor={cellColor}
           blockedColor={cellBlocked}
@@ -55,7 +55,7 @@ const SubmissionCellTile = ({ level14Cells, level17Cells, pois }) => {
         />
       ))}
       {level14Cells?.map((cell) => (
-        <Level14Tile
+        <S14CellTile
           key={`tc${cell.id}-${cell.polygon.join('-')}`}
           cellColor={cellColor}
           oneStopTillNext={oneStopTillNext}
@@ -68,6 +68,4 @@ const SubmissionCellTile = ({ level14Cells, level17Cells, pois }) => {
   )
 }
 
-const MemoSubmissionCell = React.memo(SubmissionCellTile)
-
-export default MemoSubmissionCell
+export const WayfarerTile = React.memo(Wayfarer)
diff --git a/src/features/wayfarer/index.js b/src/features/wayfarer/index.js
new file mode 100644
index 000000000..06155455a
--- /dev/null
+++ b/src/features/wayfarer/index.js
@@ -0,0 +1 @@
+export * from './WayfarerTile'
diff --git a/src/components/markers/typeCell.js b/src/features/wayfarer/typeCell.js
similarity index 96%
rename from src/components/markers/typeCell.js
rename to src/features/wayfarer/typeCell.js
index 9faf19f19..d0bcbfce5 100644
--- a/src/components/markers/typeCell.js
+++ b/src/features/wayfarer/typeCell.js
@@ -9,7 +9,7 @@
  * @param {string} noMoreGyms
  * @returns {L.PathOptions}
  */
-export default function typeStyle(
+export function getPathOptions(
   cell,
   total,
   oneStopTillNext,
diff --git a/src/components/layout/general/ActiveWeather.jsx b/src/features/weather/ActiveWeather.jsx
similarity index 66%
rename from src/components/layout/general/ActiveWeather.jsx
rename to src/features/weather/ActiveWeather.jsx
index 91adc5a52..d7ffcf2d3 100644
--- a/src/components/layout/general/ActiveWeather.jsx
+++ b/src/features/weather/ActiveWeather.jsx
@@ -8,14 +8,14 @@ import booleanPointInPolygon from '@turf/boolean-point-in-polygon'
 import { point, polygon } from '@turf/helpers'
 import { useTranslation } from 'react-i18next'
 
-import WeatherPopup from '@components/popups/Weather'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 import { apolloClient } from '@services/apollo'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
+import { Img } from '@components/Img'
 
-import Header from './Header'
-import Footer from './Footer'
-import { Img } from './Img'
+import { WeatherPopup } from './WeatherPopup'
 
 const StyledBox = styled(Box)(({ theme }) => ({
   zIndex: 1000,
@@ -36,39 +36,18 @@ const ImgSx = {
   height: { xs: 24, sm: 36 },
 }
 
-export default function ActiveWeather() {
-  const weatherEnabled = useStorage((s) => s.filters?.weather?.enabled ?? false)
-  const location = useStorage((state) => state.location)
-  const Icons = useMemory((state) => state.Icons)
-  const clickable = useStorage((s) => s.userSettings?.weather?.clickableIcon)
+/** @param {import('@rm/types').Weather} props */
+function Weather({ gameplay_condition, ...props }) {
+  const Icons = useMemory((s) => s.Icons)
   const timeOfDay = useMemory((s) => s.timeOfDay)
-  const zoom = useStorage((s) => s.zoom)
-  const allowedZoom = useMemory((s) => s.config.general.activeWeatherZoom)
+  const clickable = useStorage((s) => s.userSettings?.weather?.clickableIcon)
   const { t } = useTranslation()
 
-  const [active, setActive] = React.useState(
-    /** @type {import('@rm/types').Weather | null} */ (null),
-  )
   const [open, setOpen] = React.useState(false)
 
-  React.useEffect(() => {
-    if (zoom > allowedZoom) {
-      const weatherCache = Object.values(apolloClient.cache.extract()).find(
-        (x) =>
-          x.__typename === 'Weather' &&
-          // @ts-ignore
-          booleanPointInPolygon(point(location), polygon([x.polygon])),
-      )
-      // @ts-ignore
-      if (weatherCache) setActive(weatherCache)
-    } else {
-      setActive(null)
-    }
-  }, [location, zoom, allowedZoom])
-
   const footerOptions = React.useMemo(
     () =>
-      /** @type {import('./Footer').FooterButton[]} */ ([
+      /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
         {
           name: 'close',
           action: () => setOpen(false),
@@ -77,20 +56,19 @@ export default function ActiveWeather() {
       ]),
     [setOpen],
   )
-
-  if (!weatherEnabled || !Icons || !active) return null
+  if (!Icons) return null
   const [{ disableColorShift = false }] = Icons.getModifiers('weather')
   return (
-    <React.Fragment key={active?.gameplay_condition}>
+    <React.Fragment key={gameplay_condition}>
       <StyledBox
         className="weather-icon flex-center"
         id="active-weather"
-        onClick={() => setOpen(Boolean(clickable))}
+        onClick={() => setOpen(!!clickable)}
       >
         <Img
           className={disableColorShift ? '' : 'fancy'}
-          src={Icons.getWeather(active.gameplay_condition, timeOfDay)}
-          alt={t(`weather_${active.gameplay_condition}`)}
+          src={Icons.getWeather(gameplay_condition, timeOfDay)}
+          alt={t(`weather_${gameplay_condition}`)}
           sx={ImgSx}
         />
       </StyledBox>
@@ -103,10 +81,50 @@ export default function ActiveWeather() {
             justifyContent: 'center',
           }}
         >
-          <WeatherPopup {...active} />
+          <WeatherPopup {...props} gameplay_condition={gameplay_condition} />
         </DialogContent>
         <Footer role="" options={footerOptions} />
       </Dialog>
     </React.Fragment>
   )
 }
+
+const WeatherMemo = React.memo(
+  Weather,
+  (prev, next) => prev.gameplay_condition === next.gameplay_condition,
+)
+
+export function ActiveWeather() {
+  const weatherEnabled = useStorage((s) => s.filters?.weather?.enabled ?? false)
+  const location = useStorage((s) => s.location)
+  const zoom = useStorage((s) => s.zoom)
+  const allowedZoom = useMemory((s) => s.config.general.activeWeatherZoom)
+
+  const [active, setActive] = React.useState(
+    /** @type {import('@rm/types').Weather | null} */ (null),
+  )
+
+  React.useEffect(() => {
+    if (zoom > allowedZoom) {
+      const weatherCache = Object.values(apolloClient.cache.extract()).find(
+        (x) =>
+          x.__typename === 'Weather' &&
+          // @ts-ignore
+          booleanPointInPolygon(point(location), polygon([x.polygon])),
+      )
+      if (
+        weatherCache &&
+        'gameplay_condition' in weatherCache &&
+        weatherCache?.gameplay_condition !== active?.gameplay_condition
+      ) {
+        // @ts-ignore
+        setActive(weatherCache)
+      }
+    } else {
+      setActive(null)
+    }
+  }, [location, zoom, allowedZoom])
+
+  if (!weatherEnabled || !active) return null
+  return <WeatherMemo {...active} />
+}
diff --git a/src/components/popups/Weather.jsx b/src/features/weather/WeatherPopup.jsx
similarity index 64%
rename from src/components/popups/Weather.jsx
rename to src/features/weather/WeatherPopup.jsx
index 4139b8b2a..541aff818 100644
--- a/src/components/popups/Weather.jsx
+++ b/src/features/weather/WeatherPopup.jsx
@@ -1,31 +1,32 @@
 // @ts-check
 import * as React from 'react'
-import { Grid, Typography } from '@mui/material'
+import Grid from '@mui/material/Unstable_Grid2'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import Utility from '@services/Utility'
-import ErrorBoundary from '@components/ErrorBoundary'
+import { useMemory } from '@store/useMemory'
+import { ErrorBoundary } from '@components/ErrorBoundary'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { getTimeUntil } from '@utils/getTimeUntil'
+import { dayCheck } from '@utils/dayCheck'
 
 /**
  *
  * @param {import('@rm/types').Weather} props
  * @returns
  */
-export default function WeatherPopup({ gameplay_condition, updated }) {
+export function WeatherPopup({ gameplay_condition, updated }) {
   const { t } = useTranslation()
   const weatherTypes = useMemory(
-    (state) => state.masterfile.weather[gameplay_condition]?.types || [],
+    (s) => s.masterfile.weather[gameplay_condition]?.types || [],
   )
-  const Icons = useMemory((state) => state.Icons)
+  const Icons = useMemory((s) => s.Icons)
 
-  React.useEffect(() => {
-    Utility.analytics(
-      'Popup',
-      `Type: ${t(`weather_${gameplay_condition}`)}`,
-      'Weather',
-    )
-  }, [])
+  useAnalytics(
+    'Popup',
+    `Type: ${t(`weather_${gameplay_condition}`)}`,
+    'Weather',
+  )
 
   return (
     <ErrorBoundary noRefresh variant="h5">
@@ -36,28 +37,28 @@ export default function WeatherPopup({ gameplay_condition, updated }) {
         alignItems="center"
         style={{ width: 150 }}
       >
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Typography variant="h6" align="center">
             {t(`weather_${gameplay_condition}`)}
           </Typography>
         </Grid>
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Typography variant="subtitle2" align="center">
             {t('last_updated')}:
           </Typography>
         </Grid>
         <Timer updated={updated} />
-        <Grid item xs={12}>
+        <Grid xs={12}>
           <Typography variant="subtitle2" align="center">
             {t('boosted_types')}:
           </Typography>
         </Grid>
         {weatherTypes.map((type) => (
-          <Grid item xs={4} key={type} style={{ textAlign: 'center' }}>
+          <Grid xs={4} key={type} textAlign="center">
             <Typography variant="caption">{t(`poke_type_${type}`)}</Typography>
             <img
               src={Icons.getTypes(type)}
-              alt={type}
+              alt={t(`weather_${gameplay_condition}`)}
               style={{
                 maxWidth: 30,
                 maxHeight: 30,
@@ -70,10 +71,11 @@ export default function WeatherPopup({ gameplay_condition, updated }) {
   )
 }
 
+// TODO: Why does this exist?
 const Timer = ({ updated, ts = Date.now() / 1000 }) => {
   const { t } = useTranslation()
   const lastUpdated = new Date(updated * 1000)
-  const [timer, setTimer] = React.useState(Utility.getTimeUntil(lastUpdated))
+  const [timer, setTimer] = React.useState(getTimeUntil(updated * 1000))
 
   const date = new Date()
   const currentHour = date.getHours()
@@ -81,31 +83,31 @@ const Timer = ({ updated, ts = Date.now() / 1000 }) => {
   const currentDay = date.getDate()
   const updatedDay = lastUpdated.getDate()
 
-  let color = 'error.main'
-  if (updatedHour === currentHour && updatedDay === currentDay) {
-    color = 'success.main'
-  }
+  const color =
+    updatedHour === currentHour && updatedDay === currentDay
+      ? 'success.main'
+      : 'error.main'
 
   React.useEffect(() => {
     const timer2 = setTimeout(() => {
-      setTimer(Utility.getTimeUntil(lastUpdated))
+      setTimer(getTimeUntil(updated * 1000))
     }, 1000)
     return () => clearTimeout(timer2)
   })
 
   return (
     <>
-      <Grid item xs={timer.diff > 60 ? 12 : 8}>
+      <Grid xs={timer.diff > 60 ? 12 : 8}>
         <Typography
           variant="subtitle2"
           align="center"
           gutterBottom
           sx={{ color }}
         >
-          {Utility.dayCheck(ts, updated)}
+          {dayCheck(ts, updated)}
         </Typography>
       </Grid>
-      <Grid item xs={timer.diff > 60 ? 12 : 4}>
+      <Grid xs={timer.diff > 60 ? 12 : 4}>
         <Typography
           variant="subtitle2"
           align="center"
diff --git a/src/components/tiles/Weather.jsx b/src/features/weather/WeatherTile.jsx
similarity index 81%
rename from src/components/tiles/Weather.jsx
rename to src/features/weather/WeatherTile.jsx
index 35f3f5c59..fcdd393a3 100644
--- a/src/components/tiles/Weather.jsx
+++ b/src/features/weather/WeatherTile.jsx
@@ -3,18 +3,18 @@
 import * as React from 'react'
 import { Popup, Polyline, Marker } from 'react-leaflet'
 
-import { basicEqualFn, useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { basicEqualFn, useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
-import weatherMarker from '../markers/weather'
-import PopupContent from '../popups/Weather'
+import { weatherMarker } from './weatherMarker'
+import { WeatherPopup } from './WeatherPopup'
 
 /**
  *
  * @param {import('@rm/types').Weather} weather
  * @returns
  */
-const WeatherTile = (weather) => {
+const BaseWeatherTile = (weather) => {
   const [popup, setPopup] = React.useState(false)
   const markerRef = React.useRef(null)
 
@@ -60,18 +60,16 @@ const WeatherTile = (weather) => {
         eventHandlers={eventHandlers}
       >
         <Popup position={[weather.latitude, weather.longitude]}>
-          <PopupContent {...weather} />
+          <WeatherPopup {...weather} />
         </Popup>
       </Marker>
     </Polyline>
   )
 }
 
-const MemoWeatherTile = React.memo(
-  WeatherTile,
+export const WeatherTile = React.memo(
+  BaseWeatherTile,
   (prev, next) =>
     prev.gameplay_condition === next.gameplay_condition &&
     prev.updated === next.updated,
 )
-
-export default MemoWeatherTile
diff --git a/src/features/weather/index.js b/src/features/weather/index.js
new file mode 100644
index 000000000..d1f9b8f0b
--- /dev/null
+++ b/src/features/weather/index.js
@@ -0,0 +1,4 @@
+export * from './WeatherPopup'
+export * from './WeatherTile'
+export * from './weatherMarker'
+export * from './ActiveWeather'
diff --git a/src/components/markers/weather.js b/src/features/weather/weatherMarker.js
similarity index 87%
rename from src/components/markers/weather.js
rename to src/features/weather/weatherMarker.js
index e96f9d9b5..f89813dcd 100644
--- a/src/components/markers/weather.js
+++ b/src/features/weather/weatherMarker.js
@@ -1,7 +1,7 @@
-import { useMemory } from '@hooks/useMemory'
 import { divIcon } from 'leaflet'
+import { useMemory } from '@store/useMemory'
 
-export default function weatherMarker(iconUrl) {
+export function weatherMarker(iconUrl) {
   const [
     {
       offsetX,
diff --git a/src/components/layout/dialogs/webhooks/Error.jsx b/src/features/webhooks/Error.jsx
similarity index 70%
rename from src/components/layout/dialogs/webhooks/Error.jsx
rename to src/features/webhooks/Error.jsx
index 70b3c376b..33b15224c 100644
--- a/src/components/layout/dialogs/webhooks/Error.jsx
+++ b/src/features/webhooks/Error.jsx
@@ -1,9 +1,12 @@
+// @ts-check
 import React from 'react'
+import Typography from '@mui/material/Typography'
+import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation, Trans } from 'react-i18next'
-import { Grid, Typography } from '@mui/material'
-import { useWebhookStore } from './store'
 
-export default function WebhookError({ children }) {
+import { useWebhookStore } from '@store/useWebhookStore'
+
+export function WebhookError({ children }) {
   const { t } = useTranslation()
   const name = useWebhookStore((s) => s.context.name)
   return (
@@ -12,18 +15,14 @@ export default function WebhookError({ children }) {
       direction="column"
       justifyContent="center"
       alignItems="center"
-      style={{ height: '100%' }}
+      height="100%"
     >
-      <Grid item>
+      <Grid>
         <Typography variant="h4" align="center">
           {t('non_registered_human_title')}
         </Typography>
         <br />
-        <Typography
-          variant="h6"
-          align="center"
-          style={{ whiteSpace: 'pre-line' }}
-        >
+        <Typography variant="h6" align="center" whiteSpace="pre-line">
           {children ?? (
             <Trans i18nKey="non_registered_human_desc">
               {{ webhook: name }}
diff --git a/src/components/layout/dialogs/webhooks/Manage.jsx b/src/features/webhooks/Manage.jsx
similarity index 71%
rename from src/components/layout/dialogs/webhooks/Manage.jsx
rename to src/features/webhooks/Manage.jsx
index 2993b0ba8..906685444 100644
--- a/src/components/layout/dialogs/webhooks/Manage.jsx
+++ b/src/features/webhooks/Manage.jsx
@@ -10,25 +10,26 @@ import Collapse from '@mui/material/Collapse'
 import Box from '@mui/material/Box'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import Poracle from '@services/Poracle'
-import Utility from '@services/Utility'
-import Footer from '@components/layout/general/Footer'
-import Header from '@components/layout/general/Header'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { Footer } from '@components/dialogs/Footer'
+import { Header } from '@components/dialogs/Header'
 import { apolloClient } from '@services/apollo'
-import Query from '@services/Query'
-import { allProfiles } from '@services/queries/webhook'
-import { WebhookItem } from '@components/layout/drawer/SelectorItem'
+import { Query } from '@services/queries'
+import { ALL_PROFILES } from '@services/queries/webhook'
+import { Menu } from '@components/Menu'
+import { setMode, setSelected, useWebhookStore } from '@store/useWebhookStore'
+import { analytics } from '@utils/analytics'
 
-import Human from './human'
-import Tracked from './Tracked'
-import Menu from '../../general/Menu'
-import { setMode, setSelected, useWebhookStore } from './store'
-import { useGenFullFilters, useGetHookContext } from './hooks'
-import ProfileEditing from './human/profile'
+import { Human } from './human'
+import { Tracked } from './Tracked'
+import { useGenFilters } from './hooks/useGenFilters'
+import { useGetHookContext } from './hooks/useGetHookContext'
+import { ProfileEditing } from './human/profile'
+import { Poracle } from './services/Poracle'
+import { WebhookItem } from './tiles/WebhookItem'
 
-export default function Manage() {
+export function Manage() {
   const { t } = useTranslation()
 
   const categories = useGetHookContext()
@@ -37,8 +38,7 @@ export default function Manage() {
 
   const feedbackLink = useMemory((s) => s.config.links.feedbackLink)
 
-  const filters = useGenFullFilters()
-  const liveFilters = useWebhookStore((s) => s.tempFilters)
+  const filters = useGenFilters()
 
   /** @type {ReturnType<typeof React.useRef<HTMLElement | null>>} */
   const dialogRef = React.useRef(null)
@@ -46,7 +46,7 @@ export default function Manage() {
   const [height, setHeight] = React.useState(0)
 
   const footerButtons = React.useMemo(() => {
-    /** @type {import('@components/layout/general/Footer').FooterButton[]} */
+    /** @type {import('@components/dialogs/Footer').FooterButton[]} */
     const buttons = [
       {
         name: 'feedback',
@@ -61,7 +61,7 @@ export default function Manage() {
           : category === 'human'
           ? t('manage_profiles')
           : t('add_new', { category: t(category) }),
-        action: () => setAddNew({ open: true, save: false }),
+        action: () => setAddNew((prev) => ({ open: !prev.open, save: false })),
         key: 'addNew',
         icon: addNew.open ? 'Save' : 'Add',
         disabled: !categories.length,
@@ -81,7 +81,7 @@ export default function Manage() {
   }, [addNew, categories, category, feedbackLink])
 
   React.useEffect(() => {
-    Utility.analytics('Webhook', `${category} Webhook Page`, category, true)
+    analytics('Webhook', `${category} Webhook Page`, category, true)
     useWebhookStore.setState({ tempFilters: { ...filters[category] } })
     setSelected()()
     if (dialogRef.current && !addNew.open) {
@@ -98,13 +98,14 @@ export default function Manage() {
         useWebhookStore.getState().context.ui[category].defaults,
       )
       apolloClient.mutate({
-        mutation: Query.webhook(category),
+        // @ts-ignore
+        mutation: Query.webhook(category.toUpperCase()),
         variables: {
           category,
           data: values,
           status: 'POST',
         },
-        refetchQueries: [allProfiles],
+        refetchQueries: [ALL_PROFILES],
       })
       useWebhookStore.setState((prev) => ({
         [category]: [...prev[category], ...values],
@@ -123,25 +124,34 @@ export default function Manage() {
 
   const tabValue = categories.findIndex((x) => x === category)
 
-  return category !== 'human' && addNew.open ? (
-    <Menu
-      tempFilters={liveFilters}
-      category={Poracle.getMapCategory(category)}
-      categories={Poracle.getFilterCategories(category)}
-      webhookCategory={category}
-      title="webhook_selection"
-      titleAction={() => setAddNew({ open: false, save: false })}
-      extraButtons={[
+  const buttons = React.useMemo(
+    () =>
+      /** @type {import('@components/dialogs/Footer').FooterButton[]} */ ([
         {
           name: 'save',
           action: () => setAddNew({ open: false, save: true }),
           icon: 'Save',
           color: 'secondary',
         },
-      ]}
-    >
-      {(_, key) => <WebhookItem id={key} category={category} caption />}
-    </Menu>
+      ]),
+    [setAddNew],
+  )
+  return category !== 'human' && addNew.open ? (
+    <>
+      <Header
+        titles="webhook_selection"
+        action={() => setAddNew({ open: false, save: false })}
+        names={[category]}
+      />
+      <Menu
+        category={Poracle.getMapCategory(category)}
+        categories={Poracle.getFilterCategories(category)}
+        webhookCategory={category}
+        extraButtons={buttons}
+      >
+        {(_, key) => <WebhookItem id={key} category={category} caption />}
+      </Menu>
+    </>
   ) : (
     <>
       <Header
@@ -188,7 +198,7 @@ export default function Manage() {
   )
 }
 
-/** @param {{ category: import('./store').WebhookStore['category'] }} props */
+/** @param {{ category: import('@store/useWebhookStore').WebhookStore['category'] }} props */
 function TabIcon({ category }) {
   const Icons = useMemory((s) => s.Icons)
   return category === 'human' ? (
diff --git a/src/features/webhooks/Notification.jsx b/src/features/webhooks/Notification.jsx
new file mode 100644
index 000000000..83926eb36
--- /dev/null
+++ b/src/features/webhooks/Notification.jsx
@@ -0,0 +1,14 @@
+// @ts-check
+import * as React from 'react'
+
+import { Notification } from '@components/Notification'
+import { resetAlert, useWebhookStore } from '@store/useWebhookStore'
+
+export function WebhookNotification() {
+  const alert = useWebhookStore((s) => s.alert)
+  return (
+    <Notification open={!!alert.open} cb={resetAlert} severity={alert.severity}>
+      {alert.message}
+    </Notification>
+  )
+}
diff --git a/src/components/layout/dialogs/webhooks/Selecting.jsx b/src/features/webhooks/Selecting.jsx
similarity index 77%
rename from src/components/layout/dialogs/webhooks/Selecting.jsx
rename to src/features/webhooks/Selecting.jsx
index 654cc1efb..22217b62d 100644
--- a/src/components/layout/dialogs/webhooks/Selecting.jsx
+++ b/src/features/webhooks/Selecting.jsx
@@ -1,16 +1,19 @@
 // @ts-check
 import * as React from 'react'
-import { Grid, Fab, Typography, Slide } from '@mui/material'
+import Grid from '@mui/material/Unstable_Grid2'
+import Fab from '@mui/material/Fab'
+import Slide from '@mui/material/Slide'
+import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import { setProfile, allProfiles } from '@services/queries/webhook'
 
-import { useWebhookStore, setSelected } from './store'
+import { SET_PROFILE, ALL_PROFILES } from '@services/queries/webhook'
+import { useWebhookStore, setSelected } from '@store/useWebhookStore'
 
-export default function Selecting() {
+export function Selecting() {
   const { t } = useTranslation()
-  const [save] = useMutation(setProfile, {
-    refetchQueries: [allProfiles],
+  const [save] = useMutation(SET_PROFILE, {
+    refetchQueries: [ALL_PROFILES],
   })
 
   const selected = useWebhookStore((s) => s.selected)
@@ -55,7 +58,7 @@ export default function Selecting() {
         left={0}
         right={0}
       >
-        <Grid item xs={3} sm={2} textAlign="center">
+        <Grid xs={3} sm={2} textAlign="center">
           <Fab
             size="small"
             color="secondary"
@@ -65,7 +68,7 @@ export default function Selecting() {
             <Typography variant="caption">{t('cancel')}</Typography>
           </Fab>
         </Grid>
-        <Grid item xs={4} sm={3} md={2} textAlign="center">
+        <Grid xs={4} sm={3} md={2} textAlign="center">
           <Fab
             size="small"
             color="secondary"
@@ -75,7 +78,7 @@ export default function Selecting() {
             <Typography variant="caption">{t('select_all')}</Typography>
           </Fab>
         </Grid>
-        <Grid item xs={5} sm={4} md={3} textAlign="center">
+        <Grid xs={5} sm={4} md={3} textAlign="center">
           <Fab
             size="small"
             color="primary"
diff --git a/src/components/layout/dialogs/webhooks/Tracked.jsx b/src/features/webhooks/Tracked.jsx
similarity index 74%
rename from src/components/layout/dialogs/webhooks/Tracked.jsx
rename to src/features/webhooks/Tracked.jsx
index fc97bffb7..f9f53270b 100644
--- a/src/components/layout/dialogs/webhooks/Tracked.jsx
+++ b/src/features/webhooks/Tracked.jsx
@@ -1,25 +1,25 @@
-/* eslint-disable react/no-unstable-nested-components */
 // @ts-check
+/* eslint-disable react/no-unstable-nested-components */
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Virtuoso } from 'react-virtuoso'
 import Typography from '@mui/material/Typography'
-
 import Box from '@mui/material/Box'
-import { Loading } from '@components/layout/general/Loading'
-import { GenericSearch } from '@components/layout/drawer/ItemSearch'
 
-import TrackedTile from './tiles/TrackedTile'
-import Selecting from './Selecting'
-import { useGetWebhookData } from './hooks'
-import { useWebhookStore } from './store'
+import { Loading } from '@components/Loading'
+import { GenericSearch } from '@components/inputs/GenericSearch'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { TrackedTile } from './tiles/TrackedTile'
+import { Selecting } from './Selecting'
+import { useGetWebhookData } from './hooks/useGetWebhookData'
 
 /**
  *
- * @param {{ category: Exclude<import('./store').WebhookStore['category'], 'human'> }} props
+ * @param {{ category: Exclude<import('@store/useWebhookStore').WebhookStore['category'], 'human'> }} props
  * @returns
  */
-const Tracked = ({ category }) => {
+export const Tracked = ({ category }) => {
   const { t } = useTranslation()
 
   const { data: tracked, loading } = useGetWebhookData(category)
@@ -62,5 +62,3 @@ export const WebhookSearch = React.memo(() => {
     />
   )
 })
-
-export default Tracked
diff --git a/src/components/layout/dialogs/webhooks/Webhook.jsx b/src/features/webhooks/Webhook.jsx
similarity index 69%
rename from src/components/layout/dialogs/webhooks/Webhook.jsx
rename to src/features/webhooks/Webhook.jsx
index 1b523a744..94726f814 100644
--- a/src/components/layout/dialogs/webhooks/Webhook.jsx
+++ b/src/features/webhooks/Webhook.jsx
@@ -2,12 +2,12 @@
 import * as React from 'react'
 import Dialog from '@mui/material/Dialog'
 
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
+import { setMode, useWebhookStore } from '@store/useWebhookStore'
 
-import Manage from './Manage'
-import { setMode, useWebhookStore } from './store'
+import { Manage } from './Manage'
 
-export default function Webhook() {
+export function Webhook() {
   const webhookMode = useWebhookStore((s) => s.mode === 'open')
   const isMobile = useMemory((s) => s.isMobile)
 
diff --git a/src/components/layout/dialogs/webhooks/WebhookAdv.jsx b/src/features/webhooks/WebhookAdv.jsx
similarity index 90%
rename from src/components/layout/dialogs/webhooks/WebhookAdv.jsx
rename to src/features/webhooks/WebhookAdv.jsx
index 810d4b4a9..254c9938f 100644
--- a/src/components/layout/dialogs/webhooks/WebhookAdv.jsx
+++ b/src/features/webhooks/WebhookAdv.jsx
@@ -1,40 +1,37 @@
 /* eslint-disable react/jsx-no-duplicate-props */
 import * as React from 'react'
 import ExpandMore from '@mui/icons-material/ExpandMore'
-import {
-  Grid,
-  Dialog,
-  DialogContent,
-  Switch,
-  Typography,
-  Select,
-  MenuItem,
-  TextField,
-  FormControl,
-  InputLabel,
-  InputAdornment,
-  Paper,
-  Accordion,
-  AccordionSummary,
-  AccordionDetails,
-  Divider,
-  CircularProgress,
-  Autocomplete,
-} from '@mui/material'
-import { Trans, useTranslation } from 'react-i18next'
+import Accordion from '@mui/material/Accordion'
+import AccordionDetails from '@mui/material/AccordionDetails'
+import AccordionSummary from '@mui/material/AccordionSummary'
+import CircularProgress from '@mui/material/CircularProgress'
+import Divider from '@mui/material/Divider'
+import Grid from '@mui/material/Unstable_Grid2'
+import InputAdornment from '@mui/material/InputAdornment'
+import MenuItem from '@mui/material/MenuItem'
+import Paper from '@mui/material/Paper'
+import Switch from '@mui/material/Switch'
+import TextField from '@mui/material/TextField'
+import Typography from '@mui/material/Typography'
+import Autocomplete from '@mui/material/Autocomplete'
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import { useTranslation } from 'react-i18next'
 import { useLazyQuery } from '@apollo/client'
+import { debounce } from 'lodash'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Query } from '@services/queries'
+import { SliderTile } from '@components/inputs/SliderTile'
+import { Header } from '@components/dialogs/Header'
+import { Footer } from '@components/dialogs/Footer'
+import { useWebhookStore } from '@store/useWebhookStore'
+import { useAnalytics } from '@hooks/useAnalytics'
+import { camelToSnake } from '@utils/strings'
+import { FCSelect } from '@components/inputs/FCSelect'
 
-import Query from '@services/Query'
-import Utility from '@services/Utility'
-import Poracle from '@services/Poracle'
-
-import SliderTile from '@components/layout/dialogs/filters/SliderTile'
-import Header from '@components/layout/general/Header'
-import Footer from '@components/layout/general/Footer'
-import { useWebhookStore } from './store'
+import { Poracle } from './services/Poracle'
 
 const skipFields = new Set([
   'profile_no',
@@ -81,13 +78,13 @@ const wildCards = {
   invasion: ['i0'],
 }
 
-export default function WebhookAdvanced() {
+export function WebhookAdvanced() {
   const { id, category, open, selectedIds, onClose } = useWebhookStore(
     (s) => s.advanced,
   )
   const idObj = Poracle.getIdObj(id)
   const { t } = useTranslation()
-  const location = useStorage((state) => state.location)
+  const location = useStorage((s) => s.location)
   const webhookAdv = useStorage((s) => s.webhookAdv)
   const { templates, prefix, leagues, pvp, hasNominatim, locale, everything } =
     useWebhookStore((s) => s.context)
@@ -112,7 +109,7 @@ export default function WebhookAdvanced() {
       : { ...info?.defaults, profile_no: human.current_profile_no },
   )
 
-  Utility.analytics(`/poracle/${category}`)
+  useAnalytics(`/poracle/${category}`)
 
   const [search, { data, previousData, loading }] = useLazyQuery(
     Query.search('webhook'),
@@ -126,6 +123,22 @@ export default function WebhookAdvanced() {
       },
     },
   )
+  const sendSearch = React.useCallback(
+    (e, searchCategory) =>
+      search({
+        variables: {
+          search: e.target.value,
+          category: searchCategory,
+          ts: Math.floor(Date.now() / 1000),
+        },
+      }),
+    [search],
+  )
+  const debounceChange = React.useMemo(
+    () => debounce(sendSearch, 250),
+    [sendSearch],
+  )
+
   const fetchedData = data || previousData
 
   React.useEffect(() => {
@@ -547,7 +560,6 @@ export default function WebhookAdvanced() {
           .map((option, i) => (
             <Grid
               key={option.name}
-              item
               xs={12}
               sm={option.size || 6}
               style={isMobile ? { marginTop: i ? 'inherit' : 10 } : {}}
@@ -565,28 +577,20 @@ export default function WebhookAdvanced() {
           .map((option) => (
             <Grid
               key={option.name}
-              item
               xs={option.xs || 6}
               sm={option.sm || size}
               style={{ margin: '10px 0', textAlign: 'center' }}
             >
-              <FormControl
-                variant="outlined"
-                size="small"
-                sx={{ width: '80%' }}
+              <FCSelect
+                name={option.name}
+                value={poracleValues[option.name]}
+                onChange={handleSelect}
+                label={t(option.name)}
+                disabled={getDisabled(option)}
+                fcSx={{ width: '80%' }}
               >
-                <InputLabel>{t(option.name)}</InputLabel>
-                <Select
-                  autoFocus
-                  name={option.name}
-                  value={poracleValues[option.name]}
-                  onChange={handleSelect}
-                  label={t(option.name)}
-                  disabled={getDisabled(option)}
-                >
-                  {getOptions(option)}
-                </Select>
-              </FormControl>
+                {getOptions(option)}
+              </FCSelect>
             </Grid>
           ))
       case 'booleans':
@@ -594,7 +598,6 @@ export default function WebhookAdvanced() {
           <Grid
             key={option.name}
             container
-            item
             xs={option.xs || 6}
             sm={option.sm || size}
             justifyContent="center"
@@ -602,12 +605,12 @@ export default function WebhookAdvanced() {
             direction={isMobile || option.override ? 'row' : 'column'}
             style={{ margin: '10px 0' }}
           >
-            <Grid item xs={6} style={{ textAlign: 'center' }}>
+            <Grid xs={6} textAlign="center">
               <Typography variant="subtitle2">
-                {t(Utility.camelToSnake(option.name))}
+                {t(camelToSnake(option.name))}
               </Typography>
             </Grid>
-            <Grid item xs={6} style={{ textAlign: 'center' }}>
+            <Grid xs={6} textAlign="center">
               <Switch
                 name={option.name}
                 color="primary"
@@ -622,7 +625,6 @@ export default function WebhookAdvanced() {
         return options.map((option) => (
           <Grid
             key={option.name}
-            item
             xs={option.xs || 6}
             sm={option.sm || size}
             style={{ margin: '10px 0', textAlign: 'center' }}
@@ -669,14 +671,13 @@ export default function WebhookAdvanced() {
         return options.map((option) => (
           <Grid
             key={option.name}
-            item
             container
             xs={option.xs}
             sm={option.sm}
             justifyContent="center"
             alignItems="center"
           >
-            <Grid item xs={11}>
+            <Grid xs={11}>
               <Autocomplete
                 style={{ width: '100%' }}
                 getOptionLabel={(x) => x.formatted}
@@ -694,21 +695,9 @@ export default function WebhookAdvanced() {
                 renderInput={(params) => (
                   <TextField
                     {...params}
-                    label={
-                      <Trans i18nKey="search_specific">
-                        {{ category: t(option.label) }}
-                      </Trans>
-                    }
+                    label={t('search_specific', { category: t(option.label) })}
                     variant="outlined"
-                    onChange={(e) =>
-                      search({
-                        variables: {
-                          search: e.target.value,
-                          category: option.searchCategory,
-                          ts: Math.floor(Date.now() / 1000),
-                        },
-                      })
-                    }
+                    onChange={(e) => debounceChange(e, option.searchCategory)}
                     InputProps={{
                       ...params.InputProps,
                       endAdornment: (
@@ -723,17 +712,17 @@ export default function WebhookAdvanced() {
                   />
                 )}
                 renderOption={(props, x) => (
-                  <Grid container alignItems="center" spacing={1} {...props}>
-                    <Grid item xs={12}>
+                  <Grid container alignItems="center" rowSpacing={1} {...props}>
+                    <Grid xs={12}>
                       <Typography variant="subtitle2">{x.name}</Typography>
                     </Grid>
-                    <Grid item xs={12}>
+                    <Grid xs={12} maxWidth="100%">
                       <Typography variant="caption">{x.formatted}</Typography>
                     </Grid>
                     <Divider
                       light
                       flexItem
-                      style={{ height: 2, width: '90%', margin: '5px 0' }}
+                      style={{ height: 2, width: '100%', margin: '5px 0' }}
                     />
                   </Grid>
                 )}
@@ -747,7 +736,6 @@ export default function WebhookAdvanced() {
           <Grid
             key={type}
             container
-            item
             xs={12}
             justifyContent="center"
             alignItems="center"
diff --git a/src/components/layout/dialogs/webhooks/hooks.js b/src/features/webhooks/hooks/useGenFilters.js
similarity index 55%
rename from src/components/layout/dialogs/webhooks/hooks.js
rename to src/features/webhooks/hooks/useGenFilters.js
index a2088a211..3811dec89 100644
--- a/src/components/layout/dialogs/webhooks/hooks.js
+++ b/src/features/webhooks/hooks/useGenFilters.js
@@ -1,207 +1,10 @@
 // @ts-check
-import { useEffect, useMemo, useRef } from 'react'
-import { useQuery } from '@apollo/client'
-import { useTranslation } from 'react-i18next'
+import { useMemo } from 'react'
+import { useMemory } from '@store/useMemory'
 
-import { useMemory } from '@hooks/useMemory'
-import {
-  WEBHOOK_CATEGORIES,
-  WEBHOOK_AREAS,
-  WEBHOOK_CONTEXT,
-  allProfiles,
-  WEBHOOK_USER,
-} from '@services/queries/webhook'
-import RobustTimeout from '@services/apollo/RobustTimeout'
-import Poracle from '@services/Poracle'
-
-import { getContext, useWebhookStore } from './store'
-
-/**
- *
- * @returns {{ data: { group: string, children: string[] }[], loading: boolean }}
- */
-export function useGetAreas() {
-  const { data, loading } = useQuery(WEBHOOK_AREAS, {
-    fetchPolicy: 'cache-first',
-  })
-
-  return { data: data?.webhookAreas || [], loading }
-}
-
-/** @returns {import('./store').WebhookStore['category'][]} */
-export function useGetHookContext() {
-  const mode = useWebhookStore((s) => s.mode)
-
-  const { data: context } = useQuery(WEBHOOK_CONTEXT, {
-    fetchPolicy: 'no-cache',
-    skip: !mode,
-  })
-  const { data: categories } = useQuery(WEBHOOK_CATEGORIES, {
-    fetchPolicy: 'no-cache',
-    skip: !mode,
-  })
-
-  useEffect(() => {
-    if (context?.webhookContext) {
-      useWebhookStore.setState({
-        context: context.webhookContext,
-      })
-    }
-  }, [context])
-
-  return categories?.webhookCategories || []
-}
-
-/**
- *
- * @template {import('./store').WebhookStore['category'] | 'profile'} T
- * @param {T} category
- * @returns {{ data: T extends 'human' ? { webhooks: string[], selected: string } : import("@rm/types").APIReturnType[T], loading: boolean }}
- */
-export function useGetWebhookData(category) {
-  const { t } = useTranslation()
-  const search = useWebhookStore((s) => s.trackedSearch)
-  const realCategory = useWebhookStore((s) => s.category)
-  const profileNo = useWebhookStore((s) => s.human.current_profile_no)
-  const timeout = useRef(new RobustTimeout(10_000))
-
-  const { data, previousData, loading, refetch } = useQuery(allProfiles, {
-    fetchPolicy: 'cache-first',
-    variables: {
-      category,
-      status: 'GET',
-    },
-    context: {
-      abortableContext: timeout.current,
-    },
-    skip: category !== realCategory && category !== 'profile',
-  })
-  const { data: userConfig } = useQuery(WEBHOOK_USER, {
-    fetchPolicy: 'no-cache',
-    skip: category !== 'human',
-  })
-
-  useEffect(() => {
-    if (category === realCategory) {
-      timeout.current.setupTimeout(refetch)
-      return () => {
-        timeout.current.off()
-      }
-    }
-  }, [category, realCategory])
-
-  const filtererData = useMemo(() => {
-    const source = data ?? previousData
-    return category === 'human' || category === 'profile'
-      ? source?.webhook?.[category]
-      : (source?.webhook?.[category] || []).filter(
-          (x) =>
-            !search ||
-            (x.description
-              ? x.description.toLowerCase().includes(search.toLowerCase())
-              : Poracle.generateDescription(x, category)
-                  .toLowerCase()
-                  .includes(search)),
-        ) || []
-  }, [data, previousData, search])
-
-  useEffect(() => {
-    if (!loading && data?.webhook) {
-      if (data.webhook.status === 'error') {
-        const { context } = useWebhookStore.getState()
-        useWebhookStore.setState({
-          alert: {
-            open: true,
-            severity: data.webhook.status,
-            message: t(data.webhook.message, { name: context.name || '' }),
-          },
-        })
-      } else {
-        useWebhookStore.setState({ [category]: filtererData })
-      }
-    }
-  }, [data, search])
-
-  useEffect(() => {
-    if (category === 'human') {
-      useWebhookStore.setState({
-        multipleHooks: userConfig?.webhookUser?.webhooks?.length > 1,
-      })
-    }
-  }, [userConfig])
-
-  useEffect(() => {
-    refetch()
-  }, [category, profileNo])
-
-  return {
-    data:
-      category === 'human'
-        ? userConfig?.webhookUser || { webhooks: [], selected: '' }
-        : filtererData || [],
-    loading,
-  }
-}
-
-/**
- * @template {import('./store').WebhookStore['category']} T
- * @param {T} category */
-export function useSyncData(category) {
-  const cached = useWebhookStore((s) => s[category])
-
-  const { data, loading } = useQuery(allProfiles, {
-    fetchPolicy: 'no-cache',
-    variables: {
-      category,
-      status: 'GET',
-    },
-  })
-
-  useEffect(() => {
-    if (data?.webhook?.[category]) {
-      useWebhookStore.setState({
-        [category]: data.webhook[category],
-      })
-    }
-  }, [data])
-  return { data: cached, loading }
-}
+import { useWebhookStore } from '@store/useWebhookStore'
 
 export function useGenFilters() {
-  const {
-    // masterfile: { invasions },
-    filters: rmFilters,
-  } = useMemory.getState()
-  const category = useWebhookStore((s) => s.category)
-  const profile_no = useWebhookStore((s) => s.human.current_profile_no) || 0
-
-  if (category === 'human') {
-    return {}
-  }
-  if (category === 'pokemon') {
-    const pokemon = getContext(category)
-    const poracleFilters = {
-      global: { ...pokemon.defaults, profile_no },
-      ...Object.fromEntries(
-        Object.keys(rmFilters[category]?.filter || {}).map((key) => [
-          key,
-          {
-            ...pokemon.defaults,
-            pokemon_id: +key.split('-')[0],
-            form: +key.split('-')[1],
-            profile_no,
-            enabled: false,
-          },
-        ]),
-      ),
-    }
-    delete poracleFilters.global.pokemon_id
-    delete poracleFilters.global.form
-    return poracleFilters
-  }
-}
-
-export function useGenFullFilters() {
   const profile_no = useWebhookStore((s) => s.human.current_profile_no)
   const ui = useWebhookStore((s) => s.context.ui)
 
diff --git a/src/features/webhooks/hooks/useGetAreas.js b/src/features/webhooks/hooks/useGetAreas.js
new file mode 100644
index 000000000..3f7a10cb8
--- /dev/null
+++ b/src/features/webhooks/hooks/useGetAreas.js
@@ -0,0 +1,15 @@
+// @ts-check
+import { useQuery } from '@apollo/client'
+
+import { WEBHOOK_AREAS } from '@services/queries/webhook'
+
+/**
+ * @returns {{ data: { group: string, children: string[] }[], loading: boolean }}
+ */
+export function useGetAreas() {
+  const { data, loading } = useQuery(WEBHOOK_AREAS, {
+    fetchPolicy: 'cache-first',
+  })
+
+  return { data: data?.webhookAreas || [], loading }
+}
diff --git a/src/features/webhooks/hooks/useGetHookContext.js b/src/features/webhooks/hooks/useGetHookContext.js
new file mode 100644
index 000000000..82069c695
--- /dev/null
+++ b/src/features/webhooks/hooks/useGetHookContext.js
@@ -0,0 +1,30 @@
+// @ts-check
+import { useEffect } from 'react'
+import { useQuery } from '@apollo/client'
+
+import { WEBHOOK_CATEGORIES, WEBHOOK_CONTEXT } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+/** @returns {import('@store/useWebhookStore').WebhookStore['category'][]} */
+export function useGetHookContext() {
+  const mode = useWebhookStore((s) => s.mode)
+
+  const { data: context } = useQuery(WEBHOOK_CONTEXT, {
+    fetchPolicy: 'no-cache',
+    skip: !mode,
+  })
+  const { data: categories } = useQuery(WEBHOOK_CATEGORIES, {
+    fetchPolicy: 'no-cache',
+    skip: !mode,
+  })
+
+  useEffect(() => {
+    if (context?.webhookContext) {
+      useWebhookStore.setState({
+        context: context.webhookContext,
+      })
+    }
+  }, [context])
+
+  return categories?.webhookCategories || []
+}
diff --git a/src/features/webhooks/hooks/useGetWebhookData.js b/src/features/webhooks/hooks/useGetWebhookData.js
new file mode 100644
index 000000000..432e9d094
--- /dev/null
+++ b/src/features/webhooks/hooks/useGetWebhookData.js
@@ -0,0 +1,96 @@
+// @ts-check
+import { useEffect, useMemo, useRef } from 'react'
+import { useQuery } from '@apollo/client'
+import { useTranslation } from 'react-i18next'
+
+import { ALL_PROFILES, WEBHOOK_USER } from '@services/queries/webhook'
+import { RobustTimeout } from '@services/apollo/RobustTimeout'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { Poracle } from '../services/Poracle'
+
+/**
+ *
+ * @template {import('@store/useWebhookStore').WebhookStore['category'] | 'profile'} T
+ * @param {T} category
+ * @returns {{ data: T extends 'human' ? { webhooks: string[], selected: string } : import("@rm/types").APIReturnType[T], loading: boolean }}
+ */
+export function useGetWebhookData(category) {
+  const { t } = useTranslation()
+  const search = useWebhookStore((s) => s.trackedSearch)
+  const realCategory = useWebhookStore((s) => s.category)
+  const timeout = useRef(new RobustTimeout(10_000))
+
+  const { data, previousData, loading, refetch } = useQuery(ALL_PROFILES, {
+    fetchPolicy: 'cache-and-network',
+    variables: {
+      category,
+      status: 'GET',
+    },
+    context: {
+      abortableContext: timeout.current,
+    },
+    skip: category !== realCategory && category !== 'profile',
+  })
+  const { data: userConfig } = useQuery(WEBHOOK_USER, {
+    fetchPolicy: 'cache-and-network',
+    skip: category !== 'human',
+  })
+
+  useEffect(() => {
+    if (category === realCategory) {
+      timeout.current.setupTimeout(refetch)
+      return () => {
+        timeout.current.off()
+      }
+    }
+  }, [category, realCategory, refetch, timeout.current])
+
+  const filtererData = useMemo(() => {
+    const source = data ?? previousData
+    return category === 'human' || category === 'profile'
+      ? source?.webhook?.[category]
+      : (source?.webhook?.[category] || []).filter(
+          (x) =>
+            !search ||
+            (x.description
+              ? x.description.toLowerCase().includes(search.toLowerCase())
+              : Poracle.generateDescription(x, category)
+                  .toLowerCase()
+                  .includes(search)),
+        ) || []
+  }, [data, previousData, search])
+
+  useEffect(() => {
+    if (!loading && data?.webhook) {
+      if (data.webhook.status === 'error') {
+        const { context } = useWebhookStore.getState()
+        useWebhookStore.setState({
+          alert: {
+            open: true,
+            severity: data.webhook.status,
+            message: t(data.webhook.message, { name: context.name || '' }),
+          },
+        })
+      } else {
+        useWebhookStore.setState({ [category]: filtererData })
+      }
+    }
+  }, [data, filtererData, search])
+
+  useEffect(() => {
+    if (category === 'human') {
+      useWebhookStore.setState({
+        multipleHooks: userConfig?.webhookUser?.webhooks?.length > 1,
+      })
+    }
+  }, [userConfig])
+
+  return {
+    data:
+      category === 'human'
+        ? userConfig?.webhookUser || { webhooks: [], selected: '' }
+        : filtererData || [],
+    loading,
+  }
+}
diff --git a/src/features/webhooks/hooks/useSyncData.js b/src/features/webhooks/hooks/useSyncData.js
new file mode 100644
index 000000000..d51f8d682
--- /dev/null
+++ b/src/features/webhooks/hooks/useSyncData.js
@@ -0,0 +1,30 @@
+// @ts-check
+import { useEffect } from 'react'
+import { useQuery } from '@apollo/client'
+
+import { ALL_PROFILES } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+/**
+ * @template {import('@store/useWebhookStore').WebhookStore['category']} T
+ * @param {T} category */
+export function useSyncData(category) {
+  const cached = useWebhookStore((s) => s[category])
+
+  const { data, loading } = useQuery(ALL_PROFILES, {
+    fetchPolicy: 'no-cache',
+    variables: {
+      category,
+      status: 'GET',
+    },
+  })
+
+  useEffect(() => {
+    if (data?.webhook?.[category]) {
+      useWebhookStore.setState({
+        [category]: data.webhook[category],
+      })
+    }
+  }, [data])
+  return { data: cached, loading }
+}
diff --git a/src/components/layout/dialogs/webhooks/human/Draggable.jsx b/src/features/webhooks/human/Draggable.jsx
similarity index 83%
rename from src/components/layout/dialogs/webhooks/human/Draggable.jsx
rename to src/features/webhooks/human/Draggable.jsx
index b9e706113..3542e13d9 100644
--- a/src/components/layout/dialogs/webhooks/human/Draggable.jsx
+++ b/src/features/webhooks/human/Draggable.jsx
@@ -1,19 +1,18 @@
 // @ts-check
 import * as React from 'react'
-import {
-  Grid,
-  Button,
-  Typography,
-  OutlinedInput,
-  InputAdornment,
-  FormControl,
-} from '@mui/material'
+import Button from '@mui/material/Button'
+import FormControl from '@mui/material/FormControl'
+import Grid from '@mui/material/Unstable_Grid2'
+import InputAdornment from '@mui/material/InputAdornment'
+import OutlinedInput from '@mui/material/OutlinedInput'
+import Typography from '@mui/material/Typography'
 import { Circle, Marker, Popup, useMap } from 'react-leaflet'
 import { useTranslation } from 'react-i18next'
-import fallbackIcon from '@components/markers/fallback'
-import { useWebhookStore } from '../store'
 
-export default function DraggableMarker() {
+import { fallbackMarker } from '@assets/fallbackMarker'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+export function WebhookMarker() {
   const map = useMap()
   const { t } = useTranslation()
 
@@ -62,7 +61,7 @@ export default function DraggableMarker() {
           if (ref) ref.openPopup()
         }}
         position={position}
-        icon={fallbackIcon}
+        icon={fallbackMarker}
       >
         <Popup minWidth={90} maxWidth={150}>
           <Grid
@@ -72,12 +71,12 @@ export default function DraggableMarker() {
             direction="column"
             spacing={2}
           >
-            <Grid item>
+            <Grid>
               <Typography variant="subtitle2" align="center">
                 {t('drag_and_drop')}
               </Typography>
             </Grid>
-            <Grid item style={{ textAlign: 'center' }}>
+            <Grid textAlign="center">
               <FormControl variant="outlined">
                 <OutlinedInput
                   value={radius}
@@ -92,7 +91,7 @@ export default function DraggableMarker() {
               </FormControl>
               <Typography variant="caption">{t('distance_radius')}</Typography>
             </Grid>
-            <Grid item>
+            <Grid>
               <Button
                 color="secondary"
                 variant="contained"
diff --git a/src/components/layout/dialogs/webhooks/human/Location.jsx b/src/features/webhooks/human/Location.jsx
similarity index 83%
rename from src/components/layout/dialogs/webhooks/human/Location.jsx
rename to src/features/webhooks/human/Location.jsx
index 1d86e0cdb..a31ed4a53 100644
--- a/src/components/layout/dialogs/webhooks/human/Location.jsx
+++ b/src/features/webhooks/human/Location.jsx
@@ -2,27 +2,25 @@
 import * as React from 'react'
 import LocationOn from '@mui/icons-material/LocationOn'
 import MyLocation from '@mui/icons-material/MyLocation'
-import {
-  Grid,
-  Button,
-  TextField,
-  Typography,
-  CircularProgress,
-  Autocomplete,
-  Box,
-} from '@mui/material'
+import Autocomplete from '@mui/material/Autocomplete'
+import Box from '@mui/material/Box'
+import Button from '@mui/material/Button'
+import CircularProgress from '@mui/material/CircularProgress'
+import Grid from '@mui/material/Unstable_Grid2'
+import TextField from '@mui/material/TextField'
+import Typography from '@mui/material/Typography'
 import { useLazyQuery, useMutation } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
 import { useMapEvents } from 'react-leaflet'
 
-import { setHuman } from '@services/queries/webhook'
+import { SET_HUMAN } from '@services/queries/webhook'
 import { WEBHOOK_NOMINATIM } from '@services/queries/geocoder'
-import useLocation from '@hooks/useLocation'
-import { Loading } from '@components/layout/general/Loading'
-import { basicEqualFn } from '@hooks/useMemory'
+import { useLocation } from '@hooks/useLocation'
+import { Loading } from '@components/Loading'
+import { basicEqualFn } from '@store/useMemory'
+import { setModeBtn, useWebhookStore } from '@store/useWebhookStore'
 
-import { setModeBtn, useWebhookStore } from '../store'
-import { useSyncData } from '../hooks'
+import { useSyncData } from '../hooks/useSyncData'
 
 const Location = () => {
   const { lc, color } = useLocation()
@@ -42,7 +40,7 @@ const Location = () => {
     },
   )
 
-  const [save] = useMutation(setHuman, { fetchPolicy: 'no-cache' })
+  const [save] = useMutation(SET_HUMAN, { fetchPolicy: 'no-cache' })
 
   /** @param {[number, number]} location */
   const handleLocationChange = (location) => {
@@ -103,23 +101,22 @@ const Location = () => {
   ) : (
     <Grid
       container
-      item
       xs={12}
       justifyContent="center"
       alignItems="center"
       spacing={2}
     >
-      <Grid item xs={6} sm={2}>
+      <Grid xs={6} sm={2}>
         <Typography variant="h6" pl={1}>
           {t('location')}
         </Typography>
       </Grid>
-      <Grid item xs={6} sm={4} style={{ textAlign: 'center' }}>
+      <Grid xs={6} sm={4} textAlign="center">
         <Typography variant="body2">
           {[latitude ?? 0, longitude ?? 0].map((x) => x.toFixed(6)).join(', ')}
         </Typography>
       </Grid>
-      <Grid item xs={6} sm={3} style={{ textAlign: 'center' }}>
+      <Grid xs={6} sm={3} textAlign="center">
         <Button
           size="small"
           variant="contained"
@@ -130,7 +127,7 @@ const Location = () => {
           {t('my_location')}
         </Button>
       </Grid>
-      <Grid item xs={6} sm={3} style={{ textAlign: 'center' }}>
+      <Grid xs={6} sm={3} textAlign="center">
         <Button
           size="small"
           variant="contained"
@@ -140,7 +137,7 @@ const Location = () => {
           {t('choose_on_map')}
         </Button>
       </Grid>
-      <Grid item xs={12}>
+      <Grid xs={12}>
         <Autocomplete
           style={{ width: '100%' }}
           getOptionLabel={(option) =>
@@ -197,6 +194,4 @@ const Location = () => {
   )
 }
 
-const LocationMemo = React.memo(Location, () => true)
-
-export default LocationMemo
+export const LocationMemo = React.memo(Location, () => true)
diff --git a/src/features/webhooks/human/area/AreaChip.jsx b/src/features/webhooks/human/area/AreaChip.jsx
new file mode 100644
index 000000000..bd44fe602
--- /dev/null
+++ b/src/features/webhooks/human/area/AreaChip.jsx
@@ -0,0 +1,36 @@
+// @ts-check
+import * as React from 'react'
+import Done from '@mui/icons-material/Done'
+import Clear from '@mui/icons-material/Clear'
+import Chip from '@mui/material/Chip'
+
+import { useWebhookStore, handleClick } from '@store/useWebhookStore'
+
+const ICON = {
+  true: <Done />,
+  false: <Clear />,
+}
+
+const AreaChip = ({ name }) => {
+  const selected = useWebhookStore((s) =>
+    s.human.area.includes(name.toLowerCase()),
+  )
+  return (
+    <Chip
+      label={name}
+      clickable
+      variant={selected ? 'filled' : 'outlined'}
+      deleteIcon={ICON[selected]}
+      size="small"
+      color={selected ? 'secondary' : 'primary'}
+      onClick={handleClick(name)}
+      onDelete={handleClick(name)}
+      style={{ margin: 3 }}
+    />
+  )
+}
+
+export const MemoAreaChip = React.memo(
+  AreaChip,
+  (prev, next) => prev.name === next.name,
+)
diff --git a/src/features/webhooks/human/area/AreaGroup.jsx b/src/features/webhooks/human/area/AreaGroup.jsx
new file mode 100644
index 000000000..05ffe0379
--- /dev/null
+++ b/src/features/webhooks/human/area/AreaGroup.jsx
@@ -0,0 +1,101 @@
+// @ts-check
+import * as React from 'react'
+import Grid2 from '@mui/material/Unstable_Grid2'
+import Divider from '@mui/material/Divider'
+import { useTranslation } from 'react-i18next'
+
+import { Loading } from '@components/Loading'
+import { BasicAccordion } from '@components/BasicAccordion'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { useGetAreas } from '../../hooks/useGetAreas'
+import { MemoAreaChip } from './AreaChip'
+
+export const AreaGroup = () => {
+  const { data, loading } = useGetAreas()
+  const { t } = useTranslation()
+
+  return loading ? (
+    <Loading>{t('loading', { category: t('areas') })}</Loading>
+  ) : (
+    data.map(({ group, children }, index) => (
+      <React.Fragment key={group}>
+        {index === 0 && (
+          <Divider
+            flexItem
+            style={{ margin: '20px 0', width: '100%', height: 2 }}
+          />
+        )}
+        <GroupTile key={group} group={group} areas={children}>
+          {children.map((child) => (
+            <MemoAreaChip key={`${group}_${child}`} name={child} />
+          ))}
+        </GroupTile>
+      </React.Fragment>
+    ))
+  )
+}
+
+/** @param {{ children: React.ReactNode[], group: string, areas: string[] }} props */
+const GroupTile = ({ children, group, areas }) => {
+  const count = useWebhookStore(
+    (s) => s.human.area?.filter((a) => areas.includes(a)).length,
+  )
+  if (children.length === 0) return null
+  return (
+    <Grid2 container xs={12}>
+      {group ? (
+        <BasicAccordion
+          title={`${group} - ${count} / ${areas.length}`}
+          stateKey={group}
+        >
+          {children}
+        </BasicAccordion>
+      ) : (
+        children
+      )}
+      {/* <Grid2 xs={group ? 4 : 12} textAlign="center">
+        <Typography variant="h4" gutterBottom>
+          {group}
+        </Typography>
+      </Grid2>
+
+      {group && (
+        <Grid2 xs={4} textAlign="center">
+          <AreaAction action="none" group={group} color="primary">
+            {t('disable_all')}
+          </AreaAction>
+        </Grid2>
+      )}
+
+      {group && (
+        <Grid2 xs={4} textAlign="center">
+          <AreaAction action="all" group={group} color="secondary">
+            {t('enable_all')}
+          </AreaAction>
+        </Grid2>
+      )} */}
+    </Grid2>
+  )
+}
+
+// /**
+//  *
+//  * @param {{
+//  *  action: string,
+//  *  children: React.ReactNode,
+//  *  color: import('@mui/material').ButtonProps['color']
+//  *  group?: string
+//  * }} props
+//  * @returns
+//  */
+// export const AreaAction = ({ action, children, color, group }) => (
+//   <Button
+//     size="small"
+//     variant="contained"
+//     color={color}
+//     onClick={handleClick(action, group)}
+//   >
+//     {children}
+//   </Button>
+// )
diff --git a/src/components/layout/dialogs/webhooks/human/area/AreaSelection.jsx b/src/features/webhooks/human/area/AreaSelection.jsx
similarity index 63%
rename from src/components/layout/dialogs/webhooks/human/area/AreaSelection.jsx
rename to src/features/webhooks/human/area/AreaSelection.jsx
index 12818d795..28dd32742 100644
--- a/src/components/layout/dialogs/webhooks/human/area/AreaSelection.jsx
+++ b/src/features/webhooks/human/area/AreaSelection.jsx
@@ -3,40 +3,35 @@ import * as React from 'react'
 import { useQuery } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
 
+import { ScanAreaTile } from '@features/scanArea'
 import { WEBHOOK_GEOJSON } from '@services/queries/webhook'
-import { Loading } from '@components/layout/general/Loading'
-import MemoScanArea from '@components/tiles/ScanArea'
-
-import { useWebhookStore } from '../../store'
+import { Loading } from '@components/Loading'
+import { useWebhookStore } from '@store/useWebhookStore'
 
 const FALLBACK = {
   type: 'FeatureCollection',
   features: [],
 }
-export default function WebhookAreaSelection() {
+export function WebhookAreaSelection() {
   const webhookMode = useWebhookStore((s) => s.mode)
-  const webhookName = useWebhookStore((s) => s.context.name)
 
   const { t } = useTranslation()
   const { data, loading, refetch } = useQuery(WEBHOOK_GEOJSON, {
     fetchPolicy: 'cache-first',
     skip: webhookMode !== 'areas',
-    variables: {
-      webhookName,
-    },
   })
 
   React.useEffect(() => {
     if (webhookMode === 'areas') {
       refetch()
     }
-  }, [webhookName, webhookMode])
+  }, [webhookMode])
 
   if (loading) {
     return <Loading>{t('loading', { category: t('areas') })}</Loading>
   }
   if (webhookMode === 'areas' && data?.webhookGeojson) {
-    return <MemoScanArea {...(data?.webhookGeojson || FALLBACK)} />
+    return <ScanAreaTile {...(data.webhookGeojson || FALLBACK)} />
   }
   return null
 }
diff --git a/src/features/webhooks/human/area/Selected.jsx b/src/features/webhooks/human/area/Selected.jsx
new file mode 100644
index 000000000..117cd3f1f
--- /dev/null
+++ b/src/features/webhooks/human/area/Selected.jsx
@@ -0,0 +1,16 @@
+// @ts-check
+import * as React from 'react'
+import Typography from '@mui/material/Typography'
+import { useTranslation } from 'react-i18next'
+
+import { useWebhookStore } from '@store/useWebhookStore'
+
+export const Selected = () => {
+  const { t } = useTranslation()
+  const selectedAreas = useWebhookStore((s) => s.human.area)
+  return (
+    <Typography variant="h6" align="center">
+      {t('selected_areas', { count: selectedAreas?.length || 0 })}
+    </Typography>
+  )
+}
diff --git a/src/components/layout/dialogs/webhooks/human/area/index.jsx b/src/features/webhooks/human/area/index.jsx
similarity index 59%
rename from src/components/layout/dialogs/webhooks/human/area/index.jsx
rename to src/features/webhooks/human/area/index.jsx
index 5cfc0d329..1c836b9ef 100644
--- a/src/components/layout/dialogs/webhooks/human/area/index.jsx
+++ b/src/features/webhooks/human/area/index.jsx
@@ -5,8 +5,9 @@ import Typography from '@mui/material/Typography'
 import Button from '@mui/material/Button'
 import Grid from '@mui/material/Unstable_Grid2'
 
-import { setModeBtn } from '../../store'
-import { AreaAction, AreaGroup } from './AreaGroup'
+import { setModeBtn } from '@store/useWebhookStore'
+
+import { AreaGroup } from './AreaGroup'
 import { Selected } from './Selected'
 
 const Areas = () => {
@@ -14,28 +15,15 @@ const Areas = () => {
 
   return (
     <Grid container xs={12} justifyContent="center" alignItems="center">
-      <Grid xs={6} sm={3} pb={{ xs: 2, sm: 0 }}>
+      <Grid xs={6} sm={3}>
         <Typography variant="h6" pl={1}>
           {t('areas')}
         </Typography>
       </Grid>
-      <Grid
-        xs={6}
-        sm={3}
-        textAlign="center"
-        display={{ xs: 'block', sm: 'none' }}
-        pb={{ xs: 2, sm: 0 }}
-      >
-        <Button
-          size="small"
-          variant="contained"
-          color="primary"
-          onClick={setModeBtn('areas')}
-        >
-          {t('choose_on_map')}
-        </Button>
+      <Grid xs={6} display={{ xs: 'none', sm: 'block' }}>
+        <Selected />
       </Grid>
-      <Grid xs={6} sm={3} textAlign="center">
+      {/* <Grid xs={6} sm={3} textAlign="center">
         <AreaAction color="primary" action="none">
           {t('disable_all')}
         </AreaAction>
@@ -44,13 +32,8 @@ const Areas = () => {
         <AreaAction color="secondary" action="all">
           {t('enable_all')}
         </AreaAction>
-      </Grid>
-      <Grid
-        xs={6}
-        sm={3}
-        textAlign="center"
-        display={{ xs: 'none', sm: 'block' }}
-      >
+      </Grid> */}
+      <Grid xs={6} sm={3} textAlign="center">
         <Button
           size="small"
           variant="contained"
@@ -60,13 +43,12 @@ const Areas = () => {
           {t('choose_on_map')}
         </Button>
       </Grid>
-      <AreaGroup />
-      <Grid container xs={12} alignItems="center" justifyContent="center" />
-      <Grid xs={12}>
+      <Grid xs={12} display={{ xs: 'block', sm: 'none' }} pt={2}>
         <Selected />
       </Grid>
+      <AreaGroup />
     </Grid>
   )
 }
 
-export default React.memo(Areas, () => true)
+export const HumanArea = React.memo(Areas, () => true)
diff --git a/src/components/layout/dialogs/webhooks/human/index.jsx b/src/features/webhooks/human/index.jsx
similarity index 60%
rename from src/components/layout/dialogs/webhooks/human/index.jsx
rename to src/features/webhooks/human/index.jsx
index 7f4a9a43a..0e7297621 100644
--- a/src/components/layout/dialogs/webhooks/human/index.jsx
+++ b/src/features/webhooks/human/index.jsx
@@ -3,23 +3,21 @@ import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import Divider from '@mui/material/Divider'
 
-import Location from './Location'
-import Areas from './area'
-import Status from './status'
+import { LocationMemo } from './Location'
+import { HumanArea } from './area'
+import { Status } from './status'
 
-const Human = () => (
+const BaseHuman = () => (
   <Grid container justifyContent="flex-start" alignItems="center" spacing={2}>
     <Status />
-    <Location />
+    <LocationMemo />
     <Divider
       light
       flexItem
       sx={{ height: 5, width: '100%', margin: '15px 0px' }}
     />
-    <Areas />
+    <HumanArea />
   </Grid>
 )
 
-const HumanMemo = React.memo(Human, () => true)
-
-export default HumanMemo
+export const Human = React.memo(BaseHuman, () => true)
diff --git a/src/components/layout/dialogs/webhooks/human/profile/ActiveHourChip.jsx b/src/features/webhooks/human/profile/ActiveHourChip.jsx
similarity index 79%
rename from src/components/layout/dialogs/webhooks/human/profile/ActiveHourChip.jsx
rename to src/features/webhooks/human/profile/ActiveHourChip.jsx
index 3a32c0227..2913aed0b 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/ActiveHourChip.jsx
+++ b/src/features/webhooks/human/profile/ActiveHourChip.jsx
@@ -5,9 +5,11 @@ import Chip from '@mui/material/Chip'
 import { styled } from '@mui/material/styles'
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import { allProfiles, setProfile } from '@services/queries/webhook'
 
-import { useWebhookStore } from '../../store'
+import { ALL_PROFILES, SET_PROFILE } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { handleUpdate } from './handleUpdate'
 
 const StyledChip = styled(Chip)(({ theme }) => ({
   margin: theme.spacing(0.5),
@@ -23,8 +25,8 @@ StyledChip.defaultProps = /** @type {const} */ ({
 /** @param {import("@rm/types").PoracleActiveHours & { uid: number }} props */
 export const ActiveHourChip = ({ day, hours, mins, uid, id }) => {
   const { t } = useTranslation()
-  const [save] = useMutation(setProfile, {
-    refetchQueries: [allProfiles],
+  const [save] = useMutation(SET_PROFILE, {
+    refetchQueries: [ALL_PROFILES],
   })
 
   const handleRemoveSchedule = React.useCallback(() => {
@@ -32,7 +34,7 @@ export const ActiveHourChip = ({ day, hours, mins, uid, id }) => {
       .getState()
       .profile.find((p) => p.uid === uid)
     if (!profile) return
-
+    useWebhookStore.setState({ profileLoading: profile.uid })
     save({
       variables: {
         category: 'profiles-update',
@@ -44,7 +46,7 @@ export const ActiveHourChip = ({ day, hours, mins, uid, id }) => {
         },
         status: 'POST',
       },
-    })
+    }).then(handleUpdate)
   }, [id, uid])
 
   return (
diff --git a/src/components/layout/dialogs/webhooks/human/profile/CopyView.jsx b/src/features/webhooks/human/profile/CopyView.jsx
similarity index 86%
rename from src/components/layout/dialogs/webhooks/human/profile/CopyView.jsx
rename to src/features/webhooks/human/profile/CopyView.jsx
index b403476ce..880274535 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/CopyView.jsx
+++ b/src/features/webhooks/human/profile/CopyView.jsx
@@ -7,17 +7,18 @@ import Typography from '@mui/material/Typography'
 import IconButton from '@mui/material/IconButton'
 import Select from '@mui/material/Select'
 import MenuItem from '@mui/material/MenuItem'
-
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import { allProfiles, setProfile } from '@services/queries/webhook'
 
-import { useWebhookStore } from '../../store'
+import { ALL_PROFILES, SET_PROFILE } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { handleUpdate } from './handleUpdate'
 
 /** @param {import('./ProfileTile').Props} props */
 export const CopyView = ({ uid, handleViewChange }) => {
-  const [save] = useMutation(setProfile, {
-    refetchQueries: [allProfiles],
+  const [save] = useMutation(SET_PROFILE, {
+    refetchQueries: [ALL_PROFILES],
   })
   const { t } = useTranslation()
 
@@ -28,6 +29,7 @@ export const CopyView = ({ uid, handleViewChange }) => {
 
   const handleCopyProfile = () => {
     if (copyTo !== 0) {
+      useWebhookStore.setState({ profileLoading: profile.uid })
       handleViewChange('profile')()
       save({
         variables: {
@@ -38,7 +40,7 @@ export const CopyView = ({ uid, handleViewChange }) => {
           },
           status: 'POST',
         },
-      })
+      }).then(handleUpdate)
     }
   }
 
diff --git a/src/components/layout/dialogs/webhooks/human/profile/DeleteVIew.jsx b/src/features/webhooks/human/profile/DeleteVIew.jsx
similarity index 72%
rename from src/components/layout/dialogs/webhooks/human/profile/DeleteVIew.jsx
rename to src/features/webhooks/human/profile/DeleteVIew.jsx
index 9e01a6880..00d77a9e1 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/DeleteVIew.jsx
+++ b/src/features/webhooks/human/profile/DeleteVIew.jsx
@@ -2,20 +2,22 @@
 import * as React from 'react'
 import Clear from '@mui/icons-material/Clear'
 import Save from '@mui/icons-material/Save'
-import { Typography, IconButton } from '@mui/material'
+import Typography from '@mui/material/Typography'
+import IconButton from '@mui/material/IconButton'
 import Grid from '@mui/material/Unstable_Grid2'
-
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import { allProfiles, setProfile } from '@services/queries/webhook'
 
-import { useWebhookStore } from '../../store'
+import { ALL_PROFILES, SET_PROFILE } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { handleUpdate } from './handleUpdate'
 
 /** @param {import('./ProfileTile').Props} props */
 export const DeleteView = ({ handleViewChange, uid }) => {
   const { t } = useTranslation()
-  const [save] = useMutation(setProfile, {
-    refetchQueries: [allProfiles],
+  const [save] = useMutation(SET_PROFILE, {
+    refetchQueries: [ALL_PROFILES],
   })
 
   const profileNo = useWebhookStore(
@@ -23,13 +25,14 @@ export const DeleteView = ({ handleViewChange, uid }) => {
   )
 
   const handleRemove = () => {
+    useWebhookStore.setState({ profileLoading: uid })
     save({
       variables: {
         category: 'profiles-byProfileNo',
         data: profileNo,
         status: 'DELETE',
       },
-    })
+    }).then(handleUpdate)
   }
 
   return (
diff --git a/src/components/layout/dialogs/webhooks/human/profile/EditView.jsx b/src/features/webhooks/human/profile/EditView.jsx
similarity index 87%
rename from src/components/layout/dialogs/webhooks/human/profile/EditView.jsx
rename to src/features/webhooks/human/profile/EditView.jsx
index 1961ebd45..94a76b7fa 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/EditView.jsx
+++ b/src/features/webhooks/human/profile/EditView.jsx
@@ -7,18 +7,19 @@ import Select from '@mui/material/Select'
 import MenuItem from '@mui/material/MenuItem'
 import IconButton from '@mui/material/IconButton'
 import OutlinedInput from '@mui/material/OutlinedInput'
-
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import { allProfiles, setProfile } from '@services/queries/webhook'
 
-import { useWebhookStore } from '../../store'
+import { ALL_PROFILES, SET_PROFILE } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { handleUpdate } from './handleUpdate'
 
 /** @param {import('./ProfileTile').Props} props */
 export const EditView = ({ handleViewChange, uid }) => {
   const { t } = useTranslation()
-  const [save] = useMutation(setProfile, {
-    refetchQueries: [allProfiles],
+  const [save] = useMutation(SET_PROFILE, {
+    refetchQueries: [ALL_PROFILES],
   })
 
   const [newActiveHours, setNewActiveHours] = React.useState({
@@ -45,15 +46,16 @@ export const EditView = ({ handleViewChange, uid }) => {
         { ...newActiveHours, id: `${uid}_${active.active_hours.length}` },
       ],
     }
+    useWebhookStore.setState({ profileLoading: uid })
     save({
       variables: {
         category: 'profiles-update',
         data: editedProfile,
         status: 'POST',
       },
-    })
+    }).then(handleUpdate)
     handleViewChange('profile')()
-  }, [newActiveHours])
+  }, [newActiveHours, uid])
 
   return (
     <>
diff --git a/src/components/layout/dialogs/webhooks/human/profile/NewProfile.jsx b/src/features/webhooks/human/profile/NewProfile.jsx
similarity index 76%
rename from src/components/layout/dialogs/webhooks/human/profile/NewProfile.jsx
rename to src/features/webhooks/human/profile/NewProfile.jsx
index a434f4fa3..196be7fb6 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/NewProfile.jsx
+++ b/src/features/webhooks/human/profile/NewProfile.jsx
@@ -3,19 +3,17 @@ import * as React from 'react'
 import Typography from '@mui/material/Typography'
 import Button from '@mui/material/Button'
 import TextField from '@mui/material/TextField'
-
 import Grid from '@mui/material/Unstable_Grid2'
-
 import { useTranslation } from 'react-i18next'
 import { useMutation } from '@apollo/client'
-import { allProfiles, setProfile } from '@services/queries/webhook'
 
-import { useWebhookStore } from '../../store'
+import { ALL_PROFILES, SET_PROFILE } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
 
 export const NewProfile = () => {
   const { t } = useTranslation()
-  const [save] = useMutation(setProfile, {
-    refetchQueries: [allProfiles],
+  const [save] = useMutation(SET_PROFILE, {
+    refetchQueries: [ALL_PROFILES],
   })
 
   const existing = useWebhookStore((s) => s.profile || []).map((x) => x.name)
@@ -34,6 +32,15 @@ export const NewProfile = () => {
     })
   }, [newProfile, save])
 
+  /** @type {React.FormEventHandler<HTMLFormElement>} */
+  const handleSubmit = React.useCallback(
+    (event) => {
+      event.preventDefault()
+      handleAddProfile()
+    },
+    [handleAddProfile],
+  )
+
   const handleChange = React.useCallback(
     (
       /** @type {React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>} */ event,
@@ -43,11 +50,10 @@ export const NewProfile = () => {
     [setNewProfile],
   )
 
-  const invalid =
-    existing.includes(newProfile) || newProfile === 'all' || !newProfile
+  const invalid = existing.includes(newProfile) || newProfile === 'all'
 
   return (
-    <Grid container xs={12}>
+    <Grid container xs={12} component="form" onSubmit={handleSubmit}>
       <Grid xs={12} sm={4}>
         <Typography variant="h6" align="center" pb={{ xs: 2, sm: 0 }}>
           {t('add_new_profile')}
@@ -70,7 +76,7 @@ export const NewProfile = () => {
           variant="contained"
           color="primary"
           onClick={handleAddProfile}
-          disabled={invalid}
+          disabled={invalid || !newProfile}
         >
           {t('save')}
         </Button>
diff --git a/src/components/layout/dialogs/webhooks/human/profile/ProfileTile.jsx b/src/features/webhooks/human/profile/ProfileTile.jsx
similarity index 84%
rename from src/components/layout/dialogs/webhooks/human/profile/ProfileTile.jsx
rename to src/features/webhooks/human/profile/ProfileTile.jsx
index 17e029ba7..57d3f5190 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/ProfileTile.jsx
+++ b/src/features/webhooks/human/profile/ProfileTile.jsx
@@ -2,7 +2,11 @@
 import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import Divider from '@mui/material/Divider'
+import CircularProgress from '@mui/material/CircularProgress'
 import { styled } from '@mui/material/styles'
+
+import { useWebhookStore } from '@store/useWebhookStore'
+
 import { ProfileView } from './ProfileView'
 import { EditView } from './EditView'
 import { DeleteView } from './DeleteVIew'
@@ -22,6 +26,7 @@ const StyledDivider = styled(Divider)(({ theme }) => ({
 /** @param {Pick<Props, 'uid'>} props */
 export const ProfileTile = ({ uid }) => {
   const [view, setView] = React.useState(/** @type {View} */ ('profile'))
+  const isLoading = useWebhookStore((s) => s.profileLoading === uid)
 
   const handleViewChange = React.useCallback(
     (/** @type {View} */ newView) => () => setView(newView),
@@ -30,7 +35,9 @@ export const ProfileTile = ({ uid }) => {
   return (
     <Grid container xs={12} justifyContent="center" alignItems="center">
       <StyledDivider flexItem />
-      {
+      {isLoading ? (
+        <CircularProgress />
+      ) : (
         {
           profile: (
             <ProfileView uid={uid} handleViewChange={handleViewChange} />
@@ -39,7 +46,7 @@ export const ProfileTile = ({ uid }) => {
           delete: <DeleteView uid={uid} handleViewChange={handleViewChange} />,
           copy: <CopyView uid={uid} handleViewChange={handleViewChange} />,
         }[view]
-      }
+      )}
     </Grid>
   )
 }
diff --git a/src/components/layout/dialogs/webhooks/human/profile/ProfileView.jsx b/src/features/webhooks/human/profile/ProfileView.jsx
similarity index 95%
rename from src/components/layout/dialogs/webhooks/human/profile/ProfileView.jsx
rename to src/features/webhooks/human/profile/ProfileView.jsx
index a95645c41..90bc74681 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/ProfileView.jsx
+++ b/src/features/webhooks/human/profile/ProfileView.jsx
@@ -7,9 +7,9 @@ import Grid from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
 import IconButton from '@mui/material/IconButton'
 
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
+import { useWebhookStore } from '@store/useWebhookStore'
 
-import { useWebhookStore } from '../../store'
 import { ActiveHourChip } from './ActiveHourChip'
 
 /** @param {import('./ProfileTile').Props} props */
diff --git a/src/features/webhooks/human/profile/handleUpdate.js b/src/features/webhooks/human/profile/handleUpdate.js
new file mode 100644
index 000000000..9f6076aa2
--- /dev/null
+++ b/src/features/webhooks/human/profile/handleUpdate.js
@@ -0,0 +1,12 @@
+// @ts-check
+import { useWebhookStore } from '@store/useWebhookStore'
+
+/**
+ * @param {{ data: { webhook: { profile: import("@rm/types").PoracleProfile[]} } }} params
+ */
+export function handleUpdate({ data }) {
+  useWebhookStore.setState({
+    profileLoading: null,
+    profile: data.webhook.profile,
+  })
+}
diff --git a/src/components/layout/dialogs/webhooks/human/profile/index.jsx b/src/features/webhooks/human/profile/index.jsx
similarity index 83%
rename from src/components/layout/dialogs/webhooks/human/profile/index.jsx
rename to src/features/webhooks/human/profile/index.jsx
index c845c8b69..f2b2448f4 100644
--- a/src/components/layout/dialogs/webhooks/human/profile/index.jsx
+++ b/src/features/webhooks/human/profile/index.jsx
@@ -3,9 +3,9 @@ import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
 
-import { Loading } from '@components/layout/general/Loading'
+import { Loading } from '@components/Loading'
 
-import { useGetWebhookData } from '../../hooks'
+import { useGetWebhookData } from '../../hooks/useGetWebhookData'
 import { MemoNewProfile } from './NewProfile'
 import { ProfileTile } from './ProfileTile'
 
@@ -14,7 +14,7 @@ import { ProfileTile } from './ProfileTile'
  * @typedef {{ uid: number, handleViewChange: (newView: View) => () => void}} Props
  */
 
-export default function ProfileEditing() {
+export function ProfileEditing() {
   const { data, loading } = useGetWebhookData('profile')
   const { t } = useTranslation()
 
diff --git a/src/components/layout/dialogs/webhooks/human/status/EnableSwitch.jsx b/src/features/webhooks/human/status/EnableSwitch.jsx
similarity index 67%
rename from src/components/layout/dialogs/webhooks/human/status/EnableSwitch.jsx
rename to src/features/webhooks/human/status/EnableSwitch.jsx
index 2c75fe9af..765aeb39d 100644
--- a/src/components/layout/dialogs/webhooks/human/status/EnableSwitch.jsx
+++ b/src/features/webhooks/human/status/EnableSwitch.jsx
@@ -1,28 +1,29 @@
+// @ts-check
 import * as React from 'react'
 import Switch from '@mui/material/Switch'
 import FormControlLabel from '@mui/material/FormControlLabel'
 import { useMutation } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
 
-import { setHuman } from '@services/queries/webhook'
-import { useWebhookStore } from '../../store'
+import { SET_HUMAN } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
 
 export function EnableSwitch() {
   const { t } = useTranslation()
 
-  const human = useWebhookStore((s) => s.human)
-  const [save] = useMutation(setHuman, { fetchPolicy: 'no-cache' })
+  const enabled = useWebhookStore((s) => !!s.human.enabled)
+  const [save] = useMutation(SET_HUMAN, { fetchPolicy: 'no-cache' })
 
   return (
     <FormControlLabel
       control={
         <Switch
           color="secondary"
-          checked={!!human.enabled}
+          checked={enabled}
           onChange={() => {
             save({
               variables: {
-                category: human.enabled ? 'stop' : 'start',
+                category: enabled ? 'stop' : 'start',
                 status: 'POST',
               },
             }).then(({ data }) =>
diff --git a/src/features/webhooks/human/status/HookSelection.jsx b/src/features/webhooks/human/status/HookSelection.jsx
new file mode 100644
index 000000000..322489d78
--- /dev/null
+++ b/src/features/webhooks/human/status/HookSelection.jsx
@@ -0,0 +1,65 @@
+// @ts-check
+import * as React from 'react'
+import MenuItem from '@mui/material/MenuItem'
+import CircularProgress from '@mui/material/CircularProgress'
+import { useTranslation } from 'react-i18next'
+import { useMutation } from '@apollo/client'
+
+import {
+  WEBHOOK_AREAS,
+  WEBHOOK_CATEGORIES,
+  WEBHOOK_CHANGE,
+  WEBHOOK_CONTEXT,
+  WEBHOOK_USER,
+  ALL_PROFILES,
+} from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+import { FCSelect } from '@components/inputs/FCSelect'
+
+import { useGetWebhookData } from '../../hooks/useGetWebhookData'
+
+export function HookSelection() {
+  const { t } = useTranslation()
+
+  const {
+    data: { selected, webhooks },
+    loading,
+  } = useGetWebhookData('human')
+  const multipleHooks = useWebhookStore((s) => s.multipleHooks)
+
+  const [save] = useMutation(WEBHOOK_CHANGE, {
+    refetchQueries: [
+      WEBHOOK_CONTEXT,
+      WEBHOOK_USER,
+      WEBHOOK_CATEGORIES,
+      WEBHOOK_AREAS,
+      ALL_PROFILES,
+    ],
+    fetchPolicy: 'no-cache',
+  })
+
+  if (!multipleHooks) return null
+
+  return loading ? (
+    <CircularProgress />
+  ) : (
+    <FCSelect
+      label={t('select_webhook')}
+      value={selected}
+      onChange={(e) => {
+        save({ variables: { webhook: e.target.value } }).then(
+          ({ data }) =>
+            data?.webhook?.human &&
+            useWebhookStore.setState({ human: data.webhook.human }),
+        )
+      }}
+      fcSx={{ m: 1, width: '90%' }}
+    >
+      {webhooks.map((webhook) => (
+        <MenuItem key={webhook} value={webhook}>
+          {webhook}
+        </MenuItem>
+      ))}
+    </FCSelect>
+  )
+}
diff --git a/src/components/layout/dialogs/webhooks/human/status/ProfileSelect.jsx b/src/features/webhooks/human/status/ProfileSelect.jsx
similarity index 59%
rename from src/components/layout/dialogs/webhooks/human/status/ProfileSelect.jsx
rename to src/features/webhooks/human/status/ProfileSelect.jsx
index 3d498bf9d..56e088545 100644
--- a/src/components/layout/dialogs/webhooks/human/status/ProfileSelect.jsx
+++ b/src/features/webhooks/human/status/ProfileSelect.jsx
@@ -1,16 +1,13 @@
 // @ts-check
 import * as React from 'react'
-import Select from '@mui/material/Select'
 import MenuItem from '@mui/material/MenuItem'
 import CircularProgress from '@mui/material/CircularProgress'
-import InputLabel from '@mui/material/InputLabel'
-import FormControl from '@mui/material/FormControl'
 import { useMutation, useQuery } from '@apollo/client'
 import { useTranslation } from 'react-i18next'
 
-import { allProfiles, setHuman } from '@services/queries/webhook'
-
-import { useWebhookStore } from '../../store'
+import { ALL_PROFILES, SET_HUMAN } from '@services/queries/webhook'
+import { useWebhookStore } from '@store/useWebhookStore'
+import { FCSelect } from '@components/inputs/FCSelect'
 
 /** @type {React.CSSProperties} */
 const STYLE = { minWidth: 100 }
@@ -29,7 +26,7 @@ export function ProfileSelect() {
     data: profiles,
     previousData,
     loading,
-  } = useQuery(allProfiles, {
+  } = useQuery(ALL_PROFILES, {
     fetchPolicy: 'no-cache',
     variables: {
       category: 'profiles',
@@ -37,8 +34,9 @@ export function ProfileSelect() {
     },
   })
 
-  const [save] = useMutation(setHuman)
+  const [save] = useMutation(SET_HUMAN)
 
+  /** @type {import('@mui/material').SelectProps['onChange']} */
   const onChange = React.useCallback(
     (event) => {
       save({
@@ -59,22 +57,20 @@ export function ProfileSelect() {
   const safeProfiles = (profiles || previousData)?.webhook?.profile
 
   return (
-    <FormControl sx={{ m: 1 }}>
-      <InputLabel id="profile-select">{t('select_profile')}</InputLabel>
-      <Select
-        id="profile-select"
-        label={t('select_profile')}
-        value={safeProfiles ? currentProfile || '' : ''}
-        onChange={onChange}
-        style={STYLE}
-        endAdornment={loading ? <CircularProgress /> : null}
-      >
-        {(safeProfiles || []).map((profile) => (
-          <MenuItem key={profile.profile_no} value={profile.profile_no}>
-            {profile.name}
-          </MenuItem>
-        ))}
-      </Select>
-    </FormControl>
+    <FCSelect
+      id="profile-select"
+      label={t('select_profile')}
+      value={safeProfiles ? currentProfile || '' : ''}
+      onChange={onChange}
+      style={STYLE}
+      endAdornment={loading ? <CircularProgress /> : null}
+      fcSx={{ m: 1, width: '90%' }}
+    >
+      {(safeProfiles || []).map((profile) => (
+        <MenuItem key={profile.profile_no} value={profile.profile_no}>
+          {profile.name}
+        </MenuItem>
+      ))}
+    </FCSelect>
   )
 }
diff --git a/src/components/layout/dialogs/webhooks/human/status/index.jsx b/src/features/webhooks/human/status/index.jsx
similarity index 91%
rename from src/components/layout/dialogs/webhooks/human/status/index.jsx
rename to src/features/webhooks/human/status/index.jsx
index 05ec547cd..3127ada2b 100644
--- a/src/components/layout/dialogs/webhooks/human/status/index.jsx
+++ b/src/features/webhooks/human/status/index.jsx
@@ -2,12 +2,13 @@ import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import Divider from '@mui/material/Divider'
 
+import { useWebhookStore } from '@store/useWebhookStore'
+
 import { ProfileSelect } from './ProfileSelect'
 import { EnableSwitch } from './EnableSwitch'
 import { HookSelection } from './HookSelection'
-import { useWebhookStore } from '../../store'
 
-export default function Status() {
+export function Status() {
   const multipleHooks = useWebhookStore((s) => s.multipleHooks)
 
   const sm = multipleHooks ? 4 : 6
diff --git a/src/features/webhooks/index.js b/src/features/webhooks/index.js
new file mode 100644
index 000000000..2ea9a9468
--- /dev/null
+++ b/src/features/webhooks/index.js
@@ -0,0 +1,7 @@
+export * from './Webhook'
+export * from './hooks/useSyncData'
+export * from './human/Draggable'
+export * from './human/area/AreaSelection'
+export * from './Notification'
+export * from './WebhookAdv'
+export * from './services/Poracle'
diff --git a/src/services/Poracle.js b/src/features/webhooks/services/Poracle.js
similarity index 98%
rename from src/services/Poracle.js
rename to src/features/webhooks/services/Poracle.js
index 79c5e7af5..a8cb9cbaa 100644
--- a/src/services/Poracle.js
+++ b/src/features/webhooks/services/Poracle.js
@@ -1,8 +1,9 @@
 // @ts-check
 import { t } from 'i18next'
-import { useWebhookStore } from '@components/layout/dialogs/webhooks/store'
 
-export default class Poracle {
+import { useWebhookStore } from '@store/useWebhookStore'
+
+export class Poracle {
   static getMapCategory(poracleCategory) {
     switch (poracleCategory) {
       case 'gym':
@@ -302,7 +303,7 @@ export default class Poracle {
   /**
    *
    * @param {object} item
-   * @param {Exclude<import('@components/layout/dialogs/webhooks/store').WebhookStore['category'], 'human'>} category
+   * @param {Exclude<import('@store/useWebhookStore').WebhookStore['category'], 'human'>} category
    * @returns {string}
    */
   static generateDescription(item, category) {
diff --git a/src/components/layout/dialogs/webhooks/tiles/TrackedTile.jsx b/src/features/webhooks/tiles/TrackedTile.jsx
similarity index 89%
rename from src/components/layout/dialogs/webhooks/tiles/TrackedTile.jsx
rename to src/features/webhooks/tiles/TrackedTile.jsx
index f2119d45e..ac74a801a 100644
--- a/src/components/layout/dialogs/webhooks/tiles/TrackedTile.jsx
+++ b/src/features/webhooks/tiles/TrackedTile.jsx
@@ -7,15 +7,15 @@ import IconButton from '@mui/material/IconButton'
 import Checkbox from '@mui/material/Checkbox'
 import Box from '@mui/material/Box'
 
-import Utility from '@services/Utility'
-import Poracle from '@services/Poracle'
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
 import { apolloClient, apolloCache } from '@services/apollo'
 import * as webhookNodes from '@services/queries/webhook'
+import { getTileBackground } from '@utils/getTileBackground'
+import { useWebhookStore, setSelected } from '@store/useWebhookStore'
 
-import { useWebhookStore, setSelected } from '../store'
+import { Poracle } from '../services/Poracle'
 
-export default function TrackedTile({ index }) {
+export function TrackedTile({ index }) {
   const category = useWebhookStore((s) => s.category)
   const item = useWebhookStore((s) => s[category][index])
   const id = Poracle.getId(item)
@@ -38,7 +38,7 @@ export default function TrackedTile({ index }) {
     (newFilter, save) => {
       if (save) {
         apolloClient.mutate({
-          mutation: webhookNodes[category],
+          mutation: webhookNodes[category.toUpperCase()],
           variables: {
             data: Poracle.processor(category, [newFilter], defaults),
             status: 'POST',
@@ -56,7 +56,7 @@ export default function TrackedTile({ index }) {
     <Grid2
       container
       xs={12}
-      bgcolor={Utility.getTileBackground(1, index)}
+      bgcolor={getTileBackground(1, index)}
       justifyContent="center"
       alignItems="center"
       py={1}
@@ -100,7 +100,7 @@ export default function TrackedTile({ index }) {
               [category]: prev[category].filter((x) => x.uid !== item.uid),
             }))
             apolloClient.mutate({
-              mutation: webhookNodes.setProfile,
+              mutation: webhookNodes.SET_PROFILE,
               variables: {
                 category,
                 data: { uid: item.uid },
diff --git a/src/features/webhooks/tiles/WebhookItem.jsx b/src/features/webhooks/tiles/WebhookItem.jsx
new file mode 100644
index 000000000..c36b6342b
--- /dev/null
+++ b/src/features/webhooks/tiles/WebhookItem.jsx
@@ -0,0 +1,45 @@
+// @ts-check
+import * as React from 'react'
+
+import { SelectorItem } from '@components/virtual/SelectorItem'
+import { useWebhookStore } from '@store/useWebhookStore'
+
+import { Poracle } from '../services/Poracle'
+
+/** @param {import('@components/virtual/SelectorItem').BaseProps<import('@rm/types').AllButHuman>} props */
+export function WebhookItem({ id, category, ...props }) {
+  const filter = useWebhookStore((s) => s.tempFilters[id])
+
+  const setFilter = (newFilter) => {
+    useWebhookStore.setState((prev) => ({
+      tempFilters: {
+        ...prev.tempFilters,
+        [id]: newFilter
+          ? {
+              ...newFilter,
+              enabled: newFilter.enabled,
+            }
+          : { enabled: true, ...Poracle.getOtherData(id) },
+      },
+    }))
+  }
+  return (
+    <SelectorItem
+      {...props}
+      id={id}
+      filter={filter}
+      setFilter={setFilter}
+      onClick={() =>
+        useWebhookStore.setState({
+          advanced: {
+            id,
+            uid: 0,
+            open: true,
+            category,
+            selectedIds: [],
+          },
+        })
+      }
+    />
+  )
+}
diff --git a/src/hooks/useAnalytics.js b/src/hooks/useAnalytics.js
new file mode 100644
index 000000000..bf4fba907
--- /dev/null
+++ b/src/hooks/useAnalytics.js
@@ -0,0 +1,22 @@
+// @ts-check
+import { useEffect } from 'react'
+
+import { analytics } from '@utils/analytics'
+
+/**
+ *
+ * @param {string} category
+ * @param {string} action
+ * @param {string} label
+ * @param {boolean} nonInteraction
+ */
+export function useAnalytics(
+  category,
+  action = '',
+  label = '',
+  nonInteraction = false,
+) {
+  useEffect(() => {
+    analytics(category, action, label, nonInteraction)
+  }, [category, action, label, nonInteraction])
+}
diff --git a/src/hooks/useFilter.js b/src/hooks/useFilter.js
index 4db656481..ba1d8d6e6 100644
--- a/src/hooks/useFilter.js
+++ b/src/hooks/useFilter.js
@@ -1,7 +1,9 @@
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useGetDeepStore } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useGetDeepStore, useStorage } from '@store/useStorage'
+import { useEffect } from 'react'
+import { useWebhookStore } from '@store/useWebhookStore'
 
 const filteringPokemon = [
   'pokemon',
@@ -10,14 +12,12 @@ const filteringPokemon = [
   'quest_reward_12',
 ]
 
-export default function useFilter(
-  tempFilters,
-  menus,
-  category,
-  webhookCategory,
-  reqCategories,
-) {
+export function useFilter(category, webhookCategory, reqCategories) {
   const { t } = useTranslation()
+  const tempFilters = webhookCategory
+    ? useWebhookStore((s) => s.tempFilters)
+    : useStorage((s) => s.filters[category].filter)
+
   const search = useGetDeepStore(`searches.${category}Advanced`, '')
     .toLowerCase()
     .trim()
@@ -27,28 +27,27 @@ export default function useFilter(
     masterfile: { pokemon },
     menuFilters,
   } = useMemory.getState()
-
+  const menus = useStorage((s) => s.menus[category].filters)
   const {
-    filters: {
-      generations,
-      types,
-      rarity,
-      historicRarity,
-      forms,
-      others,
-      categories,
-    },
-  } = menus[category]
+    generations,
+    types,
+    rarity,
+    historicRarity,
+    forms,
+    others,
+    categories,
+  } = menus
+
   const tempAdvFilter = {}
   const filteredArr = []
   const searchTerms = []
   const count = { total: 0, show: 0 }
   let switchKey
 
-  Object.keys(menus[category].filters).forEach((subCategory) => {
-    tempAdvFilter[subCategory] = Object.values(
-      menus[category].filters[subCategory],
-    ).every((val) => val === false)
+  Object.keys(menus).forEach((subCategory) => {
+    tempAdvFilter[subCategory] = Object.values(menus[subCategory]).every(
+      (val) => val === false,
+    )
   })
 
   if (
@@ -250,5 +249,18 @@ export default function useFilter(
     })
   })
 
-  return { filteredArr, count }
+  useEffect(() => {
+    useMemory.setState((prev) => ({
+      advMenuCounts: {
+        ...prev.advMenuCounts,
+        [category]: count,
+      },
+      advMenuFiltered: {
+        ...prev.advMenuFiltered,
+        [category]: filteredArr,
+      },
+    }))
+  }, [count, filteredArr])
+
+  return filteredArr
 }
diff --git a/src/hooks/useForcePopup.js b/src/hooks/useForcePopup.js
index c499ecbb6..4a5ce0b36 100644
--- a/src/hooks/useForcePopup.js
+++ b/src/hooks/useForcePopup.js
@@ -1,6 +1,7 @@
 // @ts-check
 import { useEffect } from 'react'
-import { useMemory } from './useMemory'
+
+import { useMemory } from '@store/useMemory'
 
 const cleanup = () =>
   useMemory.setState({ manualParams: { category: '', id: '' } })
@@ -10,7 +11,7 @@ const cleanup = () =>
  * @param {string | number} id
  * @param {import('leaflet').Marker<any>} ref
  */
-export default function useForcePopup(id, ref) {
+export function useForcePopup(id, ref) {
   const manualParams = useMemory((s) => s.manualParams)
 
   useEffect(() => {
diff --git a/src/hooks/useGenerate.js b/src/hooks/useGenerate.js
deleted file mode 100644
index 7056ea26c..000000000
--- a/src/hooks/useGenerate.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useEffect } from 'react'
-
-import genPokemon from '@services/filtering/genPokemon'
-import genGyms from '@services/filtering/genGyms'
-import genPokestops from '@services/filtering/genPokestops'
-
-import { useMemory } from '@hooks/useMemory'
-
-export default function useGenerate() {
-  const pokemon = useMemory((s) => s.masterfile.pokemon)
-  const gyms = useMemory((s) => s.filters.gyms)
-  const pokestops = useMemory((s) => s.filters.pokestops)
-  const staticMenus = useMemory((s) => s.menus)
-
-  useEffect(() => {
-    const pokeFilters = genPokemon(pokemon, staticMenus.pokemon.categories)
-    const gymFilters = genGyms(gyms, staticMenus.gyms.categories)
-    const stopFilters = genPokestops(
-      pokemon,
-      pokestops,
-      staticMenus.pokestops.categories,
-    )
-
-    useMemory.setState({
-      menuFilters: { ...gymFilters, ...stopFilters, ...pokeFilters },
-    })
-  }, [pokemon, gyms, pokestops, staticMenus])
-}
diff --git a/src/hooks/useGetAvailable.js b/src/hooks/useGetAvailable.js
index be70d08f8..32bf0d987 100644
--- a/src/hooks/useGetAvailable.js
+++ b/src/hooks/useGetAvailable.js
@@ -1,23 +1,23 @@
 // @ts-check
 import { useEffect, useMemo } from 'react'
 import { useQuery } from '@apollo/client'
-import * as queries from '@services/queries/available'
-import { capitalize } from '@mui/material'
+import { capitalize } from '@mui/material/utils'
 
-import { useMemory } from './useMemory'
+import * as queries from '@services/queries/available'
+import { useMemory } from '@store/useMemory'
 
 /**
  * @param {keyof import('packages/types/lib').Available} category
  * @returns {{available: string[], loading: boolean, error: import('@apollo/client').ApolloError}}
  */
-export default function useGetAvailable(category) {
+export function useGetAvailable(category) {
   const capitalized = capitalize(category)
   const active = useMemory((s) => s.active)
   const online = useMemory((s) => s.online)
 
   /** @type {import('@apollo/client').QueryResult<{ [key: string]: string[] }>} */
   const { data, previousData, loading, error } = useQuery(
-    queries[`getAvailable${capitalized}`],
+    queries[`GET_AVAILABLE_${category.toUpperCase()}`],
     {
       fetchPolicy: active && online ? 'network-only' : 'cache-and-network',
     },
diff --git a/src/hooks/useLocation.js b/src/hooks/useLocation.js
index 44faeb493..d6d067f35 100644
--- a/src/hooks/useLocation.js
+++ b/src/hooks/useLocation.js
@@ -8,7 +8,7 @@ import 'leaflet.locatecontrol'
  * Use location hook
  * @returns {{ lc: any, color: import('@mui/material').ButtonProps['color'] }}
  */
-export default function useLocation() {
+export function useLocation() {
   const map = useMap()
   const [color, setColor] = useState(
     /** @type {import('@mui/material').ButtonProps['color']} */ ('inherit'),
diff --git a/src/hooks/useRefresh.js b/src/hooks/useMapData.js
similarity index 88%
rename from src/hooks/useRefresh.js
rename to src/hooks/useMapData.js
index 182f8abd5..d767e5dc6 100644
--- a/src/hooks/useRefresh.js
+++ b/src/hooks/useMapData.js
@@ -1,22 +1,21 @@
 // @ts-check
 import { useEffect } from 'react'
 import { useQuery } from '@apollo/client'
-import { getMapData } from '@services/queries/available'
 
-import { deepMerge } from '@services/functions/deepMerge'
-import UAssets from '@services/Icons'
+import { GET_MAP_DATA } from '@services/queries/available'
+import { deepMerge } from '@utils/deepMerge'
+import { UAssets } from '@services/Assets'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
-import { useMemory } from './useMemory'
-import { useStorage } from './useStorage'
-
-export default function useRefresh(once = false) {
+export function useMapData(once = false) {
   const active = useMemory((s) => s.active)
   const online = useMemory((s) => s.online)
 
   const hasIcons = useMemory((s) => !!s.Icons)
 
   const { data, loading, stopPolling, startPolling, refetch, error } = useQuery(
-    getMapData,
+    GET_MAP_DATA,
     {
       fetchPolicy: active && online ? 'network-only' : 'cache-only',
     },
@@ -36,7 +35,7 @@ export default function useRefresh(once = false) {
   }, [hasIcons, online])
 
   useEffect(() => {
-    if (error && 'statusCode' in error.networkError) {
+    if (error?.networkError && 'statusCode' in error.networkError) {
       stopPolling()
       if (error.networkError?.statusCode === 464) {
         useMemory.setState({ clientError: 'early_old_client' })
diff --git a/src/hooks/useMarkerTimer.js b/src/hooks/useMarkerTimer.js
index 9e0c8e08c..f179d429a 100644
--- a/src/hooks/useMarkerTimer.js
+++ b/src/hooks/useMarkerTimer.js
@@ -7,7 +7,7 @@ import { useEffect } from 'react'
  * @param {import('leaflet').Marker<any>} ref
  * @param {() => void} [callback]
  */
-export default function useMarkerTimer(itemExpire, ref, callback) {
+export function useMarkerTimer(itemExpire, ref, callback) {
   const ts = Math.floor(Date.now() / 1000)
   useEffect(() => {
     if (itemExpire > ts && itemExpire !== Infinity) {
diff --git a/src/hooks/useOpacity.js b/src/hooks/useOpacity.js
index f05f87dbe..4cd858260 100644
--- a/src/hooks/useOpacity.js
+++ b/src/hooks/useOpacity.js
@@ -1,6 +1,7 @@
 // @ts-check
 import { useCallback } from 'react'
-import { useStorage } from './useStorage'
+
+import { useStorage } from '@store/useStorage'
 
 /**
  * Returns dynamic opacity based on timestamp
@@ -9,7 +10,7 @@ import { useStorage } from './useStorage'
  * @param {T extends 'pokestops' ? 'invasion' : T extends 'gyms' ? 'raid' : never} [subCategory]
  * @returns
  */
-export default function useOpacity(category, subCategory) {
+export function useOpacity(category, subCategory) {
   const enabled = useStorage(
     (s) =>
       s.userSettings[category]?.[`${subCategory || category}Opacity`] ?? false,
diff --git a/src/index.jsx b/src/index.jsx
index e848e6d82..dd1e66c60 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -6,7 +6,8 @@ import ReactGA from 'react-ga4'
 // Sentry must be imported before app
 import '@services/Sentry'
 import '@services/i18n'
-import App from '@components/App'
+
+import { App } from './App'
 
 if (CONFIG.googleAnalyticsId) {
   ReactGA.initialize(CONFIG.googleAnalyticsId)
diff --git a/src/components/layout/auth/Blocked.jsx b/src/pages/Blocked.jsx
similarity index 93%
rename from src/components/layout/auth/Blocked.jsx
rename to src/pages/Blocked.jsx
index 548b26f1f..3d174e83d 100644
--- a/src/components/layout/auth/Blocked.jsx
+++ b/src/pages/Blocked.jsx
@@ -15,13 +15,12 @@ import ListItem from '@mui/material/ListItem'
 import ListItemIcon from '@mui/material/ListItemIcon'
 import ListItemText from '@mui/material/ListItemText'
 
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
+import { DiscordButton } from '@components/auth/Discord'
+import { ThemeToggle } from '@components/inputs/ThemeToggle'
+import { I } from '@components/I'
 
-import DiscordButton from './Discord'
-import ThemeToggle from '../general/ThemeToggle'
-import { I } from '../general/I'
-
-export default function Blocked() {
+export function BlockedPage() {
   const { t } = useTranslation()
   const { info } = useParams()
   const navigate = useNavigate()
diff --git a/src/components/Errors.jsx b/src/pages/Error.jsx
similarity index 85%
rename from src/components/Errors.jsx
rename to src/pages/Error.jsx
index 3d779ea0d..adb36cb28 100644
--- a/src/components/Errors.jsx
+++ b/src/pages/Error.jsx
@@ -1,12 +1,13 @@
 // @ts-check
 import * as React from 'react'
-import Grid from '@mui/material/Grid'
+import Grid from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
 import Button from '@mui/material/Button'
 import { useTranslation } from 'react-i18next'
+
 import { useHideElement } from '@hooks/useHideElement'
 
-export default function Errors() {
+export function ErrorPage() {
   const { t } = useTranslation()
   const error = window.location.href.split('/').pop()
   useHideElement()
@@ -19,17 +20,17 @@ export default function Errors() {
       alignItems="center"
       minHeight="100cqh"
     >
-      <Grid item>
+      <Grid>
         <Typography variant="h1" align="center">
           {error}
         </Typography>
       </Grid>
-      <Grid item>
+      <Grid>
         <Typography variant="h6" align="center">
           {t(`errors_${error}`)}
         </Typography>
       </Grid>
-      <Grid item style={{ paddingTop: 20 }}>
+      <Grid paddingTop={3}>
         <Button
           variant="contained"
           color="secondary"
diff --git a/src/components/Reset.jsx b/src/pages/Reset.jsx
similarity index 58%
rename from src/components/Reset.jsx
rename to src/pages/Reset.jsx
index a67888b32..a4b4c3db1 100644
--- a/src/components/Reset.jsx
+++ b/src/pages/Reset.jsx
@@ -2,9 +2,9 @@
 import * as React from 'react'
 import { Navigate } from 'react-router-dom'
 
-import { hardReset } from '@services/functions/resetState'
+import { hardReset } from '@utils/resetState'
 
-export default function ResetAll() {
+export function ResetPage() {
   hardReset()
   return <Navigate to="/" />
 }
diff --git a/src/features/data/components/Notification.jsx b/src/pages/data/components/Notification.jsx
similarity index 99%
rename from src/features/data/components/Notification.jsx
rename to src/pages/data/components/Notification.jsx
index ccd0c957a..d71b114c6 100644
--- a/src/features/data/components/Notification.jsx
+++ b/src/pages/data/components/Notification.jsx
@@ -1,6 +1,7 @@
 import * as React from 'react'
 import Snackbar from '@mui/material/Snackbar'
 import Alert from '@mui/material/Alert'
+
 import { useDataManagementStore } from '../hooks/store'
 
 const handleClose = (_, reason) => {
diff --git a/src/features/data/components/ResetFilters.jsx b/src/pages/data/components/ResetFilters.jsx
similarity index 86%
rename from src/features/data/components/ResetFilters.jsx
rename to src/pages/data/components/ResetFilters.jsx
index 69d3435ea..6d0422216 100644
--- a/src/features/data/components/ResetFilters.jsx
+++ b/src/pages/data/components/ResetFilters.jsx
@@ -2,9 +2,9 @@
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { resetFilter, resetFilters } from '@services/functions/resetState'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { resetFilter, resetFilters } from '@utils/resetState'
+import { camelToSnake } from '@utils/strings'
 
 import {
   ButtonWithNotification,
@@ -30,7 +30,7 @@ export function ResetFilters() {
             key={key}
             onClick={() => resetFilter(key)}
             color="warning.main"
-            label={t(`reset_${Utility.camelToSnake(key)}`)}
+            label={t(`reset_${camelToSnake(key)}`)}
             category="filter"
             isHovering={isHovering}
           />
diff --git a/src/features/data/components/ResetGeneral.jsx b/src/pages/data/components/ResetGeneral.jsx
similarity index 98%
rename from src/features/data/components/ResetGeneral.jsx
rename to src/pages/data/components/ResetGeneral.jsx
index e7492e682..c1fa58ba9 100644
--- a/src/features/data/components/ResetGeneral.jsx
+++ b/src/pages/data/components/ResetGeneral.jsx
@@ -11,7 +11,7 @@ import {
   resetSettings,
   resetUI,
   resetUserSettings,
-} from '@services/functions/resetState'
+} from '@utils/resetState'
 
 import {
   ButtonWithNotification,
diff --git a/src/features/data/components/Shared.jsx b/src/pages/data/components/Shared.jsx
similarity index 86%
rename from src/features/data/components/Shared.jsx
rename to src/pages/data/components/Shared.jsx
index 51bb41b21..a0b87d61e 100644
--- a/src/features/data/components/Shared.jsx
+++ b/src/pages/data/components/Shared.jsx
@@ -5,10 +5,9 @@ import Divider from '@mui/material/Divider'
 import List from '@mui/material/List'
 import ListSubheader from '@mui/material/ListSubheader'
 import { styled } from '@mui/material/styles'
-import CheckIcon from '@mui/icons-material/Check'
-import ClearIcon from '@mui/icons-material/Clear'
 
-import { BasicListButton } from '@components/layout/general/BasicListButton'
+import { BasicListButton } from '@components/inputs/BasicListButton'
+import { StatusIcon } from '@components/StatusIcon'
 
 import { setNotification, useDataManagementStore } from '../hooks/store'
 
@@ -77,11 +76,7 @@ export function ButtonWithNotification({
       sx={{ bgcolor: isHovering ? 'rgba(255, 255, 255, 0.08)' : 'inherit' }}
       {...props}
     >
-      {hasBeenReset ? (
-        <CheckIcon color="success" />
-      ) : (
-        <ClearIcon color="error" />
-      )}
+      <StatusIcon status={hasBeenReset} />
     </BasicListButton>
   )
 }
diff --git a/src/features/data/components/TopRow.jsx b/src/pages/data/components/TopRow.jsx
similarity index 96%
rename from src/features/data/components/TopRow.jsx
rename to src/pages/data/components/TopRow.jsx
index 23be3e261..c4d9646c1 100644
--- a/src/features/data/components/TopRow.jsx
+++ b/src/pages/data/components/TopRow.jsx
@@ -6,7 +6,7 @@ import Divider from '@mui/material/Divider'
 import Button from '@mui/material/Button'
 import { useTranslation } from 'react-i18next'
 
-import { hardReset } from '@services/functions/resetState'
+import { hardReset } from '@utils/resetState'
 
 import { BORDER_SX } from './Shared'
 import { setNotification, useDataManagementStore } from '../hooks/store'
diff --git a/src/features/data/hooks/store.js b/src/pages/data/hooks/store.js
similarity index 100%
rename from src/features/data/hooks/store.js
rename to src/pages/data/hooks/store.js
diff --git a/src/features/data/index.jsx b/src/pages/data/index.jsx
similarity index 90%
rename from src/features/data/index.jsx
rename to src/pages/data/index.jsx
index fe090f887..070b31b9d 100644
--- a/src/features/data/index.jsx
+++ b/src/pages/data/index.jsx
@@ -4,7 +4,7 @@ import Grid from '@mui/material/Unstable_Grid2'
 import Typography from '@mui/material/Typography'
 import { useTranslation } from 'react-i18next'
 
-import useRefresh from '@hooks/useRefresh'
+import { useMapData } from '@hooks/useMapData'
 
 import { TopRow } from './components/TopRow'
 import { ResetGeneral } from './components/ResetGeneral'
@@ -12,9 +12,9 @@ import { ResetFilters } from './components/ResetFilters'
 import { DataManagementNotification } from './components/Notification'
 import { restoreDefault } from './hooks/store'
 
-export default function DataManager() {
+export function DataManagerPage() {
   const { t } = useTranslation()
-  useRefresh(true)
+  useMapData(true)
 
   React.useEffect(() => {
     restoreDefault()
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
new file mode 100644
index 000000000..a425a21be
--- /dev/null
+++ b/src/pages/index.jsx
@@ -0,0 +1,67 @@
+// @ts-check
+import * as React from 'react'
+import { Route, Routes } from 'react-router-dom'
+
+import { Config } from '@components/Config'
+
+import { MapPage } from './map'
+import { LoginPage } from './login'
+import { BlockedPage } from './Blocked'
+import { ErrorPage } from './Error'
+import { DataManagerPage } from './data'
+import { ResetPage } from './Reset'
+import { LocalesPage } from './locales'
+
+const Playground = React.lazy(() =>
+  import('./playground').then(({ PlaygroundPage }) => ({
+    default: PlaygroundPage,
+  })),
+)
+
+const mapRoute = (
+  <Config>
+    <MapPage />
+  </Config>
+)
+const loginRoute = (
+  <Config>
+    <LoginPage />
+  </Config>
+)
+const dataRoute = (
+  <Config>
+    <DataManagerPage />
+  </Config>
+)
+const blockedRoute = (
+  <Config>
+    <BlockedPage />
+  </Config>
+)
+const playgroundRoute = (
+  <Config>
+    <Playground />
+  </Config>
+)
+const errorRoute = <ErrorPage />
+const resetRoute = <ResetPage />
+const localesPage = <LocalesPage />
+
+export function Pages() {
+  return (
+    <Routes>
+      <Route path="/" element={mapRoute} />
+      <Route path="reset" element={resetRoute} />
+      <Route path="login" element={loginRoute} />
+      <Route path="data-management" element={dataRoute} />
+      <Route path="locales" element={localesPage} />
+      <Route path="playground" element={playgroundRoute} />
+      <Route path="blocked/:info" element={blockedRoute} />
+      <Route path="@/:lat/:lon" element={mapRoute} />
+      <Route path="@/:lat/:lon/:zoom" element={mapRoute} />
+      <Route path="id/:category/:id" element={mapRoute} />
+      <Route path="id/:category/:id/:zoom" element={mapRoute} />
+      <Route path="*" element={errorRoute} />
+    </Routes>
+  )
+}
diff --git a/src/pages/locales/components/AllSwitch.jsx b/src/pages/locales/components/AllSwitch.jsx
new file mode 100644
index 000000000..677e6c357
--- /dev/null
+++ b/src/pages/locales/components/AllSwitch.jsx
@@ -0,0 +1,22 @@
+import * as React from 'react'
+import FormControlLabel from '@mui/material/FormControlLabel'
+import Switch from '@mui/material/Switch'
+import { useTranslation } from 'react-i18next'
+
+import { useLocalesStore } from '../hooks/store'
+
+export function AllSwitch() {
+  const { t } = useTranslation()
+  const all = useLocalesStore((s) => s.all)
+  return (
+    <FormControlLabel
+      control={
+        <Switch
+          checked={all}
+          onChange={(_, checked) => useLocalesStore.setState({ all: checked })}
+        />
+      }
+      label={t('all')}
+    />
+  )
+}
diff --git a/src/pages/locales/components/EditLocale.jsx b/src/pages/locales/components/EditLocale.jsx
new file mode 100644
index 000000000..5a2e4878f
--- /dev/null
+++ b/src/pages/locales/components/EditLocale.jsx
@@ -0,0 +1,37 @@
+// @ts-check
+import * as React from 'react'
+import TextField from '@mui/material/TextField'
+import { useTranslation } from 'react-i18next'
+
+import { useLocalesStore } from '../hooks/store'
+
+/** @param {{ name: string } & import('@mui/material').TextFieldProps} props */
+export function EditLocale({ name, type, ...props }) {
+  const { t } = useTranslation()
+  const value = useLocalesStore((s) => s.custom[name] || '')
+  /** @type {import('@mui/material').TextFieldProps['onChange']} */
+  const onChange = React.useCallback(
+    (event) => {
+      useLocalesStore.setState((prev) => ({
+        custom: {
+          ...prev.custom,
+          [name]:
+            type === 'number' ? +event.target.value || 0 : event.target.value,
+        },
+      }))
+    },
+    [name],
+  )
+  return (
+    <TextField
+      fullWidth
+      type={type}
+      value={value}
+      onChange={onChange}
+      multiline={type === 'text'}
+      size="small"
+      placeholder={t('enter_translation')}
+      {...props}
+    />
+  )
+}
diff --git a/src/pages/locales/components/LocalesFooter.jsx b/src/pages/locales/components/LocalesFooter.jsx
new file mode 100644
index 000000000..f575519da
--- /dev/null
+++ b/src/pages/locales/components/LocalesFooter.jsx
@@ -0,0 +1,35 @@
+// @ts-check
+import * as React from 'react'
+import Grid from '@mui/material/Unstable_Grid2'
+import Button from '@mui/material/Button'
+import GitHubIcon from '@mui/icons-material/GitHub'
+import { useTranslation } from 'react-i18next'
+
+import { downloadLocales } from '../hooks/store'
+import { AllSwitch } from './AllSwitch'
+
+const github = <GitHubIcon />
+
+export function LocalesFooter() {
+  const { t } = useTranslation()
+  return (
+    <Grid component="footer" container justifyContent="space-evenly" py={1}>
+      <Grid xs={4} sm={2} className="flex-center">
+        <AllSwitch />
+      </Grid>
+      <Grid xs={4} sm={2} className="flex-center">
+        <Button onClick={downloadLocales}>{t('download')}</Button>
+      </Grid>
+      <Grid xs={4} sm={2} className="flex-center">
+        <Button
+          startIcon={github}
+          color="secondary"
+          href="https://github.com/WatWowMap/ReactMap"
+          target="_blank"
+        >
+          {t('contribute')}
+        </Button>
+      </Grid>
+    </Grid>
+  )
+}
diff --git a/src/pages/locales/components/LocalesHeader.jsx b/src/pages/locales/components/LocalesHeader.jsx
new file mode 100644
index 000000000..c0377a810
--- /dev/null
+++ b/src/pages/locales/components/LocalesHeader.jsx
@@ -0,0 +1,51 @@
+// @ts-check
+import * as React from 'react'
+import Grid from '@mui/material/Unstable_Grid2'
+import Typography from '@mui/material/Typography'
+import Collapse from '@mui/material/Collapse'
+import Button from '@mui/material/Button'
+import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
+import { useTranslation } from 'react-i18next'
+
+import { LocaleSelection } from '@components/inputs/LocaleSelection'
+
+import { useLocalesStore } from '../hooks/store'
+
+const expandMore = <ExpandMoreIcon />
+
+export function LocalesHeader() {
+  const { t, i18n } = useTranslation()
+  const instructions = useLocalesStore((s) => s.instructions)
+  return (
+    <Grid component="header" container className="flex-center" p={2}>
+      <Grid xs={4} sm={4}>
+        <Typography variant="h4">{t('locales')}</Typography>
+      </Grid>
+      <Grid xs={8} sm={4}>
+        <LocaleSelection />
+      </Grid>
+      <Grid xs={12} sm={4} textAlign="right">
+        <Button
+          color="secondary"
+          onClick={() =>
+            useLocalesStore.setState((prev) => ({
+              instructions: !prev.instructions,
+            }))
+          }
+          endIcon={expandMore}
+        >
+          {t('instructions')}
+        </Button>
+      </Grid>
+      <Grid component={Collapse} in={instructions} xs={12} sm={8}>
+        <ol>
+          {[1, 2, 3, 4, 5, 6, 7, 8].map((i) => (
+            <Typography key={i} component="li">
+              {t(`locale_instructions_${i}`, { lng: i18n.language })}
+            </Typography>
+          ))}
+        </ol>
+      </Grid>
+    </Grid>
+  )
+}
diff --git a/src/pages/locales/components/LocalesTable.jsx b/src/pages/locales/components/LocalesTable.jsx
new file mode 100644
index 000000000..a1e011ef5
--- /dev/null
+++ b/src/pages/locales/components/LocalesTable.jsx
@@ -0,0 +1,138 @@
+// @ts-check
+import * as React from 'react'
+import { useTranslation } from 'react-i18next'
+import { useQuery } from '@apollo/client'
+import TableCell from '@mui/material/TableCell'
+import TableRow from '@mui/material/TableRow'
+import Box from '@mui/material/Box'
+import ClearIcon from '@mui/icons-material/Clear'
+import useMediaQuery from '@mui/material/useMediaQuery'
+import Grid2 from '@mui/material/Unstable_Grid2'
+import Typography from '@mui/material/Typography'
+import Divider from '@mui/material/Divider'
+
+import { LOCALES_STATUS } from '@services/queries/config'
+import { VirtualTable } from '@components/virtual/Table'
+
+import { useLocalesStore } from '../hooks/store'
+import { EditLocale } from './EditLocale'
+
+/**
+ * @typedef {{
+ *  name: string,
+ *  english?: string,
+ *  ai?: string,
+ *  missing: boolean,
+ *  type: string
+ * }} Row
+ */
+const clear = <ClearIcon color="error" fontSize="small" />
+
+/** @type {import('react-virtuoso').TableVirtuosoProps['fixedHeaderContent']} */
+function fixedHeaderContent() {
+  const { t } = useTranslation()
+  // @ts-ignore
+  const isMobile = useMediaQuery((theme) => theme.breakpoints.down('sm'))
+  return isMobile ? null : (
+    <TableRow sx={{ bgcolor: 'background.paper' }}>
+      <TableCell>{t('key')}</TableCell>
+      <TableCell>{t('locale_selection_en')}</TableCell>
+      <TableCell>{t('ai')}</TableCell>
+      <TableCell width="40%">{t('human')}</TableCell>
+    </TableRow>
+  )
+}
+
+/** @type {import('react-virtuoso').TableVirtuosoProps<Row, { isMobile: boolean }>['itemContent']} */
+function itemContent(_index, row, ctx) {
+  return ctx?.isMobile ? (
+    <TableCell>
+      <Grid2 className="flex-center" container direction="column">
+        <Typography component={Grid2}>{row.name}</Typography>
+        <Divider flexItem sx={{ my: 2, width: '100%' }} />
+        <Typography component={Grid2} mb={2}>
+          {row.english}
+        </Typography>
+        <EditLocale
+          name={row.name}
+          type={typeof row.english === 'number' ? 'number' : 'text'}
+        />
+      </Grid2>
+    </TableCell>
+  ) : (
+    <>
+      <TableCell sx={{ overflow: 'hidden' }}>{row.name}</TableCell>
+      <TableCell>{row.english || clear}</TableCell>
+      <TableCell>{row.ai || clear}</TableCell>
+      <TableCell width="40%">
+        <EditLocale
+          name={row.name}
+          type={typeof row.english === 'number' ? 'number' : 'text'}
+        />
+      </TableCell>
+    </>
+  )
+}
+
+export function LocalesTable() {
+  const { i18n } = useTranslation()
+  const all = useLocalesStore((s) => s.all)
+  // @ts-ignore
+  const isMobile = useMediaQuery((theme) => theme.breakpoints.down('sm'))
+
+  const { data, loading } = useQuery(LOCALES_STATUS, {
+    fetchPolicy: 'network-only',
+    nextFetchPolicy: 'cache-only',
+    variables: { locale: i18n.language },
+  })
+
+  const { data: enData, loading: enLoading } = useQuery(LOCALES_STATUS, {
+    fetchPolicy: 'network-only',
+    nextFetchPolicy: 'cache-only',
+    variables: { locale: 'en' },
+  })
+
+  const stringSorter = new Intl.Collator(i18n.language, {
+    sensitivity: 'base',
+    ignorePunctuation: true,
+  })
+
+  /** @type {Row[]} */
+  const rows = React.useMemo(() => {
+    if (data?.locales && enData?.locales) {
+      const { missing, ai } = data.locales
+      /** @type {string[]} */
+      const source = all ? Object.keys(enData.locales.human) : missing
+      return source.toSorted(stringSorter.compare).map((key) => ({
+        name: key,
+        english: enData.locales.human[key],
+        ai: ai[key],
+        missing: !!missing[key],
+        type: typeof enData.locales.human[key],
+      }))
+    }
+    return []
+  }, [data, enData, all])
+
+  React.useEffect(() => {
+    if (Array.isArray(data?.locales?.missing)) {
+      useLocalesStore.setState({
+        custom: all
+          ? data?.locales.human
+          : Object.fromEntries(data.locales.missing.map((key) => [key, ''])),
+        existingHuman: data.locales.human || {},
+      })
+    }
+  }, [data, all])
+
+  return (
+    <Box component="main" flex={1} overflow="auto">
+      <VirtualTable
+        data={loading || enLoading ? [] : rows}
+        fixedHeaderContent={fixedHeaderContent}
+        itemContent={itemContent}
+        context={{ isMobile }}
+      />
+    </Box>
+  )
+}
diff --git a/src/pages/locales/hooks/store.js b/src/pages/locales/hooks/store.js
new file mode 100644
index 000000000..f3fd2ccdc
--- /dev/null
+++ b/src/pages/locales/hooks/store.js
@@ -0,0 +1,30 @@
+// @ts-check
+import { create } from 'zustand'
+
+import { downloadJson } from '@utils/downloadJson'
+
+/**
+ * @typedef {{
+ *  custom: Record<string, string | number>
+ *  existingHuman: Record<string, string | number>
+ *  all: boolean
+ *  instructions: boolean
+ * }} LocalesStore
+ * @type {import("zustand").UseBoundStore<import("zustand").StoreApi<LocalesStore>>}
+ */
+export const useLocalesStore = create(() => ({
+  custom: {},
+  existingHuman: {},
+  all: false,
+  instructions: false,
+  isScrolling: false,
+}))
+
+export const downloadLocales = () => {
+  const { custom, existingHuman } = useLocalesStore.getState()
+  const locale = localStorage.getItem('i18nextLng') || 'en'
+  const filtered = Object.fromEntries(
+    Object.entries(custom).filter(([, v]) => v !== ''),
+  )
+  return downloadJson({ ...existingHuman, ...filtered }, `${locale}.json`)
+}
diff --git a/src/pages/locales/index.jsx b/src/pages/locales/index.jsx
new file mode 100644
index 000000000..1e3921407
--- /dev/null
+++ b/src/pages/locales/index.jsx
@@ -0,0 +1,20 @@
+// @ts-check
+import * as React from 'react'
+import Box from '@mui/material/Box'
+
+import { useHideElement } from '@hooks/useHideElement'
+
+import { LocalesTable } from './components/LocalesTable'
+import { LocalesHeader } from './components/LocalesHeader'
+import { LocalesFooter } from './components/LocalesFooter'
+
+export function LocalesPage() {
+  useHideElement()
+  return (
+    <Box className="locales-layout">
+      <LocalesHeader />
+      <LocalesTable />
+      <LocalesFooter />
+    </Box>
+  )
+}
diff --git a/src/features/login/DefaultPage.jsx b/src/pages/login/DefaultPage.jsx
similarity index 90%
rename from src/features/login/DefaultPage.jsx
rename to src/pages/login/DefaultPage.jsx
index 0626655bc..ef24f8589 100644
--- a/src/features/login/DefaultPage.jsx
+++ b/src/pages/login/DefaultPage.jsx
@@ -6,10 +6,10 @@ import Grid from '@mui/material/Unstable_Grid2'
 import Divider from '@mui/material/Divider'
 import { styled } from '@mui/material/styles'
 
-import { useMemory } from '@hooks/useMemory'
-import LocaleSelection from '@components/layout/general/LocaleSelection'
+import { useMemory } from '@store/useMemory'
+import { LocaleSelection } from '@components/inputs/LocaleSelection'
 
-import methods from './Methods'
+import { methods } from './Methods'
 
 const StyledDivider = styled(Divider)(({ theme }) => ({
   margin: theme.spacing(3, 0),
diff --git a/src/features/login/Methods.jsx b/src/pages/login/Methods.jsx
similarity index 84%
rename from src/features/login/Methods.jsx
rename to src/pages/login/Methods.jsx
index dfe54a787..d2ecf117a 100644
--- a/src/features/login/Methods.jsx
+++ b/src/pages/login/Methods.jsx
@@ -3,10 +3,10 @@ import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
 
-import DiscordButton from '@components/layout/auth/Discord'
-import TelegramWidget from '@components/layout/auth/Telegram'
-import LocalLogin from '@components/layout/auth/Local'
-import { useMemory } from '@hooks/useMemory'
+import { DiscordButton } from '@components/auth/Discord'
+import { TelegramWidget } from '@components/auth/Telegram'
+import { LocalLogin } from '@components/auth/Local'
+import { useMemory } from '@store/useMemory'
 
 function Discord() {
   const { t } = useTranslation()
@@ -60,10 +60,8 @@ function Local() {
   )
 }
 
-const methods = {
+export const methods = {
   discord: <Discord />,
   telegram: <Telegram />,
   local: <Local />,
 }
-
-export default methods
diff --git a/src/features/login/index.jsx b/src/pages/login/index.jsx
similarity index 74%
rename from src/features/login/index.jsx
rename to src/pages/login/index.jsx
index be1cf1897..a7731fe31 100644
--- a/src/features/login/index.jsx
+++ b/src/pages/login/index.jsx
@@ -3,13 +3,13 @@ import * as React from 'react'
 import { Navigate } from 'react-router-dom'
 import Box from '@mui/material/Box'
 
-import { useMemory } from '@hooks/useMemory'
-import ThemeToggle from '@components/layout/general/ThemeToggle'
+import { useMemory } from '@store/useMemory'
+import { ThemeToggle } from '@components/inputs/ThemeToggle'
+import { CustomLoginPage } from '@features/builder'
 
-import { CustomLoginPage } from './CustomPage'
 import { DefaultLoginPage } from './DefaultPage'
 
-export default function LoginPage() {
+export function LoginPage() {
   const loggedIn = useMemory((s) => s.auth.loggedIn)
   const loginPage = useMemory((s) => s.config.loginPage)
 
diff --git a/src/components/Clustering.jsx b/src/pages/map/components/Clustering.jsx
similarity index 95%
rename from src/components/Clustering.jsx
rename to src/pages/map/components/Clustering.jsx
index 3d8d85390..46c36f975 100644
--- a/src/components/Clustering.jsx
+++ b/src/pages/map/components/Clustering.jsx
@@ -3,9 +3,10 @@ import * as React from 'react'
 import { useMap, GeoJSON } from 'react-leaflet'
 import Supercluster from 'supercluster'
 import { marker, divIcon, point } from 'leaflet'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import Notification from './layout/general/Notification'
+
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Notification } from '@components/Notification'
 
 const IGNORE_CLUSTERING = new Set([
   'devices',
@@ -41,7 +42,7 @@ function createClusterIcon(feature, latlng) {
  * }} props
  * @returns
  */
-function Clustering({ category, children }) {
+export function Clustering({ category, children }) {
   /** @type {ReturnType<typeof React.useRef<import('leaflet').GeoJSON>>} */
   const featureRef = React.useRef(null)
 
@@ -169,5 +170,3 @@ function Clustering({ category, children }) {
     </>
   )
 }
-
-export default Clustering
diff --git a/src/components/Container.jsx b/src/pages/map/components/Container.jsx
similarity index 69%
rename from src/components/Container.jsx
rename to src/pages/map/components/Container.jsx
index c5744db4f..ffacef9a8 100644
--- a/src/components/Container.jsx
+++ b/src/pages/map/components/Container.jsx
@@ -2,23 +2,22 @@
 import * as React from 'react'
 import { MapContainer } from 'react-leaflet'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import { useMapStore } from '@hooks/useMapStore'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useMapStore } from '@store/useMapStore'
+import { ScanOnDemand } from '@features/scanner'
+import { WebhookMarker, WebhookAreaSelection } from '@features/webhooks'
+import { ActiveWeather } from '@features/weather'
+import { timeCheck } from '@utils/timeCheck'
 
-import Map from './Map'
-import ScanOnDemand from './layout/dialogs/scanner/ScanOnDemand'
-import DraggableMarker from './layout/dialogs/webhooks/human/Draggable'
-import WebhookAreaSelection from './layout/dialogs/webhooks/human/area/AreaSelection'
-import { Nav } from './layout/Nav'
-import ActiveWeather from './layout/general/ActiveWeather'
+import { Effects } from './Effects'
+import { DataView } from './Data'
+import { Nav } from './Nav'
 import {
   ControlledLocate,
   ControlledTileLayer,
   ControlledZoomLayer,
 } from './Layers'
-import { Effects } from './Effects'
 
 /** @param {{ target: import('leaflet').Map, type: string }} args */
 function setLocationZoom({ target: map }) {
@@ -26,7 +25,7 @@ function setLocationZoom({ target: map }) {
   const zoom = map.getZoom()
   useStorage.setState({ location: [lat, lng], zoom })
   useMemory.setState({
-    timeOfDay: Utility.timeCheck(lat, lng),
+    timeOfDay: timeCheck(lat, lng),
   })
   if (map.hasEventListeners('fetchdata')) map.fire('fetchdata')
 }
@@ -36,7 +35,7 @@ const MAX_BOUNDS = /** @type {[[number, number], [number, number]]} */ ([
   [90, 210],
 ])
 
-export default function Container() {
+export function Container() {
   const { location, zoom } = useStorage.getState()
 
   return (
@@ -61,10 +60,10 @@ export default function Container() {
       <ControlledTileLayer />
       <ControlledZoomLayer />
       <ControlledLocate />
-      <Map />
+      <DataView />
       <ScanOnDemand mode="scanNext" />
       <ScanOnDemand mode="scanZone" />
-      <DraggableMarker />
+      <WebhookMarker />
       <WebhookAreaSelection />
       <Nav />
       <ActiveWeather />
diff --git a/src/components/Map.jsx b/src/pages/map/components/Data.jsx
similarity index 77%
rename from src/components/Map.jsx
rename to src/pages/map/components/Data.jsx
index ef882500a..372d034ba 100644
--- a/src/components/Map.jsx
+++ b/src/pages/map/components/Data.jsx
@@ -1,16 +1,13 @@
 // @ts-check
 import * as React from 'react'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import { useMapStore } from '@hooks/useMapStore'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { useMapStore } from '@store/useMapStore'
 
-import FilterPermCheck from './QueryData'
-
-export default function Map() {
-  Utility.analytics(window.location.pathname)
+import { FilterPermCheck } from './QueryData'
 
+export function DataView() {
   const iconsReady = useMemory((s) => !!s.Icons)
   const mapReady = useMapStore((s) => !!s.map)
   const ui = useMemory((s) => s.ui)
diff --git a/src/components/Effects.jsx b/src/pages/map/components/Effects.jsx
similarity index 78%
rename from src/components/Effects.jsx
rename to src/pages/map/components/Effects.jsx
index e48e8ec32..e80b27ecb 100644
--- a/src/components/Effects.jsx
+++ b/src/pages/map/components/Effects.jsx
@@ -1,20 +1,25 @@
 import * as React from 'react'
-import useMediaQuery from '@mui/material/useMediaQuery'
-
-import useGenerate from '@hooks/useGenerate'
-import useRefresh from '@hooks/useRefresh'
-import { useMemory } from '@hooks/useMemory'
 import { useParams } from 'react-router-dom'
 import { useMap } from 'react-leaflet'
 import { useTranslation } from 'react-i18next'
+import useMediaQuery from '@mui/material/useMediaQuery'
+
+import { useMapData } from '@hooks/useMapData'
+import { useMemory } from '@store/useMemory'
+
+import { useGenGyms } from '../hooks/useGenGyms'
+import { useGenPokestops } from '../hooks/useGenPokestops'
+import { useGenPokemon } from '../hooks/useGenPokemon'
 
 export function Effects() {
   const params = useParams()
   const map = useMap()
   const { t } = useTranslation()
 
-  useRefresh()
-  useGenerate()
+  useMapData()
+  useGenGyms()
+  useGenPokestops()
+  useGenPokemon()
 
   const isMobile = useMediaQuery((theme) => theme.breakpoints.only('xs'))
   const isTablet = useMediaQuery((theme) => theme.breakpoints.only('sm'))
diff --git a/src/components/layout/FloatingBtn.jsx b/src/pages/map/components/FloatingBtn.jsx
similarity index 95%
rename from src/components/layout/FloatingBtn.jsx
rename to src/pages/map/components/FloatingBtn.jsx
index 3a70d06e2..a9e3d3a63 100644
--- a/src/components/layout/FloatingBtn.jsx
+++ b/src/pages/map/components/FloatingBtn.jsx
@@ -11,7 +11,6 @@ import AttachMoneyIcon from '@mui/icons-material/AttachMoney'
 import CheckIcon from '@mui/icons-material/Check'
 import CurrencyBitcoinIcon from '@mui/icons-material/CurrencyBitcoin'
 import CurrencyPoundIcon from '@mui/icons-material/CurrencyPound'
-
 import Stack from '@mui/material/Stack'
 import EuroSymbol from '@mui/icons-material/EuroSymbol'
 import Person from '@mui/icons-material/Person'
@@ -19,20 +18,18 @@ import TrackChanges from '@mui/icons-material/TrackChanges'
 import BlurOn from '@mui/icons-material/BlurOn'
 import Fab from '@mui/material/Fab'
 import { useQuery } from '@apollo/client'
-
 import { useTranslation } from 'react-i18next'
 import { useMap } from 'react-leaflet'
 import { DomEvent } from 'leaflet'
 
 import { FAB_BUTTONS } from '@services/queries/config'
-import useLocation from '@hooks/useLocation'
-import { useMemory } from '@hooks/useMemory'
-import { useLayoutStore } from '@hooks/useLayoutStore'
-import { useStorage } from '@hooks/useStorage'
-import { useScanStore } from './dialogs/scanner/store'
-
-import { I } from './general/I'
-import { setModeBtn, useWebhookStore } from './dialogs/webhooks/store'
+import { useLocation } from '@hooks/useLocation'
+import { useMemory } from '@store/useMemory'
+import { useLayoutStore } from '@store/useLayoutStore'
+import { useStorage } from '@store/useStorage'
+import { useScanStore } from '@features/scanner'
+import { setModeBtn, useWebhookStore } from '@store/useWebhookStore'
+import { I } from '@components/I'
 
 /** @typedef {keyof ReturnType<typeof useLayoutStore['getState']> | keyof ReturnType<typeof useScanStore['getState']>} Keys */
 
diff --git a/src/components/Layers.jsx b/src/pages/map/components/Layers.jsx
similarity index 82%
rename from src/components/Layers.jsx
rename to src/pages/map/components/Layers.jsx
index 29883da3a..0e33cbe5f 100644
--- a/src/components/Layers.jsx
+++ b/src/pages/map/components/Layers.jsx
@@ -3,8 +3,9 @@ import * as React from 'react'
 import { TileLayer, useMap } from 'react-leaflet'
 import { control } from 'leaflet'
 
-import { useStorage } from '@hooks/useStorage'
-import useTileLayer from '@hooks/useTileLayer'
+import { useStorage } from '@store/useStorage'
+
+import { useTileLayer } from '../hooks/useTileLayer'
 
 export function ControlledTileLayer() {
   const layer = useTileLayer()
@@ -14,7 +15,7 @@ export function ControlledTileLayer() {
 export function ControlledZoomLayer() {
   const map = useMap()
   const navSetting = useStorage(
-    (state) => state.settings.navigationControls === 'leaflet',
+    (s) => s.settings.navigationControls === 'leaflet',
   )
 
   React.useLayoutEffect(() => {
@@ -32,7 +33,7 @@ export function ControlledZoomLayer() {
 export function ControlledLocate() {
   const map = useMap()
   const navSetting = useStorage(
-    (state) => state.settings.navigationControls === 'leaflet',
+    (s) => s.settings.navigationControls === 'leaflet',
   )
 
   const lc = React.useMemo(
diff --git a/src/pages/map/components/Nav.jsx b/src/pages/map/components/Nav.jsx
new file mode 100644
index 000000000..1c2de5924
--- /dev/null
+++ b/src/pages/map/components/Nav.jsx
@@ -0,0 +1,62 @@
+// @ts-check
+import * as React from 'react'
+
+import { Tutorial } from '@features/tutorial'
+import { UserProfile } from '@features/profile'
+import { Search } from '@features/search'
+import {
+  Webhook,
+  WebhookNotification,
+  WebhookAdvanced,
+} from '@features/webhooks'
+import { DonorPage, MessageOfTheDay } from '@features/builder'
+import { ScanDialog } from '@features/scanner'
+import { Feedback } from '@components/dialogs/Feedback'
+import { FilterMenu } from '@components/filters/FilterMenu'
+import { UserOptions } from '@components/dialogs/UserOptions'
+import { ResetFilters } from '@components/dialogs/ResetFilters'
+import { ClientError } from '@components/dialogs/ClientError'
+import { AdvancedFilter } from '@components/filters/Advanced'
+import { BadgeSelection } from '@components/dialogs/BadgeSelection'
+import { SlotSelection } from '@components/filters/SlotSelection'
+import { HelpDialog } from '@components/dialogs/Help'
+import { Drawer, PkmnFilterHelp } from '@features/drawer'
+import { useMemory } from '@store/useMemory'
+
+import { FloatingButtonsMemo } from './FloatingBtn'
+
+export const Nav = React.memo(
+  () => {
+    const iconsIsReady = useMemory((s) => !!s.Icons)
+    return (
+      <>
+        <ClientError />
+        {iconsIsReady && (
+          <>
+            <Drawer />
+            <FloatingButtonsMemo />
+            <UserProfile />
+            <Tutorial />
+            <FilterMenu />
+            <UserOptions />
+            <Webhook />
+            <Search />
+            <MessageOfTheDay />
+            <DonorPage />
+            <Feedback />
+            <ResetFilters />
+            <ScanDialog />
+            <WebhookNotification />
+            <AdvancedFilter />
+            <BadgeSelection />
+            <WebhookAdvanced />
+            <SlotSelection />
+            <HelpDialog />
+            <PkmnFilterHelp />
+          </>
+        )}
+      </>
+    )
+  },
+  () => true,
+)
diff --git a/src/components/QueryData.jsx b/src/pages/map/components/QueryData.jsx
similarity index 85%
rename from src/components/QueryData.jsx
rename to src/pages/map/components/QueryData.jsx
index cd15d1cd7..5b68747a6 100644
--- a/src/components/QueryData.jsx
+++ b/src/pages/map/components/QueryData.jsx
@@ -3,19 +3,19 @@ import * as React from 'react'
 import { useQuery } from '@apollo/client'
 import { useMap } from 'react-leaflet'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import { usePermCheck } from '@hooks/usePermCheck'
-import Query from '@services/Query'
-import { getQueryArgs } from '@services/functions/getQueryArgs'
-import RobustTimeout from '@services/apollo/RobustTimeout'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { Query } from '@services/queries'
+import { getQueryArgs } from '@utils/getQueryArgs'
+import { RobustTimeout } from '@services/apollo/RobustTimeout'
 import { FILTER_SKIP_LIST } from '@assets/constants'
+import { Notification } from '@components/Notification'
+import { GenerateCells } from '@features/s2cell'
+import { useAnalytics } from '@hooks/useAnalytics'
 
-import * as index from './tiles/index'
-import Clustering from './Clustering'
-import Notification from './layout/general/Notification'
-import { GenerateCells } from './tiles/S2Cell'
+import { Clustering } from './Clustering'
+import { TILES } from '../tileObject'
+import { usePermCheck } from '../hooks/usePermCheck'
 
 /** @param {string} category */
 const userSettingsCategory = (category) => {
@@ -75,9 +75,9 @@ const trimFilters = (requestedFilters, userSettings, category, onlyAreas) => {
   return trimmed
 }
 
-export default function FilterPermCheck({ category }) {
+export function FilterPermCheck({ category }) {
   const valid = usePermCheck(category)
-  const error = useMemory((state) => state.clientError)
+  const error = useMemory((s) => s.clientError)
 
   if (!valid || error) {
     return null
@@ -91,13 +91,13 @@ export default function FilterPermCheck({ category }) {
 
 function QueryWrapper({ category }) {
   const timeout = React.useRef(new RobustTimeout(category))
-  Utility.analytics('Data', `${category} being fetched`, category, true)
+  useAnalytics('Data', `${category} being fetched`, category, true)
 
   return <QueryData category={category} timeout={timeout} />
 }
 
 function QueryData({ category, timeout }) {
-  const Component = React.useMemo(() => index[category], [])
+  const Component = React.useMemo(() => TILES[category], [])
 
   const map = useMap()
 
@@ -162,7 +162,7 @@ function QueryData({ category, timeout }) {
     }
   }, [filters, userSettings, onlyAreas, timeout.current.refetch])
 
-  if (error && 'statusCode' in error.networkError) {
+  if (error?.networkError && 'statusCode' in error.networkError) {
     if (error.networkError?.statusCode === 464) {
       useMemory.setState({ clientError: 'old_client' })
       return null
diff --git a/src/components/WebhookQuery.jsx b/src/pages/map/components/WebhookQuery.jsx
similarity index 88%
rename from src/components/WebhookQuery.jsx
rename to src/pages/map/components/WebhookQuery.jsx
index 9357de6c8..2ddaa3573 100644
--- a/src/components/WebhookQuery.jsx
+++ b/src/pages/map/components/WebhookQuery.jsx
@@ -3,9 +3,9 @@ import * as React from 'react'
 import { useParams } from 'react-router-dom'
 import { useQuery } from '@apollo/client'
 
-import Query from '@services/Query'
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { Query } from '@services/queries'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 /**
  * @param {string} category
@@ -27,7 +27,7 @@ const getLowerCase = (category) => {
   }
 }
 
-export default function WebhookQuery({ children }) {
+export function WebhookQuery({ children }) {
   const params = useParams()
   const lowercase = getLowerCase(params.category)
 
diff --git a/src/pages/map/hooks/useGenGyms.js b/src/pages/map/hooks/useGenGyms.js
new file mode 100644
index 000000000..fecc9b720
--- /dev/null
+++ b/src/pages/map/hooks/useGenGyms.js
@@ -0,0 +1,77 @@
+// @ts-check
+import { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+
+export function useGenGyms() {
+  const { t } = useTranslation()
+  const gyms = useMemory((s) => s.filters.gyms)
+  const categories = useMemory((s) => s.menus.gyms.categories)
+
+  useEffect(() => {
+    /** @type {import('@rm/types').ClientFilterObj} */
+    const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
+    if (!gyms?.filter) return
+
+    if (tempObj.eggs) {
+      tempObj.eggs.e90 = {
+        name: t('poke_global'),
+        perms: ['raids'],
+        webhookOnly: true,
+      }
+    }
+    if (tempObj.raids) {
+      tempObj.raids.r90 = {
+        name: t('poke_global'),
+        perms: ['raids'],
+        webhookOnly: true,
+      }
+    }
+    if (tempObj.teams) {
+      tempObj.teams.t4 = {
+        name: t('poke_global'),
+        perms: ['gyms'],
+        webhookOnly: true,
+      }
+    }
+
+    Object.keys(gyms.filter).forEach((id) => {
+      if (id !== 'global' && !/\d/.test(id.charAt(0)) && !id.startsWith('g')) {
+        switch (id.charAt(0)) {
+          case 'e':
+            tempObj.eggs[id] = {
+              name: t(`egg_${id.slice(1)}_plural`),
+              perms: ['raids'],
+              searchMeta: `${t(`egg_${id.slice(1)}_plural`)} ${t(
+                'eggs',
+              ).toLowerCase()}`,
+            }
+            break
+          case 'r':
+            tempObj.raids[id] = {
+              name: t(`raid_${id.slice(1).split('-')[0]}_plural`),
+              perms: ['raids'],
+              searchMeta: `${t(`raid_${id.slice(1)}_plural`)} ${t(
+                'raids',
+              ).toLowerCase()}`,
+              webhookOnly: true,
+            }
+            break
+          default:
+            tempObj.teams[id] = {
+              name: t(`team_${id.slice(1).split('-')[0]}`),
+              perms: ['gyms'],
+              searchMeta: `${t(`team_${id.slice(1)}`)} ${t(
+                'teams',
+              ).toLowerCase()}`,
+            }
+            break
+        }
+      }
+    })
+    useMemory.setState((prev) => ({
+      menuFilters: { ...prev.menuFilters, ...tempObj },
+    }))
+  }, [gyms, categories, t])
+}
diff --git a/src/pages/map/hooks/useGenPokemon.js b/src/pages/map/hooks/useGenPokemon.js
new file mode 100644
index 000000000..88d583a50
--- /dev/null
+++ b/src/pages/map/hooks/useGenPokemon.js
@@ -0,0 +1,79 @@
+// @ts-check
+import { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { useMemory } from '@store/useMemory'
+
+export function useGenPokemon() {
+  const { t } = useTranslation()
+  const pokemon = useMemory((s) => s.masterfile.pokemon)
+  const categories = useMemory((s) => s.menus.pokemon.categories)
+
+  useEffect(() => {
+    /** @type {import('@rm/types').ClientFilterObj} */
+    const tempObj = Object.fromEntries(
+      categories.map((x) => [
+        x,
+        {
+          '0-0': {
+            webhookOnly: true,
+            name: t('poke_global'),
+            perms: ['pokemon', 'raids', 'quests', 'nests'],
+            formTypes: [],
+          },
+        },
+      ]),
+    )
+
+    Object.entries(pokemon).forEach(([i, pkmn]) => {
+      const pokeName = t(`poke_${i}`)
+      Object.entries(pkmn.forms).forEach(([j, form]) => {
+        const formName = t(`form_${j}`)
+        const id = `${i}-${j}`
+        const formTypes = (form.types || pkmn.types || []).map(
+          (x) => `poke_type_${x}`,
+        )
+        const name =
+          form.name &&
+          form.name !== 'Normal' &&
+          j !== '0' &&
+          +j !== pkmn.defaultFormId
+            ? formName
+            : pokeName
+        tempObj.pokemon[id] = {
+          name: form.name === '*' ? `${name}*` : name,
+          category: form.name === '*' ? form.category : undefined,
+          pokedexId: +i,
+          formId: +j,
+          defaultFormId: pkmn.defaultFormId,
+          pokeName,
+          formName,
+          formTypes,
+          rarity: form.rarity || pkmn.rarity,
+          historic: pkmn.historic,
+          legendary: pkmn.legendary,
+          mythical: pkmn.mythical,
+          ultraBeast: pkmn.ultraBeast,
+          genId: `generation_${pkmn.genId}`,
+          perms: ['pokemon', 'raids', 'quests', 'nests'],
+          family: pkmn.family,
+        }
+        tempObj.pokemon[id].searchMeta = `${Object.entries(tempObj.pokemon[id])
+          .flatMap(([k, v]) =>
+            Array.isArray(v)
+              ? v.map((y) => t(y))
+              : typeof v === 'boolean'
+              ? v
+                ? t(k)
+                : ''
+              : t(v),
+          )
+          .join(' ')
+          .toLowerCase()} ${t('pokemon').toLowerCase()}`
+      })
+    })
+    useMemory.setState((prev) => ({
+      menuFilters: { ...prev.menuFilters, ...tempObj },
+    }))
+  }, [pokemon, categories, t])
+}
diff --git a/src/pages/map/hooks/useGenPokestops.js b/src/pages/map/hooks/useGenPokestops.js
new file mode 100644
index 000000000..1c037bd9c
--- /dev/null
+++ b/src/pages/map/hooks/useGenPokestops.js
@@ -0,0 +1,208 @@
+// @ts-check
+import { useMemory } from '@store/useMemory'
+import { useEffect } from 'react'
+import { useTranslation } from 'react-i18next'
+
+export function useGenPokestops() {
+  const { t } = useTranslation()
+  const pokemon = useMemory((s) => s.masterfile.pokemon)
+  const pokestops = useMemory((s) => s.filters.pokestops)
+  const categories = useMemory((s) => s.menus.pokestops.categories)
+
+  useEffect(() => {
+    /** @type {import('@rm/types').ClientFilterObj} */
+    const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
+    if (!pokestops?.filter) return
+
+    if (tempObj.invasions) {
+      tempObj.invasions.i0 = {
+        name: t('poke_global'),
+        perms: ['invasions'],
+        webhookOnly: true,
+      }
+      tempObj.invasions['gold-stop'] = {
+        name: t('gold_stop'),
+        perms: ['invasions'],
+        webhookOnly: true,
+      }
+      tempObj.invasions.kecleon = {
+        name: t('poke_352'),
+        perms: ['invasions'],
+        webhookOnly: true,
+      }
+      tempObj.invasions.showcase = {
+        name: t('showcase'),
+        perms: ['invasions'],
+        webhookOnly: true,
+      }
+    }
+
+    Object.keys(pokestops.filter).forEach((id) => {
+      if (id !== 'global' && !/\d/.test(id.charAt(0))) {
+        switch (id.charAt(0)) {
+          case 'a':
+            if (tempObj.rocket_pokemon) {
+              const name = t(`poke_${id.slice(1).split('-')[0]}`)
+              tempObj.rocket_pokemon[id] = {
+                name,
+                perms: ['invasions'],
+              }
+              tempObj.rocket_pokemon[id].searchMeta = name.toLowerCase()
+            }
+            break
+          case 'i':
+            if (tempObj.invasions) {
+              tempObj.invasions[id] = {
+                name: t(`grunt_a_${id.slice(1)}`, `grunt_${id.slice(1)}`),
+                perms: ['invasions'],
+              }
+              tempObj.invasions[id].searchMeta = `${t(
+                'invasions',
+              ).toLowerCase()} ${t(`grunt_${id.slice(1)}`).toLowerCase()}`
+            }
+            break
+          case 'h':
+            if (tempObj.showcase) {
+              const name = t(`poke_type_${id.slice(1)}`)
+              tempObj.showcase[id] = {
+                name,
+                perms: ['eventStops'],
+              }
+              tempObj.showcase[id].searchMeta = `${t(
+                'showcase',
+              ).toLowerCase()} ${name.toLowerCase()}`
+            }
+            break
+          case 'f':
+            if (tempObj.showcase) {
+              const name = t(`poke_${id.slice(1).split('-')[0]}`)
+              tempObj.showcase[id] = {
+                name,
+                perms: ['eventStops'],
+              }
+              tempObj.showcase[id].searchMeta = `${t(
+                'showcase',
+              ).toLowerCase()} ${name.toLowerCase()}`
+            }
+            break
+          case 'd':
+            if (tempObj.quest_reward_3) {
+              tempObj.quest_reward_3[id] = {
+                name: `x${id.slice(1)}`,
+                perms: ['quests'],
+              }
+              tempObj.quest_reward_3[id].searchMeta = `${t(
+                'quest_reward_3',
+              ).toLowerCase()} ${tempObj.quest_reward_3[id].name.toLowerCase()}`
+            }
+            break
+          case 'm':
+            {
+              const monId = id && id.slice(1).split('-')[0]
+              if (tempObj.quest_reward_12 && pokemon[monId]) {
+                tempObj.quest_reward_12[id] = {
+                  name: `${t(`poke_${monId}`)} x${id.split('-')[1]}`,
+                  perms: ['quests'],
+                  genId: `generation_${pokemon[monId].genId}`,
+                  formTypes: pokemon[monId].types.map((x) => `poke_type_${x}`),
+                  rarity: pokemon[monId].rarity,
+                  family: pokemon[monId].family,
+                }
+                tempObj.quest_reward_12[id].searchMeta = `${Object.values(
+                  tempObj.quest_reward_12[id],
+                )
+                  .flatMap((x) => t(x))
+                  .join(' ')
+                  .toLowerCase()} ${t('quest_reward_12').toLowerCase()}`
+              }
+            }
+            break
+          case 'p':
+            if (tempObj.quest_reward_1) {
+              tempObj.quest_reward_1[id] = {
+                name: `x${id.slice(1)}`,
+                perms: ['quests'],
+              }
+              tempObj.quest_reward_1[id].searchMeta = `${t(
+                'quest_reward_1',
+              ).toLowerCase()} ${tempObj.quest_reward_1[id].name.toLowerCase()}`
+            }
+            break
+          case 'q':
+            if (tempObj.items) {
+              tempObj.items[id] = {
+                name: t(`item_${id.slice(1)}`),
+                perms: ['quests'],
+              }
+              tempObj.items[id].searchMeta = `${t(
+                'items',
+              ).toLowerCase()} ${tempObj.items[id].name.toLowerCase()}`
+            }
+            break
+          case 'l':
+            if (tempObj.lures) {
+              tempObj.lures[id] = {
+                name: t(`lure_${id.slice(1)}`),
+                perms: ['lures'],
+              }
+              tempObj.lures[id].searchMeta = `${t(
+                'lures',
+              ).toLowerCase()} ${tempObj.lures[id].name.toLowerCase()}`
+            }
+            break
+          case 'x':
+          case 'c':
+            {
+              const monId = id && id.slice(1)
+              if (
+                tempObj.quest_reward_4 &&
+                tempObj.quest_reward_9 &&
+                pokemon[monId]
+              ) {
+                const category =
+                  id.charAt(0) === 'c' ? 'quest_reward_4' : 'quest_reward_9'
+                tempObj[category][id] = {
+                  name: `${t(`poke_${monId}`)} ${
+                    id.charAt(0) === 'c' ? t('candy') : t('xl')
+                  }`,
+                  perms: ['quests'],
+                  genId: `generation_${pokemon[monId].genId}`,
+                  formTypes: pokemon[monId].types.map((x) => `poke_type_${x}`),
+                  rarity: pokemon[monId].rarity,
+                  family: pokemon[monId].family,
+                }
+                tempObj[category][id].searchMeta = `${Object.values(
+                  tempObj[category][id],
+                )
+                  .flatMap((x) => t(x))
+                  .join(' ')
+                  .toLowerCase()} ${t(category).toLowerCase()}`
+              }
+            }
+            break
+          case 'u':
+            if (tempObj.general) {
+              tempObj.general[id] = {
+                name: t(`quest_reward_${id.slice(1)}`),
+                perms: ['quests'],
+              }
+              tempObj.general[id].searchMeta = `${t(
+                'general',
+              ).toLowerCase()} ${tempObj.general[id].name.toLowerCase()}`
+            }
+            break
+          default:
+            if (tempObj.pokestops) {
+              tempObj.pokestops[id] = {
+                name: t('pokestop'),
+                perms: ['pokestops'],
+              }
+            }
+        }
+      }
+    })
+    useMemory.setState((prev) => ({
+      menuFilters: { ...prev.menuFilters, ...tempObj },
+    }))
+  }, [pokemon, pokestops, categories, t])
+}
diff --git a/src/hooks/usePermCheck.js b/src/pages/map/hooks/usePermCheck.js
similarity index 93%
rename from src/hooks/usePermCheck.js
rename to src/pages/map/hooks/usePermCheck.js
index 14a10f942..d415c3f2c 100644
--- a/src/hooks/usePermCheck.js
+++ b/src/pages/map/hooks/usePermCheck.js
@@ -1,5 +1,5 @@
-import { useMemory } from './useMemory'
-import { useStorage } from './useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 export function usePermCheck(category) {
   const filters = useStorage((s) => s.filters[category])
diff --git a/src/hooks/useTileLayer.js b/src/pages/map/hooks/useTileLayer.js
similarity index 87%
rename from src/hooks/useTileLayer.js
rename to src/pages/map/hooks/useTileLayer.js
index c057fdd6b..1b1973c14 100644
--- a/src/hooks/useTileLayer.js
+++ b/src/pages/map/hooks/useTileLayer.js
@@ -1,12 +1,12 @@
 // @ts-check
 import * as React from 'react'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
 /**
  *
- * @param {Record<string, { name: string, style: 'light' | 'dark', attribution?: string, url?: string, background?: string }>} tileServers
+ * @param {import('@store/useMemory').UseMemory['settings']['tileServers']} tileServers
  * @param {string} tileServer
  * @param {'day' | 'night' | 'dusk' | 'dawn'} timeOfDay
  * @returns
@@ -25,7 +25,7 @@ const getTileLayer = (tileServers, tileServer, timeOfDay) => {
   return tileServers[tileServer] || fallbackTs
 }
 
-export default function useTileLayer() {
+export function useTileLayer() {
   const timeOfDay = useMemory((s) => s.timeOfDay)
   const userTileLayer = useStorage((s) => s.settings.tileServers)
   const online = useMemory((s) => s.online)
diff --git a/src/components/layout/auth/Auth.jsx b/src/pages/map/index.jsx
similarity index 83%
rename from src/components/layout/auth/Auth.jsx
rename to src/pages/map/index.jsx
index 61ea8175a..e8e6f85bd 100644
--- a/src/components/layout/auth/Auth.jsx
+++ b/src/pages/map/index.jsx
@@ -2,12 +2,12 @@
 import * as React from 'react'
 import { Navigate, useParams } from 'react-router-dom'
 
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
 
-import Container from '../../Container'
-import WebhookQuery from '../../WebhookQuery'
+import { Container } from './components/Container'
+import { WebhookQuery } from './components/WebhookQuery'
 
-export default function Auth() {
+export function MapPage() {
   const params = useParams()
   const mapPerm = useMemory((s) => s.auth.perms.map)
 
diff --git a/src/pages/map/tileObject.js b/src/pages/map/tileObject.js
new file mode 100644
index 000000000..8ccbbd48f
--- /dev/null
+++ b/src/pages/map/tileObject.js
@@ -0,0 +1,29 @@
+import { PokemonTile as pokemon } from '@features/pokemon'
+import { PokestopTile as pokestops } from '@features/pokestop'
+import { GymTile as gyms } from '@features/gym'
+import { DeviceTile as devices } from '@features/device'
+import { NestTile as nests } from '@features/nest'
+import { PortalTile as portals } from '@features/portal'
+import { RouteTile as routes } from '@features/route'
+import { WeatherTile as weather } from '@features/weather'
+import { SpawnpointTile as spawnpoints } from '@features/spawnpoint'
+import { ScanCellTile as scanCells } from '@features/scanCell'
+import { WayfarerTile as submissionCells } from '@features/wayfarer'
+import { ScanAreaTile as scanAreas } from '@features/scanArea'
+import { BaseCell as s2cells } from '@features/s2cell'
+
+export const TILES = {
+  devices,
+  gyms,
+  nests,
+  pokemon,
+  pokestops,
+  portals,
+  scanAreas,
+  scanCells,
+  submissionCells,
+  spawnpoints,
+  weather,
+  s2cells,
+  routes,
+}
diff --git a/src/features/playground/components/ComponentMenu.jsx b/src/pages/playground/components/ComponentMenu.jsx
similarity index 96%
rename from src/features/playground/components/ComponentMenu.jsx
rename to src/pages/playground/components/ComponentMenu.jsx
index 140be703b..d301638c5 100644
--- a/src/features/playground/components/ComponentMenu.jsx
+++ b/src/pages/playground/components/ComponentMenu.jsx
@@ -10,11 +10,11 @@ import DialogContent from '@mui/material/DialogContent'
 import DialogContentText from '@mui/material/DialogContentText'
 import DialogActions from '@mui/material/DialogActions'
 import { useTranslation } from 'react-i18next'
-
-import Utility from '@services/Utility'
-
 import { useQuery } from '@apollo/client'
+
 import { CUSTOM_COMPONENT } from '@services/queries/config'
+import { camelToSnake } from '@utils/strings'
+
 import { setComponent, usePlayStore } from '../hooks/store'
 
 const PAGES = ['loginPage', 'messageOfTheDay', 'donationPage']
@@ -87,7 +87,7 @@ export function ComponentMenu() {
             onClick={handleMenuClose(c)}
             selected={c === component}
           >
-            {t(`component_${Utility.camelToSnake(c)}`)}
+            {t(`component_${camelToSnake(c)}`)}
           </MenuItem>
         ))}
       </Menu>
diff --git a/src/features/playground/components/Download.jsx b/src/pages/playground/components/Download.jsx
similarity index 100%
rename from src/features/playground/components/Download.jsx
rename to src/pages/playground/components/Download.jsx
diff --git a/src/features/playground/components/Editor.jsx b/src/pages/playground/components/Editor.jsx
similarity index 100%
rename from src/features/playground/components/Editor.jsx
rename to src/pages/playground/components/Editor.jsx
diff --git a/src/features/playground/components/LocaleMenu.jsx b/src/pages/playground/components/LocaleMenu.jsx
similarity index 99%
rename from src/features/playground/components/LocaleMenu.jsx
rename to src/pages/playground/components/LocaleMenu.jsx
index 20410af44..83e6a3a53 100644
--- a/src/features/playground/components/LocaleMenu.jsx
+++ b/src/pages/playground/components/LocaleMenu.jsx
@@ -4,7 +4,6 @@ import MenuItem from '@mui/material/MenuItem'
 import Button from '@mui/material/Button'
 import Menu from '@mui/material/Menu'
 import TranslateIcon from '@mui/icons-material/Translate'
-
 import { useTranslation } from 'react-i18next'
 
 const startIcon = <TranslateIcon />
diff --git a/src/features/playground/components/MainMenu.jsx b/src/pages/playground/components/MainMenu.jsx
similarity index 100%
rename from src/features/playground/components/MainMenu.jsx
rename to src/pages/playground/components/MainMenu.jsx
diff --git a/src/features/playground/components/Save.jsx b/src/pages/playground/components/Save.jsx
similarity index 100%
rename from src/features/playground/components/Save.jsx
rename to src/pages/playground/components/Save.jsx
diff --git a/src/features/playground/components/Status.jsx b/src/pages/playground/components/Status.jsx
similarity index 100%
rename from src/features/playground/components/Status.jsx
rename to src/pages/playground/components/Status.jsx
diff --git a/src/features/playground/components/Theme.jsx b/src/pages/playground/components/Theme.jsx
similarity index 94%
rename from src/features/playground/components/Theme.jsx
rename to src/pages/playground/components/Theme.jsx
index 5a003862e..fe642e8d2 100644
--- a/src/features/playground/components/Theme.jsx
+++ b/src/pages/playground/components/Theme.jsx
@@ -7,7 +7,7 @@ import ListItemIcon from '@mui/material/ListItemIcon'
 import ListItemText from '@mui/material/ListItemText'
 import { useTranslation } from 'react-i18next'
 
-import { useStorage } from '@hooks/useStorage'
+import { useStorage } from '@store/useStorage'
 
 export function ThemeMenuItem() {
   const { t } = useTranslation()
diff --git a/src/features/playground/components/ToggleEditor.jsx b/src/pages/playground/components/ToggleEditor.jsx
similarity index 100%
rename from src/features/playground/components/ToggleEditor.jsx
rename to src/pages/playground/components/ToggleEditor.jsx
diff --git a/src/features/playground/components/Toolbar.jsx b/src/pages/playground/components/Toolbar.jsx
similarity index 100%
rename from src/features/playground/components/Toolbar.jsx
rename to src/pages/playground/components/Toolbar.jsx
diff --git a/src/features/playground/components/Viewer.jsx b/src/pages/playground/components/Viewer.jsx
similarity index 88%
rename from src/features/playground/components/Viewer.jsx
rename to src/pages/playground/components/Viewer.jsx
index d3cf4c106..5e8a3d1cc 100644
--- a/src/features/playground/components/Viewer.jsx
+++ b/src/pages/playground/components/Viewer.jsx
@@ -4,9 +4,8 @@ import * as React from 'react'
 import Grid from '@mui/material/Unstable_Grid2'
 import { useTranslation } from 'react-i18next'
 
-import CustomTile from '@components/layout/custom/CustomTile'
-import DialogWrapper from '@components/layout/custom/DialogWrapper'
-import ErrorBoundary from '@components/ErrorBoundary'
+import { CustomTile, CustomDialog } from '@features/builder'
+import { ErrorBoundary } from '@components/ErrorBoundary'
 
 import { useSafeParse } from '../hooks/useSafeParse'
 import { usePlayStore } from '../hooks/store'
@@ -47,7 +46,7 @@ export function Viewer() {
           </Grid>
         ) : (
           <Grid height="100%" pb={16} pt={4}>
-            <DialogWrapper
+            <CustomDialog
               configObj={configObj}
               defaultTitle={
                 component === 'donorPage' ? 'donor_page' : 'message_of_the_day'
@@ -57,7 +56,7 @@ export function Viewer() {
               {configObj.components.map((block, i) => (
                 <CustomTile key={i} block={block} />
               ))}
-            </DialogWrapper>
+            </CustomDialog>
           </Grid>
         )}
       </ErrorBoundary>
diff --git a/src/features/playground/hooks/store.js b/src/pages/playground/hooks/store.js
similarity index 97%
rename from src/features/playground/hooks/store.js
rename to src/pages/playground/hooks/store.js
index e5076a520..e1e327fca 100644
--- a/src/features/playground/hooks/store.js
+++ b/src/pages/playground/hooks/store.js
@@ -1,6 +1,7 @@
 // @ts-check
 import { create } from 'zustand'
-import { downloadJson } from '@services/functions/downloadJson'
+
+import { downloadJson } from '@utils/downloadJson'
 
 /**
  * @typedef {{
diff --git a/src/features/playground/hooks/useSafeParse.js b/src/pages/playground/hooks/useSafeParse.js
similarity index 100%
rename from src/features/playground/hooks/useSafeParse.js
rename to src/pages/playground/hooks/useSafeParse.js
diff --git a/src/features/playground/index.jsx b/src/pages/playground/index.jsx
similarity index 96%
rename from src/features/playground/index.jsx
rename to src/pages/playground/index.jsx
index 90ec765b3..59683e367 100644
--- a/src/features/playground/index.jsx
+++ b/src/pages/playground/index.jsx
@@ -5,6 +5,7 @@ import Grid2 from '@mui/material/Unstable_Grid2'
 import Box from '@mui/material/Box'
 import { Navigate } from 'react-router-dom'
 import { useQuery } from '@apollo/client'
+
 import { VALIDATE_USER } from '@services/queries/config'
 
 import { CodeWrapper } from './components/Editor'
@@ -12,7 +13,7 @@ import { MuiToolbar } from './components/Toolbar'
 import { Viewer } from './components/Viewer'
 import { StatusNotification } from './components/Status'
 
-export default function Playground() {
+export function PlaygroundPage() {
   const { data } = useQuery(VALIDATE_USER)
 
   if (data?.validateUser === undefined) return null
diff --git a/src/services/Icons.js b/src/services/Assets.js
similarity index 57%
rename from src/services/Icons.js
rename to src/services/Assets.js
index 743938934..f77ea6eee 100644
--- a/src/services/Icons.js
+++ b/src/services/Assets.js
@@ -1,5 +1,6 @@
 // @ts-check
 /* eslint-disable no-console */
+import { UICONS } from 'uicons.js'
 
 // /**
 //  *
@@ -25,7 +26,7 @@
 // }
 
 // TODO: This is dumb, should be a state machine with Zustand
-class UAssets {
+export class UAssets {
   /**
    *
    * @param {import("@rm/types").Config['icons']} iconsConfig
@@ -71,32 +72,32 @@ class UAssets {
   build(icons) {
     icons.forEach((icon) => {
       try {
-        const { data, name: dirtyName, path: dirtyPath } = icon
+        const { data, name: dirtyName, path: dirtyPath, ...rest } = icon
         const name = dirtyName.endsWith('/')
           ? dirtyName?.slice(0, -1)
           : dirtyName
-        const path = dirtyPath?.endsWith('/')
-          ? dirtyPath.slice(0, -1)
-          : dirtyPath
-
+        let path = dirtyPath?.endsWith('/') ? dirtyPath.slice(0, -1) : dirtyPath
+        if (!path) {
+          console.error(
+            `[${this.assetType}] No path provided for`,
+            name,
+            'using default path',
+          )
+          this[name].path = this.fallback
+        }
+        if (!path.startsWith('http')) {
+          path = `/images/${this.assetType}/${path}`
+        }
         if (data) {
           const indexes = Object.keys(data)
           this[name] = {
             ...this[name],
-            ...icon,
+            ...rest,
+            name,
             path,
+            class: new UICONS(path, name),
           }
-          if (!path) {
-            console.error(
-              `[${this.assetType}] No path provided for`,
-              name,
-              'using default path',
-            )
-            this[name].path = this.fallback
-          }
-          if (!path.startsWith('http')) {
-            this[name].path = `/images/${this.assetType}/${path}`
-          }
+          this[name].class.init(data)
           if (!this[name].modifiers) {
             this[name].modifiers = {}
           }
@@ -108,19 +109,10 @@ class UAssets {
               category !== 'lastFetched'
             ) {
               if (Array.isArray(data[category])) {
-                this[name][category] = new Set(data[category])
                 isValid = true
-                this[name].extension =
-                  data[category][0]?.split('.')[1] || this[name].extension
               } else {
                 Object.keys(data[category]).forEach((subCategory) => {
                   if (Array.isArray(data[category][subCategory])) {
-                    this[name].extension =
-                      data[category][subCategory][0]?.split('.')[1] ||
-                      this[name].extension
-                    this[name][subCategory] = new Set(
-                      data[category][subCategory],
-                    )
                     isValid = true
                   }
                 })
@@ -335,35 +327,15 @@ class UAssets {
     shiny = false,
   ) {
     try {
-      const baseUrl = `${
-        this[this.selected.pokemon]?.path || this.fallback
-      }/pokemon`
-      const extension = this[this.selected.pokemon]?.extension || 'png'
-
-      const evolutionSuffixes = evolution ? [`_e${evolution}`, ''] : ['']
-      const formSuffixes = form ? [`_f${form}`, ''] : ['']
-      const costumeSuffixes = costume ? [`_c${costume}`, ''] : ['']
-      const genderSuffixes = gender ? [`_g${gender}`, ''] : ['']
-      const alignmentSuffixes = alignment ? [`_a${alignment}`, ''] : ['']
-      const shinySuffixes = shiny ? ['_s', ''] : ['']
-
-      for (let e = 0; e < evolutionSuffixes.length; e += 1) {
-        for (let f = 0; f < formSuffixes.length; f += 1) {
-          for (let c = 0; c < costumeSuffixes.length; c += 1) {
-            for (let g = 0; g < genderSuffixes.length; g += 1) {
-              for (let a = 0; a < alignmentSuffixes.length; a += 1) {
-                for (let s = 0; s < shinySuffixes.length; s += 1) {
-                  const result = `${pokemonId}${evolutionSuffixes[e]}${formSuffixes[f]}${costumeSuffixes[c]}${genderSuffixes[g]}${alignmentSuffixes[a]}${shinySuffixes[s]}.${extension}`
-                  if (this[this.selected.pokemon].pokemon.has(result)) {
-                    return `${baseUrl}/${result}`
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.pokemon]?.class?.pokemon(
+        pokemonId,
+        form,
+        evolution,
+        gender,
+        costume,
+        alignment,
+        shiny,
+      )
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/pokemon/0.${this.fallbackExt}`
@@ -373,14 +345,7 @@ class UAssets {
   /** @param {number | string} [typeId] */
   getTypes(typeId = 0) {
     try {
-      const baseUrl = `${this[this.selected.type]?.path || this.fallback}/type`
-      const extension = this[this.selected.type]?.extension || 'png'
-
-      const result = `${typeId}.${extension}`
-      if (this[this.selected.type].type.has(result)) {
-        return `${baseUrl}/${result}`
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.type]?.class?.type(typeId)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/type/0.${this.fallbackExt}`
@@ -406,30 +371,14 @@ class UAssets {
     display = '',
   ) {
     try {
-      const baseUrl = `${
-        this[this.selected.pokestop]?.path || this.fallback
-      }/pokestop`
-      const extension = this[this.selected.pokestop]?.extension || 'png'
-
-      const invasionSuffixes =
-        invasionActive || display ? [`_i${display}`, ''] : ['']
-      const questSuffixes = questActive ? ['_q', ''] : ['']
-      const arSuffixes = ar ? ['_ar', ''] : ['']
-      const powerUpSuffixes = power ? [`_p${power}`, ''] : ['']
-
-      for (let i = 0; i < invasionSuffixes.length; i += 1) {
-        for (let q = 0; q < questSuffixes.length; q += 1) {
-          for (let a = 0; a < arSuffixes.length; a += 1) {
-            for (let p = 0; p < powerUpSuffixes.length; p += 1) {
-              const result = `${lureId}${invasionSuffixes[i]}${questSuffixes[q]}${arSuffixes[a]}${powerUpSuffixes[p]}.${extension}`
-              if (this[this.selected.pokestop].pokestop.has(result)) {
-                return `${baseUrl}/${result}`
-              }
-            }
-          }
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.pokestop]?.class?.pokestop(
+        lureId,
+        power,
+        display,
+        invasionActive,
+        questActive,
+        ar,
+      )
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/pokestop/0.${this.fallbackExt}`
@@ -445,22 +394,8 @@ class UAssets {
    */
   getRewards(rewardType, id, amount = 0) {
     try {
-      const category = this.questRewardTypes[rewardType] || 'unset'
-      const baseUrl = `${
-        this[this.selected.reward]?.path || this.fallback
-      }/reward/${category}`
-      const extension = this[this.selected.reward]?.extension || 'png'
-
-      if (this[this.selected.reward][category]) {
-        const amountSuffixes = amount > 1 ? [`_a${amount}`, ''] : ['']
-        for (let a = 0; a < amountSuffixes.length; a += 1) {
-          const result = `${id}${amountSuffixes[a]}.${extension}`
-          if (this[this.selected.reward][category].has(result)) {
-            return `${baseUrl}/${result}`
-          }
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      const reward = this.questRewardTypes[rewardType]
+      return this[this.selected.reward]?.class?.reward(reward, id, amount)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/reward/unset/0.${this.fallbackExt}`
@@ -475,19 +410,7 @@ class UAssets {
    */
   getInvasions(gruntType, confirmed = false) {
     try {
-      const baseUrl = `${
-        this[this.selected.invasion]?.path || this.fallback
-      }/invasion`
-      const extension = this[this.selected.invasion]?.extension || 'png'
-
-      const confirmedSuffixes = confirmed ? [''] : ['_u', '']
-      for (let c = 0; c < confirmedSuffixes.length; c += 1) {
-        const result = `${gruntType}${confirmedSuffixes[c]}.${extension}`
-        if (this[this.selected.invasion].invasion.has(result)) {
-          return `${baseUrl}/${result}`
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.invasion]?.class?.invasion(gruntType, confirmed)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/invasion/0.${this.fallbackExt}`
@@ -511,26 +434,13 @@ class UAssets {
     ar = false,
   ) {
     try {
-      const baseUrl = `${this[this.selected.gym]?.path || this.fallback}/gym`
-      const extension = this[this.selected.gym]?.extension || 'png'
-
-      const trainerSuffixes = trainerCount ? [`_t${trainerCount}`, ''] : ['']
-      const inBattleSuffixes = inBattle ? ['_b', ''] : ['']
-      const exSuffixes = ex ? ['_ex', ''] : ['']
-      const arSuffixes = ar ? ['_ar', ''] : ['']
-      for (let t = 0; t < trainerSuffixes.length; t += 1) {
-        for (let b = 0; b < inBattleSuffixes.length; b += 1) {
-          for (let e = 0; e < exSuffixes.length; e += 1) {
-            for (let a = 0; a < arSuffixes.length; a += 1) {
-              const result = `${teamId}${trainerSuffixes[t]}${inBattleSuffixes[b]}${exSuffixes[e]}${arSuffixes[a]}.${extension}`
-              if (this[this.selected.gym].gym.has(result)) {
-                return `${baseUrl}/${result}`
-              }
-            }
-          }
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.gym]?.class?.gym(
+        teamId,
+        trainerCount,
+        inBattle,
+        ex,
+        ar,
+      )
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/gym/0.${this.fallbackExt}`
@@ -546,25 +456,7 @@ class UAssets {
    */
   getEggs(level, hatched = false, ex = false) {
     try {
-      const baseUrl = `${
-        this[this.selected.raid]?.path || this.fallback
-      }/raid/egg`
-      const extension = this[this.selected.raid]?.extension || 'png'
-
-      const hatchedSuffixes = hatched ? ['_h', ''] : ['']
-      const exSuffixes = ex ? ['_ex', ''] : ['']
-      for (let h = 0; h < hatchedSuffixes.length; h += 1) {
-        for (let e = 0; e < exSuffixes.length; e += 1) {
-          const result = `${level}${hatchedSuffixes[h]}${exSuffixes[e]}.${extension}`
-          if (
-            this[this.selected.raid].egg &&
-            this[this.selected.raid].egg.has(result)
-          ) {
-            return `${baseUrl}/${result}`
-          }
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.raid]?.class?.raidEgg(level, hatched, ex)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/raid/egg/0.${this.fallbackExt}`
@@ -578,14 +470,7 @@ class UAssets {
    */
   getTeams(teamId = 0) {
     try {
-      const baseUrl = `${this[this.selected.team]?.path || this.fallback}/team`
-      const extension = this[this.selected.team]?.extension || 'png'
-
-      const result = `${teamId}.${extension}`
-      if (this[this.selected.team].team.has(result)) {
-        return `${baseUrl}/${result}`
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.team]?.class?.team(teamId)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/team/0.${this.fallbackExt}`
@@ -600,19 +485,7 @@ class UAssets {
    */
   getWeather(weatherId, timeOfDay = 'day') {
     try {
-      const baseUrl = `${
-        this[this.selected.weather]?.path || this.fallback
-      }/weather`
-      const extension = this[this.selected.weather]?.extension || 'png'
-
-      const timeSuffixes = timeOfDay === 'night' ? ['_n', ''] : ['_d', '']
-      for (let t = 0; t < timeSuffixes.length; t += 1) {
-        const result = `${weatherId}${timeSuffixes[t]}.${extension}`
-        if (this[this.selected.weather].weather.has(result)) {
-          return `${baseUrl}/${result}`
-        }
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.weather]?.class?.weather(weatherId, timeOfDay)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/weather/0.${this.fallbackExt}`
@@ -626,54 +499,37 @@ class UAssets {
    */
   getNests(typeId) {
     try {
-      const baseUrl = `${this[this.selected.nest]?.path || this.fallback}/nest`
-      const extension = this[this.selected.nest]?.extension || 'png'
-
-      const result = `${typeId}.${extension}`
-      if (this[this.selected.nest].nest.has(result)) {
-        return `${baseUrl}/${result}`
-      }
-      return `${baseUrl}/0.${extension}`
+      return this[this.selected.nest]?.class?.nest(typeId)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/nest/0.${this.fallbackExt}`
     }
   }
 
-  /** @param {string} fileName */
-  doesMiscHave(fileName) {
-    return this[this.selected.misc].misc.has(
-      `${fileName}.${this[this.selected.misc].extension || 'png'}`,
-    )
-  }
-
   /** @param {string} fileName */
   getMisc(fileName = '') {
     try {
-      const baseUrl = `${this[this.selected.misc]?.path || this.fallback}/misc`
-      const extension = this[this.selected.misc]?.extension || 'png'
+      const miscClass = this[this.selected.misc]?.class
 
-      if (this.doesMiscHave(fileName)) {
-        return `${baseUrl}/${fileName}.${extension}`
-      }
-      if (fileName.endsWith('s') && this.doesMiscHave(fileName.slice(0, -1))) {
-        return `${baseUrl}/${fileName.slice(0, -1)}.${extension}`
+      if (miscClass.has('misc', fileName)) {
+        return miscClass.misc(fileName)
       }
       if (
-        !fileName.endsWith('s') &&
-        this.doesMiscHave(`${fileName}s.${extension}`)
+        fileName.endsWith('s') &&
+        miscClass.has('misc', fileName.slice(0, -1))
       ) {
-        return `${baseUrl}/${fileName}s.${extension}`
+        return miscClass.misc(fileName.slice(0, -1))
+      }
+      if (!fileName.endsWith('s') && miscClass.has('misc', `${fileName}s`)) {
+        return miscClass.misc(`${fileName}s`)
       }
       if (
         this[this.selected[fileName]]?.path &&
-        this[this.selected[fileName]][fileName]?.has(`0.${extension}`)
+        this[this.selected[fileName]].class.has(fileName, `0`)
       ) {
-        return `${
-          this[this.selected[fileName]]?.path
-        }/${fileName}/0.${extension}`
+        return this[this.selected[fileName]].class[fileName]('0')
       }
-      return `${baseUrl}/0.${extension}`
+      return miscClass.misc('0')
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/misc/0.${this.fallbackExt}`
@@ -683,12 +539,7 @@ class UAssets {
   /** @param {boolean} [online] */
   getDevices(online = false) {
     try {
-      const baseUrl = `${
-        this[this.selected.device]?.path || this.fallback
-      }/device`
-      const extension = this[this.selected.device]?.extension || 'png'
-
-      return online ? `${baseUrl}/1.${extension}` : `${baseUrl}/0.${extension}`
+      return this[this.selected.device]?.class?.device(online)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/device/0.${this.fallbackExt}`
@@ -698,17 +549,10 @@ class UAssets {
   /** @param {boolean} [hasTth] */
   getSpawnpoints(hasTth = false) {
     try {
-      const baseUrl = `${
-        this[this.selected.spawnpoint]?.path || this.fallback
-      }/spawnpoint`
-      const extension = this[this.selected.spawnpoint]?.extension || 'png'
-
-      return hasTth ? `${baseUrl}/1.${extension}` : `${baseUrl}/0.${extension}`
+      return this[this.selected.spawnpoint]?.class?.spawnpoint(hasTth)
     } catch (e) {
       console.error(`[${this.assetType.toUpperCase()}]`, e)
       return `${this.fallback}/spawnpoint/0.${this.fallbackExt}`
     }
   }
 }
-
-export default UAssets
diff --git a/src/services/Fetch.js b/src/services/Fetch.js
deleted file mode 100644
index 8141c696a..000000000
--- a/src/services/Fetch.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/* eslint-disable no-console */
-
-export default class Fetch {
-  /**
-   *
-   * @returns {Promise<ReturnType<typeof import('../../server/src/services/functions/getServerSettings')>>}
-   */
-  static async getSettings() {
-    try {
-      const response = await fetch('/api/settings')
-      if (!response.ok) {
-        throw new Error(`${response.status} (${response.statusText})`)
-      }
-      const body = await response.json()
-      return body
-    } catch (error) {
-      console.error(
-        error.message,
-        '\nUnable to fetch settings at this time, please try again later.',
-      )
-      return { error: true, status: 500 }
-    }
-  }
-
-  static async login(user, endpoint = '/auth/local/callback') {
-    try {
-      return fetch(endpoint, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(user),
-      })
-    } catch (error) {
-      console.error(
-        error.message,
-        '\nUnable to login at this time, please try again later.',
-      )
-      return { error: true, status: 500 }
-    }
-  }
-
-  static async sendError(error) {
-    try {
-      return fetch('/api/error/client', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          version: CONFIG.client.version,
-        },
-        body: JSON.stringify(error),
-      })
-    } catch (e) {
-      console.error(
-        e.message,
-        '\nWell, this is awkward, we were unable to report the error to the server.',
-      )
-      return { error: true, status: 500 }
-    }
-  }
-}
diff --git a/src/services/Query.js b/src/services/Query.js
deleted file mode 100644
index 888b92266..000000000
--- a/src/services/Query.js
+++ /dev/null
@@ -1,171 +0,0 @@
-// @ts-check
-import { useMemory } from '@hooks/useMemory'
-
-import getAllDevices from './queries/device'
-import * as gymIndex from './queries/gym'
-import * as pokestopIndex from './queries/pokestop'
-import * as pokemonIndex from './queries/pokemon'
-import getAllSpawnpoints from './queries/spawnpoint'
-import * as portalIndex from './queries/portal'
-import getAllWeather from './queries/weather'
-import getAllScanCells from './queries/scanCell'
-import getAllSubmissionCells from './queries/submissionCells'
-import { getOne, getAllNests, nestSubmission } from './queries/nest'
-import { getAllScanAreas, getScanAreasMenu } from './queries/scanAreas'
-import * as searchIndex from './queries/search'
-import * as webhookIndex from './queries/webhook'
-import * as user from './queries/user'
-import s2cell from './queries/s2cell'
-import { getRoute, getRoutes } from './queries/route'
-
-export default class Query {
-  static devices() {
-    return getAllDevices
-  }
-
-  static gyms(filters) {
-    const perms = useMemory.getState().ui.gyms
-    if (filters === 'id') {
-      return gymIndex.getOne
-    }
-    if (filters === 'badges') {
-      return gymIndex.getBadges
-    }
-    const permObj = {
-      Gyms: filters.raids
-        ? filters.allGyms || perms.allGyms
-        : filters.allGyms && perms.allGyms,
-      Raids: filters.raids && perms.raids,
-    }
-    let query = 'get'
-    Object.keys(permObj).forEach((keyPerm) => {
-      if (permObj[keyPerm]) query += keyPerm
-    })
-    if (
-      query === 'get' &&
-      (filters.exEligible ||
-        filters.inBattle ||
-        filters.arEligible ||
-        filters.gymBadges)
-    ) {
-      query += 'Gyms'
-    }
-
-    return gymIndex[query]
-  }
-
-  static nests(filters) {
-    if (filters === 'id') {
-      return getOne
-    }
-    if (filters === 'nestSubmission') {
-      return nestSubmission
-    }
-    return getAllNests
-  }
-
-  static pokestops(filters) {
-    const perms = useMemory.getState().ui.pokestops
-    if (filters === 'id') {
-      return pokestopIndex.getOne
-    }
-    const permObj = {
-      Lures: filters.lures && perms.lures,
-      Quests: filters.quests && perms.quests,
-      Invasions: filters.invasions && perms.invasions,
-      Events: filters.eventStops && perms.eventStops,
-    }
-    let query = 'get'
-
-    Object.keys(permObj).forEach((keyPerm) => {
-      if (permObj[keyPerm]) query += keyPerm
-    })
-
-    if (query === 'get') query += 'Pokestops'
-    return pokestopIndex[query]
-  }
-
-  static pokemon(filters) {
-    const perms = useMemory.getState().ui.pokemon
-    if (filters === 'id') {
-      return pokemonIndex.getOne
-    }
-    const permObj = {
-      Ivs: perms.iv,
-      Pvp: perms.pvp,
-    }
-    let query = 'get'
-
-    Object.keys(permObj).forEach((keyPerm) => {
-      if (permObj[keyPerm]) query += keyPerm
-    })
-    if (query === 'get') query += 'Pokemon'
-
-    return pokemonIndex[query]
-  }
-
-  static portals(filters) {
-    if (filters === 'id') {
-      return portalIndex.getOne
-    }
-
-    return portalIndex.getAllPortals
-  }
-
-  static scanCells() {
-    return getAllScanCells
-  }
-
-  static spawnpoints() {
-    return getAllSpawnpoints
-  }
-
-  static submissionCells() {
-    return getAllSubmissionCells
-  }
-
-  static weather() {
-    return getAllWeather
-  }
-
-  static scanAreas() {
-    return getAllScanAreas
-  }
-
-  static scanAreasMenu() {
-    return getScanAreasMenu
-  }
-
-  static search(category) {
-    switch (category) {
-      case 'lures':
-      case 'raids':
-      case 'nests':
-      case 'quests':
-      case 'invasions':
-      case 'pokemon':
-        return searchIndex[category]
-      case 'webhook':
-        return searchIndex.poiWebhook
-      default:
-        return searchIndex.poi
-    }
-  }
-
-  static webhook(type) {
-    return webhookIndex[type]
-  }
-
-  static user(type) {
-    return user[type]
-  }
-
-  static s2cells() {
-    return s2cell
-  }
-
-  static routes(method) {
-    if (method === 'getOne') return getRoute
-    return getRoutes
-  }
-}
diff --git a/src/services/ttlcache.js b/src/services/SimpleTTLCache.js
similarity index 91%
rename from src/services/ttlcache.js
rename to src/services/SimpleTTLCache.js
index 00e4ad308..c349d0341 100644
--- a/src/services/ttlcache.js
+++ b/src/services/SimpleTTLCache.js
@@ -1,6 +1,6 @@
 // @ts-check
 
-class SimpleTTLCache {
+export class SimpleTTLCache {
   /**
    * @param {number} ttl
    */
@@ -35,5 +35,3 @@ class SimpleTTLCache {
     return this._cache.size
   }
 }
-
-export default SimpleTTLCache
diff --git a/src/services/Utility.js b/src/services/Utility.js
deleted file mode 100644
index fcc4fe35e..000000000
--- a/src/services/Utility.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import ReactGA from 'react-ga4'
-import SunCalc from 'suncalc'
-
-import formatInterval from './functions/formatInterval'
-import getProperName from './functions/getProperName'
-import checkAdvFilter from './functions/checkAdvFilter'
-import dayCheck from './functions/dayCheck'
-import parseQuestConditions from './functions/parseConditions'
-
-export default class Utility {
-  static getProperName(word) {
-    return getProperName(word)
-  }
-
-  static checkAdvFilter(filter) {
-    return checkAdvFilter(filter)
-  }
-
-  static formatInterval(intervalMs) {
-    return formatInterval(intervalMs)
-  }
-
-  static getTimeUntil(date, until) {
-    return formatInterval(until ? date - Date.now() : Date.now() - date)
-  }
-
-  static dayCheck(ts, desiredStamp) {
-    return dayCheck(ts, desiredStamp)
-  }
-
-  static parseConditions(conditions) {
-    return parseQuestConditions(conditions)
-  }
-
-  static camelToSnake(str) {
-    return str.replace(/([a-z](?=[A-Z]))/g, '$1_').toLowerCase()
-  }
-
-  static capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.slice(1)
-  }
-
-  static getTileBackground(columnIndex, rowIndex) {
-    return columnIndex % 2
-      ? rowIndex % 2 === 0
-        ? 'rgba(1, 1, 1, 0.01)'
-        : 'rgba(240, 240, 240, 0.01)'
-      : rowIndex % 2
-      ? 'rgba(1, 1, 1, 0.01)'
-      : 'rgba(240, 240, 240, 0.01)'
-  }
-
-  static generateSlots = (teamId, show, tempFilters) => {
-    const slotObj = {}
-    for (let i = 1; i <= 6; i += 1) {
-      const slotKey = `g${teamId.charAt(1)}-${i}`
-      slotObj[slotKey] =
-        typeof show === 'boolean'
-          ? { ...tempFilters[slotKey], enabled: show }
-          : { ...tempFilters[slotKey], size: show.size }
-    }
-    return slotObj
-  }
-
-  static timeCheck(lat, lon) {
-    const date = new Date()
-    const times = SunCalc.getTimes(date, lat, lon)
-    switch (true) {
-      case date > times.dawn && date < times.sunriseEnd:
-        return 'dawn'
-      case date > times.dusk && date < times.night:
-        return 'dusk'
-      case date > times.night || date < times.nightEnd:
-        return 'night'
-      default:
-        return 'day'
-    }
-  }
-
-  static analytics(category, action = '', label = '', nonInteraction = false) {
-    if (CONFIG.googleAnalyticsId) {
-      if (action) {
-        ReactGA.event({
-          category,
-          action,
-          label,
-          nonInteraction,
-        })
-      } else {
-        ReactGA.pageview(category)
-      }
-    }
-  }
-
-  /**
-   * @param {Record<string, number>} sizeObj
-   */
-  static getSizes = (sizeObj) => ({
-    xs: sizeObj?.xs || 12,
-    sm: sizeObj?.sm || sizeObj?.xs || 12,
-    md: sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
-    lg: sizeObj?.lg || sizeObj?.md || sizeObj?.sm || sizeObj?.xs || 12,
-    xl:
-      sizeObj?.xl ||
-      sizeObj?.lg ||
-      sizeObj?.md ||
-      sizeObj?.sm ||
-      sizeObj?.xs ||
-      12,
-  })
-
-  /**
-   * Provides the raw content or translated content if available
-   * @param {string | Record<string, string>} content
-   * @returns
-   */
-  static getBlockContent(content) {
-    if (!content) return ''
-    if (typeof content === 'string') return content
-    return typeof content === 'object'
-      ? content[localStorage.getItem('i18nextLng')] || Object.values(content)[0]
-      : ''
-  }
-}
diff --git a/src/services/apollo/AbortableContext.js b/src/services/apollo/AbortableContext.js
index 6f4fe683a..96f27e0ed 100644
--- a/src/services/apollo/AbortableContext.js
+++ b/src/services/apollo/AbortableContext.js
@@ -6,7 +6,7 @@ import { Observable } from '@apollo/client/utilities/observables/Observable'
  * @see AbortableLink
  * @author Mygod
  */
-export default class AbortableContext {
+export class AbortableContext {
   constructor(error = 'Request aborted') {
     this._pendingOp = null
     this._error = error
diff --git a/src/services/apollo/AbortableLink.js b/src/services/apollo/AbortableLink.js
index f10df2513..632ff11e6 100644
--- a/src/services/apollo/AbortableLink.js
+++ b/src/services/apollo/AbortableLink.js
@@ -6,7 +6,7 @@ import { ApolloLink } from '@apollo/client'
  * @author Mygod
  * @see AbortableContext
  */
-export default class AbortableLink extends ApolloLink {
+export class AbortableLink extends ApolloLink {
   /**
    * @param {import("@apollo/client").Operation} operation
    * @param {import("@apollo/client").NextLink} [forward]
diff --git a/src/services/apollo/RobustTimeout.js b/src/services/apollo/RobustTimeout.js
index 3ab198f91..3ed814ae3 100644
--- a/src/services/apollo/RobustTimeout.js
+++ b/src/services/apollo/RobustTimeout.js
@@ -1,8 +1,8 @@
 // @ts-check
-import { useMemory } from '@hooks/useMemory'
-import AbortableContext from './AbortableContext'
+import { useMemory } from '@store/useMemory'
+import { AbortableContext } from './AbortableContext'
 
-export default class RobustTimeout extends AbortableContext {
+export class RobustTimeout extends AbortableContext {
   /**
    * @param {keyof import('@rm/types').Config['api']['polling'] | number} category
    */
diff --git a/src/services/apollo/index.js b/src/services/apollo/index.js
index 8f445e874..58fb190ab 100644
--- a/src/services/apollo/index.js
+++ b/src/services/apollo/index.js
@@ -1,7 +1,7 @@
 // @ts-check
 import { ApolloClient, InMemoryCache, createHttpLink } from '@apollo/client'
 
-import AbortableLink from './AbortableLink'
+import { AbortableLink } from './AbortableLink'
 
 const abortableLink = new AbortableLink()
 
diff --git a/src/services/desktopNotification.js b/src/services/desktopNotification.js
index 940a5e44f..f11203891 100644
--- a/src/services/desktopNotification.js
+++ b/src/services/desktopNotification.js
@@ -1,10 +1,10 @@
 // @ts-check
 import { t } from 'i18next'
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
-import SimpleTTLCache from '@services/ttlcache'
-import { useMapStore } from '@hooks/useMapStore'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
+import { SimpleTTLCache } from '@services/SimpleTTLCache'
+import { useMapStore } from '@store/useMapStore'
 
 export const HAS_API = 'Notification' in window
 const cache = new SimpleTTLCache(1000 * 60 * 60)
diff --git a/src/services/events.js b/src/services/events.js
index c9eede164..f5c00eb40 100644
--- a/src/services/events.js
+++ b/src/services/events.js
@@ -1,39 +1,29 @@
 // @ts-check
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
-/** @param {KeyboardEvent} event */
-function toggleDarkMode(event) {
+window.addEventListener('keydown', (event) => {
   // This is mostly meant for development purposes
   if (event.ctrlKey && event.key === 'd') {
     useStorage.setState((prev) => ({ darkMode: !prev.darkMode }))
   }
-}
-window.addEventListener('keydown', toggleDarkMode)
+})
 
 let timer
 
-function onFocus() {
+window.addEventListener('focus', () => {
   if (timer) {
     clearTimeout(timer)
   }
   useMemory.setState({ active: true })
-}
-window.addEventListener('focus', onFocus)
+})
 
-function onBlur() {
+window.addEventListener('blur', () => {
   timer = setTimeout(() => {
     useMemory.setState({ active: false })
-  }, 1000 * 60 * useMemory.getState().config.misc.clientTimeoutMinutes)
-}
-window.addEventListener('blur', onBlur)
+  }, 1000 * 60 * (useMemory.getState().config?.misc?.clientTimeoutMinutes || 5))
+})
 
-function online() {
-  useMemory.setState({ online: true })
-}
-window.addEventListener('online', online)
+window.addEventListener('online', () => useMemory.setState({ online: true }))
 
-function offline() {
-  useMemory.setState({ online: false })
-}
-window.addEventListener('offline', offline)
+window.addEventListener('offline', () => useMemory.setState({ online: false }))
diff --git a/src/services/fetches.js b/src/services/fetches.js
new file mode 100644
index 000000000..768b04f69
--- /dev/null
+++ b/src/services/fetches.js
@@ -0,0 +1,59 @@
+/* eslint-disable no-console */
+
+/**
+ *
+ * @returns {Promise<ReturnType<typeof import('../../server/src/services/functions/getServerSettings')>>}
+ */
+export async function getSettings() {
+  try {
+    const response = await fetch('/api/settings')
+    if (!response.ok) {
+      throw new Error(`${response.status} (${response.statusText})`)
+    }
+    const body = await response.json()
+    return body
+  } catch (error) {
+    console.error(
+      error.message,
+      '\nUnable to fetch settings at this time, please try again later.',
+    )
+    return { error: true, status: 500 }
+  }
+}
+
+export async function login(user, endpoint = '/auth/local/callback') {
+  try {
+    return fetch(endpoint, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(user),
+    })
+  } catch (error) {
+    console.error(
+      error.message,
+      '\nUnable to login at this time, please try again later.',
+    )
+    return { error: true, status: 500 }
+  }
+}
+
+export async function sendError(error) {
+  try {
+    return fetch('/api/error/client', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        version: CONFIG.client.version,
+      },
+      body: JSON.stringify(error),
+    })
+  } catch (e) {
+    console.error(
+      e.message,
+      '\nWell, this is awkward, we were unable to report the error to the server.',
+    )
+    return { error: true, status: 500 }
+  }
+}
diff --git a/src/services/filtering/genGyms.js b/src/services/filtering/genGyms.js
deleted file mode 100644
index 48c1c9504..000000000
--- a/src/services/filtering/genGyms.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { t } from 'i18next'
-
-export default function genGyms(gyms, categories) {
-  const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
-  if (!gyms?.filter) return {}
-
-  if (tempObj.eggs) {
-    tempObj.eggs.e90 = {
-      name: t('poke_global'),
-      perms: ['raids'],
-      webhookOnly: true,
-    }
-  }
-  if (tempObj.raids) {
-    tempObj.raids.r90 = {
-      name: t('poke_global'),
-      perms: ['raids'],
-      webhookOnly: true,
-    }
-  }
-  if (tempObj.teams) {
-    tempObj.teams.t4 = {
-      name: t('poke_global'),
-      perms: ['gyms'],
-      webhookOnly: true,
-    }
-  }
-
-  Object.keys(gyms.filter).forEach((id) => {
-    if (id !== 'global' && !/\d/.test(id.charAt(0)) && !id.startsWith('g')) {
-      switch (id.charAt(0)) {
-        case 'e':
-          tempObj.eggs[id] = {
-            name: t(`egg_${id.slice(1)}_plural`),
-            perms: ['raids'],
-            searchMeta: `${t(`egg_${id.slice(1)}_plural`)} ${t(
-              'eggs',
-            ).toLowerCase()}`,
-          }
-          break
-        case 'r':
-          tempObj.raids[id] = {
-            name: t(`raid_${id.slice(1).split('-')[0]}_plural`),
-            perms: ['raids'],
-            searchMeta: `${t(`raid_${id.slice(1)}_plural`)} ${t(
-              'raids',
-            ).toLowerCase()}`,
-            webhookOnly: true,
-          }
-          break
-        default:
-          tempObj.teams[id] = {
-            name: t(`team_${id.slice(1).split('-')[0]}`),
-            perms: ['gyms'],
-            searchMeta: `${t(`team_${id.slice(1)}`)} ${t(
-              'teams',
-            ).toLowerCase()}`,
-          }
-          break
-      }
-    }
-  })
-
-  return tempObj
-}
diff --git a/src/services/filtering/genPokemon.js b/src/services/filtering/genPokemon.js
deleted file mode 100644
index 594e26ef9..000000000
--- a/src/services/filtering/genPokemon.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { t } from 'i18next'
-
-/**
- *
- * @param {import('@rm/masterfile').Masterfile} pokemon
- * @param {string[]} categories
- * @returns
- */
-export default function genPokemon(pokemon, categories) {
-  const tempObj = Object.fromEntries(
-    categories.map((x) => [
-      x,
-      {
-        '0-0': {
-          webhookOnly: true,
-          name: t('poke_global'),
-          perms: ['pokemon', 'raids', 'quests', 'nests'],
-          formTypes: [],
-        },
-      },
-    ]),
-  )
-
-  Object.entries(pokemon).forEach(([i, pkmn]) => {
-    const pokeName = t(`poke_${i}`)
-    Object.entries(pkmn.forms).forEach(([j, form]) => {
-      const formName = t(`form_${j}`)
-      const id = `${i}-${j}`
-      const formTypes = (form.types || pkmn.types || []).map(
-        (x) => `poke_type_${x}`,
-      )
-      const name =
-        form.name &&
-        form.name !== 'Normal' &&
-        j !== '0' &&
-        j != pkmn.defaultFormId
-          ? formName
-          : pokeName
-      tempObj.pokemon[id] = {
-        name: form.name === '*' ? `${name}*` : name,
-        category: form.name === '*' ? form.category : undefined,
-        pokedexId: +i,
-        formId: +j,
-        defaultFormId: pkmn.defaultFormId,
-        pokeName,
-        formName,
-        formTypes,
-        rarity: form.rarity || pkmn.rarity,
-        historic: pkmn.historic,
-        legendary: pkmn.legendary,
-        mythical: pkmn.mythical,
-        ultraBeast: pkmn.ultraBeast,
-        genId: `generation_${pkmn.genId}`,
-        perms: ['pokemon', 'raids', 'quests', 'nests'],
-        family: pkmn.family,
-      }
-      tempObj.pokemon[id].searchMeta = `${Object.entries(tempObj.pokemon[id])
-        .flatMap(([k, v]) =>
-          Array.isArray(v)
-            ? v.map((y) => t(y))
-            : typeof v === 'boolean'
-            ? v
-              ? t(k)
-              : ''
-            : t(v),
-        )
-        .join(' ')
-        .toLowerCase()} ${t('pokemon').toLowerCase()}`
-    })
-  })
-  return tempObj
-}
diff --git a/src/services/filtering/genPokestops.js b/src/services/filtering/genPokestops.js
deleted file mode 100644
index 9a075bfd5..000000000
--- a/src/services/filtering/genPokestops.js
+++ /dev/null
@@ -1,202 +0,0 @@
-import { t } from 'i18next'
-
-/**
- *
- * @param {import('@rm/masterfile').Masterfile} pokemon
- * @param {*} pokestops
- * @param {*} categories
- * @returns
- */
-export default function genPokestops(pokemon, pokestops, categories) {
-  const tempObj = Object.fromEntries(categories.map((x) => [x, {}]))
-  if (!pokestops?.filter) return {}
-
-  if (tempObj.invasions) {
-    tempObj.invasions.i0 = {
-      name: t('poke_global'),
-      perms: ['invasions'],
-      webhookOnly: true,
-    }
-    tempObj.invasions['gold-stop'] = {
-      name: t('gold_stop'),
-      perms: ['invasions'],
-      webhookOnly: true,
-    }
-    tempObj.invasions.kecleon = {
-      name: t('poke_352'),
-      perms: ['invasions'],
-      webhookOnly: true,
-    }
-    tempObj.invasions.showcase = {
-      name: t('showcase'),
-      perms: ['invasions'],
-      webhookOnly: true,
-    }
-  }
-
-  Object.keys(pokestops.filter).forEach((id) => {
-    if (id !== 'global' && !/\d/.test(id.charAt(0))) {
-      switch (id.charAt(0)) {
-        case 'a':
-          if (tempObj.rocket_pokemon) {
-            const name = t(`poke_${id.slice(1).split('-')[0]}`)
-            tempObj.rocket_pokemon[id] = {
-              name,
-              perms: ['invasions'],
-            }
-            tempObj.rocket_pokemon[id].searchMeta = name.toLowerCase()
-          }
-          break
-        case 'i':
-          if (tempObj.invasions) {
-            tempObj.invasions[id] = {
-              name: t(`grunt_a_${id.slice(1)}`, `grunt_${id.slice(1)}`),
-              perms: ['invasions'],
-            }
-            tempObj.invasions[id].searchMeta = `${t(
-              'invasions',
-            ).toLowerCase()} ${t(`grunt_${id.slice(1)}`).toLowerCase()}`
-          }
-          break
-        case 'h':
-          if (tempObj.showcase) {
-            const name = t(`poke_type_${id.slice(1)}`)
-            tempObj.showcase[id] = {
-              name,
-              perms: ['eventStops'],
-            }
-            tempObj.showcase[id].searchMeta = `${t(
-              'showcase',
-            ).toLowerCase()} ${name.toLowerCase()}`
-          }
-          break
-        case 'f':
-          if (tempObj.showcase) {
-            const name = t(`poke_${id.slice(1).split('-')[0]}`)
-            tempObj.showcase[id] = {
-              name,
-              perms: ['eventStops'],
-            }
-            tempObj.showcase[id].searchMeta = `${t(
-              'showcase',
-            ).toLowerCase()} ${name.toLowerCase()}`
-          }
-          break
-        case 'd':
-          if (tempObj.quest_reward_3) {
-            tempObj.quest_reward_3[id] = {
-              name: `x${id.slice(1)}`,
-              perms: ['quests'],
-            }
-            tempObj.quest_reward_3[id].searchMeta = `${t(
-              'quest_reward_3',
-            ).toLowerCase()} ${tempObj.quest_reward_3[id].name.toLowerCase()}`
-          }
-          break
-        case 'm':
-          {
-            const monId = id && id.slice(1).split('-')[0]
-            if (tempObj.quest_reward_12 && pokemon[monId]) {
-              tempObj.quest_reward_12[id] = {
-                name: `${t(`poke_${monId}`)} x${id.split('-')[1]}`,
-                perms: ['quests'],
-                genId: `generation_${pokemon[monId].genId}`,
-                formTypes: pokemon[monId].types.map((x) => `poke_type_${x}`),
-                rarity: pokemon[monId].rarity,
-                family: pokemon[monId].family,
-              }
-              tempObj.quest_reward_12[id].searchMeta = `${Object.values(
-                tempObj.quest_reward_12[id],
-              )
-                .flatMap((x) => t(x))
-                .join(' ')
-                .toLowerCase()} ${t('quest_reward_12').toLowerCase()}`
-            }
-          }
-          break
-        case 'p':
-          if (tempObj.quest_reward_1) {
-            tempObj.quest_reward_1[id] = {
-              name: `x${id.slice(1)}`,
-              perms: ['quests'],
-            }
-            tempObj.quest_reward_1[id].searchMeta = `${t(
-              'quest_reward_1',
-            ).toLowerCase()} ${tempObj.quest_reward_1[id].name.toLowerCase()}`
-          }
-          break
-        case 'q':
-          if (tempObj.items) {
-            tempObj.items[id] = {
-              name: t(`item_${id.slice(1)}`),
-              perms: ['quests'],
-            }
-            tempObj.items[id].searchMeta = `${t(
-              'items',
-            ).toLowerCase()} ${tempObj.items[id].name.toLowerCase()}`
-          }
-          break
-        case 'l':
-          if (tempObj.lures) {
-            tempObj.lures[id] = {
-              name: t(`lure_${id.slice(1)}`),
-              perms: ['lures'],
-            }
-            tempObj.lures[id].searchMeta = `${t(
-              'lures',
-            ).toLowerCase()} ${tempObj.lures[id].name.toLowerCase()}`
-          }
-          break
-        case 'x':
-        case 'c':
-          {
-            const monId = id && id.slice(1)
-            if (
-              tempObj.quest_reward_4 &&
-              tempObj.quest_reward_9 &&
-              pokemon[monId]
-            ) {
-              const category =
-                id.charAt(0) === 'c' ? 'quest_reward_4' : 'quest_reward_9'
-              tempObj[category][id] = {
-                name: `${t(`poke_${monId}`)} ${
-                  id.charAt(0) === 'c' ? t('candy') : t('xl')
-                }`,
-                perms: ['quests'],
-                genId: `generation_${pokemon[monId].genId}`,
-                formTypes: pokemon[monId].types.map((x) => `poke_type_${x}`),
-                rarity: pokemon[monId].rarity,
-                family: pokemon[monId].family,
-              }
-              tempObj[category][id].searchMeta = `${Object.values(
-                tempObj[category][id],
-              )
-                .flatMap((x) => t(x))
-                .join(' ')
-                .toLowerCase()} ${t(category).toLowerCase()}`
-            }
-          }
-          break
-        case 'u':
-          if (tempObj.general) {
-            tempObj.general[id] = {
-              name: t(`quest_reward_${id.slice(1)}`),
-              perms: ['quests'],
-            }
-            tempObj.general[id].searchMeta = `${t(
-              'general',
-            ).toLowerCase()} ${tempObj.general[id].name.toLowerCase()}`
-          }
-          break
-        default:
-          if (tempObj.pokestops) {
-            tempObj.pokestops[id] = {
-              name: t('pokestop'),
-              perms: ['pokestops'],
-            }
-          }
-      }
-    }
-  })
-  return tempObj
-}
diff --git a/src/services/functions/checkHoliday.js b/src/services/functions/checkHoliday.js
deleted file mode 100644
index 30626ff27..000000000
--- a/src/services/functions/checkHoliday.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// @ts-check
-/**
- *
- * @param {import("packages/types/lib").Config['map']['holidayEffects'][number]} holiday
- * @returns
- */
-export function checkHoliday(holiday) {
-  if (!holiday.enabled) return false
-
-  const date = new Date()
-  const start = new Date(
-    date.getFullYear() - (holiday.startMonth > holiday.endMonth ? 1 : 0),
-    holiday.startMonth - 1,
-    holiday.startDay,
-    0,
-    0,
-    0,
-  )
-  const end = new Date(
-    date.getFullYear(),
-    holiday.endMonth - 1,
-    holiday.endDay,
-    23,
-    59,
-    59,
-  )
-  return date >= start && date <= end
-}
diff --git a/src/services/functions/fromSnakeCase.js b/src/services/functions/fromSnakeCase.js
deleted file mode 100644
index fd877f145..000000000
--- a/src/services/functions/fromSnakeCase.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @ts-check
-import { capitalize } from '@mui/material'
-
-/**
- * @param {string} str
- * @param {string} [separator]
- */
-export function fromSnakeCase(str, separator = ' ') {
-  return capitalize(str)
-    .replace(/_/g, separator)
-    .replace(/([a-z\d])([A-Z])/g, `$1${separator}$2`)
-    .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, `$1${separator}$2`)
-}
diff --git a/src/services/functions/getProperName.js b/src/services/functions/getProperName.js
deleted file mode 100644
index 4694f082d..000000000
--- a/src/services/functions/getProperName.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// @ts-check
-/**
- * @param {string} word
- */
-function getProperName(word) {
-  const capital = `${word.charAt(0).toUpperCase()}${word.slice(1)}`
-  return capital.replace(/([a-z0-9])([A-Z])/g, '$1 $2')
-}
-
-export default getProperName
diff --git a/src/services/i18n.js b/src/services/i18n.js
index 4797df774..727222412 100644
--- a/src/services/i18n.js
+++ b/src/services/i18n.js
@@ -1,7 +1,6 @@
 // @ts-check
 import i18n from 'i18next'
 import { initReactI18next } from 'react-i18next'
-
 import Backend from 'i18next-http-backend'
 import LanguageDetector from 'i18next-browser-languagedetector'
 
diff --git a/src/services/queries/available.js b/src/services/queries/available.js
index 645eceb68..14482bede 100644
--- a/src/services/queries/available.js
+++ b/src/services/queries/available.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-export const getMapData = gql`
+export const GET_MAP_DATA = gql`
   query MapData {
     available {
       masterfile
@@ -12,25 +12,25 @@ export const getMapData = gql`
   }
 `
 
-export const getAvailablePokemon = gql`
+export const GET_AVAILABLE_POKEMON = gql`
   query AvailablePokemon {
     availablePokemon
   }
 `
 
-export const getAvailablePokestops = gql`
+export const GET_AVAILABLE_POKESTOPS = gql`
   query AvailablePokestops {
     availablePokestops
   }
 `
 
-export const getAvailableGyms = gql`
+export const GET_AVAILABLE_GYMS = gql`
   query AvailableGyms {
     availableGyms
   }
 `
 
-export const getAvailableNests = gql`
+export const GET_AVAILABLE_NESTS = gql`
   query AvailableNests {
     availableNests
   }
diff --git a/src/services/queries/config.js b/src/services/queries/config.js
index bcfe63d68..da225bec6 100644
--- a/src/services/queries/config.js
+++ b/src/services/queries/config.js
@@ -51,3 +51,13 @@ export const SAVE_COMPONENT = gql`
     saveComponent(component: $component, code: $code)
   }
 `
+
+export const LOCALES_STATUS = gql`
+  query Locales($locale: String!) {
+    locales(locale: $locale) {
+      human
+      ai
+      missing
+    }
+  }
+`
diff --git a/src/services/queries/device.js b/src/services/queries/device.js
index ad48234e7..a236d1ce1 100644
--- a/src/services/queries/device.js
+++ b/src/services/queries/device.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-const getAllDevices = gql`
+export const GET_ALL_DEVICES = gql`
   query Devices($filters: JSON) {
     devices(filters: $filters) {
       id
@@ -15,5 +15,3 @@ const getAllDevices = gql`
     }
   }
 `
-
-export default getAllDevices
diff --git a/src/services/queries/geocoder.js b/src/services/queries/geocoder.js
index b25beedb5..461a69a35 100644
--- a/src/services/queries/geocoder.js
+++ b/src/services/queries/geocoder.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-export const Nominatim = gql`
+export const NOMINATIM = gql`
   fragment Nominatim on Geocoder {
     latitude
     longitude
diff --git a/src/services/queries/gym.js b/src/services/queries/gym.js
index e5992d631..f12eaa5f9 100644
--- a/src/services/queries/gym.js
+++ b/src/services/queries/gym.js
@@ -44,7 +44,7 @@ const raid = gql`
   }
 `
 
-export const getGyms = gql`
+export const GET_GYMS = gql`
   ${core}
   ${gym}
   query Gyms(
@@ -67,7 +67,7 @@ export const getGyms = gql`
   }
 `
 
-export const getRaids = gql`
+export const GET_RAIDS = gql`
   ${core}
   ${raid}
   query Raids(
@@ -90,7 +90,7 @@ export const getRaids = gql`
   }
 `
 
-export const getGymsRaids = gql`
+export const GET_GYMS_RAIDS = gql`
   ${core}
   ${gym}
   ${raid}
@@ -115,7 +115,7 @@ export const getGymsRaids = gql`
   }
 `
 
-export const getOne = gql`
+export const GET_ONE_GYM = gql`
   query GetOneGym($id: ID!, $perm: String!) {
     gymsSingle(id: $id, perm: $perm) {
       lat
@@ -124,7 +124,7 @@ export const getOne = gql`
   }
 `
 
-export const getBadges = gql`
+export const GET_BADGES = gql`
   query GetBadgeInfo {
     badges {
       id
diff --git a/src/services/queries/index.js b/src/services/queries/index.js
new file mode 100644
index 000000000..dec7b04e2
--- /dev/null
+++ b/src/services/queries/index.js
@@ -0,0 +1,178 @@
+// @ts-check
+import { useMemory } from '@store/useMemory'
+
+import * as gymIndex from './gym'
+import * as pokestopIndex from './pokestop'
+import * as pokemonIndex from './pokemon'
+import * as portalIndex from './portal'
+import * as searchIndex from './search'
+import * as webhookIndex from './webhook'
+import * as user from './user'
+import { GET_ALL_DEVICES } from './device'
+import { GET_ALL_SPAWNPOINTS } from './spawnpoint'
+import { GET_ALL_WEATHER } from './weather'
+import { GET_ALL_SCAN_CELLS } from './scanCell'
+import { GET_ALL_SUBMISSION_CELLS } from './submissionCells'
+import { GET_ONE_NEST, GET_ALL_NESTS, NEST_SUBMISSION } from './nest'
+import { GET_ALL_SCAN_AREAS, GET_SCAN_AREAS_MENU } from './scanAreas'
+import { S2_CELLS } from './s2cell'
+import { GET_ROUTE, GET_ROUTES } from './route'
+
+export class Query {
+  /**
+   * @param {Record<string, boolean>} object
+   * @returns {string}
+   */
+  static build(object) {
+    let query = 'GET'
+    Object.entries(object).forEach(([key, value]) => {
+      if (value) query += `_${key.toUpperCase()}`
+    })
+    return query
+  }
+
+  static devices() {
+    return GET_ALL_DEVICES
+  }
+
+  /** @param {import('@rm/types').AllFilters['gyms'] | 'id' | 'badges'} filters */
+  static gyms(filters) {
+    const perms = useMemory.getState().ui.gyms
+    if (filters === 'id') {
+      return gymIndex.GET_ONE_GYM
+    }
+    if (filters === 'badges') {
+      return gymIndex.GET_BADGES
+    }
+    let query = Query.build({
+      Gyms: filters.raids
+        ? filters.allGyms || perms.allGyms
+        : filters.allGyms && perms.allGyms,
+      Raids: filters.raids && perms.raids,
+    })
+    if (
+      query === 'GET' &&
+      (filters.exEligible ||
+        filters.inBattle ||
+        filters.arEligible ||
+        filters.gymBadges)
+    ) {
+      query += '_GYMS'
+    }
+
+    return gymIndex[query]
+  }
+
+  /** @param {import('@rm/types').AllFilters['nests'] | 'id' | 'nestSubmission'} filters */
+  static nests(filters) {
+    if (filters === 'id') {
+      return GET_ONE_NEST
+    }
+    if (filters === 'nestSubmission') {
+      return NEST_SUBMISSION
+    }
+    return GET_ALL_NESTS
+  }
+
+  /** @param {import('@rm/types').AllFilters['pokestops'] | 'id'} filters */
+  static pokestops(filters) {
+    const perms = useMemory.getState().ui.pokestops
+    if (filters === 'id') {
+      return pokestopIndex.GET_ONE_POKESTOP
+    }
+    let query = Query.build({
+      Lures: filters.lures && perms.lures,
+      Quests: filters.quests && perms.quests,
+      Invasions: filters.invasions && perms.invasions,
+      Events: filters.eventStops && perms.eventStops,
+    })
+
+    if (query === 'GET') query += '_POKESTOPS'
+    return pokestopIndex[query]
+  }
+
+  /** @param {import('@rm/types').AllFilters['pokemon'] | 'id'} filters */
+  static pokemon(filters) {
+    const perms = useMemory.getState().ui.pokemon
+    if (filters === 'id') {
+      return pokemonIndex.GET_ONE_POKEMON
+    }
+    let query = Query.build({
+      Ivs: perms.iv,
+      Pvp: perms.pvp,
+    })
+    if (query === 'GET') query += '_POKEMON'
+
+    return pokemonIndex[query]
+  }
+
+  /** @param {import('@rm/types').AllFilters['portals'] | 'id'} filters */
+  static portals(filters) {
+    if (filters === 'id') {
+      return portalIndex.GET_ONE_PORTAL
+    }
+
+    return portalIndex.GET_ALL_PORTALS
+  }
+
+  static scanCells() {
+    return GET_ALL_SCAN_CELLS
+  }
+
+  static spawnpoints() {
+    return GET_ALL_SPAWNPOINTS
+  }
+
+  static submissionCells() {
+    return GET_ALL_SUBMISSION_CELLS
+  }
+
+  static weather() {
+    return GET_ALL_WEATHER
+  }
+
+  static scanAreas() {
+    return GET_ALL_SCAN_AREAS
+  }
+
+  static scanAreasMenu() {
+    return GET_SCAN_AREAS_MENU
+  }
+
+  /** @param {string} category */
+  static search(category) {
+    switch (category) {
+      case 'lures':
+      case 'raids':
+      case 'nests':
+      case 'quests':
+      case 'invasions':
+      case 'pokemon':
+        return searchIndex[category.toUpperCase()]
+      case 'webhook':
+        return searchIndex.POI_WEBHOOK
+      default:
+        return searchIndex.POI
+    }
+  }
+
+  /** @param {keyof typeof webhookIndex} type */
+  static webhook(type) {
+    return webhookIndex[type]
+  }
+
+  /** @param {keyof typeof user} type */
+  static user(type) {
+    return user[type]
+  }
+
+  static s2cells() {
+    return S2_CELLS
+  }
+
+  /** @param {import('@rm/types').AllFilters['routes'] | 'getOne'} method */
+  static routes(method) {
+    if (method === 'getOne') return GET_ROUTE
+    return GET_ROUTES
+  }
+}
diff --git a/src/services/queries/nest.js b/src/services/queries/nest.js
index 8cfdee00e..63c58ae38 100644
--- a/src/services/queries/nest.js
+++ b/src/services/queries/nest.js
@@ -8,7 +8,7 @@ const core = gql`
   }
 `
 
-export const getAllNests = gql`
+export const GET_ALL_NESTS = gql`
   ${core}
   query Nests(
     $minLat: Float!
@@ -36,7 +36,7 @@ export const getAllNests = gql`
   }
 `
 
-export const getOne = gql`
+export const GET_ONE_NEST = gql`
   ${core}
   query GetOneNest($id: ID!, $perm: String!) {
     nestsSingle(id: $id, perm: $perm) {
@@ -45,7 +45,7 @@ export const getOne = gql`
   }
 `
 
-export const nestSubmission = gql`
+export const NEST_SUBMISSION = gql`
   mutation NestSubmission($id: ID!, $name: String!) {
     nestSubmission(id: $id, name: $name)
   }
diff --git a/src/services/queries/pokemon.js b/src/services/queries/pokemon.js
index 799c26e30..b2cf055bc 100644
--- a/src/services/queries/pokemon.js
+++ b/src/services/queries/pokemon.js
@@ -43,7 +43,7 @@ const pvp = gql`
   }
 `
 
-export const getPokemon = gql`
+export const GET_POKEMON = gql`
   ${core}
   query Pokemon(
     $minLat: Float!
@@ -64,7 +64,7 @@ export const getPokemon = gql`
   }
 `
 
-export const getIvs = gql`
+export const GET_IVS = gql`
   ${core}
   ${ivs}
   query PokemonIVs(
@@ -87,7 +87,7 @@ export const getIvs = gql`
   }
 `
 
-export const getPvp = gql`
+export const GET_PVP = gql`
   ${core}
   ${pvp}
   query PokemonPVP(
@@ -110,7 +110,7 @@ export const getPvp = gql`
   }
 `
 
-export const getIvsPvp = gql`
+export const GET_IVS_PVP = gql`
   ${core}
   ${ivs}
   ${pvp}
@@ -135,7 +135,7 @@ export const getIvsPvp = gql`
   }
 `
 
-export const getOne = gql`
+export const GET_ONE_POKEMON = gql`
   query GetOnePokemon($id: ID!, $perm: String!) {
     pokemonSingle(id: $id, perm: $perm) {
       lat
diff --git a/src/services/queries/pokestop.js b/src/services/queries/pokestop.js
index 076b5abfb..4e9d5aa3a 100644
--- a/src/services/queries/pokestop.js
+++ b/src/services/queries/pokestop.js
@@ -95,7 +95,7 @@ const event = gql`
   }
 `
 
-export const getPokestops = gql`
+export const GET_POKESTOPS = gql`
   ${core}
   query Pokestops(
     $minLat: Float!
@@ -116,7 +116,7 @@ export const getPokestops = gql`
   }
 `
 
-export const getLures = gql`
+export const GET_LURES = gql`
   ${core}
   ${lure}
   query Lures(
@@ -139,7 +139,7 @@ export const getLures = gql`
   }
 `
 
-export const getQuests = gql`
+export const GET_QUESTS = gql`
   ${core}
   ${quest}
   query Quests(
@@ -162,7 +162,7 @@ export const getQuests = gql`
   }
 `
 
-export const getInvasions = gql`
+export const GET_INVASIONS = gql`
   ${core}
   ${invasion}
   query Invasions(
@@ -185,7 +185,7 @@ export const getInvasions = gql`
   }
 `
 
-export const getEvents = gql`
+export const GET_EVENTS = gql`
   ${core}
   ${event}
   query Events(
@@ -208,7 +208,7 @@ export const getEvents = gql`
   }
 `
 
-export const getLuresQuests = gql`
+export const GET_LURES_QUESTS = gql`
   ${core}
   ${lure}
   ${quest}
@@ -233,7 +233,7 @@ export const getLuresQuests = gql`
   }
 `
 
-export const getLuresInvasions = gql`
+export const GET_LURES_INVASIONS = gql`
   ${core}
   ${lure}
   ${invasion}
@@ -258,7 +258,7 @@ export const getLuresInvasions = gql`
   }
 `
 
-export const getLuresEvents = gql`
+export const GET_LURES_EVENTS = gql`
   ${core}
   ${lure}
   ${event}
@@ -283,7 +283,7 @@ export const getLuresEvents = gql`
   }
 `
 
-export const getQuestsInvasions = gql`
+export const GET_QUESTS_INVASIONS = gql`
   ${core}
   ${quest}
   ${invasion}
@@ -308,7 +308,7 @@ export const getQuestsInvasions = gql`
   }
 `
 
-export const getQuestsEvents = gql`
+export const GET_QUESTS_EVENTS = gql`
   ${core}
   ${quest}
   ${event}
@@ -333,7 +333,7 @@ export const getQuestsEvents = gql`
   }
 `
 
-export const getInvasionsEvents = gql`
+export const GET_INVASIONS_EVENTS = gql`
   ${core}
   ${invasion}
   ${event}
@@ -358,7 +358,7 @@ export const getInvasionsEvents = gql`
   }
 `
 
-export const getLuresQuestsInvasions = gql`
+export const GET_LURES_QUESTS_INVASIONS = gql`
   ${core}
   ${lure}
   ${quest}
@@ -385,7 +385,7 @@ export const getLuresQuestsInvasions = gql`
   }
 `
 
-export const getLuresQuestsEvents = gql`
+export const GET_LURES_QUESTS_EVENTS = gql`
   ${core}
   ${lure}
   ${quest}
@@ -412,7 +412,7 @@ export const getLuresQuestsEvents = gql`
   }
 `
 
-export const getLuresInvasionsEvents = gql`
+export const GET_LURES_INVASIONS_EVENTS = gql`
   ${core}
   ${lure}
   ${invasion}
@@ -439,7 +439,7 @@ export const getLuresInvasionsEvents = gql`
   }
 `
 
-export const getQuestsInvasionsEvents = gql`
+export const GET_QUESTS_INVASIONS_EVENTS = gql`
   ${core}
   ${quest}
   ${invasion}
@@ -466,7 +466,7 @@ export const getQuestsInvasionsEvents = gql`
   }
 `
 
-export const getLuresQuestsInvasionsEvents = gql`
+export const GET_LURES_QUESTS_INVASIONS_EVENTS = gql`
   ${core}
   ${lure}
   ${quest}
@@ -495,7 +495,7 @@ export const getLuresQuestsInvasionsEvents = gql`
   }
 `
 
-export const getOne = gql`
+export const GET_ONE_POKESTOP = gql`
   query GetOnePokestop($id: ID!, $perm: String!) {
     pokestopsSingle(id: $id, perm: $perm) {
       lat
diff --git a/src/services/queries/portal.js b/src/services/queries/portal.js
index a192285b6..9537aa4cb 100644
--- a/src/services/queries/portal.js
+++ b/src/services/queries/portal.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-export const getAllPortals = gql`
+export const GET_ALL_PORTALS = gql`
   query Portals(
     $minLat: Float!
     $minLon: Float!
@@ -26,7 +26,7 @@ export const getAllPortals = gql`
   }
 `
 
-export const getOne = gql`
+export const GET_ONE_PORTAL = gql`
   query GetOnePortal($id: ID!, $perm: String!) {
     portalsSingle(id: $id, perm: $perm) {
       lat
diff --git a/src/services/queries/route.js b/src/services/queries/route.js
index e04ad1c7b..f8ee87f94 100644
--- a/src/services/queries/route.js
+++ b/src/services/queries/route.js
@@ -10,7 +10,7 @@ const core = gql`
   }
 `
 
-export const getRoute = gql`
+export const GET_ROUTE = gql`
   ${core}
   query Route($id: ID) {
     route(id: $id) {
@@ -32,7 +32,7 @@ export const getRoute = gql`
   }
 `
 
-export const getRoutes = gql`
+export const GET_ROUTES = gql`
   ${core}
   query Routes(
     $minLat: Float!
diff --git a/src/services/queries/s2cell.js b/src/services/queries/s2cell.js
index 526b3aee8..d11073f74 100644
--- a/src/services/queries/s2cell.js
+++ b/src/services/queries/s2cell.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-export default gql`
+export const S2_CELLS = gql`
   query S2Cells(
     $minLat: Float!
     $minLon: Float!
diff --git a/src/services/queries/scanAreas.js b/src/services/queries/scanAreas.js
index 726c2af3a..f29b399fd 100644
--- a/src/services/queries/scanAreas.js
+++ b/src/services/queries/scanAreas.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-export const getAllScanAreas = gql`
+export const GET_ALL_SCAN_AREAS = gql`
   query ScanAreas {
     scanAreas {
       type
@@ -9,7 +9,7 @@ export const getAllScanAreas = gql`
   }
 `
 
-export const getScanAreasMenu = gql`
+export const GET_SCAN_AREAS_MENU = gql`
   query ScanAreasMenu {
     scanAreasMenu {
       name
diff --git a/src/services/queries/scanCell.js b/src/services/queries/scanCell.js
index aec065f11..2954ddf6a 100644
--- a/src/services/queries/scanCell.js
+++ b/src/services/queries/scanCell.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-const getAllScanCells = gql`
+export const GET_ALL_SCAN_CELLS = gql`
   query ScanCells(
     $minLat: Float!
     $minLon: Float!
@@ -25,5 +25,3 @@ const getAllScanCells = gql`
     }
   }
 `
-
-export default getAllScanCells
diff --git a/src/services/queries/search.js b/src/services/queries/search.js
index ea2e07ac2..d66eac5ac 100644
--- a/src/services/queries/search.js
+++ b/src/services/queries/search.js
@@ -1,5 +1,4 @@
 import { gql } from '@apollo/client'
-import { Nominatim } from './geocoder'
 
 const core = gql`
   fragment CoreSearch on Search {
@@ -12,7 +11,7 @@ const core = gql`
   }
 `
 
-export const poi = gql`
+export const POI = gql`
   ${core}
   query SearchPoi(
     $search: String!
@@ -35,7 +34,7 @@ export const poi = gql`
   }
 `
 
-export const lures = gql`
+export const LURES = gql`
   query SearchLures(
     $search: String!
     $category: String!
@@ -63,15 +62,13 @@ export const lures = gql`
   }
 `
 
-export const poiWebhook = gql`
-  ${Nominatim}
+export const POI_WEBHOOK = gql`
   query SearchWebhook(
     $search: String!
     $category: String!
     $lat: Float!
     $lon: Float!
     $locale: String!
-    $webhookName: String
     $onlyAreas: [String]
   ) {
     search(
@@ -80,19 +77,16 @@ export const poiWebhook = gql`
       lat: $lat
       lon: $lon
       locale: $locale
-      webhookName: $webhookName
       onlyAreas: $onlyAreas
     ) {
       id
       name
-      formatted {
-        ...Nominatim
-      }
+      formatted
     }
   }
 `
 
-export const nests = gql`
+export const NESTS = gql`
   ${core}
   query SearchNests(
     $search: String!
@@ -117,7 +111,7 @@ export const nests = gql`
   }
 `
 
-export const pokemon = gql`
+export const POKEMON = gql`
   ${core}
   query SearchPokemon(
     $search: String!
@@ -147,7 +141,7 @@ export const pokemon = gql`
   }
 `
 
-export const quests = gql`
+export const QUESTS = gql`
   query SearchQuests(
     $search: String!
     $category: String!
@@ -192,7 +186,7 @@ export const quests = gql`
   }
 `
 
-export const raids = gql`
+export const RAIDS = gql`
   ${core}
   query SearchRaids(
     $search: String!
@@ -221,7 +215,7 @@ export const raids = gql`
   }
 `
 
-export const invasions = gql`
+export const INVASIONS = gql`
   query SearchInvasions(
     $search: String!
     $category: String!
diff --git a/src/services/queries/spawnpoint.js b/src/services/queries/spawnpoint.js
index 8fc8f540f..304789288 100644
--- a/src/services/queries/spawnpoint.js
+++ b/src/services/queries/spawnpoint.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-const getAllSpawnpoints = gql`
+export const GET_ALL_SPAWNPOINTS = gql`
   query Spawnpoints(
     $minLat: Float!
     $minLon: Float!
@@ -23,5 +23,3 @@ const getAllSpawnpoints = gql`
     }
   }
 `
-
-export default getAllSpawnpoints
diff --git a/src/services/queries/submissionCells.js b/src/services/queries/submissionCells.js
index b9e1e35d0..308e93bd3 100644
--- a/src/services/queries/submissionCells.js
+++ b/src/services/queries/submissionCells.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-const getAllSubmissionCells = gql`
+export const GET_ALL_SUBMISSION_CELLS = gql`
   query SubmissionCells(
     $minLat: Float!
     $minLon: Float!
@@ -38,5 +38,3 @@ const getAllSubmissionCells = gql`
     }
   }
 `
-
-export default getAllSubmissionCells
diff --git a/src/services/queries/user.js b/src/services/queries/user.js
index 39602bcca..08812471e 100644
--- a/src/services/queries/user.js
+++ b/src/services/queries/user.js
@@ -1,36 +1,36 @@
 import { gql } from '@apollo/client'
 
-export const setTutorial = gql`
+export const SET_TUTORIAL = gql`
   mutation SetTutorial($tutorial: Boolean!) {
     tutorial(tutorial: $tutorial)
   }
 `
 
-export const setWebhookStrategy = gql`
+export const SET_WEBHOOK_STRATEGY = gql`
   mutation SetStrategy($strategy: String!) {
     strategy(strategy: $strategy)
   }
 `
 
-export const checkUsername = gql`
+export const CHECK_USERNAME = gql`
   query CheckUsername($username: String!) {
     checkUsername(username: $username)
   }
 `
 
-export const setGymBadge = gql`
+export const SET_GYM_BADGE = gql`
   mutation SetGymBadge($gymId: String!, $badge: Int!) {
     setGymBadge(gymId: $gymId, badge: $badge)
   }
 `
 
-export const setExtraFields = gql`
+export const SET_EXTRA_FIELDS = gql`
   mutation SetExtraFields($key: String, $value: String) {
     setExtraFields(key: $key, value: $value)
   }
 `
 
-export const getBackups = gql`
+export const GET_BACKUPS = gql`
   query GetBackups {
     backups {
       id
@@ -41,7 +41,7 @@ export const getBackups = gql`
   }
 `
 
-export const getFullBackup = gql`
+export const GET_FULL_BACKUP = gql`
   query GetFullBackup($id: ID!) {
     backup(id: $id) {
       name
@@ -50,19 +50,19 @@ export const getFullBackup = gql`
   }
 `
 
-export const createBackup = gql`
+export const CREATE_BACKUP = gql`
   mutation CreateBackup($backup: BackupCreate!) {
     createBackup(backup: $backup)
   }
 `
 
-export const updateBackup = gql`
+export const UPDATE_BACKUP = gql`
   mutation UpdateBackup($backup: BackupUpdate!) {
     updateBackup(backup: $backup)
   }
 `
 
-export const deleteBackup = gql`
+export const DELETE_BACKUP = gql`
   mutation DeleteBackup($id: ID!) {
     deleteBackup(id: $id)
   }
diff --git a/src/services/queries/weather.js b/src/services/queries/weather.js
index a05810f83..9a919941d 100644
--- a/src/services/queries/weather.js
+++ b/src/services/queries/weather.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client'
 
-const getAllWeather = gql`
+export const GET_ALL_WEATHER = gql`
   query Weather(
     $minLat: Float!
     $minLon: Float!
@@ -24,5 +24,3 @@ const getAllWeather = gql`
     }
   }
 `
-
-export default getAllWeather
diff --git a/src/services/queries/webhook.js b/src/services/queries/webhook.js
index e02b6debb..9c038d3e6 100644
--- a/src/services/queries/webhook.js
+++ b/src/services/queries/webhook.js
@@ -167,7 +167,7 @@ const Pokemon = gql`
   }
 `
 
-export const Profile = gql`
+export const PROFILE = gql`
   fragment PoracleProfile on Poracle {
     profile {
       active_hours {
@@ -246,7 +246,7 @@ const Weather = gql`
   }
 `
 
-export const allProfiles = gql`
+export const ALL_PROFILES = gql`
   ${Human}
   ${Egg}
   ${Gym}
@@ -254,7 +254,7 @@ export const allProfiles = gql`
   ${Lure}
   ${Nest}
   ${Pokemon}
-  ${Profile}
+  ${PROFILE}
   ${Quest}
   ${Raid}
   ${Weather}
@@ -284,7 +284,7 @@ export const WEBHOOK_AREAS = gql`
   }
 `
 
-export const quickAdd = gql`
+export const QUICK_ADD = gql`
   ${Human}
   ${Egg}
   ${Gym}
@@ -292,7 +292,7 @@ export const quickAdd = gql`
   ${Lure}
   ${Nest}
   ${Pokemon}
-  ${Profile}
+  ${PROFILE}
   ${Quest}
   ${Raid}
   ${Weather}
@@ -315,7 +315,7 @@ export const quickAdd = gql`
   }
 `
 
-export const setHuman = gql`
+export const SET_HUMAN = gql`
   ${base}
   ${Human}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -326,9 +326,9 @@ export const setHuman = gql`
   }
 `
 
-export const setProfile = gql`
+export const SET_PROFILE = gql`
   ${base}
-  ${Profile}
+  ${PROFILE}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
     webhook(data: $data, category: $category, status: $status) {
       ...Base
@@ -337,7 +337,7 @@ export const setProfile = gql`
   }
 `
 
-export const pokemon = gql`
+export const POKEMON = gql`
   ${base}
   ${Pokemon}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -348,7 +348,7 @@ export const pokemon = gql`
   }
 `
 
-export const raid = gql`
+export const RAID = gql`
   ${base}
   ${Raid}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -359,7 +359,7 @@ export const raid = gql`
   }
 `
 
-export const egg = gql`
+export const EGG = gql`
   ${base}
   ${Egg}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -370,7 +370,7 @@ export const egg = gql`
   }
 `
 
-export const gym = gql`
+export const GYM = gql`
   ${base}
   ${Gym}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -381,7 +381,7 @@ export const gym = gql`
   }
 `
 
-export const invasion = gql`
+export const INVASION = gql`
   ${base}
   ${Invasion}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -392,7 +392,7 @@ export const invasion = gql`
   }
 `
 
-export const lure = gql`
+export const LURE = gql`
   ${base}
   ${Lure}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -403,7 +403,7 @@ export const lure = gql`
   }
 `
 
-export const nest = gql`
+export const NEST = gql`
   ${base}
   ${Nest}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
@@ -414,7 +414,7 @@ export const nest = gql`
   }
 `
 
-export const quest = gql`
+export const QUEST = gql`
   ${base}
   ${Quest}
   mutation Webhook($data: JSON, $category: String!, $status: String!) {
diff --git a/src/hooks/useLayoutStore.js b/src/store/useLayoutStore.js
similarity index 72%
rename from src/hooks/useLayoutStore.js
rename to src/store/useLayoutStore.js
index 8188197c7..07cab5be1 100644
--- a/src/hooks/useLayoutStore.js
+++ b/src/store/useLayoutStore.js
@@ -1,7 +1,8 @@
 // @ts-check
 import { create } from 'zustand'
 
-import Utility from '@services/Utility'
+import { analytics } from '@utils/analytics'
+
 import { useStorage } from './useStorage'
 
 /**
@@ -27,8 +28,8 @@ import { useStorage } from './useStorage'
  *  },
  *  dialog: {
  *    open: boolean,
- *    category: import('@rm/types').AdvCategories | '',
- *    type: string,
+ *    category: keyof import('@rm/types').UIObject | 'notifications' | '',
+ *    type: 'options' | 'filters' | '',
  *  },
  *  gymBadge: {
  *   open: boolean,
@@ -70,19 +71,27 @@ export const useLayoutStore = create(() => ({
   },
 }))
 
-export const toggleDialog = (open, category, type, filter) => (event) => {
-  Utility.analytics(
+/**
+ *
+ * @param {boolean} open
+ * @param {UseLayoutStore['dialog']['category']} [category]
+ * @param {UseLayoutStore['dialog']['type']} [type]
+ * @param {import('@rm/types').BaseFilter | import('@rm/types').PokemonFilter} [filter]
+ * @returns {() => void}
+ */
+export const toggleDialog = (open, category, type, filter) => () => {
+  analytics(
     'Menu Toggle',
     `Open: ${open}`,
     `Category: ${category} Menu: ${type}`,
   )
-  if (
-    event.type === 'keydown' &&
-    (event.key === 'Tab' || event.key === 'Shift')
-  ) {
-    return
-  }
-  useLayoutStore.setState({ dialog: { open, category, type } })
+  useLayoutStore.setState((prev) => ({
+    dialog: {
+      open,
+      category: category || prev.dialog.category,
+      type: type || prev.dialog.type,
+    },
+  }))
   if (filter && type === 'filters') {
     useStorage.setState((prev) => ({
       filters: {
diff --git a/src/hooks/useMapStore.js b/src/store/useMapStore.js
similarity index 100%
rename from src/hooks/useMapStore.js
rename to src/store/useMapStore.js
diff --git a/src/hooks/useMemory.js b/src/store/useMemory.js
similarity index 73%
rename from src/hooks/useMemory.js
rename to src/store/useMemory.js
index d275f5f16..ca6ed8d7c 100644
--- a/src/hooks/useMemory.js
+++ b/src/store/useMemory.js
@@ -8,8 +8,8 @@ import { create } from 'zustand'
  *   active: boolean,
  *   online: boolean,
  *   searchLoading: boolean,
- *   Icons: InstanceType<typeof import("../services/Icons").default>,
- *   Audio: InstanceType<typeof import("../services/Icons").default>,
+ *   Icons: InstanceType<typeof import("../services/Assets").UAssets>,
+ *   Audio: InstanceType<typeof import("../services/Assets").UAssets>,
  *   config: import('@rm/types').Config['map'],
  *   ui: import('@rm/types').UIObject,
  *   auth: {
@@ -32,18 +32,19 @@ import { create } from 'zustand'
  *   },
  *   glowRules: ((pkmn: import('@rm/types').Pokemon) => string)[],
  *   menus: ReturnType<import('server/src/services/ui/advMenus')>
+ *   menuFilters: import('@rm/types').ClientFilterObj,
  *   filters: import('@rm/types').AllFilters,
  *   masterfile: import('@rm/masterfile').Masterfile
  *   polling: import('@rm/types').Config['api']['polling'],
  *   gymValidDataLimit: number
- *   settings: Record<keyof import('./useStorage').UseStorage['settings'], { name: string }>
+ *   settings: { [K in keyof import('./useStorage').UseStorage['settings']]: Record<string, K extends 'tileServers' ? import('@rm/types').TileLayer : K extends 'navigation' ? { name: string, url: string } : { name: string }> }
  *   userSettings: ReturnType<import('server/src/services/ui/clientOptions')>['clientValues']
  *   clientMenus: ReturnType<import('server/src/services/ui/clientOptions')>['clientMenus']
  *   clientError: string,
  *   timeOfDay: import('@rm/types').TimesOfDay,
  *   hideList: Set<string | number>,
  *   timerList: string[],
- *   tileStyle: 'light' | 'dark',
+ *   tileStyle: import('@rm/types').Theme,
  *   reset: boolean,
  *   theme: {
  *     primary: string,
@@ -61,11 +62,13 @@ import { create } from 'zustand'
  *     id: number | string,
  *   },
  *   extraUserFields: (import('@rm/types').ExtraField | string)[],
+ *   advMenuCounts: { [K in keyof import('./useStorage').UseStorage['advMenu']]: { total: number, show: number } }
+ *   advMenuFiltered: { [K in keyof import('./useStorage').UseStorage['advMenu']]: string[] }
  * }} UseMemory
  *
  * @type {import("zustand").UseBoundStore<import("zustand").StoreApi<UseMemory>>}
  */
-export const useMemory = create((set) => ({
+export const useMemory = create(() => ({
   isMobile: false,
   isTablet: false,
   active: true,
@@ -98,7 +101,19 @@ export const useMemory = create((set) => ({
     userBackupLimits: 0,
   },
   glowRules: [],
-  config: {},
+  config: {
+    holidayEffects: [],
+    clustering: {},
+    customRoutes: {},
+    donationPage: {},
+    general: {},
+    links: {},
+    loginPage: {},
+    map: {},
+    messageOfTheDay: {},
+    misc: {},
+    theme: {},
+  },
   filters: {},
   menus: {},
   clientMenus: {},
@@ -123,18 +138,24 @@ export const useMemory = create((set) => ({
   },
   hideList: new Set(),
   timerList: [],
-  webhookAlert: {
-    open: false,
-    severity: 'info',
-    message: '',
-  },
-  setWebhookAlert: (webhookAlert) => set({ webhookAlert }),
   timeOfDay: 'day',
   extraUserFields: [],
   manualParams: {
     category: '',
     id: '',
   },
+  advMenuCounts: {
+    pokemon: { count: 0, show: 0 },
+    gyms: { count: 0, show: 0 },
+    pokestops: { count: 0, show: 0 },
+    nests: { count: 0, show: 0 },
+  },
+  advMenuFiltered: {
+    gyms: [],
+    pokestops: [],
+    pokemon: [],
+    nests: [],
+  },
 }))
 
 /**
diff --git a/src/hooks/useStorage.js b/src/store/useStorage.js
similarity index 96%
rename from src/hooks/useStorage.js
rename to src/store/useStorage.js
index 1a1144d0f..22c90e663 100644
--- a/src/hooks/useStorage.js
+++ b/src/store/useStorage.js
@@ -1,9 +1,10 @@
-import { setDeep } from '@services/functions/setDeep'
 import dlv from 'dlv'
 import { useCallback, useMemo } from 'react'
 import { create } from 'zustand'
 import { persist, createJSONStorage } from 'zustand/middleware'
 
+import { setDeep } from '@utils/setDeep'
+
 /**
  * TODO: Finish this
  * @typedef {{
@@ -20,8 +21,15 @@ import { persist, createJSONStorage } from 'zustand/middleware'
  *    tileServers: string
  *    distanceUnit: 'kilometers' | 'miles'
  *   },
+ *   advMenu: {
+ *    pokemon: string,
+ *    gyms: string,
+ *    pokestops: string,
+ *    nests: string,
+ *   }
  *   searches: Record<string, string>,
  *   tabs: Record<string, number>,
+ *   expanded: Record<string, boolean>,
  *   menus: ReturnType<import('server/src/services/ui/advMenus')>
  *   holidayEffects: Record<string, boolean>,
  *   motdIndex: number
@@ -114,6 +122,7 @@ export const useStorage = create(
       settings: {},
       searches: {},
       tabs: {},
+      expanded: {},
       userSettings: {},
       icons: {},
       audio: {},
diff --git a/src/components/layout/dialogs/webhooks/store.js b/src/store/useWebhookStore.js
similarity index 67%
rename from src/components/layout/dialogs/webhooks/store.js
rename to src/store/useWebhookStore.js
index 0ce833b0d..c338aaa37 100644
--- a/src/components/layout/dialogs/webhooks/store.js
+++ b/src/store/useWebhookStore.js
@@ -1,4 +1,6 @@
 // @ts-check
+import { apolloClient } from '@services/apollo'
+import { SET_HUMAN, WEBHOOK_AREAS } from '@services/queries/webhook'
 import { create } from 'zustand'
 
 /**
@@ -29,6 +31,7 @@ import { create } from 'zustand'
  *  trackedSearch: string
  *  selected: Record<string, boolean>
  *  tempFilters: Record<string, any>
+ *  profileLoading: null | number
  *  advanced: {
  *    id: string
  *    uid: number
@@ -72,6 +75,7 @@ export const useWebhookStore = create(() => ({
   trackedSearch: '',
   selected: {},
   tempFilters: {},
+  profileLoading: null,
   advanced: {
     id: '',
     uid: 0,
@@ -145,3 +149,57 @@ export const applyToAllWebhooks = (enabled, ids) => {
     ),
   }))
 }
+
+/** @param {string} areaName @param {string} [groupName] */
+export const handleClick =
+  (areaName, groupName = '') =>
+  async () => {
+    /** @type {{ group: string, children: string[] }[]} */
+    const areas =
+      apolloClient.cache.readQuery({
+        query: WEBHOOK_AREAS,
+      }).webhookAreas || []
+    const incomingArea = areaName.toLowerCase()
+    const { human } = useWebhookStore.getState()
+    const existing = human.area || []
+    const foundGroup = areas.find((group) => group.group === groupName) || {
+      children: [],
+      group: '',
+    }
+    const withLowerCase = {
+      group: foundGroup.group,
+      children: foundGroup.children.map((a) => a.toLowerCase()),
+    }
+
+    let newAreas = []
+    if (incomingArea === 'all') {
+      newAreas = withLowerCase.group
+        ? [...existing, ...withLowerCase.children]
+        : areas.flatMap((group) => group.children)
+    } else if (incomingArea === 'none') {
+      newAreas = groupName
+        ? existing.filter((a) => !withLowerCase.children.includes(a))
+        : []
+    } else {
+      newAreas = existing.includes(incomingArea)
+        ? existing.filter((a) => a !== incomingArea)
+        : [...existing, incomingArea]
+    }
+    newAreas = [...new Set(newAreas)]
+
+    await apolloClient
+      .mutate({
+        mutation: SET_HUMAN,
+        variables: {
+          category: 'setAreas',
+          data: newAreas,
+          status: 'POST',
+        },
+      })
+      .then(({ data }) => {
+        if (data?.webhook?.human) {
+          useWebhookStore.setState({ human: data.webhook.human })
+        }
+      })
+    return newAreas
+  }
diff --git a/src/utils/analytics.js b/src/utils/analytics.js
new file mode 100644
index 000000000..f7f775539
--- /dev/null
+++ b/src/utils/analytics.js
@@ -0,0 +1,28 @@
+import ReactGA from 'react-ga4'
+
+/**
+ *
+ * @param {string} category
+ * @param {string} [action]
+ * @param {string} [label]
+ * @param {boolean} [nonInteraction]
+ */
+export function analytics(
+  category,
+  action = '',
+  label = '',
+  nonInteraction = false,
+) {
+  if (CONFIG.googleAnalyticsId) {
+    if (action) {
+      ReactGA.event({
+        category,
+        action,
+        label,
+        nonInteraction,
+      })
+    } else {
+      ReactGA.pageview(category)
+    }
+  }
+}
diff --git a/src/services/filtering/applyToAll.js b/src/utils/applyToAll.js
similarity index 84%
rename from src/services/filtering/applyToAll.js
rename to src/utils/applyToAll.js
index f46aa4ba2..179a3d408 100644
--- a/src/services/filtering/applyToAll.js
+++ b/src/utils/applyToAll.js
@@ -1,8 +1,8 @@
 // @ts-check
 
-import { useMemory } from '@hooks/useMemory'
-import { useStorage, setDeepStore } from '@hooks/useStorage'
-import Utility from '@services/Utility'
+import { useMemory } from '@store/useMemory'
+import { useStorage, setDeepStore } from '@store/useStorage'
+import { generateSlots } from '@utils/generateSlots'
 
 export const STANDARD_BACKUP =
   /** @type {import('@rm/types/lib').BaseFilter} */ ({
@@ -48,9 +48,7 @@ export function applyToAll(
       ]
       if (key.startsWith('t') && +key.charAt(1) !== 0 && includeSlots) {
         filters.push(
-          ...Object.entries(
-            Utility.generateSlots(key, newFilter.enabled, userFilters),
-          ),
+          ...Object.entries(generateSlots(key, newFilter.enabled, userFilters)),
         )
       }
       return filters
diff --git a/src/services/functions/checkAdvFilter.js b/src/utils/checkAdvFilter.js
similarity index 94%
rename from src/services/functions/checkAdvFilter.js
rename to src/utils/checkAdvFilter.js
index c9ddadfbd..f7d738620 100644
--- a/src/services/functions/checkAdvFilter.js
+++ b/src/utils/checkAdvFilter.js
@@ -7,7 +7,7 @@
  * @param {string} filter
  * @param {boolean} [dnf]
  */
-function checkIVFilterValid(filter, dnf = true) {
+export function checkIVFilterValid(filter, dnf = true) {
   const input = filter.toUpperCase()
   const tokenizer =
     /\s*([()|&!,]|([ADSLXG]?|CP|LC|[GU]L)\s*([0-9]+(?:\.[0-9]*)?)(?:\s*-\s*([0-9]+(?:\.[0-9]*)?))?)/g
@@ -64,5 +64,3 @@ function checkIVFilterValid(filter, dnf = true) {
   }
   return true
 }
-
-export default checkIVFilterValid
diff --git a/src/services/functions/dayCheck.js b/src/utils/dayCheck.js
similarity index 81%
rename from src/services/functions/dayCheck.js
rename to src/utils/dayCheck.js
index d99c7ff7b..4e03ed44e 100644
--- a/src/services/functions/dayCheck.js
+++ b/src/utils/dayCheck.js
@@ -4,12 +4,10 @@
  * @param {number} currentStamp
  * @param {number} desiredStamp
  */
-function dayCheck(currentStamp, desiredStamp) {
+export function dayCheck(currentStamp, desiredStamp) {
   const locale = localStorage.getItem('i18nextLng') || 'en'
   if (currentStamp - desiredStamp < 86400) {
     return new Date(desiredStamp * 1000).toLocaleTimeString(locale)
   }
   return new Date(desiredStamp * 1000).toLocaleString(locale)
 }
-
-export default dayCheck
diff --git a/src/services/functions/deepMerge.js b/src/utils/deepMerge.js
similarity index 100%
rename from src/services/functions/deepMerge.js
rename to src/utils/deepMerge.js
diff --git a/src/services/functions/downloadJson.js b/src/utils/downloadJson.js
similarity index 84%
rename from src/services/functions/downloadJson.js
rename to src/utils/downloadJson.js
index 9cbb135e6..cb15218fc 100644
--- a/src/services/functions/downloadJson.js
+++ b/src/utils/downloadJson.js
@@ -9,7 +9,9 @@ export function downloadJson(json, fileName) {
     const el = document.createElement('a')
     el.setAttribute(
       'href',
-      `data:application/json;charset=utf-8,${encodeURIComponent(json)}`,
+      `data:application/json;charset=utf-8,${encodeURIComponent(
+        typeof json === 'string' ? json : JSON.stringify(json, null, 2),
+      )}`,
     )
     el.setAttribute('download', fileName)
     el.style.display = 'none'
diff --git a/src/services/functions/formatDistance.js b/src/utils/formatDistance.js
similarity index 92%
rename from src/services/functions/formatDistance.js
rename to src/utils/formatDistance.js
index 0a6b64c7a..62a211412 100644
--- a/src/services/functions/formatDistance.js
+++ b/src/utils/formatDistance.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { useStorage } from '@hooks/useStorage'
+import { useStorage } from '@store/useStorage'
 
 const METERS_PER_MILE = 1609.344
 
diff --git a/src/services/functions/formatInterval.js b/src/utils/formatInterval.js
similarity index 88%
rename from src/services/functions/formatInterval.js
rename to src/utils/formatInterval.js
index b032f2177..ab6c58da2 100644
--- a/src/services/functions/formatInterval.js
+++ b/src/utils/formatInterval.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 /** @param {number} intervalMs */
-function formatInterval(intervalMs) {
+export function formatInterval(intervalMs) {
   const diff = Math.floor(intervalMs / 1000)
   const d = Math.floor(diff / 86400)
   const h = Math.floor(diff / 3600)
@@ -19,5 +19,3 @@ function formatInterval(intervalMs) {
 
   return { str: str.join(' '), diff }
 }
-
-export default formatInterval
diff --git a/src/services/functions/fromSearchCategory.js b/src/utils/fromSearchCategory.js
similarity index 100%
rename from src/services/functions/fromSearchCategory.js
rename to src/utils/fromSearchCategory.js
diff --git a/src/utils/generateSlots.js b/src/utils/generateSlots.js
new file mode 100644
index 000000000..89c321871
--- /dev/null
+++ b/src/utils/generateSlots.js
@@ -0,0 +1,20 @@
+// @ts-check
+
+/**
+ *
+ * @param {string} teamId
+ * @param {import("@rm/types").BaseFilter | boolean} show
+ * @param {import("@rm/types").AllFilters['gyms']['filter']} tempFilters
+ * @returns
+ */
+export function generateSlots(teamId, show, tempFilters) {
+  const slotObj = {}
+  for (let i = 1; i <= 6; i += 1) {
+    const slotKey = `g${teamId.charAt(1)}-${i}`
+    slotObj[slotKey] =
+      typeof show === 'boolean'
+        ? { ...tempFilters[slotKey], enabled: show }
+        : { ...tempFilters[slotKey], size: show.size }
+  }
+  return slotObj
+}
diff --git a/src/services/functions/getBadge.js b/src/utils/getBadge.js
similarity index 100%
rename from src/services/functions/getBadge.js
rename to src/utils/getBadge.js
diff --git a/src/services/functions/getGlowRules.js b/src/utils/getGlowRules.js
similarity index 100%
rename from src/services/functions/getGlowRules.js
rename to src/utils/getGlowRules.js
diff --git a/src/services/functions/getGruntReward.js b/src/utils/getGruntReward.js
similarity index 100%
rename from src/services/functions/getGruntReward.js
rename to src/utils/getGruntReward.js
diff --git a/src/services/functions/getQueryArgs.js b/src/utils/getQueryArgs.js
similarity index 91%
rename from src/services/functions/getQueryArgs.js
rename to src/utils/getQueryArgs.js
index 333c704b6..70b57889b 100644
--- a/src/services/functions/getQueryArgs.js
+++ b/src/utils/getQueryArgs.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { useMapStore } from '@hooks/useMapStore'
+import { useMapStore } from '@store/useMapStore'
 
 export function getQueryArgs() {
   const { map } = useMapStore.getState()
diff --git a/src/services/functions/getRewardInfo.js b/src/utils/getRewardInfo.js
similarity index 96%
rename from src/services/functions/getRewardInfo.js
rename to src/utils/getRewardInfo.js
index 21540ecc0..a21a4d5d9 100644
--- a/src/services/functions/getRewardInfo.js
+++ b/src/utils/getRewardInfo.js
@@ -1,9 +1,9 @@
 // @ts-check
 
-import { useMemory } from '@hooks/useMemory'
+import { useMemory } from '@store/useMemory'
 
 /** @param {Partial<import("@rm/types").Quest>} quest */
-export default function getRewardInfo({
+export function getRewardInfo({
   quest_pokemon_id,
   quest_form_id,
   quest_gender_id,
diff --git a/src/utils/getTileBackground.js b/src/utils/getTileBackground.js
new file mode 100644
index 000000000..adb7e2eac
--- /dev/null
+++ b/src/utils/getTileBackground.js
@@ -0,0 +1,16 @@
+// @ts-check
+
+/**
+ *
+ * @param {number} columnIndex
+ * @param {number} rowIndex
+ */
+export function getTileBackground(columnIndex, rowIndex) {
+  return columnIndex % 2
+    ? rowIndex % 2 === 0
+      ? 'rgba(1, 1, 1, 0.01)'
+      : 'rgba(240, 240, 240, 0.01)'
+    : rowIndex % 2
+    ? 'rgba(1, 1, 1, 0.01)'
+    : 'rgba(240, 240, 240, 0.01)'
+}
diff --git a/src/utils/getTimeUntil.js b/src/utils/getTimeUntil.js
new file mode 100644
index 000000000..70722d0dd
--- /dev/null
+++ b/src/utils/getTimeUntil.js
@@ -0,0 +1,12 @@
+// @ts-check
+import { formatInterval } from './formatInterval'
+
+/**
+ *
+ * @param {number} date
+ * @param {boolean} [until]
+ * @returns
+ */
+export function getTimeUntil(date, until) {
+  return formatInterval(until ? date - Date.now() : Date.now() - date)
+}
diff --git a/src/services/functions/hasAll.js b/src/utils/hasAll.js
similarity index 100%
rename from src/services/functions/hasAll.js
rename to src/utils/hasAll.js
diff --git a/src/services/functions/isLocalStorageEnabled.js b/src/utils/isLocalStorageEnabled.js
similarity index 100%
rename from src/services/functions/isLocalStorageEnabled.js
rename to src/utils/isLocalStorageEnabled.js
diff --git a/src/services/functions/offset.js b/src/utils/offset.js
similarity index 100%
rename from src/services/functions/offset.js
rename to src/utils/offset.js
diff --git a/src/services/functions/parseConditions.js b/src/utils/parseConditions.js
similarity index 95%
rename from src/services/functions/parseConditions.js
rename to src/utils/parseConditions.js
index b49f92c02..5048a9845 100644
--- a/src/services/functions/parseConditions.js
+++ b/src/utils/parseConditions.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 /** @param {string} conditions */
-function parseQuestConditions(conditions) {
+export function parseQuestConditions(conditions) {
   const [type1, type2] = JSON.parse(conditions)
   const conditionsToReturn = []
   const parseMadRewards = (specifics) => {
@@ -63,5 +63,3 @@ function parseQuestConditions(conditions) {
   }
   return conditionsToReturn
 }
-
-export default parseQuestConditions
diff --git a/src/services/functions/resetState.js b/src/utils/resetState.js
similarity index 90%
rename from src/services/functions/resetState.js
rename to src/utils/resetState.js
index e1febd120..d0c498a7a 100644
--- a/src/services/functions/resetState.js
+++ b/src/utils/resetState.js
@@ -1,8 +1,8 @@
 // @ts-check
-import { useMemory } from '@hooks/useMemory'
-import { useStorage } from '@hooks/useStorage'
+import { useMemory } from '@store/useMemory'
+import { useStorage } from '@store/useStorage'
 
-/** @param {keyof import('@hooks/useStorage').UseStorage & keyof import('@hooks/useMemory').UseMemory} key */
+/** @param {keyof import('@store/useStorage').UseStorage & keyof import('@store/useMemory').UseMemory} key */
 const resetState = (key) => {
   const state = useMemory.getState()[key]
   useStorage.setState({
diff --git a/src/services/functions/setDeep.js b/src/utils/setDeep.js
similarity index 100%
rename from src/services/functions/setDeep.js
rename to src/utils/setDeep.js
diff --git a/src/services/functions/setLoadingText.js b/src/utils/setLoadingText.js
similarity index 100%
rename from src/services/functions/setLoadingText.js
rename to src/utils/setLoadingText.js
diff --git a/src/utils/strings.js b/src/utils/strings.js
new file mode 100644
index 000000000..bee0c0f5d
--- /dev/null
+++ b/src/utils/strings.js
@@ -0,0 +1,26 @@
+// @ts-check
+import { capitalize } from '@mui/material/utils'
+
+/** @param {string} str */
+export function camelToSnake(str) {
+  return str.replace(/([a-z](?=[A-Z]))/g, '$1_').toLowerCase()
+}
+
+/**
+ * @param {string} str
+ * @param {string} [separator]
+ */
+export function fromSnakeCase(str, separator = ' ') {
+  return capitalize(str)
+    .replace(/_/g, separator)
+    .replace(/([a-z\d])([A-Z])/g, `$1${separator}$2`)
+    .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, `$1${separator}$2`)
+}
+
+/**
+ * @param {string} str
+ */
+export function getProperName(str) {
+  const capital = `${str.charAt(0).toUpperCase()}${str.slice(1)}`
+  return capital.replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+}
diff --git a/src/utils/timeCheck.js b/src/utils/timeCheck.js
new file mode 100644
index 000000000..fa46010fb
--- /dev/null
+++ b/src/utils/timeCheck.js
@@ -0,0 +1,23 @@
+// @ts-check
+import SunCalc from 'suncalc'
+
+/**
+ *
+ * @param {number} lat
+ * @param {number} lon
+ * @returns
+ */
+export function timeCheck(lat, lon) {
+  const date = new Date()
+  const times = SunCalc.getTimes(date, lat, lon)
+  switch (true) {
+    case date > times.dawn && date < times.sunriseEnd:
+      return 'dawn'
+    case date > times.dusk && date < times.night:
+      return 'dusk'
+    case date > times.night || date < times.nightEnd:
+      return 'night'
+    default:
+      return 'day'
+  }
+}
diff --git a/vite.config.js b/vite.config.js
index ace62341c..be9d6e66d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,7 @@ const { sentryVitePlugin } = require('@sentry/vite-plugin')
 
 const config = require('@rm/config')
 const { log, HELPERS } = require('@rm/logger')
-const { locales } = require('@rm/locales')
+const { locales, status } = require('@rm/locales')
 const {
   faviconPlugin,
   customFilePlugin,
@@ -108,10 +108,13 @@ const viteConfig = defineConfig(({ mode }) => {
     publicDir: 'public',
     resolve: {
       alias: {
-        '@components': resolve(__dirname, './src/components'),
         '@assets': resolve(__dirname, './src/assets'),
+        '@components': resolve(__dirname, './src/components'),
+        '@features': resolve(__dirname, './src/features'),
         '@hooks': resolve(__dirname, './src/hooks'),
         '@services': resolve(__dirname, './src/services'),
+        '@utils': resolve(__dirname, './src/utils'),
+        '@store': resolve(__dirname, './src/store'),
       },
     },
     define: {
@@ -119,6 +122,7 @@ const viteConfig = defineConfig(({ mode }) => {
         client: {
           version,
           locales,
+          localeStatus: status,
           hasCustom,
           title: config.getSafe('map.general.headerTitle'),
         },
@@ -139,7 +143,12 @@ const viteConfig = defineConfig(({ mode }) => {
     },
     build: {
       target: ['safari11.1', 'chrome64', 'firefox66', 'edge88'],
-      outDir: resolve(__dirname, './dist'),
+      outDir: resolve(
+        __dirname,
+        `./dist${
+          process.env.NODE_CONFIG_ENV ? `-${process.env.NODE_CONFIG_ENV}` : ''
+        }`,
+      ),
       sourcemap: isRelease || isDevelopment ? true : 'hidden',
       minify:
         isDevelopment || config.getSafe('devOptions.skipMinified')
diff --git a/yarn.lock b/yarn.lock
index 44e32e40e..c0665e363 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5215,6 +5215,13 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+gpt-tokenizer@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/gpt-tokenizer/-/gpt-tokenizer-2.1.2.tgz#14f7ce424cf2309fb5be66e112d1836080c2791a"
+  integrity sha512-HSuI5d6uey+c7x/VzQlPfCoGrfLyAc28vxWofKbjR9PJHm0AjQGSWkKw/OJnb+8S1g7nzgRsf0WH3dK+NNWYbg==
+  dependencies:
+    rfc4648 "^1.5.2"
+
 graceful-fs@4.2.10:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -7418,10 +7425,10 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-openai@^4.24.1:
-  version "4.24.1"
-  resolved "https://registry.yarnpkg.com/openai/-/openai-4.24.1.tgz#3759001eca835228289fcf18c1bd8d35dae538ba"
-  integrity sha512-ezm/O3eiZMnyBqirUnWm9N6INJU1WhNtz+nK/Zj/2oyKvRz9pgpViDxa5wYOtyGYXPn1sIKBV0I/S4BDhtydqw==
+openai@4.29.0:
+  version "4.29.0"
+  resolved "https://registry.yarnpkg.com/openai/-/openai-4.29.0.tgz#4e69e6be5fc623d6783c1758de93126a3b27b315"
+  integrity sha512-ic6C681bSow1XQdKhADthM/OOKqNL05M1gCFLx1mRqLJ+yH49v6qnvaWQ76kwqI/IieCuVTXfRfTk3sz4cB45w==
   dependencies:
     "@types/node" "^18.11.18"
     "@types/node-fetch" "^2.6.4"
@@ -8334,6 +8341,11 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rfc4648@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.5.3.tgz#e62b81736c10361ca614efe618a566e93d0b41c0"
+  integrity sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==
+
 rfdc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
@@ -9266,6 +9278,11 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
 
+uicons.js@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/uicons.js/-/uicons.js-1.1.1.tgz#37340b5cdcfc9043c6c1e21e3f4311c641cf0df1"
+  integrity sha512-1Zt3BKiGobef55FqGgD8FQs7xTZmPLbeHm25QIaQH1cw+oYaphvMStv5K93Aq6XYvei7mw82gKvprvLD5ZNhtw==
+
 uid-safe@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"