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