diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffa5e1e..699bbf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,19 +6,21 @@
 
 </p> -->
 
- <!-- >[!NOTE]
-> 🅱️ This is a beta build.
--->
+> [!NOTE]
+> 🅱️ This is a Beta build.
 
 # ⬇️ Downloads
 
-[<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="175"/>](https://apps.microsoft.com/detail/9p4q134b2jw3?referrer=appbadge&mode=direct)
+| <img height="20" src="https://github.com/user-attachments/assets/340d360e-79b1-4c70-bfab-d944085f75df" /> Windows                                                                                                  | <img height="20" src="https://github.com/user-attachments/assets/42d7e887-4616-4e8c-b1d3-e44e01340f8c" /> macOS     | <img height="20" src="https://github.com/user-attachments/assets/e0cc4f33-4516-408b-9c5c-be71a3ac316b" /> Linux                                                                                                                  |
+| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **EXE:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Windows-x64.exe) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Windows-arm64.exe) | **[Universal DMG](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-MacOS-universal.dmg)** | **AppImage:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Linux-x86_64.AppImage) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Linux-arm64.AppImage) |
+| <div align="center"><a href="https://apps.microsoft.com/detail/9p4q134b2jw3?referrer=appbadge&mode=direct"><img src="https://get.microsoft.com/images/en-us%20dark.svg" width="150"/></a></div>                    | **[Universal ZIP](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-MacOS-universal.zip)** | **DEB:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Linux-amd64.deb) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Linux-arm64.deb)                 |
+|                                                                                                                                                                                                                    |                                                                                                                     | **RPM:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Linux-x86_64.rpm) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.2/ROSI-Linux-aarch64.rpm)              |
 
-| <img height="20" src="https://github.com/user-attachments/assets/340d360e-79b1-4c70-bfab-d944085f75df" /> Windows                                                                                                    | <img height="20" src="https://github.com/user-attachments/assets/42d7e887-4616-4e8c-b1d3-e44e01340f8c" /> macOS     | <img height="20" src="https://github.com/user-attachments/assets/e0cc4f33-4516-408b-9c5c-be71a3ac316b" /> Linux                                                                                                                  |
-| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **[Universal EXE](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-Windows.exe)** <br>_(Both x64 and arm64)_                                                                               | **[Universal DMG](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-MacOS-universal.dmg)** | **AppImage:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-Linux-x86_64.AppImage) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-Linux-arm64.AppImage) |
-| **Other:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-Windows-x64.exe) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-Windows-arm64.exe) |                                                                                                                     | **DEB:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-linux_amd64.deb) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-linux_arm64.deb)                 |
-|                                                                                                                                                                                                                      |                                                                                                                     | **RPM:** [x64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-linux.x86_64.rpm) / [arm64](https://github.com/BurntToasters/ROSI/releases/download/v4.1.0-beta.1/ROSI-linux.aarch64.rpm)              |
+> [!IMPORTANT]
+> The `.sig` files in this repo are NOT normal GPG signatures — they are for ROSI's built-in updater to verify the integrity of updates before downloading and installing.
+>
+> The `.asc` files are my normal GPG signatures which you can verify using my GPG Public Key: https://tuxedo.rosie.run/GPG/BurntToasters_0xF2FBC20F_public.asc
 
 <!-- REMOVED <details>
   <summary>🛠️ Build Status & OS App Store Publishing Status (for NERDS)</summary>
@@ -35,6 +37,19 @@
 
 ---
 
+## Changes in `v4.1.0-beta.2:`
+
+- **Updater:** Fixed macOS in-app updates where **Restart Now** did nothing after an update finished downloading.
+- **Updater:** Fixed the `Auto` update channel so beta installs actually receive beta updates when that setting is selected.
+- **Downloads:** Manual downloads and the queue no longer stomp each other — ROSI blocks conflicting starts instead of silently killing one mid-run.
+- **Downloads:** Queue downloads now use your chosen download folder instead of always saving to system Downloads.
+- **Settings:** Importing settings refreshes the UI in-place instead of forcing a full app restart.
+- **macOS:** Closing the window now stops active downloads instead of leaving `yt-dlp` running headless in the background.
+- **Security:** Tightened download URL validation, output path checks, `ffmpeg` path handling on import, and subprocess environment hardening.
+- **UI:** Accessibility and polish pass — setup wizard focus trapping, clearer modal buttons, progress bar screen-reader support, queue confirm dialogs, theme flash fix on launch, and assorted UX cleanup.
+- **Testing:** Expanded automated coverage for the updater, downloader, preview pipeline, IPC validation, and renderer modules.
+- **PKG:** Updated packages.
+
 ## Changes in `v4.1.0-beta.1:`
 
 - **NEW - Preview:** Added video preview before downloading so ROSI can show the title, uploader, duration, thumbnail, playlist info, and other basic metadata before saving.
@@ -47,21 +62,6 @@
 - **Testing:** Added jsdom DOM coverage for the renderer plus tests for video info parsing, codec-aware FFmpeg args, GPU probing, settings migration, IPC validation, and queue wiring.
 - **PKG:** Updated packages.
 
-## Changes in `v4.0.13:`
-
-- **Electron:** Updated electron to `42.2.0`
-- **PKG:** Updated packages.
-
-## Changes in `v4.0.12:`
-
-- **Electron:** Updated electron to `42.0.0`.
-- **PKG:** Updated packages.
-
-## Changes in `v4.0.9:`
-
-- **Electron:** Updated electron to `41.5.0`.
-- **PKG:** Updated packages.
-
 ## Changes in `v4.0.0:`
 
 ### Welcome to ROSI v4!
@@ -88,6 +88,9 @@ Nothing.. yet!
 
 </details>
 
+> [!IMPORTANT]
+> **Note:** MSI builds are NOT provided for beta releases. Use the EXE installer.
+
 # ℹ️ Installation & Notes
 
 ### 🔐 GPG Signing
diff --git a/com.burnttoasters.rosi.metainfo.xml b/com.burnttoasters.rosi.metainfo.xml
index 4541893..ffd4327 100644
--- a/com.burnttoasters.rosi.metainfo.xml
+++ b/com.burnttoasters.rosi.metainfo.xml
@@ -33,7 +33,7 @@
     </screenshot>
   </screenshots>
   <releases>
-                                                                    <release version="4.1.0-beta.1" date="2026-06-02"/>
+                                                                        <release version="4.1.0-beta.2" date="2026-06-11"/>
   </releases>
   <content_rating type="oars-1.1"/>
 </component>
diff --git a/package-lock.json b/package-lock.json
index a22b4c8..8d799e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "rosi",
-  "version": "4.1.0-beta.1",
+  "version": "4.1.0-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "rosi",
-      "version": "4.1.0-beta.1",
+      "version": "4.1.0-beta.2",
       "license": "MPL-2.0",
       "dependencies": {
         "electron-log": "^5.3.4",
@@ -468,25 +468,18 @@
       }
     },
     "node_modules/@electron/rebuild": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-4.0.3.tgz",
-      "integrity": "sha512-u9vpTHRMkOYCs/1FLiSVAFZ7FbjsXK+bQuzviJZa+lG7BHZl1nz52/IcGvwa3sk80/fc3llutBkbCq10Vh8WQA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-4.0.4.tgz",
+      "integrity": "sha512-Rzc39XPdk/+/wBG8MfwAHohXflep0ITUfulb6Rgz3R0NeSB1noE+E9/M/cb8ftCAiyDD9PPhLuuWgE1GaInbKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@malept/cross-spawn-promise": "^2.0.0",
         "debug": "^4.1.1",
-        "detect-libc": "^2.0.1",
-        "got": "^11.7.0",
-        "graceful-fs": "^4.2.11",
         "node-abi": "^4.2.0",
         "node-api-version": "^0.2.1",
-        "node-gyp": "^11.2.0",
-        "ora": "^5.1.0",
-        "read-binary-file-arch": "^1.0.6",
-        "semver": "^7.3.5",
-        "tar": "^7.5.6",
-        "yargs": "^17.0.1"
+        "node-gyp": "^12.2.0",
+        "read-binary-file-arch": "^1.0.6"
       },
       "bin": {
         "electron-rebuild": "lib/cli.js"
@@ -854,80 +847,6 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/@isaacs/fs-minipass": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
@@ -1056,43 +975,6 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@npmcli/agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz",
-      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.1",
-        "lru-cache": "^10.0.1",
-        "socks-proxy-agent": "^8.0.3"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz",
-      "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
     "node_modules/@oxc-project/types": {
       "version": "0.133.0",
       "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz",
@@ -1155,17 +1037,6 @@
         "node": ">=14.18.0"
       }
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@rolldown/binding-android-arm64": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.3.tgz",
@@ -2004,13 +1875,13 @@
       }
     },
     "node_modules/abbrev": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz",
-      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
+      "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/acorn": {
@@ -2109,9 +1980,9 @@
       }
     },
     "node_modules/app-builder-lib": {
-      "version": "26.15.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.15.0.tgz",
-      "integrity": "sha512-j2+P6Lh+l/VuWfXZWSs7u+OAPqYJQGnZZO30M833XQQaRuyohm4RZk7Gw4nQXfeyQH9GqXaTwR16Y0LaVTlS+g==",
+      "version": "26.15.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.15.1.tgz",
+      "integrity": "sha512-+YXdZcIbsHLIc/DKtPauZ0n4v5dNl89Rs9SHV062b/LZKl47dkXaE2J4LAgTo5sBuKWEbCkUMdJKXCkJVJpxpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2120,7 +1991,7 @@
         "@electron/get": "^3.0.0",
         "@electron/notarize": "2.5.0",
         "@electron/osx-sign": "1.3.3",
-        "@electron/rebuild": "4.0.3",
+        "@electron/rebuild": "^4.0.4",
         "@electron/universal": "2.0.3",
         "@malept/flatpak-bundler": "^0.4.0",
         "@noble/hashes": "^2.2.0",
@@ -2137,7 +2008,7 @@
         "dotenv": "^16.4.5",
         "dotenv-expand": "^11.0.6",
         "ejs": "^3.1.8",
-        "electron-publish": "26.15.0",
+        "electron-publish": "26.15.1",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
         "isbinaryfile": "^5.0.0",
@@ -2161,8 +2032,8 @@
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "dmg-builder": "26.15.0",
-        "electron-builder-squirrel-windows": "26.15.0"
+        "dmg-builder": "26.15.1",
+        "electron-builder-squirrel-windows": "26.15.1"
       }
     },
     "node_modules/app-builder-lib/node_modules/@electron/get": {
@@ -2451,18 +2322,6 @@
         "require-from-string": "^2.0.2"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -2492,31 +2351,6 @@
         "node": "18 || 20 || >=22"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -2583,92 +2417,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/cacache": {
-      "version": "19.0.1",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
-      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/fs": "^4.0.0",
-        "fs-minipass": "^3.0.0",
-        "glob": "^10.2.2",
-        "lru-cache": "^10.0.1",
-        "minipass": "^7.0.3",
-        "minipass-collect": "^2.0.1",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "p-map": "^7.0.2",
-        "ssri": "^12.0.0",
-        "tar": "^7.4.3",
-        "unique-filename": "^4.0.0"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/cacache/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cacache/node_modules/brace-expansion": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz",
-      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/cacache/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/cacache/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/cacache/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
@@ -2788,19 +2536,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/cli-truncate": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz",
@@ -2899,16 +2634,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/clone-response": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
@@ -3126,19 +2851,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@@ -3258,13 +2970,13 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "26.15.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.15.0.tgz",
-      "integrity": "sha512-oS8MWttbpIUF/2v8LOEY+f4ayL84ipMOarZvdRMl/pxlhLxAYjYMklTXHEXIl37Ig+qJv/bVF7HgyIoOoZyMWA==",
+      "version": "26.15.1",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.15.1.tgz",
+      "integrity": "sha512-9qyIXJpR9dBnkhsClbht/addUeJJYIj95Ofx0wlKoyK1d3RzlCdUduwGElLWONOlGZio287CHtblgrxvu+uCbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "app-builder-lib": "26.15.0",
+        "app-builder-lib": "26.15.1",
         "builder-util": "26.15.0",
         "fs-extra": "^10.1.0",
         "js-yaml": "^4.1.0"
@@ -3353,46 +3065,6 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/duplexer2/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
@@ -3429,18 +3101,18 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "26.15.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.15.0.tgz",
-      "integrity": "sha512-zd4cfvjHmtyGqMaDudg5rAjNUkwIJDz8ICaCsz77hFKcjMQHcZNNNCs/C4phwN9+gEVwmhvpKMzNFum6fs/n6A==",
+      "version": "26.15.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.15.1.tgz",
+      "integrity": "sha512-qqhv7Da4M5pwHZA2dF94PVwIJiQXiXPhAX7Ogo6KAdzMbBoNsM0g8vSMcWtUPDfpC+Z1coq+p9fXn9U4uDeo1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "app-builder-lib": "26.15.0",
+        "app-builder-lib": "26.15.1",
         "builder-util": "26.15.0",
         "builder-util-runtime": "9.7.0",
         "chalk": "^4.1.2",
         "ci-info": "^4.2.0",
-        "dmg-builder": "26.15.0",
+        "dmg-builder": "26.15.1",
         "fs-extra": "^10.1.0",
         "lazy-val": "^1.0.5",
         "simple-update-notifier": "2.0.0",
@@ -3455,14 +3127,14 @@
       }
     },
     "node_modules/electron-builder-squirrel-windows": {
-      "version": "26.15.0",
-      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.15.0.tgz",
-      "integrity": "sha512-WyiGTdAHOk8oncyg/Ik0+NsrPI6y7ftG/eB7uxr9iGjmF9RNuIdeW/BRpI7iLEe718WkBQCbspUAq/4Vi31wXg==",
+      "version": "26.15.1",
+      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.15.1.tgz",
+      "integrity": "sha512-kPEqUP4Bnpb3oRhfN2/19FbRDYwFoq+tXEM87m3clK/AotegS3pKx0tSTrWtM7pEZ0zw5V/tuoo2hRwig1ax8Q==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "app-builder-lib": "26.15.0",
+        "app-builder-lib": "26.15.1",
         "builder-util": "26.15.0",
         "electron-winstaller": "5.4.0"
       }
@@ -3477,9 +3149,9 @@
       }
     },
     "node_modules/electron-publish": {
-      "version": "26.15.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.15.0.tgz",
-      "integrity": "sha512-pt6K3ol/a+o3HbqmYkL2NYlVH5pd34tL4FPRcgX8E88xQAqQyIsseXe4vWy7Pq2BaYy+iFGJrtInZe11FFAQwQ==",
+      "version": "26.15.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.15.1.tgz",
+      "integrity": "sha512-BMgMHOyexWn0UnOC+Afffw0DMrr0yfLp4U8YsLXwoJ3Da7LS7WUnz21teYZqO0gaApE1KgsjREWmbPqvF5JcPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3606,17 +3278,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.5",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@@ -4148,36 +3809,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/foreground-child": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "cross-spawn": "^7.0.6",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/foreground-child/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/form-data": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
@@ -4209,19 +3840,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -4644,41 +4262,6 @@
         "url": "https://github.com/sponsors/typicode"
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "BSD-3-Clause"
-    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -4718,16 +4301,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/ip-address": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
-      "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -4767,16 +4340,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -4784,19 +4347,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4863,22 +4413,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
     "node_modules/jake": {
       "version": "10.9.4",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
@@ -5422,23 +4956,6 @@
       "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
       "license": "MIT"
     },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/log-update": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
@@ -5593,29 +5110,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-fetch-happen": {
-      "version": "14.0.3",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
-      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/agent": "^3.0.0",
-        "cacache": "^19.0.1",
-        "http-cache-semantics": "^4.1.1",
-        "minipass": "^7.0.2",
-        "minipass-fetch": "^4.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^1.0.0",
-        "proc-log": "^5.0.0",
-        "promise-retry": "^2.0.1",
-        "ssri": "^12.0.0"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
     "node_modules/matcher": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
@@ -5683,16 +5177,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/mimic-function": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
@@ -5752,115 +5236,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz",
-      "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.0.3",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^3.0.1"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.13"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz",
-      "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/minizlib": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
@@ -5920,16 +5295,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/node-abi": {
       "version": "4.31.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.31.0.tgz",
@@ -5954,28 +5319,28 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "11.5.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz",
-      "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==",
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz",
+      "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^14.0.3",
-        "nopt": "^8.0.0",
-        "proc-log": "^5.0.0",
+        "nopt": "^9.0.0",
+        "proc-log": "^6.0.0",
         "semver": "^7.3.5",
-        "tar": "^7.4.3",
+        "tar": "^7.5.4",
         "tinyglobby": "^0.2.12",
-        "which": "^5.0.0"
+        "undici": "^6.25.0",
+        "which": "^6.0.0"
       },
       "bin": {
         "node-gyp": "bin/node-gyp.js"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/node-gyp/node_modules/env-paths": {
@@ -5989,29 +5354,39 @@
       }
     },
     "node_modules/node-gyp/node_modules/isexe": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
-      "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
+      "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
+      }
+    },
+    "node_modules/node-gyp/node_modules/undici": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.26.0.tgz",
+      "integrity": "sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.17"
       }
     },
     "node_modules/node-gyp/node_modules/which": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
-      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
+      "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "isexe": "^3.1.1"
+        "isexe": "^4.0.0"
       },
       "bin": {
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/node-int64": {
@@ -6022,19 +5397,19 @@
       "license": "MIT"
     },
     "node_modules/nopt": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz",
-      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz",
+      "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "abbrev": "^3.0.0"
+        "abbrev": "^4.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/normalize-url": {
@@ -6119,96 +5494,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
@@ -6251,26 +5536,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-map": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
-      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0"
-    },
     "node_modules/parse5": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.1.tgz",
@@ -6314,30 +5579,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -6519,13 +5760,13 @@
       }
     },
     "node_modules/proc-log": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz",
