style: copy

deps(rust)(deps): bump the rust-dependencies group in /src-tauri with 6 updates

.github/workflows/dependabot-automerge.yml

@@ -73,7 +73,7 @@ jobs:
           compat-lookup: true
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Auto-merge minor and patch updates
-        uses: ridedott/merge-me-action@d288b479e76cb993344ca8b5e0fcaa7d6e667eed #v2.10.123
+        uses: ridedott/merge-me-action@f96a67511b4be051e77760230e6a3fb9cb7b1903 #v2.10.124
         with:
           GITHUB_TOKEN: ${{ secrets.SECRET_DEPENDABOT_GITHUB_TOKEN }}
           MERGE_METHOD: SQUASH

.github/workflows/greetings.yml

@@ -1,6 +1,10 @@
 name: Greetings
 
-on: [pull_request_target, issues]
+on:
+  pull_request:
+    types: [opened]
+  issues:
+    types: [opened]
 
 jobs:
   greeting:
@@ -9,8 +13,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/first-interaction@2d4393e6bc0e2efb2e48fba7e06819c3bf61ffc9 #v2.0.0
+      - uses: actions/first-interaction@2d4393e6bc0e2efb2e48fba7e06819c3bf61ffc9 # v2.0.0
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: "Thank you for your first issue ❤️ If it's a feature request, please make sure it's clear what you want, why you want it, and how important it is to you. If you posted a bug report, please make sure it includes as much detail as possible."
           pr-message: "Welcome to the community and thank you for your first contribution ❤️ A human will review your PR shortly. Make sure that the pipelines are green, so that the PR is considered ready for a review and could be merged."

.github/workflows/issue-validation.yml

@@ -5,6 +5,7 @@ on:
     types: [opened]
 
 permissions:
+  contents: read
   issues: write
   models: read
 
@@ -48,7 +49,7 @@ jobs:
 
       - name: Validate issue with AI
         id: validate
-        uses: actions/ai-inference@9693b137b6566bb66055a713613bf4f0493701eb # v1.2.3
+        uses: actions/ai-inference@b81b2afb8390ee6839b494a404766bef6493c7d9 # v1.2.8
         with:
           prompt-file: issue_analysis.txt
           system-prompt: |
@@ -90,17 +91,25 @@ jobs:
             ```
 
             Be constructive and helpful in your feedback. If the issue is incomplete, provide specific guidance on what's needed.
-          model: gpt-4o
+            model: openai/gpt-4o
 
       - name: Parse validation result and take action
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Get the AI response
-          VALIDATION_RESULT='${{ steps.validate.outputs.response }}'
+          # Prefer reading from the response file to avoid output truncation
+          RESPONSE_FILE='${{ steps.validate.outputs.response-file }}'
+          if [ -n "$RESPONSE_FILE" ] && [ -f "$RESPONSE_FILE" ]; then
+            RAW_OUTPUT=$(cat "$RESPONSE_FILE")
+          else
+            RAW_OUTPUT='${{ steps.validate.outputs.response }}'
+          fi
 
-          # Extract JSON from the response (handle potential markdown formatting)
-          JSON_RESULT=$(echo "$VALIDATION_RESULT" | sed -n '/```json/,/```/p' | sed '1d;$d' || echo "$VALIDATION_RESULT")
+          # Extract JSON if wrapped in markdown code fences; otherwise use raw
+          JSON_RESULT=$(printf "%s" "$RAW_OUTPUT" | sed -n '/```json/,/```/p' | sed '1d;$d')
+          if [ -z "$JSON_RESULT" ]; then
+            JSON_RESULT="$RAW_OUTPUT"
+          fi
 
           # Parse JSON fields
           IS_VALID=$(echo "$JSON_RESULT" | jq -r '.is_valid // false')
@@ -156,7 +165,24 @@ jobs:
             echo "✅ Validation comment posted and 'needs-info' label added"
           else
             echo "✅ Issue contains sufficient information"
-            
+
+            # Prepare a summary comment even when valid
+            cat > comment.md << EOF
+          ## 🤖 Issue Validation
+
+          **Issue Type Detected:** \`$ISSUE_TYPE\`
+
+          **Assessment:** $ASSESSMENT
+
+          $( [ -n "$SUGGESTIONS" ] && echo "### 💡 Suggestions:" && echo "$SUGGESTIONS" )
+
+          ---
+          *This validation was performed automatically to help triage issues.*
+          EOF
+
+            # Post the summary comment
+            gh issue comment ${{ github.event.issue.number }} --body-file comment.md
+
             # Add appropriate labels based on issue type
             case "$ISSUE_TYPE" in
               "bug_report")

.github/workflows/lint-rs.yml

@@ -30,9 +30,8 @@ permissions:
 jobs:
   build:
     strategy:
-      fail-fast: true
       matrix:
-        os: [macos-latest]
+        os: [macos-latest, ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 
@@ -87,9 +86,9 @@ jobs:
           fi
 
       # TODO: replace with an integration test that fetches everything from rust
-      - name: Download Camoufox for testing
-        run: npx camoufox-js fetch
-        continue-on-error: true
+      # - name: Download Camoufox for testing
+      #   run: npx camoufox-js fetch
+      #   continue-on-error: true
 
       - name: Copy nodecar binary to Tauri binaries
         shell: bash

.github/workflows/release-notes-generator.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: Generate release notes with AI
         id: generate-notes
-        uses: actions/ai-inference@9693b137b6566bb66055a713613bf4f0493701eb # v1.2.3
+        uses: actions/ai-inference@b81b2afb8390ee6839b494a404766bef6493c7d9 # v1.2.8
         with:
           prompt-file: commits.txt
           system-prompt: |

.github/workflows/release.yml

@@ -67,37 +67,37 @@ jobs:
       matrix:
         include:
           - platform: "macos-latest"
-            args: "--target aarch64-apple-darwin"
+            args: "--target aarch64-apple-darwin --verbose"
             arch: "aarch64"
             target: "aarch64-apple-darwin"
             pkg_target: "latest-macos-arm64"
             nodecar_script: "build:mac-aarch64"
           - platform: "macos-latest"
-            args: "--target x86_64-apple-darwin"
+            args: "--target x86_64-apple-darwin --verbose"
             arch: "x86_64"
             target: "x86_64-apple-darwin"
             pkg_target: "latest-macos-x64"
             nodecar_script: "build:mac-x86_64"
           - platform: "ubuntu-22.04"
-            args: "--target x86_64-unknown-linux-gnu"
+            args: "--target x86_64-unknown-linux-gnu --verbose"
             arch: "x86_64"
             target: "x86_64-unknown-linux-gnu"
             pkg_target: "latest-linux-x64"
             nodecar_script: "build:linux-x64"
           - platform: "ubuntu-22.04-arm"
-            args: "--target aarch64-unknown-linux-gnu"
+            args: "--target aarch64-unknown-linux-gnu --verbose"
             arch: "aarch64"
             target: "aarch64-unknown-linux-gnu"
             pkg_target: "latest-linux-arm64"
             nodecar_script: "build:linux-arm64"
           # - platform: "windows-latest"
-          #   args: "--target x86_64-pc-windows-msvc"
+          #   args: "--target x86_64-pc-windows-msvc --verbose"
           #   arch: "x86_64"
           #   target: "x86_64-pc-windows-msvc"
           #   pkg_target: "latest-win-x64"
           #   nodecar_script: "build:win-x64"
           # - platform: "windows-11-arm"
-          #   args: "--target aarch64-pc-windows-msvc"
+          #   args: "--target aarch64-pc-windows-msvc --verbose"
           #   arch: "aarch64"
           #   target: "aarch64-pc-windows-msvc"
           #   pkg_target: "latest-win-arm64"
@@ -154,9 +154,9 @@ jobs:
             cp nodecar/nodecar-bin src-tauri/binaries/nodecar-${{ matrix.target }}
           fi
 
-      - name: Download Camoufox for testing
-        run: npx camoufox-js fetch
-        continue-on-error: true
+      # - name: Download Camoufox for testing
+      #   run: npx camoufox-js fetch
+      #   continue-on-error: true
 
       - name: Build frontend
         run: pnpm build
@@ -179,4 +179,3 @@ jobs:
         with:
           branch: main
           commit_message: "docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]"
-          file_pattern: CHANGELOG.md

.github/workflows/rolling-release.yml

@@ -66,37 +66,37 @@ jobs:
       matrix:
         include:
           - platform: "macos-latest"
-            args: "--target aarch64-apple-darwin"
+            args: "--target aarch64-apple-darwin --verbose"
             arch: "aarch64"
             target: "aarch64-apple-darwin"
             pkg_target: "latest-macos-arm64"
             nodecar_script: "build:mac-aarch64"
           - platform: "macos-latest"
-            args: "--target x86_64-apple-darwin"
+            args: "--target x86_64-apple-darwin --verbose"
             arch: "x86_64"
             target: "x86_64-apple-darwin"
             pkg_target: "latest-macos-x64"
             nodecar_script: "build:mac-x86_64"
           - platform: "ubuntu-22.04"
-            args: "--target x86_64-unknown-linux-gnu"
+            args: "--target x86_64-unknown-linux-gnu --verbose"
             arch: "x86_64"
             target: "x86_64-unknown-linux-gnu"
             pkg_target: "latest-linux-x64"
             nodecar_script: "build:linux-x64"
           - platform: "ubuntu-22.04-arm"
-            args: "--target aarch64-unknown-linux-gnu"
+            args: "--target aarch64-unknown-linux-gnu --verbose"
             arch: "aarch64"
             target: "aarch64-unknown-linux-gnu"
             pkg_target: "latest-linux-arm64"
             nodecar_script: "build:linux-arm64"
           - platform: "windows-latest"
-            args: "--target x86_64-pc-windows-msvc"
+            args: "--target x86_64-pc-windows-msvc --verbose"
             arch: "x86_64"
             target: "x86_64-pc-windows-msvc"
             pkg_target: "latest-win-x64"
             nodecar_script: "build:win-x64"
           # - platform: "windows-11-arm"
-          #   args: "--target aarch64-pc-windows-msvc"
+          #   args: "--target aarch64-pc-windows-msvc --verbose"
           #   arch: "aarch64"
           #   target: "aarch64-pc-windows-msvc"
           #   pkg_target: "latest-win-arm64"
@@ -153,9 +153,9 @@ jobs:
             cp nodecar/nodecar-bin src-tauri/binaries/nodecar-${{ matrix.target }}
           fi
 
-      - name: Download Camoufox for testing
-        run: npx camoufox-js fetch
-        continue-on-error: true
+      # - name: Download Camoufox for testing
+      #   run: npx camoufox-js fetch
+      #   continue-on-error: true
 
       - name: Build frontend
         run: pnpm build

.github/workflows/spellcheck.yml

@@ -23,4 +23,4 @@ jobs:
       - name: Checkout Actions Repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
       - name: Spell Check Repo
-        uses: crate-ci/typos@392b78fe18a52790c53f42456e46124f77346842 #v1.34.0
+        uses: crate-ci/typos@52bd719c2c91f9d676e2aa359fc8e0db8925e6d8 #v1.35.3

.vscode/settings.json

@@ -25,7 +25,9 @@
     "cmdk",
     "codegen",
     "codesign",
+    "commitish",
     "CTYPE",
+    "daijro",
     "dataclasses",
     "datareporting",
     "datas",
@@ -36,6 +38,7 @@
     "doesn",
     "domcontentloaded",
     "donutbrowser",
+    "doorhanger",
     "dpkg",
     "dtolnay",
     "dyld",
@@ -44,6 +47,7 @@
     "esac",
     "esbuild",
     "etree",
+    "flate",
     "frontmost",
     "geoip",
     "getcwd",
@@ -78,6 +82,7 @@
     "libxdo",
     "localtime",
     "lxml",
+    "lzma",
     "mmdb",
     "mountpoint",
     "msiexec",
@@ -104,6 +109,7 @@
     "pathex",
     "pathlib",
     "peerconnection",
+    "pids",
     "pixbuf",
     "plasmohq",
     "platformdirs",
@@ -175,6 +181,7 @@
     "xfconf",
     "xsettings",
     "zhom",
+    "zipball",
     "zoneinfo"
   ]
 }

README.md

@@ -37,7 +37,7 @@
 - Safely use multiple accounts on one device by using anti-detect browser profiles, powered by [Camoufox](https://camoufox.com)
 - Proxy support with basic auth for all browsers except for TOR Browser
 - Import profiles from your existing browsers
-- Automatic updates both for browsers and for the app itself
+- Automatic updates for browsers
 - Set Donut Browser as your default browser to control in which profile to open links
 
 ## Download
@@ -84,8 +84,8 @@ Have questions or want to contribute? We'd love to hear from you!
 
 <!-- readme: collaborators,contributors -start -->
 <table>
- <tbody>
-  <tr>
+	<tbody>
+		<tr>
             <td align="center">
                 <a href="https://github.com/zhom">
                     <img src="https://avatars.githubusercontent.com/u/2717306?v=4" width="100;" alt="zhom"/>
@@ -93,8 +93,8 @@ Have questions or want to contribute? We'd love to hear from you!
                     <sub><b>zhom</b></sub>
                 </a>
             </td>
-  </tr>
- <tbody>
+		</tr>
+	<tbody>
 </table>
 <!-- readme: collaborators,contributors -end -->
 

nodecar/package.json

@@ -21,16 +21,16 @@
   "author": "",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@types/node": "^24.2.0",
+    "@types/node": "^24.2.1",
     "commander": "^14.0.0",
-    "donutbrowser-camoufox-js": "^0.6.4",
+    "donutbrowser-camoufox-js": "^0.6.6",
     "dotenv": "^17.2.1",
     "fingerprint-generator": "^2.1.69",
     "get-port": "^7.1.0",
     "nodemon": "^3.1.10",
     "playwright-core": "^1.54.2",
     "proxy-chain": "^2.5.9",
-    "tmp": "^0.2.4",
+    "tmp": "^0.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.2"
   },

nodecar/src/camoufox-launcher.ts

@@ -344,6 +344,8 @@ interface GenerateConfigOptions {
   proxy?: string;
   maxWidth?: number;
   maxHeight?: number;
+  minWidth?: number;
+  minHeight?: number;
   geoip?: string | boolean;
   blockImages?: boolean;
   blockWebrtc?: boolean;
@@ -411,11 +413,21 @@ export async function generateCamoufoxConfig(
     } else {
       // Use individual options to build configuration
 
-      if (options.maxWidth && options.maxHeight) {
-        launchOpts.screen = {
-          maxWidth: options.maxWidth,
-          maxHeight: options.maxHeight,
-        };
+      // Build screen configuration with min/max dimensions
+      const screen: {
+        minWidth?: number;
+        maxWidth?: number;
+        minHeight?: number;
+        maxHeight?: number;
+      } = {};
+
+      if (options.minWidth) screen.minWidth = options.minWidth;
+      if (options.maxWidth) screen.maxWidth = options.maxWidth;
+      if (options.minHeight) screen.minHeight = options.minHeight;
+      if (options.maxHeight) screen.maxHeight = options.maxHeight;
+
+      if (Object.keys(screen).length > 0) {
+        launchOpts.screen = screen;
       }
     }
 

nodecar/src/camoufox-worker.ts

@@ -158,6 +158,15 @@ export async function runCamoufoxWorker(id: string): Promise<void> {
         env: finalEnv,
       };
 
+      // If a custom executable path was provided, ensure Playwright uses it
+      if (
+        (camoufoxOptions as any).executable_path &&
+        typeof (camoufoxOptions as any).executable_path === "string"
+      ) {
+        finalOptions.executablePath = (camoufoxOptions as any)
+          .executable_path as string;
+      }
+
       // Only add proxy if it exists and is valid
       if (camoufoxOptions.proxy) {
         try {

nodecar/src/index.ts

@@ -57,10 +57,8 @@ program
 
         // Build upstream URL from individual components if provided
         if (options.host && options.proxyPort && options.type) {
-          const protocol =
-            options.type === "socks4" || options.type === "socks5"
-              ? options.type
-              : "http";
+          // Preserve provided scheme (http, https, socks4, socks5)
+          const protocol = String(options.type).toLowerCase();
           const auth =
             options.username && options.password
               ? `${encodeURIComponent(options.username)}:${encodeURIComponent(
@@ -165,6 +163,8 @@ program
   .option("--proxy <proxy>", "proxy URL for config generation")
   .option("--max-width <width>", "maximum screen width", parseInt)
   .option("--max-height <height>", "maximum screen height", parseInt)
+  .option("--min-width <width>", "minimum screen width", parseInt)
+  .option("--min-height <height>", "minimum screen height", parseInt)
   .option("--geoip", "enable geoip")
   .option("--block-images", "block images")
   .option("--block-webrtc", "block WebRTC")
@@ -241,6 +241,16 @@ program
               ",",
             ) as "UBO"[];
 
+          // Executable path: forward through to camoufox-js and ultimately Playwright
+          if (
+            options.executablePath &&
+            typeof options.executablePath === "string"
+          ) {
+            // camoufox-js uses snake_case for this option
+            (camoufoxOptions as any).executable_path =
+              options.executablePath as string;
+          }
+
           // Screen and window
           const screen: {
             minWidth?: number;
@@ -384,6 +394,14 @@ program
               typeof options.maxHeight === "number"
                 ? options.maxHeight
                 : undefined,
+            minWidth:
+              typeof options.minWidth === "number"
+                ? options.minWidth
+                : undefined,
+            minHeight:
+              typeof options.minHeight === "number"
+                ? options.minHeight
+                : undefined,
             geoip: Boolean(options.geoip),
             blockImages:
               typeof options.blockImages === "boolean"

package.json

@@ -2,7 +2,7 @@
   "name": "donutbrowser",
   "private": true,
   "license": "AGPL-3.0",
-  "version": "0.8.2",
+  "version": "0.9.2",
   "type": "module",
   "scripts": {
     "dev": "next dev --turbopack",
@@ -46,6 +46,7 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
+    "motion": "^12.23.12",
     "next": "^15.4.6",
     "next-themes": "^0.4.6",
     "react": "^19.1.1",
@@ -56,23 +57,23 @@
     "tauri-plugin-macos-permissions-api": "^2.3.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.1.3",
+    "@biomejs/biome": "2.1.4",
     "@tailwindcss/postcss": "^4.1.11",
     "@tauri-apps/cli": "^2.7.1",
-    "@types/node": "^24.2.0",
+    "@types/node": "^24.2.1",
     "@types/react": "^19.1.9",
     "@types/react-dom": "^19.1.7",
-    "@vitejs/plugin-react": "^4.7.0",
+    "@vitejs/plugin-react": "^5.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.1.4",
+    "lint-staged": "^16.1.5",
     "tailwindcss": "^4.1.11",
     "ts-unused-exports": "^11.0.1",
     "tw-animate-css": "^1.3.6",
     "typescript": "~5.9.2"
   },
-  "packageManager": "pnpm@10.13.1",
+  "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
   "lint-staged": {
-    "**/*.{js,jsx,ts,tsx,json,css,md}": [
+    "**/*.{js,jsx,ts,tsx,json,css}": [
       "biome check --fix"
     ],
     "src-tauri/**/*.rs": [

pnpm-lock.yaml

@@ -74,6 +74,9 @@ importers:
       cmdk:
         specifier: ^1.1.1
         version: 1.1.1(@types/react-dom@19.1.7(@types/react@19.1.9))(@types/react@19.1.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      motion:
+        specifier: ^12.23.12
+        version: 12.23.12(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
       next:
         specifier: ^15.4.6
         version: 15.4.6(@babel/core@7.28.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
@@ -100,8 +103,8 @@ importers:
         version: 2.3.0
     devDependencies:
       '@biomejs/biome':
-        specifier: 2.1.3
-        version: 2.1.3
+        specifier: 2.1.4
+        version: 2.1.4
       '@tailwindcss/postcss':
         specifier: ^4.1.11
         version: 4.1.11
@@ -109,8 +112,8 @@ importers:
         specifier: ^2.7.1
         version: 2.7.1
       '@types/node':
-        specifier: ^24.2.0
-        version: 24.2.0
+        specifier: ^24.2.1
+        version: 24.2.1
       '@types/react':
         specifier: ^19.1.9
         version: 19.1.9
@@ -118,14 +121,14 @@ importers:
         specifier: ^19.1.7
         version: 19.1.7(@types/react@19.1.9)
       '@vitejs/plugin-react':
-        specifier: ^4.7.0
-        version: 4.7.0(vite@7.0.6(@types/node@24.2.0)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1))
+        specifier: ^5.0.0
+        version: 5.0.0(vite@7.0.6(@types/node@24.2.1)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1))
       husky:
         specifier: ^9.1.7
         version: 9.1.7
       lint-staged:
-        specifier: ^16.1.4
-        version: 16.1.4
+        specifier: ^16.1.5
+        version: 16.1.5
       tailwindcss:
         specifier: ^4.1.11
         version: 4.1.11
@@ -142,14 +145,14 @@ importers:
   nodecar:
     dependencies:
       '@types/node':
-        specifier: ^24.2.0
-        version: 24.2.0
+        specifier: ^24.2.1
+        version: 24.2.1
       commander:
         specifier: ^14.0.0
         version: 14.0.0
       donutbrowser-camoufox-js:
-        specifier: ^0.6.4
-        version: 0.6.4(encoding@0.1.13)(playwright-core@1.54.2)
+        specifier: ^0.6.6
+        version: 0.6.6(encoding@0.1.13)(playwright-core@1.54.2)
       dotenv:
         specifier: ^17.2.1
         version: 17.2.1
@@ -169,11 +172,11 @@ importers:
         specifier: ^2.5.9
         version: 2.5.9
       tmp:
-        specifier: ^0.2.4
-        version: 0.2.4
+        specifier: ^0.2.5
+        version: 0.2.5
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@types/node@24.2.0)(typescript@5.9.2)
+        version: 10.9.2(@types/node@24.2.1)(typescript@5.9.2)
       typescript:
         specifier: ^5.9.2
         version: 5.9.2
@@ -279,55 +282,55 @@ packages:
     resolution: {integrity: sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==}
     engines: {node: '>=6.9.0'}
 
-  '@biomejs/biome@2.1.3':
-    resolution: {integrity: sha512-KE/tegvJIxTkl7gJbGWSgun7G6X/n2M6C35COT6ctYrAy7SiPyNvi6JtoQERVK/VRbttZfgGq96j2bFmhmnH4w==}
+  '@biomejs/biome@2.1.4':
+    resolution: {integrity: sha512-QWlrqyxsU0FCebuMnkvBIkxvPqH89afiJzjMl+z67ybutse590jgeaFdDurE9XYtzpjRGTI1tlUZPGWmbKsElA==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.1.3':
-    resolution: {integrity: sha512-LFLkSWRoSGS1wVUD/BE6Nlt2dSn0ulH3XImzg2O/36BoToJHKXjSxzPEMAqT9QvwVtk7/9AQhZpTneERU9qaXA==}
+  '@biomejs/cli-darwin-arm64@2.1.4':
+    resolution: {integrity: sha512-sCrNENE74I9MV090Wq/9Dg7EhPudx3+5OiSoQOkIe3DLPzFARuL1dOwCWhKCpA3I5RHmbrsbNSRfZwCabwd8Qg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.1.3':
-    resolution: {integrity: sha512-Q/4OTw8P9No9QeowyxswcWdm0n2MsdCwWcc5NcKQQvzwPjwuPdf8dpPPf4r+x0RWKBtl1FLiAUtJvBlri6DnYw==}
+  '@biomejs/cli-darwin-x64@2.1.4':
+    resolution: {integrity: sha512-gOEICJbTCy6iruBywBDcG4X5rHMbqCPs3clh3UQ+hRKlgvJTk4NHWQAyHOXvaLe+AxD1/TNX1jbZeffBJzcrOw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.1.3':
-    resolution: {integrity: sha512-KXouFSBnoxAWZYDQrnNRzZBbt5s9UJkIm40hdvSL9mBxSSoxRFQJbtg1hP3aa8A2SnXyQHxQfpiVeJlczZt76w==}
+  '@biomejs/cli-linux-arm64-musl@2.1.4':
+    resolution: {integrity: sha512-nYr7H0CyAJPaLupFE2cH16KZmRC5Z9PEftiA2vWxk+CsFkPZQ6dBRdcC6RuS+zJlPc/JOd8xw3uCCt9Pv41WvQ==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-arm64@2.1.3':
-    resolution: {integrity: sha512-2hS6LgylRqMFmAZCOFwYrf77QMdUwJp49oe8PX/O8+P2yKZMSpyQTf3Eo5ewnsMFUEmYbPOskafdV1ds1MZMJA==}
+  '@biomejs/cli-linux-arm64@2.1.4':
+    resolution: {integrity: sha512-juhEkdkKR4nbUi5k/KRp1ocGPNWLgFRD4NrHZSveYrD6i98pyvuzmS9yFYgOZa5JhaVqo0HPnci0+YuzSwT2fw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64-musl@2.1.3':
-    resolution: {integrity: sha512-KaLAxnROouzIWtl6a0Y88r/4hW5oDUJTIqQorOTVQITaKQsKjZX4XCUmHIhdEk8zMnaiLZzRTAwk1yIAl+mIew==}
+  '@biomejs/cli-linux-x64-musl@2.1.4':
+    resolution: {integrity: sha512-lvwvb2SQQHctHUKvBKptR6PLFCM7JfRjpCCrDaTmvB7EeZ5/dQJPhTYBf36BE/B4CRWR2ZiBLRYhK7hhXBCZAg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-linux-x64@2.1.3':
-    resolution: {integrity: sha512-NxlSCBhLvQtWGagEztfAZ4WcE1AkMTntZV65ZvR+J9jp06+EtOYEBPQndA70ZGhHbEDG57bR6uNvqkd1WrEYVA==}
+  '@biomejs/cli-linux-x64@2.1.4':
+    resolution: {integrity: sha512-Eoy9ycbhpJVYuR+LskV9s3uyaIkp89+qqgqhGQsWnp/I02Uqg2fXFblHJOpGZR8AxdB9ADy87oFVxn9MpFKUrw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
 
-  '@biomejs/cli-win32-arm64@2.1.3':
-    resolution: {integrity: sha512-V9CUZCtWH4u0YwyCYbQ3W5F4ZGPWp2C2TYcsiWFNNyRfmOW1j/TY/jAurl33SaRjgZPO5UUhGyr9m6BN9t84NQ==}
+  '@biomejs/cli-win32-arm64@2.1.4':
+    resolution: {integrity: sha512-3WRYte7orvyi6TRfIZkDN9Jzoogbv+gSvR+b9VOXUg1We1XrjBg6WljADeVEaKTvOcpVdH0a90TwyOQ6ue4fGw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.1.3':
-    resolution: {integrity: sha512-dxy599q6lgp8ANPpR8sDMscwdp9oOumEsVXuVCVT9N2vAho8uYXlCz53JhxX6LtJOXaE73qzgkGQ7QqvFlMC0g==}
+  '@biomejs/cli-win32-x64@2.1.4':
+    resolution: {integrity: sha512-tBc+W7anBPSFXGAoQW+f/+svkpt8/uXfRwDzN1DvnatkRMt16KIYpEi/iw8u9GahJlFv98kgHcIrSsZHZTR0sw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -1135,8 +1138,8 @@ packages:
   '@radix-ui/rect@1.1.1':
     resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
 
-  '@rolldown/pluginutils@1.0.0-beta.27':
-    resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}
+  '@rolldown/pluginutils@1.0.0-beta.30':
+    resolution: {integrity: sha512-whXaSoNUFiyDAjkUF8OBpOm77Szdbk5lGNqFe6CbVbJFrhCCPinCbRA3NjawwlNHla1No7xvXXh+CpSxnPfUEw==}
 
   '@rollup/rollup-android-arm-eabi@4.46.2':
     resolution: {integrity: sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==}
@@ -1467,8 +1470,8 @@ packages:
   '@types/node-fetch@2.6.13':
     resolution: {integrity: sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==}
 
-  '@types/node@24.2.0':
-    resolution: {integrity: sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==}
+  '@types/node@24.2.1':
+    resolution: {integrity: sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==}
 
   '@types/react-dom@19.1.7':
     resolution: {integrity: sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw==}
@@ -1481,9 +1484,9 @@ packages:
   '@types/tmp@0.2.6':
     resolution: {integrity: sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==}
 
-  '@vitejs/plugin-react@4.7.0':
-    resolution: {integrity: sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  '@vitejs/plugin-react@5.0.0':
+    resolution: {integrity: sha512-Jx9JfsTa05bYkS9xo0hkofp2dCmp1blrKjw9JONs5BTHOvJCgLbaPSuZLGSVJW6u2qe0tc4eevY0+gSNNi0YCw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
@@ -1594,8 +1597,8 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  browserslist@4.25.1:
-    resolution: {integrity: sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==}
+  browserslist@4.25.2:
+    resolution: {integrity: sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -1614,8 +1617,8 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  caniuse-lite@1.0.30001731:
-    resolution: {integrity: sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==}
+  caniuse-lite@1.0.30001734:
+    resolution: {integrity: sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==}
 
   chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
@@ -1757,8 +1760,8 @@ packages:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
 
-  donutbrowser-camoufox-js@0.6.4:
-    resolution: {integrity: sha512-PAH6iCZHuMtEfwOrJmucF54APeTuMUhZgJySz+OrGaRQqg992+Xdk6xRChjtoRJv9H5E/mjoL4mYPCK7jB88oQ==}
+  donutbrowser-camoufox-js@0.6.6:
+    resolution: {integrity: sha512-kuZgwp6hh9G3lBPkpAgByun/tjMRPJClwMPgVmRv4Xpc9tM4qRXjM4aS5xdy52pPWNYdP4CUAKASdXr2y5/NAg==}
     hasBin: true
     peerDependencies:
       playwright-core: '*'
@@ -1775,8 +1778,8 @@ packages:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
 
-  electron-to-chromium@1.5.194:
-    resolution: {integrity: sha512-SdnWJwSUot04UR51I2oPD8kuP2VI37/CADR1OHsFOUzZIvfWJBO6q11k5P/uKNyTT3cdOsnyjkrZ+DDShqYqJA==}
+  electron-to-chromium@1.5.199:
+    resolution: {integrity: sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==}
 
   emoji-regex@10.4.0:
     resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
@@ -1860,6 +1863,20 @@ packages:
     resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
     engines: {node: '>= 6'}
 
+  framer-motion@12.23.12:
+    resolution: {integrity: sha512-6e78rdVtnBvlEVgu6eFEAgG9v3wLnYEboM8I5O5EXvfKC8gxGQB8wXJdhkMy10iVcn05jl6CNw7/HTsTCfwcWg==}
+    peerDependencies:
+      '@emotion/is-prop-valid': '*'
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/is-prop-valid':
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
@@ -2215,8 +2232,8 @@ packages:
     resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
     engines: {node: '>=14'}
 
-  lint-staged@16.1.4:
-    resolution: {integrity: sha512-xy7rnzQrhTVGKMpv6+bmIA3C0yET31x8OhKBYfvGo0/byeZ6E0BjGARrir3Kg/RhhYHutpsi01+2J5IpfVoueA==}
+  lint-staged@16.1.5:
+    resolution: {integrity: sha512-uAeQQwByI6dfV7wpt/gVqg+jAPaSp8WwOA8kKC/dv1qw14oGpnpAisY65ibGHUGDUv0rYaZ8CAJZ/1U8hUvC2A==}
     engines: {node: '>=20.17'}
     hasBin: true
 
@@ -2343,6 +2360,26 @@ packages:
     resolution: {integrity: sha512-DXO4L9W+08T+A7h5+xdT32l7IMot8z7WOH+7C1Maol571PnktQ8un7Ni4CyPFp4H+vht/FDA5/tpjRvWMFQDMw==}
     engines: {node: '>=10', npm: '>=6'}
 
+  motion-dom@12.23.12:
+    resolution: {integrity: sha512-RcR4fvMCTESQBD/uKQe49D5RUeDOokkGRmz4ceaJKDBgHYtZtntC/s2vLvY38gqGaytinij/yi3hMcWVcEF5Kw==}
+
+  motion-utils@12.23.6:
+    resolution: {integrity: sha512-eAWoPgr4eFEOFfg2WjIsMoqJTW6Z8MTUCgn/GZ3VRpClWBdnbjryiA3ZSNLyxCTmCQx4RmYX6jX1iWHbenUPNQ==}
+
+  motion@12.23.12:
+    resolution: {integrity: sha512-8jCD8uW5GD1csOoqh1WhH1A6j5APHVE15nuBkFeRiMzYBdRwyAHmSP/oXSuW0WJPZRXTFdBoG4hY9TFWNhhwng==}
+    peerDependencies:
+      '@emotion/is-prop-valid': '*'
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/is-prop-valid':
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
@@ -2782,8 +2819,8 @@ packages:
     resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==}
     engines: {node: '>=12.0.0'}
 
-  tmp@0.2.4:
-    resolution: {integrity: sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==}
+  tmp@0.2.5:
+    resolution: {integrity: sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==}
     engines: {node: '>=14.14'}
 
   to-regex-range@5.0.1:
@@ -3026,7 +3063,7 @@ snapshots:
     dependencies:
       '@babel/compat-data': 7.28.0
       '@babel/helper-validator-option': 7.27.1
-      browserslist: 4.25.1
+      browserslist: 4.25.2
       lru-cache: 5.1.1
       semver: 6.3.1
 
@@ -3100,39 +3137,39 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
 
-  '@biomejs/biome@2.1.3':
+  '@biomejs/biome@2.1.4':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.1.3
-      '@biomejs/cli-darwin-x64': 2.1.3
-      '@biomejs/cli-linux-arm64': 2.1.3
-      '@biomejs/cli-linux-arm64-musl': 2.1.3
-      '@biomejs/cli-linux-x64': 2.1.3
-      '@biomejs/cli-linux-x64-musl': 2.1.3
-      '@biomejs/cli-win32-arm64': 2.1.3
-      '@biomejs/cli-win32-x64': 2.1.3
+      '@biomejs/cli-darwin-arm64': 2.1.4
+      '@biomejs/cli-darwin-x64': 2.1.4
+      '@biomejs/cli-linux-arm64': 2.1.4
+      '@biomejs/cli-linux-arm64-musl': 2.1.4
+      '@biomejs/cli-linux-x64': 2.1.4
+      '@biomejs/cli-linux-x64-musl': 2.1.4
+      '@biomejs/cli-win32-arm64': 2.1.4
+      '@biomejs/cli-win32-x64': 2.1.4
 
-  '@biomejs/cli-darwin-arm64@2.1.3':
+  '@biomejs/cli-darwin-arm64@2.1.4':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.1.3':
+  '@biomejs/cli-darwin-x64@2.1.4':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.1.3':
+  '@biomejs/cli-linux-arm64-musl@2.1.4':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.1.3':
+  '@biomejs/cli-linux-arm64@2.1.4':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.1.3':
+  '@biomejs/cli-linux-x64-musl@2.1.4':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.1.3':
+  '@biomejs/cli-linux-x64@2.1.4':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.1.3':
+  '@biomejs/cli-win32-arm64@2.1.4':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.1.3':
+  '@biomejs/cli-win32-x64@2.1.4':
     optional: true
 
   '@cspotcode/source-map-support@0.8.1':
@@ -3826,7 +3863,7 @@ snapshots:
 
   '@radix-ui/rect@1.1.1': {}
 
-  '@rolldown/pluginutils@1.0.0-beta.27': {}
+  '@rolldown/pluginutils@1.0.0-beta.30': {}
 
   '@rollup/rollup-android-arm-eabi@4.46.2':
     optional: true
@@ -4077,10 +4114,10 @@ snapshots:
 
   '@types/node-fetch@2.6.13':
     dependencies:
-      '@types/node': 24.2.0
+      '@types/node': 24.2.1
       form-data: 4.0.4
 
-  '@types/node@24.2.0':
+  '@types/node@24.2.1':
     dependencies:
       undici-types: 7.10.0
 
@@ -4094,15 +4131,15 @@ snapshots:
 
   '@types/tmp@0.2.6': {}
 
-  '@vitejs/plugin-react@4.7.0(vite@7.0.6(@types/node@24.2.0)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1))':
+  '@vitejs/plugin-react@5.0.0(vite@7.0.6(@types/node@24.2.1)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1))':
     dependencies:
       '@babel/core': 7.28.0
       '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.0)
       '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.0)
-      '@rolldown/pluginutils': 1.0.0-beta.27
+      '@rolldown/pluginutils': 1.0.0-beta.30
       '@types/babel__core': 7.20.5
       react-refresh: 0.17.0
-      vite: 7.0.6(@types/node@24.2.0)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1)
+      vite: 7.0.6(@types/node@24.2.1)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -4215,12 +4252,12 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.25.1:
+  browserslist@4.25.2:
     dependencies:
-      caniuse-lite: 1.0.30001731
-      electron-to-chromium: 1.5.194
+      caniuse-lite: 1.0.30001734
+      electron-to-chromium: 1.5.199
       node-releases: 2.0.19
-      update-browserslist-db: 1.1.3(browserslist@4.25.1)
+      update-browserslist-db: 1.1.3(browserslist@4.25.2)
 
   buffer@5.7.1:
     dependencies:
@@ -4258,7 +4295,7 @@ snapshots:
 
   callsites@3.1.0: {}
 
-  caniuse-lite@1.0.30001731: {}
+  caniuse-lite@1.0.30001734: {}
 
   chalk@4.1.2:
     dependencies:
@@ -4386,7 +4423,7 @@ snapshots:
 
   diff@4.0.2: {}
 
-  donutbrowser-camoufox-js@0.6.4(encoding@0.1.13)(playwright-core@1.54.2):
+  donutbrowser-camoufox-js@0.6.6(encoding@0.1.13)(playwright-core@1.54.2):
     dependencies:
       adm-zip: 0.5.16
       commander: 13.1.0
@@ -4417,7 +4454,7 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  electron-to-chromium@1.5.194: {}
+  electron-to-chromium@1.5.199: {}
 
   emoji-regex@10.4.0: {}
 
@@ -4520,6 +4557,15 @@ snapshots:
       hasown: 2.0.2
       mime-types: 2.1.35
 
+  framer-motion@12.23.12(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      motion-dom: 12.23.12
+      motion-utils: 12.23.6
+      tslib: 2.8.1
+    optionalDependencies:
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
   fs-constants@1.0.0: {}
 
   fs-minipass@2.1.0:
@@ -4616,7 +4662,7 @@ snapshots:
 
   header-generator@2.1.69:
     dependencies:
-      browserslist: 4.25.1
+      browserslist: 4.25.2
       generative-bayesian-network: 2.1.69
       ow: 0.28.2
       tslib: 2.8.1
@@ -4825,7 +4871,7 @@ snapshots:
 
   lilconfig@3.1.3: {}
 
-  lint-staged@16.1.4:
+  lint-staged@16.1.5:
     dependencies:
       chalk: 5.5.0
       commander: 14.0.0
@@ -4981,6 +5027,20 @@ snapshots:
 
   mmdb-lib@2.2.1: {}
 
+  motion-dom@12.23.12:
+    dependencies:
+      motion-utils: 12.23.6
+
+  motion-utils@12.23.6: {}
+
+  motion@12.23.12(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      framer-motion: 12.23.12(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      tslib: 2.8.1
+    optionalDependencies:
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
   ms@2.1.3: {}
 
   nano-spawn@1.0.2: {}
@@ -5001,7 +5061,7 @@ snapshots:
     dependencies:
       '@next/env': 15.4.6
       '@swc/helpers': 0.5.15
-      caniuse-lite: 1.0.30001731
+      caniuse-lite: 1.0.30001734
       postcss: 8.4.31
       react: 19.1.1
       react-dom: 19.1.1(react@19.1.1)
@@ -5495,7 +5555,7 @@ snapshots:
       fdir: 6.4.6(picomatch@4.0.3)
       picomatch: 4.0.3
 
-  tmp@0.2.4: {}
+  tmp@0.2.5: {}
 
   to-regex-range@5.0.1:
     dependencies:
@@ -5505,14 +5565,14 @@ snapshots:
 
   tr46@0.0.3: {}
 
-  ts-node@10.9.2(@types/node@24.2.0)(typescript@5.9.2):
+  ts-node@10.9.2(@types/node@24.2.1)(typescript@5.9.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 24.2.0
+      '@types/node': 24.2.1
       acorn: 8.15.0
       acorn-walk: 8.3.4
       arg: 4.1.3
@@ -5572,9 +5632,9 @@ snapshots:
       imurmurhash: 0.1.4
     optional: true
 
-  update-browserslist-db@1.1.3(browserslist@4.25.1):
+  update-browserslist-db@1.1.3(browserslist@4.25.2):
     dependencies:
-      browserslist: 4.25.1
+      browserslist: 4.25.2
       escalade: 3.2.0
       picocolors: 1.1.1
 
@@ -5599,7 +5659,7 @@ snapshots:
 
   vali-date@1.0.0: {}
 
-  vite@7.0.6(@types/node@24.2.0)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1):
+  vite@7.0.6(@types/node@24.2.1)(jiti@2.5.1)(lightningcss@1.30.1)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.8
       fdir: 6.4.6(picomatch@4.0.3)
@@ -5608,7 +5668,7 @@ snapshots:
       rollup: 4.46.2
       tinyglobby: 0.2.14
     optionalDependencies:
-      '@types/node': 24.2.0
+      '@types/node': 24.2.1
       fsevents: 2.3.3
       jiti: 2.5.1
       lightningcss: 1.30.1

src-tauri/Cargo.lock

@@ -401,9 +401,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.1"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
 
 [[package]]
 name = "byteorder"
@@ -429,6 +429,18 @@ dependencies = [
  "libbz2-rs-sys",
 ]
 
+[[package]]
+name = "cab"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "171228650e6721d5acc0868a462cd864f49ac5f64e4a42cde270406e64e404d2"
+dependencies = [
+ "byteorder",
+ "flate2",
+ "lzxd",
+ "time",
+]
+
 [[package]]
 name = "cairo-rs"
 version = "0.18.5"
@@ -456,9 +468,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0"
 dependencies = [
  "serde",
 ]
@@ -498,9 +510,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.31"
+version = "1.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
+checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
 dependencies = [
  "jobserver",
  "libc",
@@ -524,6 +536,17 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "cfb"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a4f8e55be323b378facfcf1f06aa97f6ec17cf4ac84fb17325093aaf62da41"
+dependencies = [
+ "byteorder",
+ "fnv",
+ "uuid",
+]
+
 [[package]]
 name = "cfg-expr"
 version = "0.15.8"
@@ -691,6 +714,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crc"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -983,24 +1021,29 @@ dependencies = [
 
 [[package]]
 name = "donutbrowser"
-version = "0.8.2"
+version = "0.9.2"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
+ "bzip2",
  "chrono",
  "core-foundation 0.10.1",
  "directories",
+ "flate2",
  "futures-util",
  "http-body-util",
  "hyper",
  "hyper-util",
  "lazy_static",
+ "lzma-rs",
+ "msi-extract",
  "objc2 0.6.1",
  "objc2-app-kit 0.3.1",
  "reqwest",
  "serde",
  "serde_json",
  "sysinfo",
+ "tar",
  "tauri",
  "tauri-build",
  "tauri-plugin-deep-link",
@@ -1192,6 +1235,18 @@ dependencies = [
  "rustc_version",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "flate2"
 version = "1.1.2"
@@ -2066,7 +2121,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"
 dependencies = [
- "cfb",
+ "cfb 0.7.3",
 ]
 
 [[package]]
@@ -2330,6 +2385,7 @@ checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -2369,6 +2425,22 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
+[[package]]
+name = "lzma-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+dependencies = [
+ "byteorder",
+ "crc",
+]
+
+[[package]]
+name = "lzxd"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b29dffab797218e12e4df08ef5d15ab9efca2504038b1b32b9b32fc844b39c9"
+
 [[package]]
 name = "mac"
 version = "0.1.1"
@@ -2468,6 +2540,30 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "msi"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a2332f87a064dea9cce571408c879e0da8dc193b3af06a2b3b2604ee4182a32"
+dependencies = [
+ "byteorder",
+ "cfb 0.10.0",
+ "encoding_rs",
+ "uuid",
+]
+
+[[package]]
+name = "msi-extract"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32047fe35aac08636833dcae558307dafc7679726b97f56449c3c126ed4be108"
+dependencies = [
+ "cab",
+ "cfb 0.10.0",
+ "msi",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "muda"
 version = "0.17.1"
@@ -3704,9 +3800,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -4093,9 +4189,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "smallvec"
@@ -4361,6 +4457,17 @@ dependencies = [
  "syn 2.0.104",
 ]
 
+[[package]]
+name = "tar"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"
@@ -4720,12 +4827,11 @@ dependencies = [
 
 [[package]]
 name = "tauri-winres"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c6d9028d41d4de835e3c482c677a8cb88137ac435d6ff9a71f392d4421576c9"
+checksum = "fd21509dd1fa9bd355dc29894a6ff10635880732396aa38c0066c1e6c1ab8074"
 dependencies = [
  "embed-resource",
- "indexmap 2.10.0",
  "toml 0.9.5",
 ]
 
@@ -4739,7 +4845,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5576,7 +5682,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6212,6 +6318,16 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "xattr"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+dependencies = [
+ "libc",
+ "rustix",
+]
+
 [[package]]
 name = "xdg-home"
 version = "1.3.0"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "donutbrowser"
-version = "0.8.2"
+version = "0.9.2"
 description = "Simple Yet Powerful Anti-Detect Browser"
 authors = ["zhom@github"]
 edition = "2021"
@@ -14,6 +14,7 @@ default-run = "donutbrowser"
 # This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
 name = "donutbrowser"
 crate-type = ["staticlib", "cdylib", "rlib"]
+doctest = false
 
 [build-dependencies]
 tauri-build = { version = "2", features = [] }
@@ -36,6 +37,12 @@ lazy_static = "1.4"
 base64 = "0.22"
 async-trait = "0.1"
 futures-util = "0.3"
+zip = "4"
+tar = "0"
+bzip2 = "0"
+flate2 = "1"
+lzma-rs = "0"
+msi-extract = "0"
 
 uuid = { version = "1.0", features = ["v4", "serde"] }
 url = "2.5"
@@ -44,9 +51,6 @@ chrono = { version = "0.4", features = ["serde"] }
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
 tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }
 
-[target.'cfg(windows)'.dependencies]
-zip = "4"
-
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.10"
 objc2 = "0.6.1"

src-tauri/donutbrowser.desktop

@@ -7,7 +7,7 @@ Exec=donutbrowser %u
 Icon=donutbrowser
 StartupNotify=true
 NoDisplay=false
-Categories=Network;WebBrowser;Productivity;
+Categories=Network;WebBrowser;
 MimeType=x-scheme-handler/http;x-scheme-handler/https;text/html;application/xhtml+xml;
 StartupWMClass=donutbrowser
 Keywords=browser;web;internet;productivity;

src-tauri/entitlements.plist

@@ -28,5 +28,11 @@
     <true/>
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
+    <key>com.apple.security.automation.apple-events</key>
+    <true/>
+    <key>com.apple.security.device.usb</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
 </dict>
 </plist> 

src-tauri/src/api_client.rs

@@ -34,6 +34,12 @@ pub enum PreReleaseKind {
 impl VersionComponent {
   pub fn parse(version: &str) -> Self {
     let version = version.trim();
+    // Normalize common tag prefixes like 'v1.2.3' -> '1.2.3'
+    let version = if version.starts_with('v') || version.starts_with('V') {
+      &version[1..]
+    } else {
+      version
+    };
 
     // Handle special case for Zen Browser twilight releases
     if version.to_lowercase() == "twilight" {
@@ -218,8 +224,11 @@ pub fn sort_versions(versions: &mut [String]) {
 // Helper function to sort GitHub releases
 pub fn sort_github_releases(releases: &mut [GithubRelease]) {
   releases.sort_by(|a, b| {
-    let version_a = VersionComponent::parse(&a.tag_name);
-    let version_b = VersionComponent::parse(&b.tag_name);
+    // Normalize tags like "v1.81.9" -> "1.81.9" for correct ordering
+    let tag_a = a.tag_name.trim_start_matches('v');
+    let tag_b = b.tag_name.trim_start_matches('v');
+    let version_a = VersionComponent::parse(tag_a);
+    let version_b = VersionComponent::parse(tag_b);
     version_b.cmp(&version_a) // Descending order (newest first)
   });
 }
@@ -242,12 +251,22 @@ pub fn is_browser_version_nightly(
       version.to_lowercase() == "twilight"
     }
     "brave" => {
-      // For Brave Browser, only releases titled "Release" are stable, everything else is nightly
+      // For Brave Browser, only releases whose name starts with "Release" (case-insensitive) are stable.
       if let Some(name) = release_name {
-        !name.starts_with("Release")
-      } else {
-        true
+        let normalized = name.trim_start().to_ascii_lowercase();
+        return !normalized.starts_with("release");
       }
+
+      // Fallback: try cached GitHub releases
+      if let Some(releases) = ApiClient::instance().get_cached_github_releases("brave") {
+        if let Some(found) = releases.iter().find(|r| r.tag_name == version) {
+          let normalized = found.name.trim_start().to_ascii_lowercase();
+          return !normalized.starts_with("release");
+        }
+      }
+
+      // Last resort: when no name available, treat as nightly (non-Release)
+      true
     }
     "firefox" | "firefox-developer" => {
       // For Firefox, use the category from the API response to determine stability
@@ -295,7 +314,7 @@ pub struct BrowserRelease {
 
 #[derive(Debug, Serialize, Deserialize)]
 struct CachedVersionData {
-  versions: Vec<String>,
+  releases: Vec<BrowserRelease>,
   timestamp: u64,
 }
 
@@ -327,6 +346,65 @@ impl ApiClient {
     }
   }
 
+  async fn fetch_github_releases_multiple_pages(
+    &self,
+    base_releases_url: &str,
+  ) -> Result<Vec<GithubRelease>, Box<dyn std::error::Error + Send + Sync>> {
+    let mut all_releases: Vec<GithubRelease> = Vec::new();
+
+    // For now, only fetch 1 page
+    for page in 1..=1 {
+      let url = format!("{base_releases_url}?per_page=100&page={page}");
+      let response = self
+        .client
+        .get(&url)
+        .header(
+          "User-Agent",
+          "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
+        )
+        .send()
+        .await?;
+
+      if !response.status().is_success() {
+        // If the first page fails, propagate error; otherwise stop pagination
+        if page == 1 {
+          return Err(
+            format!(
+              "GitHub API returned status for page {}: {}",
+              page,
+              response.status()
+            )
+            .into(),
+          );
+        } else {
+          break;
+        }
+      }
+
+      let text = response.text().await?;
+      let mut page_releases: Vec<GithubRelease> = serde_json::from_str(&text).map_err(|e| {
+        eprintln!("Failed to parse GitHub API response (page {page}): {e}");
+        eprintln!(
+          "Response text (first 500 chars): {}",
+          if text.len() > 500 {
+            &text[..500]
+          } else {
+            &text
+          }
+        );
+        format!("Failed to parse GitHub API response: {e}")
+      })?;
+
+      if page_releases.is_empty() {
+        break;
+      }
+
+      all_releases.append(&mut page_releases);
+    }
+
+    Ok(all_releases)
+  }
+
   pub fn instance() -> &'static ApiClient {
     &API_CLIENT
   }
@@ -374,7 +452,7 @@ impl ApiClient {
     current_time - timestamp < cache_duration
   }
 
-  pub fn load_cached_versions(&self, browser: &str) -> Option<Vec<String>> {
+  pub fn load_cached_versions(&self, browser: &str) -> Option<Vec<BrowserRelease>> {
     let cache_dir = Self::get_cache_dir().ok()?;
     let cache_file = cache_dir.join(format!("{browser}_versions.json"));
 
@@ -383,11 +461,27 @@ impl ApiClient {
     }
 
     let content = fs::read_to_string(&cache_file).ok()?;
-    let cached_data: CachedVersionData = serde_json::from_str(&content).ok()?;
+    if let Ok(cached) = serde_json::from_str::<CachedVersionData>(&content) {
+      // Always return cached releases regardless of age - they're always valid
+      println!("Using cached versions for {browser}");
+      return Some(cached.releases);
+    }
 
-    // Always return cached versions regardless of age - they're always valid
-    println!("Using cached versions for {browser}");
-    Some(cached_data.versions)
+    // Backward compatibility: legacy caches stored just an array of version strings
+    if let Ok(legacy_versions) = serde_json::from_str::<Vec<String>>(&content) {
+      println!("Using legacy cached versions for {browser}; upgrading in-memory");
+      let releases: Vec<BrowserRelease> = legacy_versions
+        .into_iter()
+        .map(|version| BrowserRelease {
+          is_prerelease: is_browser_version_nightly(browser, &version, None),
+          version,
+          date: "".to_string(),
+        })
+        .collect();
+      return Some(releases);
+    }
+
+    None
   }
 
   pub fn is_cache_expired(&self, browser: &str) -> bool {
@@ -418,19 +512,19 @@ impl ApiClient {
   pub fn save_cached_versions(
     &self,
     browser: &str,
-    versions: &[String],
+    releases: &[BrowserRelease],
   ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let cache_dir = Self::get_cache_dir()?;
     let cache_file = cache_dir.join(format!("{browser}_versions.json"));
 
     let cached_data = CachedVersionData {
-      versions: versions.to_vec(),
+      releases: releases.to_vec(),
       timestamp: Self::get_current_timestamp(),
     };
 
     let content = serde_json::to_string_pretty(&cached_data)?;
     fs::write(&cache_file, content)?;
-    println!("Cached {} versions for {}", versions.len(), browser);
+    println!("Cached {} versions for {}", releases.len(), browser);
     Ok(())
   }
 
@@ -450,6 +544,11 @@ impl ApiClient {
     Some(cached_data.releases)
   }
 
+  /// Public accessor for cached GitHub releases (used by other modules for classification)
+  pub fn get_cached_github_releases(&self, browser: &str) -> Option<Vec<GithubRelease>> {
+    self.load_cached_github_releases(browser)
+  }
+
   fn save_cached_github_releases(
     &self,
     browser: &str,
@@ -475,19 +574,8 @@ impl ApiClient {
   ) -> Result<Vec<BrowserRelease>, Box<dyn std::error::Error + Send + Sync>> {
     // Check cache first (unless bypassing)
     if !no_caching {
-      if let Some(cached_versions) = self.load_cached_versions("firefox") {
-        return Ok(
-          cached_versions
-            .into_iter()
-            .map(|version| {
-              BrowserRelease {
-                version: version.clone(),
-                date: "".to_string(), // Cache doesn't store dates
-                is_prerelease: is_browser_version_nightly("firefox", &version, None),
-              }
-            })
-            .collect(),
-        );
+      if let Some(cached_releases) = self.load_cached_versions("firefox") {
+        return Ok(cached_releases);
       }
     }
 
@@ -533,12 +621,9 @@ impl ApiClient {
       version_b.cmp(&version_a)
     });
 
-    // Extract versions for caching
-    let versions: Vec<String> = releases.iter().map(|r| r.version.clone()).collect();
-
     // Cache the results (unless bypassing cache)
     if !no_caching {
-      if let Err(e) = self.save_cached_versions("firefox", &versions) {
+      if let Err(e) = self.save_cached_versions("firefox", &releases) {
         eprintln!("Failed to cache Firefox versions: {e}");
       }
     }
@@ -552,19 +637,8 @@ impl ApiClient {
   ) -> Result<Vec<BrowserRelease>, Box<dyn std::error::Error + Send + Sync>> {
     // Check cache first (unless bypassing)
     if !no_caching {
-      if let Some(cached_versions) = self.load_cached_versions("firefox-developer") {
-        return Ok(
-          cached_versions
-            .into_iter()
-            .map(|version| {
-              BrowserRelease {
-                version: version.clone(),
-                date: "".to_string(), // Cache doesn't store dates
-                is_prerelease: is_browser_version_nightly("firefox-developer", &version, None),
-              }
-            })
-            .collect(),
-        );
+      if let Some(cached_releases) = self.load_cached_versions("firefox-developer") {
+        return Ok(cached_releases);
       }
     }
 
@@ -616,12 +690,9 @@ impl ApiClient {
       version_b.cmp(&version_a)
     });
 
-    // Extract versions for caching
-    let versions: Vec<String> = releases.iter().map(|r| r.version.clone()).collect();
-
     // Cache the results (unless bypassing cache)
     if !no_caching {
-      if let Err(e) = self.save_cached_versions("firefox-developer", &versions) {
+      if let Err(e) = self.save_cached_versions("firefox-developer", &releases) {
         eprintln!("Failed to cache Firefox Developer versions: {e}");
       }
     }
@@ -640,43 +711,12 @@ impl ApiClient {
       }
     }
 
-    println!("Fetching Mullvad releases from GitHub API...");
-    let url = format!(
-      "{}/repos/mullvad/mullvad-browser/releases?per_page=100",
+    println!("Fetching Mullvad releases from GitHub API");
+    let base_url = format!(
+      "{}/repos/mullvad/mullvad-browser/releases",
       self.github_api_base
     );
-
-    let response = self
-      .client
-      .get(url)
-      .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36")
-      .send()
-      .await?;
-
-    if !response.status().is_success() {
-      return Err(format!("GitHub API returned status: {}", response.status()).into());
-    }
-
-    // Get the response text first for better error reporting
-    let response_text = response.text().await?;
-
-    // Try to parse the JSON with better error handling
-    let releases: Vec<GithubRelease> = match serde_json::from_str(&response_text) {
-      Ok(releases) => releases,
-      Err(e) => {
-        eprintln!("Failed to parse GitHub API response for Mullvad releases:");
-        eprintln!("Error: {e}");
-        eprintln!(
-          "Response text (first 500 chars): {}",
-          if response_text.len() > 500 {
-            &response_text[..500]
-          } else {
-            &response_text
-          }
-        );
-        return Err(format!("Failed to parse GitHub API response: {e}").into());
-      }
-    };
+    let releases = self.fetch_github_releases_multiple_pages(&base_url).await?;
 
     let mut releases: Vec<GithubRelease> = releases
       .into_iter()
@@ -710,43 +750,13 @@ impl ApiClient {
       }
     }
 
-    println!("Fetching Zen releases from GitHub API...");
-    let url = format!(
-      "{}/repos/zen-browser/desktop/releases?per_page=100",
+    println!("Fetching Zen releases from GitHub API");
+    let base_url = format!(
+      "{}/repos/zen-browser/desktop/releases",
       self.github_api_base
     );
-
-    let response = self
-      .client
-      .get(url)
-      .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36")
-      .send()
-      .await?;
-
-    if !response.status().is_success() {
-      return Err(format!("GitHub API returned status: {}", response.status()).into());
-    }
-
-    // Get the response text first for better error reporting
-    let response_text = response.text().await?;
-
-    // Try to parse the JSON with better error handling
-    let mut releases: Vec<GithubRelease> = match serde_json::from_str(&response_text) {
-      Ok(releases) => releases,
-      Err(e) => {
-        eprintln!("Failed to parse GitHub API response for Zen releases:");
-        eprintln!("Error: {e}");
-        eprintln!(
-          "Response text (first 500 chars): {}",
-          if response_text.len() > 500 {
-            &response_text[..500]
-          } else {
-            &response_text
-          }
-        );
-        return Err(format!("Failed to parse GitHub API response: {e}").into());
-      }
-    };
+    let mut releases: Vec<GithubRelease> =
+      self.fetch_github_releases_multiple_pages(&base_url).await?;
 
     // Check for twilight updates and mark alpha releases
     for release in &mut releases {
@@ -791,55 +801,25 @@ impl ApiClient {
       }
     }
 
-    println!("Fetching Brave releases from GitHub API...");
-    let url = format!(
-      "{}/repos/brave/brave-browser/releases?per_page=100",
+    println!("Fetching Brave releases from GitHub API");
+    let base_url = format!(
+      "{}/repos/brave/brave-browser/releases",
       self.github_api_base
     );
-
-    let response = self
-      .client
-      .get(url)
-      .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36")
-      .send()
-      .await?;
-
-    if !response.status().is_success() {
-      return Err(format!("GitHub API returned status: {}", response.status()).into());
-    }
-
-    // Get the response text first for better error reporting
-    let response_text = response.text().await?;
-
-    // Try to parse the JSON with better error handling
-    let releases: Vec<GithubRelease> = match serde_json::from_str(&response_text) {
-      Ok(releases) => releases,
-      Err(e) => {
-        eprintln!("Failed to parse GitHub API response for Brave releases:");
-        eprintln!("Error: {e}");
-        eprintln!(
-          "Response text (first 500 chars): {}",
-          if response_text.len() > 500 {
-            &response_text[..500]
-          } else {
-            &response_text
-          }
-        );
-        return Err(format!("Failed to parse GitHub API response: {e}").into());
-      }
-    };
+    let releases: Vec<GithubRelease> = self.fetch_github_releases_multiple_pages(&base_url).await?;
 
     // Get platform info to filter appropriate releases
-    let (os, arch) = Self::get_platform_info();
+    let (os, _) = Self::get_platform_info();
 
     // Filter releases that have assets compatible with the current platform
     let mut filtered_releases: Vec<GithubRelease> = releases
       .into_iter()
       .filter_map(|mut release| {
         // Check if this release has compatible assets for the current platform
-        let has_compatible_asset = Self::has_compatible_brave_asset(&release.assets, &os, &arch);
+        let has_compatible_asset = Self::has_compatible_brave_asset(&release.assets, &os);
 
         if has_compatible_asset {
+          println!("release.name: {:?}", release.name);
           // Use the centralized nightly detection function
           release.is_nightly =
             is_browser_version_nightly("brave", &release.tag_name, Some(&release.name));
@@ -853,11 +833,8 @@ impl ApiClient {
     // Sort releases using the new version sorting system
     sort_github_releases(&mut filtered_releases);
 
-    // Cache the results (unless bypassing cache)
-    if !no_caching {
-      if let Err(e) = self.save_cached_github_releases("brave", &filtered_releases) {
-        eprintln!("Failed to cache Brave releases: {e}");
-      }
+    if let Err(e) = self.save_cached_github_releases("brave", &filtered_releases) {
+      eprintln!("Failed to cache Brave releases: {e}");
     }
 
     Ok(filtered_releases)
@@ -889,11 +866,7 @@ impl ApiClient {
     })
   }
 
-  fn has_compatible_brave_asset(
-    assets: &[crate::browser::GithubAsset],
-    os: &str,
-    arch: &str,
-  ) -> bool {
+  fn has_compatible_brave_asset(assets: &[crate::browser::GithubAsset], os: &str) -> bool {
     match os {
       "windows" => {
         // For Windows, look for standalone setup EXE (not the auto-updater one)
@@ -910,12 +883,9 @@ impl ApiClient {
         }) || assets.iter().any(|asset| asset.name.ends_with(".dmg"))
       }
       "linux" => {
-        // For Linux, be strict about architecture matching - only allow assets that explicitly match the current architecture
-        let arch_pattern = if arch == "arm64" { "arm64" } else { "amd64" };
-
         if assets.iter().any(|asset| {
           let name = asset.name.to_lowercase();
-          name.contains("linux") && name.contains(arch_pattern) && name.ends_with(".zip")
+          name.contains("lin")
         }) {
           return true;
         }
@@ -979,19 +949,8 @@ impl ApiClient {
   ) -> Result<Vec<BrowserRelease>, Box<dyn std::error::Error + Send + Sync>> {
     // Check cache first (unless bypassing)
     if !no_caching {
-      if let Some(cached_versions) = self.load_cached_versions("chromium") {
-        return Ok(
-          cached_versions
-            .into_iter()
-            .map(|version| {
-              BrowserRelease {
-                version: version.clone(),
-                date: "".to_string(), // Cache doesn't store dates
-                is_prerelease: false, // Chromium versions are generally stable builds
-              }
-            })
-            .collect(),
-        );
+      if let Some(cached_releases) = self.load_cached_versions("chromium") {
+        return Ok(cached_releases);
       }
     }
 
@@ -1010,23 +969,24 @@ impl ApiClient {
       }
     }
 
+    // Convert to BrowserRelease objects
+    let releases: Vec<BrowserRelease> = versions
+      .into_iter()
+      .map(|version| BrowserRelease {
+        version: version.clone(),
+        date: "".to_string(),
+        is_prerelease: false,
+      })
+      .collect();
+
     // Cache the results (unless bypassing cache)
     if !no_caching {
-      if let Err(e) = self.save_cached_versions("chromium", &versions) {
+      if let Err(e) = self.save_cached_versions("chromium", &releases) {
         eprintln!("Failed to cache Chromium versions: {e}");
       }
     }
 
-    Ok(
-      versions
-        .into_iter()
-        .map(|version| BrowserRelease {
-          version: version.clone(),
-          date: "".to_string(),
-          is_prerelease: false,
-        })
-        .collect(),
-    )
+    Ok(releases)
   }
 
   pub async fn fetch_camoufox_releases_with_caching(
@@ -1044,43 +1004,9 @@ impl ApiClient {
       }
     }
 
-    println!("Fetching Camoufox releases from GitHub API...");
-    let url = format!(
-      "{}/repos/daijro/camoufox/releases?per_page=100",
-      self.github_api_base
-    );
-
-    let response = self
-      .client
-      .get(url)
-      .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36")
-      .send()
-      .await?;
-
-    if !response.status().is_success() {
-      return Err(format!("GitHub API returned status: {}", response.status()).into());
-    }
-
-    // Get the response text first for better error reporting
-    let response_text = response.text().await?;
-
-    // Try to parse the JSON with better error handling
-    let releases: Vec<GithubRelease> = match serde_json::from_str(&response_text) {
-      Ok(releases) => releases,
-      Err(e) => {
-        eprintln!("Failed to parse GitHub API response for Camoufox releases:");
-        eprintln!("Error: {e}");
-        eprintln!(
-          "Response text (first 500 chars): {}",
-          if response_text.len() > 500 {
-            &response_text[..500]
-          } else {
-            &response_text
-          }
-        );
-        return Err(format!("Failed to parse GitHub API response: {e}").into());
-      }
-    };
+    println!("Fetching Camoufox releases from GitHub API");
+    let base_url = format!("{}/repos/daijro/camoufox/releases", self.github_api_base);
+    let releases: Vec<GithubRelease> = self.fetch_github_releases_multiple_pages(&base_url).await?;
 
     println!(
       "Fetched {} total Camoufox releases from GitHub",
@@ -1157,19 +1083,8 @@ impl ApiClient {
   ) -> Result<Vec<BrowserRelease>, Box<dyn std::error::Error + Send + Sync>> {
     // Check cache first (unless bypassing)
     if !no_caching {
-      if let Some(cached_versions) = self.load_cached_versions("tor-browser") {
-        return Ok(
-          cached_versions
-            .into_iter()
-            .map(|version| {
-              BrowserRelease {
-                version: version.clone(),
-                date: "".to_string(), // Cache doesn't store dates
-                is_prerelease: is_browser_version_nightly("tor-browser", &version, None),
-              }
-            })
-            .collect(),
-        );
+      if let Some(cached_releases) = self.load_cached_versions("tor-browser") {
+        return Ok(cached_releases);
       }
     }
 
@@ -1225,25 +1140,24 @@ impl ApiClient {
       tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
     }
 
+    // Convert to BrowserRelease objects
+    let releases: Vec<BrowserRelease> = version_strings
+      .into_iter()
+      .map(|version| BrowserRelease {
+        version: version.clone(),
+        date: "".to_string(), // TOR archive doesn't provide structured dates
+        is_prerelease: false, // Assume all archived versions are stable
+      })
+      .collect();
+
     // Cache the results (unless bypassing cache)
     if !no_caching {
-      if let Err(e) = self.save_cached_versions("tor-browser", &version_strings) {
+      if let Err(e) = self.save_cached_versions("tor-browser", &releases) {
         eprintln!("Failed to cache TOR versions: {e}");
       }
     }
 
-    Ok(
-      version_strings
-        .into_iter()
-        .map(|version| {
-          BrowserRelease {
-            version: version.clone(),
-            date: "".to_string(), // TOR archive doesn't provide structured dates
-            is_prerelease: false, // Assume all archived versions are stable
-          }
-        })
-        .collect(),
-    )
+    Ok(releases)
   }
 
   async fn check_tor_version_has_macos(
@@ -1678,11 +1592,22 @@ mod tests {
         "name": "Release v1.81.9 (Chromium 137.0.7151.104)",
         "prerelease": false,
         "published_at": "2024-01-15T10:00:00Z",
+        "draft": false,
         "assets": [
           {
             "name": "brave-v1.81.9-universal.dmg",
             "browser_download_url": "https://example.com/brave-1.81.9-universal.dmg",
             "size": 200000000
+          },
+          {
+            "name": "brave-browser-1.81.9-linux-amd64.zip",
+            "browser_download_url": "https://example.com/brave-1.81.9-linux-amd64.zip",
+            "size": 180000000
+          },
+          {
+            "name": "BraveBrowserStandaloneSetup.exe",
+            "browser_download_url": "https://example.com/brave-1.81.9-setup.exe",
+            "size": 150000000
           }
         ]
       }
@@ -1959,6 +1884,84 @@ mod tests {
     assert!(result.is_err());
   }
 
+  #[tokio::test]
+  async fn test_mullvad_pagination_two_pages() {
+    let server = setup_mock_server().await;
+    let client = create_test_client(&server);
+
+    // Page 1 response with Link: rel="next" header
+    let mock_page1 = r#"[
+      {
+        "tag_name": "100.0",
+        "name": "Mullvad Browser 100.0",
+        "prerelease": false,
+        "published_at": "2024-07-01T00:00:00Z",
+        "assets": [
+          { "name": "mullvad-browser-macos-100.0.dmg", "browser_download_url": "https://example.com/100.0.dmg", "size": 1 }
+        ]
+      }
+    ]"#;
+
+    // Page 2 response
+    let mock_page2 = r#"[
+      {
+        "tag_name": "99.0",
+        "name": "Mullvad Browser 99.0",
+        "prerelease": false,
+        "published_at": "2024-06-01T00:00:00Z",
+        "assets": [
+          { "name": "mullvad-browser-macos-99.0.dmg", "browser_download_url": "https://example.com/99.0.dmg", "size": 1 }
+        ]
+      }
+    ]"#;
+
+    // Mock page 1
+    Mock::given(method("GET"))
+      .and(path("/repos/mullvad/mullvad-browser/releases"))
+      .and(query_param("per_page", "100"))
+      .and(query_param("page", "1"))
+      .respond_with(
+        ResponseTemplate::new(200)
+          .set_body_string(mock_page1)
+          .insert_header("content-type", "application/json")
+          .insert_header(
+            "link",
+            format!(
+              "<{}?per_page=100&page=2>; rel=\"next\", <{}?per_page=100&page=2>; rel=\"last\"",
+              server.uri().to_string() + "/repos/mullvad/mullvad-browser/releases",
+              server.uri().to_string() + "/repos/mullvad/mullvad-browser/releases"
+            ),
+          ),
+      )
+      .mount(&server)
+      .await;
+
+    // Mock page 2
+    Mock::given(method("GET"))
+      .and(path("/repos/mullvad/mullvad-browser/releases"))
+      .and(query_param("per_page", "100"))
+      .and(query_param("page", "2"))
+      .respond_with(
+        ResponseTemplate::new(200)
+          .set_body_string(mock_page2)
+          .insert_header("content-type", "application/json"),
+      )
+      .mount(&server)
+      .await;
+
+    let result = client.fetch_mullvad_releases_with_caching(true).await;
+
+    assert!(result.is_ok());
+    let releases = result.unwrap();
+    // We currently only fetch 1 page intentionally; ensure we at least got page 1
+    assert_eq!(
+      releases.len(),
+      1,
+      "Should fetch only the first page of results"
+    );
+    assert_eq!(releases[0].tag_name, "100.0");
+  }
+
   #[test]
   fn test_camoufox_beta_version_parsing() {
     // Test specific Camoufox beta versions that are causing issues

src-tauri/src/auto_updater.rs

@@ -1,5 +1,5 @@
 use crate::api_client::is_browser_version_nightly;
-use crate::browser_version_service::{BrowserVersionInfo, BrowserVersionService};
+use crate::browser_version_manager::{BrowserVersionInfo, BrowserVersionManager};
 use crate::profile::BrowserProfile;
 use crate::settings_manager::SettingsManager;
 use serde::{Deserialize, Serialize};
@@ -29,14 +29,14 @@ pub struct AutoUpdateState {
 }
 
 pub struct AutoUpdater {
-  version_service: &'static BrowserVersionService,
+  version_service: &'static BrowserVersionManager,
   settings_manager: &'static SettingsManager,
 }
 
 impl AutoUpdater {
   fn new() -> Self {
     Self {
-      version_service: BrowserVersionService::instance(),
+      version_service: BrowserVersionManager::instance(),
       settings_manager: SettingsManager::instance(),
     }
   }
@@ -779,13 +779,15 @@ mod tests {
     let state_file = test_settings_manager
       .get_settings_dir()
       .join("auto_update_state.json");
-    std::fs::create_dir_all(test_settings_manager.get_settings_dir()).unwrap();
-    let json = serde_json::to_string_pretty(&state).unwrap();
-    std::fs::write(&state_file, json).unwrap();
+    std::fs::create_dir_all(test_settings_manager.get_settings_dir())
+      .expect("Failed to create settings directory");
+    let json = serde_json::to_string_pretty(&state).expect("Failed to serialize state");
+    std::fs::write(&state_file, json).expect("Failed to write state file");
 
     // Load state
-    let content = std::fs::read_to_string(&state_file).unwrap();
-    let loaded_state: AutoUpdateState = serde_json::from_str(&content).unwrap();
+    let content = std::fs::read_to_string(&state_file).expect("Failed to read state file");
+    let loaded_state: AutoUpdateState =
+      serde_json::from_str(&content).expect("Failed to deserialize state");
 
     assert_eq!(loaded_state.disabled_browsers.len(), 1);
     assert!(loaded_state.disabled_browsers.contains("firefox"));
@@ -823,11 +825,15 @@ mod tests {
     let state_file = test_settings_manager
       .get_settings_dir()
       .join("auto_update_state.json");
-    std::fs::create_dir_all(test_settings_manager.get_settings_dir()).unwrap();
+    std::fs::create_dir_all(test_settings_manager.get_settings_dir())
+      .expect("Failed to create settings directory");
 
     // Initially not disabled (empty state file means default state)
     let state = AutoUpdateState::default();
-    assert!(!state.disabled_browsers.contains("firefox"));
+    assert!(
+      !state.disabled_browsers.contains("firefox"),
+      "Firefox should not be disabled initially"
+    );
 
     // Start update (should disable)
     let mut state = AutoUpdateState::default();
@@ -835,27 +841,41 @@ mod tests {
     state
       .auto_update_downloads
       .insert("firefox-1.1.0".to_string());
-    let json = serde_json::to_string_pretty(&state).unwrap();
-    std::fs::write(&state_file, json).unwrap();
+    let json = serde_json::to_string_pretty(&state).expect("Failed to serialize state");
+    std::fs::write(&state_file, json).expect("Failed to write state file");
 
     // Check that it's disabled
-    let content = std::fs::read_to_string(&state_file).unwrap();
-    let loaded_state: AutoUpdateState = serde_json::from_str(&content).unwrap();
-    assert!(loaded_state.disabled_browsers.contains("firefox"));
-    assert!(loaded_state.auto_update_downloads.contains("firefox-1.1.0"));
+    let content = std::fs::read_to_string(&state_file).expect("Failed to read state file");
+    let loaded_state: AutoUpdateState =
+      serde_json::from_str(&content).expect("Failed to deserialize state");
+    assert!(
+      loaded_state.disabled_browsers.contains("firefox"),
+      "Firefox should be disabled"
+    );
+    assert!(
+      loaded_state.auto_update_downloads.contains("firefox-1.1.0"),
+      "Firefox download should be tracked"
+    );
 
     // Complete update (should enable)
     let mut state = loaded_state;
     state.disabled_browsers.remove("firefox");
     state.auto_update_downloads.remove("firefox-1.1.0");
-    let json = serde_json::to_string_pretty(&state).unwrap();
-    std::fs::write(&state_file, json).unwrap();
+    let json = serde_json::to_string_pretty(&state).expect("Failed to serialize final state");
+    std::fs::write(&state_file, json).expect("Failed to write final state file");
 
     // Check that it's enabled again
-    let content = std::fs::read_to_string(&state_file).unwrap();
-    let final_state: AutoUpdateState = serde_json::from_str(&content).unwrap();
-    assert!(!final_state.disabled_browsers.contains("firefox"));
-    assert!(!final_state.auto_update_downloads.contains("firefox-1.1.0"));
+    let content = std::fs::read_to_string(&state_file).expect("Failed to read final state file");
+    let final_state: AutoUpdateState =
+      serde_json::from_str(&content).expect("Failed to deserialize final state");
+    assert!(
+      !final_state.disabled_browsers.contains("firefox"),
+      "Firefox should be enabled again"
+    );
+    assert!(
+      !final_state.auto_update_downloads.contains("firefox-1.1.0"),
+      "Firefox download should not be tracked anymore"
+    );
   }
 
   #[test]
@@ -863,7 +883,7 @@ mod tests {
     use tempfile::TempDir;
 
     // Create a temporary directory for testing
-    let temp_dir = TempDir::new().unwrap();
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
 
     // Create a mock settings manager that uses the temp directory
     struct TestSettingsManager {
@@ -897,21 +917,27 @@ mod tests {
     let state_file = test_settings_manager
       .get_settings_dir()
       .join("auto_update_state.json");
-    std::fs::create_dir_all(test_settings_manager.get_settings_dir()).unwrap();
-    let json = serde_json::to_string_pretty(&state).unwrap();
-    std::fs::write(&state_file, json).unwrap();
+    std::fs::create_dir_all(test_settings_manager.get_settings_dir())
+      .expect("Failed to create settings directory");
+    let json = serde_json::to_string_pretty(&state).expect("Failed to serialize initial state");
+    std::fs::write(&state_file, json).expect("Failed to write initial state file");
 
     // Dismiss notification (remove from pending updates)
     state
       .pending_updates
       .retain(|n| n.id != "test_notification");
-    let json = serde_json::to_string_pretty(&state).unwrap();
-    std::fs::write(&state_file, json).unwrap();
+    let json = serde_json::to_string_pretty(&state).expect("Failed to serialize updated state");
+    std::fs::write(&state_file, json).expect("Failed to write updated state file");
 
     // Check that it's removed
-    let content = std::fs::read_to_string(&state_file).unwrap();
-    let loaded_state: AutoUpdateState = serde_json::from_str(&content).unwrap();
-    assert_eq!(loaded_state.pending_updates.len(), 0);
+    let content = std::fs::read_to_string(&state_file).expect("Failed to read updated state file");
+    let loaded_state: AutoUpdateState =
+      serde_json::from_str(&content).expect("Failed to deserialize updated state");
+    assert_eq!(
+      loaded_state.pending_updates.len(),
+      0,
+      "Pending updates should be empty after dismissal"
+    );
   }
 }
 

src-tauri/src/browser.rs

@@ -168,17 +168,25 @@ mod linux {
     install_dir: &Path,
     browser_type: &BrowserType,
   ) -> Result<PathBuf, Box<dyn std::error::Error>> {
-    // Expected structure: install_dir/<browser>/<binary>
+    // Expected structure examples:
+    // - Firefox/Firefox Developer on Linux often extract to: install_dir/firefox/firefox
+    // - Some archives may extract directly under: install_dir/firefox or install_dir/firefox-bin
+    // - For some flavors we may have: install_dir/<browser_type>/<binary>
     let browser_subdir = install_dir.join(browser_type.as_str());
 
-    // Try firefox first (preferred), then firefox-bin
+    // Try common firefox executable locations (nested and flat)
     let possible_executables = match browser_type {
-      BrowserType::Firefox | BrowserType::FirefoxDeveloper => {
-        vec![
-          browser_subdir.join("firefox"),
-          browser_subdir.join("firefox-bin"),
-        ]
-      }
+      BrowserType::Firefox | BrowserType::FirefoxDeveloper => vec![
+        // Nested "firefox/firefox" or "firefox/firefox-bin"
+        install_dir.join("firefox").join("firefox"),
+        install_dir.join("firefox").join("firefox-bin"),
+        // Flat under version directory
+        install_dir.join("firefox"),
+        install_dir.join("firefox-bin"),
+        // Under a subdirectory matching the browser type
+        browser_subdir.join("firefox"),
+        browser_subdir.join("firefox-bin"),
+      ],
       BrowserType::MullvadBrowser => {
         vec![
           browser_subdir.join("firefox"),
@@ -191,15 +199,20 @@ mod linux {
       }
       BrowserType::TorBrowser => {
         vec![
-          browser_subdir.join("firefox"),
+          // Common Tor Browser launchers
           browser_subdir.join("tor-browser"),
+          // Firefox-based binaries
+          browser_subdir.join("firefox"),
           browser_subdir.join("firefox-bin"),
+          // Sometimes packaged similarly to Firefox
+          install_dir.join("firefox").join("firefox"),
+          install_dir.join("firefox").join("firefox-bin"),
         ]
       }
       BrowserType::Camoufox => {
         vec![
-          browser_subdir.join("camoufox-bin"),
-          browser_subdir.join("camoufox"),
+          install_dir.join("camoufox-bin"),
+          install_dir.join("camoufox"),
         ]
       }
       _ => vec![],
@@ -213,9 +226,9 @@ mod linux {
 
     Err(
       format!(
-        "Firefox executable not found in {}/{}",
+        "Executable not found for {} in {}",
+        browser_type.as_str(),
         install_dir.display(),
-        browser_type.as_str()
       )
       .into(),
     )
@@ -253,18 +266,21 @@ mod linux {
   }
 
   pub fn is_firefox_version_downloaded(install_dir: &Path, browser_type: &BrowserType) -> bool {
-    // Expected structure: install_dir/<browser>/<binary>
+    // Expected structure (most common):
+    //   install_dir/<browser>/<binary>
+    // However, Firefox Developer tarballs often extract to a "firefox" subfolder
+    // rather than "firefox-developer". Support both layouts.
     let browser_subdir = install_dir.join(browser_type.as_str());
 
-    if !browser_subdir.exists() || !browser_subdir.is_dir() {
-      return false;
-    }
-
     let possible_executables = match browser_type {
       BrowserType::Firefox | BrowserType::FirefoxDeveloper => {
         vec![
+          // Preferred: executable inside a subdirectory named after the browser type
           browser_subdir.join("firefox-bin"),
           browser_subdir.join("firefox"),
+          // Fallback: executable inside a generic "firefox" subdirectory
+          install_dir.join("firefox").join("firefox-bin"),
+          install_dir.join("firefox").join("firefox"),
         ]
       }
       BrowserType::MullvadBrowser => {
@@ -286,8 +302,8 @@ mod linux {
       }
       BrowserType::Camoufox => {
         vec![
-          browser_subdir.join("camoufox-bin"),
-          browser_subdir.join("camoufox"),
+          install_dir.join("camoufox-bin"),
+          install_dir.join("camoufox"),
         ]
       }
       _ => vec![],
@@ -893,38 +909,55 @@ mod tests {
     assert_eq!(BrowserType::TorBrowser.as_str(), "tor-browser");
     assert_eq!(BrowserType::Camoufox.as_str(), "camoufox");
 
-    // Test from_str
+    // Test from_str - use expect with descriptive messages instead of unwrap
     assert_eq!(
-      BrowserType::from_str("mullvad-browser").unwrap(),
+      BrowserType::from_str("mullvad-browser").expect("mullvad-browser should be valid"),
       BrowserType::MullvadBrowser
     );
     assert_eq!(
-      BrowserType::from_str("firefox").unwrap(),
+      BrowserType::from_str("firefox").expect("firefox should be valid"),
       BrowserType::Firefox
     );
     assert_eq!(
-      BrowserType::from_str("firefox-developer").unwrap(),
+      BrowserType::from_str("firefox-developer").expect("firefox-developer should be valid"),
       BrowserType::FirefoxDeveloper
     );
     assert_eq!(
-      BrowserType::from_str("chromium").unwrap(),
+      BrowserType::from_str("chromium").expect("chromium should be valid"),
       BrowserType::Chromium
     );
-    assert_eq!(BrowserType::from_str("brave").unwrap(), BrowserType::Brave);
-    assert_eq!(BrowserType::from_str("zen").unwrap(), BrowserType::Zen);
     assert_eq!(
-      BrowserType::from_str("tor-browser").unwrap(),
+      BrowserType::from_str("brave").expect("brave should be valid"),
+      BrowserType::Brave
+    );
+    assert_eq!(
+      BrowserType::from_str("zen").expect("zen should be valid"),
+      BrowserType::Zen
+    );
+    assert_eq!(
+      BrowserType::from_str("tor-browser").expect("tor-browser should be valid"),
       BrowserType::TorBrowser
     );
     assert_eq!(
-      BrowserType::from_str("camoufox").unwrap(),
+      BrowserType::from_str("camoufox").expect("camoufox should be valid"),
       BrowserType::Camoufox
     );
 
-    // Test invalid browser type
-    assert!(BrowserType::from_str("invalid").is_err());
-    assert!(BrowserType::from_str("").is_err());
-    assert!(BrowserType::from_str("Firefox").is_err()); // Case sensitive
+    // Test invalid browser type - these should properly fail
+    let invalid_result = BrowserType::from_str("invalid");
+    assert!(
+      invalid_result.is_err(),
+      "Invalid browser type should return error"
+    );
+
+    let empty_result = BrowserType::from_str("");
+    assert!(empty_result.is_err(), "Empty string should return error");
+
+    let case_sensitive_result = BrowserType::from_str("Firefox");
+    assert!(
+      case_sensitive_result.is_err(),
+      "Case sensitive check should fail"
+    );
   }
 
   #[test]
@@ -933,9 +966,12 @@ mod tests {
     let browser = FirefoxBrowser::new(BrowserType::Firefox);
     let args = browser
       .create_launch_args("/path/to/profile", None, None)
-      .unwrap();
+      .expect("Failed to create launch args for Firefox");
     assert_eq!(args, vec!["-profile", "/path/to/profile"]);
-    assert!(!args.contains(&"-no-remote".to_string()));
+    assert!(
+      !args.contains(&"-no-remote".to_string()),
+      "Firefox should not use -no-remote"
+    );
 
     let args = browser
       .create_launch_args(
@@ -943,7 +979,7 @@ mod tests {
         None,
         Some("https://example.com".to_string()),
       )
-      .unwrap();
+      .expect("Failed to create launch args for Firefox with URL");
     assert_eq!(
       args,
       vec!["-profile", "/path/to/profile", "https://example.com"]
@@ -953,23 +989,26 @@ mod tests {
     let browser = FirefoxBrowser::new(BrowserType::MullvadBrowser);
     let args = browser
       .create_launch_args("/path/to/profile", None, None)
-      .unwrap();
+      .expect("Failed to create launch args for Mullvad Browser");
     assert_eq!(args, vec!["-profile", "/path/to/profile", "-no-remote"]);
 
     // Test Tor Browser (should use -no-remote)
     let browser = FirefoxBrowser::new(BrowserType::TorBrowser);
     let args = browser
       .create_launch_args("/path/to/profile", None, None)
-      .unwrap();
+      .expect("Failed to create launch args for Tor Browser");
     assert_eq!(args, vec!["-profile", "/path/to/profile", "-no-remote"]);
 
     // Test Zen Browser (should not use -no-remote)
     let browser = FirefoxBrowser::new(BrowserType::Zen);
     let args = browser
       .create_launch_args("/path/to/profile", None, None)
-      .unwrap();
+      .expect("Failed to create launch args for Zen Browser");
     assert_eq!(args, vec!["-profile", "/path/to/profile"]);
-    assert!(!args.contains(&"-no-remote".to_string()));
+    assert!(
+      !args.contains(&"-no-remote".to_string()),
+      "Zen Browser should not use -no-remote"
+    );
   }
 
   #[test]
@@ -977,15 +1016,27 @@ mod tests {
     let browser = ChromiumBrowser::new(BrowserType::Chromium);
     let args = browser
       .create_launch_args("/path/to/profile", None, None)
-      .unwrap();
+      .expect("Failed to create launch args for Chromium");
 
     // Test that basic required arguments are present
-    assert!(args.contains(&"--user-data-dir=/path/to/profile".to_string()));
-    assert!(args.contains(&"--no-default-browser-check".to_string()));
+    assert!(
+      args.contains(&"--user-data-dir=/path/to/profile".to_string()),
+      "Chromium args should contain user-data-dir"
+    );
+    assert!(
+      args.contains(&"--no-default-browser-check".to_string()),
+      "Chromium args should contain no-default-browser-check"
+    );
 
     // Test that automatic update disabling arguments are present
-    assert!(args.contains(&"--disable-background-mode".to_string()));
-    assert!(args.contains(&"--disable-component-update".to_string()));
+    assert!(
+      args.contains(&"--disable-background-mode".to_string()),
+      "Chromium args should contain disable-background-mode"
+    );
+    assert!(
+      args.contains(&"--disable-component-update".to_string()),
+      "Chromium args should contain disable-component-update"
+    );
 
     let args_with_url = browser
       .create_launch_args(
@@ -993,11 +1044,17 @@ mod tests {
         None,
         Some("https://example.com".to_string()),
       )
-      .unwrap();
-    assert!(args_with_url.contains(&"https://example.com".to_string()));
+      .expect("Failed to create launch args for Chromium with URL");
+    assert!(
+      args_with_url.contains(&"https://example.com".to_string()),
+      "Chromium args should contain the URL"
+    );
 
     // Verify URL is at the end
-    assert_eq!(args_with_url.last().unwrap(), "https://example.com");
+    assert_eq!(
+      args_with_url.last().expect("Args should not be empty"),
+      "https://example.com"
+    );
   }
 
   #[test]
@@ -1030,16 +1087,45 @@ mod tests {
 
   #[test]
   fn test_version_downloaded_check() {
-    let temp_dir = TempDir::new().unwrap();
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
     let binaries_dir = temp_dir.path();
 
     // Create a mock Firefox browser installation with new path structure: binaries/<browser>/<version>/
     let browser_dir = binaries_dir.join("firefox").join("139.0");
-    fs::create_dir_all(&browser_dir).unwrap();
+    fs::create_dir_all(&browser_dir).expect("Failed to create browser directory");
 
-    // Create a mock .app directory
-    let app_dir = browser_dir.join("Firefox.app");
-    fs::create_dir_all(&app_dir).unwrap();
+    #[cfg(target_os = "macos")]
+    {
+      // Create a mock .app directory for macOS
+      let app_dir = browser_dir.join("Firefox.app");
+      fs::create_dir_all(&app_dir).expect("Failed to create Firefox.app directory");
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      // Create a mock firefox subdirectory and executable for Linux
+      let firefox_subdir = browser_dir.join("firefox");
+      fs::create_dir_all(&firefox_subdir).expect("Failed to create firefox subdirectory");
+      let executable_path = firefox_subdir.join("firefox");
+      fs::write(&executable_path, "mock executable").expect("Failed to write mock executable");
+
+      // Set executable permissions on Linux
+      use std::os::unix::fs::PermissionsExt;
+      let mut permissions = executable_path
+        .metadata()
+        .expect("Failed to get file metadata")
+        .permissions();
+      permissions.set_mode(0o755);
+      fs::set_permissions(&executable_path, permissions)
+        .expect("Failed to set executable permissions");
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      // Create a mock firefox.exe for Windows
+      let executable_path = browser_dir.join("firefox.exe");
+      fs::write(&executable_path, "mock executable").expect("Failed to write mock executable");
+    }
 
     let browser = FirefoxBrowser::new(BrowserType::Firefox);
     assert!(browser.is_version_downloaded("139.0", binaries_dir));
@@ -1047,36 +1133,76 @@ mod tests {
 
     // Test with Chromium browser with new path structure
     let chromium_dir = binaries_dir.join("chromium").join("1465660");
-    fs::create_dir_all(&chromium_dir).unwrap();
-    let chromium_app_dir = chromium_dir.join("Chromium.app");
-    fs::create_dir_all(chromium_app_dir.join("Contents").join("MacOS")).unwrap();
+    fs::create_dir_all(&chromium_dir).expect("Failed to create chromium directory");
 
-    // Create a mock executable
-    let executable_path = chromium_app_dir
-      .join("Contents")
-      .join("MacOS")
-      .join("Chromium");
-    fs::write(&executable_path, "mock executable").unwrap();
+    #[cfg(target_os = "macos")]
+    {
+      let chromium_app_dir = chromium_dir.join("Chromium.app");
+      fs::create_dir_all(chromium_app_dir.join("Contents").join("MacOS"))
+        .expect("Failed to create Chromium.app structure");
+
+      // Create a mock executable
+      let executable_path = chromium_app_dir
+        .join("Contents")
+        .join("MacOS")
+        .join("Chromium");
+      fs::write(&executable_path, "mock executable")
+        .expect("Failed to write mock Chromium executable");
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      // Create a mock chromium executable for Linux
+      let executable_path = chromium_dir.join("chromium");
+      fs::write(&executable_path, "mock executable")
+        .expect("Failed to write mock chromium executable");
+
+      // Set executable permissions on Linux
+      use std::os::unix::fs::PermissionsExt;
+      let mut permissions = executable_path
+        .metadata()
+        .expect("Failed to get chromium metadata")
+        .permissions();
+      permissions.set_mode(0o755);
+      fs::set_permissions(&executable_path, permissions)
+        .expect("Failed to set chromium permissions");
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      // Create a mock chromium.exe for Windows
+      let executable_path = chromium_dir.join("chromium.exe");
+      fs::write(&executable_path, "mock executable").expect("Failed to write mock chromium.exe");
+    }
 
     let chromium_browser = ChromiumBrowser::new(BrowserType::Chromium);
-    assert!(chromium_browser.is_version_downloaded("1465660", binaries_dir));
-    assert!(!chromium_browser.is_version_downloaded("1465661", binaries_dir));
+    assert!(
+      chromium_browser.is_version_downloaded("1465660", binaries_dir),
+      "Chromium version should be detected as downloaded"
+    );
+    assert!(
+      !chromium_browser.is_version_downloaded("1465661", binaries_dir),
+      "Non-existent Chromium version should not be detected as downloaded"
+    );
   }
 
   #[test]
   fn test_version_downloaded_no_app_directory() {
-    let temp_dir = TempDir::new().unwrap();
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
     let binaries_dir = temp_dir.path();
 
-    // Create browser directory but no .app directory with new path structure
+    // Create browser directory but no proper executable structure
     let browser_dir = binaries_dir.join("firefox").join("139.0");
-    fs::create_dir_all(&browser_dir).unwrap();
+    fs::create_dir_all(&browser_dir).expect("Failed to create browser directory");
 
-    // Create some other files but no .app
-    fs::write(browser_dir.join("readme.txt"), "Some content").unwrap();
+    // Create some other files but no proper executable structure
+    fs::write(browser_dir.join("readme.txt"), "Some content").expect("Failed to write readme file");
 
     let browser = FirefoxBrowser::new(BrowserType::Firefox);
-    assert!(!browser.is_version_downloaded("139.0", binaries_dir));
+    assert!(
+      !browser.is_version_downloaded("139.0", binaries_dir),
+      "Firefox version should not be detected without proper executable structure"
+    );
   }
 
   #[test]
@@ -1101,16 +1227,20 @@ mod tests {
     };
 
     // Test that it can be serialized (implements Serialize)
-    let json = serde_json::to_string(&proxy).unwrap();
-    assert!(json.contains("127.0.0.1"));
-    assert!(json.contains("8080"));
-    assert!(json.contains("http"));
+    let json = serde_json::to_string(&proxy).expect("Failed to serialize proxy settings");
+    assert!(json.contains("127.0.0.1"), "JSON should contain host IP");
+    assert!(json.contains("8080"), "JSON should contain port number");
+    assert!(json.contains("http"), "JSON should contain proxy type");
 
     // Test that it can be deserialized (implements Deserialize)
-    let deserialized: ProxySettings = serde_json::from_str(&json).unwrap();
-    assert_eq!(deserialized.proxy_type, proxy.proxy_type);
-    assert_eq!(deserialized.host, proxy.host);
-    assert_eq!(deserialized.port, proxy.port);
+    let deserialized: ProxySettings =
+      serde_json::from_str(&json).expect("Failed to deserialize proxy settings");
+    assert_eq!(
+      deserialized.proxy_type, proxy.proxy_type,
+      "Proxy type should match"
+    );
+    assert_eq!(deserialized.host, proxy.host, "Host should match");
+    assert_eq!(deserialized.port, proxy.port, "Port should match");
   }
 }
 

src-tauri/src/browser_runner.rs

@@ -11,8 +11,8 @@ use sysinfo::System;
 use tauri::Emitter;
 
 use crate::browser::{create_browser, BrowserType, ProxySettings};
-use crate::browser_version_service::{
-  BrowserVersionInfo, BrowserVersionService, BrowserVersionsResult,
+use crate::browser_version_manager::{
+  BrowserVersionInfo, BrowserVersionManager, BrowserVersionsResult,
 };
 use crate::camoufox::CamoufoxConfig;
 use crate::download::DownloadProgress;
@@ -38,20 +38,6 @@ impl BrowserRunner {
     &BROWSER_RUNNER
   }
 
-  // Start periodic cleanup of dead proxies
-  #[allow(dead_code)]
-  pub fn start_proxy_cleanup_task(&self, app_handle: tauri::AppHandle) {
-    tokio::spawn(async move {
-      let mut interval = tokio::time::interval(tokio::time::Duration::from_secs(30));
-      loop {
-        interval.tick().await;
-        if let Err(e) = PROXY_MANAGER.cleanup_dead_proxies(app_handle.clone()).await {
-          println!("Warning: Failed to cleanup dead proxies: {e}");
-        }
-      }
-    });
-  }
-
   // Helper function to check if a process matches TOR/Mullvad browser
   fn is_tor_or_mullvad_browser(
     &self,
@@ -167,7 +153,7 @@ impl BrowserRunner {
     app_handle: tauri::AppHandle,
     profile: &BrowserProfile,
     url: Option<String>,
-    _local_proxy_settings: Option<&ProxySettings>,
+    local_proxy_settings: Option<&ProxySettings>,
   ) -> Result<BrowserProfile, Box<dyn std::error::Error + Send + Sync>> {
     // Check if browser is disabled due to ongoing update
     let auto_updater = crate::auto_updater::AutoUpdater::instance();
@@ -304,8 +290,8 @@ impl BrowserRunner {
       .as_ref()
       .and_then(|id| PROXY_MANAGER.get_proxy_settings_by_id(id));
 
-    // For now, don't use proxy in launch args - we'll set it up after launch
-    let proxy_for_launch_args: Option<&ProxySettings> = None;
+    // Use provided local proxy for Chromium-based browsers launch arguments
+    let proxy_for_launch_args: Option<&ProxySettings> = local_proxy_settings;
 
     // Get profile data path and launch arguments
     let profiles_dir = self.get_profiles_dir();
@@ -382,6 +368,82 @@ impl BrowserRunner {
       }
     }
 
+    // On macOS, when launching via `open -a`, the child PID is the `open` helper.
+    // Resolve and store the actual browser PID for all browser types.
+    #[cfg(target_os = "macos")]
+    {
+      // Give the browser a moment to start
+      tokio::time::sleep(tokio::time::Duration::from_millis(1500)).await;
+
+      let system = System::new_all();
+      let profiles_dir = self.get_profiles_dir();
+      let profile_data_path = profile.get_profile_data_path(&profiles_dir);
+      let profile_data_path_str = profile_data_path.to_string_lossy();
+
+      for (pid, process) in system.processes() {
+        let cmd = process.cmd();
+        if cmd.is_empty() {
+          continue;
+        }
+
+        // Determine if this process matches the intended browser type
+        let exe_name_lower = process.name().to_string_lossy().to_lowercase();
+        let is_correct_browser = match profile.browser.as_str() {
+          "firefox" => {
+            exe_name_lower.contains("firefox")
+              && !exe_name_lower.contains("developer")
+              && !exe_name_lower.contains("tor")
+              && !exe_name_lower.contains("mullvad")
+              && !exe_name_lower.contains("camoufox")
+          }
+          "firefox-developer" => {
+            exe_name_lower.contains("firefox") && exe_name_lower.contains("developer")
+          }
+          "mullvad-browser" => {
+            self.is_tor_or_mullvad_browser(&exe_name_lower, cmd, "mullvad-browser")
+          }
+          "tor-browser" => self.is_tor_or_mullvad_browser(&exe_name_lower, cmd, "tor-browser"),
+          "zen" => exe_name_lower.contains("zen"),
+          "chromium" => exe_name_lower.contains("chromium"),
+          "brave" => exe_name_lower.contains("brave"),
+          // Camoufox uses nodecar, not PID-based here
+          _ => false,
+        };
+
+        if !is_correct_browser {
+          continue;
+        }
+
+        // Check for profile path match in command line args
+        let profile_path_match = cmd.iter().any(|s| {
+          let arg = s.to_str().unwrap_or("");
+          if profile.browser == "tor-browser"
+            || profile.browser == "firefox"
+            || profile.browser == "firefox-developer"
+            || profile.browser == "mullvad-browser"
+            || profile.browser == "zen"
+          {
+            arg == profile_data_path_str || arg == format!("-profile={profile_data_path_str}")
+          } else {
+            // For Chromium-based browsers, look for user-data-dir flag or raw path
+            arg.contains(&format!("--user-data-dir={profile_data_path_str}"))
+              || arg == profile_data_path_str
+          }
+        });
+
+        if profile_path_match {
+          let pid_u32 = pid.as_u32();
+          if pid_u32 != launcher_pid {
+            actual_pid = pid_u32;
+            println!(
+              "Resolved actual macOS browser PID: {actual_pid} (launcher PID: {launcher_pid})"
+            );
+            break;
+          }
+        }
+      }
+    }
+
     // Update profile with process info and save
     let mut updated_profile = profile.clone();
     updated_profile.process_id = Some(actual_pid);
@@ -404,58 +466,6 @@ impl BrowserRunner {
       // which is already handled in the profile creation process
     }
 
-    // Always start a local proxy for traffic monitoring and potential upstream routing
-    let upstream_proxy = profile
-      .proxy_id
-      .as_ref()
-      .and_then(|id| PROXY_MANAGER.get_proxy_settings_by_id(id));
-
-    println!(
-      "Starting local proxy for profile: {} (upstream: {})",
-      profile.name,
-      upstream_proxy
-        .as_ref()
-        .map(|p| format!("{}:{}", p.host, p.port))
-        .unwrap_or_else(|| "DIRECT".to_string())
-    );
-
-    match PROXY_MANAGER
-      .start_proxy(
-        app_handle.clone(),
-        upstream_proxy.as_ref(),
-        actual_pid,
-        Some(&profile.name),
-      )
-      .await
-    {
-      Ok(local_proxy) => {
-        println!(
-          "Local proxy started successfully for profile: {} on port: {}",
-          profile.name, local_proxy.port
-        );
-
-        // For Firefox-based browsers, update the PAC file with the local proxy
-        if matches!(
-          browser_type,
-          BrowserType::Firefox
-            | BrowserType::FirefoxDeveloper
-            | BrowserType::Zen
-            | BrowserType::TorBrowser
-            | BrowserType::MullvadBrowser
-        ) {
-          let profiles_dir = self.get_profiles_dir();
-          let profile_path = profiles_dir
-            .join(updated_profile.id.to_string())
-            .join("profile");
-
-          if let Err(e) = self.apply_proxy_settings_to_profile(&profile_path, &local_proxy, None) {
-            println!("Warning: Failed to update Firefox proxy settings: {e}");
-          }
-        }
-      }
-      Err(e) => println!("Warning: Failed to start local proxy: {e}"),
-    }
-
     // Emit profile update event to frontend
     if let Err(e) = app_handle.emit("profile-updated", &updated_profile) {
       println!("Warning: Failed to emit profile update event: {e}");
@@ -1044,6 +1054,27 @@ impl BrowserRunner {
     Ok(missing_binaries)
   }
 
+  /// Check if GeoIP database is missing for Camoufox profiles
+  pub fn check_missing_geoip_database(
+    &self,
+  ) -> Result<bool, Box<dyn std::error::Error + Send + Sync>> {
+    // Get all profiles
+    let profiles = self
+      .list_profiles()
+      .map_err(|e| format!("Failed to list profiles: {e}"))?;
+
+    // Check if there are any Camoufox profiles
+    let has_camoufox_profiles = profiles.iter().any(|profile| profile.browser == "camoufox");
+
+    if has_camoufox_profiles {
+      // Check if GeoIP database is available
+      use crate::geoip_downloader::GeoIPDownloader;
+      return Ok(!GeoIPDownloader::is_geoip_database_available());
+    }
+
+    Ok(false)
+  }
+
   /// Automatically download missing binaries for all profiles
   pub async fn ensure_all_binaries_exist(
     &self,
@@ -1082,6 +1113,25 @@ impl BrowserRunner {
       }
     }
 
+    // Check if GeoIP database is missing for Camoufox profiles
+    if self.check_missing_geoip_database()? {
+      println!("GeoIP database is missing for Camoufox profiles, downloading...");
+
+      use crate::geoip_downloader::GeoIPDownloader;
+      let geoip_downloader = GeoIPDownloader::instance();
+
+      match geoip_downloader.download_geoip_database(app_handle).await {
+        Ok(_) => {
+          downloaded.push("GeoIP database for Camoufox".to_string());
+          println!("GeoIP database downloaded successfully");
+        }
+        Err(e) => {
+          eprintln!("Failed to download GeoIP database: {e}");
+          // Don't fail the entire operation if GeoIP download fails
+        }
+      }
+    }
+
     Ok(downloaded)
   }
 
@@ -1129,7 +1179,7 @@ impl BrowserRunner {
     }
 
     // Check if browser is supported on current platform before attempting download
-    let version_service = BrowserVersionService::instance();
+    let version_service = BrowserVersionManager::instance();
 
     if !version_service
       .is_browser_supported(&browser_str)
@@ -1156,11 +1206,6 @@ impl BrowserRunner {
     browser_dir.push(browser_type.as_str());
     browser_dir.push(&version);
 
-    // Clean up any failed previous download
-    if let Err(e) = registry.cleanup_failed_download(&browser_str, &version) {
-      println!("Warning: Failed to cleanup previous download: {e}");
-    }
-
     create_dir_all(&browser_dir).map_err(|e| format!("Failed to create browser directory: {e}"))?;
 
     // Mark download as started in registry
@@ -1171,7 +1216,9 @@ impl BrowserRunner {
 
     // Use the download module
     let downloader = crate::download::Downloader::instance();
-    let download_path = match downloader
+    // Attempt to download the archive. If the download fails but an archive with the
+    // expected filename already exists (manual download), continue using that file.
+    let download_path: PathBuf = match downloader
       .download_browser(
         &app_handle,
         browser_type.clone(),
@@ -1183,14 +1230,12 @@ impl BrowserRunner {
     {
       Ok(path) => path,
       Err(e) => {
-        // Clean up failed download
-        let _ = registry.cleanup_failed_download(&browser_str, &version);
+        // Do NOT continue with extraction on failed downloads. Partial files may exist but are invalid.
+        // Clean registry entry and stop here so the UI can show a single, clear error.
+        let _ = registry.remove_browser(&browser_str, &version);
         let _ = registry.save();
-        // Remove browser-version pair from downloading set on error
-        {
-          let mut downloading = DOWNLOADING_BROWSERS.lock().unwrap();
-          downloading.remove(&download_key);
-        }
+        let mut downloading = DOWNLOADING_BROWSERS.lock().unwrap();
+        downloading.remove(&download_key);
         return Err(format!("Failed to download browser: {e}").into());
       }
     };
@@ -1209,14 +1254,12 @@ impl BrowserRunner {
         .await
       {
         Ok(_) => {
-          // Clean up the downloaded archive
-          if let Err(e) = std::fs::remove_file(&download_path) {
-            println!("Warning: Could not delete archive file: {e}");
-          }
+          // Do not remove the archive here. We keep it until verification succeeds.
         }
         Err(e) => {
-          // Clean up failed download
-          let _ = registry.cleanup_failed_download(&browser_str, &version);
+          // Do not remove the archive or extracted files. Just drop the registry entry
+          // so it won't be reported as downloaded.
+          let _ = registry.remove_browser(&browser_str, &version);
           let _ = registry.save();
           // Remove browser-version pair from downloading set on error
           {
@@ -1250,14 +1293,68 @@ impl BrowserRunner {
     // Use the browser's own verification method
     let binaries_dir = self.get_binaries_dir();
     if !browser.is_version_downloaded(&version, &binaries_dir) {
-      let _ = registry.cleanup_failed_download(&browser_str, &version);
+      // Provide detailed error information for debugging
+      let browser_dir = binaries_dir.join(&browser_str).join(&version);
+      let mut error_details = format!(
+        "Browser download completed but verification failed for {} {}. Expected directory: {}",
+        browser_str,
+        version,
+        browser_dir.display()
+      );
+
+      // List what files actually exist
+      if browser_dir.exists() {
+        error_details.push_str("\nFiles found in directory:");
+        if let Ok(entries) = std::fs::read_dir(&browser_dir) {
+          for entry in entries.flatten() {
+            let path = entry.path();
+            let file_type = if path.is_dir() { "DIR" } else { "FILE" };
+            error_details.push_str(&format!("\n  {} {}", file_type, path.display()));
+          }
+        } else {
+          error_details.push_str("\n  (Could not read directory contents)");
+        }
+      } else {
+        error_details.push_str("\nDirectory does not exist!");
+      }
+
+      // For Camoufox on Linux, provide specific expected files
+      if browser_str == "camoufox" && cfg!(target_os = "linux") {
+        let camoufox_subdir = browser_dir.join("camoufox");
+        error_details.push_str("\nExpected Camoufox executable locations:");
+        error_details.push_str(&format!("\n  {}/camoufox-bin", camoufox_subdir.display()));
+        error_details.push_str(&format!("\n  {}/camoufox", camoufox_subdir.display()));
+
+        if camoufox_subdir.exists() {
+          error_details.push_str(&format!(
+            "\nCamoufox subdirectory exists: {}",
+            camoufox_subdir.display()
+          ));
+          if let Ok(entries) = std::fs::read_dir(&camoufox_subdir) {
+            error_details.push_str("\nFiles in camoufox subdirectory:");
+            for entry in entries.flatten() {
+              let path = entry.path();
+              let file_type = if path.is_dir() { "DIR" } else { "FILE" };
+              error_details.push_str(&format!("\n  {} {}", file_type, path.display()));
+            }
+          }
+        } else {
+          error_details.push_str(&format!(
+            "\nCamoufox subdirectory does not exist: {}",
+            camoufox_subdir.display()
+          ));
+        }
+      }
+
+      // Do not delete files on verification failure; keep archive for manual retry.
+      let _ = registry.remove_browser(&browser_str, &version);
       let _ = registry.save();
       // Remove browser-version pair from downloading set on verification failure
       {
         let mut downloading = DOWNLOADING_BROWSERS.lock().unwrap();
         downloading.remove(&download_key);
       }
-      return Err("Browser download completed but verification failed".into());
+      return Err(error_details.into());
     }
 
     registry
@@ -1267,6 +1364,16 @@ impl BrowserRunner {
       .save()
       .map_err(|e| format!("Failed to save registry: {e}"))?;
 
+    // Now that verification succeeded, remove the archive file if it exists
+    if download_info.is_archive {
+      let archive_path = browser_dir.join(&download_info.filename);
+      if archive_path.exists() {
+        if let Err(e) = std::fs::remove_file(&archive_path) {
+          println!("Warning: Could not delete archive file after verification: {e}");
+        }
+      }
+    }
+
     // If this is Camoufox, automatically download GeoIP database
     if browser_str == "camoufox" {
       use crate::geoip_downloader::GeoIPDownloader;
@@ -1384,54 +1491,77 @@ pub async fn launch_browser_profile(
   // Store the internal proxy settings for passing to launch_browser
   let mut internal_proxy_settings: Option<ProxySettings> = None;
 
-  // If the profile has proxy settings, we need to start the proxy first
-  // and update the profile with proxy settings before launching
-  let profile_for_launch = profile.clone();
-  if let Some(proxy_id) = &profile.proxy_id {
-    if let Some(proxy) = PROXY_MANAGER.get_proxy_settings_by_id(proxy_id) {
-      // Use a temporary PID (1) to start the proxy, we'll update it after browser launch
-      let temp_pid = 1u32;
+  // Resolve the most up-to-date profile from disk by name to avoid using stale proxy_id/browser state
+  let profile_for_launch = browser_runner
+    .list_profiles()
+    .map_err(|e| format!("Failed to list profiles: {e}"))?
+    .into_iter()
+    .find(|p| p.name == profile.name)
+    .unwrap_or_else(|| profile.clone());
 
-      // Start the proxy first
-      match PROXY_MANAGER
-        .start_proxy(
-          app_handle.clone(),
-          Some(&proxy),
-          temp_pid,
-          Some(&profile.name),
-        )
-        .await
-      {
-        Ok(internal_proxy) => {
-          let browser_runner = BrowserRunner::instance();
+  // Always start a local proxy before launching (non-Camoufox handled here; Camoufox has its own flow)
+  if profile.browser != "camoufox" {
+    // Determine upstream proxy if configured; otherwise use DIRECT
+    let upstream_proxy = profile_for_launch
+      .proxy_id
+      .as_ref()
+      .and_then(|id| PROXY_MANAGER.get_proxy_settings_by_id(id));
+
+    // Use a temporary PID (1) to start the proxy, we'll update it after browser launch
+    let temp_pid = 1u32;
+
+    match PROXY_MANAGER
+      .start_proxy(
+        app_handle.clone(),
+        upstream_proxy.as_ref(),
+        temp_pid,
+        Some(&profile.name),
+      )
+      .await
+    {
+      Ok(internal_proxy) => {
+        // Use internal proxy for subsequent launch
+        internal_proxy_settings = Some(internal_proxy.clone());
+
+        // For Firefox-based browsers, apply PAC/user.js to point to the local proxy
+        if matches!(
+          profile_for_launch.browser.as_str(),
+          "firefox" | "firefox-developer" | "zen" | "tor-browser" | "mullvad-browser"
+        ) {
           let profiles_dir = browser_runner.get_profiles_dir();
-          let profile_path = profiles_dir.join(profile.id.to_string()).join("profile");
+          let profile_path = profiles_dir
+            .join(profile_for_launch.id.to_string())
+            .join("profile");
 
-          // Store the internal proxy settings for later use
-          internal_proxy_settings = Some(internal_proxy.clone());
+          // Provide a dummy upstream (ignored when internal proxy is provided)
+          let dummy_upstream = ProxySettings {
+            proxy_type: "http".to_string(),
+            host: "127.0.0.1".to_string(),
+            port: internal_proxy.port,
+            username: None,
+            password: None,
+          };
 
-          // Apply the proxy settings with the internal proxy to the profile directory
           browser_runner
-            .apply_proxy_settings_to_profile(&profile_path, &proxy, Some(&internal_proxy))
-            .map_err(|e| format!("Failed to update profile proxy: {e}"))?;
-
-          println!("Successfully started proxy for profile: {}", profile.name);
-
-          // Give the proxy a moment to fully start up
-          tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
-        }
-        Err(e) => {
-          eprintln!("Failed to start proxy: {e}");
-          // Still continue with browser launch, but without proxy
-          let browser_runner = BrowserRunner::instance();
-          let profiles_dir = browser_runner.get_profiles_dir();
-          let profile_path = profiles_dir.join(profile.id.to_string()).join("profile");
-
-          // Apply proxy settings without internal proxy
-          browser_runner
-            .apply_proxy_settings_to_profile(&profile_path, &proxy, None)
+            .apply_proxy_settings_to_profile(&profile_path, &dummy_upstream, Some(&internal_proxy))
             .map_err(|e| format!("Failed to update profile proxy: {e}"))?;
         }
+
+        println!(
+          "Local proxy prepared for profile: {} on port: {} (upstream: {})",
+          profile_for_launch.name,
+          internal_proxy.port,
+          upstream_proxy
+            .as_ref()
+            .map(|p| format!("{}:{}", p.host, p.port))
+            .unwrap_or_else(|| "DIRECT".to_string())
+        );
+
+        // Give the proxy a moment to fully start up
+        tokio::time::sleep(tokio::time::Duration::from_millis(300)).await;
+      }
+      Err(e) => {
+        eprintln!("Failed to start local proxy (will launch without it): {e}");
       }
     }
   }
@@ -1452,20 +1582,9 @@ pub async fn launch_browser_profile(
     })?;
 
   // Now update the proxy with the correct PID if we have one
-  if let Some(proxy_id) = &profile.proxy_id {
-    if PROXY_MANAGER.get_proxy_settings_by_id(proxy_id).is_some() {
-      if let Some(actual_pid) = updated_profile.process_id {
-        // Update the proxy manager with the correct PID
-        match PROXY_MANAGER.update_proxy_pid(1u32, actual_pid) {
-          Ok(()) => {
-            println!("Updated proxy PID mapping from temp (1) to actual PID: {actual_pid}");
-          }
-          Err(e) => {
-            eprintln!("Failed to update proxy PID mapping: {e}");
-          }
-        }
-      }
-    }
+  if let Some(actual_pid) = updated_profile.process_id {
+    // Update the proxy manager with the correct PID (we always started with temp pid 1 for non-Camoufox)
+    let _ = PROXY_MANAGER.update_proxy_pid(1u32, actual_pid);
   }
 
   Ok(updated_profile)
@@ -1484,17 +1603,6 @@ pub async fn update_profile_proxy(
     .map_err(|e| format!("Failed to update profile: {e}"))
 }
 
-#[tauri::command]
-pub fn update_profile_version(
-  profile_name: String,
-  version: String,
-) -> Result<BrowserProfile, String> {
-  let profile_manager = ProfileManager::instance();
-  profile_manager
-    .update_profile_version(&profile_name, &version)
-    .map_err(|e| format!("Failed to update profile version: {e}"))
-}
-
 #[tauri::command]
 pub async fn check_browser_status(
   app_handle: tauri::AppHandle,
@@ -1529,13 +1637,13 @@ pub fn delete_profile(_app_handle: tauri::AppHandle, profile_name: String) -> Re
 
 #[tauri::command]
 pub fn get_supported_browsers() -> Result<Vec<String>, String> {
-  let service = BrowserVersionService::instance();
+  let service = BrowserVersionManager::instance();
   Ok(service.get_supported_browsers())
 }
 
 #[tauri::command]
 pub fn is_browser_supported_on_platform(browser_str: String) -> Result<bool, String> {
-  let service = BrowserVersionService::instance();
+  let service = BrowserVersionManager::instance();
   service
     .is_browser_supported(&browser_str)
     .map_err(|e| format!("Failed to check browser support: {e}"))
@@ -1545,14 +1653,14 @@ pub fn is_browser_supported_on_platform(browser_str: String) -> Result<bool, Str
 pub async fn fetch_browser_versions_cached_first(
   browser_str: String,
 ) -> Result<Vec<BrowserVersionInfo>, String> {
-  let service = BrowserVersionService::instance();
+  let service = BrowserVersionManager::instance();
 
   // Get cached versions immediately if available
   if let Some(cached_versions) = service.get_cached_browser_versions_detailed(&browser_str) {
     // Check if we should update cache in background
     if service.should_update_cache(&browser_str) {
       // Start background update but return cached data immediately
-      let service_clone = BrowserVersionService::instance();
+      let service_clone = BrowserVersionManager::instance();
       let browser_str_clone = browser_str.clone();
       tokio::spawn(async move {
         if let Err(e) = service_clone
@@ -1577,14 +1685,14 @@ pub async fn fetch_browser_versions_cached_first(
 pub async fn fetch_browser_versions_with_count_cached_first(
   browser_str: String,
 ) -> Result<BrowserVersionsResult, String> {
-  let service = BrowserVersionService::instance();
+  let service = BrowserVersionManager::instance();
 
   // Get cached versions immediately if available
   if let Some(cached_versions) = service.get_cached_browser_versions(&browser_str) {
     // Check if we should update cache in background
     if service.should_update_cache(&browser_str) {
       // Start background update but return cached data immediately
-      let service_clone = BrowserVersionService::instance();
+      let service_clone = BrowserVersionManager::instance();
       let browser_str_clone = browser_str.clone();
       tokio::spawn(async move {
         if let Err(e) = service_clone
@@ -1692,7 +1800,7 @@ pub async fn update_camoufox_config(
 pub async fn fetch_browser_versions_with_count(
   browser_str: String,
 ) -> Result<BrowserVersionsResult, String> {
-  let service = BrowserVersionService::instance();
+  let service = BrowserVersionManager::instance();
   service
     .fetch_browser_versions_with_count(&browser_str, false)
     .await
@@ -1705,17 +1813,6 @@ pub fn get_downloaded_browser_versions(browser_str: String) -> Result<Vec<String
   Ok(registry.get_downloaded_versions(&browser_str))
 }
 
-#[tauri::command]
-pub async fn get_browser_release_types(
-  browser_str: String,
-) -> Result<crate::browser_version_service::BrowserReleaseTypes, String> {
-  let service = BrowserVersionService::instance();
-  service
-    .get_browser_release_types(&browser_str)
-    .await
-    .map_err(|e| format!("Failed to get release types: {e}"))
-}
-
 #[tauri::command]
 pub async fn check_missing_binaries() -> Result<Vec<(String, String, String)>, String> {
   let browser_runner = BrowserRunner::instance();
@@ -1725,6 +1822,14 @@ pub async fn check_missing_binaries() -> Result<Vec<(String, String, String)>, S
     .map_err(|e| format!("Failed to check missing binaries: {e}"))
 }
 
+#[tauri::command]
+pub async fn check_missing_geoip_database() -> Result<bool, String> {
+  let browser_runner = BrowserRunner::instance();
+  browser_runner
+    .check_missing_geoip_database()
+    .map_err(|e| format!("Failed to check missing GeoIP database: {e}"))
+}
+
 #[tauri::command]
 pub async fn ensure_all_binaries_exist(
   app_handle: tauri::AppHandle,

src-tauri/src/browser_version_manager.rs

@@ -30,18 +30,18 @@ pub struct DownloadInfo {
   pub is_archive: bool, // true for .dmg, .zip, etc.
 }
 
-pub struct BrowserVersionService {
+pub struct BrowserVersionManager {
   api_client: &'static ApiClient,
 }
 
-impl BrowserVersionService {
+impl BrowserVersionManager {
   fn new() -> Self {
     Self {
       api_client: ApiClient::instance(),
     }
   }
 
-  pub fn instance() -> &'static BrowserVersionService {
+  pub fn instance() -> &'static BrowserVersionManager {
     &BROWSER_VERSION_SERVICE
   }
 
@@ -116,7 +116,16 @@ impl BrowserVersionService {
 
   /// Get cached browser versions immediately (returns None if no cache exists)
   pub fn get_cached_browser_versions(&self, browser: &str) -> Option<Vec<String>> {
-    self.api_client.load_cached_versions(browser)
+    if browser == "brave" {
+      return ApiClient::instance()
+        .get_cached_github_releases("brave")
+        .map(|releases| releases.into_iter().map(|r| r.tag_name).collect());
+    }
+
+    self
+      .api_client
+      .load_cached_versions(browser)
+      .map(|releases| releases.into_iter().map(|r| r.version).collect())
   }
 
   /// Get cached detailed browser version information immediately
@@ -124,17 +133,29 @@ impl BrowserVersionService {
     &self,
     browser: &str,
   ) -> Option<Vec<BrowserVersionInfo>> {
-    let cached_versions = self.api_client.load_cached_versions(browser)?;
+    if browser == "brave" {
+      if let Some(releases) = ApiClient::instance().get_cached_github_releases("brave") {
+        let detailed_info: Vec<BrowserVersionInfo> = releases
+          .into_iter()
+          .map(|r| BrowserVersionInfo {
+            version: r.tag_name,
+            is_prerelease: r.is_nightly,
+            date: r.published_at,
+          })
+          .collect();
+        return Some(detailed_info);
+      }
+    }
+
+    let cached_releases = self.api_client.load_cached_versions(browser)?;
 
     // Convert cached versions to detailed info (without dates since cache doesn't store them)
-    let detailed_info: Vec<BrowserVersionInfo> = cached_versions
+    let detailed_info: Vec<BrowserVersionInfo> = cached_releases
       .into_iter()
-      .map(|version| {
-        BrowserVersionInfo {
-          version: version.clone(),
-          is_prerelease: crate::api_client::is_browser_version_nightly(browser, &version, None),
-          date: "".to_string(), // Cache doesn't store dates
-        }
+      .map(|r| BrowserVersionInfo {
+        version: r.version,
+        is_prerelease: r.is_prerelease,
+        date: r.date,
       })
       .collect();
 
@@ -153,15 +174,6 @@ impl BrowserVersionService {
   ) -> Result<BrowserReleaseTypes, Box<dyn std::error::Error + Send + Sync>> {
     // Try to get from cache first
     if let Some(cached_versions) = self.get_cached_browser_versions_detailed(browser) {
-      // For Chromium, only return stable since all releases are stable
-      if browser == "chromium" {
-        let latest_stable = cached_versions.first().map(|v| v.version.clone());
-        return Ok(BrowserReleaseTypes {
-          stable: latest_stable,
-          nightly: None,
-        });
-      }
-
       let latest_stable = cached_versions
         .iter()
         .find(|v| !v.is_prerelease)
@@ -178,17 +190,6 @@ impl BrowserVersionService {
       });
     }
 
-    // Fallback to fetching if not cached
-    // For Chromium, only return stable since all releases are stable
-    if browser == "chromium" {
-      let detailed_versions = self.fetch_browser_versions_detailed(browser, false).await?;
-      let latest_stable = detailed_versions.first().map(|v| v.version.clone());
-      return Ok(BrowserReleaseTypes {
-        stable: latest_stable,
-        nightly: None,
-      });
-    }
-
     let detailed_versions = self.fetch_browser_versions_detailed(browser, false).await?;
 
     let latest_stable = detailed_versions
@@ -230,7 +231,7 @@ impl BrowserVersionService {
       .api_client
       .load_cached_versions(browser)
       .unwrap_or_default();
-    let existing_set: HashSet<String> = existing_versions.into_iter().collect();
+    let existing_set: HashSet<String> = existing_versions.into_iter().map(|r| r.version).collect();
 
     // Fetch fresh versions from API
     let fresh_versions = match browser {
@@ -262,10 +263,18 @@ impl BrowserVersionService {
     crate::api_client::sort_versions(&mut merged_versions);
 
     // Save the merged cache (unless explicitly bypassing cache)
-    if !no_caching {
+    if !no_caching && browser != "brave" {
+      let merged_releases: Vec<BrowserRelease> = merged_versions
+        .iter()
+        .map(|v| BrowserRelease {
+          version: v.clone(),
+          date: "".to_string(),
+          is_prerelease: crate::api_client::is_browser_version_nightly(browser, v, None),
+        })
+        .collect();
       if let Err(e) = self
         .api_client
-        .save_cached_versions(browser, &merged_versions)
+        .save_cached_versions(browser, &merged_releases)
       {
         eprintln!("Failed to save merged cache for {browser}: {e}");
       }
@@ -498,7 +507,7 @@ impl BrowserVersionService {
       .api_client
       .load_cached_versions(browser)
       .unwrap_or_default();
-    let existing_set: HashSet<String> = existing_versions.into_iter().collect();
+    let existing_set: HashSet<String> = existing_versions.into_iter().map(|r| r.version).collect();
 
     // Fetch new versions (always bypass cache for background updates)
     let new_versions = self.fetch_browser_versions(browser, true).await?;
@@ -515,7 +524,15 @@ impl BrowserVersionService {
     sort_versions(&mut all_versions);
 
     // Save the updated cache
-    if let Err(e) = self.api_client.save_cached_versions(browser, &all_versions) {
+    let releases: Vec<BrowserRelease> = all_versions
+      .iter()
+      .map(|v| BrowserRelease {
+        version: v.clone(),
+        date: "".to_string(),
+        is_prerelease: crate::api_client::is_browser_version_nightly(browser, v, None),
+      })
+      .collect();
+    if let Err(e) = self.api_client.save_cached_versions(browser, &releases) {
       eprintln!("Failed to save updated cache for {browser}: {e}");
     }
 
@@ -893,6 +910,20 @@ impl BrowserVersionService {
     no_caching: bool,
   ) -> Result<Vec<String>, Box<dyn std::error::Error + Send + Sync>> {
     let releases = self.fetch_brave_releases_detailed(no_caching).await?;
+    // Persist a lightweight versions cache with accurate prerelease info for Brave
+    let converted: Vec<BrowserRelease> = releases
+      .iter()
+      .map(|r| BrowserRelease {
+        version: r.tag_name.clone(),
+        date: r.published_at.clone(),
+        is_prerelease: r.is_nightly,
+      })
+      .collect();
+    // Always save so that other callers without release_name can classify correctly
+    if let Err(e) = self.api_client.save_cached_versions("brave", &converted) {
+      eprintln!("Failed to persist Brave versions cache: {e}");
+    }
+
     Ok(releases.into_iter().map(|r| r.tag_name).collect())
   }
 
@@ -900,10 +931,25 @@ impl BrowserVersionService {
     &self,
     no_caching: bool,
   ) -> Result<Vec<GithubRelease>, Box<dyn std::error::Error + Send + Sync>> {
-    self
+    let releases = self
       .api_client
       .fetch_brave_releases_with_caching(no_caching)
-      .await
+      .await?;
+
+    // Save a parallel versions cache for Brave with accurate prerelease flags
+    let converted: Vec<BrowserRelease> = releases
+      .iter()
+      .map(|r| BrowserRelease {
+        version: r.tag_name.clone(),
+        date: r.published_at.clone(),
+        is_prerelease: r.is_nightly,
+      })
+      .collect();
+    if let Err(e) = self.api_client.save_cached_versions("brave", &converted) {
+      eprintln!("Failed to persist Brave versions cache: {e}");
+    }
+
+    Ok(releases)
   }
 
   async fn fetch_chromium_versions(
@@ -961,6 +1007,17 @@ impl BrowserVersionService {
   }
 }
 
+#[tauri::command]
+pub async fn get_browser_release_types(
+  browser_str: String,
+) -> Result<crate::browser_version_manager::BrowserReleaseTypes, String> {
+  let service = BrowserVersionManager::instance();
+  service
+    .get_browser_release_types(&browser_str)
+    .await
+    .map_err(|e| format!("Failed to get release types: {e}"))
+}
+
 #[cfg(test)]
 mod tests {
   use super::*;
@@ -982,13 +1039,13 @@ mod tests {
     )
   }
 
-  fn create_test_service(_api_client: ApiClient) -> &'static BrowserVersionService {
-    BrowserVersionService::instance()
+  fn create_test_service(_api_client: ApiClient) -> &'static BrowserVersionManager {
+    BrowserVersionManager::instance()
   }
 
   #[tokio::test]
-  async fn test_browser_version_service_creation() {
-    let _ = BrowserVersionService::instance();
+  async fn test_browser_version_manager_creation() {
+    let _ = BrowserVersionManager::instance();
     // Test passes if we can create the service without panicking
   }
 
@@ -1014,61 +1071,200 @@ mod tests {
 
   #[test]
   fn test_get_download_info() {
-    let service = BrowserVersionService::instance();
+    let service = BrowserVersionManager::instance();
 
-    // Test Firefox
+    // Test Firefox - platform-specific expectations
     let firefox_info = service.get_download_info("firefox", "139.0").unwrap();
-    assert_eq!(firefox_info.filename, "Firefox 139.0.dmg");
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(firefox_info.filename, "Firefox 139.0.dmg");
+      assert!(firefox_info.is_archive);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(firefox_info.filename, "firefox-139.0.tar.xz");
+      assert!(firefox_info.is_archive);
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(firefox_info.filename, "Firefox Setup 139.0.exe");
+      assert!(!firefox_info.is_archive);
+    }
+
     assert!(firefox_info
       .url
       .contains("download-installer.cdn.mozilla.net"));
     assert!(firefox_info.url.contains("/pub/firefox/releases/139.0/"));
-    assert!(firefox_info.is_archive);
 
     // Test Firefox Developer
     let firefox_dev_info = service
       .get_download_info("firefox-developer", "139.0b1")
       .unwrap();
-    assert_eq!(firefox_dev_info.filename, "Firefox 139.0b1.dmg");
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(firefox_dev_info.filename, "Firefox 139.0b1.dmg");
+      assert!(firefox_dev_info.is_archive);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(firefox_dev_info.filename, "firefox-139.0b1.tar.xz");
+      assert!(firefox_dev_info.is_archive);
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(firefox_dev_info.filename, "Firefox Setup 139.0b1.exe");
+      assert!(!firefox_dev_info.is_archive);
+    }
+
     assert!(firefox_dev_info
       .url
       .contains("download-installer.cdn.mozilla.net"));
     assert!(firefox_dev_info
       .url
       .contains("/pub/devedition/releases/139.0b1/"));
-    assert!(firefox_dev_info.is_archive);
 
     // Test Mullvad Browser
     let mullvad_info = service
       .get_download_info("mullvad-browser", "14.5a6")
       .unwrap();
-    assert_eq!(mullvad_info.filename, "mullvad-browser-macos-14.5a6.dmg");
-    assert!(mullvad_info.url.contains("mullvad-browser-macos-14.5a6"));
-    assert!(mullvad_info.is_archive);
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(mullvad_info.filename, "mullvad-browser-macos-14.5a6.dmg");
+      assert!(mullvad_info.url.contains("mullvad-browser-macos-14.5a6"));
+      assert!(mullvad_info.is_archive);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(
+        mullvad_info.filename,
+        "mullvad-browser-x86_64-14.5a6.tar.xz"
+      );
+      assert!(mullvad_info.url.contains("mullvad-browser-x86_64-14.5a6"));
+      assert!(mullvad_info.is_archive);
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(
+        mullvad_info.filename,
+        "mullvad-browser-windows-x86_64-14.5a6.exe"
+      );
+      assert!(mullvad_info
+        .url
+        .contains("mullvad-browser-windows-x86_64-14.5a6"));
+      assert!(!mullvad_info.is_archive);
+    }
 
     // Test Zen Browser
     let zen_info = service.get_download_info("zen", "1.11b").unwrap();
-    assert_eq!(zen_info.filename, "zen-1.11b.dmg");
-    assert!(zen_info.url.contains("zen.macos-universal.dmg"));
-    assert!(zen_info.is_archive);
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(zen_info.filename, "zen-1.11b.dmg");
+      assert!(zen_info.url.contains("zen.macos-universal.dmg"));
+      assert!(zen_info.is_archive);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(zen_info.filename, "zen-1.11b-x86_64.tar.xz");
+      assert!(zen_info.url.contains("zen.linux-x86_64.tar.xz"));
+      assert!(zen_info.is_archive);
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(zen_info.filename, "zen-1.11b.exe");
+      assert!(zen_info.url.contains("zen.installer.exe"));
+      assert!(!zen_info.is_archive);
+    }
 
     // Test Tor Browser
     let tor_info = service.get_download_info("tor-browser", "14.0.4").unwrap();
-    assert_eq!(tor_info.filename, "tor-browser-macos-14.0.4.dmg");
-    assert!(tor_info.url.contains("tor-browser-macos-14.0.4"));
-    assert!(tor_info.is_archive);
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(tor_info.filename, "tor-browser-macos-14.0.4.dmg");
+      assert!(tor_info.url.contains("tor-browser-macos-14.0.4"));
+      assert!(tor_info.is_archive);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(tor_info.filename, "tor-browser-linux-x86_64-14.0.4.tar.xz");
+      assert!(tor_info.url.contains("tor-browser-linux-x86_64-14.0.4"));
+      assert!(tor_info.is_archive);
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(
+        tor_info.filename,
+        "tor-browser-windows-x86_64-portable-14.0.4.exe"
+      );
+      assert!(tor_info
+        .url
+        .contains("tor-browser-windows-x86_64-portable-14.0.4"));
+      assert!(!tor_info.is_archive);
+    }
 
     // Test Chromium
     let chromium_info = service.get_download_info("chromium", "1465660").unwrap();
-    assert_eq!(chromium_info.filename, "chromium-1465660-mac.zip");
-    assert!(chromium_info.url.contains("chrome-mac.zip"));
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(chromium_info.filename, "chromium-1465660-mac.zip");
+      assert!(chromium_info.url.contains("chrome-mac.zip"));
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(chromium_info.filename, "chromium-1465660-linux.zip");
+      assert!(chromium_info.url.contains("chrome-linux.zip"));
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(chromium_info.filename, "chromium-1465660-win.zip");
+      assert!(chromium_info.url.contains("chrome-win.zip"));
+    }
+
     assert!(chromium_info.is_archive);
 
     // Test Brave - Note: Brave uses dynamic URL resolution, so get_download_info provides a template URL
     let brave_info = service.get_download_info("brave", "v1.81.9").unwrap();
-    assert_eq!(brave_info.filename, "Brave-Browser-universal.dmg");
-    assert_eq!(brave_info.url, "https://github.com/brave/brave-browser/releases/download/v1.81.9/Brave-Browser-universal.dmg");
-    assert!(brave_info.is_archive);
+
+    #[cfg(target_os = "macos")]
+    {
+      assert_eq!(brave_info.filename, "Brave-Browser-universal.dmg");
+      assert_eq!(brave_info.url, "https://github.com/brave/brave-browser/releases/download/v1.81.9/Brave-Browser-universal.dmg");
+      assert!(brave_info.is_archive);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+      assert_eq!(brave_info.filename, "brave-browser-v1.81.9-linux-amd64.zip");
+      assert_eq!(brave_info.url, "https://github.com/brave/brave-browser/releases/download/v1.81.9/brave-browser-v1.81.9-linux-amd64.zip");
+      assert!(brave_info.is_archive);
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+      assert_eq!(brave_info.filename, "brave-v1.81.9.exe");
+      assert_eq!(
+        brave_info.url,
+        "https://github.com/brave/brave-browser/releases/download/v1.81.9/brave-v1.81.9.exe"
+      );
+      assert!(!brave_info.is_archive);
+    }
 
     // Test unsupported browser
     let unsupported_result = service.get_download_info("unsupported", "1.0.0");
@@ -1080,5 +1276,5 @@ mod tests {
 
 // Global singleton instance
 lazy_static::lazy_static! {
-  static ref BROWSER_VERSION_SERVICE: BrowserVersionService = BrowserVersionService::new();
+  static ref BROWSER_VERSION_SERVICE: BrowserVersionManager = BrowserVersionManager::new();
 }

src-tauri/src/camoufox.rs

@@ -12,6 +12,8 @@ pub struct CamoufoxConfig {
   pub proxy: Option<String>,
   pub screen_max_width: Option<u32>,
   pub screen_max_height: Option<u32>,
+  pub screen_min_width: Option<u32>,
+  pub screen_min_height: Option<u32>,
   pub geoip: Option<serde_json::Value>, // Can be String or bool
   pub block_images: Option<bool>,
   pub block_webrtc: Option<bool>,
@@ -26,6 +28,8 @@ impl Default for CamoufoxConfig {
       proxy: None,
       screen_max_width: None,
       screen_max_height: None,
+      screen_min_width: None,
+      screen_min_height: None,
       geoip: Some(serde_json::Value::Bool(true)),
       block_images: None,
       block_webrtc: None,
@@ -77,17 +81,6 @@ impl CamoufoxNodecarLauncher {
     &CAMOUFOX_NODECAR_LAUNCHER
   }
 
-  /// Create a test configuration
-  #[allow(dead_code)]
-  pub fn create_test_config() -> CamoufoxConfig {
-    CamoufoxConfig {
-      screen_max_width: Some(1440),
-      screen_max_height: Some(900),
-      geoip: Some(serde_json::Value::Bool(true)),
-      ..Default::default()
-    }
-  }
-
   /// Generate Camoufox fingerprint configuration during profile creation
   pub async fn generate_fingerprint_config(
     &self,
@@ -134,6 +127,14 @@ impl CamoufoxNodecarLauncher {
       config_args.extend(["--max-height".to_string(), max_height.to_string()]);
     }
 
+    if let Some(min_width) = config.screen_min_width {
+      config_args.extend(["--min-width".to_string(), min_width.to_string()]);
+    }
+
+    if let Some(min_height) = config.screen_min_height {
+      config_args.extend(["--min-height".to_string(), min_height.to_string()]);
+    }
+
     // Add block_* options
     if let Some(block_images) = config.block_images {
       if block_images {
@@ -470,16 +471,6 @@ impl CamoufoxNodecarLauncher {
 mod tests {
   use super::*;
 
-  #[test]
-  fn test_camoufox_config_creation() {
-    let test_config = CamoufoxNodecarLauncher::create_test_config();
-
-    // Verify test config has expected values
-    assert_eq!(test_config.screen_max_width, Some(1440));
-    assert_eq!(test_config.screen_max_height, Some(900));
-    assert_eq!(test_config.geoip, Some(serde_json::Value::Bool(true)));
-  }
-
   #[test]
   fn test_default_config() {
     let default_config = CamoufoxConfig::default();

src-tauri/src/download.rs

@@ -1,13 +1,12 @@
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
-use std::fs::File;
 use std::io;
 use std::path::{Path, PathBuf};
 use tauri::Emitter;
 
 use crate::api_client::ApiClient;
 use crate::browser::BrowserType;
-use crate::browser_version_service::DownloadInfo;
+use crate::browser_version_manager::DownloadInfo;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct DownloadProgress {
@@ -397,43 +396,104 @@ impl Downloader {
     let is_twilight =
       browser_type == BrowserType::Zen && version.to_lowercase().contains("twilight");
 
-    // Emit initial progress
+    // Determine if we have a partial file to resume
+    let mut existing_size: u64 = 0;
+    if let Ok(meta) = std::fs::metadata(&file_path) {
+      existing_size = meta.len();
+    }
+
+    // Build request, add Range only if we have bytes
+    let mut request = self
+      .client
+      .get(&download_url)
+      .header(
+        "User-Agent",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
+      );
+
+    if existing_size > 0 {
+      request = request.header("Range", format!("bytes={existing_size}-"));
+    }
+
+    // Start download (or resume)
+    let response = request.send().await?;
+
+    // Check if the response is successful
+    if !(response.status().is_success() || response.status().as_u16() == 206) {
+      return Err(format!("Download failed with status: {}", response.status()).into());
+    }
+
+    // Determine total size
+    let mut total_size = response.content_length();
+
+    // If resuming (206) and Content-Range is present, parse total
+    if response.status().as_u16() == 206 {
+      if let Some(content_range) = response.headers().get(reqwest::header::CONTENT_RANGE) {
+        if let Ok(cr) = content_range.to_str() {
+          // Format: bytes start-end/total
+          if let Some((_, total_str)) = cr.split('/').collect::<Vec<_>>().split_first() {
+            if let Some(total_str) = total_str.first() {
+              if let Ok(total) = total_str.parse::<u64>() {
+                total_size = Some(total);
+              }
+            }
+          }
+        }
+      } else if let Some(len) = response.headers().get(reqwest::header::CONTENT_LENGTH) {
+        // Fallback: total = existing + incoming length
+        if let Ok(len_str) = len.to_str() {
+          if let Ok(incoming) = len_str.parse::<u64>() {
+            total_size = Some(existing_size + incoming);
+          }
+        }
+      }
+    } else if existing_size > 0 && response.status().is_success() {
+      // Server ignored range or we asked from 0; if 200 and existing file has content, start fresh
+      // Truncate existing file so we don't append duplicate bytes
+      let _ = std::fs::remove_file(&file_path);
+      existing_size = 0;
+    }
+
+    let mut downloaded = existing_size;
+    let start_time = std::time::Instant::now();
+    let mut last_update = start_time;
+
+    // Emit initial progress AFTER we've established total size and resume state
+    let initial_percentage = if let Some(total) = total_size {
+      if total > 0 {
+        (existing_size as f64 / total as f64) * 100.0
+      } else {
+        0.0
+      }
+    } else {
+      0.0
+    };
+
+    let initial_stage = if is_twilight {
+      "downloading (twilight rolling release)".to_string()
+    } else {
+      "downloading".to_string()
+    };
+
     let progress = DownloadProgress {
       browser: browser_type.as_str().to_string(),
       version: version.to_string(),
-      downloaded_bytes: 0,
-      total_bytes: None,
-      percentage: 0.0,
+      downloaded_bytes: existing_size,
+      total_bytes: total_size,
+      percentage: initial_percentage,
       speed_bytes_per_sec: 0.0,
       eta_seconds: None,
-      stage: if is_twilight {
-        "downloading (twilight rolling release)".to_string()
-      } else {
-        "downloading".to_string()
-      },
+      stage: initial_stage,
     };
 
     let _ = app_handle.emit("download-progress", &progress);
 
-    // Start download
-    let response = self
-      .client
-      .get(&download_url)
-      .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36")
-      .send()
-      .await?;
-
-    // Check if the response is successful
-    if !response.status().is_success() {
-      return Err(format!("Download failed with status: {}", response.status()).into());
-    }
-
-    let total_size = response.content_length();
-    let mut downloaded = 0u64;
-    let start_time = std::time::Instant::now();
-    let mut last_update = start_time;
-
-    let mut file = File::create(&file_path)?;
+    // Open file in append mode (resuming) or create new
+    use std::fs::OpenOptions;
+    let mut file = OpenOptions::new()
+      .create(true)
+      .append(true)
+      .open(&file_path)?;
     let mut stream = response.bytes_stream();
 
     use futures_util::StreamExt;
@@ -446,13 +506,19 @@ impl Downloader {
       // Update progress every 100ms to avoid too many events
       if now.duration_since(last_update).as_millis() >= 100 {
         let elapsed = start_time.elapsed().as_secs_f64();
+        // Compute speed based only on bytes downloaded in this session to avoid inflated values when resuming
+        let downloaded_since_start = downloaded.saturating_sub(existing_size);
         let speed = if elapsed > 0.0 {
-          downloaded as f64 / elapsed
+          downloaded_since_start as f64 / elapsed
         } else {
           0.0
         };
         let percentage = if let Some(total) = total_size {
-          (downloaded as f64 / total as f64) * 100.0
+          if total > 0 {
+            (downloaded as f64 / total as f64) * 100.0
+          } else {
+            0.0
+          }
         } else {
           0.0
         };
@@ -493,7 +559,7 @@ mod tests {
   use super::*;
   use crate::api_client::ApiClient;
   use crate::browser::BrowserType;
-  use crate::browser_version_service::DownloadInfo;
+  use crate::browser_version_manager::DownloadInfo;
 
   use tempfile::TempDir;
   use wiremock::matchers::{method, path};

src-tauri/src/downloaded_browsers.rs

@@ -135,30 +135,57 @@ impl DownloadedBrowsersRegistry {
     version: &str,
   ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     if let Some(info) = self.remove_browser(browser, version) {
-      // Clean up any files that might have been left behind
+      // Clean up extracted binaries but preserve downloaded archives
       if info.file_path.exists() {
         if info.file_path.is_dir() {
-          fs::remove_dir_all(&info.file_path)?;
+          // Allowed archive extensions to preserve
+          let archive_exts = [
+            "zip", "dmg", "tar.xz", "tar.gz", "tar.bz2", "AppImage", "exe", "pkg", "msi",
+          ];
+
+          for entry in fs::read_dir(&info.file_path)? {
+            let entry = entry?;
+            let path = entry.path();
+
+            if path.is_dir() {
+              fs::remove_dir_all(&path)?;
+              continue;
+            }
+
+            // For files, preserve if they look like downloaded archives/installers
+            let keep = path
+              .file_name()
+              .and_then(|n| n.to_str())
+              .map(|name| {
+                // Match suffixes (handles multi-part extensions like .tar.xz)
+                archive_exts
+                  .iter()
+                  .any(|ext| name.to_lowercase().ends_with(&ext.to_lowercase()))
+              })
+              .unwrap_or(false);
+
+            if !keep {
+              fs::remove_file(&path)?;
+            }
+          }
         } else {
-          fs::remove_file(&info.file_path)?;
+          // It's a file. If it's not an archive, remove it; otherwise preserve it.
+          let file_name = info
+            .file_path
+            .file_name()
+            .and_then(|n| n.to_str())
+            .unwrap_or("");
+          let archive_exts = [
+            "zip", "dmg", "tar.xz", "tar.gz", "tar.bz2", "AppImage", "exe", "pkg", "msi",
+          ];
+          let is_archive = archive_exts
+            .iter()
+            .any(|ext| file_name.to_lowercase().ends_with(&ext.to_lowercase()));
+          if !is_archive {
+            fs::remove_file(&info.file_path)?;
+          }
         }
       }
-
-      // Also clean up the browser directory if it exists
-      let base_dirs = BaseDirs::new().ok_or("Failed to get base directories")?;
-      let mut browser_dir = base_dirs.data_local_dir().to_path_buf();
-      browser_dir.push(if cfg!(debug_assertions) {
-        "DonutBrowserDev"
-      } else {
-        "DonutBrowser"
-      });
-      browser_dir.push("binaries");
-      browser_dir.push(browser);
-      browser_dir.push(version);
-
-      if browser_dir.exists() {
-        fs::remove_dir_all(&browser_dir)?;
-      }
     }
     Ok(())
   }
@@ -334,16 +361,20 @@ impl DownloadedBrowsersRegistry {
           continue;
         }
 
-        // Check if this browser/version is already in registry
+        // Only add to registry if this looks like a valid installed browser, not just an archive
         if !self.is_browser_downloaded(browser_name, version_name) {
-          // Add to registry
-          let info = DownloadedBrowserInfo {
-            browser: browser_name.to_string(),
-            version: version_name.to_string(),
-            file_path: version_path.clone(),
-          };
-          self.add_browser(info);
-          changes.push(format!("Added {browser_name} {version_name} to registry"));
+          if let Ok(browser_type) = crate::browser::BrowserType::from_str(browser_name) {
+            let browser = crate::browser::create_browser(browser_type);
+            if browser.is_version_downloaded(version_name, binaries_dir) {
+              let info = DownloadedBrowserInfo {
+                browser: browser_name.to_string(),
+                version: version_name.to_string(),
+                file_path: version_path.clone(),
+              };
+              self.add_browser(info);
+              changes.push(format!("Added {browser_name} {version_name} to registry"));
+            }
+          }
         }
       }
     }
@@ -496,15 +527,21 @@ mod tests {
     registry.mark_download_started("firefox", "139.0", PathBuf::from("/test/path"));
 
     // Should be considered downloaded immediately
-    assert!(registry.is_browser_downloaded("firefox", "139.0"));
+    assert!(
+      registry.is_browser_downloaded("firefox", "139.0"),
+      "Browser should be considered downloaded after marking as started"
+    );
 
     // Mark as completed
     registry
       .mark_download_completed("firefox", "139.0")
-      .unwrap();
+      .expect("Failed to mark download as completed");
 
     // Should still be considered downloaded
-    assert!(registry.is_browser_downloaded("firefox", "139.0"));
+    assert!(
+      registry.is_browser_downloaded("firefox", "139.0"),
+      "Browser should still be considered downloaded after completion"
+    );
   }
 
   #[test]
@@ -517,11 +554,20 @@ mod tests {
     };
 
     registry.add_browser(info);
-    assert!(registry.is_browser_downloaded("firefox", "139.0"));
+    assert!(
+      registry.is_browser_downloaded("firefox", "139.0"),
+      "Browser should be downloaded after adding"
+    );
 
     let removed = registry.remove_browser("firefox", "139.0");
-    assert!(removed.is_some());
-    assert!(!registry.is_browser_downloaded("firefox", "139.0"));
+    assert!(
+      removed.is_some(),
+      "Remove operation should return the removed browser info"
+    );
+    assert!(
+      !registry.is_browser_downloaded("firefox", "139.0"),
+      "Browser should not be downloaded after removal"
+    );
   }
 
   #[test]
@@ -532,6 +578,9 @@ mod tests {
     registry.mark_download_started("zen", "twilight", PathBuf::from("/test/zen-twilight"));
 
     // Check that it's registered
-    assert!(registry.is_browser_downloaded("zen", "twilight"));
+    assert!(
+      registry.is_browser_downloaded("zen", "twilight"),
+      "Zen twilight version should be registered as downloaded"
+    );
   }
 }

src-tauri/src/geoip_downloader.rs

@@ -14,6 +14,11 @@ pub struct GeoIPDownloadProgress {
   pub stage: String, // "downloading", "extracting", "completed"
   pub percentage: f64,
   pub message: String,
+  // Extra fields to mirror browser download progress payload
+  pub downloaded_bytes: Option<u64>,
+  pub total_bytes: Option<u64>,
+  pub speed_bytes_per_sec: Option<f64>,
+  pub eta_seconds: Option<f64>,
 }
 
 pub struct GeoIPDownloader {
@@ -91,6 +96,10 @@ impl GeoIPDownloader {
         stage: "downloading".to_string(),
         percentage: 0.0,
         message: "Starting GeoIP database download".to_string(),
+        downloaded_bytes: Some(0),
+        total_bytes: None,
+        speed_bytes_per_sec: Some(0.0),
+        eta_seconds: None,
       },
     );
 
@@ -122,26 +131,51 @@ impl GeoIPDownloader {
     }
 
     let total_size = response.content_length().unwrap_or(0);
-    let mut downloaded = 0;
+    let mut downloaded: u64 = 0;
     let mut file = fs::File::create(&mmdb_path).await?;
     let mut stream = response.bytes_stream();
 
     use futures_util::StreamExt;
+    use std::time::Instant;
+    let start_time = Instant::now();
+    let mut last_update = Instant::now();
     while let Some(chunk) = stream.next().await {
       let chunk = chunk?;
       downloaded += chunk.len() as u64;
       file.write_all(&chunk).await?;
 
-      if total_size > 0 {
-        let percentage = (downloaded as f64 / total_size as f64) * 100.0;
+      let now = Instant::now();
+      if now.duration_since(last_update).as_millis() >= 100 {
+        let elapsed = start_time.elapsed().as_secs_f64();
+        let speed = if elapsed > 0.0 {
+          downloaded as f64 / elapsed
+        } else {
+          0.0
+        };
+        let percentage = if total_size > 0 {
+          (downloaded as f64 / total_size as f64) * 100.0
+        } else {
+          0.0
+        };
+        let eta = if speed > 0.0 && total_size > 0 {
+          Some((total_size.saturating_sub(downloaded)) as f64 / speed)
+        } else {
+          None
+        };
+
         let _ = app_handle.emit(
           "geoip-download-progress",
           GeoIPDownloadProgress {
             stage: "downloading".to_string(),
             percentage,
             message: format!("Downloaded {downloaded} / {total_size} bytes"),
+            downloaded_bytes: Some(downloaded),
+            total_bytes: Some(total_size),
+            speed_bytes_per_sec: Some(speed),
+            eta_seconds: eta,
           },
         );
+        last_update = now;
       }
     }
 
@@ -154,6 +188,10 @@ impl GeoIPDownloader {
         stage: "completed".to_string(),
         percentage: 100.0,
         message: "GeoIP database download completed".to_string(),
+        downloaded_bytes: Some(downloaded),
+        total_bytes: Some(total_size),
+        speed_bytes_per_sec: Some(0.0),
+        eta_seconds: Some(0.0),
       },
     );
 
@@ -293,12 +331,26 @@ mod tests {
 
   #[test]
   fn test_is_geoip_database_available() {
-    // This test will return false unless the database actually exists
-    // In a real environment, this would check the actual file system
+    // Test that the function works correctly regardless of file system state
     let is_available = GeoIPDownloader::is_geoip_database_available();
-    // We can't assert a specific value since it depends on the system state
-    // But we can verify the function doesn't panic
-    println!("GeoIP database available: {is_available}");
+
+    // The function should return a boolean value (either true or false)
+    // The function should return a boolean value - we just verify it doesn't panic
+    // and returns the expected result based on file existence
+
+    // Verify the function logic by checking if the path resolution works
+    let mmdb_path_result = GeoIPDownloader::get_mmdb_file_path();
+    assert!(
+      mmdb_path_result.is_ok(),
+      "Should be able to get MMDB file path"
+    );
+
+    let mmdb_path = mmdb_path_result.unwrap();
+    let expected_available = mmdb_path.exists();
+    assert_eq!(
+      is_available, expected_available,
+      "Function result should match actual file existence"
+    );
   }
 }
 

src-tauri/src/group_manager.rs

@@ -2,7 +2,7 @@ use directories::BaseDirs;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::Mutex;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -25,16 +25,37 @@ struct GroupsData {
 
 pub struct GroupManager {
   base_dirs: BaseDirs,
+  data_dir_override: Option<PathBuf>,
 }
 
 impl GroupManager {
   pub fn new() -> Self {
     Self {
       base_dirs: BaseDirs::new().expect("Failed to get base directories"),
+      data_dir_override: std::env::var("DONUTBROWSER_DATA_DIR")
+        .ok()
+        .map(PathBuf::from),
+    }
+  }
+
+  // Helper for tests to override data directory without global env var
+  #[allow(dead_code)]
+  pub fn with_data_dir_override(dir: &Path) -> Self {
+    Self {
+      base_dirs: BaseDirs::new().expect("Failed to get base directories"),
+      data_dir_override: Some(dir.to_path_buf()),
     }
   }
 
   fn get_groups_file_path(&self) -> PathBuf {
+    if let Some(dir) = &self.data_dir_override {
+      let mut override_path = dir.clone();
+      // Ensure the directory exists before returning the path
+      let _ = fs::create_dir_all(&override_path);
+      override_path.push("groups.json");
+      return override_path;
+    }
+
     let mut path = self.base_dirs.data_local_dir().to_path_buf();
     path.push(if cfg!(debug_assertions) {
       "DonutBrowserDev"
@@ -152,29 +173,26 @@ impl GroupManager {
       }
     }
 
-    // Create result with counts
+    // Create result including all groups (even those with 0 count)
     let mut result = Vec::new();
     for group in groups {
       let count = group_counts.get(&group.id).copied().unwrap_or(0);
-      if count > 0 {
-        result.push(GroupWithCount {
-          id: group.id,
-          name: group.name,
-          count,
-        });
-      }
+      result.push(GroupWithCount {
+        id: group.id,
+        name: group.name,
+        count,
+      });
     }
 
-    // Add default group count (profiles without group_id)
+    // Add default group count (profiles without group_id), always include even if 0
     let default_count = profiles.iter().filter(|p| p.group_id.is_none()).count();
-    if default_count > 0 {
-      let default_group = GroupWithCount {
-        id: "default".to_string(),
-        name: "Default".to_string(),
-        count: default_count,
-      };
-      result.insert(0, default_group);
-    }
+    let default_group = GroupWithCount {
+      id: "default".to_string(),
+      name: "Default".to_string(),
+      count: default_count,
+    };
+    // Insert at the beginning for consistent ordering with UI expectations
+    result.insert(0, default_group);
 
     Ok(result)
   }
@@ -185,6 +203,267 @@ lazy_static::lazy_static! {
   pub static ref GROUP_MANAGER: Mutex<GroupManager> = Mutex::new(GroupManager::new());
 }
 
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use std::env;
+  use tempfile::TempDir;
+
+  fn create_test_group_manager() -> (GroupManager, TempDir) {
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
+
+    // Set up a temporary home directory for testing
+    env::set_var("HOME", temp_dir.path());
+
+    // Use per-test isolated data directory without relying on global env vars
+    let data_override = temp_dir.path().join("donutbrowser_test_data");
+    let manager = GroupManager::with_data_dir_override(&data_override);
+    (manager, temp_dir)
+  }
+
+  #[test]
+  fn test_group_manager_creation() {
+    let (_manager, _temp_dir) = create_test_group_manager();
+    // Test passes if no panic occurs
+  }
+
+  #[test]
+  fn test_create_and_get_groups() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    // Initially should have no groups
+    let groups = manager
+      .get_all_groups()
+      .expect("Should be able to get groups");
+    assert!(groups.is_empty(), "Should start with no groups");
+
+    // Create a group
+    let group_name = "Test Group".to_string();
+    let created_group = manager
+      .create_group(group_name.clone())
+      .expect("Should create group successfully");
+
+    assert_eq!(
+      created_group.name, group_name,
+      "Created group should have correct name"
+    );
+    assert!(
+      !created_group.id.is_empty(),
+      "Created group should have an ID"
+    );
+
+    // Verify group was saved
+    let groups = manager
+      .get_all_groups()
+      .expect("Should be able to get groups");
+    assert_eq!(groups.len(), 1, "Should have one group");
+    assert_eq!(
+      groups[0].name, group_name,
+      "Retrieved group should have correct name"
+    );
+    assert_eq!(
+      groups[0].id, created_group.id,
+      "Retrieved group should have correct ID"
+    );
+  }
+
+  #[test]
+  fn test_create_duplicate_group_fails() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    let group_name = "Duplicate Group".to_string();
+
+    // Create first group
+    let _first_group = manager
+      .create_group(group_name.clone())
+      .expect("Should create first group");
+
+    // Try to create duplicate group
+    let result = manager.create_group(group_name.clone());
+    assert!(result.is_err(), "Should fail to create duplicate group");
+
+    let error_msg = result.unwrap_err().to_string();
+    assert!(
+      error_msg.contains("already exists"),
+      "Error should mention group already exists"
+    );
+  }
+
+  #[test]
+  fn test_update_group() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    // Create a group
+    let original_name = "Original Name".to_string();
+    let created_group = manager
+      .create_group(original_name)
+      .expect("Should create group");
+
+    // Update the group
+    let new_name = "Updated Name".to_string();
+    let updated_group = manager
+      .update_group(created_group.id.clone(), new_name.clone())
+      .expect("Should update group successfully");
+
+    assert_eq!(
+      updated_group.name, new_name,
+      "Updated group should have new name"
+    );
+    assert_eq!(
+      updated_group.id, created_group.id,
+      "Updated group should keep same ID"
+    );
+
+    // Verify update was persisted
+    let groups = manager.get_all_groups().expect("Should get groups");
+    assert_eq!(groups.len(), 1, "Should still have one group");
+    assert_eq!(
+      groups[0].name, new_name,
+      "Persisted group should have updated name"
+    );
+  }
+
+  #[test]
+  fn test_update_nonexistent_group_fails() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    let result = manager.update_group("nonexistent-id".to_string(), "New Name".to_string());
+    assert!(result.is_err(), "Should fail to update nonexistent group");
+
+    let error_msg = result.unwrap_err().to_string();
+    assert!(
+      error_msg.contains("not found"),
+      "Error should mention group not found"
+    );
+  }
+
+  #[test]
+  fn test_delete_group() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    // Create a group
+    let group_name = "To Delete".to_string();
+    let created_group = manager
+      .create_group(group_name)
+      .expect("Should create group");
+
+    // Verify group exists
+    let groups = manager.get_all_groups().expect("Should get groups");
+    assert_eq!(groups.len(), 1, "Should have one group");
+
+    // Delete the group
+    manager
+      .delete_group(created_group.id)
+      .expect("Should delete group successfully");
+
+    // Verify group was deleted
+    let groups = manager.get_all_groups().expect("Should get groups");
+    assert!(groups.is_empty(), "Should have no groups after deletion");
+  }
+
+  #[test]
+  fn test_delete_nonexistent_group_fails() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    let result = manager.delete_group("nonexistent-id".to_string());
+    assert!(result.is_err(), "Should fail to delete nonexistent group");
+
+    let error_msg = result.unwrap_err().to_string();
+    assert!(
+      error_msg.contains("not found"),
+      "Error should mention group not found"
+    );
+  }
+
+  #[test]
+  fn test_get_groups_with_profile_counts() {
+    let (manager, _temp_dir) = create_test_group_manager();
+
+    // Create test groups
+    let group1 = manager
+      .create_group("Group 1".to_string())
+      .expect("Should create group 1");
+    let _group2 = manager
+      .create_group("Group 2".to_string())
+      .expect("Should create group 2");
+
+    // Create mock profiles
+    let profiles = vec![
+      crate::profile::BrowserProfile {
+        id: uuid::Uuid::new_v4(),
+        name: "Profile 1".to_string(),
+        browser: "firefox".to_string(),
+        version: "1.0".to_string(),
+        proxy_id: None,
+        process_id: None,
+        last_launch: None,
+        release_type: "stable".to_string(),
+        camoufox_config: None,
+        group_id: Some(group1.id.clone()),
+      },
+      crate::profile::BrowserProfile {
+        id: uuid::Uuid::new_v4(),
+        name: "Profile 2".to_string(),
+        browser: "firefox".to_string(),
+        version: "1.0".to_string(),
+        proxy_id: None,
+        process_id: None,
+        last_launch: None,
+        release_type: "stable".to_string(),
+        camoufox_config: None,
+        group_id: Some(group1.id.clone()),
+      },
+      crate::profile::BrowserProfile {
+        id: uuid::Uuid::new_v4(),
+        name: "Profile 3".to_string(),
+        browser: "firefox".to_string(),
+        version: "1.0".to_string(),
+        proxy_id: None,
+        process_id: None,
+        last_launch: None,
+        release_type: "stable".to_string(),
+        camoufox_config: None,
+        group_id: None, // Default group
+      },
+    ];
+
+    let groups_with_counts = manager
+      .get_groups_with_profile_counts(&profiles)
+      .expect("Should get groups with counts");
+
+    // Should have default group + group1 + group2 (group2 has 0 profiles but should still appear)
+    assert_eq!(
+      groups_with_counts.len(),
+      3,
+      "Should include all groups, even those with 0 profiles"
+    );
+
+    // Check default group
+    let default_group = groups_with_counts
+      .iter()
+      .find(|g| g.id == "default")
+      .expect("Should have default group");
+    assert_eq!(
+      default_group.count, 1,
+      "Default group should have 1 profile"
+    );
+
+    // Check group1
+    let group1_with_count = groups_with_counts
+      .iter()
+      .find(|g| g.id == group1.id)
+      .expect("Should have group1");
+    assert_eq!(group1_with_count.count, 2, "Group1 should have 2 profiles");
+
+    // Check that group2 exists with 0 profiles
+    let group2_with_count = groups_with_counts
+      .iter()
+      .find(|g| g.name == "Group 2")
+      .expect("Should have group2 present even with 0 profiles");
+    assert_eq!(group2_with_count.count, 0, "Group2 should have 0 profiles");
+  }
+}
+
 // Helper function to get groups with counts
 pub fn get_groups_with_counts(profiles: &[crate::profile::BrowserProfile]) -> Vec<GroupWithCount> {
   let group_manager = GROUP_MANAGER.lock().unwrap();

src-tauri/src/lib.rs

@@ -12,7 +12,7 @@ mod app_auto_updater;
 mod auto_updater;
 mod browser;
 mod browser_runner;
-mod browser_version_service;
+mod browser_version_manager;
 mod camoufox;
 mod default_browser;
 mod download;
@@ -25,19 +25,19 @@ mod profile;
 mod profile_importer;
 mod proxy_manager;
 mod settings_manager;
-mod theme_detector;
+// mod theme_detector; // removed: theme detection handled in webview via CSS prefers-color-scheme
 mod version_updater;
 
 extern crate lazy_static;
 
 use browser_runner::{
-  check_browser_exists, check_browser_status, check_missing_binaries, create_browser_profile_new,
-  delete_profile, download_browser, ensure_all_binaries_exist, fetch_browser_versions_cached_first,
-  fetch_browser_versions_with_count, fetch_browser_versions_with_count_cached_first,
-  get_browser_release_types, get_downloaded_browser_versions, get_supported_browsers,
-  is_browser_supported_on_platform, kill_browser_profile, launch_browser_profile,
-  list_browser_profiles, rename_profile, update_camoufox_config, update_profile_proxy,
-  update_profile_version,
+  check_browser_exists, check_browser_status, check_missing_binaries, check_missing_geoip_database,
+  create_browser_profile_new, delete_profile, download_browser, ensure_all_binaries_exist,
+  fetch_browser_versions_cached_first, fetch_browser_versions_with_count,
+  fetch_browser_versions_with_count_cached_first, get_downloaded_browser_versions,
+  get_supported_browsers, is_browser_supported_on_platform, kill_browser_profile,
+  launch_browser_profile, list_browser_profiles, rename_profile, update_camoufox_config,
+  update_profile_proxy,
 };
 
 use settings_manager::{
@@ -62,13 +62,17 @@ use app_auto_updater::{
 
 use profile_importer::{detect_existing_profiles, import_browser_profile};
 
-use theme_detector::get_system_theme;
+// use theme_detector::get_system_theme;
 
 use group_manager::{
   assign_profiles_to_group, create_profile_group, delete_profile_group, delete_selected_profiles,
   get_groups_with_profile_counts, get_profile_groups, update_profile_group,
 };
 
+use geoip_downloader::GeoIPDownloader;
+
+use browser_version_manager::get_browser_release_types;
+
 // Trait to extend WebviewWindow with transparent titlebar functionality
 pub trait WindowExt {
   #[cfg(target_os = "macos")]
@@ -114,6 +118,35 @@ impl<R: Runtime> WindowExt for WebviewWindow<R> {
   }
 }
 
+#[tauri::command]
+async fn warm_up_nodecar(app: tauri::AppHandle) -> Result<(), String> {
+  use tauri_plugin_shell::ShellExt;
+  use tokio::time::{timeout, Duration};
+
+  let start_time = std::time::Instant::now();
+
+  // Use sidecar to execute a fast, harmless command that ensures the binary is loaded
+  let cmd = app
+    .shell()
+    .sidecar("nodecar")
+    .map_err(|e| format!("Failed to create nodecar sidecar: {e}"))?
+    .arg("help");
+
+  let exec_future = async { cmd.output().await };
+  match timeout(Duration::from_secs(120), exec_future).await {
+    Ok(Ok(_output)) => {
+      let duration = start_time.elapsed();
+      println!(
+        "Nodecar warm-up (frontend-triggered) completed in {:.2}s",
+        duration.as_secs_f64()
+      );
+      Ok(())
+    }
+    Ok(Err(e)) => Err(format!("Failed to execute nodecar for warm-up: {e}")),
+    Err(_) => Err("Nodecar warm-up timed out after 120s".to_string()),
+  }
+}
+
 #[tauri::command]
 async fn handle_url_open(app: tauri::AppHandle, url: String) -> Result<(), String> {
   println!("handle_url_open called with URL: {url}");
@@ -173,6 +206,20 @@ async fn delete_stored_proxy(proxy_id: String) -> Result<(), String> {
     .map_err(|e| format!("Failed to delete stored proxy: {e}"))
 }
 
+#[tauri::command]
+async fn is_geoip_database_available() -> Result<bool, String> {
+  Ok(GeoIPDownloader::is_geoip_database_available())
+}
+
+#[tauri::command]
+async fn download_geoip_database(app_handle: tauri::AppHandle) -> Result<(), String> {
+  let downloader = GeoIPDownloader::instance();
+  downloader
+    .download_geoip_database(&app_handle)
+    .await
+    .map_err(|e| format!("Failed to download GeoIP database: {e}"))
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
   let args: Vec<String> = env::args().collect();
@@ -386,6 +433,35 @@ pub fn run() {
         }
       });
 
+      // Check and download GeoIP database at startup if needed
+      let app_handle_geoip = app.handle().clone();
+      tauri::async_runtime::spawn(async move {
+        // Wait a bit for the app to fully initialize
+        tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
+
+        let browser_runner = crate::browser_runner::BrowserRunner::instance();
+        match browser_runner.check_missing_geoip_database() {
+          Ok(true) => {
+            println!("GeoIP database is missing for Camoufox profiles, downloading at startup...");
+            let geoip_downloader = GeoIPDownloader::instance();
+            if let Err(e) = geoip_downloader
+              .download_geoip_database(&app_handle_geoip)
+              .await
+            {
+              eprintln!("Failed to download GeoIP database at startup: {e}");
+            } else {
+              println!("GeoIP database downloaded successfully at startup");
+            }
+          }
+          Ok(false) => {
+            // No Camoufox profiles or GeoIP database already available
+          }
+          Err(e) => {
+            eprintln!("Failed to check GeoIP database status at startup: {e}");
+          }
+        }
+      });
+
       // Start proxy cleanup task for dead browser processes
       let app_handle_proxy_cleanup = app.handle().clone();
       tauri::async_runtime::spawn(async move {
@@ -413,40 +489,7 @@ pub fn run() {
         }
       });
 
-      // Warm up nodecar binary in the background
-      tauri::async_runtime::spawn(async move {
-        println!("Starting nodecar warm-up...");
-        let start_time = std::time::Instant::now();
-
-        // Send a ping request to nodecar to trigger unpacking/warm-up
-        match tokio::process::Command::new("nodecar")
-          .arg("--version")
-          .output()
-          .await
-        {
-          Ok(output) => {
-            let duration = start_time.elapsed();
-            if output.status.success() {
-              println!(
-                "Nodecar warm-up completed successfully in {:.2}s",
-                duration.as_secs_f64()
-              );
-            } else {
-              println!(
-                "Nodecar warm-up completed with non-zero exit code in {:.2}s",
-                duration.as_secs_f64()
-              );
-            }
-          }
-          Err(e) => {
-            let duration = start_time.elapsed();
-            println!(
-              "Nodecar warm-up failed after {:.2}s: {e}",
-              duration.as_secs_f64()
-            );
-          }
-        }
-      });
+      // Nodecar warm-up is now triggered from the frontend to allow UI blocking overlay
 
       Ok(())
     })
@@ -465,7 +508,6 @@ pub fn run() {
       get_downloaded_browser_versions,
       get_browser_release_types,
       update_profile_proxy,
-      update_profile_version,
       check_browser_status,
       kill_browser_profile,
       rename_profile,
@@ -487,10 +529,11 @@ pub fn run() {
       check_for_app_updates,
       check_for_app_updates_manual,
       download_and_install_app_update,
-      get_system_theme,
+      // get_system_theme, // removed
       detect_existing_profiles,
       import_browser_profile,
       check_missing_binaries,
+      check_missing_geoip_database,
       ensure_all_binaries_exist,
       create_stored_proxy,
       get_stored_proxies,
@@ -504,6 +547,9 @@ pub fn run() {
       delete_profile_group,
       assign_profiles_to_group,
       delete_selected_profiles,
+      is_geoip_database_available,
+      download_geoip_database,
+      warm_up_nodecar,
     ])
     .run(tauri::generate_context!())
     .expect("error while running tauri application");

src-tauri/src/platform_browser.rs

@@ -48,7 +48,38 @@ pub mod macos {
     args: &[String],
   ) -> Result<std::process::Child, Box<dyn std::error::Error + Send + Sync>> {
     println!("Launching browser on macOS: {executable_path:?} with args: {args:?}");
-    Ok(Command::new(executable_path).args(args).spawn()?)
+    // If the executable is inside an app bundle, launch via Launch Services so
+    // macOS recognizes the real application for privacy permissions (e.g. Screen Recording).
+    // This ensures TCC prompts are attributed to the browser app, not our launcher.
+    let mut current = Some(executable_path);
+    let mut app_bundle: Option<std::path::PathBuf> = None;
+    while let Some(path) = current {
+      if let Some(file_name) = path.file_name().and_then(|s| s.to_str()) {
+        if file_name.ends_with(".app") {
+          app_bundle = Some(path.to_path_buf());
+          break;
+        }
+      }
+      current = path.parent();
+    }
+
+    if let Some(app_path) = app_bundle {
+      // Use `open -n -a <App>.app --args ...` to launch the app bundle.
+      // Note: The returned child PID will belong to `open`, not the browser.
+      // The caller should resolve the actual browser PID after launch.
+      let mut cmd = Command::new("open");
+      cmd.arg("-n");
+      cmd.arg("-a");
+      cmd.arg(app_path);
+      cmd.arg("--args");
+      for a in args {
+        cmd.arg(a);
+      }
+      Ok(cmd.spawn()?)
+    } else {
+      // Fallback: direct spawn if this is not an app bundle
+      Ok(Command::new(executable_path).args(args).spawn()?)
+    }
   }
 
   pub async fn open_url_in_existing_browser_firefox_like(

src-tauri/src/profile/manager.rs

@@ -603,6 +603,11 @@ impl ProfileManager {
         })?;
     }
 
+    // Emit profile update event so frontend UIs can refresh immediately (e.g. proxy manager)
+    if let Err(e) = app_handle.emit("profile-updated", &profile) {
+      println!("Warning: Failed to emit profile update event: {e}");
+    }
+
     Ok(profile)
   }
 
@@ -736,25 +741,33 @@ impl ProfileManager {
       }
     }
 
-    // Update the process ID if we found a different one
-    if let Some(pid) = found_pid {
-      if inner_profile.process_id != Some(pid) {
-        inner_profile.process_id = Some(pid);
+    // Only persist status changes if the profile metadata still exists on disk
+    let profiles_dir = self.get_profiles_dir();
+    let profile_uuid_dir = profiles_dir.join(profile.id.to_string());
+    let metadata_file = profile_uuid_dir.join("metadata.json");
+    let metadata_exists = metadata_file.exists();
+
+    if metadata_exists {
+      // Update the process ID if we found a different one
+      if let Some(pid) = found_pid {
+        if inner_profile.process_id != Some(pid) {
+          inner_profile.process_id = Some(pid);
+          if let Err(e) = self.save_profile(&inner_profile) {
+            println!("Warning: Failed to update profile with new PID: {e}");
+          }
+        }
+      } else if inner_profile.process_id.is_some() {
+        // Clear the PID if no process found
+        inner_profile.process_id = None;
         if let Err(e) = self.save_profile(&inner_profile) {
-          println!("Warning: Failed to update profile with new PID: {e}");
+          println!("Warning: Failed to clear profile PID: {e}");
         }
       }
-    } else if inner_profile.process_id.is_some() {
-      // Clear the PID if no process found
-      inner_profile.process_id = None;
-      if let Err(e) = self.save_profile(&inner_profile) {
-        println!("Warning: Failed to clear profile PID: {e}");
-      }
-    }
 
-    // Emit profile update event to frontend
-    if let Err(e) = app_handle.emit("profile-updated", &inner_profile) {
-      println!("Warning: Failed to emit profile update event: {e}");
+      // Emit profile update event to frontend
+      if let Err(e) = app_handle.emit("profile-updated", &inner_profile) {
+        println!("Warning: Failed to emit profile update event: {e}");
+      }
     }
 
     Ok(is_running)
@@ -778,7 +791,13 @@ impl ProfileManager {
       Ok(Some(camoufox_process)) => {
         // Found a running instance, update profile with process info if changed
         let process_id_changed = profile.process_id != camoufox_process.processId;
-        if process_id_changed {
+        // Only write status changes if metadata still exists
+        let profiles_dir = self.get_profiles_dir();
+        let profile_uuid_dir = profiles_dir.join(profile.id.to_string());
+        let metadata_file = profile_uuid_dir.join("metadata.json");
+        let metadata_exists = metadata_file.exists();
+
+        if process_id_changed && metadata_exists {
           let mut updated_profile = profile.clone();
           updated_profile.process_id = camoufox_process.processId;
           if let Err(e) = self.save_profile(&updated_profile) {
@@ -799,7 +818,12 @@ impl ProfileManager {
       }
       Ok(None) => {
         // No running instance found, clear process ID if set
-        if profile.process_id.is_some() {
+        let profiles_dir = self.get_profiles_dir();
+        let profile_uuid_dir = profiles_dir.join(profile.id.to_string());
+        let metadata_file = profile_uuid_dir.join("metadata.json");
+        let metadata_exists = metadata_file.exists();
+
+        if profile.process_id.is_some() && metadata_exists {
           let mut updated_profile = profile.clone();
           updated_profile.process_id = None;
           if let Err(e) = self.save_profile(&updated_profile) {
@@ -816,7 +840,12 @@ impl ProfileManager {
       Err(e) => {
         // Error checking status, assume not running and clear process ID
         println!("Warning: Failed to check Camoufox status via nodecar: {e}");
-        if profile.process_id.is_some() {
+        let profiles_dir = self.get_profiles_dir();
+        let profile_uuid_dir = profiles_dir.join(profile.id.to_string());
+        let metadata_file = profile_uuid_dir.join("metadata.json");
+        let metadata_exists = metadata_file.exists();
+
+        if profile.process_id.is_some() && metadata_exists {
           let mut updated_profile = profile.clone();
           updated_profile.process_id = None;
           if let Err(e) = self.save_profile(&updated_profile) {
@@ -879,6 +908,15 @@ impl ProfileManager {
       "user_pref(\"browser.preferences.moreFromMozilla\", false);".to_string(),
       "user_pref(\"services.sync.prefs.sync.browser.startup.upgradeDialog.enabled\", false);"
         .to_string(),
+      // Disable welcome / first-run screens
+      "user_pref(\"browser.aboutwelcome.enabled\", false);".to_string(),
+      "user_pref(\"browser.startup.homepage_override.mstone\", \"ignore\");".to_string(),
+      "user_pref(\"startup.homepage_welcome_url\", \"\");".to_string(),
+      "user_pref(\"startup.homepage_welcome_url.additional\", \"\");".to_string(),
+      "user_pref(\"startup.homepage_override_url\", \"\");".to_string(),
+      // Keep extension updates enabled
+      "user_pref(\"extensions.update.enabled\", true);".to_string(),
+      "user_pref(\"extensions.update.autoUpdateDefault\", true);".to_string(),
       "user_pref(\"app.update.enabled\", false);".to_string(),
       "user_pref(\"app.update.staging.enabled\", false);".to_string(),
       "user_pref(\"app.update.timerFirstInterval\", -1);".to_string(),
@@ -894,6 +932,12 @@ impl ProfileManager {
       "user_pref(\"app.update.interval\", -1);".to_string(),
       "user_pref(\"app.update.background.interval\", -1);".to_string(),
       "user_pref(\"app.update.idletime\", -1);".to_string(),
+      // Suppress additional update UI/prompts
+      "user_pref(\"app.update.doorhanger\", false);".to_string(),
+      "user_pref(\"app.update.badge\", false);".to_string(),
+      "user_pref(\"app.update.background.scheduling.enabled\", false);".to_string(),
+      // Suppress upgrade dialogs on startup
+      "user_pref(\"browser.startup.upgradeDialog.enabled\", false);".to_string(),
     ]
   }
 
@@ -1025,8 +1069,135 @@ mod tests {
     let (manager, _temp_dir) = create_test_profile_manager();
     let profiles_dir = manager.get_profiles_dir();
 
-    assert!(profiles_dir.to_string_lossy().contains("DonutBrowser"));
-    assert!(profiles_dir.to_string_lossy().contains("profiles"));
+    assert!(
+      profiles_dir.to_string_lossy().contains("DonutBrowser"),
+      "Profiles dir should contain DonutBrowser"
+    );
+    assert!(
+      profiles_dir.to_string_lossy().contains("profiles"),
+      "Profiles dir should contain profiles"
+    );
+  }
+
+  #[test]
+  fn test_list_profiles_empty() {
+    let (manager, _temp_dir) = create_test_profile_manager();
+
+    let result = manager.list_profiles();
+    assert!(
+      result.is_ok(),
+      "Should successfully list profiles even when empty"
+    );
+
+    let profiles = result.unwrap();
+    assert!(
+      profiles.is_empty(),
+      "Should return empty vector when no profiles exist"
+    );
+  }
+
+  #[test]
+  fn test_get_common_firefox_preferences() {
+    let (manager, _temp_dir) = create_test_profile_manager();
+
+    let prefs = manager.get_common_firefox_preferences();
+    assert!(!prefs.is_empty(), "Should return non-empty preferences");
+
+    // Check for some expected preferences
+    let prefs_string = prefs.join("\n");
+    assert!(
+      prefs_string.contains("browser.shell.checkDefaultBrowser"),
+      "Should contain default browser check preference"
+    );
+    assert!(
+      prefs_string.contains("app.update.enabled"),
+      "Should contain update preference"
+    );
+  }
+
+  #[test]
+  fn test_get_binaries_dir() {
+    let (manager, _temp_dir) = create_test_profile_manager();
+
+    let binaries_dir = manager.get_binaries_dir();
+    let path_str = binaries_dir.to_string_lossy();
+
+    assert!(
+      path_str.contains("DonutBrowser"),
+      "Binaries dir should contain DonutBrowser"
+    );
+    assert!(
+      path_str.contains("binaries"),
+      "Binaries dir should contain binaries"
+    );
+  }
+
+  #[test]
+  fn test_disable_proxy_settings_in_profile() {
+    let (manager, temp_dir) = create_test_profile_manager();
+
+    // Create a test profile directory
+    let profile_dir = temp_dir.path().join("test_profile");
+    fs::create_dir_all(&profile_dir).expect("Should create profile directory");
+
+    let result = manager.disable_proxy_settings_in_profile(&profile_dir);
+    assert!(result.is_ok(), "Should successfully disable proxy settings");
+
+    // Check that user.js was created
+    let user_js_path = profile_dir.join("user.js");
+    assert!(user_js_path.exists(), "user.js should be created");
+
+    let content = fs::read_to_string(&user_js_path).expect("Should read user.js");
+    assert!(
+      content.contains("network.proxy.type"),
+      "Should contain proxy type setting"
+    );
+    assert!(
+      content.contains("0"),
+      "Should set proxy type to 0 (no proxy)"
+    );
+  }
+
+  #[test]
+  fn test_apply_proxy_settings_to_profile() {
+    let (manager, temp_dir) = create_test_profile_manager();
+
+    // Create a test profile directory structure
+    let uuid_dir = temp_dir.path().join("test_uuid");
+    let profile_dir = uuid_dir.join("profile");
+    fs::create_dir_all(&profile_dir).expect("Should create profile directory");
+
+    let proxy_settings = ProxySettings {
+      proxy_type: "http".to_string(),
+      host: "proxy.example.com".to_string(),
+      port: 8080,
+      username: Some("user".to_string()),
+      password: Some("pass".to_string()),
+    };
+
+    let result = manager.apply_proxy_settings_to_profile(&profile_dir, &proxy_settings, None);
+    assert!(result.is_ok(), "Should successfully apply proxy settings");
+
+    // Check that user.js was created
+    let user_js_path = profile_dir.join("user.js");
+    assert!(user_js_path.exists(), "user.js should be created");
+
+    let content = fs::read_to_string(&user_js_path).expect("Should read user.js");
+    assert!(
+      content.contains("network.proxy.type"),
+      "Should contain proxy type setting"
+    );
+    assert!(content.contains("2"), "Should set proxy type to 2 (PAC)");
+
+    // Check that PAC file was created
+    let pac_path = uuid_dir.join("proxy.pac");
+    assert!(pac_path.exists(), "proxy.pac should be created");
+
+    let pac_content = fs::read_to_string(&pac_path).expect("Should read proxy.pac");
+    assert!(
+      pac_content.contains("FindProxyForURL"),
+      "PAC file should contain FindProxyForURL function"
+    );
   }
 }
 

src-tauri/src/profile_importer.rs

@@ -51,14 +51,11 @@ impl ProfileImporter {
     // Detect Chromium profiles
     detected_profiles.extend(self.detect_chromium_profiles()?);
 
-    // Detect Mullvad Browser profiles
-    detected_profiles.extend(self.detect_mullvad_browser_profiles()?);
-
     // Detect Zen Browser profiles
     detected_profiles.extend(self.detect_zen_browser_profiles()?);
 
-    // Detect TOR Browser profiles
-    detected_profiles.extend(self.detect_tor_browser_profiles()?);
+    // NOTE: Mullvad and Tor Browser profile imports are no longer supported.
+    // We intentionally do not detect these profiles to avoid offering them in the UI.
 
     // Remove duplicates based on path
     let mut seen_paths = HashSet::new();
@@ -242,45 +239,6 @@ impl ProfileImporter {
     Ok(profiles)
   }
 
-  /// Detect Mullvad Browser profiles
-  fn detect_mullvad_browser_profiles(
-    &self,
-  ) -> Result<Vec<DetectedProfile>, Box<dyn std::error::Error>> {
-    let mut profiles = Vec::new();
-
-    #[cfg(target_os = "macos")]
-    {
-      let mullvad_dir = self
-        .base_dirs
-        .home_dir()
-        .join("Library/Application Support/MullvadBrowser/Profiles");
-      profiles.extend(self.scan_firefox_profiles_dir(&mullvad_dir, "mullvad-browser")?);
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-      // Primary location in AppData\Roaming
-      let app_data = self.base_dirs.data_dir();
-      let mullvad_dir = app_data.join("MullvadBrowser/Profiles");
-      profiles.extend(self.scan_firefox_profiles_dir(&mullvad_dir, "mullvad-browser")?);
-
-      // Also check common installation locations
-      let local_app_data = self.base_dirs.data_local_dir();
-      let mullvad_local_dir = local_app_data.join("MullvadBrowser/Profiles");
-      if mullvad_local_dir.exists() {
-        profiles.extend(self.scan_firefox_profiles_dir(&mullvad_local_dir, "mullvad-browser")?);
-      }
-    }
-
-    #[cfg(target_os = "linux")]
-    {
-      let mullvad_dir = self.base_dirs.home_dir().join(".mullvad-browser");
-      profiles.extend(self.scan_firefox_profiles_dir(&mullvad_dir, "mullvad-browser")?);
-    }
-
-    Ok(profiles)
-  }
-
   /// Detect Zen Browser profiles
   fn detect_zen_browser_profiles(
     &self,
@@ -312,107 +270,6 @@ impl ProfileImporter {
     Ok(profiles)
   }
 
-  /// Detect TOR Browser profiles
-  fn detect_tor_browser_profiles(
-    &self,
-  ) -> Result<Vec<DetectedProfile>, Box<dyn std::error::Error>> {
-    let mut profiles = Vec::new();
-
-    #[cfg(target_os = "macos")]
-    {
-      // TOR Browser on macOS is typically in Applications
-      let tor_dir = self
-        .base_dirs
-        .home_dir()
-        .join("Library/Application Support/TorBrowser-Data/Browser/profile.default");
-
-      if tor_dir.exists() {
-        profiles.push(DetectedProfile {
-          browser: "tor-browser".to_string(),
-          name: "TOR Browser - Default Profile".to_string(),
-          path: tor_dir.to_string_lossy().to_string(),
-          description: "Default TOR Browser profile".to_string(),
-        });
-      }
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-      // Check common TOR Browser installation locations on Windows
-      let possible_paths = [
-        // Default installation in user directory
-        (
-          "Desktop",
-          "Desktop/Tor Browser/Browser/TorBrowser/Data/Browser/profile.default",
-        ),
-        // AppData locations
-        (
-          "AppData/Roaming",
-          "TorBrowser/Browser/TorBrowser/Data/Browser/profile.default",
-        ),
-        (
-          "AppData/Local",
-          "TorBrowser/Browser/TorBrowser/Data/Browser/profile.default",
-        ),
-      ];
-
-      let home_dir = self.base_dirs.home_dir();
-
-      for (location_name, relative_path) in &possible_paths {
-        let tor_dir = home_dir.join(relative_path);
-        if tor_dir.exists() {
-          profiles.push(DetectedProfile {
-            browser: "tor-browser".to_string(),
-            name: format!("TOR Browser - {} Profile", location_name),
-            path: tor_dir.to_string_lossy().to_string(),
-            description: format!("TOR Browser profile from {}", location_name),
-          });
-        }
-      }
-
-      // Also check AppData directories if available
-      let app_data = self.base_dirs.data_dir();
-      let tor_app_data =
-        app_data.join("TorBrowser/Browser/TorBrowser/Data/Browser/profile.default");
-      if tor_app_data.exists() {
-        profiles.push(DetectedProfile {
-          browser: "tor-browser".to_string(),
-          name: "TOR Browser - AppData Profile".to_string(),
-          path: tor_app_data.to_string_lossy().to_string(),
-          description: "TOR Browser profile from AppData".to_string(),
-        });
-      }
-    }
-
-    #[cfg(target_os = "linux")]
-    {
-      // Common TOR Browser locations on Linux
-      let possible_paths = [
-        ".local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default",
-        "tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default",
-        ".tor-browser/Browser/TorBrowser/Data/Browser/profile.default",
-        "Downloads/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default",
-      ];
-
-      let home_dir = self.base_dirs.home_dir();
-
-      for relative_path in &possible_paths {
-        let tor_dir = home_dir.join(relative_path);
-        if tor_dir.exists() {
-          profiles.push(DetectedProfile {
-            browser: "tor-browser".to_string(),
-            name: "TOR Browser - Default Profile".to_string(),
-            path: tor_dir.to_string_lossy().to_string(),
-            description: "TOR Browser profile".to_string(),
-          });
-          break; // Only add the first one found to avoid duplicates
-        }
-      }
-    }
-
-    Ok(profiles)
-  }
-
   /// Scan Firefox-style profiles directory
   fn scan_firefox_profiles_dir(
     &self,
@@ -647,6 +504,11 @@ impl ProfileImporter {
     browser_type: &str,
     new_profile_name: &str,
   ) -> Result<(), Box<dyn std::error::Error>> {
+    // Disable imports for Mullvad and Tor browsers
+    if browser_type == "mullvad-browser" || browser_type == "tor-browser" {
+      return Err("Importing Mullvad Browser or Tor Browser profiles is not supported".into());
+    }
+
     // Validate that source path exists
     let source_path = Path::new(source_path);
     if !source_path.exists() {
@@ -778,3 +640,206 @@ pub async fn import_browser_profile(
 lazy_static::lazy_static! {
   static ref PROFILE_IMPORTER: ProfileImporter = ProfileImporter::new();
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use std::env;
+  use tempfile::TempDir;
+
+  fn create_test_profile_importer() -> (ProfileImporter, TempDir) {
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
+
+    // Set up a temporary home directory for testing
+    env::set_var("HOME", temp_dir.path());
+
+    let importer = ProfileImporter::new();
+    (importer, temp_dir)
+  }
+
+  #[test]
+  fn test_profile_importer_creation() {
+    let (_importer, _temp_dir) = create_test_profile_importer();
+    // Test passes if no panic occurs
+  }
+
+  #[test]
+  fn test_get_browser_display_name() {
+    let (importer, _temp_dir) = create_test_profile_importer();
+
+    assert_eq!(importer.get_browser_display_name("firefox"), "Firefox");
+    assert_eq!(
+      importer.get_browser_display_name("firefox-developer"),
+      "Firefox Developer"
+    );
+    assert_eq!(
+      importer.get_browser_display_name("chromium"),
+      "Chrome/Chromium"
+    );
+    assert_eq!(importer.get_browser_display_name("brave"), "Brave");
+    assert_eq!(
+      importer.get_browser_display_name("mullvad-browser"),
+      "Mullvad Browser"
+    );
+    assert_eq!(importer.get_browser_display_name("zen"), "Zen Browser");
+    assert_eq!(
+      importer.get_browser_display_name("tor-browser"),
+      "Tor Browser"
+    );
+    assert_eq!(
+      importer.get_browser_display_name("unknown"),
+      "Unknown Browser"
+    );
+  }
+
+  #[test]
+  fn test_detect_existing_profiles_no_panic() {
+    let (importer, _temp_dir) = create_test_profile_importer();
+
+    // This should not panic even if no browser profiles exist
+    let result = importer.detect_existing_profiles();
+    assert!(result.is_ok(), "detect_existing_profiles should not fail");
+
+    let _profiles = result.unwrap();
+    // We can't assert specific profiles since they depend on the system
+    // but we can verify the result is a valid Vec
+    // We can't assert specific profiles since they depend on the system
+    // but we can verify the result is a valid Vec (length check is always true for Vec, but shows intent)
+  }
+
+  #[test]
+  fn test_scan_firefox_profiles_dir_nonexistent() {
+    let (importer, temp_dir) = create_test_profile_importer();
+
+    let nonexistent_dir = temp_dir.path().join("nonexistent");
+    let result = importer.scan_firefox_profiles_dir(&nonexistent_dir, "firefox");
+
+    assert!(
+      result.is_ok(),
+      "Should handle nonexistent directory gracefully"
+    );
+    let profiles = result.unwrap();
+    assert!(
+      profiles.is_empty(),
+      "Should return empty vector for nonexistent directory"
+    );
+  }
+
+  #[test]
+  fn test_scan_chrome_profiles_dir_nonexistent() {
+    let (importer, temp_dir) = create_test_profile_importer();
+
+    let nonexistent_dir = temp_dir.path().join("nonexistent");
+    let result = importer.scan_chrome_profiles_dir(&nonexistent_dir, "chromium");
+
+    assert!(
+      result.is_ok(),
+      "Should handle nonexistent directory gracefully"
+    );
+    let profiles = result.unwrap();
+    assert!(
+      profiles.is_empty(),
+      "Should return empty vector for nonexistent directory"
+    );
+  }
+
+  #[test]
+  fn test_parse_firefox_profiles_ini_empty() {
+    let (importer, _temp_dir) = create_test_profile_importer();
+
+    let empty_content = "";
+    let profiles_dir = Path::new("/tmp");
+    let result = importer.parse_firefox_profiles_ini(empty_content, profiles_dir, "firefox");
+
+    assert!(result.is_ok(), "Should handle empty profiles.ini");
+    let profiles = result.unwrap();
+    assert!(
+      profiles.is_empty(),
+      "Should return empty vector for empty content"
+    );
+  }
+
+  #[test]
+  fn test_parse_firefox_profiles_ini_valid() {
+    let (importer, temp_dir) = create_test_profile_importer();
+
+    // Create a mock profile directory
+    let profiles_dir = temp_dir.path().join("profiles");
+    let profile_dir = profiles_dir.join("test.profile");
+    fs::create_dir_all(&profile_dir).expect("Should create profile directory");
+
+    // Create a prefs.js file to make it look like a valid profile
+    let prefs_file = profile_dir.join("prefs.js");
+    fs::write(&prefs_file, "// Firefox preferences").expect("Should create prefs.js");
+
+    let profiles_ini_content = r#"
+[Profile0]
+Name=Test Profile
+IsRelative=1
+Path=test.profile
+"#;
+
+    let result =
+      importer.parse_firefox_profiles_ini(profiles_ini_content, &profiles_dir, "firefox");
+
+    assert!(result.is_ok(), "Should parse valid profiles.ini");
+    let profiles = result.unwrap();
+    assert_eq!(profiles.len(), 1, "Should find one profile");
+    assert_eq!(profiles[0].name, "Firefox - Test Profile");
+    assert_eq!(profiles[0].browser, "firefox");
+  }
+
+  #[test]
+  fn test_copy_directory_recursive() {
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
+
+    // Create source directory structure
+    let source_dir = temp_dir.path().join("source");
+    let source_subdir = source_dir.join("subdir");
+    fs::create_dir_all(&source_subdir).expect("Should create source directories");
+
+    // Create some test files
+    let source_file1 = source_dir.join("file1.txt");
+    let source_file2 = source_subdir.join("file2.txt");
+    fs::write(&source_file1, "content1").expect("Should create file1");
+    fs::write(&source_file2, "content2").expect("Should create file2");
+
+    // Create destination directory
+    let dest_dir = temp_dir.path().join("dest");
+
+    // Copy recursively
+    let result = ProfileImporter::copy_directory_recursive(&source_dir, &dest_dir);
+    assert!(result.is_ok(), "Should copy directory successfully");
+
+    // Verify files were copied
+    let dest_file1 = dest_dir.join("file1.txt");
+    let dest_file2 = dest_dir.join("subdir").join("file2.txt");
+
+    assert!(dest_file1.exists(), "file1.txt should be copied");
+    assert!(dest_file2.exists(), "file2.txt should be copied");
+
+    let content1 = fs::read_to_string(&dest_file1).expect("Should read file1");
+    let content2 = fs::read_to_string(&dest_file2).expect("Should read file2");
+
+    assert_eq!(content1, "content1", "file1 content should match");
+    assert_eq!(content2, "content2", "file2 content should match");
+  }
+
+  #[test]
+  fn test_get_default_version_for_browser_no_versions() {
+    let (importer, _temp_dir) = create_test_profile_importer();
+
+    // This should fail since no versions are downloaded in test environment
+    let result = importer.get_default_version_for_browser("firefox");
+    assert!(
+      result.is_err(),
+      "Should fail when no versions are available"
+    );
+
+    let error_msg = result.unwrap_err().to_string();
+    assert!(
+      error_msg.contains("No downloaded versions found"),
+      "Error should mention no versions found"
+    );
+  }
+}

src-tauri/src/proxy_manager.rs

@@ -18,6 +18,8 @@ pub struct ProxyInfo {
   pub upstream_port: u16,
   pub upstream_type: String,
   pub local_port: u16,
+  // Optional profile name to which this proxy instance is logically tied
+  pub profile_name: Option<String>,
 }
 
 // Stored proxy configuration with name and ID for reuse
@@ -51,7 +53,9 @@ pub struct ProxyManager {
   active_proxies: Mutex<HashMap<u32, ProxyInfo>>, // Maps browser process ID to proxy info
   // Store proxy info by profile name for persistence across browser restarts
   profile_proxies: Mutex<HashMap<String, ProxySettings>>, // Maps profile name to proxy settings
-  stored_proxies: Mutex<HashMap<String, StoredProxy>>,    // Maps proxy ID to stored proxy
+  // Track active proxy IDs by profile name for targeted cleanup
+  profile_active_proxy_ids: Mutex<HashMap<String, String>>, // Maps profile name to proxy id
+  stored_proxies: Mutex<HashMap<String, StoredProxy>>,      // Maps proxy ID to stored proxy
   base_dirs: BaseDirs,
 }
 
@@ -61,6 +65,7 @@ impl ProxyManager {
     let manager = Self {
       active_proxies: Mutex::new(HashMap::new()),
       profile_proxies: Mutex::new(HashMap::new()),
+      profile_active_proxy_ids: Mutex::new(HashMap::new()),
       stored_proxies: Mutex::new(HashMap::new()),
       base_dirs,
     };
@@ -257,20 +262,94 @@ impl ProxyManager {
     browser_pid: u32,
     profile_name: Option<&str>,
   ) -> Result<ProxySettings, String> {
-    // Check if we already have a proxy for this browser
+    // First, proactively cleanup any dead proxies so we don't accidentally reuse stale ones
+    let _ = self.cleanup_dead_proxies(app_handle.clone()).await;
+
+    // If we have a previous proxy tied to this profile, and the upstream settings are changing,
+    // stop it before starting a new one so the change takes effect immediately.
+    if let Some(name) = profile_name {
+      // Check if we have an active proxy recorded for this profile
+      let maybe_existing_id = {
+        let map = self.profile_active_proxy_ids.lock().unwrap();
+        map.get(name).cloned()
+      };
+
+      if let Some(existing_id) = maybe_existing_id {
+        // Find the existing proxy info
+        let existing_info = {
+          let proxies = self.active_proxies.lock().unwrap();
+          proxies.values().find(|p| p.id == existing_id).cloned()
+        };
+
+        if let Some(existing) = existing_info {
+          let desired_type = proxy_settings
+            .map(|p| p.proxy_type.as_str())
+            .unwrap_or("DIRECT");
+          let desired_host = proxy_settings.map(|p| p.host.as_str()).unwrap_or("DIRECT");
+          let desired_port = proxy_settings.map(|p| p.port).unwrap_or(0);
+
+          let is_same_upstream = existing.upstream_type == desired_type
+            && existing.upstream_host == desired_host
+            && existing.upstream_port == desired_port;
+
+          if !is_same_upstream {
+            // Stop the previous proxy tied to this profile (best effort)
+            // We don't know the original PID mapping that created it; iterate to find its key
+            let pid_to_stop = {
+              let proxies = self.active_proxies.lock().unwrap();
+              proxies.iter().find_map(|(pid, info)| {
+                if info.id == existing_id {
+                  Some(*pid)
+                } else {
+                  None
+                }
+              })
+            };
+            if let Some(pid) = pid_to_stop {
+              let _ = self.stop_proxy(app_handle.clone(), pid).await;
+            }
+          }
+        }
+      }
+    }
+    // Check if we already have a proxy for this browser PID. If it exists but the upstream
+    // settings don't match the newly requested ones, stop it and create a new proxy so that
+    // changes take effect immediately.
+    let mut needs_restart = false;
     {
       let proxies = self.active_proxies.lock().unwrap();
-      if let Some(proxy) = proxies.get(&browser_pid) {
-        return Ok(ProxySettings {
-          proxy_type: "http".to_string(),
-          host: "127.0.0.1".to_string(), // Use 127.0.0.1 instead of localhost for better compatibility
-          port: proxy.local_port,
-          username: None,
-          password: None,
-        });
+      if let Some(existing) = proxies.get(&browser_pid) {
+        let desired_type = proxy_settings
+          .map(|p| p.proxy_type.as_str())
+          .unwrap_or("DIRECT");
+        let desired_host = proxy_settings.map(|p| p.host.as_str()).unwrap_or("DIRECT");
+        let desired_port = proxy_settings.map(|p| p.port).unwrap_or(0);
+
+        let is_same_upstream = existing.upstream_type == desired_type
+          && existing.upstream_host == desired_host
+          && existing.upstream_port == desired_port;
+
+        if is_same_upstream {
+          // Reuse existing local proxy
+          return Ok(ProxySettings {
+            proxy_type: "http".to_string(),
+            host: "127.0.0.1".to_string(),
+            port: existing.local_port,
+            username: None,
+            password: None,
+          });
+        } else {
+          // Upstream changed; we must restart the local proxy so that traffic is routed correctly
+          needs_restart = true;
+        }
       }
     }
 
+    if needs_restart {
+      // Best-effort stop of the old proxy for this PID before starting a new one
+      let _ = self.stop_proxy(app_handle.clone(), browser_pid).await;
+    }
+
     // Check if we have a preferred port for this profile
     let preferred_port = if let Some(name) = profile_name {
       let profile_proxies = self.profile_proxies.lock().unwrap();
@@ -367,6 +446,7 @@ impl ProxyManager {
         .map(|p| p.proxy_type.clone())
         .unwrap_or_else(|| "DIRECT".to_string()),
       local_port,
+      profile_name: profile_name.map(|s| s.to_string()),
     };
 
     // Store the proxy info
@@ -381,6 +461,9 @@ impl ProxyManager {
         let mut profile_proxies = self.profile_proxies.lock().unwrap();
         profile_proxies.insert(name.to_string(), proxy_settings.clone());
       }
+      // Also record the active proxy id for this profile for quick cleanup on changes
+      let mut map = self.profile_active_proxy_ids.lock().unwrap();
+      map.insert(name.to_string(), proxy_info.id.clone());
     }
 
     // Return proxy settings for the browser
@@ -399,10 +482,10 @@ impl ProxyManager {
     app_handle: tauri::AppHandle,
     browser_pid: u32,
   ) -> Result<(), String> {
-    let proxy_id = {
+    let (proxy_id, profile_name): (String, Option<String>) = {
       let mut proxies = self.active_proxies.lock().unwrap();
       match proxies.remove(&browser_pid) {
-        Some(proxy) => proxy.id,
+        Some(proxy) => (proxy.id, proxy.profile_name.clone()),
         None => return Ok(()), // No proxy to stop
       }
     };
@@ -415,7 +498,7 @@ impl ProxyManager {
       .arg("proxy")
       .arg("stop")
       .arg("--id")
-      .arg(proxy_id);
+      .arg(&proxy_id);
 
     let output = nodecar.output().await.unwrap();
 
@@ -425,6 +508,16 @@ impl ProxyManager {
       // We still return Ok since we've already removed the proxy from our tracking
     }
 
+    // Clear profile-to-proxy mapping if it references this proxy
+    if let Some(name) = profile_name {
+      let mut map = self.profile_active_proxy_ids.lock().unwrap();
+      if let Some(current_id) = map.get(&name) {
+        if current_id == &proxy_id {
+          map.remove(&name);
+        }
+      }
+    }
+
     Ok(())
   }
 
@@ -467,13 +560,6 @@ impl ProxyManager {
 
     Ok(dead_pids)
   }
-
-  // Get all active proxy PIDs for monitoring
-  #[allow(dead_code)]
-  pub fn get_active_proxy_pids(&self) -> Vec<u32> {
-    let proxies = self.active_proxies.lock().unwrap();
-    proxies.keys().copied().collect()
-  }
 }
 
 // Create a singleton instance of the proxy manager
@@ -573,8 +659,23 @@ mod tests {
       password: Some("pass".to_string()),
     };
 
-    assert!(!valid_settings.host.is_empty());
-    assert!(valid_settings.port > 0);
+    assert!(
+      !valid_settings.host.is_empty(),
+      "Valid settings should have non-empty host"
+    );
+    assert!(
+      valid_settings.port > 0,
+      "Valid settings should have positive port"
+    );
+    assert_eq!(valid_settings.proxy_type, "http", "Proxy type should match");
+    assert!(
+      valid_settings.username.is_some(),
+      "Username should be present"
+    );
+    assert!(
+      valid_settings.password.is_some(),
+      "Password should be present"
+    );
 
     // Test proxy settings with empty values
     let empty_settings = ProxySettings {
@@ -585,7 +686,16 @@ mod tests {
       password: None,
     };
 
-    assert!(empty_settings.host.is_empty());
+    assert!(
+      empty_settings.host.is_empty(),
+      "Empty settings should have empty host"
+    );
+    assert_eq!(
+      empty_settings.port, 0,
+      "Empty settings should have zero port"
+    );
+    assert!(empty_settings.username.is_none(), "Username should be None");
+    assert!(empty_settings.password.is_none(), "Password should be None");
   }
 
   #[tokio::test]
@@ -607,6 +717,7 @@ mod tests {
           upstream_port: 3128,
           upstream_type: "http".to_string(),
           local_port: (8000 + i) as u16,
+          profile_name: None,
         };
 
         // Add proxy
@@ -743,7 +854,7 @@ mod tests {
     };
 
     // Test command arguments match expected format
-    let _expected_args = [
+    let expected_args = [
       "proxy",
       "start",
       "--host",
@@ -759,11 +870,37 @@ mod tests {
     ];
 
     // This test verifies the argument structure without actually running the command
-    assert_eq!(proxy_settings.host, "proxy.example.com");
-    assert_eq!(proxy_settings.port, 8080);
-    assert_eq!(proxy_settings.proxy_type, "http");
-    assert_eq!(proxy_settings.username.as_ref().unwrap(), "user");
-    assert_eq!(proxy_settings.password.as_ref().unwrap(), "pass");
+    assert_eq!(
+      proxy_settings.host, "proxy.example.com",
+      "Host should match expected value"
+    );
+    assert_eq!(
+      proxy_settings.port, 8080,
+      "Port should match expected value"
+    );
+    assert_eq!(
+      proxy_settings.proxy_type, "http",
+      "Proxy type should match expected value"
+    );
+    assert_eq!(
+      proxy_settings.username.as_ref().unwrap(),
+      "user",
+      "Username should match expected value"
+    );
+    assert_eq!(
+      proxy_settings.password.as_ref().unwrap(),
+      "pass",
+      "Password should match expected value"
+    );
+
+    // Verify expected args structure
+    assert_eq!(expected_args[0], "proxy", "First arg should be 'proxy'");
+    assert_eq!(expected_args[1], "start", "Second arg should be 'start'");
+    assert_eq!(expected_args[2], "--host", "Third arg should be '--host'");
+    assert_eq!(
+      expected_args[3], "proxy.example.com",
+      "Fourth arg should be host value"
+    );
   }
 
   // Test the CLI detachment specifically - ensure the CLI exits properly

src-tauri/src/settings_manager.rs

@@ -207,7 +207,7 @@ pub async fn clear_all_version_cache_and_refetch(
   // Disable all browsers during the update process
   let auto_updater = crate::auto_updater::AutoUpdater::instance();
   let supported_browsers =
-    crate::browser_version_service::BrowserVersionService::instance().get_supported_browsers();
+    crate::browser_version_manager::BrowserVersionManager::instance().get_supported_browsers();
 
   // Load current state and disable all browsers
   let mut state = auto_updater
@@ -245,3 +245,213 @@ pub async fn clear_all_version_cache_and_refetch(
 lazy_static::lazy_static! {
   static ref SETTINGS_MANAGER: SettingsManager = SettingsManager::new();
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use std::env;
+  use tempfile::TempDir;
+
+  fn create_test_settings_manager() -> (SettingsManager, TempDir) {
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
+
+    // Set up a temporary home directory for testing
+    env::set_var("HOME", temp_dir.path());
+
+    let manager = SettingsManager::new();
+    (manager, temp_dir)
+  }
+
+  #[test]
+  fn test_settings_manager_creation() {
+    let (_manager, _temp_dir) = create_test_settings_manager();
+    // Test passes if no panic occurs
+  }
+
+  #[test]
+  fn test_default_app_settings() {
+    let default_settings = AppSettings::default();
+
+    assert!(
+      !default_settings.set_as_default_browser,
+      "Default should not set as default browser"
+    );
+    assert_eq!(
+      default_settings.theme, "system",
+      "Default theme should be system"
+    );
+  }
+
+  #[test]
+  fn test_default_table_sorting_settings() {
+    let default_sorting = TableSortingSettings::default();
+
+    assert_eq!(
+      default_sorting.column, "name",
+      "Default sort column should be name"
+    );
+    assert_eq!(
+      default_sorting.direction, "asc",
+      "Default sort direction should be asc"
+    );
+  }
+
+  #[test]
+  fn test_load_settings_nonexistent_file() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    let result = manager.load_settings();
+    assert!(
+      result.is_ok(),
+      "Should handle nonexistent settings file gracefully"
+    );
+
+    let settings = result.unwrap();
+    assert!(
+      !settings.set_as_default_browser,
+      "Should return default settings"
+    );
+    assert_eq!(settings.theme, "system", "Should return default theme");
+  }
+
+  #[test]
+  fn test_save_and_load_settings() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    let test_settings = AppSettings {
+      set_as_default_browser: true,
+      theme: "dark".to_string(),
+    };
+
+    // Save settings
+    let save_result = manager.save_settings(&test_settings);
+    assert!(save_result.is_ok(), "Should save settings successfully");
+
+    // Load settings back
+    let load_result = manager.load_settings();
+    assert!(load_result.is_ok(), "Should load settings successfully");
+
+    let loaded_settings = load_result.unwrap();
+    assert!(
+      loaded_settings.set_as_default_browser,
+      "Loaded settings should match saved"
+    );
+    assert_eq!(
+      loaded_settings.theme, "dark",
+      "Loaded theme should match saved"
+    );
+  }
+
+  #[test]
+  fn test_load_table_sorting_nonexistent_file() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    let result = manager.load_table_sorting();
+    assert!(
+      result.is_ok(),
+      "Should handle nonexistent sorting file gracefully"
+    );
+
+    let sorting = result.unwrap();
+    assert_eq!(sorting.column, "name", "Should return default sorting");
+    assert_eq!(sorting.direction, "asc", "Should return default direction");
+  }
+
+  #[test]
+  fn test_save_and_load_table_sorting() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    let test_sorting = TableSortingSettings {
+      column: "browser".to_string(),
+      direction: "desc".to_string(),
+    };
+
+    // Save sorting
+    let save_result = manager.save_table_sorting(&test_sorting);
+    assert!(save_result.is_ok(), "Should save sorting successfully");
+
+    // Load sorting back
+    let load_result = manager.load_table_sorting();
+    assert!(load_result.is_ok(), "Should load sorting successfully");
+
+    let loaded_sorting = load_result.unwrap();
+    assert_eq!(
+      loaded_sorting.column, "browser",
+      "Loaded column should match saved"
+    );
+    assert_eq!(
+      loaded_sorting.direction, "desc",
+      "Loaded direction should match saved"
+    );
+  }
+
+  #[test]
+  fn test_should_show_settings_on_startup() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    let result = manager.should_show_settings_on_startup();
+    assert!(result.is_ok(), "Should not fail");
+
+    let should_show = result.unwrap();
+    assert!(
+      !should_show,
+      "Should always return false as per implementation"
+    );
+  }
+
+  #[test]
+  fn test_load_corrupted_settings_file() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    // Create settings directory
+    let settings_dir = manager.get_settings_dir();
+    fs::create_dir_all(&settings_dir).expect("Should create settings directory");
+
+    // Write corrupted JSON
+    let settings_file = manager.get_settings_file();
+    fs::write(&settings_file, "{ invalid json }").expect("Should write corrupted file");
+
+    // Should handle corrupted file gracefully
+    let result = manager.load_settings();
+    assert!(
+      result.is_ok(),
+      "Should handle corrupted settings file gracefully"
+    );
+
+    let settings = result.unwrap();
+    assert!(
+      !settings.set_as_default_browser,
+      "Should return default settings for corrupted file"
+    );
+    assert_eq!(
+      settings.theme, "system",
+      "Should return default theme for corrupted file"
+    );
+  }
+
+  #[test]
+  fn test_settings_file_paths() {
+    let (manager, _temp_dir) = create_test_settings_manager();
+
+    let settings_dir = manager.get_settings_dir();
+    let settings_file = manager.get_settings_file();
+    let sorting_file = manager.get_table_sorting_file();
+
+    assert!(
+      settings_dir.to_string_lossy().contains("settings"),
+      "Settings dir should contain 'settings'"
+    );
+    assert!(
+      settings_file
+        .to_string_lossy()
+        .ends_with("app_settings.json"),
+      "Settings file should end with app_settings.json"
+    );
+    assert!(
+      sorting_file
+        .to_string_lossy()
+        .ends_with("table_sorting.json"),
+      "Sorting file should end with table_sorting.json"
+    );
+  }
+}

src-tauri/src/theme_detector.rs

@@ -1,548 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::process::Command;
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct SystemTheme {
-  pub theme: String, // "light", "dark", or "unknown"
-}
-
-pub struct ThemeDetector;
-
-impl ThemeDetector {
-  fn new() -> Self {
-    Self
-  }
-
-  pub fn instance() -> &'static ThemeDetector {
-    &THEME_DETECTOR
-  }
-
-  /// Detect the system theme preference
-  pub fn detect_system_theme(&self) -> SystemTheme {
-    #[cfg(target_os = "linux")]
-    return linux::detect_system_theme();
-
-    #[cfg(target_os = "macos")]
-    return macos::detect_system_theme();
-
-    #[cfg(target_os = "windows")]
-    return windows::detect_system_theme();
-
-    #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))]
-    return SystemTheme {
-      theme: "unknown".to_string(),
-    };
-  }
-}
-
-#[cfg(target_os = "linux")]
-mod linux {
-  use super::*;
-
-  pub fn detect_system_theme() -> SystemTheme {
-    // Try multiple methods in order of preference
-
-    // 1. Try GNOME/GTK settings via gsettings
-    if let Ok(theme) = detect_gnome_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 2. Try KDE Plasma settings via kreadconfig5/kreadconfig6
-    if let Ok(theme) = detect_kde_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 3. Try XFCE settings via xfconf-query
-    if let Ok(theme) = detect_xfce_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 4. Try looking at current GTK theme name
-    if let Ok(theme) = detect_gtk_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 5. Try dconf directly (fallback for GNOME-based systems)
-    if let Ok(theme) = detect_dconf_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 6. Try environment variables
-    if let Ok(theme) = detect_env_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 7. Try freedesktop portal
-    if let Ok(theme) = detect_portal_theme() {
-      return SystemTheme { theme };
-    }
-
-    // 8. Try looking at system color scheme files
-    if let Ok(theme) = detect_system_files_theme() {
-      return SystemTheme { theme };
-    }
-
-    // Fallback to unknown
-    SystemTheme {
-      theme: "unknown".to_string(),
-    }
-  }
-
-  fn detect_gnome_theme() -> Result<String, Box<dyn std::error::Error>> {
-    // Check if gsettings is available
-    if !is_command_available("gsettings") {
-      return Err("gsettings not available".into());
-    }
-
-    // Try GNOME color scheme first (modern way)
-    if let Ok(output) = Command::new("gsettings")
-      .args(["get", "org.gnome.desktop.interface", "color-scheme"])
-      .output()
-    {
-      if output.status.success() {
-        let scheme = String::from_utf8_lossy(&output.stdout).trim().to_string();
-        match scheme.as_str() {
-          "'prefer-dark'" => return Ok("dark".to_string()),
-          "'prefer-light'" => return Ok("light".to_string()),
-          _ => {}
-        }
-      }
-    }
-
-    // Fallback to GTK theme name detection
-    if let Ok(output) = Command::new("gsettings")
-      .args(["get", "org.gnome.desktop.interface", "gtk-theme"])
-      .output()
-    {
-      if output.status.success() {
-        let theme_name = String::from_utf8_lossy(&output.stdout)
-          .trim()
-          .trim_matches('\'')
-          .to_lowercase();
-
-        if theme_name.contains("dark") || theme_name.contains("night") {
-          return Ok("dark".to_string());
-        } else if theme_name.contains("light") || theme_name.contains("adwaita") {
-          return Ok("light".to_string());
-        }
-      }
-    }
-
-    Err("Could not detect GNOME theme".into())
-  }
-
-  fn detect_kde_theme() -> Result<String, Box<dyn std::error::Error>> {
-    // Try KDE Plasma 6 first
-    if is_command_available("kreadconfig6") {
-      if let Ok(output) = Command::new("kreadconfig6")
-        .args([
-          "--file",
-          "kdeglobals",
-          "--group",
-          "KDE",
-          "--key",
-          "LookAndFeelPackage",
-        ])
-        .output()
-      {
-        if output.status.success() {
-          let theme = String::from_utf8_lossy(&output.stdout)
-            .trim()
-            .to_lowercase();
-          if theme.contains("dark") || theme.contains("breezedark") {
-            return Ok("dark".to_string());
-          } else if theme.contains("light") || theme.contains("breeze") {
-            return Ok("light".to_string());
-          }
-        }
-      }
-
-      // Try color scheme as well
-      if let Ok(output) = Command::new("kreadconfig6")
-        .args([
-          "--file",
-          "kdeglobals",
-          "--group",
-          "General",
-          "--key",
-          "ColorScheme",
-        ])
-        .output()
-      {
-        if output.status.success() {
-          let scheme = String::from_utf8_lossy(&output.stdout)
-            .trim()
-            .to_lowercase();
-          if scheme.contains("dark") || scheme.contains("breezedark") {
-            return Ok("dark".to_string());
-          } else if scheme.contains("light") || scheme.contains("breeze") {
-            return Ok("light".to_string());
-          }
-        }
-      }
-    }
-
-    // Try KDE Plasma 5 as fallback
-    if is_command_available("kreadconfig5") {
-      if let Ok(output) = Command::new("kreadconfig5")
-        .args([
-          "--file",
-          "kdeglobals",
-          "--group",
-          "KDE",
-          "--key",
-          "LookAndFeelPackage",
-        ])
-        .output()
-      {
-        if output.status.success() {
-          let theme = String::from_utf8_lossy(&output.stdout)
-            .trim()
-            .to_lowercase();
-          if theme.contains("dark") || theme.contains("breezedark") {
-            return Ok("dark".to_string());
-          } else if theme.contains("light") || theme.contains("breeze") {
-            return Ok("light".to_string());
-          }
-        }
-      }
-    }
-
-    Err("Could not detect KDE theme".into())
-  }
-
-  fn detect_xfce_theme() -> Result<String, Box<dyn std::error::Error>> {
-    if !is_command_available("xfconf-query") {
-      return Err("xfconf-query not available".into());
-    }
-
-    // Check XFCE theme
-    if let Ok(output) = Command::new("xfconf-query")
-      .args(["-c", "xsettings", "-p", "/Net/ThemeName"])
-      .output()
-    {
-      if output.status.success() {
-        let theme = String::from_utf8_lossy(&output.stdout)
-          .trim()
-          .to_lowercase();
-        if theme.contains("dark") || theme.contains("night") {
-          return Ok("dark".to_string());
-        } else if theme.contains("light") {
-          return Ok("light".to_string());
-        }
-      }
-    }
-
-    // Check XFCE window manager theme as backup
-    if let Ok(output) = Command::new("xfconf-query")
-      .args(["-c", "xfwm4", "-p", "/general/theme"])
-      .output()
-    {
-      if output.status.success() {
-        let theme = String::from_utf8_lossy(&output.stdout)
-          .trim()
-          .to_lowercase();
-        if theme.contains("dark") || theme.contains("night") {
-          return Ok("dark".to_string());
-        } else if theme.contains("light") {
-          return Ok("light".to_string());
-        }
-      }
-    }
-
-    Err("Could not detect XFCE theme".into())
-  }
-
-  fn detect_gtk_theme() -> Result<String, Box<dyn std::error::Error>> {
-    // Try to read GTK3 settings file
-    if let Ok(home) = std::env::var("HOME") {
-      let gtk3_settings = std::path::Path::new(&home).join(".config/gtk-3.0/settings.ini");
-      if gtk3_settings.exists() {
-        if let Ok(content) = std::fs::read_to_string(gtk3_settings) {
-          for line in content.lines() {
-            if line.starts_with("gtk-theme-name=") {
-              let theme_name = line.split('=').nth(1).unwrap_or("").trim().to_lowercase();
-              if theme_name.contains("dark") || theme_name.contains("night") {
-                return Ok("dark".to_string());
-              } else if theme_name.contains("light") || theme_name.contains("adwaita") {
-                return Ok("light".to_string());
-              }
-            }
-          }
-        }
-      }
-
-      // Try GTK4 settings
-      let gtk4_settings = std::path::Path::new(&home).join(".config/gtk-4.0/settings.ini");
-      if gtk4_settings.exists() {
-        if let Ok(content) = std::fs::read_to_string(gtk4_settings) {
-          for line in content.lines() {
-            if line.starts_with("gtk-theme-name=") {
-              let theme_name = line.split('=').nth(1).unwrap_or("").trim().to_lowercase();
-              if theme_name.contains("dark") || theme_name.contains("night") {
-                return Ok("dark".to_string());
-              } else if theme_name.contains("light") || theme_name.contains("adwaita") {
-                return Ok("light".to_string());
-              }
-            }
-          }
-        }
-      }
-    }
-
-    Err("Could not detect GTK theme".into())
-  }
-
-  fn detect_dconf_theme() -> Result<String, Box<dyn std::error::Error>> {
-    if !is_command_available("dconf") {
-      return Err("dconf not available".into());
-    }
-
-    // Try reading color scheme directly from dconf
-    if let Ok(output) = Command::new("dconf")
-      .args(["read", "/org/gnome/desktop/interface/color-scheme"])
-      .output()
-    {
-      if output.status.success() {
-        let scheme = String::from_utf8_lossy(&output.stdout).trim().to_string();
-        match scheme.as_str() {
-          "'prefer-dark'" => return Ok("dark".to_string()),
-          "'prefer-light'" => return Ok("light".to_string()),
-          _ => {}
-        }
-      }
-    }
-
-    // Try reading GTK theme from dconf
-    if let Ok(output) = Command::new("dconf")
-      .args(["read", "/org/gnome/desktop/interface/gtk-theme"])
-      .output()
-    {
-      if output.status.success() {
-        let theme_name = String::from_utf8_lossy(&output.stdout)
-          .trim()
-          .trim_matches('\'')
-          .to_lowercase();
-
-        if theme_name.contains("dark") || theme_name.contains("night") {
-          return Ok("dark".to_string());
-        } else if theme_name.contains("light") || theme_name.contains("adwaita") {
-          return Ok("light".to_string());
-        }
-      }
-    }
-
-    Err("Could not detect dconf theme".into())
-  }
-
-  fn detect_env_theme() -> Result<String, Box<dyn std::error::Error>> {
-    // Check common environment variables
-    if let Ok(theme) = std::env::var("GTK_THEME") {
-      let theme_lower = theme.to_lowercase();
-      if theme_lower.contains("dark") || theme_lower.contains("night") {
-        return Ok("dark".to_string());
-      } else if theme_lower.contains("light") {
-        return Ok("light".to_string());
-      }
-    }
-
-    if let Ok(theme) = std::env::var("QT_STYLE_OVERRIDE") {
-      let theme_lower = theme.to_lowercase();
-      if theme_lower.contains("dark") || theme_lower.contains("night") {
-        return Ok("dark".to_string());
-      } else if theme_lower.contains("light") {
-        return Ok("light".to_string());
-      }
-    }
-
-    Err("Could not detect theme from environment".into())
-  }
-
-  fn detect_portal_theme() -> Result<String, Box<dyn std::error::Error>> {
-    if !is_command_available("busctl") {
-      return Err("busctl not available".into());
-    }
-
-    // Try to query the color scheme via org.freedesktop.portal.Settings
-    if let Ok(output) = Command::new("busctl")
-      .args([
-        "--user",
-        "call",
-        "org.freedesktop.portal.Desktop",
-        "/org/freedesktop/portal/desktop",
-        "org.freedesktop.portal.Settings",
-        "Read",
-        "ss",
-        "org.freedesktop.appearance",
-        "color-scheme",
-      ])
-      .output()
-    {
-      if output.status.success() {
-        let response = String::from_utf8_lossy(&output.stdout);
-        // Parse DBus response - look for preference values
-        if response.contains(" 1 ") {
-          return Ok("dark".to_string());
-        } else if response.contains(" 2 ") {
-          return Ok("light".to_string());
-        }
-      }
-    }
-
-    Err("Could not detect portal theme".into())
-  }
-
-  fn detect_system_files_theme() -> Result<String, Box<dyn std::error::Error>> {
-    // Check if we're in a dark terminal (heuristic)
-    if let Ok(term) = std::env::var("TERM") {
-      let term_lower = term.to_lowercase();
-      if term_lower.contains("dark") || term_lower.contains("night") {
-        return Ok("dark".to_string());
-      }
-    }
-
-    // Check if we can determine from desktop session
-    if let Ok(desktop) = std::env::var("XDG_CURRENT_DESKTOP") {
-      let desktop_lower = desktop.to_lowercase();
-      // Some desktops default to dark
-      if desktop_lower.contains("i3") || desktop_lower.contains("sway") {
-        // Window managers often use dark themes by default
-        return Ok("dark".to_string());
-      }
-    }
-
-    Err("Could not detect theme from system files".into())
-  }
-
-  fn is_command_available(command: &str) -> bool {
-    Command::new("which")
-      .arg(command)
-      .output()
-      .map(|output| output.status.success())
-      .unwrap_or(false)
-  }
-}
-
-#[cfg(target_os = "macos")]
-mod macos {
-  use super::*;
-
-  pub fn detect_system_theme() -> SystemTheme {
-    // macOS theme detection using osascript
-    if let Ok(output) = Command::new("osascript")
-      .args([
-        "-e",
-        "tell application \"System Events\" to tell appearance preferences to get dark mode",
-      ])
-      .output()
-    {
-      if output.status.success() {
-        let result = String::from_utf8_lossy(&output.stdout).to_string();
-        let result = result.trim();
-        match result {
-          "true" => {
-            return SystemTheme {
-              theme: "dark".to_string(),
-            }
-          }
-          "false" => {
-            return SystemTheme {
-              theme: "light".to_string(),
-            }
-          }
-          _ => {}
-        }
-      }
-    }
-
-    // Fallback method using defaults
-    if let Ok(output) = Command::new("defaults")
-      .args(["read", "-g", "AppleInterfaceStyle"])
-      .output()
-    {
-      if output.status.success() {
-        let style = String::from_utf8_lossy(&output.stdout).to_string();
-        let style = style.trim();
-        if style.to_lowercase() == "dark" {
-          return SystemTheme {
-            theme: "dark".to_string(),
-          };
-        }
-      }
-    }
-
-    // Default to light if we can't determine
-    SystemTheme {
-      theme: "light".to_string(),
-    }
-  }
-}
-
-#[cfg(target_os = "windows")]
-mod windows {
-  use super::*;
-
-  pub fn detect_system_theme() -> SystemTheme {
-    // Windows theme detection via registry
-    // This is a simplified implementation - you might want to use winreg crate for better registry access
-    if let Ok(output) = Command::new("reg")
-      .args([
-        "query",
-        "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
-        "/v",
-        "AppsUseLightTheme",
-      ])
-      .output()
-    {
-      if output.status.success() {
-        let result = String::from_utf8_lossy(&output.stdout);
-        if result.contains("0x0") {
-          return SystemTheme {
-            theme: "dark".to_string(),
-          };
-        } else if result.contains("0x1") {
-          return SystemTheme {
-            theme: "light".to_string(),
-          };
-        }
-      }
-    }
-
-    // Default to light if we can't determine
-    SystemTheme {
-      theme: "light".to_string(),
-    }
-  }
-}
-
-// Command to expose this functionality to the frontend
-#[tauri::command]
-pub fn get_system_theme() -> SystemTheme {
-  let detector = ThemeDetector::instance();
-  detector.detect_system_theme()
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn test_theme_detector_creation() {
-    let detector = ThemeDetector::instance();
-    let theme = detector.detect_system_theme();
-
-    // Should return a valid theme string
-    assert!(matches!(theme.theme.as_str(), "light" | "dark" | "unknown"));
-  }
-
-  #[test]
-  fn test_get_system_theme_command() {
-    let theme = get_system_theme();
-    assert!(matches!(theme.theme.as_str(), "light" | "dark" | "unknown"));
-  }
-}
-
-// Global singleton instance
-lazy_static::lazy_static! {
-  static ref THEME_DETECTOR: ThemeDetector = ThemeDetector::new();
-}

src-tauri/src/version_updater.rs

@@ -10,7 +10,7 @@ use tokio::sync::Mutex;
 use tokio::time::interval;
 
 use crate::auto_updater::AutoUpdater;
-use crate::browser_version_service::BrowserVersionService;
+use crate::browser_version_manager::BrowserVersionManager;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct VersionUpdateProgress {
@@ -41,13 +41,13 @@ impl Default for BackgroundUpdateState {
   fn default() -> Self {
     Self {
       last_update_time: 0,
-      update_interval_hours: 3,
+      update_interval_hours: 12,
     }
   }
 }
 
 pub struct VersionUpdater {
-  version_service: &'static BrowserVersionService,
+  version_service: &'static BrowserVersionManager,
   auto_updater: &'static AutoUpdater,
   app_handle: Option<tauri::AppHandle>,
 }
@@ -55,7 +55,7 @@ pub struct VersionUpdater {
 impl VersionUpdater {
   pub fn new() -> Self {
     Self {
-      version_service: BrowserVersionService::instance(),
+      version_service: BrowserVersionManager::instance(),
       auto_updater: AutoUpdater::instance(),
       app_handle: None,
     }
@@ -519,31 +519,138 @@ mod tests {
 
   #[test]
   fn test_should_run_background_update_logic() {
-    // Note: This test uses the shared state file, so results may vary
-    // depending on previous test runs. This is expected behavior.
+    // Create isolated test states to avoid interference
+    let current_time = VersionUpdater::get_current_timestamp();
 
     // Test with recent update (should not update)
     let recent_state = BackgroundUpdateState {
-      last_update_time: VersionUpdater::get_current_timestamp() - 60, // 1 minute ago
+      last_update_time: current_time - 60, // 1 minute ago
       update_interval_hours: 3,
     };
-    VersionUpdater::save_background_update_state(&recent_state).unwrap();
-    assert!(!VersionUpdater::should_run_background_update());
+
+    // Save and test recent state
+    let save_result = VersionUpdater::save_background_update_state(&recent_state);
+    assert!(save_result.is_ok(), "Should save recent state successfully");
+
+    let should_update_recent = VersionUpdater::should_run_background_update();
+    assert!(
+      !should_update_recent,
+      "Should not update when last update was recent"
+    );
 
     // Test with old update (should update)
     let old_state = BackgroundUpdateState {
-      last_update_time: VersionUpdater::get_current_timestamp() - (4 * 60 * 60), // 4 hours ago
+      last_update_time: current_time - (4 * 60 * 60), // 4 hours ago
       update_interval_hours: 3,
     };
-    VersionUpdater::save_background_update_state(&old_state).unwrap();
-    assert!(VersionUpdater::should_run_background_update());
+
+    // Save and test old state
+    let save_result = VersionUpdater::save_background_update_state(&old_state);
+    assert!(save_result.is_ok(), "Should save old state successfully");
+
+    let should_update_old = VersionUpdater::should_run_background_update();
+    assert!(should_update_old, "Should update when last update was old");
+
+    // Test with never updated (should update)
+    let never_updated_state = BackgroundUpdateState {
+      last_update_time: 0,
+      update_interval_hours: 3,
+    };
+
+    let save_result = VersionUpdater::save_background_update_state(&never_updated_state);
+    assert!(
+      save_result.is_ok(),
+      "Should save never updated state successfully"
+    );
+
+    let should_update_never = VersionUpdater::should_run_background_update();
+    assert!(
+      should_update_never,
+      "Should update when never updated before"
+    );
   }
 
   #[test]
   fn test_cache_dir_creation() {
     // This should not panic and should create the directory if it doesn't exist
-    let cache_dir = VersionUpdater::get_cache_dir().unwrap();
-    assert!(cache_dir.exists());
-    assert!(cache_dir.is_dir());
+    let cache_dir_result = VersionUpdater::get_cache_dir();
+    assert!(
+      cache_dir_result.is_ok(),
+      "Should successfully get cache directory"
+    );
+
+    let cache_dir = cache_dir_result.unwrap();
+    assert!(
+      cache_dir.exists(),
+      "Cache directory should exist after creation"
+    );
+    assert!(cache_dir.is_dir(), "Cache directory should be a directory");
+
+    // Verify the path contains expected components
+    let path_str = cache_dir.to_string_lossy();
+    assert!(
+      path_str.contains("version_cache"),
+      "Path should contain version_cache"
+    );
+
+    // Test that calling it again returns the same directory
+    let cache_dir2 = VersionUpdater::get_cache_dir().unwrap();
+    assert_eq!(
+      cache_dir, cache_dir2,
+      "Multiple calls should return same directory"
+    );
+  }
+
+  #[test]
+  fn test_version_updater_creation() {
+    let updater = VersionUpdater::new();
+
+    // Should have valid references to services
+    assert!(
+      !std::ptr::eq(updater.version_service as *const _, std::ptr::null()),
+      "Version service should not be null"
+    );
+    assert!(
+      !std::ptr::eq(updater.auto_updater as *const _, std::ptr::null()),
+      "Auto updater should not be null"
+    );
+    assert!(
+      updater.app_handle.is_none(),
+      "App handle should initially be None"
+    );
+  }
+
+  #[test]
+  fn test_get_current_timestamp() {
+    let timestamp1 = VersionUpdater::get_current_timestamp();
+
+    // Should be a reasonable timestamp (after year 2020)
+    assert!(
+      timestamp1 > 1577836800,
+      "Timestamp should be after 2020-01-01"
+    ); // 2020-01-01 00:00:00 UTC
+
+    // Should be before year 2100
+    assert!(
+      timestamp1 < 4102444800,
+      "Timestamp should be before 2100-01-01"
+    ); // 2100-01-01 00:00:00 UTC
+
+    // Wait a tiny bit and check it increases
+    std::thread::sleep(std::time::Duration::from_millis(1));
+    let timestamp2 = VersionUpdater::get_current_timestamp();
+    assert!(timestamp2 >= timestamp1, "Timestamp should not decrease");
+  }
+
+  #[test]
+  fn test_get_version_updater_singleton() {
+    let updater1 = get_version_updater();
+    let updater2 = get_version_updater();
+
+    // Should return the same Arc instance
+    assert!(
+      Arc::ptr_eq(&updater1, &updater2),
+      "Should return same singleton instance"
+    );
   }
 }

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Donut Browser",
-  "version": "0.8.2",
+  "version": "0.9.2",
   "identifier": "com.donutbrowser",
   "build": {
     "beforeDevCommand": "pnpm dev",

src-tauri/test-assets/test.txt

@@ -0,0 +1 @@
+Hello, World!

src-tauri/tests/common/mod.rs

@@ -52,26 +52,6 @@ impl TestUtils {
     Ok(nodecar_binary)
   }
 
-  /// Get the appropriate build target for the current platform
-  #[allow(dead_code)]
-  fn get_build_target() -> &'static str {
-    if cfg!(target_arch = "aarch64") && cfg!(target_os = "macos") {
-      "build:mac-aarch64"
-    } else if cfg!(target_arch = "x86_64") && cfg!(target_os = "macos") {
-      "build:mac-x86_64"
-    } else if cfg!(target_arch = "x86_64") && cfg!(target_os = "linux") {
-      "build:linux-x64"
-    } else if cfg!(target_arch = "aarch64") && cfg!(target_os = "linux") {
-      "build:linux-arm64"
-    } else if cfg!(target_arch = "x86_64") && cfg!(target_os = "windows") {
-      "build:win-x64"
-    } else if cfg!(target_arch = "aarch64") && cfg!(target_os = "windows") {
-      "build:win-arm64"
-    } else {
-      panic!("Unsupported target architecture for nodecar build")
-    }
-  }
-
   /// Execute a nodecar command with timeout
   pub async fn execute_nodecar_command(
     binary_path: &PathBuf,
@@ -150,58 +130,4 @@ impl TestUtils {
     println!("Test process cleanup completed");
     Ok(())
   }
-
-  /// Clean up all running nodecar processes (proxies and camoufox instances)
-  /// WARNING: This will stop ALL processes, including those from actual app usage
-  #[allow(dead_code)]
-  pub async fn cleanup_all_nodecar_processes(
-    nodecar_path: &PathBuf,
-  ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    println!("WARNING: Cleaning up ALL nodecar processes...");
-
-    // Get list of all proxies and stop them individually
-    let proxy_list_args = ["proxy", "list"];
-    if let Ok(list_output) = Self::execute_nodecar_command(nodecar_path, &proxy_list_args).await {
-      if list_output.status.success() {
-        let list_stdout = String::from_utf8(list_output.stdout)?;
-        if let Ok(proxies) = serde_json::from_str::<serde_json::Value>(&list_stdout) {
-          if let Some(proxy_array) = proxies.as_array() {
-            for proxy in proxy_array {
-              if let Some(proxy_id) = proxy["id"].as_str() {
-                let stop_args = ["proxy", "stop", "--id", proxy_id];
-                let _ = Self::execute_nodecar_command(nodecar_path, &stop_args).await;
-                println!("Stopped proxy: {proxy_id}");
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // Get list of all camoufox instances and stop them individually
-    let camoufox_list_args = ["camoufox", "list"];
-    if let Ok(list_output) = Self::execute_nodecar_command(nodecar_path, &camoufox_list_args).await
-    {
-      if list_output.status.success() {
-        let list_stdout = String::from_utf8(list_output.stdout)?;
-        if let Ok(instances) = serde_json::from_str::<serde_json::Value>(&list_stdout) {
-          if let Some(instance_array) = instances.as_array() {
-            for instance in instance_array {
-              if let Some(instance_id) = instance["id"].as_str() {
-                let stop_args = ["camoufox", "stop", "--id", instance_id];
-                let _ = Self::execute_nodecar_command(nodecar_path, &stop_args).await;
-                println!("Stopped camoufox instance: {instance_id}");
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // Give processes time to clean up
-    tokio::time::sleep(Duration::from_secs(2)).await;
-
-    println!("Nodecar process cleanup completed");
-    Ok(())
-  }
 }

src/app/layout.tsx

@@ -27,9 +27,9 @@ export default function RootLayout({
         className={`${geistSans.variable} ${geistMono.variable} antialiased overflow-hidden`}
       >
         <CustomThemeProvider>
-          <TooltipProvider>{children}</TooltipProvider>
-          <Toaster className="pointer-events-none" />
           <WindowDragArea />
+          <TooltipProvider>{children}</TooltipProvider>
+          <Toaster />
         </CustomThemeProvider>
       </body>
     </html>

src/app/page.tsx

@@ -5,7 +5,6 @@ import { listen } from "@tauri-apps/api/event";
 import { getCurrent } from "@tauri-apps/plugin-deep-link";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { CamoufoxConfigDialog } from "@/components/camoufox-config-dialog";
-import { ChangeVersionDialog } from "@/components/change-version-dialog";
 import { CreateProfileDialog } from "@/components/create-profile-dialog";
 import { DeleteConfirmationDialog } from "@/components/delete-confirmation-dialog";
 import { GroupAssignmentDialog } from "@/components/group-assignment-dialog";
@@ -17,14 +16,12 @@ import { PermissionDialog } from "@/components/permission-dialog";
 import { ProfilesDataTable } from "@/components/profile-data-table";
 import { ProfileSelectorDialog } from "@/components/profile-selector-dialog";
 import { ProxyManagementDialog } from "@/components/proxy-management-dialog";
-import { ProxySettingsDialog } from "@/components/proxy-settings-dialog";
 import { SettingsDialog } from "@/components/settings-dialog";
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { useAppUpdateNotifications } from "@/hooks/use-app-update-notifications";
 import type { PermissionType } from "@/hooks/use-permissions";
 import { usePermissions } from "@/hooks/use-permissions";
 import { useUpdateNotifications } from "@/hooks/use-update-notifications";
-import { showErrorToast } from "@/lib/toast-utils";
+import { showErrorToast, showToast } from "@/lib/toast-utils";
 import type { BrowserProfile, CamoufoxConfig, GroupWithCount } from "@/types";
 
 type BrowserTypeString =
@@ -43,11 +40,10 @@ interface PendingUrl {
 }
 
 export default function Home() {
+  const [isInitializing, setIsInitializing] = useState(true);
   const [profiles, setProfiles] = useState<BrowserProfile[]>([]);
   const [error, setError] = useState<string | null>(null);
-  const [proxyDialogOpen, setProxyDialogOpen] = useState(false);
   const [createProfileDialogOpen, setCreateProfileDialogOpen] = useState(false);
-  const [changeVersionDialogOpen, setChangeVersionDialogOpen] = useState(false);
   const [settingsDialogOpen, setSettingsDialogOpen] = useState(false);
   const [importProfileDialogOpen, setImportProfileDialogOpen] = useState(false);
   const [proxyManagementDialogOpen, setProxyManagementDialogOpen] =
@@ -64,10 +60,6 @@ export default function Home() {
   >([]);
   const [selectedProfiles, setSelectedProfiles] = useState<string[]>([]);
   const [pendingUrls, setPendingUrls] = useState<PendingUrl[]>([]);
-  const [currentProfileForProxy, setCurrentProfileForProxy] =
-    useState<BrowserProfile | null>(null);
-  const [currentProfileForVersionChange, setCurrentProfileForVersionChange] =
-    useState<BrowserProfile | null>(null);
   const [currentProfileForCamoufoxConfig, setCurrentProfileForCamoufoxConfig] =
     useState<BrowserProfile | null>(null);
   const [hasCheckedStartupPrompt, setHasCheckedStartupPrompt] = useState(false);
@@ -94,8 +86,18 @@ export default function Home() {
         "check_missing_binaries",
       );
 
-      if (missingBinaries.length > 0) {
-        console.log("Found missing binaries:", missingBinaries);
+      // Also check for missing GeoIP database
+      const missingGeoIP = await invoke<boolean>(
+        "check_missing_geoip_database",
+      );
+
+      if (missingBinaries.length > 0 || missingGeoIP) {
+        if (missingBinaries.length > 0) {
+          console.log("Found missing binaries:", missingBinaries);
+        }
+        if (missingGeoIP) {
+          console.log("Found missing GeoIP database for Camoufox");
+        }
 
         // Group missing binaries by browser type to avoid concurrent downloads
         const browserMap = new Map<string, string[]>();
@@ -110,34 +112,45 @@ export default function Home() {
         }
 
         // Show a toast notification about missing binaries and auto-download them
-        const missingList = Array.from(browserMap.entries())
+        let missingList = Array.from(browserMap.entries())
           .map(([browser, versions]) => `${browser}: ${versions.join(", ")}`)
           .join(", ");
 
-        console.log(`Downloading missing binaries: ${missingList}`);
+        if (missingGeoIP) {
+          if (missingList) {
+            missingList += ", GeoIP database for Camoufox";
+          } else {
+            missingList = "GeoIP database for Camoufox";
+          }
+        }
+
+        console.log(`Downloading missing components: ${missingList}`);
 
         try {
-          // Download missing binaries sequentially by browser type to prevent conflicts
+          // Download missing binaries and GeoIP database sequentially to prevent conflicts
           const downloaded = await invoke<string[]>(
             "ensure_all_binaries_exist",
           );
           if (downloaded.length > 0) {
             console.log(
-              "Successfully downloaded missing binaries:",
+              "Successfully downloaded missing components:",
               downloaded,
             );
           }
         } catch (downloadError) {
-          console.error("Failed to download missing binaries:", downloadError);
+          console.error(
+            "Failed to download missing components:",
+            downloadError,
+          );
           setError(
-            `Failed to download missing binaries: ${JSON.stringify(
+            `Failed to download missing components: ${JSON.stringify(
               downloadError,
             )}`,
           );
         }
       }
     } catch (err: unknown) {
-      console.error("Failed to check missing binaries:", err);
+      console.error("Failed to check missing components:", err);
     }
   }, []);
 
@@ -248,6 +261,28 @@ export default function Home() {
     }
   }, [hasCheckedStartupPrompt]);
 
+  // Warm up nodecar at startup and block UI until complete
+  useEffect(() => {
+    let cancelled = false;
+    (async () => {
+      try {
+        await invoke("warm_up_nodecar");
+      } catch (err) {
+        if (!cancelled) {
+          setError(
+            `Initialization failed: ${err instanceof Error ? err.message : String(err)}`,
+          );
+        }
+      } finally {
+        if (!cancelled) setIsInitializing(false);
+      }
+    })();
+
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+
   const checkAllPermissions = useCallback(async () => {
     try {
       // Wait for permissions to be initialized before checking
@@ -333,16 +368,6 @@ export default function Home() {
     }
   }, [handleUrlOpen]);
 
-  const openProxyDialog = useCallback((profile: BrowserProfile | null) => {
-    setCurrentProfileForProxy(profile);
-    setProxyDialogOpen(true);
-  }, []);
-
-  const openChangeVersionDialog = useCallback((profile: BrowserProfile) => {
-    setCurrentProfileForVersionChange(profile);
-    setChangeVersionDialogOpen(true);
-  }, []);
-
   const handleConfigureCamoufox = useCallback((profile: BrowserProfile) => {
     setCurrentProfileForCamoufoxConfig(profile);
     setCamoufoxConfigDialogOpen(true);
@@ -367,28 +392,6 @@ export default function Home() {
     [loadProfiles],
   );
 
-  const handleSaveProxy = useCallback(
-    async (proxyId: string | null) => {
-      setProxyDialogOpen(false);
-      setError(null);
-
-      try {
-        if (currentProfileForProxy) {
-          await invoke("update_profile_proxy", {
-            profileName: currentProfileForProxy.name,
-            proxyId: proxyId,
-          });
-        }
-        await loadProfiles();
-        // Trigger proxy data reload in the table
-      } catch (err: unknown) {
-        console.error("Failed to update proxy settings:", err);
-        setError(`Failed to update proxy settings: ${JSON.stringify(err)}`);
-      }
-    },
-    [currentProfileForProxy, loadProfiles],
-  );
-
   const loadGroups = useCallback(async () => {
     setGroupsLoading(true);
     try {
@@ -693,6 +696,39 @@ export default function Home() {
     loadGroups,
   ]);
 
+  // Show deprecation warning for unsupported profiles (with names)
+  useEffect(() => {
+    if (profiles.length === 0) return;
+
+    const deprecatedProfiles = profiles.filter(
+      (p) =>
+        ["tor-browser", "mullvad-browser"].includes(p.browser) ||
+        (p.release_type === "nightly" && p.browser !== "firefox-developer"),
+    );
+
+    if (deprecatedProfiles.length > 0) {
+      const deprecatedNames = deprecatedProfiles.map((p) => p.name).join(", ");
+
+      // Use a stable id to avoid duplicate toasts on re-renders
+      showToast({
+        id: "deprecated-profiles-warning",
+        type: "error",
+        title: "Some profiles will be deprecated soon",
+        description: `The following profiles will be deprecated soon: ${deprecatedNames}. Tor Browser, Mullvad Browser, and nightly profiles (except Firefox Developers Edition) will be removed in upcoming versions. Please check GitHub for migration instructions.`,
+        duration: 15000,
+        action: {
+          label: "Learn more",
+          onClick: () => {
+            const event = new CustomEvent("url-open-request", {
+              detail: "https://github.com/zhom/donutbrowser/discussions/66",
+            });
+            window.dispatchEvent(event);
+          },
+        },
+      });
+    }
+  }, [profiles]);
+
   useEffect(() => {
     if (profiles.length === 0) return;
 
@@ -727,57 +763,55 @@ export default function Home() {
 
   return (
     <div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen gap-8 font-[family-name:var(--font-geist-sans)]  bg-white dark:bg-black">
-      <main className="flex flex-col row-start-2 gap-8 items-center w-full max-w-3xl">
-        <Card className="gap-2 w-full">
-          <CardHeader>
-            <HomeHeader
-              selectedProfiles={selectedProfiles}
-              onBulkDelete={handleBulkDelete}
-              onBulkGroupAssignment={handleBulkGroupAssignment}
-              onCreateProfileDialogOpen={setCreateProfileDialogOpen}
-              onGroupManagementDialogOpen={setGroupManagementDialogOpen}
-              onImportProfileDialogOpen={setImportProfileDialogOpen}
-              onProxyManagementDialogOpen={setProxyManagementDialogOpen}
-              onSettingsDialogOpen={setSettingsDialogOpen}
-            />
-          </CardHeader>
-          <CardContent>
-            <GroupBadges
-              selectedGroupId={selectedGroupId}
-              onGroupSelect={handleSelectGroup}
-              groups={groups}
-              isLoading={areGroupsLoading}
-            />
-            <ProfilesDataTable
-              data={profiles}
-              onLaunchProfile={launchProfile}
-              onKillProfile={handleKillProfile}
-              onProxySettings={openProxyDialog}
-              onDeleteProfile={handleDeleteProfile}
-              onRenameProfile={handleRenameProfile}
-              onChangeVersion={openChangeVersionDialog}
-              onConfigureCamoufox={handleConfigureCamoufox}
-              runningProfiles={runningProfiles}
-              isUpdating={isUpdating}
-              onDeleteSelectedProfiles={handleDeleteSelectedProfiles}
-              onAssignProfilesToGroup={handleAssignProfilesToGroup}
-              selectedGroupId={selectedGroupId}
-              selectedProfiles={selectedProfiles}
-              onSelectedProfilesChange={setSelectedProfiles}
-            />
-          </CardContent>
-        </Card>
+      <main className="flex flex-col row-start-2 gap-6 items-center w-full max-w-3xl">
+        <div className="w-full">
+          <HomeHeader
+            selectedProfiles={selectedProfiles}
+            onBulkDelete={handleBulkDelete}
+            onBulkGroupAssignment={handleBulkGroupAssignment}
+            onCreateProfileDialogOpen={setCreateProfileDialogOpen}
+            onGroupManagementDialogOpen={setGroupManagementDialogOpen}
+            onImportProfileDialogOpen={setImportProfileDialogOpen}
+            onProxyManagementDialogOpen={setProxyManagementDialogOpen}
+            onSettingsDialogOpen={setSettingsDialogOpen}
+          />
+        </div>
+        <div className="space-y-4 w-full">
+          <GroupBadges
+            selectedGroupId={selectedGroupId}
+            onGroupSelect={handleSelectGroup}
+            groups={groups}
+            isLoading={areGroupsLoading}
+          />
+          <ProfilesDataTable
+            data={profiles}
+            onLaunchProfile={launchProfile}
+            onKillProfile={handleKillProfile}
+            onDeleteProfile={handleDeleteProfile}
+            onRenameProfile={handleRenameProfile}
+            onConfigureCamoufox={handleConfigureCamoufox}
+            runningProfiles={runningProfiles}
+            isUpdating={isUpdating}
+            onDeleteSelectedProfiles={handleDeleteSelectedProfiles}
+            onAssignProfilesToGroup={handleAssignProfilesToGroup}
+            selectedGroupId={selectedGroupId}
+            selectedProfiles={selectedProfiles}
+            onSelectedProfilesChange={setSelectedProfiles}
+          />
+        </div>
       </main>
 
-      <ProxySettingsDialog
-        isOpen={proxyDialogOpen}
-        onClose={() => {
-          setProxyDialogOpen(false);
-        }}
-        onSave={handleSaveProxy}
-        initialProxyId={currentProfileForProxy?.proxy_id}
-        browserType={currentProfileForProxy?.browser}
-      />
+      {isInitializing && (
+        <div className="fixed inset-0 z-[100000] backdrop-blur-sm bg-black/30 flex items-center justify-center">
+          <div className="bg-white dark:bg-neutral-900 rounded-xl p-6 shadow-xl border border-black/10 dark:border-white/10 w-[320px] text-center">
+            <div className="text-lg font-medium">Initializing</div>
+            <div className="mt-1 mb-2 text-sm text-gray-600 dark:text-gray-300">
+              Please don't close the app
+            </div>
+            <div className="mx-auto mb-4 w-8 h-8 rounded-full border-2 border-gray-300 animate-spin border-t-gray-900 dark:border-gray-700 dark:border-t-white" />
+          </div>
+        </div>
+      )}
 
       <CreateProfileDialog
         isOpen={createProfileDialogOpen}
@@ -795,15 +829,6 @@ export default function Home() {
         }}
       />
 
-      <ChangeVersionDialog
-        isOpen={changeVersionDialogOpen}
-        onClose={() => {
-          setChangeVersionDialogOpen(false);
-        }}
-        profile={currentProfileForVersionChange}
-        onVersionChanged={() => void loadProfiles()}
-      />
-
       <ImportProfileDialog
         isOpen={importProfileDialogOpen}
         onClose={() => {

src/components/app-update-toast.tsx

@@ -5,6 +5,7 @@ import { LuCheckCheck, LuCog, LuRefreshCw } from "react-icons/lu";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import type { AppUpdateInfo, AppUpdateProgress } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface AppUpdateToastProps {
   updateInfo: AppUpdateInfo;
@@ -16,26 +17,20 @@ interface AppUpdateToastProps {
 
 function getStageIcon(stage?: string, isUpdating?: boolean) {
   if (!isUpdating) {
-    return <FaDownload className="flex-shrink-0 w-5 h-5 text-blue-500" />;
+    return <FaDownload className="flex-shrink-0 w-5 h-5" />;
   }
 
   switch (stage) {
     case "downloading":
-      return <FaDownload className="flex-shrink-0 w-5 h-5 text-blue-500" />;
+      return <FaDownload className="flex-shrink-0 w-5 h-5" />;
     case "extracting":
-      return (
-        <LuRefreshCw className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
-      );
+      return <LuRefreshCw className="flex-shrink-0 w-5 h-5 animate-spin" />;
     case "installing":
-      return (
-        <LuCog className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
-      );
+      return <LuCog className="flex-shrink-0 w-5 h-5 animate-spin" />;
     case "completed":
-      return <LuCheckCheck className="flex-shrink-0 w-5 h-5 text-green-500" />;
+      return <LuCheckCheck className="flex-shrink-0 w-5 h-5" />;
     default:
-      return (
-        <LuRefreshCw className="flex-shrink-0 w-5 h-5 text-blue-500 animate-spin" />
-      );
+      return <LuRefreshCw className="flex-shrink-0 w-5 h-5 animate-spin" />;
   }
 }
 
@@ -78,7 +73,7 @@ export function AppUpdateToast({
       updateProgress.stage === "completed");
 
   return (
-    <div className="flex items-start p-4 w-full max-w-md bg-white rounded-lg border border-gray-200 shadow-lg dark:bg-gray-800 dark:border-gray-700">
+    <div className="flex items-start p-4 w-full max-w-md rounded-lg border shadow-lg bg-card border-border text-card-foreground">
       <div className="mr-3 mt-0.5">
         {getStageIcon(updateProgress?.stage, isUpdating)}
       </div>
@@ -133,9 +128,9 @@ export function AppUpdateToast({
                 {updateProgress.eta && ` • ${updateProgress.eta} remaining`}
               </p>
             </div>
-            <div className="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-1.5">
+            <div className="w-full bg-muted rounded-full h-1.5">
               <div
-                className="bg-blue-500 h-1.5 rounded-full transition-all duration-300"
+                className="bg-primary h-1.5 rounded-full transition-all duration-300"
                 style={{ width: `${updateProgress.percentage}%` }}
               />
             </div>
@@ -146,12 +141,12 @@ export function AppUpdateToast({
         {showOtherStageProgress && (
           <div className="mt-2 space-y-1">
             {/* Progress indicator for non-downloading stages */}
-            <div className="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-1.5">
+            <div className="w-full bg-muted rounded-full h-1.5">
               <div
                 className={`h-1.5 rounded-full transition-all duration-500 ${
                   updateProgress.stage === "completed"
                     ? "bg-green-500 w-full"
-                    : "bg-blue-500 w-full animate-pulse"
+                    : "bg-primary w-full animate-pulse"
                 }`}
               />
             </div>
@@ -160,22 +155,22 @@ export function AppUpdateToast({
 
         {!isUpdating && (
           <div className="flex gap-2 items-center mt-3">
-            <Button
+            <RippleButton
               onClick={() => void handleUpdateClick()}
               size="sm"
               className="flex gap-2 items-center text-xs"
             >
               <FaDownload className="w-3 h-3" />
               Update Now
-            </Button>
-            <Button
+            </RippleButton>
+            <RippleButton
               variant="outline"
               onClick={onDismiss}
               size="sm"
               className="text-xs"
             >
               Later
-            </Button>
+            </RippleButton>
           </div>
         )}
       </div>

src/components/camoufox-config-dialog.tsx

@@ -2,7 +2,6 @@
 
 import { useEffect, useState } from "react";
 import { SharedCamoufoxConfigForm } from "@/components/shared-camoufox-config-form";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -12,6 +11,8 @@ import {
 } from "@/components/ui/dialog";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import type { BrowserProfile, CamoufoxConfig } from "@/types";
+import { LoadingButton } from "./loading-button";
+import { RippleButton } from "./ui/ripple";
 
 interface CamoufoxConfigDialogProps {
   isOpen: boolean;
@@ -102,11 +103,11 @@ export function CamoufoxConfigDialog({
       <DialogContent className="max-w-3xl max-h-[90vh] flex flex-col">
         <DialogHeader className="flex-shrink-0">
           <DialogTitle>
-            Configure Camoufox Settings - {profile.name}
+            Configure Fingerprint Settings - {profile.name}
           </DialogTitle>
         </DialogHeader>
 
-        <ScrollArea className="flex-1 pr-6 h-[400px]">
+        <ScrollArea className="flex-1 h-[400px]">
           <div className="py-4">
             <SharedCamoufoxConfigForm
               config={config}
@@ -117,12 +118,16 @@ export function CamoufoxConfigDialog({
         </ScrollArea>
 
         <DialogFooter className="flex-shrink-0 pt-4 border-t">
-          <Button variant="outline" onClick={handleClose}>
+          <RippleButton variant="outline" onClick={handleClose}>
             Cancel
-          </Button>
-          <Button onClick={handleSave} disabled={isSaving}>
-            {isSaving ? "Saving..." : "Save Configuration"}
-          </Button>
+          </RippleButton>
+          <LoadingButton
+            isLoading={isSaving}
+            onClick={handleSave}
+            disabled={isSaving}
+          >
+            Save
+          </LoadingButton>
         </DialogFooter>
       </DialogContent>
     </Dialog>

src/components/change-version-dialog.tsx

@@ -1,307 +0,0 @@
-"use client";
-
-import { invoke } from "@tauri-apps/api/core";
-import { useCallback, useEffect, useState } from "react";
-import { LuTriangleAlert } from "react-icons/lu";
-import { LoadingButton } from "@/components/loading-button";
-import { ReleaseTypeSelector } from "@/components/release-type-selector";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Label } from "@/components/ui/label";
-import { useBrowserDownload } from "@/hooks/use-browser-download";
-import { getBrowserDisplayName } from "@/lib/browser-utils";
-import type { BrowserProfile, BrowserReleaseTypes } from "@/types";
-
-interface ChangeVersionDialogProps {
-  isOpen: boolean;
-  onClose: () => void;
-  profile: BrowserProfile | null;
-  onVersionChanged: () => void;
-}
-
-export function ChangeVersionDialog({
-  isOpen,
-  onClose,
-  profile,
-  onVersionChanged,
-}: ChangeVersionDialogProps) {
-  const [selectedReleaseType, setSelectedReleaseType] = useState<
-    "stable" | "nightly" | null
-  >(null);
-  const [releaseTypes, setReleaseTypes] = useState<BrowserReleaseTypes>({});
-  const [isLoadingReleaseTypes, setIsLoadingReleaseTypes] = useState(false);
-  const [isUpdating, setIsUpdating] = useState(false);
-  const [showDowngradeWarning, setShowDowngradeWarning] = useState(false);
-  const [acknowledgeDowngrade, setAcknowledgeDowngrade] = useState(false);
-
-  const {
-    downloadedVersions,
-    isBrowserDownloading,
-    loadDownloadedVersions,
-    downloadBrowser,
-    isVersionDownloaded,
-  } = useBrowserDownload();
-
-  const loadReleaseTypes = useCallback(async (browser: string) => {
-    setIsLoadingReleaseTypes(true);
-    try {
-      const releaseTypes = await invoke<BrowserReleaseTypes>(
-        "get_browser_release_types",
-        { browserStr: browser },
-      );
-      setReleaseTypes(releaseTypes);
-    } catch (error) {
-      console.error("Failed to load release types:", error);
-    } finally {
-      setIsLoadingReleaseTypes(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    if (
-      profile &&
-      selectedReleaseType &&
-      selectedReleaseType !== profile.release_type
-    ) {
-      // For simplicity, we'll show downgrade warning when switching from stable to nightly
-      // since nightly versions might be considered "downgrades" in terms of stability
-      const isDowngrade =
-        profile.release_type === "stable" && selectedReleaseType === "nightly";
-      setShowDowngradeWarning(isDowngrade);
-
-      if (!isDowngrade) {
-        setAcknowledgeDowngrade(false);
-      }
-    }
-  }, [selectedReleaseType, profile]);
-
-  const handleDownload = useCallback(async () => {
-    if (!profile || !selectedReleaseType) return;
-
-    const version =
-      selectedReleaseType === "stable"
-        ? releaseTypes.stable
-        : releaseTypes.nightly;
-    if (!version) return;
-
-    await downloadBrowser(profile.browser, version);
-  }, [profile, selectedReleaseType, downloadBrowser, releaseTypes]);
-
-  const handleVersionChange = useCallback(async () => {
-    if (!profile || !selectedReleaseType) return;
-
-    const version =
-      selectedReleaseType === "stable"
-        ? releaseTypes.stable
-        : releaseTypes.nightly;
-    if (!version) return;
-
-    setIsUpdating(true);
-    try {
-      await invoke("update_profile_version", {
-        profileName: profile.name,
-        version,
-      });
-      onVersionChanged();
-      onClose();
-    } catch (error) {
-      console.error("Failed to update profile version:", error);
-    } finally {
-      setIsUpdating(false);
-    }
-  }, [profile, selectedReleaseType, releaseTypes, onVersionChanged, onClose]);
-
-  const selectedVersion =
-    selectedReleaseType === "stable"
-      ? releaseTypes.stable
-      : releaseTypes.nightly;
-
-  const canUpdate =
-    profile &&
-    selectedReleaseType &&
-    selectedReleaseType !== profile.release_type &&
-    selectedVersion &&
-    isVersionDownloaded(selectedVersion) &&
-    (!showDowngradeWarning || acknowledgeDowngrade);
-
-  useEffect(() => {
-    if (isOpen && profile) {
-      // Set current release type based on profile
-      setSelectedReleaseType(profile.release_type as "stable" | "nightly");
-      setAcknowledgeDowngrade(false);
-      void loadReleaseTypes(profile.browser);
-      void loadDownloadedVersions(profile.browser);
-    }
-  }, [isOpen, profile, loadDownloadedVersions, loadReleaseTypes]);
-
-  if (!profile) return null;
-
-  return (
-    <Dialog open={isOpen} onOpenChange={onClose}>
-      <DialogContent className="max-w-md">
-        <DialogHeader>
-          <DialogTitle>Change Release Type</DialogTitle>
-        </DialogHeader>
-
-        <div className="grid gap-4 py-4">
-          <div className="space-y-2">
-            <Label className="text-sm font-medium">Profile:</Label>
-            <div className="p-2 text-sm rounded bg-muted">{profile.name}</div>
-          </div>
-
-          <div className="space-y-2">
-            <Label className="text-sm font-medium">Current Release:</Label>
-            <div className="p-2 text-sm capitalize rounded bg-muted">
-              {profile.release_type} ({profile.version})
-            </div>
-          </div>
-
-          {!releaseTypes.stable && !releaseTypes.nightly ? (
-            <Alert>
-              <AlertDescription>
-                No releases are available for{" "}
-                {getBrowserDisplayName(profile.browser)}.
-              </AlertDescription>
-            </Alert>
-          ) : !releaseTypes.stable || !releaseTypes.nightly ? (
-            <div className="space-y-4">
-              <Alert>
-                <AlertDescription>
-                  Only {profile.release_type} releases are available for{" "}
-                  {getBrowserDisplayName(profile.browser)}.
-                </AlertDescription>
-              </Alert>
-              <div className="grid gap-2">
-                <Label>New Release Type</Label>
-                {isLoadingReleaseTypes ? (
-                  <div className="text-sm text-muted-foreground">
-                    Loading release types...
-                  </div>
-                ) : (
-                  <div className="space-y-4">
-                    {selectedReleaseType &&
-                      selectedReleaseType !== profile.release_type &&
-                      selectedVersion &&
-                      !isVersionDownloaded(selectedVersion) && (
-                        <Alert>
-                          <AlertDescription>
-                            You must download{" "}
-                            {getBrowserDisplayName(profile.browser)}{" "}
-                            {selectedVersion} before switching to this release
-                            type. Use the download button above to get the
-                            latest version.
-                          </AlertDescription>
-                        </Alert>
-                      )}
-
-                    <ReleaseTypeSelector
-                      selectedReleaseType={selectedReleaseType}
-                      onReleaseTypeSelect={setSelectedReleaseType}
-                      availableReleaseTypes={releaseTypes}
-                      browser={profile.browser}
-                      isDownloading={isBrowserDownloading(profile.browser)}
-                      onDownload={() => {
-                        void handleDownload();
-                      }}
-                      placeholder="Select release type..."
-                      downloadedVersions={downloadedVersions}
-                    />
-                  </div>
-                )}
-              </div>
-            </div>
-          ) : (
-            <div className="grid gap-2">
-              <Label>New Release Type</Label>
-              {isLoadingReleaseTypes ? (
-                <div className="text-sm text-muted-foreground">
-                  Loading release types...
-                </div>
-              ) : (
-                <div className="space-y-4">
-                  {selectedReleaseType &&
-                    selectedReleaseType !== profile.release_type &&
-                    selectedVersion &&
-                    !isVersionDownloaded(selectedVersion) && (
-                      <Alert>
-                        <AlertDescription>
-                          You must download{" "}
-                          {getBrowserDisplayName(profile.browser)}{" "}
-                          {selectedVersion} before switching to this release
-                          type. Use the download button above to get the latest
-                          version.
-                        </AlertDescription>
-                      </Alert>
-                    )}
-
-                  <ReleaseTypeSelector
-                    selectedReleaseType={selectedReleaseType}
-                    onReleaseTypeSelect={setSelectedReleaseType}
-                    availableReleaseTypes={releaseTypes}
-                    browser={profile.browser}
-                    isDownloading={isBrowserDownloading(profile.browser)}
-                    onDownload={() => {
-                      void handleDownload();
-                    }}
-                    placeholder="Select release type..."
-                    downloadedVersions={downloadedVersions}
-                  />
-                </div>
-              )}
-            </div>
-          )}
-
-          {/* Downgrade Warning */}
-          {showDowngradeWarning && (
-            <Alert className="border-orange-700">
-              <LuTriangleAlert className="w-4 h-4 text-orange-700" />
-              <AlertTitle className="text-orange-700">
-                Stability Warning
-              </AlertTitle>
-              <AlertDescription className="text-orange-700">
-                You are about to switch from stable to nightly releases. Nightly
-                versions may be less stable and could contain bugs or incomplete
-                features.
-                <div className="flex items-center mt-3 space-x-2">
-                  <Checkbox
-                    id="acknowledge-downgrade"
-                    checked={acknowledgeDowngrade}
-                    onCheckedChange={(checked) => {
-                      setAcknowledgeDowngrade(checked as boolean);
-                    }}
-                  />
-                  <Label htmlFor="acknowledge-downgrade" className="text-sm">
-                    I understand the risks and want to proceed
-                  </Label>
-                </div>
-              </AlertDescription>
-            </Alert>
-          )}
-        </div>
-
-        <DialogFooter>
-          <Button variant="outline" onClick={onClose}>
-            Cancel
-          </Button>
-          <LoadingButton
-            isLoading={isUpdating}
-            onClick={() => {
-              void handleVersionChange();
-            }}
-            disabled={!canUpdate}
-          >
-            {isUpdating ? "Updating..." : "Update Release Type"}
-          </LoadingButton>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}

src/components/create-group-dialog.tsx

@@ -4,7 +4,6 @@ import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useState } from "react";
 import { toast } from "sonner";
 import { LoadingButton } from "@/components/loading-button";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -16,6 +15,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import type { ProfileGroup } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface CreateGroupDialogProps {
   isOpen: boolean;
@@ -98,15 +98,19 @@ export function CreateGroupDialog({
         </div>
 
         <DialogFooter>
-          <Button variant="outline" onClick={handleClose} disabled={isCreating}>
+          <RippleButton
+            variant="outline"
+            onClick={handleClose}
+            disabled={isCreating}
+          >
             Cancel
-          </Button>
+          </RippleButton>
           <LoadingButton
             isLoading={isCreating}
             onClick={() => void handleCreate()}
             disabled={!groupName.trim()}
           >
-            Create Group
+            Create
           </LoadingButton>
         </DialogFooter>
       </DialogContent>

src/components/create-profile-dialog.tsx

@@ -1,10 +1,11 @@
 "use client";
 
 import { invoke } from "@tauri-apps/api/core";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { GoPlus } from "react-icons/go";
 import { LoadingButton } from "@/components/loading-button";
+import { ProxyFormDialog } from "@/components/proxy-form-dialog";
 import { SharedCamoufoxConfigForm } from "@/components/shared-camoufox-config-form";
-import { Button } from "@/components/ui/button";
 import { Combobox } from "@/components/ui/combobox";
 import {
   Dialog,
@@ -27,6 +28,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { useBrowserDownload } from "@/hooks/use-browser-download";
 import { getBrowserIcon } from "@/lib/browser-utils";
 import type { BrowserReleaseTypes, CamoufoxConfig, StoredProxy } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 type BrowserTypeString =
   | "mullvad-browser"
@@ -56,44 +58,36 @@ interface CreateProfileDialogProps {
 interface BrowserOption {
   value: BrowserTypeString;
   label: string;
-  description: string;
 }
 
 const browserOptions: BrowserOption[] = [
   {
     value: "firefox",
     label: "Firefox",
-    description: "Mozilla's main web browser",
   },
   {
     value: "firefox-developer",
     label: "Firefox Developer Edition",
-    description: "Browser for developers with cutting-edge features",
   },
   {
     value: "chromium",
     label: "Chromium",
-    description: "Open-source version of Chrome",
   },
   {
     value: "brave",
     label: "Brave",
-    description: "Privacy-focused browser with ad blocking",
   },
   {
     value: "zen",
     label: "Zen Browser",
-    description: "Beautiful, customizable Firefox-based browser",
   },
   {
     value: "mullvad-browser",
     label: "Mullvad Browser",
-    description: "TOR Browser fork by Mullvad VPN",
   },
   {
     value: "tor-browser",
     label: "Tor Browser",
-    description: "Browse anonymously through the Tor network",
   },
 ];
 
@@ -104,15 +98,16 @@ export function CreateProfileDialog({
   selectedGroupId,
 }: CreateProfileDialogProps) {
   const [profileName, setProfileName] = useState("");
-  const [activeTab, setActiveTab] = useState("regular");
+  const [activeTab, setActiveTab] = useState("anti-detect");
 
   // Regular browser states
-  const [selectedBrowser, setSelectedBrowser] = useState<BrowserTypeString>();
+  const [selectedBrowser, setSelectedBrowser] =
+    useState<BrowserTypeString | null>("camoufox");
   const [selectedProxyId, setSelectedProxyId] = useState<string>();
 
   const handleTabChange = (value: string) => {
     if (value === "regular") {
-      setSelectedBrowser(undefined);
+      setSelectedBrowser(null);
     } else if (value === "anti-detect") {
       setSelectedBrowser("camoufox");
     }
@@ -125,14 +120,11 @@ export function CreateProfileDialog({
     geoip: true, // Default to automatic geoip
   });
 
-  // Common states
-  const [availableReleaseTypes, setAvailableReleaseTypes] =
-    useState<BrowserReleaseTypes>({});
-  const [camoufoxReleaseTypes, setCamoufoxReleaseTypes] =
-    useState<BrowserReleaseTypes>({});
   const [supportedBrowsers, setSupportedBrowsers] = useState<string[]>([]);
   const [storedProxies, setStoredProxies] = useState<StoredProxy[]>([]);
+  const [showProxyForm, setShowProxyForm] = useState(false);
   const [isCreating, setIsCreating] = useState(false);
+  const [releaseTypes, setReleaseTypes] = useState<BrowserReleaseTypes>();
   const loadingBrowserRef = useRef<string | null>(null);
 
   // Use the browser download hook
@@ -161,23 +153,49 @@ export function CreateProfileDialog({
     }
   }, []);
 
+  const checkAndDownloadGeoIPDatabase = useCallback(async () => {
+    try {
+      const isAvailable = await invoke<boolean>("is_geoip_database_available");
+      if (!isAvailable) {
+        console.log("GeoIP database not available, downloading...");
+        await invoke("download_geoip_database");
+        console.log("GeoIP database downloaded successfully");
+      }
+    } catch (error) {
+      console.error("Failed to check/download GeoIP database:", error);
+      // Don't show error to user as this is not critical for profile creation
+    }
+  }, []);
+
   const loadReleaseTypes = useCallback(
     async (browser: string) => {
       // Set loading state
       loadingBrowserRef.current = browser;
 
       try {
-        const releaseTypes = await invoke<BrowserReleaseTypes>(
+        const rawReleaseTypes = await invoke<BrowserReleaseTypes>(
           "get_browser_release_types",
           { browserStr: browser },
         );
 
         // Only update state if this browser is still the one we're loading
         if (loadingBrowserRef.current === browser) {
+          // Filter to enforce stable-only creation, except Firefox Developer (nightly-only)
           if (browser === "camoufox") {
-            setCamoufoxReleaseTypes(releaseTypes);
+            const filtered: BrowserReleaseTypes = {};
+            if (rawReleaseTypes.stable)
+              filtered.stable = rawReleaseTypes.stable;
+            setReleaseTypes(filtered);
+          } else if (browser === "firefox-developer") {
+            const filtered: BrowserReleaseTypes = {};
+            if (rawReleaseTypes.nightly)
+              filtered.nightly = rawReleaseTypes.nightly;
+            setReleaseTypes(filtered);
           } else {
-            setAvailableReleaseTypes(releaseTypes);
+            const filtered: BrowserReleaseTypes = {};
+            if (rawReleaseTypes.stable)
+              filtered.stable = rawReleaseTypes.stable;
+            setReleaseTypes(filtered);
           }
 
           // Load downloaded versions for this browser
@@ -202,8 +220,16 @@ export function CreateProfileDialog({
       void loadStoredProxies();
       // Load camoufox release types when dialog opens
       void loadReleaseTypes("camoufox");
+      // Check and download GeoIP database if needed for Camoufox
+      void checkAndDownloadGeoIPDatabase();
     }
-  }, [isOpen, loadSupportedBrowsers, loadStoredProxies, loadReleaseTypes]);
+  }, [
+    isOpen,
+    loadSupportedBrowsers,
+    loadStoredProxies,
+    loadReleaseTypes,
+    checkAndDownloadGeoIPDatabase,
+  ]);
 
   // Load release types when browser selection changes
   useEffect(() => {
@@ -211,40 +237,34 @@ export function CreateProfileDialog({
       // Cancel any previous loading
       loadingBrowserRef.current = null;
       // Clear previous release types immediately to prevent showing stale data
-      setAvailableReleaseTypes({});
+      setReleaseTypes({});
       void loadReleaseTypes(selectedBrowser);
     }
   }, [selectedBrowser, loadReleaseTypes]);
 
-  // Helper function to get the best available version and release type
+  // Helper function to get the best available version respecting rules
   const getBestAvailableVersion = useCallback(
-    (releaseTypes: BrowserReleaseTypes, browserType?: string) => {
-      // For Firefox Developer Edition, prefer nightly over stable
+    (browserType?: string) => {
+      if (!releaseTypes) return null;
+
+      // Firefox Developer Edition: nightly-only
       if (browserType === "firefox-developer" && releaseTypes.nightly) {
         return {
           version: releaseTypes.nightly,
           releaseType: "nightly" as const,
         };
       }
-
+      // All others: stable-only
       if (releaseTypes.stable) {
         return { version: releaseTypes.stable, releaseType: "stable" as const };
       }
-      if (releaseTypes.nightly) {
-        return {
-          version: releaseTypes.nightly,
-          releaseType: "nightly" as const,
-        };
-      }
       return null;
     },
-    [],
+    [releaseTypes],
   );
 
   const handleDownload = async (browserStr: string) => {
-    const releaseTypes =
-      browserStr === "camoufox" ? camoufoxReleaseTypes : availableReleaseTypes;
-    const bestVersion = getBestAvailableVersion(releaseTypes, browserStr);
+    const bestVersion = getBestAvailableVersion(browserStr);
 
     if (!bestVersion) {
       console.error("No version available for download");
@@ -270,10 +290,7 @@ export function CreateProfileDialog({
         }
 
         // Use the best available version (stable preferred, nightly as fallback)
-        const bestVersion = getBestAvailableVersion(
-          availableReleaseTypes,
-          selectedBrowser,
-        );
+        const bestVersion = getBestAvailableVersion(selectedBrowser);
         if (!bestVersion) {
           console.error("No version available");
           return;
@@ -289,10 +306,7 @@ export function CreateProfileDialog({
         });
       } else {
         // Anti-detect tab - always use Camoufox with best available version
-        const bestCamoufoxVersion = getBestAvailableVersion(
-          camoufoxReleaseTypes,
-          "camoufox",
-        );
+        const bestCamoufoxVersion = getBestAvailableVersion("camoufox");
         if (!bestCamoufoxVersion) {
           console.error("No Camoufox version available");
           return;
@@ -327,55 +341,68 @@ export function CreateProfileDialog({
 
     // Reset all states
     setProfileName("");
-    setSelectedBrowser(undefined);
+    setSelectedBrowser(null);
     setSelectedProxyId(undefined);
-    setAvailableReleaseTypes({});
-    setCamoufoxReleaseTypes({});
+    setReleaseTypes({});
     setCamoufoxConfig({
       geoip: true, // Reset to automatic geoip
     });
-    setActiveTab("regular");
+    setActiveTab("anti-detect");
     onClose();
   };
 
-  const isCreateDisabled = () => {
-    if (!profileName.trim()) return true;
-
-    if (!selectedBrowser) return true;
-
-    if (isBrowserCurrentlyDownloading(selectedBrowser)) return true;
-
-    if (!isBrowserVersionAvailable(selectedBrowser)) return true;
-
-    if (selectedBrowser === "camoufox") {
-      return !getBestAvailableVersion(camoufoxReleaseTypes, selectedBrowser);
-    }
-
-    return !getBestAvailableVersion(availableReleaseTypes, selectedBrowser);
-  };
-
   const updateCamoufoxConfig = (key: keyof CamoufoxConfig, value: unknown) => {
     setCamoufoxConfig((prev) => ({ ...prev, [key]: value }));
   };
 
   // Check if browser version is downloaded and available
-  const isBrowserVersionAvailable = (browserStr: string) => {
-    const releaseTypes =
-      browserStr === "camoufox" ? camoufoxReleaseTypes : availableReleaseTypes;
-    const bestVersion = getBestAvailableVersion(releaseTypes, browserStr);
-    return bestVersion && isVersionDownloaded(bestVersion.version);
-  };
+  const isBrowserVersionAvailable = useCallback(
+    (browserStr: string) => {
+      const bestVersion = getBestAvailableVersion(browserStr);
+      return bestVersion && isVersionDownloaded(bestVersion.version);
+    },
+    [isVersionDownloaded, getBestAvailableVersion],
+  );
 
   // Check if browser is currently downloading
-  const isBrowserCurrentlyDownloading = (browserStr: string) => {
-    return isBrowserDownloading(browserStr);
-  };
+  const isBrowserCurrentlyDownloading = useCallback(
+    (browserStr: string) => {
+      return isBrowserDownloading(browserStr);
+    },
+    [isBrowserDownloading],
+  );
 
-  console.log(selectedBrowser);
+  const isCreateDisabled = useMemo(() => {
+    if (!profileName.trim()) return true;
+    if (!selectedBrowser) return true;
+    if (isBrowserCurrentlyDownloading(selectedBrowser)) return true;
+    if (!isBrowserVersionAvailable(selectedBrowser)) return true;
+
+    return false;
+  }, [
+    profileName,
+    selectedBrowser,
+    isBrowserCurrentlyDownloading,
+    isBrowserVersionAvailable,
+  ]);
+
+  useEffect(() => {
+    console.log(
+      selectedBrowser,
+      selectedBrowser && isBrowserCurrentlyDownloading(selectedBrowser),
+      selectedBrowser && isBrowserVersionAvailable(selectedBrowser),
+      selectedBrowser && getBestAvailableVersion(selectedBrowser),
+    );
+  }, [
+    selectedBrowser,
+    isBrowserCurrentlyDownloading,
+    isBrowserVersionAvailable,
+    getBestAvailableVersion,
+  ]);
 
   return (
     <Dialog open={isOpen} onOpenChange={handleClose}>
-      <DialogContent className="max-w-4xl max-h-[90vh] flex flex-col">
+      <DialogContent className="w-full max-h-[90vh] flex flex-col">
         <DialogHeader className="flex-shrink-0">
           <DialogTitle>Create New Profile</DialogTitle>
         </DialogHeader>
@@ -385,214 +412,230 @@ export function CreateProfileDialog({
           onValueChange={handleTabChange}
           className="flex flex-col flex-1 w-full min-h-0"
         >
-          <TabsList className="grid flex-shrink-0 grid-cols-2 w-full">
-            <TabsTrigger value="regular">Regular Browsers</TabsTrigger>
+          <TabsList
+            className="grid flex-shrink-0 grid-cols-2 w-full"
+            defaultValue="anti-detect"
+          >
             <TabsTrigger value="anti-detect">Anti-Detect</TabsTrigger>
+            <TabsTrigger value="regular">Regular</TabsTrigger>
           </TabsList>
 
-          <ScrollArea className="flex-1 pr-6 h-[320px]">
-            <div className="py-4 space-y-6">
-              {/* Profile Name - Common to both tabs */}
-              <div className="space-y-2">
-                <Label htmlFor="profile-name">Profile Name</Label>
-                <Input
-                  id="profile-name"
-                  value={profileName}
-                  onChange={(e) => setProfileName(e.target.value)}
-                  placeholder="Enter profile name"
-                />
-              </div>
+          <ScrollArea className="flex-1 h-[330px] overflow-y-hidden">
+            <div className="flex flex-col justify-center items-center w-full">
+              <div className="py-4 space-y-6 w-full max-w-md">
+                {/* Profile Name - Common to both tabs */}
+                <div className="space-y-2">
+                  <Label htmlFor="profile-name">Profile Name</Label>
+                  <Input
+                    id="profile-name"
+                    value={profileName}
+                    onChange={(e) => setProfileName(e.target.value)}
+                    placeholder="Enter profile name"
+                  />
+                </div>
 
-              <TabsContent value="regular" className="mt-0 space-y-6">
-                <div className="space-y-4">
-                  <div className="space-y-2">
-                    <Label>Browser</Label>
-                    <Combobox
-                      options={browserOptions
-                        .filter((browser) =>
-                          supportedBrowsers.includes(browser.value),
-                        )
-                        .map((browser) => {
-                          const IconComponent = getBrowserIcon(browser.value);
-                          return {
-                            value: browser.value,
-                            label: browser.label,
-                            icon: IconComponent,
-                          };
-                        })}
-                      value={selectedBrowser || ""}
-                      onValueChange={(value) =>
-                        setSelectedBrowser(value as BrowserTypeString)
-                      }
-                      placeholder="Select a browser..."
-                      searchPlaceholder="Search browsers..."
-                    />
-                  </div>
+                <TabsContent value="regular" className="mt-0 space-y-6">
+                  <div className="space-y-4">
+                    <div className="space-y-2">
+                      <Label>Browser</Label>
+                      <Combobox
+                        options={browserOptions
+                          .filter(
+                            (browser) =>
+                              supportedBrowsers.includes(browser.value) &&
+                              browser.value !== "mullvad-browser" &&
+                              browser.value !== "tor-browser",
+                          )
+                          .map((browser) => {
+                            const IconComponent = getBrowserIcon(browser.value);
+                            return {
+                              value: browser.value,
+                              label: browser.label,
+                              icon: IconComponent,
+                            };
+                          })}
+                        value={selectedBrowser || ""}
+                        onValueChange={(value) =>
+                          setSelectedBrowser(value as BrowserTypeString)
+                        }
+                        placeholder="Select a browser..."
+                        searchPlaceholder="Search browsers..."
+                      />
+                    </div>
 
-                  {selectedBrowser && (
-                    <div className="space-y-3">
-                      {!isBrowserCurrentlyDownloading(selectedBrowser) &&
-                        !isBrowserVersionAvailable(selectedBrowser) &&
-                        getBestAvailableVersion(
-                          availableReleaseTypes,
-                          selectedBrowser,
-                        ) && (
-                          <div className="flex gap-3 items-center">
-                            <p className="text-sm text-muted-foreground">
-                              {(() => {
-                                const bestVersion = getBestAvailableVersion(
-                                  availableReleaseTypes,
+                    {selectedBrowser && (
+                      <div className="space-y-3">
+                        {!isBrowserCurrentlyDownloading(selectedBrowser) &&
+                          !isBrowserVersionAvailable(selectedBrowser) &&
+                          getBestAvailableVersion(selectedBrowser) && (
+                            <div className="flex gap-3 items-center">
+                              <p className="text-sm text-muted-foreground">
+                                {(() => {
+                                  const bestVersion =
+                                    getBestAvailableVersion(selectedBrowser);
+                                  return `Latest version (${bestVersion?.version}) needs to be downloaded`;
+                                })()}
+                              </p>
+                              <LoadingButton
+                                onClick={() => handleDownload(selectedBrowser)}
+                                isLoading={isBrowserCurrentlyDownloading(
                                   selectedBrowser,
-                                );
-                                return `${bestVersion?.releaseType === "stable" ? "Latest stable" : "Latest nightly"} version (${bestVersion?.version}) needs to be downloaded`;
+                                )}
+                                className="ml-auto"
+                                size="sm"
+                                disabled={isBrowserCurrentlyDownloading(
+                                  selectedBrowser,
+                                )}
+                              >
+                                Download
+                              </LoadingButton>
+                            </div>
+                          )}
+                        {!isBrowserCurrentlyDownloading(selectedBrowser) &&
+                          isBrowserVersionAvailable(selectedBrowser) && (
+                            <div className="text-sm text-muted-foreground">
+                              {(() => {
+                                const bestVersion =
+                                  getBestAvailableVersion(selectedBrowser);
+                                return `✓ Latest version (${bestVersion?.version}) is available`;
                               })()}
-                            </p>
-                            <LoadingButton
-                              onClick={() => handleDownload(selectedBrowser)}
-                              isLoading={isBrowserCurrentlyDownloading(
-                                selectedBrowser,
-                              )}
-                              size="sm"
-                              disabled={isBrowserCurrentlyDownloading(
-                                selectedBrowser,
-                              )}
-                            >
-                              Download
-                            </LoadingButton>
-                          </div>
-                        )}
-                      {!isBrowserCurrentlyDownloading(selectedBrowser) &&
-                        isBrowserVersionAvailable(selectedBrowser) && (
+                            </div>
+                          )}
+                        {isBrowserCurrentlyDownloading(selectedBrowser) && (
                           <div className="text-sm text-muted-foreground">
                             {(() => {
-                              const bestVersion = getBestAvailableVersion(
-                                availableReleaseTypes,
-                                selectedBrowser,
-                              );
-                              return `✓ ${bestVersion?.releaseType === "stable" ? "Latest stable" : "Latest nightly"} version (${bestVersion?.version}) is available`;
+                              const bestVersion =
+                                getBestAvailableVersion(selectedBrowser);
+                              return `Downloading version (${bestVersion?.version})...`;
                             })()}
                           </div>
                         )}
-                      {isBrowserCurrentlyDownloading(selectedBrowser) && (
-                        <div className="text-sm text-muted-foreground">
+                      </div>
+                    )}
+                  </div>
+                </TabsContent>
+
+                <TabsContent value="anti-detect" className="mt-0 space-y-6">
+                  <div className="space-y-6">
+                    {/* Camoufox Download Status */}
+                    {!isBrowserCurrentlyDownloading("camoufox") &&
+                      !isBrowserVersionAvailable("camoufox") &&
+                      getBestAvailableVersion("camoufox") && (
+                        <div className="flex gap-3 items-center p-3 rounded-md border">
+                          <p className="text-sm text-muted-foreground">
+                            {(() => {
+                              const bestVersion =
+                                getBestAvailableVersion("camoufox");
+                              return `Camoufox version (${bestVersion?.version}) needs to be downloaded`;
+                            })()}
+                          </p>
+                          <LoadingButton
+                            onClick={() => handleDownload("camoufox")}
+                            isLoading={isBrowserCurrentlyDownloading(
+                              "camoufox",
+                            )}
+                            size="sm"
+                            disabled={isBrowserCurrentlyDownloading("camoufox")}
+                          >
+                            {isBrowserCurrentlyDownloading("camoufox")
+                              ? "Downloading..."
+                              : "Download"}
+                          </LoadingButton>
+                        </div>
+                      )}
+                    {!isBrowserCurrentlyDownloading("camoufox") &&
+                      isBrowserVersionAvailable("camoufox") && (
+                        <div className="p-3 text-sm rounded-md border text-muted-foreground">
                           {(() => {
-                            const bestVersion = getBestAvailableVersion(
-                              availableReleaseTypes,
-                              selectedBrowser,
-                            );
-                            return `Downloading ${bestVersion?.releaseType === "stable" ? "stable" : "nightly"} version (${bestVersion?.version})...`;
+                            const bestVersion =
+                              getBestAvailableVersion("camoufox");
+                            return `✓ Camoufox version (${bestVersion?.version}) is available`;
                           })()}
                         </div>
                       )}
-                    </div>
-                  )}
-                </div>
-              </TabsContent>
-
-              <TabsContent value="anti-detect" className="mt-0 space-y-6">
-                <div className="space-y-6">
-                  {/* Camoufox Download Status */}
-                  {!isBrowserCurrentlyDownloading("camoufox") &&
-                    !isBrowserVersionAvailable("camoufox") &&
-                    getBestAvailableVersion(
-                      camoufoxReleaseTypes,
-                      "camoufox",
-                    ) && (
-                      <div className="flex gap-3 items-center p-3 rounded-md border">
-                        <p className="text-sm text-muted-foreground">
-                          {(() => {
-                            const bestVersion = getBestAvailableVersion(
-                              camoufoxReleaseTypes,
-                              "camoufox",
-                            );
-                            return `Camoufox ${bestVersion?.releaseType} version (${bestVersion?.version}) needs to be downloaded`;
-                          })()}
-                        </p>
-                        <LoadingButton
-                          onClick={() => handleDownload("camoufox")}
-                          isLoading={isBrowserCurrentlyDownloading("camoufox")}
-                          size="sm"
-                          disabled={isBrowserCurrentlyDownloading("camoufox")}
-                        >
-                          {isBrowserCurrentlyDownloading("camoufox")
-                            ? "Downloading..."
-                            : "Download"}
-                        </LoadingButton>
-                      </div>
-                    )}
-                  {!isBrowserCurrentlyDownloading("camoufox") &&
-                    isBrowserVersionAvailable("camoufox") && (
+                    {isBrowserCurrentlyDownloading("camoufox") && (
                       <div className="p-3 text-sm rounded-md border text-muted-foreground">
                         {(() => {
-                          const bestVersion = getBestAvailableVersion(
-                            camoufoxReleaseTypes,
-                            "camoufox",
-                          );
-                          return `✓ Camoufox ${bestVersion?.releaseType} version (${bestVersion?.version}) is available`;
+                          const bestVersion =
+                            getBestAvailableVersion("camoufox");
+                          return `Downloading Camoufox version (${bestVersion?.version})...`;
                         })()}
                       </div>
                     )}
-                  {isBrowserCurrentlyDownloading("camoufox") && (
-                    <div className="p-3 text-sm text-muted-foreground rounded-md border">
-                      {(() => {
-                        const bestVersion = getBestAvailableVersion(
-                          camoufoxReleaseTypes,
-                          "camoufox",
-                        );
-                        return `Downloading Camoufox ${bestVersion?.releaseType} version (${bestVersion?.version})...`;
-                      })()}
+
+                    <SharedCamoufoxConfigForm
+                      config={camoufoxConfig}
+                      onConfigChange={updateCamoufoxConfig}
+                      isCreating
+                    />
+                  </div>
+                </TabsContent>
+
+                {/* Proxy Selection - Common to both tabs - Always visible */}
+                <div className="space-y-3">
+                  <div className="flex justify-between items-center">
+                    <Label>Proxy</Label>
+                    <RippleButton
+                      size="sm"
+                      variant="outline"
+                      onClick={() => setShowProxyForm(true)}
+                      className="px-2 h-7 text-xs"
+                    >
+                      <GoPlus className="mr-1 w-3 h-3" /> Add Proxy
+                    </RippleButton>
+                  </div>
+                  {storedProxies.length > 0 ? (
+                    <Select
+                      value={selectedProxyId || "none"}
+                      onValueChange={(value) =>
+                        setSelectedProxyId(value === "none" ? undefined : value)
+                      }
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="No proxy" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="none">No proxy</SelectItem>
+                        {storedProxies.map((proxy) => (
+                          <SelectItem key={proxy.id} value={proxy.id}>
+                            {proxy.name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  ) : (
+                    <div className="flex gap-3 items-center p-3 text-sm rounded-md border text-muted-foreground">
+                      No proxies available. Add one to route this profile's
+                      traffic.
                     </div>
                   )}
-
-                  <SharedCamoufoxConfigForm
-                    config={camoufoxConfig}
-                    onConfigChange={updateCamoufoxConfig}
-                    isCreating
-                  />
                 </div>
-              </TabsContent>
-
-              {/* Proxy Selection - Common to both tabs - Compact without card */}
-              {storedProxies.length > 0 && (
-                <div className="space-y-3">
-                  <Label>Proxy</Label>
-                  <Select
-                    value={selectedProxyId || "none"}
-                    onValueChange={(value) =>
-                      setSelectedProxyId(value === "none" ? undefined : value)
-                    }
-                  >
-                    <SelectTrigger>
-                      <SelectValue placeholder="No proxy" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="none">No proxy</SelectItem>
-                      {storedProxies.map((proxy) => (
-                        <SelectItem key={proxy.id} value={proxy.id}>
-                          {proxy.name}{" "}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-              )}
+              </div>
             </div>
           </ScrollArea>
 
           <DialogFooter className="flex-shrink-0 pt-4 border-t">
-            <Button variant="outline" onClick={handleClose}>
+            <RippleButton variant="outline" onClick={handleClose}>
               Cancel
-            </Button>
+            </RippleButton>
             <LoadingButton
               onClick={handleCreate}
               isLoading={isCreating}
-              disabled={isCreateDisabled()}
+              disabled={isCreateDisabled}
             >
-              Create Profile
+              Create
             </LoadingButton>
           </DialogFooter>
         </Tabs>
       </DialogContent>
+      <ProxyFormDialog
+        isOpen={showProxyForm}
+        onClose={() => setShowProxyForm(false)}
+        onSave={(proxy) => {
+          setStoredProxies((prev) => [...prev, proxy]);
+          setSelectedProxyId(proxy.id);
+        }}
+      />
     </Dialog>
   );
 }

src/components/custom-toast.tsx

@@ -47,20 +47,23 @@
  * });
  * ```
  */
+/** biome-ignore-all lint/suspicious/noExplicitAny: TODO */
 
 import {
   LuCheckCheck,
   LuDownload,
   LuRefreshCw,
-  LuRocket,
   LuTriangleAlert,
 } from "react-icons/lu";
+import type { ExternalToast } from "sonner";
+import { RippleButton } from "./ui/ripple";
 
 interface BaseToastProps {
   id?: string;
   title: string;
   description?: string;
   duration?: number;
+  action?: ExternalToast["action"];
 }
 
 interface LoadingToastProps extends BaseToastProps {
@@ -123,72 +126,52 @@ type ToastProps =
 function getToastIcon(type: ToastProps["type"], stage?: string) {
   switch (type) {
     case "success":
-      return <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-green-500" />;
+      return <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-foreground" />;
     case "error":
-      return <LuTriangleAlert className="flex-shrink-0 w-4 h-4 text-red-500" />;
+      return (
+        <LuTriangleAlert className="flex-shrink-0 w-4 h-4 text-foreground" />
+      );
     case "download":
       if (stage === "completed") {
         return (
-          <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-green-500" />
+          <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-foreground" />
         );
       }
-      return <LuDownload className="flex-shrink-0 w-4 h-4 text-blue-500" />;
+      return <LuDownload className="flex-shrink-0 w-4 h-4 text-foreground" />;
 
     case "version-update":
       return (
-        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 animate-spin text-foreground" />
       );
     case "fetching":
       return (
-        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 animate-spin text-foreground" />
       );
     case "twilight-update":
       return (
-        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-purple-500 animate-spin" />
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 animate-spin text-foreground" />
       );
     case "loading":
       return (
-        <div className="flex-shrink-0 w-4 h-4 rounded-full border-2 border-blue-500 animate-spin border-t-transparent" />
+        <div className="flex-shrink-0 w-4 h-4 rounded-full border-2 animate-spin border-foreground border-t-transparent" />
       );
     default:
       return (
-        <div className="flex-shrink-0 w-4 h-4 rounded-full border-2 border-blue-500 animate-spin border-t-transparent" />
+        <div className="flex-shrink-0 w-4 h-4 rounded-full border-2 animate-spin border-foreground border-t-transparent" />
       );
   }
 }
 
 export function UnifiedToast(props: ToastProps) {
-  const { title, description, type } = props;
+  const { title, description, type, action } = props;
   const stage = "stage" in props ? props.stage : undefined;
   const progress = "progress" in props ? props.progress : undefined;
 
-  // Check if this is an auto-update toast
-  const isAutoUpdate = title.includes("update started");
-
   return (
-    <div
-      className={`flex items-start p-3 w-96 rounded-lg border shadow-lg ${
-        isAutoUpdate
-          ? "bg-emerald-50 border-emerald-200 dark:bg-emerald-950 dark:border-emerald-800"
-          : "bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700"
-      }`}
-      data-toast-type={isAutoUpdate ? "auto-update" : "default"}
-    >
-      <div className="mr-3 mt-0.5">
-        {isAutoUpdate ? (
-          <LuRocket className="flex-shrink-0 w-4 h-4 text-emerald-500" />
-        ) : (
-          getToastIcon(type, stage)
-        )}
-      </div>
+    <div className="flex items-start p-4 w-full max-w-md rounded-lg border shadow-lg bg-card border-border text-card-foreground">
+      <div className="mr-3 mt-0.5">{getToastIcon(type, stage)}</div>
       <div className="flex-1 min-w-0">
-        <p
-          className={`text-sm font-medium leading-tight ${
-            isAutoUpdate
-              ? "text-emerald-900 dark:text-emerald-100"
-              : "text-gray-900 dark:text-white"
-          }`}
-        >
+        <p className="text-sm font-semibold leading-tight text-foreground">
           {title}
         </p>
 
@@ -199,15 +182,15 @@ export function UnifiedToast(props: ToastProps) {
           stage === "downloading" && (
             <div className="mt-2 space-y-1">
               <div className="flex justify-between items-center">
-                <p className="flex-1 min-w-0 text-xs text-gray-600 dark:text-gray-300">
+                <p className="flex-1 min-w-0 text-xs text-muted-foreground">
                   {progress.percentage.toFixed(1)}%
                   {progress.speed && ` • ${progress.speed} MB/s`}
                   {progress.eta && ` • ${progress.eta} remaining`}
                 </p>
               </div>
-              <div className="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-1.5">
+              <div className="w-full bg-muted rounded-full h-1.5">
                 <div
-                  className="bg-blue-500 h-1.5 rounded-full transition-all duration-300"
+                  className="bg-foreground h-1.5 rounded-full transition-all duration-300"
                   style={{ width: `${progress.percentage}%` }}
                 />
               </div>
@@ -219,21 +202,21 @@ export function UnifiedToast(props: ToastProps) {
           progress &&
           "current_browser" in progress && (
             <div className="mt-2 space-y-1">
-              <p className="text-xs text-gray-600 dark:text-gray-300">
+              <p className="text-xs text-muted-foreground">
                 {progress.current_browser && (
                   <>Looking for updates for {progress.current_browser}</>
                 )}
               </p>
               <div className="flex items-center space-x-2">
-                <div className="flex-1 bg-gray-200 dark:bg-gray-700 rounded-full h-1.5 min-w-0">
+                <div className="flex-1 bg-muted rounded-full h-1.5 min-w-0">
                   <div
-                    className="bg-blue-500 h-1.5 rounded-full transition-all duration-300"
+                    className="bg-foreground h-1.5 rounded-full transition-all duration-300"
                     style={{
                       width: `${(progress.current / progress.total) * 100}%`,
                     }}
                   />
                 </div>
-                <span className="w-8 text-xs text-right text-gray-500 whitespace-nowrap dark:text-gray-400 shrink-0">
+                <span className="w-8 text-xs text-right whitespace-nowrap text-muted-foreground shrink-0">
                   {progress.current}/{progress.total}
                 </span>
               </div>
@@ -243,13 +226,13 @@ export function UnifiedToast(props: ToastProps) {
         {/* Twilight update progress */}
         {type === "twilight-update" && (
           <div className="mt-2">
-            <p className="text-xs text-gray-600 dark:text-gray-300">
+            <p className="text-xs text-muted-foreground">
               {"hasUpdate" in props && props.hasUpdate
                 ? "New twilight build available for download"
                 : "Checking for twilight updates..."}
             </p>
             {props.browserName && (
-              <p className="mt-1 text-xs text-purple-600 dark:text-purple-400">
+              <p className="mt-1 text-xs text-muted-foreground">
                 {props.browserName} • Rolling Release
               </p>
             )}
@@ -258,13 +241,7 @@ export function UnifiedToast(props: ToastProps) {
 
         {/* Description */}
         {description && (
-          <p
-            className={`mt-1 text-xs leading-tight ${
-              isAutoUpdate
-                ? "text-emerald-700 dark:text-emerald-300"
-                : "text-gray-600 dark:text-gray-300"
-            }`}
-          >
+          <p className="mt-1 text-xs leading-tight text-muted-foreground">
             {description}
           </p>
         )}
@@ -273,22 +250,35 @@ export function UnifiedToast(props: ToastProps) {
         {type === "download" && !description && (
           <>
             {stage === "extracting" && (
-              <p className="mt-1 text-xs text-gray-600 dark:text-gray-300">
+              <p className="mt-1 text-xs text-muted-foreground">
                 Extracting browser files...
               </p>
             )}
             {stage === "verifying" && (
-              <p className="mt-1 text-xs text-gray-600 dark:text-gray-300">
+              <p className="mt-1 text-xs text-muted-foreground">
                 Verifying browser files...
               </p>
             )}
             {stage === "downloading (twilight rolling release)" && (
-              <p className="mt-1 text-xs text-purple-600 dark:text-purple-400">
+              <p className="mt-1 text-xs text-muted-foreground">
                 Downloading rolling release build...
               </p>
             )}
           </>
         )}
+        {action &&
+          "onClick" in (action as any) &&
+          "label" in (action as any) && (
+            <div className="mt-2 w-full">
+              <RippleButton
+                size="sm"
+                className="ml-auto"
+                onClick={(action as any).onClick}
+              >
+                {(action as any).label}
+              </RippleButton>
+            </div>
+          )}
       </div>
     </div>
   );

src/components/delete-confirmation-dialog.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -9,6 +8,8 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
+import { LoadingButton } from "./loading-button";
+import { RippleButton } from "./ui/ripple";
 
 interface DeleteConfirmationDialogProps {
   isOpen: boolean;
@@ -59,16 +60,20 @@ export function DeleteConfirmationDialog({
           )}
         </DialogHeader>
         <DialogFooter>
-          <Button variant="outline" onClick={onClose} disabled={isLoading}>
-            Cancel
-          </Button>
-          <Button
-            variant="destructive"
-            onClick={() => void handleConfirm()}
+          <RippleButton
+            variant="outline"
+            onClick={onClose}
             disabled={isLoading}
           >
-            {isLoading ? "Deleting..." : confirmButtonText}
-          </Button>
+            Cancel
+          </RippleButton>
+          <LoadingButton
+            variant="destructive"
+            onClick={() => void handleConfirm()}
+            isLoading={isLoading}
+          >
+            {confirmButtonText}
+          </LoadingButton>
         </DialogFooter>
       </DialogContent>
     </Dialog>

src/components/delete-group-dialog.tsx

@@ -4,7 +4,6 @@ import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { LoadingButton } from "@/components/loading-button";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -17,6 +16,7 @@ import { Label } from "@/components/ui/label";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import type { BrowserProfile, ProfileGroup } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface DeleteGroupDialogProps {
   isOpen: boolean;
@@ -188,9 +188,13 @@ export function DeleteGroupDialog({
         </div>
 
         <DialogFooter>
-          <Button variant="outline" onClick={handleClose} disabled={isDeleting}>
+          <RippleButton
+            variant="outline"
+            onClick={handleClose}
+            disabled={isDeleting}
+          >
             Cancel
-          </Button>
+          </RippleButton>
           <LoadingButton
             variant="destructive"
             isLoading={isDeleting}

src/components/edit-group-dialog.tsx

@@ -4,7 +4,6 @@ import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { LoadingButton } from "@/components/loading-button";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -16,6 +15,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import type { ProfileGroup } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface EditGroupDialogProps {
   isOpen: boolean;
@@ -108,9 +108,13 @@ export function EditGroupDialog({
         </div>
 
         <DialogFooter>
-          <Button variant="outline" onClick={handleClose} disabled={isUpdating}>
+          <RippleButton
+            variant="outline"
+            onClick={handleClose}
+            disabled={isUpdating}
+          >
             Cancel
-          </Button>
+          </RippleButton>
           <LoadingButton
             isLoading={isUpdating}
             onClick={() => void handleUpdate()}

src/components/group-assignment-dialog.tsx

@@ -2,9 +2,10 @@
 
 import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useEffect, useState } from "react";
+import { GoPlus } from "react-icons/go";
 import { toast } from "sonner";
+import { CreateGroupDialog } from "@/components/create-group-dialog";
 import { LoadingButton } from "@/components/loading-button";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -22,6 +23,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import type { ProfileGroup } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface GroupAssignmentDialogProps {
   isOpen: boolean;
@@ -41,6 +43,7 @@ export function GroupAssignmentDialog({
   const [isLoading, setIsLoading] = useState(false);
   const [isAssigning, setIsAssigning] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const [createDialogOpen, setCreateDialogOpen] = useState(false);
 
   const loadGroups = useCallback(async () => {
     setIsLoading(true);
@@ -126,7 +129,17 @@ export function GroupAssignmentDialog({
           </div>
 
           <div className="space-y-2">
-            <Label htmlFor="group-select">Assign to Group:</Label>
+            <div className="flex justify-between items-center">
+              <Label htmlFor="group-select">Assign to Group:</Label>
+              <RippleButton
+                size="sm"
+                variant="outline"
+                className="h-7 px-2 text-xs"
+                onClick={() => setCreateDialogOpen(true)}
+              >
+                <GoPlus className="mr-1 w-3 h-3" /> Create Group
+              </RippleButton>
+            </div>
             {isLoading ? (
               <div className="text-sm text-muted-foreground">
                 Loading groups...
@@ -161,9 +174,13 @@ export function GroupAssignmentDialog({
         </div>
 
         <DialogFooter>
-          <Button variant="outline" onClick={onClose} disabled={isAssigning}>
+          <RippleButton
+            variant="outline"
+            onClick={onClose}
+            disabled={isAssigning}
+          >
             Cancel
-          </Button>
+          </RippleButton>
           <LoadingButton
             isLoading={isAssigning}
             onClick={() => void handleAssign()}
@@ -173,6 +190,15 @@ export function GroupAssignmentDialog({
           </LoadingButton>
         </DialogFooter>
       </DialogContent>
+      <CreateGroupDialog
+        isOpen={createDialogOpen}
+        onClose={() => setCreateDialogOpen(false)}
+        onGroupCreated={(group) => {
+          setGroups((prev) => [...prev, group]);
+          setSelectedGroupId(group.id);
+          setCreateDialogOpen(false);
+        }}
+      />
     </Dialog>
   );
 }

src/components/group-badges.tsx

@@ -27,17 +27,13 @@ export function GroupBadges({
     );
   }
 
-  if (groups.length === 0) {
-    return null;
-  }
-
   return (
     <div className="flex flex-wrap gap-2 mb-4">
       {groups.map((group) => (
         <Badge
           key={group.id}
           variant={selectedGroupId === group.id ? "default" : "secondary"}
-          className="cursor-pointer hover:bg-primary/80 transition-colors flex items-center gap-2 px-3 py-1"
+          className="flex gap-2 items-center px-3 py-1 transition-colors cursor-pointer dark:hover:bg-primary/60 hover:bg-primary/80"
           onClick={() => {
             onGroupSelect(selectedGroupId === group.id ? "default" : group.id);
           }}

src/components/group-management-dialog.tsx

@@ -26,6 +26,7 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import type { ProfileGroup } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface GroupManagementDialogProps {
   isOpen: boolean;
@@ -119,14 +120,14 @@ export function GroupManagementDialog({
             {/* Create new group button */}
             <div className="flex justify-between items-center">
               <Label>Groups</Label>
-              <Button
+              <RippleButton
                 size="sm"
                 onClick={() => setCreateDialogOpen(true)}
                 className="flex gap-2 items-center"
               >
                 <GoPlus className="w-4 h-4" />
-                Create Group
-              </Button>
+                Create
+              </RippleButton>
             </div>
 
             {error && (
@@ -187,9 +188,9 @@ export function GroupManagementDialog({
           </div>
 
           <DialogFooter>
-            <Button variant="outline" onClick={onClose}>
+            <RippleButton variant="outline" onClick={onClose}>
               Close
-            </Button>
+            </RippleButton>
           </DialogFooter>
         </DialogContent>
       </Dialog>

src/components/home-header.tsx

@@ -11,6 +11,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "./ui/dropdown-menu";
+import { RippleButton } from "./ui/ripple";
 import { Tooltip, TooltipContent, TooltipTrigger } from "./ui/tooltip";
 
 type Props = {
@@ -43,23 +44,23 @@ const HomeHeader = ({
   };
   return (
     <div className="flex justify-between items-center">
-      <div className="flex items-center gap-3">
+      <div className="flex gap-3 items-center">
         <button
           type="button"
-          onClick={handleLogoClick}
           className="p-1 cursor-pointer"
           title="Open donutbrowser.com"
+          onClick={handleLogoClick}
         >
-          <Logo className="w-10 h-10" />
+          <Logo className="w-10 h-10 transition-transform duration-300 ease-out will-change-transform hover:scale-110" />
         </button>
         {selectedProfiles.length > 0 ? (
-          <div className="flex items-center gap-3">
+          <div className="flex gap-3 items-center">
             <span className="text-sm font-medium">
               {selectedProfiles.length} profile
               {selectedProfiles.length !== 1 ? "s" : ""} selected
             </span>
             <div className="flex gap-2">
-              <Button
+              <RippleButton
                 variant="outline"
                 size="sm"
                 onClick={onBulkGroupAssignment}
@@ -67,8 +68,8 @@ const HomeHeader = ({
               >
                 <LuUsers className="w-4 h-4" />
                 Assign to Group
-              </Button>
-              <Button
+              </RippleButton>
+              <RippleButton
                 variant="destructive"
                 size="sm"
                 onClick={onBulkDelete}
@@ -76,7 +77,7 @@ const HomeHeader = ({
               >
                 <LuTrash2 className="w-4 h-4" />
                 Delete Selected
-              </Button>
+              </RippleButton>
             </div>
           </div>
         ) : (

src/components/import-profile-dialog.tsx

@@ -26,6 +26,7 @@ import {
 import { useBrowserSupport } from "@/hooks/use-browser-support";
 import { getBrowserDisplayName, getBrowserIcon } from "@/lib/browser-utils";
 import type { DetectedProfile } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface ImportProfileDialogProps {
   isOpen: boolean;
@@ -63,6 +64,11 @@ export function ImportProfileDialog({
   const { supportedBrowsers, isLoading: isLoadingSupport } =
     useBrowserSupport();
 
+  // Exclude browsers that are no longer supported for import
+  const importableBrowsers = supportedBrowsers.filter(
+    (b) => b !== "mullvad-browser" && b !== "tor-browser",
+  );
+
   const loadDetectedProfiles = useCallback(async () => {
     setIsLoading(true);
     try {
@@ -242,7 +248,7 @@ export function ImportProfileDialog({
       );
       if (profile) {
         const browserName = getBrowserDisplayName(profile.browser);
-        const defaultName = `Imported ${browserName} Profile`;
+        const defaultName = `Old ${browserName}`;
         setAutoDetectProfileName(defaultName);
       }
     }
@@ -268,7 +274,7 @@ export function ImportProfileDialog({
         <div className="overflow-y-auto flex-1 space-y-6 min-h-0">
           {/* Mode Selection */}
           <div className="flex gap-2">
-            <Button
+            <RippleButton
               variant={importMode === "auto-detect" ? "default" : "outline"}
               onClick={() => {
                 setImportMode("auto-detect");
@@ -277,8 +283,8 @@ export function ImportProfileDialog({
               disabled={isLoading}
             >
               Auto-Detect
-            </Button>
-            <Button
+            </RippleButton>
+            <RippleButton
               variant={importMode === "manual" ? "default" : "outline"}
               onClick={() => {
                 setImportMode("manual");
@@ -287,7 +293,7 @@ export function ImportProfileDialog({
               disabled={isLoading}
             >
               Manual Import
-            </Button>
+            </RippleButton>
           </div>
 
           {/* Auto-Detect Mode */}
@@ -409,7 +415,7 @@ export function ImportProfileDialog({
                       />
                     </SelectTrigger>
                     <SelectContent>
-                      {supportedBrowsers.map((browser) => {
+                      {importableBrowsers.map((browser) => {
                         const IconComponent = getBrowserIcon(browser);
                         return (
                           <SelectItem key={browser} value={browser}>
@@ -479,9 +485,9 @@ export function ImportProfileDialog({
         </div>
 
         <DialogFooter className="flex-shrink-0">
-          <Button variant="outline" onClick={handleClose}>
+          <RippleButton variant="outline" onClick={handleClose}>
             Cancel
-          </Button>
+          </RippleButton>
           {importMode === "auto-detect" ? (
             <LoadingButton
               isLoading={isImporting}
@@ -494,7 +500,7 @@ export function ImportProfileDialog({
                 isLoading
               }
             >
-              Import Profile
+              Import
             </LoadingButton>
           ) : (
             <LoadingButton
@@ -508,7 +514,7 @@ export function ImportProfileDialog({
                 !manualProfileName.trim()
               }
             >
-              Import Profile
+              Import
             </LoadingButton>
           )}
         </DialogFooter>

src/components/loading-button.tsx

@@ -1,5 +1,8 @@
 import { LuLoaderCircle } from "react-icons/lu";
-import { type ButtonProps, Button as UIButton } from "./ui/button";
+import {
+  type RippleButtonProps as ButtonProps,
+  RippleButton as UIButton,
+} from "./ui/ripple";
 
 type Props = ButtonProps & {
   isLoading: boolean;
@@ -7,7 +10,11 @@ type Props = ButtonProps & {
 };
 export const LoadingButton = ({ isLoading, ...props }: Props) => {
   return (
-    <UIButton className="grid place-items-center" {...props}>
+    <UIButton
+      className="grid place-items-center"
+      {...props}
+      disabled={props.disabled || isLoading}
+    >
       {isLoading ? (
         <LuLoaderCircle className="h-4 w-4 animate-spin" />
       ) : (

src/components/permission-dialog.tsx

@@ -3,7 +3,6 @@
 import { useEffect, useState } from "react";
 import { BsCamera, BsMic } from "react-icons/bs";
 import { LoadingButton } from "@/components/loading-button";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -15,6 +14,7 @@ import {
 import type { PermissionType } from "@/hooks/use-permissions";
 import { usePermissions } from "@/hooks/use-permissions";
 import { showErrorToast, showSuccessToast } from "@/lib/toast-utils";
+import { RippleButton } from "./ui/ripple";
 
 interface PermissionDialogProps {
   isOpen: boolean;
@@ -148,9 +148,9 @@ export function PermissionDialog({
         </div>
 
         <DialogFooter className="gap-2">
-          <Button variant="outline" onClick={onClose}>
+          <RippleButton variant="outline" onClick={onClose}>
             {isCurrentPermissionGranted ? "Done" : "Cancel"}
-          </Button>
+          </RippleButton>
 
           {!isCurrentPermissionGranted && (
             <LoadingButton

src/components/profile-data-table.tsx

@@ -12,10 +12,18 @@ import { invoke } from "@tauri-apps/api/core";
 import * as React from "react";
 import { CiCircleCheck } from "react-icons/ci";
 import { IoEllipsisHorizontal } from "react-icons/io5";
-import { LuChevronDown, LuChevronUp } from "react-icons/lu";
+import { LuCheck, LuChevronDown, LuChevronUp } from "react-icons/lu";
 import { DeleteConfirmationDialog } from "@/components/delete-confirmation-dialog";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@/components/ui/command";
 import {
   Dialog,
   DialogContent,
@@ -27,10 +35,13 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import {
   Table,
@@ -57,19 +68,17 @@ import { cn } from "@/lib/utils";
 import type { BrowserProfile, StoredProxy } from "@/types";
 import { Input } from "./ui/input";
 import { Label } from "./ui/label";
+import { RippleButton } from "./ui/ripple";
 
 interface ProfilesDataTableProps {
   data: BrowserProfile[];
   onLaunchProfile: (profile: BrowserProfile) => void | Promise<void>;
   onKillProfile: (profile: BrowserProfile) => void | Promise<void>;
-  onProxySettings: (profile: BrowserProfile) => void;
   onDeleteProfile: (profile: BrowserProfile) => void | Promise<void>;
   onRenameProfile: (oldName: string, newName: string) => Promise<void>;
-  onChangeVersion: (profile: BrowserProfile) => void;
   onConfigureCamoufox?: (profile: BrowserProfile) => void;
   runningProfiles: Set<string>;
   isUpdating: (browser: string) => boolean;
-  onReloadProxyData?: () => void | Promise<void>;
   onDeleteSelectedProfiles?: (profileNames: string[]) => Promise<void>;
   onAssignProfilesToGroup?: (profileNames: string[]) => void;
   selectedGroupId?: string | null;
@@ -81,14 +90,11 @@ export function ProfilesDataTable({
   data,
   onLaunchProfile,
   onKillProfile,
-  onProxySettings,
   onDeleteProfile,
   onRenameProfile,
-  onChangeVersion,
   onConfigureCamoufox,
   runningProfiles,
   isUpdating,
-  onDeleteSelectedProfiles: _onDeleteSelectedProfiles,
   onAssignProfilesToGroup,
   selectedGroupId,
   selectedProfiles: externalSelectedProfiles = [],
@@ -111,38 +117,32 @@ export function ProfilesDataTable({
   );
 
   const [storedProxies, setStoredProxies] = React.useState<StoredProxy[]>([]);
+  const [openProxySelectorFor, setOpenProxySelectorFor] = React.useState<
+    string | null
+  >(null);
+  const [proxyOverrides, setProxyOverrides] = React.useState<
+    Record<string, string | null>
+  >({});
   const [selectedProfiles, setSelectedProfiles] = React.useState<Set<string>>(
     new Set(externalSelectedProfiles),
   );
   const [showCheckboxes, setShowCheckboxes] = React.useState(false);
 
-  // Helper function to check if a profile has a proxy
-  const hasProxy = React.useCallback(
-    (profile: BrowserProfile): boolean => {
-      if (!profile.proxy_id) return false;
-      const proxy = storedProxies.find((p) => p.id === profile.proxy_id);
-      return proxy !== undefined;
+  const handleProxySelection = React.useCallback(
+    async (profileName: string, proxyId: string | null) => {
+      try {
+        await invoke("update_profile_proxy", {
+          profileName: profileName,
+          proxy_id: proxyId,
+        });
+        setProxyOverrides((prev) => ({ ...prev, [profileName]: proxyId }));
+      } catch (error) {
+        console.error("Failed to update proxy settings:", error);
+      } finally {
+        setOpenProxySelectorFor(null);
+      }
     },
-    [storedProxies],
-  );
-
-  // Helper function to get proxy info for a profile
-  const getProxyInfo = React.useCallback(
-    (profile: BrowserProfile): StoredProxy | null => {
-      if (!profile.proxy_id) return null;
-      return storedProxies.find((p) => p.id === profile.proxy_id) ?? null;
-    },
-    [storedProxies],
-  );
-
-  // Helper function to get proxy name for display
-  const getProxyDisplayName = React.useCallback(
-    (profile: BrowserProfile): string => {
-      if (!profile.proxy_id) return "Disabled";
-      const proxy = storedProxies.find((p) => p.id === profile.proxy_id);
-      return proxy?.name ?? "Unknown Proxy";
-    },
-    [storedProxies],
+    [],
   );
 
   // Filter data by selected group
@@ -548,7 +548,7 @@ export function ProfilesDataTable({
               <Tooltip>
                 <TooltipTrigger asChild>
                   <span className="inline-flex">
-                    <Button
+                    <RippleButton
                       variant={isRunning ? "destructive" : "default"}
                       size="sm"
                       disabled={!canLaunch || isLaunching || isStopping}
@@ -567,7 +567,7 @@ export function ProfilesDataTable({
                       ) : (
                         "Launch"
                       )}
-                    </Button>
+                    </RippleButton>
                   </span>
                 </TooltipTrigger>
                 {tooltipContent && (
@@ -667,76 +667,140 @@ export function ProfilesDataTable({
           );
         },
       },
-      {
-        accessorKey: "release_type",
-        header: "Release",
-        cell: ({ row }) => {
-          const releaseType: string = row.getValue("release_type");
-          const isNightly = releaseType === "nightly";
-          return (
-            <div className="flex items-center">
-              <span
-                className={`inline-flex items-center px-2 py-1 rounded-full text-xs font-medium ${
-                  isNightly
-                    ? "text-yellow-800 bg-yellow-100 dark:bg-yellow-900 dark:text-yellow-200"
-                    : "text-green-800 bg-green-100 dark:bg-green-900 dark:text-green-200"
-                }`}
-              >
-                {isNightly ? "Nightly" : "Stable"}
-              </span>
-            </div>
-          );
-        },
-        enableSorting: true,
-        sortingFn: (rowA, rowB, columnId) => {
-          const releaseA: string = rowA.getValue(columnId);
-          const releaseB: string = rowB.getValue(columnId);
-          // Sort with "stable" before "nightly"
-          if (releaseA === "stable" && releaseB === "nightly") return -1;
-          if (releaseA === "nightly" && releaseB === "stable") return 1;
-          return 0;
-        },
-      },
       {
         id: "proxy",
         header: "Proxy",
         cell: ({ row }) => {
           const profile = row.original;
-          const profileHasProxy = hasProxy(profile);
-          const proxyDisplayName = getProxyDisplayName(profile);
-          const proxyInfo = getProxyInfo(profile);
+          const isRunning =
+            browserState.isClient && runningProfiles.has(profile.name);
+          const isLaunching = launchingProfiles.has(profile.name);
+          const isStopping = stoppingProfiles.has(profile.name);
+          const isBrowserUpdating = isUpdating(profile.browser);
+          const isDisabled =
+            isRunning || isLaunching || isStopping || isBrowserUpdating;
 
+          const hasOverride = Object.hasOwn(proxyOverrides, profile.name);
+          const effectiveProxyId = hasOverride
+            ? proxyOverrides[profile.name]
+            : (profile.proxy_id ?? null);
+          const effectiveProxy = effectiveProxyId
+            ? (storedProxies.find((p) => p.id === effectiveProxyId) ?? null)
+            : null;
+          const displayName =
+            profile.browser === "tor-browser"
+              ? "Not supported"
+              : effectiveProxy
+                ? effectiveProxy.name
+                : "Not Selected";
+          const profileHasProxy = Boolean(effectiveProxy);
           const tooltipText =
             profile.browser === "tor-browser"
               ? "Proxies are not supported for TOR browser"
-              : profileHasProxy && proxyInfo
-                ? `${proxyDisplayName}, ${proxyInfo.proxy_settings.proxy_type.toUpperCase()} (${
-                    proxyInfo.proxy_settings.host
-                  }:${proxyInfo.proxy_settings.port})`
+              : profileHasProxy && effectiveProxy
+                ? `${effectiveProxy.name} (${effectiveProxy.proxy_settings.proxy_type.toUpperCase()})`
                 : "";
+          const isSelectorOpen = openProxySelectorFor === profile.name;
+
+          if (profile.browser === "tor-browser") {
+            return (
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <span className="flex gap-2 items-center">
+                    <span className="text-sm text-muted-foreground">
+                      Not supported
+                    </span>
+                  </span>
+                </TooltipTrigger>
+                {tooltipText && <TooltipContent>{tooltipText}</TooltipContent>}
+              </Tooltip>
+            );
+          }
 
           return (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <span className="flex gap-2 items-center">
-                  {profileHasProxy && (
-                    <CiCircleCheck className="w-4 h-4 text-green-500" />
-                  )}
-                  {proxyDisplayName.length > 10 ? (
-                    <span className="text-sm truncate text-muted-foreground">
-                      {proxyDisplayName.slice(0, 10)}...
+            <Popover
+              open={isSelectorOpen}
+              onOpenChange={(open) =>
+                setOpenProxySelectorFor(open ? profile.name : null)
+              }
+            >
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <PopoverTrigger asChild>
+                    <span
+                      className={cn(
+                        "flex gap-2 items-center px-1 rounded",
+                        isDisabled
+                          ? "opacity-60 cursor-not-allowed pointer-events-none"
+                          : "cursor-pointer hover:bg-accent/50",
+                      )}
+                    >
+                      {profileHasProxy && (
+                        <CiCircleCheck className="w-4 h-4 text-green-500" />
+                      )}
+                      {displayName.length > 18 ? (
+                        <span className="text-sm truncate text-muted-foreground max-w-[140px]">
+                          {displayName.slice(0, 18)}...
+                        </span>
+                      ) : (
+                        <span className="text-sm text-muted-foreground">
+                          {displayName}
+                        </span>
+                      )}
                     </span>
-                  ) : (
-                    <span className="text-sm text-muted-foreground">
-                      {profile.browser === "tor-browser"
-                        ? "Not supported"
-                        : proxyDisplayName}
-                    </span>
-                  )}
-                </span>
-              </TooltipTrigger>
-              {tooltipText && <TooltipContent>{tooltipText}</TooltipContent>}
-            </Tooltip>
+                  </PopoverTrigger>
+                </TooltipTrigger>
+                {tooltipText && <TooltipContent>{tooltipText}</TooltipContent>}
+              </Tooltip>
+
+              {!isDisabled && (
+                <PopoverContent className="w-[240px] p-0" align="start">
+                  <Command>
+                    <CommandInput placeholder="Search proxies..." />
+                    <CommandList>
+                      <CommandEmpty>No proxies found.</CommandEmpty>
+                      <CommandGroup>
+                        <CommandItem
+                          value="__none__"
+                          onSelect={() =>
+                            void handleProxySelection(profile.name, null)
+                          }
+                        >
+                          <LuCheck
+                            className={cn(
+                              "mr-2 h-4 w-4",
+                              effectiveProxyId === null
+                                ? "opacity-100"
+                                : "opacity-0",
+                            )}
+                          />
+                          No Proxy
+                        </CommandItem>
+                        {storedProxies.map((proxy) => (
+                          <CommandItem
+                            key={proxy.id}
+                            value={proxy.name}
+                            onSelect={() =>
+                              void handleProxySelection(profile.name, proxy.id)
+                            }
+                          >
+                            <LuCheck
+                              className={cn(
+                                "mr-2 h-4 w-4",
+                                effectiveProxyId === proxy.id
+                                  ? "opacity-100"
+                                  : "opacity-0",
+                              )}
+                            />
+                            {proxy.name}
+                          </CommandItem>
+                        ))}
+                      </CommandGroup>
+                    </CommandList>
+                  </Command>
+                </PopoverContent>
+              )}
+            </Popover>
           );
         },
       },
@@ -748,6 +812,10 @@ export function ProfilesDataTable({
             browserState.isClient && runningProfiles.has(profile.name);
           const isBrowserUpdating =
             browserState.isClient && isUpdating(profile.browser);
+          const isLaunching = launchingProfiles.has(profile.name);
+          const isStopping = stoppingProfiles.has(profile.name);
+          const isDisabled =
+            isRunning || isLaunching || isStopping || isBrowserUpdating;
 
           return (
             <div className="flex justify-end items-center">
@@ -763,27 +831,13 @@ export function ProfilesDataTable({
                   </Button>
                 </DropdownMenuTrigger>
                 <DropdownMenuContent align="end">
-                  <DropdownMenuLabel>Actions</DropdownMenuLabel>
-                  <DropdownMenuSeparator />
-                  <DropdownMenuItem
-                    onClick={() => {
-                      onProxySettings(profile);
-                    }}
-                    disabled={
-                      !browserState.isClient || isBrowserUpdating || isRunning
-                    }
-                  >
-                    Configure Proxy
-                  </DropdownMenuItem>
                   <DropdownMenuItem
                     onClick={() => {
                       if (onAssignProfilesToGroup) {
                         onAssignProfilesToGroup([profile.name]);
                       }
                     }}
-                    disabled={
-                      !browserState.isClient || isBrowserUpdating || isRunning
-                    }
+                    disabled={isDisabled}
                   >
                     Assign to Group
                   </DropdownMenuItem>
@@ -792,25 +846,9 @@ export function ProfilesDataTable({
                       onClick={() => {
                         onConfigureCamoufox(profile);
                       }}
-                      disabled={
-                        !browserState.isClient || isRunning || isBrowserUpdating
-                      }
+                      disabled={isDisabled}
                     >
-                      Configure Camoufox
-                    </DropdownMenuItem>
-                  )}
-                  {!["chromium", "zen", "camoufox"].includes(
-                    profile.browser,
-                  ) && (
-                    <DropdownMenuItem
-                      onClick={() => {
-                        onChangeVersion(profile);
-                      }}
-                      disabled={
-                        !browserState.isClient || isRunning || isBrowserUpdating
-                      }
-                    >
-                      Switch Release
+                      Configure Fingerprint
                     </DropdownMenuItem>
                   )}
                   <DropdownMenuItem
@@ -818,9 +856,7 @@ export function ProfilesDataTable({
                       setProfileToRename(profile);
                       setNewProfileName(profile.name);
                     }}
-                    disabled={
-                      !browserState.isClient || isRunning || isBrowserUpdating
-                    }
+                    disabled={isDisabled}
                   >
                     Rename
                   </DropdownMenuItem>
@@ -828,9 +864,7 @@ export function ProfilesDataTable({
                     onClick={() => {
                       setProfileToDelete(profile);
                     }}
-                    disabled={
-                      !browserState.isClient || isRunning || isBrowserUpdating
-                    }
+                    disabled={isDisabled}
                   >
                     Delete
                   </DropdownMenuItem>
@@ -849,20 +883,19 @@ export function ProfilesDataTable({
       handleIconClick,
       runningProfiles,
       browserState,
-      hasProxy,
-      getProxyDisplayName,
-      getProxyInfo,
-      onProxySettings,
       onLaunchProfile,
       onKillProfile,
       onConfigureCamoufox,
-      onChangeVersion,
       onAssignProfilesToGroup,
       isUpdating,
       launchingProfiles,
       stoppingProfiles,
       filteredData,
       browserState.isClient,
+      storedProxies,
+      openProxySelectorFor,
+      proxyOverrides,
+      handleProxySelection,
     ],
   );
 
@@ -971,15 +1004,17 @@ export function ProfilesDataTable({
             )}
           </div>
           <DialogFooter>
-            <Button
+            <RippleButton
               variant="outline"
               onClick={() => {
                 setProfileToRename(null);
               }}
             >
               Cancel
-            </Button>
-            <Button onClick={() => void handleRename()}>Save</Button>
+            </RippleButton>
+            <RippleButton onClick={() => void handleRename()}>
+              Save
+            </RippleButton>
           </DialogFooter>
         </DialogContent>
       </Dialog>

src/components/profile-selector-dialog.tsx

@@ -6,7 +6,6 @@ import { LuCopy } from "react-icons/lu";
 import { toast } from "sonner";
 import { LoadingButton } from "@/components/loading-button";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -30,6 +29,7 @@ import {
 import { useBrowserState } from "@/hooks/use-browser-state";
 import { getBrowserDisplayName, getBrowserIcon } from "@/lib/browser-utils";
 import type { BrowserProfile, StoredProxy } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface ProfileSelectorDialogProps {
   isOpen: boolean;
@@ -196,7 +196,7 @@ export function ProfileSelectorDialog({
             <div className="space-y-2">
               <div className="flex justify-between items-center">
                 <Label className="text-sm font-medium">Opening URL:</Label>
-                <Button
+                <RippleButton
                   variant="outline"
                   size="sm"
                   onClick={() => void handleCopyUrl()}
@@ -204,7 +204,7 @@ export function ProfileSelectorDialog({
                 >
                   <LuCopy className="w-3 h-3" />
                   Copy
-                </Button>
+                </RippleButton>
               </div>
               <div className="p-2 text-sm break-all rounded bg-muted">
                 {url}
@@ -312,9 +312,9 @@ export function ProfileSelectorDialog({
         </div>
 
         <DialogFooter>
-          <Button variant="outline" onClick={handleCancel}>
+          <RippleButton variant="outline" onClick={handleCancel}>
             Cancel
-          </Button>
+          </RippleButton>
           <Tooltip>
             <TooltipTrigger asChild>
               <span className="inline-flex">

src/components/proxy-form-dialog.tsx

@@ -4,7 +4,6 @@ import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useEffect, useState } from "react";
 import { toast } from "sonner";
 import { LoadingButton } from "@/components/loading-button";
-import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -22,6 +21,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import type { StoredProxy } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface ProxyFormData {
   name: string;
@@ -264,13 +264,13 @@ export function ProxyFormDialog({
         </div>
 
         <DialogFooter>
-          <Button
+          <RippleButton
             variant="outline"
             onClick={handleClose}
             disabled={isSubmitting}
           >
             Cancel
-          </Button>
+          </RippleButton>
           <LoadingButton
             isLoading={isSubmitting}
             onClick={handleSubmit}

src/components/proxy-management-dialog.tsx

@@ -1,10 +1,12 @@
 "use client";
 
 import { invoke } from "@tauri-apps/api/core";
+import { listen } from "@tauri-apps/api/event";
 import { useCallback, useEffect, useState } from "react";
 import { FiEdit2, FiPlus, FiTrash2, FiWifi } from "react-icons/fi";
 import { toast } from "sonner";
 import { ProxyFormDialog } from "@/components/proxy-form-dialog";
+import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -20,6 +22,7 @@ import {
 } from "@/components/ui/tooltip";
 import { trimName } from "@/lib/name-utils";
 import type { StoredProxy } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface ProxyManagementDialogProps {
   isOpen: boolean;
@@ -34,6 +37,7 @@ export function ProxyManagementDialog({
   const [loading, setLoading] = useState(false);
   const [showProxyForm, setShowProxyForm] = useState(false);
   const [editingProxy, setEditingProxy] = useState<StoredProxy | null>(null);
+  const [proxyUsage, setProxyUsage] = useState<Record<string, number>>({});
 
   const loadStoredProxies = useCallback(async () => {
     try {
@@ -48,11 +52,44 @@ export function ProxyManagementDialog({
     }
   }, []);
 
+  const loadProxyUsage = useCallback(async () => {
+    try {
+      const profiles = await invoke<Array<{ proxy_id?: string }>>(
+        "list_browser_profiles",
+      );
+      const counts: Record<string, number> = {};
+      for (const p of profiles) {
+        if (p.proxy_id) counts[p.proxy_id] = (counts[p.proxy_id] ?? 0) + 1;
+      }
+      setProxyUsage(counts);
+    } catch (_err) {
+      // ignore non-critical errors
+    }
+  }, []);
+
   useEffect(() => {
     if (isOpen) {
       loadStoredProxies();
+      void loadProxyUsage();
     }
-  }, [isOpen, loadStoredProxies]);
+  }, [isOpen, loadStoredProxies, loadProxyUsage]);
+
+  useEffect(() => {
+    let unlisten: (() => void) | undefined;
+    const setup = async () => {
+      try {
+        unlisten = await listen("profile-updated", () => {
+          void loadProxyUsage();
+        });
+      } catch (_err) {
+        // ignore non-critical errors
+      }
+    };
+    if (isOpen) void setup();
+    return () => {
+      if (unlisten) unlisten();
+    };
+  }, [isOpen, loadProxyUsage]);
 
   const handleDeleteProxy = useCallback(async (proxy: StoredProxy) => {
     if (
@@ -124,13 +161,13 @@ export function ProxyManagementDialog({
                   profiles
                 </p>
               </div>
-              <Button
+              <RippleButton
                 onClick={handleCreateProxy}
                 className="flex gap-2 items-center"
               >
                 <FiPlus className="w-4 h-4" />
                 Create Proxy
-              </Button>
+              </RippleButton>
             </div>
 
             {/* Proxy List - Scrollable */}
@@ -150,10 +187,10 @@ export function ProxyManagementDialog({
                   <p className="mb-4 text-sm text-muted-foreground">
                     Create your first proxy configuration to get started
                   </p>
-                  <Button variant="outline" onClick={handleCreateProxy}>
+                  <RippleButton variant="outline" onClick={handleCreateProxy}>
                     <FiPlus className="mr-2 w-4 h-4" />
                     Create First Proxy
-                  </Button>
+                  </RippleButton>
                 </div>
               ) : (
                 <div className="overflow-y-auto pr-2 space-y-2 h-full">
@@ -182,6 +219,11 @@ export function ProxyManagementDialog({
                           </span>
                         )}
                       </div>
+                      <div className="mr-2">
+                        <Badge variant="secondary">
+                          {proxyUsage[proxy.id] ?? 0}
+                        </Badge>
+                      </div>
                       <div className="flex flex-shrink-0 gap-1 items-center">
                         <Tooltip>
                           <TooltipTrigger asChild>
@@ -221,7 +263,7 @@ export function ProxyManagementDialog({
           </div>
 
           <DialogFooter className="flex-shrink-0">
-            <Button onClick={onClose}>Close</Button>
+            <RippleButton onClick={onClose}>Close</RippleButton>
           </DialogFooter>
         </DialogContent>
       </Dialog>

src/components/proxy-settings-dialog.tsx

@@ -1,283 +0,0 @@
-"use client";
-
-import { invoke } from "@tauri-apps/api/core";
-import { useCallback, useEffect, useState } from "react";
-import { FiPlus } from "react-icons/fi";
-import { toast } from "sonner";
-import { ProxyFormDialog } from "@/components/proxy-form-dialog";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Label } from "@/components/ui/label";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { cn } from "@/lib/utils";
-import type { StoredProxy } from "@/types";
-
-interface ProxySettingsDialogProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onSave: (proxyId: string | null) => void;
-  initialProxyId?: string | null;
-  browserType?: string;
-}
-
-export function ProxySettingsDialog({
-  isOpen,
-  onClose,
-  onSave,
-  initialProxyId,
-  browserType,
-}: ProxySettingsDialogProps) {
-  const [storedProxies, setStoredProxies] = useState<StoredProxy[]>([]);
-  const [selectedProxyId, setSelectedProxyId] = useState<string | null>(
-    initialProxyId || null,
-  );
-  const [loading, setLoading] = useState(false);
-  const [showProxyForm, setShowProxyForm] = useState(false);
-
-  // Helper to determine if proxy should be disabled for the selected browser
-  const isProxyDisabled = browserType === "tor-browser";
-
-  const loadStoredProxies = useCallback(async () => {
-    try {
-      setLoading(true);
-      const proxies = await invoke<StoredProxy[]>("get_stored_proxies");
-      setStoredProxies(proxies);
-    } catch (error) {
-      console.error("Failed to load stored proxies:", error);
-      toast.error("Failed to load proxies");
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    if (isOpen) {
-      loadStoredProxies();
-      if (isProxyDisabled) {
-        setSelectedProxyId(null);
-      } else {
-        // Reset to initial proxy ID when dialog opens
-        setSelectedProxyId(initialProxyId || null);
-      }
-    }
-  }, [isOpen, isProxyDisabled, loadStoredProxies, initialProxyId]);
-
-  const handleCreateProxy = useCallback(() => {
-    setShowProxyForm(true);
-  }, []);
-
-  const handleProxySaved = useCallback((savedProxy: StoredProxy) => {
-    setStoredProxies((prev) => {
-      const existingIndex = prev.findIndex((p) => p.id === savedProxy.id);
-      if (existingIndex >= 0) {
-        // Update existing proxy
-        const updated = [...prev];
-        updated[existingIndex] = savedProxy;
-        return updated;
-      } else {
-        // Add new proxy
-        return [...prev, savedProxy];
-      }
-    });
-    setSelectedProxyId(savedProxy.id);
-    setShowProxyForm(false);
-  }, []);
-
-  const handleProxyFormClose = useCallback(() => {
-    setShowProxyForm(false);
-  }, []);
-
-  const handleSave = () => {
-    onSave(selectedProxyId);
-  };
-
-  const hasChanged = () => {
-    return selectedProxyId !== initialProxyId;
-  };
-
-  return (
-    <>
-      <Dialog
-        open={isOpen}
-        onOpenChange={(open) => {
-          if (!open) {
-            onClose();
-          }
-        }}
-      >
-        <DialogContent className="max-w-md max-h-[80vh] my-8 flex flex-col">
-          <DialogHeader className="flex-shrink-0">
-            <DialogTitle>Proxy Settings</DialogTitle>
-          </DialogHeader>
-
-          <div className="grid gap-6 py-4">
-            {isProxyDisabled && (
-              <div className="p-4 bg-yellow-50 rounded-md border border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800">
-                <p className="text-sm text-yellow-800 dark:text-yellow-200">
-                  Tor Browser has its own built-in proxy system and doesn't
-                  support additional proxy configuration.
-                </p>
-              </div>
-            )}
-
-            {!isProxyDisabled && (
-              <>
-                {/* Proxy Selection */}
-                <div className="space-y-3">
-                  <div className="flex justify-between items-center">
-                    <Label className="text-base font-medium">
-                      Select Proxy
-                    </Label>
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          onClick={handleCreateProxy}
-                          className="flex gap-2 items-center"
-                        >
-                          <FiPlus className="w-4 h-4" />
-                          Create New
-                        </Button>
-                      </TooltipTrigger>
-                      <TooltipContent>
-                        <p>Create a new proxy configuration</p>
-                      </TooltipContent>
-                    </Tooltip>
-                  </div>
-
-                  <div className="overflow-y-auto p-2 space-y-2 h-full">
-                    <Button
-                      variant="ghost"
-                      onClick={() => setSelectedProxyId(null)}
-                      asChild
-                    >
-                      <Card
-                        className={cn(
-                          "w-full bg-card cursor-pointer transition-colors",
-                          selectedProxyId === null
-                            ? "ring-2 ring-blue-500"
-                            : "",
-                        )}
-                      >
-                        <CardContent className="p-4 w-full">
-                          <div className="flex items-center space-x-3">
-                            <input
-                              type="radio"
-                              id="no-proxy"
-                              name="proxy-selection"
-                              checked={selectedProxyId === null}
-                              onChange={() => setSelectedProxyId(null)}
-                            />
-                            <div className="flex gap-2 items-center">
-                              <Label
-                                htmlFor="no-proxy"
-                                className="font-medium cursor-pointer"
-                              >
-                                No Proxy
-                              </Label>
-                            </div>
-                          </div>
-                        </CardContent>
-                      </Card>
-                    </Button>
-
-                    {loading ? (
-                      <p className="text-sm text-muted-foreground">
-                        Loading proxies...
-                      </p>
-                    ) : (
-                      storedProxies.map((proxy) => (
-                        <Button
-                          key={proxy.id}
-                          variant="ghost"
-                          onClick={() => setSelectedProxyId(proxy.id)}
-                          asChild
-                        >
-                          <Card
-                            className={cn(
-                              "w-full bg-card cursor-pointer transition-colors",
-                              selectedProxyId === proxy.id
-                                ? "ring-2 ring-blue-500"
-                                : "",
-                            )}
-                          >
-                            <CardContent className="p-4 w-full">
-                              <div className="flex items-center space-x-3">
-                                <input
-                                  type="radio"
-                                  id={`proxy-${proxy.id}`}
-                                  name="proxy-selection"
-                                  checked={selectedProxyId === proxy.id}
-                                  onChange={() => setSelectedProxyId(proxy.id)}
-                                />
-                                <div className="flex gap-2 items-center">
-                                  <Label
-                                    htmlFor={`proxy-${proxy.id}`}
-                                    className="font-medium cursor-pointer"
-                                  >
-                                    {proxy.name}
-                                  </Label>
-                                  <Badge variant="outline">
-                                    {proxy.proxy_settings.proxy_type.toUpperCase()}
-                                  </Badge>
-                                </div>
-                              </div>
-                            </CardContent>
-                          </Card>
-                        </Button>
-                      ))
-                    )}
-
-                    {!loading && storedProxies.length === 0 && (
-                      <div className="py-4 text-center">
-                        <p className="mb-2 text-sm text-muted-foreground">
-                          No saved proxies available.
-                        </p>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          onClick={handleCreateProxy}
-                        >
-                          <FiPlus className="mr-2 w-4 h-4" />
-                          Create First Proxy
-                        </Button>
-                      </div>
-                    )}
-                  </div>
-                </div>
-              </>
-            )}
-          </div>
-
-          <DialogFooter>
-            <Button variant="outline" onClick={onClose}>
-              Cancel
-            </Button>
-            <Button onClick={handleSave} disabled={!hasChanged()}>
-              Save
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-
-      <ProxyFormDialog
-        isOpen={showProxyForm}
-        onClose={handleProxyFormClose}
-        onSave={handleProxySaved}
-      />
-    </>
-  );
-}

src/components/release-type-selector.tsx

@@ -4,7 +4,6 @@ import { useState } from "react";
 import { LuCheck, LuChevronsUpDown, LuDownload } from "react-icons/lu";
 import { LoadingButton } from "@/components/loading-button";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
 import {
   Command,
   CommandEmpty,
@@ -19,12 +18,12 @@ import {
 } from "@/components/ui/popover";
 import { cn } from "@/lib/utils";
 import type { BrowserReleaseTypes } from "@/types";
+import { RippleButton } from "./ui/ripple";
 
 interface ReleaseTypeSelectorProps {
   selectedReleaseType: "stable" | "nightly" | null;
   onReleaseTypeSelect: (releaseType: "stable" | "nightly" | null) => void;
   availableReleaseTypes: BrowserReleaseTypes;
-  browser: string;
   isDownloading: boolean;
   onDownload: () => void;
   placeholder?: string;
@@ -36,7 +35,6 @@ export function ReleaseTypeSelector({
   selectedReleaseType,
   onReleaseTypeSelect,
   availableReleaseTypes,
-  browser,
   isDownloading,
   onDownload,
   placeholder = "Select release type...",
@@ -49,7 +47,7 @@ export function ReleaseTypeSelector({
     ...(availableReleaseTypes.stable
       ? [{ type: "stable" as const, version: availableReleaseTypes.stable }]
       : []),
-    ...(availableReleaseTypes.nightly && browser !== "chromium"
+    ...(availableReleaseTypes.nightly
       ? [{ type: "nightly" as const, version: availableReleaseTypes.nightly }]
       : []),
   ];
@@ -85,7 +83,7 @@ export function ReleaseTypeSelector({
       {showDropdown ? (
         <Popover open={popoverOpen} onOpenChange={setPopoverOpen} modal={true}>
           <PopoverTrigger asChild>
-            <Button
+            <RippleButton
               variant="outline"
               role="combobox"
               aria-expanded={popoverOpen}
@@ -93,7 +91,7 @@ export function ReleaseTypeSelector({
             >
               {selectedDisplayText}
               <LuChevronsUpDown className="ml-2 w-4 h-4 opacity-50 shrink-0" />
-            </Button>
+            </RippleButton>
           </PopoverTrigger>
           <PopoverContent className="p-0">
             <Command>
@@ -159,11 +157,6 @@ export function ReleaseTypeSelector({
             <span className="text-sm font-medium capitalize">
               {releaseOptions[0].type}
             </span>
-            {releaseOptions[0].type === "nightly" && (
-              <Badge variant="secondary" className="text-xs">
-                Nightly
-              </Badge>
-            )}
             <Badge variant="outline" className="text-xs">
               {releaseOptions[0].version}
             </Badge>

src/components/settings-dialog.tsx

@@ -7,7 +7,6 @@ import { useCallback, useEffect, useState } from "react";
 import { BsCamera, BsMic } from "react-icons/bs";
 import { LoadingButton } from "@/components/loading-button";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
 
 import {
   Dialog,
@@ -33,6 +32,7 @@ import {
   showSuccessToast,
   showUnifiedVersionUpdateToast,
 } from "@/lib/toast-utils";
+import { RippleButton } from "./ui/ripple";
 
 interface AppSettings {
   set_as_default_browser: boolean;
@@ -529,9 +529,9 @@ export function SettingsDialog({ isOpen, onClose }: SettingsDialogProps) {
         </div>
 
         <DialogFooter className="flex-shrink-0">
-          <Button variant="outline" onClick={onClose}>
+          <RippleButton variant="outline" onClick={onClose}>
             Cancel
-          </Button>
+          </RippleButton>
           <LoadingButton
             isLoading={isSaving}
             onClick={() => {

src/components/shared-camoufox-config-form.tsx

@@ -874,6 +874,36 @@ export function SharedCamoufoxConfigForm({
                     placeholder="e.g., 1080"
                   />
                 </div>
+                <div className="space-y-2">
+                  <Label htmlFor="screen-min-width">Min Width</Label>
+                  <Input
+                    id="screen-min-width"
+                    type="number"
+                    value={config.screen_min_width || ""}
+                    onChange={(e) =>
+                      onConfigChange(
+                        "screen_min_width",
+                        e.target.value ? parseInt(e.target.value) : undefined,
+                      )
+                    }
+                    placeholder="e.g., 800"
+                  />
+                </div>
+                <div className="space-y-2">
+                  <Label htmlFor="screen-min-height">Min Height</Label>
+                  <Input
+                    id="screen-min-height"
+                    type="number"
+                    value={config.screen_min_height || ""}
+                    onChange={(e) =>
+                      onConfigChange(
+                        "screen_min_height",
+                        e.target.value ? parseInt(e.target.value) : undefined,
+                      )
+                    }
+                    placeholder="e.g., 600"
+                  />
+                </div>
               </div>
             </div>
           </TabsContent>

src/components/theme-provider.tsx

@@ -1,15 +1,10 @@
 "use client";
 
-import { invoke } from "@tauri-apps/api/core";
 import { ThemeProvider } from "next-themes";
 import { useEffect, useState } from "react";
 
 interface AppSettings {
-  show_settings_on_startup: boolean;
-  theme: string;
-}
-
-interface SystemTheme {
+  set_as_default_browser: boolean;
   theme: string;
 }
 
@@ -17,40 +12,10 @@ interface CustomThemeProviderProps {
   children: React.ReactNode;
 }
 
-// Helper function to detect system dark mode preference
-function getSystemTheme(): string {
-  if (typeof window !== "undefined") {
-    const isDarkMode = window.matchMedia(
-      "(prefers-color-scheme: dark)",
-    ).matches;
-    return isDarkMode ? "dark" : "light";
-  }
-  return "light";
-}
-
-// Function to get native system theme (fallback to CSS media query)
-async function getNativeSystemTheme(): Promise<string> {
-  try {
-    const systemTheme = await invoke<SystemTheme>("get_system_theme");
-    if (systemTheme.theme === "dark" || systemTheme.theme === "light") {
-      return systemTheme.theme;
-    }
-    // Fallback to CSS media query if native detection returns "unknown"
-    return getSystemTheme();
-  } catch (error) {
-    console.warn(
-      "Failed to get native system theme, falling back to CSS media query:",
-      error,
-    );
-    // Fallback to CSS media query
-    return getSystemTheme();
-  }
-}
-
 export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
   const [isLoading, setIsLoading] = useState(true);
   const [defaultTheme, setDefaultTheme] = useState<string>("system");
-  const [mounted, setMounted] = useState(false);
+  const [_mounted, setMounted] = useState(false);
 
   useEffect(() => {
     setMounted(true);
@@ -59,30 +24,24 @@ export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
   useEffect(() => {
     const loadTheme = async () => {
       try {
+        // Lazy import to avoid pulling Tauri API on SSR
+        const { invoke } = await import("@tauri-apps/api/core");
         const settings = await invoke<AppSettings>("get_app_settings");
-        setDefaultTheme(settings.theme);
-      } catch (error) {
-        console.error("Failed to load theme settings:", error);
-        // For first-time users, detect system preference and apply it
-        const systemTheme = await getNativeSystemTheme();
-        console.log(
-          "First-time user detected, applying system theme:",
-          systemTheme,
-        );
-
-        // Save the detected theme as the default
-        try {
-          await invoke("save_app_settings", {
-            settings: {
-              show_settings_on_startup: true,
-              theme: "system",
-              auto_updates_enabled: true,
-            },
-          });
-        } catch (saveError) {
-          console.error("Failed to save initial theme settings:", saveError);
+        if (
+          settings?.theme === "light" ||
+          settings?.theme === "dark" ||
+          settings?.theme === "system"
+        ) {
+          setDefaultTheme(settings.theme);
+        } else {
+          setDefaultTheme("system");
         }
-
+      } catch (error) {
+        // Failed to load settings; fall back to system (handled by next-themes)
+        console.warn(
+          "Failed to load theme settings; defaulting to system:",
+          error,
+        );
         setDefaultTheme("system");
       } finally {
         setIsLoading(false);
@@ -92,73 +51,9 @@ export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
     void loadTheme();
   }, []);
 
-  // Monitor system theme changes when using "system" theme
-  useEffect(() => {
-    if (!mounted || defaultTheme !== "system") {
-      return;
-    }
-
-    const checkSystemTheme = async () => {
-      try {
-        const currentSystemTheme = await getNativeSystemTheme();
-        // Force re-evaluation by toggling the theme
-        const html = document.documentElement;
-
-        // Apply the system theme class
-        if (currentSystemTheme === "dark") {
-          if (!html.classList.contains("dark")) {
-            html.classList.add("dark");
-            html.classList.remove("light");
-          }
-        } else {
-          if (
-            !html.classList.contains("light") ||
-            html.classList.contains("dark")
-          ) {
-            html.classList.add("light");
-            html.classList.remove("dark");
-          }
-        }
-      } catch (error) {
-        console.warn("Failed to check system theme:", error);
-      }
-    };
-
-    // Check system theme every 2 seconds when using system theme
-    const intervalId = setInterval(() => void checkSystemTheme(), 2000);
-
-    // Initial check
-    void checkSystemTheme();
-
-    return () => {
-      clearInterval(intervalId);
-    };
-  }, [mounted, defaultTheme]);
-
   if (isLoading) {
-    // Use a consistent loading screen that doesn't depend on system theme during SSR
-    // This prevents hydration mismatch by ensuring server and client render the same initially
-    let loadingBgColor = "bg-white";
-    let spinnerColor = "border-gray-900";
-
-    // Only apply system theme detection after component is mounted (client-side only)
-    if (mounted) {
-      // Use CSS media query for loading screen since async call would complicate this
-      const systemTheme = getSystemTheme();
-      loadingBgColor = systemTheme === "dark" ? "bg-gray-900" : "bg-white";
-      spinnerColor =
-        systemTheme === "dark" ? "border-white" : "border-gray-900";
-    }
-
-    return (
-      <div
-        className={`flex fixed inset-0 justify-center items-center ${loadingBgColor}`}
-      >
-        <div
-          className={`w-8 h-8 rounded-full border-2 animate-spin ${spinnerColor} border-t-transparent`}
-        />
-      </div>
-    );
+    // Keep UI simple during initial settings load to avoid flicker
+    return null;
   }
 
   return (

src/components/ui/badge.tsx

@@ -12,7 +12,7 @@ const badgeVariants = cva(
         default:
           "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90",
         secondary:
-          "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90",
+          "border-transparent bg-secondary dark:bg-secondary/60 text-secondary-foreground [a&]:hover:bg-secondary/90",
         destructive:
           "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:

src/components/ui/dialog.tsx

@@ -63,6 +63,12 @@ function DialogContent({
           "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-[10000] grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
           className,
         )}
+        onInteractOutside={(event) => {
+          const target = event.target as HTMLElement | null;
+          if (target?.closest('[data-window-drag-area="true"]')) {
+            event.preventDefault();
+          }
+        }}
         {...props}
       >
         {children}

src/components/ui/ripple.tsx

@@ -0,0 +1,146 @@
+"use client";
+
+import { cva, type VariantProps } from "class-variance-authority";
+import { type HTMLMotionProps, motion, type Transition } from "motion/react";
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const buttonVariants = cva(
+  "relative overflow-hidden cursor-pointer inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  {
+    variants: {
+      variant: {
+        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        destructive:
+          "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
+        outline:
+          "border bg-background hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
+        secondary:
+          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        ghost:
+          "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+      },
+      size: {
+        default: "h-10 px-4 py-2 has-[>svg]:px-3",
+        sm: "h-9 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
+        lg: "h-11 px-8 has-[>svg]:px-6",
+        icon: "size-10",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  },
+);
+
+const rippleVariants = cva("absolute rounded-full size-5 pointer-events-none", {
+  variants: {
+    variant: {
+      default: "bg-primary-foreground",
+      destructive: "bg-destructive",
+      outline: "bg-input",
+      secondary: "bg-secondary",
+      ghost: "bg-accent",
+    },
+  },
+  defaultVariants: {
+    variant: "default",
+  },
+});
+
+type Ripple = {
+  id: number;
+  x: number;
+  y: number;
+};
+
+type RippleButtonProps = HTMLMotionProps<"button"> & {
+  children: React.ReactNode;
+  rippleClassName?: string;
+  scale?: number;
+  transition?: Transition;
+} & VariantProps<typeof buttonVariants>;
+
+function RippleButton({
+  ref,
+  children,
+  onClick,
+  className,
+  rippleClassName,
+  variant,
+  size,
+  scale = 10,
+  transition = { duration: 0.6, ease: "easeOut" },
+  ...props
+}: RippleButtonProps) {
+  const [ripples, setRipples] = React.useState<Ripple[]>([]);
+  const buttonRef = React.useRef<HTMLButtonElement>(null);
+  React.useImperativeHandle(ref, () => buttonRef.current as HTMLButtonElement);
+
+  const createRipple = React.useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      const button = buttonRef.current;
+      if (!button) return;
+
+      const rect = button.getBoundingClientRect();
+      const x = event.clientX - rect.left;
+      const y = event.clientY - rect.top;
+
+      const newRipple: Ripple = {
+        id: Date.now(),
+        x,
+        y,
+      };
+
+      setRipples((prev) => [...prev, newRipple]);
+
+      setTimeout(() => {
+        setRipples((prev) => prev.filter((r) => r.id !== newRipple.id));
+      }, 600);
+    },
+    [],
+  );
+
+  const handleClick = React.useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      createRipple(event);
+      if (onClick) {
+        onClick(event);
+      }
+    },
+    [createRipple, onClick],
+  );
+
+  return (
+    <motion.button
+      ref={buttonRef}
+      data-slot="ripple-button"
+      onClick={handleClick}
+      whileTap={{ scale: 0.95 }}
+      whileHover={{ scale: 1.05 }}
+      className={cn(buttonVariants({ variant, size, className }))}
+      {...props}
+    >
+      {children}
+      {ripples.map((ripple) => (
+        <motion.span
+          key={ripple.id}
+          initial={{ scale: 0, opacity: 0.5 }}
+          animate={{ scale, opacity: 0 }}
+          transition={transition}
+          className={cn(
+            rippleVariants({ variant, className: rippleClassName }),
+          )}
+          style={{
+            top: ripple.y - 10,
+            left: ripple.x - 10,
+          }}
+        />
+      ))}
+    </motion.button>
+  );
+}
+
+export { RippleButton, type RippleButtonProps };

src/components/ui/sonner.tsx

@@ -12,8 +12,8 @@ const Toaster = ({ ...props }: ToasterProps) => {
       className="toaster group"
       style={
         {
-          "--normal-bg": "var(--popover)",
-          "--normal-text": "var(--popover-foreground)",
+          "--normal-bg": "var(--card)",
+          "--normal-text": "var(--card-foreground)",
           "--normal-border": "var(--border)",
           zIndex: 99999,
         } as React.CSSProperties
@@ -22,6 +22,7 @@ const Toaster = ({ ...props }: ToasterProps) => {
         style: {
           zIndex: 99999,
           pointerEvents: "auto",
+          backdropFilter: "saturate(1.2)",
         },
       }}
       {...props}

src/components/window-drag-area.tsx

@@ -16,11 +16,11 @@ export function WindowDragArea() {
     checkPlatform();
   }, []);
 
-  const handleMouseDown = (e: React.MouseEvent) => {
-    // Only handle left mouse button
+  const handlePointerDown = (e: React.PointerEvent) => {
     if (e.button !== 0) return;
+    e.preventDefault();
+    e.stopPropagation();
 
-    // Start dragging asynchronously
     const startDrag = async () => {
       try {
         const window = getCurrentWindow();
@@ -42,7 +42,8 @@ export function WindowDragArea() {
     <button
       type="button"
       className="fixed top-0 right-0 left-0 h-10 bg-transparent border-0 z-[9999] select-none"
-      onMouseDown={handleMouseDown}
+      data-window-drag-area="true"
+      onPointerDown={handlePointerDown}
       onContextMenu={(e) => {
         e.preventDefault();
         e.stopPropagation();

src/hooks/use-app-update-notifications.tsx

@@ -156,6 +156,7 @@ export function useAppUpdateNotifications() {
         style: {
           zIndex: 99999, // Ensure app updates appear above dialogs
           pointerEvents: "auto", // Ensure app updates remain interactive
+          marginTop: "16px", // slightly lower on macOS-like top controls
         },
       },
     );

src/hooks/use-browser-download.ts

@@ -1,4 +1,5 @@
 import { invoke } from "@tauri-apps/api/core";
+import type { Event as TauriEvent } from "@tauri-apps/api/event";
 import { listen } from "@tauri-apps/api/event";
 import { useCallback, useEffect, useState } from "react";
 import { getBrowserDisplayName } from "@/lib/browser-utils";
@@ -7,6 +8,7 @@ import {
   showDownloadToast,
   showErrorToast,
   showSuccessToast,
+  showToast,
 } from "@/lib/toast-utils";
 
 interface GithubRelease {
@@ -210,9 +212,21 @@ export function useBrowserDownload() {
         if (!suppressNotifications) {
           // Dismiss any existing download toast and show error
           dismissToast(`download-${browserStr}-${version}`);
+
+          let errorMessage = "Unknown error occurred";
+          if (error instanceof Error) {
+            errorMessage = error.message;
+          } else if (typeof error === "string") {
+            errorMessage = error;
+          } else if (error && typeof error === "object" && "message" in error) {
+            errorMessage = String(error.message);
+          }
+
+          // Ensure the long-running download toast is dismissed, and show a finite error toast
+          dismissToast(`download-${browserStr}-${version}`);
           showErrorToast(`Failed to download ${browserName} ${version}`, {
-            description:
-              error instanceof Error ? error.message : "Unknown error occurred",
+            description: errorMessage,
+            duration: 8000,
           });
         }
         throw error;
@@ -245,21 +259,22 @@ export function useBrowserDownload() {
   // Legacy isDownloading for backwards compatibility
   const isDownloading = downloadingBrowsers.size > 0;
 
-  // Listen for download progress events
+  // Listen for download progress events (browsers) and GeoIP progress events
   useEffect(() => {
-    let unlistenFn: (() => void) | null = null;
+    let unlistenBrowser: (() => void) | null = null;
+    let unlistenGeoip: (() => void) | null = null;
 
-    const setupListener = async () => {
+    const setupListeners = async () => {
       try {
-        unlistenFn = await listen<DownloadProgress>(
+        // Browser binaries download progress
+        unlistenBrowser = await listen<DownloadProgress>(
           "download-progress",
-          (event) => {
+          async (event: TauriEvent<DownloadProgress>) => {
             const progress = event.payload;
             setDownloadProgress(progress);
 
             const browserName = getBrowserDisplayName(progress.browser);
 
-            // Show toast with progress
             if (progress.stage === "downloading") {
               const speedMBps = (
                 progress.speed_bytes_per_sec /
@@ -279,6 +294,16 @@ export function useBrowserDownload() {
             } else if (progress.stage === "verifying") {
               showDownloadToast(browserName, progress.version, "verifying");
             } else if (progress.stage === "completed") {
+              // On completion, refresh the downloaded versions for this browser and also refresh camoufox,
+              // since the Create dialog implicitly uses camoufox on the anti-detect tab
+              try {
+                await Promise.all([
+                  loadDownloadedVersions(progress.browser),
+                  progress.browser !== "camoufox"
+                    ? loadDownloadedVersions("camoufox")
+                    : Promise.resolve([]),
+                ]);
+              } catch {}
               showDownloadToast(browserName, progress.version, "completed");
               setDownloadProgress(null);
             }
@@ -287,20 +312,82 @@ export function useBrowserDownload() {
       } catch (error) {
         console.error("Failed to setup download progress listener:", error);
       }
+
+      try {
+        // GeoIP database download progress
+        unlistenGeoip = await listen<{
+          stage: string;
+          percentage: number;
+          message: string;
+          downloaded_bytes?: number;
+          total_bytes?: number;
+          speed_bytes_per_sec?: number;
+          eta_seconds?: number;
+        }>(
+          "geoip-download-progress",
+          (
+            event: TauriEvent<{
+              stage: string;
+              percentage: number;
+              message: string;
+              downloaded_bytes?: number;
+              total_bytes?: number;
+              speed_bytes_per_sec?: number;
+              eta_seconds?: number;
+            }>,
+          ) => {
+            const { stage, percentage, speed_bytes_per_sec, eta_seconds } =
+              event.payload;
+            if (stage === "downloading") {
+              const speedMBps = speed_bytes_per_sec
+                ? (speed_bytes_per_sec / (1024 * 1024)).toFixed(1)
+                : undefined;
+              const etaText = eta_seconds ? formatTime(eta_seconds) : undefined;
+              showToast({
+                id: "geoip-download",
+                type: "download",
+                title: "Downloading GeoIP database",
+                stage: "downloading",
+                progress: {
+                  percentage,
+                  ...(speedMBps ? { speed: speedMBps } : {}),
+                  ...(etaText ? { eta: etaText } : {}),
+                },
+              });
+            } else if (stage === "completed") {
+              showToast({
+                id: "geoip-download",
+                type: "download",
+                title: "GeoIP database downloaded successfully!",
+                stage: "completed",
+              });
+            }
+          },
+        );
+      } catch (error) {
+        console.error("Failed to setup GeoIP progress listener:", error);
+      }
     };
 
-    setupListener();
+    void setupListeners();
 
     return () => {
-      if (unlistenFn) {
+      if (unlistenBrowser) {
         try {
-          unlistenFn();
+          unlistenBrowser();
         } catch (error) {
-          console.error("Failed to cleanup download progress listener:", error);
+          console.error("Failed to cleanup browser download listener:", error);
+        }
+      }
+      if (unlistenGeoip) {
+        try {
+          unlistenGeoip();
+        } catch (error) {
+          console.error("Failed to cleanup GeoIP progress listener:", error);
         }
       }
     };
-  }, [formatTime]);
+  }, [formatTime, loadDownloadedVersions]);
 
   return {
     availableVersions,

src/hooks/use-version-updater.ts

@@ -245,11 +245,22 @@ export function useVersionUpdater() {
                 }
               } catch (error) {
                 console.error("Failed to handle browser auto-update:", error);
+
+                let errorMessage = "Unknown error occurred";
+                if (error instanceof Error) {
+                  errorMessage = error.message;
+                } else if (typeof error === "string") {
+                  errorMessage = error;
+                } else if (
+                  error &&
+                  typeof error === "object" &&
+                  "message" in error
+                ) {
+                  errorMessage = String(error.message);
+                }
+
                 showErrorToast(`Failed to auto-update ${browserDisplayName}`, {
-                  description:
-                    error instanceof Error
-                      ? error.message
-                      : "Unknown error occurred",
+                  description: errorMessage,
                   duration: 8000,
                 });
               } finally {
@@ -336,9 +347,17 @@ export function useVersionUpdater() {
       return results;
     } catch (error) {
       console.error("Failed to trigger manual update:", error);
+      let errorMessage = "Unknown error occurred";
+      if (error instanceof Error) {
+        errorMessage = error.message;
+      } else if (typeof error === "string") {
+        errorMessage = error;
+      } else if (error && typeof error === "object" && "message" in error) {
+        errorMessage = String(error.message);
+      }
+
       showErrorToast("Failed to update browser versions", {
-        description:
-          error instanceof Error ? error.message : "Unknown error occurred",
+        description: errorMessage,
         duration: 4000,
       });
       throw error;

src/lib/toast-utils.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { toast as sonnerToast } from "sonner";
+import { type ExternalToast, toast as sonnerToast } from "sonner";
 import { UnifiedToast } from "@/components/custom-toast";
 
 interface BaseToastProps {
@@ -7,6 +7,7 @@ interface BaseToastProps {
   title: string;
   description?: string;
   duration?: number;
+  action?: ExternalToast["action"];
 }
 
 interface LoadingToastProps extends BaseToastProps {

src/types.ts

@@ -74,6 +74,8 @@ export interface CamoufoxConfig {
   proxy?: string;
   screen_max_width?: number;
   screen_max_height?: number;
+  screen_min_width?: number;
+  screen_min_height?: number;
   geoip?: string | boolean;
   block_images?: boolean;
   block_webrtc?: boolean;