diff --git a/xovi-ext/build.sh b/xovi-ext/build.sh
index 28d77b6..b530c21 100755
--- a/xovi-ext/build.sh
+++ b/xovi-ext/build.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# Build all grimoire xovi components: extension .so + uinject + uinjectd + grimoired
+# Build and deploy all grimoire components to reMarkable
+# Usage: bash build.sh [--no-restart]
 set -e
 cd "$(dirname "$0")"
 
@@ -8,8 +9,15 @@ EXT_DIR="$(pwd)/grimoire-injector"
 UINJECT_DIR="$(pwd)/uinject"
 UINJECTD_DIR="$(pwd)/uinjectd"
 GRIMOIRED_DIR="$(pwd)/grimoired"
+FONT_FILE="$(dirname "$0")/../fonts/EMSAllure.svg"
+RESTART_XOCHITL=true
+
+if [ "$1" = "--no-restart" ]; then
+    RESTART_XOCHITL=false
+fi
+
+# ─── Builder container ──────────────────────────────────────────────
 
-# Create persistent builder container if needed
 if ! docker inspect $CONTAINER &>/dev/null; then
     echo "Creating builder container..."
     docker create --platform linux/amd64 --name $CONTAINER \
@@ -21,7 +29,8 @@ if ! docker inspect $CONTAINER &>/dev/null; then
     sleep 3
 fi
 
-# Build extension .so
+# ─── Build extension .so ────────────────────────────────────────────
+
 echo "=== Building grimoire-injector.so ==="
 docker exec $CONTAINER bash -c '
 export XOVI_REPO=/tmp/xovi
@@ -30,11 +39,11 @@ cd /xovi-ext/grimoire-injector
 qmake6 2>/dev/null
 make 2>&1
 '
-
 echo "Copying .so..."
 docker cp $CONTAINER:/xovi-ext/grimoire-injector/grimoire-injector.so "$EXT_DIR/"
 
-# Build uinject
+# ─── Build uinject ──────────────────────────────────────────────────
+
 echo "=== Building uinject ==="
 docker exec $CONTAINER bash -c '
 . /opt/codex/*/*/environment-setup-*
@@ -42,11 +51,11 @@ cd /xovi-ext/uinject
 $CC -o uinject uinject.c -O2 $CFLAGS $LDFLAGS
 echo "uinject built OK"
 '
-
 echo "Copying uinject..."
 docker cp $CONTAINER:/xovi-ext/uinject/uinject "$UINJECT_DIR/"
 
-# Build uinjectd
+# ─── Build uinjectd ─────────────────────────────────────────────────
+
 echo "=== Building uinjectd ==="
 docker exec $CONTAINER bash -c '
 . /opt/codex/*/*/environment-setup-*
@@ -54,11 +63,11 @@ cd /xovi-ext/uinjectd
 $CC -o uinjectd uinjectd.c -O2 $CFLAGS $LDFLAGS -lpthread
 echo "uinjectd built OK"
 '
-
 echo "Copying uinjectd..."
 docker cp $CONTAINER:/xovi-ext/uinjectd/uinjectd "$UINJECTD_DIR/"
 
-# Build grimoired
+# ─── Build grimoired ────────────────────────────────────────────────
+
 echo "=== Building grimoired ==="
 docker exec $CONTAINER bash -c '
 . /opt/codex/*/*/environment-setup-*
@@ -66,20 +75,74 @@ cd /xovi-ext/grimoired
 $CC -o grimoired grimoired.c font_render.c -O2 $CFLAGS $LDFLAGS -lpthread -lpng16 -lssl -lcrypto -lm
 echo "grimoired built OK"
 '
-
 echo "Copying grimoired..."
 docker cp $CONTAINER:/xovi-ext/grimoired/grimoired "$GRIMOIRED_DIR/"
 
-# Deploy all to device
+# ─── Deploy to device ───────────────────────────────────────────────
+
 echo "=== Deploying to device ==="
