diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..ab415de
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: Unit tests
+        run: npm run test:unit
+
+      - name: Install Playwright browser
+        run: npx playwright install --with-deps chromium
+
+      - name: E2E tests
+        run: npm run test:e2e
+
+      - name: Upload Playwright artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-artifacts
+          path: |
+            output/playwright/report
+            output/playwright/test-results
+          if-no-files-found: ignore
diff --git a/.gitignore b/.gitignore
index a547bf3..6f80358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,9 @@ node_modules
 dist
 dist-ssr
 *.local
+output/playwright/
+playwright-report/
+test-results/
 
 # Editor directories and files
 .vscode/*
diff --git a/README.md b/README.md
index 0e7880c..0f11d4b 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,15 @@
-# Vanity ETH GPU
+# Vanity SOL GPU
 
-A fast Ethereum vanity address generator that runs entirely in your browser.
+A fast Solana vanity address generator that runs entirely in your browser.
 
 ## Features
 
-- **Multi-threaded** - Uses Web Workers for parallel address generation
+- **Multi-threaded** - Uses Web Workers for parallel keypair generation
+- **GPU-accelerated matching** - Uses WebGPU to parallelize Base58 vanity matching when available
 - **Privacy First** - All computations run locally in your browser, no server communication
-- **Custom Prefix/Suffix** - Find addresses starting or ending with your desired characters
-- **Wallet + First Contract Targets** - Scan either the wallet address or its first `CREATE` deploy address (nonce 0)
-- **Keystore Export** - Download encrypted keystore JSON files
+- **Custom Prefix/Suffix** - Find addresses starting or ending with your desired Base58 characters
+- **Wallet + Program ID Targets** - Scan either wallet addresses or program IDs
+- **Keypair Export** - Download Solana-compatible keypair JSON files
 
 ## Requirements
 
@@ -16,15 +17,15 @@ A fast Ethereum vanity address generator that runs entirely in your browser.
 
 ## Usage
 
-1. Choose target: wallet address or first contract address
-2. Enter your desired prefix and/or suffix (hex characters: 0-9, a-f)
+1. Choose target: wallet address or program ID
+2. Enter your desired prefix and/or suffix (Base58 characters)
 3. Click Generate and wait for a match
-4. Once found, reveal the private key or download as encrypted keystore
+4. Once found, reveal the secret key or download keypair JSON
 
 ## Security
 
 - Disconnect from the internet before generating for maximum security
-- Never share your private key
+- Never share your secret key
 - Always verify the address matches your requirements before use
 
 ## Development
@@ -38,14 +39,37 @@ npm run dev
 
 # Build for production
 npm run build
+
+# Run unit tests
+npm run test:unit
+
+# Run browser E2E tests
+npm run test:e2e
+
+# Run full quality gate (build + unit + e2e)
+npm run check
 ```
 
+## Testing
+
+- Unit tests use `vitest` and cover core Base58/keys logic.
+- E2E tests use `@playwright/test` and exercise real UI flows in Chromium.
+- CI runs `build`, `test:unit`, and `test:e2e` on every push/PR.
+- For deterministic test runs, the dev server is started with `VITE_FORCE_BACKEND=cpu`.
+
 ## Tech Stack
 
 - TypeScript
 - Vite
 - Web Workers
-- @noble/secp256k1 for cryptography
+- WebGPU
+- @noble/curves (ed25519)
+
+## Notes
+
+- Runtime auto-benchmarks GPU hybrid mode vs CPU mode and picks the faster backend.
+- If WebGPU is unavailable, the app falls back to CPU-only search.
+- You can force a backend for troubleshooting with `VITE_FORCE_BACKEND=cpu` or `VITE_FORCE_BACKEND=gpu`.
 
 ## License
 
diff --git a/index.html b/index.html
index f991372..5bd8a67 100644
--- a/index.html
+++ b/index.html
@@ -4,58 +4,55 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vanity ETH GPU | Vanity Wallet & First Contract Address Generator</title>
+    <title>Vanity SOL GPU | Solana Vanity Wallet & Program ID Generator</title>
 
     <meta
       name="description"
-      content="Generate Ethereum vanity wallet addresses and first contract deploy addresses (CREATE nonce 0) directly in your browser with WebGPU, WASM, and CPU fallback."
+      content="Generate Solana vanity wallet addresses and vanity program IDs directly in your browser with WebGPU-accelerated matching and CPU fallback."
     />
     <meta
       name="keywords"
-      content="ethereum vanity address, ethereum address generator, vanity wallet, first contract address, webgpu ethereum, create nonce 0"
+      content="solana vanity address, solana vanity wallet, vanity program id, solana address generator, webgpu solana"
     />
     <meta name="author" content="HODL Community" />
-    <meta name="application-name" content="Vanity ETH GPU" />
-    <meta name="apple-mobile-web-app-title" content="Vanity ETH GPU" />
+    <meta name="application-name" content="Vanity SOL GPU" />
+    <meta name="apple-mobile-web-app-title" content="Vanity SOL GPU" />
     <meta name="robots" content="index, follow, max-image-preview:large, max-snippet:-1, max-video-preview:-1" />
     <meta name="referrer" content="strict-origin-when-cross-origin" />
-    <meta name="theme-color" content="#0b0c12" />
+    <meta name="theme-color" content="#05070d" />
 
-    <link rel="canonical" href="https://hodl-community.github.io/vanity-eth-gpu/" />
-    <link rel="alternate" href="https://hodl-community.github.io/vanity-eth-gpu/" hreflang="en" />
+    <link rel="canonical" href="https://hodl-community.github.io/vanity-sol-gpu/" />
+    <link rel="alternate" href="https://hodl-community.github.io/vanity-sol-gpu/" hreflang="en" />
 
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
     <link rel="manifest" href="/site.webmanifest" />
 
     <meta property="og:locale" content="en_US" />
     <meta property="og:type" content="website" />
-    <meta property="og:site_name" content="Vanity ETH GPU" />
-    <meta property="og:url" content="https://hodl-community.github.io/vanity-eth-gpu/" />
-    <meta property="og:title" content="Vanity ETH GPU | Vanity Wallet & First Contract Address Generator" />
+    <meta property="og:site_name" content="Vanity SOL GPU" />
+    <meta property="og:url" content="https://hodl-community.github.io/vanity-sol-gpu/" />
+    <meta property="og:title" content="Vanity SOL GPU | Solana Vanity Wallet & Program ID Generator" />
     <meta
       property="og:description"
-      content="Generate Ethereum vanity wallet addresses and first contract deploy addresses in-browser with GPU acceleration."
+      content="Generate Solana vanity wallet addresses and program IDs in-browser with WebGPU-accelerated matching and CPU fallback."
     />
-    <meta property="og:image" content="https://hodl-community.github.io/vanity-eth-gpu/og-image.png" />
-    <meta property="og:image:secure_url" content="https://hodl-community.github.io/vanity-eth-gpu/og-image.png" />
+    <meta property="og:image" content="https://hodl-community.github.io/vanity-sol-gpu/og-image.svg" />
+    <meta property="og:image:secure_url" content="https://hodl-community.github.io/vanity-sol-gpu/og-image.svg" />
     <meta property="og:image:width" content="1200" />
     <meta property="og:image:height" content="630" />
     <meta
       property="og:image:alt"
-      content="Vanity ETH GPU: Ethereum vanity wallet and first-contract address generator."
+      content="Vanity SOL GPU: Solana vanity wallet and program ID generator."
     />
 
     <meta name="twitter:card" content="summary_large_image" />
-    <meta name="twitter:title" content="Vanity ETH GPU | Vanity Wallet & First Contract Address Generator" />
+    <meta name="twitter:title" content="Vanity SOL GPU | Solana Vanity Wallet & Program ID Generator" />
     <meta
       name="twitter:description"
-      content="GPU-accelerated in-browser Ethereum vanity scanner for wallets and first contract deploy addresses."
+      content="In-browser Solana vanity scanner with WebGPU-accelerated matching and CPU fallback."
     />
-    <meta name="twitter:image" content="https://hodl-community.github.io/vanity-eth-gpu/twitter-card.png" />
-    <meta name="twitter:image:alt" content="Vanity ETH GPU social card showing wallet and first-contract matching." />
+    <meta name="twitter:image" content="https://hodl-community.github.io/vanity-sol-gpu/twitter-card.svg" />
+    <meta name="twitter:image:alt" content="Vanity SOL GPU social card showing Solana vanity matching." />
 
     <script type="application/ld+json">
       {
@@ -63,20 +60,20 @@
         "@graph": [
           {
             "@type": "WebSite",
-            "name": "Vanity ETH GPU",
-            "url": "https://hodl-community.github.io/vanity-eth-gpu/",
+            "name": "Vanity SOL GPU",
+            "url": "https://hodl-community.github.io/vanity-sol-gpu/",
             "inLanguage": "en-US",
-            "description": "A privacy-first in-browser Ethereum vanity address generator with GPU acceleration."
+            "description": "A privacy-first in-browser Solana vanity address generator with GPU-accelerated matching."
           },
           {
             "@type": "SoftwareApplication",
-            "name": "Vanity ETH GPU",
+            "name": "Vanity SOL GPU",
             "applicationCategory": "SecurityApplication",
             "operatingSystem": "Web",
-            "url": "https://hodl-community.github.io/vanity-eth-gpu/",
-            "image": "https://hodl-community.github.io/vanity-eth-gpu/og-image.png",
+            "url": "https://hodl-community.github.io/vanity-sol-gpu/",
+            "image": "https://hodl-community.github.io/vanity-sol-gpu/og-image.svg",
             "inLanguage": "en-US",
-            "description": "Generate vanity Ethereum wallet and first-contract addresses with local-only key generation and WebGPU acceleration.",
+            "description": "Generate vanity Solana wallet addresses and program IDs with WebGPU-accelerated matching and local-only key generation.",
             "offers": {
               "@type": "Offer",
               "price": "0",
@@ -84,9 +81,10 @@
             },
             "featureList": [
               "Wallet vanity address scanning",
-              "First contract deploy address scanning (CREATE nonce 0)",
+              "Program ID vanity scanning",
+              "WebGPU-accelerated Base58 matching",
               "Local-only private key generation",
-              "Encrypted keystore export"
+              "Solana keypair JSON export"
             ]
           }
         ]
diff --git a/notes/mistakes.md b/notes/mistakes.md
index 2bba3f6..8d21640 100644
--- a/notes/mistakes.md
+++ b/notes/mistakes.md
@@ -13,3 +13,23 @@
 - Mistake: I interpreted “remove EIP-55” as removing the feature instead of removing the wording in the selector, and merged that broader behavior change.
 - Avoid: Confirm scope by mapping the request to explicit targets (label text vs runtime logic) before editing behavior paths.
 - Cleanup: Restore the previous behavior and apply only the requested copy change in a follow-up PR.
+
+- Mistake: I tried to remove files using `rm -rf` in this environment, and the command was blocked by policy.
+- Avoid: Prefer `apply_patch` delete hunks for tracked-file removals so cleanup is tool-policy compatible.
+- Cleanup: Re-run the file removals via `apply_patch` and verify deletions with `git status --short`.
+
+- Mistake: I imported `@noble/curves/ed25519` without the `.js` extension, which failed TypeScript module resolution under the repo’s ESM/bundler settings.
+- Avoid: For `@noble/*` subpath imports in this setup, use explicit `.js` subpath imports from the start and run a build after dependency swaps.
+- Cleanup: Replace imports with `@noble/curves/ed25519.js` and rerun `npm run build` to confirm.
+
+- Mistake: I assumed typed-array buffers would satisfy `ArrayBuffer` transfer typings, but under strict TS they were inferred as `ArrayBufferLike`, causing compile errors in worker postMessage and `queue.writeBuffer`.
+- Avoid: Validate transfer/buffer boundaries early for worker/GPU code; normalize with explicit `Uint8Array#slice()` copies when strict buffer types are required.
+- Cleanup: Send typed arrays directly through worker messages (or copy into concrete `ArrayBuffer`), and pass a concrete copy into `queue.writeBuffer` before building.
+
+- Mistake: I ran `mkdir -p tests/...` without setting the repo `workdir`, so the folders were created outside the project context.
+- Avoid: Always include `workdir` on filesystem mutations, even for simple directory creation commands.
+- Cleanup: Re-run directory creation with the correct repo `workdir` and verify with `pwd` + `ls`.
+
+- Mistake: I assumed the local Playwright skill wrapper command (`playwright-cli`) was still available from `@playwright/mcp`; current package exposes `playwright-mcp` instead.
+- Avoid: Verify CLI binary names with `npm pkg get bin` (or inspect installed package metadata) before scripting around a wrapper.
+- Cleanup: Use a fallback test strategy (`@playwright/test`) when wrapper tooling is not operational in the environment, and document the discrepancy.
diff --git a/package-lock.json b/package-lock.json
index 49ed140..77978fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,25 +1,22 @@
 {
-  "name": "vanity-eth-webgpu",
+  "name": "vanity-sol-gpu",
   "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "vanity-eth-webgpu",
+      "name": "vanity-sol-gpu",
       "version": "0.0.0",
       "dependencies": {
-        "@noble/ciphers": "^2.1.1",
         "@noble/curves": "^2.0.1",
-        "@noble/hashes": "^2.0.1",
-        "@noble/secp256k1": "^3.0.0",
-        "tiny-secp256k1": "^2.2.4",
-        "vite-plugin-top-level-await": "^1.6.0",
-        "vite-plugin-wasm": "^3.5.0"
+        "@scure/base": "^2.0.0"
       },
       "devDependencies": {
+        "@playwright/test": "^1.55.0",
         "@webgpu/types": "^0.1.68",
         "typescript": "~5.9.3",
-        "vite": "^7.2.4"
+        "vite": "^7.2.4",
+        "vitest": "^3.2.4"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
@@ -29,6 +26,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -45,6 +43,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -61,6 +60,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -77,6 +77,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -93,6 +94,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -109,6 +111,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -125,6 +128,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -141,6 +145,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -157,6 +162,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -173,6 +179,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -189,6 +196,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -205,6 +213,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -221,6 +230,7 @@
       "cpu": [
         "mips64el"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -237,6 +247,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -253,6 +264,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -269,6 +281,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -285,6 +298,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -301,6 +315,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -317,6 +332,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -333,6 +349,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -349,6 +366,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -365,6 +383,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -381,6 +400,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -397,6 +417,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -413,6 +434,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -429,6 +451,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -438,17 +461,12 @@
         "node": ">=18"
       }
     },
-    "node_modules/@noble/ciphers": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-2.1.1.tgz",
-      "integrity": "sha512-bysYuiVfhxNJuldNXlFEitTVdNnYUc+XNJZd7Qm2a5j1vZHgY+fazadNFWFaMK/2vye0JVlxV3gHmC0WDfAOQw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 20.19.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@noble/curves": {
       "version": "2.0.1",
@@ -477,30 +495,20 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@noble/secp256k1": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-3.0.0.tgz",
-      "integrity": "sha512-NJBaR352KyIvj3t6sgT/+7xrNyF9Xk9QlLSIqUGVUYlsnDTAUqY8LOmwpcgEx4AMJXRITQ5XEVHD+mMaPfr3mg==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@rollup/plugin-virtual": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-3.0.2.tgz",
-      "integrity": "sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
+    "node_modules/@playwright/test": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
+      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.58.2"
       },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      "bin": {
+        "playwright": "cli.js"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
@@ -510,6 +518,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -523,6 +532,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -536,6 +546,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -549,6 +560,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -562,6 +574,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -575,6 +588,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -588,6 +602,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -601,6 +616,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -614,6 +630,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -627,6 +644,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -640,6 +658,7 @@
       "cpu": [
         "loong64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -653,6 +672,7 @@
       "cpu": [
         "ppc64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -666,6 +686,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -679,6 +700,7 @@
       "cpu": [
         "riscv64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -692,6 +714,7 @@
       "cpu": [
         "s390x"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -705,6 +728,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -718,6 +742,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -731,6 +756,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -744,6 +770,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -757,6 +784,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -770,6 +798,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -783,248 +812,256 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
-    "node_modules/@swc/core": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.11.tgz",
-      "integrity": "sha512-iLmLTodbYxU39HhMPaMUooPwO/zqJWvsqkrXv1ZI38rMb048p6N7qtAtTp37sw9NzSrvH6oli8EdDygo09IZ/w==",
-      "hasInstallScript": true,
-      "license": "Apache-2.0",
+    "node_modules/@scure/base": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-2.0.0.tgz",
+      "integrity": "sha512-3E1kpuZginKkek01ovG8krQ0Z44E3DHPjc5S2rjJw9lZn3KSQOs8S7wqikF/AH7iRanHypj85uGyxk0XAyC37w==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@types/chai": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
+      "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.25"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/deep-eql": "*",
+        "assertion-error": "^2.0.1"
+      }
+    },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vitest/expect": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
+        "chai": "^5.2.0",
+        "tinyrainbow": "^2.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/swc"
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/mocker": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "3.2.4",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.17"
       },
-      "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.15.11",
-        "@swc/core-darwin-x64": "1.15.11",
-        "@swc/core-linux-arm-gnueabihf": "1.15.11",
-        "@swc/core-linux-arm64-gnu": "1.15.11",
-        "@swc/core-linux-arm64-musl": "1.15.11",
-        "@swc/core-linux-x64-gnu": "1.15.11",
-        "@swc/core-linux-x64-musl": "1.15.11",
-        "@swc/core-win32-arm64-msvc": "1.15.11",
-        "@swc/core-win32-ia32-msvc": "1.15.11",
-        "@swc/core-win32-x64-msvc": "1.15.11"
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@swc/helpers": ">=0.5.17"
+        "msw": "^2.4.9",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
-        "@swc/helpers": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
           "optional": true
         }
       }
     },
-    "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.11.tgz",
-      "integrity": "sha512-QoIupRWVH8AF1TgxYyeA5nS18dtqMuxNwchjBIwJo3RdwLEFiJq6onOx9JAxHtuPwUkIVuU2Xbp+jCJ7Vzmgtg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
+    "node_modules/@vitest/pretty-format": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@swc/core-darwin-x64": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.11.tgz",
-      "integrity": "sha512-S52Gu1QtPSfBYDiejlcfp9GlN+NjTZBRRNsz8PNwBgSE626/FUf2PcllVUix7jqkoMC+t0rS8t+2/aSWlMuQtA==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
+    "node_modules/@vitest/runner": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.11.tgz",
-      "integrity": "sha512-lXJs8oXo6Z4yCpimpQ8vPeCjkgoHu5NoMvmJZ8qxDyU99KVdg6KwU9H79vzrmB+HfH+dCZ7JGMqMF//f8Cfvdg==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
+    "node_modules/@vitest/snapshot": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.2.4",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.11.tgz",
-      "integrity": "sha512-chRsz1K52/vj8Mfq/QOugVphlKPWlMh10V99qfH41hbGvwAU6xSPd681upO4bKiOr9+mRIZZW+EfJqY42ZzRyA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
+    "node_modules/@vitest/spy": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^4.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.11.tgz",
-      "integrity": "sha512-PYftgsTaGnfDK4m6/dty9ryK1FbLk+LosDJ/RJR2nkXGc8rd+WenXIlvHjWULiBVnS1RsjHHOXmTS4nDhe0v0w==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
+    "node_modules/@vitest/utils": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
+        "tinyrainbow": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.11.tgz",
-      "integrity": "sha512-DKtnJKIHiZdARyTKiX7zdRjiDS1KihkQWatQiCHMv+zc2sfwb4Glrodx2VLOX4rsa92NLR0Sw8WLcPEMFY1szQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/@webgpu/types": {
+      "version": "0.1.69",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.69.tgz",
+      "integrity": "sha512-RPmm6kgRbI8e98zSD3RVACvnuktIja5+yLgDAkTmxLr90BEwdTXRQWNLF3ETTTyH/8mKhznZuN5AveXYFEsMGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
-    "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.11.tgz",
-      "integrity": "sha512-mUjjntHj4+8WBaiDe5UwRNHuEzLjIWBTSGTw0JT9+C9/Yyuh4KQqlcEQ3ro6GkHmBGXBFpGIj/o5VMyRWfVfWw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
-    "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.11.tgz",
-      "integrity": "sha512-ZkNNG5zL49YpaFzfl6fskNOSxtcZ5uOYmWBkY4wVAvgbSAQzLRVBp+xArGWh2oXlY/WgL99zQSGTv7RI5E6nzA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.11.tgz",
-      "integrity": "sha512-6XnzORkZCQzvTQ6cPrU7iaT9+i145oLwnin8JrfsLG41wl26+5cNQ2XV3zcbrnFEV6esjOceom9YO1w9mGJByw==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/chai": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
+      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
-    "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.11.tgz",
-      "integrity": "sha512-IQ2n6af7XKLL6P1gIeZACskSxK8jWtoKpJWLZmdXTDj1MGzktUy4i+FvpdtxFmJWNavRWH1VmTr6kAubRDHeKw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/check-error": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
+      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">= 16"
       }
     },
-    "node_modules/@swc/counter": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
-      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/@swc/types": {
-      "version": "0.1.25",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz",
-      "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==",
-      "license": "Apache-2.0",
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@swc/counter": "^0.1.3"
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@swc/wasm": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@swc/wasm/-/wasm-1.15.11.tgz",
-      "integrity": "sha512-230rdYZf8ux3nIwISOQNCFrxzxpL/UFY4Khv/3UsvpEdo709j/+Tg80yXWW3DXETeZNPBV72QpvEBhXsl7Lc9g==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "license": "MIT"
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/@webgpu/types": {
-      "version": "0.1.68",
-      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.68.tgz",
-      "integrity": "sha512-3ab1B59Ojb6RwjOspYLsTpCzbNB3ZaamIAxBMmvnNkiDoLTZUOBXZ9p5nAYVEkQlDdf6qAZWi1pqj9+ypiqznA==",
+    "node_modules/es-module-lexer": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "MIT"
     },
     "node_modules/esbuild": {
       "version": "0.27.2",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz",
       "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -1062,10 +1099,31 @@
         "@esbuild/win32-x64": "0.27.2"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/expect-type": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
+      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
       "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
@@ -1083,6 +1141,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -1093,10 +1152,42 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/loupe": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
+      "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -1111,16 +1202,35 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pathval": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -1129,10 +1239,58 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
+      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
+      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
       "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -1161,6 +1319,7 @@
       "version": "4.54.0",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.54.0.tgz",
       "integrity": "sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.8"
@@ -1198,31 +1357,69 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/source-map-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/tiny-secp256k1": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.4.tgz",
-      "integrity": "sha512-FoDTcToPqZE454Q04hH9o2EhxWsm7pOSpicyHkgTwKhdKWdsTUuqfP5MLq3g+VjAtl2vSx6JpXGdwA2qpYkI0Q==",
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/std-env": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
+      "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/strip-literal": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.1.0.tgz",
+      "integrity": "sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "uint8array-tools": "0.0.7"
+        "js-tokens": "^9.0.1"
       },
-      "engines": {
-        "node": ">=14.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/tinybench": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
       "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
@@ -1235,6 +1432,36 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/tinypool": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
+      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.4.tgz",
+      "integrity": "sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
@@ -1249,32 +1476,11 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/uint8array-tools": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/uint8array-tools/-/uint8array-tools-0.0.7.tgz",
-      "integrity": "sha512-vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/vite": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
       "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.27.0",
@@ -1345,28 +1551,117 @@
         }
       }
     },
-    "node_modules/vite-plugin-top-level-await": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.6.0.tgz",
-      "integrity": "sha512-bNhUreLamTIkoulCR9aDXbTbhLk6n1YE8NJUTTxl5RYskNRtzOR0ASzSjBVRtNdjIfngDXo11qOsybGLNsrdww==",
+    "node_modules/vite-node": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rollup/plugin-virtual": "^3.0.2",
-        "@swc/core": "^1.12.14",
-        "@swc/wasm": "^1.12.14",
-        "uuid": "10.0.0"
+        "cac": "^6.7.14",
+        "debug": "^4.4.1",
+        "es-module-lexer": "^1.7.0",
+        "pathe": "^2.0.3",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
-      "peerDependencies": {
-        "vite": ">=2.8"
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/vite-plugin-wasm": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-wasm/-/vite-plugin-wasm-3.5.0.tgz",
-      "integrity": "sha512-X5VWgCnqiQEGb+omhlBVsvTfxikKtoOgAzQ95+BZ8gQ+VfMHIjSHr0wyvXFQCa0eKQ0fKyaL0kWcEnYqBac4lQ==",
+    "node_modules/vitest": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
+        "chai": "^5.2.0",
+        "debug": "^4.4.1",
+        "expect-type": "^1.2.1",
+        "magic-string": "^0.30.17",
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.2",
+        "std-env": "^3.9.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
+        "tinyrainbow": "^2.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
       "peerDependencies": {
-        "vite": "^2 || ^3 || ^4 || ^5 || ^6 || ^7"
+        "@edge-runtime/vm": "*",
+        "@types/debug": "^4.1.12",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/debug": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/why-is-node-running": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
       }
     }
   }
diff --git a/package.json b/package.json
index 692d37c..849a3f8 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,27 @@
 {
-  "name": "vanity-eth-webgpu",
+  "name": "vanity-sol-gpu",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview"
+    "typecheck": "tsc --noEmit",
+    "build": "npm run typecheck && vite build",
+    "preview": "vite preview",
+    "test:unit": "vitest run",
+    "test:e2e": "playwright test",
+    "test": "npm run test:unit && npm run test:e2e",
+    "check": "npm run build && npm run test:unit && npm run test:e2e"
   },
   "devDependencies": {
+    "@playwright/test": "^1.55.0",
     "@webgpu/types": "^0.1.68",
     "typescript": "~5.9.3",
-    "vite": "^7.2.4"
+    "vite": "^7.2.4",
+    "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@noble/ciphers": "^2.1.1",
     "@noble/curves": "^2.0.1",
-    "@noble/hashes": "^2.0.1",
-    "@noble/secp256k1": "^3.0.0",
-    "tiny-secp256k1": "^2.2.4",
-    "vite-plugin-top-level-await": "^1.6.0",
-    "vite-plugin-wasm": "^3.5.0"
+    "@scure/base": "^2.0.0"
   }
 }
diff --git a/playwright.config.ts b/playwright.config.ts
new file mode 100644
index 0000000..09c12e7
--- /dev/null
+++ b/playwright.config.ts
@@ -0,0 +1,37 @@
+import { defineConfig, devices } from '@playwright/test'
+
+export default defineConfig({
+  testDir: './tests/e2e',
+  timeout: 120_000,
+  expect: {
+    timeout: 30_000,
+  },
+  fullyParallel: false,
+  retries: process.env.CI ? 1 : 0,
+  reporter: [
+    ['list'],
+    ['html', { outputFolder: 'output/playwright/report', open: 'never' }],
+  ],
+  outputDir: 'output/playwright/test-results',
+  use: {
+    baseURL: 'http://127.0.0.1:4173',
+    trace: 'retain-on-failure',
+    screenshot: 'only-on-failure',
+    video: 'retain-on-failure',
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+  ],
+  webServer: {
+    command: 'npm run dev -- --host 127.0.0.1 --port 4173',
+    url: 'http://127.0.0.1:4173',
+    timeout: 120_000,
+    reuseExistingServer: !process.env.CI,
+    env: {
+      VITE_FORCE_BACKEND: 'cpu',
+    },
+  },
+})
diff --git a/public/favicon.svg b/public/favicon.svg
index 60d6b3e..c839782 100644
--- a/public/favicon.svg
+++ b/public/favicon.svg
@@ -1,17 +1,18 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <defs>
     <linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#627eea"/>
-      <stop offset="100%" stop-color="#3b4d9b"/>
+      <stop offset="0%" stop-color="#0b1120"/>
+      <stop offset="100%" stop-color="#070a14"/>
     </linearGradient>
-    <linearGradient id="eth" x1="50%" y1="0%" x2="50%" y2="100%">
-      <stop offset="0%" stop-color="#fff"/>
-      <stop offset="100%" stop-color="#c8d4ff"/>
+    <linearGradient id="sol" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#14F195"/>
+      <stop offset="100%" stop-color="#9945FF"/>
     </linearGradient>
   </defs>
   <rect width="64" height="64" rx="14" fill="url(#bg)"/>
-  <g transform="translate(32, 32)">
-    <polygon points="0,-20 12,0 0,8 -12,0" fill="url(#eth)" opacity="0.95"/>
-    <polygon points="0,8 12,0 0,20 -12,0" fill="url(#eth)" opacity="0.7"/>
+  <g transform="translate(8, 10)">
+    <path d="M8 3h39l-6 7H2l6-7z" fill="url(#sol)"/>
+    <path d="M2 18h39l-6 7H-4l6-7z" fill="url(#sol)"/>
+    <path d="M8 33h39l-6 7H2l6-7z" fill="url(#sol)"/>
   </g>
 </svg>
diff --git a/public/og-image.svg b/public/og-image.svg
index f5f11a5..e1feb9f 100644
--- a/public/og-image.svg
+++ b/public/og-image.svg
@@ -1,73 +1,44 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="1200" height="630" viewBox="0 0 1200 630" role="img" aria-labelledby="title desc">
-  <title id="title">Vanity ETH GPU Open Graph Image</title>
-  <desc id="desc">A premium cover image for Vanity ETH GPU showing wallet and first contract vanity generation.</desc>
+  <title id="title">Vanity SOL GPU Open Graph Image</title>
+  <desc id="desc">Vanity SOL GPU card with Solana-themed styling and logo.</desc>
   <defs>
     <linearGradient id="bg" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0%" stop-color="#060A14"/>
-      <stop offset="55%" stop-color="#0B1120"/>
-      <stop offset="100%" stop-color="#0E1B34"/>
+      <stop offset="0%" stop-color="#0a0f1e"/>
+      <stop offset="55%" stop-color="#11152a"/>
+      <stop offset="100%" stop-color="#060911"/>
     </linearGradient>
-    <radialGradient id="glowA" cx="18%" cy="20%" r="52%">
-      <stop offset="0%" stop-color="#5B8CFF" stop-opacity="0.45"/>
-      <stop offset="100%" stop-color="#5B8CFF" stop-opacity="0"/>
+    <radialGradient id="glowA" cx="0.15" cy="0.2" r="0.7">
+      <stop offset="0%" stop-color="#9945ff" stop-opacity="0.4"/>
+      <stop offset="100%" stop-color="#9945ff" stop-opacity="0"/>
     </radialGradient>
-    <radialGradient id="glowB" cx="82%" cy="82%" r="54%">
-      <stop offset="0%" stop-color="#3CD6A8" stop-opacity="0.28"/>
-      <stop offset="100%" stop-color="#3CD6A8" stop-opacity="0"/>
+    <radialGradient id="glowB" cx="0.82" cy="0.82" r="0.6">
+      <stop offset="0%" stop-color="#14f195" stop-opacity="0.35"/>
+      <stop offset="100%" stop-color="#14f195" stop-opacity="0"/>
     </radialGradient>
-    <linearGradient id="line" x1="0" y1="0" x2="1" y2="0">
-      <stop offset="0%" stop-color="#6A9DFF"/>
-      <stop offset="100%" stop-color="#43E3B2"/>
+    <linearGradient id="sol" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#14f195"/>
+      <stop offset="100%" stop-color="#9945ff"/>
     </linearGradient>
-    <filter id="soft" x="-20%" y="-20%" width="140%" height="140%">
-      <feGaussianBlur stdDeviation="24"/>
-    </filter>
-    <pattern id="grid" width="28" height="28" patternUnits="userSpaceOnUse">
-      <path d="M 28 0 L 0 0 0 28" fill="none" stroke="#90A7DD" stroke-opacity="0.12" stroke-width="1"/>
-    </pattern>
   </defs>
 
   <rect width="1200" height="630" fill="url(#bg)"/>
-  <rect width="1200" height="630" fill="url(#grid)" opacity="0.25"/>
   <rect width="1200" height="630" fill="url(#glowA)"/>
   <rect width="1200" height="630" fill="url(#glowB)"/>
 
-  <g filter="url(#soft)">
-    <circle cx="205" cy="120" r="90" fill="#4E7FFF" fill-opacity="0.35"/>
-    <circle cx="1030" cy="530" r="120" fill="#39C79E" fill-opacity="0.24"/>
-  </g>
-
-  <rect x="70" y="62" width="1060" height="506" rx="28" fill="#0E162A" fill-opacity="0.62" stroke="#8AB2FF" stroke-opacity="0.3" stroke-width="2"/>
-  <line x1="70" y1="136" x2="1130" y2="136" stroke="url(#line)" stroke-opacity="0.45" stroke-width="2"/>
-
-  <g transform="translate(105 92)">
-    <rect x="0" y="0" width="42" height="42" rx="12" fill="#5F83F5"/>
-    <path d="M21 6L7 21L21 36L35 21L21 6ZM21 6V21M21 21H35" fill="none" stroke="#F7FAFF" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round"/>
-    <text x="58" y="28" fill="#EAF2FF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="30" font-weight="700" letter-spacing="0.3">Vanity ETH GPU</text>
-  </g>
-
-  <g transform="translate(106 188)">
-    <text x="0" y="0" fill="#F7FAFF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="64" font-weight="760" letter-spacing="-0.8">Find Elite Ethereum Vanity Addresses</text>
-    <text x="0" y="56" fill="#BCD0F8" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="31" font-weight="520">Wallet and first-contract deploy targets with GPU, WASM, and CPU backends.</text>
-  </g>
-
-  <g transform="translate(106 332)">
-    <rect x="0" y="0" width="364" height="58" rx="14" fill="#132440" stroke="#79A6FF" stroke-opacity="0.55"/>
-    <text x="20" y="36" fill="#DCEBFF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="25" font-weight="600">Local-only private key generation</text>
-
-    <rect x="382" y="0" width="244" height="58" rx="14" fill="#132440" stroke="#79A6FF" stroke-opacity="0.55"/>
-    <text x="403" y="36" fill="#DCEBFF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="25" font-weight="600">WebGPU speed</text>
-
-    <rect x="638" y="0" width="368" height="58" rx="14" fill="#132440" stroke="#5ED7AE" stroke-opacity="0.6"/>
-    <text x="661" y="36" fill="#D6FFF1" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="25" font-weight="600">First contract (CREATE nonce 0)</text>
-  </g>
-
-  <g transform="translate(106 430)">
-    <rect x="0" y="0" width="994" height="96" rx="16" fill="#09111E" stroke="#6B8CC8" stroke-opacity="0.5"/>
-    <text x="24" y="38" fill="#8EACDF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="24" font-weight="500">MATCHED</text>
-    <text x="24" y="72" fill="#EAF3FF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="34" font-weight="700">0x</text>
-    <text x="69" y="72" fill="#56B5FF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="34" font-weight="700">c0ffee</text>
-    <text x="208" y="72" fill="#DCE9FF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="34">9b4a7d8e1f22a6c4d3f1019</text>
-    <text x="780" y="72" fill="#4DE7B0" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="34" font-weight="700">beef</text>
+  <g transform="translate(84 96)">
+    <rect x="0" y="0" width="130" height="130" rx="26" fill="rgba(255,255,255,0.03)" stroke="rgba(255,255,255,0.10)"/>
+    <g transform="translate(28 32)">
+      <path d="M12 0h64l-10 11H2L12 0z" fill="url(#sol)"/>
+      <path d="M2 23h64l-10 11H-8l10-11z" fill="url(#sol)"/>
+      <path d="M12 46h64l-10 11H2l10-11z" fill="url(#sol)"/>
+    </g>
+
+    <text x="170" y="44" fill="#e8f6ff" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="62" font-weight="760">Vanity SOL GPU</text>
+    <text x="170" y="102" fill="#c7d8f8" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="30" font-weight="540">Solana Vanity Wallet + Program ID Generator</text>
+
+    <rect x="170" y="150" width="860" height="236" rx="20" fill="rgba(255,255,255,0.03)" stroke="rgba(255,255,255,0.10)"/>
+    <text x="208" y="214" fill="#d9f4ff" font-family="'SF Mono','SFMono-Regular',Menlo,monospace" font-size="30">Prefix: <tspan fill="#14f195">Sol</tspan></text>
+    <text x="208" y="262" fill="#d9f4ff" font-family="'SF Mono','SFMono-Regular',Menlo,monospace" font-size="30">Suffix: <tspan fill="#9945ff">pump</tspan></text>
+    <text x="208" y="325" fill="#c3d6ef" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="28">Local-only key generation • Multi-core workers • Solana keypair JSON export</text>
   </g>
 </svg>
diff --git a/public/robots.txt b/public/robots.txt
index 83cf769..06b8bca 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,4 +1,4 @@
 User-agent: *
 Allow: /
 
-Sitemap: https://hodl-community.github.io/vanity-eth-gpu/sitemap.xml
+Sitemap: https://hodl-community.github.io/vanity-sol-gpu/sitemap.xml
diff --git a/public/site.webmanifest b/public/site.webmanifest
index 47dee52..57cd3e2 100644
--- a/public/site.webmanifest
+++ b/public/site.webmanifest
@@ -1,22 +1,18 @@
 {
-  "name": "Vanity ETH GPU",
-  "short_name": "Vanity ETH",
-  "description": "Fast in-browser Ethereum vanity wallet and first contract address generator with GPU acceleration.",
+  "name": "Vanity SOL GPU",
+  "short_name": "Vanity SOL",
+  "description": "Fast in-browser Solana vanity wallet and program ID generator.",
   "start_url": "./",
   "scope": "./",
   "display": "standalone",
-  "background_color": "#07080c",
-  "theme_color": "#0b0c12",
+  "background_color": "#05070d",
+  "theme_color": "#05070d",
   "icons": [
     {
-      "src": "/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
+      "src": "/favicon.svg",
+      "sizes": "any",
+      "type": "image/svg+xml",
+      "purpose": "any"
     }
   ]
 }
diff --git a/public/sitemap.xml b/public/sitemap.xml
index 118908a..cf74b45 100644
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
-    <loc>https://hodl-community.github.io/vanity-eth-gpu/</loc>
+    <loc>https://hodl-community.github.io/vanity-sol-gpu/</loc>
     <lastmod>2026-02-12</lastmod>
     <changefreq>weekly</changefreq>
     <priority>1.0</priority>
diff --git a/public/twitter-card.svg b/public/twitter-card.svg
index f39bd79..b088c0e 100644
--- a/public/twitter-card.svg
+++ b/public/twitter-card.svg
@@ -1,49 +1,37 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="630" viewBox="0 0 1200 630" role="img" aria-labelledby="title desc">
-  <title id="title">Vanity ETH GPU Twitter Card</title>
-  <desc id="desc">Generate vanity wallet and first contract addresses directly in browser with GPU acceleration.</desc>
+<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="600" viewBox="0 0 1200 600" role="img" aria-labelledby="title desc">
+  <title id="title">Vanity SOL GPU Twitter Card</title>
+  <desc id="desc">Social card for the Solana vanity address generator.</desc>
   <defs>
     <linearGradient id="bg" x1="0" y1="0" x2="1" y2="1">
-      <stop offset="0%" stop-color="#070A13"/>
-      <stop offset="100%" stop-color="#101E38"/>
+      <stop offset="0%" stop-color="#0b1020"/>
+      <stop offset="100%" stop-color="#070a13"/>
     </linearGradient>
-    <linearGradient id="accent" x1="0" y1="0" x2="1" y2="0">
-      <stop offset="0%" stop-color="#6EA1FF"/>
-      <stop offset="100%" stop-color="#49E0B2"/>
+    <linearGradient id="sol" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#14f195"/>
+      <stop offset="100%" stop-color="#9945ff"/>
     </linearGradient>
-    <radialGradient id="r" cx="75%" cy="16%" r="60%">
-      <stop offset="0%" stop-color="#75A6FF" stop-opacity="0.30"/>
-      <stop offset="100%" stop-color="#75A6FF" stop-opacity="0"/>
-    </radialGradient>
   </defs>
 
-  <rect width="1200" height="630" fill="url(#bg)"/>
-  <rect width="1200" height="630" fill="url(#r)"/>
+  <rect width="1200" height="600" fill="url(#bg)"/>
+  <circle cx="220" cy="140" r="220" fill="#9945ff" opacity="0.18"/>
+  <circle cx="1000" cy="530" r="260" fill="#14f195" opacity="0.16"/>
 
-  <rect x="74" y="68" width="1052" height="494" rx="30" fill="#0F1728" fill-opacity="0.74" stroke="#80A9F7" stroke-opacity="0.42" stroke-width="2"/>
-  <rect x="74" y="68" width="1052" height="7" fill="url(#accent)"/>
+  <g transform="translate(92 92)">
+    <rect x="0" y="0" width="1020" height="416" rx="28" fill="rgba(255,255,255,0.03)" stroke="rgba(255,255,255,0.10)"/>
 
-  <g transform="translate(118 128)">
-    <text x="0" y="0" fill="#ECF4FF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="66" font-weight="760">Vanity ETH GPU</text>
-    <text x="0" y="56" fill="#BCD4FF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="31">Wallet + First Contract vanity scanner, fully in-browser.</text>
-  </g>
-
-  <g transform="translate(118 264)">
-    <rect x="0" y="0" width="310" height="58" rx="14" fill="#152741" stroke="#6F9FFF"/>
-    <text x="24" y="37" fill="#DBEAFF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="25" font-weight="600">WebGPU / WASM / CPU</text>
+    <g transform="translate(52 58)">
+      <path d="M15 0h90l-14 15H1L15 0z" fill="url(#sol)"/>
+      <path d="M1 31h90l-14 15H-13L1 31z" fill="url(#sol)"/>
+      <path d="M15 62h90l-14 15H1l14-15z" fill="url(#sol)"/>
+    </g>
 
-    <rect x="326" y="0" width="320" height="58" rx="14" fill="#152741" stroke="#6F9FFF"/>
-    <text x="351" y="37" fill="#DBEAFF" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="25" font-weight="600">Prefix + suffix matching</text>
+    <text x="188" y="118" fill="#ecf5ff" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="66" font-weight="760">Vanity SOL GPU</text>
+    <text x="188" y="170" fill="#d0def7" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="30" font-weight="520">Vanity Wallet + Program ID Generator</text>
 
-    <rect x="662" y="0" width="356" height="58" rx="14" fill="#152741" stroke="#4DDAAD"/>
-    <text x="685" y="37" fill="#D6FFF1" font-family="'SF Pro Display', 'Inter', 'Segoe UI', sans-serif" font-size="25" font-weight="600">Private keys stay local</text>
-  </g>
+    <text x="188" y="252" fill="#bcd0ef" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="28">Multi-core local search • Base58 prefix/suffix matching</text>
+    <text x="188" y="302" fill="#bcd0ef" font-family="'SF Pro Display','Segoe UI',sans-serif" font-size="28">No server calls • Download Solana keypair JSON</text>
 
-  <g transform="translate(118 360)">
-    <rect x="0" y="0" width="960" height="154" rx="20" fill="#091221" stroke="#6285C5" stroke-opacity="0.58"/>
-    <text x="26" y="45" fill="#95B3E6" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="23">FIRST CONTRACT</text>
-    <text x="26" y="104" fill="#EAF3FF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="41" font-weight="700">0x</text>
-    <text x="82" y="104" fill="#56B5FF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="41" font-weight="700">c0ffee</text>
-    <text x="248" y="104" fill="#DCE9FF" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="41">2ad43ef5c98d11a9073f</text>
-    <text x="780" y="104" fill="#4DE7B0" font-family="ui-monospace, 'SF Mono', Menlo, Monaco, monospace" font-size="41" font-weight="700">beef</text>
+    <rect x="188" y="342" width="520" height="52" rx="12" fill="rgba(255,255,255,0.04)" stroke="rgba(255,255,255,0.12)"/>
+    <text x="214" y="376" fill="#e0f6ff" font-family="'SF Mono','SFMono-Regular',Menlo,monospace" font-size="27">Solxxxxxxxxxxxxxxxxxxxxxxxxxxxxpump</text>
   </g>
 </svg>
diff --git a/src/searchTarget.ts b/src/searchTarget.ts
index e1d8270..fba3485 100644
--- a/src/searchTarget.ts
+++ b/src/searchTarget.ts
@@ -1,6 +1 @@
-export type SearchTarget = 'wallet' | 'first-contract'
-
-export function searchTargetToGpuMode(target: SearchTarget): number {
-  return target === 'first-contract' ? 1 : 0
-}
-
+export type SearchTarget = 'wallet' | 'program'
diff --git a/src/style.css b/src/style.css
index 44c2771..088307b 100644
--- a/src/style.css
+++ b/src/style.css
@@ -3,16 +3,17 @@
 }
 
 :root {
-  --bg-primary: #07080c;
-  --bg-secondary: rgba(15, 16, 22, 0.85);
-  --bg-card: rgba(20, 22, 30, 0.7);
+  --bg-primary: #05070d;
+  --bg-secondary: rgba(11, 16, 28, 0.88);
+  --bg-card: rgba(12, 22, 34, 0.72);
   --border: rgba(255, 255, 255, 0.08);
-  --border-focus: rgba(99, 126, 234, 0.5);
+  --border-focus: rgba(20, 241, 149, 0.55);
   --text-primary: #f0f1f5;
   --text-secondary: rgba(240, 241, 245, 0.65);
   --text-muted: rgba(240, 241, 245, 0.45);
-  --accent: #627eea;
-  --accent-glow: rgba(99, 126, 234, 0.25);
+  --accent: #14f195;
+  --accent-alt: #9945ff;
+  --accent-glow: rgba(20, 241, 149, 0.22);
   --success: #4ade80;
   --success-glow: rgba(74, 222, 128, 0.2);
   --font-sans: system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif;
@@ -34,7 +35,8 @@ body {
   margin: 0;
   min-height: 100vh;
   background:
-    radial-gradient(ellipse 80% 50% at 50% -20%, rgba(99, 126, 234, 0.15) 0%, transparent 50%),
+    radial-gradient(ellipse 78% 52% at 50% -16%, rgba(153, 69, 255, 0.22) 0%, transparent 52%),
+    radial-gradient(ellipse 90% 58% at 50% 118%, rgba(20, 241, 149, 0.17) 0%, transparent 58%),
     var(--bg-primary);
 }
 
@@ -60,9 +62,9 @@ a:hover { text-decoration: underline; }
   width: 56px;
   height: 56px;
   margin-bottom: 16px;
-  background: linear-gradient(135deg, #627eea 0%, #3b4d9b 100%);
+  background: linear-gradient(140deg, rgba(153, 69, 255, 0.36) 0%, rgba(20, 241, 149, 0.28) 100%);
   border-radius: 16px;
-  box-shadow: 0 8px 32px rgba(99, 126, 234, 0.3);
+  box-shadow: 0 8px 32px rgba(20, 241, 149, 0.18), 0 12px 40px rgba(153, 69, 255, 0.15);
 }
 
 .logo svg {
@@ -247,9 +249,9 @@ input:disabled {
 
 .target-option input:checked + span {
   color: #fff;
-  background: linear-gradient(135deg, #627eea 0%, #4f64c7 100%);
-  border-color: rgba(143, 167, 255, 0.6);
-  box-shadow: 0 4px 14px rgba(99, 126, 234, 0.25);
+  background: linear-gradient(135deg, var(--accent-alt) 0%, var(--accent) 100%);
+  border-color: rgba(20, 241, 149, 0.55);
+  box-shadow: 0 4px 14px rgba(20, 241, 149, 0.18);
 }
 
 .target-option input:focus-visible + span {
@@ -300,9 +302,9 @@ input:disabled {
 
 .case-option input:checked + span {
   color: #fff;
-  background: linear-gradient(135deg, #627eea 0%, #4f64c7 100%);
-  border-color: rgba(143, 167, 255, 0.6);
-  box-shadow: 0 4px 14px rgba(99, 126, 234, 0.25);
+  background: linear-gradient(135deg, var(--accent-alt) 0%, var(--accent) 100%);
+  border-color: rgba(20, 241, 149, 0.55);
+  box-shadow: 0 4px 14px rgba(20, 241, 149, 0.18);
 }
 
 .case-option input:focus-visible + span {
@@ -323,7 +325,7 @@ input:disabled {
   font-size: 15px;
   font-weight: 600;
   color: #fff;
-  background: linear-gradient(135deg, #627eea 0%, #4f64c7 100%);
+  background: linear-gradient(135deg, var(--accent-alt) 0%, var(--accent) 100%);
   border: none;
   border-radius: var(--radius);
   cursor: pointer;
@@ -332,7 +334,7 @@ input:disabled {
 
 .btn-generate:hover:not(:disabled) {
   transform: translateY(-1px);
-  box-shadow: 0 8px 24px rgba(99, 126, 234, 0.35);
+  box-shadow: 0 8px 24px rgba(20, 241, 149, 0.3);
 }
 
 .btn-generate:active:not(:disabled) {
@@ -505,12 +507,12 @@ input:disabled {
 }
 
 .btn-primary {
-  background: linear-gradient(135deg, #627eea 0%, #4f64c7 100%);
+  background: linear-gradient(135deg, var(--accent-alt) 0%, var(--accent) 100%);
   border-color: transparent;
 }
 
 .btn-primary:hover:not(:disabled) {
-  box-shadow: 0 4px 16px rgba(99, 126, 234, 0.3);
+  box-shadow: 0 4px 16px rgba(20, 241, 149, 0.28);
 }
 
 /* Footer */
