diff --git a/components/StyledButton.qml b/components/StyledButton.qml
index ead62b4..fb9be2b 100644
--- a/components/StyledButton.qml
+++ b/components/StyledButton.qml
@@ -8,19 +8,16 @@ Button {
     property alias radius: rectangle.radius
 
     font.pixelSize: 14
-    padding: 6
+    verticalPadding: 6
+    horizontalPadding: 8
 
-    palette.button: hovered ? Theme.palette.primary : Theme.palette.base100
-    Behavior on palette.button {
-        ColorAnimation {
-            duration: 100
-        }
+    palette.button: hovered ? Theme.palette.primary : Theme.palette.base200
+    ColorAnimation on palette.button {
+        duration: 100
     }
     palette.buttonText: hoverEnabled && hovered ? Theme.palette.primarycontent : Theme.palette.basecontent
-    Behavior on palette.buttonText {
-        ColorAnimation {
-            duration: 100
-        }
+    ColorAnimation on palette.buttonText {
+        duration: 100
     }
 
     wheelEnabled: true
diff --git a/components/StyledDrawer.qml b/components/StyledDrawer.qml
index c153482..eafe214 100644
--- a/components/StyledDrawer.qml
+++ b/components/StyledDrawer.qml
@@ -20,6 +20,6 @@ Drawer {
                 topRightRadius = 8;
             }
         }
-        color: Theme.palette.base200
+        color: Theme.palette.base100
     }
 }
