diff --git a/components/StyledPanelWindow.qml b/components/StyledPanelWindow.qml
index f1275ba..dab6ee0 100644
--- a/components/StyledPanelWindow.qml
+++ b/components/StyledPanelWindow.qml
@@ -1,9 +1,41 @@
+import qs.config
+import QtQuick
 import Quickshell
 import Quickshell.Wayland
 
 PanelWindow {
+    id: window
+
     required property string name
 
     WlrLayershell.namespace: `lux-${name}`
     color: "transparent"
+
+    Rectangle {
+        anchors.fill: parent
+        radius: Styling.theme.radiusBox
+        Behavior on radius {
+            NumberAnimation {
+                duration: Styling.animations.speed.normal
+            }
+        }
+        color: Styling.theme.base100
+        Behavior on color {
+            ColorAnimation {
+                duration: Styling.animations.speed.fast
+            }
+        }
+        Behavior on opacity {
+            NumberAnimation {
+                duration: Styling.animations.speed.fast
+            }
+        }
+        border.width: 2
+        border.color: Styling.theme.base200
+        Behavior on border.color {
+            ColorAnimation {
+                duration: Styling.animations.speed.fast
+            }
+        }
+    }
 }
diff --git a/modules/launcher/Launcher.qml b/modules/launcher/Launcher.qml
index 7a2b0d0..816d221 100644
--- a/modules/launcher/Launcher.qml
+++ b/modules/launcher/Launcher.qml
@@ -4,10 +4,11 @@ import "services"
 import qs.config
 import qs.components
 import qs.services
-import Quickshell.Hyprland
-import Quickshell.Wayland
 import QtQuick
 import QtQuick.Layouts
+import Quickshell.Hyprland
+import Quickshell.Wayland
+import Quickshell.Widgets
 
 StyledPanelWindow {
     id: root
@@ -34,7 +35,7 @@ StyledPanelWindow {
         search.clear();
     }
 
-    StyledWrapperRectangle {
+    WrapperItem {
         id: rect
 
         margin: 18
diff --git a/modules/pomodoro/Pomodoro.qml b/modules/pomodoro/Pomodoro.qml
index 88d3e96..034e479 100644
--- a/modules/pomodoro/Pomodoro.qml
+++ b/modules/pomodoro/Pomodoro.qml
@@ -4,10 +4,11 @@ import qs.components
 import qs.config
 import qs.services
 import qs.widgets
-import Quickshell.Hyprland
-import Quickshell.Wayland
 import QtQuick
 import QtQuick.Layouts
+import Quickshell.Hyprland
+import Quickshell.Wayland
+import Quickshell.Widgets
 
 StyledPanelWindow {
     id: root
@@ -20,7 +21,7 @@ StyledPanelWindow {
     WlrLayershell.layer: WlrLayer.Top
     WlrLayershell.keyboardFocus: root.visible ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 
-    StyledWrapperRectangle {
+    WrapperItem {
         id: rect
 
         leftMargin: 48
diff --git a/modules/powermenu/PowerMenu.qml b/modules/powermenu/PowerMenu.qml
index 739bcee..6627c0f 100644
--- a/modules/powermenu/PowerMenu.qml
+++ b/modules/powermenu/PowerMenu.qml
@@ -4,10 +4,11 @@ import qs.components
 import qs.config
 import qs.services
 import Quickshell.Hyprland
-import Quickshell.Io
-import Quickshell.Wayland
 import QtQuick
 import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Wayland
+import Quickshell.Widgets
 
 StyledPanelWindow {
     id: root
@@ -24,7 +25,7 @@ StyledPanelWindow {
         id: process
     }
 
-    StyledWrapperRectangle {
+    WrapperItem {
         id: rect
 
         margin: 14
diff --git a/modules/storybook/Storybook.qml b/modules/storybook/Storybook.qml
index 68d5776..e402da0 100644
--- a/modules/storybook/Storybook.qml
+++ b/modules/storybook/Storybook.qml
@@ -3,11 +3,12 @@ pragma ComponentBehavior: Bound
 import qs.components
 import qs.config
 import qs.services
-import Quickshell.Hyprland
-import Quickshell.Wayland
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import Quickshell.Hyprland
+import Quickshell.Wayland
+import Quickshell.Widgets
 
 StyledPanelWindow {
     id: root
@@ -28,7 +29,7 @@ StyledPanelWindow {
         }
     }
 
-    StyledWrapperRectangle {
+    WrapperItem {
         id: rect
 
         margin: 48