diff --git a/Bar.qml b/Bar.qml
index 9527ab5..50c12d3 100644
--- a/Bar.qml
+++ b/Bar.qml
@@ -29,6 +29,7 @@ Scope {
 
             PanelWindow {
                 id: exclusionZone
+				WlrLayershell.namespace: "ZShell-Bar-Exclusion"
                 screen: bar.screen
                 WlrLayershell.layer: WlrLayer.Bottom
                 anchors {
diff --git a/Daemons/NotifServer.qml b/Daemons/NotifServer.qml
index 2e3f9ce..59d54bf 100644
--- a/Daemons/NotifServer.qml
+++ b/Daemons/NotifServer.qml
@@ -155,6 +155,7 @@ Singleton {
                 implicitHeight: 48
                 color: "transparent"
                 mask: Region {}
+				visible: false
 
                 Image {
                     anchors.fill: parent
diff --git a/Modules/Lock/LockSurface.qml b/Modules/Lock/LockSurface.qml
index 28391fb..657d35a 100644
--- a/Modules/Lock/LockSurface.qml
+++ b/Modules/Lock/LockSurface.qml
@@ -89,7 +89,9 @@ WlSessionLockSurface {
 		anchors.fill: parent
 		asynchronous: false
 		cache: false
-		source: WallpaperPath.lockscreenBg
+		source: WallpaperPath.currentWallpaperPath
+		sourceSize.width: root.screen.width
+		sourceSize.height: root.screen.height
 		visible: Config.lock.useWallpaper
 
 		Component.onCompleted: {
@@ -106,7 +108,9 @@ WlSessionLockSurface {
 
 		Rectangle {
 			id: contentBox
-			anchors.centerIn: parent
+			anchors.bottom: !Config.lock.useWallpaper ? "" : parent.bottom
+			anchors.centerIn: !Config.lock.useWallpaper ? parent : ""
+			anchors.horizontalCenter: !Config.lock.useWallpaper ? "" : parent.horizontalCenter
 
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: 28
diff --git a/Wallpaper.qml b/Wallpaper.qml
index af1f9ff..a0368b0 100644
--- a/Wallpaper.qml
+++ b/Wallpaper.qml
@@ -7,26 +7,27 @@ import qs.Config
 
 Loader {
 
-    asynchronous: true
-    active: Config.background.enabled
+	asynchronous: true
+	active: Config.background.enabled
 
-    sourceComponent: Variants {
-        model: Quickshell.screens
-        PanelWindow {
-            id: root
-            required property var modelData
-            screen: modelData
-            WlrLayershell.exclusionMode: ExclusionMode.Ignore
-            WlrLayershell.layer: WlrLayer.Bottom
-            color: "transparent"
+	sourceComponent: Variants {
+		model: Quickshell.screens
+		PanelWindow {
+			id: root
+			required property var modelData
+			screen: modelData
+			WlrLayershell.namespace: "ZShell-Wallpaper"
+			WlrLayershell.exclusionMode: ExclusionMode.Ignore
+			WlrLayershell.layer: WlrLayer.Bottom
+			color: "transparent"
 
-            anchors {
-                top: true
-                left: true
-                right: true
-                bottom: true
-            }
-            WallBackground {}
-        }
-    }
+			anchors {
+				top: true
+				left: true
+				right: true
+				bottom: true
+			}
+			WallBackground {}
+		}
+	}
 }