diff --git a/Modules/Bar/Widgets/ActiveWindow.qml b/Modules/Bar/Widgets/ActiveWindow.qml
index d02e92a3..bd8fc4f5 100644
--- a/Modules/Bar/Widgets/ActiveWindow.qml
+++ b/Modules/Bar/Widgets/ActiveWindow.qml
@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Widgets
 import qs.Commons
+import qs.Services.Compositor
 import qs.Services.UI
 import qs.Widgets
 
diff --git a/Modules/Bar/Widgets/Bluetooth.qml b/Modules/Bar/Widgets/Bluetooth.qml
index 8c3bb1d8..2ce3fea6 100644
--- a/Modules/Bar/Widgets/Bluetooth.qml
+++ b/Modules/Bar/Widgets/Bluetooth.qml
@@ -1,8 +1,9 @@
 import QtQuick
 import Quickshell
 import qs.Commons
-import qs.Services.UI
 import qs.Modules.Bar.Extras
+import qs.Services.Networking
+import qs.Services.UI
 
 Item {
   id: root
diff --git a/Modules/Bar/Widgets/Brightness.qml b/Modules/Bar/Widgets/Brightness.qml
index a94383e1..e426c4aa 100644
--- a/Modules/Bar/Widgets/Brightness.qml
+++ b/Modules/Bar/Widgets/Brightness.qml
@@ -3,6 +3,7 @@ import Quickshell
 import qs.Commons
 import qs.Modules.Bar.Extras
 import qs.Modules.Panels.Settings
+import qs.Services.Hardware
 import qs.Services.UI
 import qs.Widgets
 
diff --git a/Modules/Bar/Widgets/KeepAwake.qml b/Modules/Bar/Widgets/KeepAwake.qml
index 58b30d6f..46f975d6 100644
--- a/Modules/Bar/Widgets/KeepAwake.qml
+++ b/Modules/Bar/Widgets/KeepAwake.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
+import qs.Services.Power
 import qs.Services.UI
 import qs.Widgets
 
diff --git a/Modules/Bar/Widgets/Microphone.qml b/Modules/Bar/Widgets/Microphone.qml
index b3e32915..d384cfb5 100644
--- a/Modules/Bar/Widgets/Microphone.qml
+++ b/Modules/Bar/Widgets/Microphone.qml
@@ -5,6 +5,7 @@ import Quickshell.Services.Pipewire
 import qs.Commons
 import qs.Modules.Bar.Extras
 import qs.Modules.Panels.Settings
+import qs.Services.Media
 import qs.Services.UI
 import qs.Widgets
 
diff --git a/Modules/Bar/Widgets/NightLight.qml b/Modules/Bar/Widgets/NightLight.qml
index 2be0a047..c04d713d 100644
--- a/Modules/Bar/Widgets/NightLight.qml
+++ b/Modules/Bar/Widgets/NightLight.qml
@@ -5,6 +5,7 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Commons
 import qs.Modules.Panels.Settings
+import qs.Services.System
 import qs.Services.UI
 import qs.Widgets
 
diff --git a/Modules/Bar/Widgets/NoctaliaPerformance.qml b/Modules/Bar/Widgets/NoctaliaPerformance.qml
index 7678e92f..4263604a 100644
--- a/Modules/Bar/Widgets/NoctaliaPerformance.qml
+++ b/Modules/Bar/Widgets/NoctaliaPerformance.qml
@@ -6,6 +6,7 @@ import Quickshell.Wayland
 import qs.Commons
 import qs.Modules.Panels.Settings
 import qs.Services.Power
+import qs.Services.UI
 import qs.Widgets
 
 NIconButton {
diff --git a/Modules/Bar/Widgets/PowerProfile.qml b/Modules/Bar/Widgets/PowerProfile.qml
index e9bca98a..724d7a4d 100644
--- a/Modules/Bar/Widgets/PowerProfile.qml
+++ b/Modules/Bar/Widgets/PowerProfile.qml
@@ -4,6 +4,7 @@ import Quickshell
 import Quickshell.Services.UPower
 import qs.Commons
 import qs.Services.Power
+import qs.Services.UI
 import qs.Widgets
 
 NIconButton {
diff --git a/Modules/Bar/Widgets/SessionMenu.qml b/Modules/Bar/Widgets/SessionMenu.qml
index a22b046c..64192d32 100644
--- a/Modules/Bar/Widgets/SessionMenu.qml
+++ b/Modules/Bar/Widgets/SessionMenu.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
+import qs.Services.UI
 import qs.Widgets
 
 NIconButton {
diff --git a/Modules/Bar/Widgets/Spacer.qml b/Modules/Bar/Widgets/Spacer.qml
index ff94682e..92bc33f3 100644
--- a/Modules/Bar/Widgets/Spacer.qml
+++ b/Modules/Bar/Widgets/Spacer.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import qs.Commons
+import qs.Services.UI
 import qs.Widgets
 
 Item {
diff --git a/Services/Hardware/BatteryService.qml b/Services/Hardware/BatteryService.qml
index 41d63695..a655be64 100644
--- a/Services/Hardware/BatteryService.qml
+++ b/Services/Hardware/BatteryService.qml
@@ -123,7 +123,7 @@ Singleton {
         Settings.data.battery.chargingMode = BatteryService.chargingMode
       } else if (exitCode === 2) {
         ToastService.showWarning(I18n.tr("toast.battery-manager.title"), I18n.tr("toast.battery-manager.initial-setup"))
-        PanelService.getPanel("batteryPanel", screen)?.toggle(this)
+        PanelService.getPanel("batteryPanel", null)?.toggle(this)
         BatteryService.runInstaller()
       } else {
         ToastService.showError(I18n.tr("toast.battery-manager.title"), I18n.tr("toast.battery-manager.set-failed"))
diff --git a/Services/Keyboard/KeyboardLayoutService.qml b/Services/Keyboard/KeyboardLayoutService.qml
index 7876b27a..d8e1a648 100644
--- a/Services/Keyboard/KeyboardLayoutService.qml
+++ b/Services/Keyboard/KeyboardLayoutService.qml
@@ -3,8 +3,8 @@ pragma Singleton
 import QtQuick
 import Quickshell
 import Quickshell.Io
-import Quickshell.Hyprland
 import qs.Commons
+import qs.Services.Compositor
 
 Singleton {
   id: root
diff --git a/Services/Media/ScreenRecorderService.qml b/Services/Media/ScreenRecorderService.qml
index 22b8f649..7338ccbb 100644
--- a/Services/Media/ScreenRecorderService.qml
+++ b/Services/Media/ScreenRecorderService.qml
@@ -5,6 +5,7 @@ import Quickshell
 import Quickshell.Io
 import qs.Commons
 import qs.Services.System
+import qs.Services.UI
 
 Singleton {
   id: root
diff --git a/Services/Networking/BluetoothService.qml b/Services/Networking/BluetoothService.qml
index b130a489..4a7f8745 100644
--- a/Services/Networking/BluetoothService.qml
+++ b/Services/Networking/BluetoothService.qml
@@ -5,6 +5,7 @@ import Quickshell
 import Quickshell.Bluetooth
 import Quickshell.Io
 import qs.Commons
+import qs.Services.UI
 
 Singleton {
   id: root
diff --git a/Services/UI/PanelService.qml b/Services/UI/PanelService.qml
index 0d4896d1..79682646 100644
--- a/Services/UI/PanelService.qml
+++ b/Services/UI/PanelService.qml
@@ -25,8 +25,7 @@ Singleton {
   // Returns a panel (loads it on-demand if not yet loaded)
   function getPanel(name, screen) {
     if (!screen) {
-      Logger.w("PanelService", "missing screen for getPanel:", name)
-      Logger.callStack()
+      Logger.d("PanelService", "missing screen for getPanel:", name)
       // If no screen specified, return the first matching panel
       for (var key in registeredPanels) {
         if (key.startsWith(name + "-")) {