diff --git a/.gitignore b/.gitignore
index 9c5932fb..a3cea336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,8 @@ plugins
 .vscode/*
 !.vscode/launch.json
 .idea
+
+# yarn berry
+.yarn/unplugged/
+.yarn/build-state.yml
+.yarn/install-state.gz
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
index d7e0d238..e3d53a3c 100644
Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ
diff --git a/app/package.json b/app/package.json
index a7d5697d..15b9bc91 100644
--- a/app/package.json
+++ b/app/package.json
@@ -21,7 +21,7 @@
     "color": "4.2.3",
     "default-shell": "1.0.1",
     "electron-devtools-installer": "3.2.0",
-    "quine-electron-drag-click": "1.0.6d",
+    "quine-electron-drag-click": "1.0.6-d",
     "electron-fetch": "1.9.1",
     "electron-is-dev": "2.0.0",
     "electron-store": "8.2.0",
diff --git a/package.json b/package.json
index 0eb4696e..a81f9db8 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "dist": "yarn run build && yarn run electron-builder-with-retry",
     "electron-builder-with-retry": "electron-builder -p never || electron-builder -p never || electron-builder -p never",
     "clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/renderer && node ./bin/rimraf-standalone.js ./target && node ./bin/rimraf-standalone.js ./dist",
-    "v8-snapshot": "cross-env npm_config_arch=x64 yarn run v8-snapshot:arch && cross-env npm_config_arch=arm64 yarn run v8-snapshot:arch",
+    "v8-snapshot": "node scripts/v8-snapshot.js",
     "v8-snapshot:arch": "yarn run mk-snapshot && yarn run cp-snapshot",
     "mk-snapshot": "node scripts/mk-snapshot.js",
     "cp-snapshot": "node bin/cp-snapshot.js",
@@ -63,6 +63,7 @@
     "open": "8.4.2",
     "ora": "8.1.1",
     "php-escape-shell": "1.0.0",
+    "quine-electron-drag-click": "1.0.6-d",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-redux": "8.1.3",
diff --git a/scripts/v8-snapshot.js b/scripts/v8-snapshot.js
new file mode 100644
index 00000000..78f7a8fd
--- /dev/null
+++ b/scripts/v8-snapshot.js
@@ -0,0 +1,10 @@
+const { execSync } = require("child_process");
+const arch = process.arch;
+
+if (arch === "arm64") {
+  console.log("Running snapshot for x64 (Rosetta build)...");
+  execSync("cross-env npm_config_arch=x64 yarn run v8-snapshot:arch", { stdio: "inherit" });
+}
+
+console.log(`Running snapshot for native arch: ${arch}...`);
+execSync("cross-env npm_config_arch=" + arch + " yarn run v8-snapshot:arch", { stdio: "inherit" });
diff --git a/yarn.lock b/yarn.lock
index 1c3b75ac..3280173f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3155,7 +3155,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bindings@npm:^1.4.0":
+"bindings@npm:^1.4.0, bindings@npm:^1.5.0":
   version: 1.5.0
   resolution: "bindings@npm:1.5.0"
   dependencies:
@@ -6452,6 +6452,7 @@ __metadata:
     plist: "npm:3.1.0"
     prettier: "npm:3.3.3"
     proxyquire: "npm:2.1.3"
+    quine-electron-drag-click: "npm:1.0.6-d"
     react: "npm:18.3.1"
     react-dom: "npm:18.3.1"
     react-redux: "npm:8.1.3"
@@ -8316,7 +8317,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-addon-api@npm:^3.1.0":
+"node-addon-api@npm:^3.0.2, node-addon-api@npm:^3.1.0":
   version: 3.2.1
   resolution: "node-addon-api@npm:3.2.1"
   dependencies:
@@ -9414,6 +9415,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"quine-electron-drag-click@npm:1.0.6-d":
+  version: 1.0.6-d
+  resolution: "quine-electron-drag-click@npm:1.0.6-d"
+  dependencies:
+    bindings: "npm:^1.5.0"
+    node-addon-api: "npm:^3.0.2"
+    node-gyp: "npm:latest"
+  checksum: 10c0/3b908f492b8f021ba9980d8993a6667034213317bf2a25a6c7e6346d7b70ad2eb4564c59ee81c16ace1552fbbd2b91083fe37f94a7d0b508a23071e0fd72a152
+  languageName: node
+  linkType: hard
+
 "randombytes@npm:^2.1.0":
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"