diff --git a/README.md b/README.md
index 7c776e06..fcfa7999 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # HyprPanel 🚀
 
-A panel built for Hyprland with [AGS](https://github.com/Aylur/ags)
+A panel built for Hyprland with [Astal](https://github.com/Aylur/astal)
 
 ![HyprPanel1](./assets/hp1.png)
 ![HyprPanel2](./assets/hp2.png)
diff --git a/src/components/bar/modules/systray/index.tsx b/src/components/bar/modules/systray/index.tsx
index c2c6ba66..ad472773 100644
--- a/src/components/bar/modules/systray/index.tsx
+++ b/src/components/bar/modules/systray/index.tsx
@@ -33,7 +33,16 @@ const MenuDefaultIcon = ({ item }: MenuEntryProps): JSX.Element => {
 };
 
 const MenuEntry = ({ item, child }: MenuEntryProps): JSX.Element => {
-    const menu = createMenu(item.menuModel, item.actionGroup);
+    let menu: Gtk.Menu;
+
+    const entryBinding = Variable.derive(
+        [bind(item, 'menuModel'), bind(item, 'actionGroup')],
+        (menuModel, actionGroup) => {
+            if (menuModel && actionGroup) {
+                menu = createMenu(menuModel, actionGroup);
+            }
+        },
+    );
 
     return (
         <button
@@ -51,7 +60,10 @@ const MenuEntry = ({ item, child }: MenuEntryProps): JSX.Element => {
                     Notify({ summary: 'App Name', body: item.id });
                 }
             }}
-            onDestroy={() => menu?.destroy()}
+            onDestroy={() => {
+                menu?.destroy();
+                entryBinding.drop();
+            }}
         >
             {child}
         </button>
diff --git a/src/components/menus/bluetooth/devices/helpers.ts b/src/components/menus/bluetooth/devices/helpers.ts
index d4e70f29..af2f2964 100644
--- a/src/components/menus/bluetooth/devices/helpers.ts
+++ b/src/components/menus/bluetooth/devices/helpers.ts
@@ -11,7 +11,9 @@ import { bluetoothService } from 'src/lib/constants/services';
  * @returns An array of available Bluetooth devices.
  */
 export const getAvailableBluetoothDevices = (): AstalBluetooth.Device[] => {
-    const availableDevices = bluetoothService.devices
+    const bluetoothDevices = bluetoothService.get_devices() ?? [];
+
+    const availableDevices = bluetoothDevices
         .filter((btDev) => btDev.name !== null)
         .sort((a, b) => {
             if (a.connected || a.paired) {
diff --git a/src/components/menus/network/wifi/WirelessAPs/helpers.ts b/src/components/menus/network/wifi/WirelessAPs/helpers.ts
index 3cad13fc..5aa762c3 100644
--- a/src/components/menus/network/wifi/WirelessAPs/helpers.ts
+++ b/src/components/menus/network/wifi/WirelessAPs/helpers.ts
@@ -69,7 +69,7 @@ const dedupeWAPs = (): AstalNetwork.AccessPoint[] => {
         return [];
     }
 
-    const WAPs = networkService.wifi.accessPoints;
+    const WAPs = networkService.wifi.get_access_points();
     const dedupMap: Record<string, AstalNetwork.AccessPoint> = {};
 
     WAPs.forEach((item: AstalNetwork.AccessPoint) => {