diff --git a/client-gui2 b/client-gui2
index 643de2b0..620302c4 160000
--- a/client-gui2
+++ b/client-gui2
@@ -1 +1 @@
-Subproject commit 643de2b0b0c862e6916c53c5e9922bb629475171
+Subproject commit 620302c4069ce91ef42c89ad3b293770252a33e6
diff --git a/packaging/flatpak/com.kompac.client.yml b/packaging/flatpak/com.kompac.client.yml
index db78ada9..83e7e231 100644
--- a/packaging/flatpak/com.kompac.client.yml
+++ b/packaging/flatpak/com.kompac.client.yml
@@ -93,9 +93,9 @@ modules:
         sha256: 7d214bfeffc2e585dc422d1a09d2b144969421281e8c7f5d784b65fc69b5673f
         dest: typst-source
     build-commands:
-      - install -Dm755 protoc-source/bin/protoc /app/bin/protoc
+      - install -Dm755 protoc-source/protoc /app/bin/protoc
       - install -d /app/include
-      - cp -a protoc-source/include/. /app/include/
+      - cp -a protoc-source/google /app/include/
       - mkdir -p "$HOME/.theseus/postgresql"
       - cp postgresql-cache/postgresql-17.10.0-x86_64-unknown-linux-gnu.tar.gz "$HOME/.theseus/postgresql/"
       - cargo build --locked --release --package server --features full-embed
@@ -104,7 +104,7 @@ modules:
       - install -Dm755 /run/build/komp-ac/target/server/release/server /app/bin/komp-ac-server
       - install -Dm755 /run/build/komp-ac/target/gui/release/client-gui2 /app/bin/client-gui2
       - install -Dm755 packaging/flatpak/launcher.sh /app/bin/komp-ac
-      - install -Dm755 typst-source/typst-x86_64-unknown-linux-musl/typst /app/bin/typst
+      - install -Dm755 typst-source/typst /app/bin/typst
       - install -d /app/lib/komp_ac/themes
       - cp -a client/runtime/themes/. /app/lib/komp_ac/themes/
       - install -Dm644 packaging/flatpak/com.kompac.client.desktop /app/share/applications/com.kompac.client.desktop