diff --git a/components/StyledIconButton.qml b/components/StyledIconButton.qml
index 780113d..186cb5d 100644
--- a/components/StyledIconButton.qml
+++ b/components/StyledIconButton.qml
@@ -15,9 +15,9 @@ RoundButton {
     property int rotation: 0
 
     font.family: loader.font.family
-    font.pixelSize: 18
+    font.pixelSize: 19
     radius: 8
-    padding: 6
+    padding: 8
 
     HoverHandler {
         cursorShape: Qt.PointingHandCursor
@@ -28,34 +28,26 @@ RoundButton {
         font: control.font
         text: control.text
         color: control.color
-        Behavior on color {
-            ColorAnimation {
-                duration: 100
-            }
+        ColorAnimation on color {
+            duration: 100
         }
         rotation: control.rotation
-        Behavior on rotation {
-            RotationAnimation {
-                duration: 200
-                easing.type: Easing.InOutCubic
-            }
+        RotationAnimation on rotation {
+            duration: 200
+            easing.type: Easing.InOutCubic
         }
     }
 
     background: Rectangle {
         id: rect
-        border.color: control.hovered ? Theme.palette.primary : Theme.palette.base100
-        Behavior on border.color {
-            ColorAnimation {
-                duration: 100
-            }
+        border.color: control.hovered ? Theme.palette.base300 : Theme.palette.base200
+        ColorAnimation on border.color {
+            duration: 100
         }
-        border.width: 2
-        color: control.hovered ? Theme.palette.primary : Theme.palette.base100
-        Behavior on color {
-            ColorAnimation {
-                duration: 100
-            }
+        border.width: 0
+        color: control.hovered ? Theme.palette.primary : Theme.palette.base200
+        ColorAnimation on color {
+            duration: 100
         }
         radius: control.radius
     }
diff --git a/components/StyledLabel.qml b/components/StyledLabel.qml
index 4b9dd07..7dd00b2 100644
--- a/components/StyledLabel.qml
+++ b/components/StyledLabel.qml
@@ -6,11 +6,9 @@ WrapperRectangle {
     id: root
     margin: 8
     radius: 8
-    color: Theme.palette.base100
-    Behavior on color {
-        ColorAnimation {
-            duration: 200
-            easing.type: Easing.InOutQuad
-        }
+    color: Theme.palette.base200
+    ColorAnimation on color {
+        duration: 200
+        easing.type: Easing.InOutQuad
     }
 }
diff --git a/components/StyledTextField.qml b/components/StyledTextField.qml
index bae90ba..8e5083f 100644
--- a/components/StyledTextField.qml
+++ b/components/StyledTextField.qml
@@ -1,8 +1,9 @@
 import qs.config
+import QtQuick
 import QtQuick.Controls
 
 TextField {
 
     color: Theme.palette.basecontent
-    background: null
+    background: Item {}
 }
diff --git a/components/StyledWrapperRectangle.qml b/components/StyledWrapperRectangle.qml
index 19a70d1..5c73284 100644
--- a/components/StyledWrapperRectangle.qml
+++ b/components/StyledWrapperRectangle.qml
@@ -4,11 +4,9 @@ import Quickshell.Widgets
 
 WrapperRectangle {
     radius: 8
-    color: Theme.palette.base300
-    Behavior on color {
-        ColorAnimation {
-            duration: 200
-            easing.type: Easing.InOutQuad
-        }
+    color: Theme.palette.base100
+    ColorAnimation on color {
+        duration: 200
+        easing.type: Easing.InOutQuad
     }
 }
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index c39e847..620823f 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -32,11 +32,11 @@ PanelWindow {
         Rectangle {
             id: background
             anchors.fill: parent
-            color: Theme.palette.base300
+            color: Theme.palette.base100
             radius: Dimensions.radius
 
             border {
-                color: Theme.palette.base100
+                color: Theme.palette.base200
                 width: Dimensions.bar.border
                 pixelAligned: true
             }
diff --git a/modules/bar/components/Caffeine.qml b/modules/bar/components/Caffeine.qml
index 82861f9..47a80c4 100644
--- a/modules/bar/components/Caffeine.qml
+++ b/modules/bar/components/Caffeine.qml
@@ -6,7 +6,8 @@ import qs.services
 StyledIconButton {
     id: root
 
-    border.color: Caffeine.enabled ? Theme.palette.secondary : root.hovered ? Theme.palette.primary : Theme.palette.base100
+    border.width: 2
+    border.color: Caffeine.enabled ? Theme.palette.secondary : root.hovered ? Theme.palette.primary : Theme.palette.base300
     text: Icons.coffee
 
     onClicked: {
diff --git a/modules/drawers/dashboard/Dashboard.qml b/modules/drawers/dashboard/Dashboard.qml
index b98647d..14bd318 100644
--- a/modules/drawers/dashboard/Dashboard.qml
+++ b/modules/drawers/dashboard/Dashboard.qml
@@ -4,13 +4,14 @@ import qs.components
 import qs.services
 import QtQuick
 import QtQuick.Layouts
+import Quickshell.Widgets
 
 StyledDrawer {
     id: root
 
     visible: Visibility.dashboard
 
-    StyledWrapperRectangle {
+    WrapperItem {
         margin: 32
         ColumnLayout {
             spacing: 8
diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index d8dbe22..cee2574 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -4,7 +4,6 @@ import "items"
 import "services"
 import qs.components
 import qs.config
-import qs.widgets
 import Quickshell
 import QtQuick
 import QtQuick.Controls
diff --git a/modules/launcher/Launcher.qml b/modules/launcher/Launcher.qml
index 137c861..b64322c 100644
--- a/modules/launcher/Launcher.qml
+++ b/modules/launcher/Launcher.qml
@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
 import "services"
+import qs.config
 import qs.components
 import qs.constants
 import qs.services
@@ -47,6 +48,8 @@ StyledWindow {
                 Layout.alignment: Qt.AlignTop
                 margin: 4
 
+                color: Theme.palette.base200
+
                 RowLayout {
                     LucideIcon {
                         id: icon
diff --git a/modules/powermenu/PowerMenu.qml b/modules/powermenu/PowerMenu.qml
index cea98f8..198c5ba 100644
--- a/modules/powermenu/PowerMenu.qml
+++ b/modules/powermenu/PowerMenu.qml
@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 import qs.components
 import qs.config
 import qs.services
-import qs.widgets
 import Quickshell.Hyprland
 import Quickshell.Io
 import Quickshell.Wayland
@@ -28,7 +27,6 @@ StyledWindow {
     StyledWrapperRectangle {
         id: rect
 
-        color: Theme.palette.base300
         margin: 14
         radius: 8