diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index dfbea23..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.qmlls.ini
diff --git a/config/Paths.qml b/config/Paths.qml
deleted file mode 100644
index 3e93bf5..0000000
--- a/config/Paths.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Quickshell
-
-Singleton {
-    id: root
-
-    readonly property url home: StandardPaths.standardLocations(StandardPaths.)[0]
-    readonly property url wallpapers: `${StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]}/Wallpapers`
-
-    readonly property url data: `${StandardPaths.standardLocations(StandardPaths.GenericDataLocation)[0]}/lux`
-    readonly property url state: `${StandardPaths.standardLocations(StandardPaths.GenericStateLocation)[0]}/lux`
-    readonly property url cache: `${StandardPaths.standardLocations(StandardPaths.GenericCacheLocation)[0]}/lux`
-    readonly property url config: `${StandardPaths.standardLocations(StandardPaths.GenericConfigLocation)[0]}/quickshell`
-}
diff --git a/config/Theme.qml b/config/Theme.qml
deleted file mode 100644
index 5bf1bf5..0000000
--- a/config/Theme.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-pragma Singleton
-
-import QtQml
-import QtQuick
-import Quickshell
-
-Singleton {
-    id: root
-
-    property string fontFamily: "JetBrainsMono Nerd Font"
-    property Palette palette: Palette {}
-
-    component Palette: QtObject {
-        id: palette
-
-        property color primary: "#1fb854"
-        property color secondary: "#1eb88e"
-        property color accent: "#1fb8ab"
-        property color neutral: "#19362d"
-        property color base100: "#1b1717"
-        property color base200: "#161212"
-        property color base300: "#110d0d"
-        property color basecontent: "#cac9c9"
-        property color info: "#00b5ff"
-        property color success: "#00a96e"
-        property color warning: "#ffbe00"
-        property color error: "#ff5861"
-    }
-}
diff --git a/modules/bar/components/Workspace.qml b/modules/bar/components/Workspace.qml
deleted file mode 100644
index e48780d..0000000
--- a/modules/bar/components/Workspace.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell.Hyprland
-import "../../../config"
-
-Item {
-    id: workspace
-
-    required property HyprlandWorkspace modelData
-
-    visible: modelData.id > 0
-
-    width: 30
-    height: 30
-
-    Button {
-        id: button
-        anchors.centerIn: parent
-
-        padding: 6
-        leftPadding: 7
-        rightPadding: 7
-
-        background: Rectangle {
-            id: rectangle
-            anchors.fill: parent
-            color: "#161212"
-            radius: 8
-        }
-
-        rotation: workspace.modelData.active ? 0 : 180
-
-        icon.source: "/home/baobeld/dotfiles/quickshell/assets/triangle.svg"
-        icon.color: workspace.modelData.active ? Theme.palette.primary : Theme.palette.basecontent
-
-        onClicked: workspace.modelData.activate()
-    }
-}
diff --git a/modules/bar/components/Workspaces.qml b/modules/bar/components/Workspaces.qml
deleted file mode 100644
index ceef72b..0000000
--- a/modules/bar/components/Workspaces.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell.Hyprland
-
-Row {
-    id: root
-
-    spacing: 4
-
-    Repeater {
-
-        model: Hyprland.workspaces
-
-        Workspace {}
-    }
-}
diff --git a/ReloadPopup.qml b/shell/ReloadPopup.qml
similarity index 100%
rename from ReloadPopup.qml
rename to shell/ReloadPopup.qml
diff --git a/assets/triangle-alert.svg b/shell/assets/triangle-alert.svg
similarity index 100%
rename from assets/triangle-alert.svg
rename to shell/assets/triangle-alert.svg
diff --git a/assets/triangle-dashed.svg b/shell/assets/triangle-dashed.svg
similarity index 100%
rename from assets/triangle-dashed.svg
rename to shell/assets/triangle-dashed.svg
diff --git a/assets/triangle.svg b/shell/assets/triangle.svg
similarity index 100%
rename from assets/triangle.svg
rename to shell/assets/triangle.svg
diff --git a/modules/background/Background.qml b/shell/modules/background/Background.qml
similarity index 96%
rename from modules/background/Background.qml
rename to shell/modules/background/Background.qml
index bc4bc35..343ff38 100644
--- a/modules/background/Background.qml
+++ b/shell/modules/background/Background.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import Quickshell.Wayland
-import "root:styled"
+import "../../widgets"
 
 Variants {
     model: Quickshell.screens
diff --git a/modules/bar/Bar.qml b/shell/modules/bar/Bar.qml
similarity index 89%
rename from modules/bar/Bar.qml
rename to shell/modules/bar/Bar.qml
index e3de268..cbc1717 100644
--- a/modules/bar/Bar.qml
+++ b/shell/modules/bar/Bar.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
 import "components"
-import "../../config/"
+import "../../config"
 
 Scope {
     PanelWindow {
@@ -13,14 +13,13 @@ Scope {
             right: true
         }
 
-        implicitHeight: 40
+        implicitHeight: 30
 
         color: 'transparent'
 
         Rectangle {
-            id: background
             anchors.fill: parent
-            color: Theme.palette.base300
+            color: Colours.palette.base100
         }
 
         Row {
diff --git a/modules/bar/components/Clock.qml b/shell/modules/bar/components/Clock.qml
similarity index 90%
rename from modules/bar/components/Clock.qml
rename to shell/modules/bar/components/Clock.qml
index fbb65fa..d5df94b 100644
--- a/modules/bar/components/Clock.qml
+++ b/shell/modules/bar/components/Clock.qml
@@ -1,7 +1,6 @@
 import Quickshell
 import Quickshell.Io
 import QtQuick
-import "root:styled"
 
 Item {
     id: clock
@@ -9,14 +8,19 @@ Item {
     implicitWidth: 200
     implicitHeight: 30
 
-    StyledLabel {
+    Rectangle {
         anchors.fill: parent
+        color: "#333"
+        opacity: 0.5
+        radius: 5
     }
 
-    StyledText {
+    Text {
         id: text
         anchors.centerIn: parent
 
+        color: "white"
+
         Process {
             // give the process object an id so we can talk
             // about it from the timer
diff --git a/shell/modules/bar/components/Workspaces.qml b/shell/modules/bar/components/Workspaces.qml
new file mode 100644
index 0000000..4a69735
--- /dev/null
+++ b/shell/modules/bar/components/Workspaces.qml
@@ -0,0 +1,51 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.VectorImage
+import Quickshell.Hyprland
+import "../../../config"
+
+Row {
+    id: root
+
+    spacing: 4
+
+    Repeater {
+
+        model: Hyprland.workspaces
+
+        Item {
+            id: workspace
+
+            required property HyprlandWorkspace modelData
+
+            visible: modelData.id > 0
+
+            width: 25
+            height: 25
+
+            Rectangle {
+                id: rectangle
+
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.fill: parent
+                color: "#161212"
+                radius: 8
+            }
+
+            Button {
+                id: button
+                anchors.centerIn: parent
+                anchors.fill: parent
+
+                rotation: workspace.modelData.active ? 0 : 180
+
+                icon.source: "/home/baobeld/dotfiles/quickshell/shell/assets/triangle.svg"
+                icon.color: "#1fb854"
+
+                // palette.button: QtColor.
+
+                onClicked: workspace.modelData.activate()
+            }
+        }
+    }
+}
diff --git a/shell.qml b/shell/shell.qml
similarity index 100%
rename from shell.qml
rename to shell/shell.qml
diff --git a/styled/StyledWindow.qml b/shell/widgets/StyledWindow.qml
similarity index 100%
rename from styled/StyledWindow.qml
rename to shell/widgets/StyledWindow.qml
diff --git a/styled/StyledLabel.qml b/styled/StyledLabel.qml
deleted file mode 100644
index 9e785ac..0000000
--- a/styled/StyledLabel.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick
-import "root:config"
-
-Rectangle {
-    color: Theme.palette.base100
-
-    radius: 5
-}
diff --git a/styled/StyledText.qml b/styled/StyledText.qml
deleted file mode 100644
index 838d6ef..0000000
--- a/styled/StyledText.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick
-import "root:config"
-
-Text {
-    color: Theme.palette.basecontent
-}