diff --git a/modules/bar/components/Storage.qml b/modules/bar/components/Storage.qml
index f0d437e..5c41b72 100644
--- a/modules/bar/components/Storage.qml
+++ b/modules/bar/components/Storage.qml
@@ -1,16 +1,20 @@
-import qs.config
-import qs.constants
-import qs.services
-import qs.utils
-import qs.widgets
 import QtQuick
-import QtQuick.Layouts
+import Quickshell
+import "../../../config/"
+import "../../../constants/"
+import "../../../services/"
+import "../../../styled/"
+import "../../../utils/"
 
 StyledLabel {
-    RowLayout {
-        Ref {
-            service: SystemInfo
-        }
+    implicitWidth: childrenRect.width
+    implicitHeight: Dimensions.storage.height
+
+    Ref {
+        service: SystemInfo
+    }
+
+    Row {
         StyledText {
             id: icon
 
@@ -18,11 +22,22 @@ StyledLabel {
             font.pixelSize: Dimensions.storage.iconSize
             font.bold: true
             text: Icons.hardDrive
+
+            anchors.verticalCenter: parent.verticalCenter
+            topPadding: Dimensions.storage.verticalPadding
+            bottomPadding: Dimensions.storage.verticalPadding
+            leftPadding: Dimensions.storage.horizontalPadding
         }
 
         StyledText {
             id: text
+            anchors.verticalCenter: parent.verticalCenter
+            topPadding: Dimensions.storage.verticalPadding
+            bottomPadding: Dimensions.storage.verticalPadding
+            rightPadding: Dimensions.storage.horizontalPadding
+
             font.pixelSize: Dimensions.storage.fontSize
+
             text: ` ${(SystemInfo.storagePerc * 100).toFixed()}%`
         }
     }
diff --git a/modules/bar/components/mpris/Mpris.qml b/modules/bar/components/mpris/Mpris.qml
index e9ff3c0..8c39c15 100644
--- a/modules/bar/components/mpris/Mpris.qml
+++ b/modules/bar/components/mpris/Mpris.qml
@@ -1,3 +1,4 @@
+import Quickshell
 import Quickshell.Services.Mpris
 import QtQuick
 
diff --git a/modules/bar/components/mpris/Player.qml b/modules/bar/components/mpris/Player.qml
index 131b0f1..3c7490f 100644
--- a/modules/bar/components/mpris/Player.qml
+++ b/modules/bar/components/mpris/Player.qml
@@ -1,10 +1,9 @@
-import qs.config
-import qs.widgets
 import Quickshell.Services.Mpris
 import QtQuick
+import "../../../../styled/"
+import "../../../../config/"
 
 Loader {
-    id: root
     required property MprisPlayer modelData
     required property int index
 
@@ -12,37 +11,46 @@ Loader {
     signal previousPlayer
 
     sourceComponent: player
-    property Component player: StyledButton {
-        id: button
+    property Component player: Clickable {
+        id: clickable
+
+        implicitWidth: text.width
+        implicitHeight: Dimensions.mpris.height
 
         onClicked: {
-            if (!root.modelData.canTogglePlaying) {
+            if (!modelData.canTogglePlaying) {
                 return;
             }
-            if (root.modelData.isPlaying) {
-                root.modelData.pause();
+            if (modelData.isPlaying) {
+                modelData.pause();
             } else {
-                root.modelData.play();
+                modelData.play();
             }
         }
 
         onWheel: event => {
             if (event.angleDelta.y > 0) {
-                root.nextPlayer();
+                parent.nextPlayer();
             } else if (event.angleDelta.y < 0) {
-                root.previousPlayer();
+                parent.previousPlayer();
             }
         }
 
-        content: StyledText {
+        StyledText {
             id: text
-            text: `${root.modelData.isPlaying ? "" : ""} ${root.modelData.trackTitle} - ${root.modelData.trackArtist}`
+            text: `${modelData.isPlaying ? "" : ""} ${modelData.trackTitle} - ${modelData.trackArtist}`
+
+            anchors.verticalCenter: parent.verticalCenter
+            topPadding: Dimensions.mpris.verticalPadding
+            bottomPadding: Dimensions.mpris.verticalPadding
+            leftPadding: Dimensions.mpris.horizontalPadding
+            rightPadding: Dimensions.mpris.horizontalPadding
 
             font.pixelSize: Dimensions.mpris.fontSize
 
             states: State {
                 name: "hovered"
-                when: button.containsMouse
+                when: clickable.containsMouse
                 PropertyChanges {
                     text {
                         color: Theme.palette.base300