diff --git a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
index 6a15bd614..ea3af837a 100644
--- a/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
+++ b/build-aux/flatpak/com.github.GradienceTeam.Gradience.json
@@ -63,7 +63,7 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler.git",
-                    "tag" : "v0.8.1"
+                    "tag" : "v0.10.0"
                 }
             ]
         },
diff --git a/data/ui/app_type_dialog.blp b/data/ui/app_type_dialog.blp
index b222ca30d..58544be87 100644
--- a/data/ui/app_type_dialog.blp
+++ b/data/ui/app_type_dialog.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceAppTypeDialog : Adw.MessageDialog {
+template $GradienceAppTypeDialog : Adw.MessageDialog {
   [extra-child]
   Box {
     orientation: vertical;
diff --git a/data/ui/builtin_preset_row.blp b/data/ui/builtin_preset_row.blp
index 2880982b2..8e495e0e0 100644
--- a/data/ui/builtin_preset_row.blp
+++ b/data/ui/builtin_preset_row.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceBuiltinPresetRow : Adw.ActionRow {
+template $GradienceBuiltinPresetRow : Adw.ActionRow {
   subtitle: _("Made by @GradienceTeam");
   activatable-widget: apply_button;
 
@@ -10,7 +10,7 @@ template GradienceBuiltinPresetRow : Adw.ActionRow {
     valign: center;
     icon-name: "checkmark-large-symbolic";
     tooltip-text: _("Apply Preset");
-    clicked => on_apply_button_clicked();
+    clicked => $on_apply_button_clicked();
     styles [
       "flat",
     ]
diff --git a/data/ui/custom_css_group.blp b/data/ui/custom_css_group.blp
index 59007564e..38f2fb883 100644
--- a/data/ui/custom_css_group.blp
+++ b/data/ui/custom_css_group.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceCustomCSSGroup : Adw.PreferencesGroup {
+template $GradienceCustomCSSGroup : Adw.PreferencesGroup {
   title: _("Custom CSS");
   description: _("Changing this may break some programs. Libadwaita allows applications to hardcode values like padding and margins, and using custom CSS may cause unintended breakage.");
 
@@ -9,7 +9,7 @@ template GradienceCustomCSSGroup : Adw.PreferencesGroup {
   DropDown app_type_dropdown {
     valign: start;
     model: app_type_list;
-    notify => on_dropdown_notify();
+    notify => $on_dropdown_notify();
   }
 
   ScrolledWindow {
@@ -23,7 +23,7 @@ template GradienceCustomCSSGroup : Adw.PreferencesGroup {
       bottom-margin: 10;
       monospace: true;
       buffer: TextBuffer {
-        changed => on_custom_css_changed();
+        changed => $on_custom_css_changed();
       };
     }
   }
diff --git a/data/ui/error_list_row.blp b/data/ui/error_list_row.blp
index 5db9a03bd..d6eb0221c 100644
--- a/data/ui/error_list_row.blp
+++ b/data/ui/error_list_row.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceErrorListRow : ListBoxRow {
+template $GradienceErrorListRow : ListBoxRow {
   Box {
     orientation: vertical;
     margin-top: 6;
diff --git a/data/ui/explore_preset_row.blp b/data/ui/explore_preset_row.blp
index b20bcd45c..62d598c56 100644
--- a/data/ui/explore_preset_row.blp
+++ b/data/ui/explore_preset_row.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceExplorePresetRow : Adw.ActionRow {
+template $GradienceExplorePresetRow : Adw.ActionRow {
   activatable-widget: apply_button;
 
   Box {
@@ -21,7 +21,7 @@ template GradienceExplorePresetRow : Adw.ActionRow {
       valign: center;
       icon-name: "checkmark-large-symbolic";
       tooltip-text: _("Download and Apply");
-      clicked => on_apply_button_clicked();
+      clicked => $on_apply_button_clicked();
 
       styles [
         "flat",
@@ -32,7 +32,7 @@ template GradienceExplorePresetRow : Adw.ActionRow {
       valign: center;
       icon-name: "folder-download-symbolic";
       tooltip-text: _("Download Only");
-      clicked => on_download_button_clicked();
+      clicked => $on_download_button_clicked();
 
       styles [
         "flat",
diff --git a/data/ui/log_out_dialog.blp b/data/ui/log_out_dialog.blp
index fd8087d70..cecb927cd 100644
--- a/data/ui/log_out_dialog.blp
+++ b/data/ui/log_out_dialog.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceLogOutDialog : Adw.MessageDialog {
+template $GradienceLogOutDialog : Adw.MessageDialog {
   heading: _("Log out");  // TODO: redundant? how can we not repeat ourselves?
   body: _("Log out to allow changes to take effect.");
 }
diff --git a/data/ui/monet_theming_group.blp b/data/ui/monet_theming_group.blp
index 0903a0dfb..d8ef65954 100644
--- a/data/ui/monet_theming_group.blp
+++ b/data/ui/monet_theming_group.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceMonetThemingGroup : Adw.PreferencesGroup {
+template $GradienceMonetThemingGroup : Adw.PreferencesGroup {
   title: _("Monet Engine");
   description: _("Monet Engine generates a Material You color palette from an image.");
 
@@ -15,7 +15,7 @@ template GradienceMonetThemingGroup : Adw.PreferencesGroup {
       valign: center;
       label: _("Apply");
       tooltip-text: _("Apply a palette");
-      clicked => on_apply_button_clicked();
+      clicked => $on_apply_button_clicked();
       styles ["suggested-action"]
     }
 
@@ -26,7 +26,7 @@ template GradienceMonetThemingGroup : Adw.PreferencesGroup {
       [suffix]
       Button file-chooser-button {
         valign: center;
-        clicked => on_file_chooser_button_clicked();
+        clicked => $on_file_chooser_button_clicked();
 
         Adw.ButtonContent {
           icon-name: "folder-pictures-symbolic";
diff --git a/data/ui/no_plugin_window.blp b/data/ui/no_plugin_window.blp
index fac7f4677..e9ab7d49a 100644
--- a/data/ui/no_plugin_window.blp
+++ b/data/ui/no_plugin_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceNoPluginPrefWindow : Adw.PreferencesWindow {
+template $GradienceNoPluginPrefWindow : Adw.PreferencesWindow {
   title: _("Plugin Preferences");
   search-enabled: false;
   default-height: 400;
diff --git a/data/ui/option_row.blp b/data/ui/option_row.blp
index 1b30f1f60..470b77a2e 100644
--- a/data/ui/option_row.blp
+++ b/data/ui/option_row.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceOptionRow : Adw.ActionRow {
+template $GradienceOptionRow : Adw.ActionRow {
   activatable-widget: color-value;
 
   [suffix]
@@ -45,7 +45,7 @@ template GradienceOptionRow : Adw.ActionRow {
     tooltip-text: _("Show Hex");
     styles ["flat"]
 
-    toggled => on_text_value_toggled();
+    toggled => $on_text_value_toggled();
   }
 }
 
diff --git a/data/ui/palette_shades.blp b/data/ui/palette_shades.blp
index 64dce7c88..5f25e0062 100644
--- a/data/ui/palette_shades.blp
+++ b/data/ui/palette_shades.blp
@@ -1,4 +1,4 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradiencePaletteShades : Adw.ActionRow {}
\ No newline at end of file
+template $GradiencePaletteShades : Adw.ActionRow {}
diff --git a/data/ui/plugin_row.blp b/data/ui/plugin_row.blp
index f6ee9f510..2a0305d37 100644
--- a/data/ui/plugin_row.blp
+++ b/data/ui/plugin_row.blp
@@ -1,14 +1,14 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradiencePluginRow : Adw.ActionRow {
+template $GradiencePluginRow : Adw.ActionRow {
   activatable-widget: switch;
 
   [suffix]
   Switch switch {
     valign: center;
     tooltip-text: _("Toggle Plugin");
-    state-set => on_switch_toggled();
+    state-set => $on_switch_toggled();
   }
 
   [suffix]
@@ -16,7 +16,7 @@ template GradiencePluginRow : Adw.ActionRow {
     valign: center;
     icon-name: "settings-symbolic";
     tooltip-text: _("Preferences");
-    clicked => on_settings_plugin_clicked();
+    clicked => $on_settings_plugin_clicked();
 
     styles [
       "flat",
@@ -28,6 +28,6 @@ template GradiencePluginRow : Adw.ActionRow {
     valign: center;
     icon-name: "user-trash-symbolic";
     tooltip-text: _("Remove Plugin");
-    clicked => on_remove_plugin_clicked();
+    clicked => $on_remove_plugin_clicked();
   }
 }
diff --git a/data/ui/preferences_window.blp b/data/ui/preferences_window.blp
index 2df2d6aed..01bdebea4 100644
--- a/data/ui/preferences_window.blp
+++ b/data/ui/preferences_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradiencePreferencesWindow : Adw.PreferencesWindow {
+template $GradiencePreferencesWindow : Adw.PreferencesWindow {
   title: _("Preferences");
   default-height: 400;
   default-width: 600;
@@ -66,7 +66,7 @@ template GradiencePreferencesWindow : Adw.PreferencesWindow {
       }
     }
 
-      
+
     // NOTE: This group is disabled as there isn't yet any implementation of custom repositories in Gradience
     Adw.PreferencesGroup custom_repository_group {
       visible: false;
diff --git a/data/ui/preset_row.blp b/data/ui/preset_row.blp
index 56b1cecd4..1b92a27dd 100644
--- a/data/ui/preset_row.blp
+++ b/data/ui/preset_row.blp
@@ -29,11 +29,11 @@ using Adw 1;
 //   }
 // }
 
-template GradiencePresetRow : Adw.ExpanderRow {
+template $GradiencePresetRow : Adw.ExpanderRow {
   [action]
   Button star_button {
     valign: center;
-    clicked => on_star_button_clicked();
+    clicked => $on_star_button_clicked();
     styles ["flat"]
   }
 
@@ -48,13 +48,13 @@ template GradiencePresetRow : Adw.ExpanderRow {
       valign: center;
       icon-name: "checkmark-large-symbolic";
       tooltip-text: _("Apply Preset");
-      clicked => on_apply_button_clicked();
+      clicked => $on_apply_button_clicked();
       styles ["flat"]
     }
 
     Entry name_entry {
       text: "Name";
-      changed => on_name_entry_changed();
+      changed => $on_name_entry_changed();
     }
   }
 
@@ -63,7 +63,7 @@ template GradiencePresetRow : Adw.ExpanderRow {
     valign: center;
     icon-name: "document-edit-symbolic";
     tooltip-text: _("Rename Preset");
-    toggled => on_name_entry_toggled();
+    toggled => $on_name_entry_toggled();
     styles ["flat"]
   }
 
@@ -100,7 +100,7 @@ template GradiencePresetRow : Adw.ExpanderRow {
       valign: center;
       icon-name: "bug-symbolic";
       tooltip-text: _("Report Preset Issue");
-      clicked => on_report_button_clicked();
+      clicked => $on_report_button_clicked();
     }
 
     [suffix]
@@ -108,7 +108,7 @@ template GradiencePresetRow : Adw.ExpanderRow {
       valign: center;
       label: _("Remove preset");
       tooltip-text: _("Remove Preset");
-      clicked => on_remove_button_clicked();
+      clicked => $on_remove_button_clicked();
       styles ["destructive-action"]
     }
   }
diff --git a/data/ui/presets_manager_window.blp b/data/ui/presets_manager_window.blp
index 1d9ce5292..8d12ea72d 100644
--- a/data/ui/presets_manager_window.blp
+++ b/data/ui/presets_manager_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradiencePresetWindow : Adw.Window {
+template $GradiencePresetWindow : Adw.Window {
   title: _("Presets");
   default-width: 650;
   default-height: 500;
@@ -30,7 +30,7 @@ template GradiencePresetWindow : Adw.Window {
             styles ["suggested-action"]
             label: _("Import");
             tooltip-text: _("Import Preset File");
-            clicked => on_import_button_clicked();
+            clicked => $on_import_button_clicked();
           }
 
           Button remove_button {
@@ -53,7 +53,7 @@ template GradiencePresetWindow : Adw.Window {
           [end]
           Button file_manager_button {
             tooltip-text: _("Open in File Manager");
-            clicked => on_file_manager_button_clicked();
+            clicked => $on_file_manager_button_clicked();
             Adw.ButtonContent {
               icon-name: "folder-symbolic";
             }
diff --git a/data/ui/repo_row.blp b/data/ui/repo_row.blp
index 3fb007e1d..97d9b1ee2 100644
--- a/data/ui/repo_row.blp
+++ b/data/ui/repo_row.blp
@@ -1,12 +1,12 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceRepoRow : Adw.ActionRow {
+template $GradienceRepoRow : Adw.ActionRow {
   [suffix]
   Button remove_button {
     valign: center;
     icon-name: "user-trash-symbolic";
     tooltip-text: _("Remove Preset");
-    clicked => on_remove_button_clicked();
+    clicked => $on_remove_button_clicked();
   }
 }
diff --git a/data/ui/reset_preset_group.blp b/data/ui/reset_preset_group.blp
index f56488e3c..075ae66c4 100644
--- a/data/ui/reset_preset_group.blp
+++ b/data/ui/reset_preset_group.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceResetPresetGroup : Adw.PreferencesGroup {
+template $GradienceResetPresetGroup : Adw.PreferencesGroup {
   title: _("Reset and Restore Presets");
   description: _("Reset a currently applied preset or restore the previous one.");
 
@@ -12,7 +12,7 @@ template GradienceResetPresetGroup : Adw.PreferencesGroup {
       valign: center;
       icon-name: "edit-undo-symbolic";
       tooltip-text: _("Restore Previous Preset");
-      clicked => on_libadw_restore_button_clicked();
+      clicked => $on_libadw_restore_button_clicked();
       styles ["flat"]
     }
 
@@ -20,7 +20,7 @@ template GradienceResetPresetGroup : Adw.PreferencesGroup {
       valign: center;
       label: _("Reset");
       tooltip-text: _("Reset Applied Preset");
-      clicked => on_libadw_reset_button_clicked();
+      clicked => $on_libadw_reset_button_clicked();
       styles ["destructive-action"]
     }
   }
@@ -32,7 +32,7 @@ template GradienceResetPresetGroup : Adw.PreferencesGroup {
       valign: center;
       icon-name: "edit-undo-symbolic";
       tooltip-text: _("Restore Previous Preset");
-      clicked => on_gtk3_restore_button_clicked();
+      clicked => $on_gtk3_restore_button_clicked();
       styles ["flat"]
     }
 
@@ -40,7 +40,7 @@ template GradienceResetPresetGroup : Adw.PreferencesGroup {
       valign: center;
       label: _("Reset");
       tooltip-text: _("Reset Applied Preset");
-      clicked => on_gtk3_reset_button_clicked();
+      clicked => $on_gtk3_reset_button_clicked();
       styles ["destructive-action"]
     }
   }
diff --git a/data/ui/save_dialog.blp b/data/ui/save_dialog.blp
index 60d5884e3..cb8b0a9d8 100644
--- a/data/ui/save_dialog.blp
+++ b/data/ui/save_dialog.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceSaveDialog : Adw.MessageDialog {
+template $GradienceSaveDialog : Adw.MessageDialog {
   heading: _("Save preset as…");
   body-use-markup: true;
 
diff --git a/data/ui/share_window.blp b/data/ui/share_window.blp
index f86fed5ea..68fb9dfff 100644
--- a/data/ui/share_window.blp
+++ b/data/ui/share_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceShareWindow: Adw.Window {
+template $GradienceShareWindow: Adw.Window {
     title: _("Share Preset");
     resizable: true;
     deletable: true;
diff --git a/data/ui/shell_prefs_window.blp b/data/ui/shell_prefs_window.blp
index 38e26b59b..354ad9f7c 100644
--- a/data/ui/shell_prefs_window.blp
+++ b/data/ui/shell_prefs_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceShellPrefsWindow : Adw.PreferencesWindow {
+template $GradienceShellPrefsWindow : Adw.PreferencesWindow {
   title: _("Shell Engine Preferences");
   search-enabled: false;
   default-height: 620;
diff --git a/data/ui/shell_theming_group.blp b/data/ui/shell_theming_group.blp
index be6b29a0a..f10e36418 100644
--- a/data/ui/shell_theming_group.blp
+++ b/data/ui/shell_theming_group.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceShellThemingGroup : Adw.PreferencesGroup {
+template $GradienceShellThemingGroup : Adw.PreferencesGroup {
   title: _("Shell Engine");
   description: _("Shell Engine generates a custom GNOME Shell theme based on the currently selected preset.\nWARNING: Extensions that modify the Shell stylesheet may cause issues with themes.");
 
@@ -15,7 +15,7 @@ template GradienceShellThemingGroup : Adw.PreferencesGroup {
       valign: center;
       label: _("Apply");
       tooltip-text: _("Apply Shell theme");
-      clicked => on_apply_button_clicked();
+      clicked => $on_apply_button_clicked();
       styles ["suggested-action"]
     }
 
@@ -27,7 +27,7 @@ template GradienceShellThemingGroup : Adw.PreferencesGroup {
       Button custom-colors-button {
         valign: center;
         label: _("Open Shell Preferences");
-        clicked => on_custom_colors_button_clicked();
+        clicked => $on_custom_colors_button_clicked();
       }
     }
 
@@ -46,7 +46,7 @@ Adw.ActionRow other-options-row {
     sensitive: false;
     //tooltip-text: _("Restore Previous Theme");
     tooltip-text: _("Currently unavailable");
-    clicked => on_restore_button_clicked();
+    clicked => $on_restore_button_clicked();
     styles ["flat"]
   }
 
@@ -55,7 +55,7 @@ Adw.ActionRow other-options-row {
     valign: center;
     label: _("Reset Theme");
     tooltip-text: _("Reset applied theme");
-    clicked => on_reset_theme_clicked();
+    clicked => $on_reset_theme_clicked();
     styles ["destructive-action"]
   }
 }
diff --git a/data/ui/theming_empty_group.blp b/data/ui/theming_empty_group.blp
index 490b68d8a..72cef87f8 100644
--- a/data/ui/theming_empty_group.blp
+++ b/data/ui/theming_empty_group.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceEmptyThemingGroup : Adw.PreferencesGroup {
+template $GradienceEmptyThemingGroup : Adw.PreferencesGroup {
   title: _("No Theme Engines");
   description: _("Theme Engines extend the functionality of Gradience. They can be enabled in the Preferences.");
 
diff --git a/data/ui/welcome_window.blp b/data/ui/welcome_window.blp
index ec2764e90..8a69283bc 100644
--- a/data/ui/welcome_window.blp
+++ b/data/ui/welcome_window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceWelcomeWindow: Adw.Window {
+template $GradienceWelcomeWindow: Adw.Window {
     title: _("Welcome to Gradience");
     resizable: true;
     deletable: true;
diff --git a/data/ui/window.blp b/data/ui/window.blp
index f5e0a30d3..26b9c5bb4 100644
--- a/data/ui/window.blp
+++ b/data/ui/window.blp
@@ -1,7 +1,7 @@
 using Gtk 4.0;
 using Adw 1;
 
-template GradienceMainWindow : Adw.ApplicationWindow {
+template $GradienceMainWindow : Adw.ApplicationWindow {
   title: _("Gradience");
   default-width: 950;
   default-height: 650;