diff --git a/flatpak/io.github.starfox64recomp.starfox64recomp.json b/flatpak/io.github.starfox64recomp.starfox64recomp.json
index 83416ac..f47c464 100644
--- a/flatpak/io.github.starfox64recomp.starfox64recomp.json
+++ b/flatpak/io.github.starfox64recomp.starfox64recomp.json
@@ -1,9 +1,9 @@
 {
   "id": "io.github.starfox64recomp.starfox64recomp",
   "runtime": "org.freedesktop.Platform",
-  "runtime-version": "23.08",
+  "runtime-version": "25.08",
   "sdk": "org.freedesktop.Sdk",
-  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm18" ],
+  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm20" ],
   "finish-args": [
     "--share=network",
     "--socket=wayland",
@@ -51,8 +51,8 @@
         }
       ],
       "build-options": {
-        "append-path": "/usr/lib/sdk/llvm18/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
+        "append-path": "/usr/lib/sdk/llvm20/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm20/lib",
         "build-args": [
           "--share=network"
         ]
diff --git a/lib/N64ModernRuntime b/lib/N64ModernRuntime
index df7e820..9ae9dbb 160000
--- a/lib/N64ModernRuntime
+++ b/lib/N64ModernRuntime
@@ -1 +1 @@
-Subproject commit df7e820d8c55e4fcb4616c210cbb2c01b25cd48c
+Subproject commit 9ae9dbbe41cafcd6f425135c726aebe80777d682
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 730e96d..d25b3c6 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -717,18 +717,21 @@ int main(int argc, char** argv) {
     // Register the .rtz texture pack file format with the previous content type as its only allowed content type.
     recomp::mods::register_mod_container_type("rtz", std::vector{ texture_pack_content_type_id }, false);
 
-    recomp::start(
-        project_version,
-        {},
-        rsp_callbacks,
-        renderer_callbacks,
-        audio_callbacks,
-        input_callbacks,
-        gfx_callbacks,
-        thread_callbacks,
-        error_handling_callbacks,
-        threads_callbacks
-    );
+    recomp::Configuration cfg{
+        .project_version = project_version,
+        .window_handle = {},
+        .rsp_callbacks = rsp_callbacks,
+        .renderer_callbacks = renderer_callbacks,
+        .audio_callbacks = audio_callbacks,
+        .input_callbacks = input_callbacks,
+        .gfx_callbacks = gfx_callbacks,
+        .events_callbacks = thread_callbacks,
+        .error_handling_callbacks = error_handling_callbacks,
+        .threads_callbacks = threads_callbacks,
+        .message_queue_control = {},
+    };
+
+    recomp::start(cfg);
 
     NFD_Quit();