-      "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
+      "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/process-nextick-args": {
@@ -6639,18 +5880,19 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "node_modules/require-directory": {
@@ -6827,34 +6069,12 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
       "license": "MIT"
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/sanitize-filename": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.4.tgz",
@@ -7004,47 +6224,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
-      "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ip-address": "^10.1.1",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
-      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "^4.3.4",
-        "socks": "^2.8.3"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7084,19 +6263,6 @@
       "license": "BSD-3-Clause",
       "optional": true
     },
-    "node_modules/ssri": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz",
-      "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
     "node_modules/stackback": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
@@ -7122,13 +6288,13 @@
       "license": "MIT"
     },
     "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/string-argv": {
@@ -7158,55 +6324,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-ansi": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
@@ -7223,30 +6340,6 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sumchecker": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
@@ -7564,9 +6657,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.27.1.tgz",
-      "integrity": "sha512-UDdpiex+mzigiyrXrGbiUaF4HzTNhKbh2vRNFaTMzcqmLIPrZxaCtwo/1TMSuWoM1Xz3WiTo9KdgI3kRqYzJGg==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.27.2.tgz",
+      "integrity": "sha512-uZsKNuzQxDMUY6M3pIMvy5tvlGmtq8XJ2oLAkfRKGNu+1VQAIvLy2xIVG5ATZl5wDXl/tddByAWCizRbOme+TA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7580,32 +6673,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/unique-filename": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz",
-      "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "unique-slug": "^5.0.0"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz",
-      "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^18.17.0 || >=20.5.0"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -7848,16 +6915,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
     "node_modules/webcrypto-core": {
       "version": "1.9.2",
       "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.9.2.tgz",
@@ -7968,73 +7025,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "6.2.3",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
diff --git a/package.json b/package.json
index 5425aed..62f1df1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rosi",
-  "version": "4.1.0-beta.1",
+  "version": "4.1.0-beta.2",
   "private": true,
   "description": "Electron GUI for yt-dlp",
   "keywords": [
diff --git a/src/main/constants.ts b/src/main/constants.ts
index 3ca9da1..d343515 100644
--- a/src/main/constants.ts
+++ b/src/main/constants.ts
@@ -13,6 +13,17 @@ export const SUBTITLE_LANGS_PATTERN = /^[A-Za-z0-9.*-]+(,[A-Za-z0-9.*-]+)*$/;
 
 export const ALLOWED_AUDIO_FORMATS = new Set(['mp3', 'flac', 'ogg', 'wav', 'm4a', 'opus']);
 export const ALLOWED_CONVERT_FORMATS = new Set(['mp4', 'mov', 'mp3', 'm4a']);
+export const ALLOWED_BROWSERS = new Set([
+  'brave',
+  'chrome',
+  'chromium',
+  'edge',
+  'firefox',
+  'opera',
+  'safari',
+  'vivaldi',
+  'whale',
+]);
 export const MAX_QUEUE_SIZE = 500;
 export const MAX_FORMAT_COUNTS = 10_000;
 export const MAX_SETTINGS_IMPORT_BYTES = 1_048_576;
diff --git a/src/main/deno.ts b/src/main/deno.ts
index eb664be..894d983 100644
--- a/src/main/deno.ts
+++ b/src/main/deno.ts
@@ -1,6 +1,5 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import { spawn } from 'child_process';
 import { BrowserWindow, dialog } from 'electron';
 import log from 'electron-log/main.js';
 import type { MessageBoxOptions } from 'electron';
@@ -10,7 +9,7 @@ import {
   MAX_OUTPUT_BUFFER,
   MAX_ERROR_BUFFER,
 } from './constants';
-import { buildEnhancedPath, isWindows } from './platform';
+import { spawnWithEnv, isWindows } from './platform';
 
 function getDenoSearchPaths(): string[] {
   if (isWindows) {
@@ -45,9 +44,7 @@ export async function checkDenoInstalled(): Promise<boolean> {
     }
 
     const checkCmd = isWindows ? 'where' : 'which';
-    const proc = spawn(checkCmd, ['deno'], {
-      env: { PATH: buildEnhancedPath() },
-    });
+    const proc = spawnWithEnv(checkCmd, ['deno']);
 
     const timeout = setTimeout(() => {
       try {
@@ -107,9 +104,7 @@ export async function installDeno(
       installArgs = ['-c', 'curl -fsSL https://deno.land/install.sh | sh'];
     }
 
-    const proc = spawn(installCmd, installArgs, {
-      env: { ...process.env, PATH: buildEnhancedPath() },
-    });
+    const proc = spawnWithEnv(installCmd, installArgs);
     let output = '';
     let error = '';
     let settled = false;
diff --git a/src/main/download/commandBuilders.ts b/src/main/download/commandBuilders.ts
index 8e4f9db..e32ca8c 100644
--- a/src/main/download/commandBuilders.ts
+++ b/src/main/download/commandBuilders.ts
@@ -4,6 +4,7 @@ import { detectGpu } from '../gpu';
 import { spawnWithEnv } from '../platform';
 import {
   ALLOWED_AUDIO_FORMATS,
+  ALLOWED_BROWSERS,
   FORMAT_ID_PATTERN,
   MAX_ERROR_BUFFER,
   SUBTITLE_LANGS_PATTERN,
@@ -11,17 +12,7 @@ import {
 
 const VALID_FORMAT_ID = FORMAT_ID_PATTERN;
 const CODEC_PROBE_TIMEOUT_MS = 30_000;
-const ALLOWED_BROWSERS = new Set([
-  'brave',
-  'chrome',
-  'chromium',
-  'edge',
-  'firefox',
-  'opera',
-  'safari',
-  'vivaldi',
-  'whale',
-]);
+export { ALLOWED_BROWSERS };
 
 export interface SourceCodecs {
   video?: string;
diff --git a/src/main/download/videoInfo.ts b/src/main/download/videoInfo.ts
index 109395a..f0facb1 100644
--- a/src/main/download/videoInfo.ts
+++ b/src/main/download/videoInfo.ts
@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import log from 'electron-log/main.js';
 import { spawnWithEnv } from '../platform';
+import { killChildProcess } from '../processKill';
 import { isSafeHttpUrl } from '../../utils/validation';
 import { MAX_OUTPUT_BUFFER, MAX_ERROR_BUFFER, FORMAT_FETCH_TIMEOUT_MS } from '../constants';
 import type { FormatsProcess, VideoInfo } from '../../types';
@@ -65,11 +66,7 @@ export function parseVideoInfo(jsonString: string): VideoInfo | null {
 export function cancelVideoInfo(): void {
   if (infoProcess?.proc && !infoProcess.proc.killed) {
     infoProcess.cancelled = true;
-    try {
-      infoProcess.proc.kill();
-    } catch (error) {
-      log.warn('Error killing video info process:', error);
-    }
+    killChildProcess(infoProcess.proc, 'video-info');
   }
 }
 
@@ -84,7 +81,7 @@ export function fetchVideoInfo(ytdlpPath: string, url: string): Promise<VideoInf
     if (infoProcess?.proc && !infoProcess.proc.killed) {
       try {
         infoProcess.cancelled = true;
-        infoProcess.proc.kill();
+        killChildProcess(infoProcess.proc, 'video-info');
       } catch (error) {
         log.warn('Error killing previous video info process:', error);
       }
@@ -105,7 +102,7 @@ export function fetchVideoInfo(ytdlpPath: string, url: string): Promise<VideoInf
     const timeout = setTimeout(() => {
       try {
         infoProcess!.cancelled = true;
-        proc.kill();
+        killChildProcess(proc, 'video-info-timeout');
       } catch (error) {
         log.warn('Error killing video info process on timeout:', error);
       }
diff --git a/src/main/downloader.ts b/src/main/downloader.ts
index 1772aba..5036466 100644
--- a/src/main/downloader.ts
+++ b/src/main/downloader.ts
@@ -4,6 +4,7 @@ import sanitize from 'sanitize-filename';
 import { dialog } from 'electron';
 import log from 'electron-log/main.js';
 import { spawnWithEnv, getEffectiveFfmpegPath, ytdlpBinary, isWindows } from './platform';
+import { killChildProcess } from './processKill';
 import { loadSettings, recordDownload } from './settings';
 import {
   buildFfmpegArgs,
@@ -29,6 +30,7 @@ import {
 import type { ChildProcess } from 'child_process';
 import type {
   DownloadSession,
+  DownloadSessionOwner,
   DownloadRequestOptions,
   DownloadOutcome,
   FormatsProcess,
@@ -36,9 +38,23 @@ import type {
 } from '../types';
 
 let activeDownloadSession: DownloadSession | null = null;
+let downloadSessionOwner: DownloadSessionOwner | null = null;
 let downloadSessionCounter = 0;
 let formatsProcess: FormatsProcess | null = null;
 
+export function getDownloadSessionOwner(): DownloadSessionOwner | null {
+  return downloadSessionOwner;
+}
+
+export function isDownloadBusy(): boolean {
+  return activeDownloadSession !== null;
+}
+
+export function canStartDownload(owner: DownloadSessionOwner): boolean {
+  if (!activeDownloadSession) return true;
+  return downloadSessionOwner === owner;
+}
+
 function isActiveSession(session: DownloadSession | null) {
   return Boolean(session && activeDownloadSession && activeDownloadSession.id === session.id);
 }
@@ -102,21 +118,11 @@ function completeSession(
   }
 
   activeDownloadSession = null;
+  downloadSessionOwner = null;
 }
 
 function killProcess(proc: ChildProcess | null, label: string) {
-  if (!proc) return;
-  try {
-    proc.kill('SIGTERM');
-    const forceKillTimer = setTimeout(() => {
-      try {
-        if (!proc.killed) proc.kill('SIGKILL');
-      } catch {}
-    }, 5000);
-    proc.once('exit', () => clearTimeout(forceKillTimer));
-  } catch (error) {
-    log.error(`Error killing ${label} process:`, error);
-  }
+  killChildProcess(proc, label);
 }
 
 export function cancelActiveSession(notify = true) {
@@ -130,7 +136,7 @@ export function cancelActiveSession(notify = true) {
 
   if (!isActiveSession(session)) return;
 
-  if (notify) {
+  if (notify || session.owner === 'manual') {
     completeSession(session, '⏹️ Cancelled.', 'cancelled', {
       progressMessage: '⏹️ Download/Conversion cancelled by user.',
     });
@@ -148,16 +154,30 @@ export function cancelActiveSession(notify = true) {
   recordDownload('cancelled');
   session.lifecycle = markTerminalEventEmitted(session.lifecycle);
   activeDownloadSession = null;
+  downloadSessionOwner = null;
 }
 
 export function killAllProcesses() {
-  if (activeDownloadSession) {
-    killProcess(activeDownloadSession.ytdlpProcess, 'yt-dlp');
-    killProcess(activeDownloadSession.ffmpegProcess, 'ffmpeg');
-    activeDownloadSession.ytdlpProcess = null;
-    activeDownloadSession.ffmpegProcess = null;
-    activeDownloadSession = null;
+  if (!activeDownloadSession) return;
+  const session = activeDownloadSession;
+  session.lifecycle = markDownloadCancelled(session.lifecycle);
+  killProcess(session.ytdlpProcess, 'yt-dlp');
+  killProcess(session.ffmpegProcess, 'ffmpeg');
+  session.ytdlpProcess = null;
+  session.ffmpegProcess = null;
+
+  if (typeof session.onComplete === 'function') {
+    try {
+      session.onComplete('⏹️ Cancelled.', 'cancelled');
+    } catch (error) {
+      log.error('Error in download cancellation callback:', error);
+    }
   }
+
+  recordDownload('cancelled');
+  session.lifecycle = markTerminalEventEmitted(session.lifecycle);
+  activeDownloadSession = null;
+  downloadSessionOwner = null;
 }
 
 export function fetchFormats(ytdlpPath: string, url: string): Promise<string> {
@@ -171,12 +191,12 @@ export function fetchFormats(ytdlpPath: string, url: string): Promise<string> {
     if (formatsProcess?.proc && !formatsProcess.proc.killed) {
       try {
         formatsProcess.cancelled = true;
-        formatsProcess.proc.kill();
+        killChildProcess(formatsProcess.proc, 'formats');
       } catch (error) {
         log.warn('Error killing previous formats process:', error);
       }
     }
-    const proc = spawnWithEnv(ytdlpPath, ['-F', url]);
+    const proc = spawnWithEnv(ytdlpPath, ['-F', '--', url]);
     formatsProcess = { proc, cancelled: false };
     let outputData = '';
     let errorData = '';
@@ -184,7 +204,7 @@ export function fetchFormats(ytdlpPath: string, url: string): Promise<string> {
     const timeout = setTimeout(() => {
       try {
         formatsProcess!.cancelled = true;
-        proc.kill();
+        killChildProcess(proc, 'formats-timeout');
       } catch (error) {
         log.warn('Error killing formats process on timeout:', error);
       }
@@ -317,6 +337,7 @@ async function runConversion(
       if (!isActiveSession(session) || !ffProc || ffProc.killed) return;
       sendProgress(session, '❌ Conversion timed out after 10 minutes.');
       killProcess(ffProc, 'ffmpeg-timeout');
+      completeSession(session, '❌ Conversion failed (timeout).', 'failed');
     }, FFMPEG_CONVERT_TIMEOUT_MS);
 
     ffProc.stdout?.on('data', (data) => {
@@ -424,8 +445,12 @@ export function startDownload(
   sender: Electron.WebContents,
   options: DownloadRequestOptions,
   mainWindow: Electron.BrowserWindow | null,
-  onComplete?: (statusMessage: string) => void
+  onComplete?: (statusMessage: string, outcome?: DownloadOutcome) => void,
+  owner: DownloadSessionOwner = 'manual'
 ) {
+  if (activeDownloadSession && downloadSessionOwner !== owner) {
+    throw new Error('Download session already active with a different owner.');
+  }
   if (activeDownloadSession) {
     cancelActiveSession(false);
   }
@@ -434,12 +459,14 @@ export function startDownload(
   const session: DownloadSession = {
     id: downloadSessionCounter,
     sender,
+    owner,
     lifecycle: createDownloadLifecycleState(),
     ytdlpProcess: null,
     ffmpegProcess: null,
     onComplete,
   };
   activeDownloadSession = session;
+  downloadSessionOwner = owner;
 
   const settings = loadSettings();
   const effectiveSettings: Settings = { ...settings };
@@ -514,7 +541,7 @@ export function startDownload(
     sendProgress(session, `🚀 Starting download: ${url}`);
     sendProgress(session, `   Command: ${ytdlpBinary} ${ytdlpArgs.join(' ')}`);
     const ytProc = spawnWithEnv(ytdlpPath, ytdlpArgs, {
-      env: { ...process.env, PYTHONUNBUFFERED: '1' },
+      env: { PYTHONUNBUFFERED: '1' },
     });
     session.ytdlpProcess = ytProc;
 
diff --git a/src/main/main.ts b/src/main/main.ts
index 4b4a776..6f12ded 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -1,6 +1,7 @@
 import { app, BrowserWindow, ipcMain, dialog, shell, Notification } from 'electron';
 import * as path from 'path';
 import * as fs from 'fs';
+import { randomUUID } from 'crypto';
 import log from 'electron-log/main.js';
 import { isPackaged, resolveYtdlpPath, verifyBundledFfmpeg } from './platform';
 import {
@@ -18,6 +19,7 @@ import {
   downloadUpdate,
   cancelUpdateDownload,
   installUpdate,
+  applyChannelFromSettings,
 } from './updater';
 import { checkDenoInstalled, installDeno } from './deno';
 import { detectGpu } from './gpu';
@@ -27,6 +29,7 @@ import {
   killAllProcesses,
   fetchFormats,
   cancelFormats,
+  canStartDownload,
 } from './downloader';
 import { fetchVideoInfo, cancelVideoInfo } from './download/videoInfo';
 import { isSafeExternalUrl, isSafeHttpUrl, isAllowedNavigationUrl } from '../utils/validation';
@@ -38,22 +41,29 @@ import {
   validateFileLocationPayload,
   validateNotificationPayload,
   validateSettingsPatchPayload,
+  validateDownloadPath,
 } from '../utils/ipcValidation';
 import { SPLASH_SHOW_DELAY_MS, SPLASH_FADE_DELAY_MS, MAX_QUEUE_SIZE } from './constants';
 import type { DownloadRequestOptions, DownloadOutcome, QueueItem } from '../types';
 
 log.initialize();
 
-process.setMaxListeners(20);
+process.setMaxListeners(48);
 
 process.on('uncaughtException', (error) => {
   log.error('Uncaught exception:', error);
+  try {
+    flushQueueOnShutdown();
+  } catch {}
   try {
     killAllProcesses();
   } catch {}
   try {
     cancelFormats();
   } catch {}
+  try {
+    cancelVideoInfo();
+  } catch {}
   try {
     dialog.showErrorBox(
       'Fatal Error',
@@ -69,7 +79,13 @@ process.on('unhandledRejection', (reason) => {
   log.error('Unhandled rejection:', reason);
 });
 
-const ytdlpPath = resolveYtdlpPath();
+let ytdlpPath: string | null = null;
+function getYtdlpPath(): string {
+  if (!ytdlpPath) {
+    ytdlpPath = resolveYtdlpPath();
+  }
+  return ytdlpPath;
+}
 const isSmokeRun = process.argv.includes('--smoke') || process.env.ROSI_SMOKE === '1';
 const isPrimaryInstance =
   isSmokeRun || typeof app.requestSingleInstanceLock !== 'function'
@@ -82,11 +98,20 @@ let splashWindow: BrowserWindow | null = null;
 let mainWindowCloseInProgress = false;
 let mainWindowCloseTimer: NodeJS.Timeout | null = null;
 let appQuitting = false;
+let isInstallingUpdate = false;
+let renderProcessReloadCount = 0;
 
 function getMainWindow() {
   return mainWindow;
 }
 
+function assertMainWindowSender(event?: { sender?: { id?: number } }): boolean {
+  if (!mainWindow || mainWindow.isDestroyed()) {
+    return false;
+  }
+  return event?.sender?.id === mainWindow.webContents.id;
+}
+
 function clearMainWindowCloseTimer() {
   if (mainWindowCloseTimer) {
     clearTimeout(mainWindowCloseTimer);
@@ -106,11 +131,18 @@ function createSplashWindow() {
       contextIsolation: true,
       nodeIntegration: false,
       sandbox: true,
+      webSecurity: true,
     },
-    roundedCorners: true,
+    ...(process.platform === 'darwin' ? { roundedCorners: true } : {}),
   });
   void splashWindow.loadFile(path.join(__dirname, '..', '..', 'src', 'renderer', 'splash.html'));
   splashWindow.center();
+  setTimeout(() => {
+    if (splashWindow && !splashWindow.isDestroyed()) {
+      splashWindow.close();
+      splashWindow = null;
+    }
+  }, 30_000);
 }
 
 async function runRendererSmokeChecks(windowRef: BrowserWindow): Promise<string[]> {
@@ -266,7 +298,7 @@ function createWindow() {
   clearMainWindowCloseTimer();
 
   mainWindow.on('close', (event) => {
-    if (isSmokeRun || mainWindowCloseInProgress) {
+    if (isSmokeRun || mainWindowCloseInProgress || isInstallingUpdate) {
       return;
     }
     if (!mainWindow || mainWindow.isDestroyed()) {
@@ -295,9 +327,26 @@ function createWindow() {
   mainWindow.on('closed', () => {
     clearMainWindowCloseTimer();
     mainWindowCloseInProgress = false;
+    isInstallingUpdate = false;
+    if (process.platform === 'darwin' && !appQuitting) {
+      stopActiveDownloadsAndQueue();
+    }
     mainWindow = null;
   });
 
+  mainWindow.webContents.on('did-fail-load', (_event, errorCode, errorDescription) => {
+    log.error(`Main window failed to load: ${errorCode} ${errorDescription}`);
+    if (splashWindow && !splashWindow.isDestroyed()) {
+      splashWindow.close();
+      splashWindow = null;
+    }
+    dialog.showErrorBox(
+      'Load Error',
+      `ROSI failed to load the application window.\n\n${errorDescription}`
+    );
+    app.quit();
+  });
+
   mainWindow.webContents.setWindowOpenHandler(({ url }) => {
     if (isSafeExternalUrl(url)) {
       shell.openExternal(url).catch((err) => {
@@ -310,12 +359,20 @@ function createWindow() {
   mainWindow.webContents.on('render-process-gone', (_event, details) => {
     log.error(`Renderer process gone: ${details.reason} (exit code: ${details.exitCode})`);
     if (details.reason !== 'clean-exit' && mainWindow && !mainWindow.isDestroyed()) {
-      mainWindow.reload();
+      if (renderProcessReloadCount < 3) {
+        renderProcessReloadCount += 1;
+        mainWindow.reload();
+        return;
+      }
+      dialog.showErrorBox(
+        'Renderer Error',
+        'The application window failed to recover after multiple reload attempts. Please restart ROSI.'
+      );
     }
   });
 
   mainWindow.webContents.on('will-navigate', (event, url) => {
-    if (!isAllowedNavigationUrl(url)) {
+    if (!isAllowedNavigationUrl(url, app.getAppPath())) {
       event.preventDefault();
       if (isSafeExternalUrl(url)) {
         shell.openExternal(url).catch((err) => {
@@ -384,6 +441,16 @@ void app.whenReady().then(() => {
     return;
   }
 
+  const resolvedYtdlpPath = getYtdlpPath();
+  if (!fs.existsSync(resolvedYtdlpPath)) {
+    dialog.showErrorBox(
+      'Missing Dependency',
+      `yt-dlp binary not found at ${resolvedYtdlpPath}.\nPlease ensure the yt-dlp binary is in the application's directory.`
+    );
+    app.quit();
+    return;
+  }
+
   if (!isSmokeRun) {
     createSplashWindow();
   }
@@ -407,6 +474,7 @@ app.on('activate', () => {
 
 app.on('before-quit', () => {
   appQuitting = true;
+  flushQueueOnShutdown();
   try {
     killAllProcesses();
   } catch (error) {
@@ -456,14 +524,49 @@ if (!process.windowsStore) {
   ipcMain.handle('check-for-updates', () => checkForUpdates(isPackaged, loadSettings));
   ipcMain.handle('download-update', () => downloadUpdate());
   ipcMain.on('cancel-update-download', () => cancelUpdateDownload(getMainWindow));
-  ipcMain.on('install-update', () => installUpdate());
+  ipcMain.on('install-update', (event) => {
+    if (!assertMainWindowSender(event)) {
+      return;
+    }
+    isInstallingUpdate = true;
+    clearMainWindowCloseTimer();
+    try {
+      installUpdate();
+      setTimeout(() => {
+        if (isInstallingUpdate && mainWindow && !mainWindow.isDestroyed()) {
+          isInstallingUpdate = false;
+        }
+      }, 8000);
+    } catch (error) {
+      isInstallingUpdate = false;
+      log.error('Failed to install update:', error);
+    }
+  });
 }
 
-ipcMain.handle('check-deno-installed', () => checkDenoInstalled());
-ipcMain.handle('install-deno', () => installDeno(mainWindow));
+ipcMain.handle('check-deno-installed', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return false;
+  }
+  return checkDenoInstalled();
+});
+ipcMain.handle('install-deno', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return { error: 'Unauthorized sender.' };
+  }
+  return installDeno(mainWindow);
+});
 
-ipcMain.handle('get-settings', () => loadSettings());
-ipcMain.handle('save-settings', (_, data) => {
+ipcMain.handle('get-settings', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return getDefaultSettings();
+  }
+  return loadSettings();
+});
+ipcMain.handle('save-settings', (event, data) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   const validation = validateSettingsPatchPayload(data);
   if (!validation.ok) {
     return errorResult(validation.error.code, validation.error.message, validation.error.details);
@@ -473,13 +576,22 @@ ipcMain.handle('save-settings', (_, data) => {
   if (!saved) {
     return errorResult('INTERNAL_ERROR', 'Failed to persist settings.');
   }
-  return okResult(loadSettings());
+  const updated = loadSettings();
+  if (!process.windowsStore && validation.data.updateChannel !== undefined) {
+    applyChannelFromSettings(updated);
+  }
+  return okResult(updated);
 });
 
-ipcMain.handle('detect-gpu', () => detectGpu());
+ipcMain.handle('detect-gpu', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return { nvidia: false, amd: false, intel: false };
+  }
+  return detectGpu();
+});
 
 ipcMain.on('reset-settings', (event) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return;
   }
   try {
@@ -496,7 +608,10 @@ ipcMain.on('reset-settings', (event) => {
   }
 });
 
-ipcMain.handle('open-external', async (_, url) => {
+ipcMain.handle('open-external', async (event, url) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   const validation = validateExternalUrlPayload(url);
   if (!validation.ok) {
     return errorResult(validation.error.code, validation.error.message, validation.error.details);
@@ -511,7 +626,10 @@ ipcMain.handle('open-external', async (_, url) => {
   }
 });
 
-ipcMain.handle('select-download-location', async () => {
+ipcMain.handle('select-download-location', async (event) => {
+  if (!assertMainWindowSender(event)) {
+    return null;
+  }
   try {
     const defaultPath = app.getPath('downloads');
     const focusedWindow = BrowserWindow.getFocusedWindow();
@@ -530,13 +648,16 @@ ipcMain.handle('select-download-location', async () => {
   }
 });
 
-ipcMain.handle('getFormats', async (_, url) => {
+ipcMain.handle('getFormats', async (event, url) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   if (typeof url !== 'string' || !isSafeHttpUrl(url)) {
     return errorResult('INVALID_URL', 'Invalid URL provided.');
   }
 
   try {
-    const formats = await fetchFormats(ytdlpPath, url);
+    const formats = await fetchFormats(getYtdlpPath(), url);
     return okResult(formats);
   } catch (error) {
     const message =
@@ -552,19 +673,22 @@ ipcMain.handle('getFormats', async (_, url) => {
   }
 });
 ipcMain.on('cancel-formats', (event) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return;
   }
   cancelFormats();
 });
 
-ipcMain.handle('get-video-info', async (_, url) => {
+ipcMain.handle('get-video-info', async (event, url) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   if (typeof url !== 'string' || !isSafeHttpUrl(url)) {
     return errorResult('INVALID_URL', 'Invalid URL provided.');
   }
 
   try {
-    const info = await fetchVideoInfo(ytdlpPath, url);
+    const info = await fetchVideoInfo(getYtdlpPath(), url);
     return okResult(info);
   } catch (error) {
     const message =
@@ -581,23 +705,33 @@ ipcMain.handle('get-video-info', async (_, url) => {
 });
 
 ipcMain.on('cancel-video-info', (event) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return;
   }
   cancelVideoInfo();
 });
 
 ipcMain.handle('download-video', (event, options) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
   }
   const validation = validateDownloadRequestPayload(options);
   if (!validation.ok) {
     return errorResult(validation.error.code, validation.error.message, validation.error.details);
   }
+  if (!canStartDownload('manual')) {
+    return errorResult('NOT_AVAILABLE', 'A queue download is already in progress.');
+  }
 
   try {
-    startDownload(ytdlpPath, event.sender, validation.data as DownloadRequestOptions, mainWindow);
+    startDownload(
+      getYtdlpPath(),
+      event.sender,
+      validation.data as DownloadRequestOptions,
+      mainWindow,
+      undefined,
+      'manual'
+    );
     return okResult({ started: true });
   } catch (error) {
     log.error('Error in download-video handler:', error);
@@ -606,7 +740,7 @@ ipcMain.handle('download-video', (event, options) => {
 });
 
 ipcMain.on('cancel-download', (event) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return;
   }
   try {
@@ -616,12 +750,27 @@ ipcMain.on('cancel-download', (event) => {
   }
 });
 
-ipcMain.handle('restart-app', () => {
+ipcMain.handle('restart-app', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return;
+  }
+  appQuitting = true;
+  try {
+    cancelActiveSession(false);
+    killAllProcesses();
+    cancelFormats();
+    cancelVideoInfo();
+  } catch (error) {
+    log.error('Error cleaning up before restart:', error);
+  }
   app.relaunch();
   app.exit(0);
 });
 
-ipcMain.handle('open-file-location', async (_, filePath) => {
+ipcMain.handle('open-file-location', async (event, filePath) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   const validation = validateFileLocationPayload(filePath);
   if (!validation.ok) {
     return errorResult(validation.error.code, validation.error.message, validation.error.details);
@@ -649,7 +798,10 @@ ipcMain.handle('open-file-location', async (_, filePath) => {
   }
 });
 
-ipcMain.handle('show-notification', (_, options) => {
+ipcMain.handle('show-notification', (event, options) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   const validation = validateNotificationPayload(options);
   if (!validation.ok) {
     return errorResult(validation.error.code, validation.error.message, validation.error.details);
@@ -667,7 +819,7 @@ ipcMain.handle('show-notification', (_, options) => {
       silent: false,
     });
 
-    notification.on('click', () => {
+    notification.once('click', () => {
       try {
         const win = getMainWindow();
         if (win && !win.isDestroyed()) {
@@ -690,7 +842,10 @@ ipcMain.handle('show-notification', (_, options) => {
   }
 });
 
-ipcMain.handle('export-settings', async () => {
+ipcMain.handle('export-settings', async (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   try {
     const parentWindow = mainWindow && !mainWindow.isDestroyed() ? mainWindow : null;
     const success = await exportSettingsToFile(parentWindow);
@@ -702,11 +857,17 @@ ipcMain.handle('export-settings', async () => {
   }
 });
 
-ipcMain.handle('import-settings', async () => {
+ipcMain.handle('import-settings', async (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   try {
     const parentWindow = mainWindow && !mainWindow.isDestroyed() ? mainWindow : null;
-    const success = await importSettingsFromFile(parentWindow);
-    if (!success) return errorResult('INTERNAL_ERROR', 'Import cancelled or failed.');
+    const importedSettings = await importSettingsFromFile(parentWindow);
+    if (!importedSettings) return errorResult('INTERNAL_ERROR', 'Import cancelled or failed.');
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      mainWindow.webContents.send('settings-imported', importedSettings);
+    }
     return okResult({ imported: true });
   } catch (error) {
     log.error('Error importing settings:', error);
@@ -714,9 +875,17 @@ ipcMain.handle('import-settings', async () => {
   }
 });
 
-ipcMain.handle('get-stats', () => loadStats());
+ipcMain.handle('get-stats', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return loadStats();
+  }
+  return loadStats();
+});
 
-ipcMain.handle('reset-stats', () => {
+ipcMain.handle('reset-stats', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   const success = resetStats();
   if (!success) return errorResult('INTERNAL_ERROR', 'Failed to reset stats.');
   return okResult(undefined);
@@ -767,6 +936,8 @@ function loadPersistedQueue(): QueueItem[] {
   return [];
 }
 
+let persistQueueTimer: NodeJS.Timeout | null = null;
+
 function persistQueue(): void {
   const tempPath = `${queuePath}.tmp`;
   try {
@@ -791,14 +962,50 @@ function persistQueue(): void {
 downloadQueue = loadPersistedQueue();
 
 function generateQueueId(): string {
-  return `q_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+  return `q_${randomUUID()}`;
+}
+
+function schedulePersistQueue(): void {
+  if (persistQueueTimer) {
+    clearTimeout(persistQueueTimer);
+  }
+  persistQueueTimer = setTimeout(() => {
+    persistQueueTimer = null;
+    persistQueue();
+  }, 300);
+}
+
+function flushQueueOnShutdown() {
+  if (persistQueueTimer) {
+    clearTimeout(persistQueueTimer);
+    persistQueueTimer = null;
+  }
+  persistQueue();
+}
+
+function stopActiveDownloadsAndQueue() {
+  queueCancelled = true;
+  isQueueRunning = false;
+  queueActiveItemId = null;
+  try {
+    cancelActiveSession(false);
+  } catch {}
+  try {
+    killAllProcesses();
+  } catch {}
+  try {
+    cancelFormats();
+  } catch {}
+  try {
+    cancelVideoInfo();
+  } catch {}
 }
 
 function broadcastQueue() {
   if (mainWindow && !mainWindow.isDestroyed()) {
     mainWindow.webContents.send('queue-update', downloadQueue);
   }
-  persistQueue();
+  schedulePersistQueue();
 }
 
 async function processQueue() {
@@ -830,9 +1037,17 @@ async function processQueue() {
       }
 
       const settings = loadSettings();
+      let outputPath = app.getPath('downloads');
+      const rawFolder = settings.downloadFolder?.trim();
+      if (rawFolder) {
+        const folderValidation = validateDownloadPath(rawFolder);
+        if (folderValidation.ok && folderValidation.data) {
+          outputPath = folderValidation.data;
+        }
+      }
       const options: DownloadRequestOptions = {
         url: nextItem.url,
-        outputPath: app.getPath('downloads'),
+        outputPath,
         ffmpegPath: settings.ffmpegPath || undefined,
         convertFormat: settings.convertEnabled ? settings.convertFormat : undefined,
         keepOriginal: settings.convertEnabled ? settings.keepOriginalAfterConvert : undefined,
@@ -860,7 +1075,14 @@ async function processQueue() {
       };
 
       try {
-        startDownload(ytdlpPath, mainWindow.webContents, options, mainWindow, completeListener);
+        startDownload(
+          getYtdlpPath(),
+          mainWindow.webContents,
+          options,
+          mainWindow,
+          completeListener,
+          'queue'
+        );
       } catch (error) {
         nextItem.status = 'failed';
         nextItem.error = (error as Error).message;
@@ -878,7 +1100,7 @@ async function processQueue() {
 }
 
 ipcMain.handle('add-to-queue', (event, urls) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
   }
   if (!Array.isArray(urls)) {
@@ -903,7 +1125,7 @@ ipcMain.handle('add-to-queue', (event, urls) => {
 });
 
 ipcMain.handle('remove-from-queue', (event, id) => {
-  if (mainWindow && !mainWindow.isDestroyed() && event.sender?.id !== mainWindow.webContents.id) {
+  if (!assertMainWindowSender(event)) {
     return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
   }
   if (typeof id !== 'string') {
@@ -921,7 +1143,10 @@ ipcMain.handle('remove-from-queue', (event, id) => {
   return okResult(undefined);
 });
 
-ipcMain.handle('clear-queue', () => {
+ipcMain.handle('clear-queue', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   if (isQueueRunning) {
     queueCancelled = true;
     cancelActiveSession(true);
@@ -933,9 +1158,17 @@ ipcMain.handle('clear-queue', () => {
   return okResult(undefined);
 });
 
-ipcMain.handle('get-queue', () => downloadQueue);
+ipcMain.handle('get-queue', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
+  return downloadQueue;
+});
 
-ipcMain.handle('start-queue', () => {
+ipcMain.handle('start-queue', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   const pending = downloadQueue.filter((item) => item.status === 'pending');
   if (pending.length === 0) {
     return errorResult('NOT_AVAILABLE', 'No pending items in queue.');
@@ -943,13 +1176,19 @@ ipcMain.handle('start-queue', () => {
   if (isQueueRunning) {
     return errorResult('VALIDATION_ERROR', 'Queue is already running.');
   }
+  if (!canStartDownload('queue')) {
+    return errorResult('NOT_AVAILABLE', 'A manual download is already in progress.');
+  }
   isQueueRunning = true;
   queueCancelled = false;
   void processQueue();
   return okResult({ started: true });
 });
 
-ipcMain.handle('cancel-queue', () => {
+ipcMain.handle('cancel-queue', (event) => {
+  if (!assertMainWindowSender(event)) {
+    return errorResult('VALIDATION_ERROR', 'Unauthorized sender.');
+  }
   try {
     queueCancelled = true;
     isQueueRunning = false;
diff --git a/src/main/platform.ts b/src/main/platform.ts
index d584bd9..8950acc 100644
--- a/src/main/platform.ts
+++ b/src/main/platform.ts
@@ -232,15 +232,22 @@ export function resolveBundledFfmpegPath(): string | null {
 export function getEffectiveFfmpegPath(customPath?: string | null): string {
   const resolved = resolveFfmpegPath(customPath);
   if (resolved) {
-    const pathLike =
-      path.isAbsolute(resolved) ||
-      resolved.includes(path.sep) ||
-      resolved.includes('/') ||
-      resolved.includes('\\');
-    if (!pathLike || fs.existsSync(resolved)) {
-      return resolved;
+    const baseName = path.basename(resolved).toLowerCase();
+    const validBasename =
+      resolved === 'ffmpeg' || baseName === 'ffmpeg' || baseName === 'ffmpeg.exe';
+    if (!validBasename) {
+      log.warn(`Custom ffmpeg path has invalid basename, falling back: ${resolved}`);
+    } else {
+      const pathLike =
+        path.isAbsolute(resolved) ||
+        resolved.includes(path.sep) ||
+        resolved.includes('/') ||
+        resolved.includes('\\');
+      if (!pathLike || fs.existsSync(resolved)) {
+        return resolved;
+      }
+      log.warn(`Custom ffmpeg path does not exist, falling back: ${resolved}`);
     }
-    log.warn(`Custom ffmpeg path does not exist, falling back: ${resolved}`);
   }
 
   const bundled = resolveBundledFfmpegPath();
@@ -339,29 +346,21 @@ export function resolveYtdlpPath(): string {
             fs.chmodSync(tmpBin, 0o755);
             resolved = tmpBin;
           } catch (copyErr) {
-            dialog.showErrorBox(
-              'Permission Error',
-              `Failed to prepare yt-dlp for execution at ${resolved}.\nError: ${(copyErr as Error).message}`
+            log.error(
+              `Failed to prepare yt-dlp for execution at ${resolved}: ${(copyErr as Error).message}`
             );
-            app.quit();
           }
         }
       } else {
-        dialog.showErrorBox(
-          'Permission Error',
-          `Failed to set executable permissions on yt-dlp binary at ${resolved}.\nError: ${(err as Error).message}`
+        log.error(
+          `Failed to set executable permissions on yt-dlp binary at ${resolved}: ${(err as Error).message}`
         );
-        app.quit();
       }
     }
   }
 
   if (!fs.existsSync(resolved)) {
-    dialog.showErrorBox(
-      'Missing Dependency',
-      `yt-dlp binary not found at ${resolved}.\nPlease ensure ${ytdlpBinary} is in the application's directory.`
-    );
-    app.quit();
+    log.error(`yt-dlp binary not found at ${resolved}`);
   }
 
   return resolved;
diff --git a/src/main/preload.ts b/src/main/preload.ts
index 38e98e8..ae797d8 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -45,12 +45,6 @@ const api: RendererApi = {
     ipcRenderer.on('updater-progress', listener);
     return () => ipcRenderer.removeListener('updater-progress', listener);
   },
-  onDownloadProgress: (callback: (data: Record<string, unknown>) => void) => {
-    const listener = (_: Electron.IpcRendererEvent, data: Record<string, unknown>) =>
-      callback(data);
-    ipcRenderer.on('download-progress', listener);
-    return () => ipcRenderer.removeListener('download-progress', listener);
-  },
   onProgress: (callback: (message: string) => void) => {
     const listener = (_: Electron.IpcRendererEvent, message: string) => callback(message);
     ipcRenderer.on('progress', listener);
@@ -88,6 +82,11 @@ const api: RendererApi = {
     ipcRenderer.on('queue-update', listener);
     return () => ipcRenderer.removeListener('queue-update', listener);
   },
+  onSettingsImported: (callback: (settings: Settings) => void) => {
+    const listener = (_: Electron.IpcRendererEvent, data: Settings) => callback(data);
+    ipcRenderer.on('settings-imported', listener);
+    return () => ipcRenderer.removeListener('settings-imported', listener);
+  },
 };
 
 contextBridge.exposeInMainWorld('api', api);
diff --git a/src/main/processKill.ts b/src/main/processKill.ts
new file mode 100644
index 0000000..8e2ca7c
--- /dev/null
+++ b/src/main/processKill.ts
@@ -0,0 +1,28 @@
+import { execFile } from 'child_process';
+import log from 'electron-log/main.js';
+import type { ChildProcess } from 'child_process';
+import { isWindows } from './platform';
+
+export function killChildProcess(proc: ChildProcess | null, label: string) {
+  if (!proc || proc.killed) return;
+  const pid = proc.pid;
+  try {
+    proc.kill('SIGTERM');
+    const forceKillTimer = setTimeout(() => {
+      try {
+        if (!proc.killed) proc.kill('SIGKILL');
+      } catch {}
+      if (isWindows && pid) {
+        execFile('taskkill', ['/PID', String(pid), '/T', '/F'], () => {});
+      }
+    }, 5000);
+    proc.once('exit', () => clearTimeout(forceKillTimer));
+  } catch (error) {
+    log.error(`Error killing ${label} process:`, error);
+    if (isWindows && pid) {
+      try {
+        execFile('taskkill', ['/PID', String(pid), '/T', '/F'], () => {});
+      } catch {}
+    }
+  }
+}
diff --git a/src/main/settings.ts b/src/main/settings.ts
index 9bcd7a2..cc6012a 100644
--- a/src/main/settings.ts
+++ b/src/main/settings.ts
@@ -5,12 +5,15 @@ import log from 'electron-log/main.js';
 import type { AudioFormat, DownloadStats, Settings } from '../types';
 import {
   ALLOWED_AUDIO_FORMATS,
+  ALLOWED_BROWSERS,
   ALLOWED_CONVERT_FORMATS,
   MAX_FORMAT_COUNTS,
   MAX_SETTINGS_IMPORT_BYTES,
   CURRENT_SETTINGS_VERSION,
   SUBTITLE_LANGS_PATTERN,
 } from './constants';
+import { validateDownloadPath, validateFfmpegPathValue } from '../utils/ipcValidation';
+import { clearGpuCache } from './gpu';
 
 const settingsPath = path.join(app.getPath('userData'), 'settings.json');
 const statsPath = path.join(app.getPath('userData'), 'download-stats.json');
@@ -29,7 +32,7 @@ const defaultSettings: Settings = {
   keepOriginalAfterConvert: true,
   firstLaunch: true,
   hookBrowser: false,
-  browserChoice: 'Chrome',
+  browserChoice: 'chrome',
   animateBackground: true,
   notifications: true,
   denoReminderDismissed: false,
@@ -37,6 +40,7 @@ const defaultSettings: Settings = {
   gpuType: 'auto',
   bestQuality: false,
   ffmpegPath: '',
+  downloadFolder: '',
   hideSupportModal: false,
   checkUpdatesOnStartup: true,
   updateChannel: 'auto',
@@ -102,6 +106,39 @@ function readGpuType(value: unknown): Settings['gpuType'] {
     : defaultSettings.gpuType;
 }
 
+function readBrowserChoice(value: unknown): string {
+  const raw = readString(value, defaultSettings.browserChoice);
+  const capped = raw.length > 64 ? raw.slice(0, 64) : raw;
+  const normalized = capped.trim().toLowerCase();
+  if (ALLOWED_BROWSERS.has(normalized)) {
+    return normalized;
+  }
+  return defaultSettings.browserChoice;
+}
+
+function readFfmpegPath(value: unknown): string {
+  const raw = readString(value, defaultSettings.ffmpegPath);
+  const capped = raw.length > 1024 ? raw.slice(0, 1024) : raw;
+  const validation = validateFfmpegPathValue(capped.trim() || undefined);
+  if (!validation.ok) {
+    return defaultSettings.ffmpegPath;
+  }
+  return validation.data || '';
+}
+
+function readDownloadFolder(value: unknown): string {
+  const raw = readString(value, defaultSettings.downloadFolder);
+  const capped = raw.length > 4096 ? raw.slice(0, 4096) : raw;
+  if (!capped.trim()) {
+    return defaultSettings.downloadFolder;
+  }
+  const validation = validateDownloadPath(capped);
+  if (!validation.ok) {
+    return defaultSettings.downloadFolder;
+  }
+  return validation.data;
+}
+
 function readSettingsVersion(value: unknown): number {
   if (
     typeof value === 'number' &&
@@ -138,7 +175,7 @@ export function migrateSettings(rawSettings: unknown): Settings {
     ),
     firstLaunch: readBoolean(rawSettings.firstLaunch, defaultSettings.firstLaunch),
     hookBrowser: readBoolean(rawSettings.hookBrowser, defaultSettings.hookBrowser),
-    browserChoice: readString(rawSettings.browserChoice, defaultSettings.browserChoice),
+    browserChoice: readBrowserChoice(rawSettings.browserChoice),
     animateBackground: readBoolean(
       rawSettings.animateBackground,
       defaultSettings.animateBackground
@@ -151,7 +188,8 @@ export function migrateSettings(rawSettings: unknown): Settings {
     gpuAcceleration: readBoolean(rawSettings.gpuAcceleration, defaultSettings.gpuAcceleration),
     gpuType: readGpuType(rawSettings.gpuType),
     bestQuality: readBoolean(rawSettings.bestQuality, defaultSettings.bestQuality),
-    ffmpegPath: readString(rawSettings.ffmpegPath, defaultSettings.ffmpegPath),
+    ffmpegPath: readFfmpegPath(rawSettings.ffmpegPath),
+    downloadFolder: readDownloadFolder(rawSettings.downloadFolder),
     hideSupportModal: readBoolean(rawSettings.hideSupportModal, defaultSettings.hideSupportModal),
     checkUpdatesOnStartup: readBoolean(
       rawSettings.checkUpdatesOnStartup,
@@ -201,6 +239,13 @@ export function saveSettings(
     const completeSettings = normalizeSettingsVersion(
       migrateSettings({ ...existing, ...newSettings })
     );
+    if (
+      (newSettings.ffmpegPath !== undefined && newSettings.ffmpegPath !== existing.ffmpegPath) ||
+      (newSettings.gpuAcceleration !== undefined &&
+        newSettings.gpuAcceleration !== existing.gpuAcceleration)
+    ) {
+      clearGpuCache();
+    }
     const tmpPath = `${settingsPath}.tmp`;
     fs.writeFileSync(tmpPath, JSON.stringify(completeSettings, null, 2), { mode: 0o600 });
     fs.renameSync(tmpPath, settingsPath);
@@ -319,7 +364,7 @@ export async function exportSettingsToFile(
   if (canceled || !filePath) return false;
   try {
     const settings = loadSettings();
-    fs.writeFileSync(filePath, JSON.stringify(settings, null, 2));
+    fs.writeFileSync(filePath, JSON.stringify(settings, null, 2), { mode: 0o600 });
     return true;
   } catch (error) {
     log.error('Failed to export settings:', error);
@@ -329,7 +374,7 @@ export async function exportSettingsToFile(
 
 export async function importSettingsFromFile(
   parentWindow: Electron.BrowserWindow | null
-): Promise<boolean> {
+): Promise<Settings | false> {
   if (!parentWindow || parentWindow.isDestroyed()) return false;
   const { canceled, filePaths } = await dialog.showOpenDialog(parentWindow, {
     title: 'Import Settings',
@@ -357,7 +402,7 @@ export async function importSettingsFromFile(
     const tmpPath = `${settingsPath}.tmp`;
     fs.writeFileSync(tmpPath, JSON.stringify(migrated, null, 2), { mode: 0o600 });
     fs.renameSync(tmpPath, settingsPath);
-    return true;
+    return migrated;
   } catch (error) {
     log.error('Failed to import settings:', error);
     return false;
diff --git a/src/main/updater.ts b/src/main/updater.ts
index 63fd5fa..3262222 100644
--- a/src/main/updater.ts
+++ b/src/main/updater.ts
@@ -69,10 +69,10 @@ export function compareVersions(a: string, b: string): number {
   return comparePrerelease(vA.prerelease, vB.prerelease);
 }
 
-export function resolveUseBeta(channel: Settings['updateChannel']): boolean {
+export function resolveUseBeta(channel: Settings['updateChannel'], appVersion?: string): boolean {
   if (channel === 'beta') return true;
   if (channel === 'stable') return false;
-  return false;
+  return isBetaVersion(appVersion || '0.0.0');
 }
 
 export function applyChannel(useBeta: boolean) {
@@ -85,6 +85,10 @@ export function applyChannel(useBeta: boolean) {
   }
 }
 
+export function applyChannelFromSettings(settings: Settings) {
+  applyChannel(resolveUseBeta(settings.updateChannel, app.getVersion()));
+}
+
 export function setupAutoUpdater(
   getMainWindow: () => BrowserWindow | null,
   loadSettings: () => Settings
@@ -93,7 +97,7 @@ export function setupAutoUpdater(
   autoUpdater.autoInstallOnAppQuit = true;
 
   const settings = loadSettings();
-  const useBeta = resolveUseBeta(settings.updateChannel);
+  const useBeta = resolveUseBeta(settings.updateChannel, app.getVersion());
   applyChannel(useBeta);
 
   const sendToWindow = (channel: 'updater-status' | 'updater-progress', data: unknown) => {
@@ -116,7 +120,7 @@ export function setupAutoUpdater(
   });
 
   autoUpdater.on('update-available', (info) => {
-    const currentUseBeta = resolveUseBeta(loadSettings().updateChannel);
+    const currentUseBeta = resolveUseBeta(loadSettings().updateChannel, app.getVersion());
     const updateIsBeta = isBetaVersion(info.version);
 
     if (currentUseBeta && !updateIsBeta) {
@@ -196,7 +200,7 @@ export async function checkForUpdates(isPackaged: boolean, loadSettings: () => S
   }
   try {
     const settings = loadSettings();
-    const useBeta = resolveUseBeta(settings.updateChannel);
+    const useBeta = resolveUseBeta(settings.updateChannel, app.getVersion());
     applyChannel(useBeta);
     return await autoUpdater.checkForUpdates();
   } catch (error) {
diff --git a/src/renderer/css/01-base.css b/src/renderer/css/01-base.css
index 7b04d42..97da7f4 100644
--- a/src/renderer/css/01-base.css
+++ b/src/renderer/css/01-base.css
@@ -300,7 +300,14 @@ body {
 }
 
 body.animate-bg {
-  background: var(--bg-gradient-mid);
+  background: linear-gradient(
+    135deg,
+    var(--bg-gradient-start),
+    var(--bg-gradient-mid),
+    var(--bg-gradient-end)
+  );
+  background-size: 200% 200%;
+  animation: gradientShift 18s ease infinite;
 }
 
 .skip-link {
@@ -328,6 +335,6 @@ body.animate-bg {
     background-position: 0% 50%;
   }
   50% {
-    background-position: 0% 50%;
+    background-position: 100% 50%;
   }
 }
diff --git a/src/renderer/css/02-sidebar.css b/src/renderer/css/02-sidebar.css
index 7a76bcb..9aa3516 100644
--- a/src/renderer/css/02-sidebar.css
+++ b/src/renderer/css/02-sidebar.css
@@ -323,6 +323,16 @@ select option {
   padding-left: var(--spacing-xs);
 }
 
+.toggle-row {
+  display: flex;
+  align-items: center;
+  gap: var(--spacing-sm);
+}
+
+.toggle-row .toggle-switch {
+  flex: 1;
+}
+
 .help-icon {
   display: inline-flex;
   align-items: center;
@@ -343,6 +353,12 @@ select option {
   color: var(--text-primary);
 }
 
+.help-icon:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
+  box-shadow: 0 0 0 4px var(--accent-subtle);
+}
+
 .settings-link-btn {
   background: var(--surface-1);
   border: 1px solid var(--border-subtle);
diff --git a/src/renderer/css/03-main.css b/src/renderer/css/03-main.css
index 41fe81d..cfb990b 100644
--- a/src/renderer/css/03-main.css
+++ b/src/renderer/css/03-main.css
@@ -100,6 +100,12 @@
   transform: scale(0.97);
 }
 
+.top-bar-links a:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
+  box-shadow: 0 0 0 4px var(--accent-subtle);
+}
+
 .download-section {
   flex: 1;
   display: flex;
diff --git a/src/renderer/css/04-panels.css b/src/renderer/css/04-panels.css
index 26c173a..4580a7c 100644
--- a/src/renderer/css/04-panels.css
+++ b/src/renderer/css/04-panels.css
@@ -18,16 +18,30 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: var(--spacing-sm) var(--spacing-md);
+  padding: 0 var(--spacing-md);
   background: var(--console-header-bg);
   border-bottom: 1px solid var(--border-subtle);
+}
+
+.history-collapse-btn,
+.console-collapse-btn {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  min-height: 44px;
+  padding: var(--spacing-sm) 0;
+  background: transparent;
+  border: none;
+  color: inherit;
   cursor: pointer;
   user-select: none;
+  text-align: left;
   transition: var(--transition-fast);
 }
 
-.history-header:hover {
-  background: var(--console-header-hover-bg);
+.history-collapse-btn:hover,
+.console-collapse-btn:hover {
+  color: var(--text-primary);
 }
 
 .history-header-left {
@@ -229,16 +243,9 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: var(--spacing-sm) var(--spacing-md);
+  padding: 0 var(--spacing-md);
   background: var(--console-header-bg);
   border-bottom: 1px solid var(--border-subtle);
-  cursor: pointer;
-  user-select: none;
-  transition: var(--transition-fast);
-}
-
-.console-header:hover {
-  background: var(--console-header-hover-bg);
 }
 
 .console-header-left {
diff --git a/src/renderer/css/05-overlays.css b/src/renderer/css/05-overlays.css
index d79d44f..614f8b9 100644
--- a/src/renderer/css/05-overlays.css
+++ b/src/renderer/css/05-overlays.css
@@ -94,16 +94,28 @@
   color: var(--text-primary);
 }
 
-.modal-buttons button:first-child {
+.modal-buttons .modal-btn-primary {
   background: var(--accent);
   border-color: transparent;
   color: var(--text-primary);
 }
 
-.modal-buttons button:first-child:hover {
+.modal-buttons .modal-btn-primary:hover {
   background: var(--accent-hover);
 }
 
+.modal-buttons .modal-btn-danger {
+  background: var(--danger-subtle);
+  border-color: var(--danger);
+  color: var(--danger);
+}
+
+.modal-buttons .modal-btn-danger:hover {
+  background: var(--danger);
+  border-color: var(--danger);
+  color: var(--text-primary);
+}
+
 .licenses-container {
   width: 90%;
   max-width: var(--licenses-max-width);
@@ -267,6 +279,10 @@
   pointer-events: none;
 }
 
+.toast-container-assertive {
+  bottom: calc(var(--spacing-xl) + 80px);
+}
+
 .toast {
   pointer-events: auto;
   display: flex;
@@ -394,7 +410,15 @@
 .modal-close-btn:focus-visible,
 .sidebar-close:focus-visible,
 .console-clear-btn:focus-visible,
-.clear-btn:focus-visible {
+.clear-btn:focus-visible,
+.preview-btn:focus-visible,
+.paste-btn:focus-visible,
+.queue-action-btn:focus-visible,
+.history-open-btn:focus-visible,
+.history-collapse-btn:focus-visible,
+.console-collapse-btn:focus-visible,
+.wizard-btn:focus-visible,
+.history-clear-btn:focus-visible {
   outline: 2px solid var(--accent);
   outline-offset: 2px;
   box-shadow: 0 0 0 4px var(--accent-subtle);
diff --git a/src/renderer/css/06-responsive.css b/src/renderer/css/06-responsive.css
index c019a74..f5914ba 100644
--- a/src/renderer/css/06-responsive.css
+++ b/src/renderer/css/06-responsive.css
@@ -21,6 +21,10 @@
 }
 
 @media (max-width: 560px) {
+  .format-grid {
+    grid-template-columns: 1fr;
+  }
+
   .url-input-wrapper {
     flex-direction: column;
   }
diff --git a/src/renderer/css/07-queue.css b/src/renderer/css/07-queue.css
index b1a5e53..e2496ea 100644
--- a/src/renderer/css/07-queue.css
+++ b/src/renderer/css/07-queue.css
@@ -134,6 +134,18 @@
   border-color: var(--accent-hover);
 }
 
+.queue-empty-message {
+  margin: 0;
+  padding: var(--spacing-sm) var(--spacing-md) var(--spacing-md);
+  color: var(--text-muted);
+  font-size: var(--text-xs);
+  text-align: center;
+}
+
+.queue-section:not(.has-items) .queue-empty-message {
+  display: block;
+}
+
 .queue-list {
   max-height: 250px;
   overflow-y: auto;
@@ -185,8 +197,10 @@
 
 .queue-item-remove {
   flex-shrink: 0;
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
+  min-width: 24px;
+  min-height: 24px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -204,6 +218,12 @@
   color: var(--danger);
 }
 
+.queue-item-remove:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
+  box-shadow: 0 0 0 4px var(--accent-subtle);
+}
+
 .queue-downloading {
   background: var(--accent-subtle);
 }
diff --git a/src/renderer/css/08-wizard.css b/src/renderer/css/08-wizard.css
index ea47342..80843ce 100644
--- a/src/renderer/css/08-wizard.css
+++ b/src/renderer/css/08-wizard.css
@@ -38,8 +38,14 @@
 
 .wizard-theme-option input {
   position: absolute;
-  opacity: 0;
-  pointer-events: none;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border: 0;
 }
 
 .wizard-theme-card {
@@ -211,8 +217,8 @@
   color: var(--text-primary);
 }
 
-.wizard-btn-secondary.hidden {
-  visibility: hidden;
+.wizard-btn-secondary[hidden] {
+  display: none;
 }
 
 @media (max-width: 480px) {
diff --git a/src/renderer/index.html b/src/renderer/index.html
index c49e8d8..5264d02 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -6,7 +6,24 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; img-src 'self' data: https:; connect-src 'self'; frame-src 'self'; object-src 'none'; base-uri 'self';"
     />
-    <title>Rosi</title>
+    <title>ROSI</title>
+    <script>
+      (function () {
+        try {
+          var pref = localStorage.getItem('rosi-theme');
+          var theme = pref;
+          if (!theme || theme === 'system') {
+            theme =
+              window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+                ? 'dark'
+                : 'light';
+          } else if (theme !== 'light' && theme !== 'dark' && theme !== 'purple') {
+            theme = 'dark';
+          }
+          document.documentElement.dataset.theme = theme;
+        } catch (e) {}
+      })();
+    </script>
     <link rel="stylesheet" href="main.css" />
   </head>
   <body>
@@ -199,14 +216,21 @@ <h3 class="settings-section-title">Enhancements</h3>
               <span class="toggle-text">Embed thumbnail / cover art</span>
             </label>
 
-            <label class="toggle-switch">
-              <input type="checkbox" id="sponsorblockToggle" />
-              <span class="toggle-slider"></span>
-              <span class="toggle-text">
-                SponsorBlock
-                <a href="#" id="sponsorblockHelp" class="help-icon" title="Learn more">?</a>
-              </span>
-            </label>
+            <div class="toggle-row">
+              <label class="toggle-switch">
+                <input type="checkbox" id="sponsorblockToggle" />
+                <span class="toggle-slider"></span>
+                <span class="toggle-text">SponsorBlock</span>
+              </label>
+              <a
+                href="#"
+                id="sponsorblockHelp"
+                class="help-icon"
+                title="Learn more"
+                aria-label="Learn more about SponsorBlock"
+                >?</a
+              >
+            </div>
 
             <label class="toggle-switch">
               <input type="checkbox" id="writeSubtitlesToggle" />
@@ -223,12 +247,19 @@ <h3 class="settings-section-title">Enhancements</h3>
                   placeholder="en,es (comma-separated)"
                   autocomplete="off"
                   spellcheck="false"
+                  aria-describedby="subtitleLangsHint subtitleLangsError"
                 />
               </label>
-              <div class="settings-hint">
+              <div id="subtitleLangsHint" class="settings-hint">
                 Comma-separated language codes (for example <code>en,es</code>). Use
                 <code>all</code> for every available language.
               </div>
+              <p
+                id="subtitleLangsError"
+                class="url-validation-message"
+                role="alert"
+                aria-live="polite"
+              ></p>
             </div>
           </div>
         </section>
@@ -263,14 +294,21 @@ <h3 class="settings-section-title">Browser Integration</h3>
             role="region"
             aria-labelledby="settingsSectionHeaderBrowser"
           >
-            <label class="toggle-switch">
-              <input type="checkbox" id="hookBrowserToggle" />
-              <span class="toggle-slider"></span>
-              <span class="toggle-text">
-                Hook into web browser
-                <a href="#" id="browserCookiesHelp" class="help-icon" title="Learn more">?</a>
-              </span>
-            </label>
+            <div class="toggle-row">
+              <label class="toggle-switch">
+                <input type="checkbox" id="hookBrowserToggle" />
+                <span class="toggle-slider"></span>
+                <span class="toggle-text">Hook into web browser</span>
+              </label>
+              <a
+                href="#"
+                id="browserCookiesHelp"
+                class="help-icon"
+                title="Learn more"
+                aria-label="Learn more about browser cookie integration"
+                >?</a
+              >
+            </div>
 
             <div id="browserChoiceContainer" class="sub-option">
               <label class="select-label">
@@ -394,7 +432,7 @@ <h3 class="settings-section-title">Application</h3>
             >
               ▸ Update channel settings
             </button>
-            <div id="updateChannelContainer" class="sub-option">
+            <div id="updateChannelContainer" class="sub-option" aria-hidden="true">
               <label class="select-label">
                 <span>Update Channel:</span>
                 <select id="updateChannelSelect">
@@ -519,7 +557,9 @@ <h3 class="settings-section-title">Application</h3>
           Reset All Settings
         </button>
         <div class="version-info">
-          <a id="versionLink" href="#">Loading...</a>
+          <a id="versionLink" href="#" aria-label="View release notes (opens externally)"
+            >Loading...</a
+          >
           <span id="betaBadge" class="beta-badge hidden">BETA</span>
         </div>
       </div>
@@ -528,7 +568,13 @@ <h3 class="settings-section-title">Application</h3>
     <main id="main-content" class="main-content">
       <div class="app-shell">
         <header class="top-bar">
-          <button id="settingsBtn" class="icon-btn" title="Settings" aria-label="Settings">
+          <button
+            id="settingsBtn"
+            class="icon-btn"
+            title="Settings"
+            aria-label="Settings"
+            aria-expanded="false"
+          >
             <svg
               width="22"
               height="22"
@@ -754,17 +800,17 @@ <h1 class="download-title">Download Videos</h1>
 
               <div id="progress-container" class="progress-container">
                 <div id="progress-phases" class="progress-phases">
-                  <div class="progress-phase active" data-phase="download">
+                  <div class="progress-phase active" data-phase="download" aria-current="step">
                     <span class="phase-dot"></span>
                     <span class="phase-label">Download</span>
                   </div>
-                  <div class="progress-phase-connector"></div>
-                  <div class="progress-phase" data-phase="merge">
+                  <div class="progress-phase-connector" aria-hidden="true"></div>
+                  <div class="progress-phase" data-phase="merge" aria-hidden="true">
                     <span class="phase-dot"></span>
                     <span class="phase-label">Merge</span>
                   </div>
-                  <div class="progress-phase-connector"></div>
-                  <div class="progress-phase" data-phase="convert">
+                  <div class="progress-phase-connector" aria-hidden="true"></div>
+                  <div class="progress-phase" data-phase="convert" aria-hidden="true">
                     <span class="phase-dot"></span>
                     <span class="phase-label">Convert</span>
                   </div>
@@ -773,10 +819,18 @@ <h1 class="download-title">Download Videos</h1>
                   <span id="progress-status" class="progress-status" aria-live="polite">Ready</span>
                   <span id="progress-percent" class="progress-percent" aria-live="polite"></span>
                 </div>
-                <div class="progress-bar-wrapper">
+                <div
+                  id="progress-bar-wrapper"
+                  class="progress-bar-wrapper"
+                  role="progressbar"
+                  aria-valuemin="0"
+                  aria-valuemax="100"
+                  aria-valuenow="0"
+                  aria-labelledby="progress-status"
+                >
                   <div id="progress-bar" class="progress-bar"></div>
                 </div>
-                <div id="progress-details" class="progress-details"></div>
+                <div id="progress-details" class="progress-details" aria-live="polite"></div>
                 <div id="progress-complete-icon" class="progress-complete-icon">
                   <svg
                     width="32"
@@ -958,34 +1012,21 @@ <h1 class="download-title">Download Videos</h1>
             >
               Queue status updates will appear here.
             </p>
-            <div id="queueList" class="queue-list" aria-live="polite"></div>
+            <div id="queueList" class="queue-list" role="list"></div>
           </section>
 
           <section id="download-history" class="download-history">
-            <div
-              class="history-header"
-              id="historyHeader"
-              role="button"
-              aria-expanded="true"
-              aria-controls="history-list"
-              tabindex="0"
-            >
-              <div class="history-header-left">
-                <svg
-                  class="history-collapse-icon"
-                  width="16"
-                  height="16"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                >
-                  <polyline points="6 9 12 15 18 9"></polyline>
-                </svg>
-                <span class="history-title">
+            <div class="history-header">
+              <button
+                type="button"
+                class="history-collapse-btn"
+                id="historyToggle"
+                aria-expanded="true"
+                aria-controls="history-list"
+              >
+                <span class="history-header-left">
                   <svg
+                    class="history-collapse-icon"
                     width="16"
                     height="16"
                     viewBox="0 0 24 24"
@@ -995,14 +1036,29 @@ <h1 class="download-title">Download Videos</h1>
                     stroke-linecap="round"
                     stroke-linejoin="round"
                   >
-                    <circle cx="12" cy="12" r="10" />
-                    <polyline points="12 6 12 12 16 14" />
+                    <polyline points="6 9 12 15 18 9"></polyline>
                   </svg>
-                  Recent Downloads
+                  <span class="history-title">
+                    <svg
+                      width="16"
+                      height="16"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      stroke="currentColor"
+                      stroke-width="2"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                    >
+                      <circle cx="12" cy="12" r="10" />
+                      <polyline points="12 6 12 12 16 14" />
+                    </svg>
+                    Recent Downloads
+                  </span>
+                  <span id="history-count" class="history-count">0</span>
                 </span>
-                <span id="history-count" class="history-count">0</span>
-              </div>
+              </button>
               <button
+                type="button"
                 id="clearHistory"
                 class="history-clear-btn"
                 title="Clear history"
@@ -1024,34 +1080,21 @@ <h1 class="download-title">Download Videos</h1>
                 </svg>
               </button>
             </div>
-            <div id="history-list" class="history-list"></div>
+            <div id="history-list" class="history-list" role="list"></div>
           </section>
 
           <section id="console-section" class="console-section">
-            <div
-              class="console-header"
-              id="consoleHeader"
-              role="button"
-              aria-expanded="false"
-              aria-controls="output"
-              tabindex="0"
-            >
-              <div class="console-header-left">
-                <svg
-                  class="console-collapse-icon"
-                  width="16"
-                  height="16"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                >
-                  <polyline points="6 9 12 15 18 9"></polyline>
-                </svg>
-                <span class="console-title">
+            <div class="console-header">
+              <button
+                type="button"
+                class="console-collapse-btn"
+                id="consoleToggleBtn"
+                aria-expanded="false"
+                aria-controls="output"
+              >
+                <span class="console-header-left">
                   <svg
+                    class="console-collapse-icon"
                     width="16"
                     height="16"
                     viewBox="0 0 24 24"
@@ -1061,13 +1104,28 @@ <h1 class="download-title">Download Videos</h1>
                     stroke-linecap="round"
                     stroke-linejoin="round"
                   >
-                    <polyline points="4 17 10 11 4 5" />
-                    <line x1="12" y1="19" x2="20" y2="19" />
+                    <polyline points="6 9 12 15 18 9"></polyline>
                   </svg>
-                  Console Output
+                  <span class="console-title">
+                    <svg
+                      width="16"
+                      height="16"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      stroke="currentColor"
+                      stroke-width="2"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                    >
+                      <polyline points="4 17 10 11 4 5" />
+                      <line x1="12" y1="19" x2="20" y2="19" />
+                    </svg>
+                    Console Output
+                  </span>
                 </span>
-              </div>
+              </button>
               <button
+                type="button"
                 id="clearConsole"
                 class="console-clear-btn"
                 title="Clear console"
@@ -1089,14 +1147,22 @@ <h1 class="download-title">Download Videos</h1>
                 </svg>
               </button>
             </div>
-            <pre id="output" class="console-output"></pre>
+            <pre id="output" class="console-output" role="log" aria-label="Console output"></pre>
           </section>
         </div>
 
         <div id="update-banner" class="update-banner">
           <div class="update-banner-content">
             <span id="update-banner-text" class="update-banner-text">Downloading update…</span>
-            <div class="update-banner-progress">
+            <div
+              id="update-banner-progress"
+              class="update-banner-progress"
+              role="progressbar"
+              aria-valuemin="0"
+              aria-valuemax="100"
+              aria-valuenow="0"
+              aria-labelledby="update-banner-text"
+            >
               <div id="update-banner-bar" class="update-banner-bar"></div>
             </div>
             <span
@@ -1106,7 +1172,13 @@ <h1 class="download-title">Download Videos</h1>
               aria-live="polite"
               aria-atomic="true"
             ></span>
-            <button id="update-banner-cancel" class="update-banner-cancel">Cancel</button>
+            <button
+              id="update-banner-cancel"
+              class="update-banner-cancel"
+              aria-label="Cancel update download"
+            >
+              Cancel
+            </button>
           </div>
         </div>
 
@@ -1128,6 +1200,7 @@ <h1 class="download-title">Download Videos</h1>
       role="dialog"
       aria-modal="true"
       aria-labelledby="modal-title"
+      aria-hidden="true"
     >
       <div class="modal-box">
         <h3 id="modal-title">Modal Title</h3>
@@ -1143,6 +1216,7 @@ <h3 id="modal-title">Modal Title</h3>
       role="dialog"
       aria-modal="true"
       aria-label="Open Source Licenses"
+      aria-hidden="true"
     >
       <div class="licenses-container">
         <div class="licenses-header">
@@ -1163,11 +1237,16 @@ <h3>Open Source Licenses</h3>
             </svg>
           </button>
         </div>
-        <iframe id="licenses-frame" src="licenses-iframe.html"></iframe>
+        <iframe id="licenses-frame" src="licenses-iframe.html" title="ROSI licenses"></iframe>
       </div>
     </div>
 
     <div id="toast-container" class="toast-container" aria-live="polite"></div>
+    <div
+      id="toast-container-assertive"
+      class="toast-container toast-container-assertive"
+      aria-live="assertive"
+    ></div>
 
     <!-- Setup Wizard Overlay -->
     <div
@@ -1176,9 +1255,18 @@ <h3>Open Source Licenses</h3>
       role="dialog"
       aria-modal="true"
       aria-labelledby="wizard-title"
+      aria-hidden="true"
     >
       <div class="wizard-card">
-        <div class="wizard-progress">
+        <div id="wizard-step-announce" class="sr-only" aria-live="polite" aria-atomic="true"></div>
+        <div
+          class="wizard-progress"
+          role="progressbar"
+          aria-valuemin="1"
+          aria-valuemax="4"
+          aria-valuenow="1"
+          aria-label="Setup progress"
+        >
           <div class="wizard-progress-bar" id="wizard-progress-bar"></div>
         </div>
 
diff --git a/src/renderer/licenses-iframe.html b/src/renderer/licenses-iframe.html
index 3628d78..5f5a1e6 100644
--- a/src/renderer/licenses-iframe.html
+++ b/src/renderer/licenses-iframe.html
@@ -1,8 +1,12 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title>Rosi License & 3rd Party Licenses/Credits</title>
+  <meta
+    http-equiv="Content-Security-Policy"
+    content="default-src 'none'; style-src 'unsafe-inline'; script-src 'unsafe-inline'; img-src data: https:; base-uri 'none'; form-action 'none';"
+  />
+  <title>ROSI License & 3rd Party Licenses/Credits</title>
   <style>
     :root {
       --font-sans: 'Manrope', 'Segoe UI', -apple-system, BlinkMacSystemFont, sans-serif;
diff --git a/src/renderer/modules/queue.ts b/src/renderer/modules/queue.ts
index a6d9f4b..c406fb7 100644
--- a/src/renderer/modules/queue.ts
+++ b/src/renderer/modules/queue.ts
@@ -16,6 +16,7 @@
   interface QueueDeps {
     escapeHtml: (value: string) => string;
     removeFromQueue: (id: string) => Promise<unknown> | unknown;
+    focusQueueItemId?: string | null;
   }
 
   interface QueueModule {
@@ -29,20 +30,45 @@
 
   type RosiWindow = Window & typeof globalThis & { rosiModules?: QueueModules };
 
+  const STATUS_LABELS: Record<QueueStatus, string> = {
+    pending: 'Pending',
+    downloading: 'Downloading',
+    completed: 'Completed',
+    failed: 'Failed',
+    cancelled: 'Cancelled',
+  };
+
+  const STATUS_ICONS: Record<QueueStatus, string> = {
+    pending: '⏸️',
+    downloading: '⏳',
+    completed: '✅',
+    failed: '❌',
+    cancelled: '⏹️',
+  };
+
   function resolveQueueSectionElement(root?: Document) {
     const doc = root ?? document;
     return doc.getElementById('queueSection') || doc.getElementById('queue-section');
   }
 
+  function getHostname(url: string) {
+    try {
+      return new URL(url).hostname;
+    } catch {
+      return url.slice(0, 40);
+    }
+  }
+
   function renderQueue(queue: QueueItem[], elements: QueueElements, deps: QueueDeps) {
     const { queueList, queueSection, queueCount } = elements;
-    const { escapeHtml, removeFromQueue } = deps;
+    const { escapeHtml, removeFromQueue, focusQueueItemId = null } = deps;
 
     if (!queueList || !queueSection) return;
     if (queueCount) queueCount.textContent = String(queue.length);
     if (queue.length === 0) {
       queueSection.classList.remove('has-items');
-      queueList.innerHTML = '';
+      queueList.innerHTML =
+        '<p class="queue-empty-message">No items in queue. Add URLs above to get started.</p>';
       return;
     }
     queueSection.classList.add('has-items');
@@ -51,16 +77,10 @@
     queue.forEach((item) => {
       const el = document.createElement('div');
       el.className = `queue-item queue-${item.status}`;
-      const statusIcon =
-        item.status === 'completed'
-          ? '✅'
-          : item.status === 'failed'
-            ? '❌'
-            : item.status === 'cancelled'
-              ? '⏹️'
-              : item.status === 'downloading'
-                ? '⏳'
-                : '⏸️';
+      el.setAttribute('role', 'listitem');
+      el.dataset.queueId = item.id;
+      const statusLabel = STATUS_LABELS[item.status];
+      const statusIcon = STATUS_ICONS[item.status];
 
       let urlDisplay: string;
       try {
@@ -70,10 +90,12 @@
         urlDisplay = item.url.slice(0, 40);
       }
 
+      const hostname = getHostname(item.url);
       el.innerHTML = `
-        <span class="queue-item-status">${statusIcon}</span>
+        <span class="queue-item-status" aria-hidden="true">${statusIcon}</span>
+        <span class="sr-only">${escapeHtml(statusLabel)}</span>
         <span class="queue-item-url" title="${escapeHtml(item.url)}">${escapeHtml(urlDisplay)}</span>
-        ${item.status === 'pending' ? '<button class="queue-item-remove" aria-label="Remove">✕</button>' : ''}
+        ${item.status === 'pending' ? `<button type="button" class="queue-item-remove" data-queue-id="${escapeHtml(item.id)}" aria-label="Remove ${escapeHtml(hostname)} from queue">✕</button>` : ''}
       `;
       const removeBtn = el.querySelector<HTMLButtonElement>('.queue-item-remove');
       if (removeBtn) {
@@ -87,6 +109,21 @@
       fragment.appendChild(el);
     });
     queueList.appendChild(fragment);
+
+    if (focusQueueItemId) {
+      const focusTarget = queueList.querySelector<HTMLButtonElement>(
+        `.queue-item-remove[data-queue-id="${CSS.escape(focusQueueItemId)}"]`
+      );
+      if (focusTarget) {
+        focusTarget.focus();
+        return;
+      }
+      const pendingRemoves = queueList.querySelectorAll<HTMLButtonElement>('.queue-item-remove');
+      const lastPending = pendingRemoves[pendingRemoves.length - 1];
+      if (lastPending) {
+        lastPending.focus();
+      }
+    }
   }
 
   const windowRef = global as RosiWindow;
diff --git a/src/renderer/modules/settings.ts b/src/renderer/modules/settings.ts
index d03ab0e..7007f95 100644
--- a/src/renderer/modules/settings.ts
+++ b/src/renderer/modules/settings.ts
@@ -21,6 +21,7 @@
     if (!element || typeof openExternal !== 'function') return;
     element.addEventListener('click', (event) => {
       event.preventDefault();
+      event.stopPropagation();
       openExternal(url);
     });
   }
diff --git a/src/renderer/modules/ui.ts b/src/renderer/modules/ui.ts
index a89e397..42e94ec 100644
--- a/src/renderer/modules/ui.ts
+++ b/src/renderer/modules/ui.ts
@@ -79,13 +79,27 @@
     document.body.classList.toggle('console-visible', !!show);
   }
 
+  function getToastContainer(type: ToastType) {
+    if (type === 'error' || type === 'warning') {
+      return (
+        document.getElementById('toast-container-assertive') ||
+        document.getElementById('toast-container')
+      );
+    }
+    return document.getElementById('toast-container');
+  }
+
   function showToast(message: unknown, options: ToastOptions = {}) {
     const { type = 'info', duration = 4000 } = options;
-    const container = document.getElementById('toast-container');
+    const container = getToastContainer(type);
     if (!container) return;
 
     const toast = document.createElement('div');
     toast.className = `toast toast-${type}`;
+    if (type === 'error' || type === 'warning') {
+      toast.setAttribute('role', 'alert');
+      toast.setAttribute('aria-live', 'assertive');
+    }
 
     const icon = document.createElement('span');
     icon.className = 'toast-icon';
@@ -165,12 +179,18 @@
       button.innerHTML = '<img src="loader.svg" class="loader-icon" alt="Loading...">';
       button.disabled = false;
       button.setAttribute('aria-busy', 'true');
+      if (typeof onCancel === 'function') {
+        button.setAttribute('aria-label', 'Cancel download');
+      } else {
+        button.removeAttribute('aria-label');
+      }
       button.onclick = typeof onCancel === 'function' ? onCancel : null;
     } else {
       button.classList.remove('loading');
       button.innerHTML = button.dataset.defaultHtml || button.dataset.defaultText || 'Action';
       button.disabled = false;
       button.removeAttribute('aria-busy');
+      button.removeAttribute('aria-label');
       button.onclick = button._originalClick ?? null;
     }
   }
diff --git a/src/renderer/msStoreDetector.js b/src/renderer/msStoreDetector.js
index f1798db..5db9aac 100644
--- a/src/renderer/msStoreDetector.js
+++ b/src/renderer/msStoreDetector.js
@@ -7,6 +7,10 @@
         if (btn) {
           btn.style.display = 'none';
         }
+        var label = document.getElementById('checkUpdatesOnStartupLabel');
+        if (label) {
+          label.style.display = 'none';
+        }
       }
     }
   } catch (e) {}
diff --git a/src/renderer/renderer-globals.d.ts b/src/renderer/renderer-globals.d.ts
index 9e03728..ad1c2df 100644
--- a/src/renderer/renderer-globals.d.ts
+++ b/src/renderer/renderer-globals.d.ts
@@ -65,7 +65,6 @@ interface RosiRendererApi {
   installUpdate: () => void;
   onUpdaterStatus: (callback: (data: RosiUpdaterStatusEvent) => void) => () => void;
   onUpdaterProgress: (callback: (data: RosiUpdaterProgressEvent) => void) => () => void;
-  onDownloadProgress: (callback: (data: Record<string, unknown>) => void) => () => void;
   onProgress: (callback: (message: string) => void) => () => void;
   onComplete: (callback: (message: string) => void) => () => void;
   openFileLocation: (filePath: string) => Promise<RosiIpcResult<{ opened: boolean }>>;
@@ -88,6 +87,7 @@ interface RosiRendererApi {
   cancelQueue: () => Promise<RosiIpcResult<void>>;
   onPrepareForClose: (callback: () => void | Promise<void>) => () => void;
   onQueueUpdate: (callback: (queue: RosiQueueItem[]) => void) => () => void;
+  onSettingsImported: (callback: (settings: RosiSettings) => void) => () => void;
 }
 
 interface RosiUiModule {
@@ -140,6 +140,7 @@ interface RosiQueueModule {
     deps: {
       escapeHtml: (value: string) => string;
       removeFromQueue: (id: string) => Promise<unknown> | unknown;
+      focusQueueItemId?: string | null;
     }
   ) => void;
   resolveQueueSectionElement: (root?: Document) => HTMLElement | null;
diff --git a/src/renderer/rosiEngine.ts b/src/renderer/rosiEngine.ts
index bd849ab..0841def 100644
--- a/src/renderer/rosiEngine.ts
+++ b/src/renderer/rosiEngine.ts
@@ -27,6 +27,7 @@ interface RosiSettings {
   gpuType: 'auto' | 'nvidia' | 'amd' | 'intel';
   bestQuality: boolean;
   ffmpegPath: string;
+  downloadFolder: string;
   hideSupportModal: boolean;
   checkUpdatesOnStartup: boolean;
   updateChannel: 'auto' | 'stable' | 'beta';
@@ -146,6 +147,20 @@ function ensureSystemThemeListener() {
   }
 }
 
+function setMainContentInert(isInert: boolean) {
+  const mainContent =
+    document.getElementById('main-content') || document.querySelector('.main-content');
+  if (!(mainContent instanceof HTMLElement)) return;
+  if ('inert' in mainContent) {
+    (mainContent as HTMLElement & { inert: boolean }).inert = isInert;
+  }
+  if (isInert) {
+    mainContent.setAttribute('aria-hidden', 'true');
+  } else {
+    mainContent.removeAttribute('aria-hidden');
+  }
+}
+
 function applyTheme(preference: string) {
   themePreference =
     preference === 'light' || preference === 'dark' || preference === 'purple'
@@ -155,6 +170,11 @@ function applyTheme(preference: string) {
   appliedTheme = resolveAppliedTheme(themePreference);
   document.documentElement.dataset.theme = appliedTheme;
   syncLicensesTheme(appliedTheme);
+  try {
+    localStorage.setItem('rosi-theme', themePreference);
+  } catch (_) {
+    /* ignore */
+  }
   return appliedTheme;
 }
 
@@ -189,12 +209,12 @@ function appendConsoleOutput(outputEl: HTMLElement | null, text: string) {
 
 function setConsoleCollapsed(collapsed: boolean) {
   const consoleSection = document.getElementById('console-section');
-  const consoleHeader = document.getElementById('consoleHeader');
+  const consoleToggleBtn = document.getElementById('consoleToggleBtn');
   const output = document.getElementById('output');
   if (!consoleSection) return false;
   consoleSection.classList.toggle('collapsed', !!collapsed);
   const isCollapsed = consoleSection.classList.contains('collapsed');
-  if (consoleHeader) consoleHeader.setAttribute('aria-expanded', String(!isCollapsed));
+  if (consoleToggleBtn) consoleToggleBtn.setAttribute('aria-expanded', String(!isCollapsed));
   if (output) output.setAttribute('aria-hidden', String(isCollapsed));
   return isCollapsed;
 }
@@ -240,12 +260,16 @@ function toggleAdvancedUI(show: boolean) {
 interface ModalButton {
   label: string;
   action?: () => void;
+  primary?: boolean;
+  danger?: boolean;
+  disabled?: boolean;
 }
 interface ModalData {
   title: string;
   message: unknown;
   buttons?: ModalButton[];
   priority?: boolean;
+  busy?: boolean;
   extra?: (() => Node | null) | Node | null;
 }
 
@@ -343,20 +367,36 @@ function displayNextModal() {
   btnContainer.innerHTML = '';
 
   modal.setAttribute('tabindex', '-1');
+  modal.setAttribute('aria-hidden', 'false');
+  if (currentModalData.busy) {
+    modal.setAttribute('aria-busy', 'true');
+  } else {
+    modal.removeAttribute('aria-busy');
+  }
   modal.classList.add('showing');
   modal.classList.add('active');
+  setMainContentInert(true);
 
   void modal.offsetWidth;
   requestAnimationFrame(() => {
     modal.classList.remove('showing');
   });
 
-  buttons.forEach(({ label, action }) => {
+  buttons.forEach(({ label, action, primary, danger, disabled }) => {
     const btn = document.createElement('button');
+    btn.type = 'button';
     btn.textContent = label;
-    btn.onclick = () => {
-      hideModal(modal, action);
-    };
+    if (primary) btn.classList.add('modal-btn-primary');
+    if (danger) btn.classList.add('modal-btn-danger');
+    if (disabled) {
+      btn.disabled = true;
+      btn.setAttribute('aria-disabled', 'true');
+    }
+    if (!disabled) {
+      btn.onclick = () => {
+        hideModal(modal, action);
+      };
+    }
     btnContainer.appendChild(btn);
   });
 
@@ -424,11 +464,16 @@ function hideModal(modal: HTMLElement, action: (() => void) | null | undefined)
   }
   setTimeout(() => {
     modal.classList.remove('active', 'hiding');
+    modal.setAttribute('aria-hidden', 'true');
+    modal.removeAttribute('aria-busy');
     isModalActive = false;
     if (typeof action === 'function') action();
     if (!isModalActive) {
       displayNextModal();
     }
+    if (!isModalActive) {
+      setMainContentInert(false);
+    }
     if (!isModalActive && previousFocus instanceof HTMLElement) {
       previousFocus.focus();
       previousFocus = null;
@@ -441,7 +486,7 @@ function showKeyboardShortcuts() {
   showModal({
     title: 'Keyboard Shortcuts',
     message: `${modKey}+D - Restart application\n${modKey}+F - Focus URL input field\n${modKey}+, - Open settings`,
-    buttons: [{ label: 'OK' }],
+    buttons: [{ label: 'OK', primary: true }],
   });
 }
 
@@ -457,7 +502,7 @@ async function fetchFormats() {
       showModal({
         title: 'Input Error',
         message: 'Please enter a video URL first.',
-        buttons: [{ label: 'OK' }],
+        buttons: [{ label: 'OK', primary: true }],
       });
       return;
     }
@@ -467,7 +512,7 @@ async function fetchFormats() {
       showModal({
         title: 'Invalid URL',
         message: 'Please enter a valid URL starting with http:// or https://',
-        buttons: [{ label: 'OK' }],
+        buttons: [{ label: 'OK', primary: true }],
       });
       return;
     }
@@ -504,7 +549,7 @@ async function fetchFormats() {
         showModal({
           title: 'Format Fetch Failed',
           message: `Could not retrieve formats.\nError: ${errorMessage}`,
-          buttons: [{ label: 'OK' }],
+          buttons: [{ label: 'OK', primary: true }],
         });
         return;
       }
@@ -564,7 +609,7 @@ async function fetchFormats() {
       showModal({
         title: 'Format Fetch Failed',
         message: `Could not retrieve formats.\nError: ${errorMessage}`,
-        buttons: [{ label: 'OK' }],
+        buttons: [{ label: 'OK', primary: true }],
       });
     } finally {
       if (!wasCancelled) {
@@ -579,7 +624,7 @@ async function fetchFormats() {
     showModal({
       title: 'Unexpected Error',
       message: 'An unexpected error occurred while fetching formats. Please try again.',
-      buttons: [{ label: 'OK' }],
+      buttons: [{ label: 'OK', primary: true }],
     });
   }
 }
@@ -685,10 +730,12 @@ function setProgressPhase(phase: string) {
     const elPhase = el.dataset.phase ?? '';
     const elIndex = phaseOrder.indexOf(elPhase);
     el.classList.remove('active', 'completed');
+    el.removeAttribute('aria-current');
     if (elIndex < phaseIndex) {
       el.classList.add('completed');
     } else if (elIndex === phaseIndex) {
       el.classList.add('active');
+      el.setAttribute('aria-current', 'step');
     }
   });
 }
@@ -698,13 +745,24 @@ function configureProgressPhases(showMerge: boolean, showConvert: boolean) {
   const convertPhase = document.querySelector<HTMLElement>('.progress-phase[data-phase="convert"]');
   const connectors = document.querySelectorAll<HTMLElement>('.progress-phase-connector');
 
-  if (mergePhase) mergePhase.style.display = showMerge ? 'flex' : 'none';
-  if (convertPhase) convertPhase.style.display = showConvert ? 'flex' : 'none';
+  const setPhaseVisibility = (phaseEl: HTMLElement | null, visible: boolean) => {
+    if (!phaseEl) return;
+    phaseEl.style.display = visible ? 'flex' : 'none';
+    phaseEl.setAttribute('aria-hidden', String(!visible));
+  };
+
+  setPhaseVisibility(mergePhase, showMerge);
+  setPhaseVisibility(convertPhase, showConvert);
 
-  if (connectors[0]) connectors[0].style.display = showMerge ? 'block' : 'none';
-  if (connectors[1])
-    connectors[1].style.display =
-      showMerge && showConvert ? 'block' : showConvert ? 'block' : 'none';
+  if (connectors[0]) {
+    connectors[0].style.display = showMerge ? 'block' : 'none';
+    connectors[0].setAttribute('aria-hidden', String(!showMerge));
+  }
+  if (connectors[1]) {
+    const connectorVisible = showMerge && showConvert ? true : showConvert;
+    connectors[1].style.display = connectorVisible ? 'block' : 'none';
+    connectors[1].setAttribute('aria-hidden', String(!connectorVisible));
+  }
 }
 
 function showProgressComplete() {
@@ -722,6 +780,7 @@ function showProgressBar(status = 'Downloading...') {
   const statusEl = document.getElementById('progress-status');
   const percentEl = document.getElementById('progress-percent');
   const bar = document.getElementById('progress-bar') as HTMLElement | null;
+  const barWrapper = document.getElementById('progress-bar-wrapper');
   const details = document.getElementById('progress-details');
 
   if (container) {
@@ -734,6 +793,10 @@ function showProgressBar(status = 'Downloading...') {
     bar.classList.remove('indeterminate');
     bar.classList.add('active-glow');
   }
+  if (barWrapper) {
+    barWrapper.setAttribute('aria-valuenow', '0');
+    barWrapper.removeAttribute('aria-valuetext');
+  }
   if (details) details.textContent = '';
   hideProgressComplete();
   setProgressPhase('download');
@@ -747,14 +810,20 @@ function updateProgressBar(
   const statusEl = document.getElementById('progress-status');
   const percentEl = document.getElementById('progress-percent');
   const bar = document.getElementById('progress-bar') as HTMLElement | null;
+  const barWrapper = document.getElementById('progress-bar-wrapper');
   const details = document.getElementById('progress-details');
 
   const clamped = Math.max(0, Math.min(100, percent));
-  if (percentEl) percentEl.textContent = `${Math.round(clamped)}%`;
+  const rounded = Math.round(clamped);
+  if (percentEl) percentEl.textContent = `${rounded}%`;
   if (bar) {
     bar.style.width = `${clamped}%`;
     bar.classList.remove('indeterminate');
   }
+  if (barWrapper) {
+    barWrapper.setAttribute('aria-valuenow', String(rounded));
+    barWrapper.removeAttribute('aria-valuetext');
+  }
   if (statusText && statusEl) statusEl.textContent = statusText;
   if (detailsText && details) details.textContent = detailsText;
 }
@@ -763,21 +832,30 @@ function setProgressIndeterminate(status = 'Processing...') {
   const statusEl = document.getElementById('progress-status');
   const percentEl = document.getElementById('progress-percent');
   const bar = document.getElementById('progress-bar');
+  const barWrapper = document.getElementById('progress-bar-wrapper');
   const details = document.getElementById('progress-details');
 
   if (statusEl) statusEl.textContent = status;
   if (percentEl) percentEl.textContent = '';
   if (bar) bar.classList.add('indeterminate');
+  if (barWrapper) {
+    barWrapper.removeAttribute('aria-valuenow');
+    barWrapper.setAttribute('aria-valuetext', status);
+  }
   if (details) details.textContent = '';
 }
 
 function hideProgressBar() {
   const container = document.getElementById('progress-container');
   const bar = document.getElementById('progress-bar');
+  const barWrapper = document.getElementById('progress-bar-wrapper');
   if (container) {
     container.classList.remove('visible');
   }
   if (bar) bar.classList.remove('active-glow');
+  if (barWrapper) {
+    barWrapper.setAttribute('aria-valuenow', '0');
+  }
   hideProgressComplete();
 }
 
@@ -890,6 +968,7 @@ function renderHistory() {
   history.forEach((entry) => {
     const item = document.createElement('div');
     item.className = 'history-item';
+    item.setAttribute('role', 'listitem');
 
     const statusLabel =
       entry.status === 'success'
@@ -905,7 +984,7 @@ function renderHistory() {
       </div>
       <div class="history-item-actions">
         <span class="history-status ${entry.status}">${statusLabel}</span>
-        ${entry.status === 'success' && entry.path ? '<button class="history-open-btn">Open</button>' : ''}
+        ${entry.status === 'success' && entry.path ? `<button type="button" class="history-open-btn" aria-label="Open file location for ${escapeHtml(entry.filename)}">Open</button>` : ''}
       </div>
     `;
 
@@ -930,6 +1009,20 @@ function clearHistory() {
 }
 
 let isManualUpdateCheck = false;
+let updateCheckTimeout: ReturnType<typeof setTimeout> | null = null;
+let updateCheckBtnRef: HTMLButtonElement | null = null;
+
+function finishManualUpdateCheck() {
+  isManualUpdateCheck = false;
+  if (updateCheckTimeout) {
+    clearTimeout(updateCheckTimeout);
+    updateCheckTimeout = null;
+  }
+  if (updateCheckBtnRef) {
+    setButtonLoading(updateCheckBtnRef, false);
+    updateCheckBtnRef = null;
+  }
+}
 
 async function checkForUpdates() {
   const channel = window.api.getChannel();
@@ -942,6 +1035,7 @@ async function checkForUpdates() {
       buttons: [
         {
           label: 'Open Store',
+          primary: true,
           action: () => window.api.openExternal('ms-windows-store://pdp/?ProductId=9N0BQSTFL4SV'),
         },
         { label: 'OK' },
@@ -950,54 +1044,58 @@ async function checkForUpdates() {
     return;
   }
 
+  if (isManualUpdateCheck) return;
+
   isManualUpdateCheck = true;
+  const checkBtn = document.getElementById('checkUpdateBtn') as HTMLButtonElement | null;
+  updateCheckBtnRef = checkBtn;
+  if (checkBtn) {
+    setButtonLoading(checkBtn, true);
+  }
 
-  try {
+  updateCheckTimeout = setTimeout(() => {
+    if (!isManualUpdateCheck) return;
+    finishManualUpdateCheck();
     showModal({
-      title: 'Checking for Updates',
-      message: 'Please wait while we check for updates...',
-      buttons: [
-        {
-          label: 'Cancel',
-          action: () => {
-            isManualUpdateCheck = false;
-          },
-        },
-      ],
+      title: 'Update Check Timed Out',
+      message: 'Checking for updates took too long. Please try again later.',
+      buttons: [{ label: 'OK', primary: true }],
+      priority: true,
     });
+  }, 30000);
 
+  try {
     const result = await window.api.checkForUpdates();
 
     if (result && result.error === 'dev-mode') {
+      finishManualUpdateCheck();
       showModal({
         title: 'Development Mode',
         message:
           'Update checking is not available when running in development mode.\n\nBuild and package the app to test auto-updates.',
-        buttons: [{ label: 'OK' }],
-        priority: isManualUpdateCheck,
+        buttons: [{ label: 'OK', primary: true }],
+        priority: true,
       });
-      isManualUpdateCheck = false;
       return;
     }
 
     if (result && result.error && result.error !== 'dev-mode') {
+      finishManualUpdateCheck();
       showModal({
         title: 'Update Check Failed',
         message: `Could not check for updates.\n\nError: ${result.error}`,
-        buttons: [{ label: 'OK' }],
-        priority: isManualUpdateCheck,
+        buttons: [{ label: 'OK', primary: true }],
+        priority: true,
       });
-      isManualUpdateCheck = false;
-      return;
     }
   } catch (e) {
+    finishManualUpdateCheck();
     showModal({
       title: 'Update Check Failed',
       message: 'Could not check for updates. Please try again later.',
-      buttons: [{ label: 'OK' }],
-      priority: isManualUpdateCheck,
+      buttons: [{ label: 'OK', primary: true }],
+      priority: true,
     });
-    isManualUpdateCheck = false;
   }
 }
 
@@ -1006,9 +1104,14 @@ let updaterCleanupFunctions: Array<() => void> = [];
 function showUpdateBanner() {
   const banner = document.getElementById('update-banner');
   const bar = document.getElementById('update-banner-bar') as HTMLElement | null;
+  const progressWrapper = document.getElementById('update-banner-progress');
   const info = document.getElementById('update-banner-info');
   const text = document.getElementById('update-banner-text');
   if (bar) bar.style.width = '0%';
+  if (progressWrapper) {
+    progressWrapper.setAttribute('aria-valuenow', '0');
+    progressWrapper.removeAttribute('aria-valuetext');
+  }
   if (info) info.textContent = '';
   if (text) text.textContent = 'Downloading update…';
   if (banner) {
@@ -1037,6 +1140,11 @@ function setupAutoUpdater() {
 
   updaterCleanupFunctions.push(
     window.api.onUpdaterStatus((data) => {
+      const wasManualCheck = isManualUpdateCheck;
+      if (isManualUpdateCheck && data.status !== 'checking') {
+        finishManualUpdateCheck();
+      }
+
       switch (data.status) {
         case 'checking':
           break;
@@ -1044,8 +1152,6 @@ function setupAutoUpdater() {
         case 'available': {
           const version = data.version ?? '';
           updateVersion = version;
-          const wasManualCheck = isManualUpdateCheck;
-          isManualUpdateCheck = false;
           const isBetaUpdate =
             data.isBeta ||
             (updatesModule && typeof updatesModule.isPrereleaseVersion === 'function'
@@ -1060,6 +1166,7 @@ function setupAutoUpdater() {
             buttons: [
               {
                 label: 'Download & Install',
+                primary: true,
                 action: async () => {
                   showUpdateBanner();
                   await window.api.downloadUpdate();
@@ -1072,28 +1179,26 @@ function setupAutoUpdater() {
         }
 
         case 'not-available':
-          if (isManualUpdateCheck) {
+          if (wasManualCheck) {
             showModal({
               title: 'ROSI is up to date!',
               message: `You are running the latest version (v${data.version}).`,
-              buttons: [{ label: 'OK' }],
+              buttons: [{ label: 'OK', primary: true }],
               priority: true,
             });
           }
-          isManualUpdateCheck = false;
           break;
 
         case 'error':
           hideUpdateBanner();
-          if (isManualUpdateCheck) {
+          if (wasManualCheck) {
             showModal({
               title: 'Update Error',
               message: `An error occurred while checking for updates:\n${data.message}`,
-              buttons: [{ label: 'OK' }],
+              buttons: [{ label: 'OK', primary: true }],
               priority: true,
             });
           }
-          isManualUpdateCheck = false;
           break;
 
         case 'cancelled':
@@ -1101,7 +1206,7 @@ function setupAutoUpdater() {
           showModal({
             title: 'Download Cancelled',
             message: 'The update download was cancelled.',
-            buttons: [{ label: 'OK' }],
+            buttons: [{ label: 'OK', primary: true }],
             priority: true,
           });
           break;
@@ -1114,6 +1219,7 @@ function setupAutoUpdater() {
             buttons: [
               {
                 label: 'Restart Now',
+                primary: true,
                 action: () => window.api.installUpdate(),
               },
               { label: 'Later' },
@@ -1128,11 +1234,15 @@ function setupAutoUpdater() {
   updaterCleanupFunctions.push(
     window.api.onUpdaterProgress((data) => {
       const progressBar = document.getElementById('update-banner-bar') as HTMLElement | null;
+      const progressWrapper = document.getElementById('update-banner-progress');
       const progressInfo = document.getElementById('update-banner-info');
 
       if (progressBar) {
         progressBar.style.width = `${data.percent}%`;
       }
+      if (progressWrapper) {
+        progressWrapper.setAttribute('aria-valuenow', String(Math.round(data.percent)));
+      }
 
       if (progressInfo) {
         if (updatesModule && typeof updatesModule.formatUpdateProgressInfo === 'function') {
@@ -1169,6 +1279,8 @@ function showLicenses() {
   if (licensesOverlay) {
     licensesPreviousFocus = document.activeElement;
     licensesOverlay.classList.add('active');
+    licensesOverlay.setAttribute('aria-hidden', 'false');
+    setMainContentInert(true);
     syncLicensesTheme(appliedTheme);
     document.body.classList.add('licenses-open');
     document.body.style.overflow = 'hidden';
@@ -1236,6 +1348,12 @@ function hideLicenses() {
       licensesFocusinHandler = null;
     }
     licensesOverlay.classList.remove('active');
+    licensesOverlay.setAttribute('aria-hidden', 'true');
+    const wizardOverlay = document.getElementById('setup-wizard');
+    const wizardActive = wizardOverlay?.classList.contains('active');
+    if (!isModalActive && !wizardActive) {
+      setMainContentInert(false);
+    }
     setTimeout(() => {
       document.body.style.overflow = '';
       document.body.classList.remove('licenses-open');
@@ -1273,12 +1391,14 @@ async function checkDenoInstallation(settings: RosiSettings, persist: () => void
         buttons: [
           {
             label: 'Install',
+            primary: true,
             action: async () => {
               showModal({
                 title: 'Installing Deno...',
                 message: 'Please wait while Deno is being installed. This may take a moment.',
-                buttons: [],
+                buttons: [{ label: 'Installing...', primary: true, disabled: true }],
                 priority: true,
+                busy: true,
               });
 
               try {
@@ -1287,7 +1407,7 @@ async function checkDenoInstallation(settings: RosiSettings, persist: () => void
                   showModal({
                     title: 'Installation Cancelled',
                     message: 'Deno installation was cancelled.',
-                    buttons: [{ label: 'OK' }],
+                    buttons: [{ label: 'OK', primary: true }],
                     priority: true,
                   });
                   return;
@@ -1297,7 +1417,7 @@ async function checkDenoInstallation(settings: RosiSettings, persist: () => void
                   message:
                     'Deno has been successfully installed!\nRestarting the app can help pick up the updated environment.',
                   buttons: [
-                    { label: 'Restart Now', action: () => window.api.restartApp() },
+                    { label: 'Restart Now', primary: true, action: () => window.api.restartApp() },
                     { label: 'Later' },
                   ],
                   priority: true,
@@ -1312,6 +1432,7 @@ async function checkDenoInstallation(settings: RosiSettings, persist: () => void
                   buttons: [
                     {
                       label: 'Open Deno Website',
+                      primary: true,
                       action: () => window.api.openExternal('https://deno.land'),
                     },
                     { label: 'OK' },
@@ -1348,7 +1469,7 @@ function launchSetupWizard(
 
   const overlay = document.getElementById('setup-wizard');
   const progressBar = document.getElementById('wizard-progress-bar') as HTMLElement | null;
-  const backBtn = document.getElementById('wizard-back');
+  const backBtn = document.getElementById('wizard-back') as HTMLButtonElement | null;
   const nextBtn = document.getElementById('wizard-next');
   const dotsContainer = document.getElementById('wizard-dots');
   const steps = overlay
@@ -1364,6 +1485,8 @@ function launchSetupWizard(
 
   const overlayEl = overlay;
   const progressBarEl = progressBar;
+  const wizardProgress = overlayEl.querySelector<HTMLElement>('.wizard-progress');
+  const stepAnnounce = document.getElementById('wizard-step-announce');
   const backBtnEl = backBtn;
   const nextBtnEl = nextBtn;
   const dotsContainerEl = dotsContainer;
@@ -1390,17 +1513,28 @@ function launchSetupWizard(
       step.classList.toggle('active', i === currentStep);
     });
 
-    // Progress bar
     progressBarEl.style.width = ((currentStep + 1) / TOTAL_STEPS) * 100 + '%';
+    if (wizardProgress) {
+      wizardProgress.setAttribute('aria-valuenow', String(currentStep + 1));
+    }
+    if (stepAnnounce) {
+      stepAnnounce.textContent = `Step ${currentStep + 1} of ${TOTAL_STEPS}`;
+    }
 
-    // Dots
     const dots = dotsContainerEl.querySelectorAll('.wizard-dot');
     dots.forEach((dot, i) => {
       dot.classList.toggle('active', i === currentStep);
     });
 
-    // Back button
-    backBtnEl.classList.toggle('hidden', currentStep === 0);
+    if (currentStep === 0) {
+      backBtnEl.setAttribute('hidden', '');
+      backBtnEl.disabled = true;
+      backBtnEl.setAttribute('tabindex', '-1');
+    } else {
+      backBtnEl.removeAttribute('hidden');
+      backBtnEl.disabled = false;
+      backBtnEl.removeAttribute('tabindex');
+    }
 
     // Next button text
     if (currentStep === 0) {
@@ -1436,13 +1570,11 @@ function launchSetupWizard(
     if (autoUpdates) settings.checkUpdatesOnStartup = autoUpdates.checked;
   }
 
-  function close() {
+  function finalizeWizard() {
     gatherSettings();
     settings.firstLaunch = false;
     void persistSettingsFn(false, true);
-    overlayEl.classList.remove('active');
 
-    // Sync sidebar controls to reflect wizard choices
     const themeSelect = document.getElementById('themeSelect') as HTMLSelectElement | null;
     if (themeSelect) themeSelect.value = settings.theme || 'system';
     const bestQualityToggle = document.getElementById(
@@ -1468,7 +1600,7 @@ function launchSetupWizard(
       currentStep++;
       updateUI();
     } else {
-      close();
+      closeWizard();
     }
   });
 
@@ -1486,8 +1618,75 @@ function launchSetupWizard(
   );
   if (matchingRadio) matchingRadio.checked = true;
 
+  let wizardPreviousFocus: Element | null = null;
+  let wizardTrapHandler: ((e: KeyboardEvent) => void) | null = null;
+  let wizardFocusinHandler: ((e: FocusEvent) => void) | null = null;
+
+  function closeWizard() {
+    if (wizardTrapHandler) {
+      overlayEl.removeEventListener('keydown', wizardTrapHandler);
+      wizardTrapHandler = null;
+    }
+    if (wizardFocusinHandler) {
+      document.removeEventListener('focusin', wizardFocusinHandler, true);
+      wizardFocusinHandler = null;
+    }
+    overlayEl.classList.remove('active');
+    overlayEl.setAttribute('aria-hidden', 'true');
+    setMainContentInert(false);
+    if (wizardPreviousFocus instanceof HTMLElement) {
+      wizardPreviousFocus.focus();
+      wizardPreviousFocus = null;
+    }
+    finalizeWizard();
+  }
+
+  wizardPreviousFocus = document.activeElement;
+  overlayEl.setAttribute('aria-hidden', 'false');
+  setMainContentInert(true);
+
+  wizardTrapHandler = (e: KeyboardEvent) => {
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      e.stopPropagation();
+      closeWizard();
+      return;
+    }
+    if (e.key !== 'Tab') return;
+    const focusable = getFocusableElements(overlayEl);
+    if (focusable.length === 0) return;
+    const first = focusable[0];
+    const last = focusable[focusable.length - 1];
+    const active = document.activeElement;
+    if (e.shiftKey) {
+      if (!active || active === first) {
+        e.preventDefault();
+        last?.focus();
+      }
+    } else if (!active || active === last) {
+      e.preventDefault();
+      first?.focus();
+    }
+  };
+  overlayEl.addEventListener('keydown', wizardTrapHandler);
+
+  wizardFocusinHandler = (e: FocusEvent) => {
+    if (!overlayEl.classList.contains('active')) return;
+    const target = e.target;
+    if (target instanceof Node && overlayEl.contains(target)) return;
+    if (!focusFirstElement(overlayEl) && typeof overlayEl.focus === 'function') {
+      overlayEl.focus();
+    }
+  };
+  document.addEventListener('focusin', wizardFocusinHandler, true);
+
   updateUI();
   overlayEl.classList.add('active');
+  requestAnimationFrame(() => {
+    if (!focusFirstElement(overlayEl)) {
+      nextBtnEl.focus();
+    }
+  });
 }
 
 document.addEventListener('DOMContentLoaded', async () => {
@@ -1515,6 +1714,7 @@ document.addEventListener('DOMContentLoaded', async () => {
       gpuType: 'auto',
       bestQuality: false,
       ffmpegPath: '',
+      downloadFolder: '',
       hideSupportModal: false,
       checkUpdatesOnStartup: true,
       updateChannel: 'auto',
@@ -1529,7 +1729,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     showModal({
       title: 'Settings Error',
       message: 'Could not load settings. Using defaults.',
-      buttons: [{ label: 'OK' }],
+      buttons: [{ label: 'OK', primary: true }],
     });
   }
   applyTheme(settings.theme ?? 'system');
@@ -1540,6 +1740,10 @@ document.addEventListener('DOMContentLoaded', async () => {
     const betaBadge = document.getElementById('betaBadge');
     if (versionLink && version) {
       versionLink.textContent = `v${version}`;
+      versionLink.setAttribute(
+        'aria-label',
+        `View release notes for v${version} (opens externally)`
+      );
       versionLink.addEventListener('click', (event) => {
         event.preventDefault();
         void window.api.openExternal(
@@ -1557,6 +1761,11 @@ document.addEventListener('DOMContentLoaded', async () => {
     }
   } catch (e) {
     logError('Could not get app version', e);
+    const versionLink = document.getElementById('versionLink');
+    if (versionLink) {
+      versionLink.textContent = 'Version unknown';
+      versionLink.setAttribute('aria-label', 'View release notes (opens externally)');
+    }
   }
 
   if (window.api.getChannel() !== 'msstore') {
@@ -1577,7 +1786,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     showModal({
       title: 'Settings Save Failed',
       message,
-      buttons: [{ label: 'OK' }],
+      buttons: [{ label: 'OK', primary: true }],
       priority: true,
     });
   }
@@ -1670,7 +1879,7 @@ document.addEventListener('DOMContentLoaded', async () => {
   const downloadCard = document.querySelector<HTMLElement>('.download-card');
   const previewBtn = byId<HTMLButtonElement>('previewBtn');
   const previewCloseBtn = byId<HTMLButtonElement>('previewClose');
-  const historyHeader = byId('historyHeader');
+  const historyToggle = byId<HTMLButtonElement>('historyToggle');
   const clearHistoryBtn = byId<HTMLButtonElement>('clearHistory');
   const browserCookiesHelp = byId('browserCookiesHelp');
   const helpLink = byId('helpLink');
@@ -1915,6 +2124,7 @@ document.addEventListener('DOMContentLoaded', async () => {
       buttons: [
         {
           label: '❤️ Yes Support!',
+          primary: true,
           action: () => {
             void window.api.openExternal('https://rosie.run/support');
             settings.hideSupportModal = true;
@@ -1946,6 +2156,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     if (element) {
       element.addEventListener('click', (event) => {
         event.preventDefault();
+        event.stopPropagation();
         void window.api.openExternal(url);
       });
     }
@@ -2038,6 +2249,17 @@ document.addEventListener('DOMContentLoaded', async () => {
       hasUrlValidationIntent = true;
       syncPrimaryActionState();
     });
+    urlInput.addEventListener('keydown', (e) => {
+      if (e.key !== 'Enter') return;
+      e.preventDefault();
+      const trimmed = urlInput.value.trim();
+      if (trimmed && isValidUrl(trimmed) && downloadBtn && !downloadBtn.disabled) {
+        downloadBtn.click();
+      } else {
+        hasUrlValidationIntent = true;
+        syncPrimaryActionState();
+      }
+    });
     updateUrlButtons();
   }
 
@@ -2150,14 +2372,14 @@ document.addEventListener('DOMContentLoaded', async () => {
 
   renderHistory();
 
-  if (historyHeader) {
+  if (historyToggle) {
     const historySection = document.getElementById('download-history');
     const historyList = document.getElementById('history-list');
     const setHistoryCollapsed = (collapsed: boolean) => {
       if (!historySection) return false;
       historySection.classList.toggle('collapsed', !!collapsed);
       const isCollapsed = historySection.classList.contains('collapsed');
-      historyHeader.setAttribute('aria-expanded', String(!isCollapsed));
+      historyToggle.setAttribute('aria-expanded', String(!isCollapsed));
       if (historyList) historyList.setAttribute('aria-hidden', String(isCollapsed));
       return isCollapsed;
     };
@@ -2169,12 +2391,10 @@ document.addEventListener('DOMContentLoaded', async () => {
       setHistoryCollapsed(historySection.classList.contains('collapsed'));
     }
 
-    historyHeader.addEventListener('click', (e) => {
-      if ((e.target as HTMLElement).closest('.history-clear-btn')) return;
+    historyToggle.addEventListener('click', () => {
       toggleHistoryCollapsed();
     });
-    historyHeader.addEventListener('keydown', (e) => {
-      if ((e.target as HTMLElement).closest('.history-clear-btn')) return;
+    historyToggle.addEventListener('keydown', (e) => {
       if (e.key === 'Enter' || e.key === ' ') {
         e.preventDefault();
         toggleHistoryCollapsed();
@@ -2198,6 +2418,7 @@ document.addEventListener('DOMContentLoaded', async () => {
           { label: 'Cancel' },
           {
             label: 'Clear',
+            danger: true,
             action: () => {
               clearHistory();
               showToast('Download history cleared.', { type: 'info' });
@@ -2312,19 +2533,16 @@ document.addEventListener('DOMContentLoaded', async () => {
       updateConsoleVisibility(settings.showConsoleOutput);
     });
 
-  // Console collapse toggle
-  const consoleHeader = document.getElementById('consoleHeader');
-  if (consoleHeader) {
-    consoleHeader.addEventListener('click', (e) => {
-      if ((e.target as HTMLElement).closest('#clearConsole')) return;
+  const consoleToggleBtn = document.getElementById('consoleToggleBtn');
+  if (consoleToggleBtn) {
+    consoleToggleBtn.addEventListener('click', () => {
       const isCollapsed = toggleConsoleCollapse();
       settings.consoleCollapsed = isCollapsed;
       void persistSettings();
     });
-    consoleHeader.addEventListener('keydown', (e) => {
+    consoleToggleBtn.addEventListener('keydown', (e) => {
       if (e.key === 'Enter' || e.key === ' ') {
         e.preventDefault();
-        if ((e.target as HTMLElement).closest('#clearConsole')) return;
         const isCollapsed = toggleConsoleCollapse();
         settings.consoleCollapsed = isCollapsed;
         void persistSettings();
@@ -2577,19 +2795,39 @@ document.addEventListener('DOMContentLoaded', async () => {
     });
   }
 
+  const subtitleLangsError = document.getElementById('subtitleLangsError');
   if (subtitleLangsInput) {
+    const showSubtitleLangsError = (message: string) => {
+      subtitleLangsInput.setAttribute('aria-invalid', 'true');
+      if (subtitleLangsError) {
+        subtitleLangsError.textContent = message;
+      } else {
+        showToast(message, { type: 'warning' });
+      }
+    };
+    const clearSubtitleLangsError = () => {
+      subtitleLangsInput.removeAttribute('aria-invalid');
+      if (subtitleLangsError) subtitleLangsError.textContent = '';
+    };
     const commitSubtitleLangs = () => {
       const raw = subtitleLangsInput.value.trim();
       if (!raw || !SUBTITLE_LANGS_RE.test(raw) || raw.length > 256) {
-        settings.subtitleLangs = 'en';
-        subtitleLangsInput.value = 'en';
-      } else {
-        settings.subtitleLangs = raw;
+        showSubtitleLangsError(
+          'Enter comma-separated language codes (for example en,es) or use all.'
+        );
+        return;
       }
+      clearSubtitleLangsError();
+      settings.subtitleLangs = raw;
       void persistSettings();
     };
     subtitleLangsInput.addEventListener('change', commitSubtitleLangs);
     subtitleLangsInput.addEventListener('blur', commitSubtitleLangs);
+    subtitleLangsInput.addEventListener('input', () => {
+      if (subtitleLangsInput.hasAttribute('aria-invalid')) {
+        clearSubtitleLangsError();
+      }
+    });
   }
 
   // Check updates on startup
@@ -2601,14 +2839,16 @@ document.addEventListener('DOMContentLoaded', async () => {
   }
 
   if (showUpdateChannelBtn && updateChannelContainer) {
-    showUpdateChannelBtn.setAttribute(
-      'aria-expanded',
-      String(updateChannelContainer.classList.contains('visible'))
-    );
+    const syncUpdateChannelAria = () => {
+      const isVisible = updateChannelContainer.classList.contains('visible');
+      updateChannelContainer.setAttribute('aria-hidden', String(!isVisible));
+      showUpdateChannelBtn.setAttribute('aria-expanded', String(isVisible));
+    };
+    syncUpdateChannelAria();
     showUpdateChannelBtn.addEventListener('click', () => {
       const isVisible = updateChannelContainer.classList.contains('visible');
       updateChannelContainer.classList.toggle('visible', !isVisible);
-      showUpdateChannelBtn.setAttribute('aria-expanded', String(!isVisible));
+      syncUpdateChannelAria();
       showUpdateChannelBtn.textContent = isVisible
         ? '▸ Update channel settings'
         : '▾ Hide update channel';
@@ -2630,7 +2870,11 @@ document.addEventListener('DOMContentLoaded', async () => {
         message: 'Are you sure you want to reset all settings to default? Rosi will restart.',
         buttons: [
           { label: 'Cancel' },
-          { label: '⟳ Reset & Restart', action: () => window.api.resetSettings() },
+          {
+            label: '⟳ Reset & Restart',
+            danger: true,
+            action: () => window.api.resetSettings(),
+          },
         ],
       });
     });
@@ -2654,18 +2898,17 @@ document.addEventListener('DOMContentLoaded', async () => {
     importSettingsBtn.addEventListener('click', async () => {
       showModal({
         title: 'Import Settings',
-        message:
-          'Importing settings will overwrite your current settings and restart ROSI. Continue?',
+        message: 'Importing settings will overwrite your current settings. Continue?',
         buttons: [
           { label: 'Cancel' },
           {
             label: 'Import',
+            primary: true,
             action: async () => {
               try {
                 const result = await window.api.importSettings();
                 if (result && result.ok) {
-                  showToast('Settings imported. Restarting...', { type: 'success' });
-                  setTimeout(() => window.api.restartApp(), 1000);
+                  showToast('Settings imported successfully.', { type: 'success' });
                 } else {
                   showToast(result?.error?.message || 'Import failed or was cancelled.', {
                     type: 'error',
@@ -2713,7 +2956,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                 showToast('Statistics reset.', { type: 'info' });
               },
             },
-            { label: 'Close' },
+            { label: 'Close', primary: true },
           ],
         });
       } catch (e) {
@@ -2722,27 +2965,56 @@ document.addEventListener('DOMContentLoaded', async () => {
     });
   }
 
+  let focusQueueItemId: string | null = null;
+  let currentQueue: RosiQueueItem[] = [];
+
+  function updateQueueButtonStates(queue: RosiQueueItem[]) {
+    const hasPending = queue.some((item) => item.status === 'pending');
+    const isRunning = queue.some((item) => item.status === 'downloading');
+    if (startQueueBtn) {
+      startQueueBtn.disabled = queueActionLocks > 0 || !hasPending;
+    }
+    if (cancelQueueBtn) {
+      cancelQueueBtn.disabled = queueActionLocks > 0 || !isRunning;
+    }
+  }
+
   function renderQueue(queue: RosiQueueItem[]) {
+    currentQueue = queue;
+    updateQueueButtonStates(queue);
     if (queueModule && typeof queueModule.renderQueue === 'function') {
       queueModule.renderQueue(
         queue,
         { queueList, queueSection, queueCount },
         {
           escapeHtml,
+          focusQueueItemId,
           removeFromQueue: async (id: string) => {
+            const removeIndex = currentQueue.findIndex((item) => item.id === id);
+            const nextFocusId =
+              removeIndex >= 0
+                ? currentQueue.slice(removeIndex + 1).find((item) => item.status === 'pending')
+                    ?.id ||
+                  currentQueue
+                    .slice(0, removeIndex)
+                    .reverse()
+                    .find((item) => item.status === 'pending')?.id ||
+                  null
+                : null;
+            focusQueueItemId = nextFocusId;
             const endQueueAction = beginQueueAction();
             try {
               const result = await window.api.removeFromQueue(id);
               if (!result || !result.ok) {
+                focusQueueItemId = null;
                 const message = result?.error?.message || 'Could not remove the queue item.';
                 setQueueStatusMessage(message);
-                showToast(message, {
-                  type: 'error',
-                });
+                showToast(message, { type: 'error' });
               } else {
-                announceQueueAction('Removed item from the queue.');
+                setQueueStatusMessage('Removed item from the queue.');
               }
             } catch {
+              focusQueueItemId = null;
               const message = 'Could not remove the queue item.';
               setQueueStatusMessage(message);
               showToast(message, { type: 'error' });
@@ -2752,6 +3024,7 @@ document.addEventListener('DOMContentLoaded', async () => {
           },
         }
       );
+      focusQueueItemId = null;
     }
   }
 
@@ -2780,9 +3053,11 @@ document.addEventListener('DOMContentLoaded', async () => {
     return count === 1 ? singular : plural.replace('{count}', String(count));
   }
 
-  function announceQueueAction(message: string, toastType: ToastType = 'info') {
+  function announceQueueAction(message: string, toastType?: ToastType) {
     setQueueStatusMessage(message);
-    showToast(message, { type: toastType });
+    if (toastType === 'error' || toastType === 'warning') {
+      showToast(message, { type: toastType });
+    }
   }
 
   const queueActionButtons = [addToQueueBtn, startQueueBtn, clearQueueBtn, cancelQueueBtn].filter(
@@ -2792,9 +3067,11 @@ document.addEventListener('DOMContentLoaded', async () => {
   function syncQueueActionBusyState() {
     const isBusy = queueActionLocks > 0;
     queueActionButtons.forEach((button) => {
-      button.disabled = isBusy;
       button.setAttribute('aria-busy', String(isBusy));
     });
+    if (addToQueueBtn) addToQueueBtn.disabled = isBusy;
+    if (clearQueueBtn) clearQueueBtn.disabled = isBusy;
+    updateQueueButtonStates(currentQueue);
     if (queueUrlInput) {
       queueUrlInput.disabled = isBusy;
     }
@@ -2836,7 +3113,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             'Added 1 URL to the queue.',
             'Added {count} URLs to the queue.'
           );
-          announceQueueAction(message, 'success');
+          announceQueueAction(message);
         } else {
           const message = result?.error?.message || 'Could not add URLs to the queue.';
           setQueueStatusMessage(message);
@@ -2876,48 +3153,74 @@ document.addEventListener('DOMContentLoaded', async () => {
   }
 
   if (clearQueueBtn) {
-    clearQueueBtn.addEventListener('click', async () => {
+    clearQueueBtn.addEventListener('click', () => {
       if (queueActionLocks > 0) return;
-      const endQueueAction = beginQueueAction();
-      try {
-        const result = await window.api.clearQueue();
-        if (result && result.ok) {
-          announceQueueAction('Queue cleared.');
-        } else {
-          const message = result?.error?.message || 'Could not clear the queue.';
-          setQueueStatusMessage(message);
-          showToast(message, { type: 'error' });
-        }
-      } catch {
-        const message = 'Could not clear the queue.';
-        setQueueStatusMessage(message);
-        showToast(message, { type: 'error' });
-      } finally {
-        endQueueAction();
-      }
+      showModal({
+        title: 'Clear Queue',
+        message: 'Remove all queued and completed items?',
+        buttons: [
+          { label: 'Cancel' },
+          {
+            label: 'Clear',
+            danger: true,
+            action: async () => {
+              const endQueueAction = beginQueueAction();
+              try {
+                const result = await window.api.clearQueue();
+                if (result && result.ok) {
+                  announceQueueAction('Queue cleared.');
+                } else {
+                  const message = result?.error?.message || 'Could not clear the queue.';
+                  setQueueStatusMessage(message);
+                  showToast(message, { type: 'error' });
+                }
+              } catch {
+                const message = 'Could not clear the queue.';
+                setQueueStatusMessage(message);
+                showToast(message, { type: 'error' });
+              } finally {
+                endQueueAction();
+              }
+            },
+          },
+        ],
+      });
     });
   }
 
   if (cancelQueueBtn) {
-    cancelQueueBtn.addEventListener('click', async () => {
+    cancelQueueBtn.addEventListener('click', () => {
       if (queueActionLocks > 0) return;
-      const endQueueAction = beginQueueAction();
-      try {
-        const result = await window.api.cancelQueue();
-        if (result && result.ok) {
-          announceQueueAction('Queue cancelled.');
-        } else {
-          const message = result?.error?.message || 'Could not cancel the queue.';
-          setQueueStatusMessage(message);
-          showToast(message, { type: 'error' });
-        }
-      } catch {
-        const message = 'Could not cancel the queue.';
-        setQueueStatusMessage(message);
-        showToast(message, { type: 'error' });
-      } finally {
-        endQueueAction();
-      }
+      showModal({
+        title: 'Cancel Queue',
+        message: 'Stop processing the active download queue?',
+        buttons: [
+          { label: 'Keep Running' },
+          {
+            label: 'Cancel Queue',
+            danger: true,
+            action: async () => {
+              const endQueueAction = beginQueueAction();
+              try {
+                const result = await window.api.cancelQueue();
+                if (result && result.ok) {
+                  announceQueueAction('Queue cancelled.');
+                } else {
+                  const message = result?.error?.message || 'Could not cancel the queue.';
+                  setQueueStatusMessage(message);
+                  showToast(message, { type: 'error' });
+                }
+              } catch {
+                const message = 'Could not cancel the queue.';
+                setQueueStatusMessage(message);
+                showToast(message, { type: 'error' });
+              } finally {
+                endQueueAction();
+              }
+            },
+          },
+        ],
+      });
     });
   }
 
@@ -2987,6 +3290,8 @@ document.addEventListener('DOMContentLoaded', async () => {
           if (outputEl) outputEl.textContent = '⚠️ Download cancelled: No save location selected.';
           return;
         }
+        settings.downloadFolder = savePath;
+        void persistSettings(true);
         if (outputEl) outputEl.textContent = '';
         downloadAbort = () => {
           isDownloading = false;
@@ -3160,6 +3465,18 @@ document.addEventListener('DOMContentLoaded', async () => {
     })
   );
 
+  ipcCleanupFunctions.push(
+    window.api.onSettingsImported((importedSettings) => {
+      settings = importedSettings;
+      try {
+        updateUIFromSettings();
+        applyTheme(settings.theme ?? 'system');
+      } catch (e) {
+        logError('Failed to refresh UI after settings import', e);
+      }
+    })
+  );
+
   let closePreparationInProgress = false;
   ipcCleanupFunctions.push(
     window.api.onPrepareForClose(async () => {
@@ -3218,6 +3535,15 @@ document.addEventListener('DOMContentLoaded', async () => {
     setTimeout(maybeShowSupportModal, 1500);
   }
 
+  const licensesOverlayEl = document.getElementById('licenses-overlay');
+  if (licensesOverlayEl) {
+    licensesOverlayEl.addEventListener('click', (event) => {
+      if (event.target === licensesOverlayEl) {
+        hideLicenses();
+      }
+    });
+  }
+
   const closeBtn = document.getElementById('close-licenses');
   if (closeBtn) {
     closeBtn.addEventListener('click', hideLicenses);
@@ -3225,11 +3551,13 @@ document.addEventListener('DOMContentLoaded', async () => {
 
   document.addEventListener('keydown', (event) => {
     const modifierPressed = isMac() ? event.metaKey : event.ctrlKey;
+    const wizardOverlay = document.getElementById('setup-wizard');
+    const wizardActive = wizardOverlay?.classList.contains('active');
+    const licensesOverlay = document.getElementById('licenses-overlay');
+    const licensesActive = licensesOverlay?.classList.contains('active');
 
-    // esc
     if (event.key === 'Escape') {
-      const licensesOverlay = document.getElementById('licenses-overlay');
-      if (licensesOverlay && licensesOverlay.classList.contains('active')) {
+      if (licensesActive) {
         hideLicenses();
         return;
       }
@@ -3247,12 +3575,19 @@ document.addEventListener('DOMContentLoaded', async () => {
       }
     }
 
+    if (wizardActive || isModalActive || licensesActive) {
+      return;
+    }
+
     if (modifierPressed && event.key === 'd') {
       event.preventDefault();
       showModal({
         title: 'Restart Application',
         message: 'Are you sure you want to restart ROSI?',
-        buttons: [{ label: 'Cancel' }, { label: 'Restart', action: () => window.api.restartApp() }],
+        buttons: [
+          { label: 'Cancel' },
+          { label: 'Restart', primary: true, action: () => window.api.restartApp() },
+        ],
       });
     }
 
diff --git a/src/renderer/splash.html b/src/renderer/splash.html
index cf48412..6b79669 100644
--- a/src/renderer/splash.html
+++ b/src/renderer/splash.html
@@ -327,7 +327,7 @@ <h1 class="app-title">ROSI</h1>
         <div class="loading-label">Loading</div>
       </div>
     </div>
-    <div class="version" id="version-display">v4.1.0-beta.1</div>
+    <div class="version" id="version-display">v4.1.0-beta.2</div>
     <script>
       setTimeout(function () {
         var label = document.querySelector('.loading-label');
diff --git a/src/tests/commandBuilders.test.ts b/src/tests/commandBuilders.test.ts
index b58bf12..7a6299d 100644
--- a/src/tests/commandBuilders.test.ts
+++ b/src/tests/commandBuilders.test.ts
@@ -1,13 +1,17 @@
+import { EventEmitter } from 'events';
 import { beforeEach, describe, it, expect, vi } from 'vitest';
 
-const detectGpuMock = vi.hoisted(() => vi.fn());
+const { detectGpuMock, spawnWithEnvMock } = vi.hoisted(() => ({
+  detectGpuMock: vi.fn(),
+  spawnWithEnvMock: vi.fn(),
+}));
 
 vi.mock('../main/gpu', () => ({
   detectGpu: detectGpuMock,
 }));
 
 vi.mock('../main/platform', () => ({
-  spawnWithEnv: vi.fn(),
+  spawnWithEnv: spawnWithEnvMock,
 }));
 
 vi.mock('electron-log/main.js', () => ({
@@ -17,6 +21,7 @@ vi.mock('electron-log/main.js', () => ({
 import {
   buildFfmpegArgs,
   buildYtdlpArgs,
+  probeMediaCodecs,
   resolveVideoEncoder,
 } from '../main/download/commandBuilders';
 import type { Settings } from '../types';
@@ -55,11 +60,92 @@ function createSettings(overrides: Partial<Settings> = {}): Settings {
   };
 }
 
+function createProbeProc(stderrLines: string[]) {
+  const proc = new EventEmitter() as EventEmitter & {
+    stderr: EventEmitter;
+    kill: (signal?: string) => void;
+  };
+  proc.stderr = new EventEmitter();
+  proc.kill = vi.fn();
+  spawnWithEnvMock.mockReturnValue(proc);
+  setImmediate(() => {
+    for (const line of stderrLines) {
+      proc.stderr.emit('data', line);
+    }
+    proc.emit('close', 1);
+  });
+  return proc;
+}
+
 describe('command builders', () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
+  it('probeMediaCodecs parses video and audio codecs from ffmpeg stderr', async () => {
+    createProbeProc([
+      'Input #0, matroska, from input.mkv:\n',
+      '  Stream #0:0: Video: h264 (High), yuv420p, 1920x1080\n',
+      '  Stream #0:1: Audio: aac (LC), 48000 Hz, stereo\n',
+    ]);
+
+    await expect(probeMediaCodecs('ffmpeg', '/tmp/input.mkv')).resolves.toEqual({
+      video: 'h264',
+      audio: 'aac',
+    });
+    expect(spawnWithEnvMock).toHaveBeenCalledWith(
+      'ffmpeg',
+      ['-hide_banner', '-i', '/tmp/input.mkv'],
+      { shell: false }
+    );
+  });
+
+  it('probeMediaCodecs returns partial codecs when only one stream is present', async () => {
+    createProbeProc(['  Stream #0:0: Video: vp9, yuv420p, 1280x720\n']);
+
+    await expect(probeMediaCodecs('ffmpeg', '/tmp/input.webm')).resolves.toEqual({
+      video: 'vp9',
+    });
+  });
+
+  it('probeMediaCodecs returns empty object when stderr has no stream info', async () => {
+    createProbeProc(['ffmpeg version 6.0\n']);
+
+    await expect(probeMediaCodecs('ffmpeg', '/tmp/input.mp4')).resolves.toEqual({});
+  });
+
+  it('probeMediaCodecs returns empty object when spawn errors', async () => {
+    const proc = new EventEmitter() as EventEmitter & {
+      stderr: EventEmitter;
+      kill: (signal?: string) => void;
+    };
+    proc.stderr = new EventEmitter();
+    proc.kill = vi.fn();
+    spawnWithEnvMock.mockReturnValue(proc);
+    setImmediate(() => proc.emit('error', new Error('spawn failed')));
+
+    await expect(probeMediaCodecs('ffmpeg', '/tmp/input.mp4')).resolves.toEqual({});
+  });
+
+  it('probeMediaCodecs kills hung probe and returns partial codecs on timeout', async () => {
+    vi.useFakeTimers();
+    const proc = new EventEmitter() as EventEmitter & {
+      stderr: EventEmitter;
+      kill: (signal?: string) => void;
+    };
+    proc.stderr = new EventEmitter();
+    proc.kill = vi.fn();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = probeMediaCodecs('ffmpeg', '/tmp/input.mkv');
+    proc.stderr.emit('data', '  Stream #0:0: Video: h264 (High), yuv420p\n');
+    await vi.advanceTimersByTimeAsync(30_000);
+
+    await expect(pending).resolves.toEqual({ video: 'h264' });
+    expect(proc.kill).toHaveBeenCalledWith('SIGKILL');
+    vi.useRealTimers();
+  });
+
   it('resolves GPU encoder based on settings', async () => {
     expect(await resolveVideoEncoder(createSettings({ gpuAcceleration: false }))).toBe('copy');
     expect(
diff --git a/src/tests/deno.test.ts b/src/tests/deno.test.ts
index 2976b8f..be9b6f4 100644
--- a/src/tests/deno.test.ts
+++ b/src/tests/deno.test.ts
@@ -39,6 +39,7 @@ vi.mock('electron', () => ({
 vi.mock('../main/platform', () => ({
   isWindows: process.platform === 'win32',
   buildEnhancedPath: () => process.env.PATH || '',
+  spawnWithEnv: (...args: unknown[]) => spawnMock(...args),
 }));
 
 vi.mock('electron-log/main.js', () => ({
diff --git a/src/tests/downloader.errorPaths.test.ts b/src/tests/downloader.errorPaths.test.ts
index 794836b..f3bfb88 100644
--- a/src/tests/downloader.errorPaths.test.ts
+++ b/src/tests/downloader.errorPaths.test.ts
@@ -13,7 +13,6 @@ const {
   getEffectiveFfmpegPathMock,
   resolveVideoEncoderMock,
   probeMediaCodecsMock,
-  buildFfmpegArgsMock,
   buildYtdlpArgsMock,
   showMessageBoxMock,
   logErrorMock,
@@ -32,7 +31,6 @@ const {
     getEffectiveFfmpegPathMock: vi.fn(() => 'ffmpeg'),
     resolveVideoEncoderMock: vi.fn(async () => 'copy'),
     probeMediaCodecsMock: vi.fn(async () => ({})),
-    buildFfmpegArgsMock: vi.fn(() => ['-i', 'in.mp4', '-c:v', 'copy', '-y', 'out.mp4']),
     buildYtdlpArgsMock: vi.fn(({ url }: { url: string }) => ({
       args: ['--print', 'after_move:filepath', '-o', '%(title)s.%(ext)s', url],
       statusMessages: [],
@@ -65,12 +63,15 @@ vi.mock('../main/settings', () => ({
   recordDownload: recordDownloadMock,
 }));
 
-vi.mock('../main/download/commandBuilders', () => ({
-  resolveVideoEncoder: resolveVideoEncoderMock,
-  buildFfmpegArgs: buildFfmpegArgsMock,
-  buildYtdlpArgs: buildYtdlpArgsMock,
-  probeMediaCodecs: probeMediaCodecsMock,
-}));
+vi.mock('../main/download/commandBuilders', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../main/download/commandBuilders')>();
+  return {
+    ...actual,
+    resolveVideoEncoder: resolveVideoEncoderMock,
+    buildYtdlpArgs: buildYtdlpArgsMock,
+    probeMediaCodecs: probeMediaCodecsMock,
+  };
+});
 
 vi.mock('electron', () => ({
   dialog: { showMessageBox: showMessageBoxMock },
@@ -382,7 +383,8 @@ describe('download error paths', () => {
       null,
       () => {
         throw new Error('cancel callback failed');
-      }
+      },
+      'queue'
     );
 
     cancelActiveSession(false);
@@ -554,6 +556,38 @@ describe('download error paths', () => {
     expect(sender.send).toHaveBeenCalledWith('complete', '❌ Failed (Invalid Folder).');
   });
 
+  it('uses stream copy in ffmpeg argv when probed codecs are container-compatible', async () => {
+    const ytProc = createProc();
+    const ffProc = createProc();
+    spawnWithEnvMock.mockReturnValueOnce(ytProc).mockReturnValueOnce(ffProc);
+    probeMediaCodecsMock.mockResolvedValueOnce({ video: 'h264', audio: 'aac' });
+    resolveVideoEncoderMock.mockResolvedValueOnce('h264_nvenc');
+    const sender = createSender();
+
+    loadSettingsMock.mockReturnValue({
+      ...loadSettingsMock(),
+      convertEnabled: true,
+      convertFormat: 'mp4',
+    });
+
+    startDownload(
+      '/tmp/ytdlp',
+      sender,
+      {
+        url: 'https://example.com/video',
+        outputPath: '/tmp/downloads',
+      },
+      null
+    );
+
+    ytProc.stdout.emit('data', '/tmp/downloads/video.webm\n');
+    ytProc.emit('close', 0);
+    await flush();
+
+    const ffmpegArgs = spawnWithEnvMock.mock.calls[1]?.[1] as string[] | undefined;
+    expect(ffmpegArgs).toEqual(expect.arrayContaining(['-c:v', 'copy', '-c:a', 'copy']));
+  });
+
   it('handles conversion enabled with valid format', () => {
     const ytProc = createProc();
     const ffProc = createProc();
@@ -1081,16 +1115,6 @@ describe('download error paths', () => {
     const ffProc = createProc();
     spawnWithEnvMock.mockReturnValueOnce(ytProc).mockReturnValueOnce(ffProc);
     resolveVideoEncoderMock.mockResolvedValueOnce('h264_nvenc');
-    buildFfmpegArgsMock.mockReturnValueOnce([
-      '-i',
-      'in.webm',
-      '-c:v',
-      'h264_nvenc',
-      '-c:a',
-      'aac',
-      '-y',
-      'out.mp4',
-    ]);
     const sender = createSender();
 
     loadSettingsMock.mockReturnValue({
diff --git a/src/tests/ipcValidation.nullEdge.test.ts b/src/tests/ipcValidation.nullEdge.test.ts
index 3894e93..9037640 100644
--- a/src/tests/ipcValidation.nullEdge.test.ts
+++ b/src/tests/ipcValidation.nullEdge.test.ts
@@ -1,3 +1,5 @@
+import * as os from 'os';
+import * as path from 'path';
 import { describe, it, expect } from 'vitest';
 import {
   validateDownloadRequestPayload,
@@ -10,7 +12,7 @@ import {
 describe('ipc validation null and edge-case handling', () => {
   const validBase = {
     url: 'https://example.com/video',
-    outputPath: '/tmp/downloads',
+    outputPath: path.join(os.homedir(), 'Downloads'),
   };
 
   describe('validateDownloadRequestPayload null inputs', () => {
@@ -110,7 +112,7 @@ describe('ipc validation null and edge-case handling', () => {
       expect(validateDownloadRequestPayload({ ...validBase, keepOriginal: [] }).ok).toBe(false);
     });
 
-    it('rejects empty string convertFormat after trim', () => {
+    it('accepts whitespace-only convertFormat as undefined', () => {
       const result = validateDownloadRequestPayload({
         ...validBase,
         convertFormat: '   ',
@@ -274,7 +276,7 @@ describe('ipc validation null and edge-case handling', () => {
     });
 
     it('accepts Unix absolute paths', () => {
-      const result = validateFileLocationPayload('/home/user/file.mp4');
+      const result = validateFileLocationPayload(path.join(os.homedir(), 'file.mp4'));
       expect(result.ok).toBe(true);
     });
   });
diff --git a/src/tests/ipcValidation.test.ts b/src/tests/ipcValidation.test.ts
index ad4d3a4..6535710 100644
--- a/src/tests/ipcValidation.test.ts
+++ b/src/tests/ipcValidation.test.ts
@@ -1,3 +1,5 @@
+import * as os from 'os';
+import * as path from 'path';
 import { describe, it, expect } from 'vitest';
 import {
   errorResult,
@@ -27,10 +29,11 @@ describe('ipc validation helpers', () => {
   });
 
   it('accepts valid download requests', () => {
+    const outputPath = path.join(os.homedir(), 'Downloads');
     const result = validateDownloadRequestPayload({
       url: '  https://example.com/video  ',
-      outputPath: '  /tmp  ',
-      ffmpegPath: '  /usr/bin/ffmpeg  ',
+      outputPath: `  ${outputPath}  `,
+      ffmpegPath: 'ffmpeg',
       convertFormat: '  mp4  ',
       keepOriginal: true,
       videoFormat: '  137  ',
@@ -40,13 +43,67 @@ describe('ipc validation helpers', () => {
     expect(result.ok).toBe(true);
     if (!result.ok) return;
     expect(result.data.url).toBe('https://example.com/video');
-    expect(result.data.outputPath).toBe('/tmp');
-    expect(result.data.ffmpegPath).toBe('/usr/bin/ffmpeg');
+    expect(result.data.outputPath).toBe(outputPath);
+    expect(result.data.ffmpegPath).toBe('ffmpeg');
     expect(result.data.convertFormat).toBe('mp4');
     expect(result.data.videoFormat).toBe('137');
     expect(result.data.audioFormat).toBe('140');
   });
 
+  it('rejects outputPath outside the user home directory', () => {
+    const result = validateDownloadRequestPayload({
+      url: 'https://example.com',
+      outputPath: '/tmp/downloads',
+    });
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error.message).toContain('within your home directory');
+    }
+  });
+
+  it('rejects invalid ffmpegPath values in download requests', () => {
+    expect(
+      validateDownloadRequestPayload({
+        url: 'https://example.com',
+        outputPath: path.join(os.homedir(), 'Downloads'),
+        ffmpegPath: 'relative/ffmpeg',
+      }).ok
+    ).toBe(false);
+    expect(
+      validateDownloadRequestPayload({
+        url: 'https://example.com',
+        outputPath: path.join(os.homedir(), 'Downloads'),
+        ffmpegPath: path.join(os.homedir(), 'bin', 'ffprobe'),
+      }).ok
+    ).toBe(false);
+    expect(
+      validateDownloadRequestPayload({
+        url: 'https://example.com',
+        outputPath: path.join(os.homedir(), 'Downloads'),
+        ffmpegPath: path.join(os.homedir(), 'missing-ffmpeg-dir', 'ffmpeg'),
+      }).ok
+    ).toBe(false);
+  });
+
+  it('accepts ffmpeg sentinel and empty ffmpegPath in download requests', () => {
+    const homeDownloads = path.join(os.homedir(), 'Downloads');
+    const sentinel = validateDownloadRequestPayload({
+      url: 'https://example.com',
+      outputPath: homeDownloads,
+      ffmpegPath: 'ffmpeg',
+    });
+    expect(sentinel.ok).toBe(true);
+    if (sentinel.ok) expect(sentinel.data.ffmpegPath).toBe('ffmpeg');
+
+    const empty = validateDownloadRequestPayload({
+      url: 'https://example.com',
+      outputPath: homeDownloads,
+      ffmpegPath: '   ',
+    });
+    expect(empty.ok).toBe(true);
+    if (empty.ok) expect(empty.data.ffmpegPath).toBeUndefined();
+  });
+
   it('rejects malformed download request payloads by field', () => {
     expect(validateDownloadRequestPayload(null).ok).toBe(false);
     expect(
@@ -112,7 +169,7 @@ describe('ipc validation helpers', () => {
       settingsVersion: 1,
       theme: 'system',
       showConsoleOutput: true,
-      browserChoice: 'Firefox',
+      browserChoice: 'firefox',
       updateChannel: 'stable',
       gpuType: 'intel',
       unknownField: 'ignored',
@@ -121,15 +178,20 @@ describe('ipc validation helpers', () => {
     if (!valid.ok) return;
     expect(valid.data.settingsVersion).toBe(1);
     expect(valid.data.theme).toBe('system');
-    expect(valid.data.browserChoice).toBe('Firefox');
+    expect(valid.data.browserChoice).toBe('firefox');
     expect(Object.keys(valid.data)).not.toContain('unknownField');
 
     expect(validateSettingsPatchPayload({ settingsVersion: 0 }).ok).toBe(false);
     expect(validateSettingsPatchPayload({ theme: 'night' }).ok).toBe(false);
     expect(validateSettingsPatchPayload({ audioOnly: 'true' }).ok).toBe(false);
     expect(validateSettingsPatchPayload({ browserChoice: 123 }).ok).toBe(false);
+    expect(validateSettingsPatchPayload({ browserChoice: 'curl' }).ok).toBe(false);
     expect(validateSettingsPatchPayload({ convertFormat: '../../bad' }).ok).toBe(false);
 
+    const normalizedBrowser = validateSettingsPatchPayload({ browserChoice: 'Firefox' });
+    expect(normalizedBrowser.ok).toBe(true);
+    if (normalizedBrowser.ok) expect(normalizedBrowser.data.browserChoice).toBe('firefox');
+
     const invalid = validateSettingsPatchPayload({
       updateChannel: 'nightly',
     });
@@ -169,24 +231,45 @@ describe('ipc validation helpers', () => {
     expect(validateExternalUrlPayload(42).ok).toBe(false);
     expect(validateExternalUrlPayload('file:///tmp').ok).toBe(false);
 
-    const filePath = validateFileLocationPayload('  /tmp/file.mp4  ');
+    const allowedFile = path.join(os.homedir(), 'file.mp4');
+    const filePath = validateFileLocationPayload(`  ${allowedFile}  `);
     expect(filePath.ok).toBe(true);
-    if (filePath.ok) expect(filePath.data).toBe('/tmp/file.mp4');
+    if (filePath.ok) expect(filePath.data).toBe(path.resolve(allowedFile));
     expect(validateFileLocationPayload('').ok).toBe(false);
   });
 
+  it('validates downloadFolder in settings patch payload', () => {
+    const homeFolder = path.join(os.homedir(), 'Downloads', 'rosi');
+    const valid = validateSettingsPatchPayload({ downloadFolder: `  ${homeFolder}  ` });
+    expect(valid.ok).toBe(true);
+    if (valid.ok) {
+      expect(valid.data.downloadFolder).toBe(path.resolve(homeFolder));
+    }
+
+    const empty = validateSettingsPatchPayload({ downloadFolder: '   ' });
+    expect(empty.ok).toBe(true);
+    if (empty.ok) expect(empty.data.downloadFolder).toBe('');
+
+    expect(validateSettingsPatchPayload({ downloadFolder: null }).ok).toBe(false);
+    expect(validateSettingsPatchPayload({ downloadFolder: 42 }).ok).toBe(false);
+    expect(validateSettingsPatchPayload({ downloadFolder: 'relative/path' }).ok).toBe(false);
+    expect(validateSettingsPatchPayload({ downloadFolder: '/tmp/outside-home' }).ok).toBe(false);
+    expect(validateSettingsPatchPayload({ downloadFolder: 'x'.repeat(4097) }).ok).toBe(false);
+  });
+
   it('validates notification payload shape', () => {
+    const notificationFile = path.join(os.homedir(), 'out.mp4');
     const valid = validateNotificationPayload({
       title: ' Done ',
       body: ' Finished ',
-      filePath: ' /tmp/out.mp4 ',
+      filePath: ` ${notificationFile} `,
     });
     expect(valid.ok).toBe(true);
     if (valid.ok) {
       expect(valid.data).toEqual({
         title: 'Done',
         body: 'Finished',
-        filePath: '/tmp/out.mp4',
+        filePath: path.resolve(notificationFile),
       });
     }
 
diff --git a/src/tests/main.ipc.test.ts b/src/tests/main.ipc.test.ts
index 2cd46f2..22233d6 100644
--- a/src/tests/main.ipc.test.ts
+++ b/src/tests/main.ipc.test.ts
@@ -1,4 +1,5 @@
 import fs from 'fs';
+import * as os from 'os';
 import path from 'path';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
@@ -24,6 +25,7 @@ const {
   notificationIsSupportedMock,
   notificationShowMock,
   notificationOnMock,
+  notificationOnceMock,
   checkForUpdatesMock,
   downloadUpdateMock,
   cancelUpdateDownloadMock,
@@ -33,7 +35,13 @@ const {
   detectGpuMock,
   fetchFormatsMock,
   cancelFormatsMock,
+  fetchVideoInfoMock,
+  cancelVideoInfoMock,
+  ytdlpFixturePath,
 } = vi.hoisted(() => {
+  const nodeOs = require('os') as typeof import('os');
+  const nodePath = require('path') as typeof import('path');
+  const { randomBytes } = require('crypto') as typeof import('crypto');
   const handleMap: Record<string, any> = {};
   const onMap: Record<string, any> = {};
   const appOnMap: Record<string, any> = {};
@@ -73,6 +81,7 @@ const {
       setWindowOpenHandler: vi.fn(),
       on: vi.fn(),
       isDestroyed: vi.fn(() => false),
+      id: 1,
     };
 
     constructor() {
@@ -115,8 +124,12 @@ const {
     }
   }
 
-  const userDataDir = `${process.cwd()}/.tmp-main-ipc-test`;
-  const downloadsDir = `${userDataDir}/downloads`;
+  const userDataDir = nodePath.join(
+    nodeOs.tmpdir(),
+    `rosi-main-ipc-test-${randomBytes(8).toString('hex')}`
+  );
+  const downloadsDir = nodePath.join(userDataDir, 'downloads');
+  const ytdlpFixturePath = nodePath.join(userDataDir, 'yt-dlp.exe');
 
   const app = {
     whenReady: vi.fn(() => Promise.resolve()),
@@ -132,6 +145,7 @@ const {
       return userDataDir;
     }),
     getVersion: vi.fn(() => '4.0.0-beta.2'),
+    getAppPath: vi.fn(() => process.cwd()),
     isReady: vi.fn(() => true),
   };
 
@@ -166,7 +180,10 @@ const {
     saveSettingsMock: vi.fn(() => true),
     resetStatsMock: vi.fn(() => true),
     exportSettingsToFileMock: vi.fn(async () => true),
-    importSettingsFromFileMock: vi.fn(async () => true),
+    importSettingsFromFileMock: vi.fn(async () => ({
+      convertEnabled: false,
+      convertFormat: 'mp4',
+    })),
     showOpenDialogMock: vi.fn(
       async (): Promise<{ canceled: boolean; filePaths: string[] }> => ({
         canceled: true,
@@ -179,6 +196,7 @@ const {
     notificationIsSupportedMock: vi.fn(() => true),
     notificationShowMock: vi.fn(),
     notificationOnMock: vi.fn(),
+    notificationOnceMock: vi.fn(),
     checkForUpdatesMock: vi.fn(async () => ({ ok: true })),
     downloadUpdateMock: vi.fn(async () => ({ success: true })),
     cancelUpdateDownloadMock: vi.fn(),
@@ -188,6 +206,13 @@ const {
     detectGpuMock: vi.fn(async () => ({ nvidia: false, amd: false, intel: false })),
     fetchFormatsMock: vi.fn(async () => 'ok'),
     cancelFormatsMock: vi.fn(),
+    fetchVideoInfoMock: vi.fn(async () => ({
+      title: 'Example Video',
+      duration: 120,
+      thumbnail: 'https://example.com/thumb.jpg',
+    })),
+    cancelVideoInfoMock: vi.fn(),
+    ytdlpFixturePath,
   };
 });
 
@@ -217,13 +242,14 @@ vi.mock('electron', () => ({
       return notificationIsSupportedMock();
     }
     on = notificationOnMock;
+    once = notificationOnceMock;
     show = notificationShowMock;
   },
 }));
 
 vi.mock('../main/platform', () => ({
   isPackaged: true,
-  resolveYtdlpPath: vi.fn(() => 'C:/tools/yt-dlp.exe'),
+  resolveYtdlpPath: vi.fn(() => ytdlpFixturePath),
   verifyBundledFfmpeg: vi.fn(),
 }));
 
@@ -260,6 +286,12 @@ vi.mock('../main/downloader', () => ({
   killAllProcesses: killAllProcessesMock,
   fetchFormats: fetchFormatsMock,
   cancelFormats: cancelFormatsMock,
+  canStartDownload: vi.fn(() => true),
+}));
+
+vi.mock('../main/download/videoInfo', () => ({
+  fetchVideoInfo: fetchVideoInfoMock,
+  cancelVideoInfo: cancelVideoInfoMock,
 }));
 
 vi.mock('../main/constants', () => ({
@@ -305,7 +337,10 @@ async function initializeMainModule(options?: { beforeImport?: (userDataDir: str
   exportSettingsToFileMock.mockClear();
   exportSettingsToFileMock.mockResolvedValue(true);
   importSettingsFromFileMock.mockClear();
-  importSettingsFromFileMock.mockResolvedValue(true);
+  importSettingsFromFileMock.mockResolvedValue({
+    convertEnabled: false,
+    convertFormat: 'mp4',
+  });
   showOpenDialogMock.mockClear();
   showOpenDialogMock.mockResolvedValue({ canceled: true, filePaths: [] });
   openExternalMock.mockClear();
@@ -317,6 +352,7 @@ async function initializeMainModule(options?: { beforeImport?: (userDataDir: str
   notificationIsSupportedMock.mockReturnValue(true);
   notificationShowMock.mockClear();
   notificationOnMock.mockClear();
+  notificationOnceMock.mockClear();
   checkForUpdatesMock.mockClear();
   checkForUpdatesMock.mockResolvedValue({ ok: true });
   downloadUpdateMock.mockClear();
@@ -332,6 +368,13 @@ async function initializeMainModule(options?: { beforeImport?: (userDataDir: str
   fetchFormatsMock.mockClear();
   fetchFormatsMock.mockResolvedValue('ok');
   cancelFormatsMock.mockClear();
+  fetchVideoInfoMock.mockClear();
+  fetchVideoInfoMock.mockResolvedValue({
+    title: 'Example Video',
+    duration: 120,
+    thumbnail: 'https://example.com/thumb.jpg',
+  });
+  cancelVideoInfoMock.mockClear();
   killAllProcessesMock.mockClear();
   appMock.on.mockClear();
   appMock.quit.mockClear();
@@ -342,6 +385,8 @@ async function initializeMainModule(options?: { beforeImport?: (userDataDir: str
   appMock.requestSingleInstanceLock.mockReset();
   appMock.requestSingleInstanceLock.mockReturnValue(true);
   options?.beforeImport?.(userDataDir);
+  fs.mkdirSync(path.dirname(ytdlpFixturePath), { recursive: true });
+  fs.writeFileSync(ytdlpFixturePath, '');
   vi.resetModules();
   await import('../main/main');
   await new Promise((resolve) => setTimeout(resolve, 10));
@@ -365,6 +410,8 @@ type MockWindow = {
   restore: MockFn;
 };
 
+const authorizedEvent = { sender: { id: 1 } };
+
 function getPrimaryWindow(): MockWindow {
   const windows = BrowserWindowMock.getAllWindows() as unknown as MockWindow[];
   const primary = [...windows]
@@ -429,42 +476,45 @@ describe('main process IPC wiring and queue behavior', () => {
     const clearQueue = handleHandlers['clear-queue'];
     const cancelQueue = handleHandlers['cancel-queue'];
 
-    const addResult = await addToQueue({}, ['https://example.com/a', 'invalid-url']);
+    const addResult = await addToQueue(authorizedEvent, ['https://example.com/a', 'invalid-url']);
     expect(addResult).toEqual({ ok: true, data: { added: 1 } });
 
-    let queue = await getQueue();
+    let queue = await getQueue(authorizedEvent);
     expect(queue).toHaveLength(1);
     expect(queue[0].status).toBe('pending');
 
-    const removeMissingResult = await removeFromQueue({}, 'missing-id');
+    const removeMissingResult = await removeFromQueue(authorizedEvent, 'missing-id');
     expect(removeMissingResult).toEqual({
       ok: false,
       error: { code: 'NOT_AVAILABLE', message: 'Queue item not found.' },
     });
 
-    const startResult = await startQueue();
+    const startResult = await startQueue(authorizedEvent);
     expect(startResult).toEqual({ ok: true, data: { started: true } });
-    await new Promise((resolve) => setTimeout(resolve, 10));
+    await new Promise((resolve) => setTimeout(resolve, 50));
     expect(startDownloadMock).toHaveBeenCalled();
 
-    queue = await getQueue();
+    queue = await getQueue(authorizedEvent);
     expect(queue[0].status).toBe('completed');
 
-    const secondAdd = await addToQueue({}, ['https://example.com/b', 'https://example.com/c']);
+    const secondAdd = await addToQueue(authorizedEvent, [
+      'https://example.com/b',
+      'https://example.com/c',
+    ]);
     expect(secondAdd).toEqual({ ok: true, data: { added: 2 } });
 
-    const cancelResult = await cancelQueue();
+    const cancelResult = await cancelQueue(authorizedEvent);
     expect(cancelResult).toEqual({ ok: true, data: undefined });
-    queue = await getQueue();
+    queue = await getQueue(authorizedEvent);
     const cancelledItems = queue.filter((item: { status: string }) => item.status === 'cancelled');
     expect(cancelledItems.length).toBeGreaterThanOrEqual(2);
 
-    const clearResult = await clearQueue();
+    const clearResult = await clearQueue(authorizedEvent);
     expect(clearResult).toEqual({ ok: true, data: undefined });
-    queue = await getQueue();
+    queue = await getQueue(authorizedEvent);
     expect(queue).toEqual([]);
 
-    expect(await startQueue()).toEqual(
+    expect(await startQueue(authorizedEvent)).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'NOT_AVAILABLE' }),
@@ -473,13 +523,13 @@ describe('main process IPC wiring and queue behavior', () => {
   });
 
   it('rejects malformed queue input and ignores duplicate completion callbacks', async () => {
-    expect(await handleHandlers['add-to-queue']!({}, 'not-array')).toEqual(
+    expect(await handleHandlers['add-to-queue']!(authorizedEvent, 'not-array')).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'VALIDATION_ERROR' }),
       })
     );
-    expect(await handleHandlers['add-to-queue']!({}, ['bad-url'])).toEqual(
+    expect(await handleHandlers['add-to-queue']!(authorizedEvent, ['bad-url'])).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ message: 'No valid URLs provided.' }),
@@ -499,11 +549,16 @@ describe('main process IPC wiring and queue behavior', () => {
       }
     );
 
-    await handleHandlers['add-to-queue']!({}, ['https://example.com/settled']);
-    expect(await handleHandlers['start-queue']!()).toEqual({ ok: true, data: { started: true } });
+    await handleHandlers['add-to-queue']!(authorizedEvent, ['https://example.com/settled']);
+    expect(await handleHandlers['start-queue']!(authorizedEvent)).toEqual({
+      ok: true,
+      data: { started: true },
+    });
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    const queue = (await handleHandlers['get-queue']!()) as Array<{ status: string }>;
+    const queue = (await handleHandlers['get-queue']!(authorizedEvent)) as Array<{
+      status: string;
+    }>;
     expect(queue[0]?.status).toBe('completed');
   });
 
@@ -514,7 +569,7 @@ describe('main process IPC wiring and queue behavior', () => {
     const startQueue = handleHandlers['start-queue'];
 
     const tooMany = Array.from({ length: 501 }, (_, index) => `https://example.com/${index}`);
-    const limitResult = await addToQueue({}, tooMany);
+    const limitResult = await addToQueue(authorizedEvent, tooMany);
     expect(limitResult).toEqual(
       expect.objectContaining({
         ok: false,
@@ -522,20 +577,20 @@ describe('main process IPC wiring and queue behavior', () => {
       })
     );
 
-    await addToQueue({}, ['https://example.com/remove-me']);
-    let queue = (await getQueue()) as Array<{ id: string; status: string }>;
-    const removeResult = await removeFromQueue({}, queue[0]!.id);
+    await addToQueue(authorizedEvent, ['https://example.com/remove-me']);
+    let queue = (await getQueue(authorizedEvent)) as Array<{ id: string; status: string }>;
+    const removeResult = await removeFromQueue(authorizedEvent, queue[0]!.id);
     expect(removeResult).toEqual({ ok: true, data: undefined });
-    expect(await getQueue()).toEqual([]);
+    expect(await getQueue(authorizedEvent)).toEqual([]);
 
     startDownloadMock.mockImplementationOnce(() => {});
-    await addToQueue({}, ['https://example.com/active']);
-    await startQueue();
+    await addToQueue(authorizedEvent, ['https://example.com/active']);
+    await startQueue(authorizedEvent);
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    queue = (await getQueue()) as Array<{ id: string; status: string }>;
+    queue = (await getQueue(authorizedEvent)) as Array<{ id: string; status: string }>;
     expect(queue[0]!.status).toBe('downloading');
-    const activeRemove = await removeFromQueue({}, queue[0]!.id);
+    const activeRemove = await removeFromQueue(authorizedEvent, queue[0]!.id);
     expect(activeRemove).toEqual(
       expect.objectContaining({
         ok: false,
@@ -548,8 +603,6 @@ describe('main process IPC wiring and queue behavior', () => {
 
   it('rejects queue mutations from unauthorized sender', async () => {
     const mainWindow = getPrimaryWindow();
-    mainWindow.webContents.id = 1;
-
     const addResult = await handleHandlers['add-to-queue']!({ sender: { id: 2 } }, [
       'https://example.com/a',
     ]);
@@ -579,11 +632,11 @@ describe('main process IPC wiring and queue behavior', () => {
       throw new Error('cancel failed');
     });
 
-    await addToQueue({}, ['https://example.com/cancel-error']);
-    await startQueue();
+    await addToQueue(authorizedEvent, ['https://example.com/cancel-error']);
+    await startQueue(authorizedEvent);
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    const result = await cancelQueue();
+    const result = await cancelQueue(authorizedEvent);
     expect(result).toEqual(
       expect.objectContaining({
         ok: false,
@@ -598,7 +651,7 @@ describe('main process IPC wiring and queue behavior', () => {
   it('validates and starts direct download requests through ipc', async () => {
     const downloadVideo = handleHandlers['download-video'];
 
-    const invalid = await downloadVideo({}, { url: 'bad', outputPath: '' });
+    const invalid = await downloadVideo(authorizedEvent, { url: 'bad', outputPath: '' });
     expect(invalid).toEqual({
       ok: false,
       error: {
@@ -607,18 +660,16 @@ describe('main process IPC wiring and queue behavior', () => {
       },
     });
 
-    const valid = await downloadVideo(
-      {},
-      { url: 'https://example.com/video', outputPath: 'C:/tmp' }
-    );
+    const valid = await downloadVideo(authorizedEvent, {
+      url: 'https://example.com/video',
+      outputPath: path.join(os.homedir(), 'Downloads'),
+    });
     expect(valid).toEqual({ ok: true, data: { started: true } });
     expect(startDownloadMock).toHaveBeenCalled();
 
-    const mainWindow = getPrimaryWindow();
-    mainWindow.webContents.id = 3;
     const unauthorized = await downloadVideo(
       { sender: { id: 4 } },
-      { url: 'https://example.com/video', outputPath: 'C:/tmp' }
+      { url: 'https://example.com/video', outputPath: path.join(os.homedir(), 'Downloads') }
     );
     expect(unauthorized).toEqual(
       expect.objectContaining({
@@ -633,10 +684,10 @@ describe('main process IPC wiring and queue behavior', () => {
       throw new Error('start failed');
     });
 
-    const result = await handleHandlers['download-video']!(
-      {},
-      { url: 'https://example.com/video', outputPath: 'C:/tmp' }
-    );
+    const result = await handleHandlers['download-video']!(authorizedEvent, {
+      url: 'https://example.com/video',
+      outputPath: path.join(os.homedir(), 'Downloads'),
+    });
 
     expect(result).toEqual(
       expect.objectContaining({
@@ -648,7 +699,7 @@ describe('main process IPC wiring and queue behavior', () => {
 
   it('rejects unsafe external links through validation', async () => {
     const openExternal = handleHandlers['open-external'];
-    const invalid = await openExternal({}, 'javascript:alert(1)');
+    const invalid = await openExternal(authorizedEvent, 'javascript:alert(1)');
     expect(invalid).toEqual({
       ok: false,
       error: { code: 'INVALID_URL', message: 'Invalid external URL payload.' },
@@ -658,22 +709,25 @@ describe('main process IPC wiring and queue behavior', () => {
   it('handles settings and utility IPC requests', async () => {
     expect(await handleHandlers['get-app-version']!()).toBe('4.0.0-beta.2');
     expect(await handleHandlers['is-packaged']!()).toBe(true);
-    expect(await handleHandlers['get-settings']!()).toEqual(
+    expect(await handleHandlers['get-settings']!(authorizedEvent)).toEqual(
       expect.objectContaining({ convertFormat: 'mp4' })
     );
-    expect(await handleHandlers['check-deno-installed']!()).toBe(true);
-    expect(await handleHandlers['install-deno']!()).toEqual({ success: true });
-    expect(await handleHandlers['detect-gpu']!()).toEqual({
+    expect(await handleHandlers['check-deno-installed']!(authorizedEvent)).toBe(true);
+    expect(await handleHandlers['install-deno']!(authorizedEvent)).toEqual({ success: true });
+    expect(await handleHandlers['detect-gpu']!(authorizedEvent)).toEqual({
       nvidia: false,
       amd: false,
       intel: false,
     });
     expect(await handleHandlers['get-stats']!()).toEqual({ totalDownloads: 0 });
-    expect(await handleHandlers['reset-stats']!()).toEqual({ ok: true, data: undefined });
+    expect(await handleHandlers['reset-stats']!(authorizedEvent)).toEqual({
+      ok: true,
+      data: undefined,
+    });
     expect(await handleHandlers['check-for-updates']!()).toEqual({ ok: true });
     expect(await handleHandlers['download-update']!()).toEqual({ success: true });
 
-    const saveResult = await handleHandlers['save-settings']!({}, { theme: 'dark' });
+    const saveResult = await handleHandlers['save-settings']!(authorizedEvent, { theme: 'dark' });
     expect(saveResult).toEqual(
       expect.objectContaining({
         ok: true,
@@ -682,7 +736,7 @@ describe('main process IPC wiring and queue behavior', () => {
     expect(saveSettingsMock).toHaveBeenCalledWith({ theme: 'dark' }, expect.anything());
 
     saveSettingsMock.mockReturnValueOnce(false);
-    const saveFailure = await handleHandlers['save-settings']!({}, { theme: 'dark' });
+    const saveFailure = await handleHandlers['save-settings']!(authorizedEvent, { theme: 'dark' });
     expect(saveFailure).toEqual(
       expect.objectContaining({
         ok: false,
@@ -690,7 +744,7 @@ describe('main process IPC wiring and queue behavior', () => {
       })
     );
 
-    const invalidSave = await handleHandlers['save-settings']!({}, { theme: 'neon' });
+    const invalidSave = await handleHandlers['save-settings']!(authorizedEvent, { theme: 'neon' });
     expect(invalidSave).toEqual(
       expect.objectContaining({
         ok: false,
@@ -701,9 +755,9 @@ describe('main process IPC wiring and queue behavior', () => {
 
   it('handles update and cancellation fire-and-forget IPC events', () => {
     onHandlers['cancel-update-download']!({});
-    onHandlers['install-update']!({});
-    onHandlers['cancel-formats']!({ sender: {} });
-    onHandlers['cancel-download']!({ sender: {} });
+    onHandlers['install-update']!(authorizedEvent);
+    onHandlers['cancel-formats']!(authorizedEvent);
+    onHandlers['cancel-download']!(authorizedEvent);
 
     expect(cancelUpdateDownloadMock).toHaveBeenCalled();
     expect(installUpdateMock).toHaveBeenCalled();
@@ -712,9 +766,6 @@ describe('main process IPC wiring and queue behavior', () => {
   });
 
   it('ignores unauthorized cancellation events and catches cancel errors', () => {
-    const mainWindow = getPrimaryWindow();
-    mainWindow.webContents.id = 10;
-
     onHandlers['cancel-formats']!({ sender: { id: 11 } });
     onHandlers['cancel-download']!({ sender: { id: 11 } });
 
@@ -725,7 +776,7 @@ describe('main process IPC wiring and queue behavior', () => {
       throw new Error('cancel failed');
     });
 
-    expect(() => onHandlers['cancel-download']!({ sender: { id: 10 } })).not.toThrow();
+    expect(() => onHandlers['cancel-download']!(authorizedEvent)).not.toThrow();
     expect(cancelActiveSessionMock).toHaveBeenCalledWith(true);
   });
 
@@ -765,6 +816,19 @@ describe('main process IPC wiring and queue behavior', () => {
     await Promise.resolve();
   });
 
+  it('allows immediate close when installing an update', () => {
+    const mainWindow = getPrimaryWindow();
+    const closeHandler = getWindowHandler(mainWindow, 'close');
+    const preventDefault = vi.fn();
+
+    onHandlers['install-update']!(authorizedEvent);
+    closeHandler({ preventDefault });
+
+    expect(installUpdateMock).toHaveBeenCalled();
+    expect(preventDefault).not.toHaveBeenCalled();
+    expect(sendMock).not.toHaveBeenCalledWith('prepare-for-close');
+  });
+
   it('waits for renderer settings flush before closing main window', () => {
     const mainWindow = getPrimaryWindow();
     mainWindow.webContents.id = 99;
@@ -829,12 +893,18 @@ describe('main process IPC wiring and queue behavior', () => {
   });
 
   it('handles external links, folder selection, and formats IPC branches', async () => {
-    const openResult = await handleHandlers['open-external']!({}, 'https://example.com');
+    const openResult = await handleHandlers['open-external']!(
+      authorizedEvent,
+      'https://example.com'
+    );
     expect(openResult).toEqual({ ok: true, data: { opened: true } });
     expect(openExternalMock).toHaveBeenCalledWith('https://example.com');
 
     openExternalMock.mockRejectedValueOnce(new Error('blocked'));
-    const openFailure = await handleHandlers['open-external']!({}, 'https://example.com');
+    const openFailure = await handleHandlers['open-external']!(
+      authorizedEvent,
+      'https://example.com'
+    );
     expect(openFailure).toEqual(
       expect.objectContaining({
         ok: false,
@@ -846,28 +916,25 @@ describe('main process IPC wiring and queue behavior', () => {
       canceled: false,
       filePaths: ['C:/Downloads'],
     });
-    expect(await handleHandlers['select-download-location']!()).toBe('C:/Downloads');
+    expect(await handleHandlers['select-download-location']!(authorizedEvent)).toBe('C:/Downloads');
 
     showOpenDialogMock.mockResolvedValueOnce({
       canceled: true,
       filePaths: [],
     });
-    expect(await handleHandlers['select-download-location']!()).toBeNull();
+    expect(await handleHandlers['select-download-location']!(authorizedEvent)).toBeNull();
 
     showOpenDialogMock.mockRejectedValueOnce(new Error('dialog failed'));
-    expect(await handleHandlers['select-download-location']!()).toBeNull();
-
-    for (const windowRef of BrowserWindowMock.getAllWindows() as unknown as MockWindow[]) {
-      (windowRef.destroy as unknown as () => void)();
-    }
-    expect(await handleHandlers['select-download-location']!()).toBeNull();
+    expect(await handleHandlers['select-download-location']!(authorizedEvent)).toBeNull();
 
-    expect(await handleHandlers['getFormats']!({}, 'https://example.com/video')).toEqual({
+    expect(
+      await handleHandlers['getFormats']!(authorizedEvent, 'https://example.com/video')
+    ).toEqual({
       ok: true,
       data: 'ok',
     });
 
-    const invalidFormats = await handleHandlers['getFormats']!({}, 'not-a-url');
+    const invalidFormats = await handleHandlers['getFormats']!(authorizedEvent, 'not-a-url');
     expect(invalidFormats).toEqual(
       expect.objectContaining({
         ok: false,
@@ -876,7 +943,10 @@ describe('main process IPC wiring and queue behavior', () => {
     );
 
     fetchFormatsMock.mockRejectedValueOnce('Format fetch cancelled.');
-    const cancelledFormats = await handleHandlers['getFormats']!({}, 'https://example.com/video');
+    const cancelledFormats = await handleHandlers['getFormats']!(
+      authorizedEvent,
+      'https://example.com/video'
+    );
     expect(cancelledFormats).toEqual(
       expect.objectContaining({
         ok: false,
@@ -885,7 +955,10 @@ describe('main process IPC wiring and queue behavior', () => {
     );
 
     fetchFormatsMock.mockRejectedValueOnce(new Error('yt-dlp failed'));
-    const failedFormats = await handleHandlers['getFormats']!({}, 'https://example.com/video');
+    const failedFormats = await handleHandlers['getFormats']!(
+      authorizedEvent,
+      'https://example.com/video'
+    );
     expect(failedFormats).toEqual(
       expect.objectContaining({
         ok: false,
@@ -894,7 +967,10 @@ describe('main process IPC wiring and queue behavior', () => {
     );
 
     fetchFormatsMock.mockRejectedValueOnce({});
-    const unknownFailure = await handleHandlers['getFormats']!({}, 'https://example.com/video');
+    const unknownFailure = await handleHandlers['getFormats']!(
+      authorizedEvent,
+      'https://example.com/video'
+    );
     expect(unknownFailure).toEqual(
       expect.objectContaining({
         ok: false,
@@ -904,24 +980,33 @@ describe('main process IPC wiring and queue behavior', () => {
         }),
       })
     );
+
+    for (const windowRef of BrowserWindowMock.getAllWindows() as unknown as MockWindow[]) {
+      (windowRef.destroy as unknown as () => void)();
+    }
+    expect(await handleHandlers['select-download-location']!(authorizedEvent)).toBeNull();
   });
 
   it('handles file location IPC branches', async () => {
-    const userDataDir = appMock.getPath('userData');
-    const filePath = path.join(userDataDir, 'downloads', 'video.mp4');
+    const downloadDir = path.join(os.homedir(), 'Downloads', `rosi-ipc-fileloc-${Date.now()}`);
+    const filePath = path.join(downloadDir, 'rosi-ipc-test-video.mp4');
+    fs.mkdirSync(downloadDir, { recursive: true });
     fs.writeFileSync(filePath, '');
 
-    const fileResult = await handleHandlers['open-file-location']!({}, filePath);
+    const fileResult = await handleHandlers['open-file-location']!(authorizedEvent, filePath);
     expect(fileResult).toEqual({ ok: true, data: { opened: true } });
     expect(showItemInFolderMock).toHaveBeenCalledWith(filePath);
 
-    const missingFilePath = path.join(userDataDir, 'downloads', 'missing.mp4');
-    const dirResult = await handleHandlers['open-file-location']!({}, missingFilePath);
+    const missingFilePath = path.join(downloadDir, 'rosi-ipc-test-missing.mp4');
+    const dirResult = await handleHandlers['open-file-location']!(authorizedEvent, missingFilePath);
     expect(dirResult).toEqual({ ok: true, data: { opened: true } });
     expect(openPathMock).toHaveBeenCalledWith(path.dirname(missingFilePath));
 
     openPathMock.mockResolvedValueOnce('blocked');
-    const dirFailure = await handleHandlers['open-file-location']!({}, missingFilePath);
+    const dirFailure = await handleHandlers['open-file-location']!(
+      authorizedEvent,
+      missingFilePath
+    );
     expect(dirFailure).toEqual(
       expect.objectContaining({
         ok: false,
@@ -929,7 +1014,7 @@ describe('main process IPC wiring and queue behavior', () => {
       })
     );
 
-    const invalid = await handleHandlers['open-file-location']!({}, 'relative/path');
+    const invalid = await handleHandlers['open-file-location']!(authorizedEvent, 'relative/path');
     expect(invalid).toEqual(
       expect.objectContaining({
         ok: false,
@@ -938,8 +1023,8 @@ describe('main process IPC wiring and queue behavior', () => {
     );
 
     const missingDir = await handleHandlers['open-file-location']!(
-      {},
-      path.join(userDataDir, 'absent', 'file.mp4')
+      authorizedEvent,
+      path.join(os.homedir(), 'rosi-nonexistent-dir', 'file.mp4')
     );
     expect(missingDir).toEqual(
       expect.objectContaining({
@@ -951,7 +1036,7 @@ describe('main process IPC wiring and queue behavior', () => {
     showItemInFolderMock.mockImplementationOnce(() => {
       throw new Error('shell failed');
     });
-    const shellFailure = await handleHandlers['open-file-location']!({}, filePath);
+    const shellFailure = await handleHandlers['open-file-location']!(authorizedEvent, filePath);
     expect(shellFailure).toEqual(
       expect.objectContaining({
         ok: false,
@@ -962,28 +1047,30 @@ describe('main process IPC wiring and queue behavior', () => {
 
   it('handles notification IPC branches and click behavior', async () => {
     const mainWindow = getPrimaryWindow();
-    const result = await handleHandlers['show-notification']!(
-      {},
-      {
-        title: 'Done',
-        body: 'Saved',
-        filePath: 'C:/tmp/video.mp4',
-      }
+    const notificationFile = path.join(
+      os.homedir(),
+      '.rosi-ipc-test',
+      'rosi-notification-test.mp4'
     );
+    const result = await handleHandlers['show-notification']!(authorizedEvent, {
+      title: 'Done',
+      body: 'Saved',
+      filePath: notificationFile,
+    });
     expect(result).toEqual({ ok: true, data: { shown: true } });
     expect(notificationShowMock).toHaveBeenCalled();
 
-    const clickHandler = notificationOnMock.mock.calls.find((call) => call[0] === 'click')?.[1] as
-      | (() => void)
-      | undefined;
+    const clickHandler = notificationOnceMock.mock.calls.find(
+      (call) => call[0] === 'click'
+    )?.[1] as (() => void) | undefined;
     expect(clickHandler).toBeTypeOf('function');
     mainWindow.minimized = true;
     clickHandler?.();
     expect(mainWindow.restore).toHaveBeenCalled();
     expect(mainWindow.focus).toHaveBeenCalled();
-    expect(showItemInFolderMock).toHaveBeenCalledWith('C:/tmp/video.mp4');
+    expect(showItemInFolderMock).toHaveBeenCalledWith(path.resolve(notificationFile));
 
-    expect(await handleHandlers['show-notification']!({}, {})).toEqual({
+    expect(await handleHandlers['show-notification']!(authorizedEvent, {})).toEqual({
       ok: true,
       data: { shown: true },
     });
@@ -991,14 +1078,19 @@ describe('main process IPC wiring and queue behavior', () => {
     showItemInFolderMock.mockImplementationOnce(() => {
       throw new Error('click failed');
     });
-    await handleHandlers['show-notification']!({}, { title: 'Click', filePath: 'C:/tmp/fail.mp4' });
-    const lastClickHandler = notificationOnMock.mock.calls
+    await handleHandlers['show-notification']!(authorizedEvent, {
+      title: 'Click',
+      filePath: path.join(os.homedir(), '.rosi-ipc-test', 'rosi-notification-fail.mp4'),
+    });
+    const lastClickHandler = notificationOnceMock.mock.calls
       .filter((call) => call[0] === 'click')
       .at(-1)?.[1] as (() => void) | undefined;
     expect(() => lastClickHandler?.()).not.toThrow();
 
     notificationIsSupportedMock.mockReturnValueOnce(false);
-    const unsupported = await handleHandlers['show-notification']!({}, { title: 'Nope' });
+    const unsupported = await handleHandlers['show-notification']!(authorizedEvent, {
+      title: 'Nope',
+    });
     expect(unsupported).toEqual(
       expect.objectContaining({
         ok: false,
@@ -1006,7 +1098,7 @@ describe('main process IPC wiring and queue behavior', () => {
       })
     );
 
-    const invalid = await handleHandlers['show-notification']!({}, { title: 123 });
+    const invalid = await handleHandlers['show-notification']!(authorizedEvent, { title: 123 });
     expect(invalid).toEqual(
       expect.objectContaining({
         ok: false,
@@ -1017,7 +1109,9 @@ describe('main process IPC wiring and queue behavior', () => {
     notificationShowMock.mockImplementationOnce(() => {
       throw new Error('notify failed');
     });
-    const showFailure = await handleHandlers['show-notification']!({}, { title: 'Fail' });
+    const showFailure = await handleHandlers['show-notification']!(authorizedEvent, {
+      title: 'Fail',
+    });
     expect(showFailure).toEqual(
       expect.objectContaining({
         ok: false,
@@ -1027,25 +1121,30 @@ describe('main process IPC wiring and queue behavior', () => {
   });
 
   it('handles settings import/export and restart/reset events', async () => {
-    expect(await handleHandlers['export-settings']!()).toEqual({
+    expect(await handleHandlers['export-settings']!(authorizedEvent)).toEqual({
       ok: true,
       data: { exported: true },
     });
-    expect(await handleHandlers['import-settings']!()).toEqual({
+    const importResult = await handleHandlers['import-settings']!(authorizedEvent);
+    expect(importResult).toEqual({
       ok: true,
       data: { imported: true },
     });
+    expect(sendMock).toHaveBeenCalledWith('settings-imported', {
+      convertEnabled: false,
+      convertFormat: 'mp4',
+    });
 
     exportSettingsToFileMock.mockResolvedValueOnce(false);
     importSettingsFromFileMock.mockResolvedValueOnce(false);
 
-    expect(await handleHandlers['export-settings']!()).toEqual(
+    expect(await handleHandlers['export-settings']!(authorizedEvent)).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'INTERNAL_ERROR' }),
       })
     );
-    expect(await handleHandlers['import-settings']!()).toEqual(
+    expect(await handleHandlers['import-settings']!(authorizedEvent)).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'INTERNAL_ERROR' }),
@@ -1055,43 +1154,44 @@ describe('main process IPC wiring and queue behavior', () => {
     exportSettingsToFileMock.mockRejectedValueOnce(new Error('export failed'));
     importSettingsFromFileMock.mockRejectedValueOnce(new Error('import failed'));
 
-    expect(await handleHandlers['export-settings']!()).toEqual(
+    expect(await handleHandlers['export-settings']!(authorizedEvent)).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'INTERNAL_ERROR' }),
       })
     );
-    expect(await handleHandlers['import-settings']!()).toEqual(
+    expect(await handleHandlers['import-settings']!(authorizedEvent)).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'INTERNAL_ERROR' }),
       })
     );
 
-    await handleHandlers['restart-app']!();
+    await handleHandlers['restart-app']!(authorizedEvent);
+    expect(cancelActiveSessionMock).toHaveBeenCalledWith(false);
+    expect(killAllProcessesMock).toHaveBeenCalled();
     expect(appMock.relaunch).toHaveBeenCalled();
     expect(appMock.exit).toHaveBeenCalledWith(0);
 
     appMock.relaunch.mockClear();
     appMock.exit.mockClear();
     const mainWindow = getPrimaryWindow();
-    mainWindow.webContents.id = 20;
     onHandlers['reset-settings']!({ sender: { id: 21 } });
     expect(appMock.relaunch).not.toHaveBeenCalled();
 
     saveSettingsMock.mockReturnValueOnce(false);
-    onHandlers['reset-settings']!({ sender: { id: 20 } });
+    onHandlers['reset-settings']!(authorizedEvent);
     expect(appMock.relaunch).toHaveBeenCalled();
     expect(appMock.exit).toHaveBeenCalled();
 
     saveSettingsMock.mockImplementationOnce(() => {
       throw new Error('reset failed');
     });
-    onHandlers['reset-settings']!({ sender: { id: 20 } });
+    onHandlers['reset-settings']!(authorizedEvent);
     expect(appMock.relaunch).toHaveBeenCalledTimes(2);
 
     resetStatsMock.mockReturnValueOnce(false);
-    expect(await handleHandlers['reset-stats']!()).toEqual(
+    expect(await handleHandlers['reset-stats']!(authorizedEvent)).toEqual(
       expect.objectContaining({
         ok: false,
         error: expect.objectContaining({ code: 'INTERNAL_ERROR' }),
@@ -1165,19 +1265,22 @@ describe('main process IPC wiring and queue behavior', () => {
       },
     });
 
-    expect(await handleHandlers['get-queue']!()).toEqual([]);
+    expect(await handleHandlers['get-queue']!(authorizedEvent)).toEqual([]);
   });
 
   it('recreates queue directory when persisting queue', async () => {
+    vi.useFakeTimers();
     const userDataDir = appMock.getPath('userData');
     fs.rmSync(userDataDir, { recursive: true, force: true });
 
-    await handleHandlers['add-to-queue']!({}, ['https://example.com/recreate-dir']);
+    await handleHandlers['add-to-queue']!(authorizedEvent, ['https://example.com/recreate-dir']);
+    await vi.advanceTimersByTimeAsync(300);
 
     expect(fs.existsSync(path.join(userDataDir, 'download-queue.json'))).toBe(true);
   });
 
   it('cleans up temp queue file when queue persist fails', async () => {
+    vi.useFakeTimers();
     const userDataDir = appMock.getPath('userData');
     const tempQueuePath = path.join(userDataDir, 'download-queue.json.tmp');
     const renameSpy = vi.spyOn(fs, 'renameSync').mockImplementationOnce(() => {
@@ -1185,25 +1288,123 @@ describe('main process IPC wiring and queue behavior', () => {
     });
 
     try {
-      await handleHandlers['add-to-queue']!({}, ['https://example.com/persist-fail']);
+      await handleHandlers['add-to-queue']!(authorizedEvent, ['https://example.com/persist-fail']);
+      await vi.advanceTimersByTimeAsync(300);
       expect(fs.existsSync(tempQueuePath)).toBe(false);
     } finally {
       renameSpy.mockRestore();
     }
   });
 
-  it('marks queued item failed when processing without a live window', async () => {
-    await handleHandlers['add-to-queue']!({}, ['https://example.com/window-closed']);
+  it('rejects start-queue when main window is already destroyed', async () => {
+    await handleHandlers['add-to-queue']!(authorizedEvent, ['https://example.com/window-closed']);
     const mainWindow = getPrimaryWindow();
     (mainWindow.destroy as unknown as () => void)();
 
-    expect(await handleHandlers['start-queue']!()).toEqual({ ok: true, data: { started: true } });
-    await new Promise((resolve) => setTimeout(resolve, 10));
+    expect(await handleHandlers['start-queue']!(authorizedEvent)).toEqual(
+      expect.objectContaining({
+        ok: false,
+        error: expect.objectContaining({ message: 'Unauthorized sender.' }),
+      })
+    );
+  });
 
-    const queue = (await handleHandlers['get-queue']!()) as Array<{
-      status: string;
-      error?: string;
-    }>;
-    expect(queue[0]).toEqual(expect.objectContaining({ status: 'failed', error: 'Window closed' }));
+  it('returns video info for authorized get-video-info requests', async () => {
+    const info = {
+      title: 'Example Video',
+      duration: 120,
+      thumbnail: 'https://example.com/thumb.jpg',
+    };
+    fetchVideoInfoMock.mockResolvedValueOnce(info);
+
+    const result = await handleHandlers['get-video-info']!(
+      authorizedEvent,
+      'https://example.com/video'
+    );
+
+    expect(result).toEqual({ ok: true, data: info });
+    expect(fetchVideoInfoMock).toHaveBeenCalledWith(ytdlpFixturePath, 'https://example.com/video');
+  });
+
+  it('rejects invalid URLs for get-video-info', async () => {
+    const result = await handleHandlers['get-video-info']!(authorizedEvent, 'not-a-url');
+    expect(result).toEqual({
+      ok: false,
+      error: { code: 'INVALID_URL', message: 'Invalid URL provided.' },
+    });
+    expect(fetchVideoInfoMock).not.toHaveBeenCalled();
+  });
+
+  it('returns NOT_AVAILABLE when get-video-info fetch is cancelled', async () => {
+    fetchVideoInfoMock.mockRejectedValueOnce('Video info fetch cancelled.');
+
+    const result = await handleHandlers['get-video-info']!(
+      authorizedEvent,
+      'https://example.com/video'
+    );
+
+    expect(result).toEqual(
+      expect.objectContaining({
+        ok: false,
+        error: expect.objectContaining({ code: 'NOT_AVAILABLE' }),
+      })
+    );
+  });
+
+  it('returns INTERNAL_ERROR when get-video-info fetch fails', async () => {
+    fetchVideoInfoMock.mockRejectedValueOnce(new Error('yt-dlp failed'));
+
+    const result = await handleHandlers['get-video-info']!(
+      authorizedEvent,
+      'https://example.com/video'
+    );
+
+    expect(result).toEqual(
+      expect.objectContaining({
+        ok: false,
+        error: expect.objectContaining({
+          code: 'INTERNAL_ERROR',
+          message: 'yt-dlp failed',
+        }),
+      })
+    );
+  });
+
+  it('rejects unauthorized get-video-info sender', async () => {
+    const result = await handleHandlers['get-video-info']!(
+      { sender: { id: 2 } },
+      'https://example.com/video'
+    );
+    expect(result).toEqual(
+      expect.objectContaining({
+        ok: false,
+        error: expect.objectContaining({ message: 'Unauthorized sender.' }),
+      })
+    );
+    expect(fetchVideoInfoMock).not.toHaveBeenCalled();
+  });
+
+  it('ignores cancel-video-info from unauthorized sender', () => {
+    onHandlers['cancel-video-info']!({ sender: { id: 2 } });
+    expect(cancelVideoInfoMock).not.toHaveBeenCalled();
+
+    onHandlers['cancel-video-info']!(authorizedEvent);
+    expect(cancelVideoInfoMock).toHaveBeenCalled();
+  });
+
+  it('rejects save-settings from unauthorized sender when main window exists', async () => {
+    const result = await handleHandlers['save-settings']!({ sender: { id: 2 } }, { theme: 'dark' });
+    expect(result).toEqual(
+      expect.objectContaining({
+        ok: false,
+        error: expect.objectContaining({ message: 'Unauthorized sender.' }),
+      })
+    );
+    expect(saveSettingsMock).not.toHaveBeenCalled();
+  });
+
+  it('ignores install-update from unauthorized sender', () => {
+    onHandlers['install-update']!({ sender: { id: 2 } });
+    expect(installUpdateMock).not.toHaveBeenCalled();
   });
 });
diff --git a/src/tests/platform.env.test.ts b/src/tests/platform.env.test.ts
index a5e528d..9ec3e3c 100644
--- a/src/tests/platform.env.test.ts
+++ b/src/tests/platform.env.test.ts
@@ -425,7 +425,7 @@ describe('platform env and ffmpeg verification', () => {
     expect(mocks.copyFileSyncMock).toHaveBeenCalled();
   });
 
-  it('shows permission error when yt-dlp temp copy fails', async () => {
+  it('logs permission error when yt-dlp temp copy fails', async () => {
     const { mod, mocks } = await loadPlatform(
       (m) => {
         m.existsSyncMock.mockImplementation((target: string) =>
@@ -449,14 +449,12 @@ describe('platform env and ffmpeg verification', () => {
 
     mod.resolveYtdlpPath();
 
-    expect(mocks.showErrorBoxMock).toHaveBeenCalledWith(
-      'Permission Error',
-      expect.stringContaining('copy failed')
-    );
-    expect(mocks.appQuitMock).toHaveBeenCalled();
+    expect(mocks.logErrorMock).toHaveBeenCalledWith(expect.stringContaining('copy failed'));
+    expect(mocks.showErrorBoxMock).not.toHaveBeenCalled();
+    expect(mocks.appQuitMock).not.toHaveBeenCalled();
   });
 
-  it('shows permission error when yt-dlp chmod fails unexpectedly', async () => {
+  it('logs permission error when yt-dlp chmod fails unexpectedly', async () => {
     const { mod, mocks } = await loadPlatform(
       (m) => {
         m.existsSyncMock.mockImplementation((target: string) =>
@@ -474,11 +472,9 @@ describe('platform env and ffmpeg verification', () => {
 
     mod.resolveYtdlpPath();
 
-    expect(mocks.showErrorBoxMock).toHaveBeenCalledWith(
-      'Permission Error',
-      expect.stringContaining('permission denied')
-    );
-    expect(mocks.appQuitMock).toHaveBeenCalled();
+    expect(mocks.logErrorMock).toHaveBeenCalledWith(expect.stringContaining('permission denied'));
+    expect(mocks.showErrorBoxMock).not.toHaveBeenCalled();
+    expect(mocks.appQuitMock).not.toHaveBeenCalled();
   });
 
   it('selects platform-specific yt-dlp binary names', async () => {
diff --git a/src/tests/platform.resolveYtdlp.test.ts b/src/tests/platform.resolveYtdlp.test.ts
index 40b9026..dfe168c 100644
--- a/src/tests/platform.resolveYtdlp.test.ts
+++ b/src/tests/platform.resolveYtdlp.test.ts
@@ -89,18 +89,18 @@ describe('platform resolveYtdlpPath', () => {
     expect(mocks.logInfoMock).toHaveBeenCalled();
   });
 
-  it('shows missing dependency error and quits when yt-dlp is absent', async () => {
+  it('logs missing dependency when yt-dlp is absent without quitting', async () => {
     const { mod, mocks } = await loadPlatformModule(true, (m) => {
       m.existsSyncMock.mockReturnValue(false);
     });
 
     const resolved = mod.resolveYtdlpPath();
     expect(resolved).toContain(mod.ytdlpBinary);
-    expect(mocks.showErrorBoxMock).toHaveBeenCalledWith(
-      'Missing Dependency',
+    expect(mocks.logErrorMock).toHaveBeenCalledWith(
       expect.stringContaining('yt-dlp binary not found')
     );
-    expect(mocks.appQuitMock).toHaveBeenCalled();
+    expect(mocks.showErrorBoxMock).not.toHaveBeenCalled();
+    expect(mocks.appQuitMock).not.toHaveBeenCalled();
   });
 
   it('shows permission error and quits for non-recoverable chmod failures', async () => {
@@ -118,10 +118,10 @@ describe('platform resolveYtdlpPath', () => {
     });
 
     mod.resolveYtdlpPath();
-    expect(mocks.showErrorBoxMock).toHaveBeenCalledWith(
-      'Permission Error',
+    expect(mocks.logErrorMock).toHaveBeenCalledWith(
       expect.stringContaining('Failed to set executable permissions')
     );
-    expect(mocks.appQuitMock).toHaveBeenCalled();
+    expect(mocks.showErrorBoxMock).not.toHaveBeenCalled();
+    expect(mocks.appQuitMock).not.toHaveBeenCalled();
   });
 });
diff --git a/src/tests/preload.test.ts b/src/tests/preload.test.ts
index 6658d88..861f182 100644
--- a/src/tests/preload.test.ts
+++ b/src/tests/preload.test.ts
@@ -105,10 +105,10 @@ describe('preload api contract', () => {
         'logError',
         'notifySettingsFlushed',
         'onComplete',
-        'onDownloadProgress',
         'onPrepareForClose',
         'onProgress',
         'onQueueUpdate',
+        'onSettingsImported',
         'onUpdaterProgress',
         'onUpdaterStatus',
         'openExternal',
@@ -202,7 +202,7 @@ describe('preload api contract', () => {
 
     validateSubscription('onUpdaterStatus', 'updater-status', { status: 'checking' });
     validateSubscription('onUpdaterProgress', 'updater-progress', { percent: 50 });
-    validateSubscription('onDownloadProgress', 'download-progress', { percent: 10 });
+    validateSubscription('onSettingsImported', 'settings-imported', { imported: true });
     validateSubscription('onProgress', 'progress', 'line');
     validateSubscription('onComplete', 'complete', 'done');
     validateSubscription('onQueueUpdate', 'queue-update', [{ id: 'q_1' }]);
diff --git a/src/tests/queue.test.ts b/src/tests/queue.test.ts
index ab2993b..5a621a6 100644
--- a/src/tests/queue.test.ts
+++ b/src/tests/queue.test.ts
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const {
   handleHandlers,
@@ -10,7 +10,11 @@ const {
   startDownloadMock,
   cancelActiveSessionMock,
   loadSettingsMock,
+  ytdlpFixturePath,
 } = vi.hoisted(() => {
+  const nodeOs = require('os') as typeof import('os');
+  const nodePath = require('path') as typeof import('path');
+  const { randomBytes } = require('crypto') as typeof import('crypto');
   const handleMap: Record<string, (...args: unknown[]) => unknown> = {};
   const send = vi.fn();
   const windows: Array<{
@@ -81,8 +85,12 @@ const {
     }
   }
 
-  const userDataDir = `${process.cwd()}/.tmp-queue-test`;
-  const downloadsDir = `${userDataDir}/downloads`;
+  const userDataDir = nodePath.join(
+    nodeOs.tmpdir(),
+    `rosi-queue-test-${randomBytes(8).toString('hex')}`
+  );
+  const downloadsDir = nodePath.join(userDataDir, 'downloads');
+  const ytdlpFixturePath = nodePath.join(userDataDir, 'yt-dlp.exe');
 
   const app = {
     whenReady: vi.fn(() => Promise.resolve()),
@@ -95,6 +103,7 @@ const {
       return userDataDir;
     }),
     getVersion: vi.fn(() => '4.0.0'),
+    getAppPath: vi.fn(() => process.cwd()),
   };
 
   return {
@@ -122,6 +131,7 @@ const {
       keepOriginalAfterConvert: true,
       ffmpegPath: '',
     })),
+    ytdlpFixturePath,
   };
 });
 
@@ -155,7 +165,7 @@ vi.mock('electron', () => ({
 
 vi.mock('../main/platform', () => ({
   isPackaged: true,
-  resolveYtdlpPath: vi.fn(() => 'C:/tools/yt-dlp.exe'),
+  resolveYtdlpPath: vi.fn(() => ytdlpFixturePath),
   verifyBundledFfmpeg: vi.fn(),
 }));
 
@@ -192,6 +202,7 @@ vi.mock('../main/downloader', () => ({
   killAllProcesses: vi.fn(),
   fetchFormats: vi.fn(async () => 'ok'),
   cancelFormats: vi.fn(),
+  canStartDownload: vi.fn(() => true),
 }));
 
 vi.mock('../main/constants', () => ({
@@ -222,16 +233,24 @@ async function initializeMainModule() {
   sendMock.mockClear();
   startDownloadMock.mockClear();
   cancelActiveSessionMock.mockClear();
+  fs.mkdirSync(path.dirname(ytdlpFixturePath), { recursive: true });
+  fs.writeFileSync(ytdlpFixturePath, '');
   vi.resetModules();
   await import('../main/main');
   await new Promise((resolve) => setTimeout(resolve, 10));
 }
 
+const queueEvent = { sender: { id: 1 } };
+
 describe('queue edge cases and error handling', () => {
   beforeEach(async () => {
     await initializeMainModule();
   });
 
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
   it('rejects adding non-array urls', async () => {
     const addToQueue = handleHandlers['add-to-queue']!;
     const result = await addToQueue({ sender: { id: 1 } }, 'not-an-array');
@@ -266,7 +285,7 @@ describe('queue edge cases and error handling', () => {
 
   it('rejects start-queue when no pending items', async () => {
     const startQueue = handleHandlers['start-queue']!;
-    const result = await startQueue();
+    const result = await startQueue(queueEvent);
     expect(result).toEqual(
       expect.objectContaining({
         ok: false,
@@ -282,10 +301,10 @@ describe('queue edge cases and error handling', () => {
     startDownloadMock.mockImplementationOnce(() => {});
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/a']);
-    await startQueue();
+    await startQueue(queueEvent);
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/b']);
-    const result = await startQueue();
+    const result = await startQueue(queueEvent);
     expect(result).toEqual(
       expect.objectContaining({
         ok: false,
@@ -324,12 +343,12 @@ describe('queue edge cases and error handling', () => {
     startDownloadMock.mockImplementationOnce(() => {});
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/a']);
-    await startQueue();
+    await startQueue(queueEvent);
 
-    const result = await clearQueue();
+    const result = await clearQueue(queueEvent);
     expect(result).toEqual({ ok: true, data: undefined });
 
-    const queue = await handleHandlers['get-queue']!();
+    const queue = await handleHandlers['get-queue']!(queueEvent);
     expect(queue).toEqual([]);
   });
 
@@ -344,10 +363,10 @@ describe('queue edge cases and error handling', () => {
       'https://example.com/3',
     ]);
 
-    await startQueue();
+    await startQueue(queueEvent);
     await new Promise((resolve) => setTimeout(resolve, 50));
 
-    const queue = (await getQueue()) as Array<{ status: string }>;
+    const queue = (await getQueue(queueEvent)) as Array<{ status: string }>;
     const completed = queue.filter((item) => item.status === 'completed');
     expect(completed.length).toBe(3);
     expect(startDownloadMock).toHaveBeenCalledTimes(3);
@@ -364,10 +383,10 @@ describe('queue edge cases and error handling', () => {
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/will-fail']);
 
-    await startQueue();
+    await startQueue(queueEvent);
     await new Promise((resolve) => setTimeout(resolve, 50));
 
-    const queue = (await getQueue()) as Array<{ status: string; error?: string }>;
+    const queue = (await getQueue(queueEvent)) as Array<{ status: string; error?: string }>;
     expect(queue[0]!.status).toBe('failed');
     expect(queue[0]!.error).toContain('spawn error');
   });
@@ -390,10 +409,10 @@ describe('queue edge cases and error handling', () => {
     );
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/fail']);
-    await startQueue();
+    await startQueue(queueEvent);
     await new Promise((resolve) => setTimeout(resolve, 50));
 
-    const queue = (await getQueue()) as Array<{ status: string; error?: string }>;
+    const queue = (await getQueue(queueEvent)) as Array<{ status: string; error?: string }>;
     expect(queue[0]!.status).toBe('failed');
     expect(queue[0]!.error).toContain('failed');
   });
@@ -416,10 +435,10 @@ describe('queue edge cases and error handling', () => {
     );
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/cancel']);
-    await startQueue();
+    await startQueue(queueEvent);
     await new Promise((resolve) => setTimeout(resolve, 50));
 
-    const queue = (await getQueue()) as Array<{ status: string }>;
+    const queue = (await getQueue(queueEvent)) as Array<{ status: string }>;
     expect(queue[0]!.status).toBe('cancelled');
   });
 
@@ -432,12 +451,12 @@ describe('queue edge cases and error handling', () => {
     startDownloadMock.mockImplementation(() => {});
 
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/a', 'https://example.com/b']);
-    await startQueue();
+    await startQueue(queueEvent);
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    await cancelQueue();
+    await cancelQueue(queueEvent);
 
-    const queue = (await getQueue()) as Array<{ status: string }>;
+    const queue = (await getQueue(queueEvent)) as Array<{ status: string }>;
     const allCancelledOrDownloading = queue.every(
       (item) => item.status === 'cancelled' || item.status === 'downloading'
     );
@@ -446,10 +465,13 @@ describe('queue edge cases and error handling', () => {
   });
 
   it('persists queue to disk and restores on re-init', async () => {
+    vi.useFakeTimers();
     const addToQueue = handleHandlers['add-to-queue']!;
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/persisted']);
+    await vi.advanceTimersByTimeAsync(300);
+    vi.useRealTimers();
 
-    const queue1 = (await handleHandlers['get-queue']!()) as Array<{ url: string }>;
+    const queue1 = (await handleHandlers['get-queue']!(queueEvent)) as Array<{ url: string }>;
     expect(queue1).toHaveLength(1);
     expect(queue1[0]!.url).toBe('https://example.com/persisted');
 
@@ -458,29 +480,38 @@ describe('queue edge cases and error handling', () => {
 
     clearHandlerMaps();
     sendMock.mockClear();
+    fs.mkdirSync(path.dirname(ytdlpFixturePath), { recursive: true });
+    fs.writeFileSync(ytdlpFixturePath, '');
     vi.resetModules();
     await import('../main/main');
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    const queue2 = (await handleHandlers['get-queue']!()) as Array<{ url: string }>;
+    const queue2 = (await handleHandlers['get-queue']!(queueEvent)) as Array<{ url: string }>;
     expect(queue2).toHaveLength(1);
     expect(queue2[0]!.url).toBe('https://example.com/persisted');
   });
 
   it('restores queue from backup when primary is corrupted', async () => {
+    vi.useFakeTimers();
+    await handleHandlers['clear-queue']!({ sender: { id: 1 } });
+    await vi.advanceTimersByTimeAsync(300);
     const addToQueue = handleHandlers['add-to-queue']!;
     await addToQueue({ sender: { id: 1 } }, ['https://example.com/backup-test']);
+    await vi.advanceTimersByTimeAsync(300);
+    vi.useRealTimers();
 
     const queuePath = path.join(appMock.getPath('userData'), 'download-queue.json');
     fs.writeFileSync(queuePath, '{invalid json}');
 
     clearHandlerMaps();
     sendMock.mockClear();
+    fs.mkdirSync(path.dirname(ytdlpFixturePath), { recursive: true });
+    fs.writeFileSync(ytdlpFixturePath, '');
     vi.resetModules();
     await import('../main/main');
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    const queue = (await handleHandlers['get-queue']!()) as Array<{ url: string }>;
+    const queue = (await handleHandlers['get-queue']!(queueEvent)) as Array<{ url: string }>;
     expect(queue).toHaveLength(1);
     expect(queue[0]!.url).toBe('https://example.com/backup-test');
   });
@@ -499,7 +530,7 @@ describe('queue edge cases and error handling', () => {
     await import('../main/main');
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    const queue = await handleHandlers['get-queue']!();
+    const queue = await handleHandlers['get-queue']!(queueEvent);
     expect(queue).toEqual([]);
   });
 
@@ -518,7 +549,7 @@ describe('queue edge cases and error handling', () => {
     await import('../main/main');
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    const queue = (await handleHandlers['get-queue']!()) as Array<{ status: string }>;
+    const queue = (await handleHandlers['get-queue']!(queueEvent)) as Array<{ status: string }>;
     expect(queue[0]!.status).toBe('pending');
   });
 });
diff --git a/src/tests/renderer.contract.test.ts b/src/tests/renderer.contract.test.ts
index 778b450..f3316fa 100644
--- a/src/tests/renderer.contract.test.ts
+++ b/src/tests/renderer.contract.test.ts
@@ -42,11 +42,15 @@ describe('renderer wiring and accessibility contracts', () => {
 
   it('keeps queue controls and status messaging accessible', () => {
     const indexHtml = readRendererFile('index.html');
+    const queueModule = readRendererFile('modules/queue.ts');
 
     expect(indexHtml).toMatch(/id="queueSection"/);
     expect(indexHtml).toMatch(/id="queueStatusMessage"[\s\S]*role="status"/);
     expect(indexHtml).toMatch(/id="queueStatusMessage"[\s\S]*aria-live="polite"/);
     expect(indexHtml).toMatch(/id="queueStatusMessage"[\s\S]*aria-atomic="true"/);
+    expect(indexHtml).toMatch(/id="queueList"[^>]*role="list"/);
+    expect(indexHtml).not.toMatch(/id="queueList"[^>]*aria-live/);
+    expect(queueModule).toMatch(/setAttribute\('role', 'listitem'\)/);
 
     expect(indexHtml).toMatch(/id="addToQueueBtn"/);
     expect(indexHtml).toMatch(/title="Add to queue"/);
@@ -73,8 +77,14 @@ describe('renderer wiring and accessibility contracts', () => {
     expect(indexHtml).toMatch(
       /id="settingsSectionHeaderApplication"[\s\S]*aria-controls="settingsSectionBodyApplication"/
     );
-    expect(indexHtml).toMatch(/id="historyHeader"[\s\S]*aria-controls="history-list"/);
-    expect(indexHtml).toMatch(/id="consoleHeader"[\s\S]*aria-controls="output"/);
+    expect(indexHtml).toMatch(/id="historyToggle"[\s\S]*aria-controls="history-list"/);
+    expect(indexHtml).toMatch(/id="consoleToggleBtn"[\s\S]*aria-controls="output"/);
+    expect(indexHtml).toMatch(/id="progress-bar-wrapper"[\s\S]*role="progressbar"/);
+    expect(indexHtml).toMatch(/id="settingsBtn"[\s\S]*aria-expanded="false"/);
+    expect(indexHtml).toMatch(/<title>ROSI<\/title>/);
+    expect(indexHtml).toMatch(/aria-label="Learn more about SponsorBlock"/);
+    expect(readRendererFile('rosiEngine.ts')).toMatch(/onSettingsImported/);
+    expect(readRendererFile('modules/settings.ts')).toMatch(/stopPropagation/);
   });
 
   it('supports arrow-key ergonomics for collapsible header controls', () => {
@@ -87,4 +97,34 @@ describe('renderer wiring and accessibility contracts', () => {
     expect(engine).toContain("e.key === 'Home'");
     expect(engine).toContain("e.key === 'End'");
   });
+
+  it('keeps overlay, wizard, and progress accessibility contracts', () => {
+    const indexHtml = readRendererFile('index.html');
+    const engine = readRendererFile('rosiEngine.ts');
+    const uiModule = readRendererFile('modules/ui.ts');
+
+    expect(indexHtml).toMatch(/id="licenses-overlay"[\s\S]*aria-hidden="true"/);
+    expect(indexHtml).toMatch(/id="licenses-frame"[\s\S]*title="ROSI licenses"/);
+    expect(engine).toMatch(/licensesOverlayEl\.addEventListener\('click'/);
+    expect(engine).not.toMatch(/licensesOverlay\.addEventListener\('click'/);
+
+    expect(indexHtml).toMatch(/class="wizard-progress"[\s\S]*role="progressbar"/);
+    expect(indexHtml).toMatch(/id="wizard-step-announce"[\s\S]*aria-live="polite"/);
+    expect(engine).toMatch(/backBtnEl\.setAttribute\('hidden'/);
+
+    expect(indexHtml).toMatch(
+      /id="subtitleLangsInput"[\s\S]*aria-describedby="subtitleLangsHint subtitleLangsError"/
+    );
+    expect(indexHtml).toMatch(/id="progress-details"[\s\S]*aria-live="polite"/);
+    expect(indexHtml).toMatch(/id="versionLink"[\s\S]*opens externally/);
+    expect(engine).toMatch(/barWrapper\.setAttribute\('aria-valuenow', '0'\)/);
+    expect(engine).toMatch(/aria-current', 'step'/);
+    expect(engine).toMatch(/busy: true/);
+    expect(engine).toMatch(
+      /primary: true,\s*\n\s*action: \(\) => \{\s*\n\s*void window\.api\.openExternal\('https:\/\/rosie\.run\/support'\)/
+    );
+
+    expect(readRendererFile('licenses-iframe.html')).toMatch(/<html lang="en">/);
+    expect(uiModule).toMatch(/setAttribute\('aria-label', 'Cancel download'\)/);
+  });
 });
diff --git a/src/tests/rendererModules.test.ts b/src/tests/rendererModules.test.ts
new file mode 100644
index 0000000..d40e722
--- /dev/null
+++ b/src/tests/rendererModules.test.ts
@@ -0,0 +1,215 @@
+// @vitest-environment jsdom
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as ts from 'typescript';
+
+const REPO = path.resolve(__dirname, '..', '..');
+const RENDERER = path.join(REPO, 'src', 'renderer');
+
+function transpile(tsSource: string): string {
+  return ts.transpileModule(tsSource, {
+    compilerOptions: {
+      target: ts.ScriptTarget.ES2020,
+      module: ts.ModuleKind.None,
+    },
+  }).outputText;
+}
+
+function loadModule(name: string) {
+  (window as unknown as { rosiModules?: Record<string, unknown> }).rosiModules = {};
+  const source = transpile(fs.readFileSync(path.join(RENDERER, 'modules', `${name}.ts`), 'utf-8'));
+  (0, eval)(source);
+}
+
+type RosiModules = {
+  downloads?: {
+    formatBytes: (bytes: number) => string;
+    parseYtdlpProgress: (message: string) => {
+      percent: number;
+      totalSize: string;
+      speed: string | null;
+      eta: string | null;
+    } | null;
+  };
+  ui?: {
+    isValidUrl: (value: string) => boolean;
+  };
+  updates?: {
+    isPrereleaseVersion: (version: string) => boolean;
+    formatUpdateProgressInfo: (
+      data: {
+        bytesPerSecond: number;
+        percent: number;
+        total: number;
+        transferred: number;
+      },
+      formatBytes: (bytes: number) => string
+    ) => string;
+  };
+  queue?: {
+    renderQueue: (
+      queue: Array<{ id: string; status: string; url: string }>,
+      elements: {
+        queueList: HTMLElement | null;
+        queueSection: HTMLElement | null;
+        queueCount: HTMLElement | null;
+      },
+      deps: {
+        escapeHtml: (value: string) => string;
+        removeFromQueue: (id: string) => unknown;
+      }
+    ) => void;
+  };
+  settings?: {
+    bindExternalLink: (
+      element: HTMLElement | null,
+      url: string,
+      openExternal: (url: string) => unknown
+    ) => void;
+  };
+};
+
+function modules(): RosiModules {
+  return (window as unknown as { rosiModules?: RosiModules }).rosiModules ?? {};
+}
+
+describe('renderer modules', () => {
+  beforeEach(() => {
+    (window as unknown as { rosiModules?: Record<string, unknown> }).rosiModules = {};
+  });
+
+  describe('downloads module', () => {
+    beforeEach(() => loadModule('downloads'));
+
+    it('parseYtdlpProgress parses full progress line', () => {
+      const result = modules().downloads!.parseYtdlpProgress(
+        '[download]  45.2% of ~10.5MiB at  1.2MiB/s ETA 00:08'
+      );
+      expect(result).toEqual({
+        percent: 45.2,
+        totalSize: '10.5MiB',
+        speed: '1.2MiB/s',
+        eta: '00:08',
+      });
+    });
+
+    it('parseYtdlpProgress parses simple progress line', () => {
+      const result = modules().downloads!.parseYtdlpProgress('[download]  10.0% of ~5.00MiB');
+      expect(result).toEqual({
+        percent: 10,
+        totalSize: '5.00MiB',
+        speed: null,
+        eta: null,
+      });
+    });
+
+    it('parseYtdlpProgress returns null for non-progress lines', () => {
+      expect(modules().downloads!.parseYtdlpProgress('random output')).toBeNull();
+    });
+
+    it('formatBytes formats byte sizes', () => {
+      expect(modules().downloads!.formatBytes(0)).toBe('0 B');
+      expect(modules().downloads!.formatBytes(1024)).toBe('1 KB');
+      expect(modules().downloads!.formatBytes(1536)).toBe('1.5 KB');
+      expect(modules().downloads!.formatBytes(1048576)).toBe('1 MB');
+    });
+  });
+
+  describe('ui module', () => {
+    beforeEach(() => loadModule('ui'));
+
+    it('isValidUrl accepts http and https URLs', () => {
+      expect(modules().ui!.isValidUrl('https://example.com/video')).toBe(true);
+      expect(modules().ui!.isValidUrl('http://example.com')).toBe(true);
+    });
+
+    it('isValidUrl rejects invalid and non-http URLs', () => {
+      expect(modules().ui!.isValidUrl('not a url')).toBe(false);
+      expect(modules().ui!.isValidUrl('ftp://example.com')).toBe(false);
+      expect(modules().ui!.isValidUrl('javascript:alert(1)')).toBe(false);
+    });
+  });
+
+  describe('queue module', () => {
+    beforeEach(() => {
+      document.body.innerHTML =
+        '<section id="queue-section"><div id="queue-list"></div><span id="queue-count"></span></section>';
+      loadModule('queue');
+    });
+
+    it('escapes malicious URL content in renderQueue output', () => {
+      const escapeHtml = (value: string) =>
+        value
+          .replace(/&/g, '&amp;')
+          .replace(/</g, '&lt;')
+          .replace(/>/g, '&gt;')
+          .replace(/"/g, '&quot;');
+      const maliciousUrl = 'https://example.com/"><img src=x onerror=alert(1)>';
+      modules().queue!.renderQueue(
+        [{ id: 'q_xss', status: 'pending', url: maliciousUrl }],
+        {
+          queueList: document.getElementById('queue-list'),
+          queueSection: document.getElementById('queue-section'),
+          queueCount: document.getElementById('queue-count'),
+        },
+        { escapeHtml, removeFromQueue: vi.fn() }
+      );
+
+      const queueList = document.getElementById('queue-list')!;
+      expect(queueList.querySelector('img')).toBeNull();
+      expect(queueList.querySelector('.queue-item-url')!.textContent).toContain('example.com');
+      expect(queueList.innerHTML).toContain('&quot;');
+    });
+  });
+
+  describe('settings module', () => {
+    beforeEach(() => loadModule('settings'));
+
+    it('bindExternalLink stops propagation and opens external URL', () => {
+      const link = document.createElement('a');
+      link.href = '#';
+      document.body.appendChild(link);
+      const openExternal = vi.fn();
+      const parentClick = vi.fn();
+      document.body.addEventListener('click', parentClick);
+
+      modules().settings!.bindExternalLink(link, 'https://example.com/help', openExternal);
+
+      const event = new MouseEvent('click', { bubbles: true, cancelable: true });
+      const stopPropagation = vi.spyOn(event, 'stopPropagation');
+      const preventDefault = vi.spyOn(event, 'preventDefault');
+      link.dispatchEvent(event);
+
+      expect(stopPropagation).toHaveBeenCalled();
+      expect(preventDefault).toHaveBeenCalled();
+      expect(parentClick).not.toHaveBeenCalled();
+      expect(openExternal).toHaveBeenCalledWith('https://example.com/help');
+    });
+  });
+
+  describe('updates module', () => {
+    beforeEach(() => loadModule('updates'));
+
+    it('isPrereleaseVersion detects prerelease suffixes', () => {
+      expect(modules().updates!.isPrereleaseVersion('4.0.0-beta.1')).toBe(true);
+      expect(modules().updates!.isPrereleaseVersion('4.0.0-alpha.2')).toBe(true);
+      expect(modules().updates!.isPrereleaseVersion('4.0.0-rc.1')).toBe(true);
+      expect(modules().updates!.isPrereleaseVersion('4.0.0')).toBe(false);
+    });
+
+    it('formatUpdateProgressInfo formats progress with byte helper', () => {
+      const formatBytes = (bytes: number) => `${bytes}B`;
+      const result = modules().updates!.formatUpdateProgressInfo(
+        {
+          bytesPerSecond: 1024,
+          percent: 42.6,
+          total: 4096,
+          transferred: 2048,
+        },
+        formatBytes
+      );
+      expect(result).toBe('2048B / 4096B (1024B/s) — 43%');
+    });
+  });
+});
diff --git a/src/tests/rosiEngine.dom.test.ts b/src/tests/rosiEngine.dom.test.ts
index c4badbe..86e1477 100644
--- a/src/tests/rosiEngine.dom.test.ts
+++ b/src/tests/rosiEngine.dom.test.ts
@@ -118,7 +118,7 @@ function buildMockApi(overrides: Partial<MockApi> = {}): MockApi {
     onPrepareForClose: noop,
     onUpdaterStatus: noop,
     onUpdaterProgress: noop,
-    onDownloadProgress: noop,
+    onSettingsImported: noop,
     ...overrides,
   };
   return api;
diff --git a/src/tests/settings.extended.test.ts b/src/tests/settings.extended.test.ts
index 21888ee..971dbcb 100644
--- a/src/tests/settings.extended.test.ts
+++ b/src/tests/settings.extended.test.ts
@@ -362,7 +362,9 @@ describe('settings extended coverage', () => {
       writeFileSyncMock.mockImplementation(() => {});
       const result = await exportSettingsToFile({ isDestroyed: () => false } as any);
       expect(result).toBe(true);
-      expect(writeFileSyncMock).toHaveBeenCalledWith('/tmp/export.json', expect.any(String));
+      expect(writeFileSyncMock).toHaveBeenCalledWith('/tmp/export.json', expect.any(String), {
+        mode: 0o600,
+      });
     });
 
     it('returns false on write error', async () => {
@@ -417,7 +419,12 @@ describe('settings extended coverage', () => {
       statSyncMock.mockReturnValue({ size: 500 });
       readFileSyncMock.mockReturnValue(JSON.stringify({ theme: 'dark', audioOnly: true }));
       const result = await importSettingsFromFile({ isDestroyed: () => false } as any);
-      expect(result).toBe(true);
+      expect(result).toEqual(
+        expect.objectContaining({
+          theme: 'dark',
+          audioOnly: true,
+        })
+      );
       expect(writeFileSyncMock).toHaveBeenCalled();
       expect(renameSyncMock).toHaveBeenCalled();
     });
diff --git a/src/tests/updaterVersioning.test.ts b/src/tests/updaterVersioning.test.ts
index fab9718..3f8f0e4 100644
--- a/src/tests/updaterVersioning.test.ts
+++ b/src/tests/updaterVersioning.test.ts
@@ -38,6 +38,7 @@ vi.mock('electron-log/main.js', () => ({
   },
 }));
 
+import { app } from 'electron';
 import {
   applyChannel,
   comparePrerelease,
@@ -78,7 +79,12 @@ describe('updater versioning helpers', () => {
   it('resolves update channel behavior', () => {
     expect(resolveUseBeta('beta')).toBe(true);
     expect(resolveUseBeta('stable')).toBe(false);
-    expect(resolveUseBeta('auto')).toBe(false);
+
+    mockAppGetVersion.mockReturnValue('3.4.3');
+    expect(resolveUseBeta('auto', app.getVersion())).toBe(isBetaVersion(app.getVersion()));
+
+    mockAppGetVersion.mockReturnValue('3.4.3-beta.1');
+    expect(resolveUseBeta('auto', app.getVersion())).toBe(isBetaVersion(app.getVersion()));
   });
 
   it('applies updater channel settings', () => {
diff --git a/src/tests/validation.test.ts b/src/tests/validation.test.ts
index f55901d..07dc6ed 100644
--- a/src/tests/validation.test.ts
+++ b/src/tests/validation.test.ts
@@ -18,6 +18,35 @@ describe('validation helpers', () => {
       expect(validation.isSafeHttpUrl('')).toBe(false);
       expect(validation.isSafeHttpUrl(null)).toBe(false);
     });
+
+    it('rejects private and local hosts', () => {
+      expect(validation.isSafeHttpUrl('http://localhost/video')).toBe(false);
+      expect(validation.isSafeHttpUrl('http://127.0.0.1/video')).toBe(false);
+      expect(validation.isSafeHttpUrl('http://192.168.1.1/video')).toBe(false);
+      expect(validation.isSafeHttpUrl('http://169.254.169.254/latest/meta-data')).toBe(false);
+    });
+
+    it('rejects decimal IPv4 host literals', () => {
+      expect(validation.isSafeHttpUrl('http://2130706433/video')).toBe(false);
+    });
+
+    it('rejects DNS rebinding hostnames', () => {
+      expect(validation.isSafeHttpUrl('http://127.0.0.1.nip.io/video')).toBe(false);
+      expect(validation.isSafeHttpUrl('http://app.localtest.me/video')).toBe(false);
+      expect(validation.isPrivateOrLocalHost('evil.nip.io')).toBe(true);
+      expect(validation.isPrivateOrLocalHost('tenant.sslip.io')).toBe(true);
+    });
+  });
+
+  describe('isPrivateOrLocalHost', () => {
+    it('detects local and private hosts', () => {
+      expect(validation.isPrivateOrLocalHost('localhost')).toBe(true);
+      expect(validation.isPrivateOrLocalHost('127.0.0.1')).toBe(true);
+      expect(validation.isPrivateOrLocalHost('10.0.0.1')).toBe(true);
+      expect(validation.isPrivateOrLocalHost('192.168.0.1')).toBe(true);
+      expect(validation.isPrivateOrLocalHost('169.254.169.254')).toBe(true);
+      expect(validation.isPrivateOrLocalHost('example.com')).toBe(false);
+    });
   });
 
   describe('isSafeExternalUrl', () => {
@@ -32,10 +61,14 @@ describe('validation helpers', () => {
       );
     });
 
+    it('accepts mailto links', () => {
+      expect(validation.isSafeExternalUrl('mailto:support@example.com')).toBe(true);
+      expect(validation.isSafeExternalUrl('  mailto:help@rosie.run  ')).toBe(true);
+    });
+
     it('rejects other schemes and invalid input', () => {
       expect(validation.isSafeExternalUrl('file:///tmp/test')).toBe(false);
       expect(validation.isSafeExternalUrl('javascript:alert(1)')).toBe(false);
-      expect(validation.isSafeExternalUrl('mailto:support@example.com')).toBe(false);
       expect(validation.isSafeExternalUrl('not a url')).toBe(false);
       expect(validation.isSafeExternalUrl('')).toBe(false);
       expect(validation.isSafeExternalUrl(undefined)).toBe(false);
@@ -50,5 +83,15 @@ describe('validation helpers', () => {
       expect(validation.isAllowedNavigationUrl('javascript:alert(1)')).toBe(false);
       expect(validation.isAllowedNavigationUrl('')).toBe(false);
     });
+
+    it('restricts file URLs to an allowed base when provided', () => {
+      const base = '/Users/test/app';
+      expect(validation.isAllowedNavigationUrl('file:///Users/test/app/index.html', base)).toBe(
+        true
+      );
+      expect(validation.isAllowedNavigationUrl('file:///Users/test/other/index.html', base)).toBe(
+        false
+      );
+    });
   });
 });
diff --git a/src/tests/videoInfo.fetch.test.ts b/src/tests/videoInfo.fetch.test.ts
new file mode 100644
index 0000000..f88d6f9
--- /dev/null
+++ b/src/tests/videoInfo.fetch.test.ts
@@ -0,0 +1,217 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { EventEmitter } from 'events';
+
+const { existsSyncMock, spawnWithEnvMock, logWarnMock, logErrorMock } = vi.hoisted(() => {
+  return {
+    existsSyncMock: vi.fn(),
+    spawnWithEnvMock: vi.fn(),
+    logWarnMock: vi.fn(),
+    logErrorMock: vi.fn(),
+  };
+});
+
+vi.mock('fs', () => ({
+  existsSync: existsSyncMock,
+}));
+
+vi.mock('../main/platform', () => ({
+  spawnWithEnv: spawnWithEnvMock,
+  isWindows: false,
+}));
+
+vi.mock('electron-log/main.js', () => ({
+  default: {
+    warn: logWarnMock,
+    error: logErrorMock,
+  },
+}));
+
+import { cancelVideoInfo, fetchVideoInfo } from '../main/download/videoInfo';
+
+function createProc() {
+  const proc = new EventEmitter() as EventEmitter & {
+    stdout: EventEmitter;
+    stderr: EventEmitter;
+    kill: () => void;
+    killed: boolean;
+  };
+  proc.stdout = new EventEmitter();
+  proc.stderr = new EventEmitter();
+  proc.killed = false;
+  proc.kill = vi.fn(() => {
+    proc.killed = true;
+    setImmediate(() => proc.emit('close', 1));
+  });
+  return proc;
+}
+
+const validJson =
+  '{"title":"Test Video","uploader":"Channel","duration":120,"ext":"mp4","view_count":1000}';
+
+describe('fetchVideoInfo', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    existsSyncMock.mockReturnValue(true);
+  });
+
+  afterEach(() => {
+    cancelVideoInfo();
+    vi.useRealTimers();
+  });
+
+  it('rejects invalid URL values', async () => {
+    await expect(fetchVideoInfo('/tmp/ytdlp', 'not-a-url')).rejects.toContain('Invalid URL');
+  });
+
+  it('rejects when yt-dlp binary is missing', async () => {
+    existsSyncMock.mockReturnValue(false);
+    await expect(fetchVideoInfo('/missing/ytdlp', 'https://example.com')).rejects.toContain(
+      'binary not found'
+    );
+  });
+
+  it('resolves parsed video info when process exits successfully', async () => {
+    const proc = createProc();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    proc.stdout.emit('data', validJson);
+    proc.emit('close', 0);
+
+    await expect(pending).resolves.toMatchObject({
+      title: 'Test Video',
+      uploader: 'Channel',
+      durationSeconds: 120,
+      ext: 'mp4',
+      viewCount: 1000,
+    });
+  });
+
+  it('rejects with process details when process exits non-zero', async () => {
+    const proc = createProc();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    proc.stderr.emit('data', 'stderr output');
+    proc.emit('close', 2);
+
+    await expect(pending).rejects.toContain('yt-dlp exited with code 2');
+  });
+
+  it('rejects when output cannot be parsed', async () => {
+    const proc = createProc();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    proc.stdout.emit('data', 'not json');
+    proc.emit('close', 0);
+
+    await expect(pending).rejects.toContain('Could not parse video information');
+  });
+
+  it('rejects when process fails to start', async () => {
+    const proc = createProc();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    proc.emit('error', new Error('spawn failed'));
+
+    await expect(pending).rejects.toContain('Failed to start yt-dlp: spawn failed');
+  });
+
+  it('cancels previous info process before starting another', async () => {
+    const firstProc = createProc();
+    const secondProc = createProc();
+    spawnWithEnvMock.mockReturnValueOnce(firstProc).mockReturnValueOnce(secondProc);
+
+    const firstPending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com/one');
+    const secondPending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com/two');
+
+    expect(firstProc.kill).toHaveBeenCalled();
+    firstProc.emit('close', 1);
+    secondProc.stdout.emit('data', validJson);
+    secondProc.emit('close', 0);
+
+    await expect(firstPending).rejects.toContain('yt-dlp exited with code 1');
+    await expect(secondPending).resolves.toMatchObject({ title: 'Test Video' });
+  });
+
+  it('logs error when previous info process cannot be killed', async () => {
+    const firstProc = createProc();
+    const secondProc = createProc();
+    firstProc.kill = vi.fn(() => {
+      throw new Error('kill denied');
+    });
+    spawnWithEnvMock.mockReturnValueOnce(firstProc).mockReturnValueOnce(secondProc);
+
+    const firstPending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com/one');
+    const secondPending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com/two');
+
+    firstProc.emit('close', 1);
+    secondProc.stdout.emit('data', validJson);
+    secondProc.emit('close', 0);
+
+    await expect(firstPending).rejects.toContain('yt-dlp exited with code 1');
+    await expect(secondPending).resolves.toMatchObject({ title: 'Test Video' });
+    expect(logErrorMock).toHaveBeenCalledWith(
+      'Error killing video-info process:',
+      expect.any(Error)
+    );
+  });
+
+  it('supports cancellation via cancelVideoInfo', async () => {
+    const proc = createProc();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    cancelVideoInfo();
+    await expect(pending).rejects.toContain('cancelled');
+  });
+
+  it('rejects on timeout', async () => {
+    vi.useFakeTimers();
+    const proc = createProc();
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    const rejection = expect(pending).rejects.toContain('timed out');
+    await vi.advanceTimersByTimeAsync(60_000);
+    await rejection;
+  });
+
+  it('logs warning when timeout kill throws', async () => {
+    vi.useFakeTimers();
+    const proc = createProc();
+    proc.kill = vi.fn(() => {
+      throw new Error('timeout kill denied');
+    });
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    const rejection = expect(pending).rejects.toContain('timed out');
+    await vi.advanceTimersByTimeAsync(60_000);
+    await rejection;
+    expect(logErrorMock).toHaveBeenCalledWith(
+      'Error killing video-info-timeout process:',
+      expect.any(Error)
+    );
+  });
+
+  it('logs error when cancelVideoInfo kill throws', async () => {
+    const proc = createProc();
+    proc.kill = vi.fn(() => {
+      throw new Error('cancel kill denied');
+    });
+    spawnWithEnvMock.mockReturnValue(proc);
+
+    const pending = fetchVideoInfo('/tmp/ytdlp', 'https://example.com');
+    cancelVideoInfo();
+    proc.emit('close', 1);
+
+    await expect(pending).rejects.toContain('cancelled');
+    expect(logErrorMock).toHaveBeenCalledWith(
+      'Error killing video-info process:',
+      expect.any(Error)
+    );
+  });
+});
diff --git a/src/types.ts b/src/types.ts
index c0cee8f..1b72850 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -21,6 +21,7 @@ export interface Settings {
   gpuType: 'auto' | 'nvidia' | 'amd' | 'intel';
   bestQuality: boolean;
   ffmpegPath: string;
+  downloadFolder: string;
   hideSupportModal: boolean;
   checkUpdatesOnStartup: boolean;
   updateChannel: UpdateChannel;
@@ -59,9 +60,12 @@ export interface DownloadLifecycleState {
 
 export type DownloadOutcome = 'success' | 'failed' | 'cancelled';
 
+export type DownloadSessionOwner = 'manual' | 'queue';
+
 export interface DownloadSession {
   id: number;
   sender: Electron.WebContents;
+  owner: DownloadSessionOwner;
   lifecycle: DownloadLifecycleState;
   ytdlpProcess: import('child_process').ChildProcess | null;
   ffmpegProcess: import('child_process').ChildProcess | null;
@@ -185,7 +189,6 @@ export interface RendererApi {
   installUpdate: () => void;
   onUpdaterStatus: (callback: (data: UpdaterStatusEvent) => void) => () => void;
   onUpdaterProgress: (callback: (data: UpdaterProgressEvent) => void) => () => void;
-  onDownloadProgress: (callback: (data: Record<string, unknown>) => void) => () => void;
   onProgress: (callback: (message: string) => void) => () => void;
   onComplete: (callback: (message: string) => void) => () => void;
   openFileLocation: (filePath: string) => Promise<IpcResult<{ opened: boolean }>>;
@@ -204,4 +207,5 @@ export interface RendererApi {
   cancelQueue: () => Promise<IpcResult<void>>;
   onPrepareForClose: (callback: () => void | Promise<void>) => () => void;
   onQueueUpdate: (callback: (queue: QueueItem[]) => void) => () => void;
+  onSettingsImported: (callback: (settings: Settings) => void) => () => void;
 }
diff --git a/src/utils/ipcValidation.ts b/src/utils/ipcValidation.ts
index f271524..4742a28 100644
--- a/src/utils/ipcValidation.ts
+++ b/src/utils/ipcValidation.ts
@@ -1,3 +1,6 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
 import type {
   DownloadRequestOptions,
   IpcErrorCode,
@@ -9,6 +12,7 @@ import type {
 import { isSafeExternalUrl, isSafeHttpUrl } from './validation';
 import {
   ALLOWED_AUDIO_FORMATS,
+  ALLOWED_BROWSERS,
   ALLOWED_CONVERT_FORMATS,
   CURRENT_SETTINGS_VERSION,
   FORMAT_ID_PATTERN,
@@ -41,6 +45,117 @@ function buildError(code: IpcErrorCode, message: string, details?: string): IpcE
   return { code, message, details };
 }
 
+function isAbsolutePath(value: string): boolean {
+  return path.isAbsolute(value) || /^[A-Za-z]:[\\/]/.test(value);
+}
+
+function isPathWithinBase(resolvedPath: string, basePath: string): boolean {
+  const base = path.resolve(basePath);
+  const resolved = path.resolve(resolvedPath);
+  const relative = path.relative(base, resolved);
+  return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
+}
+
+function isAllowedDownloadBase(resolvedPath: string): boolean {
+  const homeDir = os.homedir();
+  if (homeDir && isPathWithinBase(resolvedPath, homeDir)) {
+    return true;
+  }
+  if (process.platform === 'darwin') {
+    const volumesRoot = path.resolve('/Volumes');
+    if (resolvedPath === volumesRoot || isPathWithinBase(resolvedPath, volumesRoot)) {
+      return true;
+    }
+  }
+  if (process.platform === 'win32' && isAbsolutePath(resolvedPath)) {
+    const normalized = resolvedPath.replace(/\//g, '\\').toLowerCase();
+    const blocked = [
+      '\\windows\\',
+      '\\program files\\',
+      '\\program files (x86)\\',
+      '\\programdata\\',
+    ];
+    if (!blocked.some((prefix) => normalized.includes(prefix))) {
+      return true;
+    }
+  }
+  return false;
+}
+
+export function validateDownloadPath(value: string): ValidationResult<string> {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return { ok: true, data: '' };
+  }
+  if (!isAbsolutePath(trimmed)) {
+    return {
+      ok: false,
+      error: buildError('INVALID_PATH', 'Download path must be an absolute path.'),
+    };
+  }
+  const resolved = path.resolve(trimmed);
+  if (!isAllowedDownloadBase(resolved)) {
+    return {
+      ok: false,
+      error: buildError(
+        'INVALID_PATH',
+        'Download path must be within your home directory or an allowed external volume.'
+      ),
+    };
+  }
+  return { ok: true, data: resolved };
+}
+
+function validateOutputPath(value: string): ValidationResult<string> {
+  const trimmed = value.trim();
+  if (!isAbsolutePath(trimmed)) {
+    return {
+      ok: false,
+      error: buildError('INVALID_PATH', 'Download outputPath must be an absolute path.'),
+    };
+  }
+  return validateDownloadPath(trimmed);
+}
+
+export function validateFfmpegPathValue(
+  value: string | undefined
+): ValidationResult<string | undefined> {
+  if (value === undefined) {
+    return { ok: true, data: undefined };
+  }
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return { ok: true, data: undefined };
+  }
+  if (trimmed === 'ffmpeg') {
+    return { ok: true, data: 'ffmpeg' };
+  }
+  if (!isAbsolutePath(trimmed)) {
+    return {
+      ok: false,
+      error: buildError(
+        'VALIDATION_ERROR',
+        'ffmpegPath must be an absolute path, empty string, or "ffmpeg".'
+      ),
+    };
+  }
+  const resolved = path.resolve(trimmed);
+  const baseName = path.basename(resolved).toLowerCase();
+  if (baseName !== 'ffmpeg' && baseName !== 'ffmpeg.exe') {
+    return {
+      ok: false,
+      error: buildError('VALIDATION_ERROR', 'ffmpegPath must point to ffmpeg or ffmpeg.exe.'),
+    };
+  }
+  if (!fs.existsSync(resolved)) {
+    return {
+      ok: false,
+      error: buildError('VALIDATION_ERROR', 'ffmpegPath does not exist.'),
+    };
+  }
+  return { ok: true, data: resolved };
+}
+
 export function okResult<T>(data: T): IpcResult<T> {
   return { ok: true, data };
 }
@@ -90,12 +205,21 @@ export function validateDownloadRequestPayload(
     };
   }
 
+  const outputPathValidation = validateOutputPath(outputPath);
+  if (!outputPathValidation.ok) {
+    return outputPathValidation;
+  }
+
   if (!isOptionalString(ffmpegPath)) {
     return {
       ok: false,
       error: buildError('VALIDATION_ERROR', 'ffmpegPath must be a string when provided.'),
     };
   }
+  const ffmpegPathValidation = validateFfmpegPathValue(ffmpegPath?.trim() || undefined);
+  if (!ffmpegPathValidation.ok) {
+    return ffmpegPathValidation;
+  }
   if (!isOptionalString(convertFormat)) {
     return {
       ok: false,
@@ -147,8 +271,8 @@ export function validateDownloadRequestPayload(
     ok: true,
     data: {
       url: url.trim(),
-      outputPath: outputPath.trim(),
-      ffmpegPath: ffmpegPath?.trim() || undefined,
+      outputPath: outputPathValidation.data,
+      ffmpegPath: ffmpegPathValidation.data,
       convertFormat: normalizedConvertFormat,
       keepOriginal,
       videoFormat: videoFormat?.trim() || undefined,
@@ -179,6 +303,7 @@ function isValidSettingsKey(key: string): key is keyof Settings {
     key === 'gpuType' ||
     key === 'bestQuality' ||
     key === 'ffmpegPath' ||
+    key === 'downloadFolder' ||
     key === 'hideSupportModal' ||
     key === 'checkUpdatesOnStartup' ||
     key === 'updateChannel' ||
@@ -333,19 +458,65 @@ export function validateSettingsPatchPayload(value: unknown): ValidationResult<P
       continue;
     }
 
-    if (!isString(rawValue)) {
-      return {
-        ok: false,
-        error: buildError('VALIDATION_ERROR', `${rawKey} must be a string.`),
-      };
+    if (rawKey === 'browserChoice') {
+      if (!isString(rawValue)) {
+        return {
+          ok: false,
+          error: buildError('VALIDATION_ERROR', 'browserChoice must be a string.'),
+        };
+      }
+      const normalized = rawValue.trim().toLowerCase();
+      if (!ALLOWED_BROWSERS.has(normalized)) {
+        return {
+          ok: false,
+          error: buildError('VALIDATION_ERROR', 'browserChoice is not an allowed browser.'),
+        };
+      }
+      patch.browserChoice = normalized;
+      continue;
     }
-    if (rawValue.length > 1024) {
-      return {
-        ok: false,
-        error: buildError('VALIDATION_ERROR', `${rawKey} exceeds maximum length of 1024.`),
-      };
+
+    if (rawKey === 'ffmpegPath') {
+      if (!isString(rawValue)) {
+        return {
+          ok: false,
+          error: buildError('VALIDATION_ERROR', 'ffmpegPath must be a string.'),
+        };
+      }
+      if (rawValue.length > 1024) {
+        return {
+          ok: false,
+          error: buildError('VALIDATION_ERROR', 'ffmpegPath exceeds maximum length of 1024.'),
+        };
+      }
+      const ffmpegValidation = validateFfmpegPathValue(rawValue.trim() || undefined);
+      if (!ffmpegValidation.ok) {
+        return ffmpegValidation;
+      }
+      patch.ffmpegPath = ffmpegValidation.data || '';
+      continue;
+    }
+
+    if (rawKey === 'downloadFolder') {
+      if (!isString(rawValue)) {
+        return {
+          ok: false,
+          error: buildError('VALIDATION_ERROR', 'downloadFolder must be a string.'),
+        };
+      }
+      if (rawValue.length > 4096) {
+        return {
+          ok: false,
+          error: buildError('VALIDATION_ERROR', 'downloadFolder exceeds maximum length of 4096.'),
+        };
+      }
+      const folderValidation = validateDownloadPath(rawValue);
+      if (!folderValidation.ok) {
+        return folderValidation;
+      }
+      patch.downloadFolder = folderValidation.data;
+      continue;
     }
-    patch[rawKey] = rawValue;
   }
 
   return { ok: true, data: patch };
@@ -365,13 +536,20 @@ export function validateFileLocationPayload(value: unknown): ValidationResult<st
       error: buildError('INVALID_PATH', 'File path exceeds maximum length.'),
     };
   }
-  if (!/^(\/|[A-Za-z]:\\)/.test(trimmed)) {
+  if (!isAbsolutePath(trimmed)) {
     return {
       ok: false,
       error: buildError('INVALID_PATH', 'File path must be absolute.'),
     };
   }
-  return { ok: true, data: trimmed };
+  const resolved = path.resolve(trimmed);
+  if (!isAllowedDownloadBase(resolved)) {
+    return {
+      ok: false,
+      error: buildError('INVALID_PATH', 'File path is outside allowed locations.'),
+    };
+  }
+  return { ok: true, data: path.normalize(resolved) };
 }
 
 export function validateNotificationPayload(value: unknown): ValidationResult<NotificationRequest> {
@@ -407,12 +585,21 @@ export function validateNotificationPayload(value: unknown): ValidationResult<No
     };
   }
 
+  let validatedFilePath: string | undefined;
+  if (filePath && filePath.trim() !== '') {
+    const filePathValidation = validateFileLocationPayload(filePath);
+    if (!filePathValidation.ok) {
+      return filePathValidation;
+    }
+    validatedFilePath = filePathValidation.data;
+  }
+
   return {
     ok: true,
     data: {
       title: title?.trim(),
       body: body?.trim(),
-      filePath: filePath?.trim(),
+      filePath: validatedFilePath,
     },
   };
 }
diff --git a/src/utils/validation.ts b/src/utils/validation.ts
index c6db7c1..570d9af 100644
--- a/src/utils/validation.ts
+++ b/src/utils/validation.ts
@@ -1,10 +1,106 @@
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+
+function normalizeHostname(hostname: string): string {
+  const trimmed = hostname.trim().toLowerCase();
+  if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
+}
+
+function parseDecimalIpv4(host: string): number | null {
+  if (!/^\d+$/.test(host)) return null;
+  const value = Number(host);
+  if (!Number.isInteger(value) || value < 0 || value > 0xffffffff) return null;
+  return value;
+}
+
+function ipv4FromDecimal(value: number): string {
+  return [(value >>> 24) & 0xff, (value >>> 16) & 0xff, (value >>> 8) & 0xff, value & 0xff].join(
+    '.'
+  );
+}
+
+function parseHexIpv4(host: string): string | null {
+  const match = host.match(/^0x([0-9a-f]{1,8})$/i);
+  if (!match?.[1]) return null;
+  const value = parseInt(match[1], 16);
+  if (!Number.isFinite(value) || value < 0 || value > 0xffffffff) return null;
+  return ipv4FromDecimal(value);
+}
+
+function isPrivateOrLocalIpv4(host: string): boolean {
+  const decimal = parseDecimalIpv4(host);
+  if (decimal !== null) {
+    return isPrivateOrLocalIpv4(ipv4FromDecimal(decimal));
+  }
+  const hexMapped = parseHexIpv4(host);
+  if (hexMapped) {
+    return isPrivateOrLocalIpv4(hexMapped);
+  }
+  const match = host.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
+  if (!match) return false;
+  const octets = match.slice(1, 5).map((value) => Number(value));
+  if (octets.some((value) => value > 255)) return false;
+  const [a, b] = octets;
+  if (a === 127) return true;
+  if (a === 10) return true;
+  if (a === 172 && b !== undefined && b >= 16 && b <= 31) return true;
+  if (a === 192 && b === 168) return true;
+  if (a === 169 && b === 254) return true;
+  if (a === 0) return true;
+  return false;
+}
+
+function isPrivateOrLocalIpv6(host: string): boolean {
+  if (host === '::1') return true;
+  if (host === '::') return true;
+  const mapped = host.match(/^::ffff:((?:\d{1,3}\.){3}\d{1,3})$/i);
+  if (mapped?.[1] && isPrivateOrLocalIpv4(mapped[1])) return true;
+  const mappedHex = host.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/i);
+  if (mappedHex) {
+    const hi = parseInt(mappedHex[1] ?? '0', 16);
+    const lo = parseInt(mappedHex[2] ?? '0', 16);
+    const ipv4 = `${(hi >> 8) & 0xff}.${hi & 0xff}.${(lo >> 8) & 0xff}.${lo & 0xff}`;
+    if (isPrivateOrLocalIpv4(ipv4)) return true;
+  }
+  const linkLocal = host.match(/^fe[89ab][0-9a-f]{0,3}:/i);
+  if (linkLocal) return true;
+  const uniqueLocal = host.match(/^f[cd][0-9a-f]{0,2}:/i);
+  if (uniqueLocal) return true;
+  return false;
+}
+
+function isRebindingHostname(host: string): boolean {
+  return (
+    host.endsWith('.nip.io') ||
+    host.endsWith('.sslip.io') ||
+    host.endsWith('.localtest.me') ||
+    host.endsWith('.lvh.me') ||
+    host.endsWith('.xip.io')
+  );
+}
+
+export function isPrivateOrLocalHost(hostname: string): boolean {
+  const host = normalizeHostname(hostname);
+  if (!host) return true;
+  if (host === 'localhost' || host.endsWith('.localhost')) return true;
+  if (isRebindingHostname(host)) return true;
+  if (isPrivateOrLocalIpv4(host)) return true;
+  if (host.includes(':') && isPrivateOrLocalIpv6(host)) return true;
+  return false;
+}
+
 export function isSafeHttpUrl(value: unknown) {
   if (typeof value !== 'string') return false;
   const trimmed = value.trim();
   if (!trimmed) return false;
   try {
     const url = new URL(trimmed);
-    return url.protocol === 'http:' || url.protocol === 'https:';
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') return false;
+    if (isPrivateOrLocalHost(url.hostname)) return false;
+    return true;
   } catch {
     return false;
   }
@@ -16,19 +112,27 @@ export function isSafeExternalUrl(value: unknown) {
   if (!trimmed) return false;
   try {
     const url = new URL(trimmed);
-    return (
-      url.protocol === 'http:' || url.protocol === 'https:' || url.protocol === 'ms-windows-store:'
-    );
+    if (url.protocol === 'mailto:') return true;
+    if (url.protocol === 'ms-windows-store:') return true;
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') return false;
+    if (isPrivateOrLocalHost(url.hostname)) return false;
+    return true;
   } catch {
     return false;
   }
 }
 
-export function isAllowedNavigationUrl(value: unknown) {
+export function isAllowedNavigationUrl(value: unknown, allowedFileBase?: string) {
   if (typeof value !== 'string') return false;
   try {
     const url = new URL(value);
-    return url.protocol === 'file:';
+    if (url.protocol !== 'file:') return false;
+    if (!allowedFileBase) return true;
+    const filePath = fileURLToPath(url);
+    const base = path.resolve(allowedFileBase);
+    const resolved = path.resolve(filePath);
+    const relative = path.relative(base, resolved);
+    return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
   } catch {
     return false;
   }
diff --git a/vitest.config.ts b/vitest.config.ts
index ad853ae..5b50ac9 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
       provider: 'v8',
       reporter: ['text', 'html', 'json-summary'],
       include: ['src/**/*.ts'],
-      exclude: ['src/**/*.test.ts', 'src/tests/**', 'src/renderer/modules/**/*.ts'],
+      exclude: ['src/**/*.test.ts', 'src/tests/**'],
     },
   },
 });