diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index b1543b2cb44..f2e17898334 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -20,6 +20,7 @@ permissions:
 jobs:
   create-release:
     if: github.repository == 'pagefaultgames/pokerogue' && (vars.BETA_DEPLOY_BRANCH == '' || ! startsWith(vars.BETA_DEPLOY_BRANCH, 'release'))
+    timeout-minutes: 10
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed for github cli commands
     runs-on: ubuntu-latest
@@ -36,11 +37,13 @@ jobs:
             exit 1
           fi
         shell: bash
+
       - uses: actions/create-github-app-token@v2
         id: app-token
         with:
           app-id: ${{ secrets.PAGEFAULT_APP_ID }}
           private-key: ${{ secrets.PAGEFAULT_APP_PRIVATE_KEY }}
+
       - name: Check out code
         uses: actions/checkout@v4
         with:
@@ -48,8 +51,10 @@ jobs:
           # Always base off of beta branch, regardless of the branch the workflow was triggered from.
           ref: beta
           token: ${{ steps.app-token.outputs.token }}
+
       - name: Create release branch
         run: git checkout -b release
+
       # In order to be able to open a PR into beta, we need the branch to have at least one change.
       - name: Overwrite RELEASE file
         run: |
@@ -58,11 +63,14 @@ jobs:
           echo "Release v${{ github.event.inputs.versionName }}" > RELEASE
           git add RELEASE
           git commit -m "Stage release v${{ github.event.inputs.versionName }}"
+
       - name: Push new branch
         run: git push origin release
+
       # The repository variable is used by the deploy-beta workflow to determine whether to deploy from beta or release.
       - name: Set repository variable
         run: GITHUB_TOKEN="${{ steps.app-token.outputs.token }}" gh variable set BETA_DEPLOY_BRANCH --body "release"
+
       - name: Create pull request to main
         run: |
           gh pr create --base main \
@@ -70,6 +78,7 @@ jobs:
                        --title "Release v${{ github.event.inputs.versionName }} to main" \
                        --body "This PR is for the release of v${{ github.event.inputs.versionName }}, and was created automatically by the GitHub Actions workflow invoked by ${{ github.actor }}" \
                        --draft
+
       - name: Create pull request to beta
         run: |
           gh pr create --base beta \
diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml
index 0894032c8ad..341999dcd45 100644
--- a/.github/workflows/deploy-beta.yml
+++ b/.github/workflows/deploy-beta.yml
@@ -12,6 +12,7 @@ on:
 jobs:
   deploy:
     if: github.repository == 'pagefaultgames/pokerogue' && github.ref_name == (vars.BETA_DEPLOY_BRANCH || 'beta')
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0e7102a41dd..528906196e5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,6 +11,7 @@ on:
 jobs:
   deploy:
     if: github.repository == 'pagefaultgames/pokerogue'
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
index 8d1c5a84962..6e056bc4032 100644
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@@ -20,9 +20,12 @@ jobs:
   pages:
     name: Github Pages
     if: github.repository == 'pagefaultgames/pokerogue'
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     env:
-      api-dir: ./
+      docs-dir: ./pokerogue_docs
+      # Only push docs when running on pushes to main/beta
+      DRY_RUN: ${{github.event_name != 'push' || (github.ref_name != 'beta' && github.ref_name != 'main')}}
 
     strategy:
       fail-fast: false
@@ -44,7 +47,7 @@ jobs:
         with:
           version: 10
 
-      - name: Setup Node 22.14.1
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version-file: "pokerogue_docs/.nvmrc"
@@ -57,26 +60,24 @@ jobs:
           ref: gh-pages
 
       - name: Install Node.js dependencies
-        working-directory: ${{env.api-dir}}
-        run: |
-          cd pokerogue_docs
-          pnpm i
+        working-directory: ${{env.docs-dir}}
+        run: pnpm i
 
       - name: Generate Typedoc docs
-        working-directory: ${{env.api-dir}}
-        run: |
-          cd pokerogue_docs
-          pnpm exec typedoc --out /tmp/docs --githubPages false --entryPoints ./src/
+        working-directory: ${{env.docs-dir}}
+        env:
+          REF_NAME: ${{github.ref_name}}
+          DRY_RUN: ${{env.DRY_RUN}}
+        run: pnpm typedoc
 
       - name: Commit & Push docs
-        if: github.event_name == 'push' && (github.ref_name == 'beta' || github.ref_name == 'main')
+        # env vars are stored as strings instead of booleans (hence why an explicit check is required)
+        if: ${{ env.DRY_RUN == 'false'}}
         run: |
           cd pokerogue_gh
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
-          mkdir -p $GITHUB_REF_NAME
-          rm -rf $GITHUB_REF_NAME/*
-          cp -r /tmp/docs/. $GITHUB_REF_NAME
+          rsync -rd --delete /tmp/docs/ $GITHUB_REF_NAME
           git add $GITHUB_REF_NAME
-          git commit --allow-empty -m "[skip ci] Deploy docs"
-          git push
\ No newline at end of file
+          git commit -m "[skip ci] Deploy docs"
+          git push
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index ae23a515c4f..edecae64f95 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -18,34 +18,94 @@ on:
 
 jobs:
   run-linters:
-    name: Run linters
+    name: Run all linters
+    timeout-minutes: 10
     runs-on: ubuntu-latest
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 10
 
-      - name: Set up Node.js
+      - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
-          cache: 'pnpm'
+          node-version-file: ".nvmrc"
+          cache: "pnpm"
 
-      - name: Install Node.js dependencies
+      - name: Install Node modules
         run: pnpm i
 
-      - name: Lint with Biome
+      # Lint files with Biome-Lint - https://biomejs.dev/linter/
+      - name: Run Biome-Lint
         run: pnpm biome-ci
+        id: biome_lint
+        continue-on-error: true
 
-      - name: Check dependencies with depcruise
+      # Validate dependencies with dependency-cruiser - https://github.com/sverweij/dependency-cruiser
+      - name: Run Dependency-Cruise
         run: pnpm depcruise
-      
-      - name: Lint with ls-lint
-        run: pnpm ls-lint
\ No newline at end of file
+        id: depcruise
+        continue-on-error: true
+
+      # Validate types with tsc - https://www.typescriptlang.org/docs/handbook/compiler-options.html#using-the-cli
+      - name: Run Typecheck
+        run: pnpm typecheck
+        id: typecheck
+        continue-on-error: true
+
+      # The exact same thing
+      - name: Run Typecheck (scripts)
+        run: pnpm typecheck:scripts
+        id: typecheck-scripts
+        continue-on-error: true
+
+      - name: Evaluate for Errors
+        env:
+          BIOME_LINT_OUTCOME: ${{ steps.biome_lint.outcome }}
+          DEPCRUISE_OUTCOME: ${{ steps.depcruise.outcome }}
+          TYPECHECK_OUTCOME: ${{ steps.typecheck.outcome }}
+          TYPECHECK_SCRIPTS_OUTCOME: ${{ steps.typecheck-scripts.outcome }}
+        run: |
+            # Check for Errors
+
+            # Make text red.
+            red () {
+              printf "\e[31m%s\e[0m" "$1"
+            }
+
+            # Make text green.
+            green () {
+              printf "\e[32m%s\e[0m" "$1"
+            }
+
+            print_result() {
+              local name=$1
+              local outcome=$2
+              if [ "$outcome" == "success" ]; then
+                printf "$(green "✅ $name: $outcome")\n"
+              else
+                printf "$(red "❌ $name: $outcome")\n"
+              fi
+            }
+
+            print_result "Biome" "$BIOME_LINT_OUTCOME"
+            print_result "Depcruise" "$DEPCRUISE_OUTCOME"
+            print_result "Typecheck" "$TYPECHECK_OUTCOME"
+            print_result "Typecheck scripts" "$TYPECHECK_SCRIPTS_OUTCOME"
+
+            if [[ "$BIOME_LINT_OUTCOME" != "success" || \
+              "$DEPCRUISE_OUTCOME" != "success" || \
+              "$TYPECHECK_OUTCOME" != "success" || \
+              "$TYPECHECK_SCRIPTS_OUTCOME" != "success" ]]; then
+              printf "$(red "❌ One or more checks failed!")\n" >&2
+              exit 1
+            fi
+
+            printf "$(green "✅ All checks passed!")\n"
diff --git a/.github/workflows/post-release-deleted.yml b/.github/workflows/post-release-deleted.yml
index 65447e7826b..fe542365da4 100644
--- a/.github/workflows/post-release-deleted.yml
+++ b/.github/workflows/post-release-deleted.yml
@@ -6,6 +6,7 @@ jobs:
   # Set the BETA_DEPLOY_BRANCH variable to beta when a release branch is deleted
   update-release-var:
     if: github.repository == 'pagefaultgames/pokerogue' && github.event.ref_type == 'branch' && github.event.ref == 'release'
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
       - name: Set BETA_DEPLOY_BRANCH to beta
diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml
index 124004f380f..79aea56bbd0 100644
--- a/.github/workflows/test-shard-template.yml
+++ b/.github/workflows/test-shard-template.yml
@@ -21,6 +21,7 @@ jobs:
   test:
     # We can't use dynmically named jobs until https://github.com/orgs/community/discussions/13261 is implemented
     name: Shard
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     if: ${{ !inputs.skip }}
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 748072c536f..39506096298 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,6 +19,7 @@ on:
 
 jobs:
   check-path-change-filter:
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read
@@ -37,6 +38,8 @@ jobs:
     name: Run Tests
     needs: check-path-change-filter
     strategy:
+      # don't stop upon 1 shard failing
+      fail-fast: false
       matrix:
         shard: [1, 2, 3, 4, 5]
     uses: ./.github/workflows/test-shard-template.yml
diff --git a/README.md b/README.md
index 1bb8c7772f3..73477968bc0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,9 @@
-<picture><img src="./public/images/logo.png" width="300" alt="PokéRogue"></picture>
+<div align="center"><picture><img src="./public/images/logo.png" width="300" alt="PokéRogue"></picture>
+
+[![Discord Static Badge](https://img.shields.io/badge/Community_Discord-blurple?style=flat&logo=discord&logoSize=auto&labelColor=white&color=5865F2)](https://discord.gg/pokerogue)
+[![Docs Coverage Static Badge](https://pagefaultgames.github.io/pokerogue/beta/coverage.svg)](https://pagefaultgames.github.io/pokerogue/beta)
+[![Testing Badge](https://github.com/pagefaultgames/pokerogue/actions/workflows/tests.yml/badge.svg)](https://github.com/pagefaultgames/pokerogue/actions/workflows/tests.yml)
+[![License: GNU AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)</div>
 
 PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more!
 
@@ -7,7 +12,7 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite
 See [CONTRIBUTING.md](./CONTRIBUTING.md), this includes instructions on how to set up the game locally.
 
 # 📝 Credits
->
+
 > If this project contains assets you have produced and you do not see your name, **please** reach out, either [here on GitHub](https://github.com/pagefaultgames/pokerogue/issues/new) or via [Discord](https://discord.gg/pokerogue).
 
 Thank you to all the wonderful people that have contributed to the PokéRogue project! You can find the credits [here](./CREDITS.md).
diff --git a/biome.jsonc b/biome.jsonc
index a63ce0ee07d..e6f9ff5711a 100644
--- a/biome.jsonc
+++ b/biome.jsonc
@@ -175,10 +175,17 @@
       }
     },
 
-    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes),
-    // as well as in all TS files in `scripts/` (which are assumed to be boilerplate templates).
+    // Overrides to prevent unused import removal inside `overrides.ts`, enums & `.d.ts` files (for TSDoc linkcodes),
+    // as well as inside script boilerplate files.
     {
-      "includes": ["**/src/overrides.ts", "**/src/enums/**/*", "**/scripts/**/*.ts", "**/*.d.ts"],
+      // TODO: Rename existing boilerplates in the folder and remove this last alias
+      "includes": [
+        "**/src/overrides.ts",
+        "**/src/enums/**/*",
+        "**/*.d.ts",
+        "scripts/**/*.boilerplate.ts",
+        "**/boilerplates/*.ts"
+      ],
       "linter": {
         "rules": {
           "correctness": {
@@ -188,7 +195,7 @@
       }
     },
     {
-      "includes": ["**/src/overrides.ts", "**/scripts/**/*.ts"],
+      "includes": ["**/src/overrides.ts"],
       "linter": {
         "rules": {
           "style": {
diff --git a/global.d.ts b/global.d.ts
index 8b79d966e3c..92a883f40c9 100644
--- a/global.d.ts
+++ b/global.d.ts
@@ -18,3 +18,14 @@ declare global {
     call<T extends AnyFn>(this: T, thisArg: ThisParameterType<T>, ...argArray: Parameters<T>): ReturnType<T>;
   }
 }
+
+// Global augments for `typedoc` to prevent TS from erroring when editing the config JS file
+declare module "typedoc" {
+  export interface TypeDocOptionMap {
+    coverageLabel: string;
+    coverageColor: string;
+    coverageOutputPath: string;
+    coverageOutputType: "svg" | "json" | "all";
+    coverageSvgWidth: number;
+  }
+}
diff --git a/package.json b/package.json
index b7aebd879d2..76a0f46d192 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "version": "1.10.7",
   "type": "module",
   "scripts": {
-    "start": "vite",
+    "start:prod": "vite --mode production",
+    "start:beta": "vite --mode beta",
     "start:dev": "vite --mode development",
     "build": "vite build",
     "build:beta": "vite build --mode beta",
@@ -14,11 +15,13 @@
     "test:watch": "vitest watch --coverage --no-isolate",
     "test:silent": "vitest run --silent='passed-only' --no-isolate",
     "test:create": "node scripts/create-test/create-test.js",
+    "eggMoves:parse": "node scripts/parse-egg-moves/main.js",
     "scrape-trainers": "node scripts/scrape-trainer-names/main.js",
     "typecheck": "tsc --noEmit",
+    "typecheck:scripts": "tsc -p scripts/jsconfig.json",
     "biome": "biome check --write --changed --no-errors-on-unmatched --diagnostic-level=error",
     "biome-ci": "biome ci --diagnostic-level=error --reporter=github --no-errors-on-unmatched",
-    "docs": "typedoc",
+    "typedoc": "typedoc",
     "depcruise": "depcruise src test",
     "postinstall": "lefthook install; git submodule update --init --recursive",
     "update-version:patch": "pnpm version patch --force --no-git-tag-version",
@@ -33,6 +36,7 @@
     "@types/node": "^22.16.5",
     "@vitest/coverage-istanbul": "^3.2.4",
     "@vitest/expect": "^3.2.4",
+    "@vitest/utils": "^3.2.4",
     "chalk": "^5.4.1",
     "dependency-cruiser": "^16.10.4",
     "inquirer": "^12.8.2",
@@ -41,6 +45,9 @@
     "msw": "^2.10.4",
     "phaser3spectorjs": "^0.0.8",
     "typedoc": "^0.28.8",
+    "typedoc-github-theme": "^0.3.1",
+    "typedoc-plugin-coverage": "^4.0.1",
+    "typedoc-plugin-mdn-links": "^5.0.9",
     "typescript": "^5.8.3",
     "vite": "^7.0.6",
     "vite-tsconfig-paths": "^5.1.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c3b58a60f48..be3e683f71c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,6 +63,9 @@ importers:
       '@vitest/expect':
         specifier: ^3.2.4
         version: 3.2.4
+      '@vitest/utils':
+        specifier: ^3.2.4
+        version: 3.2.4
       chalk:
         specifier: ^5.4.1
         version: 5.4.1
@@ -87,6 +90,15 @@ importers:
       typedoc:
         specifier: ^0.28.8
         version: 0.28.8(typescript@5.8.3)
+      typedoc-github-theme:
+        specifier: ^0.3.1
+        version: 0.3.1(typedoc@0.28.8(typescript@5.8.3))
+      typedoc-plugin-coverage:
+        specifier: ^4.0.1
+        version: 4.0.1(typedoc@0.28.8(typescript@5.8.3))
+      typedoc-plugin-mdn-links:
+        specifier: ^5.0.9
+        version: 5.0.9(typedoc@0.28.8(typescript@5.8.3))
       typescript:
         specifier: ^5.8.3
         version: 5.8.3
@@ -1789,6 +1801,23 @@ packages:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
 
+  typedoc-github-theme@0.3.1:
+    resolution: {integrity: sha512-j6PmkAGmf/MGCzYjQcUH6jS9djPsNl/IoTXooxC+MoeMkBhbmPyKJlpR6Lw12BLoe2OYpYA2J1KMktUJXp/8Sw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      typedoc: ~0.28.0
+
+  typedoc-plugin-coverage@4.0.1:
+    resolution: {integrity: sha512-P1QBR5GJSfW3fDrpz4Vkd8z8lzWaBYjaHebRLk0u2Uga0oSFlPaqrCyiHzItBXxZX28aMlNlZwrUnsLgUgqA7g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      typedoc: 0.28.x
+
+  typedoc-plugin-mdn-links@5.0.9:
+    resolution: {integrity: sha512-kXssRKBhUd0JeHzFmxWVsGWVFR9WXafe70Y8Ed+MYH2Nu2647cqfGQN1OBKgvXpmAT8MTpACmUIQ7GnQnh1/iw==}
+    peerDependencies:
+      typedoc: 0.27.x || 0.28.x
+
   typedoc@0.28.8:
     resolution: {integrity: sha512-16GfLopc8icHfdvqZDqdGBoS2AieIRP2rpf9mU+MgN+gGLyEQvAO0QgOa6NJ5QNmQi0LFrDY9in4F2fUNKgJKA==}
     engines: {node: '>= 18', pnpm: '>= 10'}
@@ -3634,6 +3663,18 @@ snapshots:
 
   type-fest@4.41.0: {}
 
+  typedoc-github-theme@0.3.1(typedoc@0.28.8(typescript@5.8.3)):
+    dependencies:
+      typedoc: 0.28.8(typescript@5.8.3)
+
+  typedoc-plugin-coverage@4.0.1(typedoc@0.28.8(typescript@5.8.3)):
+    dependencies:
+      typedoc: 0.28.8(typescript@5.8.3)
+
+  typedoc-plugin-mdn-links@5.0.9(typedoc@0.28.8(typescript@5.8.3)):
+    dependencies:
+      typedoc: 0.28.8(typescript@5.8.3)
+
   typedoc@0.28.8(typescript@5.8.3):
     dependencies:
       '@gerrit0/mini-shiki': 3.8.1
diff --git a/public/images/ui/legacy/numbers_alt.png b/public/images/ui/legacy/numbers_alt.png
deleted file mode 100644
index fb510465471..00000000000
Binary files a/public/images/ui/legacy/numbers_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/numbers_red_alt.png b/public/images/ui/legacy/numbers_red_alt.png
deleted file mode 100644
index d9edb0468d8..00000000000
Binary files a/public/images/ui/legacy/numbers_red_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_lv.png b/public/images/ui/legacy/overlay_lv.png
deleted file mode 100644
index fdcbb1c7082..00000000000
Binary files a/public/images/ui/legacy/overlay_lv.png and /dev/null differ
diff --git a/public/images/ui/legacy/overlay_lv_alt.png b/public/images/ui/legacy/overlay_lv_alt.png
deleted file mode 100644
index 92ec684bf75..00000000000
Binary files a/public/images/ui/legacy/overlay_lv_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/party_slot_hp_bar.png b/public/images/ui/legacy/party_slot_hp_bar.png
index 6a37002744c..7ec53ae806b 100644
Binary files a/public/images/ui/legacy/party_slot_hp_bar.png and b/public/images/ui/legacy/party_slot_hp_bar.png differ
diff --git a/public/images/ui/legacy/party_slot_overlay_lv_alt.png b/public/images/ui/legacy/party_slot_overlay_lv_alt.png
deleted file mode 100644
index 7aa9a590a13..00000000000
Binary files a/public/images/ui/legacy/party_slot_overlay_lv_alt.png and /dev/null differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_boss.png b/public/images/ui/legacy/pbinfo_enemy_boss.png
index 98b2f09f941..20eb74c59b3 100644
Binary files a/public/images/ui/legacy/pbinfo_enemy_boss.png and b/public/images/ui/legacy/pbinfo_enemy_boss.png differ
diff --git a/public/images/ui/legacy/pbinfo_enemy_mini.png b/public/images/ui/legacy/pbinfo_enemy_mini.png
index c1c002a4b21..7beddd98d55 100644
Binary files a/public/images/ui/legacy/pbinfo_enemy_mini.png and b/public/images/ui/legacy/pbinfo_enemy_mini.png differ
diff --git a/public/images/ui/legacy/pbinfo_player.png b/public/images/ui/legacy/pbinfo_player.png
index 60c92f886aa..f9e16a9aa0c 100644
Binary files a/public/images/ui/legacy/pbinfo_player.png and b/public/images/ui/legacy/pbinfo_player.png differ
diff --git a/public/images/ui/legacy/pbinfo_player_mini.png b/public/images/ui/legacy/pbinfo_player_mini.png
index 120e9592ab9..183db0d44f9 100644
Binary files a/public/images/ui/legacy/pbinfo_player_mini.png and b/public/images/ui/legacy/pbinfo_player_mini.png differ
diff --git a/public/images/ui/legacy/pbinfo_stat.png b/public/images/ui/legacy/pbinfo_stat.png
deleted file mode 100644
index 25c94f9a807..00000000000
Binary files a/public/images/ui/legacy/pbinfo_stat.png and /dev/null differ
diff --git a/public/images/ui/legacy/pokedex_summary_bg.png b/public/images/ui/legacy/pokedex_summary_bg.png
index 0f8fed843c9..62369eaa248 100644
Binary files a/public/images/ui/legacy/pokedex_summary_bg.png and b/public/images/ui/legacy/pokedex_summary_bg.png differ
diff --git a/public/images/ui/legacy/starter_select_bg.png b/public/images/ui/legacy/starter_select_bg.png
index 501e892969e..09d21d4a630 100644
Binary files a/public/images/ui/legacy/starter_select_bg.png and b/public/images/ui/legacy/starter_select_bg.png differ
diff --git a/public/images/ui/legacy/summary_bg.png b/public/images/ui/legacy/summary_bg.png
index 668a7438bf0..b08bd406a81 100644
Binary files a/public/images/ui/legacy/summary_bg.png and b/public/images/ui/legacy/summary_bg.png differ
diff --git a/public/images/ui/legacy/summary_moves.png b/public/images/ui/legacy/summary_moves.png
index ab909588160..abb499fdbb0 100644
Binary files a/public/images/ui/legacy/summary_moves.png and b/public/images/ui/legacy/summary_moves.png differ
diff --git a/public/images/ui/legacy/summary_moves_effect.png b/public/images/ui/legacy/summary_moves_effect.png
index 61567c9749b..f12e7e523b8 100644
Binary files a/public/images/ui/legacy/summary_moves_effect.png and b/public/images/ui/legacy/summary_moves_effect.png differ
diff --git a/public/images/ui/legacy/summary_profile.png b/public/images/ui/legacy/summary_profile.png
index d8cfebb000e..e2c678a3206 100644
Binary files a/public/images/ui/legacy/summary_profile.png and b/public/images/ui/legacy/summary_profile.png differ
diff --git a/public/images/ui/legacy/summary_profile_ability.png b/public/images/ui/legacy/summary_profile_ability.png
deleted file mode 100644
index f839a6249f8..00000000000
Binary files a/public/images/ui/legacy/summary_profile_ability.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_profile_passive.png b/public/images/ui/legacy/summary_profile_passive.png
deleted file mode 100644
index 1ff9ad8e09a..00000000000
Binary files a/public/images/ui/legacy/summary_profile_passive.png and /dev/null differ
diff --git a/public/images/ui/legacy/summary_stats.png b/public/images/ui/legacy/summary_stats.png
index 1da361f6157..773661cce07 100644
Binary files a/public/images/ui/legacy/summary_stats.png and b/public/images/ui/legacy/summary_stats.png differ
diff --git a/public/images/ui/legacy/text_images/ca/battle_ui/overlay_exp_label_ca.png b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_exp_label_ca.png
new file mode 100644
index 00000000000..acb04a84a31
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_exp_label_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/battle_ui/overlay_hp_label_boss_ca.png b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_hp_label_boss_ca.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_hp_label_boss_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/battle_ui/overlay_hp_label_ca.png b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_hp_label_ca.png
new file mode 100644
index 00000000000..4f388b70a75
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_hp_label_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/battle_ui/overlay_lv_ca.png b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_lv_ca.png
new file mode 100644
index 00000000000..7fdf26388bf
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/battle_ui/overlay_lv_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/battle_ui/pbinfo_stat_ca.json b/public/images/ui/legacy/text_images/ca/battle_ui/pbinfo_stat_ca.json
new file mode 100644
index 00000000000..4bae82011ea
--- /dev/null
+++ b/public/images/ui/legacy/text_images/ca/battle_ui/pbinfo_stat_ca.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ca.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/ca/battle_ui/pbinfo_stat_ca.png b/public/images/ui/legacy/text_images/ca/battle_ui/pbinfo_stat_ca.png
new file mode 100644
index 00000000000..a6ccf90c284
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/battle_ui/pbinfo_stat_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/party_ui/party_slot_overlay_hp_ca.png b/public/images/ui/legacy/text_images/ca/party_ui/party_slot_overlay_hp_ca.png
new file mode 100644
index 00000000000..981d8573aca
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/party_ui/party_slot_overlay_hp_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/party_ui/party_slot_overlay_lv_ca.png b/public/images/ui/legacy/text_images/ca/party_ui/party_slot_overlay_lv_ca.png
new file mode 100644
index 00000000000..512db34fa85
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/party_ui/party_slot_overlay_lv_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_dexnb_label_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_dexnb_label_ca.png
new file mode 100644
index 00000000000..a457468d8d0
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_dexnb_label_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_dexnb_label_overlay_shiny_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_dexnb_label_overlay_shiny_ca.png
new file mode 100644
index 00000000000..3277a28a59b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_dexnb_label_overlay_shiny_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_moves_descriptions_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_moves_descriptions_title_ca.png
new file mode 100644
index 00000000000..a37aad953cc
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_moves_descriptions_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_moves_effect_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_moves_effect_title_ca.png
new file mode 100644
index 00000000000..ca66436eca6
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_moves_effect_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_moves_moves_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_moves_moves_title_ca.png
new file mode 100644
index 00000000000..71a6889da53
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_moves_moves_title_ca.png differ
diff --git a/public/images/ui/legacy/summary_moves_overlay_pp.png b/public/images/ui/legacy/text_images/ca/summary/summary_moves_overlay_pp_ca.png
similarity index 100%
rename from public/images/ui/legacy/summary_moves_overlay_pp.png
rename to public/images/ui/legacy/text_images/ca/summary/summary_moves_overlay_pp_ca.png
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_profile_ability_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_profile_ability_ca.png
new file mode 100644
index 00000000000..2d9e8ac317d
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_profile_ability_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_profile_memo_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_profile_memo_title_ca.png
new file mode 100644
index 00000000000..b7ef7c91fc5
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_profile_memo_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_profile_passive_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_profile_passive_ca.png
new file mode 100644
index 00000000000..a072b663d25
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_profile_passive_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_profile_profile_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_profile_profile_title_ca.png
new file mode 100644
index 00000000000..a5ed0e3e169
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_profile_profile_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_stats_exp_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_stats_exp_title_ca.png
new file mode 100644
index 00000000000..e7ac7268b54
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_stats_exp_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_stats_expbar_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_stats_expbar_title_ca.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_stats_expbar_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_stats_item_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_stats_item_title_ca.png
new file mode 100644
index 00000000000..c13189fc816
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_stats_item_title_ca.png differ
diff --git a/public/images/ui/legacy/text_images/ca/summary/summary_stats_stats_title_ca.png b/public/images/ui/legacy/text_images/ca/summary/summary_stats_stats_title_ca.png
new file mode 100644
index 00000000000..426848af866
Binary files /dev/null and b/public/images/ui/legacy/text_images/ca/summary/summary_stats_stats_title_ca.png differ
diff --git a/public/images/ui/legacy/summary_tabs_1.png b/public/images/ui/legacy/text_images/ca/summary/summary_tabs_1_ca.png
similarity index 100%
rename from public/images/ui/legacy/summary_tabs_1.png
rename to public/images/ui/legacy/text_images/ca/summary/summary_tabs_1_ca.png
diff --git a/public/images/ui/legacy/summary_tabs_2.png b/public/images/ui/legacy/text_images/ca/summary/summary_tabs_2_ca.png
similarity index 100%
rename from public/images/ui/legacy/summary_tabs_2.png
rename to public/images/ui/legacy/text_images/ca/summary/summary_tabs_2_ca.png
diff --git a/public/images/ui/legacy/summary_tabs_3.png b/public/images/ui/legacy/text_images/ca/summary/summary_tabs_3_ca.png
similarity index 100%
rename from public/images/ui/legacy/summary_tabs_3.png
rename to public/images/ui/legacy/text_images/ca/summary/summary_tabs_3_ca.png
diff --git a/public/images/ui/legacy/text_images/da/battle_ui/overlay_exp_label_da.png b/public/images/ui/legacy/text_images/da/battle_ui/overlay_exp_label_da.png
new file mode 100644
index 00000000000..4c456fff94e
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/battle_ui/overlay_exp_label_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/battle_ui/overlay_hp_label_boss_da.png b/public/images/ui/legacy/text_images/da/battle_ui/overlay_hp_label_boss_da.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/battle_ui/overlay_hp_label_boss_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/battle_ui/overlay_hp_label_da.png b/public/images/ui/legacy/text_images/da/battle_ui/overlay_hp_label_da.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/battle_ui/overlay_hp_label_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/battle_ui/overlay_lv_da.png b/public/images/ui/legacy/text_images/da/battle_ui/overlay_lv_da.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/battle_ui/overlay_lv_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/battle_ui/pbinfo_stat_da.json b/public/images/ui/legacy/text_images/da/battle_ui/pbinfo_stat_da.json
new file mode 100644
index 00000000000..eca2a9071ac
--- /dev/null
+++ b/public/images/ui/legacy/text_images/da/battle_ui/pbinfo_stat_da.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_da.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/da/battle_ui/pbinfo_stat_da.png b/public/images/ui/legacy/text_images/da/battle_ui/pbinfo_stat_da.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/battle_ui/pbinfo_stat_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/party_ui/party_slot_overlay_hp_da.png b/public/images/ui/legacy/text_images/da/party_ui/party_slot_overlay_hp_da.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/party_ui/party_slot_overlay_hp_da.png differ
diff --git a/public/images/ui/legacy/party_slot_overlay_lv.png b/public/images/ui/legacy/text_images/da/party_ui/party_slot_overlay_lv_da.png
similarity index 100%
rename from public/images/ui/legacy/party_slot_overlay_lv.png
rename to public/images/ui/legacy/text_images/da/party_ui/party_slot_overlay_lv_da.png
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_dexnb_label_da.png b/public/images/ui/legacy/text_images/da/summary/summary_dexnb_label_da.png
new file mode 100644
index 00000000000..ef081f493f3
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_dexnb_label_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_dexnb_label_overlay_shiny_da.png b/public/images/ui/legacy/text_images/da/summary/summary_dexnb_label_overlay_shiny_da.png
new file mode 100644
index 00000000000..92c2412f426
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_dexnb_label_overlay_shiny_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_moves_descriptions_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_moves_descriptions_title_da.png
new file mode 100644
index 00000000000..79b16227bfe
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_moves_descriptions_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_moves_effect_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_moves_effect_title_da.png
new file mode 100644
index 00000000000..f2ac04e62c4
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_moves_effect_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_moves_moves_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_moves_moves_title_da.png
new file mode 100644
index 00000000000..f1732e3e2c0
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_moves_moves_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_moves_overlay_pp_da.png b/public/images/ui/legacy/text_images/da/summary/summary_moves_overlay_pp_da.png
new file mode 100644
index 00000000000..6cc0a2a6831
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_moves_overlay_pp_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_profile_ability_da.png b/public/images/ui/legacy/text_images/da/summary/summary_profile_ability_da.png
new file mode 100644
index 00000000000..206b65c6cdd
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_profile_ability_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_profile_memo_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_profile_memo_title_da.png
new file mode 100644
index 00000000000..48886d25e39
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_profile_memo_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_profile_passive_da.png b/public/images/ui/legacy/text_images/da/summary/summary_profile_passive_da.png
new file mode 100644
index 00000000000..681ae3f1b5e
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_profile_passive_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_profile_profile_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_profile_profile_title_da.png
new file mode 100644
index 00000000000..83b8a1d5e99
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_profile_profile_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_stats_exp_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_stats_exp_title_da.png
new file mode 100644
index 00000000000..feae0c9cb90
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_stats_exp_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_stats_expbar_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_stats_expbar_title_da.png
new file mode 100644
index 00000000000..78bfe5d9735
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_stats_expbar_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_stats_item_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_stats_item_title_da.png
new file mode 100644
index 00000000000..2cbce6c3dcf
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_stats_item_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_stats_stats_title_da.png b/public/images/ui/legacy/text_images/da/summary/summary_stats_stats_title_da.png
new file mode 100644
index 00000000000..ff97416c7ed
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_stats_stats_title_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_tabs_1_da.png b/public/images/ui/legacy/text_images/da/summary/summary_tabs_1_da.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_tabs_1_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_tabs_2_da.png b/public/images/ui/legacy/text_images/da/summary/summary_tabs_2_da.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_tabs_2_da.png differ
diff --git a/public/images/ui/legacy/text_images/da/summary/summary_tabs_3_da.png b/public/images/ui/legacy/text_images/da/summary/summary_tabs_3_da.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/da/summary/summary_tabs_3_da.png differ
diff --git a/public/images/ui/legacy/text_images/de/battle_ui/overlay_exp_label_de.png b/public/images/ui/legacy/text_images/de/battle_ui/overlay_exp_label_de.png
new file mode 100644
index 00000000000..4c456fff94e
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/battle_ui/overlay_exp_label_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/battle_ui/overlay_hp_label_boss_de.png b/public/images/ui/legacy/text_images/de/battle_ui/overlay_hp_label_boss_de.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/battle_ui/overlay_hp_label_boss_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/battle_ui/overlay_hp_label_de.png b/public/images/ui/legacy/text_images/de/battle_ui/overlay_hp_label_de.png
new file mode 100644
index 00000000000..b8404159bc9
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/battle_ui/overlay_hp_label_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/battle_ui/overlay_lv_de.png b/public/images/ui/legacy/text_images/de/battle_ui/overlay_lv_de.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/battle_ui/overlay_lv_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/battle_ui/pbinfo_stat_de.json b/public/images/ui/legacy/text_images/de/battle_ui/pbinfo_stat_de.json
new file mode 100644
index 00000000000..c5ace776596
--- /dev/null
+++ b/public/images/ui/legacy/text_images/de/battle_ui/pbinfo_stat_de.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_de.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/de/battle_ui/pbinfo_stat_de.png b/public/images/ui/legacy/text_images/de/battle_ui/pbinfo_stat_de.png
new file mode 100644
index 00000000000..8de02e9f16e
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/battle_ui/pbinfo_stat_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/party_ui/party_slot_overlay_hp_de.png b/public/images/ui/legacy/text_images/de/party_ui/party_slot_overlay_hp_de.png
new file mode 100644
index 00000000000..8265dfda0d2
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/party_ui/party_slot_overlay_hp_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/party_ui/party_slot_overlay_lv_de.png b/public/images/ui/legacy/text_images/de/party_ui/party_slot_overlay_lv_de.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/party_ui/party_slot_overlay_lv_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_dexnb_label_de.png b/public/images/ui/legacy/text_images/de/summary/summary_dexnb_label_de.png
new file mode 100644
index 00000000000..ef081f493f3
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_dexnb_label_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_dexnb_label_overlay_shiny_de.png b/public/images/ui/legacy/text_images/de/summary/summary_dexnb_label_overlay_shiny_de.png
new file mode 100644
index 00000000000..92c2412f426
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_dexnb_label_overlay_shiny_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_moves_descriptions_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_moves_descriptions_title_de.png
new file mode 100644
index 00000000000..ea4827c081d
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_moves_descriptions_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_moves_effect_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_moves_effect_title_de.png
new file mode 100644
index 00000000000..951e9281839
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_moves_effect_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_moves_moves_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_moves_moves_title_de.png
new file mode 100644
index 00000000000..d5e28d3dfe7
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_moves_moves_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_moves_overlay_pp_de.png b/public/images/ui/legacy/text_images/de/summary/summary_moves_overlay_pp_de.png
new file mode 100644
index 00000000000..ba23731775d
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_moves_overlay_pp_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_profile_ability_de.png b/public/images/ui/legacy/text_images/de/summary/summary_profile_ability_de.png
new file mode 100644
index 00000000000..2b6bd055555
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_profile_ability_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_profile_memo_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_profile_memo_title_de.png
new file mode 100644
index 00000000000..089668218fa
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_profile_memo_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_profile_passive_de.png b/public/images/ui/legacy/text_images/de/summary/summary_profile_passive_de.png
new file mode 100644
index 00000000000..681ae3f1b5e
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_profile_passive_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_profile_profile_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_profile_profile_title_de.png
new file mode 100644
index 00000000000..83b8a1d5e99
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_profile_profile_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_stats_exp_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_stats_exp_title_de.png
new file mode 100644
index 00000000000..fa702b4c223
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_stats_exp_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_stats_expbar_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_stats_expbar_title_de.png
new file mode 100644
index 00000000000..78bfe5d9735
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_stats_expbar_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_stats_item_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_stats_item_title_de.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_stats_item_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_stats_stats_title_de.png b/public/images/ui/legacy/text_images/de/summary/summary_stats_stats_title_de.png
new file mode 100644
index 00000000000..87438a5bd4f
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_stats_stats_title_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_tabs_1_de.png b/public/images/ui/legacy/text_images/de/summary/summary_tabs_1_de.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_tabs_1_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_tabs_2_de.png b/public/images/ui/legacy/text_images/de/summary/summary_tabs_2_de.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_tabs_2_de.png differ
diff --git a/public/images/ui/legacy/text_images/de/summary/summary_tabs_3_de.png b/public/images/ui/legacy/text_images/de/summary/summary_tabs_3_de.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/de/summary/summary_tabs_3_de.png differ
diff --git a/public/images/ui/legacy/text_images/en/battle_ui/overlay_exp_label.png b/public/images/ui/legacy/text_images/en/battle_ui/overlay_exp_label.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/battle_ui/overlay_exp_label.png differ
diff --git a/public/images/ui/legacy/text_images/en/battle_ui/overlay_hp_label.png b/public/images/ui/legacy/text_images/en/battle_ui/overlay_hp_label.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/battle_ui/overlay_hp_label.png differ
diff --git a/public/images/ui/legacy/text_images/en/battle_ui/overlay_hp_label_boss.png b/public/images/ui/legacy/text_images/en/battle_ui/overlay_hp_label_boss.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/battle_ui/overlay_hp_label_boss.png differ
diff --git a/public/images/ui/legacy/text_images/en/battle_ui/overlay_lv.png b/public/images/ui/legacy/text_images/en/battle_ui/overlay_lv.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/battle_ui/overlay_lv.png differ
diff --git a/public/images/ui/legacy/pbinfo_stat.json b/public/images/ui/legacy/text_images/en/battle_ui/pbinfo_stat.json
similarity index 100%
rename from public/images/ui/legacy/pbinfo_stat.json
rename to public/images/ui/legacy/text_images/en/battle_ui/pbinfo_stat.json
diff --git a/public/images/ui/legacy/text_images/en/battle_ui/pbinfo_stat.png b/public/images/ui/legacy/text_images/en/battle_ui/pbinfo_stat.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/battle_ui/pbinfo_stat.png differ
diff --git a/public/images/ui/legacy/text_images/en/party_ui/party_slot_overlay_hp.png b/public/images/ui/legacy/text_images/en/party_ui/party_slot_overlay_hp.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/party_ui/party_slot_overlay_hp.png differ
diff --git a/public/images/ui/legacy/text_images/en/party_ui/party_slot_overlay_lv.png b/public/images/ui/legacy/text_images/en/party_ui/party_slot_overlay_lv.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/party_ui/party_slot_overlay_lv.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_dexnb_label.png b/public/images/ui/legacy/text_images/en/summary/summary_dexnb_label.png
new file mode 100644
index 00000000000..eab90a91c7f
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_dexnb_label.png differ
diff --git a/public/images/ui/legacy/summary_overlay_shiny.png b/public/images/ui/legacy/text_images/en/summary/summary_dexnb_label_overlay_shiny.png
similarity index 100%
rename from public/images/ui/legacy/summary_overlay_shiny.png
rename to public/images/ui/legacy/text_images/en/summary/summary_dexnb_label_overlay_shiny.png
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_moves_descriptions_title.png b/public/images/ui/legacy/text_images/en/summary/summary_moves_descriptions_title.png
new file mode 100644
index 00000000000..3d2b4d08376
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_moves_descriptions_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_moves_effect_title.png b/public/images/ui/legacy/text_images/en/summary/summary_moves_effect_title.png
new file mode 100644
index 00000000000..55fb0efd832
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_moves_effect_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_moves_moves_title.png b/public/images/ui/legacy/text_images/en/summary/summary_moves_moves_title.png
new file mode 100644
index 00000000000..d869ab4e311
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_moves_moves_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_moves_overlay_pp.png b/public/images/ui/legacy/text_images/en/summary/summary_moves_overlay_pp.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_moves_overlay_pp.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_profile_ability.png b/public/images/ui/legacy/text_images/en/summary/summary_profile_ability.png
new file mode 100644
index 00000000000..6600db26802
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_profile_ability.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_profile_memo_title.png b/public/images/ui/legacy/text_images/en/summary/summary_profile_memo_title.png
new file mode 100644
index 00000000000..14cdf099044
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_profile_memo_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_profile_passive.png b/public/images/ui/legacy/text_images/en/summary/summary_profile_passive.png
new file mode 100644
index 00000000000..66f56ff435e
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_profile_passive.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_profile_profile_title.png b/public/images/ui/legacy/text_images/en/summary/summary_profile_profile_title.png
new file mode 100644
index 00000000000..8d4f82df3b3
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_profile_profile_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_stats_exp_title.png b/public/images/ui/legacy/text_images/en/summary/summary_stats_exp_title.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_stats_exp_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_stats_expbar_title.png b/public/images/ui/legacy/text_images/en/summary/summary_stats_expbar_title.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_stats_expbar_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_stats_item_title.png b/public/images/ui/legacy/text_images/en/summary/summary_stats_item_title.png
new file mode 100644
index 00000000000..5752b28288c
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_stats_item_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_stats_stats_title.png b/public/images/ui/legacy/text_images/en/summary/summary_stats_stats_title.png
new file mode 100644
index 00000000000..5531819ef66
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_stats_stats_title.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_tabs_1.png b/public/images/ui/legacy/text_images/en/summary/summary_tabs_1.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_tabs_1.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_tabs_2.png b/public/images/ui/legacy/text_images/en/summary/summary_tabs_2.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_tabs_2.png differ
diff --git a/public/images/ui/legacy/text_images/en/summary/summary_tabs_3.png b/public/images/ui/legacy/text_images/en/summary/summary_tabs_3.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/en/summary/summary_tabs_3.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_exp_label_es-ES.png b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_exp_label_es-ES.png
new file mode 100644
index 00000000000..acb04a84a31
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_exp_label_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_hp_label_boss_es-ES.png b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_hp_label_boss_es-ES.png
new file mode 100644
index 00000000000..6018011d75b
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_hp_label_boss_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_hp_label_es-ES.png b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_hp_label_es-ES.png
new file mode 100644
index 00000000000..4f388b70a75
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_hp_label_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_lv_es-ES.png b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_lv_es-ES.png
new file mode 100644
index 00000000000..7fdf26388bf
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/battle_ui/overlay_lv_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/battle_ui/pbinfo_stat_es_ES.json b/public/images/ui/legacy/text_images/es-ES/battle_ui/pbinfo_stat_es_ES.json
new file mode 100644
index 00000000000..e7e6318b3b5
--- /dev/null
+++ b/public/images/ui/legacy/text_images/es-ES/battle_ui/pbinfo_stat_es_ES.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_es-ES.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/es-ES/battle_ui/pbinfo_stat_es_ES.png b/public/images/ui/legacy/text_images/es-ES/battle_ui/pbinfo_stat_es_ES.png
new file mode 100644
index 00000000000..0a66f1a7137
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/battle_ui/pbinfo_stat_es_ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/party_ui/party_slot_overlay_hp_es-ES.png b/public/images/ui/legacy/text_images/es-ES/party_ui/party_slot_overlay_hp_es-ES.png
new file mode 100644
index 00000000000..981d8573aca
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/party_ui/party_slot_overlay_hp_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/party_ui/party_slot_overlay_lv_es-ES.png b/public/images/ui/legacy/text_images/es-ES/party_ui/party_slot_overlay_lv_es-ES.png
new file mode 100644
index 00000000000..512db34fa85
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/party_ui/party_slot_overlay_lv_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_dexnb_label_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_dexnb_label_es-ES.png
new file mode 100644
index 00000000000..a457468d8d0
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_dexnb_label_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_dexnb_label_overlay_shiny_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_dexnb_label_overlay_shiny_es-ES.png
new file mode 100644
index 00000000000..3277a28a59b
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_dexnb_label_overlay_shiny_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_descriptions_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_descriptions_title_es-ES.png
new file mode 100644
index 00000000000..ffcae31894d
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_descriptions_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_effect_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_effect_title_es-ES.png
new file mode 100644
index 00000000000..50ce2f51d6f
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_effect_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_moves_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_moves_title_es-ES.png
new file mode 100644
index 00000000000..ffca8bdfa10
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_moves_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_overlay_pp_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_overlay_pp_es-ES.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_moves_overlay_pp_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_ability_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_ability_es-ES.png
new file mode 100644
index 00000000000..b1b1a84ddcf
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_ability_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_memo_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_memo_title_es-ES.png
new file mode 100644
index 00000000000..e837a58e4f9
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_memo_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_passive_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_passive_es-ES.png
new file mode 100644
index 00000000000..885453e3e98
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_passive_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_profile_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_profile_title_es-ES.png
new file mode 100644
index 00000000000..51ba9300dab
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_profile_profile_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_exp_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_exp_title_es-ES.png
new file mode 100644
index 00000000000..7c8a80f0627
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_exp_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_expbar_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_expbar_title_es-ES.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_expbar_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_item_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_item_title_es-ES.png
new file mode 100644
index 00000000000..15fdb806125
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_item_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_stats_title_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_stats_title_es-ES.png
new file mode 100644
index 00000000000..2233461522c
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_stats_stats_title_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_1_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_1_es-ES.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_1_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_2_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_2_es-ES.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_2_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_3_es-ES.png b/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_3_es-ES.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-ES/summary/summary_tabs_3_es-ES.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_exp_label_es-MX.png b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_exp_label_es-MX.png
new file mode 100644
index 00000000000..acb04a84a31
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_exp_label_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_hp_label_boss_es-MX.png b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_hp_label_boss_es-MX.png
new file mode 100644
index 00000000000..6018011d75b
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_hp_label_boss_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_hp_label_es-MX.png b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_hp_label_es-MX.png
new file mode 100644
index 00000000000..4f388b70a75
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_hp_label_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_lv_es-MX.png b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_lv_es-MX.png
new file mode 100644
index 00000000000..7fdf26388bf
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/battle_ui/overlay_lv_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/battle_ui/pbinfo_stat_es_MX.json b/public/images/ui/legacy/text_images/es-MX/battle_ui/pbinfo_stat_es_MX.json
new file mode 100644
index 00000000000..98bd43e7dd9
--- /dev/null
+++ b/public/images/ui/legacy/text_images/es-MX/battle_ui/pbinfo_stat_es_MX.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_es-MX.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/es-MX/battle_ui/pbinfo_stat_es_MX.png b/public/images/ui/legacy/text_images/es-MX/battle_ui/pbinfo_stat_es_MX.png
new file mode 100644
index 00000000000..0a66f1a7137
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/battle_ui/pbinfo_stat_es_MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/party_ui/party_slot_overlay_hp_es-MX.png b/public/images/ui/legacy/text_images/es-MX/party_ui/party_slot_overlay_hp_es-MX.png
new file mode 100644
index 00000000000..981d8573aca
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/party_ui/party_slot_overlay_hp_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/party_ui/party_slot_overlay_lv_es-MX.png b/public/images/ui/legacy/text_images/es-MX/party_ui/party_slot_overlay_lv_es-MX.png
new file mode 100644
index 00000000000..512db34fa85
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/party_ui/party_slot_overlay_lv_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_dexnb_label_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_dexnb_label_es-MX.png
new file mode 100644
index 00000000000..a457468d8d0
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_dexnb_label_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_dexnb_label_overlay_shiny_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_dexnb_label_overlay_shiny_es-MX.png
new file mode 100644
index 00000000000..3277a28a59b
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_dexnb_label_overlay_shiny_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_descriptions_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_descriptions_title_es-MX.png
new file mode 100644
index 00000000000..ffcae31894d
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_descriptions_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_effect_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_effect_title_es-MX.png
new file mode 100644
index 00000000000..50ce2f51d6f
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_effect_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_moves_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_moves_title_es-MX.png
new file mode 100644
index 00000000000..ffca8bdfa10
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_moves_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_overlay_pp_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_overlay_pp_es-MX.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_moves_overlay_pp_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_ability_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_ability_es-MX.png
new file mode 100644
index 00000000000..b1b1a84ddcf
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_ability_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_memo_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_memo_title_es-MX.png
new file mode 100644
index 00000000000..e837a58e4f9
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_memo_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_passive_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_passive_es-MX.png
new file mode 100644
index 00000000000..885453e3e98
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_passive_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_profile_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_profile_title_es-MX.png
new file mode 100644
index 00000000000..51ba9300dab
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_profile_profile_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_exp_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_exp_title_es-MX.png
new file mode 100644
index 00000000000..7c8a80f0627
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_exp_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_expbar_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_expbar_title_es-MX.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_expbar_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_item_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_item_title_es-MX.png
new file mode 100644
index 00000000000..15fdb806125
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_item_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_stats_title_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_stats_title_es-MX.png
new file mode 100644
index 00000000000..2233461522c
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_stats_stats_title_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_1_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_1_es-MX.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_1_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_2_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_2_es-MX.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_2_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_3_es-MX.png b/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_3_es-MX.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/es-MX/summary/summary_tabs_3_es-MX.png differ
diff --git a/public/images/ui/legacy/text_images/fr/battle_ui/overlay_exp_label_fr.png b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_exp_label_fr.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_exp_label_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/battle_ui/overlay_hp_label_boss_fr.png b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_hp_label_boss_fr.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_hp_label_boss_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/battle_ui/overlay_hp_label_fr.png b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_hp_label_fr.png
new file mode 100644
index 00000000000..3f7e12c3246
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_hp_label_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/battle_ui/overlay_lv_fr.png b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_lv_fr.png
new file mode 100644
index 00000000000..5a31182069c
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/battle_ui/overlay_lv_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/battle_ui/pbinfo_stat_fr.json b/public/images/ui/legacy/text_images/fr/battle_ui/pbinfo_stat_fr.json
new file mode 100644
index 00000000000..00cc9f7ea0e
--- /dev/null
+++ b/public/images/ui/legacy/text_images/fr/battle_ui/pbinfo_stat_fr.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_fr.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/fr/battle_ui/pbinfo_stat_fr.png b/public/images/ui/legacy/text_images/fr/battle_ui/pbinfo_stat_fr.png
new file mode 100644
index 00000000000..1919561ddfe
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/battle_ui/pbinfo_stat_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/party_ui/party_slot_overlay_hp_fr.png b/public/images/ui/legacy/text_images/fr/party_ui/party_slot_overlay_hp_fr.png
new file mode 100644
index 00000000000..55468e4b1d1
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/party_ui/party_slot_overlay_hp_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/party_ui/party_slot_overlay_lv_fr.png b/public/images/ui/legacy/text_images/fr/party_ui/party_slot_overlay_lv_fr.png
new file mode 100644
index 00000000000..e7bbec23b07
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/party_ui/party_slot_overlay_lv_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_dexnb_label_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_dexnb_label_fr.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_dexnb_label_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_dexnb_label_overlay_shiny_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_dexnb_label_overlay_shiny_fr.png
new file mode 100644
index 00000000000..1640e46caa0
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_dexnb_label_overlay_shiny_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_moves_descriptions_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_moves_descriptions_title_fr.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_moves_descriptions_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_moves_effect_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_moves_effect_title_fr.png
new file mode 100644
index 00000000000..49f4e11096a
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_moves_effect_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_moves_moves_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_moves_moves_title_fr.png
new file mode 100644
index 00000000000..1fd7d72c307
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_moves_moves_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_moves_overlay_pp_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_moves_overlay_pp_fr.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_moves_overlay_pp_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_profile_ability_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_profile_ability_fr.png
new file mode 100644
index 00000000000..3354b40adfe
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_profile_ability_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_profile_memo_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_profile_memo_title_fr.png
new file mode 100644
index 00000000000..54c6beb4428
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_profile_memo_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_profile_passive_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_profile_passive_fr.png
new file mode 100644
index 00000000000..f5d2c98a21c
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_profile_passive_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_profile_profile_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_profile_profile_title_fr.png
new file mode 100644
index 00000000000..bccba2d87df
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_profile_profile_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_stats_exp_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_stats_exp_title_fr.png
new file mode 100644
index 00000000000..32d41d44be4
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_stats_exp_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_stats_expbar_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_stats_expbar_title_fr.png
new file mode 100644
index 00000000000..da999975932
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_stats_expbar_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_stats_item_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_stats_item_title_fr.png
new file mode 100644
index 00000000000..45c10e8c907
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_stats_item_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_stats_stats_title_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_stats_stats_title_fr.png
new file mode 100644
index 00000000000..63fe6a694af
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_stats_stats_title_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_tabs_1_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_tabs_1_fr.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_tabs_1_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_tabs_2_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_tabs_2_fr.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_tabs_2_fr.png differ
diff --git a/public/images/ui/legacy/text_images/fr/summary/summary_tabs_3_fr.png b/public/images/ui/legacy/text_images/fr/summary/summary_tabs_3_fr.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/fr/summary/summary_tabs_3_fr.png differ
diff --git a/public/images/ui/legacy/text_images/it/battle_ui/overlay_exp_label_it.png b/public/images/ui/legacy/text_images/it/battle_ui/overlay_exp_label_it.png
new file mode 100644
index 00000000000..3a888a5ffb0
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/battle_ui/overlay_exp_label_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/battle_ui/overlay_hp_label_boss_it.png b/public/images/ui/legacy/text_images/it/battle_ui/overlay_hp_label_boss_it.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/battle_ui/overlay_hp_label_boss_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/battle_ui/overlay_hp_label_it.png b/public/images/ui/legacy/text_images/it/battle_ui/overlay_hp_label_it.png
new file mode 100644
index 00000000000..4f388b70a75
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/battle_ui/overlay_hp_label_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/battle_ui/overlay_lv_it.png b/public/images/ui/legacy/text_images/it/battle_ui/overlay_lv_it.png
new file mode 100644
index 00000000000..579c684d766
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/battle_ui/overlay_lv_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/battle_ui/pbinfo_stat_it.json b/public/images/ui/legacy/text_images/it/battle_ui/pbinfo_stat_it.json
new file mode 100644
index 00000000000..1971bb61221
--- /dev/null
+++ b/public/images/ui/legacy/text_images/it/battle_ui/pbinfo_stat_it.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_it.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/it/battle_ui/pbinfo_stat_it.png b/public/images/ui/legacy/text_images/it/battle_ui/pbinfo_stat_it.png
new file mode 100644
index 00000000000..ced53e91a6e
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/battle_ui/pbinfo_stat_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/party_ui/party_slot_overlay_hp_it.png b/public/images/ui/legacy/text_images/it/party_ui/party_slot_overlay_hp_it.png
new file mode 100644
index 00000000000..981d8573aca
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/party_ui/party_slot_overlay_hp_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/party_ui/party_slot_overlay_lv_it.png b/public/images/ui/legacy/text_images/it/party_ui/party_slot_overlay_lv_it.png
new file mode 100644
index 00000000000..5338254b4d0
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/party_ui/party_slot_overlay_lv_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_dexnb_label_it.png b/public/images/ui/legacy/text_images/it/summary/summary_dexnb_label_it.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_dexnb_label_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_dexnb_label_overlay_shiny_it.png b/public/images/ui/legacy/text_images/it/summary/summary_dexnb_label_overlay_shiny_it.png
new file mode 100644
index 00000000000..1640e46caa0
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_dexnb_label_overlay_shiny_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_moves_descriptions_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_moves_descriptions_title_it.png
new file mode 100644
index 00000000000..e0bf21396e5
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_moves_descriptions_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_moves_effect_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_moves_effect_title_it.png
new file mode 100644
index 00000000000..99f9dfeb2c3
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_moves_effect_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_moves_moves_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_moves_moves_title_it.png
new file mode 100644
index 00000000000..e56e3f4b336
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_moves_moves_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_moves_overlay_pp_it.png b/public/images/ui/legacy/text_images/it/summary/summary_moves_overlay_pp_it.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_moves_overlay_pp_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_profile_ability_it.png b/public/images/ui/legacy/text_images/it/summary/summary_profile_ability_it.png
new file mode 100644
index 00000000000..bb915da37ee
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_profile_ability_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_profile_memo_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_profile_memo_title_it.png
new file mode 100644
index 00000000000..0c81cd56f06
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_profile_memo_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_profile_passive_it.png b/public/images/ui/legacy/text_images/it/summary/summary_profile_passive_it.png
new file mode 100644
index 00000000000..a072b663d25
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_profile_passive_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_profile_profile_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_profile_profile_title_it.png
new file mode 100644
index 00000000000..169b0a7b8e7
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_profile_profile_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_stats_exp_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_stats_exp_title_it.png
new file mode 100644
index 00000000000..a3a1aa4c402
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_stats_exp_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_stats_expbar_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_stats_expbar_title_it.png
new file mode 100644
index 00000000000..aa8eee71613
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_stats_expbar_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_stats_item_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_stats_item_title_it.png
new file mode 100644
index 00000000000..a93695a48c8
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_stats_item_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_stats_stats_title_it.png b/public/images/ui/legacy/text_images/it/summary/summary_stats_stats_title_it.png
new file mode 100644
index 00000000000..998db7fc7e3
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_stats_stats_title_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_tabs_1_it.png b/public/images/ui/legacy/text_images/it/summary/summary_tabs_1_it.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_tabs_1_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_tabs_2_it.png b/public/images/ui/legacy/text_images/it/summary/summary_tabs_2_it.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_tabs_2_it.png differ
diff --git a/public/images/ui/legacy/text_images/it/summary/summary_tabs_3_it.png b/public/images/ui/legacy/text_images/it/summary/summary_tabs_3_it.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/it/summary/summary_tabs_3_it.png differ
diff --git a/public/images/ui/legacy/text_images/ja/battle_ui/overlay_exp_label_ja.png b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_exp_label_ja.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_exp_label_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/battle_ui/overlay_hp_label_boss_ja.png b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_hp_label_boss_ja.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_hp_label_boss_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/battle_ui/overlay_hp_label_ja.png b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_hp_label_ja.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_hp_label_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/battle_ui/overlay_lv_ja.png b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_lv_ja.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/battle_ui/overlay_lv_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/battle_ui/pbinfo_stat_ja.json b/public/images/ui/legacy/text_images/ja/battle_ui/pbinfo_stat_ja.json
new file mode 100644
index 00000000000..d8907e8e68c
--- /dev/null
+++ b/public/images/ui/legacy/text_images/ja/battle_ui/pbinfo_stat_ja.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ja.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/ja/battle_ui/pbinfo_stat_ja.png b/public/images/ui/legacy/text_images/ja/battle_ui/pbinfo_stat_ja.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/battle_ui/pbinfo_stat_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/party_ui/party_slot_overlay_hp_ja.png b/public/images/ui/legacy/text_images/ja/party_ui/party_slot_overlay_hp_ja.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/party_ui/party_slot_overlay_hp_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/party_ui/party_slot_overlay_lv_ja.png b/public/images/ui/legacy/text_images/ja/party_ui/party_slot_overlay_lv_ja.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/party_ui/party_slot_overlay_lv_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_dexnb_label_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_dexnb_label_ja.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_dexnb_label_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_dexnb_label_overlay_shiny_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_dexnb_label_overlay_shiny_ja.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_dexnb_label_overlay_shiny_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_moves_descriptions_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_moves_descriptions_title_ja.png
new file mode 100644
index 00000000000..d844e844244
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_moves_descriptions_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_moves_effect_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_moves_effect_title_ja.png
new file mode 100644
index 00000000000..a75452f1299
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_moves_effect_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_moves_moves_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_moves_moves_title_ja.png
new file mode 100644
index 00000000000..6492c3ecf7c
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_moves_moves_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_moves_overlay_pp_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_moves_overlay_pp_ja.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_moves_overlay_pp_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_profile_ability_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_profile_ability_ja.png
new file mode 100644
index 00000000000..6c82a863a69
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_profile_ability_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_profile_memo_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_profile_memo_title_ja.png
new file mode 100644
index 00000000000..3f5a4536817
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_profile_memo_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_profile_passive_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_profile_passive_ja.png
new file mode 100644
index 00000000000..3bfed88c7da
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_profile_passive_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_profile_profile_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_profile_profile_title_ja.png
new file mode 100644
index 00000000000..a05cba49247
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_profile_profile_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_stats_exp_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_stats_exp_title_ja.png
new file mode 100644
index 00000000000..0bc237a7e6b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_stats_exp_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_stats_expbar_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_stats_expbar_title_ja.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_stats_expbar_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_stats_item_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_stats_item_title_ja.png
new file mode 100644
index 00000000000..114b4d7fd3f
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_stats_item_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_stats_stats_title_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_stats_stats_title_ja.png
new file mode 100644
index 00000000000..c9f2e28fb07
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_stats_stats_title_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_tabs_1_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_tabs_1_ja.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_tabs_1_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_tabs_2_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_tabs_2_ja.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_tabs_2_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ja/summary/summary_tabs_3_ja.png b/public/images/ui/legacy/text_images/ja/summary/summary_tabs_3_ja.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/ja/summary/summary_tabs_3_ja.png differ
diff --git a/public/images/ui/legacy/text_images/ko/battle_ui/overlay_exp_label_ko.png b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_exp_label_ko.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_exp_label_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/battle_ui/overlay_hp_label_boss_ko.png b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_hp_label_boss_ko.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_hp_label_boss_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/battle_ui/overlay_hp_label_ko.png b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_hp_label_ko.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_hp_label_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/battle_ui/overlay_lv_ko.png b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_lv_ko.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/battle_ui/overlay_lv_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/battle_ui/pbinfo_stat_ko.json b/public/images/ui/legacy/text_images/ko/battle_ui/pbinfo_stat_ko.json
new file mode 100644
index 00000000000..359e3a5b76f
--- /dev/null
+++ b/public/images/ui/legacy/text_images/ko/battle_ui/pbinfo_stat_ko.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ko.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/ko/battle_ui/pbinfo_stat_ko.png b/public/images/ui/legacy/text_images/ko/battle_ui/pbinfo_stat_ko.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/battle_ui/pbinfo_stat_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/party_ui/party_slot_overlay_hp_ko.png b/public/images/ui/legacy/text_images/ko/party_ui/party_slot_overlay_hp_ko.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/party_ui/party_slot_overlay_hp_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/party_ui/party_slot_overlay_lv_ko.png b/public/images/ui/legacy/text_images/ko/party_ui/party_slot_overlay_lv_ko.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/party_ui/party_slot_overlay_lv_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_dexnb_label_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_dexnb_label_ko.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_dexnb_label_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_dexnb_label_overlay_shiny_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_dexnb_label_overlay_shiny_ko.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_dexnb_label_overlay_shiny_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_moves_descriptions_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_moves_descriptions_title_ko.png
new file mode 100644
index 00000000000..350bd607aed
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_moves_descriptions_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_moves_effect_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_moves_effect_title_ko.png
new file mode 100644
index 00000000000..f90ac18fc4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_moves_effect_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_moves_moves_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_moves_moves_title_ko.png
new file mode 100644
index 00000000000..d020d8a77cb
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_moves_moves_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_moves_overlay_pp_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_moves_overlay_pp_ko.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_moves_overlay_pp_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_profile_ability_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_profile_ability_ko.png
new file mode 100644
index 00000000000..cdeafaf486e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_profile_ability_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_profile_memo_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_profile_memo_title_ko.png
new file mode 100644
index 00000000000..7af960fe1df
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_profile_memo_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_profile_passive_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_profile_passive_ko.png
new file mode 100644
index 00000000000..34a13ffe836
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_profile_passive_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_profile_profile_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_profile_profile_title_ko.png
new file mode 100644
index 00000000000..deb57b96715
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_profile_profile_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_stats_exp_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_stats_exp_title_ko.png
new file mode 100644
index 00000000000..af0cb3afab8
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_stats_exp_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_stats_expbar_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_stats_expbar_title_ko.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_stats_expbar_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_stats_item_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_stats_item_title_ko.png
new file mode 100644
index 00000000000..6be5909e5f0
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_stats_item_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_stats_stats_title_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_stats_stats_title_ko.png
new file mode 100644
index 00000000000..371c2be4976
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_stats_stats_title_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_tabs_1_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_tabs_1_ko.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_tabs_1_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_tabs_2_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_tabs_2_ko.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_tabs_2_ko.png differ
diff --git a/public/images/ui/legacy/text_images/ko/summary/summary_tabs_3_ko.png b/public/images/ui/legacy/text_images/ko/summary/summary_tabs_3_ko.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/ko/summary/summary_tabs_3_ko.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_exp_label_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_exp_label_pt-BR.png
new file mode 100644
index 00000000000..acb04a84a31
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_exp_label_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_hp_label_boss_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_hp_label_boss_pt-BR.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_hp_label_boss_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_hp_label_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_hp_label_pt-BR.png
new file mode 100644
index 00000000000..4f388b70a75
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_hp_label_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_lv_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_lv_pt-BR.png
new file mode 100644
index 00000000000..7fdf26388bf
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/battle_ui/overlay_lv_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.json b/public/images/ui/legacy/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.json
new file mode 100644
index 00000000000..dc7eecf1970
--- /dev/null
+++ b/public/images/ui/legacy/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_pt-BR.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 8
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 8
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.png
new file mode 100644
index 00000000000..3dcd273bcc9
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/party_ui/party_slot_overlay_hp_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/party_ui/party_slot_overlay_hp_pt-BR.png
new file mode 100644
index 00000000000..981d8573aca
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/party_ui/party_slot_overlay_hp_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/party_ui/party_slot_overlay_lv_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/party_ui/party_slot_overlay_lv_pt-BR.png
new file mode 100644
index 00000000000..512db34fa85
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/party_ui/party_slot_overlay_lv_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_dexnb_label_overlay_shiny_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_dexnb_label_overlay_shiny_pt-BR.png
new file mode 100644
index 00000000000..3277a28a59b
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_dexnb_label_overlay_shiny_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_dexnb_label_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_dexnb_label_pt-BR.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_dexnb_label_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_descriptions_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_descriptions_title_pt-BR.png
new file mode 100644
index 00000000000..8d888143663
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_descriptions_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_effect_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_effect_title_pt-BR.png
new file mode 100644
index 00000000000..83190955f2c
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_effect_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_moves_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_moves_title_pt-BR.png
new file mode 100644
index 00000000000..0a2d1657750
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_moves_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_overlay_pp_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_overlay_pp_pt-BR.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_moves_overlay_pp_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_ability_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_ability_pt-BR.png
new file mode 100644
index 00000000000..28fbb5a8be9
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_ability_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_memo_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_memo_title_pt-BR.png
new file mode 100644
index 00000000000..b7ef7c91fc5
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_memo_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_passive_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_passive_pt-BR.png
new file mode 100644
index 00000000000..11616a74287
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_passive_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_profile_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_profile_title_pt-BR.png
new file mode 100644
index 00000000000..a5ed0e3e169
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_profile_profile_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_exp_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_exp_title_pt-BR.png
new file mode 100644
index 00000000000..d66fa829be1
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_exp_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_expbar_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_expbar_title_pt-BR.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_expbar_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_item_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_item_title_pt-BR.png
new file mode 100644
index 00000000000..b9ea9400a64
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_item_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_stats_title_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_stats_title_pt-BR.png
new file mode 100644
index 00000000000..bc9dffc2887
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_stats_stats_title_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_1_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_1_pt-BR.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_1_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_2_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_2_pt-BR.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_2_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_3_pt-BR.png b/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_3_pt-BR.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/pt-BR/summary/summary_tabs_3_pt-BR.png differ
diff --git a/public/images/ui/legacy/text_images/ro/battle_ui/overlay_exp_label_ro.png b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_exp_label_ro.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_exp_label_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/battle_ui/overlay_hp_label_boss_ro.png b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_hp_label_boss_ro.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_hp_label_boss_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/battle_ui/overlay_hp_label_ro.png b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_hp_label_ro.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_hp_label_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/battle_ui/overlay_lv_ro.png b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_lv_ro.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/battle_ui/overlay_lv_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/battle_ui/pbinfo_stat_ro.json b/public/images/ui/legacy/text_images/ro/battle_ui/pbinfo_stat_ro.json
new file mode 100644
index 00000000000..8c268a77098
--- /dev/null
+++ b/public/images/ui/legacy/text_images/ro/battle_ui/pbinfo_stat_ro.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ro.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/ro/battle_ui/pbinfo_stat_ro.png b/public/images/ui/legacy/text_images/ro/battle_ui/pbinfo_stat_ro.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/battle_ui/pbinfo_stat_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/party_ui/party_slot_overlay_hp_ro.png b/public/images/ui/legacy/text_images/ro/party_ui/party_slot_overlay_hp_ro.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/party_ui/party_slot_overlay_hp_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/party_ui/party_slot_overlay_lv_ro.png b/public/images/ui/legacy/text_images/ro/party_ui/party_slot_overlay_lv_ro.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/party_ui/party_slot_overlay_lv_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_dexnb_label_overlay_shiny_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_dexnb_label_overlay_shiny_ro.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_dexnb_label_overlay_shiny_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_dexnb_label_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_dexnb_label_ro.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_dexnb_label_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_moves_descriptions_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_moves_descriptions_title_ro.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_moves_descriptions_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_moves_effect_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_moves_effect_title_ro.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_moves_effect_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_moves_moves_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_moves_moves_title_ro.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_moves_moves_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_moves_overlay_pp_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_moves_overlay_pp_ro.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_moves_overlay_pp_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_profile_ability_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_profile_ability_ro.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_profile_ability_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_profile_memo_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_profile_memo_title_ro.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_profile_memo_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_profile_passive_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_profile_passive_ro.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_profile_passive_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_profile_profile_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_profile_profile_title_ro.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_profile_profile_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_stats_exp_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_stats_exp_title_ro.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_stats_exp_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_stats_expbar_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_stats_expbar_title_ro.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_stats_expbar_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_stats_item_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_stats_item_title_ro.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_stats_item_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_stats_stats_title_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_stats_stats_title_ro.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_stats_stats_title_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_tabs_1_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_tabs_1_ro.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_tabs_1_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_tabs_2_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_tabs_2_ro.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_tabs_2_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ro/summary/summary_tabs_3_ro.png b/public/images/ui/legacy/text_images/ro/summary/summary_tabs_3_ro.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/ro/summary/summary_tabs_3_ro.png differ
diff --git a/public/images/ui/legacy/text_images/ru/battle_ui/overlay_exp_label_ru.png b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_exp_label_ru.png
new file mode 100644
index 00000000000..d8817108408
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_exp_label_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/battle_ui/overlay_hp_label_boss_ru.png b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_hp_label_boss_ru.png
new file mode 100644
index 00000000000..26c4d570bb1
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_hp_label_boss_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/battle_ui/overlay_hp_label_ru.png b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_hp_label_ru.png
new file mode 100644
index 00000000000..490c93f8d39
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_hp_label_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/battle_ui/overlay_lv_ru.png b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_lv_ru.png
new file mode 100644
index 00000000000..e8760560dfa
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/battle_ui/overlay_lv_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/battle_ui/pbinfo_stat_ru.json b/public/images/ui/legacy/text_images/ru/battle_ui/pbinfo_stat_ru.json
new file mode 100644
index 00000000000..e4e67b4da18
--- /dev/null
+++ b/public/images/ui/legacy/text_images/ru/battle_ui/pbinfo_stat_ru.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ru.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 7
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 7
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 7
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 7
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 7
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 7
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 7
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 7
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/ru/battle_ui/pbinfo_stat_ru.png b/public/images/ui/legacy/text_images/ru/battle_ui/pbinfo_stat_ru.png
new file mode 100644
index 00000000000..0899fbdbfc1
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/battle_ui/pbinfo_stat_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/party_ui/party_slot_overlay_hp_ru.png b/public/images/ui/legacy/text_images/ru/party_ui/party_slot_overlay_hp_ru.png
new file mode 100644
index 00000000000..24bf5a8923f
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/party_ui/party_slot_overlay_hp_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/party_ui/party_slot_overlay_lv_ru.png b/public/images/ui/legacy/text_images/ru/party_ui/party_slot_overlay_lv_ru.png
new file mode 100644
index 00000000000..319d7a75fb8
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/party_ui/party_slot_overlay_lv_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_dexnb_label_overlay_shiny_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_dexnb_label_overlay_shiny_ru.png
new file mode 100644
index 00000000000..1f8f6a1246e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_dexnb_label_overlay_shiny_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_dexnb_label_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_dexnb_label_ru.png
new file mode 100644
index 00000000000..2a2e66426cb
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_dexnb_label_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_moves_descriptions_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_moves_descriptions_title_ru.png
new file mode 100644
index 00000000000..a435d6d845e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_moves_descriptions_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_moves_effect_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_moves_effect_title_ru.png
new file mode 100644
index 00000000000..8bd4b965247
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_moves_effect_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_moves_moves_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_moves_moves_title_ru.png
new file mode 100644
index 00000000000..94afd3226e8
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_moves_moves_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_moves_overlay_pp_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_moves_overlay_pp_ru.png
new file mode 100644
index 00000000000..4af1f833036
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_moves_overlay_pp_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_profile_ability_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_profile_ability_ru.png
new file mode 100644
index 00000000000..ddfcc6102dc
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_profile_ability_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_profile_memo_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_profile_memo_title_ru.png
new file mode 100644
index 00000000000..743a2f36454
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_profile_memo_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_profile_passive_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_profile_passive_ru.png
new file mode 100644
index 00000000000..29179b6d75b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_profile_passive_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_profile_profile_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_profile_profile_title_ru.png
new file mode 100644
index 00000000000..77edb538634
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_profile_profile_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_stats_exp_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_stats_exp_title_ru.png
new file mode 100644
index 00000000000..e058eaa917e
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_stats_exp_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_stats_expbar_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_stats_expbar_title_ru.png
new file mode 100644
index 00000000000..b885633d336
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_stats_expbar_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_stats_item_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_stats_item_title_ru.png
new file mode 100644
index 00000000000..95b01d062ab
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_stats_item_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_stats_stats_title_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_stats_stats_title_ru.png
new file mode 100644
index 00000000000..0c1c5dc9445
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_stats_stats_title_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_tabs_1_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_tabs_1_ru.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_tabs_1_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_tabs_2_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_tabs_2_ru.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_tabs_2_ru.png differ
diff --git a/public/images/ui/legacy/text_images/ru/summary/summary_tabs_3_ru.png b/public/images/ui/legacy/text_images/ru/summary/summary_tabs_3_ru.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/ru/summary/summary_tabs_3_ru.png differ
diff --git a/public/images/ui/legacy/text_images/tl/battle_ui/overlay_exp_label_tl.png b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_exp_label_tl.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_exp_label_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/battle_ui/overlay_hp_label_boss_tl.png b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_hp_label_boss_tl.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_hp_label_boss_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/battle_ui/overlay_hp_label_tl.png b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_hp_label_tl.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_hp_label_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/battle_ui/overlay_lv_tl.png b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_lv_tl.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/battle_ui/overlay_lv_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/battle_ui/pbinfo_stat_tl.json b/public/images/ui/legacy/text_images/tl/battle_ui/pbinfo_stat_tl.json
new file mode 100644
index 00000000000..023a5ee45f9
--- /dev/null
+++ b/public/images/ui/legacy/text_images/tl/battle_ui/pbinfo_stat_tl.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_tl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/tl/battle_ui/pbinfo_stat_tl.png b/public/images/ui/legacy/text_images/tl/battle_ui/pbinfo_stat_tl.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/battle_ui/pbinfo_stat_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/party_ui/party_slot_overlay_hp_tl.png b/public/images/ui/legacy/text_images/tl/party_ui/party_slot_overlay_hp_tl.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/party_ui/party_slot_overlay_hp_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/party_ui/party_slot_overlay_lv_tl.png b/public/images/ui/legacy/text_images/tl/party_ui/party_slot_overlay_lv_tl.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/party_ui/party_slot_overlay_lv_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_dexnb_label_overlay_shiny_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_dexnb_label_overlay_shiny_tl.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_dexnb_label_overlay_shiny_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_dexnb_label_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_dexnb_label_tl.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_dexnb_label_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_moves_descriptions_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_moves_descriptions_title_tl.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_moves_descriptions_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_moves_effect_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_moves_effect_title_tl.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_moves_effect_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_moves_moves_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_moves_moves_title_tl.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_moves_moves_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_moves_overlay_pp_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_moves_overlay_pp_tl.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_moves_overlay_pp_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_profile_ability_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_profile_ability_tl.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_profile_ability_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_profile_memo_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_profile_memo_title_tl.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_profile_memo_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_profile_passive_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_profile_passive_tl.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_profile_passive_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_profile_profile_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_profile_profile_title_tl.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_profile_profile_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_stats_exp_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_stats_exp_title_tl.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_stats_exp_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_stats_expbar_title.png b/public/images/ui/legacy/text_images/tl/summary/summary_stats_expbar_title.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_stats_expbar_title.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_stats_item_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_stats_item_title_tl.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_stats_item_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_stats_stats_title_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_stats_stats_title_tl.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_stats_stats_title_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_tabs_1_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_tabs_1_tl.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_tabs_1_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_tabs_2_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_tabs_2_tl.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_tabs_2_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tl/summary/summary_tabs_3_tl.png b/public/images/ui/legacy/text_images/tl/summary/summary_tabs_3_tl.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/tl/summary/summary_tabs_3_tl.png differ
diff --git a/public/images/ui/legacy/text_images/tr/battle_ui/overlay_exp_label_tr.png b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_exp_label_tr.png
new file mode 100644
index 00000000000..5b9bd882581
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_exp_label_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/battle_ui/overlay_hp_label_boss_tr.png b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_hp_label_boss_tr.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_hp_label_boss_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/battle_ui/overlay_hp_label_tr.png b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_hp_label_tr.png
new file mode 100644
index 00000000000..da11c11cb50
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_hp_label_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/battle_ui/overlay_lv_tr.png b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_lv_tr.png
new file mode 100644
index 00000000000..6d8ccbb3f3a
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/battle_ui/overlay_lv_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/battle_ui/pbinfo_stat_tr.json b/public/images/ui/legacy/text_images/tr/battle_ui/pbinfo_stat_tr.json
new file mode 100644
index 00000000000..6de50500767
--- /dev/null
+++ b/public/images/ui/legacy/text_images/tr/battle_ui/pbinfo_stat_tr.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_tr.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/tr/battle_ui/pbinfo_stat_tr.png b/public/images/ui/legacy/text_images/tr/battle_ui/pbinfo_stat_tr.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/battle_ui/pbinfo_stat_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/party_ui/party_slot_overlay_hp_tr.png b/public/images/ui/legacy/text_images/tr/party_ui/party_slot_overlay_hp_tr.png
new file mode 100644
index 00000000000..2833fa27fb4
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/party_ui/party_slot_overlay_hp_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/party_ui/party_slot_overlay_lv_tr.png b/public/images/ui/legacy/text_images/tr/party_ui/party_slot_overlay_lv_tr.png
new file mode 100644
index 00000000000..958a750a665
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/party_ui/party_slot_overlay_lv_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_dexnb_label_overlay_shiny_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_dexnb_label_overlay_shiny_tr.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_dexnb_label_overlay_shiny_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_dexnb_label_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_dexnb_label_tr.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_dexnb_label_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_moves_descriptions_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_moves_descriptions_title_tr.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_moves_descriptions_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_moves_effect_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_moves_effect_title_tr.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_moves_effect_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_moves_moves_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_moves_moves_title_tr.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_moves_moves_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_moves_overlay_pp_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_moves_overlay_pp_tr.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_moves_overlay_pp_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_profile_ability_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_profile_ability_tr.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_profile_ability_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_profile_memo_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_profile_memo_title_tr.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_profile_memo_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_profile_passive_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_profile_passive_tr.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_profile_passive_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_profile_profile_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_profile_profile_title_tr.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_profile_profile_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_stats_exp_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_stats_exp_title_tr.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_stats_exp_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_stats_expbar_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_stats_expbar_title_tr.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_stats_expbar_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_stats_item_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_stats_item_title_tr.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_stats_item_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_stats_stats_title_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_stats_stats_title_tr.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_stats_stats_title_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_tabs_1_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_tabs_1_tr.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_tabs_1_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_tabs_2_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_tabs_2_tr.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_tabs_2_tr.png differ
diff --git a/public/images/ui/legacy/text_images/tr/summary/summary_tabs_3_tr.png b/public/images/ui/legacy/text_images/tr/summary/summary_tabs_3_tr.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/tr/summary/summary_tabs_3_tr.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_exp_label_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_exp_label_zh-CN.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_exp_label_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_hp_label_boss_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_hp_label_boss_zh-CN.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_hp_label_boss_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_hp_label_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_hp_label_zh-CN.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_hp_label_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_lv_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_lv_zh-CN.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/battle_ui/overlay_lv_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.json b/public/images/ui/legacy/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.json
new file mode 100644
index 00000000000..49649bbc315
--- /dev/null
+++ b/public/images/ui/legacy/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_zh-CN.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/party_ui/party_slot_overlay_hp_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/party_ui/party_slot_overlay_hp_zh-CN.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/party_ui/party_slot_overlay_hp_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/party_ui/party_slot_overlay_lv_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/party_ui/party_slot_overlay_lv_zh-CN.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/party_ui/party_slot_overlay_lv_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_dexnb_label_overlay_shiny_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_dexnb_label_overlay_shiny_zh-CN.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_dexnb_label_overlay_shiny_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_dexnb_label_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_dexnb_label_zh-CN.png
new file mode 100644
index 00000000000..eab90a91c7f
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_dexnb_label_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_descriptions_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_descriptions_title_zh-CN.png
new file mode 100644
index 00000000000..3d2b4d08376
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_descriptions_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_effect_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_effect_title_zh-CN.png
new file mode 100644
index 00000000000..55fb0efd832
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_effect_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_moves_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_moves_title_zh-CN.png
new file mode 100644
index 00000000000..d869ab4e311
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_moves_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_overlay_pp_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_overlay_pp_zh-CN.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_moves_overlay_pp_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_ability_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_ability_zh-CN.png
new file mode 100644
index 00000000000..6600db26802
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_ability_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_memo_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_memo_title_zh-CN.png
new file mode 100644
index 00000000000..14cdf099044
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_memo_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_passive_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_passive_zh-CN.png
new file mode 100644
index 00000000000..66f56ff435e
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_passive_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_profile_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_profile_title_zh-CN.png
new file mode 100644
index 00000000000..8d4f82df3b3
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_profile_profile_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_exp_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_exp_title_zh-CN.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_exp_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_expbar_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_expbar_title_zh-CN.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_expbar_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_item_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_item_title_zh-CN.png
new file mode 100644
index 00000000000..5752b28288c
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_item_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_stats_title_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_stats_title_zh-CN.png
new file mode 100644
index 00000000000..5531819ef66
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_stats_stats_title_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_1_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_1_zh-CN.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_1_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_2_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_2_zh-CN.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_2_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_3_zh-CN.png b/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_3_zh-CN.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-CN/summary/summary_tabs_3_zh-CN.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_exp_label_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_exp_label_zh-TW.png
new file mode 100644
index 00000000000..40b5e8925a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_exp_label_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_hp_label_boss_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_hp_label_boss_zh-TW.png
new file mode 100644
index 00000000000..283d63fb235
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_hp_label_boss_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_hp_label_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_hp_label_zh-TW.png
new file mode 100644
index 00000000000..67824c7ee4e
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_hp_label_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_lv_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_lv_zh-TW.png
new file mode 100644
index 00000000000..ea32ac03ee2
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/battle_ui/overlay_lv_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.json b/public/images/ui/legacy/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.json
new file mode 100644
index 00000000000..5a2e0fe2c30
--- /dev/null
+++ b/public/images/ui/legacy/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_zh-TW.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 112,
+				"h": 6
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 18,
+						"h": 6
+					},
+					"frame": {
+						"x": 18,
+						"y": 0,
+						"w": 18,
+						"h": 6
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 16,
+						"h": 6
+					},
+					"frame": {
+						"x": 36,
+						"y": 0,
+						"w": 16,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 52,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 64,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 76,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 88,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 12,
+						"h": 6
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 12,
+						"h": 6
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 1,
+						"y": 2,
+						"w": 8,
+						"h": 6
+					},
+					"frame": {
+						"x": 112,
+						"y": 0,
+						"w": 8,
+						"h": 6
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/legacy/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.png
new file mode 100644
index 00000000000..c729e7a2207
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/party_ui/party_slot_overlay_hp_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/party_ui/party_slot_overlay_hp_zh-TW.png
new file mode 100644
index 00000000000..a78ac090d3b
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/party_ui/party_slot_overlay_hp_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/party_ui/party_slot_overlay_lv_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/party_ui/party_slot_overlay_lv_zh-TW.png
new file mode 100644
index 00000000000..11bb545c7af
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/party_ui/party_slot_overlay_lv_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_dexnb_label_overlay_shiny_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_dexnb_label_overlay_shiny_zh-TW.png
new file mode 100644
index 00000000000..bb2436738a8
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_dexnb_label_overlay_shiny_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_dexnb_label_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_dexnb_label_zh-TW.png
new file mode 100644
index 00000000000..eab90a91c7f
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_dexnb_label_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_descriptions_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_descriptions_title_zh-TW.png
new file mode 100644
index 00000000000..3d2b4d08376
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_descriptions_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_effect_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_effect_title_zh-TW.png
new file mode 100644
index 00000000000..55fb0efd832
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_effect_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_moves_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_moves_title_zh-TW.png
new file mode 100644
index 00000000000..d869ab4e311
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_moves_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_overlay_pp_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_overlay_pp_zh-TW.png
new file mode 100644
index 00000000000..9babffc0429
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_moves_overlay_pp_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_ability_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_ability_zh-TW.png
new file mode 100644
index 00000000000..6600db26802
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_ability_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_memo_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_memo_title_zh-TW.png
new file mode 100644
index 00000000000..14cdf099044
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_memo_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_passive_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_passive_zh-TW.png
new file mode 100644
index 00000000000..66f56ff435e
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_passive_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_profile_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_profile_title_zh-TW.png
new file mode 100644
index 00000000000..8d4f82df3b3
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_profile_profile_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_exp_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_exp_title_zh-TW.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_exp_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_expbar_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_expbar_title_zh-TW.png
new file mode 100644
index 00000000000..e9dfb10e5d6
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_expbar_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_item_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_item_title_zh-TW.png
new file mode 100644
index 00000000000..5752b28288c
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_item_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_stats_title_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_stats_title_zh-TW.png
new file mode 100644
index 00000000000..5531819ef66
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_stats_stats_title_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_1_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_1_zh-TW.png
new file mode 100644
index 00000000000..379768ea310
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_1_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_2_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_2_zh-TW.png
new file mode 100644
index 00000000000..2a04879b32b
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_2_zh-TW.png differ
diff --git a/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_3_zh-TW.png b/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_3_zh-TW.png
new file mode 100644
index 00000000000..ef65774f744
Binary files /dev/null and b/public/images/ui/legacy/text_images/zh-TW/summary/summary_tabs_3_zh-TW.png differ
diff --git a/public/images/ui/overlay_lv.png b/public/images/ui/overlay_lv.png
deleted file mode 100644
index 6ced2da2660..00000000000
Binary files a/public/images/ui/overlay_lv.png and /dev/null differ
diff --git a/public/images/ui/party_slot_hp_bar.png b/public/images/ui/party_slot_hp_bar.png
index 181bd04c0ea..c1818439e75 100644
Binary files a/public/images/ui/party_slot_hp_bar.png and b/public/images/ui/party_slot_hp_bar.png differ
diff --git a/public/images/ui/pbinfo_enemy_boss.png b/public/images/ui/pbinfo_enemy_boss.png
index ce829bf4631..421edabba03 100644
Binary files a/public/images/ui/pbinfo_enemy_boss.png and b/public/images/ui/pbinfo_enemy_boss.png differ
diff --git a/public/images/ui/pbinfo_enemy_mini.png b/public/images/ui/pbinfo_enemy_mini.png
index ddf10776778..bf60bb0f964 100644
Binary files a/public/images/ui/pbinfo_enemy_mini.png and b/public/images/ui/pbinfo_enemy_mini.png differ
diff --git a/public/images/ui/pbinfo_player.png b/public/images/ui/pbinfo_player.png
index c7b2227e800..55c381bd436 100644
Binary files a/public/images/ui/pbinfo_player.png and b/public/images/ui/pbinfo_player.png differ
diff --git a/public/images/ui/pbinfo_player_mini.png b/public/images/ui/pbinfo_player_mini.png
index 90d5e03dae8..255ad00f8ca 100644
Binary files a/public/images/ui/pbinfo_player_mini.png and b/public/images/ui/pbinfo_player_mini.png differ
diff --git a/public/images/ui/pbinfo_stat.png b/public/images/ui/pbinfo_stat.png
deleted file mode 100644
index 1f86cc6a958..00000000000
Binary files a/public/images/ui/pbinfo_stat.png and /dev/null differ
diff --git a/public/images/ui/pokedex_summary_bg.png b/public/images/ui/pokedex_summary_bg.png
index bb55127edf2..423bc7528fd 100644
Binary files a/public/images/ui/pokedex_summary_bg.png and b/public/images/ui/pokedex_summary_bg.png differ
diff --git a/public/images/ui/starter_select_bg.png b/public/images/ui/starter_select_bg.png
index b11cd12a5e4..14e90dd0f85 100644
Binary files a/public/images/ui/starter_select_bg.png and b/public/images/ui/starter_select_bg.png differ
diff --git a/public/images/ui/summary_bg.png b/public/images/ui/summary_bg.png
index ebfe87b78b2..4bdb6d0db22 100644
Binary files a/public/images/ui/summary_bg.png and b/public/images/ui/summary_bg.png differ
diff --git a/public/images/ui/summary_moves.png b/public/images/ui/summary_moves.png
index 618d91934f2..7f53809d052 100644
Binary files a/public/images/ui/summary_moves.png and b/public/images/ui/summary_moves.png differ
diff --git a/public/images/ui/summary_moves_effect.png b/public/images/ui/summary_moves_effect.png
index 7993cd0ad57..f8ead3c5263 100644
Binary files a/public/images/ui/summary_moves_effect.png and b/public/images/ui/summary_moves_effect.png differ
diff --git a/public/images/ui/summary_overlay_shiny.png b/public/images/ui/summary_overlay_shiny.png
deleted file mode 100644
index 956f9fb93f3..00000000000
Binary files a/public/images/ui/summary_overlay_shiny.png and /dev/null differ
diff --git a/public/images/ui/summary_profile.png b/public/images/ui/summary_profile.png
index 2c0c93af6b4..6362148f9d9 100644
Binary files a/public/images/ui/summary_profile.png and b/public/images/ui/summary_profile.png differ
diff --git a/public/images/ui/summary_profile_ability.png b/public/images/ui/summary_profile_ability.png
deleted file mode 100644
index f839a6249f8..00000000000
Binary files a/public/images/ui/summary_profile_ability.png and /dev/null differ
diff --git a/public/images/ui/summary_profile_passive.png b/public/images/ui/summary_profile_passive.png
deleted file mode 100644
index 1ff9ad8e09a..00000000000
Binary files a/public/images/ui/summary_profile_passive.png and /dev/null differ
diff --git a/public/images/ui/summary_stats.png b/public/images/ui/summary_stats.png
index d808be92fd1..bcfc55fb6aa 100644
Binary files a/public/images/ui/summary_stats.png and b/public/images/ui/summary_stats.png differ
diff --git a/public/images/ui/summary_tabs_2.png b/public/images/ui/summary_tabs_2.png
deleted file mode 100644
index 250c3ce7960..00000000000
Binary files a/public/images/ui/summary_tabs_2.png and /dev/null differ
diff --git a/public/images/ui/summary_tabs_3.png b/public/images/ui/summary_tabs_3.png
deleted file mode 100644
index 1af80fa5c0d..00000000000
Binary files a/public/images/ui/summary_tabs_3.png and /dev/null differ
diff --git a/public/images/ui/text_images/ca/battle_ui/overlay_exp_label_ca.png b/public/images/ui/text_images/ca/battle_ui/overlay_exp_label_ca.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/ca/battle_ui/overlay_exp_label_ca.png differ
diff --git a/public/images/ui/text_images/ca/battle_ui/overlay_hp_label_boss_ca.png b/public/images/ui/text_images/ca/battle_ui/overlay_hp_label_boss_ca.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/ca/battle_ui/overlay_hp_label_boss_ca.png differ
diff --git a/public/images/ui/text_images/ca/battle_ui/overlay_hp_label_ca.png b/public/images/ui/text_images/ca/battle_ui/overlay_hp_label_ca.png
new file mode 100644
index 00000000000..7c7ccba752f
Binary files /dev/null and b/public/images/ui/text_images/ca/battle_ui/overlay_hp_label_ca.png differ
diff --git a/public/images/ui/text_images/ca/battle_ui/overlay_lv_ca.png b/public/images/ui/text_images/ca/battle_ui/overlay_lv_ca.png
new file mode 100644
index 00000000000..869a1ee0051
Binary files /dev/null and b/public/images/ui/text_images/ca/battle_ui/overlay_lv_ca.png differ
diff --git a/public/images/ui/text_images/ca/battle_ui/pbinfo_stat_ca.json b/public/images/ui/text_images/ca/battle_ui/pbinfo_stat_ca.json
new file mode 100644
index 00000000000..488321effd7
--- /dev/null
+++ b/public/images/ui/text_images/ca/battle_ui/pbinfo_stat_ca.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ca.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 9
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 17,
+						"h": 9
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 9,
+						"h": 9
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 9
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/ca/battle_ui/pbinfo_stat_ca.png b/public/images/ui/text_images/ca/battle_ui/pbinfo_stat_ca.png
new file mode 100644
index 00000000000..2b22b4f4d6f
Binary files /dev/null and b/public/images/ui/text_images/ca/battle_ui/pbinfo_stat_ca.png differ
diff --git a/public/images/ui/text_images/ca/party_ui/party_slot_overlay_hp_ca.png b/public/images/ui/text_images/ca/party_ui/party_slot_overlay_hp_ca.png
new file mode 100644
index 00000000000..4bc95e4f95e
Binary files /dev/null and b/public/images/ui/text_images/ca/party_ui/party_slot_overlay_hp_ca.png differ
diff --git a/public/images/ui/text_images/ca/party_ui/party_slot_overlay_lv_ca.png b/public/images/ui/text_images/ca/party_ui/party_slot_overlay_lv_ca.png
new file mode 100644
index 00000000000..c5971de4fd0
Binary files /dev/null and b/public/images/ui/text_images/ca/party_ui/party_slot_overlay_lv_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_dexnb_label_ca.png b/public/images/ui/text_images/ca/summary/summary_dexnb_label_ca.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_dexnb_label_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_dexnb_label_overlay_shiny_ca.png b/public/images/ui/text_images/ca/summary/summary_dexnb_label_overlay_shiny_ca.png
new file mode 100644
index 00000000000..54f0c3799a0
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_dexnb_label_overlay_shiny_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_moves_descriptions_title_ca.png b/public/images/ui/text_images/ca/summary/summary_moves_descriptions_title_ca.png
new file mode 100644
index 00000000000..a37aad953cc
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_moves_descriptions_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_moves_effect_title_ca.png b/public/images/ui/text_images/ca/summary/summary_moves_effect_title_ca.png
new file mode 100644
index 00000000000..ca66436eca6
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_moves_effect_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_moves_moves_title_ca.png b/public/images/ui/text_images/ca/summary/summary_moves_moves_title_ca.png
new file mode 100644
index 00000000000..71a6889da53
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_moves_moves_title_ca.png differ
diff --git a/public/images/ui/summary_moves_overlay_pp.png b/public/images/ui/text_images/ca/summary/summary_moves_overlay_pp_ca.png
similarity index 100%
rename from public/images/ui/summary_moves_overlay_pp.png
rename to public/images/ui/text_images/ca/summary/summary_moves_overlay_pp_ca.png
diff --git a/public/images/ui/text_images/ca/summary/summary_profile_ability_ca.png b/public/images/ui/text_images/ca/summary/summary_profile_ability_ca.png
new file mode 100644
index 00000000000..2d9e8ac317d
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_profile_ability_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_profile_memo_title_ca.png b/public/images/ui/text_images/ca/summary/summary_profile_memo_title_ca.png
new file mode 100644
index 00000000000..b7ef7c91fc5
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_profile_memo_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_profile_passive_ca.png b/public/images/ui/text_images/ca/summary/summary_profile_passive_ca.png
new file mode 100644
index 00000000000..a072b663d25
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_profile_passive_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_profile_profile_title_ca.png b/public/images/ui/text_images/ca/summary/summary_profile_profile_title_ca.png
new file mode 100644
index 00000000000..a5ed0e3e169
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_profile_profile_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_stats_exp_title_ca.png b/public/images/ui/text_images/ca/summary/summary_stats_exp_title_ca.png
new file mode 100644
index 00000000000..e7ac7268b54
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_stats_exp_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_stats_expbar_title_ca.png b/public/images/ui/text_images/ca/summary/summary_stats_expbar_title_ca.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_stats_expbar_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_stats_item_title_ca.png b/public/images/ui/text_images/ca/summary/summary_stats_item_title_ca.png
new file mode 100644
index 00000000000..c13189fc816
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_stats_item_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_stats_stats_title_ca.png b/public/images/ui/text_images/ca/summary/summary_stats_stats_title_ca.png
new file mode 100644
index 00000000000..426848af866
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_stats_stats_title_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_tabs_1_ca.png b/public/images/ui/text_images/ca/summary/summary_tabs_1_ca.png
new file mode 100644
index 00000000000..1e1ad63672e
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_tabs_1_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_tabs_2_ca.png b/public/images/ui/text_images/ca/summary/summary_tabs_2_ca.png
new file mode 100644
index 00000000000..bf794e82d20
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_tabs_2_ca.png differ
diff --git a/public/images/ui/text_images/ca/summary/summary_tabs_3_ca.png b/public/images/ui/text_images/ca/summary/summary_tabs_3_ca.png
new file mode 100644
index 00000000000..6a0109997b2
Binary files /dev/null and b/public/images/ui/text_images/ca/summary/summary_tabs_3_ca.png differ
diff --git a/public/images/ui/text_images/da/battle_ui/overlay_exp_label_da.png b/public/images/ui/text_images/da/battle_ui/overlay_exp_label_da.png
new file mode 100644
index 00000000000..39a92725bc0
Binary files /dev/null and b/public/images/ui/text_images/da/battle_ui/overlay_exp_label_da.png differ
diff --git a/public/images/ui/text_images/da/battle_ui/overlay_hp_label_boss_da.png b/public/images/ui/text_images/da/battle_ui/overlay_hp_label_boss_da.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/da/battle_ui/overlay_hp_label_boss_da.png differ
diff --git a/public/images/ui/text_images/da/battle_ui/overlay_hp_label_da.png b/public/images/ui/text_images/da/battle_ui/overlay_hp_label_da.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/da/battle_ui/overlay_hp_label_da.png differ
diff --git a/public/images/ui/text_images/da/battle_ui/overlay_lv_da.png b/public/images/ui/text_images/da/battle_ui/overlay_lv_da.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/da/battle_ui/overlay_lv_da.png differ
diff --git a/public/images/ui/text_images/da/battle_ui/pbinfo_stat_da.json b/public/images/ui/text_images/da/battle_ui/pbinfo_stat_da.json
new file mode 100644
index 00000000000..5108fa59582
--- /dev/null
+++ b/public/images/ui/text_images/da/battle_ui/pbinfo_stat_da.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_da.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/da/battle_ui/pbinfo_stat_da.png b/public/images/ui/text_images/da/battle_ui/pbinfo_stat_da.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/da/battle_ui/pbinfo_stat_da.png differ
diff --git a/public/images/ui/text_images/da/party_ui/party_slot_overlay_hp_da.png b/public/images/ui/text_images/da/party_ui/party_slot_overlay_hp_da.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/da/party_ui/party_slot_overlay_hp_da.png differ
diff --git a/public/images/ui/party_slot_overlay_lv.png b/public/images/ui/text_images/da/party_ui/party_slot_overlay_lv_da.png
similarity index 100%
rename from public/images/ui/party_slot_overlay_lv.png
rename to public/images/ui/text_images/da/party_ui/party_slot_overlay_lv_da.png
diff --git a/public/images/ui/text_images/da/summary/summary_dexnb_label_da.png b/public/images/ui/text_images/da/summary/summary_dexnb_label_da.png
new file mode 100644
index 00000000000..ef081f493f3
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_dexnb_label_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_dexnb_label_overlay_shiny_da.png b/public/images/ui/text_images/da/summary/summary_dexnb_label_overlay_shiny_da.png
new file mode 100644
index 00000000000..2c66a714e0c
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_dexnb_label_overlay_shiny_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_moves_descriptions_title_da.png b/public/images/ui/text_images/da/summary/summary_moves_descriptions_title_da.png
new file mode 100644
index 00000000000..79b16227bfe
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_moves_descriptions_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_moves_effect_title_da.png b/public/images/ui/text_images/da/summary/summary_moves_effect_title_da.png
new file mode 100644
index 00000000000..f2ac04e62c4
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_moves_effect_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_moves_moves_title_da.png b/public/images/ui/text_images/da/summary/summary_moves_moves_title_da.png
new file mode 100644
index 00000000000..f1732e3e2c0
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_moves_moves_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_moves_overlay_pp_da.png b/public/images/ui/text_images/da/summary/summary_moves_overlay_pp_da.png
new file mode 100644
index 00000000000..04430665f8f
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_moves_overlay_pp_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_profile_ability_da.png b/public/images/ui/text_images/da/summary/summary_profile_ability_da.png
new file mode 100644
index 00000000000..206b65c6cdd
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_profile_ability_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_profile_memo_title_da.png b/public/images/ui/text_images/da/summary/summary_profile_memo_title_da.png
new file mode 100644
index 00000000000..48886d25e39
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_profile_memo_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_profile_passive_da.png b/public/images/ui/text_images/da/summary/summary_profile_passive_da.png
new file mode 100644
index 00000000000..681ae3f1b5e
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_profile_passive_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_profile_profile_title_da.png b/public/images/ui/text_images/da/summary/summary_profile_profile_title_da.png
new file mode 100644
index 00000000000..83b8a1d5e99
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_profile_profile_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_stats_exp_title_da.png b/public/images/ui/text_images/da/summary/summary_stats_exp_title_da.png
new file mode 100644
index 00000000000..feae0c9cb90
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_stats_exp_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_stats_expbar_title_da.png b/public/images/ui/text_images/da/summary/summary_stats_expbar_title_da.png
new file mode 100644
index 00000000000..566dd844aa6
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_stats_expbar_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_stats_item_title_da.png b/public/images/ui/text_images/da/summary/summary_stats_item_title_da.png
new file mode 100644
index 00000000000..2cbce6c3dcf
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_stats_item_title_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_stats_stats_title_da.png b/public/images/ui/text_images/da/summary/summary_stats_stats_title_da.png
new file mode 100644
index 00000000000..ff97416c7ed
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_stats_stats_title_da.png differ
diff --git a/public/images/ui/summary_tabs_1.png b/public/images/ui/text_images/da/summary/summary_tabs_1_da.png
similarity index 100%
rename from public/images/ui/summary_tabs_1.png
rename to public/images/ui/text_images/da/summary/summary_tabs_1_da.png
diff --git a/public/images/ui/text_images/da/summary/summary_tabs_2_da.png b/public/images/ui/text_images/da/summary/summary_tabs_2_da.png
new file mode 100644
index 00000000000..e8dd00bc7e0
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_tabs_2_da.png differ
diff --git a/public/images/ui/text_images/da/summary/summary_tabs_3_da.png b/public/images/ui/text_images/da/summary/summary_tabs_3_da.png
new file mode 100644
index 00000000000..a274f79e4e2
Binary files /dev/null and b/public/images/ui/text_images/da/summary/summary_tabs_3_da.png differ
diff --git a/public/images/ui/text_images/de/battle_ui/overlay_exp_label_de.png b/public/images/ui/text_images/de/battle_ui/overlay_exp_label_de.png
new file mode 100644
index 00000000000..39a92725bc0
Binary files /dev/null and b/public/images/ui/text_images/de/battle_ui/overlay_exp_label_de.png differ
diff --git a/public/images/ui/text_images/de/battle_ui/overlay_hp_label_boss_de.png b/public/images/ui/text_images/de/battle_ui/overlay_hp_label_boss_de.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/de/battle_ui/overlay_hp_label_boss_de.png differ
diff --git a/public/images/ui/text_images/de/battle_ui/overlay_hp_label_de.png b/public/images/ui/text_images/de/battle_ui/overlay_hp_label_de.png
new file mode 100644
index 00000000000..8b227eebd7a
Binary files /dev/null and b/public/images/ui/text_images/de/battle_ui/overlay_hp_label_de.png differ
diff --git a/public/images/ui/text_images/de/battle_ui/overlay_lv_de.png b/public/images/ui/text_images/de/battle_ui/overlay_lv_de.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/de/battle_ui/overlay_lv_de.png differ
diff --git a/public/images/ui/text_images/de/battle_ui/pbinfo_stat_de.json b/public/images/ui/text_images/de/battle_ui/pbinfo_stat_de.json
new file mode 100644
index 00000000000..dbf39c94059
--- /dev/null
+++ b/public/images/ui/text_images/de/battle_ui/pbinfo_stat_de.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_de.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/de/battle_ui/pbinfo_stat_de.png b/public/images/ui/text_images/de/battle_ui/pbinfo_stat_de.png
new file mode 100644
index 00000000000..b8bcb6138b9
Binary files /dev/null and b/public/images/ui/text_images/de/battle_ui/pbinfo_stat_de.png differ
diff --git a/public/images/ui/text_images/de/party_ui/party_slot_overlay_hp_de.png b/public/images/ui/text_images/de/party_ui/party_slot_overlay_hp_de.png
new file mode 100644
index 00000000000..47ac22e52cb
Binary files /dev/null and b/public/images/ui/text_images/de/party_ui/party_slot_overlay_hp_de.png differ
diff --git a/public/images/ui/text_images/de/party_ui/party_slot_overlay_lv_de.png b/public/images/ui/text_images/de/party_ui/party_slot_overlay_lv_de.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/de/party_ui/party_slot_overlay_lv_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_dexnb_label_de.png b/public/images/ui/text_images/de/summary/summary_dexnb_label_de.png
new file mode 100644
index 00000000000..ef081f493f3
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_dexnb_label_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_dexnb_label_overlay_shiny_de.png b/public/images/ui/text_images/de/summary/summary_dexnb_label_overlay_shiny_de.png
new file mode 100644
index 00000000000..2c66a714e0c
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_dexnb_label_overlay_shiny_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_moves_descriptions_title_de.png b/public/images/ui/text_images/de/summary/summary_moves_descriptions_title_de.png
new file mode 100644
index 00000000000..ea4827c081d
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_moves_descriptions_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_moves_effect_title_de.png b/public/images/ui/text_images/de/summary/summary_moves_effect_title_de.png
new file mode 100644
index 00000000000..951e9281839
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_moves_effect_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_moves_moves_title_de.png b/public/images/ui/text_images/de/summary/summary_moves_moves_title_de.png
new file mode 100644
index 00000000000..d5e28d3dfe7
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_moves_moves_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_moves_overlay_pp_de.png b/public/images/ui/text_images/de/summary/summary_moves_overlay_pp_de.png
new file mode 100644
index 00000000000..5db3861fbc9
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_moves_overlay_pp_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_profile_ability_de.png b/public/images/ui/text_images/de/summary/summary_profile_ability_de.png
new file mode 100644
index 00000000000..2b6bd055555
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_profile_ability_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_profile_memo_title_de.png b/public/images/ui/text_images/de/summary/summary_profile_memo_title_de.png
new file mode 100644
index 00000000000..089668218fa
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_profile_memo_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_profile_passive_de.png b/public/images/ui/text_images/de/summary/summary_profile_passive_de.png
new file mode 100644
index 00000000000..681ae3f1b5e
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_profile_passive_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_profile_profile_title_de.png b/public/images/ui/text_images/de/summary/summary_profile_profile_title_de.png
new file mode 100644
index 00000000000..83b8a1d5e99
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_profile_profile_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_stats_exp_title_de.png b/public/images/ui/text_images/de/summary/summary_stats_exp_title_de.png
new file mode 100644
index 00000000000..fa702b4c223
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_stats_exp_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_stats_expbar_title_de.png b/public/images/ui/text_images/de/summary/summary_stats_expbar_title_de.png
new file mode 100644
index 00000000000..566dd844aa6
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_stats_expbar_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_stats_item_title_de.png b/public/images/ui/text_images/de/summary/summary_stats_item_title_de.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_stats_item_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_stats_stats_title_de.png b/public/images/ui/text_images/de/summary/summary_stats_stats_title_de.png
new file mode 100644
index 00000000000..87438a5bd4f
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_stats_stats_title_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_tabs_1_de.png b/public/images/ui/text_images/de/summary/summary_tabs_1_de.png
new file mode 100644
index 00000000000..9c3e6c795b4
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_tabs_1_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_tabs_2_de.png b/public/images/ui/text_images/de/summary/summary_tabs_2_de.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_tabs_2_de.png differ
diff --git a/public/images/ui/text_images/de/summary/summary_tabs_3_de.png b/public/images/ui/text_images/de/summary/summary_tabs_3_de.png
new file mode 100644
index 00000000000..297df98c111
Binary files /dev/null and b/public/images/ui/text_images/de/summary/summary_tabs_3_de.png differ
diff --git a/public/images/ui/text_images/en/battle_ui/overlay_exp_label.png b/public/images/ui/text_images/en/battle_ui/overlay_exp_label.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/en/battle_ui/overlay_exp_label.png differ
diff --git a/public/images/ui/text_images/en/battle_ui/overlay_hp_label.png b/public/images/ui/text_images/en/battle_ui/overlay_hp_label.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/en/battle_ui/overlay_hp_label.png differ
diff --git a/public/images/ui/text_images/en/battle_ui/overlay_hp_label_boss.png b/public/images/ui/text_images/en/battle_ui/overlay_hp_label_boss.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/en/battle_ui/overlay_hp_label_boss.png differ
diff --git a/public/images/ui/text_images/en/battle_ui/overlay_lv.png b/public/images/ui/text_images/en/battle_ui/overlay_lv.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/en/battle_ui/overlay_lv.png differ
diff --git a/public/images/ui/pbinfo_stat.json b/public/images/ui/text_images/en/battle_ui/pbinfo_stat.json
similarity index 100%
rename from public/images/ui/pbinfo_stat.json
rename to public/images/ui/text_images/en/battle_ui/pbinfo_stat.json
diff --git a/public/images/ui/text_images/en/battle_ui/pbinfo_stat.png b/public/images/ui/text_images/en/battle_ui/pbinfo_stat.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/en/battle_ui/pbinfo_stat.png differ
diff --git a/public/images/ui/text_images/en/party_ui/party_slot_overlay_hp.png b/public/images/ui/text_images/en/party_ui/party_slot_overlay_hp.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/en/party_ui/party_slot_overlay_hp.png differ
diff --git a/public/images/ui/text_images/en/party_ui/party_slot_overlay_lv.png b/public/images/ui/text_images/en/party_ui/party_slot_overlay_lv.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/en/party_ui/party_slot_overlay_lv.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_dexnb_label.png b/public/images/ui/text_images/en/summary/summary_dexnb_label.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_dexnb_label.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_dexnb_label_overlay_shiny.png b/public/images/ui/text_images/en/summary/summary_dexnb_label_overlay_shiny.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_dexnb_label_overlay_shiny.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_moves_descriptions_title.png b/public/images/ui/text_images/en/summary/summary_moves_descriptions_title.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_moves_descriptions_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_moves_effect_title.png b/public/images/ui/text_images/en/summary/summary_moves_effect_title.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_moves_effect_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_moves_moves_title.png b/public/images/ui/text_images/en/summary/summary_moves_moves_title.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_moves_moves_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_moves_overlay_pp.png b/public/images/ui/text_images/en/summary/summary_moves_overlay_pp.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_moves_overlay_pp.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_profile_ability.png b/public/images/ui/text_images/en/summary/summary_profile_ability.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_profile_ability.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_profile_memo_title.png b/public/images/ui/text_images/en/summary/summary_profile_memo_title.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_profile_memo_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_profile_passive.png b/public/images/ui/text_images/en/summary/summary_profile_passive.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_profile_passive.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_profile_profile_title.png b/public/images/ui/text_images/en/summary/summary_profile_profile_title.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_profile_profile_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_stats_exp_title.png b/public/images/ui/text_images/en/summary/summary_stats_exp_title.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_stats_exp_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_stats_expbar_title.png b/public/images/ui/text_images/en/summary/summary_stats_expbar_title.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_stats_expbar_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_stats_item_title.png b/public/images/ui/text_images/en/summary/summary_stats_item_title.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_stats_item_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_stats_stats_title.png b/public/images/ui/text_images/en/summary/summary_stats_stats_title.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_stats_stats_title.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_tabs_1.png b/public/images/ui/text_images/en/summary/summary_tabs_1.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_tabs_1.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_tabs_2.png b/public/images/ui/text_images/en/summary/summary_tabs_2.png
new file mode 100644
index 00000000000..50c1db1f34c
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_tabs_2.png differ
diff --git a/public/images/ui/text_images/en/summary/summary_tabs_3.png b/public/images/ui/text_images/en/summary/summary_tabs_3.png
new file mode 100644
index 00000000000..24676712fb9
Binary files /dev/null and b/public/images/ui/text_images/en/summary/summary_tabs_3.png differ
diff --git a/public/images/ui/text_images/es-ES/battle_ui/overlay_exp_label_es-ES.png b/public/images/ui/text_images/es-ES/battle_ui/overlay_exp_label_es-ES.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/es-ES/battle_ui/overlay_exp_label_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/battle_ui/overlay_hp_label_boss_es-ES.png b/public/images/ui/text_images/es-ES/battle_ui/overlay_hp_label_boss_es-ES.png
new file mode 100644
index 00000000000..440ba6136dc
Binary files /dev/null and b/public/images/ui/text_images/es-ES/battle_ui/overlay_hp_label_boss_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/battle_ui/overlay_hp_label_es-ES.png b/public/images/ui/text_images/es-ES/battle_ui/overlay_hp_label_es-ES.png
new file mode 100644
index 00000000000..7c7ccba752f
Binary files /dev/null and b/public/images/ui/text_images/es-ES/battle_ui/overlay_hp_label_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/battle_ui/overlay_lv_es-ES.png b/public/images/ui/text_images/es-ES/battle_ui/overlay_lv_es-ES.png
new file mode 100644
index 00000000000..869a1ee0051
Binary files /dev/null and b/public/images/ui/text_images/es-ES/battle_ui/overlay_lv_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/battle_ui/pbinfo_stat_es-ES.json b/public/images/ui/text_images/es-ES/battle_ui/pbinfo_stat_es-ES.json
new file mode 100644
index 00000000000..1af1d7108bc
--- /dev/null
+++ b/public/images/ui/text_images/es-ES/battle_ui/pbinfo_stat_es-ES.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_es-ES.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 9
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 17,
+						"h": 9
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 9,
+						"h": 9
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 9
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/es-ES/battle_ui/pbinfo_stat_es-ES.png b/public/images/ui/text_images/es-ES/battle_ui/pbinfo_stat_es-ES.png
new file mode 100644
index 00000000000..63f8215113f
Binary files /dev/null and b/public/images/ui/text_images/es-ES/battle_ui/pbinfo_stat_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/party_ui/party_slot_overlay_hp_es-ES.png b/public/images/ui/text_images/es-ES/party_ui/party_slot_overlay_hp_es-ES.png
new file mode 100644
index 00000000000..4bc95e4f95e
Binary files /dev/null and b/public/images/ui/text_images/es-ES/party_ui/party_slot_overlay_hp_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/party_ui/party_slot_overlay_lv_es-ES.png b/public/images/ui/text_images/es-ES/party_ui/party_slot_overlay_lv_es-ES.png
new file mode 100644
index 00000000000..c5971de4fd0
Binary files /dev/null and b/public/images/ui/text_images/es-ES/party_ui/party_slot_overlay_lv_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_dexnb_label_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_dexnb_label_es-ES.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_dexnb_label_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_dexnb_label_overlay_shiny_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_dexnb_label_overlay_shiny_es-ES.png
new file mode 100644
index 00000000000..54f0c3799a0
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_dexnb_label_overlay_shiny_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_moves_descriptions_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_moves_descriptions_title_es-ES.png
new file mode 100644
index 00000000000..3a4e3c7c375
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_moves_descriptions_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_moves_effect_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_moves_effect_title_es-ES.png
new file mode 100644
index 00000000000..cf8d1309848
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_moves_effect_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_moves_moves_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_moves_moves_title_es-ES.png
new file mode 100644
index 00000000000..a601ae79e4f
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_moves_moves_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_moves_overlay_pp_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_moves_overlay_pp_es-ES.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_moves_overlay_pp_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_profile_ability_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_profile_ability_es-ES.png
new file mode 100644
index 00000000000..71bffe95cfe
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_profile_ability_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_profile_memo_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_profile_memo_title_es-ES.png
new file mode 100644
index 00000000000..b7ef7c91fc5
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_profile_memo_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_profile_passive_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_profile_passive_es-ES.png
new file mode 100644
index 00000000000..a50e3cacf58
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_profile_passive_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_profile_profile_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_profile_profile_title_es-ES.png
new file mode 100644
index 00000000000..a5ed0e3e169
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_profile_profile_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_stats_exp_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_stats_exp_title_es-ES.png
new file mode 100644
index 00000000000..7c8a80f0627
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_stats_exp_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_stats_expbar_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_stats_expbar_title_es-ES.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_stats_expbar_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_stats_item_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_stats_item_title_es-ES.png
new file mode 100644
index 00000000000..9236aaa1ff8
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_stats_item_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_stats_stats_title_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_stats_stats_title_es-ES.png
new file mode 100644
index 00000000000..5b59c12984f
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_stats_stats_title_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_tabs_1_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_tabs_1_es-ES.png
new file mode 100644
index 00000000000..99f187c396f
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_tabs_1_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_tabs_2_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_tabs_2_es-ES.png
new file mode 100644
index 00000000000..c841de2c12c
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_tabs_2_es-ES.png differ
diff --git a/public/images/ui/text_images/es-ES/summary/summary_tabs_3_es-ES.png b/public/images/ui/text_images/es-ES/summary/summary_tabs_3_es-ES.png
new file mode 100644
index 00000000000..805fec323dd
Binary files /dev/null and b/public/images/ui/text_images/es-ES/summary/summary_tabs_3_es-ES.png differ
diff --git a/public/images/ui/text_images/es-MX/battle_ui/overlay_exp_label_es-MX.png b/public/images/ui/text_images/es-MX/battle_ui/overlay_exp_label_es-MX.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/es-MX/battle_ui/overlay_exp_label_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/battle_ui/overlay_hp_label_boss_es-MX.png b/public/images/ui/text_images/es-MX/battle_ui/overlay_hp_label_boss_es-MX.png
new file mode 100644
index 00000000000..440ba6136dc
Binary files /dev/null and b/public/images/ui/text_images/es-MX/battle_ui/overlay_hp_label_boss_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/battle_ui/overlay_hp_label_es-MX.png b/public/images/ui/text_images/es-MX/battle_ui/overlay_hp_label_es-MX.png
new file mode 100644
index 00000000000..7c7ccba752f
Binary files /dev/null and b/public/images/ui/text_images/es-MX/battle_ui/overlay_hp_label_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/battle_ui/overlay_lv_es-MX.png b/public/images/ui/text_images/es-MX/battle_ui/overlay_lv_es-MX.png
new file mode 100644
index 00000000000..869a1ee0051
Binary files /dev/null and b/public/images/ui/text_images/es-MX/battle_ui/overlay_lv_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/battle_ui/pbinfo_stat_es-MX.json b/public/images/ui/text_images/es-MX/battle_ui/pbinfo_stat_es-MX.json
new file mode 100644
index 00000000000..b372566656b
--- /dev/null
+++ b/public/images/ui/text_images/es-MX/battle_ui/pbinfo_stat_es-MX.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_es-MX.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 9
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 17,
+						"h": 9
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 9,
+						"h": 9
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 9
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/es-MX/battle_ui/pbinfo_stat_es-MX.png b/public/images/ui/text_images/es-MX/battle_ui/pbinfo_stat_es-MX.png
new file mode 100644
index 00000000000..63f8215113f
Binary files /dev/null and b/public/images/ui/text_images/es-MX/battle_ui/pbinfo_stat_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/party_ui/party_slot_overlay_hp_es-MX.png b/public/images/ui/text_images/es-MX/party_ui/party_slot_overlay_hp_es-MX.png
new file mode 100644
index 00000000000..4bc95e4f95e
Binary files /dev/null and b/public/images/ui/text_images/es-MX/party_ui/party_slot_overlay_hp_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/party_ui/party_slot_overlay_lv_es-MX.png b/public/images/ui/text_images/es-MX/party_ui/party_slot_overlay_lv_es-MX.png
new file mode 100644
index 00000000000..c5971de4fd0
Binary files /dev/null and b/public/images/ui/text_images/es-MX/party_ui/party_slot_overlay_lv_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_dexnb_label_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_dexnb_label_es-MX.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_dexnb_label_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_dexnb_label_overlay_shiny_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_dexnb_label_overlay_shiny_es-MX.png
new file mode 100644
index 00000000000..54f0c3799a0
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_dexnb_label_overlay_shiny_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_moves_descriptions_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_moves_descriptions_title_es-MX.png
new file mode 100644
index 00000000000..3a4e3c7c375
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_moves_descriptions_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_moves_effect_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_moves_effect_title_es-MX.png
new file mode 100644
index 00000000000..cf8d1309848
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_moves_effect_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_moves_moves_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_moves_moves_title_es-MX.png
new file mode 100644
index 00000000000..a601ae79e4f
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_moves_moves_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_moves_overlay_pp_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_moves_overlay_pp_es-MX.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_moves_overlay_pp_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_profile_ability_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_profile_ability_es-MX.png
new file mode 100644
index 00000000000..71bffe95cfe
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_profile_ability_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_profile_memo_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_profile_memo_title_es-MX.png
new file mode 100644
index 00000000000..b7ef7c91fc5
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_profile_memo_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_profile_passive_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_profile_passive_es-MX.png
new file mode 100644
index 00000000000..a50e3cacf58
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_profile_passive_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_profile_profile_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_profile_profile_title_es-MX.png
new file mode 100644
index 00000000000..a5ed0e3e169
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_profile_profile_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_stats_exp_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_stats_exp_title_es-MX.png
new file mode 100644
index 00000000000..7c8a80f0627
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_stats_exp_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_stats_expbar_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_stats_expbar_title_es-MX.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_stats_expbar_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_stats_item_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_stats_item_title_es-MX.png
new file mode 100644
index 00000000000..9236aaa1ff8
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_stats_item_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_stats_stats_title_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_stats_stats_title_es-MX.png
new file mode 100644
index 00000000000..5b59c12984f
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_stats_stats_title_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_tabs_1_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_tabs_1_es-MX.png
new file mode 100644
index 00000000000..99f187c396f
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_tabs_1_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_tabs_2_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_tabs_2_es-MX.png
new file mode 100644
index 00000000000..c841de2c12c
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_tabs_2_es-MX.png differ
diff --git a/public/images/ui/text_images/es-MX/summary/summary_tabs_3_es-MX.png b/public/images/ui/text_images/es-MX/summary/summary_tabs_3_es-MX.png
new file mode 100644
index 00000000000..805fec323dd
Binary files /dev/null and b/public/images/ui/text_images/es-MX/summary/summary_tabs_3_es-MX.png differ
diff --git a/public/images/ui/text_images/fr/battle_ui/overlay_exp_label_fr.png b/public/images/ui/text_images/fr/battle_ui/overlay_exp_label_fr.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/fr/battle_ui/overlay_exp_label_fr.png differ
diff --git a/public/images/ui/text_images/fr/battle_ui/overlay_hp_label_boss_fr.png b/public/images/ui/text_images/fr/battle_ui/overlay_hp_label_boss_fr.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/fr/battle_ui/overlay_hp_label_boss_fr.png differ
diff --git a/public/images/ui/text_images/fr/battle_ui/overlay_hp_label_fr.png b/public/images/ui/text_images/fr/battle_ui/overlay_hp_label_fr.png
new file mode 100644
index 00000000000..e086339f047
Binary files /dev/null and b/public/images/ui/text_images/fr/battle_ui/overlay_hp_label_fr.png differ
diff --git a/public/images/ui/text_images/fr/battle_ui/overlay_lv_fr.png b/public/images/ui/text_images/fr/battle_ui/overlay_lv_fr.png
new file mode 100644
index 00000000000..9a9ccb6d02d
Binary files /dev/null and b/public/images/ui/text_images/fr/battle_ui/overlay_lv_fr.png differ
diff --git a/public/images/ui/text_images/fr/battle_ui/pbinfo_stat_fr.json b/public/images/ui/text_images/fr/battle_ui/pbinfo_stat_fr.json
new file mode 100644
index 00000000000..1275fe16ec3
--- /dev/null
+++ b/public/images/ui/text_images/fr/battle_ui/pbinfo_stat_fr.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_fr.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 9
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 17,
+						"h": 9
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 9,
+						"h": 9
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 9
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/fr/battle_ui/pbinfo_stat_fr.png b/public/images/ui/text_images/fr/battle_ui/pbinfo_stat_fr.png
new file mode 100644
index 00000000000..baea5c8d93c
Binary files /dev/null and b/public/images/ui/text_images/fr/battle_ui/pbinfo_stat_fr.png differ
diff --git a/public/images/ui/text_images/fr/party_ui/party_slot_overlay_hp_fr.png b/public/images/ui/text_images/fr/party_ui/party_slot_overlay_hp_fr.png
new file mode 100644
index 00000000000..140c99eef68
Binary files /dev/null and b/public/images/ui/text_images/fr/party_ui/party_slot_overlay_hp_fr.png differ
diff --git a/public/images/ui/text_images/fr/party_ui/party_slot_overlay_lv_fr.png b/public/images/ui/text_images/fr/party_ui/party_slot_overlay_lv_fr.png
new file mode 100644
index 00000000000..ff489e33712
Binary files /dev/null and b/public/images/ui/text_images/fr/party_ui/party_slot_overlay_lv_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_dexnb_label_fr.png b/public/images/ui/text_images/fr/summary/summary_dexnb_label_fr.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_dexnb_label_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_dexnb_label_overlay_shiny_fr.png b/public/images/ui/text_images/fr/summary/summary_dexnb_label_overlay_shiny_fr.png
new file mode 100644
index 00000000000..54f0c3799a0
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_dexnb_label_overlay_shiny_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_moves_descriptions_title_fr.png b/public/images/ui/text_images/fr/summary/summary_moves_descriptions_title_fr.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_moves_descriptions_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_moves_effect_title_fr.png b/public/images/ui/text_images/fr/summary/summary_moves_effect_title_fr.png
new file mode 100644
index 00000000000..49f4e11096a
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_moves_effect_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_moves_moves_title_fr.png b/public/images/ui/text_images/fr/summary/summary_moves_moves_title_fr.png
new file mode 100644
index 00000000000..1fd7d72c307
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_moves_moves_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_moves_overlay_pp_fr.png b/public/images/ui/text_images/fr/summary/summary_moves_overlay_pp_fr.png
new file mode 100644
index 00000000000..8285fb09c45
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_moves_overlay_pp_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_profile_ability_fr.png b/public/images/ui/text_images/fr/summary/summary_profile_ability_fr.png
new file mode 100644
index 00000000000..3354b40adfe
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_profile_ability_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_profile_memo_title_fr.png b/public/images/ui/text_images/fr/summary/summary_profile_memo_title_fr.png
new file mode 100644
index 00000000000..54c6beb4428
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_profile_memo_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_profile_passive_fr.png b/public/images/ui/text_images/fr/summary/summary_profile_passive_fr.png
new file mode 100644
index 00000000000..f5d2c98a21c
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_profile_passive_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_profile_profile_title_fr.png b/public/images/ui/text_images/fr/summary/summary_profile_profile_title_fr.png
new file mode 100644
index 00000000000..bccba2d87df
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_profile_profile_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_stats_exp_title_fr.png b/public/images/ui/text_images/fr/summary/summary_stats_exp_title_fr.png
new file mode 100644
index 00000000000..32d41d44be4
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_stats_exp_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_stats_expbar_title_fr.png b/public/images/ui/text_images/fr/summary/summary_stats_expbar_title_fr.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_stats_expbar_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_stats_item_title_fr.png b/public/images/ui/text_images/fr/summary/summary_stats_item_title_fr.png
new file mode 100644
index 00000000000..45c10e8c907
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_stats_item_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_stats_stats_title_fr.png b/public/images/ui/text_images/fr/summary/summary_stats_stats_title_fr.png
new file mode 100644
index 00000000000..63fe6a694af
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_stats_stats_title_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_tabs_1_fr.png b/public/images/ui/text_images/fr/summary/summary_tabs_1_fr.png
new file mode 100644
index 00000000000..dd918e773e9
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_tabs_1_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_tabs_2_fr.png b/public/images/ui/text_images/fr/summary/summary_tabs_2_fr.png
new file mode 100644
index 00000000000..6e53366bec3
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_tabs_2_fr.png differ
diff --git a/public/images/ui/text_images/fr/summary/summary_tabs_3_fr.png b/public/images/ui/text_images/fr/summary/summary_tabs_3_fr.png
new file mode 100644
index 00000000000..d4c353084a3
Binary files /dev/null and b/public/images/ui/text_images/fr/summary/summary_tabs_3_fr.png differ
diff --git a/public/images/ui/text_images/it/battle_ui/overlay_exp_label_it.png b/public/images/ui/text_images/it/battle_ui/overlay_exp_label_it.png
new file mode 100644
index 00000000000..6ad5855cc46
Binary files /dev/null and b/public/images/ui/text_images/it/battle_ui/overlay_exp_label_it.png differ
diff --git a/public/images/ui/text_images/it/battle_ui/overlay_hp_label_boss_it.png b/public/images/ui/text_images/it/battle_ui/overlay_hp_label_boss_it.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/it/battle_ui/overlay_hp_label_boss_it.png differ
diff --git a/public/images/ui/text_images/it/battle_ui/overlay_hp_label_it.png b/public/images/ui/text_images/it/battle_ui/overlay_hp_label_it.png
new file mode 100644
index 00000000000..7c7ccba752f
Binary files /dev/null and b/public/images/ui/text_images/it/battle_ui/overlay_hp_label_it.png differ
diff --git a/public/images/ui/text_images/it/battle_ui/overlay_lv_it.png b/public/images/ui/text_images/it/battle_ui/overlay_lv_it.png
new file mode 100644
index 00000000000..987d806b93a
Binary files /dev/null and b/public/images/ui/text_images/it/battle_ui/overlay_lv_it.png differ
diff --git a/public/images/ui/text_images/it/battle_ui/pbinfo_stat_it.json b/public/images/ui/text_images/it/battle_ui/pbinfo_stat_it.json
new file mode 100644
index 00000000000..111a88ba365
--- /dev/null
+++ b/public/images/ui/text_images/it/battle_ui/pbinfo_stat_it.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_it.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/it/battle_ui/pbinfo_stat_it.png b/public/images/ui/text_images/it/battle_ui/pbinfo_stat_it.png
new file mode 100644
index 00000000000..c2ac58da184
Binary files /dev/null and b/public/images/ui/text_images/it/battle_ui/pbinfo_stat_it.png differ
diff --git a/public/images/ui/text_images/it/party_ui/party_slot_overlay_hp_it.png b/public/images/ui/text_images/it/party_ui/party_slot_overlay_hp_it.png
new file mode 100644
index 00000000000..4bc95e4f95e
Binary files /dev/null and b/public/images/ui/text_images/it/party_ui/party_slot_overlay_hp_it.png differ
diff --git a/public/images/ui/text_images/it/party_ui/party_slot_overlay_lv_it.png b/public/images/ui/text_images/it/party_ui/party_slot_overlay_lv_it.png
new file mode 100644
index 00000000000..31a2a31dd41
Binary files /dev/null and b/public/images/ui/text_images/it/party_ui/party_slot_overlay_lv_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_dexnb_label_it.png b/public/images/ui/text_images/it/summary/summary_dexnb_label_it.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_dexnb_label_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_dexnb_label_overlay_shiny_it.png b/public/images/ui/text_images/it/summary/summary_dexnb_label_overlay_shiny_it.png
new file mode 100644
index 00000000000..54f0c3799a0
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_dexnb_label_overlay_shiny_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_moves_descriptions_title_it.png b/public/images/ui/text_images/it/summary/summary_moves_descriptions_title_it.png
new file mode 100644
index 00000000000..e0bf21396e5
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_moves_descriptions_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_moves_effect_title_it.png b/public/images/ui/text_images/it/summary/summary_moves_effect_title_it.png
new file mode 100644
index 00000000000..99f9dfeb2c3
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_moves_effect_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_moves_moves_title_it.png b/public/images/ui/text_images/it/summary/summary_moves_moves_title_it.png
new file mode 100644
index 00000000000..e56e3f4b336
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_moves_moves_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_moves_overlay_pp_it.png b/public/images/ui/text_images/it/summary/summary_moves_overlay_pp_it.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_moves_overlay_pp_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_profile_ability_it.png b/public/images/ui/text_images/it/summary/summary_profile_ability_it.png
new file mode 100644
index 00000000000..bb915da37ee
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_profile_ability_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_profile_memo_title_it.png b/public/images/ui/text_images/it/summary/summary_profile_memo_title_it.png
new file mode 100644
index 00000000000..0c81cd56f06
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_profile_memo_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_profile_passive_it.png b/public/images/ui/text_images/it/summary/summary_profile_passive_it.png
new file mode 100644
index 00000000000..a072b663d25
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_profile_passive_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_profile_profile_title_it.png b/public/images/ui/text_images/it/summary/summary_profile_profile_title_it.png
new file mode 100644
index 00000000000..169b0a7b8e7
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_profile_profile_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_stats_exp_title_it.png b/public/images/ui/text_images/it/summary/summary_stats_exp_title_it.png
new file mode 100644
index 00000000000..a3a1aa4c402
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_stats_exp_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_stats_expbar_title_it.png b/public/images/ui/text_images/it/summary/summary_stats_expbar_title_it.png
new file mode 100644
index 00000000000..d6cd930c1c2
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_stats_expbar_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_stats_item_title_it.png b/public/images/ui/text_images/it/summary/summary_stats_item_title_it.png
new file mode 100644
index 00000000000..a93695a48c8
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_stats_item_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_stats_stats_title_it.png b/public/images/ui/text_images/it/summary/summary_stats_stats_title_it.png
new file mode 100644
index 00000000000..998db7fc7e3
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_stats_stats_title_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_tabs_1_it.png b/public/images/ui/text_images/it/summary/summary_tabs_1_it.png
new file mode 100644
index 00000000000..933a381dd50
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_tabs_1_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_tabs_2_it.png b/public/images/ui/text_images/it/summary/summary_tabs_2_it.png
new file mode 100644
index 00000000000..07c73fbdb90
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_tabs_2_it.png differ
diff --git a/public/images/ui/text_images/it/summary/summary_tabs_3_it.png b/public/images/ui/text_images/it/summary/summary_tabs_3_it.png
new file mode 100644
index 00000000000..57e8b176be1
Binary files /dev/null and b/public/images/ui/text_images/it/summary/summary_tabs_3_it.png differ
diff --git a/public/images/ui/text_images/ja/battle_ui/overlay_exp_label_ja.png b/public/images/ui/text_images/ja/battle_ui/overlay_exp_label_ja.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/ja/battle_ui/overlay_exp_label_ja.png differ
diff --git a/public/images/ui/text_images/ja/battle_ui/overlay_hp_label_boss_ja.png b/public/images/ui/text_images/ja/battle_ui/overlay_hp_label_boss_ja.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/ja/battle_ui/overlay_hp_label_boss_ja.png differ
diff --git a/public/images/ui/text_images/ja/battle_ui/overlay_hp_label_ja.png b/public/images/ui/text_images/ja/battle_ui/overlay_hp_label_ja.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/ja/battle_ui/overlay_hp_label_ja.png differ
diff --git a/public/images/ui/text_images/ja/battle_ui/overlay_lv_ja.png b/public/images/ui/text_images/ja/battle_ui/overlay_lv_ja.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/ja/battle_ui/overlay_lv_ja.png differ
diff --git a/public/images/ui/text_images/ja/battle_ui/pbinfo_stat_ja.json b/public/images/ui/text_images/ja/battle_ui/pbinfo_stat_ja.json
new file mode 100644
index 00000000000..d8de5c788ef
--- /dev/null
+++ b/public/images/ui/text_images/ja/battle_ui/pbinfo_stat_ja.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ja.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/ja/battle_ui/pbinfo_stat_ja.png b/public/images/ui/text_images/ja/battle_ui/pbinfo_stat_ja.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/ja/battle_ui/pbinfo_stat_ja.png differ
diff --git a/public/images/ui/text_images/ja/party_ui/party_slot_overlay_hp_ja.png b/public/images/ui/text_images/ja/party_ui/party_slot_overlay_hp_ja.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/ja/party_ui/party_slot_overlay_hp_ja.png differ
diff --git a/public/images/ui/text_images/ja/party_ui/party_slot_overlay_lv_ja.png b/public/images/ui/text_images/ja/party_ui/party_slot_overlay_lv_ja.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/ja/party_ui/party_slot_overlay_lv_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_dexnb_label_ja.png b/public/images/ui/text_images/ja/summary/summary_dexnb_label_ja.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_dexnb_label_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_dexnb_label_overlay_shiny_ja.png b/public/images/ui/text_images/ja/summary/summary_dexnb_label_overlay_shiny_ja.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_dexnb_label_overlay_shiny_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_moves_descriptions_title_ja.png b/public/images/ui/text_images/ja/summary/summary_moves_descriptions_title_ja.png
new file mode 100644
index 00000000000..d844e844244
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_moves_descriptions_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_moves_effect_title_ja.png b/public/images/ui/text_images/ja/summary/summary_moves_effect_title_ja.png
new file mode 100644
index 00000000000..a75452f1299
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_moves_effect_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_moves_moves_title_ja.png b/public/images/ui/text_images/ja/summary/summary_moves_moves_title_ja.png
new file mode 100644
index 00000000000..6492c3ecf7c
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_moves_moves_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_moves_overlay_pp_ja.png b/public/images/ui/text_images/ja/summary/summary_moves_overlay_pp_ja.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_moves_overlay_pp_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_profile_ability_ja.png b/public/images/ui/text_images/ja/summary/summary_profile_ability_ja.png
new file mode 100644
index 00000000000..6c82a863a69
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_profile_ability_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_profile_memo_title_ja.png b/public/images/ui/text_images/ja/summary/summary_profile_memo_title_ja.png
new file mode 100644
index 00000000000..3f5a4536817
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_profile_memo_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_profile_passive_ja.png b/public/images/ui/text_images/ja/summary/summary_profile_passive_ja.png
new file mode 100644
index 00000000000..3bfed88c7da
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_profile_passive_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_profile_profile_title_ja.png b/public/images/ui/text_images/ja/summary/summary_profile_profile_title_ja.png
new file mode 100644
index 00000000000..a05cba49247
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_profile_profile_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_stats_exp_title_ja.png b/public/images/ui/text_images/ja/summary/summary_stats_exp_title_ja.png
new file mode 100644
index 00000000000..0bc237a7e6b
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_stats_exp_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_stats_expbar_title_ja.png b/public/images/ui/text_images/ja/summary/summary_stats_expbar_title_ja.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_stats_expbar_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_stats_item_title_ja.png b/public/images/ui/text_images/ja/summary/summary_stats_item_title_ja.png
new file mode 100644
index 00000000000..114b4d7fd3f
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_stats_item_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_stats_stats_title_ja.png b/public/images/ui/text_images/ja/summary/summary_stats_stats_title_ja.png
new file mode 100644
index 00000000000..c9f2e28fb07
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_stats_stats_title_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_tabs_1_ja.png b/public/images/ui/text_images/ja/summary/summary_tabs_1_ja.png
new file mode 100644
index 00000000000..90f454dae75
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_tabs_1_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_tabs_2_ja.png b/public/images/ui/text_images/ja/summary/summary_tabs_2_ja.png
new file mode 100644
index 00000000000..006c33f23b1
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_tabs_2_ja.png differ
diff --git a/public/images/ui/text_images/ja/summary/summary_tabs_3_ja.png b/public/images/ui/text_images/ja/summary/summary_tabs_3_ja.png
new file mode 100644
index 00000000000..3306d0aba62
Binary files /dev/null and b/public/images/ui/text_images/ja/summary/summary_tabs_3_ja.png differ
diff --git a/public/images/ui/text_images/ko/battle_ui/overlay_exp_label_ko.png b/public/images/ui/text_images/ko/battle_ui/overlay_exp_label_ko.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/ko/battle_ui/overlay_exp_label_ko.png differ
diff --git a/public/images/ui/text_images/ko/battle_ui/overlay_hp_label_boss_ko.png b/public/images/ui/text_images/ko/battle_ui/overlay_hp_label_boss_ko.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/ko/battle_ui/overlay_hp_label_boss_ko.png differ
diff --git a/public/images/ui/text_images/ko/battle_ui/overlay_hp_label_ko.png b/public/images/ui/text_images/ko/battle_ui/overlay_hp_label_ko.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/ko/battle_ui/overlay_hp_label_ko.png differ
diff --git a/public/images/ui/text_images/ko/battle_ui/overlay_lv_ko.png b/public/images/ui/text_images/ko/battle_ui/overlay_lv_ko.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/ko/battle_ui/overlay_lv_ko.png differ
diff --git a/public/images/ui/text_images/ko/battle_ui/pbinfo_stat_ko.json b/public/images/ui/text_images/ko/battle_ui/pbinfo_stat_ko.json
new file mode 100644
index 00000000000..a1d660dfca3
--- /dev/null
+++ b/public/images/ui/text_images/ko/battle_ui/pbinfo_stat_ko.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ko.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/ko/battle_ui/pbinfo_stat_ko.png b/public/images/ui/text_images/ko/battle_ui/pbinfo_stat_ko.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/ko/battle_ui/pbinfo_stat_ko.png differ
diff --git a/public/images/ui/text_images/ko/party_ui/party_slot_overlay_hp_ko.png b/public/images/ui/text_images/ko/party_ui/party_slot_overlay_hp_ko.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/ko/party_ui/party_slot_overlay_hp_ko.png differ
diff --git a/public/images/ui/text_images/ko/party_ui/party_slot_overlay_lv_ko.png b/public/images/ui/text_images/ko/party_ui/party_slot_overlay_lv_ko.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/ko/party_ui/party_slot_overlay_lv_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_dexnb_label_ko.png b/public/images/ui/text_images/ko/summary/summary_dexnb_label_ko.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_dexnb_label_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_dexnb_label_overlay_shiny_ko.png b/public/images/ui/text_images/ko/summary/summary_dexnb_label_overlay_shiny_ko.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_dexnb_label_overlay_shiny_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_moves_descriptions_title_ko.png b/public/images/ui/text_images/ko/summary/summary_moves_descriptions_title_ko.png
new file mode 100644
index 00000000000..350bd607aed
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_moves_descriptions_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_moves_effect_title_ko.png b/public/images/ui/text_images/ko/summary/summary_moves_effect_title_ko.png
new file mode 100644
index 00000000000..f90ac18fc4e
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_moves_effect_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_moves_moves_title_ko.png b/public/images/ui/text_images/ko/summary/summary_moves_moves_title_ko.png
new file mode 100644
index 00000000000..d020d8a77cb
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_moves_moves_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_moves_overlay_pp_ko.png b/public/images/ui/text_images/ko/summary/summary_moves_overlay_pp_ko.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_moves_overlay_pp_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_profile_ability_ko.png b/public/images/ui/text_images/ko/summary/summary_profile_ability_ko.png
new file mode 100644
index 00000000000..cdeafaf486e
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_profile_ability_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_profile_memo_title_ko.png b/public/images/ui/text_images/ko/summary/summary_profile_memo_title_ko.png
new file mode 100644
index 00000000000..7af960fe1df
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_profile_memo_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_profile_passive_ko.png b/public/images/ui/text_images/ko/summary/summary_profile_passive_ko.png
new file mode 100644
index 00000000000..34a13ffe836
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_profile_passive_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_profile_profile_title_ko.png b/public/images/ui/text_images/ko/summary/summary_profile_profile_title_ko.png
new file mode 100644
index 00000000000..deb57b96715
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_profile_profile_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_stats_exp_title_ko.png b/public/images/ui/text_images/ko/summary/summary_stats_exp_title_ko.png
new file mode 100644
index 00000000000..af0cb3afab8
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_stats_exp_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_stats_expbar_title_ko.png b/public/images/ui/text_images/ko/summary/summary_stats_expbar_title_ko.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_stats_expbar_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_stats_item_title_ko.png b/public/images/ui/text_images/ko/summary/summary_stats_item_title_ko.png
new file mode 100644
index 00000000000..6be5909e5f0
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_stats_item_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_stats_stats_title_ko.png b/public/images/ui/text_images/ko/summary/summary_stats_stats_title_ko.png
new file mode 100644
index 00000000000..371c2be4976
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_stats_stats_title_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_tabs_1_ko.png b/public/images/ui/text_images/ko/summary/summary_tabs_1_ko.png
new file mode 100644
index 00000000000..487d4a628ca
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_tabs_1_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_tabs_2_ko.png b/public/images/ui/text_images/ko/summary/summary_tabs_2_ko.png
new file mode 100644
index 00000000000..304127ea2ef
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_tabs_2_ko.png differ
diff --git a/public/images/ui/text_images/ko/summary/summary_tabs_3_ko.png b/public/images/ui/text_images/ko/summary/summary_tabs_3_ko.png
new file mode 100644
index 00000000000..832acf4d5ba
Binary files /dev/null and b/public/images/ui/text_images/ko/summary/summary_tabs_3_ko.png differ
diff --git a/public/images/ui/text_images/pt-BR/battle_ui/overlay_exp_label_pt-BR.png b/public/images/ui/text_images/pt-BR/battle_ui/overlay_exp_label_pt-BR.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/battle_ui/overlay_exp_label_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/battle_ui/overlay_hp_label_boss_pt-BR.png b/public/images/ui/text_images/pt-BR/battle_ui/overlay_hp_label_boss_pt-BR.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/battle_ui/overlay_hp_label_boss_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/battle_ui/overlay_hp_label_pt-BR.png b/public/images/ui/text_images/pt-BR/battle_ui/overlay_hp_label_pt-BR.png
new file mode 100644
index 00000000000..7c7ccba752f
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/battle_ui/overlay_hp_label_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/battle_ui/overlay_lv_pt-BR.png b/public/images/ui/text_images/pt-BR/battle_ui/overlay_lv_pt-BR.png
new file mode 100644
index 00000000000..869a1ee0051
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/battle_ui/overlay_lv_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.json b/public/images/ui/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.json
new file mode 100644
index 00000000000..ca97288795e
--- /dev/null
+++ b/public/images/ui/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_pt-BR.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 9
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 19,
+						"h": 9
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 9
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 17,
+						"h": 9
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 13,
+						"h": 9
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 9
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": -1,
+						"w": 9,
+						"h": 9
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 9
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.png b/public/images/ui/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.png
new file mode 100644
index 00000000000..c20f4441983
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/battle_ui/pbinfo_stat_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/party_ui/party_slot_overlay_hp_pt-BR.png b/public/images/ui/text_images/pt-BR/party_ui/party_slot_overlay_hp_pt-BR.png
new file mode 100644
index 00000000000..4bc95e4f95e
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/party_ui/party_slot_overlay_hp_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/party_ui/party_slot_overlay_lv_pt-BR.png b/public/images/ui/text_images/pt-BR/party_ui/party_slot_overlay_lv_pt-BR.png
new file mode 100644
index 00000000000..c5971de4fd0
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/party_ui/party_slot_overlay_lv_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_dexnb_label_overlay_shiny_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_dexnb_label_overlay_shiny_pt-BR.png
new file mode 100644
index 00000000000..54f0c3799a0
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_dexnb_label_overlay_shiny_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_dexnb_label_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_dexnb_label_pt-BR.png
new file mode 100644
index 00000000000..5477e3385a8
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_dexnb_label_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_moves_descriptions_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_moves_descriptions_title_pt-BR.png
new file mode 100644
index 00000000000..8d888143663
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_moves_descriptions_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_moves_effect_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_moves_effect_title_pt-BR.png
new file mode 100644
index 00000000000..83190955f2c
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_moves_effect_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_moves_moves_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_moves_moves_title_pt-BR.png
new file mode 100644
index 00000000000..0a2d1657750
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_moves_moves_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_moves_overlay_pp_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_moves_overlay_pp_pt-BR.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_moves_overlay_pp_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_profile_ability_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_profile_ability_pt-BR.png
new file mode 100644
index 00000000000..28fbb5a8be9
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_profile_ability_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_profile_memo_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_profile_memo_title_pt-BR.png
new file mode 100644
index 00000000000..b7ef7c91fc5
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_profile_memo_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_profile_passive_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_profile_passive_pt-BR.png
new file mode 100644
index 00000000000..11616a74287
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_profile_passive_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_profile_profile_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_profile_profile_title_pt-BR.png
new file mode 100644
index 00000000000..a5ed0e3e169
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_profile_profile_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_stats_exp_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_stats_exp_title_pt-BR.png
new file mode 100644
index 00000000000..d66fa829be1
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_stats_exp_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_stats_expbar_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_stats_expbar_title_pt-BR.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_stats_expbar_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_stats_item_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_stats_item_title_pt-BR.png
new file mode 100644
index 00000000000..b9ea9400a64
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_stats_item_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_stats_stats_title_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_stats_stats_title_pt-BR.png
new file mode 100644
index 00000000000..bc9dffc2887
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_stats_stats_title_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_tabs_1_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_tabs_1_pt-BR.png
new file mode 100644
index 00000000000..888e8042051
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_tabs_1_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_tabs_2_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_tabs_2_pt-BR.png
new file mode 100644
index 00000000000..29cad435f2d
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_tabs_2_pt-BR.png differ
diff --git a/public/images/ui/text_images/pt-BR/summary/summary_tabs_3_pt-BR.png b/public/images/ui/text_images/pt-BR/summary/summary_tabs_3_pt-BR.png
new file mode 100644
index 00000000000..f4eebe1eb11
Binary files /dev/null and b/public/images/ui/text_images/pt-BR/summary/summary_tabs_3_pt-BR.png differ
diff --git a/public/images/ui/text_images/ro/battle_ui/overlay_exp_label_ro.png b/public/images/ui/text_images/ro/battle_ui/overlay_exp_label_ro.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/ro/battle_ui/overlay_exp_label_ro.png differ
diff --git a/public/images/ui/text_images/ro/battle_ui/overlay_hp_label_boss_ro.png b/public/images/ui/text_images/ro/battle_ui/overlay_hp_label_boss_ro.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/ro/battle_ui/overlay_hp_label_boss_ro.png differ
diff --git a/public/images/ui/text_images/ro/battle_ui/overlay_hp_label_ro.png b/public/images/ui/text_images/ro/battle_ui/overlay_hp_label_ro.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/ro/battle_ui/overlay_hp_label_ro.png differ
diff --git a/public/images/ui/text_images/ro/battle_ui/overlay_lv_ro.png b/public/images/ui/text_images/ro/battle_ui/overlay_lv_ro.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/ro/battle_ui/overlay_lv_ro.png differ
diff --git a/public/images/ui/text_images/ro/battle_ui/pbinfo_stat_ro.json b/public/images/ui/text_images/ro/battle_ui/pbinfo_stat_ro.json
new file mode 100644
index 00000000000..b5f74fdd7cc
--- /dev/null
+++ b/public/images/ui/text_images/ro/battle_ui/pbinfo_stat_ro.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ro.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/ro/battle_ui/pbinfo_stat_ro.png b/public/images/ui/text_images/ro/battle_ui/pbinfo_stat_ro.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/ro/battle_ui/pbinfo_stat_ro.png differ
diff --git a/public/images/ui/text_images/ro/party_ui/party_slot_overlay_hp_ro.png b/public/images/ui/text_images/ro/party_ui/party_slot_overlay_hp_ro.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/ro/party_ui/party_slot_overlay_hp_ro.png differ
diff --git a/public/images/ui/text_images/ro/party_ui/party_slot_overlay_lv_ro.png b/public/images/ui/text_images/ro/party_ui/party_slot_overlay_lv_ro.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/ro/party_ui/party_slot_overlay_lv_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_dexnb_label_overlay_shiny_ro.png b/public/images/ui/text_images/ro/summary/summary_dexnb_label_overlay_shiny_ro.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_dexnb_label_overlay_shiny_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_dexnb_label_ro.png b/public/images/ui/text_images/ro/summary/summary_dexnb_label_ro.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_dexnb_label_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_moves_descriptions_title_ro.png b/public/images/ui/text_images/ro/summary/summary_moves_descriptions_title_ro.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_moves_descriptions_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_moves_effect_title_ro.png b/public/images/ui/text_images/ro/summary/summary_moves_effect_title_ro.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_moves_effect_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_moves_moves_title_ro.png b/public/images/ui/text_images/ro/summary/summary_moves_moves_title_ro.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_moves_moves_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_moves_overlay_pp_ro.png b/public/images/ui/text_images/ro/summary/summary_moves_overlay_pp_ro.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_moves_overlay_pp_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_profile_ability_ro.png b/public/images/ui/text_images/ro/summary/summary_profile_ability_ro.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_profile_ability_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_profile_memo_title_ro.png b/public/images/ui/text_images/ro/summary/summary_profile_memo_title_ro.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_profile_memo_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_profile_passive_ro.png b/public/images/ui/text_images/ro/summary/summary_profile_passive_ro.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_profile_passive_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_profile_profile_title_ro.png b/public/images/ui/text_images/ro/summary/summary_profile_profile_title_ro.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_profile_profile_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_stats_exp_title_ro.png b/public/images/ui/text_images/ro/summary/summary_stats_exp_title_ro.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_stats_exp_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_stats_expbar_title_ro.png b/public/images/ui/text_images/ro/summary/summary_stats_expbar_title_ro.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_stats_expbar_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_stats_item_title_ro.png b/public/images/ui/text_images/ro/summary/summary_stats_item_title_ro.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_stats_item_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_stats_stats_title_ro.png b/public/images/ui/text_images/ro/summary/summary_stats_stats_title_ro.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_stats_stats_title_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_tabs_1_ro.png b/public/images/ui/text_images/ro/summary/summary_tabs_1_ro.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_tabs_1_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_tabs_2_ro.png b/public/images/ui/text_images/ro/summary/summary_tabs_2_ro.png
new file mode 100644
index 00000000000..50c1db1f34c
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_tabs_2_ro.png differ
diff --git a/public/images/ui/text_images/ro/summary/summary_tabs_3_ro.png b/public/images/ui/text_images/ro/summary/summary_tabs_3_ro.png
new file mode 100644
index 00000000000..24676712fb9
Binary files /dev/null and b/public/images/ui/text_images/ro/summary/summary_tabs_3_ro.png differ
diff --git a/public/images/ui/text_images/ru/battle_ui/overlay_exp_label_ru.png b/public/images/ui/text_images/ru/battle_ui/overlay_exp_label_ru.png
new file mode 100644
index 00000000000..8342acb74fb
Binary files /dev/null and b/public/images/ui/text_images/ru/battle_ui/overlay_exp_label_ru.png differ
diff --git a/public/images/ui/text_images/ru/battle_ui/overlay_hp_label_boss_ru.png b/public/images/ui/text_images/ru/battle_ui/overlay_hp_label_boss_ru.png
new file mode 100644
index 00000000000..af85409a084
Binary files /dev/null and b/public/images/ui/text_images/ru/battle_ui/overlay_hp_label_boss_ru.png differ
diff --git a/public/images/ui/text_images/ru/battle_ui/overlay_hp_label_ru.png b/public/images/ui/text_images/ru/battle_ui/overlay_hp_label_ru.png
new file mode 100644
index 00000000000..b040247cd64
Binary files /dev/null and b/public/images/ui/text_images/ru/battle_ui/overlay_hp_label_ru.png differ
diff --git a/public/images/ui/text_images/ru/battle_ui/overlay_lv_ru.png b/public/images/ui/text_images/ru/battle_ui/overlay_lv_ru.png
new file mode 100644
index 00000000000..65ec593d656
Binary files /dev/null and b/public/images/ui/text_images/ru/battle_ui/overlay_lv_ru.png differ
diff --git a/public/images/ui/text_images/ru/battle_ui/pbinfo_stat_ru.json b/public/images/ui/text_images/ru/battle_ui/pbinfo_stat_ru.json
new file mode 100644
index 00000000000..61618578d25
--- /dev/null
+++ b/public/images/ui/text_images/ru/battle_ui/pbinfo_stat_ru.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_ru.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 8
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 8
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 8
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 8
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 8
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 8
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 8
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 8
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 8
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 8
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 8
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 8
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 8
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 8
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 8
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 8
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 8
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/ru/battle_ui/pbinfo_stat_ru.png b/public/images/ui/text_images/ru/battle_ui/pbinfo_stat_ru.png
new file mode 100644
index 00000000000..9688d78d425
Binary files /dev/null and b/public/images/ui/text_images/ru/battle_ui/pbinfo_stat_ru.png differ
diff --git a/public/images/ui/text_images/ru/party_ui/party_slot_overlay_hp_ru.png b/public/images/ui/text_images/ru/party_ui/party_slot_overlay_hp_ru.png
new file mode 100644
index 00000000000..5d9e62ac79a
Binary files /dev/null and b/public/images/ui/text_images/ru/party_ui/party_slot_overlay_hp_ru.png differ
diff --git a/public/images/ui/text_images/ru/party_ui/party_slot_overlay_lv_ru.png b/public/images/ui/text_images/ru/party_ui/party_slot_overlay_lv_ru.png
new file mode 100644
index 00000000000..65ec593d656
Binary files /dev/null and b/public/images/ui/text_images/ru/party_ui/party_slot_overlay_lv_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_dexnb_label_overlay_shiny_ru.png b/public/images/ui/text_images/ru/summary/summary_dexnb_label_overlay_shiny_ru.png
new file mode 100644
index 00000000000..1ba0191881d
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_dexnb_label_overlay_shiny_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_dexnb_label_ru.png b/public/images/ui/text_images/ru/summary/summary_dexnb_label_ru.png
new file mode 100644
index 00000000000..2a2e66426cb
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_dexnb_label_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_moves_descriptions_title_ru.png b/public/images/ui/text_images/ru/summary/summary_moves_descriptions_title_ru.png
new file mode 100644
index 00000000000..a435d6d845e
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_moves_descriptions_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_moves_effect_title_ru.png b/public/images/ui/text_images/ru/summary/summary_moves_effect_title_ru.png
new file mode 100644
index 00000000000..8bd4b965247
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_moves_effect_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_moves_moves_title_ru.png b/public/images/ui/text_images/ru/summary/summary_moves_moves_title_ru.png
new file mode 100644
index 00000000000..94afd3226e8
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_moves_moves_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_moves_overlay_pp_ru.png b/public/images/ui/text_images/ru/summary/summary_moves_overlay_pp_ru.png
new file mode 100644
index 00000000000..dbdc2275129
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_moves_overlay_pp_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_profile_ability_ru.png b/public/images/ui/text_images/ru/summary/summary_profile_ability_ru.png
new file mode 100644
index 00000000000..ddfcc6102dc
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_profile_ability_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_profile_memo_title_ru.png b/public/images/ui/text_images/ru/summary/summary_profile_memo_title_ru.png
new file mode 100644
index 00000000000..743a2f36454
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_profile_memo_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_profile_passive_ru.png b/public/images/ui/text_images/ru/summary/summary_profile_passive_ru.png
new file mode 100644
index 00000000000..29179b6d75b
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_profile_passive_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_profile_profile_title_ru.png b/public/images/ui/text_images/ru/summary/summary_profile_profile_title_ru.png
new file mode 100644
index 00000000000..77edb538634
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_profile_profile_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_stats_exp_title_ru.png b/public/images/ui/text_images/ru/summary/summary_stats_exp_title_ru.png
new file mode 100644
index 00000000000..e058eaa917e
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_stats_exp_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_stats_expbar_title_ru.png b/public/images/ui/text_images/ru/summary/summary_stats_expbar_title_ru.png
new file mode 100644
index 00000000000..424a5378f7e
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_stats_expbar_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_stats_item_title_ru.png b/public/images/ui/text_images/ru/summary/summary_stats_item_title_ru.png
new file mode 100644
index 00000000000..95b01d062ab
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_stats_item_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_stats_stats_title_ru.png b/public/images/ui/text_images/ru/summary/summary_stats_stats_title_ru.png
new file mode 100644
index 00000000000..0c1c5dc9445
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_stats_stats_title_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_tabs_1_ru.png b/public/images/ui/text_images/ru/summary/summary_tabs_1_ru.png
new file mode 100644
index 00000000000..1fef6034ad7
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_tabs_1_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_tabs_2_ru.png b/public/images/ui/text_images/ru/summary/summary_tabs_2_ru.png
new file mode 100644
index 00000000000..0382fc880a9
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_tabs_2_ru.png differ
diff --git a/public/images/ui/text_images/ru/summary/summary_tabs_3_ru.png b/public/images/ui/text_images/ru/summary/summary_tabs_3_ru.png
new file mode 100644
index 00000000000..1395ac840af
Binary files /dev/null and b/public/images/ui/text_images/ru/summary/summary_tabs_3_ru.png differ
diff --git a/public/images/ui/text_images/tl/battle_ui/overlay_exp_label_tl.png b/public/images/ui/text_images/tl/battle_ui/overlay_exp_label_tl.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/tl/battle_ui/overlay_exp_label_tl.png differ
diff --git a/public/images/ui/text_images/tl/battle_ui/overlay_hp_label_boss_tl.png b/public/images/ui/text_images/tl/battle_ui/overlay_hp_label_boss_tl.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/tl/battle_ui/overlay_hp_label_boss_tl.png differ
diff --git a/public/images/ui/text_images/tl/battle_ui/overlay_hp_label_tl.png b/public/images/ui/text_images/tl/battle_ui/overlay_hp_label_tl.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/tl/battle_ui/overlay_hp_label_tl.png differ
diff --git a/public/images/ui/text_images/tl/battle_ui/overlay_lv_tl.png b/public/images/ui/text_images/tl/battle_ui/overlay_lv_tl.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/tl/battle_ui/overlay_lv_tl.png differ
diff --git a/public/images/ui/text_images/tl/battle_ui/pbinfo_stat_tl.json b/public/images/ui/text_images/tl/battle_ui/pbinfo_stat_tl.json
new file mode 100644
index 00000000000..d2277c79f24
--- /dev/null
+++ b/public/images/ui/text_images/tl/battle_ui/pbinfo_stat_tl.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_tl.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/tl/battle_ui/pbinfo_stat_tl.png b/public/images/ui/text_images/tl/battle_ui/pbinfo_stat_tl.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/tl/battle_ui/pbinfo_stat_tl.png differ
diff --git a/public/images/ui/text_images/tl/party_ui/party_slot_overlay_hp_tl.png b/public/images/ui/text_images/tl/party_ui/party_slot_overlay_hp_tl.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/tl/party_ui/party_slot_overlay_hp_tl.png differ
diff --git a/public/images/ui/text_images/tl/party_ui/party_slot_overlay_lv_tl.png b/public/images/ui/text_images/tl/party_ui/party_slot_overlay_lv_tl.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/tl/party_ui/party_slot_overlay_lv_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_dexnb_label_overlay_shiny_tl.png b/public/images/ui/text_images/tl/summary/summary_dexnb_label_overlay_shiny_tl.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_dexnb_label_overlay_shiny_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_dexnb_label_tl.png b/public/images/ui/text_images/tl/summary/summary_dexnb_label_tl.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_dexnb_label_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_moves_descriptions_title_tl.png b/public/images/ui/text_images/tl/summary/summary_moves_descriptions_title_tl.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_moves_descriptions_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_moves_effect_title_tl.png b/public/images/ui/text_images/tl/summary/summary_moves_effect_title_tl.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_moves_effect_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_moves_moves_title_tl.png b/public/images/ui/text_images/tl/summary/summary_moves_moves_title_tl.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_moves_moves_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_moves_overlay_pp_tl.png b/public/images/ui/text_images/tl/summary/summary_moves_overlay_pp_tl.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_moves_overlay_pp_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_profile_ability_tl.png b/public/images/ui/text_images/tl/summary/summary_profile_ability_tl.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_profile_ability_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_profile_memo_title_tl.png b/public/images/ui/text_images/tl/summary/summary_profile_memo_title_tl.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_profile_memo_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_profile_passive_tl.png b/public/images/ui/text_images/tl/summary/summary_profile_passive_tl.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_profile_passive_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_profile_profile_title_tl.png b/public/images/ui/text_images/tl/summary/summary_profile_profile_title_tl.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_profile_profile_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_stats_exp_title_tl.png b/public/images/ui/text_images/tl/summary/summary_stats_exp_title_tl.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_stats_exp_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_stats_expbar_title_tl.png b/public/images/ui/text_images/tl/summary/summary_stats_expbar_title_tl.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_stats_expbar_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_stats_item_title_tl.png b/public/images/ui/text_images/tl/summary/summary_stats_item_title_tl.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_stats_item_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_stats_stats_title_tl.png b/public/images/ui/text_images/tl/summary/summary_stats_stats_title_tl.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_stats_stats_title_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_tabs_1_tl.png b/public/images/ui/text_images/tl/summary/summary_tabs_1_tl.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_tabs_1_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_tabs_2_tl.png b/public/images/ui/text_images/tl/summary/summary_tabs_2_tl.png
new file mode 100644
index 00000000000..50c1db1f34c
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_tabs_2_tl.png differ
diff --git a/public/images/ui/text_images/tl/summary/summary_tabs_3_tl.png b/public/images/ui/text_images/tl/summary/summary_tabs_3_tl.png
new file mode 100644
index 00000000000..24676712fb9
Binary files /dev/null and b/public/images/ui/text_images/tl/summary/summary_tabs_3_tl.png differ
diff --git a/public/images/ui/text_images/tr/battle_ui/overlay_exp_label_tr.png b/public/images/ui/text_images/tr/battle_ui/overlay_exp_label_tr.png
new file mode 100644
index 00000000000..0920a95fba2
Binary files /dev/null and b/public/images/ui/text_images/tr/battle_ui/overlay_exp_label_tr.png differ
diff --git a/public/images/ui/text_images/tr/battle_ui/overlay_hp_label_boss_tr.png b/public/images/ui/text_images/tr/battle_ui/overlay_hp_label_boss_tr.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/tr/battle_ui/overlay_hp_label_boss_tr.png differ
diff --git a/public/images/ui/text_images/tr/battle_ui/overlay_hp_label_tr.png b/public/images/ui/text_images/tr/battle_ui/overlay_hp_label_tr.png
new file mode 100644
index 00000000000..e28aceaf0fa
Binary files /dev/null and b/public/images/ui/text_images/tr/battle_ui/overlay_hp_label_tr.png differ
diff --git a/public/images/ui/text_images/tr/battle_ui/overlay_lv_tr.png b/public/images/ui/text_images/tr/battle_ui/overlay_lv_tr.png
new file mode 100644
index 00000000000..5140444ec15
Binary files /dev/null and b/public/images/ui/text_images/tr/battle_ui/overlay_lv_tr.png differ
diff --git a/public/images/ui/text_images/tr/battle_ui/pbinfo_stat_tr.json b/public/images/ui/text_images/tr/battle_ui/pbinfo_stat_tr.json
new file mode 100644
index 00000000000..c3ccb4a5391
--- /dev/null
+++ b/public/images/ui/text_images/tr/battle_ui/pbinfo_stat_tr.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_tr.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/tr/battle_ui/pbinfo_stat_tr.png b/public/images/ui/text_images/tr/battle_ui/pbinfo_stat_tr.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/tr/battle_ui/pbinfo_stat_tr.png differ
diff --git a/public/images/ui/text_images/tr/party_ui/party_slot_overlay_hp_tr.png b/public/images/ui/text_images/tr/party_ui/party_slot_overlay_hp_tr.png
new file mode 100644
index 00000000000..bb0017bcb58
Binary files /dev/null and b/public/images/ui/text_images/tr/party_ui/party_slot_overlay_hp_tr.png differ
diff --git a/public/images/ui/text_images/tr/party_ui/party_slot_overlay_lv_tr.png b/public/images/ui/text_images/tr/party_ui/party_slot_overlay_lv_tr.png
new file mode 100644
index 00000000000..12782430b9e
Binary files /dev/null and b/public/images/ui/text_images/tr/party_ui/party_slot_overlay_lv_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_dexnb_label_overlay_shiny_tr.png b/public/images/ui/text_images/tr/summary/summary_dexnb_label_overlay_shiny_tr.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_dexnb_label_overlay_shiny_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_dexnb_label_tr.png b/public/images/ui/text_images/tr/summary/summary_dexnb_label_tr.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_dexnb_label_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_moves_descriptions_title_tr.png b/public/images/ui/text_images/tr/summary/summary_moves_descriptions_title_tr.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_moves_descriptions_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_moves_effect_title_tr.png b/public/images/ui/text_images/tr/summary/summary_moves_effect_title_tr.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_moves_effect_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_moves_moves_title_tr.png b/public/images/ui/text_images/tr/summary/summary_moves_moves_title_tr.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_moves_moves_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_moves_overlay_pp_tr.png b/public/images/ui/text_images/tr/summary/summary_moves_overlay_pp_tr.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_moves_overlay_pp_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_profile_ability_tr.png b/public/images/ui/text_images/tr/summary/summary_profile_ability_tr.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_profile_ability_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_profile_memo_title_tr.png b/public/images/ui/text_images/tr/summary/summary_profile_memo_title_tr.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_profile_memo_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_profile_passive_tr.png b/public/images/ui/text_images/tr/summary/summary_profile_passive_tr.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_profile_passive_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_profile_profile_title_tr.png b/public/images/ui/text_images/tr/summary/summary_profile_profile_title_tr.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_profile_profile_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_stats_exp_title_tr.png b/public/images/ui/text_images/tr/summary/summary_stats_exp_title_tr.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_stats_exp_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_stats_expbar_title_tr.png b/public/images/ui/text_images/tr/summary/summary_stats_expbar_title_tr.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_stats_expbar_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_stats_item_title_tr.png b/public/images/ui/text_images/tr/summary/summary_stats_item_title_tr.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_stats_item_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_stats_stats_title_tr.png b/public/images/ui/text_images/tr/summary/summary_stats_stats_title_tr.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_stats_stats_title_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_tabs_1_tr.png b/public/images/ui/text_images/tr/summary/summary_tabs_1_tr.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_tabs_1_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_tabs_2_tr.png b/public/images/ui/text_images/tr/summary/summary_tabs_2_tr.png
new file mode 100644
index 00000000000..50c1db1f34c
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_tabs_2_tr.png differ
diff --git a/public/images/ui/text_images/tr/summary/summary_tabs_3_tr.png b/public/images/ui/text_images/tr/summary/summary_tabs_3_tr.png
new file mode 100644
index 00000000000..24676712fb9
Binary files /dev/null and b/public/images/ui/text_images/tr/summary/summary_tabs_3_tr.png differ
diff --git a/public/images/ui/text_images/zh-CN/battle_ui/overlay_exp_label_zh-CN.png b/public/images/ui/text_images/zh-CN/battle_ui/overlay_exp_label_zh-CN.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/battle_ui/overlay_exp_label_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/battle_ui/overlay_hp_label_boss_zh-CN.png b/public/images/ui/text_images/zh-CN/battle_ui/overlay_hp_label_boss_zh-CN.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/battle_ui/overlay_hp_label_boss_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/battle_ui/overlay_hp_label_zh-CN.png b/public/images/ui/text_images/zh-CN/battle_ui/overlay_hp_label_zh-CN.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/battle_ui/overlay_hp_label_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/battle_ui/overlay_lv_zh-CN.png b/public/images/ui/text_images/zh-CN/battle_ui/overlay_lv_zh-CN.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/battle_ui/overlay_lv_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.json b/public/images/ui/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.json
new file mode 100644
index 00000000000..22a1da0b536
--- /dev/null
+++ b/public/images/ui/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_zh-CN.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.png b/public/images/ui/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/battle_ui/pbinfo_stat_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/party_ui/party_slot_overlay_hp_zh-CN.png b/public/images/ui/text_images/zh-CN/party_ui/party_slot_overlay_hp_zh-CN.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/party_ui/party_slot_overlay_hp_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/party_ui/party_slot_overlay_lv_zh-CN.png b/public/images/ui/text_images/zh-CN/party_ui/party_slot_overlay_lv_zh-CN.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/party_ui/party_slot_overlay_lv_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_dexnb_label_overlay_shiny_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_dexnb_label_overlay_shiny_zh-CN.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_dexnb_label_overlay_shiny_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_dexnb_label_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_dexnb_label_zh-CN.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_dexnb_label_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_moves_descriptions_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_moves_descriptions_title_zh-CN.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_moves_descriptions_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_moves_effect_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_moves_effect_title_zh-CN.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_moves_effect_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_moves_moves_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_moves_moves_title_zh-CN.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_moves_moves_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_moves_overlay_pp_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_moves_overlay_pp_zh-CN.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_moves_overlay_pp_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_profile_ability_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_profile_ability_zh-CN.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_profile_ability_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_profile_memo_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_profile_memo_title_zh-CN.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_profile_memo_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_profile_passive_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_profile_passive_zh-CN.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_profile_passive_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_profile_profile_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_profile_profile_title_zh-CN.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_profile_profile_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_stats_exp_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_stats_exp_title_zh-CN.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_stats_exp_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_stats_expbar_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_stats_expbar_title_zh-CN.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_stats_expbar_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_stats_item_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_stats_item_title_zh-CN.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_stats_item_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_stats_stats_title_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_stats_stats_title_zh-CN.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_stats_stats_title_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_tabs_1_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_tabs_1_zh-CN.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_tabs_1_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_tabs_2_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_tabs_2_zh-CN.png
new file mode 100644
index 00000000000..50c1db1f34c
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_tabs_2_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-CN/summary/summary_tabs_3_zh-CN.png b/public/images/ui/text_images/zh-CN/summary/summary_tabs_3_zh-CN.png
new file mode 100644
index 00000000000..24676712fb9
Binary files /dev/null and b/public/images/ui/text_images/zh-CN/summary/summary_tabs_3_zh-CN.png differ
diff --git a/public/images/ui/text_images/zh-TW/battle_ui/overlay_exp_label_zh-TW.png b/public/images/ui/text_images/zh-TW/battle_ui/overlay_exp_label_zh-TW.png
new file mode 100644
index 00000000000..fde37213eff
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/battle_ui/overlay_exp_label_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/battle_ui/overlay_hp_label_boss_zh-TW.png b/public/images/ui/text_images/zh-TW/battle_ui/overlay_hp_label_boss_zh-TW.png
new file mode 100644
index 00000000000..0bcec679e05
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/battle_ui/overlay_hp_label_boss_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/battle_ui/overlay_hp_label_zh-TW.png b/public/images/ui/text_images/zh-TW/battle_ui/overlay_hp_label_zh-TW.png
new file mode 100644
index 00000000000..38a34761381
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/battle_ui/overlay_hp_label_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/battle_ui/overlay_lv_zh-TW.png b/public/images/ui/text_images/zh-TW/battle_ui/overlay_lv_zh-TW.png
new file mode 100644
index 00000000000..9ad4312d561
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/battle_ui/overlay_lv_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.json b/public/images/ui/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.json
new file mode 100644
index 00000000000..26c01d8bcc2
--- /dev/null
+++ b/public/images/ui/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.json
@@ -0,0 +1,209 @@
+{
+	"textures": [
+		{
+			"image": "pbinfo_stat_zh-TW.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 120,
+				"h": 7
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "SPATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPDEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 19,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 19,
+						"h": 7
+					},
+					"frame": {
+						"x": 19,
+						"y": 0,
+						"w": 19,
+						"h": 7
+					}
+				},
+				{
+					"filename": "CRIT",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 17,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 17,
+						"h": 7
+					},
+					"frame": {
+						"x": 38,
+						"y": 0,
+						"w": 17,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ACC",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 55,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "ATK",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 68,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "DEF",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 81,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "EVA",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 94,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+				{
+					"filename": "SPD",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 13,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 13,
+						"h": 7
+					},
+					"frame": {
+						"x": 107,
+						"y": 0,
+						"w": 13,
+						"h": 7
+					}
+				},
+        {
+					"filename": "HP",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 9,
+						"h": 8
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 1,
+						"w": 9,
+						"h": 7
+					},
+					"frame": {
+						"x": 120,
+						"y": 0,
+						"w": 9,
+						"h": 7
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
+	}
+}
diff --git a/public/images/ui/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.png b/public/images/ui/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.png
new file mode 100644
index 00000000000..9656c5f04b9
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/battle_ui/pbinfo_stat_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/party_ui/party_slot_overlay_hp_zh-TW.png b/public/images/ui/text_images/zh-TW/party_ui/party_slot_overlay_hp_zh-TW.png
new file mode 100644
index 00000000000..9be90b5c6bb
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/party_ui/party_slot_overlay_hp_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/party_ui/party_slot_overlay_lv_zh-TW.png b/public/images/ui/text_images/zh-TW/party_ui/party_slot_overlay_lv_zh-TW.png
new file mode 100644
index 00000000000..122d3f7151c
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/party_ui/party_slot_overlay_lv_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_dexnb_label_overlay_shiny_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_dexnb_label_overlay_shiny_zh-TW.png
new file mode 100644
index 00000000000..f35e327c29a
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_dexnb_label_overlay_shiny_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_dexnb_label_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_dexnb_label_zh-TW.png
new file mode 100644
index 00000000000..bf568c486aa
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_dexnb_label_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_moves_descriptions_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_moves_descriptions_title_zh-TW.png
new file mode 100644
index 00000000000..e83e8cafbfc
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_moves_descriptions_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_moves_effect_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_moves_effect_title_zh-TW.png
new file mode 100644
index 00000000000..fbbaac0b260
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_moves_effect_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_moves_moves_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_moves_moves_title_zh-TW.png
new file mode 100644
index 00000000000..6bbb29c9c5f
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_moves_moves_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_moves_overlay_pp_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_moves_overlay_pp_zh-TW.png
new file mode 100644
index 00000000000..a2bcd0bd021
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_moves_overlay_pp_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_profile_ability_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_profile_ability_zh-TW.png
new file mode 100644
index 00000000000..a05c22b7d47
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_profile_ability_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_profile_memo_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_profile_memo_title_zh-TW.png
new file mode 100644
index 00000000000..3d69c20e57f
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_profile_memo_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_profile_passive_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_profile_passive_zh-TW.png
new file mode 100644
index 00000000000..c026e87a215
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_profile_passive_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_profile_profile_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_profile_profile_title_zh-TW.png
new file mode 100644
index 00000000000..4170dccf682
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_profile_profile_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_stats_exp_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_stats_exp_title_zh-TW.png
new file mode 100644
index 00000000000..d0d8d7f81a1
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_stats_exp_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_stats_expbar_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_stats_expbar_title_zh-TW.png
new file mode 100644
index 00000000000..4889b64eca8
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_stats_expbar_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_stats_item_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_stats_item_title_zh-TW.png
new file mode 100644
index 00000000000..42e08b3e52a
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_stats_item_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_stats_stats_title_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_stats_stats_title_zh-TW.png
new file mode 100644
index 00000000000..f602a43c39d
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_stats_stats_title_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_tabs_1_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_tabs_1_zh-TW.png
new file mode 100644
index 00000000000..750c407b075
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_tabs_1_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_tabs_2_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_tabs_2_zh-TW.png
new file mode 100644
index 00000000000..50c1db1f34c
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_tabs_2_zh-TW.png differ
diff --git a/public/images/ui/text_images/zh-TW/summary/summary_tabs_3_zh-TW.png b/public/images/ui/text_images/zh-TW/summary/summary_tabs_3_zh-TW.png
new file mode 100644
index 00000000000..24676712fb9
Binary files /dev/null and b/public/images/ui/text_images/zh-TW/summary/summary_tabs_3_zh-TW.png differ
diff --git a/scripts/create-test/create-test.js b/scripts/create-test/create-test.js
index 765993959d1..5e395783da7 100644
--- a/scripts/create-test/create-test.js
+++ b/scripts/create-test/create-test.js
@@ -156,7 +156,7 @@ async function runInteractive() {
     console.log(chalk.green.bold(`✔ File created at: test/${localDir}/${fileName}.test.ts\n`));
     console.groupEnd();
   } catch (err) {
-    console.error(chalk.red("✗ Error: ", err.message));
+    console.error(chalk.red("✗ Error: ", err));
   }
 }
 
diff --git a/scripts/decrypt-save.js b/scripts/decrypt-save.js
index e50f152f159..26b0a311378 100644
--- a/scripts/decrypt-save.js
+++ b/scripts/decrypt-save.js
@@ -1,7 +1,6 @@
 // Usage: node decrypt-save.js <encrypted-file> [save-file]
 
-// biome-ignore lint/performance/noNamespaceImport: This is how you import fs from node
-import * as fs from "node:fs";
+import fs from "node:fs";
 import crypto_js from "crypto-js";
 
 const { AES, enc } = crypto_js;
@@ -60,6 +59,11 @@ function decryptSave(path) {
   try {
     fileData = fs.readFileSync(path, "utf8");
   } catch (e) {
+    if (!(e instanceof Error)) {
+      console.error(`Unrecognized error: ${e}`);
+      process.exit(1);
+    }
+    // @ts-expect-error - e is usually a SystemError (all of which have codes)
     switch (e.code) {
       case "ENOENT":
         console.error(`File not found: ${path}`);
@@ -104,6 +108,13 @@ function writeToFile(filePath, data) {
   try {
     fs.writeFileSync(filePath, data);
   } catch (e) {
+    if (!(e instanceof Error)) {
+      console.error("Unknown error detected: ", e);
+      process.exitCode = 1;
+      return;
+    }
+
+    // @ts-expect-error - e is usually a SystemError (all of which have codes)
     switch (e.code) {
       case "EACCES":
         console.error(`Could not open ${filePath}: Permission denied`);
@@ -114,7 +125,8 @@ function writeToFile(filePath, data) {
       default:
         console.error(`Error writing file: ${e.message}`);
     }
-    process.exit(1);
+    process.exitCode = 1;
+    return;
   }
 }
 
diff --git a/scripts/jsconfig.json b/scripts/jsconfig.json
new file mode 100644
index 00000000000..aed71f4f576
--- /dev/null
+++ b/scripts/jsconfig.json
@@ -0,0 +1,17 @@
+{
+  "include": ["**/*.js"],
+  "compilerOptions": {
+    "allowJs": true,
+    "checkJs": true,
+    "rootDir": ".",
+    "target": "esnext",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "erasableSyntaxOnly": true,
+    "strict": true,
+    "noEmit": true,
+    // Forcibly disable `node_modules` recursion to prevent TSC from typechecking random JS files.
+    // This is disabled by default in `tsconfig.json`, but needs to be explicitly disabled from the default of `2`
+    "maxNodeModuleJsDepth": 0
+  }
+}
diff --git a/scripts/parse-egg-moves/egg-move-template.boilerplate.ts b/scripts/parse-egg-moves/egg-move-template.boilerplate.ts
new file mode 100644
index 00000000000..bfac05f4bde
--- /dev/null
+++ b/scripts/parse-egg-moves/egg-move-template.boilerplate.ts
@@ -0,0 +1,10 @@
+//! DO NOT EDIT THIS FILE - CREATED BY THE `eggMoves:parse` script automatically
+import { MoveId } from "#enums/move-id";
+import { SpeciesId } from "#enums/species-id";
+
+/**
+ * An object mapping all base form {@linkcode SpeciesId}s to an array of {@linkcode MoveId}s corresponding
+ * to their current egg moves.
+ * Generated by the `eggMoves:parse` script using a CSV sourced from the current Balance Team spreadsheet.
+ */
+export const speciesEggMoves = "{{table}}";
diff --git a/scripts/parse-egg-moves/help-message.js b/scripts/parse-egg-moves/help-message.js
new file mode 100644
index 00000000000..397a28e5011
--- /dev/null
+++ b/scripts/parse-egg-moves/help-message.js
@@ -0,0 +1,17 @@
+import chalk from "chalk";
+
+/** Show help/usage text for the `eggMoves:parse` CLI. */
+export function showHelpText() {
+  console.log(`
+Usage: ${chalk.cyan("pnpm eggMoves:parse [options]")}
+If given no options, assumes ${chalk.blue("\`--interactive\`")}.
+If given only a file path, assumes ${chalk.blue("\`--file\`")}.
+
+${chalk.hex("#ffa500")("Options:")}
+  ${chalk.blue("-h, --help")}            Show this help message.
+  ${chalk.blue("-f, --file[=PATH]")}     Specify a path to a CSV file to read, or provide one from stdin.
+  ${chalk.blue("-t, --text[=TEXT]")}
+  ${chalk.blue("-c, --console[=TEXT]")}  Specify CSV text to read, or provide it from stdin.
+  ${chalk.blue("-i, --interactive")}     Run in interactive mode (default)
+`);
+}
diff --git a/scripts/parse-egg-moves/interactive.js b/scripts/parse-egg-moves/interactive.js
new file mode 100644
index 00000000000..68ee41e7900
--- /dev/null
+++ b/scripts/parse-egg-moves/interactive.js
@@ -0,0 +1,108 @@
+import fs from "fs";
+import chalk from "chalk";
+import inquirer from "inquirer";
+import { showHelpText } from "./help-message.js";
+
+/**
+ * @import { Option } from "./main.js"
+ */
+
+/**
+ * Prompt the user to interactively select an option (console/file) to retrieve the egg move CSV.
+ * @returns {Promise<Option>} The selected option with value
+ */
+export async function runInteractive() {
+  /** @type {"Console" | "File" | "Help" | "Exit"} */
+  const answer = await inquirer
+    .prompt([
+      {
+        type: "list",
+        name: "type",
+        message: "Select the method to obtain egg moves.",
+        choices: ["Console", "File", "Help", "Exit"],
+      },
+    ])
+    .then(a => a.type);
+
+  if (answer === "Exit") {
+    console.log("Exiting...");
+    process.exitCode = 1;
+    return { type: "Exit" };
+  }
+
+  if (answer === "Help") {
+    showHelpText();
+    return { type: "Exit" };
+  }
+
+  if (!["Console", "File"].includes(answer)) {
+    console.error(chalk.red("Please provide a valid type!"));
+    return await runInteractive();
+  }
+
+  return { type: answer, value: await promptForValue(answer) };
+}
+
+/**
+ * Prompt the user to give a value (either the direct CSV or the file path).
+ * @param {"Console" | "File"} type - The input method
+ * @returns {Promise<string>} A Promise resolving with the CSV/file path.
+ */
+function promptForValue(type) {
+  switch (type) {
+    case "Console":
+      return doPromptConsole();
+    case "File":
+      return getFilePath();
+  }
+}
+
+/**
+ * Prompt the user to enter a file path from the console.
+ * @returns {Promise<string>} The file path inputted by the user.
+ */
+async function getFilePath() {
+  return await inquirer
+    .prompt([
+      {
+        type: "input",
+        name: "path",
+        message: "Please enter the path to the egg move CSV file.",
+        validate: input => {
+          if (input.trim() === "") {
+            return "File path cannot be empty!";
+          }
+          if (!fs.existsSync(input)) {
+            return "File does not exist!";
+          }
+          return true;
+        },
+      },
+    ])
+    .then(answer => answer.path);
+}
+
+/**
+ * Prompt the user for CSV input from the console.
+ * @returns {Promise<string>} The CSV input from the user.
+ */
+async function doPromptConsole() {
+  return await inquirer
+    .prompt([
+      {
+        type: "input",
+        name: "csv",
+        message: "Please enter the egg move CSV text.",
+        validate: input => {
+          if (input.trim() === "") {
+            return "CSV text cannot be empty!";
+          }
+          if (!input.match(/^[^,]+(,[^,]+){4}$/gm)) {
+            return "CSV text malformed - should contain 5 consecutive comma-separated values per line!";
+          }
+          return true;
+        },
+      },
+    ])
+    .then(answer => answer.csv);
+}
diff --git a/scripts/parse-egg-moves/main.js b/scripts/parse-egg-moves/main.js
new file mode 100644
index 00000000000..a009c81a041
--- /dev/null
+++ b/scripts/parse-egg-moves/main.js
@@ -0,0 +1,168 @@
+/*
+ * This script accepts a CSV value or file path as input, parses the egg moves,
+ * and writes the output to a TypeScript file.
+ * It can be run interactively or with command line arguments.
+ * Usage: `pnpm eggMoves:parse`
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import chalk from "chalk";
+import { showHelpText } from "./help-message.js";
+import { runInteractive } from "./interactive.js";
+import { parseEggMoves } from "./parse.js";
+
+const version = "1.0.0";
+
+// Get the directory name of the current module file
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const projectRoot = path.join(__dirname, "..", "..");
+const templatePath = path.join(__dirname, "egg-move-template.ts");
+// TODO: Do we want this to be configurable?
+const eggMoveTargetPath = path.join(projectRoot, "src/data/balance/egg-moves.ts");
+
+/**
+ * @typedef {{type: "Console" | "File", value: string} | {type: "Exit"}}
+ * Option
+ * An option selected by the user.
+ */
+
+/**
+ * Runs the interactive eggMoves:parse CLI.
+ * @returns {Promise<void>}
+ */
+async function start() {
+  console.log(chalk.yellow(`🥚 Egg Move Parser - v${version}`));
+
+  if (process.argv.length > 4) {
+    console.error(
+      chalk.redBright.bold(
+        `✗ Error: Too many arguments provided!\nArgs: ${chalk.hex("#7310fdff")(process.argv.slice(2).join(" "))}`,
+      ),
+    );
+    showHelpText();
+    process.exitCode = 1;
+    return;
+  }
+
+  let csv = "";
+  const inputType = await parseArguments();
+  if (process.exitCode) {
+    // If exit code is non-zero, return to allow it to propagate up the chain.
+    return;
+  }
+  switch (inputType.type) {
+    case "Console":
+      csv = inputType.value;
+      break;
+    case "File":
+      csv = await fs.promises.readFile(inputType.value, "utf-8");
+      break;
+    case "Exit":
+      // Help screen triggered; break out
+      return;
+  }
+
+  await writeToFile(parseEggMoves(csv));
+}
+
+/**
+ * Handle the arguments passed to the script and obtain the CSV input type.
+ * @returns {Promise<{type: "Console" | "File", value: string} | {type: "Exit"}>} The input method selected by the user
+ */
+async function parseArguments() {
+  const args = process.argv.slice(2); // first 2 args are node and script name (irrelevant)
+
+  /** @type {string | undefined}  */
+  const arg = args[0].split("=")[0]; // Yoink everything up to the first "=" to get the raw command
+  switch (arg) {
+    case "-f":
+    case "--file":
+      return { type: "File", value: getArgValue() };
+    case "-t":
+    case "--text":
+    case "-c":
+    case "--console":
+      return { type: "Console", value: getArgValue() };
+    case "-h":
+    case "--help":
+      showHelpText();
+      process.exitCode = 0;
+      return { type: "Exit" };
+    case "--interactive":
+    case "-i":
+    case undefined:
+      return await runInteractive();
+    default:
+      // If no arguments are found, check if it's a file path
+      if (fs.existsSync(arg)) {
+        console.log(chalk.green(`Using file path from stdin: ${chalk.blue(arg)}`));
+        return { type: "File", value: arg };
+      }
+      badArgs();
+      return { type: "Exit" };
+  }
+}
+
+/**
+ * Get the value of the argument provided.
+ * @returns {string} The CSV or file path from the arguments
+ * @throws {Error} If arguments are malformed
+ */
+function getArgValue() {
+  // If the user provided a value as argument 2, take that as the argument.
+  // Otherwise, check the 1st argument to see if it contains an `=` and extract everything afterwards.
+  /** @type {string | undefined} */
+  let filePath = process.argv[3];
+  const equalsIndex = process.argv[2].indexOf("=");
+  if (equalsIndex > -1) {
+    // If arg 3 was aleady existing and someone used `=` notation to assign a property, throw an error.
+    filePath = filePath ? undefined : process.argv[2].slice(equalsIndex + 1);
+  }
+
+  if (!filePath?.trim()) {
+    badArgs();
+    return "";
+  }
+  // NB: It doesn't really matter that this can be `undefined` - we'll always break out by lieu of setting the exit code
+  return filePath;
+}
+
+/**
+ * Write out the parsed CSV to a file.
+ * @param {string} moves - The parsed CSV
+ * @returns {Promise<void>}
+ */
+export async function writeToFile(moves) {
+  try {
+    // Read the template file, replacing the placeholder with the move table.
+    const content = fs.readFileSync(templatePath, "utf8").replace(`"{{table}}"`, moves);
+
+    if (fs.existsSync(eggMoveTargetPath)) {
+      console.warn(chalk.hex("#ffa500")("\nEgg moves file already exists, overwriting...\n"));
+    }
+
+    // Write the template content to the file
+    fs.writeFileSync(eggMoveTargetPath, content, "utf8");
+
+    console.log(chalk.green.bold(`\n✔ Egg Moves written to ${eggMoveTargetPath}`));
+    console.groupEnd();
+  } catch (err) {
+    console.error(chalk.red(`✗ Error while writing egg moves: ${err}`));
+    process.exitCode = 1;
+  }
+}
+
+/**
+ * Do logging for incorrect or malformed CLI arguments.
+ * @returns {void}
+ */
+function badArgs() {
+  chalk.red.bold(`✗ Error: Malformed arguments!\nArgs: ${chalk.hex("#7310fdff")(process.argv.slice(2).join(" "))}`);
+  showHelpText();
+  process.exitCode = 1;
+}
+
+start();
diff --git a/scripts/parse-egg-moves/parse.js b/scripts/parse-egg-moves/parse.js
new file mode 100644
index 00000000000..fe7511f8b08
--- /dev/null
+++ b/scripts/parse-egg-moves/parse.js
@@ -0,0 +1,79 @@
+import chalk from "chalk";
+
+/**
+ * A single line of the inputted CSV.
+ * @typedef {[speciesName: string, move1: string, move2: string, move3: string, move4: string]}
+ * CSVLine
+ */
+
+/**
+ * Regex to determine if a string follows the required CSV format.
+ */
+const csvRegex = /^((?:[^,]+?,){4}(?:\w|\s)+?,?\n?)+$/g;
+
+/**
+ * Given a CSV string, parse it and return a structured table ready to be inputted into code.
+ * @param {string} csv - The formatted CSV string.
+ * @returns {string} The fully formatted table.
+ */
+export function parseEggMoves(csv) {
+  console.log(chalk.grey("⚙️ Parsing egg moves..."));
+  if (!csvRegex.test(csv)) {
+    console.error(chalk.redBright("! Input was not proper CSV!"));
+    process.exitCode = 1;
+    return "";
+  }
+
+  let output = "{\n";
+
+  const lines = csv.split(/\n/g);
+
+  for (const line of lines) {
+    /**
+     * The individual CSV column for this species.
+     */
+    const cols =
+      /** @type {CSVLine} */
+      (line.split(",").slice(0, 5));
+    const speciesName = toUpperSnakeCase(cols[0]);
+
+    const eggMoves =
+      /** @type {string[]} */
+      ([]);
+
+    for (let m = 1; m < 5; m++) {
+      const moveName = cols[m].trim();
+      if (!moveName || moveName === "N/A") {
+        console.warn(`Species ${speciesName} missing ${m}th egg move!`);
+        eggMoves.push("MoveId.NONE");
+        continue;
+      }
+
+      // Remove (N) and (P) from the ends of move names before UPPER_SNAKE_CASE-ing them
+      const moveNameTitle = toUpperSnakeCase(moveName.replace(/ \([A-Z]\)$/, ""));
+      eggMoves.push("MoveId." + moveNameTitle);
+    }
+
+    if (eggMoves.every(move => move === "MoveId.NONE")) {
+      console.warn(`Species ${speciesName} could not be parsed, excluding from output...`);
+      output += `  // [SpeciesId.${speciesName}]: [ MoveId.NONE, MoveId.NONE, MoveId.NONE, MoveId.NONE ],\n`;
+    } else {
+      output += `  [SpeciesId.${speciesName}]: [ ${eggMoves.join(", ")} ],\n`;
+    }
+  }
+
+  // NB: We omit the semicolon as it is contained in the template string itself
+  return output + "} satisfies Partial<Record<SpeciesId, [MoveId, MoveId, MoveId, MoveId]>>";
+}
+
+/**
+ * Helper method to convert a string into `UPPER_SNAKE_CASE`.
+ * @param {string} str - The string being converted
+ * @returns {string} The result of converting `str` into upper snake case.
+ */
+function toUpperSnakeCase(str) {
+  return str
+    .split(/[_ -]+/g)
+    .map(word => word.toUpperCase())
+    .join("_");
+}
diff --git a/scripts/scrape-trainer-names/fetch-names.js b/scripts/scrape-trainer-names/fetch-names.js
index 9e6bd0c4d2b..3f7d0393f5b 100644
--- a/scripts/scrape-trainer-names/fetch-names.js
+++ b/scripts/scrape-trainer-names/fetch-names.js
@@ -31,11 +31,11 @@ export function fetchNames(trainerListHeader, knownFemale = false) {
 
   // Grab all the trainer name tables sorted by generation
   const tables = elements.slice(startChildIndex, endChildIndex).filter(
-    /** @type {(t: ChildNode) => t is Element} */
+    /** @type {(t: ChildNode) => t is HTMLTableElement} */
     (
       t =>
         // Only grab expandable tables within the header block
-        t.nodeName === "TABLE" && t["className"] === "expandable"
+        t.nodeName === "TABLE" && /** @type {HTMLTableElement} */ (t)["className"] === "expandable"
     ),
   );
 
@@ -48,7 +48,7 @@ export function fetchNames(trainerListHeader, knownFemale = false) {
 
 /**
  * Parse the table in question.
- * @param {Element[]} tables - The array of Elements forming the current table
+ * @param {HTMLTableElement[]} tables - The array of Elements forming the current table
  * @param {boolean} isFemale - Whether the trainer is known to be female or not
  * @param {Set<string>} trainerNames A Set containing the male trainer names
  * @param {Set<string>} femaleTrainerNames - A Set containing the female trainer names
@@ -56,7 +56,7 @@ export function fetchNames(trainerListHeader, knownFemale = false) {
 function parseTable(tables, isFemale, trainerNames, femaleTrainerNames) {
   for (const table of tables) {
     // Grab all rows past the first header with exactly 9 children in them (Name, Battle, Winnings, 6 party slots)
-    const trainerRows = [...table.querySelectorAll("tr:not(:first-child)")].filter(r => r.children.length === 9);
+    const trainerRows = [...table.rows].slice(1).filter(r => r.children.length === 9);
     for (const row of trainerRows) {
       const content = row.firstElementChild?.innerHTML;
       // Skip empty elements & ones without anchors
diff --git a/src/@types/api/pokerogue-daily-api.ts b/src/@types/api/pokerogue-daily-api.ts
index 838af2a2a34..862ff2f51a3 100644
--- a/src/@types/api/pokerogue-daily-api.ts
+++ b/src/@types/api/pokerogue-daily-api.ts
@@ -1,4 +1,4 @@
-import type { ScoreboardCategory } from "#ui/daily-run-scoreboard";
+import type { ScoreboardCategory } from "#ui/containers/daily-run-scoreboard";
 
 export interface GetDailyRankingsRequest {
   category: ScoreboardCategory;
diff --git a/src/@types/arena-tags.ts b/src/@types/arena-tags.ts
index 4ac7abf6f3d..390d95a7daa 100644
--- a/src/@types/arena-tags.ts
+++ b/src/@types/arena-tags.ts
@@ -2,6 +2,7 @@ import type { ArenaTagTypeMap } from "#data/arena-tag";
 import type { ArenaTagType } from "#enums/arena-tag-type";
 // biome-ignore lint/correctness/noUnusedImports: TSDocs
 import type { SessionSaveData } from "#system/game-data";
+import type { ObjectValues } from "#types/type-helpers";
 
 /** Subset of {@linkcode ArenaTagType}s that apply some negative effect to pokemon that switch in ({@link https://bulbapedia.bulbagarden.net/wiki/List_of_moves_that_cause_entry_hazards#List_of_traps | entry hazards} and Imprison. */
 export type EntryHazardTagType =
@@ -24,22 +25,32 @@ export type TurnProtectArenaTagType =
 /** Subset of {@linkcode ArenaTagType}s that create Trick Room-like effects which are removed upon overlap. */
 export type RoomArenaTagType = ArenaTagType.TRICK_ROOM;
 
-/** Subset of {@linkcode ArenaTagType}s that cannot persist across turns, and thus should not be serialized in {@linkcode SessionSaveData}. */
+/** Subset of {@linkcode ArenaTagType}s that are **not** able to persist across turns, and should therefore not be serialized in {@linkcode SessionSaveData}. */
 export type NonSerializableArenaTagType = ArenaTagType.NONE | TurnProtectArenaTagType | ArenaTagType.ION_DELUGE;
 
 /** Subset of {@linkcode ArenaTagType}s that may persist across turns, and thus must be serialized in {@linkcode SessionSaveData}. */
 export type SerializableArenaTagType = Exclude<ArenaTagType, NonSerializableArenaTagType>;
 
 /**
- * Type-safe representation of an arbitrary, serialized Arena Tag
+ * Utility type containing all entries of {@linkcode ArenaTagTypeMap} corresponding to serializable tags.
  */
-export type ArenaTagTypeData = Parameters<
-  ArenaTagTypeMap[keyof {
-    [K in keyof ArenaTagTypeMap as K extends SerializableArenaTagType ? K : never]: ArenaTagTypeMap[K];
-  }]["loadTag"]
->[0];
+type SerializableArenaTagTypeMap = Pick<ArenaTagTypeMap, SerializableArenaTagType>;
 
-/** Dummy, typescript-only declaration to ensure that
+/**
+ * Type mapping all `ArenaTag`s to type-safe representations of their serialized forms.
+ * @interface
+ */
+export type ArenaTagDataMap = {
+  [k in keyof SerializableArenaTagTypeMap]: Parameters<SerializableArenaTagTypeMap[k]["loadTag"]>[0];
+};
+
+/**
+ * Type-safe representation of an arbitrary, serialized `ArenaTag`.
+ */
+export type ArenaTagData = ObjectValues<ArenaTagDataMap>;
+
+/**
+ * Dummy, typescript-only declaration to ensure that
  * {@linkcode ArenaTagTypeMap} has a map for all ArenaTagTypes.
  *
  * If an arena tag is missing from the map, typescript will throw an error on this statement.
diff --git a/src/@types/battler-tags.ts b/src/@types/battler-tags.ts
index 211eb25113d..8e34108958e 100644
--- a/src/@types/battler-tags.ts
+++ b/src/@types/battler-tags.ts
@@ -1,8 +1,11 @@
 // biome-ignore-start lint/correctness/noUnusedImports: Used in a TSDoc comment
 import type { AbilityBattlerTag, BattlerTagTypeMap, SerializableBattlerTag, TypeBoostTag } from "#data/battler-tags";
 import type { AbilityId } from "#enums/ability-id";
-// biome-ignore-end lint/correctness/noUnusedImports: end
+import type { SessionSaveData } from "#system/game-data";
+// biome-ignore-end lint/correctness/noUnusedImports: Used in a TSDoc comment
+
 import type { BattlerTagType } from "#enums/battler-tag-type";
+import type { InferKeys, ObjectValues } from "#types/type-helpers";
 
 /**
  * Subset of {@linkcode BattlerTagType}s that restrict the use of moves.
@@ -103,28 +106,35 @@ export type RemovedTypeTagType = BattlerTagType.DOUBLE_SHOCKED | BattlerTagType.
 export type HighestStatBoostTagType =
   | BattlerTagType.QUARK_DRIVE // formatting
   | BattlerTagType.PROTOSYNTHESIS;
-/**
- * Subset of {@linkcode BattlerTagType}s that are able to persist between turns and should therefore be serialized
- */
-export type SerializableBattlerTagType = keyof {
-  [K in keyof BattlerTagTypeMap as BattlerTagTypeMap[K] extends SerializableBattlerTag
-    ? K
-    : never]: BattlerTagTypeMap[K];
-};
 
 /**
- * Subset of {@linkcode BattlerTagType}s that are not able to persist across waves and should therefore not be serialized
+ * Subset of {@linkcode BattlerTagType}s that are able to persist between turns, and should therefore be serialized.
+ */
+export type SerializableBattlerTagType = InferKeys<BattlerTagTypeMap, SerializableBattlerTag>;
+
+/**
+ * Subset of {@linkcode BattlerTagType}s that are **not** able to persist between turns,
+ * and should therefore not be serialized in {@linkcode SessionSaveData}.
  */
 export type NonSerializableBattlerTagType = Exclude<BattlerTagType, SerializableBattlerTagType>;
 
 /**
- * Type-safe representation of an arbitrary, serialized Battler Tag
+ * Utility type containing all entries of {@linkcode BattlerTagTypeMap} corresponding to serializable tags.
  */
-export type BattlerTagTypeData = Parameters<
-  BattlerTagTypeMap[keyof {
-    [K in keyof BattlerTagTypeMap as K extends SerializableBattlerTagType ? K : never]: BattlerTagTypeMap[K];
-  }]["loadTag"]
->[0];
+type SerializableBattlerTagTypeMap = Pick<BattlerTagTypeMap, SerializableBattlerTagType>;
+
+/**
+ * Type mapping all `BattlerTag`s to type-safe representations of their serialized forms.
+ * @interface
+ */
+export type BattlerTagDataMap = {
+  [k in keyof SerializableBattlerTagTypeMap]: Parameters<SerializableBattlerTagTypeMap[k]["loadTag"]>[0];
+};
+
+/**
+ * Type-safe representation of an arbitrary, serialized `BattlerTag`.
+ */
+export type BattlerTagData = ObjectValues<BattlerTagDataMap>;
 
 /**
  * Dummy, typescript-only declaration to ensure that
diff --git a/src/@types/helpers/type-helpers.ts b/src/@types/helpers/type-helpers.ts
index 0be391aa3c4..048a86ab489 100644
--- a/src/@types/helpers/type-helpers.ts
+++ b/src/@types/helpers/type-helpers.ts
@@ -36,15 +36,18 @@ export type Mutable<T> = {
 
 /**
  * Type helper to obtain the keys associated with a given value inside an object.
+ * Acts similar to {@linkcode Pick}, except checking the object's values instead of its keys.
  * @typeParam O - The type of the object
- * @typeParam V - The type of one of O's values
+ * @typeParam V - The type of one of O's values.
  */
-export type InferKeys<O extends object, V extends ObjectValues<O>> = {
-  [K in keyof O]: O[K] extends V ? K : never;
-}[keyof O];
+export type InferKeys<O extends object, V> = V extends ObjectValues<O>
+  ? {
+      [K in keyof O]: O[K] extends V ? K : never;
+    }[keyof O]
+  : never;
 
 /**
- * Utility type to obtain the values of a given object. \
+ * Utility type to obtain a union of the values of a given object. \
  * Functions similar to `keyof E`, except producing the values instead of the keys.
  * @remarks
  * This can be used to convert an `enum` interface produced by `typeof Enum` into the union type representing its members.
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 3a1de1bcc43..115d32e6651 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -121,13 +121,13 @@ import { vouchers } from "#system/voucher";
 import { trainerConfigs } from "#trainers/trainer-config";
 import type { HeldModifierConfig } from "#types/held-modifier-config";
 import type { Localizable } from "#types/locales";
-import { AbilityBar } from "#ui/ability-bar";
-import { ArenaFlyout } from "#ui/arena-flyout";
-import { CandyBar } from "#ui/candy-bar";
-import { CharSprite } from "#ui/char-sprite";
-import { PartyExpBar } from "#ui/party-exp-bar";
-import { PokeballTray } from "#ui/pokeball-tray";
-import { PokemonInfoContainer } from "#ui/pokemon-info-container";
+import { AbilityBar } from "#ui/containers/ability-bar";
+import { ArenaFlyout } from "#ui/containers/arena-flyout";
+import { CandyBar } from "#ui/containers/candy-bar";
+import { CharSprite } from "#ui/containers/char-sprite";
+import { PartyExpBar } from "#ui/containers/party-exp-bar";
+import { PokeballTray } from "#ui/containers/pokeball-tray";
+import { PokemonInfoContainer } from "#ui/containers/pokemon-info-container";
 import { addTextObject, getTextColor } from "#ui/text";
 import { UI } from "#ui/ui";
 import { addUiThemeOverrides } from "#ui/ui-theme";
@@ -1478,10 +1478,7 @@ export class BattleScene extends SceneBase {
           pokemon.resetBattleAndWaveData();
           pokemon.resetTera();
           applyAbAttrs("PostBattleInitAbAttr", { pokemon });
-          if (
-            pokemon.hasSpecies(SpeciesId.TERAPAGOS) ||
-            (this.gameMode.isClassic && this.currentBattle.waveIndex > 180 && this.currentBattle.waveIndex <= 190)
-          ) {
+          if (pokemon.hasSpecies(SpeciesId.TERAPAGOS)) {
             this.arena.playerTerasUsed = 0;
           }
         }
@@ -1566,9 +1563,9 @@ export class BattleScene extends SceneBase {
       return 0;
     }
 
-    const isEggPhase: boolean = ["EggLapsePhase", "EggHatchPhase"].includes(
-      this.phaseManager.getCurrentPhase()?.phaseName ?? "",
-    );
+    const isEggPhase =
+      this.phaseManager.getCurrentPhase().is("EggLapsePhase") ||
+      this.phaseManager.getCurrentPhase().is("EggHatchPhase");
 
     if (
       // Give trainers with specialty types an appropriately-typed form for Wormadam, Rotom, Arceus, Oricorio, Silvally, or Paldean Tauros.
diff --git a/src/constants/colors.ts b/src/constants/colors.ts
new file mode 100644
index 00000000000..717c5fa5f0d
--- /dev/null
+++ b/src/constants/colors.ts
@@ -0,0 +1,25 @@
+/**
+ * @module
+ * A big file storing colors used in logging.
+ * Minified by Terser during production builds, so has no overhead.
+ */
+
+// Colors used in prod
+/** Color used for "Start Phase <Phase>" logs */
+export const PHASE_START_COLOR = "green" as const;
+/** Color used for logs in `MovePhase` */
+export const MOVE_COLOR = "orchid" as const;
+
+// Colors used for testing code
+export const NEW_TURN_COLOR = "#ffad00ff" as const;
+export const UI_MSG_COLOR = "#009dffff" as const;
+export const OVERRIDES_COLOR = "#b0b01eff" as const;
+export const SETTINGS_COLOR = "#008844ff" as const;
+
+// Colors used for Vitest-related test utils
+export const TEST_NAME_COLOR = "#008886ff" as const;
+export const VITEST_PINK_COLOR = "#c162de" as const;
+
+// Mock console log stuff
+export const TRACE_COLOR = "#b700ff" as const;
+export const DEBUG_COLOR = "#874600ff" as const;
diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts
index bec3e3f6543..32744c69cc1 100644
--- a/src/data/abilities/ability.ts
+++ b/src/data/abilities/ability.ts
@@ -4796,7 +4796,7 @@ export class MoodyAbAttr extends PostTurnAbAttr {
     if (!simulated) {
       if (canRaise.length > 0) {
         const raisedStat = canRaise[pokemon.randBattleSeedInt(canRaise.length)];
-        canLower = canRaise.filter(s => s !== raisedStat);
+        canLower = canLower.filter(s => s !== raisedStat);
         globalScene.phaseManager.unshiftNew("StatStageChangePhase", pokemon.getBattlerIndex(), true, [raisedStat], 2);
       }
       if (canLower.length > 0) {
diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index cd02455af0f..70e8697179e 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -23,7 +23,7 @@ import type { Arena } from "#field/arena";
 import type { Pokemon } from "#field/pokemon";
 import type {
   ArenaScreenTagType,
-  ArenaTagTypeData,
+  ArenaTagData,
   EntryHazardTagType,
   RoomArenaTagType,
   SerializableArenaTagType,
@@ -471,7 +471,7 @@ const QuickGuardConditionFunc: ProtectConditionFunc = (_arena, moveId) => {
   const move = allMoves[moveId];
   const effectPhase = globalScene.phaseManager.getCurrentPhase();
 
-  if (effectPhase?.is("MoveEffectPhase")) {
+  if (effectPhase.is("MoveEffectPhase")) {
     const attacker = effectPhase.getUserPokemon();
     if (attacker) {
       return move.getPriority(attacker) > 0;
@@ -1663,7 +1663,7 @@ export function getArenaTag(
  * @param source - An arena tag
  * @returns The valid arena tag
  */
-export function loadArenaTag(source: ArenaTag | ArenaTagTypeData | { tagType: ArenaTagType.NONE }): ArenaTag {
+export function loadArenaTag(source: ArenaTag | ArenaTagData | { tagType: ArenaTagType.NONE }): ArenaTag {
   if (source.tagType === ArenaTagType.NONE) {
     return new NoneTag();
   }
diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts
index 5dd7bcbd9e2..1184de70b07 100644
--- a/src/data/balance/egg-moves.ts
+++ b/src/data/balance/egg-moves.ts
@@ -1,9 +1,12 @@
-import { allMoves } from "#data/data-lists";
+//! DO NOT EDIT THIS FILE - CREATED BY THE `eggMoves:parse` script automatically
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
-import { getEnumKeys, getEnumValues } from "#utils/enums";
-import { toTitleCase } from "#utils/strings";
 
+/**
+ * An object mapping all base form {@linkcode SpeciesId}s to an array of {@linkcode MoveId}s corresponding
+ * to their current egg moves.
+ * Generated by the `eggMoves:parse` script using a CSV sourced from the current Balance Team spreadsheet.
+ */
 export const speciesEggMoves = {
   [SpeciesId.BULBASAUR]: [ MoveId.SAPPY_SEED, MoveId.MALIGNANT_CHAIN, MoveId.EARTH_POWER, MoveId.MATCHA_GOTCHA ],
   [SpeciesId.CHARMANDER]: [ MoveId.DRAGON_DANCE, MoveId.AEROBLAST, MoveId.EARTH_POWER, MoveId.BITTER_BLADE ],
@@ -582,55 +585,4 @@ export const speciesEggMoves = {
   [SpeciesId.PALDEA_TAUROS]: [ MoveId.NO_RETREAT, MoveId.BLAZING_TORQUE, MoveId.AQUA_STEP, MoveId.THUNDEROUS_KICK ],
   [SpeciesId.PALDEA_WOOPER]: [ MoveId.STONE_AXE, MoveId.RECOVER, MoveId.BANEFUL_BUNKER, MoveId.BARB_BARRAGE ],
   [SpeciesId.BLOODMOON_URSALUNA]: [ MoveId.NASTY_PLOT, MoveId.ROCK_POLISH, MoveId.SANDSEAR_STORM, MoveId.BOOMBURST ]
-};
-
-/**
- * Parse a CSV-separated list of Egg Moves (such as one sourced from a Google Sheets)
- * into code able to form the `speciesEggMoves` const object as above.
- * @param content - The CSV-formatted string to convert into code.
- */
-// TODO: Move this into the scripts folder and stop running it on initialization
-function parseEggMoves(content: string): void {
-  let output = "";
-
-  const speciesNames = getEnumKeys(SpeciesId);
-  const speciesValues = getEnumValues(SpeciesId);
-  const moveNames = allMoves.map(m => m.name.replace(/ \([A-Z]\)$/, "").toLowerCase());
-  const lines = content.split(/\n/g);
-
-  for (const line of lines) {
-    const cols = line.split(",").slice(0, 5);
-    const enumSpeciesName = cols[0].toUpperCase().replace(/[ -]/g, "_") as keyof typeof SpeciesId;
-    // TODO: This should use reverse mapping instead of `indexOf`
-    const species = speciesValues[speciesNames.indexOf(enumSpeciesName)];
-
-    const eggMoves: MoveId[] = [];
-
-    for (let m = 0; m < 4; m++) {
-      const moveName = cols[m + 1].trim();
-      const moveIndex = moveName !== "N/A" ? moveNames.indexOf(moveName.toLowerCase()) : -1;
-      if (moveIndex === -1) {
-        console.warn(moveName, "could not be parsed");
-      }
-
-      eggMoves.push(moveIndex > -1 ? moveIndex as MoveId : MoveId.NONE);
-    }
-
-    if (eggMoves.every(m => m === MoveId.NONE)) {
-      console.warn(`Species ${toTitleCase(SpeciesId[species])} could not be parsed, excluding from output...`)
-    } else {
-      output += `[SpeciesId.${SpeciesId[species]}]: [ ${eggMoves.map(m => `MoveId.${MoveId[m]}`).join(", ")} ],\n`;
-    }
-  }
-
-  console.log(output);
-}
-
-export function initEggMoves() {
-  const eggMovesStr = "";
-  if (eggMovesStr) {
-    setTimeout(() => {
-      parseEggMoves(eggMovesStr);
-    }, 1000);
-  }
-}
+} satisfies Partial<Record<SpeciesId, [MoveId, MoveId, MoveId, MoveId]>>;
diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 3dbbf747c5c..5484eba7271 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -34,7 +34,7 @@ import type { StatStageChangeCallback } from "#phases/stat-stage-change-phase";
 import i18next from "#plugins/i18n";
 import type {
   AbilityBattlerTagType,
-  BattlerTagTypeData,
+  BattlerTagData,
   ContactSetStatusProtectedTagType,
   ContactStatStageChangeProtectedTagType,
   CritStageBoostTagType,
@@ -228,26 +228,27 @@ interface GenericSerializableBattlerTag<T extends BattlerTagType> extends Serial
  * Descendants can override {@linkcode isMoveRestricted} to restrict moves that
  * match a condition. A restricted move gets cancelled before it is used.
  * Players and enemies should not be allowed to select restricted moves.
+ * @todo Require descendant subclasses to inherit a `PRE_MOVE` lapse type
  */
 export abstract class MoveRestrictionBattlerTag extends SerializableBattlerTag {
   public declare readonly tagType: MoveRestrictionBattlerTagType;
   override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean {
-    if (lapseType === BattlerTagLapseType.PRE_MOVE) {
-      // Cancel the affected pokemon's selected move
-      const phase = globalScene.phaseManager.getCurrentPhase() as MovePhase;
-      const move = phase.move;
-
-      if (this.isMoveRestricted(move.moveId, pokemon)) {
-        if (this.interruptedText(pokemon, move.moveId)) {
-          globalScene.phaseManager.queueMessage(this.interruptedText(pokemon, move.moveId));
-        }
-        phase.cancel();
-      }
-
-      return true;
+    if (lapseType !== BattlerTagLapseType.PRE_MOVE) {
+      return super.lapse(pokemon, lapseType);
     }
 
-    return super.lapse(pokemon, lapseType);
+    // Cancel the affected pokemon's selected move
+    const phase = globalScene.phaseManager.getCurrentPhase() as MovePhase;
+    const move = phase.move;
+
+    if (this.isMoveRestricted(move.moveId, pokemon)) {
+      if (this.interruptedText(pokemon, move.moveId)) {
+        globalScene.phaseManager.queueMessage(this.interruptedText(pokemon, move.moveId));
+      }
+      phase.cancel();
+    }
+
+    return true;
   }
 
   /**
@@ -3842,7 +3843,7 @@ export function getBattlerTag(
  * @param source - An object containing the data necessary to reconstruct the BattlerTag.
  * @returns The valid battler tag
  */
-export function loadBattlerTag(source: BattlerTag | BattlerTagTypeData): BattlerTag {
+export function loadBattlerTag(source: BattlerTag | BattlerTagData): BattlerTag {
   // TODO: Remove this bang by fixing the signature of `getBattlerTag`
   // to allow undefined sourceIds and sourceMoves (with appropriate fallback for tags that require it)
   const tag = getBattlerTag(source.tagType, source.turnCount, source.sourceMove!, source.sourceId!);
diff --git a/src/data/daily-run.ts b/src/data/daily-run.ts
index f0a20a0b02b..47936e16828 100644
--- a/src/data/daily-run.ts
+++ b/src/data/daily-run.ts
@@ -6,7 +6,7 @@ import { PokemonSpecies } from "#data/pokemon-species";
 import { BiomeId } from "#enums/biome-id";
 import { PartyMemberStrength } from "#enums/party-member-strength";
 import { SpeciesId } from "#enums/species-id";
-import type { Starter } from "#ui/starter-select-ui-handler";
+import type { Starter } from "#ui/handlers/starter-select-ui-handler";
 import { isNullOrUndefined, randSeedGauss, randSeedInt, randSeedItem } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 097b7b9d68d..71346f1eec7 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -93,6 +93,7 @@ import { getEnumValues } from "#utils/enums";
 import { toCamelCase, toTitleCase } from "#utils/strings";
 import i18next from "i18next";
 import { applyChallenges } from "#utils/challenge-utils";
+import type { AbstractConstructor } from "#types/type-helpers";
 
 /**
  * A function used to conditionally determine execution of a given {@linkcode MoveAttr}.
@@ -1055,16 +1056,11 @@ export class SelfStatusMove extends Move {
   }
 }
 
-// TODO: Figure out how to improve the signature of this so that
-// the `ChargeMove` function knows that the argument `Base` is a specific subclass of move that cannot
-// be abstract.
-// Right now, I only know how to do this by using the type conjunction (the & operators)
-type SubMove = new (...args: any[]) => Move & {
-  is<K extends keyof MoveClassMap>(moveKind: K): this is MoveClassMap[K];
-};
+type SubMove = AbstractConstructor<Move>
 
 function ChargeMove<TBase extends SubMove>(Base: TBase, nameAppend: string) {
-  return class extends Base {
+  // NB: This cannot be made into a oneline return
+  abstract class Charging extends Base {
     /** The animation to play during the move's charging phase */
     public readonly chargeAnim: ChargeAnim = ChargeAnim[`${MoveId[this.id]}_CHARGING`];
     /** The message to show during the move's charging phase */
@@ -1141,6 +1137,7 @@ function ChargeMove<TBase extends SubMove>(Base: TBase, nameAppend: string) {
       return this;
     }
   };
+  return Charging;
 }
 
 export class ChargingAttackMove extends ChargeMove(AttackMove, "ChargingAttackMove") {}
@@ -8912,7 +8909,9 @@ export function initMoves() {
       .attr(AddArenaTagAttr, ArenaTagType.REFLECT, 5, true)
       .target(MoveTarget.USER_SIDE),
     new SelfStatusMove(MoveId.FOCUS_ENERGY, PokemonType.NORMAL, -1, 30, -1, 0, 1)
-      .attr(AddBattlerTagAttr, BattlerTagType.CRIT_BOOST, true, true),
+      .attr(AddBattlerTagAttr, BattlerTagType.CRIT_BOOST, true, true)
+      // TODO: Remove once dragon cheer & focus energy are merged into 1 tag
+      .condition((_user, target) => !target.getTag(BattlerTagType.DRAGON_CHEER)),
     new AttackMove(MoveId.BIDE, PokemonType.NORMAL, MoveCategory.PHYSICAL, -1, -1, 10, -1, 1, 1)
       .target(MoveTarget.USER)
       .unimplemented(),
@@ -9439,7 +9438,9 @@ export function initMoves() {
       .attr(AddBattlerTagAttr, BattlerTagType.HELPING_HAND)
       .ignoresSubstitute()
       .target(MoveTarget.NEAR_ALLY)
-      .condition(failIfSingleBattle),
+      .condition(failIfSingleBattle)
+      // should stack multiplicatively if used multiple times in 1 turn
+      .edgeCase(),
     new StatusMove(MoveId.TRICK, PokemonType.PSYCHIC, 100, 10, -1, 0, 3)
       .unimplemented(),
     new StatusMove(MoveId.ROLE_PLAY, PokemonType.PSYCHIC, -1, 10, -1, 0, 3)
@@ -11608,6 +11609,8 @@ export function initMoves() {
       .attr(OpponentHighHpPowerAttr, 100),
     new StatusMove(MoveId.DRAGON_CHEER, PokemonType.DRAGON, -1, 15, -1, 0, 9)
       .attr(AddBattlerTagAttr, BattlerTagType.DRAGON_CHEER, false, true)
+      // TODO: Remove once dragon cheer & focus energy are merged into 1 tag
+      .condition((_user, target) => !target.getTag(BattlerTagType.CRIT_BOOST))
       .target(MoveTarget.NEAR_ALLY),
     new AttackMove(MoveId.ALLURING_VOICE, PokemonType.FAIRY, MoveCategory.SPECIAL, 80, 100, 10, 100, 0, 9)
       .attr(AddBattlerTagIfBoostedAttr, BattlerTagType.CONFUSED)
diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
index 6750051c3c4..1c2bfdd105b 100644
--- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
+++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts
@@ -46,8 +46,8 @@ import {
 } from "#mystery-encounters/mystery-encounter-requirements";
 import { getRandomPartyMemberFunc, trainerConfigs } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { MoveInfoOverlay } from "#ui/move-info-overlay";
+import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { isNullOrUndefined, randSeedInt, randSeedShuffle } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
index 09e59c7e391..016af698104 100644
--- a/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
+++ b/src/data/mystery-encounters/encounters/clowning-around-encounter.ts
@@ -45,7 +45,7 @@ import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
 import { trainerConfigs } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler";
 import { randSeedInt, randSeedShuffle } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
diff --git a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
index e2c330a1106..1baed27cfde 100644
--- a/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
+++ b/src/data/mystery-encounters/encounters/dancing-lessons-encounter.ts
@@ -37,7 +37,7 @@ import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encou
 import { MoveRequirement } from "#mystery-encounters/mystery-encounter-requirements";
 import { DANCING_MOVES } from "#mystery-encounters/requirement-groups";
 import { PokemonData } from "#system/pokemon-data";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
 
diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
index 8cd4c8bee66..79cccd91b26 100644
--- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
+++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@@ -33,7 +33,7 @@ import {
   MoneyRequirement,
 } from "#mystery-encounters/mystery-encounter-requirements";
 import i18next from "#plugins/i18n";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { randSeedItem } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 
diff --git a/src/data/mystery-encounters/encounters/field-trip-encounter.ts b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
index 67a7cad3466..7d885deaa41 100644
--- a/src/data/mystery-encounters/encounters/field-trip-encounter.ts
+++ b/src/data/mystery-encounters/encounters/field-trip-encounter.ts
@@ -18,7 +18,7 @@ import {
 import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import i18next from "i18next";
 
 /** i18n namespace for the encounter */
diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
index a8dafdaa848..baa32bb4c70 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -42,7 +42,7 @@ import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encou
 import { PartySizeRequirement } from "#mystery-encounters/mystery-encounter-requirements";
 import { PokemonData } from "#system/pokemon-data";
 import { MusicPreference } from "#system/settings";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { isNullOrUndefined, NumberHolder, randInt, randSeedInt, randSeedItem, randSeedShuffle } from "#utils/common";
 import { getEnumKeys } from "#utils/enums";
 import { getRandomLocaleEntry } from "#utils/i18n";
diff --git a/src/data/mystery-encounters/encounters/training-session-encounter.ts b/src/data/mystery-encounters/encounters/training-session-encounter.ts
index b8173aa5fed..3f44e286ca1 100644
--- a/src/data/mystery-encounters/encounters/training-session-encounter.ts
+++ b/src/data/mystery-encounters/encounters/training-session-encounter.ts
@@ -27,7 +27,7 @@ import { MysteryEncounterBuilder } from "#mystery-encounters/mystery-encounter";
 import { MysteryEncounterOptionBuilder } from "#mystery-encounters/mystery-encounter-option";
 import { PokemonData } from "#system/pokemon-data";
 import type { HeldModifierConfig } from "#types/held-modifier-config";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { isNullOrUndefined, randSeedShuffle } from "#utils/common";
 import { getEnumValues } from "#utils/enums";
 import i18next from "i18next";
@@ -188,7 +188,7 @@ export const TrainingSessionEncounter: MysteryEncounter = MysteryEncounterBuilde
           // Return the options for nature selection
           return getEnumValues(Nature).map((nature: Nature) => {
             const option: OptionSelectItem = {
-              label: getNatureName(nature, true, true, true, globalScene.uiTheme),
+              label: getNatureName(nature, true, true, true),
               handler: () => {
                 // Pokemon and second option selected
                 encounter.setDialogueToken("nature", getNatureName(nature));
diff --git a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts
index 54179ee2604..1a9b008f9e9 100644
--- a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts
@@ -1,6 +1,5 @@
 import { globalScene } from "#app/global-scene";
 import type { TextStyle } from "#enums/text-style";
-import { UiTheme } from "#enums/ui-theme";
 import { getTextWithColors } from "#ui/text";
 import { isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
@@ -16,14 +15,12 @@ export function getEncounterText(keyOrString?: string, primaryStyle?: TextStyle)
     return null;
   }
 
-  const uiTheme = globalScene.uiTheme ?? UiTheme.DEFAULT;
-
   let textString: string | null = getTextWithDialogueTokens(keyOrString);
 
   // Can only color the text if a Primary Style is defined
   // primaryStyle is applied to all text that does not have its own specified style
   if (primaryStyle && textString) {
-    textString = getTextWithColors(textString, primaryStyle, uiTheme, true);
+    textString = getTextWithColors(textString, primaryStyle, true);
   }
 
   return textString;
diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
index 5c976cbc8cd..a0606b53834 100644
--- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@@ -46,9 +46,9 @@ import type { PokemonData } from "#system/pokemon-data";
 import type { TrainerConfig } from "#trainers/trainer-config";
 import { trainerConfigs } from "#trainers/trainer-config";
 import type { HeldModifierConfig } from "#types/held-modifier-config";
-import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import type { PartyOption, PokemonSelectFilter } from "#ui/party-ui-handler";
-import { PartyUiMode } from "#ui/party-ui-handler";
+import type { OptionSelectConfig, OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import type { PartyOption, PokemonSelectFilter } from "#ui/handlers/party-ui-handler";
+import { PartyUiMode } from "#ui/handlers/party-ui-handler";
 import { coerceArray, isNullOrUndefined, randomString, randSeedInt, randSeedItem } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import i18next from "i18next";
diff --git a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
index 93ef59d6ee7..06a43b1ff64 100644
--- a/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-pokemon-utils.ts
@@ -31,9 +31,9 @@ import {
   showEncounterText,
 } from "#mystery-encounters/encounter-dialogue-utils";
 import { achvs } from "#system/achv";
-import type { PartyOption } from "#ui/party-ui-handler";
-import { PartyUiMode } from "#ui/party-ui-handler";
-import { SummaryUiMode } from "#ui/summary-ui-handler";
+import type { PartyOption } from "#ui/handlers/party-ui-handler";
+import { PartyUiMode } from "#ui/handlers/party-ui-handler";
+import { SummaryUiMode } from "#ui/handlers/summary-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { BooleanHolder, isNullOrUndefined, randSeedInt } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
diff --git a/src/data/nature.ts b/src/data/nature.ts
index 65e401cd288..116732d60b3 100644
--- a/src/data/nature.ts
+++ b/src/data/nature.ts
@@ -1,7 +1,6 @@
 import { Nature } from "#enums/nature";
 import { EFFECTIVE_STATS, getShortenedStatKey, Stat } from "#enums/stat";
 import { TextStyle } from "#enums/text-style";
-import { UiTheme } from "#enums/ui-theme";
 import { getBBCodeFrag } from "#ui/text";
 import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
@@ -11,7 +10,6 @@ export function getNatureName(
   includeStatEffects = false,
   forStarterSelect = false,
   ignoreBBCode = false,
-  uiTheme: UiTheme = UiTheme.DEFAULT,
 ): string {
   let ret = toCamelCase(Nature[nature]);
   //Translating nature
@@ -31,7 +29,7 @@ export function getNatureName(
     }
     const textStyle = forStarterSelect ? TextStyle.SUMMARY_ALT : TextStyle.WINDOW;
     const getTextFrag = !ignoreBBCode
-      ? (text: string, style: TextStyle) => getBBCodeFrag(text, style, uiTheme)
+      ? (text: string, style: TextStyle) => getBBCodeFrag(text, style)
       : (text: string, _style: TextStyle) => text;
     if (increasedStat && decreasedStat) {
       ret = `${getTextFrag(`${ret}${!forStarterSelect ? "\n" : " "}(`, textStyle)}${getTextFrag(`+${i18next.t(getShortenedStatKey(increasedStat))}`, TextStyle.SUMMARY_PINK)}${getTextFrag("/", textStyle)}${getTextFrag(`-${i18next.t(getShortenedStatKey(decreasedStat))}`, TextStyle.SUMMARY_BLUE)}${getTextFrag(")", textStyle)}`;
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 86e63e49953..8bd4c10e54e 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -147,8 +147,8 @@ import type { IllusionData } from "#types/illusion-data";
 import type { TurnMove } from "#types/turn-move";
 import { BattleInfo } from "#ui/battle-info";
 import { EnemyBattleInfo } from "#ui/enemy-battle-info";
-import type { PartyOption } from "#ui/party-ui-handler";
-import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import type { PartyOption } from "#ui/handlers/party-ui-handler";
+import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
 import { PlayerBattleInfo } from "#ui/player-battle-info";
 import { applyChallenges } from "#utils/challenge-utils";
 import {
@@ -1252,7 +1252,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     }
     // During the Pokemon's MoveEffect phase, the offset is removed to put the Pokemon "in focus"
     const currentPhase = globalScene.phaseManager.getCurrentPhase();
-    return !(currentPhase?.is("MoveEffectPhase") && currentPhase.getPokemon() === this);
+    return !(currentPhase.is("MoveEffectPhase") && currentPhase.getPokemon() === this);
   }
 
   /** If this Pokemon has a Substitute on the field, removes its sprite from the field. */
@@ -1652,19 +1652,6 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     return precise ? this.hp / this.getMaxHp() : Math.round((this.hp / this.getMaxHp()) * 100) / 100;
   }
 
-  generateGender(): void {
-    if (this.species.malePercent === null) {
-      this.gender = Gender.GENDERLESS;
-    } else {
-      const genderChance = (this.id % 256) * 0.390625;
-      if (genderChance < this.species.malePercent) {
-        this.gender = Gender.MALE;
-      } else {
-        this.gender = Gender.FEMALE;
-      }
-    }
-  }
-
   /**
    * Return this Pokemon's {@linkcode Gender}.
    * @param ignoreOverride - Whether to ignore any overrides caused by {@linkcode MoveId.TRANSFORM | Transform}; default `false`
@@ -3083,14 +3070,17 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
       if (this.level < levelMove[0]) {
         break;
       }
-      let weight = levelMove[0];
+      let weight = levelMove[0] + 20;
       // Evolution Moves
-      if (weight === EVOLVE_MOVE) {
-        weight = 50;
+      if (levelMove[0] === EVOLVE_MOVE) {
+        weight = 70;
       }
       // Assume level 1 moves with 80+ BP are "move reminder" moves and bump their weight. Trainers use actual relearn moves.
-      if ((weight === 1 && allMoves[levelMove[1]].power >= 80) || (weight === RELEARN_MOVE && this.hasTrainer())) {
-        weight = 40;
+      if (
+        (levelMove[0] === 1 && allMoves[levelMove[1]].power >= 80) ||
+        (levelMove[0] === RELEARN_MOVE && this.hasTrainer())
+      ) {
+        weight = 60;
       }
       if (!movePool.some(m => m[0] === levelMove[1]) && !allMoves[levelMove[1]].name.endsWith(" (N)")) {
         movePool.push([levelMove[1], weight]);
@@ -3120,11 +3110,11 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
         }
         if (compatible && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) {
           if (tmPoolTiers[moveId] === ModifierTier.COMMON && this.level >= 15) {
-            movePool.push([moveId, 4]);
+            movePool.push([moveId, 24]);
           } else if (tmPoolTiers[moveId] === ModifierTier.GREAT && this.level >= 30) {
-            movePool.push([moveId, 8]);
+            movePool.push([moveId, 28]);
           } else if (tmPoolTiers[moveId] === ModifierTier.ULTRA && this.level >= 50) {
-            movePool.push([moveId, 14]);
+            movePool.push([moveId, 34]);
           }
         }
       }
@@ -3134,7 +3124,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
         for (let i = 0; i < 3; i++) {
           const moveId = speciesEggMoves[this.species.getRootSpeciesId()][i];
           if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) {
-            movePool.push([moveId, 40]);
+            movePool.push([moveId, 60]);
           }
         }
         const moveId = speciesEggMoves[this.species.getRootSpeciesId()][3];
@@ -3145,13 +3135,13 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
           !allMoves[moveId].name.endsWith(" (N)") &&
           !this.isBoss()
         ) {
-          movePool.push([moveId, 30]);
+          movePool.push([moveId, 50]);
         }
         if (this.fusionSpecies) {
           for (let i = 0; i < 3; i++) {
             const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i];
             if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) {
-              movePool.push([moveId, 40]);
+              movePool.push([moveId, 60]);
             }
           }
           const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3];
@@ -3162,7 +3152,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
             !allMoves[moveId].name.endsWith(" (N)") &&
             !this.isBoss()
           ) {
-            movePool.push([moveId, 30]);
+            movePool.push([moveId, 50]);
           }
         }
       }
@@ -4979,7 +4969,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
      */
     if (effect === StatusEffect.SLEEP || effect === StatusEffect.FREEZE) {
       const currentPhase = globalScene.phaseManager.getCurrentPhase();
-      if (currentPhase?.is("MoveEffectPhase") && currentPhase.getUserPokemon() === this) {
+      if (currentPhase.is("MoveEffectPhase") && currentPhase.getUserPokemon() === this) {
         this.turnData.hitCount = 1;
         this.turnData.hitsLeft = 1;
       }
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index acbc8031dbc..6d427585a87 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -17,7 +17,7 @@ import { getIsInitialized, initI18n } from "#plugins/i18n";
 import type { TrainerConfig } from "#trainers/trainer-config";
 import { trainerConfigs } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, type TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import { randSeedInt, randSeedItem, randSeedWeightedItem } from "#utils/common";
+import { randSeedInt, randSeedItem } from "#utils/common";
 import { getRandomLocaleEntry } from "#utils/i18n";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { toCamelCase } from "#utils/strings";
@@ -61,9 +61,7 @@ export class Trainer extends Phaser.GameObjects.Container {
 
     this.variant = variant;
     this.partyTemplateIndex = Math.min(
-      partyTemplateIndex !== undefined
-        ? partyTemplateIndex
-        : randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
+      partyTemplateIndex !== undefined ? partyTemplateIndex : randSeedItem(this.config.partyTemplates.map((_, i) => i)),
       this.config.partyTemplates.length - 1,
     );
     // TODO: Rework this and add actual error handling for missing names
diff --git a/src/init/init.ts b/src/init/init.ts
index ba9738e2be8..b717664b654 100644
--- a/src/init/init.ts
+++ b/src/init/init.ts
@@ -1,6 +1,5 @@
 import { initAbilities } from "#abilities/ability";
 import { initBiomes } from "#balance/biomes";
-import { initEggMoves } from "#balance/egg-moves";
 import { initPokemonPrevolutions, initPokemonStarters } from "#balance/pokemon-evolutions";
 import { initSpecies } from "#balance/pokemon-species";
 import { initChallenges } from "#data/challenge";
@@ -12,7 +11,7 @@ import { initMoves } from "#moves/move";
 import { initMysteryEncounters } from "#mystery-encounters/mystery-encounters";
 import { initAchievements } from "#system/achv";
 import { initVouchers } from "#system/voucher";
-import { initStatsKeys } from "#ui/game-stats-ui-handler";
+import { initStatsKeys } from "#ui/handlers/game-stats-ui-handler";
 
 /** Initialize the game. */
 export function initializeGame() {
@@ -24,7 +23,6 @@ export function initializeGame() {
   initPokemonPrevolutions();
   initPokemonStarters();
   initBiomes();
-  initEggMoves();
   initPokemonForms();
   initTrainerTypeDialogue();
   initSpecies();
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index 0a42fc3fa7d..232c2abca29 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -60,9 +60,7 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas("pbinfo_enemy_type", "ui");
     this.loadAtlas("pbinfo_enemy_type1", "ui");
     this.loadAtlas("pbinfo_enemy_type2", "ui");
-    this.loadAtlas("pbinfo_stat", "ui");
     this.loadAtlas("pbinfo_stat_numbers", "ui");
-    this.loadImage("overlay_lv", "ui");
     this.loadAtlas("numbers", "ui");
     this.loadAtlas("numbers_red", "ui");
     this.loadAtlas("overlay_hp", "ui");
@@ -125,7 +123,6 @@ export class LoadingScene extends SceneBase {
     this.loadAtlas("party_slot_main", "ui");
     this.loadAtlas("party_slot_main_short", "ui");
     this.loadAtlas("party_slot", "ui");
-    this.loadImage("party_slot_overlay_lv", "ui");
     this.loadImage("party_slot_hp_bar", "ui");
     this.loadAtlas("party_slot_hp_overlay", "ui");
     this.loadAtlas("party_pb", "ui");
@@ -138,19 +135,13 @@ export class LoadingScene extends SceneBase {
     this.loadImage("summary_profile", "ui");
     this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt
     this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt
-    this.loadImage("summary_profile_ability", "ui"); // Pixel text 'ABILITY'
-    this.loadImage("summary_profile_passive", "ui"); // Pixel text 'PASSIVE'
     this.loadImage("summary_status", "ui");
     this.loadImage("summary_stats", "ui");
     this.loadImage("summary_stats_overlay_exp", "ui");
     this.loadImage("summary_moves", "ui");
     this.loadImage("summary_moves_effect", "ui");
     this.loadImage("summary_moves_overlay_row", "ui");
-    this.loadImage("summary_moves_overlay_pp", "ui");
     this.loadAtlas("summary_moves_cursor", "ui");
-    for (let t = 1; t <= 3; t++) {
-      this.loadImage(`summary_tabs_${t}`, "ui");
-    }
 
     this.loadImage("scroll_bar", "ui");
     this.loadImage("scroll_bar_handle", "ui");
@@ -230,23 +221,119 @@ export class LoadingScene extends SceneBase {
 
     this.loadAtlas("pb", "");
     this.loadAtlas("items", "");
-    this.loadAtlas("types", "");
 
     // Get current lang and load the types atlas for it. English will only load types while all other languages will load types and types_<lang>
-    const lang = i18next.resolvedLanguage;
-    if (lang !== "en") {
-      if (hasAllLocalizedSprites(lang)) {
-        this.loadAtlas(`statuses_${lang}`, "");
-        this.loadAtlas(`types_${lang}`, "");
-      } else {
-        // Fallback to English
-        this.loadAtlas("statuses", "");
-        this.loadAtlas("types", "");
-      }
-    } else {
-      this.loadAtlas("statuses", "");
-      this.loadAtlas("types", "");
+    const lang = i18next.resolvedLanguage ?? "en";
+    const keySuffix = lang !== "en" && hasAllLocalizedSprites(lang) ? `_${lang}` : "";
+
+    this.loadAtlas(`statuses${keySuffix}`, "");
+    this.loadAtlas(`types${keySuffix}`, "");
+    for (let t = 1; t <= 3; t++) {
+      this.loadImage(
+        `summary_tabs_${t}${keySuffix}`,
+        "ui",
+        `text_images/${lang}/summary/summary_tabs_${t}${keySuffix}.png`,
+      );
     }
+    this.loadImage(
+      `summary_dexnb_label${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_dexnb_label${keySuffix}.png`,
+    ); // Pixel text 'No'
+    this.loadImage(
+      `summary_dexnb_label_overlay_shiny${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_dexnb_label_overlay_shiny${keySuffix}.png`,
+    ); // Pixel text 'No' shiny
+    this.loadImage(
+      `summary_profile_profile_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_profile_profile_title${keySuffix}.png`,
+    ); // Pixel text 'PROFILE'
+    this.loadImage(
+      `summary_profile_ability${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_profile_ability${keySuffix}.png`,
+    ); // Pixel text 'ABILITY'
+    this.loadImage(
+      `summary_profile_passive${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_profile_passive${keySuffix}.png`,
+    ); // Pixel text 'PASSIVE'
+    this.loadImage(
+      `summary_profile_memo_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_profile_memo_title${keySuffix}.png`,
+    ); // Pixel text 'TRAINER MEMO'
+    this.loadImage(
+      `summary_stats_item_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_stats_item_title${keySuffix}.png`,
+    ); // Pixel text 'ITEM'
+    this.loadImage(
+      `summary_stats_stats_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_stats_stats_title${keySuffix}.png`,
+    ); // Pixel text 'STATS'
+    this.loadImage(
+      `summary_stats_exp_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_stats_exp_title${keySuffix}.png`,
+    ); // Pixel text 'EXP.'
+    this.loadImage(
+      `summary_stats_expbar_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_stats_expbar_title${keySuffix}.png`,
+    ); // Pixel mini text 'EXP'
+    this.loadImage(
+      `summary_moves_moves_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_moves_moves_title${keySuffix}.png`,
+    ); // Pixel text 'MOVES'
+    this.loadImage(
+      `summary_moves_descriptions_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_moves_descriptions_title${keySuffix}.png`,
+    ); // Pixel text 'DESCRIPTIONS'
+    this.loadImage(
+      `summary_moves_overlay_pp${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_moves_overlay_pp${keySuffix}.png`,
+    ); // Pixel text 'PP'
+    this.loadImage(
+      `summary_moves_effect_title${keySuffix}`,
+      "ui",
+      `text_images/${lang}/summary/summary_moves_effect_title${keySuffix}.png`,
+    ); // Pixel text 'EFFECT'
+
+    this.loadAtlas(`pbinfo_stat${keySuffix}`, "ui", `text_images/${lang}/battle_ui/pbinfo_stat${keySuffix}`); // Pixel text for in-battle stats info tab
+    this.loadImage(`overlay_lv${keySuffix}`, "ui", `text_images/${lang}/battle_ui/overlay_lv${keySuffix}.png`); // Pixel text in-battle 'Lv.'
+    this.loadImage(
+      `overlay_hp_label${keySuffix}`,
+      "ui",
+      `text_images/${lang}/battle_ui/overlay_hp_label${keySuffix}.png`,
+    ); // Pixel text in-battle 'HP'
+    this.loadImage(
+      `overlay_hp_label_boss${keySuffix}`,
+      "ui",
+      `text_images/${lang}/battle_ui/overlay_hp_label_boss${keySuffix}.png`,
+    ); // Pixel text in-battle 'BOSS'
+    this.loadImage(
+      `overlay_exp_label${keySuffix}`,
+      "ui",
+      `text_images/${lang}/battle_ui/overlay_exp_label${keySuffix}.png`,
+    ); // Pixel text in-battle 'EXP'
+    this.loadImage(
+      `party_slot_overlay_lv${keySuffix}`,
+      "ui",
+      `text_images/${lang}/party_ui/party_slot_overlay_lv${keySuffix}.png`,
+    ); // Pixel text party 'Lv.'
+    this.loadImage(
+      `party_slot_overlay_hp${keySuffix}`,
+      "ui",
+      `text_images/${lang}/party_ui/party_slot_overlay_hp${keySuffix}.png`,
+    ); // Pixel text party 'HP'
+
     if (timedEventManager.activeEventHasBanner()) {
       const availableLangs = timedEventManager.getEventBannerLangs();
       if (lang && availableLangs.includes(lang)) {
@@ -256,7 +343,6 @@ export class LoadingScene extends SceneBase {
       }
     }
 
-    this.loadAtlas("statuses", "");
     this.loadAtlas("categories", "");
 
     this.loadAtlas("egg", "egg");
diff --git a/src/main.ts b/src/main.ts
index 7e4943bdca5..80f2ca3ed8b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,10 @@ import InputTextPlugin from "phaser3-rex-plugins/plugins/inputtext-plugin";
 import TransitionImagePackPlugin from "phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin";
 import UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin";
 
+if (import.meta.env.DEV) {
+  document.title += " (Beta)";
+}
+
 // Catch global errors and display them in an alert so users can report the issue.
 window.onerror = (_message, _source, _lineno, _colno, error) => {
   console.error(error);
diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts
index 8b77900cb62..20a18a3de38 100644
--- a/src/modifier/modifier-type.ts
+++ b/src/modifier/modifier-type.ts
@@ -115,8 +115,8 @@ import {
 import type { PokemonMove } from "#moves/pokemon-move";
 import { getVoucherTypeIcon, getVoucherTypeName, VoucherType } from "#system/voucher";
 import type { ModifierTypeFunc, WeightedModifierTypeWeightFunc } from "#types/modifier-types";
-import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#ui/party-ui-handler";
-import { PartyUiHandler } from "#ui/party-ui-handler";
+import type { PokemonMoveSelectFilter, PokemonSelectFilter } from "#ui/handlers/party-ui-handler";
+import { PartyUiHandler } from "#ui/handlers/party-ui-handler";
 import { getModifierTierTextTint } from "#ui/text";
 import { applyChallenges } from "#utils/challenge-utils";
 import {
diff --git a/src/phase-manager.ts b/src/phase-manager.ts
index 8a31689f7b2..2185de559ae 100644
--- a/src/phase-manager.ts
+++ b/src/phase-manager.ts
@@ -1,3 +1,4 @@
+import { PHASE_START_COLOR } from "#app/constants/colors";
 import { globalScene } from "#app/global-scene";
 import type { Phase } from "#app/phase";
 import { type PhasePriorityQueue, PostSummonPhasePriorityQueue } from "#data/phase-priority-queue";
@@ -236,7 +237,7 @@ export class PhaseManager {
   /** Parallel array to {@linkcode dynamicPhaseQueues} - matches phase types to their queues */
   private dynamicPhaseTypes: Constructor<Phase>[];
 
-  private currentPhase: Phase | null = null;
+  private currentPhase: Phase;
   private standbyPhase: Phase | null = null;
 
   constructor() {
@@ -260,7 +261,9 @@ export class PhaseManager {
   }
 
   /* Phase Functions */
-  getCurrentPhase(): Phase | null {
+
+  /** @returns The currently running {@linkcode Phase}. */
+  getCurrentPhase(): Phase {
     return this.currentPhase;
   }
 
@@ -370,20 +373,28 @@ export class PhaseManager {
         unactivatedConditionalPhases.push([condition, phase]);
       }
     }
+
     this.conditionalQueue = unactivatedConditionalPhases;
 
+    // If no phases are left, unshift phases to start a new turn.
     if (!this.phaseQueue.length) {
       this.populatePhaseQueue();
       // Clear the conditionalQueue if there are no phases left in the phaseQueue
       this.conditionalQueue = [];
     }
 
-    this.currentPhase = this.phaseQueue.shift() ?? null;
+    // Bang is justified as `populatePhaseQueue` ensures we always have _something_ in the queue at all times
+    this.currentPhase = this.phaseQueue.shift()!;
 
-    if (this.currentPhase) {
-      console.log(`%cStart Phase ${this.currentPhase.constructor.name}`, "color:green;");
-      this.currentPhase.start();
-    }
+    this.startCurrentPhase();
+  }
+
+  /**
+   * Helper method to start and log the current phase.
+   */
+  private startCurrentPhase(): void {
+    console.log(`%cStart Phase ${this.currentPhase.phaseName}`, `color:${PHASE_START_COLOR};`);
+    this.currentPhase.start();
   }
 
   overridePhase(phase: Phase): boolean {
@@ -393,8 +404,7 @@ export class PhaseManager {
 
     this.standbyPhase = this.currentPhase;
     this.currentPhase = phase;
-    console.log(`%cStart Phase ${phase.constructor.name}`, "color:green;");
-    phase.start();
+    this.startCurrentPhase();
 
     return true;
   }
diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts
index 699caa2af21..25122e91033 100644
--- a/src/phases/attempt-capture-phase.ts
+++ b/src/phases/attempt-capture-phase.ts
@@ -21,9 +21,9 @@ import type { EnemyPokemon } from "#field/pokemon";
 import { PokemonHeldItemModifier } from "#modifiers/modifier";
 import { PokemonPhase } from "#phases/pokemon-phase";
 import { achvs } from "#system/achv";
-import type { PartyOption } from "#ui/party-ui-handler";
-import { PartyUiMode } from "#ui/party-ui-handler";
-import { SummaryUiMode } from "#ui/summary-ui-handler";
+import type { PartyOption } from "#ui/handlers/party-ui-handler";
+import { PartyUiMode } from "#ui/handlers/party-ui-handler";
+import { SummaryUiMode } from "#ui/handlers/summary-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { BooleanHolder } from "#utils/common";
 import i18next from "i18next";
diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts
index bfcb2136391..68c60abc0dc 100644
--- a/src/phases/egg-hatch-phase.ts
+++ b/src/phases/egg-hatch-phase.ts
@@ -9,9 +9,9 @@ import { doShinySparkleAnim } from "#field/anims";
 import type { PlayerPokemon } from "#field/pokemon";
 import type { EggLapsePhase } from "#phases/egg-lapse-phase";
 import { achvs } from "#system/achv";
-import { EggCounterContainer } from "#ui/egg-counter-container";
-import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler";
-import { PokemonInfoContainer } from "#ui/pokemon-info-container";
+import { EggCounterContainer } from "#ui/containers/egg-counter-container";
+import { PokemonInfoContainer } from "#ui/containers/pokemon-info-container";
+import type { EggHatchSceneHandler } from "#ui/handlers/egg-hatch-scene-handler";
 import { fixedInt, getFrameMs, randInt } from "#utils/common";
 import i18next from "i18next";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
diff --git a/src/phases/evolution-phase.ts b/src/phases/evolution-phase.ts
index 6095dfafa21..7d7301bbeca 100644
--- a/src/phases/evolution-phase.ts
+++ b/src/phases/evolution-phase.ts
@@ -10,7 +10,7 @@ import { LearnMoveSituation } from "#enums/learn-move-situation";
 import { UiMode } from "#enums/ui-mode";
 import { cos, sin } from "#field/anims";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
-import type { EvolutionSceneHandler } from "#ui/evolution-scene-handler";
+import type { EvolutionSceneHandler } from "#ui/handlers/evolution-scene-handler";
 import { fixedInt, getFrameMs, randInt } from "#utils/common";
 import i18next from "i18next";
 import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
diff --git a/src/phases/form-change-phase.ts b/src/phases/form-change-phase.ts
index 7b7f5a6dac6..298e6f32a10 100644
--- a/src/phases/form-change-phase.ts
+++ b/src/phases/form-change-phase.ts
@@ -8,7 +8,7 @@ import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon, Pokemon } from "#field/pokemon";
 import { EvolutionPhase } from "#phases/evolution-phase";
 import { achvs } from "#system/achv";
-import type { PartyUiHandler } from "#ui/party-ui-handler";
+import type { PartyUiHandler } from "#ui/handlers/party-ui-handler";
 import { fixedInt } from "#utils/common";
 
 export class FormChangePhase extends EvolutionPhase {
diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts
index a714d247730..a16e12ba058 100644
--- a/src/phases/learn-move-phase.ts
+++ b/src/phases/learn-move-phase.ts
@@ -10,8 +10,8 @@ import { UiMode } from "#enums/ui-mode";
 import type { Pokemon } from "#field/pokemon";
 import type { Move } from "#moves/move";
 import { PlayerPartyMemberPokemonPhase } from "#phases/player-party-member-pokemon-phase";
-import { EvolutionSceneHandler } from "#ui/evolution-scene-handler";
-import { SummaryUiMode } from "#ui/summary-ui-handler";
+import { EvolutionSceneHandler } from "#ui/handlers/evolution-scene-handler";
+import { SummaryUiMode } from "#ui/handlers/summary-ui-handler";
 import i18next from "i18next";
 
 export class LearnMovePhase extends PlayerPartyMemberPokemonPhase {
diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts
index dd73227a4a8..b0d95a7ad23 100644
--- a/src/phases/move-phase.ts
+++ b/src/phases/move-phase.ts
@@ -1,4 +1,5 @@
 import { applyAbAttrs } from "#abilities/apply-ab-attrs";
+import { MOVE_COLOR } from "#app/constants/colors";
 import { globalScene } from "#app/global-scene";
 import { getPokemonNameWithAffix } from "#app/messages";
 import Overrides from "#app/overrides";
@@ -131,7 +132,10 @@ export class MovePhase extends BattlePhase {
   public start(): void {
     super.start();
 
-    console.log(MoveId[this.move.moveId], enumValueToKey(MoveUseMode, this.useMode));
+    console.log(
+      `%cMove: ${MoveId[this.move.moveId]}\nUse Mode: ${enumValueToKey(MoveUseMode, this.useMode)}`,
+      `color:${MOVE_COLOR}`,
+    );
 
     // Check if move is unusable (e.g. running out of PP due to a mid-turn Spite
     // or the user no longer being on field), ending the phase early if not.
diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts
index 0235fb51da3..3add1bcbe34 100644
--- a/src/phases/revival-blessing-phase.ts
+++ b/src/phases/revival-blessing-phase.ts
@@ -3,8 +3,8 @@ import { SwitchType } from "#enums/switch-type";
 import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
 import { BattlePhase } from "#phases/battle-phase";
-import type { PartyOption } from "#ui/party-ui-handler";
-import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import type { PartyOption } from "#ui/handlers/party-ui-handler";
+import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
 import { isNullOrUndefined, toDmgValue } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts
index eebee28bfbb..38b39b310e1 100644
--- a/src/phases/scan-ivs-phase.ts
+++ b/src/phases/scan-ivs-phase.ts
@@ -24,7 +24,6 @@ export class ScanIvsPhase extends PokemonPhase {
     let statsContainer: Phaser.GameObjects.Sprite[] = [];
     let statsContainerLabels: Phaser.GameObjects.Sprite[] = [];
     const enemyField = globalScene.getEnemyField();
-    const uiTheme = globalScene.uiTheme; // Assuming uiTheme is accessible
     for (let e = 0; e < enemyField.length; e++) {
       enemyIvs = enemyField[e].ivs;
       // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists
@@ -36,8 +35,8 @@ export class ScanIvsPhase extends PokemonPhase {
         if (enemyIvs[ivStat] > currentIvs[ivStat] && PERMANENT_STATS.indexOf(Number(ivStat)) >= 0) {
           const hexColour =
             enemyIvs[ivStat] === 31
-              ? getTextColor(TextStyle.PERFECT_IV, false, uiTheme)
-              : getTextColor(TextStyle.SUMMARY_GREEN, false, uiTheme);
+              ? getTextColor(TextStyle.PERFECT_IV, false)
+              : getTextColor(TextStyle.SUMMARY_GREEN, false);
           const hexTextColour = Phaser.Display.Color.HexStringToColor(hexColour).color;
           statsContainerLabels[s].setTint(hexTextColour);
         }
diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts
index d02d69fc934..640b6de6db0 100644
--- a/src/phases/select-biome-phase.ts
+++ b/src/phases/select-biome-phase.ts
@@ -5,7 +5,7 @@ import { ChallengeType } from "#enums/challenge-type";
 import { UiMode } from "#enums/ui-mode";
 import { MapModifier, MoneyInterestModifier } from "#modifiers/modifier";
 import { BattlePhase } from "#phases/battle-phase";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { BooleanHolder, randSeedInt } from "#utils/common";
 
diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts
index 06a02af38b0..e2d2e107e4a 100644
--- a/src/phases/select-modifier-phase.ts
+++ b/src/phases/select-modifier-phase.ts
@@ -24,9 +24,9 @@ import {
   TmModifierType,
 } from "#modifiers/modifier-type";
 import { BattlePhase } from "#phases/battle-phase";
-import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
-import { SHOP_OPTIONS_ROW_LIMIT } from "#ui/modifier-select-ui-handler";
-import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
+import { SHOP_OPTIONS_ROW_LIMIT } from "#ui/handlers/modifier-select-ui-handler";
+import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
 import { isNullOrUndefined, NumberHolder } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts
index ef3fa74bd44..e099fdd7a3a 100644
--- a/src/phases/select-starter-phase.ts
+++ b/src/phases/select-starter-phase.ts
@@ -7,8 +7,8 @@ import { ChallengeType } from "#enums/challenge-type";
 import type { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { overrideHeldItems, overrideModifiers } from "#modifiers/modifier";
-import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler";
-import type { Starter } from "#ui/starter-select-ui-handler";
+import { SaveSlotUiMode } from "#ui/handlers/save-slot-select-ui-handler";
+import type { Starter } from "#ui/handlers/starter-select-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { isNullOrUndefined } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts
index eaa8a723745..58d0338e8de 100644
--- a/src/phases/switch-phase.ts
+++ b/src/phases/switch-phase.ts
@@ -3,7 +3,7 @@ import { DynamicPhaseType } from "#enums/dynamic-phase-type";
 import { SwitchType } from "#enums/switch-type";
 import { UiMode } from "#enums/ui-mode";
 import { BattlePhase } from "#phases/battle-phase";
-import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import { PartyOption, PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
 
 /**
  * Opens the party selector UI and transitions into a {@linkcode SwitchSummonPhase}
diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts
index a7db5b6a6dd..77145b28bb2 100644
--- a/src/phases/title-phase.ts
+++ b/src/phases/title-phase.ts
@@ -16,8 +16,8 @@ import type { Modifier } from "#modifiers/modifier";
 import { getDailyRunStarterModifiers, regenerateModifierPoolThresholds } from "#modifiers/modifier-type";
 import type { SessionSaveData } from "#system/game-data";
 import { vouchers } from "#system/voucher";
-import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { SaveSlotUiMode } from "#ui/save-slot-select-ui-handler";
+import type { OptionSelectConfig, OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import { SaveSlotUiMode } from "#ui/handlers/save-slot-select-ui-handler";
 import { isLocal, isLocalServerConnected, isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/plugins/api/pokerogue-daily-api.ts b/src/plugins/api/pokerogue-daily-api.ts
index 5ea3846e60e..dfde4720730 100644
--- a/src/plugins/api/pokerogue-daily-api.ts
+++ b/src/plugins/api/pokerogue-daily-api.ts
@@ -1,6 +1,6 @@
 import { ApiBase } from "#api/api-base";
 import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#types/api/pokerogue-daily-api";
-import type { RankingEntry } from "#ui/daily-run-scoreboard";
+import type { RankingEntry } from "#ui/containers/daily-run-scoreboard";
 
 /**
  * A wrapper for daily-run PokéRogue API requests.
diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts
index b2a04f96a55..18620e15223 100644
--- a/src/system/arena-data.ts
+++ b/src/system/arena-data.ts
@@ -5,14 +5,14 @@ import { Terrain } from "#data/terrain";
 import { Weather } from "#data/weather";
 import type { BiomeId } from "#enums/biome-id";
 import { Arena } from "#field/arena";
-import type { ArenaTagTypeData } from "#types/arena-tags";
+import type { ArenaTagData } from "#types/arena-tags";
 import type { NonFunctionProperties } from "#types/type-helpers";
 
 export interface SerializedArenaData {
   biome: BiomeId;
   weather: NonFunctionProperties<Weather> | null;
   terrain: NonFunctionProperties<Terrain> | null;
-  tags?: ArenaTagTypeData[];
+  tags?: ArenaTagData[];
   positionalTags: SerializedPositionalTag[];
   playerTerasUsed?: number;
 }
@@ -31,7 +31,7 @@ export class ArenaData {
     // is not yet an instance of `ArenaTag`
     this.tags =
       source.tags
-        ?.map((t: ArenaTag | ArenaTagTypeData) => loadArenaTag(t))
+        ?.map((t: ArenaTag | ArenaTagData) => loadArenaTag(t))
         ?.filter((tag): tag is SerializableArenaTag => tag instanceof SerializableArenaTag) ?? [];
 
     this.playerTerasUsed = source.playerTerasUsed ?? 0;
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index a00701f86f5..a3e1e532b15 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -62,7 +62,7 @@ import {
 import { VoucherType, vouchers } from "#system/voucher";
 import { trainerConfigs } from "#trainers/trainer-config";
 import type { DexData, DexEntry } from "#types/dex-data";
-import { RUN_HISTORY_LIMIT } from "#ui/run-history-ui-handler";
+import { RUN_HISTORY_LIMIT } from "#ui/handlers/run-history-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { executeIf, fixedInt, isLocal, NumberHolder, randInt, randSeedItem } from "#utils/common";
 import { decrypt, encrypt } from "#utils/data";
@@ -1536,6 +1536,7 @@ export class GameData {
             switch (dataType) {
               case GameDataType.SYSTEM: {
                 dataStr = this.convertSystemDataStr(dataStr);
+                dataStr = dataStr.replace(/"playTime":\d+/, `"playTime":${this.gameStats.playTime + 60}`);
                 const systemData = this.parseSystemData(dataStr);
                 valid = !!systemData.dexData && !!systemData.timestamp;
                 break;
diff --git a/src/tutorial.ts b/src/tutorial.ts
index 018d0927da0..5ab0be116f8 100644
--- a/src/tutorial.ts
+++ b/src/tutorial.ts
@@ -1,8 +1,8 @@
 import { globalScene } from "#app/global-scene";
 import Overrides from "#app/overrides";
 import { UiMode } from "#enums/ui-mode";
-import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
-import type { UiHandler } from "#ui/ui-handler";
+import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
+import type { UiHandler } from "#ui/handlers/ui-handler";
 import i18next from "i18next";
 
 export enum Tutorial {
diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts
index 72ae59faaec..9c45bdb394d 100644
--- a/src/ui-inputs.ts
+++ b/src/ui-inputs.ts
@@ -3,16 +3,16 @@ import type { InputsController } from "#app/inputs-controller";
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
 import { Setting, SettingKeys, settingIndex } from "#system/settings";
-import type { MessageUiHandler } from "#ui/message-ui-handler";
-import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
-import { PokedexUiHandler } from "#ui/pokedex-ui-handler";
-import { RunInfoUiHandler } from "#ui/run-info-ui-handler";
+import { PokedexPageUiHandler } from "#ui/containers/pokedex-page-ui-handler";
+import type { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
+import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler";
+import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
 import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler";
 import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler";
 import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler";
 import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler";
 import { SettingsUiHandler } from "#ui/settings-ui-handler";
-import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
 import Phaser from "phaser";
 
 type ActionKeys = Record<Button, () => void>;
diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts
index 1641585a603..2a502148bc5 100644
--- a/src/ui/battle-info/battle-info.ts
+++ b/src/ui/battle-info/battle-info.ts
@@ -5,6 +5,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { Stat } from "#enums/stat";
 import { StatusEffect } from "#enums/status-effect";
 import { TextStyle } from "#enums/text-style";
+import { UiTheme } from "#enums/ui-theme";
 import type { Pokemon } from "#field/pokemon";
 import { getVariantTint } from "#sprites/variant";
 import { addTextObject } from "#ui/text";
@@ -71,6 +72,7 @@ export abstract class BattleInfo extends Phaser.GameObjects.Container {
   protected splicedIcon: Phaser.GameObjects.Sprite;
   protected statusIndicator: Phaser.GameObjects.Sprite;
   protected levelContainer: Phaser.GameObjects.Container;
+  protected hpLabel: Phaser.GameObjects.Image;
   protected hpBar: Phaser.GameObjects.Image;
   protected levelNumbersContainer: Phaser.GameObjects.Container;
   protected type1Icon: Phaser.GameObjects.Sprite;
@@ -177,7 +179,7 @@ export abstract class BattleInfo extends Phaser.GameObjects.Container {
       }
 
       const statLabel = globalScene.add
-        .sprite(statX, statY, "pbinfo_stat", Stat[s])
+        .sprite(statX, statY, getLocalizedSpriteKey("pbinfo_stat"), Stat[s])
         .setName("icon_stat_label_" + i.toString())
         .setOrigin(0);
       statLabels.push(statLabel);
@@ -258,14 +260,19 @@ export abstract class BattleInfo extends Phaser.GameObjects.Container {
       .setName("container_level");
     this.add(this.levelContainer);
 
-    const levelOverlay = globalScene.add.image(0, 0, "overlay_lv");
+    const levelOverlay = globalScene.add.image(5.5, 0, getLocalizedSpriteKey("overlay_lv")).setOrigin(1, 0.5);
     this.levelContainer.add(levelOverlay);
 
     this.hpBar = globalScene.add.image(posParams.hpBarX, posParams.hpBarY, "overlay_hp").setName("hp_bar").setOrigin(0);
     this.add(this.hpBar);
 
+    this.hpLabel = globalScene.add
+      .image(posParams.hpBarX - 1, posParams.hpBarY - 3, getLocalizedSpriteKey("overlay_hp_label"))
+      .setOrigin(1, 0);
+    this.add(this.hpLabel);
+
     this.levelNumbersContainer = globalScene.add
-      .container(9.5, globalScene.uiTheme ? 0 : -0.5)
+      .container(9.5, globalScene.uiTheme === UiTheme.LEGACY ? 0 : -0.5)
       .setName("container_level");
     this.levelContainer.add(this.levelNumbersContainer);
 
diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts
index 7a2af017219..1d648b93774 100644
--- a/src/ui/battle-info/enemy-battle-info.ts
+++ b/src/ui/battle-info/enemy-battle-info.ts
@@ -1,12 +1,14 @@
 import { globalScene } from "#app/global-scene";
 import { Stat } from "#enums/stat";
 import { TextStyle } from "#enums/text-style";
+import { UiTheme } from "#enums/ui-theme";
 import type { EnemyPokemon } from "#field/pokemon";
-import { BattleFlyout } from "#ui/battle-flyout";
 import type { BattleInfoParamList } from "#ui/battle-info";
 import { BattleInfo } from "#ui/battle-info";
+import { BattleFlyout } from "#ui/containers/battle-flyout";
 import { addTextObject } from "#ui/text";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
+import { getLocalizedSpriteKey } from "#utils/common";
 import i18next from "i18next";
 import type { GameObjects } from "phaser";
 
@@ -188,6 +190,9 @@ export class EnemyBattleInfo extends BattleInfo {
       this.hpBar.x += 38 * (boss ? -1 : 1);
       this.hpBar.y += 2 * (this.boss ? -1 : 1);
       this.hpBar.setTexture(`overlay_hp${boss ? "_boss" : ""}`);
+      this.hpLabel.x += 38 * (boss ? -1 : 1);
+      this.hpLabel.y += 1 * (this.boss ? -1 : 1);
+      this.hpLabel.setTexture(getLocalizedSpriteKey(`overlay_hp_label${boss ? "_boss" : ""}`));
       this.levelContainer.x += 2 * (boss ? -1 : 1);
       this.box.setTexture(this.getTextureName());
       this.statsBox.setTexture(`${this.getTextureName()}_stats`);
@@ -203,7 +208,7 @@ export class EnemyBattleInfo extends BattleInfo {
     }
 
     if (this.boss && this.bossSegments > 1) {
-      const uiTheme = globalScene.uiTheme;
+      const isLegacyUiTheme = globalScene.uiTheme === UiTheme.LEGACY;
       const maxHp = pokemon.getMaxHp();
       for (let s = 1; s < this.bossSegments; s++) {
         const dividerX = (Math.round((maxHp / this.bossSegments) * s) / maxHp) * this.hpBar.width;
@@ -211,14 +216,14 @@ export class EnemyBattleInfo extends BattleInfo {
           0,
           0,
           1,
-          this.hpBar.height - (uiTheme ? 0 : 1),
+          this.hpBar.height - (isLegacyUiTheme ? 0 : 1),
           pokemon.bossSegmentIndex >= s ? 0xffffff : 0x404040,
         );
         divider.setOrigin(0.5, 0).setName("hpBar_divider_" + s.toString());
         this.add(divider);
         this.moveBelow(divider as Phaser.GameObjects.GameObject, this.statsContainer);
 
-        divider.setPositionRelative(this.hpBar, dividerX, uiTheme ? 0 : 1);
+        divider.setPositionRelative(this.hpBar, dividerX, isLegacyUiTheme ? 0 : 1);
         this.hpBarSegmentDividers.push(divider);
       }
     }
diff --git a/src/ui/battle-info/player-battle-info.ts b/src/ui/battle-info/player-battle-info.ts
index f0b50748154..5a23eab2071 100644
--- a/src/ui/battle-info/player-battle-info.ts
+++ b/src/ui/battle-info/player-battle-info.ts
@@ -5,10 +5,12 @@ import { Stat } from "#enums/stat";
 import type { PlayerPokemon } from "#field/pokemon";
 import type { BattleInfoParamList } from "#ui/battle-info";
 import { BattleInfo } from "#ui/battle-info";
+import { getLocalizedSpriteKey } from "#utils/common";
 
 export class PlayerBattleInfo extends BattleInfo {
   protected player: true = true;
   protected hpNumbersContainer: Phaser.GameObjects.Container;
+  protected expBarLabel: Phaser.GameObjects.Image;
 
   override get statOrder(): Stat[] {
     return [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD];
@@ -46,6 +48,12 @@ export class PlayerBattleInfo extends BattleInfo {
     // hp number container must be beneath the stat container for overlay to display properly
     this.addAt(this.hpNumbersContainer, this.getIndex(this.statsContainer));
 
+    const expBarLabel = globalScene.add
+      .image(-91, 20, getLocalizedSpriteKey("overlay_exp_label"))
+      .setName("overlay_exp_label")
+      .setOrigin(1, 1);
+    this.add(expBarLabel);
+
     const expBar = globalScene.add.image(-98, 18, "overlay_exp").setName("overlay_exp").setOrigin(0);
     this.add(expBar);
 
@@ -60,6 +68,7 @@ export class PlayerBattleInfo extends BattleInfo {
 
     expBar.setMask(expMask);
 
+    this.expBarLabel = expBarLabel;
     this.expBar = expBar;
     this.expMaskRect = expMaskRect;
   }
@@ -108,7 +117,7 @@ export class PlayerBattleInfo extends BattleInfo {
     this.statValuesContainer.x += 2 * (mini ? 1 : -1);
     this.statValuesContainer.y += -7 * (mini ? 1 : -1);
 
-    const toggledElements = [this.hpNumbersContainer, this.expBar];
+    const toggledElements = [this.hpNumbersContainer, this.expBarLabel, this.expBar];
     toggledElements.forEach(el => el.setVisible(!mini));
   }
 
diff --git a/src/ui/ability-bar.ts b/src/ui/containers/ability-bar.ts
similarity index 100%
rename from src/ui/ability-bar.ts
rename to src/ui/containers/ability-bar.ts
diff --git a/src/ui/achv-bar.ts b/src/ui/containers/achv-bar.ts
similarity index 100%
rename from src/ui/achv-bar.ts
rename to src/ui/containers/achv-bar.ts
diff --git a/src/ui/arena-flyout.ts b/src/ui/containers/arena-flyout.ts
similarity index 99%
rename from src/ui/arena-flyout.ts
rename to src/ui/containers/arena-flyout.ts
index da062f5c96f..cdecabee8e3 100644
--- a/src/ui/arena-flyout.ts
+++ b/src/ui/containers/arena-flyout.ts
@@ -15,8 +15,8 @@ import {
 } from "#events/arena";
 import type { TurnEndEvent } from "#events/battle-scene";
 import { BattleSceneEventType } from "#events/battle-scene";
+import { TimeOfDayWidget } from "#ui/containers/time-of-day-widget";
 import { addTextObject } from "#ui/text";
-import { TimeOfDayWidget } from "#ui/time-of-day-widget";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 import { fixedInt } from "#utils/common";
 import { toCamelCase, toTitleCase } from "#utils/strings";
diff --git a/src/ui/base-stats-overlay.ts b/src/ui/containers/base-stats-overlay.ts
similarity index 100%
rename from src/ui/base-stats-overlay.ts
rename to src/ui/containers/base-stats-overlay.ts
diff --git a/src/ui/battle-flyout.ts b/src/ui/containers/battle-flyout.ts
similarity index 100%
rename from src/ui/battle-flyout.ts
rename to src/ui/containers/battle-flyout.ts
diff --git a/src/ui/bgm-bar.ts b/src/ui/containers/bgm-bar.ts
similarity index 100%
rename from src/ui/bgm-bar.ts
rename to src/ui/containers/bgm-bar.ts
diff --git a/src/ui/candy-bar.ts b/src/ui/containers/candy-bar.ts
similarity index 100%
rename from src/ui/candy-bar.ts
rename to src/ui/containers/candy-bar.ts
diff --git a/src/ui/char-sprite.ts b/src/ui/containers/char-sprite.ts
similarity index 100%
rename from src/ui/char-sprite.ts
rename to src/ui/containers/char-sprite.ts
diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/containers/daily-run-scoreboard.ts
similarity index 100%
rename from src/ui/daily-run-scoreboard.ts
rename to src/ui/containers/daily-run-scoreboard.ts
diff --git a/src/ui/dropdown.ts b/src/ui/containers/dropdown.ts
similarity index 99%
rename from src/ui/dropdown.ts
rename to src/ui/containers/dropdown.ts
index c13d1ab6482..4076387caf1 100644
--- a/src/ui/dropdown.ts
+++ b/src/ui/containers/dropdown.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
-import { ScrollBar } from "#ui/scroll-bar";
+import { ScrollBar } from "#ui/containers/scroll-bar";
 import { addTextObject } from "#ui/text";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 import i18next from "i18next";
diff --git a/src/ui/egg-counter-container.ts b/src/ui/containers/egg-counter-container.ts
similarity index 96%
rename from src/ui/egg-counter-container.ts
rename to src/ui/containers/egg-counter-container.ts
index da394e73b28..811b6b3bc3a 100644
--- a/src/ui/egg-counter-container.ts
+++ b/src/ui/containers/egg-counter-container.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
 import type { EggCountChangedEvent } from "#events/egg";
 import { EggEventType } from "#events/egg";
-import type { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler";
+import type { EggHatchSceneHandler } from "#ui/handlers/egg-hatch-scene-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 
diff --git a/src/ui/filter-bar.ts b/src/ui/containers/filter-bar.ts
similarity index 96%
rename from src/ui/filter-bar.ts
rename to src/ui/containers/filter-bar.ts
index ea227655a97..3c1cf0ed699 100644
--- a/src/ui/filter-bar.ts
+++ b/src/ui/containers/filter-bar.ts
@@ -2,9 +2,9 @@ import { globalScene } from "#app/global-scene";
 import type { DropDownColumn } from "#enums/drop-down-column";
 import { TextStyle } from "#enums/text-style";
 import type { UiTheme } from "#enums/ui-theme";
-import type { DropDown } from "#ui/dropdown";
-import { DropDownType } from "#ui/dropdown";
-import type { StarterContainer } from "#ui/starter-container";
+import type { DropDown } from "#ui/containers/dropdown";
+import { DropDownType } from "#ui/containers/dropdown";
+import type { StarterContainer } from "#ui/containers/starter-container";
 import { addTextObject, getTextColor } from "#ui/text";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 
@@ -97,9 +97,9 @@ export class FilterBar extends Phaser.GameObjects.Container {
   updateFilterLabels(): void {
     for (let i = 0; i < this.numFilters; i++) {
       if (this.dropDowns[i].hasDefaultValues()) {
-        this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false, globalScene.uiTheme));
+        this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false));
       } else {
-        this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false, globalScene.uiTheme));
+        this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false));
       }
     }
   }
diff --git a/src/ui/filter-text.ts b/src/ui/containers/filter-text.ts
similarity index 97%
rename from src/ui/filter-text.ts
rename to src/ui/containers/filter-text.ts
index d5809292c25..202761152eb 100644
--- a/src/ui/filter-text.ts
+++ b/src/ui/containers/filter-text.ts
@@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 import type { UiTheme } from "#enums/ui-theme";
-import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
-import type { StarterContainer } from "#ui/starter-container";
+import type { StarterContainer } from "#ui/containers/starter-container";
+import type { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
 import { addTextObject, getTextColor } from "#ui/text";
 import type { UI } from "#ui/ui";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
@@ -167,9 +167,9 @@ export class FilterText extends Phaser.GameObjects.Container {
   updateFilterLabels(): void {
     for (let i = 0; i < this.numFilters; i++) {
       if (this.selections[i].text === this.defaultText) {
-        this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false, globalScene.uiTheme));
+        this.labels[i].setColor(getTextColor(TextStyle.TOOLTIP_CONTENT, false));
       } else {
-        this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false, globalScene.uiTheme));
+        this.labels[i].setColor(getTextColor(TextStyle.STATS_LABEL, false));
       }
     }
   }
diff --git a/src/ui/hatched-pokemon-container.ts b/src/ui/containers/hatched-pokemon-container.ts
similarity index 97%
rename from src/ui/hatched-pokemon-container.ts
rename to src/ui/containers/hatched-pokemon-container.ts
index a5919348a94..4ed67477a3f 100644
--- a/src/ui/hatched-pokemon-container.ts
+++ b/src/ui/containers/hatched-pokemon-container.ts
@@ -4,8 +4,8 @@ import { Gender } from "#data/gender";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { DexAttr } from "#enums/dex-attr";
 import { getVariantTint } from "#sprites/variant";
-import type { PokemonIconAnimHandler } from "#ui/pokemon-icon-anim-handler";
-import { PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
+import type { PokemonIconAnimHandler } from "#ui/handlers/pokemon-icon-anim-handler";
+import { PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
 
 /**
  * A container for a Pokemon's sprite and icons to get displayed in the egg summary screen
diff --git a/src/ui/move-info-overlay.ts b/src/ui/containers/move-info-overlay.ts
similarity index 100%
rename from src/ui/move-info-overlay.ts
rename to src/ui/containers/move-info-overlay.ts
diff --git a/src/ui/party-exp-bar.ts b/src/ui/containers/party-exp-bar.ts
similarity index 100%
rename from src/ui/party-exp-bar.ts
rename to src/ui/containers/party-exp-bar.ts
diff --git a/src/ui/pokeball-tray.ts b/src/ui/containers/pokeball-tray.ts
similarity index 100%
rename from src/ui/pokeball-tray.ts
rename to src/ui/containers/pokeball-tray.ts
diff --git a/src/ui/pokedex-info-overlay.ts b/src/ui/containers/pokedex-info-overlay.ts
similarity index 100%
rename from src/ui/pokedex-info-overlay.ts
rename to src/ui/containers/pokedex-info-overlay.ts
diff --git a/src/ui/pokedex-mon-container.ts b/src/ui/containers/pokedex-mon-container.ts
similarity index 100%
rename from src/ui/pokedex-mon-container.ts
rename to src/ui/containers/pokedex-mon-container.ts
diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/containers/pokedex-page-ui-handler.ts
similarity index 98%
rename from src/ui/pokedex-page-ui-handler.ts
rename to src/ui/containers/pokedex-page-ui-handler.ts
index 706f139b8bb..1280b3bc30f 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/containers/pokedex-page-ui-handler.ts
@@ -46,12 +46,12 @@ import { getVariantIcon, getVariantTint } from "#sprites/variant";
 import type { StarterAttributes } from "#system/game-data";
 import { SettingKeyboard } from "#system/settings-keyboard";
 import type { DexEntry } from "#types/dex-data";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { BaseStatsOverlay } from "#ui/base-stats-overlay";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { MoveInfoOverlay } from "#ui/move-info-overlay";
-import { PokedexInfoOverlay } from "#ui/pokedex-info-overlay";
-import { StatsContainer } from "#ui/stats-container";
+import { BaseStatsOverlay } from "#ui/containers/base-stats-overlay";
+import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
+import { PokedexInfoOverlay } from "#ui/containers/pokedex-info-overlay";
+import { StatsContainer } from "#ui/containers/stats-container";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common";
@@ -175,6 +175,7 @@ enum MenuOptions {
 export class PokedexPageUiHandler extends MessageUiHandler {
   private starterSelectContainer: Phaser.GameObjects.Container;
   private shinyOverlay: Phaser.GameObjects.Image;
+  private starterDexNoLabel: Phaser.GameObjects.Image;
   private pokemonNumberText: Phaser.GameObjects.Text;
   private pokemonSprite: Phaser.GameObjects.Sprite;
   private pokemonNameText: Phaser.GameObjects.Text;
@@ -324,8 +325,12 @@ export class PokedexPageUiHandler extends MessageUiHandler {
     });
     this.starterSelectContainer.add(this.pokemonSprite);
 
-    this.shinyOverlay = globalScene.add.image(6, 6, "summary_overlay_shiny");
-    this.shinyOverlay.setOrigin(0, 0);
+    this.starterDexNoLabel = globalScene.add.image(6, 14, getLocalizedSpriteKey("summary_dexnb_label")); // Pixel text 'No'
+    this.starterDexNoLabel.setOrigin(0, 1);
+    this.starterSelectContainer.add(this.starterDexNoLabel);
+
+    this.shinyOverlay = globalScene.add.image(6, 111, getLocalizedSpriteKey("summary_dexnb_label_overlay_shiny")); // Pixel text 'No' shiny
+    this.shinyOverlay.setOrigin(0, 1);
     this.shinyOverlay.setVisible(false);
     this.starterSelectContainer.add(this.shinyOverlay);
 
@@ -657,7 +662,7 @@ export class PokedexPageUiHandler extends MessageUiHandler {
       i18next.t("pokedexUiHandler:showEvolutions"),
     ];
 
-    this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
+    this.scale = getTextStyleOptions(TextStyle.WINDOW).scale;
     this.menuBg = addWindow(
       globalScene.scaledCanvas.width - 83,
       0,
@@ -705,7 +710,7 @@ export class PokedexPageUiHandler extends MessageUiHandler {
   show(args: any[]): boolean {
     // Allow the use of candies if we are in one of the whitelisted phases
     this.canUseCandies = ["TitlePhase", "SelectStarterPhase", "CommandPhase"].includes(
-      globalScene.phaseManager.getCurrentPhase()?.phaseName ?? "",
+      globalScene.phaseManager.getCurrentPhase().phaseName,
     );
 
     if (args.length >= 1 && args[0] === "refresh") {
@@ -762,16 +767,8 @@ export class PokedexPageUiHandler extends MessageUiHandler {
           !isSeen ||
           (!isStarterCaught && (o === MenuOptions.TOGGLE_IVS || o === MenuOptions.NATURES)) ||
           (this.tmMoves.length < 1 && o === MenuOptions.TM_MOVES);
-        const color = getTextColor(
-          isDark ? TextStyle.SHADOW_TEXT : TextStyle.SETTINGS_VALUE,
-          false,
-          globalScene.uiTheme,
-        );
-        const shadow = getTextColor(
-          isDark ? TextStyle.SHADOW_TEXT : TextStyle.SETTINGS_VALUE,
-          true,
-          globalScene.uiTheme,
-        );
+        const color = getTextColor(isDark ? TextStyle.SHADOW_TEXT : TextStyle.SETTINGS_VALUE, false);
+        const shadow = getTextColor(isDark ? TextStyle.SHADOW_TEXT : TextStyle.SETTINGS_VALUE, true);
         return `[shadow=${shadow}][color=${color}]${label}[/color][/shadow]`;
       })
       .join("\n");
@@ -1784,7 +1781,7 @@ export class PokedexPageUiHandler extends MessageUiHandler {
                     options: natures
                       .map((n: Nature, _i: number) => {
                         const option: OptionSelectItem = {
-                          label: getNatureName(n, true, true, true, globalScene.uiTheme),
+                          label: getNatureName(n, true, true, true),
                           handler: () => {
                             return false;
                           },
@@ -2512,10 +2509,10 @@ export class PokedexPageUiHandler extends MessageUiHandler {
 
       this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default?
       this.pokemonNumberText.setColor(
-        this.getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, false),
+        getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, false),
       );
       this.pokemonNumberText.setShadowColor(
-        this.getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, true),
+        getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, true),
       );
 
       const assetLoadCancelled = new BooleanHolder(false);
@@ -2723,8 +2720,8 @@ export class PokedexPageUiHandler extends MessageUiHandler {
       }
     } else {
       this.shinyOverlay.setVisible(false);
-      this.pokemonNumberText.setColor(this.getTextColor(TextStyle.SUMMARY));
-      this.pokemonNumberText.setShadowColor(this.getTextColor(TextStyle.SUMMARY, true));
+      this.pokemonNumberText.setColor(getTextColor(TextStyle.SUMMARY));
+      this.pokemonNumberText.setShadowColor(getTextColor(TextStyle.SUMMARY, true));
       this.pokemonGenderText.setText("");
       this.setTypeIcons(null, null);
     }
diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/containers/pokemon-hatch-info-container.ts
similarity index 99%
rename from src/ui/pokemon-hatch-info-container.ts
rename to src/ui/containers/pokemon-hatch-info-container.ts
index bb1cc22e9fd..8ddd9df9836 100644
--- a/src/ui/pokemon-hatch-info-container.ts
+++ b/src/ui/containers/pokemon-hatch-info-container.ts
@@ -9,7 +9,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { TextStyle } from "#enums/text-style";
 import type { PlayerPokemon } from "#field/pokemon";
-import { PokemonInfoContainer } from "#ui/pokemon-info-container";
+import { PokemonInfoContainer } from "#ui/containers/pokemon-info-container";
 import { addTextObject } from "#ui/text";
 import { padInt, rgbHexToRgba } from "#utils/common";
 import { getPokemonSpeciesForm } from "#utils/pokemon-utils";
diff --git a/src/ui/pokemon-info-container.ts b/src/ui/containers/pokemon-info-container.ts
similarity index 94%
rename from src/ui/pokemon-info-container.ts
rename to src/ui/containers/pokemon-info-container.ts
index 3b2349348a8..2b214229992 100644
--- a/src/ui/pokemon-info-container.ts
+++ b/src/ui/containers/pokemon-info-container.ts
@@ -8,8 +8,8 @@ import type { Pokemon } from "#field/pokemon";
 import { getVariantTint } from "#sprites/variant";
 import type { StarterDataEntry } from "#system/game-data";
 import type { DexEntry } from "#types/dex-data";
-import { ConfirmUiHandler } from "#ui/confirm-ui-handler";
-import { StatsContainer } from "#ui/stats-container";
+import { StatsContainer } from "#ui/containers/stats-container";
+import { ConfirmUiHandler } from "#ui/handlers/confirm-ui-handler";
 import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, getShinyDescriptor } from "#utils/common";
@@ -274,8 +274,8 @@ export class PokemonInfoContainer extends Phaser.GameObjects.Container {
 
         const newGender = BigInt(1 << pokemon.gender) * DexAttr.MALE;
         this.pokemonGenderNewText.setText("(+)");
-        this.pokemonGenderNewText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
-        this.pokemonGenderNewText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
+        this.pokemonGenderNewText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false));
+        this.pokemonGenderNewText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true));
         this.pokemonGenderNewText.setVisible((newGender & caughtAttr) === BigInt(0));
       } else {
         this.pokemonGenderNewText.setVisible(false);
@@ -290,11 +290,11 @@ export class PokemonInfoContainer extends Phaser.GameObjects.Container {
         const newForm = BigInt(1 << pokemon.formIndex) * DexAttr.DEFAULT_FORM;
 
         if ((newForm & caughtAttr) === BigInt(0)) {
-          this.pokemonFormLabelText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
-          this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
+          this.pokemonFormLabelText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false));
+          this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true));
         } else {
-          this.pokemonFormLabelText.setColor(getTextColor(TextStyle.WINDOW, false, globalScene.uiTheme));
-          this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, globalScene.uiTheme));
+          this.pokemonFormLabelText.setColor(getTextColor(TextStyle.WINDOW, false));
+          this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true));
         }
 
         this.pokemonFormText.setText(
@@ -320,31 +320,31 @@ export class PokemonInfoContainer extends Phaser.GameObjects.Container {
 
       const abilityTextStyle = pokemon.abilityIndex === 2 ? TextStyle.MONEY : TextStyle.WINDOW;
       this.pokemonAbilityText.setText(pokemon.getAbility(true).name);
-      this.pokemonAbilityText.setColor(getTextColor(abilityTextStyle, false, globalScene.uiTheme));
-      this.pokemonAbilityText.setShadowColor(getTextColor(abilityTextStyle, true, globalScene.uiTheme));
+      this.pokemonAbilityText.setColor(getTextColor(abilityTextStyle, false));
+      this.pokemonAbilityText.setShadowColor(getTextColor(abilityTextStyle, true));
 
       // Check if the player owns ability for the root form
       const playerOwnsThisAbility = pokemon.checkIfPlayerHasAbilityOfStarter(starterEntry.abilityAttr);
 
       if (!playerOwnsThisAbility) {
-        this.pokemonAbilityLabelText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
-        this.pokemonAbilityLabelText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
+        this.pokemonAbilityLabelText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false));
+        this.pokemonAbilityLabelText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true));
       } else {
-        this.pokemonAbilityLabelText.setColor(getTextColor(TextStyle.WINDOW, false, globalScene.uiTheme));
-        this.pokemonAbilityLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, globalScene.uiTheme));
+        this.pokemonAbilityLabelText.setColor(getTextColor(TextStyle.WINDOW, false));
+        this.pokemonAbilityLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true));
       }
 
-      this.pokemonNatureText.setText(getNatureName(pokemon.getNature(), true, false, false, globalScene.uiTheme));
+      this.pokemonNatureText.setText(getNatureName(pokemon.getNature(), true, false, false));
 
       const dexNatures = dexEntry.natureAttr;
       const newNature = 1 << (pokemon.nature + 1);
 
       if (!(dexNatures & newNature)) {
-        this.pokemonNatureLabelText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
-        this.pokemonNatureLabelText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
+        this.pokemonNatureLabelText.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false));
+        this.pokemonNatureLabelText.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true));
       } else {
-        this.pokemonNatureLabelText.setColor(getTextColor(TextStyle.WINDOW, false, globalScene.uiTheme));
-        this.pokemonNatureLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, globalScene.uiTheme));
+        this.pokemonNatureLabelText.setColor(getTextColor(TextStyle.WINDOW, false));
+        this.pokemonNatureLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true));
       }
 
       const isFusion = pokemon.isFusion();
@@ -373,16 +373,16 @@ export class PokemonInfoContainer extends Phaser.GameObjects.Container {
         const newVariant = BigInt(1 << (pokemon.variant + 4));
 
         this.pokemonShinyNewIcon.setText("(+)");
-        this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
-        this.pokemonShinyNewIcon.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
+        this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false));
+        this.pokemonShinyNewIcon.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true));
         const newShinyOrVariant = (newShiny & caughtAttr) === BigInt(0) || (newVariant & caughtAttr) === BigInt(0);
         this.pokemonShinyNewIcon.setVisible(!!newShinyOrVariant);
       } else if ((caughtAttr & DexAttr.NON_SHINY) === BigInt(0) && (caughtAttr & DexAttr.SHINY) === DexAttr.SHINY) {
         //If the player has *only* caught any shiny variant of this species, not a non-shiny
         this.pokemonShinyNewIcon.setVisible(true);
         this.pokemonShinyNewIcon.setText("(+)");
-        this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme));
-        this.pokemonShinyNewIcon.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme));
+        this.pokemonShinyNewIcon.setColor(getTextColor(TextStyle.SUMMARY_BLUE, false));
+        this.pokemonShinyNewIcon.setShadowColor(getTextColor(TextStyle.SUMMARY_BLUE, true));
       } else {
         this.pokemonShinyNewIcon.setVisible(false);
       }
diff --git a/src/ui/saving-icon-handler.ts b/src/ui/containers/saving-icon-handler.ts
similarity index 100%
rename from src/ui/saving-icon-handler.ts
rename to src/ui/containers/saving-icon-handler.ts
diff --git a/src/ui/scroll-bar.ts b/src/ui/containers/scroll-bar.ts
similarity index 100%
rename from src/ui/scroll-bar.ts
rename to src/ui/containers/scroll-bar.ts
diff --git a/src/ui/starter-container.ts b/src/ui/containers/starter-container.ts
similarity index 100%
rename from src/ui/starter-container.ts
rename to src/ui/containers/starter-container.ts
diff --git a/src/ui/stats-container.ts b/src/ui/containers/stats-container.ts
similarity index 96%
rename from src/ui/stats-container.ts
rename to src/ui/containers/stats-container.ts
index e9af5eed3e3..f5221d38991 100644
--- a/src/ui/stats-container.ts
+++ b/src/ui/containers/stats-container.ts
@@ -113,7 +113,7 @@ export class StatsContainer extends Phaser.GameObjects.Container {
           (ivs[ivChartStatIndexes[i]] / 31) * ivChartSize * ivChartStatCoordMultipliers[ivChartStatIndexes[i]][1],
         ]);
       const lastIvChartData = this.statsIvsCache || defaultIvChartData;
-      const perfectIVColor: string = getTextColor(TextStyle.SUMMARY_GOLD, false, globalScene.uiTheme);
+      const perfectIVColor: string = getTextColor(TextStyle.SUMMARY_GOLD, false);
       this.statsIvsCache = ivChartData.slice(0);
 
       this.ivStatValueTexts.map((t: BBCodeText, i: number) => {
@@ -127,7 +127,7 @@ export class StatsContainer extends Phaser.GameObjects.Container {
         }
         if (this.showDiff && originalIvs) {
           if (originalIvs[i] < ivs[i]) {
-            label += ` ([color=${getTextColor(TextStyle.SUMMARY_BLUE, false, globalScene.uiTheme)}][shadow=${getTextColor(TextStyle.SUMMARY_BLUE, true, globalScene.uiTheme)}]+${ivs[i] - originalIvs[i]}[/shadow][/color])`;
+            label += ` ([color=${getTextColor(TextStyle.SUMMARY_BLUE, false)}][shadow=${getTextColor(TextStyle.SUMMARY_BLUE, true)}]+${ivs[i] - originalIvs[i]}[/shadow][/color])`;
           } else {
             label += " (-)";
           }
diff --git a/src/ui/time-of-day-widget.ts b/src/ui/containers/time-of-day-widget.ts
similarity index 100%
rename from src/ui/time-of-day-widget.ts
rename to src/ui/containers/time-of-day-widget.ts
diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/handlers/abstract-binding-ui-handler.ts
similarity index 91%
rename from src/ui/settings/abstract-binding-ui-handler.ts
rename to src/ui/handlers/abstract-binding-ui-handler.ts
index 2c8d0eb63ba..d106ff6f914 100644
--- a/src/ui/settings/abstract-binding-ui-handler.ts
+++ b/src/ui/handlers/abstract-binding-ui-handler.ts
@@ -2,9 +2,9 @@ import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { NavigationManager } from "#ui/navigation-menu";
-import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
+import { addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import i18next from "i18next";
 
@@ -222,16 +222,16 @@ export abstract class AbstractBindingUiHandler extends UiHandler {
   setCursor(cursor: number): boolean {
     this.cursor = cursor;
     if (cursor === 1) {
-      this.actionLabel.setColor(this.getTextColor(TextStyle.SETTINGS_SELECTED));
-      this.actionLabel.setShadowColor(this.getTextColor(TextStyle.SETTINGS_SELECTED, true));
-      this.cancelLabel.setColor(this.getTextColor(TextStyle.WINDOW));
-      this.cancelLabel.setShadowColor(this.getTextColor(TextStyle.WINDOW, true));
+      this.actionLabel.setColor(getTextColor(TextStyle.SETTINGS_SELECTED));
+      this.actionLabel.setShadowColor(getTextColor(TextStyle.SETTINGS_SELECTED, true));
+      this.cancelLabel.setColor(getTextColor(TextStyle.WINDOW));
+      this.cancelLabel.setShadowColor(getTextColor(TextStyle.WINDOW, true));
       return true;
     }
-    this.actionLabel.setColor(this.getTextColor(TextStyle.WINDOW));
-    this.actionLabel.setShadowColor(this.getTextColor(TextStyle.WINDOW, true));
-    this.cancelLabel.setColor(this.getTextColor(TextStyle.SETTINGS_SELECTED));
-    this.cancelLabel.setShadowColor(this.getTextColor(TextStyle.SETTINGS_SELECTED, true));
+    this.actionLabel.setColor(getTextColor(TextStyle.WINDOW));
+    this.actionLabel.setShadowColor(getTextColor(TextStyle.WINDOW, true));
+    this.cancelLabel.setColor(getTextColor(TextStyle.SETTINGS_SELECTED));
+    this.cancelLabel.setShadowColor(getTextColor(TextStyle.SETTINGS_SELECTED, true));
     return true;
   }
 
diff --git a/src/ui/abstract-option-select-ui-handler.ts b/src/ui/handlers/abstract-option-select-ui-handler.ts
similarity index 95%
rename from src/ui/abstract-option-select-ui-handler.ts
rename to src/ui/handlers/abstract-option-select-ui-handler.ts
index b7279bc2d30..d6e9b583237 100644
--- a/src/ui/abstract-option-select-ui-handler.ts
+++ b/src/ui/handlers/abstract-option-select-ui-handler.ts
@@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addBBCodeTextObject, getTextColor, getTextStyleOptions } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, rgbHexToRgba } from "#utils/common";
 import { argbFromRgba } from "@material/material-color-utilities";
@@ -81,7 +81,7 @@ export abstract class AbstractOptionSelectUiHandler extends UiHandler {
 
     this.optionSelectIcons = [];
 
-    this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
+    this.scale = getTextStyleOptions(TextStyle.WINDOW).scale;
 
     this.setCursor(0);
   }
@@ -124,8 +124,8 @@ export abstract class AbstractOptionSelectUiHandler extends UiHandler {
       optionsForWidth
         .map(o =>
           o.item
-            ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]    ${o.label}[/color][/shadow]`
-            : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`,
+            ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false)}]    ${o.label}[/color][/shadow]`
+            : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false)}]${o.label}[/color][/shadow]`,
         )
         .join("\n"),
       TextStyle.WINDOW,
@@ -149,8 +149,8 @@ export abstract class AbstractOptionSelectUiHandler extends UiHandler {
     this.textContent = optionsWithScroll
       .map(o =>
         o.item
-          ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]    ${o.label}[/color][/shadow]`
-          : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true, globalScene.uiTheme)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false, globalScene.uiTheme)}]${o.label}[/color][/shadow]`,
+          ? `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false)}]    ${o.label}[/color][/shadow]`
+          : `[shadow=${getTextColor(o.style ?? this.defaultTextStyle, true)}][color=${getTextColor(o.style ?? TextStyle.WINDOW, false)}]${o.label}[/color][/shadow]`,
       )
       .join("\n");
     this.optionSelectText.setText(this.textContent);
diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/handlers/achvs-ui-handler.ts
similarity index 99%
rename from src/ui/achvs-ui-handler.ts
rename to src/ui/handlers/achvs-ui-handler.ts
index b0f49d13c86..f8f73dd2078 100644
--- a/src/ui/achvs-ui-handler.ts
+++ b/src/ui/handlers/achvs-ui-handler.ts
@@ -8,8 +8,8 @@ import { achvs, getAchievementDescription } from "#system/achv";
 import type { AchvUnlocks, VoucherUnlocks } from "#system/game-data";
 import type { Voucher } from "#system/voucher";
 import { getVoucherTypeIcon, getVoucherTypeName, vouchers } from "#system/voucher";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { ScrollBar } from "#ui/scroll-bar";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import i18next from "i18next";
diff --git a/src/ui/admin-ui-handler.ts b/src/ui/handlers/admin-ui-handler.ts
similarity index 96%
rename from src/ui/admin-ui-handler.ts
rename to src/ui/handlers/admin-ui-handler.ts
index e577368363d..bddf730208f 100644
--- a/src/ui/admin-ui-handler.ts
+++ b/src/ui/handlers/admin-ui-handler.ts
@@ -3,9 +3,10 @@ import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
+import { getTextColor } from "#ui/text";
 import { toTitleCase } from "#utils/strings";
 
 type AdminUiHandlerService = "discord" | "google";
@@ -129,11 +130,11 @@ export class AdminUiHandler extends FormModalUiHandler {
 
     this.errorMessage.setPosition(10, (hasTitle ? 31 : 5) + 20 * (fields.length - 1) + 16 + this.getButtonTopMargin()); // sets the position of the message dynamically
     if (isMessageError) {
-      this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_PINK));
-      this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_PINK, true));
+      this.errorMessage.setColor(getTextColor(TextStyle.SUMMARY_PINK));
+      this.errorMessage.setShadowColor(getTextColor(TextStyle.SUMMARY_PINK, true));
     } else {
-      this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_GREEN));
-      this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_GREEN, true));
+      this.errorMessage.setColor(getTextColor(TextStyle.SUMMARY_GREEN));
+      this.errorMessage.setShadowColor(getTextColor(TextStyle.SUMMARY_GREEN, true));
     }
 
     if (super.show(args)) {
diff --git a/src/ui/autocomplete-ui-handler.ts b/src/ui/handlers/autocomplete-ui-handler.ts
similarity index 94%
rename from src/ui/autocomplete-ui-handler.ts
rename to src/ui/handlers/autocomplete-ui-handler.ts
index 337b17048dc..914fe23a123 100644
--- a/src/ui/autocomplete-ui-handler.ts
+++ b/src/ui/handlers/autocomplete-ui-handler.ts
@@ -1,6 +1,6 @@
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
-import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler";
+import { AbstractOptionSelectUiHandler } from "#ui/handlers/abstract-option-select-ui-handler";
 
 export class AutoCompleteUiHandler extends AbstractOptionSelectUiHandler {
   modalContainer: Phaser.GameObjects.Container;
diff --git a/src/ui/awaitable-ui-handler.ts b/src/ui/handlers/awaitable-ui-handler.ts
similarity index 96%
rename from src/ui/awaitable-ui-handler.ts
rename to src/ui/handlers/awaitable-ui-handler.ts
index e8513b4acc1..9dcd3377da2 100644
--- a/src/ui/awaitable-ui-handler.ts
+++ b/src/ui/handlers/awaitable-ui-handler.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import type { UiMode } from "#enums/ui-mode";
-import { UiHandler } from "#ui/ui-handler";
+import { UiHandler } from "#ui/handlers/ui-handler";
 
 export abstract class AwaitableUiHandler extends UiHandler {
   protected awaitingActionInput: boolean;
diff --git a/src/ui/ball-ui-handler.ts b/src/ui/handlers/ball-ui-handler.ts
similarity index 97%
rename from src/ui/ball-ui-handler.ts
rename to src/ui/handlers/ball-ui-handler.ts
index 99dabd893df..3d1868c207e 100644
--- a/src/ui/ball-ui-handler.ts
+++ b/src/ui/handlers/ball-ui-handler.ts
@@ -5,8 +5,8 @@ import { Command } from "#enums/command";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 import type { CommandPhase } from "#phases/command-phase";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addTextObject, getTextStyleOptions } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
 import i18next from "i18next";
 
@@ -26,7 +26,7 @@ export class BallUiHandler extends UiHandler {
   setup() {
     const ui = this.getUi();
 
-    this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
+    this.scale = getTextStyleOptions(TextStyle.WINDOW).scale;
 
     let optionsTextContent = "";
 
diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/handlers/battle-message-ui-handler.ts
similarity index 97%
rename from src/ui/battle-message-ui-handler.ts
rename to src/ui/handlers/battle-message-ui-handler.ts
index 2ecca06172b..72ccec735aa 100644
--- a/src/ui/battle-message-ui-handler.ts
+++ b/src/ui/handlers/battle-message-ui-handler.ts
@@ -3,7 +3,7 @@ import { Button } from "#enums/buttons";
 import { getStatKey, PERMANENT_STATS } from "#enums/stat";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import { MessageUiHandler } from "#ui/message-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import i18next from "i18next";
@@ -245,7 +245,6 @@ export class BattleMessageUiHandler extends MessageUiHandler {
   getIvDescriptor(value: number, typeIv: number, pokemonId: number): string {
     const starterSpecies = globalScene.getPokemonById(pokemonId)!.species.getRootSpeciesId(); // we are using getRootSpeciesId() here because we want to check against the baby form, not the mid form if it exists
     const starterIvs: number[] = globalScene.gameData.dexData[starterSpecies].ivs;
-    const uiTheme = globalScene.uiTheme; // Assuming uiTheme is accessible
 
     // Function to wrap text in color based on comparison
     const coloredText = (text: string, isBetter: boolean, ivValue) => {
@@ -259,8 +258,8 @@ export class BattleMessageUiHandler extends MessageUiHandler {
       } else {
         textStyle = TextStyle.WINDOW;
       }
-      const color = getTextColor(textStyle, false, uiTheme);
-      return `[color=${color}][shadow=${getTextColor(textStyle, true, uiTheme)}]${text}[/shadow][/color]`;
+      const color = getTextColor(textStyle, false);
+      return `[color=${color}][shadow=${getTextColor(textStyle, true)}]${text}[/shadow][/color]`;
     };
 
     if (value > 30) {
diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/handlers/challenges-select-ui-handler.ts
similarity index 99%
rename from src/ui/challenges-select-ui-handler.ts
rename to src/ui/handlers/challenges-select-ui-handler.ts
index b37ddcc6a5f..b7cdd16efe0 100644
--- a/src/ui/challenges-select-ui-handler.ts
+++ b/src/ui/handlers/challenges-select-ui-handler.ts
@@ -5,8 +5,8 @@ import { Challenges } from "#enums/challenges";
 import { Color, ShadowColor } from "#enums/color";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
 import { getLocalizedSpriteKey } from "#utils/common";
 import i18next from "i18next";
@@ -383,14 +383,14 @@ export class GameChallengesUiHandler extends UiHandler {
         this.updateChallengeArrows(this.startCursor.visible);
       } else {
         globalScene.phaseManager.toTitleScreen();
-        globalScene.phaseManager.getCurrentPhase()?.end();
+        globalScene.phaseManager.getCurrentPhase().end();
       }
       success = true;
     } else if (button === Button.SUBMIT || button === Button.ACTION) {
       if (this.hasSelectedChallenge) {
         if (this.startCursor.visible) {
           globalScene.phaseManager.unshiftNew("SelectStarterPhase");
-          globalScene.phaseManager.getCurrentPhase()?.end();
+          globalScene.phaseManager.getCurrentPhase().end();
         } else {
           this.startCursor.setVisible(true);
           this.cursorObj?.setVisible(false);
diff --git a/src/ui/change-password-form-ui-handler.ts b/src/ui/handlers/change-password-form-ui-handler.ts
similarity index 94%
rename from src/ui/change-password-form-ui-handler.ts
rename to src/ui/handlers/change-password-form-ui-handler.ts
index eccc67ffb04..f4fdf349978 100644
--- a/src/ui/change-password-form-ui-handler.ts
+++ b/src/ui/handlers/change-password-form-ui-handler.ts
@@ -1,9 +1,9 @@
 import { globalScene } from "#app/global-scene";
 import { pokerogueApi } from "#app/plugins/api/pokerogue-api";
 import { UiMode } from "#enums/ui-mode";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
 import i18next from "i18next";
 
 export class ChangePasswordFormUiHandler extends FormModalUiHandler {
diff --git a/src/ui/command-ui-handler.ts b/src/ui/handlers/command-ui-handler.ts
similarity index 98%
rename from src/ui/command-ui-handler.ts
rename to src/ui/handlers/command-ui-handler.ts
index b702bcd0803..a1219a8fb31 100644
--- a/src/ui/command-ui-handler.ts
+++ b/src/ui/handlers/command-ui-handler.ts
@@ -9,9 +9,9 @@ import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 import { TerastallizeAccessModifier } from "#modifiers/modifier";
 import type { CommandPhase } from "#phases/command-phase";
-import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import i18next from "i18next";
 
 export class CommandUiHandler extends UiHandler {
diff --git a/src/ui/confirm-ui-handler.ts b/src/ui/handlers/confirm-ui-handler.ts
similarity index 95%
rename from src/ui/confirm-ui-handler.ts
rename to src/ui/handlers/confirm-ui-handler.ts
index 529d1bd8bbb..f1bd70e272a 100644
--- a/src/ui/confirm-ui-handler.ts
+++ b/src/ui/handlers/confirm-ui-handler.ts
@@ -1,8 +1,8 @@
 import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
-import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
-import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler";
+import { AbstractOptionSelectUiHandler } from "#ui/handlers/abstract-option-select-ui-handler";
 import i18next from "i18next";
 
 export class ConfirmUiHandler extends AbstractOptionSelectUiHandler {
diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/handlers/egg-gacha-ui-handler.ts
similarity index 99%
rename from src/ui/egg-gacha-ui-handler.ts
rename to src/ui/handlers/egg-gacha-ui-handler.ts
index e54ee445aee..b7884d8653a 100644
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/handlers/egg-gacha-ui-handler.ts
@@ -9,7 +9,7 @@ import { GachaType } from "#enums/gacha-types";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 import { getVoucherTypeIcon, VoucherType } from "#system/voucher";
-import { MessageUiHandler } from "#ui/message-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { addTextObject, getEggTierTextTint, getTextStyleOptions } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, randSeedShuffle } from "#utils/common";
@@ -170,7 +170,7 @@ export class EggGachaUiHandler extends MessageUiHandler {
 
   setup() {
     this.gachaCursor = 0;
-    this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
+    this.scale = getTextStyleOptions(TextStyle.WINDOW).scale;
 
     const ui = this.getUi();
 
diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/handlers/egg-hatch-scene-handler.ts
similarity index 93%
rename from src/ui/egg-hatch-scene-handler.ts
rename to src/ui/handlers/egg-hatch-scene-handler.ts
index 6536ef2af80..b7b5b78641f 100644
--- a/src/ui/egg-hatch-scene-handler.ts
+++ b/src/ui/handlers/egg-hatch-scene-handler.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
-import { UiHandler } from "#ui/ui-handler";
+import { UiHandler } from "#ui/handlers/ui-handler";
 
 export class EggHatchSceneHandler extends UiHandler {
   public eggHatchContainer: Phaser.GameObjects.Container;
@@ -45,7 +45,7 @@ export class EggHatchSceneHandler extends UiHandler {
   processInput(button: Button): boolean {
     if (button === Button.ACTION || button === Button.CANCEL) {
       const phase = globalScene.phaseManager.getCurrentPhase();
-      if (phase?.is("EggHatchPhase") && phase.trySkip()) {
+      if (phase.is("EggHatchPhase") && phase.trySkip()) {
         return true;
       }
     }
diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/handlers/egg-list-ui-handler.ts
similarity index 96%
rename from src/ui/egg-list-ui-handler.ts
rename to src/ui/handlers/egg-list-ui-handler.ts
index 2516903f631..2161073e6b1 100644
--- a/src/ui/egg-list-ui-handler.ts
+++ b/src/ui/handlers/egg-list-ui-handler.ts
@@ -2,10 +2,10 @@ import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
-import { ScrollBar } from "#ui/scroll-bar";
-import { ScrollableGridUiHandler } from "#ui/scrollable-grid-handler";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
+import { ScrollableGridUiHandler } from "#ui/handlers/scrollable-grid-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import i18next from "i18next";
diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/handlers/egg-summary-ui-handler.ts
similarity index 95%
rename from src/ui/egg-summary-ui-handler.ts
rename to src/ui/handlers/egg-summary-ui-handler.ts
index c66075dd910..ebf1a01b2c2 100644
--- a/src/ui/egg-summary-ui-handler.ts
+++ b/src/ui/handlers/egg-summary-ui-handler.ts
@@ -3,12 +3,12 @@ import { getEggTierForSpecies } from "#data/egg";
 import type { EggHatchData } from "#data/egg-hatch-data";
 import { Button } from "#enums/buttons";
 import { UiMode } from "#enums/ui-mode";
-import { HatchedPokemonContainer } from "#ui/hatched-pokemon-container";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { PokemonHatchInfoContainer } from "#ui/pokemon-hatch-info-container";
-import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
-import { ScrollBar } from "#ui/scroll-bar";
-import { ScrollableGridUiHandler } from "#ui/scrollable-grid-handler";
+import { HatchedPokemonContainer } from "#ui/containers/hatched-pokemon-container";
+import { PokemonHatchInfoContainer } from "#ui/containers/pokemon-hatch-info-container";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
+import { ScrollableGridUiHandler } from "#ui/handlers/scrollable-grid-handler";
 
 const iconContainerX = 112;
 const iconContainerY = 9;
@@ -222,7 +222,7 @@ export class EggSummaryUiHandler extends MessageUiHandler {
     if (button === Button.CANCEL) {
       if (!this.blockExit) {
         const phase = globalScene.phaseManager.getCurrentPhase();
-        if (phase?.is("EggSummaryPhase")) {
+        if (phase.is("EggSummaryPhase")) {
           phase.end();
         }
         success = true;
diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/handlers/evolution-scene-handler.ts
similarity index 97%
rename from src/ui/evolution-scene-handler.ts
rename to src/ui/handlers/evolution-scene-handler.ts
index 0333594dc36..987a64b5333 100644
--- a/src/ui/evolution-scene-handler.ts
+++ b/src/ui/handlers/evolution-scene-handler.ts
@@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import { MessageUiHandler } from "#ui/message-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { addTextObject } from "#ui/text";
 
 export class EvolutionSceneHandler extends MessageUiHandler {
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/handlers/fight-ui-handler.ts
similarity index 97%
rename from src/ui/fight-ui-handler.ts
rename to src/ui/handlers/fight-ui-handler.ts
index 1d856079939..74e5888fa68 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/handlers/fight-ui-handler.ts
@@ -12,9 +12,9 @@ import { UiMode } from "#enums/ui-mode";
 import type { EnemyPokemon, Pokemon } from "#field/pokemon";
 import type { PokemonMove } from "#moves/pokemon-move";
 import type { CommandPhase } from "#phases/command-phase";
-import { MoveInfoOverlay } from "#ui/move-info-overlay";
-import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
+import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
+import { UiHandler } from "#ui/handlers/ui-handler";
+import { addTextObject, getTextColor } from "#ui/text";
 import { fixedInt, getLocalizedSpriteKey, padInt } from "#utils/common";
 import i18next from "i18next";
 
@@ -284,7 +284,7 @@ export class FightUiHandler extends UiHandler implements InfoToggle {
     const ppColorStyle = FightUiHandler.ppRatioToColor(pp / maxPP);
 
     // Changes the text color and shadow according to the determined TextStyle
-    this.ppText.setColor(this.getTextColor(ppColorStyle, false)).setShadowColor(this.getTextColor(ppColorStyle, true));
+    this.ppText.setColor(getTextColor(ppColorStyle, false)).setShadowColor(getTextColor(ppColorStyle, true));
     this.moveInfoOverlay.show(pokemonMove.getMove());
 
     pokemon.getOpponents().forEach(opponent => {
diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/handlers/form-modal-ui-handler.ts
similarity index 94%
rename from src/ui/form-modal-ui-handler.ts
rename to src/ui/handlers/form-modal-ui-handler.ts
index c6ef8705aa8..5a687d658c6 100644
--- a/src/ui/form-modal-ui-handler.ts
+++ b/src/ui/handlers/form-modal-ui-handler.ts
@@ -2,9 +2,9 @@ import { globalScene } from "#app/global-scene";
 import { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
-import type { ModalConfig } from "#ui/modal-ui-handler";
-import { ModalUiHandler } from "#ui/modal-ui-handler";
-import { addTextInputObject, addTextObject } from "#ui/text";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
+import { ModalUiHandler } from "#ui/handlers/modal-ui-handler";
+import { addTextInputObject, addTextObject, getTextColor } from "#ui/text";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 import { fixedInt } from "#utils/common";
 import type InputText from "phaser3-rex-plugins/plugins/inputtext";
@@ -78,8 +78,8 @@ export abstract class FormModalUiHandler extends ModalUiHandler {
         wordWrap: { width: 850 },
       },
     );
-    this.errorMessage.setColor(this.getTextColor(TextStyle.SUMMARY_PINK));
-    this.errorMessage.setShadowColor(this.getTextColor(TextStyle.SUMMARY_PINK, true));
+    this.errorMessage.setColor(getTextColor(TextStyle.SUMMARY_PINK));
+    this.errorMessage.setShadowColor(getTextColor(TextStyle.SUMMARY_PINK, true));
     this.errorMessage.setVisible(false);
     this.modalContainer.add(this.errorMessage);
   }
diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/handlers/game-stats-ui-handler.ts
similarity index 99%
rename from src/ui/game-stats-ui-handler.ts
rename to src/ui/handlers/game-stats-ui-handler.ts
index be41e4d21b9..f961d5c18f1 100644
--- a/src/ui/game-stats-ui-handler.ts
+++ b/src/ui/handlers/game-stats-ui-handler.ts
@@ -7,8 +7,8 @@ import { PlayerGender } from "#enums/player-gender";
 import { TextStyle } from "#enums/text-style";
 import { UiTheme } from "#enums/ui-theme";
 import type { GameData } from "#system/game-data";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
 import { formatFancyLargeNumber, getPlayTimeString } from "#utils/common";
 import { toTitleCase } from "#utils/strings";
diff --git a/src/ui/loading-modal-ui-handler.ts b/src/ui/handlers/loading-modal-ui-handler.ts
similarity index 92%
rename from src/ui/loading-modal-ui-handler.ts
rename to src/ui/handlers/loading-modal-ui-handler.ts
index de00d911c47..9b401e17f91 100644
--- a/src/ui/loading-modal-ui-handler.ts
+++ b/src/ui/handlers/loading-modal-ui-handler.ts
@@ -1,6 +1,6 @@
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
-import { ModalUiHandler } from "#ui/modal-ui-handler";
+import { ModalUiHandler } from "#ui/handlers/modal-ui-handler";
 import { addTextObject } from "#ui/text";
 import i18next from "i18next";
 
diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/handlers/login-form-ui-handler.ts
similarity index 97%
rename from src/ui/login-form-ui-handler.ts
rename to src/ui/handlers/login-form-ui-handler.ts
index 0f55faba5c4..eaab2742897 100644
--- a/src/ui/login-form-ui-handler.ts
+++ b/src/ui/handlers/login-form-ui-handler.ts
@@ -2,10 +2,10 @@ import { pokerogueApi } from "#api/pokerogue-api";
 import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt } from "#utils/common";
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/handlers/menu-ui-handler.ts
similarity index 98%
rename from src/ui/menu-ui-handler.ts
rename to src/ui/handlers/menu-ui-handler.ts
index 4f6d6ede488..db74d127056 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/handlers/menu-ui-handler.ts
@@ -7,11 +7,10 @@ import { Button } from "#enums/buttons";
 import { GameDataType } from "#enums/game-data-type";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import type { OptionSelectConfig, OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { AdminMode, getAdminModeName } from "#ui/admin-ui-handler";
-import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
-import { BgmBar } from "#ui/bgm-bar";
-import { MessageUiHandler } from "#ui/message-ui-handler";
+import { BgmBar } from "#ui/containers/bgm-bar";
+import type { OptionSelectConfig, OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import type { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { addTextObject, getTextStyleOptions } from "#ui/text";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 import { fixedInt, isLocal, sessionIdKey } from "#utils/common";
@@ -20,6 +19,7 @@ import { getEnumValues } from "#utils/enums";
 import { toCamelCase } from "#utils/strings";
 import { isBeta } from "#utils/utility-vars";
 import i18next from "i18next";
+import { AdminMode, getAdminModeName } from "./admin-ui-handler";
 
 enum MenuOptions {
   GAME_SETTINGS,
@@ -126,7 +126,7 @@ export class MenuUiHandler extends MessageUiHandler {
     const ui = this.getUi();
     this.excludedMenus = () => [
       {
-        condition: !!globalScene.phaseManager.getCurrentPhase()?.is("SelectModifierPhase"),
+        condition: globalScene.phaseManager.getCurrentPhase().is("SelectModifierPhase"),
         options: [MenuOptions.EGG_GACHA],
       },
       { condition: bypassLogin, options: [MenuOptions.LOG_OUT] },
@@ -145,7 +145,7 @@ export class MenuUiHandler extends MessageUiHandler {
     );
     this.optionSelectText.setLineSpacing(12);
 
-    this.scale = getTextStyleOptions(TextStyle.WINDOW, globalScene.uiTheme).scale;
+    this.scale = getTextStyleOptions(TextStyle.WINDOW).scale;
     this.menuBg = addWindow(
       globalScene.scaledCanvas.width - (this.optionSelectText.displayWidth + 25),
       0,
diff --git a/src/ui/message-ui-handler.ts b/src/ui/handlers/message-ui-handler.ts
similarity index 99%
rename from src/ui/message-ui-handler.ts
rename to src/ui/handlers/message-ui-handler.ts
index 57f054c9bf9..262e716512c 100644
--- a/src/ui/message-ui-handler.ts
+++ b/src/ui/handlers/message-ui-handler.ts
@@ -1,6 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import type { UiMode } from "#enums/ui-mode";
-import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
+import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
 import { getFrameMs } from "#utils/common";
 
 export abstract class MessageUiHandler extends AwaitableUiHandler {
diff --git a/src/ui/modal-ui-handler.ts b/src/ui/handlers/modal-ui-handler.ts
similarity index 99%
rename from src/ui/modal-ui-handler.ts
rename to src/ui/handlers/modal-ui-handler.ts
index 51a6a21a29c..c11a694c1c9 100644
--- a/src/ui/modal-ui-handler.ts
+++ b/src/ui/handlers/modal-ui-handler.ts
@@ -2,8 +2,8 @@ import { globalScene } from "#app/global-scene";
 import type { Button } from "#enums/buttons";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 
 export interface ModalConfig {
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/handlers/modifier-select-ui-handler.ts
similarity index 98%
rename from src/ui/modifier-select-ui-handler.ts
rename to src/ui/handlers/modifier-select-ui-handler.ts
index a070b522050..09c849e7c04 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/handlers/modifier-select-ui-handler.ts
@@ -11,8 +11,8 @@ import { UiMode } from "#enums/ui-mode";
 import { HealShopCostModifier, LockModifierTiersModifier, PokemonHeldItemModifier } from "#modifiers/modifier";
 import type { ModifierTypeOption } from "#modifiers/modifier-type";
 import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "#modifiers/modifier-type";
-import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
-import { MoveInfoOverlay } from "#ui/move-info-overlay";
+import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
+import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
 import { addTextObject, getModifierTierTextTint, getTextColor, getTextStyleOptions } from "#ui/text";
 import { formatMoney, NumberHolder } from "#utils/common";
 import i18next from "i18next";
@@ -65,7 +65,7 @@ export class ModifierSelectUiHandler extends AwaitableUiHandler {
 
     const canvas = document.createElement("canvas");
     const context = canvas.getContext("2d");
-    const styleOptions = getTextStyleOptions(TextStyle.PARTY, globalScene.uiTheme).styleOptions;
+    const styleOptions = getTextStyleOptions(TextStyle.PARTY).styleOptions;
 
     if (context) {
       context.font = styleOptions.fontSize + "px " + styleOptions.fontFamily;
@@ -686,14 +686,14 @@ export class ModifierSelectUiHandler extends AwaitableUiHandler {
     const formattedMoney = formatMoney(globalScene.moneyFormat, this.rerollCost);
 
     this.rerollCostText.setText(i18next.t("modifierSelectUiHandler:rerollCost", { formattedMoney }));
-    this.rerollCostText.setColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
-    this.rerollCostText.setShadowColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED, true));
+    this.rerollCostText.setColor(getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
+    this.rerollCostText.setShadowColor(getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED, true));
   }
 
   updateLockRaritiesText(): void {
     const textStyle = globalScene.lockModifierTiers ? TextStyle.SUMMARY_BLUE : TextStyle.PARTY;
-    this.lockRarityButtonText.setColor(this.getTextColor(textStyle));
-    this.lockRarityButtonText.setShadowColor(this.getTextColor(textStyle, true));
+    this.lockRarityButtonText.setColor(getTextColor(textStyle));
+    this.lockRarityButtonText.setShadowColor(getTextColor(textStyle, true));
   }
 
   clear() {
@@ -1042,7 +1042,7 @@ class ModifierOption extends Phaser.GameObjects.Container {
     const formattedMoney = formatMoney(globalScene.moneyFormat, cost);
 
     this.itemCostText.setText(i18next.t("modifierSelectUiHandler:itemCost", { formattedMoney }));
-    this.itemCostText.setColor(getTextColor(textStyle, false, globalScene.uiTheme));
-    this.itemCostText.setShadowColor(getTextColor(textStyle, true, globalScene.uiTheme));
+    this.itemCostText.setColor(getTextColor(textStyle, false));
+    this.itemCostText.setShadowColor(getTextColor(textStyle, true));
   }
 }
diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/handlers/mystery-encounter-ui-handler.ts
similarity index 99%
rename from src/ui/mystery-encounter-ui-handler.ts
rename to src/ui/handlers/mystery-encounter-ui-handler.ts
index 37f77cf43b9..26d70088d77 100644
--- a/src/ui/mystery-encounter-ui-handler.ts
+++ b/src/ui/handlers/mystery-encounter-ui-handler.ts
@@ -9,9 +9,9 @@ import { getEncounterText } from "#mystery-encounters/encounter-dialogue-utils";
 import type { OptionSelectSettings } from "#mystery-encounters/encounter-phase-utils";
 import type { MysteryEncounterOption } from "#mystery-encounters/mystery-encounter-option";
 import type { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
-import { PartyUiMode } from "#ui/party-ui-handler";
+import { PartyUiMode } from "#ui/handlers/party-ui-handler";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addBBCodeTextObject, getBBCodeFrag } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow, WindowVariant } from "#ui/ui-theme";
 import { fixedInt, isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
diff --git a/src/ui/party-ui-handler.ts b/src/ui/handlers/party-ui-handler.ts
similarity index 95%
rename from src/ui/party-ui-handler.ts
rename to src/ui/handlers/party-ui-handler.ts
index a7c7a134488..60a6fd1104f 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/handlers/party-ui-handler.ts
@@ -21,9 +21,9 @@ import type { PokemonMove } from "#moves/pokemon-move";
 import type { CommandPhase } from "#phases/command-phase";
 import { getVariantTint } from "#sprites/variant";
 import type { TurnMove } from "#types/turn-move";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { MoveInfoOverlay } from "#ui/move-info-overlay";
-import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
+import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
 import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { applyChallenges } from "#utils/challenge-utils";
@@ -562,6 +562,9 @@ export class PartyUiHandler extends MessageUiHandler {
   private processModifierTransferModeInput(pokemon: PlayerPokemon) {
     const ui = this.getUi();
     const option = this.options[this.optionsCursor];
+    const allItems = this.getTransferrableItemsFromPokemon(pokemon);
+    // get the index of the "All" option.
+    const allCursorIndex = allItems.length;
 
     if (this.transferMode && option === PartyOption.TRANSFER) {
       return this.processTransferOption();
@@ -573,36 +576,62 @@ export class PartyUiHandler extends MessageUiHandler {
 
       let ableToTransferText: string;
       for (let p = 0; p < globalScene.getPlayerParty().length; p++) {
-        // this for look goes through each of the party pokemon
+        // this for loop goes through each of the party pokemon
         const newPokemon = globalScene.getPlayerParty()[p];
         // this next bit checks to see if the the selected item from the original transfer pokemon exists on the new pokemon `p`
         // this returns `undefined` if the new pokemon doesn't have the item at all, otherwise it returns the `pokemonHeldItemModifier` for that item
-        const matchingModifier = globalScene.findModifier(
-          m =>
-            m.is("PokemonHeldItemModifier") &&
-            m.pokemonId === newPokemon.id &&
-            m.matchType(this.getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor]),
-        ) as PokemonHeldItemModifier;
+        const matchingModifiers: (PokemonHeldItemModifier | undefined)[] = [];
+        if (this.transferOptionCursor === allCursorIndex) {
+          // if "All" is selected, check all items
+          for (const item of allItems) {
+            matchingModifiers.push(
+              globalScene.findModifier(
+                m => m.is("PokemonHeldItemModifier") && m.pokemonId === newPokemon.id && m.matchType(item),
+              ) as PokemonHeldItemModifier | undefined,
+            );
+          }
+        } else {
+          // otherwise only check the selected item
+          matchingModifiers.push(
+            globalScene.findModifier(
+              m =>
+                m.is("PokemonHeldItemModifier") &&
+                m.pokemonId === newPokemon.id &&
+                m.matchType(allItems[this.transferOptionCursor]),
+            ) as PokemonHeldItemModifier | undefined,
+          );
+        }
+        const hasMatchingModifier = matchingModifiers.some(m => m !== undefined); // checks if any items match
         const partySlot = this.partySlots.filter(m => m.getPokemon() === newPokemon)[0]; // this gets pokemon [p] for us
         if (p !== this.transferCursor) {
           // this skips adding the able/not able labels on the pokemon doing the transfer
-          if (matchingModifier) {
+          if (hasMatchingModifier) {
             // if matchingModifier exists then the item exists on the new pokemon
-            if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) {
-              // checks to see if the stack of items is at max stack; if so, set the description label to "Not able"
-              ableToTransferText = i18next.t("partyUiHandler:notAble");
-            } else {
-              // if the pokemon isn't at max stack, make the label "Able"
-              ableToTransferText = i18next.t("partyUiHandler:able");
+            ableToTransferText = i18next.t("partyUiHandler:notAble"); // start with not able
+            /**
+             * The amount of items that can be transferred in the `All` option
+             */
+            let ableAmount = 0;
+            for (const modifier of matchingModifiers) {
+              if (!modifier || modifier.getCountUnderMax() > 0) {
+                // if the modifier doesn't exist, or the stack count isn't at max, then we can transfer at least 1 stack
+                ableToTransferText = i18next.t("partyUiHandler:able");
+                ableAmount++;
+              }
             }
+            // only show the amount if an item can be transferred and there are multiple items
+            ableToTransferText += ableAmount && matchingModifiers.length > 1 ? ` (${ableAmount})` : "";
           } else {
-            // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able"
+            // if no item matches, that means the pokemon doesn't have any of the item, and we need to show "Able"
             ableToTransferText = i18next.t("partyUiHandler:able");
+            // only show the amount if there are multiple items
+            ableToTransferText += matchingModifiers.length > 1 ? ` (${matchingModifiers.length})` : "";
           }
         } else {
           // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text
           ableToTransferText = "";
         }
+        partySlot.slotHpLabel.setVisible(false);
         partySlot.slotHpBar.setVisible(false);
         partySlot.slotHpOverlay.setVisible(false);
         partySlot.slotHpText.setVisible(false);
@@ -834,7 +863,7 @@ export class PartyUiHandler extends MessageUiHandler {
     // TODO: This risks hitting the other options (.MOVE_i and ALL) so does it? Do we need an extra check?
     if (
       option >= PartyOption.FORM_CHANGE_ITEM &&
-      globalScene.phaseManager.getCurrentPhase()?.is("SelectModifierPhase") &&
+      globalScene.phaseManager.getCurrentPhase().is("SelectModifierPhase") &&
       this.partyUiMode === PartyUiMode.CHECK
     ) {
       const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon);
@@ -1528,7 +1557,7 @@ export class PartyUiHandler extends MessageUiHandler {
         break;
       case PartyUiMode.CHECK:
         this.addCommonOptions(pokemon);
-        if (globalScene.phaseManager.getCurrentPhase()?.is("SelectModifierPhase")) {
+        if (globalScene.phaseManager.getCurrentPhase().is("SelectModifierPhase")) {
           const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon);
           for (let i = 0; i < formChangeItemModifiers.length; i++) {
             this.options.push(PartyOption.FORM_CHANGE_ITEM + i);
@@ -1645,6 +1674,8 @@ export class PartyUiHandler extends MessageUiHandler {
           .find(plm => plm[1] === move);
       } else if (option === PartyOption.ALL) {
         optionName = i18next.t("partyUiHandler:all");
+        // add the number of items to the `all` option
+        optionName += ` (${this.getTransferrableItemsFromPokemon(pokemon).length})`;
       } else {
         const itemModifiers = this.getItemModifiers(pokemon);
         const itemModifier = itemModifiers[option];
@@ -1708,6 +1739,7 @@ export class PartyUiHandler extends MessageUiHandler {
     this.partySlots[this.transferCursor].setTransfer(false);
     for (let i = 0; i < this.partySlots.length; i++) {
       this.partySlots[i].slotDescriptionLabel.setVisible(false);
+      this.partySlots[i].slotHpLabel.setVisible(true);
       this.partySlots[i].slotHpBar.setVisible(true);
       this.partySlots[i].slotHpOverlay.setVisible(true);
       this.partySlots[i].slotHpText.setVisible(true);
@@ -1860,6 +1892,7 @@ class PartySlot extends Phaser.GameObjects.Container {
   private slotBg: Phaser.GameObjects.Image;
   private slotPb: Phaser.GameObjects.Sprite;
   public slotName: Phaser.GameObjects.Text;
+  public slotHpLabel: Phaser.GameObjects.Image;
   public slotHpBar: Phaser.GameObjects.Image;
   public slotHpOverlay: Phaser.GameObjects.Sprite;
   public slotHpText: Phaser.GameObjects.Text;
@@ -2012,7 +2045,7 @@ class PartySlot extends Phaser.GameObjects.Container {
     this.slotName.setOrigin(0);
 
     const slotLevelLabel = globalScene.add
-      .image(0, 0, "party_slot_overlay_lv")
+      .image(0, 0, getLocalizedSpriteKey("party_slot_overlay_lv"))
       .setPositionRelative(this.slotBg, levelLabelPosition.x, levelLabelPosition.y)
       .setOrigin(0);
 
@@ -2074,6 +2107,12 @@ class PartySlot extends Phaser.GameObjects.Container {
       }
     }
 
+    this.slotHpLabel = globalScene.add
+      .image(0, 0, getLocalizedSpriteKey("party_slot_overlay_hp"))
+      .setOrigin(1, 0)
+      .setVisible(false)
+      .setPositionRelative(this.slotBg, hpBarPosition.x + 15, hpBarPosition.y);
+
     this.slotHpBar = globalScene.add
       .image(0, 0, "party_slot_hp_bar")
       .setOrigin(0)
@@ -2103,14 +2142,22 @@ class PartySlot extends Phaser.GameObjects.Container {
       .setVisible(false)
       .setPositionRelative(this.slotBg, descriptionLabelPosition.x, descriptionLabelPosition.y);
 
-    slotInfoContainer.add([this.slotHpBar, this.slotHpOverlay, this.slotHpText, this.slotDescriptionLabel]);
+    slotInfoContainer.add([
+      this.slotHpLabel,
+      this.slotHpBar,
+      this.slotHpOverlay,
+      this.slotHpText,
+      this.slotDescriptionLabel,
+    ]);
 
     if (partyUiMode !== PartyUiMode.TM_MODIFIER) {
       this.slotDescriptionLabel.setVisible(false);
+      this.slotHpLabel.setVisible(true);
       this.slotHpBar.setVisible(true);
       this.slotHpOverlay.setVisible(true);
       this.slotHpText.setVisible(true);
     } else {
+      this.slotHpLabel.setVisible(false);
       this.slotHpBar.setVisible(false);
       this.slotHpOverlay.setVisible(false);
       this.slotHpText.setVisible(false);
diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/handlers/pokedex-scan-ui-handler.ts
similarity index 93%
rename from src/ui/pokedex-scan-ui-handler.ts
rename to src/ui/handlers/pokedex-scan-ui-handler.ts
index 9be7a903dec..c241616ae71 100644
--- a/src/ui/pokedex-scan-ui-handler.ts
+++ b/src/ui/handlers/pokedex-scan-ui-handler.ts
@@ -1,11 +1,11 @@
 import { allAbilities, allMoves, allSpecies } from "#data/data-lists";
 import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { FilterTextRow } from "#ui/filter-text";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import { FilterTextRow } from "#ui/containers/filter-text";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
 import { isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/handlers/pokedex-ui-handler.ts
similarity index 99%
rename from src/ui/pokedex-ui-handler.ts
rename to src/ui/handlers/pokedex-ui-handler.ts
index 01046bfef9c..0550353233c 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/handlers/pokedex-ui-handler.ts
@@ -28,20 +28,28 @@ import { PokemonType } from "#enums/pokemon-type";
 import type { SpeciesId } from "#enums/species-id";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
+import { UiTheme } from "#enums/ui-theme";
 import type { Variant } from "#sprites/variant";
 import { getVariantIcon, getVariantTint } from "#sprites/variant";
 import type { DexAttrProps, StarterAttributes } from "#system/game-data";
 import { SettingKeyboard } from "#system/settings-keyboard";
 import type { DexEntry } from "#types/dex-data";
-import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
-import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown";
-import { FilterBar } from "#ui/filter-bar";
-import { FilterText, FilterTextRow } from "#ui/filter-text";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { PokedexMonContainer } from "#ui/pokedex-mon-container";
-import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
-import { ScrollBar } from "#ui/scroll-bar";
-import { addTextObject } from "#ui/text";
+import {
+  DropDown,
+  DropDownLabel,
+  DropDownOption,
+  DropDownState,
+  DropDownType,
+  SortCriteria,
+} from "#ui/containers/dropdown";
+import { FilterBar } from "#ui/containers/filter-bar";
+import { FilterText, FilterTextRow } from "#ui/containers/filter-text";
+import { PokedexMonContainer } from "#ui/containers/pokedex-mon-container";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
+import { addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { BooleanHolder, fixedInt, getLocalizedSpriteKey, padInt, randIntRange, rgbHexToRgba } from "#utils/common";
 import type { StarterPreferences } from "#utils/data";
@@ -470,7 +478,7 @@ export class PokedexUiHandler extends MessageUiHandler {
     // Offset the generation filter dropdown to avoid covering the filtered pokemon
     this.filterBar.offsetHybridFilters();
 
-    if (!globalScene.uiTheme) {
+    if (globalScene.uiTheme === UiTheme.DEFAULT) {
       pokemonContainerWindow.setVisible(false);
     }
 
@@ -2314,8 +2322,8 @@ export class PokedexUiHandler extends MessageUiHandler {
         break;
     }
     if (baseStarterValue - starterValue > 0) {
-      starter.label.setColor(this.getTextColor(textStyle));
-      starter.label.setShadowColor(this.getTextColor(textStyle, true));
+      starter.label.setColor(getTextColor(textStyle));
+      starter.label.setShadowColor(getTextColor(textStyle, true));
     }
   }
 
diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/handlers/pokemon-icon-anim-handler.ts
similarity index 100%
rename from src/ui/pokemon-icon-anim-handler.ts
rename to src/ui/handlers/pokemon-icon-anim-handler.ts
diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/handlers/registration-form-ui-handler.ts
similarity index 94%
rename from src/ui/registration-form-ui-handler.ts
rename to src/ui/handlers/registration-form-ui-handler.ts
index 2c8080d534d..d424e44b455 100644
--- a/src/ui/registration-form-ui-handler.ts
+++ b/src/ui/handlers/registration-form-ui-handler.ts
@@ -2,9 +2,9 @@ import { pokerogueApi } from "#api/pokerogue-api";
 import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
 import { addTextObject } from "#ui/text";
 import i18next from "i18next";
 
diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/handlers/rename-form-ui-handler.ts
similarity index 87%
rename from src/ui/rename-form-ui-handler.ts
rename to src/ui/handlers/rename-form-ui-handler.ts
index 9da5b0e8554..f1d9ae3c981 100644
--- a/src/ui/rename-form-ui-handler.ts
+++ b/src/ui/handlers/rename-form-ui-handler.ts
@@ -1,7 +1,7 @@
 import type { PlayerPokemon } from "#field/pokemon";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
 import i18next from "i18next";
 
 export class RenameFormUiHandler extends FormModalUiHandler {
diff --git a/src/ui/rename-run-ui-handler.ts b/src/ui/handlers/rename-run-ui-handler.ts
similarity index 91%
rename from src/ui/rename-run-ui-handler.ts
rename to src/ui/handlers/rename-run-ui-handler.ts
index a94b7b08fb9..08c52cfed5b 100644
--- a/src/ui/rename-run-ui-handler.ts
+++ b/src/ui/handlers/rename-run-ui-handler.ts
@@ -1,6 +1,5 @@
 import i18next from "i18next";
-import type { InputFieldConfig } from "./form-modal-ui-handler";
-import { FormModalUiHandler } from "./form-modal-ui-handler";
+import { FormModalUiHandler, type InputFieldConfig } from "./form-modal-ui-handler";
 import type { ModalConfig } from "./modal-ui-handler";
 
 export class RenameRunFormUiHandler extends FormModalUiHandler {
diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/handlers/run-history-ui-handler.ts
similarity index 99%
rename from src/ui/run-history-ui-handler.ts
rename to src/ui/handlers/run-history-ui-handler.ts
index 6f4d9024832..db5a8eac7bd 100644
--- a/src/ui/run-history-ui-handler.ts
+++ b/src/ui/handlers/run-history-ui-handler.ts
@@ -8,8 +8,8 @@ import { TrainerVariant } from "#enums/trainer-variant";
 import { UiMode } from "#enums/ui-mode";
 import type { RunEntry } from "#system/game-data";
 import type { PokemonData } from "#system/pokemon-data";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { RunDisplayMode } from "#ui/run-info-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { RunDisplayMode } from "#ui/handlers/run-info-ui-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, formatLargeNumber } from "#utils/common";
diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/handlers/run-info-ui-handler.ts
similarity index 99%
rename from src/ui/run-info-ui-handler.ts
rename to src/ui/handlers/run-info-ui-handler.ts
index 5fc0f37c72d..42fef26ec6d 100644
--- a/src/ui/run-info-ui-handler.ts
+++ b/src/ui/handlers/run-info-ui-handler.ts
@@ -22,8 +22,8 @@ import { getVariantTint } from "#sprites/variant";
 import type { SessionSaveData } from "#system/game-data";
 import type { PokemonData } from "#system/pokemon-data";
 import { SettingKeyboard } from "#system/settings-keyboard";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
 import { formatFancyLargeNumber, formatLargeNumber, formatMoney, getPlayTimeString } from "#utils/common";
 import { toCamelCase } from "#utils/strings";
@@ -618,7 +618,7 @@ export class RunInfoUiHandler extends UiHandler {
     const runTime = getPlayTimeString(this.runInfo.playTime);
     runInfoText.appendText(`${i18next.t("runHistory:runLength")}: ${runTime}`, false);
     const runMoney = formatMoney(globalScene.moneyFormat, this.runInfo.money);
-    const moneyTextColor = getTextColor(TextStyle.MONEY_WINDOW, false, globalScene.uiTheme);
+    const moneyTextColor = getTextColor(TextStyle.MONEY_WINDOW, false);
     runInfoText.appendText(
       `[color=${moneyTextColor}]${i18next.t("battleScene:moneyOwned", { formattedMoney: runMoney })}[/color]`,
     );
diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/handlers/save-slot-select-ui-handler.ts
similarity index 99%
rename from src/ui/save-slot-select-ui-handler.ts
rename to src/ui/handlers/save-slot-select-ui-handler.ts
index 97cd3016479..7c86a3e8d5b 100644
--- a/src/ui/save-slot-select-ui-handler.ts
+++ b/src/ui/handlers/save-slot-select-ui-handler.ts
@@ -8,9 +8,9 @@ import { UiMode } from "#enums/ui-mode";
 import * as Modifier from "#modifiers/modifier";
 import type { SessionSaveData } from "#system/game-data";
 import type { PokemonData } from "#system/pokemon-data";
-import type { OptionSelectConfig } from "#ui/abstract-option-select-ui-handler";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { RunDisplayMode } from "#ui/run-info-ui-handler";
+import type { OptionSelectConfig } from "#ui/handlers/abstract-option-select-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { RunDisplayMode } from "#ui/handlers/run-info-ui-handler";
 import { addTextObject } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { fixedInt, formatLargeNumber, getPlayTimeString, isNullOrUndefined } from "#utils/common";
diff --git a/src/ui/scrollable-grid-handler.ts b/src/ui/handlers/scrollable-grid-handler.ts
similarity index 98%
rename from src/ui/scrollable-grid-handler.ts
rename to src/ui/handlers/scrollable-grid-handler.ts
index 3c6458f5083..12bbaa32e98 100644
--- a/src/ui/scrollable-grid-handler.ts
+++ b/src/ui/handlers/scrollable-grid-handler.ts
@@ -1,6 +1,6 @@
 import { Button } from "#enums/buttons";
-import type { ScrollBar } from "#ui/scroll-bar";
-import type { UiHandler } from "#ui/ui-handler";
+import type { ScrollBar } from "#ui/containers/scroll-bar";
+import type { UiHandler } from "#ui/handlers/ui-handler";
 
 type UpdateGridCallbackFunction = () => void;
 type UpdateDetailsCallbackFunction = (index: number) => void;
diff --git a/src/ui/session-reload-modal-ui-handler.ts b/src/ui/handlers/session-reload-modal-ui-handler.ts
similarity index 88%
rename from src/ui/session-reload-modal-ui-handler.ts
rename to src/ui/handlers/session-reload-modal-ui-handler.ts
index 1f5a205f990..33c18b1974a 100644
--- a/src/ui/session-reload-modal-ui-handler.ts
+++ b/src/ui/handlers/session-reload-modal-ui-handler.ts
@@ -1,7 +1,7 @@
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
-import type { ModalConfig } from "#ui/modal-ui-handler";
-import { ModalUiHandler } from "#ui/modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
+import { ModalUiHandler } from "#ui/handlers/modal-ui-handler";
 import { addTextObject } from "#ui/text";
 
 export class SessionReloadModalUiHandler extends ModalUiHandler {
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts
similarity index 98%
rename from src/ui/starter-select-ui-handler.ts
rename to src/ui/handlers/starter-select-ui-handler.ts
index c3214fa5420..41697d9d79d 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/handlers/starter-select-ui-handler.ts
@@ -40,6 +40,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
+import { UiTheme } from "#enums/ui-theme";
 import type { CandyUpgradeNotificationChangedEvent } from "#events/battle-scene";
 import { BattleSceneEventType } from "#events/battle-scene";
 import type { Variant } from "#sprites/variant";
@@ -49,16 +50,23 @@ import type { DexAttrProps, StarterAttributes, StarterDataEntry, StarterMoveset
 import { RibbonData } from "#system/ribbons/ribbon-data";
 import { SettingKeyboard } from "#system/settings-keyboard";
 import type { DexEntry } from "#types/dex-data";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown";
-import { FilterBar } from "#ui/filter-bar";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { MoveInfoOverlay } from "#ui/move-info-overlay";
-import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-handler";
-import { ScrollBar } from "#ui/scroll-bar";
-import { StarterContainer } from "#ui/starter-container";
-import { StatsContainer } from "#ui/stats-container";
-import { addBBCodeTextObject, addTextObject } from "#ui/text";
+import {
+  DropDown,
+  DropDownLabel,
+  DropDownOption,
+  DropDownState,
+  DropDownType,
+  SortCriteria,
+} from "#ui/containers/dropdown";
+import { FilterBar } from "#ui/containers/filter-bar";
+import { MoveInfoOverlay } from "#ui/containers/move-info-overlay";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import { StarterContainer } from "#ui/containers/starter-container";
+import { StatsContainer } from "#ui/containers/stats-container";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { PokemonIconAnimHandler, PokemonIconAnimMode } from "#ui/handlers/pokemon-icon-anim-handler";
+import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { applyChallenges, checkStarterValidForChallenge } from "#utils/challenge-utils";
 import {
@@ -339,7 +347,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
   private teraLabel: Phaser.GameObjects.Text;
   private goFilterLabel: Phaser.GameObjects.Text;
   /** Group holding the UI elements appearing in the instructionsContainer */
-  /* TODO: Uncomment this once our testing infra supports mocks of `Phaser.GameObject.Group` 
+  /* TODO: Uncomment this once our testing infra supports mocks of `Phaser.GameObject.Group`
   private instructionElemGroup: Phaser.GameObjects.Group;
   */
 
@@ -432,8 +440,15 @@ export class StarterSelectUiHandler extends MessageUiHandler {
 
     const bgColor = globalScene.add.rectangle(0, 0, sWidth, sHeight, 0x006860).setOrigin(0);
 
+    const starterDexNoLabel = globalScene.add
+      .image(6, 14, getLocalizedSpriteKey("summary_dexnb_label"))
+      .setOrigin(0, 1); // Pixel text 'No'
+
     const starterSelectBg = globalScene.add.image(0, 0, "starter_select_bg").setOrigin(0);
-    this.shinyOverlay = globalScene.add.image(6, 6, "summary_overlay_shiny").setOrigin(0).setVisible(false);
+    this.shinyOverlay = globalScene.add
+      .image(6, 111, getLocalizedSpriteKey("summary_dexnb_label_overlay_shiny"))
+      .setOrigin(0, 1)
+      .setVisible(false); // Pixel text 'No' shiny
 
     const starterContainerWindow = addWindow(speciesContainerX, filterBarHeight + 1, 175, 161);
     const starterContainerBg = globalScene.add
@@ -592,7 +607,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     // Offset the generation filter dropdown to avoid covering the filtered pokemon
     this.filterBar.offsetHybridFilters();
 
-    if (!globalScene.uiTheme) {
+    if (globalScene.uiTheme === UiTheme.DEFAULT) {
       starterContainerWindow.setVisible(false);
     }
 
@@ -1070,6 +1085,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     this.starterSelectContainer.add([
       bgColor,
       starterSelectBg,
+      starterDexNoLabel,
       this.shinyOverlay,
       starterContainerBg,
       addWindow(
@@ -1610,6 +1626,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
       if (!this.filterMode) {
         this.startCursorObj.setVisible(false);
         this.starterIconsCursorObj.setVisible(false);
+        this.randomCursorObj.setVisible(false);
         this.setSpecies(null);
         this.filterBarCursor = 0;
         this.setFilterMode(true);
@@ -2057,7 +2074,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
                     options: natures
                       .map((n: Nature, _i: number) => {
                         const option: OptionSelectItem = {
-                          label: getNatureName(n, true, true, true, globalScene.uiTheme),
+                          label: getNatureName(n, true, true, true),
                           handler: () => {
                             starterAttributes.nature = n;
                             originalStarterAttributes.nature = starterAttributes.nature;
@@ -3901,10 +3918,10 @@ export class StarterSelectUiHandler extends MessageUiHandler {
 
       this.shinyOverlay.setVisible(shiny ?? false); // TODO: is false the correct default?
       this.pokemonNumberText.setColor(
-        this.getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, false),
+        getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, false),
       );
       this.pokemonNumberText.setShadowColor(
-        this.getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, true),
+        getTextColor(shiny ? TextStyle.SUMMARY_DEX_NUM_GOLD : TextStyle.SUMMARY_DEX_NUM, true),
       );
 
       if (forSeen ? this.speciesStarterDexEntry?.seenAttr : this.speciesStarterDexEntry?.caughtAttr) {
@@ -4013,8 +4030,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         const isHidden = abilityIndex === (this.lastSpecies.ability2 ? 2 : 1);
         this.pokemonAbilityText
           .setText(ability.name)
-          .setColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD))
-          .setShadowColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true));
+          .setColor(getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD))
+          .setShadowColor(getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD, true));
 
         const passiveAttr = starterDataEntry.passiveAttr;
         const passiveAbility = allAbilities[this.lastSpecies.getPassiveAbility(formIndex)];
@@ -4043,14 +4060,14 @@ export class StarterSelectUiHandler extends MessageUiHandler {
 
           this.pokemonPassiveLabelText
             .setVisible(!isFreshStartChallenge)
-            .setColor(this.getTextColor(TextStyle.SUMMARY_ALT))
-            .setShadowColor(this.getTextColor(TextStyle.SUMMARY_ALT, true));
+            .setColor(getTextColor(TextStyle.SUMMARY_ALT))
+            .setShadowColor(getTextColor(TextStyle.SUMMARY_ALT, true));
           this.pokemonPassiveText
             .setVisible(!isFreshStartChallenge)
             .setText(passiveAbility.name)
-            .setColor(this.getTextColor(textStyle))
+            .setColor(getTextColor(textStyle))
             .setAlpha(textAlpha)
-            .setShadowColor(this.getTextColor(textStyle, true));
+            .setShadowColor(getTextColor(textStyle, true));
 
           if (this.activeTooltip === "PASSIVE") {
             globalScene.ui.editTooltip(`${passiveAbility.name}`, `${passiveAbility.description}`);
@@ -4082,9 +4099,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
           globalScene.ui.hideTooltip();
         }
 
-        this.pokemonNatureText.setText(
-          getNatureName(natureIndex as unknown as Nature, true, true, false, globalScene.uiTheme),
-        );
+        this.pokemonNatureText.setText(getNatureName(natureIndex as unknown as Nature, true, true, false));
 
         let levelMoves: LevelMoves;
         if (
@@ -4151,8 +4166,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     } else {
       this.shinyOverlay.setVisible(false);
       this.pokemonNumberText
-        .setColor(this.getTextColor(TextStyle.SUMMARY))
-        .setShadowColor(this.getTextColor(TextStyle.SUMMARY, true));
+        .setColor(getTextColor(TextStyle.SUMMARY))
+        .setShadowColor(getTextColor(TextStyle.SUMMARY, true));
       this.pokemonGenderText.setText("");
       this.pokemonAbilityText.setText("");
       this.pokemonPassiveText.setText("");
@@ -4294,7 +4309,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         textStyle = TextStyle.SUMMARY_GOLD;
         break;
     }
-    starter.label.setColor(this.getTextColor(textStyle)).setShadowColor(this.getTextColor(textStyle, true));
+    starter.label.setColor(getTextColor(textStyle)).setShadowColor(getTextColor(textStyle, true));
   }
 
   tryUpdateValue(add?: number, addingToParty?: boolean): boolean {
@@ -4314,8 +4329,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     }
     this.valueLimitLabel
       .setText(`${newValueStr}/${valueLimit}`)
-      .setColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK))
-      .setShadowColor(this.getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true));
+      .setColor(getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK))
+      .setShadowColor(getTextColor(!overLimit ? TextStyle.TOOLTIP_CONTENT : TextStyle.SUMMARY_PINK, true));
     if (overLimit) {
       globalScene.time.delayedCall(fixedInt(500), () => this.tryUpdateValue());
       return false;
@@ -4412,7 +4427,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
             globalScene.phaseManager.pushNew("EncounterPhase");
           }
           this.clearText();
-          globalScene.phaseManager.getCurrentPhase()?.end();
+          globalScene.phaseManager.getCurrentPhase().end();
         },
         cancel,
         null,
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/handlers/summary-ui-handler.ts
similarity index 91%
rename from src/ui/summary-ui-handler.ts
rename to src/ui/handlers/summary-ui-handler.ts
index dfa70d1dc76..a1ae01b895b 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/handlers/summary-ui-handler.ts
@@ -25,8 +25,8 @@ import type { PokemonMove } from "#moves/pokemon-move";
 import type { Variant } from "#sprites/variant";
 import { getVariantTint } from "#sprites/variant";
 import { achvs } from "#system/achv";
-import { addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
+import { UiHandler } from "#ui/handlers/ui-handler";
+import { addBBCodeTextObject, addTextObject, getBBCodeFrag, getTextColor } from "#ui/text";
 import {
   fixedInt,
   formatStat,
@@ -68,6 +68,7 @@ export class SummaryUiHandler extends UiHandler {
   private summaryUiMode: SummaryUiMode;
 
   private summaryContainer: Phaser.GameObjects.Container;
+  private summaryContainerDexNoLabel: Phaser.GameObjects.Image;
   private tabSprite: Phaser.GameObjects.Sprite;
   private shinyOverlay: Phaser.GameObjects.Image;
   private numberText: Phaser.GameObjects.Text;
@@ -94,12 +95,15 @@ export class SummaryUiHandler extends UiHandler {
   private passiveContainer: abilityContainer;
   private summaryPageContainer: Phaser.GameObjects.Container;
   private movesContainer: Phaser.GameObjects.Container;
+  private movesContainerMovesTitle: Phaser.GameObjects.Image;
+  private movesContainerDescriptionsTitle: Phaser.GameObjects.Image;
   private moveDescriptionText: Phaser.GameObjects.Text;
   private moveCursorObj: Phaser.GameObjects.Sprite | null;
   private selectedMoveCursorObj: Phaser.GameObjects.Sprite | null;
   private moveRowsContainer: Phaser.GameObjects.Container;
   private extraMoveRowContainer: Phaser.GameObjects.Container;
   private moveEffectContainer: Phaser.GameObjects.Container;
+  private moveEffectContainerTitle: Phaser.GameObjects.Image;
   private movePowerText: Phaser.GameObjects.Text;
   private moveAccuracyText: Phaser.GameObjects.Text;
   private moveCategoryIcon: Phaser.GameObjects.Sprite;
@@ -111,6 +115,10 @@ export class SummaryUiHandler extends UiHandler {
   private permStatsContainer: Phaser.GameObjects.Container;
   private ivContainer: Phaser.GameObjects.Container;
   private statsContainer: Phaser.GameObjects.Container;
+  private statsContainerItemTitle: Phaser.GameObjects.Image;
+  private statsContainerStatsTitle: Phaser.GameObjects.Image;
+  private statsContainerExpTitle: Phaser.GameObjects.Image;
+  private statsContainerExpBarTitle: Phaser.GameObjects.Image;
 
   private descriptionScrollTween: Phaser.Tweens.Tween | null;
   private moveCursorBlinkTimer: Phaser.Time.TimerEvent | null;
@@ -144,15 +152,19 @@ export class SummaryUiHandler extends UiHandler {
     summaryBg.setOrigin(0, 1);
     this.summaryContainer.add(summaryBg);
 
-    this.tabSprite = globalScene.add.sprite(134, -summaryBg.displayHeight + 16, "summary_tabs_1");
-    this.tabSprite.setOrigin(1, 1);
+    this.tabSprite = globalScene.add.sprite(81, -summaryBg.displayHeight + 16, getLocalizedSpriteKey("summary_tabs_1")); // Pixel text 'STATUS' tab
+    this.tabSprite.setOrigin(0, 1);
     this.summaryContainer.add(this.tabSprite);
 
     const summaryLabel = addTextObject(4, -165, i18next.t("pokemonSummary:pokemonInfo"), TextStyle.SUMMARY_HEADER);
     summaryLabel.setOrigin(0, 1);
     this.summaryContainer.add(summaryLabel);
 
-    this.shinyOverlay = globalScene.add.image(6, -54, "summary_overlay_shiny");
+    this.summaryContainerDexNoLabel = globalScene.add.image(6, -151, getLocalizedSpriteKey("summary_dexnb_label")); // Pixel text 'No'
+    this.summaryContainerDexNoLabel.setOrigin(0, 1);
+    this.summaryContainer.add(this.summaryContainerDexNoLabel);
+
+    this.shinyOverlay = globalScene.add.image(6, -54, getLocalizedSpriteKey("summary_dexnb_label_overlay_shiny")); // Pixel text 'No' shiny
     this.shinyOverlay.setOrigin(0, 1);
     this.shinyOverlay.setVisible(false);
     this.summaryContainer.add(this.shinyOverlay);
@@ -281,6 +293,10 @@ export class SummaryUiHandler extends UiHandler {
     moveEffectBg.setOrigin(0, 0);
     this.moveEffectContainer.add(moveEffectBg);
 
+    this.moveEffectContainerTitle = globalScene.add.image(7, 7, getLocalizedSpriteKey("summary_moves_effect_title")); // Pixel text 'EFFECT'
+    this.moveEffectContainerTitle.setOrigin(0, 0.5);
+    this.moveEffectContainer.add(this.moveEffectContainerTitle);
+
     const moveEffectLabels = addTextObject(8, 12, i18next.t("pokemonSummary:powerAccuracyCategory"), TextStyle.SUMMARY);
     moveEffectLabels.setLineSpacing(9);
     moveEffectLabels.setOrigin(0, 0);
@@ -345,9 +361,9 @@ export class SummaryUiHandler extends UiHandler {
     this.candyOverlay.setTint(argbFromRgba(rgbHexToRgba(colorScheme[1])));
 
     this.numberText.setText(padInt(this.pokemon.species.speciesId, 4));
-    this.numberText.setColor(this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
+    this.numberText.setColor(getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD));
     this.numberText.setShadowColor(
-      this.getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true),
+      getTextColor(!this.pokemon.isShiny() ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true),
     );
     const spriteKey = this.pokemon.getSpriteKey(true);
     try {
@@ -738,7 +754,7 @@ export class SummaryUiHandler extends UiHandler {
         const forward = this.cursor < cursor;
         this.cursor = cursor;
 
-        this.tabSprite.setTexture(`summary_tabs_${this.cursor + 1}`);
+        this.tabSprite.setTexture(getLocalizedSpriteKey(`summary_tabs_${this.cursor + 1}`)); // Pixel text 'STATUS' and "MOVES" tabs
 
         this.getUi().hideTooltip();
 
@@ -812,6 +828,14 @@ export class SummaryUiHandler extends UiHandler {
             ? i18next.t("trainerNames:playerF")
             : i18next.t("trainerNames:playerM");
 
+        const profileContainerProfilTitle = globalScene.add.image(
+          7,
+          4,
+          getLocalizedSpriteKey("summary_profile_profile_title"), // Pixel text 'PROFIL'
+        );
+        profileContainerProfilTitle.setOrigin(0, 0.5);
+        profileContainer.add(profileContainerProfilTitle);
+
         // TODO: should add field for original trainer name to Pokemon object, to support gift/traded Pokemon from MEs
         const trainerText = addBBCodeTextObject(
           7,
@@ -886,7 +910,7 @@ export class SummaryUiHandler extends UiHandler {
         }
 
         this.abilityContainer = {
-          labelImage: globalScene.add.image(0, 0, "summary_profile_ability"),
+          labelImage: globalScene.add.image(0, 0, getLocalizedSpriteKey("summary_profile_ability")), // Pixel text 'ABILITY'
           ability: this.pokemon?.getAbility(true)!, // TODO: is this bang correct?
           nameText: null,
           descriptionText: null,
@@ -896,7 +920,7 @@ export class SummaryUiHandler extends UiHandler {
         // Only add to the array and set up displaying a passive if it's unlocked
         if (this.pokemon?.hasPassive()) {
           this.passiveContainer = {
-            labelImage: globalScene.add.image(0, 0, "summary_profile_passive"),
+            labelImage: globalScene.add.image(0, 0, getLocalizedSpriteKey("summary_profile_passive")), // Pixel text 'PASSIVE'
             ability: this.pokemon.getPassiveAbility(),
             nameText: null,
             descriptionText: null,
@@ -916,9 +940,9 @@ export class SummaryUiHandler extends UiHandler {
         }
 
         allAbilityInfo.forEach(abilityInfo => {
-          abilityInfo.labelImage.setPosition(17, 43);
+          abilityInfo.labelImage.setPosition(17, 47);
           abilityInfo.labelImage.setVisible(true);
-          abilityInfo.labelImage.setOrigin(0, 0);
+          abilityInfo.labelImage.setOrigin(0, 0.5);
           profileContainer.add(abilityInfo.labelImage);
 
           abilityInfo.nameText = addTextObject(7, 68, abilityInfo.ability?.name!, TextStyle.SUMMARY_ALT); // TODO: is this bang correct?
@@ -966,6 +990,14 @@ export class SummaryUiHandler extends UiHandler {
         const rawNature = toCamelCase(Nature[this.pokemon?.getNature()!]); // TODO: is this bang correct?
         const nature = `${getBBCodeFrag(toTitleCase(getNatureName(this.pokemon?.getNature()!)), TextStyle.SUMMARY_RED)}${closeFragment}`; // TODO: is this bang correct?
 
+        const profileContainerMemoTitle = globalScene.add.image(
+          7,
+          107,
+          getLocalizedSpriteKey("summary_profile_memo_title"), // Pixel text 'TRAINER MEMO'
+        );
+        profileContainerMemoTitle.setOrigin(0, 0.5);
+        profileContainer.add(profileContainerMemoTitle);
+
         const memoString = i18next.t("pokemonSummary:memoString", {
           metFragment: i18next.t(
             `pokemonSummary:metFragment.${this.pokemon?.metBiome === -1 ? "apparently" : "normal"}`,
@@ -992,6 +1024,30 @@ export class SummaryUiHandler extends UiHandler {
         this.statsContainer.add(this.ivContainer);
         this.statsContainer.setVisible(true);
 
+        this.statsContainerItemTitle = globalScene.add.image(7, 4, getLocalizedSpriteKey("summary_stats_item_title")); // Pixel text 'ITEM'
+        this.statsContainerItemTitle.setOrigin(0, 0.5);
+        this.statsContainer.add(this.statsContainerItemTitle);
+
+        this.statsContainerStatsTitle = globalScene.add.image(
+          16,
+          51,
+          getLocalizedSpriteKey("summary_stats_stats_title"), // Pixel text 'STATS'
+        );
+        this.statsContainerStatsTitle.setOrigin(0, 0.5);
+        this.statsContainer.add(this.statsContainerStatsTitle);
+
+        this.statsContainerExpTitle = globalScene.add.image(7, 107, getLocalizedSpriteKey("summary_stats_exp_title")); // Pixel text 'EXP.'
+        this.statsContainerExpTitle.setOrigin(0, 0.5);
+        this.statsContainer.add(this.statsContainerExpTitle);
+
+        this.statsContainerExpBarTitle = globalScene.add.image(
+          126,
+          144,
+          getLocalizedSpriteKey("summary_stats_expbar_title"), // Pixel mini text 'EXP'
+        );
+        this.statsContainerExpBarTitle.setOrigin(0, 0);
+        this.statsContainer.add(this.statsContainerExpBarTitle);
+
         PERMANENT_STATS.forEach((stat, s) => {
           const statName = i18next.t(getStatKey(stat));
           const rowIndex = s % 3;
@@ -1107,6 +1163,22 @@ export class SummaryUiHandler extends UiHandler {
         this.movesContainer = globalScene.add.container(5, -pageBg.height + 26);
         pageContainer.add(this.movesContainer);
 
+        this.movesContainerMovesTitle = globalScene.add.image(
+          2,
+          -22,
+          getLocalizedSpriteKey("summary_moves_moves_title"),
+        ); // Pixel text 'MOVES'
+        this.movesContainerMovesTitle.setOrigin(0, 0.5);
+        this.movesContainer.add(this.movesContainerMovesTitle);
+
+        this.movesContainerDescriptionsTitle = globalScene.add.image(
+          2,
+          78,
+          getLocalizedSpriteKey("summary_moves_descriptions_title"),
+        ); // Pixel text 'DESCRIPTIONS'
+        this.movesContainerDescriptionsTitle.setOrigin(0, 0.5);
+        this.movesContainer.add(this.movesContainerDescriptionsTitle);
+
         this.extraMoveRowContainer = globalScene.add.container(0, 64);
         this.extraMoveRowContainer.setVisible(false);
         this.movesContainer.add(this.extraMoveRowContainer);
@@ -1136,8 +1208,8 @@ export class SummaryUiHandler extends UiHandler {
             newMoveTypeIcon.setOrigin(0, 1);
             this.extraMoveRowContainer.add(newMoveTypeIcon);
           }
-          const ppOverlay = globalScene.add.image(163, -1, "summary_moves_overlay_pp");
-          ppOverlay.setOrigin(0, 1);
+          const ppOverlay = globalScene.add.image(172, -5, getLocalizedSpriteKey("summary_moves_overlay_pp")); // Pixel text 'PP'
+          ppOverlay.setOrigin(1, 0.5);
           this.extraMoveRowContainer.add(ppOverlay);
 
           const pp = padInt(this.newMove?.pp!, 2, "  "); // TODO: is this bang correct?
@@ -1167,8 +1239,8 @@ export class SummaryUiHandler extends UiHandler {
           moveText.setOrigin(0, 1);
           moveRowContainer.add(moveText);
 
-          const ppOverlay = globalScene.add.image(163, -1, "summary_moves_overlay_pp");
-          ppOverlay.setOrigin(0, 1);
+          const ppOverlay = globalScene.add.image(172, -5, getLocalizedSpriteKey("summary_moves_overlay_pp")); // Pixel text 'PP'
+          ppOverlay.setOrigin(1, 0.5);
           moveRowContainer.add(ppOverlay);
 
           const ppText = addTextObject(173, 1, "--/--", TextStyle.WINDOW);
diff --git a/src/ui/target-select-ui-handler.ts b/src/ui/handlers/target-select-ui-handler.ts
similarity index 99%
rename from src/ui/target-select-ui-handler.ts
rename to src/ui/handlers/target-select-ui-handler.ts
index 5ea89929cda..91f40d4a476 100644
--- a/src/ui/target-select-ui-handler.ts
+++ b/src/ui/handlers/target-select-ui-handler.ts
@@ -7,7 +7,7 @@ import { UiMode } from "#enums/ui-mode";
 import type { Pokemon } from "#field/pokemon";
 import type { ModifierBar } from "#modifiers/modifier";
 import { getMoveTargets } from "#moves/move-utils";
-import { UiHandler } from "#ui/ui-handler";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { fixedInt, isNullOrUndefined } from "#utils/common";
 
 export type TargetSelectCallback = (targets: BattlerIndex[]) => void;
diff --git a/src/ui/test-dialogue-ui-handler.ts b/src/ui/handlers/test-dialogue-ui-handler.ts
similarity index 94%
rename from src/ui/test-dialogue-ui-handler.ts
rename to src/ui/handlers/test-dialogue-ui-handler.ts
index 6f7c79a151b..e925e523bc5 100644
--- a/src/ui/test-dialogue-ui-handler.ts
+++ b/src/ui/handlers/test-dialogue-ui-handler.ts
@@ -1,9 +1,9 @@
 import { UiMode } from "#enums/ui-mode";
 import type { PlayerPokemon } from "#field/pokemon";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import type { InputFieldConfig } from "#ui/form-modal-ui-handler";
-import { FormModalUiHandler } from "#ui/form-modal-ui-handler";
-import type { ModalConfig } from "#ui/modal-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import type { InputFieldConfig } from "#ui/handlers/form-modal-ui-handler";
+import { FormModalUiHandler } from "#ui/handlers/form-modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
 import { isNullOrUndefined } from "#utils/common";
 import i18next from "i18next";
 
diff --git a/src/ui/title-ui-handler.ts b/src/ui/handlers/title-ui-handler.ts
similarity index 98%
rename from src/ui/title-ui-handler.ts
rename to src/ui/handlers/title-ui-handler.ts
index 5ae195231e5..ef814167631 100644
--- a/src/ui/title-ui-handler.ts
+++ b/src/ui/handlers/title-ui-handler.ts
@@ -141,7 +141,8 @@ export class TitleUiHandler extends OptionSelectUiHandler {
         }),
       );
 
-      this.appVersionText.setText("v" + version);
+      const betaText = import.meta.env.DEV ? " (Beta)" : "";
+      this.appVersionText.setText("v" + version + betaText);
 
       const ui = this.getUi();
 
diff --git a/src/ui/ui-handler.ts b/src/ui/handlers/ui-handler.ts
similarity index 86%
rename from src/ui/ui-handler.ts
rename to src/ui/handlers/ui-handler.ts
index 7dde6b22dcd..558cb08f252 100644
--- a/src/ui/ui-handler.ts
+++ b/src/ui/handlers/ui-handler.ts
@@ -1,8 +1,6 @@
 import { globalScene } from "#app/global-scene";
 import type { Button } from "#enums/buttons";
-import type { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
-import { getTextColor } from "#ui/text";
 
 /**
  * A basic abstract class to act as a holder and processor for UI elements.
@@ -33,10 +31,6 @@ export abstract class UiHandler {
     return globalScene.ui;
   }
 
-  getTextColor(style: TextStyle, shadow = false): string {
-    return getTextColor(style, shadow, globalScene.uiTheme);
-  }
-
   getCursor(): number {
     return this.cursor;
   }
diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/handlers/unavailable-modal-ui-handler.ts
similarity index 95%
rename from src/ui/unavailable-modal-ui-handler.ts
rename to src/ui/handlers/unavailable-modal-ui-handler.ts
index 5c3dc513473..a69f423376b 100644
--- a/src/ui/unavailable-modal-ui-handler.ts
+++ b/src/ui/handlers/unavailable-modal-ui-handler.ts
@@ -2,8 +2,8 @@ import { updateUserInfo } from "#app/account";
 import { globalScene } from "#app/global-scene";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
-import type { ModalConfig } from "#ui/modal-ui-handler";
-import { ModalUiHandler } from "#ui/modal-ui-handler";
+import type { ModalConfig } from "#ui/handlers/modal-ui-handler";
+import { ModalUiHandler } from "#ui/handlers/modal-ui-handler";
 import { addTextObject } from "#ui/text";
 import { sessionIdKey } from "#utils/common";
 import { removeCookie } from "#utils/cookies";
diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts
index b40676fc97c..2d9f3e6a6bd 100644
--- a/src/ui/settings/abstract-control-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-control-settings-ui-handler.ts
@@ -5,10 +5,10 @@ import type { Device } from "#enums/devices";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
 import { getIconWithSettingName } from "#inputs/config-handler";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import { UiHandler } from "#ui/handlers/ui-handler";
 import { NavigationManager, NavigationMenu } from "#ui/navigation-menu";
-import { ScrollBar } from "#ui/scroll-bar";
-import { addTextObject } from "#ui/text";
-import { UiHandler } from "#ui/ui-handler";
+import { addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import { toCamelCase } from "#utils/strings";
 import i18next from "i18next";
@@ -544,8 +544,13 @@ export abstract class AbstractControlSettingsUiHandler extends UiHandler {
           }
           if (this.settingBlacklisted.includes(setting) || setting.includes("BUTTON_")) {
             success = false;
-          } else if (this.optionCursors[cursor]) {
-            success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true);
+          } else {
+            // Cycle to the rightmost position when at the leftmost, otherwise move left
+            success = this.setOptionCursor(
+              cursor,
+              Phaser.Math.Wrap(this.optionCursors[cursor] - 1, 0, this.optionValueLabels[cursor].length),
+              true,
+            );
           }
           break;
         case Button.RIGHT: // Move selection right within the current option set.
@@ -554,8 +559,13 @@ export abstract class AbstractControlSettingsUiHandler extends UiHandler {
           }
           if (this.settingBlacklisted.includes(setting) || setting.includes("BUTTON_")) {
             success = false;
-          } else if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) {
-            success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true);
+          } else {
+            // Cycle to the leftmost position when at the rightmost, otherwise move right
+            success = this.setOptionCursor(
+              cursor,
+              Phaser.Math.Wrap(this.optionCursors[cursor] + 1, 0, this.optionValueLabels[cursor].length),
+              true,
+            );
           }
           break;
         case Button.CYCLE_FORM:
@@ -653,16 +663,16 @@ export abstract class AbstractControlSettingsUiHandler extends UiHandler {
     if (!this.bindingSettings.includes(setting) && !setting.includes("BUTTON_")) {
       // Get the label of the last selected option and revert its color to the default.
       const lastValueLabel = this.optionValueLabels[settingIndex][lastCursor];
-      lastValueLabel.setColor(this.getTextColor(TextStyle.WINDOW));
-      lastValueLabel.setShadowColor(this.getTextColor(TextStyle.WINDOW, true));
+      lastValueLabel.setColor(getTextColor(TextStyle.WINDOW));
+      lastValueLabel.setShadowColor(getTextColor(TextStyle.WINDOW, true));
 
       // Update the cursor for the setting to the new position.
       this.optionCursors[settingIndex] = cursor;
 
       // Change the color of the new selected option to indicate it's selected.
       const newValueLabel = this.optionValueLabels[settingIndex][cursor];
-      newValueLabel.setColor(this.getTextColor(TextStyle.SETTINGS_SELECTED));
-      newValueLabel.setShadowColor(this.getTextColor(TextStyle.SETTINGS_SELECTED, true));
+      newValueLabel.setColor(getTextColor(TextStyle.SETTINGS_SELECTED));
+      newValueLabel.setShadowColor(getTextColor(TextStyle.SETTINGS_SELECTED, true));
     }
 
     // If the save flag is set, save the setting to local storage
diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts
index 91d5aec984a..cb93d5be960 100644
--- a/src/ui/settings/abstract-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-settings-ui-handler.ts
@@ -5,10 +5,10 @@ import { UiMode } from "#enums/ui-mode";
 import type { SettingType } from "#system/settings";
 import { Setting, SettingKeys } from "#system/settings";
 import type { InputsIcons } from "#ui/abstract-control-settings-ui-handler";
-import { MessageUiHandler } from "#ui/message-ui-handler";
+import { ScrollBar } from "#ui/containers/scroll-bar";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
 import { NavigationManager, NavigationMenu } from "#ui/navigation-menu";
-import { ScrollBar } from "#ui/scroll-bar";
-import { addTextObject } from "#ui/text";
+import { addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import i18next from "i18next";
 
@@ -318,16 +318,20 @@ export class AbstractSettingsUiHandler extends MessageUiHandler {
           }
           break;
         case Button.LEFT:
-          if (this.optionCursors[cursor]) {
-            // Moves the option cursor left, if possible.
-            success = this.setOptionCursor(cursor, this.optionCursors[cursor] - 1, true);
-          }
+          // Cycle to the rightmost position when at the leftmost, otherwise move left
+          success = this.setOptionCursor(
+            cursor,
+            Phaser.Math.Wrap(this.optionCursors[cursor] - 1, 0, this.optionValueLabels[cursor].length),
+            true,
+          );
           break;
         case Button.RIGHT:
-          // Moves the option cursor right, if possible.
-          if (this.optionCursors[cursor] < this.optionValueLabels[cursor].length - 1) {
-            success = this.setOptionCursor(cursor, this.optionCursors[cursor] + 1, true);
-          }
+          // Cycle to the leftmost position when at the rightmost, otherwise move right
+          success = this.setOptionCursor(
+            cursor,
+            Phaser.Math.Wrap(this.optionCursors[cursor] + 1, 0, this.optionValueLabels[cursor].length),
+            true,
+          );
           break;
         case Button.CYCLE_FORM:
         case Button.CYCLE_SHINY:
@@ -403,14 +407,14 @@ export class AbstractSettingsUiHandler extends MessageUiHandler {
     const lastCursor = this.optionCursors[settingIndex];
 
     const lastValueLabel = this.optionValueLabels[settingIndex][lastCursor];
-    lastValueLabel.setColor(this.getTextColor(TextStyle.SETTINGS_VALUE));
-    lastValueLabel.setShadowColor(this.getTextColor(TextStyle.SETTINGS_VALUE, true));
+    lastValueLabel.setColor(getTextColor(TextStyle.SETTINGS_VALUE));
+    lastValueLabel.setShadowColor(getTextColor(TextStyle.SETTINGS_VALUE, true));
 
     this.optionCursors[settingIndex] = cursor;
 
     const newValueLabel = this.optionValueLabels[settingIndex][cursor];
-    newValueLabel.setColor(this.getTextColor(TextStyle.SETTINGS_SELECTED));
-    newValueLabel.setShadowColor(this.getTextColor(TextStyle.SETTINGS_SELECTED, true));
+    newValueLabel.setColor(getTextColor(TextStyle.SETTINGS_SELECTED));
+    newValueLabel.setShadowColor(getTextColor(TextStyle.SETTINGS_SELECTED, true));
 
     if (save) {
       const saveSetting = () => {
diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts
index 53d606b6f84..397d9c88531 100644
--- a/src/ui/settings/gamepad-binding-ui-handler.ts
+++ b/src/ui/settings/gamepad-binding-ui-handler.ts
@@ -3,7 +3,7 @@ import { Device } from "#enums/devices";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
 import { getIconWithSettingName, getKeyWithKeycode } from "#inputs/config-handler";
-import { AbstractBindingUiHandler } from "#ui/abstract-binding-ui-handler";
+import { AbstractBindingUiHandler } from "#ui/handlers/abstract-binding-ui-handler";
 import { addTextObject } from "#ui/text";
 import i18next from "i18next";
 
diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts
index b339ac16188..b1fd153461f 100644
--- a/src/ui/settings/keyboard-binding-ui-handler.ts
+++ b/src/ui/settings/keyboard-binding-ui-handler.ts
@@ -3,7 +3,7 @@ import { Device } from "#enums/devices";
 import { TextStyle } from "#enums/text-style";
 import type { UiMode } from "#enums/ui-mode";
 import { getKeyWithKeycode } from "#inputs/config-handler";
-import { AbstractBindingUiHandler } from "#ui/abstract-binding-ui-handler";
+import { AbstractBindingUiHandler } from "#ui/handlers/abstract-binding-ui-handler";
 import { addTextObject } from "#ui/text";
 import i18next from "i18next";
 
diff --git a/src/ui/settings/option-select-ui-handler.ts b/src/ui/settings/option-select-ui-handler.ts
index c989c768244..235f16e7f09 100644
--- a/src/ui/settings/option-select-ui-handler.ts
+++ b/src/ui/settings/option-select-ui-handler.ts
@@ -1,5 +1,5 @@
 import { UiMode } from "#enums/ui-mode";
-import { AbstractOptionSelectUiHandler } from "#ui/abstract-option-select-ui-handler";
+import { AbstractOptionSelectUiHandler } from "#ui/handlers/abstract-option-select-ui-handler";
 
 export class OptionSelectUiHandler extends AbstractOptionSelectUiHandler {
   constructor(mode: UiMode = UiMode.OPTION_SELECT) {
diff --git a/src/ui/text.ts b/src/ui/text.ts
index bac53f81ba6..927f9f08bb2 100644
--- a/src/ui/text.ts
+++ b/src/ui/text.ts
@@ -16,11 +16,7 @@ export function addTextObject(
   style: TextStyle,
   extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
 ): Phaser.GameObjects.Text {
-  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(
-    style,
-    globalScene.uiTheme,
-    extraStyleOptions,
-  );
+  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, extraStyleOptions);
 
   const ret = globalScene.add
     .text(x, y, content, styleOptions)
@@ -38,11 +34,7 @@ export function setTextStyle(
   style: TextStyle,
   extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
 ) {
-  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(
-    style,
-    globalScene.uiTheme,
-    extraStyleOptions,
-  );
+  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, extraStyleOptions);
   obj.setScale(scale).setShadow(shadowXpos, shadowYpos, shadowColor);
   if (!(styleOptions as Phaser.Types.GameObjects.Text.TextStyle).lineSpacing) {
     obj.setLineSpacing(scale * 30);
@@ -60,11 +52,7 @@ export function addBBCodeTextObject(
   style: TextStyle,
   extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
 ): BBCodeText {
-  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(
-    style,
-    globalScene.uiTheme,
-    extraStyleOptions,
-  );
+  const { scale, styleOptions, shadowColor, shadowXpos, shadowYpos } = getTextStyleOptions(style, extraStyleOptions);
 
   const ret = new BBCodeText(globalScene, x, y, content, styleOptions as BBCodeText.TextStyle);
   globalScene.add.existing(ret);
@@ -84,7 +72,7 @@ export function addTextInputObject(
   style: TextStyle,
   extraStyleOptions?: InputText.IConfig,
 ): InputText {
-  const { scale, styleOptions } = getTextStyleOptions(style, globalScene.uiTheme, extraStyleOptions);
+  const { scale, styleOptions } = getTextStyleOptions(style, extraStyleOptions);
 
   const ret = globalScene.add.rexInputText(x, y, width, height, styleOptions as InputText.IConfig);
   ret.setScale(scale);
@@ -94,7 +82,6 @@ export function addTextInputObject(
 
 export function getTextStyleOptions(
   style: TextStyle,
-  uiTheme: UiTheme,
   extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
 ): TextStyleOptions {
   const lang = i18next.resolvedLanguage;
@@ -106,7 +93,7 @@ export function getTextStyleOptions(
   let styleOptions: Phaser.Types.GameObjects.Text.TextStyle = {
     fontFamily: "emerald",
     fontSize: 96,
-    color: getTextColor(style, false, uiTheme),
+    color: getTextColor(style, false),
     padding: {
       bottom: 6,
     },
@@ -465,7 +452,7 @@ export function getTextStyleOptions(
       break;
   }
 
-  const shadowColor = getTextColor(style, true, uiTheme);
+  const shadowColor = getTextColor(style, true);
 
   if (extraStyleOptions) {
     if (extraStyleOptions.fontSize) {
@@ -480,8 +467,8 @@ export function getTextStyleOptions(
   return { scale, styleOptions, shadowColor, shadowXpos, shadowYpos };
 }
 
-export function getBBCodeFrag(content: string, textStyle: TextStyle, uiTheme: UiTheme = UiTheme.DEFAULT): string {
-  return `[color=${getTextColor(textStyle, false, uiTheme)}][shadow=${getTextColor(textStyle, true, uiTheme)}]${content}`;
+export function getBBCodeFrag(content: string, textStyle: TextStyle): string {
+  return `[color=${getTextColor(textStyle, false)}][shadow=${getTextColor(textStyle, true)}]${content}`;
 }
 
 /**
@@ -500,14 +487,9 @@ export function getBBCodeFrag(content: string, textStyle: TextStyle, uiTheme: Ui
  * @param forWindow set to `true` if the text is to be displayed in a window ({@linkcode BattleScene.addWindow})
  *  it will replace all instances of the default MONEY TextStyle by {@linkcode TextStyle.MONEY_WINDOW}
  */
-export function getTextWithColors(
-  content: string,
-  primaryStyle: TextStyle,
-  uiTheme: UiTheme,
-  forWindow?: boolean,
-): string {
+export function getTextWithColors(content: string, primaryStyle: TextStyle, forWindow?: boolean): string {
   // Apply primary styling before anything else
-  let text = getBBCodeFrag(content, primaryStyle, uiTheme) + "[/color][/shadow]";
+  let text = getBBCodeFrag(content, primaryStyle) + "[/color][/shadow]";
   const primaryStyleString = [...text.match(new RegExp(/\[color=[^[]*\]\[shadow=[^[]*\]/i))!][0];
 
   /* For money text displayed in game windows, we can't use the default {@linkcode TextStyle.MONEY}
@@ -520,10 +502,7 @@ export function getTextWithColors(
   // Set custom colors
   text = text.replace(/@\[([^{]*)\]{([^}]*)}/gi, (_substring, textStyle: string, textToColor: string) => {
     return (
-      "[/color][/shadow]" +
-      getBBCodeFrag(textToColor, TextStyle[textStyle], uiTheme) +
-      "[/color][/shadow]" +
-      primaryStyleString
+      "[/color][/shadow]" + getBBCodeFrag(textToColor, TextStyle[textStyle]) + "[/color][/shadow]" + primaryStyleString
     );
   });
 
@@ -532,8 +511,8 @@ export function getTextWithColors(
 }
 
 // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: This is a giant switch which is the best option.
-export function getTextColor(textStyle: TextStyle, shadow?: boolean, uiTheme: UiTheme = UiTheme.DEFAULT): string {
-  const isLegacyTheme = uiTheme === UiTheme.LEGACY;
+export function getTextColor(textStyle: TextStyle, shadow?: boolean): string {
+  const isLegacyTheme = globalScene.uiTheme === UiTheme.LEGACY;
   switch (textStyle) {
     case TextStyle.MESSAGE:
       return !shadow ? "#f8f8f8" : "#6b5a73";
diff --git a/src/ui/ui-theme.ts b/src/ui/ui-theme.ts
index f2d434c024a..9e130417b43 100644
--- a/src/ui/ui-theme.ts
+++ b/src/ui/ui-theme.ts
@@ -51,7 +51,7 @@ export function addWindow(
     windowVariant = WindowVariant.NORMAL;
   }
 
-  const borderSize = globalScene.uiTheme ? 6 : 8;
+  const borderSize = globalScene.uiTheme === UiTheme.LEGACY ? 6 : 8;
 
   const window = globalScene.add.nineslice(
     x,
@@ -153,7 +153,11 @@ export function addUiThemeOverrides(): void {
     frame?: string | number,
   ): Phaser.GameObjects.Image {
     let legacy = false;
-    if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) {
+    if (
+      typeof texture === "string" &&
+      globalScene.uiTheme === UiTheme.LEGACY &&
+      legacyCompatibleImages.includes(texture)
+    ) {
       legacy = true;
       texture += "_legacy";
     }
@@ -176,7 +180,11 @@ export function addUiThemeOverrides(): void {
     frame?: string | number,
   ): Phaser.GameObjects.Sprite {
     let legacy = false;
-    if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) {
+    if (
+      typeof texture === "string" &&
+      globalScene.uiTheme === UiTheme.LEGACY &&
+      legacyCompatibleImages.includes(texture)
+    ) {
       legacy = true;
       texture += "_legacy";
     }
@@ -205,7 +213,11 @@ export function addUiThemeOverrides(): void {
     bottomHeight?: number,
   ): Phaser.GameObjects.NineSlice {
     let legacy = false;
-    if (typeof texture === "string" && globalScene.uiTheme && legacyCompatibleImages.includes(texture)) {
+    if (
+      typeof texture === "string" &&
+      globalScene.uiTheme === UiTheme.LEGACY &&
+      legacyCompatibleImages.includes(texture)
+    ) {
       legacy = true;
       texture += "_legacy";
     }
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index e381d205b78..5c270eacdc0 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -4,63 +4,63 @@ import { Device } from "#enums/devices";
 import { PlayerGender } from "#enums/player-gender";
 import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
-import { AchvBar } from "#ui/achv-bar";
-import { AchvsUiHandler } from "#ui/achvs-ui-handler";
-import { AdminUiHandler } from "#ui/admin-ui-handler";
-import { AutoCompleteUiHandler } from "#ui/autocomplete-ui-handler";
-import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
-import { BallUiHandler } from "#ui/ball-ui-handler";
-import { BattleMessageUiHandler } from "#ui/battle-message-ui-handler";
-import type { BgmBar } from "#ui/bgm-bar";
-import { GameChallengesUiHandler } from "#ui/challenges-select-ui-handler";
-import { ChangePasswordFormUiHandler } from "#ui/change-password-form-ui-handler";
-import { CommandUiHandler } from "#ui/command-ui-handler";
-import { ConfirmUiHandler } from "#ui/confirm-ui-handler";
-import { EggGachaUiHandler } from "#ui/egg-gacha-ui-handler";
-import { EggHatchSceneHandler } from "#ui/egg-hatch-scene-handler";
-import { EggListUiHandler } from "#ui/egg-list-ui-handler";
-import { EggSummaryUiHandler } from "#ui/egg-summary-ui-handler";
-import { EvolutionSceneHandler } from "#ui/evolution-scene-handler";
-import { FightUiHandler } from "#ui/fight-ui-handler";
-import { GameStatsUiHandler } from "#ui/game-stats-ui-handler";
+import { AchvBar } from "#ui/containers/achv-bar";
+import type { BgmBar } from "#ui/containers/bgm-bar";
+import { PokedexPageUiHandler } from "#ui/containers/pokedex-page-ui-handler";
+import { SavingIconHandler } from "#ui/containers/saving-icon-handler";
 import { GamepadBindingUiHandler } from "#ui/gamepad-binding-ui-handler";
+import { AchvsUiHandler } from "#ui/handlers/achvs-ui-handler";
+import { AutoCompleteUiHandler } from "#ui/handlers/autocomplete-ui-handler";
+import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
+import { BallUiHandler } from "#ui/handlers/ball-ui-handler";
+import { BattleMessageUiHandler } from "#ui/handlers/battle-message-ui-handler";
+import { GameChallengesUiHandler } from "#ui/handlers/challenges-select-ui-handler";
+import { ChangePasswordFormUiHandler } from "#ui/handlers/change-password-form-ui-handler";
+import { CommandUiHandler } from "#ui/handlers/command-ui-handler";
+import { ConfirmUiHandler } from "#ui/handlers/confirm-ui-handler";
+import { EggGachaUiHandler } from "#ui/handlers/egg-gacha-ui-handler";
+import { EggHatchSceneHandler } from "#ui/handlers/egg-hatch-scene-handler";
+import { EggListUiHandler } from "#ui/handlers/egg-list-ui-handler";
+import { EggSummaryUiHandler } from "#ui/handlers/egg-summary-ui-handler";
+import { EvolutionSceneHandler } from "#ui/handlers/evolution-scene-handler";
+import { FightUiHandler } from "#ui/handlers/fight-ui-handler";
+import { GameStatsUiHandler } from "#ui/handlers/game-stats-ui-handler";
+import { LoadingModalUiHandler } from "#ui/handlers/loading-modal-ui-handler";
+import { LoginFormUiHandler } from "#ui/handlers/login-form-ui-handler";
+import { MenuUiHandler } from "#ui/handlers/menu-ui-handler";
+import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
+import { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler";
+import { PartyUiHandler } from "#ui/handlers/party-ui-handler";
+import { PokedexScanUiHandler } from "#ui/handlers/pokedex-scan-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
+import { RegistrationFormUiHandler } from "#ui/handlers/registration-form-ui-handler";
+import { RenameFormUiHandler } from "#ui/handlers/rename-form-ui-handler";
+import { RunHistoryUiHandler } from "#ui/handlers/run-history-ui-handler";
+import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler";
+import { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler";
+import { SessionReloadModalUiHandler } from "#ui/handlers/session-reload-modal-ui-handler";
+import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
+import { SummaryUiHandler } from "#ui/handlers/summary-ui-handler";
+import { TargetSelectUiHandler } from "#ui/handlers/target-select-ui-handler";
+import { TestDialogueUiHandler } from "#ui/handlers/test-dialogue-ui-handler";
+import { TitleUiHandler } from "#ui/handlers/title-ui-handler";
+import type { UiHandler } from "#ui/handlers/ui-handler";
+import { UnavailableModalUiHandler } from "#ui/handlers/unavailable-modal-ui-handler";
 import { KeyboardBindingUiHandler } from "#ui/keyboard-binding-ui-handler";
-import { LoadingModalUiHandler } from "#ui/loading-modal-ui-handler";
-import { LoginFormUiHandler } from "#ui/login-form-ui-handler";
-import { MenuUiHandler } from "#ui/menu-ui-handler";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
-import { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler";
 import { NavigationManager } from "#ui/navigation-menu";
 import { OptionSelectUiHandler } from "#ui/option-select-ui-handler";
-import { PartyUiHandler } from "#ui/party-ui-handler";
-import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
-import { PokedexScanUiHandler } from "#ui/pokedex-scan-ui-handler";
-import { PokedexUiHandler } from "#ui/pokedex-ui-handler";
-import { RegistrationFormUiHandler } from "#ui/registration-form-ui-handler";
-import { RenameFormUiHandler } from "#ui/rename-form-ui-handler";
-import { RunHistoryUiHandler } from "#ui/run-history-ui-handler";
-import { RunInfoUiHandler } from "#ui/run-info-ui-handler";
-import { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler";
-import { SavingIconHandler } from "#ui/saving-icon-handler";
-import { SessionReloadModalUiHandler } from "#ui/session-reload-modal-ui-handler";
 import { SettingsAudioUiHandler } from "#ui/settings-audio-ui-handler";
 import { SettingsDisplayUiHandler } from "#ui/settings-display-ui-handler";
 import { SettingsGamepadUiHandler } from "#ui/settings-gamepad-ui-handler";
 import { SettingsKeyboardUiHandler } from "#ui/settings-keyboard-ui-handler";
 import { SettingsUiHandler } from "#ui/settings-ui-handler";
-import { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
-import { SummaryUiHandler } from "#ui/summary-ui-handler";
-import { TargetSelectUiHandler } from "#ui/target-select-ui-handler";
-import { TestDialogueUiHandler } from "#ui/test-dialogue-ui-handler";
 import { addTextObject } from "#ui/text";
-import { TitleUiHandler } from "#ui/title-ui-handler";
-import type { UiHandler } from "#ui/ui-handler";
 import { addWindow } from "#ui/ui-theme";
-import { UnavailableModalUiHandler } from "#ui/unavailable-modal-ui-handler";
 import { executeIf } from "#utils/common";
 import i18next from "i18next";
-import { RenameRunFormUiHandler } from "./rename-run-ui-handler";
+import { AdminUiHandler } from "./handlers/admin-ui-handler";
+import { RenameRunFormUiHandler } from "./handlers/rename-run-ui-handler";
 
 const transitionModes = [
   UiMode.SAVE_SLOT,
diff --git a/src/utils/common.ts b/src/utils/common.ts
index aac1ef359e6..97e61b902d8 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -133,10 +133,6 @@ export function randSeedItem<T>(items: T[]): T {
   return items.length === 1 ? items[0] : Phaser.Math.RND.pick(items);
 }
 
-export function randSeedWeightedItem<T>(items: T[]): T {
-  return items.length === 1 ? items[0] : Phaser.Math.RND.weightedPick(items);
-}
-
 /**
  * Shuffle a list using the seeded rng. Utilises the Fisher-Yates algorithm.
  * @param {Array} items An array of items.
@@ -276,25 +272,11 @@ export function executeIf<T>(condition: boolean, promiseFunc: () => Promise<T>):
 }
 
 export const sessionIdKey = "pokerogue_sessionId";
-// Check if the current hostname is 'localhost' or an IP address, and ensure a port is specified
-export const isLocal =
-  ((window.location.hostname === "localhost" || /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/.test(window.location.hostname)) &&
-    window.location.port !== "") ||
-  window.location.hostname === "";
 
-/**
- * @deprecated Refer to [pokerogue-api.ts](./plugins/api/pokerogue-api.ts) instead
- */
-export const localServerUrl =
-  import.meta.env.VITE_SERVER_URL ?? `http://${window.location.hostname}:${window.location.port + 1}`;
+/** `true` when run via `pnpm start:dev` (which runs `vite --mode development`) */
+export const isLocal = import.meta.env.MODE === "development";
 
-/**
- * Set the server URL based on whether it's local or not
- *
- * @deprecated Refer to [pokerogue-api.ts](./plugins/api/pokerogue-api.ts) instead
- */
-export const apiUrl = localServerUrl ?? "https://api.pokerogue.net";
-// used to disable api calls when isLocal is true and a server is not found
+/** Used to disable api calls when isLocal is true and a server is not found */
 export let isLocalServerConnected = true;
 
 /**
@@ -302,7 +284,7 @@ export let isLocalServerConnected = true;
  * with a GET request to verify if a server is running,
  * sets isLocalServerConnected based on results
  */
-export async function localPing() {
+export async function localPing(): Promise<void> {
   if (isLocal) {
     const titleStats = await pokerogueApi.getGameTitleStats();
     isLocalServerConnected = !!titleStats;
diff --git a/src/utils/utility-vars.ts b/src/utils/utility-vars.ts
index 081f70164c8..1f8eca00650 100644
--- a/src/utils/utility-vars.ts
+++ b/src/utils/utility-vars.ts
@@ -1 +1,4 @@
-export const isBeta = import.meta.env.MODE === "beta"; // this checks to see if the env mode is development. Technically this gives the same value for beta AND for dev envs
+// TODO: move this (and other global constants) to `src/constants/*-constants.ts`
+
+/** `true` if running on `beta.pokerogue.net` or via `pnpm start:beta` (which runs `vite --mode beta`) */
+export const isBeta = import.meta.env.MODE === "beta";
diff --git a/test/@types/vitest.d.ts b/test/@types/vitest.d.ts
index 2ed0512538a..b13d9e53101 100644
--- a/test/@types/vitest.d.ts
+++ b/test/@types/vitest.d.ts
@@ -1,9 +1,9 @@
 import "vitest";
 
-import type { TerrainType } from "#app/data/terrain";
+import type { Phase } from "#app/phase";
 import type Overrides from "#app/overrides";
 import type { ArenaTag } from "#data/arena-tag";
-import type { PositionalTag } from "#data/positional-tags/positional-tag";
+import type { TerrainType } from "#data/terrain";
 import type { AbilityId } from "#enums/ability-id";
 import type { ArenaTagSide } from "#enums/arena-tag-side";
 import type { ArenaTagType } from "#enums/arena-tag-type";
@@ -11,21 +11,19 @@ import type { BattlerTagType } from "#enums/battler-tag-type";
 import type { MoveId } from "#enums/move-id";
 import type { PokemonType } from "#enums/pokemon-type";
 import type { PositionalTagType } from "#enums/positional-tag-type";
-import type { BattleStat, EffectiveStat, Stat } from "#enums/stat";
-import type { StatusEffect } from "#enums/status-effect";
+import type { BattleStat, EffectiveStat } from "#enums/stat";
 import type { WeatherType } from "#enums/weather-type";
-import type { Arena } from "#field/arena";
-import type { Pokemon } from "#field/pokemon";
-import type { PokemonMove } from "#moves/pokemon-move";
 import type { toHaveArenaTagOptions } from "#test/test-utils/matchers/to-have-arena-tag";
 import type { toHaveEffectiveStatOptions } from "#test/test-utils/matchers/to-have-effective-stat";
 import type { toHavePositionalTagOptions } from "#test/test-utils/matchers/to-have-positional-tag";
 import type { expectedStatusType } from "#test/test-utils/matchers/to-have-status-effect";
 import type { toHaveTypesOptions } from "#test/test-utils/matchers/to-have-types";
+import type { PhaseString } from "#types/phase-types";
 import type { TurnMove } from "#types/turn-move";
 import type { AtLeastOne } from "#types/type-helpers";
-import type { toDmgValue } from "utils/common";
+import type { toDmgValue } from "#utils/common";
 import type { expect } from "vitest";
+import type { toHaveBattlerTagOptions } from "#test/test-utils/matchers/to-have-battler-tag";
 
 declare module "vitest" {
   interface Assertion<T> {
@@ -40,6 +38,12 @@ declare module "vitest" {
      */
     toEqualArrayUnsorted(expected: T[]): void;
 
+    /**
+     * Check if the currently-running {@linkcode Phase} is of the given type.
+     * @param expectedPhase - The expected {@linkcode PhaseString}
+     */
+    toBeAtPhase(expectedPhase: PhaseString): void;
+
     // #region Arena Matchers
 
     /**
@@ -125,10 +129,15 @@ declare module "vitest" {
     toHaveStatStage(stat: BattleStat, expectedStage: number): void;
 
     /**
-     * Check whether a {@linkcode Pokemon} has a specific {@linkcode BattlerTagType}.
-     * @param expectedBattlerTagType - The expected {@linkcode BattlerTagType}
+     * Check whether a {@linkcode Pokemon} has the given {@linkcode BattlerTag}.
+     * @param expectedTag - A partially-filled {@linkcode BattlerTag} containing the desired properties
      */
-    toHaveBattlerTag(expectedBattlerTagType: BattlerTagType): void;
+    toHaveBattlerTag<B extends BattlerTagType>(expectedTag: toHaveBattlerTagOptions<B>): void;
+    /**
+     * Check whether a {@linkcode Pokemon} has the given {@linkcode BattlerTag}.
+     * @param expectedType - The expected {@linkcode BattlerTagType}
+     */
+    toHaveBattlerTag(expectedType: BattlerTagType): void;
 
     /**
      * Check whether a {@linkcode Pokemon} has applied a specific {@linkcode AbilityId}.
diff --git a/test/abilities/arena-trap.test.ts b/test/abilities/arena-trap.test.ts
index 0090487f49c..d43148dce7b 100644
--- a/test/abilities/arena-trap.test.ts
+++ b/test/abilities/arena-trap.test.ts
@@ -6,7 +6,7 @@ import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { PartyUiHandler } from "#ui/party-ui-handler";
+import type { PartyUiHandler } from "#ui/handlers/party-ui-handler";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/abilities/cud-chew.test.ts b/test/abilities/cud-chew.test.ts
index f68141096eb..ae3b4ad8765 100644
--- a/test/abilities/cud-chew.test.ts
+++ b/test/abilities/cud-chew.test.ts
@@ -99,7 +99,7 @@ describe("Abilities - Cud Chew", () => {
       expect(abDisplaySpy.mock.calls[1][2]).toBe(false);
 
       // should display messgae
-      expect(game.textInterceptor.getLatestMessage()).toBe(
+      expect(game.textInterceptor.logs).toContain(
         i18next.t("battle:hpIsFull", {
           pokemonName: getPokemonNameWithAffix(farigiraf),
         }),
diff --git a/test/abilities/disguise.test.ts b/test/abilities/disguise.test.ts
index f36501cb647..8a7e9a05ddb 100644
--- a/test/abilities/disguise.test.ts
+++ b/test/abilities/disguise.test.ts
@@ -196,7 +196,7 @@ describe("Abilities - Disguise", () => {
     game.move.select(MoveId.SHADOW_SNEAK);
     await game.toNextWave();
 
-    expect(game.scene.phaseManager.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
     expect(game.scene.currentBattle.waveIndex).toBe(2);
   });
 
diff --git a/test/abilities/moody.test.ts b/test/abilities/moody.test.ts
index d1f8aa2e351..b7882c15ced 100644
--- a/test/abilities/moody.test.ts
+++ b/test/abilities/moody.test.ts
@@ -84,4 +84,40 @@ describe("Abilities - Moody", () => {
     expect(decreasedStat).toBeTruthy();
     expect(decreasedStat.length).toBe(1);
   });
+
+  it("should only try to increase a stat stage by 1 if the stat stage is not at 6", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.field.getPlayerPokemon();
+
+    // Set all stat stages to 6
+    vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(6));
+
+    // Set one of the stat stages to -6
+    const raisedStat = EFFECTIVE_STATS[playerPokemon.randBattleSeedInt(EFFECTIVE_STATS.length)];
+    playerPokemon.setStatStage(raisedStat, -6);
+
+    game.move.select(MoveId.SPLASH);
+    await game.toNextTurn();
+
+    expect(playerPokemon.getStatStage(raisedStat), "should increase only the stat that is not at stage 6").toBe(-4);
+  });
+
+  it("should only try to decrease a stat stage by 1 if the stat stage is not at -6", async () => {
+    await game.classicMode.startBattle();
+
+    const playerPokemon = game.field.getPlayerPokemon();
+
+    // Set all stat stages to -6
+    vi.spyOn(playerPokemon.summonData, "statStages", "get").mockReturnValue(new Array(BATTLE_STATS.length).fill(-6));
+
+    // Set one of the stat stages to 6
+    const raisedStat = EFFECTIVE_STATS[playerPokemon.randBattleSeedInt(EFFECTIVE_STATS.length)];
+    playerPokemon.setStatStage(raisedStat, 6);
+
+    game.move.select(MoveId.SPLASH);
+    await game.toNextTurn();
+
+    expect(playerPokemon.getStatStage(raisedStat), "should decrease only the stat that is not at stage -6").toBe(5);
+  });
 });
diff --git a/test/abilities/pastel-veil.test.ts b/test/abilities/pastel-veil.test.ts
index c4b368c94d0..cc414fa6f87 100644
--- a/test/abilities/pastel-veil.test.ts
+++ b/test/abilities/pastel-veil.test.ts
@@ -3,7 +3,6 @@ import { BattlerIndex } from "#enums/battler-index";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { StatusEffect } from "#enums/status-effect";
-import { TurnEndPhase } from "#phases/turn-end-phase";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -24,48 +23,35 @@ describe("Abilities - Pastel Veil", () => {
 
   beforeEach(() => {
     game = new GameManager(phaserGame);
-    game.override
-      .battleStyle("double")
-      .moveset([MoveId.TOXIC_THREAD, MoveId.SPLASH])
-      .enemyAbility(AbilityId.BALL_FETCH)
-      .enemySpecies(SpeciesId.SUNKERN)
-      .enemyMoveset(MoveId.SPLASH);
+    game.override.battleStyle("double").enemyAbility(AbilityId.BALL_FETCH).enemySpecies(SpeciesId.TOXAPEX);
   });
 
-  it("prevents the user and its allies from being afflicted by poison", async () => {
+  it("should prevent the user and its allies from being poisoned", async () => {
     await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.GALAR_PONYTA]);
-    const ponyta = game.scene.getPlayerField()[1];
-    const magikarp = game.scene.getPlayerField()[0];
-    ponyta.abilityIndex = 1;
+    const [magikarp, ponyta] = game.scene.getPlayerField();
+    game.field.mockAbility(ponyta, AbilityId.PASTEL_VEIL);
 
-    expect(ponyta.hasAbility(AbilityId.PASTEL_VEIL)).toBe(true);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.move.forceEnemyMove(MoveId.TOXIC, BattlerIndex.PLAYER);
+    await game.move.forceEnemyMove(MoveId.TOXIC, BattlerIndex.PLAYER_2);
+    await game.toEndOfTurn();
 
-    game.move.select(MoveId.SPLASH);
-    game.move.select(MoveId.TOXIC_THREAD, 1, BattlerIndex.PLAYER);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    expect(magikarp.status?.effect).toBeUndefined();
+    expect(magikarp).toHaveStatusEffect(StatusEffect.NONE);
+    expect(ponyta).toHaveStatusEffect(StatusEffect.NONE);
   });
 
-  it("it heals the poisoned status condition of allies if user is sent out into battle", async () => {
+  it("should cure allies' poison if user is sent out into battle", async () => {
     await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS, SpeciesId.GALAR_PONYTA]);
-    const ponyta = game.scene.getPlayerParty()[2];
-    const magikarp = game.scene.getPlayerField()[0];
-    ponyta.abilityIndex = 1;
+    const [magikarp, , ponyta] = game.scene.getPlayerParty();
+    game.field.mockAbility(ponyta, AbilityId.PASTEL_VEIL);
 
-    expect(ponyta.hasAbility(AbilityId.PASTEL_VEIL)).toBe(true);
+    magikarp.doSetStatus(StatusEffect.POISON);
 
-    game.move.select(MoveId.SPLASH);
-    game.move.select(MoveId.TOXIC_THREAD, 1, BattlerIndex.PLAYER);
-
-    await game.phaseInterceptor.to(TurnEndPhase);
-    expect(magikarp.status?.effect).toBe(StatusEffect.POISON);
-
-    game.move.select(MoveId.SPLASH);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
     game.doSwitchPokemon(2);
-    await game.phaseInterceptor.to(TurnEndPhase);
+    await game.toEndOfTurn();
 
-    expect(magikarp.status?.effect).toBeUndefined();
+    expect(magikarp).toHaveStatusEffect(StatusEffect.NONE);
   });
 });
diff --git a/test/abilities/sweet-veil.test.ts b/test/abilities/sweet-veil.test.ts
index 12eeae9f9c5..d08c3eb04f8 100644
--- a/test/abilities/sweet-veil.test.ts
+++ b/test/abilities/sweet-veil.test.ts
@@ -2,8 +2,9 @@ import { AbilityId } from "#enums/ability-id";
 import { BattlerIndex } from "#enums/battler-index";
 import { BattlerTagType } from "#enums/battler-tag-type";
 import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
 import { SpeciesId } from "#enums/species-id";
-import { TurnEndPhase } from "#phases/turn-end-phase";
+import { StatusEffect } from "#enums/status-effect";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -26,62 +27,108 @@ describe("Abilities - Sweet Veil", () => {
     game = new GameManager(phaserGame);
     game.override
       .battleStyle("double")
-      .moveset([MoveId.SPLASH, MoveId.REST, MoveId.YAWN])
+      .ability(AbilityId.BALL_FETCH)
       .enemySpecies(SpeciesId.MAGIKARP)
       .enemyAbility(AbilityId.BALL_FETCH)
-      .enemyMoveset(MoveId.POWDER);
+      .enemyMoveset(MoveId.SPLASH);
   });
 
-  it("prevents the user and its allies from falling asleep", async () => {
+  function expectNoStatus() {
+    game.scene.getPlayerField().forEach(p => {
+      expect.soft(p).toHaveStatusEffect(StatusEffect.NONE);
+    });
+  }
+
+  it("should prevent the user and its allies from falling asleep", async () => {
     await game.classicMode.startBattle([SpeciesId.SWIRLIX, SpeciesId.MAGIKARP]);
 
-    game.move.select(MoveId.SPLASH);
-    game.move.select(MoveId.SPLASH, 1);
+    game.field.mockAbility(game.field.getPlayerPokemon(), AbilityId.SWEET_VEIL);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.move.forceEnemyMove(MoveId.SPORE, BattlerIndex.PLAYER);
+    await game.move.forceEnemyMove(MoveId.SPORE, BattlerIndex.PLAYER_2);
+    await game.toEndOfTurn();
 
-    await game.phaseInterceptor.to(TurnEndPhase);
-
-    expect(game.scene.getPlayerField().every(p => p.status?.effect)).toBe(false);
+    expectNoStatus();
   });
 
-  it("causes Rest to fail when used by the user or its allies", async () => {
-    game.override.enemyMoveset(MoveId.SPLASH);
+  it("should cause Rest to fail when used by the user or its allies", async () => {
     await game.classicMode.startBattle([SpeciesId.SWIRLIX, SpeciesId.MAGIKARP]);
 
-    game.move.select(MoveId.SPLASH);
-    game.move.select(MoveId.REST, 1);
+    const [swirlix, magikarp] = game.scene.getPlayerField();
+    game.field.mockAbility(swirlix, AbilityId.SWEET_VEIL);
+    swirlix.hp = 1;
+    magikarp.hp = 1;
 
-    await game.phaseInterceptor.to(TurnEndPhase);
+    game.move.use(MoveId.REST, BattlerIndex.PLAYER);
+    game.move.use(MoveId.REST, BattlerIndex.PLAYER_2);
+    await game.toEndOfTurn();
 
-    expect(game.scene.getPlayerField().every(p => p.status?.effect)).toBe(false);
+    expectNoStatus();
+    expect(swirlix).toHaveUsedMove({ move: MoveId.REST, result: MoveResult.FAIL });
+    expect(magikarp).toHaveUsedMove({ move: MoveId.REST, result: MoveResult.FAIL });
   });
 
-  it("causes Yawn to fail if used on the user or its allies", async () => {
-    game.override.enemyMoveset(MoveId.YAWN);
+  it("should cause Yawn to fail if used on the user or its allies", async () => {
     await game.classicMode.startBattle([SpeciesId.SWIRLIX, SpeciesId.MAGIKARP]);
 
-    game.move.select(MoveId.SPLASH);
-    game.move.select(MoveId.SPLASH, 1);
+    const [shuckle, swirlix] = game.scene.getPlayerField();
+    game.field.mockAbility(swirlix, AbilityId.SWEET_VEIL);
 
-    await game.phaseInterceptor.to(TurnEndPhase);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.move.forceEnemyMove(MoveId.YAWN, BattlerIndex.PLAYER);
+    await game.move.forceEnemyMove(MoveId.YAWN, BattlerIndex.PLAYER_2);
+    await game.toEndOfTurn();
 
-    expect(game.scene.getPlayerField().every(p => !!p.getTag(BattlerTagType.DROWSY))).toBe(false);
+    expect(shuckle).not.toHaveBattlerTag(BattlerTagType.DROWSY);
+    expect(swirlix).not.toHaveBattlerTag(BattlerTagType.DROWSY);
+    // TODO: This dooesn't work ATM
+    /*
+    const [karp1, karp2] = game.scene.getEnemyField();
+    expect(karp1).toHaveUsedMove({move: MoveId.YAWN, result: MoveResult.FAIL});
+    expect(karp2).toHaveUsedMove({move: MoveId.YAWN, result: MoveResult.FAIL});
+     */
   });
 
-  it("prevents the user and its allies already drowsy due to Yawn from falling asleep.", async () => {
-    game.override.enemySpecies(SpeciesId.PIKACHU).enemyLevel(5).startingLevel(5).enemyMoveset(MoveId.SPLASH);
+  it("should NOT cure allies' sleep status if user is sent out into battle", async () => {
+    await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.FEEBAS, SpeciesId.SWIRLIX]);
 
-    await game.classicMode.startBattle([SpeciesId.SHUCKLE, SpeciesId.SHUCKLE, SpeciesId.SWIRLIX]);
+    const [magikarp, , swirlix] = game.scene.getPlayerParty();
+    game.field.mockAbility(swirlix, AbilityId.PASTEL_VEIL);
 
-    game.move.select(MoveId.SPLASH);
-    game.move.select(MoveId.YAWN, 1, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH);
+    game.move.use(MoveId.SPORE, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
+    await game.toNextTurn();
 
-    await game.phaseInterceptor.to("BerryPhase");
+    expect(magikarp).toHaveStatusEffect(StatusEffect.SLEEP);
 
-    expect(game.scene.getPlayerField().some(p => !!p.getTag(BattlerTagType.DROWSY))).toBe(true);
-
-    game.move.select(MoveId.SPLASH);
+    game.move.use(MoveId.SPLASH);
     game.doSwitchPokemon(2);
+    await game.toEndOfTurn();
 
-    expect(game.scene.getPlayerField().every(p => p.status?.effect)).toBe(false);
+    expect(magikarp).toHaveStatusEffect(StatusEffect.SLEEP);
+  });
+
+  it("should prevent an already-drowsy user or ally from falling asleep", async () => {
+    await game.classicMode.startBattle([SpeciesId.SHUCKLE, SpeciesId.SWIRLIX]);
+
+    // Add yawn before granting ability
+    const [shuckle, swirlix] = game.scene.getPlayerField();
+    shuckle.addTag(BattlerTagType.DROWSY, 1);
+    swirlix.addTag(BattlerTagType.DROWSY, 1);
+
+    game.field.mockAbility(shuckle, AbilityId.SWEET_VEIL);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toNextTurn();
+
+    expect(shuckle).not.toHaveBattlerTag(BattlerTagType.DROWSY);
+    expect(swirlix).not.toHaveBattlerTag(BattlerTagType.DROWSY);
+    expectNoStatus();
   });
 });
diff --git a/test/battle/special-battle.test.ts b/test/battle/special-battle.test.ts
index d22931bfea5..4fb859a2a40 100644
--- a/test/battle/special-battle.test.ts
+++ b/test/battle/special-battle.test.ts
@@ -36,62 +36,62 @@ describe("Test Battle Phase", () => {
     game.override.battleStyle("single").startingWave(10);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 2vs2 boss", async () => {
     game.override.battleStyle("double").startingWave(10);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 2vs2 trainer", async () => {
     game.override.battleStyle("double").startingWave(5);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 2vs1 trainer", async () => {
     game.override.battleStyle("single").startingWave(5);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 2vs1 rival", async () => {
     game.override.battleStyle("single").startingWave(8);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 2vs2 rival", async () => {
     game.override.battleStyle("double").startingWave(8);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 1vs1 trainer", async () => {
     game.override.battleStyle("single").startingWave(5);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 2vs2 trainer", async () => {
     game.override.battleStyle("double").startingWave(5);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 
   it("startBattle 4vs2 trainer", async () => {
     game.override.battleStyle("double").startingWave(5);
     await game.classicMode.startBattle([SpeciesId.BLASTOISE, SpeciesId.CHARIZARD, SpeciesId.DARKRAI, SpeciesId.GABITE]);
     expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND);
-    expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+    expect(game).toBeAtPhase("CommandPhase");
   });
 });
diff --git a/test/challenges/hardcore.test.ts b/test/challenges/hardcore.test.ts
index 0f4ab1b9f02..a52d7102868 100644
--- a/test/challenges/hardcore.test.ts
+++ b/test/challenges/hardcore.test.ts
@@ -8,7 +8,7 @@ import { SpeciesId } from "#enums/species-id";
 import { StatusEffect } from "#enums/status-effect";
 import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/challenges/limited-support.test.ts b/test/challenges/limited-support.test.ts
index 35413220550..ba8930943dd 100644
--- a/test/challenges/limited-support.test.ts
+++ b/test/challenges/limited-support.test.ts
@@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { ExpBoosterModifier } from "#modifiers/modifier";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/daily-mode.test.ts b/test/daily-mode.test.ts
index 34a8da80478..fae12a0b5d7 100644
--- a/test/daily-mode.test.ts
+++ b/test/daily-mode.test.ts
@@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { MapModifier } from "#modifiers/modifier";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 describe("Daily Mode", () => {
diff --git a/test/imports.test.ts b/test/imports.test.ts
index 04e9462d8d0..aeaa763c05e 100644
--- a/test/imports.test.ts
+++ b/test/imports.test.ts
@@ -1,4 +1,4 @@
-import { initStatsKeys } from "#ui/game-stats-ui-handler";
+import { initStatsKeys } from "#ui/handlers/game-stats-ui-handler";
 import { describe, expect, it } from "vitest";
 
 async function importModule() {
diff --git a/test/items/dire-hit.test.ts b/test/items/dire-hit.test.ts
index 6d4bc7524eb..d704a94f3a8 100644
--- a/test/items/dire-hit.test.ts
+++ b/test/items/dire-hit.test.ts
@@ -10,7 +10,7 @@ import { NewBattlePhase } from "#phases/new-battle-phase";
 import { TurnEndPhase } from "#phases/turn-end-phase";
 import { TurnInitPhase } from "#phases/turn-init-phase";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/items/double-battle-chance-booster.test.ts b/test/items/double-battle-chance-booster.test.ts
index 2c12b34eba3..9985d4b3a55 100644
--- a/test/items/double-battle-chance-booster.test.ts
+++ b/test/items/double-battle-chance-booster.test.ts
@@ -5,7 +5,7 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { DoubleBattleChanceBoosterModifier } from "#modifiers/modifier";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/items/temp-stat-stage-booster.test.ts b/test/items/temp-stat-stage-booster.test.ts
index 05ea5a03eae..499f1d630b0 100644
--- a/test/items/temp-stat-stage-booster.test.ts
+++ b/test/items/temp-stat-stage-booster.test.ts
@@ -7,7 +7,7 @@ import { BATTLE_STATS, Stat } from "#enums/stat";
 import { UiMode } from "#enums/ui-mode";
 import { TempStatStageBoosterModifier } from "#modifiers/modifier";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/matchers.setup.ts b/test/matchers.setup.ts
index f76a9423ab3..fe2135f4db4 100644
--- a/test/matchers.setup.ts
+++ b/test/matchers.setup.ts
@@ -1,3 +1,4 @@
+import { toBeAtPhase } from "#test/test-utils/matchers/to-be-at-phase";
 import { toEqualArrayUnsorted } from "#test/test-utils/matchers/to-equal-array-unsorted";
 import { toHaveAbilityApplied } from "#test/test-utils/matchers/to-have-ability-applied";
 import { toHaveArenaTag } from "#test/test-utils/matchers/to-have-arena-tag";
@@ -24,6 +25,7 @@ import { expect } from "vitest";
 
 expect.extend({
   toEqualArrayUnsorted,
+  toBeAtPhase,
   toHaveWeather,
   toHaveTerrain,
   toHaveArenaTag,
diff --git a/test/moves/dragon-cheer.test.ts b/test/moves/dragon-cheer.test.ts
index 614dd9ab6ab..50880e067d9 100644
--- a/test/moves/dragon-cheer.test.ts
+++ b/test/moves/dragon-cheer.test.ts
@@ -1,15 +1,18 @@
 import { AbilityId } from "#enums/ability-id";
 import { BattlerIndex } from "#enums/battler-index";
+import { BattlerTagType } from "#enums/battler-tag-type";
 import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
 import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { GameManager } from "#test/test-utils/game-manager";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
-describe("Moves - Dragon Cheer", () => {
+describe("Move - Dragon Cheer", () => {
   let phaserGame: Phaser.Game;
   let game: GameManager;
+
   beforeAll(() => {
     phaserGame = new Phaser.Game({
       type: Phaser.HEADLESS,
@@ -24,75 +27,81 @@ describe("Moves - Dragon Cheer", () => {
     game = new GameManager(phaserGame);
     game.override
       .battleStyle("double")
+      .ability(AbilityId.BALL_FETCH)
       .enemyAbility(AbilityId.BALL_FETCH)
       .enemyMoveset(MoveId.SPLASH)
-      .enemyLevel(20)
-      .moveset([MoveId.DRAGON_CHEER, MoveId.TACKLE, MoveId.SPLASH]);
+      .enemyLevel(20);
   });
 
-  it("increases the user's allies' critical hit ratio by one stage", async () => {
+  it("should increase non-Dragon type allies' crit ratios by 1 stage", async () => {
     await game.classicMode.startBattle([SpeciesId.DRAGONAIR, SpeciesId.MAGIKARP]);
 
-    const enemy = game.scene.getEnemyField()[0];
-
+    const enemy = game.field.getEnemyPokemon();
     vi.spyOn(enemy, "getCritStage");
 
-    game.move.select(MoveId.DRAGON_CHEER, 0);
-    game.move.select(MoveId.TACKLE, 1, BattlerIndex.ENEMY);
-
+    game.move.use(MoveId.DRAGON_CHEER, BattlerIndex.PLAYER);
+    game.move.use(MoveId.TACKLE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
     await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.toEndOfTurn();
 
-    // After Tackle
-    await game.phaseInterceptor.to("TurnEndPhase");
+    const [dragonair, magikarp] = game.scene.getPlayerField();
+    expect(dragonair).not.toHaveBattlerTag(BattlerTagType.DRAGON_CHEER);
+    expect(magikarp).toHaveBattlerTag({ tagType: BattlerTagType.DRAGON_CHEER, critStages: 1 });
     expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
   });
 
-  it("increases the user's Dragon-type allies' critical hit ratio by two stages", async () => {
+  it("should increase Dragon-type allies' crit ratios by 2 stages", async () => {
     await game.classicMode.startBattle([SpeciesId.MAGIKARP, SpeciesId.DRAGONAIR]);
 
-    const enemy = game.scene.getEnemyField()[0];
-
+    const enemy = game.field.getEnemyPokemon();
     vi.spyOn(enemy, "getCritStage");
 
-    game.move.select(MoveId.DRAGON_CHEER, 0);
-    game.move.select(MoveId.TACKLE, 1, BattlerIndex.ENEMY);
-
+    game.move.use(MoveId.DRAGON_CHEER, BattlerIndex.PLAYER);
+    game.move.use(MoveId.TACKLE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY);
     await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
+    await game.toEndOfTurn();
 
-    // After Tackle
-    await game.phaseInterceptor.to("TurnEndPhase");
+    const [magikarp, dragonair] = game.scene.getPlayerField();
+    expect(magikarp).not.toHaveBattlerTag(BattlerTagType.DRAGON_CHEER);
+    expect(dragonair).toHaveBattlerTag({ tagType: BattlerTagType.DRAGON_CHEER, critStages: 2 });
     expect(enemy.getCritStage).toHaveReturnedWith(2); // getCritStage is called on defender
   });
 
-  it("applies the effect based on the allies' type upon use of the move, and do not change if the allies' type changes later in battle", async () => {
+  it("should maintain crit boost amount even if user's type is changed", async () => {
     await game.classicMode.startBattle([SpeciesId.DRAGONAIR, SpeciesId.MAGIKARP]);
 
-    const magikarp = game.scene.getPlayerField()[1];
-    const enemy = game.scene.getEnemyField()[0];
-
-    vi.spyOn(enemy, "getCritStage");
-
-    game.move.select(MoveId.DRAGON_CHEER, 0);
-    game.move.select(MoveId.TACKLE, 1, BattlerIndex.ENEMY);
-
+    // Use Reflect Type to become Dragon-type mid-turn
+    game.move.use(MoveId.DRAGON_CHEER, BattlerIndex.PLAYER);
+    game.move.use(MoveId.REFLECT_TYPE, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER);
     await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
-
-    // After Tackle
-    await game.phaseInterceptor.to("TurnEndPhase");
-    expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
-
-    await game.toNextTurn();
-
-    // Change Magikarp's type to Dragon
-    vi.spyOn(magikarp, "getTypes").mockReturnValue([PokemonType.DRAGON]);
-    expect(magikarp.getTypes()).toEqual([PokemonType.DRAGON]);
-
-    game.move.select(MoveId.SPLASH, 0);
-    game.move.select(MoveId.TACKLE, 1, BattlerIndex.ENEMY);
-
-    await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]);
-
     await game.phaseInterceptor.to("MoveEndPhase");
-    expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender
+
+    // Dragon cheer added +1 stages
+    const magikarp = game.scene.getPlayerField()[1];
+    expect(magikarp).toHaveBattlerTag({ tagType: BattlerTagType.DRAGON_CHEER, critStages: 1 });
+    expect(magikarp).toHaveTypes([PokemonType.WATER]);
+
+    await game.toEndOfTurn();
+
+    // Should be dragon type, but still with a +1 stage boost
+    expect(magikarp).toHaveTypes([PokemonType.DRAGON]);
+    expect(magikarp).toHaveBattlerTag({ tagType: BattlerTagType.DRAGON_CHEER, critStages: 1 });
+  });
+
+  it.each([
+    { name: "Focus Energy", tagType: BattlerTagType.CRIT_BOOST },
+    { name: "Dragon Cheer", tagType: BattlerTagType.DRAGON_CHEER },
+  ])("should fail if $name is already present", async ({ tagType }) => {
+    await game.classicMode.startBattle([SpeciesId.DRAGONAIR, SpeciesId.MAGIKARP]);
+
+    const [dragonair, magikarp] = game.scene.getPlayerField();
+    magikarp.addTag(tagType);
+
+    game.move.use(MoveId.DRAGON_CHEER, BattlerIndex.PLAYER);
+    game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
+    await game.toEndOfTurn();
+
+    expect(dragonair).toHaveUsedMove({ move: MoveId.DRAGON_CHEER, result: MoveResult.FAIL });
+    expect(magikarp).toHaveBattlerTag(tagType);
   });
 });
diff --git a/test/moves/focus-energy.test.ts b/test/moves/focus-energy.test.ts
new file mode 100644
index 00000000000..3c2882f5bf3
--- /dev/null
+++ b/test/moves/focus-energy.test.ts
@@ -0,0 +1,69 @@
+import { AbilityId } from "#enums/ability-id";
+import { BattlerTagType } from "#enums/battler-tag-type";
+import { MoveId } from "#enums/move-id";
+import { MoveResult } from "#enums/move-result";
+import { SpeciesId } from "#enums/species-id";
+import { GameManager } from "#test/test-utils/game-manager";
+import Phaser from "phaser";
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+
+describe("Move - Focus Energy", () => {
+  let phaserGame: Phaser.Game;
+  let game: GameManager;
+
+  beforeAll(() => {
+    phaserGame = new Phaser.Game({
+      type: Phaser.HEADLESS,
+    });
+  });
+
+  afterEach(() => {
+    game.phaseInterceptor.restoreOg();
+  });
+
+  beforeEach(() => {
+    game = new GameManager(phaserGame);
+    game.override
+      .ability(AbilityId.BALL_FETCH)
+      .battleStyle("single")
+      .criticalHits(false)
+      .enemySpecies(SpeciesId.MAGIKARP)
+      .enemyAbility(AbilityId.BALL_FETCH)
+      .enemyMoveset(MoveId.SPLASH)
+      .startingLevel(100)
+      .enemyLevel(100);
+  });
+
+  it("should increase the user's crit ratio by 2 stages", async () => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    game.move.use(MoveId.FOCUS_ENERGY);
+    await game.toNextTurn();
+
+    const feebas = game.field.getPlayerPokemon();
+    expect(feebas).toHaveBattlerTag({ tagType: BattlerTagType.CRIT_BOOST, critStages: 2 });
+
+    const enemy = game.field.getEnemyPokemon();
+    vi.spyOn(enemy, "getCritStage");
+
+    game.move.use(MoveId.TACKLE);
+    await game.toEndOfTurn();
+
+    expect(enemy.getCritStage).toHaveReturnedWith(2);
+  });
+
+  it.each([
+    { name: "Focus Energy", tagType: BattlerTagType.CRIT_BOOST },
+    { name: "Dragon Cheer", tagType: BattlerTagType.DRAGON_CHEER },
+  ])("should fail if $name is already present", async ({ tagType }) => {
+    await game.classicMode.startBattle([SpeciesId.FEEBAS]);
+
+    const feebas = game.field.getPlayerPokemon();
+    feebas.addTag(tagType);
+
+    game.move.use(MoveId.FOCUS_ENERGY);
+    await game.toEndOfTurn();
+
+    expect(feebas).toHaveUsedMove({ move: MoveId.FOCUS_ENERGY, result: MoveResult.FAIL });
+  });
+});
diff --git a/test/moves/focus-punch.test.ts b/test/moves/focus-punch.test.ts
index 9a76dbec0db..d7b40569aaa 100644
--- a/test/moves/focus-punch.test.ts
+++ b/test/moves/focus-punch.test.ts
@@ -9,7 +9,7 @@ import { TurnStartPhase } from "#phases/turn-start-phase";
 import { GameManager } from "#test/test-utils/game-manager";
 import i18next from "i18next";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Moves - Focus Punch", () => {
   let phaserGame: Phaser.Game;
@@ -125,8 +125,8 @@ describe("Moves - Focus Punch", () => {
     game.move.select(MoveId.FOCUS_PUNCH);
     await game.phaseInterceptor.to("MoveEndPhase", true);
     await game.phaseInterceptor.to("MessagePhase", false);
-    const consoleSpy = vi.spyOn(console, "log");
     await game.phaseInterceptor.to("MoveEndPhase", true);
-    expect(consoleSpy).nthCalledWith(1, i18next.t("moveTriggers:lostFocus", { pokemonName: "Charizard" }));
+    expect(game.textInterceptor.logs).toContain(i18next.t("moveTriggers:lostFocus", { pokemonName: "Charizard" }));
+    expect(game.textInterceptor.logs).not.toContain(i18next.t("battle:attackFailed"));
   });
 });
diff --git a/test/moves/transform-imposter.test.ts b/test/moves/transform-imposter.test.ts
index b1631130154..1b38a4bce9c 100644
--- a/test/moves/transform-imposter.test.ts
+++ b/test/moves/transform-imposter.test.ts
@@ -212,7 +212,7 @@ describe("Transforming Effects", () => {
       await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
       await game.toNextWave();
 
-      expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+      expect(game).toBeAtPhase("CommandPhase");
       expect(game.scene.currentBattle.waveIndex).toBe(2);
 
       await game.reload.reloadSession();
@@ -242,7 +242,7 @@ describe("Transforming Effects", () => {
       await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
       await game.toNextWave();
 
-      expect(game.scene.phaseManager.getCurrentPhase()?.phaseName).toBe("CommandPhase");
+      expect(game).toBeAtPhase("CommandPhase");
       expect(game.scene.currentBattle.waveIndex).toBe(2);
 
       expect(player.getSpeciesForm().speciesId).toBe(enemy.getSpeciesForm().speciesId);
diff --git a/test/mystery-encounter/encounter-test-utils.ts b/test/mystery-encounter/encounter-test-utils.ts
index 7b2dbfc9aeb..fcf27b2c6fb 100644
--- a/test/mystery-encounter/encounter-test-utils.ts
+++ b/test/mystery-encounter/encounter-test-utils.ts
@@ -13,10 +13,10 @@ import {
 } from "#phases/mystery-encounter-phases";
 import { VictoryPhase } from "#phases/victory-phase";
 import type { GameManager } from "#test/test-utils/game-manager";
-import type { MessageUiHandler } from "#ui/message-ui-handler";
-import type { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler";
+import type { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import type { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler";
+import type { PartyUiHandler } from "#ui/handlers/party-ui-handler";
 import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler";
-import type { PartyUiHandler } from "#ui/party-ui-handler";
 import { isNullOrUndefined } from "#utils/common";
 import { expect, vi } from "vitest";
 
diff --git a/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
index 93cf4537c53..b4bd74d44d6 100644
--- a/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
+++ b/test/mystery-encounter/encounters/a-trainers-test-encounter.test.ts
@@ -9,7 +9,6 @@ import { ATrainersTestEncounter } from "#mystery-encounters/a-trainers-test-enco
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
 import { PartyHealPhase } from "#phases/party-heal-phase";
 import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
@@ -106,7 +105,7 @@ describe("A Trainer's Test - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(
@@ -131,7 +130,7 @@ describe("A Trainer's Test - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
 
       const eggsAfter = scene.gameData.eggs;
       expect(eggsAfter).toBeDefined();
@@ -179,7 +178,7 @@ describe("A Trainer's Test - Mystery Encounter", () => {
 
       await runMysteryEncounterToEnd(game, 2);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
 
       const eggsAfter = scene.gameData.eggs;
       expect(eggsAfter).toBeDefined();
diff --git a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
index 562482dd520..d269e40db0f 100644
--- a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
+++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts
@@ -10,7 +10,6 @@ import { BerryModifier, PokemonHeldItemModifier } from "#modifiers/modifier";
 import { AbsoluteAvariceEncounter } from "#mystery-encounters/absolute-avarice-encounter";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
 import { MovePhase } from "#phases/move-phase";
 import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
@@ -132,7 +131,7 @@ describe("Absolute Avarice - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(SpeciesId.GREEDENT);
       const moveset = enemyField[0].moveset.map(m => m.moveId);
@@ -148,7 +147,7 @@ describe("Absolute Avarice - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
 
       for (const partyPokemon of scene.getPlayerParty()) {
         const pokemonId = partyPokemon.id;
diff --git a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
index 12c5a6515bc..44585d4d795 100644
--- a/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
+++ b/test/mystery-encounter/encounters/berries-abound-encounter.test.ts
@@ -11,15 +11,13 @@ import { BerriesAboundEncounter } from "#mystery-encounters/berries-abound-encou
 import * as EncounterDialogueUtils from "#mystery-encounters/encounter-dialogue-utils";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/berriesAbound";
@@ -114,7 +112,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
     });
@@ -135,7 +133,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
 
       const berriesAfter = scene.findModifiers(m => m instanceof BerryModifier) as BerryModifier[];
       const berriesAfterCount = berriesAfter.reduce((a, b) => a + b.stackCount, 0);
@@ -186,7 +184,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
@@ -210,7 +208,7 @@ describe("Berries Abound - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
@@ -230,8 +228,6 @@ describe("Berries Abound - Mystery Encounter", () => {
       });
 
       await runMysteryEncounterToEnd(game, 2);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
index 13d3c030c63..a3357b00b89 100644
--- a/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
+++ b/test/mystery-encounter/encounters/bug-type-superfan-encounter.test.ts
@@ -12,9 +12,7 @@ import { PokemonMove } from "#moves/pokemon-move";
 import { BugTypeSuperfanEncounter } from "#mystery-encounters/bug-type-superfan-encounter";
 import * as encounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
-import { MysteryEncounterPhase, MysteryEncounterRewardsPhase } from "#phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
+import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
 import {
   runMysteryEncounterToEnd,
   runSelectMysteryEncounterOption,
@@ -22,7 +20,7 @@ import {
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/bugTypeSuperfan";
@@ -231,7 +229,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(2);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -244,7 +242,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(3);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -258,7 +256,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(4);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -273,7 +271,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(5);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -289,7 +287,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(5);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -307,7 +305,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(5);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -325,7 +323,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(5);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -343,7 +341,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyParty = scene.getEnemyParty();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyParty.length).toBe(5);
       expect(scene.currentBattle.trainer?.config.trainerType).toBe(TrainerType.BUG_TYPE_SUPERFAN);
       expect(enemyParty[0].species.speciesId).toBe(SpeciesId.BEEDRILL);
@@ -365,7 +363,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game, false);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterRewardsPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterRewardsPhase");
       game.phaseInterceptor["prompts"] = []; // Clear out prompt handlers
       game.onNextPrompt("MysteryEncounterRewardsPhase", UiMode.OPTION_SELECT, () => {
         game.endPhase();
@@ -406,7 +404,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -416,7 +414,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.BUG_TYPE_SUPERFAN, defaultParty);
       await runMysteryEncounterToEnd(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -435,7 +433,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       ]);
       await runMysteryEncounterToEnd(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -457,7 +455,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       ]);
       await runMysteryEncounterToEnd(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -481,7 +479,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
       ]);
       await runMysteryEncounterToEnd(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -542,7 +540,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 3);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -557,7 +555,7 @@ describe("Bug-Type Superfan - Mystery Encounter", () => {
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
index f02a5c623af..d199a331943 100644
--- a/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
+++ b/test/mystery-encounter/encounters/clowning-around-encounter.test.ts
@@ -22,18 +22,15 @@ import { ClowningAroundEncounter } from "#mystery-encounters/clowning-around-enc
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import { generateModifierType } from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
 import { MovePhase } from "#phases/move-phase";
-import { PostMysteryEncounterPhase } from "#phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
+import type { PartyUiHandler } from "#ui/handlers/party-ui-handler";
 import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler";
-import type { PartyUiHandler } from "#ui/party-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -171,7 +168,7 @@ describe("Clowning Around - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(2);
       expect(enemyField[0].species.speciesId).toBe(SpeciesId.MR_MIME);
       expect(enemyField[0].moveset).toEqual([
@@ -199,9 +196,6 @@ describe("Clowning Around - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.CLOWNING_AROUND, defaultParty);
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
-      await game.phaseInterceptor.to("SelectModifierPhase");
       const abilityToTrain = scene.currentBattle.mysteryEncounter?.misc.ability;
 
       game.onNextPrompt("PostMysteryEncounterPhase", UiMode.MESSAGE, () => {
@@ -215,7 +209,7 @@ describe("Clowning Around - Mystery Encounter", () => {
       vi.spyOn(partyUiHandler, "show");
       game.endPhase();
       await game.phaseInterceptor.to("PostMysteryEncounterPhase");
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(PostMysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("PostMysteryEncounterPhase");
 
       // Wait for Yes/No confirmation to appear
       await vi.waitFor(() => expect(optionSelectUiHandler.show).toHaveBeenCalled());
diff --git a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
index de47b074089..bf42e6d4df3 100644
--- a/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
+++ b/test/mystery-encounter/encounters/dancing-lessons-encounter.test.ts
@@ -9,18 +9,16 @@ import { UiMode } from "#enums/ui-mode";
 import { DancingLessonsEncounter } from "#mystery-encounters/dancing-lessons-encounter";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
 import { LearnMovePhase } from "#phases/learn-move-phase";
 import { MovePhase } from "#phases/move-phase";
 import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   runSelectMysteryEncounterOption,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/dancingLessons";
@@ -105,7 +103,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(SpeciesId.ORICORIO);
       expect(enemyField[0].summonData.statStages).toEqual([1, 1, 1, 1, 0, 0, 0]);
@@ -126,7 +124,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -226,7 +224,7 @@ describe("Dancing Lessons - Mystery Encounter", () => {
       await runSelectMysteryEncounterOption(game, 3);
       const partyCountAfter = scene.getPlayerParty().length;
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
index 7398b639f1c..fe17f091d0e 100644
--- a/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
+++ b/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
@@ -161,7 +161,7 @@ describe("Delibird-y - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 1);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -316,7 +316,7 @@ describe("Delibird-y - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -449,7 +449,7 @@ describe("Delibird-y - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 3);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
index 3c19d458049..2ee83945159 100644
--- a/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
+++ b/test/mystery-encounter/encounters/department-store-sale-encounter.test.ts
@@ -9,10 +9,9 @@ import { DepartmentStoreSaleEncounter } from "#mystery-encounters/department-sto
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/departmentStoreSale";
@@ -93,7 +92,7 @@ describe("Department Store Sale - Mystery Encounter", () => {
     it("should have shop with only TMs", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DEPARTMENT_STORE_SALE, defaultParty);
       await runMysteryEncounterToEnd(game, 1);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -130,7 +129,7 @@ describe("Department Store Sale - Mystery Encounter", () => {
     it("should have shop with only Vitamins", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DEPARTMENT_STORE_SALE, defaultParty);
       await runMysteryEncounterToEnd(game, 2);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -170,7 +169,7 @@ describe("Department Store Sale - Mystery Encounter", () => {
     it("should have shop with only X Items", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DEPARTMENT_STORE_SALE, defaultParty);
       await runMysteryEncounterToEnd(game, 3);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -210,7 +209,7 @@ describe("Department Store Sale - Mystery Encounter", () => {
     it("should have shop with only Pokeballs", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.DEPARTMENT_STORE_SALE, defaultParty);
       await runMysteryEncounterToEnd(game, 4);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/field-trip-encounter.test.ts b/test/mystery-encounter/encounters/field-trip-encounter.test.ts
index fd3e20012b1..b8e6e36cf17 100644
--- a/test/mystery-encounter/encounters/field-trip-encounter.test.ts
+++ b/test/mystery-encounter/encounters/field-trip-encounter.test.ts
@@ -12,7 +12,7 @@ import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import i18next from "i18next";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
diff --git a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
index 54f790ca207..91a32c025d5 100644
--- a/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fiery-fallout-encounter.test.ts
@@ -16,7 +16,6 @@ import { AttackTypeBoosterModifier, PokemonHeldItemModifier } from "#modifiers/m
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import { FieryFalloutEncounter } from "#mystery-encounters/fiery-fallout-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
 import { MovePhase } from "#phases/move-phase";
 import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
 import { SelectModifierPhase } from "#phases/select-modifier-phase";
@@ -161,7 +160,7 @@ describe("Fiery Fallout - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(2);
       expect(enemyField[0].species.speciesId).toBe(SpeciesId.VOLCARONA);
       expect(enemyField[1].species.speciesId).toBe(SpeciesId.VOLCARONA);
@@ -177,7 +176,7 @@ describe("Fiery Fallout - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
 
       const leadPokemonId = scene.getPlayerParty()?.[0].id;
       const leadPokemonItems = scene.findModifiers(
@@ -266,7 +265,7 @@ describe("Fiery Fallout - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FIERY_FALLOUT, defaultParty);
       await runMysteryEncounterToEnd(game, 3);
       await game.phaseInterceptor.to(SelectModifierPhase, false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
 
       const leadPokemonItems = scene.getPlayerParty()[0].getHeldItems() as PokemonHeldItemModifier[];
       const item = leadPokemonItems.find(i => i instanceof AttackTypeBoosterModifier);
@@ -292,7 +291,7 @@ describe("Fiery Fallout - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 3);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(continueEncounterSpy).not.toHaveBeenCalled();
     });
   });
diff --git a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
index 8650b42ce4d..34c0f635000 100644
--- a/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fight-or-flight-encounter.test.ts
@@ -9,9 +9,7 @@ import { UiMode } from "#enums/ui-mode";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import { FightOrFlightEncounter } from "#mystery-encounters/fight-or-flight-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
 import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   runSelectMysteryEncounterOption,
@@ -19,7 +17,7 @@ import {
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/fightOrFlight";
@@ -109,7 +107,7 @@ describe("Fight or Flight - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
     });
@@ -122,8 +120,9 @@ describe("Fight or Flight - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
+
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
 
       const modifierSelectHandler = scene.ui.handlers.find(
@@ -165,7 +164,7 @@ describe("Fight or Flight - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -182,7 +181,7 @@ describe("Fight or Flight - Mystery Encounter", () => {
 
       await runMysteryEncounterToEnd(game, 2);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
 
diff --git a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
index 7bfaaac1141..8a058bad5fe 100644
--- a/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
+++ b/test/mystery-encounter/encounters/fun-and-games-encounter.test.ts
@@ -14,16 +14,15 @@ import { FunAndGamesEncounter } from "#mystery-encounters/fun-and-games-encounte
 import { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
+import type { CommandPhase } from "#phases/command-phase";
 import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   runSelectMysteryEncounterOption,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/funAndGames";
@@ -131,7 +130,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 1);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -143,7 +142,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(game.field.getEnemyPokemon().species.speciesId).toBe(SpeciesId.WOBBUFFET);
       expect(game.field.getEnemyPokemon().ivs).toEqual([0, 0, 0, 0, 0, 0]);
       expect(game.field.getEnemyPokemon().nature).toBe(Nature.MILD);
@@ -165,7 +164,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.phaseInterceptor.to("SelectModifierPhase", false);
 
       // Rewards
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
     });
 
     it("should have no items in rewards if Wubboffet doesn't take enough damage", async () => {
@@ -173,7 +172,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
@@ -184,7 +183,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.phaseInterceptor.to("SelectModifierPhase", false);
 
       // Rewards
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -200,7 +199,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
@@ -213,7 +212,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.phaseInterceptor.to("SelectModifierPhase", false);
 
       // Rewards
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -230,7 +229,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
@@ -243,7 +242,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.phaseInterceptor.to("SelectModifierPhase", false);
 
       // Rewards
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -260,7 +259,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.FUN_AND_GAMES, defaultParty);
       await runMysteryEncounterToEnd(game, 1, { pokemonNo: 1 }, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       game.onNextPrompt("MessagePhase", UiMode.MESSAGE, () => {
         game.endPhase();
       });
@@ -273,7 +272,7 @@ describe("Fun And Games! - Mystery Encounter", () => {
       await game.phaseInterceptor.to("SelectModifierPhase", false);
 
       // Rewards
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
index bb56505ac48..90bc41fde2b 100644
--- a/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
+++ b/test/mystery-encounter/encounters/global-trade-system-encounter.test.ts
@@ -13,10 +13,9 @@ import { generateModifierType } from "#mystery-encounters/encounter-phase-utils"
 import { GlobalTradeSystemEncounter } from "#mystery-encounters/global-trade-system-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { CIVILIZATION_ENCOUNTER_BIOMES } from "#mystery-encounters/mystery-encounters";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import * as Utils from "#utils/common";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -226,7 +225,7 @@ describe("Global Trade System - Mystery Encounter", () => {
       await scene.updateModifiers(true);
 
       await runMysteryEncounterToEnd(game, 3, { pokemonNo: 1, optionNo: 1 });
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
index 73134381553..ed0ca02720c 100644
--- a/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
+++ b/test/mystery-encounter/encounters/lost-at-sea-encounter.test.ts
@@ -147,7 +147,7 @@ describe("Lost at Sea - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 1);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -212,7 +212,7 @@ describe("Lost at Sea - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
index 0c4e3044bbd..0d87533ea37 100644
--- a/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
+++ b/test/mystery-encounter/encounters/mysterious-challengers-encounter.test.ts
@@ -12,8 +12,6 @@ import { MysteriousChallengersEncounter } from "#mystery-encounters/mysterious-c
 import { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
-import { CommandPhase } from "#phases/command-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
@@ -22,7 +20,7 @@ import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
 import { TrainerConfig } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/mysteriousChallengers";
@@ -152,7 +150,7 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, defaultParty);
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE);
     });
@@ -162,7 +160,7 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -196,7 +194,7 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, defaultParty);
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE);
     });
@@ -206,7 +204,7 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -253,7 +251,7 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, defaultParty);
       await runMysteryEncounterToEnd(game, 3, undefined, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE);
     });
@@ -262,8 +260,7 @@ describe("Mysterious Challengers - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.MYSTERIOUS_CHALLENGERS, defaultParty);
       await runMysteryEncounterToEnd(game, 3, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/part-timer-encounter.test.ts b/test/mystery-encounter/encounters/part-timer-encounter.test.ts
index 36a92b2b6bf..1826c75381a 100644
--- a/test/mystery-encounter/encounters/part-timer-encounter.test.ts
+++ b/test/mystery-encounter/encounters/part-timer-encounter.test.ts
@@ -246,7 +246,7 @@ describe("Part-Timer - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 3);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/safari-zone.test.ts b/test/mystery-encounter/encounters/safari-zone.test.ts
index ec43dcfb69b..dd41d08df38 100644
--- a/test/mystery-encounter/encounters/safari-zone.test.ts
+++ b/test/mystery-encounter/encounters/safari-zone.test.ts
@@ -119,7 +119,7 @@ describe("Safari Zone - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 1);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
index 4d006abc636..a096ea5ff6e 100644
--- a/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
+++ b/test/mystery-encounter/encounters/teleporting-hijinks-encounter.test.ts
@@ -8,9 +8,7 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { TeleportingHijinksEncounter } from "#mystery-encounters/teleporting-hijinks-encounter";
-import { CommandPhase } from "#phases/command-phase";
 import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   runSelectMysteryEncounterOption,
@@ -18,7 +16,7 @@ import {
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import i18next from "i18next";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -157,7 +155,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 1);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -167,7 +165,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, defaultParty);
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
     });
 
     it("should transport to a new area", async () => {
@@ -229,7 +227,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -239,7 +237,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TELEPORTING_HIJINKS, [SpeciesId.METAGROSS]);
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
     });
 
     it("should transport to a new area", async () => {
@@ -300,7 +298,7 @@ describe("Teleporting Hijinks - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 3, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
index ade98bfa99f..ae4eb0647ce 100644
--- a/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-expert-breeder-encounter.test.ts
@@ -12,8 +12,6 @@ import { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
 import { TheExpertPokemonBreederEncounter } from "#mystery-encounters/the-expert-pokemon-breeder-encounter";
-import { CommandPhase } from "#phases/command-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
@@ -157,7 +155,7 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
       expect(successfullyLoaded).toBe(true);
 
       // Check usual battle stuff
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE);
       expect(scene.getPlayerParty().length).toBe(1);
@@ -175,8 +173,8 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
 
       await runMysteryEncounterToEnd(game, 1, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
+      await game.phaseInterceptor.to("SelectModifierPhase");
 
       const eggsAfter = scene.gameData.eggs;
       const commonEggs = scene.currentBattle.mysteryEncounter!.misc.pokemon1CommonEggs;
@@ -242,7 +240,7 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
       expect(successfullyLoaded).toBe(true);
 
       // Check usual battle stuff
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE);
       expect(scene.getPlayerParty().length).toBe(1);
@@ -260,8 +258,8 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
 
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
+      await game.phaseInterceptor.to("SelectModifierPhase");
 
       const eggsAfter = scene.gameData.eggs;
       const commonEggs = scene.currentBattle.mysteryEncounter!.misc.pokemon2CommonEggs;
@@ -324,7 +322,7 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
       expect(successfullyLoaded).toBe(true);
 
       // Check usual battle stuff
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.mysteryEncounter?.encounterMode).toBe(MysteryEncounterMode.TRAINER_BATTLE);
       expect(scene.getPlayerParty().length).toBe(1);
@@ -342,8 +340,8 @@ describe("The Expert Pokémon Breeder - Mystery Encounter", () => {
 
       await runMysteryEncounterToEnd(game, 3, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
+      await game.phaseInterceptor.to("SelectModifierPhase");
 
       const eggsAfter = scene.gameData.eggs;
       const commonEggs = scene.currentBattle.mysteryEncounter!.misc.pokemon3CommonEggs;
diff --git a/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
index 3880c07c312..4011a850a08 100644
--- a/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-pokemon-salesman-encounter.test.ts
@@ -182,7 +182,7 @@ describe("The Pokemon Salesman - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 1);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
index 3592e2dc774..5df2d2ab358 100644
--- a/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-strong-stuff-encounter.test.ts
@@ -17,16 +17,14 @@ import { PokemonMove } from "#moves/pokemon-move";
 import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { TheStrongStuffEncounter } from "#mystery-encounters/the-strong-stuff-encounter";
-import { CommandPhase } from "#phases/command-phase";
 import { MovePhase } from "#phases/move-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -192,7 +190,7 @@ describe("The Strong Stuff - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(SpeciesId.SHUCKLE);
       expect(enemyField[0].summonData.statStages).toEqual([0, 1, 0, 1, 0, 0, 0]);
@@ -230,7 +228,7 @@ describe("The Strong Stuff - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
index cf0ff7a94bd..9b009879522 100644
--- a/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
+++ b/test/mystery-encounter/encounters/the-winstrate-challenge-encounter.test.ts
@@ -15,14 +15,12 @@ import { MysteryEncounter } from "#mystery-encounters/mystery-encounter";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { HUMAN_TRANSITABLE_BIOMES } from "#mystery-encounters/mystery-encounters";
 import { TheWinstrateChallengeEncounter } from "#mystery-encounters/the-winstrate-challenge-encounter";
-import { CommandPhase } from "#phases/command-phase";
 import { PartyHealPhase } from "#phases/party-heal-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import { VictoryPhase } from "#phases/victory-phase";
 import { runMysteryEncounterToEnd } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -262,7 +260,7 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.THE_WINSTRATE_CHALLENGE, defaultParty);
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(scene.currentBattle.trainer).toBeDefined();
       expect(scene.currentBattle.trainer!.config.trainerType).toBe(TrainerType.VICTOR);
       expect(scene.currentBattle.mysteryEncounter?.enemyPartyConfigs.length).toBe(4);
@@ -295,7 +293,7 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
       // Should have Macho Brace in the rewards
       await skipBattleToNextBattle(game, true);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -337,7 +335,7 @@ describe("The Winstrate Challenge - Mystery Encounter", () => {
     it("should have a Rarer Candy in the rewards", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.THE_WINSTRATE_CHALLENGE, defaultParty);
       await runMysteryEncounterToEnd(game, 2);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
index 7cc9a69b32d..a370c3ecc98 100644
--- a/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
+++ b/test/mystery-encounter/encounters/trash-to-treasure-encounter.test.ts
@@ -20,16 +20,14 @@ import {
 } from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { TrashToTreasureEncounter } from "#mystery-encounters/trash-to-treasure-encounter";
-import { CommandPhase } from "#phases/command-phase";
 import { MovePhase } from "#phases/move-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import * as Utils from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
@@ -172,8 +170,8 @@ describe("Trash to Treasure - Mystery Encounter", () => {
     it("should give 1 Leftovers, 1 Shell Bell, and Black Sludge", async () => {
       await game.runToMysteryEncounter(MysteryEncounterType.TRASH_TO_TREASURE, defaultParty);
       await runMysteryEncounterToEnd(game, 1);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
+      await game.phaseInterceptor.to("SelectModifierPhase");
 
       const leftovers = scene.findModifier(m => m instanceof TurnHealModifier) as TurnHealModifier;
       expect(leftovers).toBeDefined();
@@ -221,7 +219,7 @@ describe("Trash to Treasure - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(SpeciesId.GARBODOR);
       expect(enemyField[0].moveset).toEqual([
@@ -243,7 +241,7 @@ describe("Trash to Treasure - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
index 5aadaf5c29a..e5b086ceba9 100644
--- a/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
+++ b/test/mystery-encounter/encounters/uncommon-breed-encounter.test.ts
@@ -15,7 +15,6 @@ import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"
 import { generateModifierType } from "#mystery-encounters/encounter-phase-utils";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { UncommonBreedEncounter } from "#mystery-encounters/uncommon-breed-encounter";
-import { CommandPhase } from "#phases/command-phase";
 import { MovePhase } from "#phases/move-phase";
 import { MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
 import { StatStageChangePhase } from "#phases/stat-stage-change-phase";
@@ -120,7 +119,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
@@ -147,7 +146,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 1, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(enemyField[0].species.speciesId).toBe(speciesToSpawn);
 
@@ -199,7 +198,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 2);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
@@ -259,7 +258,7 @@ describe("Uncommon Breed - Mystery Encounter", () => {
 
       await runSelectMysteryEncounterOption(game, 3);
 
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
       expect(scene.ui.playError).not.toHaveBeenCalled(); // No error sfx, option is disabled
       expect(mysteryEncounterPhase.handleOptionSelect).not.toHaveBeenCalled();
       expect(mysteryEncounterPhase.continueEncounter).not.toHaveBeenCalled();
diff --git a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
index e2ec7ae514a..44ae5a45d51 100644
--- a/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
+++ b/test/mystery-encounter/encounters/weird-dream-encounter.test.ts
@@ -10,15 +10,13 @@ import * as EncounterPhaseUtils from "#mystery-encounters/encounter-phase-utils"
 import * as EncounterTransformationSequence from "#mystery-encounters/encounter-transformation-sequence";
 import * as MysteryEncounters from "#mystery-encounters/mystery-encounters";
 import { WeirdDreamEncounter } from "#mystery-encounters/weird-dream-encounter";
-import { CommandPhase } from "#phases/command-phase";
-import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import {
   runMysteryEncounterToEnd,
   skipBattleRunMysteryEncounterRewardsPhase,
 } from "#test/mystery-encounter/encounter-test-utils";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 
 const namespace = "mysteryEncounters/weirdDream";
@@ -116,8 +114,8 @@ describe("Weird Dream - Mystery Encounter", () => {
       const bstsPrior = pokemonPrior.map(species => species.getSpeciesForm().getBaseStatTotal());
 
       await runMysteryEncounterToEnd(game, 1);
-      await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
+      await game.phaseInterceptor.to("SelectModifierPhase");
 
       const pokemonAfter = scene.getPlayerParty();
       const bstsAfter = pokemonAfter.map(pokemon => pokemon.getSpeciesForm().getBaseStatTotal());
@@ -140,7 +138,7 @@ describe("Weird Dream - Mystery Encounter", () => {
       await game.runToMysteryEncounter(MysteryEncounterType.WEIRD_DREAM, defaultParty);
       await runMysteryEncounterToEnd(game, 1);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
@@ -187,7 +185,7 @@ describe("Weird Dream - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
 
       const enemyField = scene.getEnemyField();
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(CommandPhase.name);
+      expect(game).toBeAtPhase("CommandPhase");
       expect(enemyField.length).toBe(1);
       expect(scene.getEnemyParty().length).toBe(scene.getPlayerParty().length);
     });
@@ -197,7 +195,7 @@ describe("Weird Dream - Mystery Encounter", () => {
       await runMysteryEncounterToEnd(game, 2, undefined, true);
       await skipBattleRunMysteryEncounterRewardsPhase(game);
       await game.phaseInterceptor.to("SelectModifierPhase", false);
-      expect(scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(SelectModifierPhase.name);
+      expect(game).toBeAtPhase("SelectModifierPhase");
       await game.phaseInterceptor.to("SelectModifierPhase");
 
       expect(scene.ui.getMode()).to.equal(UiMode.MODIFIER_SELECT);
diff --git a/test/mystery-encounter/mystery-encounter.test.ts b/test/mystery-encounter/mystery-encounter.test.ts
index ec27f7c6a48..d44e3dd2905 100644
--- a/test/mystery-encounter/mystery-encounter.test.ts
+++ b/test/mystery-encounter/mystery-encounter.test.ts
@@ -34,7 +34,7 @@ describe("Mystery Encounters", () => {
     ]);
 
     await game.phaseInterceptor.to(MysteryEncounterPhase, false);
-    expect(game.scene.phaseManager.getCurrentPhase()!.constructor.name).toBe(MysteryEncounterPhase.name);
+    expect(game).toBeAtPhase("MysteryEncounterPhase");
   });
 
   it("Encounters should not run on X1 waves", async () => {
diff --git a/test/phases/mystery-encounter-phase.test.ts b/test/phases/mystery-encounter-phase.test.ts
index a3dc779b02c..8dfbd509a05 100644
--- a/test/phases/mystery-encounter-phase.test.ts
+++ b/test/phases/mystery-encounter-phase.test.ts
@@ -3,10 +3,10 @@ import { MysteryEncounterTier } from "#enums/mystery-encounter-tier";
 import { MysteryEncounterType } from "#enums/mystery-encounter-type";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
-import { MysteryEncounterOptionSelectedPhase, MysteryEncounterPhase } from "#phases/mystery-encounter-phases";
+import { MysteryEncounterOptionSelectedPhase } from "#phases/mystery-encounter-phases";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { MessageUiHandler } from "#ui/message-ui-handler";
-import type { MysteryEncounterUiHandler } from "#ui/mystery-encounter-ui-handler";
+import type { MessageUiHandler } from "#ui/handlers/message-ui-handler";
+import type { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
@@ -38,7 +38,7 @@ describe("Mystery Encounter Phases", () => {
       ]);
 
       await game.phaseInterceptor.to("MysteryEncounterPhase", false);
-      expect(game.scene.phaseManager.getCurrentPhase()?.constructor.name).toBe(MysteryEncounterPhase.name);
+      expect(game).toBeAtPhase("MysteryEncounterPhase");
     });
 
     it("Runs MysteryEncounterPhase", async () => {
diff --git a/test/phases/select-modifier-phase.test.ts b/test/phases/select-modifier-phase.test.ts
index b77e31e931f..a23ed99b049 100644
--- a/test/phases/select-modifier-phase.test.ts
+++ b/test/phases/select-modifier-phase.test.ts
@@ -12,7 +12,7 @@ import { ModifierTypeOption } from "#modifiers/modifier-type";
 import { SelectModifierPhase } from "#phases/select-modifier-phase";
 import { GameManager } from "#test/test-utils/game-manager";
 import { initSceneWithoutEncounterPhase } from "#test/test-utils/game-manager-utils";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
 import { shiftCharCodes } from "#utils/common";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import Phaser from "phaser";
diff --git a/test/plugins/api/pokerogue-daily-api.test.ts b/test/plugins/api/pokerogue-daily-api.test.ts
index ef5dfddada5..b45896e6a2c 100644
--- a/test/plugins/api/pokerogue-daily-api.test.ts
+++ b/test/plugins/api/pokerogue-daily-api.test.ts
@@ -2,7 +2,7 @@ import { PokerogueDailyApi } from "#api/pokerogue-daily-api";
 import { initServerForApiTests } from "#test/test-utils/test-file-initialization";
 import { getApiBaseUrl } from "#test/test-utils/test-utils";
 import type { GetDailyRankingsPageCountRequest, GetDailyRankingsRequest } from "#types/api/pokerogue-daily-api";
-import { type RankingEntry, ScoreboardCategory } from "#ui/daily-run-scoreboard";
+import { type RankingEntry, ScoreboardCategory } from "#ui/containers/daily-run-scoreboard";
 import { HttpResponse, http } from "msw";
 import type { SetupServerApi } from "msw/node";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/test-utils/game-manager-utils.ts b/test/test-utils/game-manager-utils.ts
index 89e352cdbdc..e9c3e9809cc 100644
--- a/test/test-utils/game-manager-utils.ts
+++ b/test/test-utils/game-manager-utils.ts
@@ -9,7 +9,7 @@ import type { MoveId } from "#enums/move-id";
 import type { SpeciesId } from "#enums/species-id";
 import { PlayerPokemon } from "#field/pokemon";
 import type { StarterMoveset } from "#system/game-data";
-import type { Starter } from "#ui/starter-select-ui-handler";
+import type { Starter } from "#ui/handlers/starter-select-ui-handler";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
 
 /** Function to convert Blob to string */
diff --git a/test/test-utils/game-manager.ts b/test/test-utils/game-manager.ts
index 57badd866b1..b8144db9d76 100644
--- a/test/test-utils/game-manager.ts
+++ b/test/test-utils/game-manager.ts
@@ -44,13 +44,14 @@ import type { InputsHandler } from "#test/test-utils/inputs-handler";
 import { MockFetch } from "#test/test-utils/mocks/mock-fetch";
 import { PhaseInterceptor } from "#test/test-utils/phase-interceptor";
 import { TextInterceptor } from "#test/test-utils/text-interceptor";
-import type { BallUiHandler } from "#ui/ball-ui-handler";
-import type { BattleMessageUiHandler } from "#ui/battle-message-ui-handler";
-import type { CommandUiHandler } from "#ui/command-ui-handler";
-import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
-import type { PartyUiHandler } from "#ui/party-ui-handler";
-import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
-import type { TargetSelectUiHandler } from "#ui/target-select-ui-handler";
+import type { PhaseClass, PhaseString } from "#types/phase-types";
+import type { BallUiHandler } from "#ui/handlers/ball-ui-handler";
+import type { BattleMessageUiHandler } from "#ui/handlers/battle-message-ui-handler";
+import type { CommandUiHandler } from "#ui/handlers/command-ui-handler";
+import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
+import type { PartyUiHandler } from "#ui/handlers/party-ui-handler";
+import type { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
+import type { TargetSelectUiHandler } from "#ui/handlers/target-select-ui-handler";
 import { isNullOrUndefined } from "#utils/common";
 import fs from "node:fs";
 import { AES, enc } from "crypto-js";
@@ -160,7 +161,7 @@ export class GameManager {
    * End the currently running phase immediately.
    */
   endPhase() {
-    this.scene.phaseManager.getCurrentPhase()?.end();
+    this.scene.phaseManager.getCurrentPhase().end();
   }
 
   /**
@@ -412,10 +413,11 @@ export class GameManager {
    * Checks if the current phase matches the target phase.
    * @param phaseTarget - The target phase.
    * @returns Whether the current phase matches the target phase
+   * @todo Remove `phaseClass` from signature
    */
-  isCurrentPhase(phaseTarget) {
+  isCurrentPhase(phaseTarget: PhaseClass | PhaseString) {
     const targetName = typeof phaseTarget === "string" ? phaseTarget : phaseTarget.name;
-    return this.scene.phaseManager.getCurrentPhase()?.constructor.name === targetName;
+    return this.scene.phaseManager.getCurrentPhase().phaseName === targetName;
   }
 
   /**
diff --git a/test/test-utils/game-wrapper.ts b/test/test-utils/game-wrapper.ts
index 1a906bf8492..166f4b8de7a 100644
--- a/test/test-utils/game-wrapper.ts
+++ b/test/test-utils/game-wrapper.ts
@@ -6,17 +6,13 @@ import * as bypassLoginModule from "#app/global-vars/bypass-login";
 import { MoveAnim } from "#data/battle-anims";
 import { Pokemon } from "#field/pokemon";
 import { version } from "#package.json";
-import { blobToString } from "#test/test-utils/game-manager-utils";
 import { MockClock } from "#test/test-utils/mocks/mock-clock";
-import { MockFetch } from "#test/test-utils/mocks/mock-fetch";
 import { MockGameObjectCreator } from "#test/test-utils/mocks/mock-game-object-creator";
 import { MockLoader } from "#test/test-utils/mocks/mock-loader";
 import { MockTextureManager } from "#test/test-utils/mocks/mock-texture-manager";
 import { MockTimedEventManager } from "#test/test-utils/mocks/mock-timed-event-manager";
 import { MockContainer } from "#test/test-utils/mocks/mocks-container/mock-container";
-import { PokedexMonContainer } from "#ui/pokedex-mon-container";
-import { sessionIdKey } from "#utils/common";
-import { setCookie } from "#utils/cookies";
+import { PokedexMonContainer } from "#ui/containers/pokedex-mon-container";
 import fs from "node:fs";
 import Phaser from "phaser";
 import { vi } from "vitest";
@@ -28,20 +24,6 @@ const GamepadPlugin = Phaser.Input.Gamepad.GamepadPlugin;
 const EventEmitter = Phaser.Events.EventEmitter;
 const UpdateList = Phaser.GameObjects.UpdateList;
 
-window.URL.createObjectURL = (blob: Blob) => {
-  blobToString(blob).then((data: string) => {
-    localStorage.setItem("toExport", data);
-  });
-  return null;
-};
-navigator.getGamepads = () => [];
-global.fetch = vi.fn(MockFetch);
-setCookie(sessionIdKey, "fake_token");
-
-window.matchMedia = () => ({
-  matches: false,
-});
-
 export class GameWrapper {
   public game: Phaser.Game;
   public scene: BattleScene;
@@ -99,6 +81,7 @@ export class GameWrapper {
       removeAll: () => null,
     };
 
+    // TODO: Can't we just turn on `noAudio` in audio config?
     this.scene.sound = {
       play: () => null,
       pause: () => null,
diff --git a/test/test-utils/helpers/challenge-mode-helper.ts b/test/test-utils/helpers/challenge-mode-helper.ts
index a6d4b5c3b5a..7bc40aec035 100644
--- a/test/test-utils/helpers/challenge-mode-helper.ts
+++ b/test/test-utils/helpers/challenge-mode-helper.ts
@@ -1,5 +1,6 @@
 import overrides from "#app/overrides";
 import type { Challenge } from "#data/challenge";
+import { copyChallenge } from "#data/challenge";
 import { BattleStyle } from "#enums/battle-style";
 import type { Challenges } from "#enums/challenges";
 import type { SpeciesId } from "#enums/species-id";
@@ -10,7 +11,6 @@ import { SelectStarterPhase } from "#phases/select-starter-phase";
 import { TurnInitPhase } from "#phases/turn-init-phase";
 import { generateStarter } from "#test/test-utils/game-manager-utils";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
-import { copyChallenge } from "data/challenge";
 
 /**
  * Helper to handle Challenge mode specifics
diff --git a/test/test-utils/helpers/daily-mode-helper.ts b/test/test-utils/helpers/daily-mode-helper.ts
index ca882eaf548..365c5df3627 100644
--- a/test/test-utils/helpers/daily-mode-helper.ts
+++ b/test/test-utils/helpers/daily-mode-helper.ts
@@ -7,7 +7,7 @@ import { EncounterPhase } from "#phases/encounter-phase";
 import { TitlePhase } from "#phases/title-phase";
 import { TurnInitPhase } from "#phases/turn-init-phase";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
-import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler";
+import type { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler";
 
 /**
  * Helper to handle daily mode specifics
diff --git a/test/test-utils/helpers/overrides-helper.ts b/test/test-utils/helpers/overrides-helper.ts
index 93b89688935..07ea1ea3d09 100644
--- a/test/test-utils/helpers/overrides-helper.ts
+++ b/test/test-utils/helpers/overrides-helper.ts
@@ -1,7 +1,9 @@
 /** biome-ignore-start lint/correctness/noUnusedImports: tsdoc imports */
 import type { NewArenaEvent } from "#events/battle-scene";
+
 /** biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */
 
+import { OVERRIDES_COLOR } from "#app/constants/colors";
 import type { BattleStyle, RandomTrainerOverride } from "#app/overrides";
 import Overrides from "#app/overrides";
 import { AbilityId } from "#enums/ability-id";
@@ -19,6 +21,7 @@ import type { ModifierOverride } from "#modifiers/modifier-type";
 import type { Variant } from "#sprites/variant";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
 import { coerceArray, shiftCharCodes } from "#utils/common";
+import chalk from "chalk";
 import { vi } from "vitest";
 
 /**
@@ -665,6 +668,6 @@ export class OverridesHelper extends GameManagerHelper {
   }
 
   private log(...params: any[]) {
-    console.log("Overrides:", ...params);
+    console.log(chalk.hex(OVERRIDES_COLOR)(...params));
   }
 }
diff --git a/test/test-utils/helpers/settings-helper.ts b/test/test-utils/helpers/settings-helper.ts
index a26aa2de33c..46ac74b83dc 100644
--- a/test/test-utils/helpers/settings-helper.ts
+++ b/test/test-utils/helpers/settings-helper.ts
@@ -1,7 +1,9 @@
+import { SETTINGS_COLOR } from "#app/constants/colors";
 import { BattleStyle } from "#enums/battle-style";
 import { ExpGainsSpeed } from "#enums/exp-gains-speed";
 import { PlayerGender } from "#enums/player-gender";
 import { GameManagerHelper } from "#test/test-utils/helpers/game-manager-helper";
+import chalk from "chalk";
 
 /**
  * Helper to handle settings for tests
@@ -49,6 +51,6 @@ export class SettingsHelper extends GameManagerHelper {
   }
 
   private log(...params: any[]) {
-    console.log("Settings:", ...params);
+    console.log(chalk.hex(SETTINGS_COLOR)(...params));
   }
 }
diff --git a/test/test-utils/matchers/to-be-at-phase.ts b/test/test-utils/matchers/to-be-at-phase.ts
new file mode 100644
index 00000000000..7ff76fa0365
--- /dev/null
+++ b/test/test-utils/matchers/to-be-at-phase.ts
@@ -0,0 +1,45 @@
+/** biome-ignore-start lint/correctness/noUnusedImports: TSDoc imports */
+import type { Phase } from "#app/phase";
+import type { GameManager } from "#test/test-utils/game-manager";
+// biome-ignore-end lint/correctness/noUnusedImports: TSDoc
+
+import { isGameManagerInstance, receivedStr } from "#test/test-utils/test-utils";
+import type { PhaseString } from "#types/phase-types";
+import type { MatcherState, SyncExpectationResult } from "@vitest/expect";
+
+/**
+ * Matcher that checks if the current {@linkcode Phase} is of the given type.
+ * @param received - The object to check. Should be the current {@linkcode GameManager}
+ * @param expectedPhase - The expected {@linkcode PhaseString}
+ * @returns The result of the matching
+ */
+export function toBeAtPhase(this: MatcherState, received: unknown, expectedPhase: PhaseString): SyncExpectationResult {
+  if (!isGameManagerInstance(received)) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected to receive a GameManager, but got ${receivedStr(received)}!`,
+    };
+  }
+
+  if (!received.scene?.phaseManager) {
+    return {
+      pass: this.isNot,
+      message: () => `Expected GameManager.${received.scene ? "scene.phaseManager" : "scene"} to be defined!`,
+    };
+  }
+
+  const currPhase = received.scene.phaseManager.getCurrentPhase();
+  const pass = currPhase.is(expectedPhase);
+
+  const actual = currPhase.phaseName;
+
+  return {
+    pass,
+    message: () =>
+      pass
+        ? `Expected the current phase to NOT be ${expectedPhase}, but it was!`
+        : `Expected the current phase to be ${expectedPhase}, but got ${actual} instead!`,
+    expected: expectedPhase,
+    actual,
+  };
+}
diff --git a/test/test-utils/matchers/to-have-arena-tag.ts b/test/test-utils/matchers/to-have-arena-tag.ts
index e2a4a71ffd5..a9d619686d1 100644
--- a/test/test-utils/matchers/to-have-arena-tag.ts
+++ b/test/test-utils/matchers/to-have-arena-tag.ts
@@ -6,11 +6,21 @@ import type { OneOther } from "#test/@types/test-helpers";
 import type { GameManager } from "#test/test-utils/game-manager";
 import { getOnelineDiffStr } from "#test/test-utils/string-utils";
 import { isGameManagerInstance, receivedStr } from "#test/test-utils/test-utils";
+import type { ArenaTagDataMap, SerializableArenaTagType } from "#types/arena-tags";
 import type { MatcherState, SyncExpectationResult } from "@vitest/expect";
 
-// intersection required to preserve T for inferences
-export type toHaveArenaTagOptions<T extends ArenaTagType> = OneOther<ArenaTagTypeMap[T], "tagType" | "side"> & {
-  tagType: T;
+/**
+ * Options type for {@linkcode toHaveArenaTag}.
+ * @typeParam A - The {@linkcode ArenaTagType} being checked
+ * @remarks
+ * If A corresponds to a serializable `ArenaTag`, only properties allowed to be serialized
+ * (i.e. can change across instances) will be present and able to be checked.
+ */
+export type toHaveArenaTagOptions<A extends ArenaTagType> = OneOther<
+  A extends SerializableArenaTagType ? ArenaTagDataMap[A] : ArenaTagTypeMap[A],
+  "tagType" | "side"
+> & {
+  tagType: A;
 };
 
 /**
@@ -22,10 +32,10 @@ export type toHaveArenaTagOptions<T extends ArenaTagType> = OneOther<ArenaTagTyp
  * {@linkcode ArenaTagSide.BOTH} to check both sides
  * @returns The result of the matching
  */
-export function toHaveArenaTag<T extends ArenaTagType>(
+export function toHaveArenaTag<A extends ArenaTagType>(
   this: MatcherState,
   received: unknown,
-  expectedTag: T | toHaveArenaTagOptions<T>,
+  expectedTag: A | toHaveArenaTagOptions<A>,
   side: ArenaTagSide = ArenaTagSide.BOTH,
 ): SyncExpectationResult {
   if (!isGameManagerInstance(received)) {
diff --git a/test/test-utils/matchers/to-have-battler-tag.ts b/test/test-utils/matchers/to-have-battler-tag.ts
index af405d7da39..ba6679b2af4 100644
--- a/test/test-utils/matchers/to-have-battler-tag.ts
+++ b/test/test-utils/matchers/to-have-battler-tag.ts
@@ -3,21 +3,39 @@ import type { Pokemon } from "#field/pokemon";
 /* biome-ignore-end lint/correctness/noUnusedImports: tsdoc imports */
 
 import { getPokemonNameWithAffix } from "#app/messages";
+import type { BattlerTagTypeMap } from "#data/battler-tags";
 import { BattlerTagType } from "#enums/battler-tag-type";
-import { getEnumStr } from "#test/test-utils/string-utils";
+import type { OneOther } from "#test/@types/test-helpers";
+import { getEnumStr, getOnelineDiffStr } from "#test/test-utils/string-utils";
 import { isPokemonInstance, receivedStr } from "#test/test-utils/test-utils";
+import type { BattlerTagDataMap, SerializableBattlerTagType } from "#types/battler-tags";
 import type { MatcherState, SyncExpectationResult } from "@vitest/expect";
 
+// intersection required to preserve T for inferences
 /**
- * Matcher that checks if a {@linkcode Pokemon} has a specific {@linkcode BattlerTagType}.
+ * Options type for {@linkcode toHaveBattlerTag}.
+ * @typeParam B - The {@linkcode BattlerTagType} being checked
+ * @remarks
+ * If B corresponds to a serializable `BattlerTag`, only properties allowed to be serialized
+ * (i.e. can change across instances) will be present and able to be checked.
+ */
+export type toHaveBattlerTagOptions<B extends BattlerTagType> = (B extends SerializableBattlerTagType
+  ? OneOther<BattlerTagDataMap[B], "tagType">
+  : OneOther<BattlerTagTypeMap[B], "tagType">) & {
+  tagType: B;
+};
+
+/**
+ * Matcher that checks if a {@linkcode Pokemon} has a specific {@linkcode BattlerTag}.
  * @param received - The object to check. Should be a {@linkcode Pokemon}
- * @param expectedBattlerTagType - The {@linkcode BattlerTagType} to check for
+ * @param expectedTag - The `BattlerTagType` of the desired tag, or a partially-filled object
+ * containing the desired properties
  * @returns Whether the matcher passed
  */
-export function toHaveBattlerTag(
+export function toHaveBattlerTag<B extends BattlerTagType>(
   this: MatcherState,
   received: unknown,
-  expectedBattlerTagType: BattlerTagType,
+  expectedTag: B | toHaveBattlerTagOptions<B>,
 ): SyncExpectationResult {
   if (!isPokemonInstance(received)) {
     return {
@@ -26,18 +44,44 @@ export function toHaveBattlerTag(
     };
   }
 
-  const pass = !!received.getTag(expectedBattlerTagType);
   const pkmName = getPokemonNameWithAffix(received);
-  // "BattlerTagType.SEEDED (=1)"
-  const expectedTagStr = getEnumStr(BattlerTagType, expectedBattlerTagType, { prefix: "BattlerTagType." });
 
+  // Coerce lone `tagType`s into objects
+  const etag = typeof expectedTag === "object" ? expectedTag : { tagType: expectedTag };
+  const gotTag = received.getTag(etag.tagType);
+
+  // If checking exclusively tag type OR no tags were found, break out early.
+  if (typeof expectedTag !== "object" || !gotTag) {
+    const pass = !!gotTag;
+    // "BattlerTagType.SEEDED (=1)"
+    const expectedTagStr = getEnumStr(BattlerTagType, etag.tagType, { prefix: "BattlerTagType." });
+
+    return {
+      pass,
+      message: () =>
+        pass
+          ? `Expected ${pkmName} to NOT have a tag of type ${expectedTagStr}, but it did!`
+          : `Expected ${pkmName} to have a tag of type ${expectedTagStr}, but it didn't!`,
+      expected: expectedTag,
+      actual: received.summonData.tags.map(t => t.tagType),
+    };
+  }
+
+  // Check for equality with the provided tag
+  const pass = this.equals(gotTag, etag, [
+    ...this.customTesters,
+    this.utils.subsetEquality,
+    this.utils.iterableEquality,
+  ]);
+
+  const expectedStr = getOnelineDiffStr.call(this, expectedTag);
   return {
     pass,
     message: () =>
       pass
-        ? `Expected ${pkmName} to NOT have ${expectedTagStr}, but it did!`
-        : `Expected ${pkmName} to have ${expectedTagStr}, but it didn't!`,
-    expected: expectedBattlerTagType,
-    actual: received.summonData.tags.map(t => t.tagType),
+        ? `Expected ${pkmName} to NOT have a tag matching ${expectedStr}, but it did!`
+        : `Expected ${pkmName} to have a tag matching ${expectedStr}, but it didn't!`,
+    expected: expectedTag,
+    actual: gotTag,
   };
 }
diff --git a/test/test-utils/mocks/mock-console-log.ts b/test/test-utils/mocks/mock-console-log.ts
deleted file mode 100644
index f54d41fea3e..00000000000
--- a/test/test-utils/mocks/mock-console-log.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-const originalLog = console.log;
-const originalError = console.error;
-const originalDebug = console.debug;
-const originalWarn = console.warn;
-
-const blacklist = ["Phaser", "variant icon does not exist", 'Texture "%s" not found'];
-const whitelist = ["Phase"];
-
-export class MockConsoleLog {
-  constructor(
-    private logDisabled = false,
-    private phaseText = false,
-  ) {}
-  private logs: any[] = [];
-  private notified: any[] = [];
-
-  public log(...args) {
-    const argsStr = this.getStr(args);
-    this.logs.push(argsStr);
-    if (this.logDisabled && !this.phaseText) {
-      return;
-    }
-    if ((this.phaseText && !whitelist.some(b => argsStr.includes(b))) || blacklist.some(b => argsStr.includes(b))) {
-      return;
-    }
-    originalLog(args);
-  }
-  public error(...args) {
-    const argsStr = this.getStr(args);
-    this.logs.push(argsStr);
-    originalError(args); // Appelle le console.error originel
-  }
-  public debug(...args) {
-    const argsStr = this.getStr(args);
-    this.logs.push(argsStr);
-    if (this.logDisabled && !this.phaseText) {
-      return;
-    }
-    if (!whitelist.some(b => argsStr.includes(b)) || blacklist.some(b => argsStr.includes(b))) {
-      return;
-    }
-    originalDebug(args);
-  }
-  warn(...args) {
-    const argsStr = this.getStr(args);
-    this.logs.push(args);
-    if (this.logDisabled && !this.phaseText) {
-      return;
-    }
-    if (!whitelist.some(b => argsStr.includes(b)) || blacklist.some(b => argsStr.includes(b))) {
-      return;
-    }
-    originalWarn(args);
-  }
-  notify(msg) {
-    originalLog(msg);
-    this.notified.push(msg);
-  }
-  getLogs() {
-    return this.logs;
-  }
-  clearLogs() {
-    this.logs = [];
-  }
-  getStr(...args) {
-    return args
-      .map(arg => {
-        if (typeof arg === "object" && arg !== null) {
-          // Handle objects including arrays
-          return JSON.stringify(arg, (_key, value) => (typeof value === "bigint" ? value.toString() : value));
-        }
-        if (typeof arg === "bigint") {
-          // Handle BigInt values
-          return arg.toString();
-        }
-        return arg.toString();
-      })
-      .join(";");
-  }
-}
diff --git a/test/test-utils/mocks/mock-console/color-map.json b/test/test-utils/mocks/mock-console/color-map.json
new file mode 100644
index 00000000000..ded83e889b0
--- /dev/null
+++ b/test/test-utils/mocks/mock-console/color-map.json
@@ -0,0 +1,150 @@
+{
+  "AliceBlue": "f0f8ff",
+  "AntiqueWhite": "faebd7",
+  "Aqua": "00ffff",
+  "Aquamarine": "7fffd4",
+  "Azure": "f0ffff",
+  "Beige": "f5f5dc",
+  "Bisque": "ffe4c4",
+  "Black": "000000",
+  "BlanchedAlmond": "ffebcd",
+  "Blue": "0000ff",
+  "BlueViolet": "8a2be2",
+  "Brown": "a52a2a",
+  "BurlyWood": "deb887",
+  "CadetBlue": "5f9ea0",
+  "Chartreuse": "7fff00",
+  "Chocolate": "d2691e",
+  "Coral": "ff7f50",
+  "CornflowerBlue": "6495ed",
+  "Cornsilk": "fff8dc",
+  "Crimson": "dc143c",
+  "Cyan": "00ffff",
+  "DarkBlue": "00008b",
+  "DarkCyan": "008b8b",
+  "DarkGoldenRod": "b8860b",
+  "DarkGray": "a9a9a9",
+  "DarkGrey": "a9a9a9",
+  "DarkGreen": "006400",
+  "DarkKhaki": "bdb76b",
+  "DarkMagenta": "8b008b",
+  "DarkOliveGreen": "556b2f",
+  "DarkOrange": "ff8c00",
+  "DarkOrchid": "9932cc",
+  "DarkRed": "8b0000",
+  "DarkSalmon": "e9967a",
+  "DarkSeaGreen": "8fbc8f",
+  "DarkSlateBlue": "483d8b",
+  "DarkSlateGray": "2f4f4f",
+  "DarkSlateGrey": "2f4f4f",
+  "DarkTurquoise": "00ced1",
+  "DarkViolet": "9400d3",
+  "DeepPink": "ff1493",
+  "DeepSkyBlue": "00bfff",
+  "DimGray": "696969",
+  "DimGrey": "696969",
+  "DodgerBlue": "1e90ff",
+  "FireBrick": "b22222",
+  "FloralWhite": "fffaf0",
+  "ForestGreen": "228b22",
+  "Fuchsia": "ff00ff",
+  "Gainsboro": "dcdcdc",
+  "GhostWhite": "f8f8ff",
+  "Gold": "ffd700",
+  "GoldenRod": "daa520",
+  "Gray": "808080",
+  "Grey": "808080",
+  "Green": "008000",
+  "GreenYellow": "adff2f",
+  "HoneyDew": "f0fff0",
+  "HotPink": "ff69b4",
+  "IndianRed": "cd5c5c",
+  "Indigo": "4b0082",
+  "Ivory": "fffff0",
+  "Khaki": "f0e68c",
+  "Lavender": "e6e6fa",
+  "LavenderBlush": "fff0f5",
+  "LawnGreen": "7cfc00",
+  "LemonChiffon": "fffacd",
+  "LightBlue": "add8e6",
+  "LightCoral": "f08080",
+  "LightCyan": "e0ffff",
+  "LightGoldenRodYellow": "fafad2",
+  "LightGray": "d3d3d3",
+  "LightGrey": "d3d3d3",
+  "LightGreen": "90ee90",
+  "LightPink": "ffb6c1",
+  "LightSalmon": "ffa07a",
+  "LightSeaGreen": "20b2aa",
+  "LightSkyBlue": "87cefa",
+  "LightSlateGray": "778899",
+  "LightSlateGrey": "778899",
+  "LightSteelBlue": "b0c4de",
+  "LightYellow": "ffffe0",
+  "Lime": "00ff00",
+  "LimeGreen": "32cd32",
+  "Linen": "faf0e6",
+  "Magenta": "ff00ff",
+  "Maroon": "800000",
+  "MediumAquaMarine": "66cdaa",
+  "MediumBlue": "0000cd",
+  "MediumOrchid": "ba55d3",
+  "MediumPurple": "9370db",
+  "MediumSeaGreen": "3cb371",
+  "MediumSlateBlue": "7b68ee",
+  "MediumSpringGreen": "00fa9a",
+  "MediumTurquoise": "48d1cc",
+  "MediumVioletRed": "c71585",
+  "MidnightBlue": "191970",
+  "MintCream": "f5fffa",
+  "MistyRose": "ffe4e1",
+  "Moccasin": "ffe4b5",
+  "NavajoWhite": "ffdead",
+  "Navy": "000080",
+  "OldLace": "fdf5e6",
+  "Olive": "808000",
+  "OliveDrab": "6b8e23",
+  "Orange": "ffa500",
+  "OrangeRed": "ff4500",
+  "Orchid": "da70d6",
+  "PaleGoldenRod": "eee8aa",
+  "PaleGreen": "98fb98",
+  "PaleTurquoise": "afeeee",
+  "PaleVioletRed": "db7093",
+  "PapayaWhip": "ffefd5",
+  "PeachPuff": "ffdab9",
+  "Peru": "cd853f",
+  "Pink": "ffc0cb",
+  "Plum": "dda0dd",
+  "PowderBlue": "b0e0e6",
+  "Purple": "800080",
+  "RebeccaPurple": "663399",
+  "Red": "ff0000",
+  "RosyBrown": "bc8f8f",
+  "RoyalBlue": "4169e1",
+  "SaddleBrown": "8b4513",
+  "Salmon": "fa8072",
+  "SandyBrown": "f4a460",
+  "SeaGreen": "2e8b57",
+  "SeaShell": "fff5ee",
+  "Sienna": "a0522d",
+  "Silver": "c0c0c0",
+  "SkyBlue": "87ceeb",
+  "SlateBlue": "6a5acd",
+  "SlateGray": "708090",
+  "SlateGrey": "708090",
+  "Snow": "fffafa",
+  "SpringGreen": "00ff7f",
+  "SteelBlue": "4682b4",
+  "Tan": "d2b48c",
+  "Teal": "008080",
+  "Thistle": "d8bfd8",
+  "Tomato": "ff6347",
+  "Turquoise": "40e0d0",
+  "Violet": "ee82ee",
+  "Wheat": "f5deb3",
+  "White": "ffffff",
+  "WhiteSmoke": "f5f5f5",
+  "Yellow": "ffff00",
+  "YellowGreen": "9acd32"
+}
diff --git a/test/test-utils/mocks/mock-console/infer-color.ts b/test/test-utils/mocks/mock-console/infer-color.ts
new file mode 100644
index 00000000000..e01adbc4ad4
--- /dev/null
+++ b/test/test-utils/mocks/mock-console/infer-color.ts
@@ -0,0 +1,61 @@
+import { hslToHex } from "#utils/common";
+import chalk, { type ChalkInstance, type ForegroundColorName, foregroundColorNames } from "chalk";
+import colorMap from "./color-map.json";
+
+export function inferColorFormat(data: [string, ...unknown[]]): ChalkInstance {
+  // Remove all CSS format strings and find the first one containing something vaguely resembling a color
+  data[0] = data[0].replaceAll("%c", "");
+  const args = data.slice(1).filter(t => typeof t === "string");
+  const color = findColorPrefix(args);
+
+  // If the color is within Chalk's native roster, use it directly.
+  if ((foregroundColorNames as string[]).includes(color)) {
+    return chalk[color as ForegroundColorName];
+  }
+
+  // Otherwise, coerce it to hex before feeding it in.
+  return getColor(color);
+}
+
+/**
+ * Find the first string with a "color:" CSS directive in an argument list.
+ * @param args - The arguments containing the color directive
+ * @returns The found color, or `"green"` if none were found
+ */
+function findColorPrefix(args: string[]): string {
+  for (const arg of args) {
+    const match = /color:\s*(.+?)(?:;|$)/g.exec(arg);
+    if (match === null) {
+      continue;
+    }
+
+    return match[1];
+  }
+  return "green";
+}
+
+/**
+ * Coerce an arbitrary CSS color string to a Chalk instance.
+ * @param color - The color to coerce
+ * @returns The Chalk color equivalent.
+ */
+function getColor(color: string): ChalkInstance {
+  if (/^#([a-z0-9]{3,4}|[a-z0-9]{6}|[a-z0-9]{8})$/i.test(color)) {
+    // already in hex
+    return chalk.hex(color);
+  }
+
+  const rgbMatch = /^rgba?\((\d{1,3})%?,\s*(\d{1,3})%?,?\s*(\d{1,3})%?,\s*/i.exec(color);
+  if (rgbMatch) {
+    const [red, green, blue] = rgbMatch;
+    return chalk.rgb(+red, +green, +blue);
+  }
+
+  const hslMatch = /^hslv?\((\d{1,3}),\s*(\d{1,3})%,\s*(\d{1,3})%\)$/i.exec(color);
+  if (hslMatch) {
+    const [hue, saturation, light] = hslMatch;
+    return chalk.hex(hslToHex(+hue, +saturation / 100, +light / 100));
+  }
+
+  return chalk.hex(colorMap[color] ?? "#00ff95ff");
+}
diff --git a/test/test-utils/mocks/mock-console/mock-console.ts b/test/test-utils/mocks/mock-console/mock-console.ts
new file mode 100644
index 00000000000..52ed0af6aa7
--- /dev/null
+++ b/test/test-utils/mocks/mock-console/mock-console.ts
@@ -0,0 +1,211 @@
+import { DEBUG_COLOR, NEW_TURN_COLOR, TRACE_COLOR, UI_MSG_COLOR } from "#app/constants/colors";
+import { inferColorFormat } from "#test/test-utils/mocks/mock-console/infer-color";
+import { coerceArray } from "#utils/common";
+import { type InspectOptions, inspect } from "node:util";
+import chalk, { type ChalkInstance } from "chalk";
+
+// Tell chalk we support truecolor
+chalk.level = 3;
+
+// TODO: Review this
+const blacklist = [
+  "variant icon does not exist", // Repetitive warnings about icons not found
+  'Texture "%s" not found', // Repetitive warnings about textures not found
+  "type: 'Pokemon',", // Large Pokemon objects
+  "gameVersion: ", // Large session-data and system-data objects
+  "Phaser v", // Phaser version text
+  "Seed:", // Stuff about wave seed (we should really stop logging this shit)
+  "Wave Seed:", // Stuff about wave seed (we should really stop logging this shit)
+] as const;
+const whitelist = ["Start Phase"] as const;
+
+const inspectOptions: InspectOptions = { sorted: true, breakLength: 120, numericSeparator: true };
+
+/**
+ * The {@linkcode MockConsole} is a wrapper around the global {@linkcode console} object.
+ * It automatically colors text and such.
+ */
+export class MockConsole implements Omit<Console, "Console"> {
+  /**
+   * A list of warnings that are queued to be displayed after all tests in the same file are finished.
+   */
+  private static readonly queuedWarnings: unknown[][] = [];
+  /**
+   * The original `Console` object, preserved to avoid overwriting
+   * Vitest's native `console.log` wrapping.
+   */
+  private console = console;
+
+  //#region Static Properties
+
+  /**
+   * Queue a warning to be printed after all tests in the same file are finished.
+   */
+  // TODO: Add some warnings
+  public static queuePostTestWarning(...data: unknown[]): void {
+    MockConsole.queuedWarnings.push(data);
+  }
+
+  /**
+   * Print and reset all post-test warnings.
+   */
+  public static printPostTestWarnings(): void {
+    for (const data of MockConsole.queuedWarnings) {
+      console.warn(...data);
+    }
+    MockConsole.queuedWarnings.splice(0);
+  }
+
+  //#endregion Private Properties
+
+  //#region Utilities
+
+  /**
+   * Check whether a given set of data is in the blacklist to be barred from logging.
+   * @param data - The data being logged
+   * @returns Whether `data` is blacklisted from console logging
+   */
+  private checkBlacklist(data: unknown[]): boolean {
+    const dataStr = this.getStr(data);
+    return !whitelist.some(b => dataStr.includes(b)) && blacklist.some(b => dataStr.includes(b));
+  }
+
+  /**
+   * Returns a human-readable string representation of `data`.
+   */
+  private getStr(data: unknown): string {
+    return inspect(data, inspectOptions);
+  }
+
+  /**
+   * Stringify the given data in a manner fit for logging.
+   * @param color - A Chalk instance or other transformation function used to transform the output,
+   * or `undefined` to not transform it at all.
+   * @param data - The data that the format should be applied to.
+   * @returns A stringified copy of `data` with {@linkcode color} applied to each individual argument.
+   * @todo Do we need to apply color to each entry or just run it through `util.format`?
+   */
+  private format(color: ((s: unknown) => unknown) | undefined, data: unknown | unknown[]): unknown[] {
+    data = coerceArray(data);
+    color ??= a => a;
+    return (data as unknown[]).map(a => color(typeof a === "function" || typeof a === "object" ? this.getStr(a) : a));
+  }
+
+  //#endregion Utilities
+
+  //#region Custom wrappers
+  public info(...data: unknown[]) {
+    return this.log(...data);
+  }
+
+  public trace(...data: unknown[]) {
+    if (this.checkBlacklist(data)) {
+      return;
+    }
+
+    // TODO: Figure out how to add color to the full trace text
+    this.console.trace(...this.format(chalk.hex(TRACE_COLOR), data));
+  }
+
+  public debug(...data: unknown[]) {
+    if (this.checkBlacklist(data)) {
+      return;
+    }
+
+    this.console.debug(...this.format(chalk.hex(DEBUG_COLOR), data));
+  }
+
+  public log(...data: unknown[]): void {
+    if (this.checkBlacklist(data)) {
+      return;
+    }
+
+    let formatter: ChalkInstance | undefined;
+
+    if (data.some(d => typeof d === "string" && d.includes("color:"))) {
+      // Infer the color format from the arguments, then remove everything but the message.
+      formatter = inferColorFormat(data as [string, ...unknown[]]);
+      data.splice(1);
+    } else if (data[0] === "[UI]") {
+      // Cyan for UI debug messages
+      formatter = chalk.hex(UI_MSG_COLOR);
+    } else if (typeof data[0] === "string" && data[0].startsWith("=====")) {
+      // Orange logging for "New Turn"/etc messages
+      formatter = chalk.hex(NEW_TURN_COLOR);
+    }
+
+    this.console.log(...this.format(formatter, data));
+  }
+
+  public warn(...data: unknown[]) {
+    if (this.checkBlacklist(data)) {
+      return;
+    }
+
+    this.console.warn(...this.format(chalk.yellow, data));
+  }
+
+  public error(...data: unknown[]) {
+    if (this.checkBlacklist(data)) {
+      return;
+    }
+
+    this.console.error(...this.format(chalk.redBright, data));
+  }
+
+  //#endregion Custom Wrappers
+
+  //#region Copy-pasted Console code
+  // TODO: Progressively add proper coloration and support for all these methods
+  public dir(...args: Parameters<(typeof console)["dir"]>): ReturnType<(typeof console)["dir"]> {
+    return this.console.dir(...args);
+  }
+  public dirxml(...args: Parameters<(typeof console)["dirxml"]>): ReturnType<(typeof console)["dirxml"]> {
+    return this.console.dirxml(...args);
+  }
+  public table(...args: Parameters<(typeof console)["table"]>): ReturnType<(typeof console)["table"]> {
+    return this.console.table(...args);
+  }
+  public group(...args: Parameters<(typeof console)["group"]>): ReturnType<(typeof console)["group"]> {
+    return this.console.group(...args);
+  }
+  public groupCollapsed(
+    ...args: Parameters<(typeof console)["groupCollapsed"]>
+  ): ReturnType<(typeof console)["groupCollapsed"]> {
+    return this.console.groupCollapsed(...args);
+  }
+  public groupEnd(...args: Parameters<(typeof console)["groupEnd"]>): ReturnType<(typeof console)["groupEnd"]> {
+    return this.console.groupEnd(...args);
+  }
+  public clear(...args: Parameters<(typeof console)["clear"]>): ReturnType<(typeof console)["clear"]> {
+    return this.console.clear(...args);
+  }
+  public count(...args: Parameters<(typeof console)["count"]>): ReturnType<(typeof console)["count"]> {
+    return this.console.count(...args);
+  }
+  public countReset(...args: Parameters<(typeof console)["countReset"]>): ReturnType<(typeof console)["countReset"]> {
+    return this.console.countReset(...args);
+  }
+  public assert(...args: Parameters<(typeof console)["assert"]>): ReturnType<(typeof console)["assert"]> {
+    return this.console.assert(...args);
+  }
+  public profile(...args: Parameters<(typeof console)["profile"]>): ReturnType<(typeof console)["profile"]> {
+    return this.console.profile(...args);
+  }
+  public profileEnd(...args: Parameters<(typeof console)["profileEnd"]>): ReturnType<(typeof console)["profileEnd"]> {
+    return this.console.profileEnd(...args);
+  }
+  public time(...args: Parameters<(typeof console)["time"]>): ReturnType<(typeof console)["time"]> {
+    return this.console.time(...args);
+  }
+  public timeLog(...args: Parameters<(typeof console)["timeLog"]>): ReturnType<(typeof console)["timeLog"]> {
+    return this.console.timeLog(...args);
+  }
+  public timeEnd(...args: Parameters<(typeof console)["timeEnd"]>): ReturnType<(typeof console)["timeEnd"]> {
+    return this.console.timeEnd(...args);
+  }
+  public timeStamp(...args: Parameters<(typeof console)["timeStamp"]>): ReturnType<(typeof console)["timeStamp"]> {
+    return this.console.timeStamp(...args);
+  }
+  //#endregion Copy-pasted Console code
+}
diff --git a/test/test-utils/mocks/mocks-container/mock-text.ts b/test/test-utils/mocks/mocks-container/mock-text.ts
index ad2fce80972..a64aa45ef80 100644
--- a/test/test-utils/mocks/mocks-container/mock-text.ts
+++ b/test/test-utils/mocks/mocks-container/mock-text.ts
@@ -1,4 +1,5 @@
 import type { MockGameObject } from "#test/test-utils/mocks/mock-game-object";
+import type { TextInterceptor } from "#test/test-utils/text-interceptor";
 import { UI } from "#ui/ui";
 
 export class MockText implements MockGameObject {
@@ -82,13 +83,14 @@ export class MockText implements MockGameObject {
 
   showText(
     text: string,
-    delay?: number | null,
+    _delay?: number | null,
     callback?: Function | null,
-    callbackDelay?: number | null,
-    prompt?: boolean | null,
-    promptDelay?: number | null,
+    _callbackDelay?: number | null,
+    _prompt?: boolean | null,
+    _promptDelay?: number | null,
   ) {
-    this.scene.messageWrapper.showText(text, delay, callback, callbackDelay, prompt, promptDelay);
+    // TODO: this is a very bad way to pass calls around
+    (this.scene.messageWrapper as TextInterceptor).showText(text);
     if (callback) {
       callback();
     }
@@ -96,13 +98,13 @@ export class MockText implements MockGameObject {
 
   showDialogue(
     keyOrText: string,
-    name: string | undefined,
-    delay: number | null = 0,
+    name: string,
+    _delay: number | null,
     callback: Function,
-    callbackDelay?: number,
-    promptDelay?: number,
+    _callbackDelay?: number,
+    _promptDelay?: number,
   ) {
-    this.scene.messageWrapper.showDialogue(keyOrText, name, delay, callback, callbackDelay, promptDelay);
+    (this.scene.messageWrapper as TextInterceptor).showDialogue(keyOrText, name);
     if (callback) {
       callback();
     }
diff --git a/test/test-utils/phase-interceptor.ts b/test/test-utils/phase-interceptor.ts
index f2f11db9d12..3549f48168a 100644
--- a/test/test-utils/phase-interceptor.ts
+++ b/test/test-utils/phase-interceptor.ts
@@ -67,7 +67,7 @@ import { UnlockPhase } from "#phases/unlock-phase";
 import { VictoryPhase } from "#phases/victory-phase";
 import { ErrorInterceptor } from "#test/test-utils/error-interceptor";
 import type { PhaseClass, PhaseString } from "#types/phase-types";
-import type { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
+import type { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
 import { UI } from "#ui/ui";
 
 export interface PromptHandler {
@@ -386,7 +386,7 @@ export class PhaseInterceptor {
         const actionForNextPrompt = this.prompts[0];
         const expireFn = actionForNextPrompt.expireFn?.();
         const currentMode = this.scene.ui.getMode();
-        const currentPhase = this.scene.phaseManager.getCurrentPhase()?.constructor.name;
+        const currentPhase = this.scene.phaseManager.getCurrentPhase().phaseName;
         const currentHandler = this.scene.ui.getHandler();
         if (expireFn) {
           this.prompts.shift();
diff --git a/test/test-utils/reporters/custom-default-reporter.ts b/test/test-utils/reporters/custom-default-reporter.ts
new file mode 100644
index 00000000000..15c4881b83c
--- /dev/null
+++ b/test/test-utils/reporters/custom-default-reporter.ts
@@ -0,0 +1,62 @@
+import { relative } from "node:path";
+import { parseStacktrace } from "@vitest/utils/source-map";
+import chalk from "chalk";
+import type { UserConsoleLog } from "vitest";
+import type { TestState } from "vitest/node";
+import { DefaultReporter } from "vitest/reporters";
+
+/**
+ * Custom Vitest reporter to strip the current file names from the output.
+ */
+export default class CustomDefaultReporter extends DefaultReporter {
+  public override onUserConsoleLog(log: UserConsoleLog, taskState?: TestState): void {
+    // This code is more or less copied verbatim from `vitest/reporters` source, with minor tweaks to use
+    // dependencies we actually _have_ (i.e. chalk) rather than ones we don't (i.e. tinyrainbow).
+
+    // SPDX-SnippetBegin
+    // SPDX-SnippetCopyrightText: 2021 VoidZero Inc. and Vitest contributors
+    // SPDX-License-Identifier: MIT
+
+    if (!super.shouldLog(log, taskState)) {
+      return;
+    }
+
+    const output = log.type === "stdout" ? this.ctx.logger.outputStream : this.ctx.logger.errorStream;
+
+    const write = (msg: string) => output.write(msg);
+
+    const task = log.taskId ? this.ctx.state.idMap.get(log.taskId) : undefined;
+
+    write(log.content); // this is about the only changed line (that and us skipping a newline)
+
+    if (!log.origin) {
+      return;
+    }
+
+    // Code for stack trace, ripped directly out of Vitest source code.
+    // I wish they had a helper function to do this so we didn't have to import `@vitest/utils`, but oh well...
+    // browser logs don't have an extra end of line at the end like Node.js does
+    if (log.browser) {
+      write("\n");
+    }
+
+    const project = task ? this.ctx.getProjectByName(task.file.projectName ?? "") : this.ctx.getRootProject();
+
+    const stack = log.browser ? (project.browser?.parseStacktrace(log.origin) ?? []) : parseStacktrace(log.origin);
+
+    const highlight = task && stack.find(i => i.file === task.file.filepath);
+
+    for (const frame of stack) {
+      const color = frame === highlight ? chalk.cyan : chalk.gray;
+      const path = relative(project.config.root, frame.file);
+
+      const positions = [frame.method, `${path}:${chalk.dim(`${frame.line}:${frame.column}`)}`]
+        .filter(Boolean)
+        .join(" ");
+
+      write(color(` ${chalk.dim(">")} ${positions}\n`));
+    }
+
+    // SPDX-SnippetEnd
+  }
+}
diff --git a/test/test-utils/setup/test-end-log.ts b/test/test-utils/setup/test-end-log.ts
new file mode 100644
index 00000000000..9814ba8a45c
--- /dev/null
+++ b/test/test-utils/setup/test-end-log.ts
@@ -0,0 +1,113 @@
+// biome-ignore lint/correctness/noUnusedImports: TSDoc
+import type CustomDefaultReporter from "#test/test-utils/reporters/custom-default-reporter";
+import { basename, join, relative } from "path";
+import chalk from "chalk";
+import type { RunnerTask, RunnerTaskResult, RunnerTestCase } from "vitest";
+
+/**
+ * @module
+ * Code to add markers to the beginning and end of tests.
+ * Intended for use with {@linkcode CustomDefaultReporter}, and placed inside test hooks
+ * (rather than as part of the reporter) to ensure Vitest waits for the log messages to be printed.
+ */
+
+/** A long string of "="s to partition off each test from one another. */
+const TEST_END_BARRIER = chalk.bold.hex("#ff7c7cff")("==================");
+
+// Colors used for Vitest-related test utils
+const TEST_NAME_COLOR = "#008886ff" as const;
+const VITEST_PINK_COLOR = "#c162de" as const;
+
+const testRoot = join(import.meta.dirname, "..", "..", "..");
+
+/**
+ * Log the testfile name and path upon a case starting. \
+ * Used to compensate for us overridding the global Console object and removing Vitest's
+ * test name annotations.
+ * @param test - The {@linkcode RunnerTask} passed from the context
+ */
+export function logTestStart(test: RunnerTask): void {
+  console.log(TEST_END_BARRIER);
+  console.log(
+    `${chalk.dim("> ")}${chalk.hex(VITEST_PINK_COLOR)("Starting test: ")}${chalk.hex(TEST_NAME_COLOR)(getTestName(test))}`,
+  );
+}
+
+/**
+ * Log the testfile name, path and result upon a case ending. \
+ * Used to compensate for us overridding the global Console object and removing Vitest's
+ * test name annotations.
+ * @param task - The {@linkcode RunnerTestCase} passed from the hook
+ */
+export function logTestEnd(task: RunnerTestCase): void {
+  const durationStr = getDurationPrefix(task.result);
+  const resultStr = getResultStr(task.result);
+  console.log(`${chalk.dim("> ")}${chalk.black.bgHex(VITEST_PINK_COLOR)(" Test finished! ")}
+    Name: ${chalk.hex(TEST_NAME_COLOR)(getTestName(task))}
+    Result: ${resultStr}${durationStr}
+    File: ${chalk.hex("#d29b0eff")(
+      getPathFromTest(task.file.filepath) + (task.location ? `:${task.location.line}:${task.location.column}` : ""),
+    )}`);
+}
+
+/**
+ * Get the path of the current test file relative to the `test` directory.
+ * @param abs - The absolute path to the file
+ * @returns The relative path with `test/` appended to it.
+ */
+function getPathFromTest(abs: string): string {
+  return join(basename(testRoot), relative(testRoot, abs));
+}
+
+function getResultStr(result: RunnerTaskResult | undefined): string {
+  if (result?.state !== "pass" && result?.state !== "fail") {
+    return "Unknown";
+  }
+
+  const resultStr =
+    result.state === "pass"
+      ? chalk.green.bold("✔ Passed")
+      : (result?.duration ?? 0) > 2
+        ? chalk.cyan.bold("◴ Timed out")
+        : chalk.red.bold("✗ Failed");
+
+  return resultStr;
+}
+
+/**
+ * Get the text to be displayed for a test's duration.
+ * @param result - The {@linkcode RunnerTaskResult} of the finished test
+ * @returns An appropriately colored suffix for the start time.
+ * Will return an empty string if `result.startTime` is `undefined`
+ */
+function getDurationPrefix(result?: RunnerTaskResult): string {
+  const startTime = result?.startTime;
+  if (!startTime) {
+    return "";
+  }
+  const duration = Math.round(Date.now() - startTime);
+
+  // TODO: Figure out a way to access the current vitest config from a hook
+  const color = duration > 10_000 ? chalk.yellow : chalk.green;
+  return ` ${chalk.dim("in")} ${color(duration)}${chalk.dim("ms")}`;
+}
+
+// Function copied from vitest source to avoid having to import `@vitest/runner/utils` for 1 function
+
+// SPDX-SnippetBegin
+// SPDX-SnippetCopyrightText: 2021 VoidZero Inc. and Vitest contributors
+// SPDX-License-Identifier: MIT
+function getTestName(task: RunnerTask, separator = " > "): string {
+  const names: string[] = [task.name];
+  let current: RunnerTask | undefined = task;
+
+  while ((current = current?.suite)) {
+    if (current?.name) {
+      names.unshift(current.name);
+    }
+  }
+
+  return names.join(separator);
+}
+
+// SPDX-SnippetEnd
diff --git a/test/test-utils/string-utils.ts b/test/test-utils/string-utils.ts
index 6c29c04c107..e19224f4571 100644
--- a/test/test-utils/string-utils.ts
+++ b/test/test-utils/string-utils.ts
@@ -183,5 +183,5 @@ export function getOnelineDiffStr(this: MatcherState, obj: unknown): string {
   return this.utils
     .stringify(obj, undefined, { maxLength: 35, indent: 0, printBasicPrototype: false })
     .replace(/\n/g, " ") // Replace newlines with spaces
-    .replace(/,(\s*)}$/g, "$1}"); // Trim trailing commas
+    .replace(/,(\s*)\}$/g, "$1}"); // Trim trailing commas
 }
diff --git a/test/test-utils/test-file-initialization.ts b/test/test-utils/test-file-initialization.ts
index 631d3f9146b..c172e2d1da8 100644
--- a/test/test-utils/test-file-initialization.ts
+++ b/test/test-utils/test-file-initialization.ts
@@ -3,7 +3,7 @@ import { initializeGame } from "#app/init/init";
 import { initI18n } from "#plugins/i18n";
 import { blobToString } from "#test/test-utils/game-manager-utils";
 import { manageListeners } from "#test/test-utils/listeners-manager";
-import { MockConsoleLog } from "#test/test-utils/mocks/mock-console-log";
+import { MockConsole } from "#test/test-utils/mocks/mock-console/mock-console";
 import { mockContext } from "#test/test-utils/mocks/mock-context-canvas";
 import { mockLocalStorage } from "#test/test-utils/mocks/mock-local-storage";
 import { MockImage } from "#test/test-utils/mocks/mocks-container/mock-image";
@@ -38,14 +38,22 @@ function initTestFile(): void {
 /**
  * Setup various stubs for testing.
  * @todo Move this into a dedicated stub file instead of running it once per test instance
+ * @todo review these to see which are actually necessary
  * @todo Investigate why this resets on new test suite start
  */
 function setupStubs(): void {
-  Object.defineProperty(window, "localStorage", {
-    value: mockLocalStorage(),
-  });
-  Object.defineProperty(window, "console", {
-    value: new MockConsoleLog(false),
+  Object.defineProperties(global, {
+    localStorage: {
+      value: mockLocalStorage(),
+    },
+    console: {
+      value: new MockConsole(),
+    },
+    matchMedia: {
+      value: () => ({
+        matches: false,
+      }),
+    },
   });
   Object.defineProperty(document, "fonts", {
     writable: true,
@@ -69,11 +77,6 @@ function setupStubs(): void {
   navigator.getGamepads = () => [];
   setCookie(SESSION_ID_COOKIE_NAME, "fake_token");
 
-  window.matchMedia = () =>
-    ({
-      matches: false,
-    }) as any;
-
   /**
    * Sets this object's position relative to another object with a given offset
    * @param guideObject - The {@linkcode Phaser.GameObjects.GameObject} to base the position off of
diff --git a/test/test-utils/text-interceptor.ts b/test/test-utils/text-interceptor.ts
index 36a5db4c78d..dfbaf2ff11c 100644
--- a/test/test-utils/text-interceptor.ts
+++ b/test/test-utils/text-interceptor.ts
@@ -1,39 +1,49 @@
+import type { BattleScene } from "#app/battle-scene";
+import chalk from "chalk";
+
 /**
- * Class will intercept any text or dialogue message calls and log them for test purposes
+ * The {@linkcode TextInterceptor} is a wrapper class that intercepts and logs any messages
+ * that would be displayed on-screen.
  */
 export class TextInterceptor {
-  private scene;
-  public logs: string[] = [];
-  constructor(scene) {
-    this.scene = scene;
+  /** A log containing messages having been displayed on screen, sorted in FIFO order. */
+  public readonly logs: string[] = [];
+
+  constructor(scene: BattleScene) {
+    // @ts-expect-error: Find another more sanitary way of doing this
     scene.messageWrapper = this;
   }
 
-  showText(
-    text: string,
-    _delay?: number,
-    _callback?: Function,
-    _callbackDelay?: number,
-    _prompt?: boolean,
-    _promptDelay?: number,
-  ): void {
-    console.log(text);
+  /** Clear the current content of the TextInterceptor. */
+  public clearLogs(): void {
+    this.logs.splice(0);
+  }
+
+  showText(text: string): void {
+    // NB: We do not format the raw _logs_ themselves as tests will be actively checking it.
+    console.log(this.formatText(text));
     this.logs.push(text);
   }
 
-  showDialogue(
-    text: string,
-    name: string,
-    _delay?: number,
-    _callback?: Function,
-    _callbackDelay?: number,
-    _promptDelay?: number,
-  ): void {
-    console.log(name, text);
+  showDialogue(text: string, name: string): void {
+    console.log(`${name}: \n${this.formatText(text)}`);
     this.logs.push(name, text);
   }
 
-  getLatestMessage(): string {
-    return this.logs.pop() ?? "";
+  /**
+   * Format text to be displayed to the test console, as follows:
+   * 1. Replaces new lines and new text boxes (marked by `$`) with indented new lines.
+   * 2. Removes all `@c{}`, `@d{}`, `@s{}`, and `@f{}` flags from the text.
+   * 3. Makes text blue
+   * @param text - The unformatted text
+   * @returns The formatted text
+   */
+  private formatText(text: string): string {
+    return chalk.blue(
+      text
+        .replace(/\n/g, " ")
+        .replace(/\$/g, "\n  ")
+        .replace(/@\w{.*?}/g, ""),
+    );
   }
 }
diff --git a/test/ui/item-manage-button.test.ts b/test/ui/item-manage-button.test.ts
index c28cd9e802e..b5c24776e7b 100644
--- a/test/ui/item-manage-button.test.ts
+++ b/test/ui/item-manage-button.test.ts
@@ -5,8 +5,8 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import type { Pokemon } from "#field/pokemon";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
-import { type PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import type { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
+import { type PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts
index edd9fa879d0..5c6ae51ffaa 100644
--- a/test/ui/pokedex.test.ts
+++ b/test/ui/pokedex.test.ts
@@ -8,9 +8,9 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import type { StarterAttributes } from "#system/game-data";
 import { GameManager } from "#test/test-utils/game-manager";
-import { FilterTextRow } from "#ui/filter-text";
-import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
-import { PokedexUiHandler } from "#ui/pokedex-ui-handler";
+import { FilterTextRow } from "#ui/containers/filter-text";
+import { PokedexPageUiHandler } from "#ui/containers/pokedex-page-ui-handler";
+import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
diff --git a/test/ui/starter-select.test.ts b/test/ui/starter-select.test.ts
index 397f3d6086f..2f575b72a5c 100644
--- a/test/ui/starter-select.test.ts
+++ b/test/ui/starter-select.test.ts
@@ -8,10 +8,10 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import type { TitlePhase } from "#phases/title-phase";
 import { GameManager } from "#test/test-utils/game-manager";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import type { OptionSelectItem } from "#ui/handlers/abstract-option-select-ui-handler";
+import type { SaveSlotSelectUiHandler } from "#ui/handlers/save-slot-select-ui-handler";
+import type { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
 import type { OptionSelectUiHandler } from "#ui/option-select-ui-handler";
-import type { SaveSlotSelectUiHandler } from "#ui/save-slot-select-ui-handler";
-import type { StarterSelectUiHandler } from "#ui/starter-select-ui-handler";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/ui/transfer-item-options.test.ts b/test/ui/transfer-item-options.test.ts
index 901aa261f50..7e9c1b5e36b 100644
--- a/test/ui/transfer-item-options.test.ts
+++ b/test/ui/transfer-item-options.test.ts
@@ -4,8 +4,8 @@ import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
-import { type PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
-import type { RenameFormUiHandler } from "#ui/rename-form-ui-handler";
+import { type PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
+import type { RenameFormUiHandler } from "#ui/handlers/rename-form-ui-handler";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
diff --git a/test/ui/transfer-item.test.ts b/test/ui/transfer-item.test.ts
index 8e42149acc3..78679b296cd 100644
--- a/test/ui/transfer-item.test.ts
+++ b/test/ui/transfer-item.test.ts
@@ -4,8 +4,8 @@ import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
-import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
-import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler";
+import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
+import { PartyUiHandler, PartyUiMode } from "#ui/handlers/party-ui-handler";
 import Phaser from "phaser";
 import type BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts
index b5fe0d9585a..56891e22c2a 100644
--- a/test/ui/type-hints.test.ts
+++ b/test/ui/type-hints.test.ts
@@ -4,7 +4,7 @@ import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
 import type { MockText } from "#test/test-utils/mocks/mocks-container/mock-text";
-import { FightUiHandler } from "#ui/fight-ui-handler";
+import { FightUiHandler } from "#ui/handlers/fight-ui-handler";
 import i18next from "i18next";
 import Phaser from "phaser";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
diff --git a/test/vitest.setup.ts b/test/vitest.setup.ts
index be35e18e2e9..23adab01a05 100644
--- a/test/vitest.setup.ts
+++ b/test/vitest.setup.ts
@@ -1,16 +1,21 @@
 import "vitest-canvas-mock";
+import { MockConsole } from "#test/test-utils/mocks/mock-console/mock-console";
+import { logTestEnd, logTestStart } from "#test/test-utils/setup/test-end-log";
 import { initTests } from "#test/test-utils/test-file-initialization";
-import { afterAll, beforeAll, vi } from "vitest";
+import chalk from "chalk";
+import { afterAll, afterEach, beforeAll, beforeEach, vi } from "vitest";
 
-/** Set the timezone to UTC for tests. */
+//#region Mocking
 
-/** Mock the override import to always return default values, ignoring any custom overrides. */
-vi.mock("#app/overrides", async importOriginal => {
-  const { defaultOverrides } = await importOriginal<typeof import("#app/overrides")>();
+// Mock the override import to always return default values, ignoring any custom overrides.
+vi.mock(import("#app/overrides"), async importOriginal => {
+  const { defaultOverrides } = await importOriginal();
 
   return {
     default: defaultOverrides,
-    defaultOverrides,
+    // Export `defaultOverrides` as a *copy*.
+    // This ensures we can easily reset `overrides` back to its default values after modifying it.
+    defaultOverrides: { ...defaultOverrides },
   } satisfies typeof import("#app/overrides");
 });
 
@@ -20,7 +25,7 @@ vi.mock("#app/overrides", async importOriginal => {
  * This is necessary because how our code is structured.
  * Do NOT try to put any of this code into external functions, it won't work as it's elevated during runtime.
  */
-vi.mock("i18next", async importOriginal => {
+vi.mock(import("i18next"), async importOriginal => {
   console.log("Mocking i18next");
   const { setupServer } = await import("msw/node");
   const { http, HttpResponse } = await import("msw");
@@ -30,8 +35,11 @@ vi.mock("i18next", async importOriginal => {
       const filename = req.params[0];
 
       try {
-        const json = await import(`../public/locales/en/${req.params[0]}`);
-        console.log("Loaded locale", filename);
+        const localeFiles = import.meta.glob("../public/locales/en/**/*.json", { eager: true });
+        const json = localeFiles[`../public/locales/en/${filename}`] || {};
+        if (import.meta.env.VITE_I18N_DEBUG === "1") {
+          console.log("Loaded locale", filename);
+        }
         return HttpResponse.json(json);
       } catch (err) {
         console.log(`Failed to load locale ${filename}!`, err);
@@ -54,7 +62,15 @@ beforeAll(() => {
   initTests();
 });
 
+beforeEach(context => {
+  logTestStart(context.task);
+});
+afterEach(context => {
+  logTestEnd(context.task);
+});
+
 afterAll(() => {
   global.server.close();
-  console.log("Closing i18n MSW server!");
+  MockConsole.printPostTestWarnings();
+  console.log(chalk.hex("#dfb8d8")("Closing i18n MSW server!"));
 });
diff --git a/tsconfig.json b/tsconfig.json
index 8becb4c00ec..7bf82eaaca0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,47 +18,47 @@
     "esModuleInterop": true,
     "strictNullChecks": true,
     "sourceMap": false,
-    "checkJs": true,
     "strict": false, // TODO: Enable this eventually
     "rootDir": ".",
-    "baseUrl": "./src",
-    "paths": {
-      "#abilities/*": ["./data/abilities/*.ts"],
-      "#api/*": ["./plugins/api/*.ts"],
-      "#balance/*": ["./data/balance/*.ts"],
-      "#enums/*": ["./enums/*.ts"],
-      "#events/*": ["./events/*.ts"],
-      "#field/*": ["./field/*.ts"],
-      "#inputs/*": ["./configs/inputs/*.ts"],
-      "#modifiers/*": ["./modifier/*.ts"],
-      "#moves/*": ["./data/moves/*.ts"],
-      "#mystery-encounters/*": [
-        "./data/mystery-encounters/utils/*.ts",
-        "./data/mystery-encounters/encounters/*.ts",
-        "./data/mystery-encounters/requirements/*.ts",
-        "./data/mystery-encounters/*.ts"
-      ],
-      "#package.json": ["../package.json"],
-      "#phases/*": ["./phases/*.ts"],
-      "#plugins/*": ["./plugins/vite/*.ts", "./plugins/*.ts"],
-      "#sprites/*": ["./sprites/*.ts"],
-      "#system/*": [
-        "./system/settings/*.ts",
-        "./system/version-migration/versions/*.ts",
-        "./system/version-migration/*.ts",
-        "./system/*.ts"
-      ],
-      "#trainers/*": ["./data/trainers/*.ts"],
-      "#types/*": ["./@types/helpers/*.ts", "./@types/*.ts", "./typings/phaser/*.ts"],
-      "#ui/*": ["./ui/battle-info/*.ts", "./ui/settings/*.ts", "./ui/*.ts"],
-      "#utils/*": ["./utils/*.ts"],
-      "#data/*": ["./data/pokemon-forms/*.ts", "./data/pokemon/*.ts", "./data/*.ts"],
-      "#test/*": ["../test/*.ts"],
-      "#app/*": ["*.ts"]
-    },
     "outDir": "./build",
-    "noEmit": true
+    "noEmit": true,
+    "paths": {
+      "#abilities/*": ["./src/data/abilities/*.ts"],
+      "#api/*": ["./src/plugins/api/*.ts"],
+      "#balance/*": ["./src/data/balance/*.ts"],
+      "#enums/*": ["./src/enums/*.ts"],
+      "#events/*": ["./src/events/*.ts"],
+      "#field/*": ["./src/field/*.ts"],
+      "#inputs/*": ["./src/configs/inputs/*.ts"],
+      "#modifiers/*": ["./src/modifier/*.ts"],
+      "#moves/*": ["./src/data/moves/*.ts"],
+      "#mystery-encounters/*": [
+        "./src/data/mystery-encounters/utils/*.ts",
+        "./src/data/mystery-encounters/encounters/*.ts",
+        "./src/data/mystery-encounters/requirements/*.ts",
+        "./src/data/mystery-encounters/*.ts"
+      ],
+      "#package.json": ["./package.json"],
+      "#phases/*": ["./src/phases/*.ts"],
+      "#plugins/*": ["./src/plugins/vite/*.ts", "./src/plugins/*.ts"],
+      "#sprites/*": ["./src/sprites/*.ts"],
+      "#system/*": [
+        "./src/system/settings/*.ts",
+        "./src/system/version-migration/versions/*.ts",
+        "./src/system/version-migration/*.ts",
+        "./src/system/*.ts"
+      ],
+      "#trainers/*": ["./src/data/trainers/*.ts"],
+      "#types/*": ["./src/@types/helpers/*.ts", "./src/@types/*.ts", "./src/typings/phaser/*.ts"],
+      "#ui/*": ["./src/ui/battle-info/*.ts", "./src/ui/settings/*.ts", "./src/ui/*.ts"],
+      "#utils/*": ["./src/utils/*.ts"],
+      "#data/*": ["./src/data/pokemon-forms/*.ts", "./src/data/pokemon/*.ts", "./src/data/*.ts"],
+      "#test/*": ["./test/*.ts"],
+      "#app/*": ["./src/*.ts"]
+    }
   },
+  // Exclude checking for script JS files as those are covered by the folder's `jsconfig.json`
+  "include": ["**/*.ts", "**/*.d.ts"],
   "exclude": [
     "node_modules",
     "dist",
diff --git a/typedoc-plugins/typedoc-plugin-rename-svg.js b/typedoc-plugins/typedoc-plugin-rename-svg.js
new file mode 100644
index 00000000000..307206d6006
--- /dev/null
+++ b/typedoc-plugins/typedoc-plugin-rename-svg.js
@@ -0,0 +1,29 @@
+// @ts-check
+
+import { PageKind, Renderer } from "typedoc";
+
+/**
+ * @module
+ * Typedoc plugin to run post-processing on the `index.html` file and replace the coverage SVG
+ * for Beta with the newly generated file for the current branch.
+ */
+
+/**
+ * @param {import('typedoc').Application} app
+ */
+export function load(app) {
+  // Don't do anything if no REF_NAME was specified (likely indicating a local docs run)
+  if (!process.env.REF_NAME) {
+    return;
+  }
+  app.renderer.on(Renderer.EVENT_END_PAGE, page => {
+    if (page.pageKind === PageKind.Index && page.contents) {
+      page.contents = page.contents
+        // Replace the SVG to the beta documentation site with the current ref name
+        .replace(
+          /^<a href="(.*?)\/beta(.*?)"><img src=".*coverage.svg"/m, // formatting
+          `<a href="$1/${process.env.REF_NAME}$2"><img src="coverage.svg"`,
+        );
+    }
+  });
+}
diff --git a/typedoc.config.js b/typedoc.config.js
new file mode 100644
index 00000000000..ef932a5d077
--- /dev/null
+++ b/typedoc.config.js
@@ -0,0 +1,64 @@
+import { globSync } from "node:fs";
+
+const dryRun = !!process.env.DRY_RUN?.match(/true/gi);
+
+/**
+ * @type {Partial<import("typedoc").TypeDocOptions>}
+ */
+const config = {
+  entryPoints: ["./src", "./test/test-utils"],
+  entryPointStrategy: "expand",
+  exclude: [
+    "src/polyfills.ts",
+    "src/vite.env.d.ts",
+    "**/*+.test.ts",
+    "test/test-utils/setup",
+    "test/test-utils/reporters",
+  ],
+  excludeReferences: true, // prevent documenting re-exports
+  requiredToBeDocumented: [
+    "Enum",
+    "EnumMember",
+    "Variable",
+    "Function",
+    "Class",
+    "Interface",
+    "Property",
+    "Method",
+    "Accessor",
+    "TypeAlias",
+  ],
+  highlightLanguages: ["javascript", "json", "jsonc", "json5", "tsx", "typescript", "markdown"],
+  plugin: [
+    "typedoc-github-theme",
+    "typedoc-plugin-coverage",
+    "typedoc-plugin-mdn-links",
+    ...globSync("./typedoc-plugins/**/*.js").map(plugin => "./" + plugin),
+  ],
+  // Avoid emitting docs for branches other than main/beta
+  emit: dryRun ? "none" : "docs",
+  out: process.env.CI ? "/tmp/docs" : "./typedoc",
+  name: "PokéRogue",
+  readme: "./README.md",
+  coverageLabel: "Documented",
+  coverageSvgWidth: 120, // Increased from 104 baseline due to adding 2 extra letters
+  favicon: "./public/images/logo.png",
+  theme: "typedoc-github-theme",
+  customFooterHtml: "<p>Copyright <strong>Pagefault Games</strong> 2025</p>",
+  customFooterHtmlDisableWrapper: true,
+  navigationLinks: {
+    GitHub: "https://github.com/pagefaultgames/pokerogue",
+  },
+};
+
+// If generating docs for main/beta, check the ref name and add an appropriate navigation header
+if (!dryRun && process.env.REF_NAME) {
+  const otherRefName = process.env.REF_NAME === "main" ? "beta" : "main";
+  config.navigationLinks = {
+    ...config.navigationLinks,
+    // This will be "Switch to Beta" when on main, and vice versa
+    [`Switch to ${otherRefName.charAt(0).toUpperCase() + otherRefName.slice(1).toLowerCase()}`]: `https://pagefaultgames.github.io/pokerogue/${otherRefName}`,
+  };
+}
+
+export default config;
diff --git a/typedoc.json b/typedoc.json
deleted file mode 100644
index c34e6190c1a..00000000000
--- a/typedoc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "entryPoints": ["./src"],
-  "entryPointStrategy": "expand",
-  "exclude": ["**/*+.test.ts"],
-  "out": "typedoc",
-  "highlightLanguages": ["javascript", "json", "jsonc", "json5", "tsx", "typescript", "markdown"]
-}
diff --git a/vitest.config.ts b/vitest.config.ts
index 65c5427e591..7fa2494bb4e 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,18 +1,25 @@
-import { defineProject } from "vitest/config";
+import { defineConfig } from "vitest/config";
 import { BaseSequencer, type TestSpecification } from "vitest/node";
 import { defaultConfig } from "./vite.config";
 
-export default defineProject(({ mode }) => ({
+export default defineConfig(({ mode }) => ({
   ...defaultConfig,
   test: {
+    reporters: process.env.GITHUB_ACTIONS
+      ? ["github-actions", "./test/test-utils/reporters/custom-default-reporter.ts"]
+      : ["./test/test-utils/reporters/custom-default-reporter.ts"],
     env: {
       TZ: "UTC",
     },
-    testTimeout: 20000,
+    testTimeout: 20_000,
+    slowTestThreshold: 10_000,
+    // TODO: Consider enabling
+    // expect: {requireAssertions: true},
     setupFiles: ["./test/font-face.setup.ts", "./test/vitest.setup.ts", "./test/matchers.setup.ts"],
     sequence: {
       sequencer: MySequencer,
     },
+    includeTaskLocation: true,
     environment: "jsdom" as const,
     environmentOptions: {
       jsdom: {