diff --git a/src/ui/app.ts b/src/ui/app.ts
index dbef0bf..a11ee90 100644
--- a/src/ui/app.ts
+++ b/src/ui/app.ts
@@ -1,22 +1,32 @@
 import { bytesToHex, hexToBytes, nowMs } from '../utils/hex'
-import { createKeystoreV3, type KeystoreV3 } from '../wallet/keystoreV3'
-import { checksumAddress, pubkeyToAddressBytes } from '../wallet/ethAddress'
-import { privateKeyToPublicKey64, type PrivKey32 } from '../wallet/keys'
-import { createWorkerPool } from '../worker/pool'
-import { createWasmWorkerPool, type WasmWorkerPool } from '../worker/wasmPool'
-import { createGpuVanity } from '../webgpu/gpuVanity'
-import { type SearchTarget, searchTargetToGpuMode } from '../searchTarget'
-
-// Benchmark cache: once determined, reuse the winner for the session
-let cachedBackend: 'gpu' | 'wasm' | 'cpu' | null = null
+import { type SearchTarget } from '../searchTarget'
+import { createWorkerPool, type WorkerPool } from '../worker/pool'
+import { createGpuMatcher, type GpuMatcher } from '../webgpu/gpuMatcher'
+import { keypairArrayFromPriv, secretKeyBase58FromPriv } from '../wallet/keypairJson'
+import { type PrivKey32 } from '../wallet/keys'
+import {
+  BASE58_ALPHABET,
+  bytesToBase58,
+  hasCaseInsensitiveVariant,
+  matchesVanityTarget,
+  sanitizeBase58Input,
+} from '../wallet/solanaAddress'
+
+type Backend = 'gpu' | 'cpu'
 
 type RunState =
   | { status: 'idle' }
   | { status: 'running'; startedAtMs: number; generated: number; speed: number }
   | { status: 'found'; generated: number; time: number; foundPriv: PrivKey32; foundAddress: string }
 
