4 files changed, 8 insertions, 5 deletions
diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp
index 8618a0e..6c7829f 100644
--- a/ui/include/turns/ui/windows/participant_editor.hpp
+++ b/ui/include/turns/ui/windows/participant_editor.hpp
@@ -1,6 +1,7 @@
 #ifndef TURNS_UI_WINDOWS_PARTICIPANT_EDITOR_HPP
 #define TURNS_UI_WINDOWS_PARTICIPANT_EDITOR_HPP
 
+#include "turns/adw/dialog.hpp"
 #include "turns/core/fwd.hpp"
 
 #include <sigc++/signal.h>
@@ -20,7 +21,7 @@
 namespace turns::ui::windows
 {
 
-  struct participant_editor : Gtk::Widget
+  struct participant_editor : adw::Dialog
   {
     using signal_finished_type = sigc::signal<void(Glib::ustring, float, core::disposition)>;
 
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp
index 8f44d08..da302ce 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/windows/tracker.hpp
@@ -1,6 +1,7 @@
 #ifndef TURNS_UI_WINDOWS_TRACKER_HPP
 #define TURNS_UI_WINDOWS_TRACKER_HPP
 
+#include "turns/adw/applicationwindow.hpp"
 #include "turns/adw/toastoverlay.hpp"
 #include "turns/core/turn_order.hpp"
 #include "turns/ui/widgets/turn_order_view.hpp"
@@ -31,7 +32,7 @@
 namespace turns::ui::windows
 {
 
-  struct tracker : Gtk::ApplicationWindow
+  struct tracker : adw::ApplicationWindow
   {
     tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<Gio::Settings> settings);
 
diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp
index a14593b..719bb1c 100644
--- a/ui/src/windows/participant_editor.cpp
+++ b/ui/src/windows/participant_editor.cpp
@@ -1,5 +1,6 @@
 #include "turns/ui/windows/participant_editor.hpp"
 
+#include "turns/adw/dialog.hpp"
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
@@ -34,7 +35,7 @@ namespace turns::ui::windows
 {
 
   participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj)
-      : Gtk::Widget{base}
+      : adw::Dialog{base}
       , m_adw{ADW_DIALOG(Glib::unwrap(this))}
       , m_disposition{ADW_COMBO_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("disposition")))}
       , m_finish{builder->get_widget<Gtk::Button>("finish")}
diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp
index cd32bee..760833b 100644
--- a/ui/src/windows/tracker.cpp
+++ b/ui/src/windows/tracker.cpp
@@ -1,5 +1,6 @@
 #include "turns/ui/windows/tracker.hpp"
 
+#include "turns/adw/applicationwindow.hpp"
 #include "turns/adw/toast.hpp"
 #include "turns/adw/toastoverlay.hpp"
 #include "turns/core/turn_order.hpp"
@@ -33,7 +34,6 @@
 #include <gtkmm/styleprovider.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
 #include <gtk/gtk.h>
 #include <nlohmann/json.hpp>
 
@@ -47,7 +47,7 @@ namespace turns::ui::windows
 {
 
   tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<Gio::Settings> settings)
-      : Gtk::ApplicationWindow{base}
+      : adw::ApplicationWindow{base}
       , m_controls{builder->get_widget<Gtk::Revealer>("controls")}
       , m_empty{builder->get_widget<Gtk::Widget>("empty")}
       , m_overlay{builder->get_widget<adw::ToastOverlay>("overlay")}