diff --git a/Makefile b/Makefile
index 50fcd46..fb52343 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ clean:
 
 start: deploy
 	# TODO: This doesn't kill weston nicely; I should handle that? Or background or something
-	ssh kiosk "pgrep -f './server' || ./server"
-	#ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so' || true"
+	ssh kiosk "pgrep -f './server' || ./server &"
+	ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so'" || true
 	ssh kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --remote-debugging-port=9222
 
 debug: deploy
-	ssh kiosk "pgrep -f './server' || ./server"
-	#ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so' || true"
+	ssh kiosk "pgrep -f './server' || ./server &"
+	ssh kiosk "pkill -f 'weston --shell=kiosk-shell.so'" || true
 	ssh -L 6000:localhost:6000 kiosk weston --shell=kiosk-shell.so -- firefox --kiosk localhost:8000 --start-debugger-server 6000
diff --git a/server/main.go b/server/main.go
index 6ab1ecf..45e8851 100644
--- a/server/main.go
+++ b/server/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"embed"
 	"fmt"
+	"io/fs"
 	"log"
 	"net/http"
 	"os"
@@ -23,6 +24,10 @@ func setReader(state string) error {
 
 func main() {
 	setReader("on")
+	webUI, err := fs.Sub(webUI, "dist")
+	if err != nil {
+		panic(err)
+	}
 	http.Handle("/", http.FileServerFS(webUI))
 
 	http.HandleFunc("POST /api/reader/{state}", func(w http.ResponseWriter, r *http.Request) {