diff --git a/config/Paths.qml b/config/Paths.qml
deleted file mode 100644
index 21a23f3..0000000
--- a/config/Paths.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick
-import Quickshell
-
-Singleton {
-    id: root
-
-    readonly property url cache: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/lux`
-    readonly property url config: `${StandardPaths.standardLocations(StandardPaths.GenericConfigLocation)[0]}/quickshell`
-    readonly property url data: `${StandardPaths.standardLocations(StandardPaths.GenericDataLocation)[0]}/lux`
-    readonly property url home: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
-    readonly property url state: `${StandardPaths.standardLocations(StandardPaths.GenericStateLocation)[0]}/lux`
-    readonly property url wallpapers: `${StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]}/Wallpapers`
-}
diff --git a/modules/bar/components/bluetooth/Bluetooth.qml b/modules/bar/components/bluetooth/Bluetooth.qml
index b39e7b8..2414f69 100644
--- a/modules/bar/components/bluetooth/Bluetooth.qml
+++ b/modules/bar/components/bluetooth/Bluetooth.qml
@@ -1,18 +1,15 @@
 import qs.config
 import qs.constants
-import qs.styled
+import qs.widgets
 
-Clickable {
+StyledButton {
     id: root
 
-    implicitWidth: text.width
-    implicitHeight: Dimensions.bluetooth.height
-
     onClicked: {
         popup.opened = !popup.opened;
     }
 
-    StyledText {
+    content: StyledText {
         id: text
 
         font.family: Theme.lucide.font.family
@@ -21,12 +18,6 @@ Clickable {
         text: Icons.bluetooth
 
         color: root.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent
-
-        anchors.verticalCenter: parent.verticalCenter
-        topPadding: Dimensions.bluetooth.verticalPadding
-        bottomPadding: Dimensions.bluetooth.verticalPadding
-        leftPadding: Dimensions.bluetooth.horizontalPadding
-        rightPadding: Dimensions.bluetooth.horizontalPadding
     }
 
     BluetoothMenu {
diff --git a/modules/bar/components/hyprland/Workspace.qml b/modules/bar/components/hyprland/Workspace.qml
index d943bed..d03298e 100644
--- a/modules/bar/components/hyprland/Workspace.qml
+++ b/modules/bar/components/hyprland/Workspace.qml
@@ -1,8 +1,8 @@
+import qs.config
+import qs.constants
+import qs.widgets
 import QtQuick
 import Quickshell.Hyprland
-import "../../../../config"
-import "../../../../constants/"
-import "../../../../styled/"
 
 Loader {
     required property HyprlandWorkspace modelData
@@ -10,15 +10,12 @@ Loader {
     active: modelData.id > 0
 
     sourceComponent: workspace
-    property Component workspace: Clickable {
+    property Component workspace: StyledButton {
         id: clickable
 
-        width: Dimensions.workspace.width
-        height: Dimensions.workspace.height
-
         onClicked: modelData.activate()
 
-        Text {
+        content: Text {
             id: icon
 
             font.family: Theme.lucide.font.family
@@ -28,8 +25,6 @@ Loader {
 
             color: Theme.palette.basecontent
 
-            anchors.centerIn: parent
-
             states: [
                 State {
                     name: "focused"
diff --git a/modules/bar/components/hyprland/Workspaces.qml b/modules/bar/components/hyprland/Workspaces.qml
index ef52c15..1b1003d 100644
--- a/modules/bar/components/hyprland/Workspaces.qml
+++ b/modules/bar/components/hyprland/Workspaces.qml
@@ -1,9 +1,9 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Layouts
 import Quickshell.Hyprland
 import "../../../../config/"
 
-Row {
+RowLayout {
     id: root
 
     spacing: Dimensions.workspace.spacing
diff --git a/modules/bar/components/tray/Tray.qml b/modules/bar/components/tray/Tray.qml
index 0a95718..ac343f8 100644
--- a/modules/bar/components/tray/Tray.qml
+++ b/modules/bar/components/tray/Tray.qml
@@ -1,8 +1,11 @@
-import QtQuick
-import Quickshell.Services.SystemTray
-import "../../../../config/"
+pragma ComponentBehavior: Bound
 
-Row {
+import qs.config
+import QtQuick
+import QtQuick.Layouts
+import Quickshell.Services.SystemTray
+
+RowLayout {
     id: root
 
     spacing: Dimensions.tray.spacing
@@ -11,12 +14,13 @@ Row {
         model: SystemTray.items
 
         Loader {
+            id: loader
             required property SystemTrayItem modelData
             active: true
 
             sourceComponent: item
             property Component item: TrayItem {
-                trayItem: modelData
+                trayItem: loader.modelData
             }
         }
     }