diff --git a/package.json b/package.json
index 6b274634..6f1508cc 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,6 @@
     "jsdom": "27.3.0",
     "lint-staged": "12.3.8",
     "progress": "2.0.3",
-    "react-grab": "0.0.18",
     "react-scan": "0.4.3",
     "stream-browserify": "3.0.0",
     "vite": "6.4.1",
diff --git a/vite.config.js b/vite.config.js
index 0750dfc5..821db6ff 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -5,7 +5,6 @@ import { nodePolyfills } from 'vite-plugin-node-polyfills';
 import eslint from 'vite-plugin-eslint';
 import { VitePWA } from 'vite-plugin-pwa';
 import reactScan from '@react-scan/vite-plugin-react-scan';
-import { reactGrab } from 'react-grab/plugins/vite';
 
 const isProduction = process.env.NODE_ENV === 'production';
 const isDevelopment = process.env.NODE_ENV === 'development';
@@ -26,8 +25,6 @@ export default defineConfig({
       showToolbar: true,
       playSound: true,
     }),
-    // Only include React Grab in development mode - never in production builds
-    (isDevelopment || (!isProduction && process.env.NODE_ENV !== 'production')) && reactGrab(),
     !isProduction && eslint({
       lintOnStart: true,
       overrideConfigFile: './.eslintrc.cjs',
diff --git a/yarn.lock b/yarn.lock
index 41da5551..a190f796 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5629,6 +5629,11 @@
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz#b79de2d67389734c57c52595f7a7305e30c2d608"
   integrity sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==
 
+"@xstate/solid@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@xstate/solid/-/solid-2.0.0.tgz#22d21610ad3edb663bc0d05e7695b836a89f6b06"
+  integrity sha512-ycGMMJWPtfnc+CGhUxxe664wTVr4M2NXEJx4EsShbcT5G0d2bP378AtAsVvVhSjr6W5+7Br6htDivND1I6DOfQ==
+
 JSONStream@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -6261,13 +6266,20 @@ bindings@^1.3.0, bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bippy@^0.3.32, bippy@^0.3.8:
+bippy@^0.3.8:
   version "0.3.32"
   resolved "https://registry.yarnpkg.com/bippy/-/bippy-0.3.32.tgz#d0f306b6cbab09090fca8d8aeb4737a5b45dc77c"
   integrity sha512-hJnncyDOOK/QAgQeSsvaz8gFj93GGmJGBQU91M/E4+G5zS/u5nANPWL0j4bTOfY1asVkXIozG6H/qxlR/yCeYA==
   dependencies:
     "@types/react-reconciler" "^0.28.9"
 
+bippy@^0.5.27:
+  version "0.5.27"
+  resolved "https://registry.yarnpkg.com/bippy/-/bippy-0.5.27.tgz#030dc48cda43e7e5c05857a8ce97dea5da3d9045"
+  integrity sha512-LvGYTQm5cMqEhnUT2tr6mSE1mrhmX/xxu3jiypHAscThhxC+9SWdaQW8Nye5CT/sR79LObNJlQpOUgi4DopTMg==
+  dependencies:
+    "@types/react-reconciler" "^0.28.9"
+
 bl@^1.0.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
@@ -7503,6 +7515,11 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
+csstype@^3.1.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
+  integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
+
 cz-conventional-changelog@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-3.3.0.tgz#9246947c90404149b3fe2cf7ee91acad3b7d22d2"
@@ -13956,12 +13973,15 @@ react-dom@19.1.2:
   dependencies:
     scheduler "^0.26.0"
 
-react-grab@0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/react-grab/-/react-grab-0.0.18.tgz#2ce7e1eb2b0625029011f2b04122a45f0bf006f1"
-  integrity sha512-6+ipbbg3Rd1b9jsc4+f100KSgqNGe2RDLQ2jFEPUQiEiRtbt+8o+gpNPJhsDwliChmNAqimuecWAukTu26HpXg==
+react-grab@0.0.93:
+  version "0.0.93"
+  resolved "https://registry.yarnpkg.com/react-grab/-/react-grab-0.0.93.tgz#b991326d5edbe2eab9d4494bb773c8ccdc3b2264"
+  integrity sha512-b2oS5qoSKZECv5bEltbFVdy7orbShCFB+yDXVytjSVHgzHE9amveG7AwqVK7XDUhekBt2CEAwTttMYZv6sAn5w==
   dependencies:
-    bippy "^0.3.32"
+    "@xstate/solid" "^2.0.0"
+    bippy "^0.5.27"
+    solid-js "^1.9.10"
+    xstate "^5.25.0"
 
 react-i18next@13.2.2:
   version "13.2.2"
@@ -14662,6 +14682,16 @@ serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
+seroval-plugins@~1.3.0:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.3.3.tgz#51bcacf09e5384080d7ea4002b08fd9f6166daf5"
+  integrity sha512-16OL3NnUBw8JG1jBLUoZJsLnQq0n5Ua6aHalhJK4fMQkz1lqR7Osz1sA30trBtd9VUDc2NgkuRCn8+/pBwqZ+w==
+
+seroval@~1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.3.2.tgz#7e5be0dc1a3de020800ef013ceae3a313f20eca7"
+  integrity sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -14925,6 +14955,15 @@ socks@^2.6.2:
     ip-address "^10.0.1"
     smart-buffer "^4.2.0"
 
+solid-js@^1.9.10:
+  version "1.9.10"
+  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.9.10.tgz#95e57b004f3788d38f19e3b47101e90a9ab9dd0f"
+  integrity sha512-Coz956cos/EPDlhs6+jsdTxKuJDPT7B5SVIWgABwROyxjY7Xbr8wkzD68Et+NxnV7DLJ3nJdAC2r9InuV/4Jew==
+  dependencies:
+    csstype "^3.1.0"
+    seroval "~1.3.0"
+    seroval-plugins "~1.3.0"
+
 sort-keys-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -16937,6 +16976,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xstate@^5.25.0:
+  version "5.25.0"
+  resolved "https://registry.yarnpkg.com/xstate/-/xstate-5.25.0.tgz#34b36c4843a9db445ed608f0e8caf8c381d5bce2"
+  integrity sha512-yyWzfhVRoTHNLjLoMmdwZGagAYfmnzpm9gPjlX2MhJZsDojXGqRxODDOi4BsgGRKD46NZRAdcLp6CKOyvQS0Bw==
+
 xtend@^4.0.0, xtend@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"