diff --git a/Modules/Background/Background.qml b/Modules/Background/Background.qml
index 2756aed..25c4236 100644
--- a/Modules/Background/Background.qml
+++ b/Modules/Background/Background.qml
@@ -3,42 +3,41 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Services
 
-ShellRoot {
-
-  property var modelData
-  property string wallpaperSource: Qt.resolvedUrl(
-                                     "../../Assets/Tests/wallpaper.png")
-
-  Variants {
+Variants {
     model: Quickshell.screens
 
     PanelWindow {
-      required property ShellScreen modelData
+        required property ShellScreen modelData
+        property string wallpaperSource: Qt.resolvedUrl("../../Assets/Tests/wallpaper.png")
 
-      visible: wallpaperSource !== ""
-      anchors {
-        bottom: true
-        top: true
-        right: true
-        left: true
-      }
-      margins {
-        top: 0
-      }
-      color: "transparent"
-      screen: modelData
-      WlrLayershell.layer: WlrLayer.Background
-      WlrLayershell.exclusionMode: ExclusionMode.Ignore
-      WlrLayershell.namespace: "quickshell-wallpaper"
-      Image {
-        anchors.fill: parent
-        fillMode: Image.PreserveAspectCrop
-        source: wallpaperSource
         visible: wallpaperSource !== ""
-        cache: true
-        smooth: true
-        mipmap: false
-      }
+        color: "transparent"
+        screen: modelData
+        WlrLayershell.layer: WlrLayer.Background
+        WlrLayershell.exclusionMode: ExclusionMode.Ignore
+        WlrLayershell.namespace: "quickshell-wallpaper"
+
+        anchors {
+            bottom: true
+            top: true
+            right: true
+            left: true
+        }
+
+        margins {
+            top: 0
+        }
+
+        Image {
+            anchors.fill: parent
+            fillMode: Image.PreserveAspectCrop
+            source: wallpaperSource
+            visible: wallpaperSource !== ""
+            cache: true
+            smooth: true
+            mipmap: false
+        }
+
     }
-  }
+
 }
diff --git a/Modules/Background/Overview.qml b/Modules/Background/Overview.qml
index 0179aad..454ba18 100644
--- a/Modules/Background/Overview.qml
+++ b/Modules/Background/Overview.qml
@@ -4,52 +4,54 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Services
 
-ShellRoot {
-  property string wallpaperSource: Qt.resolvedUrl(
-                                     "../../Assets/Tests/wallpaper.png")
-  property var modelData
-
-  Variants {
+Variants {
     model: Quickshell.screens
 
     PanelWindow {
-      required property ShellScreen modelData
+        required property ShellScreen modelData
+        property string wallpaperSource: Qt.resolvedUrl("../../Assets/Tests/wallpaper.png")
 
-      visible: wallpaperSource !== ""
-      anchors {
-        top: true
-        bottom: true
-        right: true
-        left: true
-      }
-      color: "transparent"
-      screen: modelData
-      WlrLayershell.layer: WlrLayer.Background
-      WlrLayershell.exclusionMode: ExclusionMode.Ignore
-      WlrLayershell.namespace: "quickshell-overview"
-      Image {
-        id: bgImage
-        anchors.fill: parent
-        fillMode: Image.PreserveAspectCrop
-        source: wallpaperSource
-        cache: true
-        smooth: true
-        mipmap: false
         visible: wallpaperSource !== ""
-      }
-      MultiEffect {
-        id: overviewBgBlur
-        anchors.fill: parent
-        source: bgImage
-        blurEnabled: true
-        blur: 0.48
-        blurMax: 128
-      }
-      Rectangle {
-        anchors.fill: parent
-        color: Qt.rgba(Colors.backgroundPrimary.r, Colors.backgroundPrimary.g,
-                       Colors.backgroundPrimary.b, 0.5)
-      }
+        color: "transparent"
+        screen: modelData
+        WlrLayershell.layer: WlrLayer.Background
+        WlrLayershell.exclusionMode: ExclusionMode.Ignore
+        WlrLayershell.namespace: "quickshell-overview"
+
+        anchors {
+            top: true
+            bottom: true
+            right: true
+            left: true
+        }
+
+        Image {
+            id: bgImage
+
+            anchors.fill: parent
+            fillMode: Image.PreserveAspectCrop
+            source: wallpaperSource
+            cache: true
+            smooth: true
+            mipmap: false
+            visible: wallpaperSource !== ""
+        }
+
+        MultiEffect {
+            id: overviewBgBlur
+
+            anchors.fill: parent
+            source: bgImage
+            blurEnabled: true
+            blur: 0.48
+            blurMax: 128
+        }
+
+        Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(Colors.backgroundPrimary.r, Colors.backgroundPrimary.g, Colors.backgroundPrimary.b, 0.5)
+        }
+
     }
-  }
+
 }
diff --git a/Modules/Bar/Bars.qml b/Modules/Bar/Bars.qml
new file mode 100644
index 0000000..e69de29