diff --git a/package.json b/package.json
index 60405826..8aa5fad5 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
     "name": "Time Safari Team"
   },
   "scripts": {
-    "dev": "NODE_ENV=dev vite --config vite.config.web.mts --host",
-    "serve": "vite preview",
+    "start:web": "vite --config vite.config.web.mts --host",
+    "serve:web": "vite preview",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
     "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js && node scripts/copy-wasm.js",
@@ -24,25 +24,19 @@
     "build:electron": "npm run clean:electron && tsc -p tsconfig.electron.json && vite build --config vite.config.electron.mts && node scripts/build-electron.js",
     "build:capacitor": "vite build --config vite.config.capacitor.mts",
     "build:web": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts",
-    "electron:dev": "npm run build && electron .",
-    "electron:start": "electron .",
+    "start:electron": "electron .",
     "clean:android": "adb uninstall app.timesafari.app || true",
     "build:android": "npm run clean:android && rm -rf dist && npm run build:web && npm run build:capacitor && cd android && ./gradlew clean && ./gradlew assembleDebug && cd .. && npx cap sync android && npx capacitor-assets generate --android && npx cap open android",
-    "electron:build-linux": "npm run build:electron && electron-builder --linux AppImage",
-    "electron:build-linux-deb": "npm run build:electron && electron-builder --linux deb",
-    "electron:build-linux-prod": "NODE_ENV=production npm run build:electron && electron-builder --linux AppImage",
+    "build:electron-linux": "npm run build:electron && electron-builder --linux AppImage",
+    "build:electron-linux-deb": "npm run build:electron && electron-builder --linux deb",
+    "build:electron-linux-prod": "NODE_ENV=production npm run build:electron && electron-builder --linux AppImage",
     "build:electron-prod": "NODE_ENV=production npm run build:electron",
-    "pywebview:dev": "vite build --config vite.config.pywebview.mts && .venv/bin/python src/pywebview/main.py",
-    "pywebview:build": "vite build --config vite.config.pywebview.mts && .venv/bin/python src/pywebview/main.py",
-    "pywebview:package-linux": "vite build --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
-    "pywebview:package-win": "vite build --config vite.config.pywebview.mts && .venv/Scripts/python -m PyInstaller --name TimeSafari --add-data 'dist;www' src/pywebview/main.py",
-    "pywebview:package-mac": "vite build --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
-    "fastlane:ios:beta": "cd ios && fastlane beta",
-    "fastlane:ios:release": "cd ios && fastlane release",
-    "fastlane:android:beta": "cd android && fastlane beta",
-    "fastlane:android:release": "cd android && fastlane release",
-    "electron:build-mac": "npm run build:electron-prod && electron-builder --mac",
-    "electron:build-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
+    "build-start:pywebview": "vite build --config vite.config.pywebview.mts && .venv/bin/python src/pywebview/main.py",
+    "package:pywebview-linux": "vite build --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
+    "package:pywebview-win": "vite build --config vite.config.pywebview.mts && .venv/Scripts/python -m PyInstaller --name TimeSafari --add-data 'dist;www' src/pywebview/main.py",
+    "package:pywebview-mac": "vite build --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
+    "build:electron-mac": "npm run build:electron-prod && electron-builder --mac",
+    "build:electron-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
   },
   "dependencies": {
     "@capacitor-community/sqlite": "6.0.2",