+
+# Stop services before replacing binaries
+ssh remarkable 'systemctl stop grimoired 2>/dev/null; killall uinject 2>/dev/null; killall uinjectd 2>/dev/null; killall grimoired 2>/dev/null'
+ssh remarkable 'rm -f /home/root/uinject /home/root/uinjectd /home/root/grimoired'
+
+# Copy binaries
 scp "$EXT_DIR/grimoire-injector.so" remarkable:/home/root/xovi/extensions.d/
-ssh remarkable 'killall uinject 2>/dev/null; killall uinjectd 2>/dev/null; killall grimoired 2>/dev/null; rm -f /home/root/uinject /home/root/uinjectd /home/root/grimoired'
 scp "$UINJECT_DIR/uinject" remarkable:/home/root/uinject
 scp "$UINJECTD_DIR/uinjectd" remarkable:/home/root/uinjectd
 scp "$GRIMOIRED_DIR/grimoired" remarkable:/home/root/grimoired
-scp "$(dirname "$0")/../fonts/EMSAllure.svg" remarkable:/home/root/EMSAllure.svg
-scp "$(dirname "$0")/grimoired/font_data.json" remarkable:/home/root/font_data.json
+
+# Copy data files
+scp "$FONT_FILE" remarkable:/home/root/EMSAllure.svg
+scp "$GRIMOIRED_DIR/font_data.json" remarkable:/home/root/font_data.json
+scp "$GRIMOIRED_DIR/ornaments.json" remarkable:/home/root/ornaments.json
+
+# Deploy QML patches
+echo "Deploying QML patches..."
+scp "$(dirname "$0")/grimoire_toggle.qmd" remarkable:/home/root/xovi/exthome/qt-resource-rebuilder/rmHacks/grimoire_toggle.qmd
+ssh remarkable 'grep -q grimoire_toggle /home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd || echo "LOAD rmHacks/grimoire_toggle.qmd" >> /home/root/xovi/exthome/qt-resource-rebuilder/zz_rmhacks.qmd'
+
+# Install systemd service for grimoired
+echo "Installing systemd service..."
+ssh remarkable 'cat > /etc/systemd/system/grimoired.service << SVCEOF
+[Unit]
+Description=Grimoire on-device daemon
+After=xochitl.service
+Wants=xochitl.service
+
+[Service]
+Type=simple
+ExecStart=/home/root/grimoired
+Restart=on-failure
+RestartSec=3
+StandardOutput=append:/tmp/grimoired.log
+StandardError=append:/tmp/grimoired.log
+
+[Install]
+WantedBy=multi-user.target
+SVCEOF
+systemctl daemon-reload
+systemctl enable grimoired'
+
+# Start services
 ssh remarkable '/home/root/uinjectd &'
-ssh remarkable '/home/root/grimoired &'
+ssh remarkable 'systemctl start grimoired'
+
+# Restart xochitl if needed (for new .so or .qmd changes)
+if [ "$RESTART_XOCHITL" = true ]; then
+    echo "Restarting xochitl..."
+    ssh remarkable 'systemctl reset-failed xochitl && systemctl restart xochitl'
+    sleep 5
+    # Re-start grimoired after xochitl restart (systemd handles this but be safe)
+    ssh remarkable 'systemctl restart grimoired 2>/dev/null'
+fi
+
+# Verify
+echo ""
+echo "=== Status ==="
+ssh remarkable 'systemctl is-active grimoired 2>/dev/null && echo "grimoired: running" || echo "grimoired: NOT running"'
+ssh remarkable 'ps | grep uinjectd | grep -v grep | head -n 1 | awk "{print \"uinjectd: running (pid \" \$1 \")\"}"'
+ssh remarkable 'tail -n 1 /tmp/grimoired.log 2>/dev/null'
 
-echo "Done! Restart xochitl to load new extension."
+echo ""
+echo "Done!"