diff --git a/demos b/demos
index bb5df9b69..0db011334 160000
--- a/demos
+++ b/demos
@@ -1 +1 @@
-Subproject commit bb5df9b69152334e67dc79a31db4e7f0ba884141
+Subproject commit 0db011334ad15bfc60ef4aaca6c90a1dec7d705c
diff --git a/src/Library/Library.blp b/src/Library/Library.blp
index 240898c9a..e0a17e639 100644
--- a/src/Library/Library.blp
+++ b/src/Library/Library.blp
@@ -1,75 +1,84 @@
 using Gtk 4.0;
 using Adw 1;
 
-Adw.PreferencesWindow window {
+Adw.Window window {
   hide-on-close: true;
   modal: false;
   title: _("Workbench — Library");
   default-height: 700;
   default-width: 700;
 
-  Adw.PreferencesPage {
-    Adw.PreferencesGroup {
-      Picture picture_illustration {
-        can-shrink: false;
-        margin-bottom: 32;
-      }
+  Adw.ToolbarView toolbar_view {
+    [top]
+    Adw.HeaderBar header_bar {
+      title-widget: Adw.WindowTitle {
+        title: _("Workbench — Library");
+      };
+    }
+
+    content: Adw.PreferencesPage {
+      Adw.PreferencesGroup {
+        Picture picture_illustration {
+          can-shrink: false;
+          margin-bottom: 32;
+        }
 
-      Label {
-        label: _("Learn, Test, Remix");
+        Label {
+          label: _("Learn, Test, Remix");
 
-        styles [
-          "title-1"
-        ]
+          styles [
+            "title-1"
+          ]
+        }
       }
-    }
 
-    Adw.PreferencesGroup library_uncategorized {}
+      Adw.PreferencesGroup library_uncategorized {}
 
-    Adw.PreferencesGroup library_tools {
-      title: _("Tools");
-    }
+      Adw.PreferencesGroup library_tools {
+        title: _("Tools");
+      }
 
-    Adw.PreferencesGroup library_network {
-      title: _("Network");
-    }
+      Adw.PreferencesGroup library_network {
+        title: _("Network");
+      }
 
-    Adw.PreferencesGroup library_controls {
-      title: _("Controls");
-    }
+      Adw.PreferencesGroup library_controls {
+        title: _("Controls");
+      }
 
-    Adw.PreferencesGroup library_layout {
-      title: _("Layout");
-    }
+      Adw.PreferencesGroup library_layout {
+        title: _("Layout");
+      }
 
-    Adw.PreferencesGroup library_feedback {
-      title: _("Feedback");
-    }
+      Adw.PreferencesGroup library_feedback {
+        title: _("Feedback");
+      }
 
-    Adw.PreferencesGroup library_navigation {
-      title: _("Navigation");
-    }
+      Adw.PreferencesGroup library_navigation {
+        title: _("Navigation");
+      }
 
-    Adw.PreferencesGroup library_user_interface {
-      title: _("User Interface");
-    }
+      Adw.PreferencesGroup library_user_interface {
+        title: _("User Interface");
+      }
 
-    Adw.PreferencesGroup library_platform {
-      title: _("Platform APIs");
-    }
+      Adw.PreferencesGroup library_platform {
+        title: _("Platform APIs");
+      }
 
-    Adw.PreferencesGroup {
-      vexpand: true;
-      valign: end;
+      Adw.PreferencesGroup {
+        vexpand: true;
+        valign: end;
 
-      Label {
-        label: _('All examples are dedicated to the public domain\nand <b>can be used freely</b> under the terms of <a href="https://creativecommons.org/publicdomain/zero/1.0/">CC0 1.0</a>');
-        use-markup: true;
+        Label {
+          label: _("All examples are dedicated to the public domain\nand <b>can be used freely</b> under the terms of <a href=\"https://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0</a>");
+          use-markup: true;
 
-        styles [
-          "caption"
-        ]
+          styles [
+            "caption"
+          ]
+        }
       }
-    }
+    };
   }
 }