-function sanitizeHex(s: string): string {
-  return s.trim().replace(/^0x/i, '').replace(/[^0-9a-fA-F]/g, '').slice(0, 40)
+const PREVIEW_LENGTH = 44
+let cachedBackend: Backend | null = null
+
+function forcedBackendFromEnv(): Backend | null {
+  const value = import.meta.env.VITE_FORCE_BACKEND?.trim().toLowerCase()
+  if (value === 'gpu') return 'gpu'
+  if (value === 'cpu') return 'cpu'
+  return null
 }
 
 function formatNumber(n: number): string {
@@ -35,16 +45,20 @@ function formatTime(seconds: number): string {
   return `${(seconds / 31536000).toFixed(1)}y`
 }
 
-function countLetters(s: string): number {
-  return (s.match(/[a-fA-F]/g) || []).length
-}
-
 function calculateDifficulty(prefix: string, suffix: string, caseSensitive: boolean): number {
-  const base = Math.pow(16, prefix.length + suffix.length)
-  if (!caseSensitive) return base
-  // Case-sensitive mode adds one binary constraint per alpha nibble.
-  const letters = countLetters(prefix) + countLetters(suffix)
-  return base * Math.pow(2, letters)
+  const pattern = prefix + suffix
+  if (pattern.length === 0) return 1
+
+  let difficulty = Math.pow(58, pattern.length)
+  if (!caseSensitive) {
+    let variants = 1
+    for (const ch of pattern) {
+      if (hasCaseInsensitiveVariant(ch)) variants *= 2
+    }
+    difficulty = difficulty / variants
+  }
+
+  return Math.max(1, difficulty)
 }
 
 function estimateTime(difficulty: number, speed: number): string {
@@ -55,16 +69,19 @@ function estimateTime(difficulty: number, speed: number): string {
 }
 
 function targetPreviewLabel(target: SearchTarget): string {
-  return target === 'first-contract' ? 'First Contract Address Preview' : 'Wallet Address Preview'
+  return target === 'program' ? 'Program ID Preview' : 'Wallet Address Preview'
 }
 
 function targetResultLabel(target: SearchTarget): string {
-  return target === 'first-contract' ? 'First Contract Address' : 'Wallet Address'
+  return target === 'program' ? 'Program ID' : 'Wallet Address'
 }
 
-function deriveWalletAddressFromPriv(priv: PrivKey32): string {
-  const pub64 = privateKeyToPublicKey64(priv)
-  return '0x' + bytesToHex(pubkeyToAddressBytes(pub64))
+function generateNoise(len: number, offset: number): string {
+  let result = ''
+  for (let i = 0; i < len; i++) {
+    result += BASE58_ALPHABET[(i + offset * 13) % BASE58_ALPHABET.length]
+  }
+  return result
 }
 
 async function copyToClipboard(text: string, btn: HTMLButtonElement) {
@@ -78,22 +95,43 @@ async function copyToClipboard(text: string, btn: HTMLButtonElement) {
     }, 1500)
   } catch {
     btn.textContent = 'Failed'
-    setTimeout(() => btn.textContent = 'Copy', 1500)
+    setTimeout(() => {
+      btn.textContent = 'Copy'
+    }, 1500)
   }
 }
 
+function setInputsDisabled(
+  disabled: boolean,
+  prefixInput: HTMLInputElement,
+  suffixInput: HTMLInputElement,
+  searchTargetInputs: HTMLInputElement[],
+  caseSensitiveInput: HTMLInputElement,
+) {
+  prefixInput.disabled = disabled
+  suffixInput.disabled = disabled
+  for (const input of searchTargetInputs) input.disabled = disabled
+  caseSensitiveInput.disabled = disabled
+}
+
 export function initApp(root: HTMLDivElement) {
   root.innerHTML = `
     <div class="header">
       <div class="logo">
-        <svg viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-          <polygon points="12 2 2 12 12 22 22 12"/>
-          <line x1="12" y1="2" x2="12" y2="12"/>
-          <line x1="12" y1="12" x2="22" y2="12"/>
+        <svg viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+          <defs>
+            <linearGradient id="sol-glyph-gradient" x1="0" y1="0" x2="1" y2="1">
+              <stop offset="0%" stop-color="#14f195"/>
+              <stop offset="100%" stop-color="#9945ff"/>
+            </linearGradient>
+          </defs>
+          <path d="M20 24H84L74 35H10L20 24Z" fill="url(#sol-glyph-gradient)"/>
+          <path d="M10 47H74L64 58H0L10 47Z" fill="url(#sol-glyph-gradient)"/>
+          <path d="M20 70H84L74 81H10L20 70Z" fill="url(#sol-glyph-gradient)"/>
         </svg>
       </div>
-      <div class="title">Vanity ETH GPU</div>
-      <div class="subtitle" id="subtitle">Fast vanity address generator</div>
+      <div class="title">Vanity SOL GPU</div>
+      <div class="subtitle" id="subtitle">Fast Solana vanity address generator</div>
     </div>
 
     <div class="panel">
@@ -105,11 +143,11 @@ export function initApp(root: HTMLDivElement) {
       <div class="input-group">
         <div class="field">
           <label for="prefix">Prefix</label>
-          <input type="text" id="prefix" placeholder="c0ffee" spellcheck="false" autocomplete="off">
+          <input type="text" id="prefix" placeholder="Sol" spellcheck="false" autocomplete="off">
         </div>
         <div class="field">
           <label for="suffix">Suffix</label>
-          <input type="text" id="suffix" placeholder="beef" spellcheck="false" autocomplete="off">
+          <input type="text" id="suffix" placeholder="pump" spellcheck="false" autocomplete="off">
         </div>
       </div>
 
@@ -122,16 +160,16 @@ export function initApp(root: HTMLDivElement) {
               <span>Wallet</span>
             </label>
             <label class="target-option">
-              <input type="radio" name="search-target" value="first-contract">
-              <span>Contract</span>
+              <input type="radio" name="search-target" value="program">
+              <span>Program ID</span>
             </label>
           </div>
         </div>
         <div class="case-wrap">
-          <div class="target-label">Checksum</div>
+          <div class="target-label">Match</div>
           <div class="case-toggle">
             <label class="case-option">
-              <input type="checkbox" id="case-sensitive">
+              <input type="checkbox" id="case-sensitive" checked>
               <span>Case-sensitive</span>
             </label>
           </div>
@@ -163,23 +201,16 @@ export function initApp(root: HTMLDivElement) {
             <button class="copy-btn" id="copy-addr">Copy</button>
           </div>
         </div>
-        <div class="result-row hidden" id="wallet-row">
-          <div class="result-label">Deployer Wallet</div>
-          <div class="result-value" id="result-wallet">
-            <span id="wallet-text"></span>
-            <button class="copy-btn" id="copy-wallet">Copy</button>
-          </div>
-        </div>
         <div class="result-row">
-          <div class="result-label">Private Key</div>
-          <div class="result-value" id="result-pk">
+          <div class="result-label">Secret Key (base58)</div>
+          <div class="result-value" id="result-sk">
             <span id="pk-text"></span>
             <button class="copy-btn hidden" id="copy-pk">Copy</button>
           </div>
         </div>
         <div class="actions">
           <button class="btn" id="btn-reveal">Reveal Key</button>
-          <button class="btn btn-primary" id="btn-download">Download Keystore</button>
+          <button class="btn btn-primary" id="btn-download">Download Keypair JSON</button>
         </div>
       </div>
     </div>
@@ -187,16 +218,14 @@ export function initApp(root: HTMLDivElement) {
     <div class="footer">
       <div>All computations run locally in your browser. For maximum security, disconnect from the internet before generating.</div>
       <div class="built-by">Built by <a href="https://x.com/snapss" target="_blank" rel="noopener">@snapss</a> & <a href="https://claude.ai" target="_blank" rel="noopener">Claude</a></div>
-      <div class="open-source"><a href="https://github.com/HODL-Community/vanity-eth-gpu" target="_blank" rel="noopener">Open Source</a> on GitHub</div>
-      <div class="donate">Donate: <span class="donate-addr">0x99999933F17A1339958d50b3f59740E5Ad48C74C</span><button class="copy-btn-small" id="copy-donate">Copy</button></div>
+      <div class="open-source"><a href="https://github.com/HODL-Community/vanity-sol-gpu" target="_blank" rel="noopener">Open Source</a> on GitHub</div>
     </div>
   `
 
-  // Elements
   const prefixInput = root.querySelector<HTMLInputElement>('#prefix')!
   const suffixInput = root.querySelector<HTMLInputElement>('#suffix')!
   const searchTargetInputs = Array.from(root.querySelectorAll<HTMLInputElement>('input[name="search-target"]'))
-  const caseSensitive = root.querySelector<HTMLInputElement>('#case-sensitive')!
+  const caseSensitiveInput = root.querySelector<HTMLInputElement>('#case-sensitive')!
   const previewEl = root.querySelector<HTMLDivElement>('#preview')!
   const previewLabel = root.querySelector<HTMLDivElement>('#preview-label')!
   const previewAddr = root.querySelector<HTMLDivElement>('#preview-addr')!
@@ -207,34 +236,20 @@ export function initApp(root: HTMLDivElement) {
   const resultEl = root.querySelector<HTMLDivElement>('#result')!
   const resultAddrLabel = root.querySelector<HTMLDivElement>('#result-addr-label')!
   const addrText = root.querySelector<HTMLSpanElement>('#addr-text')!
-  const walletRow = root.querySelector<HTMLDivElement>('#wallet-row')!
-  const walletText = root.querySelector<HTMLSpanElement>('#wallet-text')!
   const pkText = root.querySelector<HTMLSpanElement>('#pk-text')!
   const copyAddr = root.querySelector<HTMLButtonElement>('#copy-addr')!
-  const copyWallet = root.querySelector<HTMLButtonElement>('#copy-wallet')!
   const copyPk = root.querySelector<HTMLButtonElement>('#copy-pk')!
   const btnReveal = root.querySelector<HTMLButtonElement>('#btn-reveal')!
   const btnDownload = root.querySelector<HTMLButtonElement>('#btn-download')!
   const subtitleEl = root.querySelector<HTMLDivElement>('#subtitle')!
 
-  // State
   let runState: RunState = { status: 'idle' }
   let stopRequested = false
-  let lastFound: { priv: PrivKey32; targetAddress: string; walletAddress: string; target: SearchTarget } | null = null
-
-  // Deterministic noise based on position (looks random but stable)
-  const noiseChars = '7a3f8c2e9b1d5046'
-  function generateNoise(len: number, offset: number): string {
-    let result = ''
-    for (let i = 0; i < len; i++) {
-      result += noiseChars[(i + offset * 7) % noiseChars.length]
-    }
-    return result
-  }
+  let lastFound: { priv: PrivKey32; targetAddress: string; target: SearchTarget } | null = null
 
   function selectedTarget(): SearchTarget {
     const checked = searchTargetInputs.find(input => input.checked)
-    return checked?.value === 'first-contract' ? 'first-contract' : 'wallet'
+    return checked?.value === 'program' ? 'program' : 'wallet'
   }
 
   function updateTargetLabels() {
@@ -242,416 +257,356 @@ export function initApp(root: HTMLDivElement) {
     previewLabel.textContent = targetPreviewLabel(target)
   }
 
-  // Update preview
   function updatePreview() {
     updateTargetLabels()
-    const pre = sanitizeHex(prefixInput.value)
-    const suf = sanitizeHex(suffixInput.value)
-    const preLower = pre.toLowerCase()
-    const sufLower = suf.toLowerCase()
-    const midLen = 40 - pre.length - suf.length
-    const mid = midLen > 0 ? generateNoise(midLen, pre.length) : ''
-
-    if (pre.length + suf.length === 0) {
-      previewAddr.innerHTML = '0x' + generateNoise(40, 0)
-    } else {
-      previewAddr.innerHTML = `0x<span class="match">${preLower}</span>${mid}<span class="match">${sufLower}</span>`
+
+    const prefix = sanitizeBase58Input(prefixInput.value)
+    const suffix = sanitizeBase58Input(suffixInput.value)
+    prefixInput.value = prefix
+    suffixInput.value = suffix
+
+    if (prefix.length + suffix.length > PREVIEW_LENGTH) {
+      previewAddr.textContent = 'Prefix + suffix must be 44 chars or less'
+      statEta.textContent = 'Invalid'
+      return
+    }
+
+    const midLen = PREVIEW_LENGTH - prefix.length - suffix.length
+    const mid = midLen > 0 ? generateNoise(midLen, prefix.length) : ''
+
+    if (prefix.length + suffix.length === 0) {
+      previewAddr.innerHTML = generateNoise(PREVIEW_LENGTH, 0)
+      statEta.textContent = '-'
+      return
     }
 
-    // Update ETA based on difficulty
-    const difficulty = calculateDifficulty(pre, suf, caseSensitive.checked)
+    previewAddr.innerHTML = `<span class="match">${prefix}</span>${mid}<span class="match">${suffix}</span>`
+
+    const difficulty = calculateDifficulty(prefix, suffix, caseSensitiveInput.checked)
     if (runState.status === 'running' && runState.speed > 0) {
       statEta.textContent = estimateTime(difficulty, runState.speed)
-    } else if (pre.length + suf.length > 0) {
-      statEta.textContent = `1 in ${formatNumber(difficulty)}`
     } else {
-      statEta.textContent = '-'
+      statEta.textContent = `1 in ${formatNumber(difficulty)}`
     }
   }
 
-  // Update stats display
   function updateStats() {
     if (runState.status === 'running') {
       statSpeed.textContent = formatNumber(runState.speed) + '/s'
       statChecked.textContent = formatNumber(runState.generated)
-      const pre = sanitizeHex(prefixInput.value)
-      const suf = sanitizeHex(suffixInput.value)
-      const difficulty = calculateDifficulty(pre, suf, caseSensitive.checked)
+
+      const prefix = sanitizeBase58Input(prefixInput.value)
+      const suffix = sanitizeBase58Input(suffixInput.value)
+      const difficulty = calculateDifficulty(prefix, suffix, caseSensitiveInput.checked)
       statEta.textContent = estimateTime(difficulty, runState.speed)
-    } else if (runState.status === 'found') {
+      return
+    }
+
+    if (runState.status === 'found') {
       statChecked.textContent = formatNumber(runState.generated)
       statEta.textContent = `Found in ${formatTime(runState.time)}`
     }
   }
 
-  // Convert hex string to nibble array (each hex char → number 0-15)
-  function hexToNibbles(hex: string): number[] {
-    return hex.split('').map(c => parseInt(c, 16))
-  }
+  async function benchmarkBackend(pool: WorkerPool): Promise<{ backend: Backend; gpuMatcher: GpuMatcher | null }> {
+    if (cachedBackend === 'cpu') {
+      return { backend: 'cpu', gpuMatcher: null }
+    }
 
-  // Main generation loop - auto-benchmarks GPU vs CPU on first run
-  async function run() {
-    stopRequested = false
-    btnGenerate.textContent = 'Stop'
-    btnGenerate.classList.add('running')
-    previewEl.classList.add('generating')
-    resultEl.classList.remove('visible', 'found')
-    walletRow.classList.add('hidden')
-    walletText.textContent = ''
-    copyPk.classList.add('hidden')
-    lastFound = null
+    let gpuMatcher: GpuMatcher | null = null
+    try {
+      gpuMatcher = await createGpuMatcher()
+    } catch {
+      cachedBackend = 'cpu'
+      return { backend: 'cpu', gpuMatcher: null }
+    }
 
-    // Disable inputs while running
-    prefixInput.disabled = true
-    suffixInput.disabled = true
-    for (const input of searchTargetInputs) input.disabled = true
-    caseSensitive.disabled = true
+    const BENCH_DURATION_MS = 1200
+    const BENCH_BATCH_SIZE = 1024
+    const impossiblePrefix = 'zzzzzzzzzzzzzz'
+    const impossibleSuffix = 'zzzzzzzzzz'
 
-    const pre = sanitizeHex(prefixInput.value)
-    const suf = sanitizeHex(suffixInput.value)
-    const preLower = pre.toLowerCase()
-    const sufLower = suf.toLowerCase()
-    const target = selectedTarget()
+    let gpuChecked = 0
+    subtitleEl.textContent = 'Benchmarking GPU...'
+    const gpuStart = nowMs()
 
-    if (pre.length + suf.length === 0) {
-      btnGenerate.textContent = 'Generate'
-      btnGenerate.classList.remove('running')
-      previewEl.classList.remove('generating')
-      prefixInput.disabled = false
-      suffixInput.disabled = false
-      for (const input of searchTargetInputs) input.disabled = false
-      caseSensitive.disabled = false
-      return
-    }
+    while (nowMs() - gpuStart < BENCH_DURATION_MS && !stopRequested) {
+      const batches = []
+      for (let i = 0; i < pool.workerCount; i++) {
+        batches.push(pool.generate(BENCH_BATCH_SIZE))
+      }
 
-    // Helper to reset UI on early exit during benchmark
-    function resetUI() {
-      prefixInput.disabled = false
-      suffixInput.disabled = false
-      for (const input of searchTargetInputs) input.disabled = false
-      caseSensitive.disabled = false
-      btnGenerate.textContent = 'Generate'
-      btnGenerate.classList.remove('running')
-      previewEl.classList.remove('generating')
-      subtitleEl.textContent = 'Fast vanity address generator'
-      runState = { status: 'idle' }
-    }
+      const generated = await Promise.all(batches)
 
-    // ── Auto-benchmark on first run (GPU vs WASM vs CPU) ──
-    if (cachedBackend === null) {
-      const BENCH_DURATION_MS = 3000
-      const BENCH_BATCH = 16384
-
-      // Check if GPU is available at all
-      let gpuAvailable = false
-      try {
-        const testGpu = await createGpuVanity()
-        testGpu.destroy()
-        gpuAvailable = true
-      } catch {
-        // WebGPU not available
+      for (const batch of generated) {
+        await gpuMatcher.findMatchIndex(batch.pubKeys, batch.checked, impossiblePrefix, impossibleSuffix, true)
+        gpuChecked += batch.checked
       }
+    }
 
-      if (stopRequested) { resetUI(); return }
-
-      let gpuSpeed = 0
-      let wasmSpeed = 0
-      let cpuSpeed = 0
-      let wasmPool: WasmWorkerPool | null = null
-
-      if (gpuAvailable) {
-        // Benchmark GPU
-        subtitleEl.textContent = 'Benchmarking GPU...'
-        const dummyNibbles = [0, 0, 0, 0, 0, 0, 0, 0]
-        let gpuChecked = 0
-        const gpuVanity = await createGpuVanity()
-        const gpuStart = nowMs()
-        while (nowMs() - gpuStart < BENCH_DURATION_MS && !stopRequested) {
-          await gpuVanity.search(dummyNibbles, dummyNibbles, BENCH_BATCH, searchTargetToGpuMode(target))
-          gpuChecked += BENCH_BATCH
-        }
-        gpuSpeed = gpuChecked / ((nowMs() - gpuStart) / 1000)
-        gpuVanity.destroy()
+    if (stopRequested) {
+      gpuMatcher.destroy()
+      return { backend: 'cpu', gpuMatcher: null }
+    }
 
-        if (stopRequested) { resetUI(); return }
-      }
+    let cpuChecked = 0
+    subtitleEl.textContent = 'Benchmarking CPU...'
+    const cpuStart = nowMs()
 
-      // Benchmark WASM (sequential init with timeout, won't hang)
-      subtitleEl.textContent = 'Benchmarking WASM...'
-      wasmPool = await createWasmWorkerPool(10000)
-
-      if (wasmPool && !stopRequested) {
-        let wasmChecked = 0
-        const wasmStart = nowMs()
-        while (nowMs() - wasmStart < BENCH_DURATION_MS && !stopRequested) {
-          const promises = []
-          for (let i = 0; i < wasmPool.workerCount; i++) {
-            promises.push(wasmPool.search('00000000', '', BENCH_BATCH, target))
-          }
-          const results = await Promise.all(promises)
-          for (const r of results) wasmChecked += r.checked
-        }
-        wasmSpeed = wasmChecked / ((nowMs() - wasmStart) / 1000)
-        // Don't destroy yet — we might use it for the real search
+    while (nowMs() - cpuStart < BENCH_DURATION_MS && !stopRequested) {
+      const searches = []
+      for (let i = 0; i < pool.workerCount; i++) {
+        searches.push(pool.search(impossiblePrefix, impossibleSuffix, BENCH_BATCH_SIZE, 'wallet', true))
       }
 
-      if (stopRequested) {
-        wasmPool?.destroy()
-        resetUI()
-        return
-      }
+      const results = await Promise.all(searches)
+      for (const result of results) cpuChecked += result.checked
+    }
 
-      // Benchmark CPU
-      subtitleEl.textContent = 'Benchmarking CPU...'
-      let cpuChecked = 0
-      const benchPool = createWorkerPool()
-      const cpuStart = nowMs()
-      while (nowMs() - cpuStart < BENCH_DURATION_MS && !stopRequested) {
-        const promises = []
-        for (let i = 0; i < benchPool.workerCount; i++) {
-          promises.push(benchPool.search('00000000', '', BENCH_BATCH, target))
-        }
-        const results = await Promise.all(promises)
-        for (const r of results) cpuChecked += r.checked
-      }
-      cpuSpeed = cpuChecked / ((nowMs() - cpuStart) / 1000)
-      benchPool.destroy()
+    if (stopRequested) {
+      gpuMatcher.destroy()
+      return { backend: 'cpu', gpuMatcher: null }
+    }
 
-      if (stopRequested) {
-        wasmPool?.destroy()
-        resetUI()
-        return
-      }
+    const gpuSpeed = gpuChecked / Math.max((nowMs() - gpuStart) / 1000, 0.001)
+    const cpuSpeed = cpuChecked / Math.max((nowMs() - cpuStart) / 1000, 0.001)
 
-      // Pick the winner
-      const speeds: [string, number][] = []
-      if (gpuAvailable) speeds.push(['gpu', gpuSpeed])
-      if (wasmPool) speeds.push(['wasm', wasmSpeed])
-      speeds.push(['cpu', cpuSpeed])
-      speeds.sort((a, b) => b[1] - a[1])
-      const winner = speeds[0][0] as 'gpu' | 'wasm' | 'cpu'
-      cachedBackend = winner
-
-      // Destroy WASM pool if it lost
-      if (winner !== 'wasm') wasmPool?.destroy()
-
-      // Show result for 2 seconds
-      const parts: string[] = []
-      if (gpuAvailable) parts.push(`GPU: ${formatNumber(Math.round(gpuSpeed))}/s`)
-      if (wasmPool) parts.push(`WASM: ${formatNumber(Math.round(wasmSpeed))}/s`)
-      parts.push(`CPU: ${formatNumber(Math.round(cpuSpeed))}/s`)
-      subtitleEl.textContent = `${parts.join(' | ')} → Using ${winner.toUpperCase()}`
-      await new Promise(resolve => setTimeout(resolve, 2000))
-
-      if (stopRequested) {
-        if (winner === 'wasm') wasmPool?.destroy()
-        resetUI()
-        return
-      }
+    const winner: Backend = gpuSpeed > cpuSpeed ? 'gpu' : 'cpu'
+    cachedBackend = winner
+
+    if (winner === 'cpu') {
+      gpuMatcher.destroy()
+      subtitleEl.textContent = `GPU: ${formatNumber(Math.round(gpuSpeed))}/s | CPU: ${formatNumber(Math.round(cpuSpeed))}/s → Using CPU`
+      await new Promise(resolve => setTimeout(resolve, 1200))
+      return { backend: 'cpu', gpuMatcher: null }
     }
 
-    // ── Start the real search ──
-    const startedAtMs = nowMs()
-    runState = { status: 'running', startedAtMs, generated: 0, speed: 0 }
+    subtitleEl.textContent = `GPU: ${formatNumber(Math.round(gpuSpeed))}/s | CPU: ${formatNumber(Math.round(cpuSpeed))}/s → Using GPU`
+    await new Promise(resolve => setTimeout(resolve, 1200))
+    return { backend: 'gpu', gpuMatcher }
+  }
+
+  async function runCpuBackend(
+    pool: WorkerPool,
+    prefix: string,
+    suffix: string,
+    target: SearchTarget,
+    caseSensitive: boolean
+  ) {
+    const batchPerWorker = 2048
+    subtitleEl.textContent = `Running on CPU (${pool.workerCount} workers)`
 
     let recentGenerated = 0
     let recentStartMs = nowMs()
 
-    if (cachedBackend === 'gpu') {
-      // ── GPU path ──
-      const gpuVanity = await createGpuVanity()
-      subtitleEl.textContent = 'Running on GPU (WebGPU)'
-      const prefixNibbles = hexToNibbles(preLower)
-      const suffixNibbles = hexToNibbles(sufLower)
-      const gpuBatchSize = 16384
-
-      while (!stopRequested) {
-        const result = await gpuVanity.search(
-          prefixNibbles,
-          suffixNibbles,
-          gpuBatchSize,
-          searchTargetToGpuMode(target)
-        )
+    while (!stopRequested && runState.status === 'running') {
+      const searches = []
+      for (let i = 0; i < pool.workerCount; i++) {
+        searches.push(pool.search(prefix, suffix, batchPerWorker, target, caseSensitive))
+      }
 
-        if (result && runState.status === 'running') {
-          const foundAddress = checksumAddress(result.addressHex)
-          handleFound(result.privHex, foundAddress, pre, suf, target)
-        }
+      const results = await Promise.all(searches)
+      let totalChecked = 0
 
-        if (runState.status === 'running') {
-          runState = { ...runState, generated: runState.generated + gpuBatchSize }
-        }
-        recentGenerated += gpuBatchSize
-
-        const elapsed = nowMs() - recentStartMs
-        if (elapsed >= 500 && runState.status === 'running') {
-          const speed = Math.floor(recentGenerated / (elapsed / 1000))
-          runState = { ...runState, speed }
-          recentGenerated = 0
-          recentStartMs = nowMs()
-          updateStats()
+      for (const result of results) {
+        totalChecked += result.checked
+        if (result.found && runState.status === 'running') {
+          handleFound(result.found.privHex, result.found.address, prefix, suffix, target, caseSensitive)
         }
       }
 
-      gpuVanity.destroy()
-    } else if (cachedBackend === 'wasm') {
-      // ── WASM path (pool already initialized from benchmark) ──
-      const pool = await createWasmWorkerPool(10000)
-      if (!pool) {
-        // Fallback to CPU if WASM init fails on second attempt
-        cachedBackend = 'cpu'
-        subtitleEl.textContent = 'WASM failed, falling back to CPU...'
-        await new Promise(resolve => setTimeout(resolve, 1000))
+      if (runState.status === 'running') {
+        runState = { ...runState, generated: runState.generated + totalChecked }
       }
+      recentGenerated += totalChecked
+
+      const elapsed = nowMs() - recentStartMs
+      if (elapsed >= 500 && runState.status === 'running') {
+        const speed = Math.floor(recentGenerated / (elapsed / 1000))
+        runState = { ...runState, speed }
+        recentGenerated = 0
+        recentStartMs = nowMs()
+        updateStats()
+      }
+    }
+  }
 
-      if (pool && cachedBackend === 'wasm') {
-        subtitleEl.textContent = `Running on WASM (${pool.workerCount} workers)`
-        const batchPerWorker = 16384
-
-        while (!stopRequested) {
-          const promises = []
-          for (let i = 0; i < pool.workerCount; i++) {
-            promises.push(pool.search(preLower, sufLower, batchPerWorker, target))
-          }
-
-          const results = await Promise.all(promises)
-          let totalChecked = 0
-
-          for (const r of results) {
-            totalChecked += r.checked
-            if (r.found && runState.status === 'running') {
-              const foundAddress = checksumAddress(r.found.address)
-              handleFound(r.found.privHex, foundAddress, pre, suf, target)
-            }
-          }
-
-          if (runState.status === 'running') {
-            runState = { ...runState, generated: runState.generated + totalChecked }
-          }
-          recentGenerated += totalChecked
-
-          const elapsed = nowMs() - recentStartMs
-          if (elapsed >= 500 && runState.status === 'running') {
-            const speed = Math.floor(recentGenerated / (elapsed / 1000))
-            runState = { ...runState, speed }
-            recentGenerated = 0
-            recentStartMs = nowMs()
-            updateStats()
-          }
-        }
+  async function runGpuBackend(
+    pool: WorkerPool,
+    gpuMatcher: GpuMatcher,
+    prefix: string,
+    suffix: string,
+    target: SearchTarget,
+    caseSensitive: boolean
+  ) {
+    const batchPerWorker = 1024
+    subtitleEl.textContent = `Running on GPU + CPU keygen (${pool.workerCount} workers)`
 
-        pool.destroy()
+    let recentGenerated = 0
+    let recentStartMs = nowMs()
+
+    while (!stopRequested && runState.status === 'running') {
+      const generatedBatches = []
+      for (let i = 0; i < pool.workerCount; i++) {
+        generatedBatches.push(pool.generate(batchPerWorker))
       }
-    }
 
-    // CPU fallback (also handles WASM→CPU fallback)
-    if (cachedBackend === 'cpu' && !stopRequested && runState.status === 'running') {
-      // ── CPU path ──
-      const pool = createWorkerPool()
-      subtitleEl.textContent = `Running on CPU (${pool.workerCount} workers)`
-      const batchPerWorker = 16384
-
-      while (!stopRequested) {
-        const promises = []
-        for (let i = 0; i < pool.workerCount; i++) {
-          promises.push(pool.search(preLower, sufLower, batchPerWorker, target))
-        }
+      const batches = await Promise.all(generatedBatches)
+      let totalChecked = 0
 
-        const results = await Promise.all(promises)
-        let totalChecked = 0
+      for (const batch of batches) {
+        totalChecked += batch.checked
 
-        for (const r of results) {
-          totalChecked += r.checked
-          if (r.found && runState.status === 'running') {
-            const foundAddress = checksumAddress(r.found.address)
-            handleFound(r.found.privHex, foundAddress, pre, suf, target)
-          }
-        }
+        if (runState.status !== 'running') break
 
-        if (runState.status === 'running') {
-          runState = { ...runState, generated: runState.generated + totalChecked }
-        }
-        recentGenerated += totalChecked
-
-        const elapsed = nowMs() - recentStartMs
-        if (elapsed >= 500 && runState.status === 'running') {
-          const speed = Math.floor(recentGenerated / (elapsed / 1000))
-          runState = { ...runState, speed }
-          recentGenerated = 0
-          recentStartMs = nowMs()
-          updateStats()
-        }
+        const matchIndex = await gpuMatcher.findMatchIndex(
+          batch.pubKeys,
+          batch.checked,
+          prefix,
+          suffix,
+          caseSensitive,
+        )
+
+        if (matchIndex === null || runState.status !== 'running') continue
+
+        const privOffset = matchIndex * 32
+        const priv = batch.privKeys.subarray(privOffset, privOffset + 32)
+        const pub = batch.pubKeys.subarray(privOffset, privOffset + 32)
+
+        handleFound(bytesToHex(priv), bytesToBase58(pub), prefix, suffix, target, caseSensitive)
       }
 
-      pool.destroy()
+      if (runState.status === 'running') {
+        runState = { ...runState, generated: runState.generated + totalChecked }
+      }
+      recentGenerated += totalChecked
+
+      const elapsed = nowMs() - recentStartMs
+      if (elapsed >= 500 && runState.status === 'running') {
+        const speed = Math.floor(recentGenerated / (elapsed / 1000))
+        runState = { ...runState, speed }
+        recentGenerated = 0
+        recentStartMs = nowMs()
+        updateStats()
+      }
     }
+  }
+
+  async function run() {
+    stopRequested = false
+    btnGenerate.textContent = 'Stop'
+    btnGenerate.classList.add('running')
+    previewEl.classList.add('generating')
+    resultEl.classList.remove('visible', 'found')
+    copyPk.classList.add('hidden')
+    lastFound = null
 
-    // Re-enable inputs
-    prefixInput.disabled = false
-    suffixInput.disabled = false
-    for (const input of searchTargetInputs) input.disabled = false
-    caseSensitive.disabled = false
+    setInputsDisabled(true, prefixInput, suffixInput, searchTargetInputs, caseSensitiveInput)
 
-    if (!stopRequested || runState.status === 'running') {
+    const prefix = sanitizeBase58Input(prefixInput.value)
+    const suffix = sanitizeBase58Input(suffixInput.value)
+    const target = selectedTarget()
+    const caseSensitive = caseSensitiveInput.checked
+
+    if (prefix.length + suffix.length === 0 || prefix.length + suffix.length > PREVIEW_LENGTH) {
+      setInputsDisabled(false, prefixInput, suffixInput, searchTargetInputs, caseSensitiveInput)
       btnGenerate.textContent = 'Generate'
       btnGenerate.classList.remove('running')
       previewEl.classList.remove('generating')
-      subtitleEl.textContent = 'Fast vanity address generator'
-      runState = { status: 'idle' }
+      return
     }
-  }
 
-  function handleFound(privHex: string, foundAddress: string, pre: string, suf: string, target: SearchTarget) {
-    const preLower = pre.toLowerCase()
-    const sufLower = suf.toLowerCase()
-    const addrToCompare = caseSensitive.checked ? foundAddress : foundAddress.toLowerCase()
-
-    const prefixOk = addrToCompare.slice(2).startsWith(preLower) ||
-      (caseSensitive.checked && addrToCompare.slice(2).startsWith(pre))
-    const suffixOk = addrToCompare.slice(2).endsWith(sufLower) ||
-      (caseSensitive.checked && addrToCompare.slice(2).endsWith(suf))
-
-    if (prefixOk && suffixOk) {
-      const priv = hexToBytes(privHex) as PrivKey32
-      const walletAddress = target === 'wallet' ? foundAddress : deriveWalletAddressFromPriv(priv)
-      const timeS = (nowMs() - (runState as any).startedAtMs) / 1000
-      const generated: number = runState.status === 'running' ? runState.generated : 0
-
-      runState = { status: 'found', generated, time: timeS, foundPriv: priv, foundAddress }
-      lastFound = { priv, targetAddress: foundAddress, walletAddress, target }
-      resultAddrLabel.textContent = targetResultLabel(target)
-
-      const preMatch = foundAddress.slice(2, 2 + pre.length)
-      const sufMatch = foundAddress.slice(2 + 40 - suf.length)
-      const midPart = foundAddress.slice(2 + pre.length, 2 + 40 - suf.length)
-
-      addrText.innerHTML = `0x<span class="highlight">${preMatch}</span>${midPart}<span class="highlight">${sufMatch}</span>`
-      walletText.textContent = walletAddress
-      if (target === 'first-contract') {
-        walletRow.classList.remove('hidden')
+    const pool = createWorkerPool()
+    let gpuMatcher: GpuMatcher | null = null
+    const forcedBackend = forcedBackendFromEnv()
+    let backend: Backend = forcedBackend ?? cachedBackend ?? 'cpu'
+
+    const startedAtMs = nowMs()
+    runState = { status: 'running', startedAtMs, generated: 0, speed: 0 }
+
+    try {
+      if (!forcedBackend && cachedBackend === null) {
+        const benchmark = await benchmarkBackend(pool)
+        backend = benchmark.backend
+        gpuMatcher = benchmark.gpuMatcher
+      }
+
+      if (stopRequested || runState.status !== 'running') return
+
+      if (backend === 'gpu' && !gpuMatcher) {
+        try {
+          gpuMatcher = await createGpuMatcher()
+        } catch {
+          backend = 'cpu'
+          if (!forcedBackend) cachedBackend = 'cpu'
+          subtitleEl.textContent = 'GPU unavailable, falling back to CPU'
+          await new Promise(resolve => setTimeout(resolve, 1000))
+        }
+      }
+
+      if (backend === 'gpu' && gpuMatcher) {
+        await runGpuBackend(pool, gpuMatcher, prefix, suffix, target, caseSensitive)
       } else {
-        walletRow.classList.add('hidden')
+        await runCpuBackend(pool, prefix, suffix, target, caseSensitive)
+      }
+    } finally {
+      pool.destroy()
+      gpuMatcher?.destroy()
+
+      setInputsDisabled(false, prefixInput, suffixInput, searchTargetInputs, caseSensitiveInput)
+
+      const finalStatus = (runState as RunState).status
+      if (finalStatus !== 'found') {
+        runState = { status: 'idle' }
+        subtitleEl.textContent = 'Fast Solana vanity address generator'
       }
-      pkText.textContent = '\u2022'.repeat(64)
 
-      resultEl.classList.add('visible', 'found')
       btnGenerate.textContent = 'Generate'
       btnGenerate.classList.remove('running')
       previewEl.classList.remove('generating')
-      updateStats()
-
-      stopRequested = true
     }
   }
 
-  // Event listeners
+  function handleFound(
+    privHex: string,
+    foundAddress: string,
+    prefix: string,
+    suffix: string,
+    target: SearchTarget,
+    caseSensitive: boolean
+  ) {
+    if (!matchesVanityTarget(foundAddress, prefix, suffix, caseSensitive)) return
+
+    const priv = hexToBytes(privHex) as PrivKey32
+    const timeS = runState.status === 'running' ? (nowMs() - runState.startedAtMs) / 1000 : 0
+    const generated = runState.status === 'running' ? runState.generated : 0
+
+    runState = { status: 'found', generated, time: timeS, foundPriv: priv, foundAddress }
+    lastFound = { priv, targetAddress: foundAddress, target }
+
+    resultAddrLabel.textContent = targetResultLabel(target)
+
+    const preMatch = foundAddress.slice(0, prefix.length)
+    const sufMatch = suffix.length > 0 ? foundAddress.slice(foundAddress.length - suffix.length) : ''
+    const midEnd = suffix.length > 0 ? foundAddress.length - suffix.length : foundAddress.length
+    const mid = foundAddress.slice(prefix.length, midEnd)
+
+    addrText.innerHTML = `<span class="highlight">${preMatch}</span>${mid}<span class="highlight">${sufMatch}</span>`
+    pkText.textContent = '\u2022'.repeat(88)
+
+    resultEl.classList.add('visible', 'found')
+    subtitleEl.textContent = 'Match found'
+    updateStats()
+    stopRequested = true
+  }
+
   prefixInput.addEventListener('input', () => {
-    prefixInput.value = sanitizeHex(prefixInput.value)
+    prefixInput.value = sanitizeBase58Input(prefixInput.value)
     updatePreview()
   })
 
   suffixInput.addEventListener('input', () => {
-    suffixInput.value = sanitizeHex(suffixInput.value)
+    suffixInput.value = sanitizeBase58Input(suffixInput.value)
     updatePreview()
   })
 
@@ -661,7 +616,7 @@ export function initApp(root: HTMLDivElement) {
     })
   }
 
-  caseSensitive.addEventListener('change', () => {
+  caseSensitiveInput.addEventListener('change', () => {
     updatePreview()
   })
 
@@ -673,7 +628,6 @@ export function initApp(root: HTMLDivElement) {
     }
   })
 
-  // Enter key to start/stop
   document.addEventListener('keydown', (e) => {
     if (e.key === 'Enter' && document.activeElement?.tagName !== 'BUTTON') {
       e.preventDefault()
@@ -682,45 +636,32 @@ export function initApp(root: HTMLDivElement) {
   })
 
   btnReveal.addEventListener('click', () => {
-    if (lastFound) {
-      pkText.textContent = bytesToHex(lastFound.priv)
-      copyPk.classList.remove('hidden')
-    }
+    if (!lastFound) return
+    pkText.textContent = secretKeyBase58FromPriv(lastFound.priv)
+    copyPk.classList.remove('hidden')
   })
 
   copyAddr.addEventListener('click', () => {
-    if (lastFound) void copyToClipboard(lastFound.targetAddress, copyAddr)
-  })
-
-  copyWallet.addEventListener('click', () => {
-    if (lastFound) void copyToClipboard(lastFound.walletAddress, copyWallet)
+    if (!lastFound) return
+    void copyToClipboard(lastFound.targetAddress, copyAddr)
   })
 
   copyPk.addEventListener('click', () => {
-    if (lastFound && pkText.textContent && !pkText.textContent.includes('\u2022')) {
-      void copyToClipboard(pkText.textContent, copyPk)
-    }
+    if (!lastFound || !pkText.textContent || pkText.textContent.includes('\u2022')) return
+    void copyToClipboard(pkText.textContent, copyPk)
   })
 
-  btnDownload.addEventListener('click', async () => {
+  btnDownload.addEventListener('click', () => {
     if (!lastFound) return
-    const password = prompt('Enter password for keystore encryption:')
-    if (!password) return
 
-    const ks: KeystoreV3 = await createKeystoreV3(lastFound.priv, password)
-    const blob = new Blob([JSON.stringify(ks, null, 2)], { type: 'application/json' })
+    const keypair = keypairArrayFromPriv(lastFound.priv)
+    const blob = new Blob([JSON.stringify(keypair, null, 2)], { type: 'application/json' })
     const a = document.createElement('a')
     a.href = URL.createObjectURL(blob)
-    a.download = `${lastFound.walletAddress}.json`
+    a.download = `${lastFound.targetAddress}.json`
     a.click()
     URL.revokeObjectURL(a.href)
   })
 
-  const copyDonate = root.querySelector<HTMLButtonElement>('#copy-donate')!
-  copyDonate.addEventListener('click', () => {
-    void copyToClipboard('0x99999933F17A1339958d50b3f59740E5Ad48C74C', copyDonate)
-  })
-
-  // Initialize
   updatePreview()
 }
diff --git a/src/wallet/ethAddress.ts b/src/wallet/ethAddress.ts
deleted file mode 100644
index 40f5421..0000000
--- a/src/wallet/ethAddress.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { keccak_256 } from '@noble/hashes/sha3.js'
-import { bytesToHex } from '../utils/hex'
-
-const hexTable: string[] = new Array(256)
-for (let i = 0; i < 256; i++) {
-  hexTable[i] = i.toString(16).padStart(2, '0')
-}
-
-const firstCreateInput = new Uint8Array(23)
-firstCreateInput[0] = 0xd6
-firstCreateInput[1] = 0x94
-firstCreateInput[22] = 0x80
-
-function hexNibbleFromCode(code: number): number {
-  if (code >= 48 && code <= 57) return code - 48 // 0-9
-  if (code >= 65 && code <= 70) return code - 55 // A-F
-  if (code >= 97 && code <= 102) return code - 87 // a-f
-  return -1
-}
-
-export function pubkeyToAddressBytes(pubkey64: Uint8Array): Uint8Array {
-  if (pubkey64.length !== 64) throw new Error('pubkey64 must be 64 bytes')
-  const hash = keccak_256(pubkey64)
-  return hash.slice(12) // last 20 bytes
-}
-
-export function firstContractAddressFromWalletHex(walletHex40: string): string {
-  if (walletHex40.length !== 40) throw new Error('Invalid wallet address length')
-
-  for (let i = 0; i < 20; i++) {
-    const hi = hexNibbleFromCode(walletHex40.charCodeAt(i * 2))
-    const lo = hexNibbleFromCode(walletHex40.charCodeAt(i * 2 + 1))
-    if (hi < 0 || lo < 0) throw new Error('Invalid wallet address hex')
-    firstCreateInput[2 + i] = (hi << 4) | lo
-  }
-
-  const hash = keccak_256(firstCreateInput)
-  let out = ''
-  for (let i = 12; i < 32; i++) out += hexTable[hash[i]]
-  return out
-}
-
-export function firstContractAddressFromWalletAddress(walletAddress: string): string {
-  const normalized = walletAddress.toLowerCase().replace(/^0x/, '')
-  if (normalized.length !== 40) throw new Error('Invalid wallet address length')
-  return '0x' + firstContractAddressFromWalletHex(normalized)
-}
-
-export function checksumAddress(address: string): string {
-  const addr = address.toLowerCase().replace(/^0x/, '')
-  if (addr.length !== 40) throw new Error('Invalid address length')
-  const hash = bytesToHex(keccak_256(new TextEncoder().encode(addr)))
-  let out = '0x'
-  for (let i = 0; i < addr.length; i++) {
-    const ch = addr[i]
-    const h = parseInt(hash[i], 16)
-    out += h >= 8 ? ch.toUpperCase() : ch
-  }
-  return out
-}
diff --git a/src/wallet/keypairJson.ts b/src/wallet/keypairJson.ts
new file mode 100644
index 0000000..ee6c8ce
--- /dev/null
+++ b/src/wallet/keypairJson.ts
@@ -0,0 +1,10 @@
+import { base58 } from '@scure/base'
+import { privateKeyToSecretKey64, type PrivKey32 } from './keys'
+
+export function secretKeyBase58FromPriv(priv: PrivKey32): string {
+  return base58.encode(privateKeyToSecretKey64(priv))
+}
+
+export function keypairArrayFromPriv(priv: PrivKey32): number[] {
+  return Array.from(privateKeyToSecretKey64(priv))
+}
diff --git a/src/wallet/keys.ts b/src/wallet/keys.ts
index 9338561..70f5a9d 100644
--- a/src/wallet/keys.ts
+++ b/src/wallet/keys.ts
@@ -1,16 +1,20 @@
-import * as secp from '@noble/secp256k1'
+import { ed25519 } from '@noble/curves/ed25519.js'
 
 export type PrivKey32 = Uint8Array & { readonly __priv32: unique symbol }
 
 export function randomPrivateKey(): PrivKey32 {
-  // noble ensures key is valid curve scalar.
-  return secp.utils.randomSecretKey() as PrivKey32
+  const key = new Uint8Array(32)
+  crypto.getRandomValues(key)
+  return key as PrivKey32
 }
 
-export function privateKeyToPublicKey64(priv: PrivKey32): Uint8Array {
-  const pub65 = secp.getPublicKey(priv, false) // 65 bytes, 0x04 + x(32) + y(32)
-  return pub65.slice(1) // 64 bytes (x||y)
+export function privateKeyToPublicKey32(priv: PrivKey32): Uint8Array {
+  return ed25519.getPublicKey(priv)
 }
 
-
-
+export function privateKeyToSecretKey64(priv: PrivKey32): Uint8Array {
+  const secret = new Uint8Array(64)
+  secret.set(priv, 0)
+  secret.set(privateKeyToPublicKey32(priv), 32)
+  return secret
+}
diff --git a/src/wallet/keystoreV3.ts b/src/wallet/keystoreV3.ts
deleted file mode 100644
index 7ba0107..0000000
--- a/src/wallet/keystoreV3.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { pbkdf2Async } from '@noble/hashes/pbkdf2.js'
-import { sha256 } from '@noble/hashes/sha2.js'
-import { keccak_256 } from '@noble/hashes/sha3.js'
-import { ctr } from '@noble/ciphers/aes.js'
-import { bytesToHex } from '../utils/hex'
-import { privateKeyToPublicKey64, type PrivKey32 } from './keys'
-import { pubkeyToAddressBytes } from './ethAddress'
-
-export type KeystoreV3 = {
-  version: 3
-  id: string
-  address: string
-  crypto: {
-    ciphertext: string
-    cipherparams: { iv: string }
-    cipher: 'aes-128-ctr'
-    kdf: 'pbkdf2'
-    kdfparams: {
-      dklen: 32
-      c: 65536
-      prf: 'hmac-sha256'
-      salt: string
-    }
-    mac: string
-  }
-}
-
-function uuidv4(): string {
-  return window.crypto.randomUUID()
-}
-
-export async function createKeystoreV3(priv: PrivKey32, password: string): Promise<KeystoreV3> {
-  const salt = new Uint8Array(32)
-  window.crypto.getRandomValues(salt)
-  const iv = new Uint8Array(16)
-  window.crypto.getRandomValues(iv)
-
-  const dk = await pbkdf2Async(sha256, password, salt, { c: 65536, dkLen: 32 })
-  const key = dk.slice(0, 16)
-
-  const aes = ctr(key, iv)
-  const ciphertext = aes.encrypt(priv)
-
-  const macInput = new Uint8Array(16 + ciphertext.length)
-  macInput.set(dk.slice(16, 32), 0)
-  macInput.set(ciphertext, 16)
-  const mac = keccak_256(macInput)
-
-  const pub64 = privateKeyToPublicKey64(priv)
-  const addr = pubkeyToAddressBytes(pub64) // 20 bytes
-
-  return {
-    version: 3,
-    id: uuidv4(),
-    address: bytesToHex(addr),
-    crypto: {
-      ciphertext: bytesToHex(ciphertext),
-      cipherparams: { iv: bytesToHex(iv) },
-      cipher: 'aes-128-ctr',
-      kdf: 'pbkdf2',
-      kdfparams: {
-        dklen: 32,
-        c: 65536,
-        prf: 'hmac-sha256',
-        salt: bytesToHex(salt),
-      },
-      mac: bytesToHex(mac),
-    },
-  }
-}
-
-
-
diff --git a/src/wallet/solanaAddress.ts b/src/wallet/solanaAddress.ts
new file mode 100644
index 0000000..92be625
--- /dev/null
+++ b/src/wallet/solanaAddress.ts
@@ -0,0 +1,36 @@
+import { base58 } from '@scure/base'
+
+export const BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+const BASE58_CHAR_SET = new Set(BASE58_ALPHABET)
+
+export function bytesToBase58(bytes: Uint8Array): string {
+  return base58.encode(bytes)
+}
+
+export function sanitizeBase58Input(input: string, maxLen = 44): string {
+  let out = ''
+  for (const ch of input.trim()) {
+    if (BASE58_CHAR_SET.has(ch)) out += ch
+    if (out.length >= maxLen) break
+  }
+  return out
+}
+
+function normalizeForMatch(input: string, caseSensitive: boolean): string {
+  return caseSensitive ? input : input.toLowerCase()
+}
+
+export function matchesVanityTarget(address: string, prefix: string, suffix: string, caseSensitive: boolean): boolean {
+  const addressValue = normalizeForMatch(address, caseSensitive)
+  const prefixValue = normalizeForMatch(prefix, caseSensitive)
+  const suffixValue = normalizeForMatch(suffix, caseSensitive)
+
+  return addressValue.startsWith(prefixValue) && addressValue.endsWith(suffixValue)
+}
+
+export function hasCaseInsensitiveVariant(ch: string): boolean {
+  if (!/[A-Za-z]/.test(ch)) return false
+  const lower = ch.toLowerCase()
+  const upper = ch.toUpperCase()
+  return BASE58_CHAR_SET.has(lower) && BASE58_CHAR_SET.has(upper)
+}
diff --git a/src/webgpu/base58Matcher.wgsl b/src/webgpu/base58Matcher.wgsl
new file mode 100644
index 0000000..f28a1de
--- /dev/null
+++ b/src/webgpu/base58Matcher.wgsl
@@ -0,0 +1,126 @@
+const NO_MATCH: u32 = 0xffffffffu;
+
+const ALPHABET: array<u32, 58> = array<u32, 58>(
+  49u, 50u, 51u, 52u, 53u, 54u, 55u, 56u, 57u,
+  65u, 66u, 67u, 68u, 69u, 70u, 71u, 72u, 74u, 75u, 76u, 77u, 78u, 80u, 81u,
+  82u, 83u, 84u, 85u, 86u, 87u, 88u, 89u, 90u,
+  97u, 98u, 99u, 100u, 101u, 102u, 103u, 104u, 105u, 106u, 107u, 109u, 110u,
+  111u, 112u, 113u, 114u, 115u, 116u, 117u, 118u, 119u, 120u, 121u, 122u
+);
+
+struct Params {
+  count: u32,
+  prefixLen: u32,
+  suffixLen: u32,
+  caseSensitive: u32,
+  prefix: array<u32, 44>,
+  suffix: array<u32, 44>,
+}
+
+@group(0) @binding(0) var<storage, read> pubkeys: array<u32>;
+@group(0) @binding(1) var<storage, read> params: Params;
+@group(0) @binding(2) var<storage, read_write> matchIndex: atomic<u32>;
+
+fn asciiLower(code: u32) -> u32 {
+  if (code >= 65u && code <= 90u) {
+    return code + 32u;
+  }
+  return code;
+}
+
+fn getPubByte(pubkeyIndex: u32, byteIndex: u32) -> u32 {
+  let wordIndex = pubkeyIndex * 8u + (byteIndex / 4u);
+  let shift = (byteIndex % 4u) * 8u;
+  return (pubkeys[wordIndex] >> shift) & 255u;
+}
+
+fn keyMatches(pubkeyIndex: u32) -> bool {
+  var digits: array<u32, 45>;
+  var digitsLen: u32 = 1u;
+  digits[0] = 0u;
+
+  var leadingZeros: u32 = 0u;
+  var allLeadingZeros = true;
+
+  for (var i: u32 = 0u; i < 32u; i = i + 1u) {
+    let byteVal = getPubByte(pubkeyIndex, i);
+
+    if (allLeadingZeros && byteVal == 0u) {
+      leadingZeros = leadingZeros + 1u;
+    } else {
+      allLeadingZeros = false;
+    }
+
+    var carry = byteVal;
+    for (var j: u32 = 0u; j < digitsLen; j = j + 1u) {
+      let value = digits[j] * 256u + carry;
+      digits[j] = value % 58u;
+      carry = value / 58u;
+    }
+
+    loop {
+      if (carry == 0u) {
+        break;
+      }
+      digits[digitsLen] = carry % 58u;
+      digitsLen = digitsLen + 1u;
+      carry = carry / 58u;
+    }
+  }
+
+  for (var z: u32 = 0u; z < leadingZeros; z = z + 1u) {
+    digits[digitsLen] = 0u;
+    digitsLen = digitsLen + 1u;
+  }
+
+  let prefixLen = params.prefixLen;
+  let suffixLen = params.suffixLen;
+
+  if (prefixLen + suffixLen > digitsLen) {
+    return false;
+  }
+
+  for (var p: u32 = 0u; p < prefixLen; p = p + 1u) {
+    let digit = digits[digitsLen - 1u - p];
+    var actual = ALPHABET[digit];
+    var expected = params.prefix[p];
+
+    if (params.caseSensitive == 0u) {
+      actual = asciiLower(actual);
+      expected = asciiLower(expected);
+    }
+
+    if (actual != expected) {
+      return false;
+    }
+  }
+
+  for (var s: u32 = 0u; s < suffixLen; s = s + 1u) {
+    let digit = digits[suffixLen - 1u - s];
+    var actual = ALPHABET[digit];
+    var expected = params.suffix[s];
+
+    if (params.caseSensitive == 0u) {
+      actual = asciiLower(actual);
+      expected = asciiLower(expected);
+    }
+
+    if (actual != expected) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+@compute @workgroup_size(256)
+fn main(@builtin(global_invocation_id) globalId: vec3<u32>) {
+  let idx = globalId.x;
+  if (idx >= params.count) {
+    return;
+  }
+
+  if (keyMatches(idx)) {
+    atomicMin(&matchIndex, idx);
+  }
+}
diff --git a/src/webgpu/gpuMatcher.ts b/src/webgpu/gpuMatcher.ts
new file mode 100644
index 0000000..0e00788
--- /dev/null
+++ b/src/webgpu/gpuMatcher.ts
@@ -0,0 +1,133 @@
+import shaderSource from './base58Matcher.wgsl?raw'
+
+const MAX_MATCH_LEN = 44
+const MAX_BATCH_SIZE = 32768
+const NO_MATCH = 0xffffffff
+const PARAM_U32_COUNT = 4 + MAX_MATCH_LEN + MAX_MATCH_LEN
+
+export type GpuMatcher = {
+  findMatchIndex(
+    pubKeys: Uint8Array,
+    count: number,
+    prefix: string,
+    suffix: string,
+    caseSensitive: boolean
+  ): Promise<number | null>
+  destroy(): void
+}
+
+export async function createGpuMatcher(): Promise<GpuMatcher> {
+  if (!navigator.gpu) {
+    throw new Error('WebGPU is not available')
+  }
+
+  const adapter = await navigator.gpu.requestAdapter({ powerPreference: 'high-performance' })
+  if (!adapter) {
+    throw new Error('No suitable WebGPU adapter found')
+  }
+
+  const device = await adapter.requestDevice()
+
+  const module = device.createShaderModule({ code: shaderSource })
+  const pipeline = device.createComputePipeline({
+    layout: 'auto',
+    compute: {
+      module,
+      entryPoint: 'main',
+    },
+  })
+
+  const pubKeysBuffer = device.createBuffer({
+    size: MAX_BATCH_SIZE * 32,
+    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+  })
+
+  const paramsBuffer = device.createBuffer({
+    size: PARAM_U32_COUNT * 4,
+    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
+  })
+
+  const resultBuffer = device.createBuffer({
+    size: 4,
+    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST,
+  })
+
+  const readbackBuffer = device.createBuffer({
+    size: 4,
+    usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ,
+  })
+
+  const bindGroup = device.createBindGroup({
+    layout: pipeline.getBindGroupLayout(0),
+    entries: [
+      { binding: 0, resource: { buffer: pubKeysBuffer } },
+      { binding: 1, resource: { buffer: paramsBuffer } },
+      { binding: 2, resource: { buffer: resultBuffer } },
+    ],
+  })
+
+  const paramsData = new Uint32Array(PARAM_U32_COUNT)
+  let destroyed = false
+
+  async function findMatchIndex(
+    pubKeys: Uint8Array,
+    count: number,
+    prefix: string,
+    suffix: string,
+    caseSensitive: boolean
+  ): Promise<number | null> {
+    if (destroyed) throw new Error('GPU matcher was destroyed')
+    if (count <= 0) return null
+    if (count > MAX_BATCH_SIZE) {
+      throw new Error(`Batch size ${count} exceeds MAX_BATCH_SIZE ${MAX_BATCH_SIZE}`)
+    }
+
+    const upload = pubKeys.slice(0, count * 32)
+    device.queue.writeBuffer(pubKeysBuffer, 0, upload)
+
+    paramsData.fill(0)
+    paramsData[0] = count
+    paramsData[1] = prefix.length
+    paramsData[2] = suffix.length
+    paramsData[3] = caseSensitive ? 1 : 0
+
+    for (let i = 0; i < prefix.length; i++) {
+      paramsData[4 + i] = prefix.charCodeAt(i)
+    }
+
+    for (let i = 0; i < suffix.length; i++) {
+      paramsData[4 + MAX_MATCH_LEN + i] = suffix.charCodeAt(i)
+    }
+
+    device.queue.writeBuffer(paramsBuffer, 0, paramsData)
+    device.queue.writeBuffer(resultBuffer, 0, new Uint32Array([NO_MATCH]))
+
+    const encoder = device.createCommandEncoder()
+    const pass = encoder.beginComputePass()
+    pass.setPipeline(pipeline)
+    pass.setBindGroup(0, bindGroup)
+    pass.dispatchWorkgroups(Math.ceil(count / 256))
+    pass.end()
+
+    encoder.copyBufferToBuffer(resultBuffer, 0, readbackBuffer, 0, 4)
+    device.queue.submit([encoder.finish()])
+
+    await readbackBuffer.mapAsync(GPUMapMode.READ)
+    const matchIndex = new Uint32Array(readbackBuffer.getMappedRange().slice(0))[0]
+    readbackBuffer.unmap()
+
+    if (matchIndex === NO_MATCH) return null
+    return Number(matchIndex)
+  }
+
+  function destroy() {
+    destroyed = true
+    pubKeysBuffer.destroy()
+    paramsBuffer.destroy()
+    resultBuffer.destroy()
+    readbackBuffer.destroy()
+    device.destroy()
+  }
+
+  return { findMatchIndex, destroy }
+}
diff --git a/src/webgpu/gpuVanity.ts b/src/webgpu/gpuVanity.ts
deleted file mode 100644
index c9ac87d..0000000
--- a/src/webgpu/gpuVanity.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import shaderSource from './secp256k1.wgsl?raw'
-
-export type GpuVanityResult = {
-  privHex: string
-  addressHex: string
-}
-
-export type GpuVanity = {
-  search(prefixNibbles: number[], suffixNibbles: number[], batchSize: number, searchMode: number): Promise<GpuVanityResult | null>
-  destroy(): void
-}
-
-// Little-endian u32 array to hex (for hash output)
-function u32ArrayToHexLE(arr: Uint32Array, start: number, count: number): string {
-  let hex = ''
-  for (let i = 0; i < count; i++) {
-    const val = arr[start + i]
-    hex += (val & 0xff).toString(16).padStart(2, '0')
-    hex += ((val >> 8) & 0xff).toString(16).padStart(2, '0')
-    hex += ((val >> 16) & 0xff).toString(16).padStart(2, '0')
-    hex += ((val >> 24) & 0xff).toString(16).padStart(2, '0')
-  }
-  return hex
-}
-
-// Little-endian limbs to big-endian hex (for private key)
-function u32ArrayToHexBE(arr: Uint32Array, start: number, count: number): string {
-  let hex = ''
-  // Reverse limb order and byte order
-  for (let i = count - 1; i >= 0; i--) {
-    const val = arr[start + i]
-    hex += ((val >> 24) & 0xff).toString(16).padStart(2, '0')
-    hex += ((val >> 16) & 0xff).toString(16).padStart(2, '0')
-    hex += ((val >> 8) & 0xff).toString(16).padStart(2, '0')
-    hex += (val & 0xff).toString(16).padStart(2, '0')
-  }
-  return hex
-}
-
-const MAX_BATCH_SIZE = 32768
-
-export async function createGpuVanity(): Promise<GpuVanity> {
-  if (!navigator.gpu) throw new Error('WebGPU not supported')
-
-  const adapter = await navigator.gpu.requestAdapter({ powerPreference: 'high-performance' })
-  if (!adapter) throw new Error('No WebGPU adapter')
-
-  const device = await adapter.requestDevice()
-
-  const module = device.createShaderModule({ code: shaderSource })
-
-  const pipeline = device.createComputePipeline({
-    layout: 'auto',
-    compute: { module, entryPoint: 'main' }
-  })
-
-  // Params buffer
-  const paramsBuffer = device.createBuffer({
-    size: (4 + 40 + 40) * 4,
-    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST
-  })
-
-  // Pre-allocate seed buffer for max batch size
-  const seedBuffer = device.createBuffer({
-    size: MAX_BATCH_SIZE * 8 * 4,
-    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST
-  })
-
-  // Results buffer
-  const resultsSize = 274 * 4
-  const resultsBuffer = device.createBuffer({
-    size: resultsSize,
-    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  })
-
-  // Double-buffered readback
-  const readbackBuffers = [
-    device.createBuffer({ size: resultsSize, usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ }),
-    device.createBuffer({ size: resultsSize, usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ })
-  ]
-  let currentReadback = 0
-  let pendingMap: Promise<void> | null = null
-
-  // Pre-allocate seed data array
-  const seedData = new Uint32Array(MAX_BATCH_SIZE * 8)
-
-  // Reusable params array
-  const params = new Uint32Array(4 + 40 + 40)
-
-  let destroyed = false
-
-  async function search(
-    prefixNibbles: number[],
-    suffixNibbles: number[],
-    batchSize: number,
-    searchMode: number
-  ): Promise<GpuVanityResult | null> {
-    if (destroyed) throw new Error('GPU vanity destroyed')
-    if (batchSize > MAX_BATCH_SIZE) batchSize = MAX_BATCH_SIZE
-
-    // Generate random seeds (chunked for 65536 byte limit)
-    const seedView = seedData.subarray(0, batchSize * 8)
-    const maxU32s = 65536 / 4
-    for (let offset = 0; offset < seedView.length; offset += maxU32s) {
-      const chunk = seedView.subarray(offset, Math.min(offset + maxU32s, seedView.length))
-      crypto.getRandomValues(chunk)
-    }
-    device.queue.writeBuffer(seedBuffer, 0, seedView)
-
-    // Pack params
-    params[0] = batchSize
-    params[1] = prefixNibbles.length
-    params[2] = suffixNibbles.length
-    params[3] = searchMode
-    for (let i = 0; i < prefixNibbles.length; i++) params[4 + i] = prefixNibbles[i]
-    for (let i = 0; i < suffixNibbles.length; i++) params[44 + i] = suffixNibbles[i]
-    device.queue.writeBuffer(paramsBuffer, 0, params)
-
-    // Clear results counter
-    device.queue.writeBuffer(resultsBuffer, 0, new Uint32Array([0]))
-
-    const bindGroup = device.createBindGroup({
-      layout: pipeline.getBindGroupLayout(0),
-      entries: [
-        { binding: 0, resource: { buffer: seedBuffer } },
-        { binding: 1, resource: { buffer: paramsBuffer } },
-        { binding: 2, resource: { buffer: resultsBuffer } }
-      ]
-    })
-
-    const encoder = device.createCommandEncoder()
-    const pass = encoder.beginComputePass()
-    pass.setPipeline(pipeline)
-    pass.setBindGroup(0, bindGroup)
-    pass.dispatchWorkgroups(Math.ceil(batchSize / 256))
-    pass.end()
-
-    // Use double buffering
-    const readbackBuffer = readbackBuffers[currentReadback]
-    currentReadback = 1 - currentReadback
-
-    // Wait for any pending map from previous iteration
-    if (pendingMap) {
-      await pendingMap
-      pendingMap = null
-    }
-
-    encoder.copyBufferToBuffer(resultsBuffer, 0, readbackBuffer, 0, resultsSize)
-    device.queue.submit([encoder.finish()])
-
-    await readbackBuffer.mapAsync(GPUMapMode.READ)
-    const resultData = new Uint32Array(readbackBuffer.getMappedRange().slice(0))
-    readbackBuffer.unmap()
-
-    const count = resultData[0]
-    if (count > 0) {
-      const base = 1
-      const privHex = u32ArrayToHexBE(resultData, base, 8)  // Big-endian for wallet import
-      const hashHex = u32ArrayToHexLE(resultData, base + 8, 8)
-      const addressHex = hashHex.slice(24)
-      return { privHex, addressHex }
-    }
-
-    return null
-  }
-
-  function destroy() {
-    destroyed = true
-    paramsBuffer.destroy()
-    seedBuffer.destroy()
-    resultsBuffer.destroy()
-    readbackBuffers[0].destroy()
-    readbackBuffers[1].destroy()
-    device.destroy()
-  }
-
-  return { search, destroy }
-}
diff --git a/src/webgpu/keccakMatch.wgsl b/src/webgpu/keccakMatch.wgsl
deleted file mode 100644
index d98d6b6..0000000
--- a/src/webgpu/keccakMatch.wgsl
+++ /dev/null
@@ -1,189 +0,0 @@
-// Keccak-256(pubkey64) and match prefix/suffix (lowercase hex nibbles).
-// Each invocation handles one 64-byte pubkey (x||y), computes address = last 20 bytes of hash,
-// and if it matches, writes the index to the matches buffer.
-
-const MAX_PREFIX: u32 = 40u;
-const MAX_SUFFIX: u32 = 40u;
-const MAX_MATCHES: u32 = 1024u;
-
-struct U64 { lo: u32, hi: u32 };
-
-fn u64_xor(a: U64, b: U64) -> U64 { return U64(a.lo ^ b.lo, a.hi ^ b.hi); }
-fn u64_and(a: U64, b: U64) -> U64 { return U64(a.lo & b.lo, a.hi & b.hi); }
-fn u64_not(a: U64) -> U64 { return U64(~a.lo, ~a.hi); }
-
-fn u64_rotl(a: U64, n: u32) -> U64 {
-  if (n == 0u) { return a; }
-  if (n < 32u) {
-    let lo = (a.lo << n) | (a.hi >> (32u - n));
-    let hi = (a.hi << n) | (a.lo >> (32u - n));
-    return U64(lo, hi);
-  }
-  if (n == 32u) { return U64(a.hi, a.lo); }
-  let k = n - 32u;
-  let lo = (a.hi << k) | (a.lo >> (32u - k));
-  let hi = (a.lo << k) | (a.hi >> (32u - k));
-  return U64(lo, hi);
-}
-
-fn u64_from_u32(x: u32) -> U64 { return U64(x, 0u); }
-
-fn u64_byte_at_le(a: U64, byteIndex: u32) -> u32 {
-  // byteIndex 0..7, little-endian
-  if (byteIndex < 4u) {
-    return (a.lo >> (8u * byteIndex)) & 0xffu;
-  }
-  let b = byteIndex - 4u;
-  return (a.hi >> (8u * b)) & 0xffu;
-}
-
-const R: array<u32, 25> = array<u32, 25>(
-  0u,  1u, 62u, 28u, 27u,
-  36u, 44u,  6u, 55u, 20u,
-  3u, 10u, 43u, 25u, 39u,
-  41u, 45u, 15u, 21u,  8u,
-  18u,  2u, 61u, 56u, 14u
-);
-
-const RC_LO: array<u32, 24> = array<u32, 24>(
-  0x00000001u, 0x00008082u, 0x0000808Au, 0x80008000u,
-  0x0000808Bu, 0x80000001u, 0x80008081u, 0x00008009u,
-  0x0000008Au, 0x00000088u, 0x80008009u, 0x8000000Au,
-  0x8000808Bu, 0x0000008Bu, 0x00008089u, 0x00008003u,
-  0x00008002u, 0x00000080u, 0x0000800Au, 0x8000000Au,
-  0x80008081u, 0x00008080u, 0x80000001u, 0x80008008u
-);
-
-const RC_HI: array<u32, 24> = array<u32, 24>(
-  0x00000000u, 0x00000000u, 0x80000000u, 0x80000000u,
-  0x00000000u, 0x00000000u, 0x80000000u, 0x00000000u,
-  0x00000000u, 0x00000000u, 0x00000000u, 0x00000000u,
-  0x00000000u, 0x80000000u, 0x80000000u, 0x80000000u,
-  0x80000000u, 0x80000000u, 0x00000000u, 0x80000000u,
-  0x80000000u, 0x80000000u, 0x00000000u, 0x80000000u
-);
-
-fn keccak_f1600(state: ptr<function, array<U64, 25>>) {
-  for (var round: u32 = 0u; round < 24u; round = round + 1u) {
-    var C: array<U64, 5>;
-    for (var x: u32 = 0u; x < 5u; x = x + 1u) {
-      C[x] = u64_xor(u64_xor(u64_xor(u64_xor((*state)[x], (*state)[x + 5u]), (*state)[x + 10u]), (*state)[x + 15u]), (*state)[x + 20u]);
-    }
-    var D: array<U64, 5>;
-    for (var x2: u32 = 0u; x2 < 5u; x2 = x2 + 1u) {
-      D[x2] = u64_xor(C[(x2 + 4u) % 5u], u64_rotl(C[(x2 + 1u) % 5u], 1u));
-    }
-    for (var i: u32 = 0u; i < 25u; i = i + 1u) {
-      (*state)[i] = u64_xor((*state)[i], D[i % 5u]);
-    }
-
-    // Rho + Pi
-    var B: array<U64, 25>;
-    for (var x3: u32 = 0u; x3 < 5u; x3 = x3 + 1u) {
-      for (var y3: u32 = 0u; y3 < 5u; y3 = y3 + 1u) {
-        let idx = x3 + 5u * y3;
-        let rot = R[idx];
-        let v = u64_rotl((*state)[idx], rot);
-        let nx = y3;
-        let ny = (2u * x3 + 3u * y3) % 5u;
-        B[nx + 5u * ny] = v;
-      }
-    }
-
-    // Chi
-    for (var y4: u32 = 0u; y4 < 5u; y4 = y4 + 1u) {
-      for (var x4: u32 = 0u; x4 < 5u; x4 = x4 + 1u) {
-        let idx = x4 + 5u * y4;
-        let a = B[idx];
-        let b = B[((x4 + 1u) % 5u) + 5u * y4];
-        let c = B[((x4 + 2u) % 5u) + 5u * y4];
-        (*state)[idx] = u64_xor(a, u64_and(u64_not(b), c));
-      }
-    }
-
-    // Iota
-    (*state)[0] = u64_xor((*state)[0], U64(RC_LO[round], RC_HI[round]));
-  }
-}
-
-struct Params {
-  prefixLen: u32,
-  suffixLen: u32,
-  _pad0: u32,
-  _pad1: u32,
-  prefix: array<u32, 40>,
-  suffix: array<u32, 40>,
-}
-
-struct Matches {
-  counter: atomic<u32>,
-  indices: array<u32, 1024>,
-}
-
-@group(0) @binding(0) var<storage, read> pubkeys_u32: array<u32>;
-@group(0) @binding(1) var<storage, read> params: Params;
-@group(0) @binding(2) var<storage, read_write> matches: Matches;
-
-fn addr_byte_at(addrWords: ptr<function, array<u32, 5>>, byteIndex: u32) -> u32 {
-  let w = (*addrWords)[byteIndex / 4u];
-  let b = byteIndex % 4u;
-  return (w >> (8u * b)) & 0xffu;
-}
-
-fn addr_nibble_at(addrWords: ptr<function, array<u32, 5>>, nibbleIndex: u32) -> u32 {
-  let byteIndex = nibbleIndex / 2u;
-  let byteVal = addr_byte_at(addrWords, byteIndex);
-  if ((nibbleIndex & 1u) == 0u) { return (byteVal >> 4u) & 0xfu; }
-  return byteVal & 0xfu;
-}
-
-@compute @workgroup_size(64)
-fn main(@builtin(global_invocation_id) gid: vec3<u32>) {
-  let i = gid.x;
-  // Each pubkey is 64 bytes = 16 u32
-  let base = i * 16u;
-
-  var st: array<U64, 25>;
-  for (var k: u32 = 0u; k < 25u; k = k + 1u) { st[k] = U64(0u, 0u); }
-
-  // Absorb 64 bytes into lanes 0..7 (each lane = 2 u32)
-  for (var lane: u32 = 0u; lane < 8u; lane = lane + 1u) {
-    let lo = pubkeys_u32[base + lane * 2u + 0u];
-    let hi = pubkeys_u32[base + lane * 2u + 1u];
-    st[lane] = u64_xor(st[lane], U64(lo, hi));
-  }
-
-  // Pad: 0x01 at byte offset 64 (lane 8, byte 0), and 0x80 at last byte of block (lane 16, byte 7)
-  st[8] = u64_xor(st[8], u64_from_u32(1u));
-  st[16] = u64_xor(st[16], U64(0u, 0x80000000u));
-
-  keccak_f1600(&st);
-
-  // Keccak-256 digest: first 32 bytes of state (lanes 0..3)
-  // Address bytes = digest[12..32): 20 bytes -> words:
-  // w0 = lane1.hi, w1 = lane2.lo, w2 = lane2.hi, w3 = lane3.lo, w4 = lane3.hi
-  var addrWords: array<u32, 5>;
-  addrWords[0] = st[1].hi;
-  addrWords[1] = st[2].lo;
-  addrWords[2] = st[2].hi;
-  addrWords[3] = st[3].lo;
-  addrWords[4] = st[3].hi;
-
-  // Compare prefix
-  for (var p: u32 = 0u; p < params.prefixLen; p = p + 1u) {
-    if (addr_nibble_at(&addrWords, p) != params.prefix[p]) { return; }
-  }
-  // Compare suffix
-  let start = 40u - params.suffixLen;
-  for (var q: u32 = 0u; q < params.suffixLen; q = q + 1u) {
-    if (addr_nibble_at(&addrWords, start + q) != params.suffix[q]) { return; }
-  }
-
-  let slot = atomicAdd(&matches.counter, 1u);
-  if (slot < MAX_MATCHES) {
-    matches.indices[slot] = i;
-  }
-}
-
-
-
diff --git a/src/webgpu/matcher.ts b/src/webgpu/matcher.ts
deleted file mode 100644
index 08d655a..0000000
--- a/src/webgpu/matcher.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import shaderSource from './keccakMatch.wgsl?raw'
-
-export type MatchRequest = {
-  // Concatenated 64-byte pubkeys (x||y), length = batchSize*64
-  pubkeys64: Uint8Array
-  // hex nibbles (0..15)
-  prefix: number[]
-  suffix: number[]
-}
-
-type WebGpuMatcher = {
-  match(req: MatchRequest): Promise<number[]>
-  destroy(): void
-}
-
-const MAX_MATCHES = 1024
-
-function u32Bytes(n: number) {
-  return new Uint8Array(new Uint32Array([n >>> 0]).buffer)
-}
-
-function packParams(prefix: number[], suffix: number[]): Uint32Array {
-  const out = new Uint32Array(4 + 40 + 40)
-  out[0] = prefix.length
-  out[1] = suffix.length
-  // out[2], out[3] padding
-  for (let i = 0; i < Math.min(40, prefix.length); i++) out[4 + i] = prefix[i] >>> 0
-  for (let i = 0; i < Math.min(40, suffix.length); i++) out[4 + 40 + i] = suffix[i] >>> 0
-  return out
-}
-
-export async function createWebGpuMatcher(): Promise<WebGpuMatcher> {
-  if (!('gpu' in navigator)) throw new Error('WebGPU not supported')
-  const adapter = await navigator.gpu.requestAdapter()
-  if (!adapter) throw new Error('No WebGPU adapter')
-  const device = await adapter.requestDevice()
-
-  const module = device.createShaderModule({ code: shaderSource })
-  const pipeline = device.createComputePipeline({
-    layout: 'auto',
-    compute: { module, entryPoint: 'main' },
-  })
-
-  // Buffers: we recreate pubkey buffer per batch size (since size varies), but reuse params+matches buffers.
-  const paramsBuf = device.createBuffer({
-    size: (4 + 40 + 40) * 4,
-    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
-  })
-
-  const matchesBufSize = 4 + 4 * MAX_MATCHES
-  const matchesBuf = device.createBuffer({
-    size: matchesBufSize,
-    usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST,
-  })
-
-  const readback = device.createBuffer({
-    size: matchesBufSize,
-    usage: GPUBufferUsage.COPY_DST | GPUBufferUsage.MAP_READ,
-  })
-
-  let destroyed = false
-
-  async function match(req: MatchRequest): Promise<number[]> {
-    if (destroyed) throw new Error('matcher destroyed')
-    const batchSize = Math.floor(req.pubkeys64.length / 64)
-    if (batchSize <= 0 || batchSize * 64 !== req.pubkeys64.length) throw new Error('pubkeys64 length must be multiple of 64')
-    if (batchSize > 16384) throw new Error('batch too large')
-    if (req.prefix.length > 40 || req.suffix.length > 40) throw new Error('prefix/suffix too long (max 40 nibbles each)')
-
-    // Pack pubkeys (Uint8Array) into u32[] (little-endian). In practice browsers are little-endian.
-    const pubU32 = new Uint32Array(req.pubkeys64.buffer, req.pubkeys64.byteOffset, req.pubkeys64.byteLength / 4)
-
-    const pubBuf = device.createBuffer({
-      size: pubU32.byteLength,
-      usage: GPUBufferUsage.STORAGE | GPUBufferUsage.COPY_DST,
-    })
-
-    device.queue.writeBuffer(pubBuf, 0, pubU32 as Uint32Array<ArrayBuffer>)
-    device.queue.writeBuffer(paramsBuf, 0, packParams(req.prefix, req.suffix) as Uint32Array<ArrayBuffer>)
-    device.queue.writeBuffer(matchesBuf, 0, u32Bytes(0)) // zero counter
-
-    const bindGroup = device.createBindGroup({
-      layout: pipeline.getBindGroupLayout(0),
-      entries: [
-        { binding: 0, resource: { buffer: pubBuf } },
-        { binding: 1, resource: { buffer: paramsBuf } },
-        { binding: 2, resource: { buffer: matchesBuf } },
-      ],
-    })
-
-    const encoder = device.createCommandEncoder()
-    const pass = encoder.beginComputePass()
-    pass.setPipeline(pipeline)
-    pass.setBindGroup(0, bindGroup)
-    const wgSize = 64
-    const workgroups = Math.ceil(batchSize / wgSize)
-    pass.dispatchWorkgroups(workgroups)
-    pass.end()
-    encoder.copyBufferToBuffer(matchesBuf, 0, readback, 0, matchesBufSize)
-    device.queue.submit([encoder.finish()])
-
-    await readback.mapAsync(GPUMapMode.READ)
-    const bytes = new Uint8Array(readback.getMappedRange())
-    const u32 = new Uint32Array(bytes.buffer, bytes.byteOffset, bytes.byteLength / 4)
-    const count = Math.min(u32[0], MAX_MATCHES)
-    const out: number[] = []
-    for (let i = 0; i < count; i++) out.push(u32[1 + i])
-    readback.unmap()
-
-    pubBuf.destroy()
-    return out
-  }
-
-  function destroy() {
-    destroyed = true
-    paramsBuf.destroy()
-    matchesBuf.destroy()
-    readback.destroy()
-    device.destroy()
-  }
-
-  return { match, destroy }
-}
-
-
-
diff --git a/src/webgpu/secp256k1.wgsl b/src/webgpu/secp256k1.wgsl
deleted file mode 100644
index 5e36e67..0000000
--- a/src/webgpu/secp256k1.wgsl
+++ /dev/null
@@ -1,524 +0,0 @@
-// Full GPU secp256k1 + Keccak-256 vanity address generator
-// Simplified WGSL for maximum compatibility
-
-// secp256k1 constants
-const P0: u32 = 0xFFFFFC2Fu; const P1: u32 = 0xFFFFFFFEu; const P2: u32 = 0xFFFFFFFFu; const P3: u32 = 0xFFFFFFFFu;
-const P4: u32 = 0xFFFFFFFFu; const P5: u32 = 0xFFFFFFFFu; const P6: u32 = 0xFFFFFFFFu; const P7: u32 = 0xFFFFFFFFu;
-
-const GX0: u32 = 0x16F81798u; const GX1: u32 = 0x59F2815Bu; const GX2: u32 = 0x2DCE28D9u; const GX3: u32 = 0x029BFCDBu;
-const GX4: u32 = 0xCE870B07u; const GX5: u32 = 0x55A06295u; const GX6: u32 = 0xF9DCBBACu; const GX7: u32 = 0x79BE667Eu;
-const GY0: u32 = 0xFB10D4B8u; const GY1: u32 = 0x9C47D08Fu; const GY2: u32 = 0xA6855419u; const GY3: u32 = 0xFD17B448u;
-const GY4: u32 = 0x0E1108A8u; const GY5: u32 = 0x5DA4FBFCu; const GY6: u32 = 0x26A3C465u; const GY7: u32 = 0x483ADA77u;
-
-// Keccak constants
-const RC_LO: array<u32, 24> = array<u32, 24>(
-  0x00000001u, 0x00008082u, 0x0000808au, 0x80008000u, 0x0000808bu, 0x80000001u,
-  0x80008081u, 0x00008009u, 0x0000008au, 0x00000088u, 0x80008009u, 0x8000000au,
-  0x8000808bu, 0x0000008bu, 0x00008089u, 0x00008003u, 0x00008002u, 0x00000080u,
-  0x0000800au, 0x8000000au, 0x80008081u, 0x00008080u, 0x80000001u, 0x80008008u
-);
-const RC_HI: array<u32, 24> = array<u32, 24>(
-  0x00000000u, 0x00000000u, 0x80000000u, 0x80000000u, 0x00000000u, 0x00000000u,
-  0x80000000u, 0x80000000u, 0x00000000u, 0x00000000u, 0x00000000u, 0x00000000u,
-  0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u,
-  0x00000000u, 0x80000000u, 0x80000000u, 0x80000000u, 0x00000000u, 0x80000000u
-);
-
-@group(0) @binding(0) var<storage, read> seeds: array<u32>;
-@group(0) @binding(1) var<storage, read> params: array<u32>;
-@group(0) @binding(2) var<storage, read_write> results: array<atomic<u32>>;
-
-// Workgroup shared memory for intermediate results
-var<private> rx: array<u32, 8>;
-var<private> ry: array<u32, 8>;
-var<private> rz: array<u32, 8>;
-var<private> gx: array<u32, 8>;
-var<private> gy: array<u32, 8>;
-var<private> gz: array<u32, 8>;
-var<private> tmp1: array<u32, 8>;
-var<private> tmp2: array<u32, 8>;
-var<private> tmp3: array<u32, 8>;
-var<private> inv_result: array<u32, 8>;
-var<private> inv_base: array<u32, 8>;
-// Point doubling temps
-var<private> pd_xx: array<u32, 8>;
-var<private> pd_yy: array<u32, 8>;
-var<private> pd_yyyy: array<u32, 8>;
-var<private> pd_s: array<u32, 8>;
-var<private> pd_m: array<u32, 8>;
-// Point addition temps
-var<private> pa_z1z1: array<u32, 8>;
-var<private> pa_z2z2: array<u32, 8>;
-var<private> pa_u1: array<u32, 8>;
-var<private> pa_u2: array<u32, 8>;
-var<private> pa_s1: array<u32, 8>;
-var<private> pa_s2: array<u32, 8>;
-var<private> pa_h: array<u32, 8>;
-var<private> pa_r: array<u32, 8>;
-var<private> pa_hh: array<u32, 8>;
-var<private> pa_hhh: array<u32, 8>;
-var<private> pa_u1hh: array<u32, 8>;
-// Affine conversion temps
-var<private> af_zinv: array<u32, 8>;
-var<private> af_zinv2: array<u32, 8>;
-var<private> af_zinv3: array<u32, 8>;
-// Main function temps
-var<private> m_privkey: array<u32, 8>;
-var<private> m_ax: array<u32, 8>;
-var<private> m_ay: array<u32, 8>;
-var<private> m_pubkey: array<u32, 16>;
-var<private> state: array<u32, 50>;
-
-fn is_zero_8(a: ptr<private, array<u32, 8>>) -> bool {
-  return (*a)[0] == 0u && (*a)[1] == 0u && (*a)[2] == 0u && (*a)[3] == 0u &&
-         (*a)[4] == 0u && (*a)[5] == 0u && (*a)[6] == 0u && (*a)[7] == 0u;
-}
-
-fn copy_8(src: ptr<private, array<u32, 8>>, dst: ptr<private, array<u32, 8>>) {
-  (*dst)[0] = (*src)[0]; (*dst)[1] = (*src)[1]; (*dst)[2] = (*src)[2]; (*dst)[3] = (*src)[3];
-  (*dst)[4] = (*src)[4]; (*dst)[5] = (*src)[5]; (*dst)[6] = (*src)[6]; (*dst)[7] = (*src)[7];
-}
-
-fn set_one(a: ptr<private, array<u32, 8>>) {
-  (*a)[0] = 1u; (*a)[1] = 0u; (*a)[2] = 0u; (*a)[3] = 0u;
-  (*a)[4] = 0u; (*a)[5] = 0u; (*a)[6] = 0u; (*a)[7] = 0u;
-}
-
-fn set_zero(a: ptr<private, array<u32, 8>>) {
-  (*a)[0] = 0u; (*a)[1] = 0u; (*a)[2] = 0u; (*a)[3] = 0u;
-  (*a)[4] = 0u; (*a)[5] = 0u; (*a)[6] = 0u; (*a)[7] = 0u;
-}
-
-// 256-bit add, result in c
-fn add256(a: ptr<private, array<u32, 8>>, b: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) -> u32 {
-  var carry: u32 = 0u;
-  for (var i: u32 = 0u; i < 8u; i = i + 1u) {
-    let sum: u32 = (*a)[i] + (*b)[i] + carry;
-    carry = select(0u, 1u, sum < (*a)[i] || (carry == 1u && sum <= (*a)[i]));
-    (*c)[i] = sum;
-  }
-  return carry;
-}
-
-// 256-bit sub, result in c
-fn sub256(a: ptr<private, array<u32, 8>>, b: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) -> u32 {
-  var borrow: u32 = 0u;
-  for (var i: u32 = 0u; i < 8u; i = i + 1u) {
-    let bi: u32 = (*b)[i] + borrow;
-    borrow = select(0u, 1u, (*a)[i] < bi || (borrow == 1u && (*b)[i] == 0xFFFFFFFFu));
-    (*c)[i] = (*a)[i] - bi;
-  }
-  return borrow;
-}
-
-fn gte_p(a: ptr<private, array<u32, 8>>) -> bool {
-  if ((*a)[7] > P7) { return true; } if ((*a)[7] < P7) { return false; }
-  if ((*a)[6] > P6) { return true; } if ((*a)[6] < P6) { return false; }
-  if ((*a)[5] > P5) { return true; } if ((*a)[5] < P5) { return false; }
-  if ((*a)[4] > P4) { return true; } if ((*a)[4] < P4) { return false; }
-  if ((*a)[3] > P3) { return true; } if ((*a)[3] < P3) { return false; }
-  if ((*a)[2] > P2) { return true; } if ((*a)[2] < P2) { return false; }
-  if ((*a)[1] > P1) { return true; } if ((*a)[1] < P1) { return false; }
-  if ((*a)[0] >= P0) { return true; }
-  return false;
-}
-
-fn sub_p(a: ptr<private, array<u32, 8>>) {
-  var borrow: u32 = 0u;
-  var t: u32;
-  t = (*a)[0] - P0 - borrow; borrow = select(0u, 1u, (*a)[0] < P0 + borrow); (*a)[0] = t;
-  t = (*a)[1] - P1 - borrow; borrow = select(0u, 1u, (*a)[1] < P1 + borrow); (*a)[1] = t;
-  t = (*a)[2] - P2 - borrow; borrow = select(0u, 1u, (*a)[2] < P2 + borrow); (*a)[2] = t;
-  t = (*a)[3] - P3 - borrow; borrow = select(0u, 1u, (*a)[3] < P3 + borrow); (*a)[3] = t;
-  t = (*a)[4] - P4 - borrow; borrow = select(0u, 1u, (*a)[4] < P4 + borrow); (*a)[4] = t;
-  t = (*a)[5] - P5 - borrow; borrow = select(0u, 1u, (*a)[5] < P5 + borrow); (*a)[5] = t;
-  t = (*a)[6] - P6 - borrow; borrow = select(0u, 1u, (*a)[6] < P6 + borrow); (*a)[6] = t;
-  t = (*a)[7] - P7 - borrow; (*a)[7] = t;
-}
-
-fn add_p(a: ptr<private, array<u32, 8>>) {
-  var carry: u32 = 0u;
-  var t: u32;
-  t = (*a)[0] + P0 + carry; carry = select(0u, 1u, t < (*a)[0]); (*a)[0] = t;
-  t = (*a)[1] + P1 + carry; carry = select(0u, 1u, t < (*a)[1]); (*a)[1] = t;
-  t = (*a)[2] + P2 + carry; carry = select(0u, 1u, t < (*a)[2]); (*a)[2] = t;
-  t = (*a)[3] + P3 + carry; carry = select(0u, 1u, t < (*a)[3]); (*a)[3] = t;
-  t = (*a)[4] + P4 + carry; carry = select(0u, 1u, t < (*a)[4]); (*a)[4] = t;
-  t = (*a)[5] + P5 + carry; carry = select(0u, 1u, t < (*a)[5]); (*a)[5] = t;
-  t = (*a)[6] + P6 + carry; carry = select(0u, 1u, t < (*a)[6]); (*a)[6] = t;
-  t = (*a)[7] + P7 + carry; (*a)[7] = t;
-}
-
-fn mod_add(a: ptr<private, array<u32, 8>>, b: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) {
-  let carry = add256(a, b, c);
-  if (carry == 1u || gte_p(c)) { sub_p(c); }
-}
-
-fn mod_sub(a: ptr<private, array<u32, 8>>, b: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) {
-  let borrow = sub256(a, b, c);
-  if (borrow == 1u) { add_p(c); }
-}
-
-fn mul32(a: u32, b: u32) -> vec2<u32> {
-  let al = a & 0xFFFFu; let ah = a >> 16u;
-  let bl = b & 0xFFFFu; let bh = b >> 16u;
-  let p0 = al * bl; let p1 = al * bh; let p2 = ah * bl; let p3 = ah * bh;
-  let mid = p1 + p2;
-  let mid_c = select(0u, 0x10000u, mid < p1);
-  let lo = p0 + (mid << 16u);
-  let lo_c = select(0u, 1u, lo < p0);
-  let hi = p3 + (mid >> 16u) + mid_c + lo_c;
-  return vec2<u32>(lo, hi);
-}
-
-fn mod_mul(a: ptr<private, array<u32, 8>>, b: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) {
-  var prod: array<u32, 16>;
-  for (var i: u32 = 0u; i < 16u; i = i + 1u) { prod[i] = 0u; }
-
-  for (var i: u32 = 0u; i < 8u; i = i + 1u) {
-    var carry: u32 = 0u;
-    for (var j: u32 = 0u; j < 8u; j = j + 1u) {
-      let m = mul32((*a)[i], (*b)[j]);
-      var sum = prod[i + j] + m.x + carry;
-      carry = select(0u, 1u, sum < prod[i + j]) + m.y;
-      if (sum < m.x) { carry = carry + 1u; }
-      prod[i + j] = sum;
-    }
-    prod[i + 8u] = carry;
-  }
-
-  // Reduction for secp256k1: multiply high part by (2^32 + 977) and add
-  for (var i: u32 = 0u; i < 8u; i = i + 1u) { (*c)[i] = prod[i]; }
-
-  for (var k: u32 = 0u; k < 8u; k = k + 1u) {
-    let h = prod[8u + k];
-    if (h == 0u) { continue; }
-
-    // Add h * 977
-    let m977 = mul32(h, 977u);
-    var carry = m977.y;
-    var sum = (*c)[k] + m977.x;
-    carry = carry + select(0u, 1u, sum < (*c)[k]);
-    (*c)[k] = sum;
-
-    // Add h (for 2^32 factor) at position k+1
-    if (k + 1u < 8u) {
-      sum = (*c)[k + 1u] + h + carry;
-      carry = select(0u, 1u, sum < (*c)[k + 1u]);
-      (*c)[k + 1u] = sum;
-    }
-
-    // Propagate
-    for (var j: u32 = k + 2u; j < 8u && carry > 0u; j = j + 1u) {
-      sum = (*c)[j] + carry;
-      carry = select(0u, 1u, sum < (*c)[j]);
-      (*c)[j] = sum;
-    }
-  }
-
-  if (gte_p(c)) { sub_p(c); }
-}
-
-fn mod_sqr(a: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) {
-  mod_mul(a, a, c);
-}
-
-// Modular inverse via Fermat: a^(p-2) mod p
-fn mod_inv(a: ptr<private, array<u32, 8>>, c: ptr<private, array<u32, 8>>) {
-  // p-2 = FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2D
-  set_one(&inv_result);
-  copy_8(a, &inv_base);
-
-  // Exponent bits (p-2)
-  let exp = array<u32, 8>(0xFFFFFC2Du, 0xFFFFFFFEu, 0xFFFFFFFFu, 0xFFFFFFFFu,
-                          0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu, 0xFFFFFFFFu);
-
-  for (var i: u32 = 0u; i < 256u; i = i + 1u) {
-    let limb = i / 32u;
-    let bit = i % 32u;
-    if ((exp[limb] & (1u << bit)) != 0u) {
-      mod_mul(&inv_result, &inv_base, &tmp1);
-      copy_8(&tmp1, &inv_result);
-    }
-    mod_sqr(&inv_base, &tmp1);
-    copy_8(&tmp1, &inv_base);
-  }
-  copy_8(&inv_result, c);
-}
-
-fn init_G() {
-  gx[0] = GX0; gx[1] = GX1; gx[2] = GX2; gx[3] = GX3;
-  gx[4] = GX4; gx[5] = GX5; gx[6] = GX6; gx[7] = GX7;
-  gy[0] = GY0; gy[1] = GY1; gy[2] = GY2; gy[3] = GY3;
-  gy[4] = GY4; gy[5] = GY5; gy[6] = GY6; gy[7] = GY7;
-  set_one(&gz);
-}
-
-// Point doubling in Jacobian coordinates
-fn point_double_g() {
-  if (is_zero_8(&gz)) { return; }
-
-  mod_sqr(&gx, &pd_xx);
-  mod_sqr(&gy, &pd_yy);
-  mod_sqr(&pd_yy, &pd_yyyy);
-
-  mod_add(&gx, &pd_yy, &tmp1);
-  mod_sqr(&tmp1, &tmp2);
-  mod_sub(&tmp2, &pd_xx, &tmp1);
-  mod_sub(&tmp1, &pd_yyyy, &tmp2);
-  mod_add(&tmp2, &tmp2, &pd_s);
-
-  mod_add(&pd_xx, &pd_xx, &tmp1);
-  mod_add(&tmp1, &pd_xx, &pd_m);
-
-  mod_sqr(&pd_m, &tmp1);
-  mod_add(&pd_s, &pd_s, &tmp2);
-  mod_sub(&tmp1, &tmp2, &gx);
-
-  mod_sub(&pd_s, &gx, &tmp1);
-  mod_mul(&pd_m, &tmp1, &tmp2);
-  mod_add(&pd_yyyy, &pd_yyyy, &tmp1);
-  mod_add(&tmp1, &tmp1, &tmp3);
-  mod_add(&tmp3, &tmp3, &tmp1);
-  mod_sub(&tmp2, &tmp1, &gy);
-
-  mod_mul(&gy, &gz, &tmp1);
-  mod_add(&tmp1, &tmp1, &gz);
-}
-
-// Point addition R = R + G (Jacobian)
-fn point_add_rg() {
-  if (is_zero_8(&rz)) {
-    copy_8(&gx, &rx); copy_8(&gy, &ry); copy_8(&gz, &rz);
-    return;
-  }
-  if (is_zero_8(&gz)) { return; }
-
-  mod_sqr(&rz, &pa_z1z1);
-  mod_sqr(&gz, &pa_z2z2);
-  mod_mul(&rx, &pa_z2z2, &pa_u1);
-  mod_mul(&gx, &pa_z1z1, &pa_u2);
-
-  mod_mul(&gz, &pa_z2z2, &tmp1);
-  mod_mul(&ry, &tmp1, &pa_s1);
-
-  mod_mul(&rz, &pa_z1z1, &tmp1);
-  mod_mul(&gy, &tmp1, &pa_s2);
-
-  mod_sub(&pa_u2, &pa_u1, &pa_h);
-  mod_sub(&pa_s2, &pa_s1, &pa_r);
-
-  mod_sqr(&pa_h, &pa_hh);
-  mod_mul(&pa_h, &pa_hh, &pa_hhh);
-  mod_mul(&pa_u1, &pa_hh, &pa_u1hh);
-
-  mod_sqr(&pa_r, &tmp1);
-  mod_add(&pa_u1hh, &pa_u1hh, &tmp2);
-  mod_add(&pa_hhh, &tmp2, &tmp3);
-  mod_sub(&tmp1, &tmp3, &rx);
-
-  mod_sub(&pa_u1hh, &rx, &tmp1);
-  mod_mul(&pa_r, &tmp1, &tmp2);
-  mod_mul(&pa_s1, &pa_hhh, &tmp1);
-  mod_sub(&tmp2, &tmp1, &ry);
-
-  mod_mul(&rz, &gz, &tmp1);
-  mod_mul(&tmp1, &pa_h, &rz);
-}
-
-// Scalar multiplication k*G
-fn scalar_mult(k: ptr<private, array<u32, 8>>) {
-  set_zero(&rx); set_zero(&ry); set_zero(&rz);
-  init_G();
-
-  for (var i: u32 = 0u; i < 256u; i = i + 1u) {
-    let limb = i / 32u;
-    let bit = i % 32u;
-    if (((*k)[limb] & (1u << bit)) != 0u) {
-      point_add_rg();
-    }
-    point_double_g();
-  }
-}
-
-// Convert to affine
-fn to_affine(ax: ptr<private, array<u32, 8>>, ay: ptr<private, array<u32, 8>>) {
-  if (is_zero_8(&rz)) {
-    set_zero(ax); set_zero(ay);
-    return;
-  }
-  mod_inv(&rz, &af_zinv);
-  mod_sqr(&af_zinv, &af_zinv2);
-  mod_mul(&af_zinv2, &af_zinv, &af_zinv3);
-  mod_mul(&rx, &af_zinv2, ax);
-  mod_mul(&ry, &af_zinv3, ay);
-}
-
-// Keccak-256
-fn rotl64(lo: u32, hi: u32, n: u32) -> vec2<u32> {
-  if (n == 0u) { return vec2<u32>(lo, hi); }
-  if (n < 32u) {
-    return vec2<u32>((lo << n) | (hi >> (32u - n)), (hi << n) | (lo >> (32u - n)));
-  }
-  let m = n - 32u;
-  return vec2<u32>((hi << m) | (lo >> (32u - m)), (lo << m) | (hi >> (32u - m)));
-}
-
-fn state_get_byte(byte_idx: u32) -> u32 {
-  let word_idx = byte_idx / 4u;
-  let byte_in_word = byte_idx % 4u;
-  return (state[word_idx] >> (byte_in_word * 8u)) & 0xFFu;
-}
-
-fn state_set_byte(byte_idx: u32, value: u32) {
-  let word_idx = byte_idx / 4u;
-  let shift = (byte_idx % 4u) * 8u;
-  let mask = ~(0xFFu << shift);
-  state[word_idx] = (state[word_idx] & mask) | ((value & 0xFFu) << shift);
-}
-
-fn keccak_permute() {
-  let PILN = array<u32, 24>(10u,7u,11u,17u,18u,3u,5u,16u,8u,21u,24u,4u,15u,23u,19u,13u,12u,2u,20u,14u,22u,9u,6u,1u);
-  let ROTC = array<u32, 24>(1u,3u,6u,10u,15u,21u,28u,36u,45u,55u,2u,14u,27u,41u,56u,8u,25u,43u,62u,18u,39u,61u,20u,44u);
-
-  for (var round: u32 = 0u; round < 24u; round = round + 1u) {
-    var c: array<u32, 10>;
-    for (var x: u32 = 0u; x < 5u; x = x + 1u) {
-      c[x*2u] = state[x*2u] ^ state[10u+x*2u] ^ state[20u+x*2u] ^ state[30u+x*2u] ^ state[40u+x*2u];
-      c[x*2u+1u] = state[x*2u+1u] ^ state[10u+x*2u+1u] ^ state[20u+x*2u+1u] ^ state[30u+x*2u+1u] ^ state[40u+x*2u+1u];
-    }
-
-    for (var x: u32 = 0u; x < 5u; x = x + 1u) {
-      let x1 = (x + 1u) % 5u;
-      let x4 = (x + 4u) % 5u;
-      let rot = rotl64(c[x1*2u], c[x1*2u+1u], 1u);
-      let d0 = c[x4*2u] ^ rot.x;
-      let d1 = c[x4*2u+1u] ^ rot.y;
-      for (var y: u32 = 0u; y < 5u; y = y + 1u) {
-        let idx = (y * 5u + x) * 2u;
-        state[idx] = state[idx] ^ d0;
-        state[idx+1u] = state[idx+1u] ^ d1;
-      }
-    }
-
-    var temp: array<u32, 50>;
-    temp[0] = state[0]; temp[1] = state[1];
-    var t0 = state[2]; var t1 = state[3];
-    for (var i: u32 = 0u; i < 24u; i = i + 1u) {
-      let j = PILN[i];
-      let n0 = state[j * 2u]; let n1 = state[j * 2u + 1u];
-      let rot = rotl64(t0, t1, ROTC[i]);
-      temp[j * 2u] = rot.x; temp[j * 2u + 1u] = rot.y;
-      t0 = n0; t1 = n1;
-    }
-
-    for (var y: u32 = 0u; y < 5u; y = y + 1u) {
-      for (var x: u32 = 0u; x < 5u; x = x + 1u) {
-        let i0 = (y * 5u + x) * 2u;
-        let i1 = (y * 5u + ((x + 1u) % 5u)) * 2u;
-        let i2 = (y * 5u + ((x + 2u) % 5u)) * 2u;
-        state[i0] = temp[i0] ^ ((~temp[i1]) & temp[i2]);
-        state[i0+1u] = temp[i0+1u] ^ ((~temp[i1+1u]) & temp[i2+1u]);
-      }
-    }
-
-    state[0] = state[0] ^ RC_LO[round];
-    state[1] = state[1] ^ RC_HI[round];
-  }
-}
-
-fn keccak256_pubkey(pubkey: ptr<private, array<u32, 16>>) {
-  for (var i: u32 = 0u; i < 50u; i = i + 1u) { state[i] = 0u; }
-  for (var i: u32 = 0u; i < 16u; i = i + 1u) { state[i] = (*pubkey)[i]; }
-  state[16u] = state[16u] ^ 0x01u;
-  state[33u] = state[33u] ^ 0x80000000u;
-  keccak_permute();
-}
-
-fn keccak256_first_contract_from_sender_hash() {
-  var sender: array<u32, 20>;
-  for (var i: u32 = 0u; i < 20u; i = i + 1u) {
-    sender[i] = state_get_byte(12u + i);
-  }
-
-  for (var i: u32 = 0u; i < 50u; i = i + 1u) { state[i] = 0u; }
-
-  // keccak(0xd6 ++ 0x94 ++ wallet_address ++ 0x80) => CREATE nonce-0 address
-  state_set_byte(0u, 0xd6u);
-  state_set_byte(1u, 0x94u);
-  for (var i: u32 = 0u; i < 20u; i = i + 1u) {
-    state_set_byte(2u + i, sender[i]);
-  }
-  state_set_byte(22u, 0x80u);
-
-  // Keccak domain separation + final padding bit.
-  state_set_byte(23u, 0x01u);
-  state_set_byte(135u, 0x80u);
-  keccak_permute();
-}
-
-@compute @workgroup_size(256)
-fn main(@builtin(global_invocation_id) gid: vec3<u32>) {
-  let idx = gid.x;
-  let batch_size = params[0];
-  if (idx >= batch_size) { return; }
-
-  let prefix_len = params[1];
-  let suffix_len = params[2];
-  let search_mode = params[3];
-
-  let seed_base = idx * 8u;
-  for (var i: u32 = 0u; i < 8u; i = i + 1u) {
-    m_privkey[i] = seeds[seed_base + i] ^ (idx * 2654435761u + i * 1597334677u);
-  }
-
-  scalar_mult(&m_privkey);
-
-  to_affine(&m_ax, &m_ay);
-
-  // Pack pubkey in big-endian format (Ethereum requires big-endian)
-  // m_ax/m_ay are in little-endian limb order, need to reverse both limb and byte order
-  for (var i: u32 = 0u; i < 8u; i = i + 1u) {
-    // Reverse limb order (7-i) and byte swap within each u32
-    let vx = m_ax[7u - i];
-    let vy = m_ay[7u - i];
-    // Byte swap: ABCD -> DCBA
-    m_pubkey[i] = ((vx & 0xFFu) << 24u) | ((vx & 0xFF00u) << 8u) | ((vx >> 8u) & 0xFF00u) | ((vx >> 24u) & 0xFFu);
-    m_pubkey[8u + i] = ((vy & 0xFFu) << 24u) | ((vy & 0xFF00u) << 8u) | ((vy >> 8u) & 0xFF00u) | ((vy >> 24u) & 0xFFu);
-  }
-
-  keccak256_pubkey(&m_pubkey);
-  if (search_mode == 1u) {
-    keccak256_first_contract_from_sender_hash();
-  }
-
-  var match_ok = true;
-  for (var i: u32 = 0u; i < prefix_len; i = i + 1u) {
-    if (!match_ok) { break; }
-    let byte_idx = 12u + i / 2u;
-    let byte_val = state_get_byte(byte_idx);
-    let nibble = select(byte_val >> 4u, byte_val & 0xFu, i % 2u == 1u);
-    if (nibble != params[4u + i]) { match_ok = false; }
-  }
-
-  for (var i: u32 = 0u; i < suffix_len; i = i + 1u) {
-    if (!match_ok) { break; }
-    let addr_nibble = 39u - (suffix_len - 1u - i);
-    let byte_idx = 12u + addr_nibble / 2u;
-    let byte_val = state_get_byte(byte_idx);
-    let nibble = select(byte_val >> 4u, byte_val & 0xFu, addr_nibble % 2u == 1u);
-    if (nibble != params[44u + i]) { match_ok = false; }
-  }
-
-  if (match_ok) {
-    let slot = atomicAdd(&results[0], 1u);
-    if (slot < 16u) {
-      let base = 1u + slot * 17u;
-      for (var i: u32 = 0u; i < 8u; i = i + 1u) {
-        atomicStore(&results[base + i], m_privkey[i]);
-        atomicStore(&results[base + 8u + i], state[i]);
-      }
-      atomicStore(&results[base + 16u], idx);
-    }
-  }
-}
diff --git a/src/worker/pool.ts b/src/worker/pool.ts
index 6267b56..c859baa 100644
--- a/src/worker/pool.ts
+++ b/src/worker/pool.ts
@@ -6,12 +6,29 @@ type SearchResult = {
   found: { privHex: string; address: string } | null
 }
 
-type PendingTask = {
-  resolve: (result: SearchResult) => void
+type GeneratedBatch = {
+  checked: number
+  privKeys: Uint8Array
+  pubKeys: Uint8Array
 }
 
+type PendingTask =
+  | { kind: 'search'; resolve: (result: SearchResult) => void }
+  | { kind: 'generate'; resolve: (result: GeneratedBatch) => void }
+
+type WorkerMessage =
+  | { type: 'result'; id: number; checked: number; found: { privHex: string; address: string } | null }
+  | { type: 'batch'; id: number; checked: number; privKeys: Uint8Array; pubKeys: Uint8Array }
+
 export type WorkerPool = {
-  search(prefixLower: string, suffixLower: string, batchSize: number, target: SearchTarget): Promise<SearchResult>
+  search(
+    prefix: string,
+    suffix: string,
+    batchSize: number,
+    target: SearchTarget,
+    caseSensitive: boolean
+  ): Promise<SearchResult>
+  generate(batchSize: number): Promise<GeneratedBatch>
   destroy(): void
   workerCount: number
 }
@@ -25,12 +42,24 @@ export function createWorkerPool(): WorkerPool {
 
   for (let i = 0; i < workerCount; i++) {
     const worker = new VanityWorker()
-    worker.onmessage = (e) => {
-      const { id, checked, found } = e.data
-      const task = pending.get(id)
-      if (task) {
-        pending.delete(id)
-        task.resolve({ checked, found })
+    worker.onmessage = (e: MessageEvent<WorkerMessage>) => {
+      const message = e.data
+      const task = pending.get(message.id)
+      if (!task) return
+
+      pending.delete(message.id)
+
+      if (message.type === 'result' && task.kind === 'search') {
+        task.resolve({ checked: message.checked, found: message.found })
+        return
+      }
+
+      if (message.type === 'batch' && task.kind === 'generate') {
+        task.resolve({
+          checked: message.checked,
+          privKeys: message.privKeys,
+          pubKeys: message.pubKeys,
+        })
       }
     }
     workers.push(worker)
@@ -38,23 +67,48 @@ export function createWorkerPool(): WorkerPool {
 
   let workerIndex = 0
 
-  function search(prefixLower: string, suffixLower: string, batchSize: number, target: SearchTarget): Promise<SearchResult> {
+  function nextWorker(): Worker {
+    const worker = workers[workerIndex]
+    workerIndex = (workerIndex + 1) % workerCount
+    return worker
+  }
+
+  function search(
+    prefix: string,
+    suffix: string,
+    batchSize: number,
+    target: SearchTarget,
+    caseSensitive: boolean
+  ): Promise<SearchResult> {
     if (destroyed) return Promise.reject(new Error('Pool destroyed'))
 
     return new Promise((resolve) => {
       const id = nextId++
-      pending.set(id, { resolve })
+      pending.set(id, { kind: 'search', resolve })
 
-      const worker = workers[workerIndex]
-      workerIndex = (workerIndex + 1) % workerCount
-
-      worker.postMessage({
+      nextWorker().postMessage({
         type: 'search',
         id,
         batchSize,
-        prefixLower,
-        suffixLower,
-        target
+        prefix,
+        suffix,
+        caseSensitive,
+        target,
+      })
+    })
+  }
+
+  function generate(batchSize: number): Promise<GeneratedBatch> {
+    if (destroyed) return Promise.reject(new Error('Pool destroyed'))
+
+    return new Promise((resolve) => {
+      const id = nextId++
+      pending.set(id, { kind: 'generate', resolve })
+
+      nextWorker().postMessage({
+        type: 'generate',
+        id,
+        batchSize,
       })
     })
   }
@@ -66,5 +120,5 @@ export function createWorkerPool(): WorkerPool {
     pending.clear()
   }
 
-  return { search, destroy, workerCount }
+  return { search, generate, destroy, workerCount }
 }
diff --git a/src/worker/vanityWorker.ts b/src/worker/vanityWorker.ts
index 88cf221..3004cd7 100644
--- a/src/worker/vanityWorker.ts
+++ b/src/worker/vanityWorker.ts
@@ -1,123 +1,108 @@
-import { Point, utils, getPublicKey } from '@noble/secp256k1'
-import { keccak_256 } from '@noble/hashes/sha3.js'
-import { firstContractAddressFromWalletHex } from '../wallet/ethAddress'
+import { ed25519 } from '@noble/curves/ed25519.js'
+import { bytesToHex } from '../utils/hex'
+import { bytesToBase58, matchesVanityTarget } from '../wallet/solanaAddress'
 import type { SearchTarget } from '../searchTarget'
 
-/**
- * SECURITY MODEL:
- * - Randomness: Uses crypto.getRandomValues() (OS-level CSPRNG) via @noble/secp256k1
- * - Key Generation: FIPS 186 B.4.1 compliant with modulo bias elimination
- * - Incremental Search: Each batch starts from a fresh 256-bit random key
- * - Verification: Found keys are re-verified before returning to prevent any bugs
- *
- * The incremental approach (k, k+1, k+2...) is safe because:
- * 1. ECDLP: Cannot derive private key from public key/address
- * 2. Only ONE key per batch is ever returned to user
- * 3. Each batch has independent random starting point
- */
-
-type WorkerMessage = {
-  type: 'search'
-  id: number
-  batchSize: number
-  prefixLower: string
-  suffixLower: string
-  target: SearchTarget
-}
+type WorkerMessage =
+  | {
+    type: 'search'
+    id: number
+    batchSize: number
+    prefix: string
+    suffix: string
+    caseSensitive: boolean
+    target: SearchTarget
+  }
+  | {
+    type: 'generate'
+    id: number
+    batchSize: number
+  }
 
-type WorkerResult = {
+type SearchWorkerResult = {
   type: 'result'
   id: number
   checked: number
   found: { privHex: string; address: string } | null
 }
 
-// Precomputed hex lookup table for fast conversion
-const hexTable: string[] = new Array(256)
-for (let i = 0; i < 256; i++) {
-  hexTable[i] = i.toString(16).padStart(2, '0')
+type BatchWorkerResult = {
+  type: 'batch'
+  id: number
+  checked: number
+  privKeys: Uint8Array
+  pubKeys: Uint8Array
 }
 
-// Generator point and curve order for incremental key generation
-const G = Point.BASE
-const N = Point.CURVE().n
+function generateBatch(batchSize: number): { privKeys: Uint8Array; pubKeys: Uint8Array } {
+  const privKeys = new Uint8Array(batchSize * 32)
+  const pubKeys = new Uint8Array(batchSize * 32)
 
-function pubkeyToAddress(pubkey64: Uint8Array): string {
-  const hash = keccak_256(pubkey64)
-  let addr = ''
-  for (let i = 12; i < 32; i++) {
-    addr += hexTable[hash[i]]
-  }
-  return addr
-}
+  crypto.getRandomValues(privKeys)
 
-function bigIntToHex(n: bigint): string {
-  return n.toString(16).padStart(64, '0')
-}
-
-function bigIntToBytes(n: bigint): Uint8Array {
-  const bytes = new Uint8Array(32)
-  let temp = n
-  for (let i = 31; i >= 0; i--) {
-    bytes[i] = Number(temp & 0xffn)
-    temp >>= 8n
+  for (let i = 0; i < batchSize; i++) {
+    const offset = i * 32
+    const seed = privKeys.subarray(offset, offset + 32)
+    const pubkey = ed25519.getPublicKey(seed)
+    pubKeys.set(pubkey, offset)
   }
-  return bytes
+
+  return { privKeys, pubKeys }
 }
 
 self.onmessage = (e: MessageEvent<WorkerMessage>) => {
-  const { type, id, batchSize, prefixLower, suffixLower, target } = e.data
+  const message = e.data
+
+  if (message.type === 'generate') {
+    const { id, batchSize } = message
+    const { privKeys, pubKeys } = generateBatch(batchSize)
+
+    const result: BatchWorkerResult = {
+      type: 'batch',
+      id,
+      checked: batchSize,
+      privKeys,
+      pubKeys,
+    }
 
-  if (type !== 'search') return
-  const searchTarget: SearchTarget = target === 'first-contract' ? 'first-contract' : 'wallet'
+    self.postMessage(result)
+    return
+  }
 
-  // Generate random starting private key using CSPRNG
-  const privBytes = utils.randomSecretKey()
-  let privKey = bytesToBigInt(privBytes)
+  if (message.type !== 'search') return
 
-  // Compute initial public key point (one full scalar multiplication)
-  let pubPoint = Point.fromBytes(getPublicKey(privBytes, false))
+  const { id, batchSize, prefix, suffix, caseSensitive, target } = message
 
-  for (let i = 0; i < batchSize; i++) {
-    // Convert point to uncompressed public key (64 bytes, no prefix)
-    const pubRaw = pubPoint.toBytes(false)
-    const pub64 = pubRaw.slice(1)
-    const walletAddr = pubkeyToAddress(pub64)
-    const targetAddr = searchTarget === 'first-contract'
-      ? firstContractAddressFromWalletHex(walletAddr)
-      : walletAddr
-
-    if (targetAddr.startsWith(prefixLower) && targetAddr.endsWith(suffixLower)) {
-      // SECURITY: Re-verify the key before returning
-      // Recompute public key from private key to ensure correctness
-      const verifyPub = getPublicKey(bigIntToBytes(privKey), false)
-      const verifyWalletAddr = pubkeyToAddress(verifyPub.slice(1))
-      const verifyTargetAddr = searchTarget === 'first-contract'
-        ? firstContractAddressFromWalletHex(verifyWalletAddr)
-        : verifyWalletAddr
-
-      if (verifyTargetAddr !== targetAddr) {
-        // Should never happen - indicates a bug
-        console.error('Key verification failed!')
-        continue
-      }
+  const { privKeys, pubKeys } = generateBatch(batchSize)
 
-      const result: WorkerResult = {
-        type: 'result',
-        id,
-        checked: i + 1,
-        found: { privHex: bigIntToHex(privKey), address: '0x' + targetAddr }
+  for (let i = 0; i < batchSize; i++) {
+    const offset = i * 32
+    const seed = privKeys.subarray(offset, offset + 32)
+    const pubkey = pubKeys.subarray(offset, offset + 32)
+    const address = bytesToBase58(pubkey)
+
+    // Program ID and wallet addresses are both Solana ed25519 pubkeys.
+    const targetAddress = target === 'program' ? address : address
+
+    if (!matchesVanityTarget(targetAddress, prefix, suffix, caseSensitive)) continue
+
+    const verifyAddress = bytesToBase58(ed25519.getPublicKey(seed))
+    if (verifyAddress !== targetAddress) continue
+
+    const result: SearchWorkerResult = {
+      type: 'result',
+      id,
+      checked: i + 1,
+      found: {
+        privHex: bytesToHex(seed),
+        address: targetAddress,
       }
-      self.postMessage(result)
-      return
     }
-
-    // Increment: add G to public key and +1 to private key (MUCH faster than full scalar mult)
-    pubPoint = pubPoint.add(G)
-    privKey = (privKey + 1n) % N
+    self.postMessage(result)
+    return
   }
 
-  const result: WorkerResult = {
+  const result: SearchWorkerResult = {
     type: 'result',
     id,
     checked: batchSize,
@@ -125,11 +110,3 @@ self.onmessage = (e: MessageEvent<WorkerMessage>) => {
   }
   self.postMessage(result)
 }
-
-function bytesToBigInt(bytes: Uint8Array): bigint {
-  let result = 0n
-  for (let i = 0; i < bytes.length; i++) {
-    result = (result << 8n) | BigInt(bytes[i])
-  }
-  return result
-}
diff --git a/src/worker/wasmPool.ts b/src/worker/wasmPool.ts
deleted file mode 100644
index f9bbbd8..0000000
--- a/src/worker/wasmPool.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import WasmVanityWorker from './wasmVanityWorker?worker'
-import type { SearchTarget } from '../searchTarget'
-
-type SearchResult = {
-  checked: number
-  found: { privHex: string; address: string } | null
-}
-
-type PendingTask = {
-  resolve: (result: SearchResult) => void
-}
-
-export type WasmWorkerPool = {
-  search(prefixLower: string, suffixLower: string, batchSize: number, target: SearchTarget): Promise<SearchResult>
-  destroy(): void
-  workerCount: number
-}
-
-/**
- * Initialize a single WASM worker: send 'init', wait for 'ready' or timeout.
- * Returns the worker if successful, null if init failed/timed out.
- */
-function initWorker(timeoutMs: number): Promise<Worker | null> {
-  return new Promise((resolve) => {
-    const worker = new WasmVanityWorker()
-    const timer = setTimeout(() => {
-      worker.terminate()
-      resolve(null)
-    }, timeoutMs)
-
-    worker.onmessage = (e) => {
-      if (e.data.type === 'ready') {
-        clearTimeout(timer)
-        resolve(worker)
-      } else if (e.data.type === 'init-failed') {
-        clearTimeout(timer)
-        worker.terminate()
-        resolve(null)
-      }
-    }
-
-    worker.postMessage({ type: 'init' })
-  })
-}
-
-/**
- * Create a WASM worker pool with sequential initialization.
- * Workers are initialized one at a time to avoid __initializeContext() contention.
- * Returns null if no workers could be initialized.
- */
-export async function createWasmWorkerPool(initTimeoutMs = 10000): Promise<WasmWorkerPool | null> {
-  const targetCount = Math.max(1, navigator.hardwareConcurrency || 4)
-  const workers: Worker[] = []
-  const pending = new Map<number, PendingTask>()
-  let nextId = 0
-  let destroyed = false
-
-  // Initialize workers sequentially to avoid contention
-  for (let i = 0; i < targetCount; i++) {
-    if (destroyed) break
-    const worker = await initWorker(initTimeoutMs)
-    if (worker) {
-      worker.onmessage = (e) => {
-        const { id, checked, found } = e.data
-        const task = pending.get(id)
-        if (task) {
-          pending.delete(id)
-          task.resolve({ checked, found })
-        }
-      }
-      workers.push(worker)
-    } else {
-      // If the first worker fails, WASM isn't going to work
-      if (workers.length === 0) {
-        return null
-      }
-    }
-  }
-
-  if (workers.length === 0) return null
-
-  let workerIndex = 0
-
-  function search(prefixLower: string, suffixLower: string, batchSize: number, target: SearchTarget): Promise<SearchResult> {
-    if (destroyed) return Promise.reject(new Error('Pool destroyed'))
-
-    return new Promise((resolve) => {
-      const id = nextId++
-      pending.set(id, { resolve })
-
-      const worker = workers[workerIndex]
-      workerIndex = (workerIndex + 1) % workers.length
-
-      worker.postMessage({
-        type: 'search',
-        id,
-        batchSize,
-        prefixLower,
-        suffixLower,
-        target
-      })
-    })
-  }
-
-  function destroy() {
-    destroyed = true
-    workers.forEach(w => w.terminate())
-    workers.length = 0
-    pending.clear()
-  }
-
-  return { search, destroy, workerCount: workers.length }
-}
diff --git a/src/worker/wasmVanityWorker.ts b/src/worker/wasmVanityWorker.ts
deleted file mode 100644
index 845d6c3..0000000
--- a/src/worker/wasmVanityWorker.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import {
-  __initializeContext,
-  pointFromScalar,
-  pointAdd,
-  privateAdd
-} from 'tiny-secp256k1'
-import { keccak_256 } from '@noble/hashes/sha3.js'
-import { firstContractAddressFromWalletHex } from '../wallet/ethAddress'
-import type { SearchTarget } from '../searchTarget'
-
-/**
- * WASM-accelerated vanity address worker.
- *
- * Uses tiny-secp256k1 (Rust → WASM) for EC point operations,
- * which is significantly faster than pure-JS @noble/secp256k1 BigInt math.
- *
- * Initialization is deferred until the first 'init' message to avoid
- * multiple workers all calling __initializeContext() simultaneously
- * (which can hang the browser).
- */
-
-type WorkerMessage =
-  | { type: 'init' }
-  | { type: 'search'; id: number; batchSize: number; prefixLower: string; suffixLower: string; target: SearchTarget }
-
-type WorkerResult =
-  | { type: 'ready' }
-  | { type: 'init-failed'; error: string }
-  | { type: 'result'; id: number; checked: number; found: { privHex: string; address: string } | null }
-
-// Precomputed hex lookup table
-const hexTable: string[] = new Array(256)
-for (let i = 0; i < 256; i++) {
-  hexTable[i] = i.toString(16).padStart(2, '0')
-}
-
-let initialized = false
-let G_UNCOMPRESSED: Uint8Array
-const ONE = new Uint8Array(32)
-ONE[31] = 1
-
-function pubkeyToAddress(pubkey64: Uint8Array): string {
-  const hash = keccak_256(pubkey64)
-  let addr = ''
-  for (let i = 12; i < 32; i++) {
-    addr += hexTable[hash[i]]
-  }
-  return addr
-}
-
-function bytesToHex(bytes: Uint8Array): string {
-  let out = ''
-  for (let i = 0; i < bytes.length; i++) {
-    out += hexTable[bytes[i]]
-  }
-  return out
-}
-
-function generateRandomKey(): Uint8Array {
-  const key = new Uint8Array(32)
-  crypto.getRandomValues(key)
-  let allZero = true
-  for (let i = 0; i < 32; i++) {
-    if (key[i] !== 0) { allZero = false; break }
-  }
-  if (allZero) key[31] = 1
-  return key
-}
-
-self.onmessage = (e: MessageEvent<WorkerMessage>) => {
-  const msg = e.data
-
-  if (msg.type === 'init') {
-    try {
-      __initializeContext()
-      G_UNCOMPRESSED = pointFromScalar(ONE, false)!
-      initialized = true
-      self.postMessage({ type: 'ready' } as WorkerResult)
-    } catch (err: any) {
-      self.postMessage({ type: 'init-failed', error: err?.message || 'unknown' } as WorkerResult)
-    }
-    return
-  }
-
-  if (msg.type !== 'search' || !initialized) return
-
-  const { id, batchSize, prefixLower, suffixLower } = msg
-  const searchTarget: SearchTarget = msg.target === 'first-contract' ? 'first-contract' : 'wallet'
-
-  let privKey = generateRandomKey()
-  let pubKey = pointFromScalar(privKey, false)
-  if (!pubKey) {
-    privKey = generateRandomKey()
-    pubKey = pointFromScalar(privKey, false)!
-  }
-
-  for (let i = 0; i < batchSize; i++) {
-    const pub64 = pubKey.subarray(1)
-    const walletAddr = pubkeyToAddress(pub64)
-    const targetAddr = searchTarget === 'first-contract'
-      ? firstContractAddressFromWalletHex(walletAddr)
-      : walletAddr
-
-    if (targetAddr.startsWith(prefixLower) && targetAddr.endsWith(suffixLower)) {
-      const verifyPub = pointFromScalar(privKey, false)
-      if (verifyPub) {
-        const verifyWalletAddr = pubkeyToAddress(verifyPub.subarray(1))
-        const verifyTargetAddr = searchTarget === 'first-contract'
-          ? firstContractAddressFromWalletHex(verifyWalletAddr)
-          : verifyWalletAddr
-        if (verifyTargetAddr === targetAddr) {
-          const result: WorkerResult = {
-            type: 'result',
-            id,
-            checked: i + 1,
-            found: { privHex: bytesToHex(privKey), address: '0x' + targetAddr }
-          }
-          self.postMessage(result)
-          return
-        }
-      }
-    }
-
-    const nextPub = pointAdd(pubKey, G_UNCOMPRESSED, false)
-    const nextPriv = privateAdd(privKey, ONE)
-
-    if (!nextPub || !nextPriv) {
-      privKey = generateRandomKey()
-      pubKey = pointFromScalar(privKey, false)!
-      continue
-    }
-
-    pubKey = nextPub
-    privKey = nextPriv
-  }
-
-  const result: WorkerResult = {
-    type: 'result',
-    id,
-    checked: batchSize,
-    found: null
-  }
-  self.postMessage(result)
-}
diff --git a/tests/e2e/app.spec.ts b/tests/e2e/app.spec.ts
new file mode 100644
index 0000000..04b8e91
--- /dev/null
+++ b/tests/e2e/app.spec.ts
@@ -0,0 +1,36 @@
+import { expect, test } from '@playwright/test'
+
+test.describe('Vanity SOL GPU app', () => {
+  test('renders and validates oversized target', async ({ page }) => {
+    await page.goto('/')
+
+    await expect(page.getByText('Vanity SOL GPU')).toBeVisible()
+
+    await page.locator('#prefix').fill('A'.repeat(44))
+    await page.locator('#suffix').fill('B')
+
+    await expect(page.locator('#preview-addr')).toContainText('Prefix + suffix must be 44 chars or less')
+    await expect(page.locator('#stat-eta')).toContainText('Invalid')
+  })
+
+  test('generates a vanity match and reveals the secret key', async ({ page }) => {
+    await page.goto('/')
+
+    await page.locator('#prefix').fill('')
+    await page.locator('#suffix').fill('1')
+    await page.locator('#btn-generate').click()
+
+    await expect(page.locator('#btn-generate')).toContainText('Stop')
+    await expect(page.locator('#subtitle')).toContainText('Running on CPU')
+
+    await expect(page.locator('#result')).toHaveClass(/visible/, { timeout: 60_000 })
+    await expect(page.locator('#subtitle')).toContainText('Match found')
+
+    await page.locator('#btn-reveal').click()
+    const revealed = await page.locator('#pk-text').textContent()
+
+    expect(revealed).toBeTruthy()
+    expect(revealed?.includes('•')).toBe(false)
+    expect((revealed ?? '').length).toBeGreaterThan(80)
+  })
+})
diff --git a/tests/unit/keys.test.ts b/tests/unit/keys.test.ts
new file mode 100644
index 0000000..bad8ead
--- /dev/null
+++ b/tests/unit/keys.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from 'vitest'
+import { base58 } from '@scure/base'
+import { keypairArrayFromPriv, secretKeyBase58FromPriv } from '../../src/wallet/keypairJson'
+import { privateKeyToPublicKey32, privateKeyToSecretKey64, type PrivKey32 } from '../../src/wallet/keys'
+
+function fixedPriv(): PrivKey32 {
+  const priv = new Uint8Array(32)
+  for (let i = 0; i < 32; i++) priv[i] = i + 1
+  return priv as PrivKey32
+}
+
+describe('keys', () => {
+  it('derives public key and 64-byte secret key from a private key seed', () => {
+    const priv = fixedPriv()
+    const publicKey = privateKeyToPublicKey32(priv)
+    const secretKey = privateKeyToSecretKey64(priv)
+
+    expect(publicKey).toHaveLength(32)
+    expect(secretKey).toHaveLength(64)
+    expect(Array.from(secretKey.slice(0, 32))).toEqual(Array.from(priv))
+    expect(Array.from(secretKey.slice(32))).toEqual(Array.from(publicKey))
+  })
+
+  it('exports keypair formats consistently', () => {
+    const priv = fixedPriv()
+    const jsonArray = keypairArrayFromPriv(priv)
+    const base58Secret = secretKeyBase58FromPriv(priv)
+
+    expect(jsonArray).toHaveLength(64)
+    expect(base58.decode(base58Secret)).toEqual(new Uint8Array(jsonArray))
+  })
+})
diff --git a/tests/unit/solanaAddress.test.ts b/tests/unit/solanaAddress.test.ts
new file mode 100644
index 0000000..127f009
--- /dev/null
+++ b/tests/unit/solanaAddress.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from 'vitest'
+import {
+  bytesToBase58,
+  hasCaseInsensitiveVariant,
+  matchesVanityTarget,
+  sanitizeBase58Input,
+} from '../../src/wallet/solanaAddress'
+
+describe('solanaAddress', () => {
+  it('sanitizes to valid Base58 characters with max length', () => {
+    expect(sanitizeBase58Input('  0OIlabcXYZ123  ')).toBe('abcXYZ123')
+    expect(sanitizeBase58Input('abcd', 2)).toBe('ab')
+  })
+
+  it('matches vanity targets with and without case sensitivity', () => {
+    const address = 'AbCdEF123xyZ'
+
+    expect(matchesVanityTarget(address, 'AbC', 'xyZ', true)).toBe(true)
+    expect(matchesVanityTarget(address, 'abc', 'xyz', true)).toBe(false)
+    expect(matchesVanityTarget(address, 'abc', 'xyz', false)).toBe(true)
+  })
+
+  it('detects case-insensitive variants only when both variants are in Base58 alphabet', () => {
+    expect(hasCaseInsensitiveVariant('Z')).toBe(true)
+    expect(hasCaseInsensitiveVariant('b')).toBe(true)
+    expect(hasCaseInsensitiveVariant('o')).toBe(false)
+    expect(hasCaseInsensitiveVariant('0')).toBe(false)
+  })
+
+  it('encodes bytes to Base58 known values', () => {
+    expect(bytesToBase58(new Uint8Array([0]))).toBe('1')
+    expect(bytesToBase58(new Uint8Array([1]))).toBe('2')
+  })
+})
diff --git a/vite.config.ts b/vite.config.ts
index 428d664..e008689 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,20 +1,10 @@
 import { defineConfig } from 'vite'
-import wasm from 'vite-plugin-wasm'
-import topLevelAwait from 'vite-plugin-top-level-await'
 
 export default defineConfig({
-  plugins: [
-    wasm(),
-    topLevelAwait()
-  ],
   build: {
     target: 'esnext'
   },
   worker: {
-    plugins: () => [
-      wasm(),
-      topLevelAwait()
-    ],
     format: 'es'
   }
 })
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 0000000..e190e00
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    environment: 'node',
+    include: ['tests/unit/**/*.test.ts'],
+    globals: false,
+  },
+})