diff --git a/awesome/src/dbus/bluetooth_dbus.lua b/awesome/src/dbus/bluetooth_dbus.lua
index 8c51a0a..ce453e0 100644
--- a/awesome/src/dbus/bluetooth_dbus.lua
+++ b/awesome/src/dbus/bluetooth_dbus.lua
@@ -28,16 +28,12 @@ return function()
         interface = "org.freedesktop.DBus.Properties",
         path = object_path
       }
-
-      if device.Name ~= "" and device.Name ~= nil then
+      awesome.emit_signal("bluetooth::scan")
+      if device.Name ~= nil or device.Alias ~= nil then
         device_properties:connect_signal(function()
-          naughty.notification {
-            title = "Bluetooth Device Connected",
-            message = device.Name,
-            icon = require("awful").util.getdir("config") .. "src/assets/icons/bluetooth/bluetooth.svg"
-          }
-          awesome.emit_signal("device_added", object_path, device, battery)
+          awesome.emit_signal("bluetooth::device_changed", device, battery)
         end, "PropertiesChanged")
+        awesome.emit_signal("bluetooth::device_changed", device, battery)
       end
     end
   end
@@ -91,10 +87,16 @@ return function()
           "PropertiesChanged"
         )
 
+        awesome.connect_signal(
+          "bluetooth::scan",
+          function()
+            Adapter:StartDiscovery()
+          end
+        )
+
         AdapterProperties:connect_signal(
           function(data)
             if data.Powered ~= nil then
-              awesome.emit_signal("state", data.Powered)
               if data.Powered then
                 Adapter:StartDiscovery()
               end
diff --git a/awesome/src/modules/init.lua b/awesome/src/modules/init.lua
index 8c952ad..c8c3027 100644
--- a/awesome/src/modules/init.lua
+++ b/awesome/src/modules/init.lua
@@ -20,6 +20,7 @@ awful.screen.connect_for_each_screen(
     require("src.modules.powermenu")(s)
     require("src.modules.volume_osd")(s)
     require("src.modules.brightness_osd")(s)
+    require("src.modules.bluetooth_controller")(s)
     require("src.modules.titlebar")
     require("src.modules.volume_controller")(s)
     require("src.modules.crylia_bar.init")(s)