diff --git a/frontend/react/package.json b/frontend/react/package.json
index 269cf4f8..938a2473 100644
--- a/frontend/react/package.json
+++ b/frontend/react/package.json
@@ -9,31 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-brands-svg-icons": "^6.5.2",
-    "@fortawesome/free-regular-svg-icons": "^6.6.0",
-    "@fortawesome/free-solid-svg-icons": "^6.5.1",
-    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@tanem/svg-injector": "^10.1.68",
-    "@turf/turf": "^6.5.0",
-    "@types/dom-webcodecs": "^0.1.12",
-    "@types/leaflet": "^1.9.8",
-    "@types/react-leaflet": "^3.0.0",
-    "@types/turf": "^3.5.32",
-    "buffer": "^6.0.3",
-    "js-sha256": "^0.11.0",
-    "jsstore": "^4.8.2",
-    "leaflet": "^1.9.4",
-    "leaflet-control-mini-map": "^0.4.0",
-    "leaflet-path-drag": "^1.9.5",
-    "magvar": "^1.1.5",
-    "opus-decoder": "^0.7.6",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-icons": "^5.0.1",
-    "react-leaflet": "^4.2.1",
-    "turf": "^3.0.14",
-    "usng": "^0.3.0"
+    
   },
   "devDependencies": {
     "@eslint/js": "^9.6.0",
@@ -59,6 +35,31 @@
     "vite": "^5.2.0",
     "vite-plugin-externals": "^0.6.2",
     "vite-plugin-file": "^1.0.5",
-    "web-audio-peak-meter": "^3.1.0"
+    "web-audio-peak-meter": "^3.1.0",
+    "@fortawesome/fontawesome-svg-core": "^6.5.1",
+    "@fortawesome/free-brands-svg-icons": "^6.5.2",
+    "@fortawesome/free-regular-svg-icons": "^6.6.0",
+    "@fortawesome/free-solid-svg-icons": "^6.5.1",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@tanem/svg-injector": "^10.1.68",
+    "@turf/turf": "^6.5.0",
+    "@types/dom-webcodecs": "^0.1.12",
+    "@types/leaflet": "^1.9.8",
+    "@types/react-leaflet": "^3.0.0",
+    "@types/turf": "^3.5.32",
+    "buffer": "^6.0.3",
+    "js-sha256": "^0.11.0",
+    "jsstore": "^4.8.2",
+    "leaflet": "^1.9.4",
+    "leaflet-control-mini-map": "^0.4.0",
+    "leaflet-path-drag": "^1.9.5",
+    "magvar": "^1.1.5",
+    "opus-decoder": "^0.7.6",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-icons": "^5.0.1",
+    "react-leaflet": "^4.2.1",
+    "turf": "^3.0.14",
+    "usng": "^0.3.0"
   }
 }
diff --git a/frontend/server/.vscode/launch.json b/frontend/server/.vscode/launch.json
index b520013d..38834a96 100644
--- a/frontend/server/.vscode/launch.json
+++ b/frontend/server/.vscode/launch.json
@@ -39,7 +39,24 @@
                 "run",
                 "server",
                 "--",
-                "-s",
+                "-c", 
+                "${input:enterDir}/Config/olympus.json",
+                "--vite"
+            ],
+            "restart": true
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch client (Electron)",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "client",
+                "--",
                 "-c", 
                 "${input:enterDir}/Config/olympus.json",
                 "--vite"
diff --git a/frontend/server/package.json b/frontend/server/package.json
index 9caf190b..8e35ef8d 100644
--- a/frontend/server/package.json
+++ b/frontend/server/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "DCSOlympus Server",
+  "name": "DCSOlympus",
   "main": "client.js",
   "version": "{{OLYMPUS_VERSION_NUMBER}}",
   "scripts": {
     "build-release": "call ./scripts/build-release.bat",
-    "server": "electron .",
+    "server": "electron . --server",
     "client": "electron .",
     "tsc": "tsc"
   },
@@ -37,8 +37,7 @@
   },
   "devDependencies": {
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.2",
-    "vite": "^6.0.3"
+    "typescript": "^5.7.2"
   },
   "overrides": {
     "node-fetch": "^3.3.2"