diff --git a/data/gtk/details_window.blp b/data/gtk/details_window.blp
index 085a08d..35f6746 100644
--- a/data/gtk/details_window.blp
+++ b/data/gtk/details_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template DetailsWindow : Adw.Window {
+template $DetailsWindow : Adw.Window {
     default-width: 500;
     default-height: -1;
     modal: true;
@@ -119,7 +119,7 @@ template DetailsWindow : Adw.Window {
                     icon-name: "help-about-symbolic";
 
                     popover: Popover {
-                        visible: bind exec_info_button.active bidirectional;
+                        visible: bind-property exec_info_button.active bidirectional;
 
                         Label exec_info_label {
                             use-markup: true;
diff --git a/data/gtk/game.blp b/data/gtk/game.blp
index 433a39d..a1251bb 100644
--- a/data/gtk/game.blp
+++ b/data/gtk/game.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template Game : Box {
+template $Game : Box {
   orientation: vertical;
   halign: center;
   valign: start;
diff --git a/data/gtk/preferences.blp b/data/gtk/preferences.blp
index 85e551c..44de14b 100644
--- a/data/gtk/preferences.blp
+++ b/data/gtk/preferences.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template PreferencesWindow : Adw.PreferencesWindow {
+template $PreferencesWindow : Adw.PreferencesWindow {
   default-height: 500;
 
   Adw.PreferencesPage general_page {
diff --git a/data/gtk/window.blp b/data/gtk/window.blp
index e7ee24d..6cdc609 100644
--- a/data/gtk/window.blp
+++ b/data/gtk/window.blp
@@ -44,7 +44,7 @@ Adw.StatusPage hidden_notice_empty {
   valign: center;
 }
 
-template CartridgesWindow : Adw.ApplicationWindow {
+template $CartridgesWindow : Adw.ApplicationWindow {
   title: _("Cartridges");
 
   Adw.ToastOverlay toast_overlay {
@@ -269,7 +269,7 @@ template CartridgesWindow : Adw.ApplicationWindow {
         }
 
         SearchBar search_bar {
-          search-mode-enabled: bind search_button.active bidirectional;
+          search-mode-enabled: bind-property search_button.active bidirectional;
           key-capture-widget: library_view;
           Adw.Clamp {
             maximum-size: 500;
@@ -334,7 +334,7 @@ template CartridgesWindow : Adw.ApplicationWindow {
         }
 
         SearchBar hidden_search_bar {
-          search-mode-enabled: bind hidden_search_button.active bidirectional;
+          search-mode-enabled: bind-property hidden_search_button.active bidirectional;
           key-capture-widget: hidden_library_view;
           Adw.Clamp {
             maximum-size: 500;