diff --git a/.gitignore b/.gitignore
index dbf8dad1c..464c8ce39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,6 @@ node_modules/
 out/
 .DS_Store
 bin
-*.pw
\ No newline at end of file
+*.pw
+build/
+*.dmg
diff --git a/scripthaus.md b/scripthaus.md
index da296095b..21e13f646 100644
--- a/scripthaus.md
+++ b/scripthaus.md
@@ -54,13 +54,16 @@ node_modules/.bin/tsc --jsx preserve --noEmit --esModuleInterop --target ES5 --e
 # @scripthaus cd :playbook
 rm -rf dist/
 rm -rf bin/
+rm -rf build/
 node_modules/.bin/webpack --config webpack.prod.js
 node_modules/.bin/webpack --config webpack.electron.prod.js
 (cd ../mshell; GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o ../sh2/bin/mshell/mshell-v0.2-darwin.amd64 main-mshell.go)
 (cd ../mshell; GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o ../sh2/bin/mshell/mshell-v0.2-darwin.arm64 main-mshell.go)
 (cd ../mshell; GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ../sh2/bin/mshell/mshell-v0.2-linux.amd64 main-mshell.go)
 (cd ../mshell; GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o ../sh2/bin/mshell/mshell-v0.2-linux.arm64 main-mshell.go)
-(cd ../sh2-server; GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o ../sh2/bin/prompt-local-server cmd/main-server.go)
+(cd ../sh2-server; GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o ../sh2/build/prompt-local-server.amd64 cmd/main-server.go)
+(cd ../sh2-server; GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w" -o ../sh2/build/prompt-local-server.arm64 cmd/main-server.go)
+lipo -create -output bin/prompt-local-server build/prompt-local-server.amd64 build/prompt-local-server.arm64
 node_modules/.bin/electron-forge make
 ```
 
@@ -69,3 +72,18 @@ node_modules/.bin/electron-forge make
 # @scripthaus cd :playbook
 open out/Prompt-darwin-x64/Prompt.app
 ```
+
+```bash
+# @scripthaus command create-dmg
+# @scripthaus cd :playbook
+../../create-dmg/create-dmg/create-dmg \
+  --volname "Prompt" \
+  --window-pos 200 120 \
+  --window-size 600 300 \
+  --icon-size 100 \
+  --icon "Prompt.app" 200 130 \
+  --hide-extension "Prompt.app" \
+  --app-drop-link 400 125 \
+  "Prompt.dmg" \
+  "out/Prompt-darwin-x64/Prompt.app"
+```
diff --git a/src/emain.ts b/src/emain.ts
index 3b451bf44..1ec650274 100644
--- a/src/emain.ts
+++ b/src/emain.ts
@@ -11,8 +11,9 @@ import {sprintf} from "sprintf-js";
 import {v4 as uuidv4} from "uuid";
 
 const PromptAppPathVarName = "PROMPT_APP_PATH";
+const PromptDevVarName = "PROMPT_DEV";
 const AuthKeyFile = "prompt.authkey";
-let isDev = (process.env.PROMPT_DEV != null);
+let isDev = (process.env[PromptDevVarName] != null);
 let scHome = getPromptHomeDir();
 ensureDir(scHome);
 let DistDir = (isDev ? "dist-dev" : "dist");
@@ -63,7 +64,7 @@ function getPromptHomeDir() {
         if (homeDir == null) {
             homeDir = "/";
         }
-        scHome = path.join(homeDir, "prompt");
+        scHome = path.join(homeDir, (isDev ? "prompt-dev" : "prompt"));
     }
     return scHome;
 }
@@ -380,6 +381,9 @@ function runLocalServer() {
     });
     let envCopy = Object.assign({}, process.env);
     envCopy[PromptAppPathVarName] = getAppBasePath();
+    if (isDev) {
+        envCopy[PromptDevVarName] = "1";
+    }
     console.log("trying to run local server", getLocalServerPath());
     let proc = child_process.spawn("/bin/bash", ["-c", getLocalServerCmd()], {
         cwd: getLocalServerCwd(),