diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efee5f155..2a0c87d55 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
       with:
         bundle: page.kramo.Cartridges.Devel.flatpak
         manifest-path: flatpak/page.kramo.Cartridges.Devel.json
+        repository-url: https://nightly.gnome.org/gnome-nightly.flatpakrepo
+	repository-name: gnome-nightly
 
   windows:
     name: Windows
diff --git a/cartridges/preferences.py b/cartridges/preferences.py
index fc79b07fc..ba1f85cb4 100644
--- a/cartridges/preferences.py
+++ b/cartridges/preferences.py
@@ -112,9 +112,8 @@ class CartridgesPreferences(Adw.PreferencesDialog):
     sgdb_spinner = Gtk.Template.Child()
 
     danger_zone_group = Gtk.Template.Child()
-    remove_all_games_list_box = Gtk.Template.Child()
-    reset_list_box = Gtk.Template.Child()
-    reset_group = Gtk.Template.Child()
+    remove_all_games_button_row = Gtk.Template.Child()
+    reset_button_row = Gtk.Template.Child()
 
     removed_games: set[Game] = set()
     warning_menu_buttons: dict = {}
@@ -144,12 +143,12 @@ def __init__(self, **kwargs: Any) -> None:
         self.add_controller(shortcut_controller)
 
         # General
-        self.remove_all_games_list_box.connect("row-activated", self.remove_all_games)
+        self.remove_all_games_button_row.connect("activated", self.remove_all_games)
 
         # Debug
         if shared.PROFILE == "development":
-            self.reset_group.set_visible(True)
-            self.reset_list_box.connect("row-activated", self.reset_app)
+            self.reset_button_row.set_visible(True)
+            self.reset_button_row.connect("activated", self.reset_app)
 
         # Sources settings
         for source_class in (
diff --git a/data/gtk/preferences.blp b/data/gtk/preferences.blp
index b60451553..27c03c1ad 100644
--- a/data/gtk/preferences.blp
+++ b/data/gtk/preferences.blp
@@ -33,76 +33,21 @@ template $CartridgesPreferences: Adw.PreferencesDialog {
 
     Adw.PreferencesGroup danger_zone_group {
       title: _("Danger Zone");
+      separate-rows: true;
 
-      ListBox remove_all_games_list_box {
-        Adw.PreferencesRow {
-          activatable: true;
-          selectable: false;
-
-          Box {
-            spacing: 6;
-            valign: center;
-            halign: center;
-
-            Label {
-              label: _("Remove All Games");
-              ellipsize: end;
-
-              styles [
-                "heading",
-              ]
-            }
-
-            styles [
-              "header",
-            ]
-          }
-
-          styles [
-            "error",
-          ]
-        }
+      Adw.ButtonRow remove_all_games_button_row {
+        title: _("Remove All Games");
 
         styles [
-          "boxed-list",
+          "destructive-action"
         ]
       }
-    }
 
-    Adw.PreferencesGroup reset_group {
-      visible: false;
-
-      ListBox reset_list_box {
-        Adw.PreferencesRow {
-          activatable: true;
-          selectable: false;
-
-          Box {
-            spacing: 6;
-            valign: center;
-            halign: center;
-
-            Label {
-              label: "Reset App";
-              ellipsize: end;
-
-              styles [
-                "heading",
-              ]
-            }
-
-            styles [
-              "header",
-            ]
-          }
-
-          styles [
-            "error",
-          ]
-        }
+      Adw.ButtonRow reset_button_row {
+        title: _("Reset App");
 
         styles [
-          "boxed-list",
+          "destructive-action"
         ]
       }
     }
@@ -123,6 +68,7 @@ template $CartridgesPreferences: Adw.PreferencesDialog {
 
     Adw.PreferencesGroup sources_group {
       title: _("Sources");
+      separate-rows: true;
 
       Adw.ExpanderRow steam_expander_row {
         title: _("Steam");
diff --git a/flatpak/page.kramo.Cartridges.Devel.json b/flatpak/page.kramo.Cartridges.Devel.json
index 1354e60e1..291200c5b 100644
--- a/flatpak/page.kramo.Cartridges.Devel.json
+++ b/flatpak/page.kramo.Cartridges.Devel.json
@@ -1,7 +1,7 @@
 {
     "id" : "page.kramo.Cartridges.Devel",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "46",
+    "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "command" : "cartridges",
     "finish-args" : [