diff --git a/.gitmodules b/.gitmodules
index b909e7c..8560d1b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "subprojects/april-asr"]
 	path = subprojects/april-asr
-	url = https://github.com/abb128/april-asr.git
+	url = https://github.com/Techlm77/april-asr.git
diff --git a/meson.build b/meson.build
index 8dfd7b3..89ac5de 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,10 @@
-project('livecaptions', 'c',
+project('livecaptions', 'c', 'cpp',
           version: '0.1.0',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2',
                      'werror=false',
                      'c_std=gnu11',
+                     'cpp_std=c++17',
                    ],
 )
 
diff --git a/src/asrproc.c b/src/asrproc.c
index 5548f38..489fd9e 100644
--- a/src/asrproc.c
+++ b/src/asrproc.c
@@ -121,6 +121,9 @@ static void april_result_handler(void* userdata, AprilResultType result, size_t
     if((data->window == NULL) || (data->pause)) return;
 
     switch(result) {
+        case APRIL_RESULT_UNKNOWN:
+            break;
+
         case APRIL_RESULT_RECOGNITION_PARTIAL:
         case APRIL_RESULT_RECOGNITION_FINAL:
         {
@@ -257,7 +260,7 @@ bool asr_thread_update_model(asr_thread data, const char *model_path) {
 
     AprilConfig config = {
         .handler = april_result_handler,
-        .flags = APRIL_CONFIG_FLAG_ASYNC_RT_BIT,
+        .flags = APRIL_CONFIG_FLAG_ASYNC_NO_RT_BIT,
         .userdata = data
     };
 
diff --git a/src/audiocap-pa.c b/src/audiocap-pa.c
index 14a7bfe..7d8da93 100644
--- a/src/audiocap-pa.c
+++ b/src/audiocap-pa.c
@@ -55,6 +55,7 @@ static void stream_success_cb(pa_stream *stream, int success, void *userdata);
 static void stream_read_cb(pa_stream *stream, size_t nbytes, void *userdata);
 
 static void server_info_callback(pa_context *c, const pa_server_info *i, void *userdata){
+    (void)c;
     audio_thread_pa data = (audio_thread_pa)userdata;
 
     data->source_name = (char *)calloc(1, strlen(i->default_source_name) + 1);
@@ -154,11 +155,13 @@ void *run_audio_thread_pa(void *userdata) {
 }
 
 static void context_state_cb(pa_context* context, void* userdata) {
+    (void)context;
     audio_thread_pa data = userdata;
     pa_threaded_mainloop_signal(data->mainloop, 0);
 }
 
 static void stream_state_cb(pa_stream *s, void *userdata) {
+    (void)s;
     audio_thread_pa data = userdata;
     pa_threaded_mainloop_signal(data->mainloop, 0);
 }
@@ -196,6 +199,8 @@ static void stream_read_cb(pa_stream *stream, size_t nbytes, void *userdata) {
 }
 
 static void stream_success_cb(pa_stream *stream, int success, void *userdata) {
+    (void)stream;
+    (void)success;
     audio_thread_pa data = userdata;
     pa_threaded_mainloop_signal(data->mainloop, 0);
 }
diff --git a/src/audiocap.c b/src/audiocap.c
index 675f502..ab3f283 100644
--- a/src/audiocap.c
+++ b/src/audiocap.c
@@ -41,12 +41,6 @@ struct audio_thread_i {
 };
 
 
-static void *run_audio_thread(void *userdata) {
-    audio_thread data = (audio_thread)userdata;
-
-    return NULL;
-}
-
 audio_thread create_audio_thread(bool microphone, asr_thread asr){
     audio_thread data = calloc(1, sizeof(struct audio_thread_i));
     
diff --git a/src/history.c b/src/history.c
index 5ca722a..7c21765 100644
--- a/src/history.c
+++ b/src/history.c
@@ -77,7 +77,7 @@ void commit_tokens_to_current_history(const AprilToken *tokens,
         struct history_token *token = &entry->tokens[i];
 
         if(strlen(tokens[i].token) >= HISTORY_TOKEN_MAX_CHARS){
-            printf("Token %s is too long! (%d)\n", tokens[i].token, strlen(tokens[i].token));
+            printf("Token %s is too long! (%zu)\n", tokens[i].token, strlen(tokens[i].token));
             g_assert(false);
         }
 
diff --git a/src/line-gen.c b/src/line-gen.c
index ddca228..4b26743 100644
--- a/src/line-gen.c
+++ b/src/line-gen.c
@@ -240,7 +240,7 @@ void line_generator_update(struct line_generator *lg, size_t num_tokens, const A
             // break line if too long
             if(i == lg->current_line){
                 curr->len += line_generator_get_text_width(lg, token);
-                if(curr->len >= lg->max_text_width) {
+                if (lg->max_text_width > 0 && curr->len >= (size_t)lg->max_text_width) {
                     size_t tgt_brk = j;
                     // find previous word boundary
                     while((!(tokens[tgt_brk].flags & APRIL_TOKEN_FLAG_WORD_BOUNDARY_BIT)) && (tgt_brk > start_of_line)) tgt_brk--;
@@ -342,7 +342,7 @@ const char *line_generator_get_plaintext(struct line_generator *lg) {
         } else {
             // HACK: We need to remove the <span...></span> tags
             bool inside_markup = false;
-            for(int j=0; j<curr->head; j++) {
+            for(size_t j=0; j<curr->head; j++) {
                 if(curr->text[j] == '<') {
                     inside_markup = true;
                     continue;
diff --git a/src/livecaptions-application.c b/src/livecaptions-application.c
index 2517f2c..3428493 100644
--- a/src/livecaptions-application.c
+++ b/src/livecaptions-application.c
@@ -119,7 +119,7 @@ static gboolean on_handle_allow_keep_above(DBLCapNetSapplesLiveCaptionsExternal
                                            GDBusMethodInvocation *invocation,
                                            gpointer user_data)
 {
-    LiveCaptionsApplication *self = LIVECAPTIONS_APPLICATION(user_data);
+    (void)user_data;
 
     override_keep_above_system(true);
 
@@ -130,7 +130,7 @@ static gboolean on_handle_allow_keep_above(DBLCapNetSapplesLiveCaptionsExternal
 static gboolean
 livecaptions_application_dbus_register(GApplication     *app,
                                        GDBusConnection  *connection,
-                                       const gchar      *object_path,
+                                       G_GNUC_UNUSED const gchar *object_path,
                                        GError          **error)
 {
     LiveCaptionsApplication *self = LIVECAPTIONS_APPLICATION(app);
@@ -172,6 +172,8 @@ livecaptions_application_dbus_unregister(GApplication    *app,
                                          GDBusConnection *connection,
                                          const gchar     *object_path)
 {
+    (void)connection;
+    (void)object_path;
     LiveCaptionsApplication *self = LIVECAPTIONS_APPLICATION(app);
 
     g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(self->dbus_external));
@@ -242,12 +244,11 @@ livecaptions_application_show_preferences(G_GNUC_UNUSED GSimpleAction *action,
     LiveCaptionsApplication *self = LIVECAPTIONS_APPLICATION(user_data);
     if(self->welcome != NULL) return;
 
-    GtkApplication *app = GTK_APPLICATION(user_data);
-    GtkWindow *window = gtk_application_get_active_window (app);
-    LiveCaptionsSettings *preferences = g_object_new(LIVECAPTIONS_TYPE_SETTINGS, "application", GTK_APPLICATION(self), NULL);
+    LiveCaptionsSettings *preferences = g_object_new(LIVECAPTIONS_TYPE_SETTINGS, NULL);
     preferences->application = self;
 
-    gtk_window_present (GTK_WINDOW (preferences));
+    // No parent, so the preferences open in their own window instead of inside the captions bar
+    adw_dialog_present(ADW_DIALOG(preferences), NULL);
 
 }
 
diff --git a/src/livecaptions-history-window.c b/src/livecaptions-history-window.c
index 3f4edbd..275937a 100644
--- a/src/livecaptions-history-window.c
+++ b/src/livecaptions-history-window.c
@@ -39,7 +39,8 @@ static gboolean close_self_window(gpointer userdata) {
     return G_SOURCE_REMOVE;
 }
 
-static void message_cb(AdwMessageDialog *dialog, gchar *response, gpointer userdata){
+static void message_cb(AdwAlertDialog *dialog, gchar *response, gpointer userdata){
+    (void)dialog;
     if(g_str_equal(response, "delete")){
         erase_all_history();
 
@@ -48,26 +49,24 @@ static void message_cb(AdwMessageDialog *dialog, gchar *response, gpointer userd
 }
 
 static void warn_deletion_cb(LiveCaptionsHistoryWindow *self){
-    GtkWindow *parent = GTK_WINDOW(gtk_widget_get_root(GTK_WIDGET(self)));
-    GtkWidget *dialog;
+    AdwDialog *dialog;
 
-    dialog = adw_message_dialog_new(parent,
-                                    _("Erase History?"),
-                                    _("Everything in history will be erased. You may wish to export your history before erasing!"));
+    dialog = adw_alert_dialog_new(_("Erase History?"),
+                                  _("Everything in history will be erased. You may wish to export your history before erasing!"));
 
-    adw_message_dialog_add_responses(ADW_MESSAGE_DIALOG(dialog),
-                                    "cancel",  _("_Cancel"),
-                                    "delete", _("_Erase Everything"),
-                                    NULL);
+    adw_alert_dialog_add_responses(ADW_ALERT_DIALOG(dialog),
+                                   "cancel",  _("_Cancel"),
+                                   "delete", _("_Erase Everything"),
+                                   NULL);
 
-    adw_message_dialog_set_response_appearance(ADW_MESSAGE_DIALOG(dialog), "delete", ADW_RESPONSE_DESTRUCTIVE);
+    adw_alert_dialog_set_response_appearance(ADW_ALERT_DIALOG(dialog), "delete", ADW_RESPONSE_DESTRUCTIVE);
 
-    adw_message_dialog_set_default_response(ADW_MESSAGE_DIALOG(dialog), "cancel");
-    adw_message_dialog_set_close_response(ADW_MESSAGE_DIALOG(dialog), "cancel");
+    adw_alert_dialog_set_default_response(ADW_ALERT_DIALOG(dialog), "cancel");
+    adw_alert_dialog_set_close_response(ADW_ALERT_DIALOG(dialog), "cancel");
 
-    g_signal_connect(ADW_MESSAGE_DIALOG(dialog), "response", G_CALLBACK(message_cb), self);
+    g_signal_connect(ADW_ALERT_DIALOG(dialog), "response", G_CALLBACK(message_cb), self);
 
-    gtk_window_present(GTK_WINDOW(dialog));
+    adw_dialog_present(dialog, GTK_WIDGET(self));
 }
 
 
@@ -232,50 +231,35 @@ static void load_more_cb(LiveCaptionsHistoryWindow *self) {
 }
 
 
-static void on_save_response(GtkNativeDialog *native,
-                             int        response,
-                             LiveCaptionsHistoryWindow *self)
+static void on_save_response(GObject      *source,
+                             GAsyncResult *result,
+                             gpointer      user_data)
 {
-    if(response == GTK_RESPONSE_ACCEPT){
-        GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+    LiveCaptionsHistoryWindow *self = LIVECAPTIONS_HISTORY_WINDOW(user_data);
 
-        g_autoptr(GFile) file = gtk_file_chooser_get_file(chooser);
-        
+    g_autoptr(GFile) file = gtk_file_dialog_save_finish(GTK_FILE_DIALOG(source), result, NULL);
+    if(file != NULL){
         char *path = g_file_get_path(file);
 
         export_history_as_text(path);
 
-        char *uri = g_file_get_uri(file);
-
-        gtk_show_uri(GTK_WINDOW(self), uri, GDK_CURRENT_TIME);
+        g_autoptr(GtkFileLauncher) launcher = gtk_file_launcher_new(file);
+        gtk_file_launcher_launch(launcher, GTK_WINDOW(self), NULL, NULL, NULL);
 
         g_free(path);
-        g_free(uri);
     }
 
-    g_object_unref(native);
+    g_object_unref(self);
 }
 
 static void export_cb(LiveCaptionsHistoryWindow *self) {
-    GtkFileChooserNative *native;
-    GtkFileChooser *chooser;
-    GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SAVE;
-
-    native = gtk_file_chooser_native_new("Export History",
-                                         GTK_WINDOW(self),
-                                         action,
-                                         _("_Export"),
-                                         _("_Cancel"));
-
-    chooser = GTK_FILE_CHOOSER(native);
-
-    gtk_file_chooser_set_current_name(chooser, _("Live Captions History.txt"));
+    g_autoptr(GtkFileDialog) dialog = gtk_file_dialog_new();
 
-    gtk_native_dialog_show(GTK_NATIVE_DIALOG(native));
+    gtk_file_dialog_set_title(dialog, "Export History");
+    gtk_file_dialog_set_accept_label(dialog, _("_Export"));
+    gtk_file_dialog_set_initial_name(dialog, _("Live Captions History.txt"));
 
-    g_signal_connect(native, "response",
-                     G_CALLBACK (on_save_response),
-                     self);
+    gtk_file_dialog_save(dialog, GTK_WINDOW(self), NULL, on_save_response, g_object_ref(self));
 }
 
 // The window needs to be kept on top if the main window is kept on top,
diff --git a/src/livecaptions-settings.c b/src/livecaptions-settings.c
index d23a8ab..627f240 100644
--- a/src/livecaptions-settings.c
+++ b/src/livecaptions-settings.c
@@ -27,19 +27,16 @@
 #include "livecaptions-history-window.h"
 #include "asrproc.h"
 
-G_DEFINE_TYPE(LiveCaptionsSettings, livecaptions_settings, ADW_TYPE_PREFERENCES_WINDOW)
+G_DEFINE_TYPE(LiveCaptionsSettings, livecaptions_settings, ADW_TYPE_PREFERENCES_DIALOG)
 
 static void rerun_benchmark_cb (LiveCaptionsSettings *self) {
-    gtk_window_close(GTK_WINDOW(self));
+    g_action_group_activate_action(G_ACTION_GROUP(self->application), "setup", NULL);
 
-    gtk_widget_activate_action(GTK_WIDGET(self), "app.setup", NULL);
-    
-    gtk_window_destroy(GTK_WINDOW(self));
+    adw_dialog_close(ADW_DIALOG(self));
 }
 
 static void about_cb(LiveCaptionsSettings *self) {
-    GtkRoot *root = gtk_widget_get_root (GTK_WIDGET (self));
-    GtkWidget *about;
+    AdwDialog *about;
 
     const char *developers[] = {
         "abb128",
@@ -52,8 +49,7 @@ static void about_cb(LiveCaptionsSettings *self) {
     };
 
     about =
-        g_object_new(ADW_TYPE_ABOUT_WINDOW,
-                    "transient-for", root,
+        g_object_new(ADW_TYPE_ABOUT_DIALOG,
                     "application-icon", "net.sapples.LiveCaptions",
                     "application-name", _("Live Captions"),
                     "developer-name", _("abb128"),
@@ -67,69 +63,67 @@ static void about_cb(LiveCaptionsSettings *self) {
                     "translator-credits", _("translator-credits"),
                     NULL);
 
-    adw_about_window_add_legal_section(ADW_ABOUT_WINDOW(about),
+    adw_about_dialog_add_legal_section(ADW_ABOUT_DIALOG(about),
                                        _("Model"),
                                        NULL,
                                        GTK_LICENSE_CUSTOM,
                                        "The ASR model was originally trained by Fangjun Kuang (@csukuangfj), and has been finetuned on extra data.");
 
-    adw_about_window_add_legal_section(ADW_ABOUT_WINDOW(about),
+    adw_about_dialog_add_legal_section(ADW_ABOUT_DIALOG(about),
                                        "april-asr",
                                        "Copyright © 2022 abb128",
                                        GTK_LICENSE_GPL_3_0_ONLY,
                                        NULL);
 
-    adw_about_window_add_legal_section(ADW_ABOUT_WINDOW(about),
+    adw_about_dialog_add_legal_section(ADW_ABOUT_DIALOG(about),
                                        "ONNXRuntime",
                                        "Copyright © 2021 Microsoft Corporation",
                                        GTK_LICENSE_MIT_X11,
                                        NULL);
 
-    adw_about_window_add_legal_section(ADW_ABOUT_WINDOW(about),
+    adw_about_dialog_add_legal_section(ADW_ABOUT_DIALOG(about),
                                        "pocketfft",
                                        "Copyright © 2010-2019 Max-Planck-Society",
                                        GTK_LICENSE_BSD_3,
                                        NULL);
 
-    adw_about_window_add_legal_section(ADW_ABOUT_WINDOW(about),
+    adw_about_dialog_add_legal_section(ADW_ABOUT_DIALOG(about),
                                        "sonic",
                                        "Copyright © 2010 Bill Cox",
                                        GTK_LICENSE_APACHE_2_0,
                                        NULL);
 
-    adw_about_window_add_acknowledgement_section(ADW_ABOUT_WINDOW(about),
+    adw_about_dialog_add_acknowledgement_section(ADW_ABOUT_DIALOG(about),
                                                  _("Special thanks to"),
                                                  special_thanks);
 
-    gtk_window_present(GTK_WINDOW(about));
+    adw_dialog_present(about, GTK_WIDGET(self));
+}
+
+
+static GtkWindow *get_parent_window(LiveCaptionsSettings *self) {
+    return GTK_WINDOW(gtk_widget_get_root(GTK_WIDGET(self)));
 }
 
+static void launch_uri(LiveCaptionsSettings *self, const char *uri) {
+    g_autoptr(GtkUriLauncher) launcher = gtk_uri_launcher_new(uri);
+    gtk_uri_launcher_launch(launcher, get_parent_window(self), NULL, NULL, NULL);
+}
 
 static void report_cb(LiveCaptionsSettings *self) {
-    gtk_show_uri(
-        GTK_WINDOW(self),
-        "https://github.com/abb128/LiveCaptions/issues/48",
-        GDK_CURRENT_TIME
-    );
+    launch_uri(self, "https://github.com/abb128/LiveCaptions/issues/48");
 }
 
 static void download_models_cb(LiveCaptionsSettings *self) {
-    gtk_show_uri(
-        GTK_WINDOW(self),
-        "https://abb128.github.io/april-asr/models.html",
-        GDK_CURRENT_TIME
-    );
+    launch_uri(self, "https://abb128.github.io/april-asr/models.html");
 }
 
 static void open_history(LiveCaptionsSettings *self) {
-    GtkRoot *root = gtk_widget_get_root(GTK_WIDGET(self));
-
-    LiveCaptionsHistoryWindow *window = g_object_new(LIVECAPTIONS_TYPE_HISTORY_WINDOW, "transient-for", root, NULL);
+    LiveCaptionsHistoryWindow *window = g_object_new(LIVECAPTIONS_TYPE_HISTORY_WINDOW, "application", self->application, NULL);
     
     gtk_window_present(GTK_WINDOW(window));
 
-    gtk_window_close(GTK_WINDOW(self));
-    gtk_window_destroy(GTK_WINDOW(self));
+    adw_dialog_close(ADW_DIALOG(self));
 }
 
 static const char *get_always_on_top_tip_text(){
@@ -146,29 +140,18 @@ static const char *get_always_on_top_tip_text(){
 }
 
 
-static void on_add_model_response(GtkNativeDialog *native,
-                                  int        response,
-                                  LiveCaptionsSettings *self);
+static void on_add_model_response(GObject      *source,
+                                  GAsyncResult *result,
+                                  gpointer      user_data);
 
 static void add_model_cb(LiveCaptionsSettings *self) {
-    GtkFileChooserNative *native;
-    GtkFileChooser *chooser;
-    GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
+    g_autoptr(GtkFileDialog) dialog = gtk_file_dialog_new();
 
-    native = gtk_file_chooser_native_new("Load Model",
-                                         GTK_WINDOW(self),
-                                         action,
-                                         _("_Load"),
-                                         _("_Cancel"));
+    gtk_file_dialog_set_title(dialog, "Load Model");
+    gtk_file_dialog_set_accept_label(dialog, _("_Load"));
+    gtk_file_dialog_set_default_filter(dialog, self->file_filter);
 
-    chooser = GTK_FILE_CHOOSER(native);
-    gtk_file_chooser_add_filter(chooser, self->file_filter);
-
-    gtk_native_dialog_show(GTK_NATIVE_DIALOG(native));
-
-    g_signal_connect(native, "response",
-                     G_CALLBACK (on_add_model_response),
-                     self);
+    gtk_file_dialog_open(dialog, get_parent_window(self), NULL, on_add_model_response, g_object_ref(self));
 }
 
 static void on_builtin_toggled(LiveCaptionsSettings *self);
@@ -217,7 +200,7 @@ static void livecaptions_settings_class_init(LiveCaptionsSettingsClass *klass) {
 static gboolean deferred_update_keep_above(void *userdata) {
     LiveCaptionsSettings *self = userdata;
 
-    set_window_keep_above(GTK_WINDOW(self), g_settings_get_boolean(self->settings, "keep-on-top"));
+    set_window_keep_above(get_parent_window(self), g_settings_get_boolean(self->settings, "keep-on-top"));
 
     return G_SOURCE_REMOVE;
 }
@@ -226,7 +209,7 @@ static void model_load_failsafe(LiveCaptionsSettings *self, bool load_default);
 static void on_model_selected(GtkCheckButton* button, LiveCaptionsSettings *self){
     if(!gtk_check_button_get_active(button)) return;
 
-    const char *model = g_quark_to_string((GQuark)g_object_get_data(G_OBJECT(button), "lcap-model-path"));
+    const char *model = g_quark_to_string(GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(button), "lcap-model-path")));
     if(!asr_thread_update_model(self->application->asr, model)) {
         model_load_failsafe(self, false);
         return;
@@ -244,7 +227,7 @@ static void on_builtin_toggled(LiveCaptionsSettings *self) {
 }
 
 static void on_model_deleted(GtkButton *button, LiveCaptionsSettings *self) {
-    const char *model = g_quark_to_string((GQuark)g_object_get_data(G_OBJECT(button), "lcap-model-path"));
+    const char *model = g_quark_to_string(GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(button), "lcap-model-path")));
     if(g_str_equal(model, "/app/LiveCaptions/models/aprilv0_en-us.april")) return;
 
     char *active_model = g_settings_get_string(self->settings, "active-model");
@@ -306,7 +289,7 @@ static void insert_model_to_list(LiveCaptionsSettings *self, gchar *model) {
 
     g_free(active_model);
 
-    gpointer quark = (gpointer)g_quark_from_string(model);
+    gpointer quark = GUINT_TO_POINTER(g_quark_from_string(model));
 
     g_object_set_data(G_OBJECT(button), "lcap-model-path", quark);
     g_signal_connect(button, "toggled", G_CALLBACK(on_model_selected), self);
@@ -344,18 +327,10 @@ static void add_new_model(LiveCaptionsSettings *self, gchar *model) {
 }
 
 static void model_load_failsafe(LiveCaptionsSettings *self, bool load_default) {
-    GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL;
-    GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW(self),
-                                        flags,
-                                        GTK_MESSAGE_ERROR,
-                                        GTK_BUTTONS_CLOSE,
-                                        "Failed to load model!");
-    
-    gtk_window_present(GTK_WINDOW(dialog));
+    AdwDialog *dialog = adw_alert_dialog_new("Failed to load model!", NULL);
+    adw_alert_dialog_add_response(ADW_ALERT_DIALOG(dialog), "close", _("_Close"));
 
-    g_signal_connect(dialog, "response",
-                    G_CALLBACK (gtk_window_destroy),
-                    NULL);
+    adw_dialog_present(dialog, GTK_WIDGET(self));
     
     char *prev_model;
     if(load_default) {
@@ -369,15 +344,14 @@ static void model_load_failsafe(LiveCaptionsSettings *self, bool load_default) {
     if(load_default) gtk_check_button_set_active(self->radio_button_1, true);
 }
 
-static void on_add_model_response(GtkNativeDialog *native,
-                                  int        response,
-                                  LiveCaptionsSettings *self)
+static void on_add_model_response(GObject      *source,
+                                  GAsyncResult *result,
+                                  gpointer      user_data)
 {
-    if(response == GTK_RESPONSE_ACCEPT){
-        GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
+    LiveCaptionsSettings *self = LIVECAPTIONS_SETTINGS(user_data);
 
-        g_autoptr(GFile) file = gtk_file_chooser_get_file(chooser);
-        
+    g_autoptr(GFile) file = gtk_file_dialog_open_finish(GTK_FILE_DIALOG(source), result, NULL);
+    if(file != NULL){
         char *model = g_file_get_path(file);
 
 
@@ -385,7 +359,7 @@ static void on_add_model_response(GtkNativeDialog *native,
             model_load_failsafe(self, false);
 
             g_free(model);
-            g_object_unref(native);
+            g_object_unref(self);
             return;
         }
         
@@ -398,7 +372,7 @@ static void on_add_model_response(GtkNativeDialog *native,
         g_free(model);
     }
 
-    g_object_unref(native);
+    g_object_unref(self);
 }
 
 static void livecaptions_settings_init(LiveCaptionsSettings *self) {
@@ -427,7 +401,7 @@ static void livecaptions_settings_init(LiveCaptionsSettings *self) {
     sprintf(benchmark_result, "%.2f", (float)benchmark_result_v);
     gtk_label_set_text(self->benchmark_label, benchmark_result);
 
-    if(is_keep_above_supported(GTK_WINDOW(self))) {
+    if(is_keep_above_supported(GTK_WIDGET(self))) {
         g_settings_bind(self->settings, "keep-on-top", self->keep_above_switch, "active", G_SETTINGS_BIND_DEFAULT);
         gtk_widget_set_sensitive(GTK_WIDGET(self->keep_above_switch), true);
 
diff --git a/src/livecaptions-settings.h b/src/livecaptions-settings.h
index 0c68318..9ec5a74 100644
--- a/src/livecaptions-settings.h
+++ b/src/livecaptions-settings.h
@@ -22,7 +22,7 @@
 #include "livecaptions-application.h"
 
 struct _LiveCaptionsSettings {
-    AdwPreferencesWindow  parent_instance;
+    AdwPreferencesDialog  parent_instance;
 
     LiveCaptionsApplication *application;
 
@@ -59,6 +59,6 @@ G_BEGIN_DECLS
 
 #define LIVECAPTIONS_TYPE_SETTINGS (livecaptions_settings_get_type())
 
-G_DECLARE_FINAL_TYPE(LiveCaptionsSettings, livecaptions_settings, LIVECAPTIONS, SETTINGS, AdwPreferencesWindow)
+G_DECLARE_FINAL_TYPE(LiveCaptionsSettings, livecaptions_settings, LIVECAPTIONS, SETTINGS, AdwPreferencesDialog)
 
 G_END_DECLS
diff --git a/src/livecaptions-settings.ui b/src/livecaptions-settings.ui
index 9f3ac91..d36e1ac 100644
--- a/src/livecaptions-settings.ui
+++ b/src/livecaptions-settings.ui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <requires lib="libadwaita" version="1.0"/>
-  <template class="LiveCaptionsSettings" parent="AdwPreferencesWindow">
-    <property name="can-navigate-back">True</property>
+  <requires lib="libadwaita" version="1.5"/>
+  <template class="LiveCaptionsSettings" parent="AdwPreferencesDialog">
     <property name="search-enabled">False</property>
     <property name="title">Live Captions Preferences</property>
 
diff --git a/src/livecaptions-welcome.c b/src/livecaptions-welcome.c
index 4cc2693..50dd2df 100644
--- a/src/livecaptions-welcome.c
+++ b/src/livecaptions-welcome.c
@@ -25,14 +25,6 @@
 #include <april_api.h>
 #include <stdio.h>
 #include <time.h>
-#include <sys/time.h>
-
-uint64_t get_time_us(void) {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
 
 static void benchmark_dummy_handler(G_GNUC_UNUSED void* _userdata,
                                     G_GNUC_UNUSED AprilResultType _result,
@@ -43,17 +35,51 @@ static void benchmark_dummy_handler(G_GNUC_UNUSED void* _userdata,
 }
 
 
+// Amount of audio to transcribe, and the chunk size it is fed in
+#define BENCHMARK_AUDIO_SECONDS (30)
+#define BENCHMARK_CHUNKS_PER_SECOND (10)
+
+typedef struct {
+    LiveCaptionsWelcome *self;
+    gdouble value;
+} BenchmarkUpdate;
+
+static void benchmark_update_free(gpointer data) {
+    BenchmarkUpdate *update = data;
+    g_object_unref(update->self);
+    g_free(update);
+}
+
+// Hands a value to the main thread; the update holds a ref so self outlives it
+static void post_benchmark_update(LiveCaptionsWelcome *self, GSourceFunc func, gdouble value) {
+    BenchmarkUpdate *update = g_new(BenchmarkUpdate, 1);
+    update->self = g_object_ref(self);
+    update->value = value;
+
+    g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, func, update, benchmark_update_free);
+}
+
 static gboolean update_progress(gpointer userdata){
-    LiveCaptionsWelcome *self = userdata;
+    BenchmarkUpdate *update = userdata;
+    LiveCaptionsWelcome *self = update->self;
 
-    gtk_progress_bar_set_fraction(self->benchmark_progress, self->benchmark_progress_v);
+    if(g_atomic_int_get(&self->benchmark_cancelled)) return G_SOURCE_REMOVE;
+
+    gtk_progress_bar_set_fraction(self->benchmark_progress, update->value);
 
     return G_SOURCE_REMOVE;
 }
 
 
 static gboolean benchmark_finish(gpointer userdata){
-    LiveCaptionsWelcome *self = userdata;
+    BenchmarkUpdate *update = userdata;
+    LiveCaptionsWelcome *self = update->self;
+
+    if(g_atomic_int_get(&self->benchmark_cancelled)) return G_SOURCE_REMOVE;
+
+    self->benchmark_result_v = update->value;
+
+    gtk_progress_bar_set_fraction(self->benchmark_progress, 1.0);
 
     char result_txt[128];
     snprintf(result_txt, 128, "Result: %.2f", self->benchmark_result_v);
@@ -74,11 +100,17 @@ static gboolean benchmark_finish(gpointer userdata){
     return G_SOURCE_REMOVE;
 }
 
+// Measures how many seconds of audio the model transcribes per second of
+// wall-clock time. Owns a ref on self, released by the final update.
 static void *run_benchmark_thread(void *userdata) {
     LiveCaptionsWelcome *self = userdata;
+    double speed = 0.0;
 
     AprilASRModel model = asr_thread_get_model(self->application->asr);
-    g_assert(model != NULL);
+    if(model == NULL) {
+        printf("Benchmark: no model is loaded\n");
+        goto done;
+    }
 
     AprilConfig config = {
         .handler = benchmark_dummy_handler,
@@ -87,57 +119,72 @@ static void *run_benchmark_thread(void *userdata) {
     };
 
     AprilASRSession session = aas_create_session(model, config);
-    g_assert(session != NULL);
-
-    short noise_data[48000];
-    for(int i=0; i<48000; i++){
-        noise_data[i] = rand();
+    if(session == NULL) {
+        printf("Benchmark: failed to create session\n");
+        goto done;
     }
 
     size_t sr = aam_get_sample_rate(model);
-    g_assert(sr < 48000);
+    size_t chunk = sr / BENCHMARK_CHUNKS_PER_SECOND;
 
-    uint64_t begin = get_time_us();
+    // One second of noise, fed repeatedly
+    short *noise_data = g_new(short, sr);
+    for(size_t i=0; i<sr; i++){
+        noise_data[i] = (short)g_random_int_range(G_MINSHORT, G_MAXSHORT + 1);
+    }
 
+    // Warm up first so one-off initialization doesn't count against the result
+    aas_feed_pcm16(session, noise_data, sr);
+    aas_flush(session);
 
-    int idx = 0;
-    for(int sec=0; sec<30; sec++){
-        aas_feed_pcm16(session, &noise_data[idx], sr);
+    // Past this point the result is below the minimum anyway, so stop early
+    // rather than make slow machines wait
+    const double time_limit = BENCHMARK_AUDIO_SECONDS / MINIMUM_BENCHMARK_RESULT;
+    const int total_chunks = BENCHMARK_AUDIO_SECONDS * BENCHMARK_CHUNKS_PER_SECOND;
 
-        idx = (idx + sr) % 48000;
-        self->benchmark_progress_v = ((double)sec) / 30.0;
+    gint64 begin = g_get_monotonic_time();
+    double elapsed = 0.0;
+    int fed = 0;
 
+    while(fed < total_chunks && !g_atomic_int_get(&self->benchmark_cancelled)){
+        aas_feed_pcm16(session, &noise_data[(fed % BENCHMARK_CHUNKS_PER_SECOND) * chunk], chunk);
+        fed++;
 
-        uint64_t current = get_time_us();
-        double time_diff = (current - begin) / 1000.0 / 1000.0;
-        if(time_diff > 55.0) {
-            double speed = ((double)sec) / time_diff;
-            self->benchmark_result_v = speed;
-            
-            goto end;
-        }
+        if(fed == total_chunks) aas_flush(session);
 
-        g_idle_add(update_progress, self);
-    }
+        elapsed = (g_get_monotonic_time() - begin) / (double)G_USEC_PER_SEC;
+        if(elapsed > time_limit) break;
 
-    uint64_t end = get_time_us();
-    double time_diff = (end - begin) / 1000.0 / 1000.0;
-
-    double speed = 30.0 / time_diff;
-    self->benchmark_result_v = speed;
+        post_benchmark_update(self, update_progress, (double)fed / total_chunks);
+    }
 
-end:
     aas_free(session);
+    g_free(noise_data);
 
-    g_idle_add(benchmark_finish, self);
+    if(elapsed > 0.0) {
+        speed = ((double)fed / BENCHMARK_CHUNKS_PER_SECOND) / elapsed;
+    }
+
+done:
+    post_benchmark_update(self, benchmark_finish, speed);
+    g_object_unref(self);
 
     return NULL;
 }
 
 static void start_benchmark(LiveCaptionsWelcome *self){
-    self->benchmark_thread = g_thread_new("initial-benchmark", run_benchmark_thread, self);
+    g_atomic_int_set(&self->benchmark_cancelled, 0);
+    gtk_progress_bar_set_fraction(self->benchmark_progress, 0.0);
 
-    g_assert(self->benchmark_thread != NULL);
+    self->benchmark_thread = g_thread_new("initial-benchmark", run_benchmark_thread, g_object_ref(self));
+}
+
+static void stop_benchmark(LiveCaptionsWelcome *self){
+    if(self->benchmark_thread == NULL) return;
+
+    g_atomic_int_set(&self->benchmark_cancelled, 1);
+    g_thread_join(self->benchmark_thread);
+    self->benchmark_thread = NULL;
 }
 
 
@@ -173,11 +220,8 @@ static gboolean quit_after_1s(G_GNUC_UNUSED gpointer user_data) {
 
 const char perf_url[] = "https://github.com/abb128/LiveCaptions/issues/40";
 static void report_perf_cb(LiveCaptionsWelcome *self){
-    gtk_show_uri(
-        GTK_WINDOW(self),
-        perf_url,
-        GDK_CURRENT_TIME
-    );
+    g_autoptr(GtkUriLauncher) launcher = gtk_uri_launcher_new(perf_url);
+    gtk_uri_launcher_launch(launcher, GTK_WINDOW(self), NULL, NULL, NULL);
 
     // Quitting here quits before uri is shown, need to wait a moment
     self->quit_time = time(NULL);
@@ -188,9 +232,27 @@ static void cancel_cb(LiveCaptionsWelcome *self){
     livecaptions_application_finish_setup(self->application, -1.0);
 }
 
+// The benchmark thread holds a ref, so dispose won't run while it is alive;
+// stop it when the window goes away instead
+static void livecaptions_welcome_unrealize(GtkWidget *widget) {
+    stop_benchmark(LIVECAPTIONS_WELCOME(widget));
+
+    GTK_WIDGET_CLASS(livecaptions_welcome_parent_class)->unrealize(widget);
+}
+
+static void livecaptions_welcome_dispose(GObject *object) {
+    stop_benchmark(LIVECAPTIONS_WELCOME(object));
+
+    G_OBJECT_CLASS(livecaptions_welcome_parent_class)->dispose(object);
+}
+
 static void livecaptions_welcome_class_init (LiveCaptionsWelcomeClass *klass) {
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
+    object_class->dispose = livecaptions_welcome_dispose;
+    widget_class->unrealize = livecaptions_welcome_unrealize;
+
     gtk_widget_class_set_template_from_resource(widget_class, "/net/sapples/LiveCaptions/livecaptions-welcome.ui");
     gtk_widget_class_bind_template_child(widget_class, LiveCaptionsWelcome, stack);
     gtk_widget_class_bind_template_child(widget_class, LiveCaptionsWelcome, initial_page);
diff --git a/src/livecaptions-welcome.h b/src/livecaptions-welcome.h
index 2af4b36..a2fa355 100644
--- a/src/livecaptions-welcome.h
+++ b/src/livecaptions-welcome.h
@@ -50,9 +50,10 @@ struct _LiveCaptionsWelcome {
     GtkLabel *bad_label;
 
     GThread *benchmark_thread;
+    gint benchmark_cancelled;
 
-    volatile gdouble benchmark_progress_v;
-    volatile gdouble benchmark_result_v;
+    // Only touched on the main thread; the benchmark thread reports via idle callbacks
+    gdouble benchmark_result_v;
 
     time_t quit_time;
 };
diff --git a/src/livecaptions-window.c b/src/livecaptions-window.c
index fe328f4..03187e1 100644
--- a/src/livecaptions-window.c
+++ b/src/livecaptions-window.c
@@ -59,7 +59,8 @@ static void update_line_width(LiveCaptionsWindow *self){
 
     int preferred_width = g_settings_get_int(self->settings, "line-width");
     size_t text_len = sizeof(LINE_WIDTH_TEXT_TEMPLATE);
-    if(preferred_width < text_len) text_len = preferred_width;
+    if (preferred_width >= 0 && (size_t)preferred_width < text_len)
+        text_len = (size_t)preferred_width;
 
     int width, height;
     PangoLayout *layout = gtk_label_get_layout(self->label);
@@ -108,7 +109,7 @@ static void update_window_transparency(LiveCaptionsWindow *self) {
 
         char css_data[256];
         snprintf(css_data, 256, ".transparent-mode {\nbackground-color: #000000%02X;\n}", transparency);
-        gtk_css_provider_load_from_data(self->css_provider, css_data, -1);
+        gtk_css_provider_load_from_string(self->css_provider, css_data);
     }else{
         gtk_widget_remove_css_class(GTK_WIDGET(self), "transparent-mode");
     }
@@ -195,8 +196,9 @@ static void livecaptions_window_init(LiveCaptionsWindow *self) {
     self->settings = g_settings_new("net.sapples.LiveCaptions");
 
     self->css_provider = gtk_css_provider_new();
-    GtkStyleContext *context = gtk_widget_get_style_context(GTK_WIDGET(self));
-    gtk_style_context_add_provider(context, GTK_STYLE_PROVIDER(self->css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    gtk_style_context_add_provider_for_display(gtk_widget_get_display(GTK_WIDGET(self)),
+                                               GTK_STYLE_PROVIDER(self->css_provider),
+                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
     g_signal_connect(self->settings, "changed", G_CALLBACK(on_settings_change), self);
     
diff --git a/src/livecaptions-window.h b/src/livecaptions-window.h
index 7297c0d..d2e493e 100644
--- a/src/livecaptions-window.h
+++ b/src/livecaptions-window.h
@@ -43,7 +43,7 @@ struct _LiveCaptionsWindow {
     GtkWidget *slow_warning;
     GtkWidget *slowest_warning;
 
-    volatile PangoLayout *font_layout;
+    PangoLayout *font_layout;
     volatile size_t font_layout_counter;
     volatile int max_text_width;
 
diff --git a/src/main.c b/src/main.c
index 90a27fb..782ccac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,7 +68,7 @@ int main (int argc, char *argv[]) {
         * application windows, integration with the window manager/compositor, and
         * desktop features such as file opening and single-instance applications.
         */
-        app = livecaptions_application_new("net.sapples.LiveCaptions", G_APPLICATION_FLAGS_NONE);
+        app = livecaptions_application_new("net.sapples.LiveCaptions", G_APPLICATION_DEFAULT_FLAGS);
 
 
         app->asr = asr;
diff --git a/src/meson.build b/src/meson.build
index 08e0cf0..8d96bcb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,7 +19,8 @@ livecaptions_sources = [
 cc = meson.get_compiler('c')
 
 livecaptions_deps = [
-  dependency('libadwaita-1', version: '>= 1.0'),
+  dependency('libadwaita-1', version: '>= 1.5'),
+  dependency('gtk4', version: '>= 4.12'),
   #dependency('libpipewire-0.3', version: '>=0.3.41'),
   dependency('libpulse'),
   dependency('x11'),
diff --git a/src/profanity-filter.c b/src/profanity-filter.c
index 373b294..604f8ae 100644
--- a/src/profanity-filter.c
+++ b/src/profanity-filter.c
@@ -130,7 +130,7 @@ size_t get_filter_skip_history(const struct history_token *tokens,
                                FilterMode mode)
 {
     // Construct a list of AprilToken * and copy data
-    AprilToken *a_tokens = calloc(sizeof(AprilToken), count);
+    AprilToken *a_tokens = calloc(count, sizeof(*a_tokens));
     for(size_t i=0; i<count; i++){
         a_tokens[i].token   = &tokens[i].token[0];
         a_tokens[i].flags   = tokens[i].flags;
diff --git a/src/window-helper.c b/src/window-helper.c
index 17c491c..f2b9bc5 100644
--- a/src/window-helper.c
+++ b/src/window-helper.c
@@ -23,6 +23,9 @@
 #include <gdk/wayland/gdkwayland.h>
 
 static bool set_window_keep_above_wayland(GtkWindow *window, bool keep_above) {
+    (void)window;
+    (void)keep_above;
+
     // TODO: Plasma: https://wayland.app/protocols/kde-plasma-window-management#org_kde_plasma_window_management:enum:state:entry:keep_above
 
     return false;
@@ -35,6 +38,9 @@ static bool set_window_keep_above_wayland(GtkWindow *window, bool keep_above) {
 #define _NET_WM_STATE_REMOVE        0    /* remove/unset property */
 #define _NET_WM_STATE_ADD           1    /* add/set property */
 #define _NET_WM_STATE_TOGGLE        2    /* toggle property  */
+
+// GTK deprecated its whole X11 backend with no replacement for these accessors
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static bool set_window_keep_above_x11(GtkWindow *window, bool keep_above) {
     GdkX11Display *display = GDK_X11_DISPLAY(gtk_widget_get_display(GTK_WIDGET(window)));
     GdkX11Surface *surface = GDK_X11_SURFACE(gtk_native_get_surface(gtk_widget_get_native(GTK_WIDGET(window))));
@@ -60,6 +66,7 @@ static bool set_window_keep_above_x11(GtkWindow *window, bool keep_above) {
 
     return true;
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 #endif
 
 
@@ -69,10 +76,10 @@ void override_keep_above_system(bool override) {
     is_keep_above_overridden = override;
 }
 
-bool is_keep_above_supported(GtkWindow *window) {
+bool is_keep_above_supported(GtkWidget *widget) {
     if(is_keep_above_overridden) return true;
 
-    GdkDisplay *display = gtk_widget_get_display(GTK_WIDGET(window));
+    GdkDisplay *display = gtk_widget_get_display(widget);
 
     #ifdef GDK_WINDOWING_X11
     if(GDK_IS_X11_DISPLAY(display))
diff --git a/src/window-helper.h b/src/window-helper.h
index 6ce39fd..72b728c 100644
--- a/src/window-helper.h
+++ b/src/window-helper.h
@@ -21,7 +21,7 @@
 
 void override_keep_above_system(bool override);
 
-bool is_keep_above_supported(GtkWindow *window);
+bool is_keep_above_supported(GtkWidget *widget);
 
 // Returns false if impossible to set keep above
 bool set_window_keep_above(GtkWindow *window, bool keep_above);
diff --git a/subprojects/april-asr b/subprojects/april-asr
index 8b52f65..95c6015 160000
--- a/subprojects/april-asr
+++ b/subprojects/april-asr
@@ -1 +1 @@
-Subproject commit 8b52f65dd3fbfa58064de85ab78237335b9de911
+Subproject commit 95c6015c496dd42b9efd607670be3eecaa7df5c1