cava reintroduced : uses libcava or cava for nix : needs nixos fixing, but could be isolated issue

.qmlformat.ini

@@ -1,10 +0,0 @@
-[General]
-FunctionsSpacing=true
-IndentWidth=4
-MaxColumnWidth=-1
-NewlineType=native
-NormalizeOrder=true
-ObjectsSpacing=true
-SemicolonRule=always
-SortImports=false
-UseTabs=true

Bar.qml

@@ -0,0 +1,197 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Effects
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Hyprland
+import qs.Daemons
+import qs.Components
+import qs.Modules
+import qs.Modules.Bar
+import qs.Config
+import qs.Helpers
+import qs.Drawers
+
+Variants {
+	model: Quickshell.screens
+	Scope {
+		id: scope
+		required property var modelData
+        PanelWindow {
+            id: bar
+            property bool trayMenuVisible: false
+            screen: scope.modelData
+            color: "transparent"
+            property var root: Quickshell.shellDir
+
+			WlrLayershell.namespace: "ZShell-Bar"
+            WlrLayershell.exclusionMode: ExclusionMode.Ignore
+			WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.sidebar || visibilities.dashboard ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+			
+			contentItem.focus: true
+
+            contentItem.Keys.onEscapePressed: {
+				if ( Config.barConfig.autoHide )
+					visibilities.bar = false;
+				visibilities.sidebar = false;
+				visibilities.dashboard = false;
+				visibilities.osd = false;
+			}
+
+            PanelWindow {
+                id: exclusionZone
+				WlrLayershell.namespace: "ZShell-Bar-Exclusion"
+                screen: bar.screen
+                WlrLayershell.layer: WlrLayer.Bottom
+				WlrLayershell.exclusionMode: Config.barConfig.autoHide ? ExclusionMode.Ignore : ExclusionMode.Auto
+                anchors {
+                    left: true
+                    right: true
+                    top: true
+                }
+                color: "transparent"
+                implicitHeight: 34
+            }
+
+            anchors {
+                top: true
+                left: true
+                right: true
+                bottom: true
+            }
+
+            mask: Region {
+				id: region
+                x: 0
+                y: Config.barConfig.autoHide && !visibilities.bar ? 4 : 34
+
+				property list<Region> nullRegions: []
+
+                width: bar.width
+                height: bar.screen.height - backgroundRect.implicitHeight
+                intersection: Intersection.Xor
+
+                regions: popoutRegions.instances
+            }
+
+            Variants {
+                id: popoutRegions
+                model: panels.children
+
+                Region {
+                    required property Item modelData
+
+                    x: modelData.x
+                    y: modelData.y + backgroundRect.implicitHeight
+                    width: modelData.width
+                    height: modelData.height
+                    intersection: Intersection.Subtract
+                }
+            }
+
+			HyprlandFocusGrab {
+				id: focusGrab
+
+				active: visibilities.launcher || visibilities.sidebar || visibilities.dashboard || ( panels.popouts.hasCurrent && panels.popouts.currentName.startsWith( "traymenu" ))
+				windows: [bar]
+				onCleared: {
+					visibilities.launcher = false;
+					visibilities.sidebar = false;
+					visibilities.dashboard = false;
+					visibilities.osd = false;
+					panels.popouts.hasCurrent = false;
+				}
+			}
+
+			PersistentProperties {
+				id: visibilities
+
+				property bool sidebar
+				property bool dashboard
+				property bool bar
+				property bool osd
+				property bool launcher
+				property bool notif: NotifServer.popups.length > 0
+
+				Component.onCompleted: Visibilities.load(scope.modelData, this)
+			}
+
+			Binding {
+				target: visibilities
+				property: "bar"
+				value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || visibilities.notif
+				when: Config.barConfig.autoHide
+			}
+
+            Item {
+                anchors.fill: parent
+                opacity: Appearance.transparency.enabled ? DynamicColors.transparency.base : 1
+                layer.enabled: true
+                layer.effect: MultiEffect {
+                    shadowEnabled: true
+                    blurMax: 32
+                    shadowColor: Qt.alpha(DynamicColors.palette.m3shadow, 1)
+                }
+
+                Border {
+                    bar: backgroundRect
+					visibilities: visibilities
+                }
+
+                Backgrounds {
+					visibilities: visibilities
+                    panels: panels
+                    bar: backgroundRect
+                }
+            }
+
+            Interactions {
+				id: mouseArea
+				screen: scope.modelData
+				popouts: panels.popouts
+				visibilities: visibilities
+				panels: panels
+				bar: barLoader
+                anchors.fill: parent
+
+                Panels {
+                    id: panels
+                    screen: scope.modelData
+                    bar: backgroundRect
+					visibilities: visibilities
+                }
+
+                CustomRect {
+                    id: backgroundRect
+                    property Wrapper popouts: panels.popouts
+					anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    implicitHeight: 34
+					anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? -30 : 0
+                    color: "transparent"
+                    radius: 0
+
+
+                    Behavior on color {
+                        CAnim {}
+                    }
+
+					Behavior on anchors.topMargin {
+						Anim {}
+					}
+
+                    BarLoader {
+                        id: barLoader
+                        anchors.fill: parent
+                        popouts: panels.popouts
+                        bar: bar
+						visibilities: visibilities
+						screen: scope.modelData
+                    }
+                }
+            }
+        }
+    }
+}

CMakeLists.txt

@@ -30,5 +30,5 @@ if("shell" IN_LIST ENABLE_MODULES)
 	foreach(dir assets scripts Components Config Modules Daemons Drawers Effects Helpers Paths)
         install(DIRECTORY ${dir} DESTINATION "${INSTALL_QSCONFDIR}")
     endforeach()
-	install(FILES shell.qml DESTINATION "${INSTALL_QSCONFDIR}")
+	install(FILES shell.qml Bar.qml Wallpaper.qml DESTINATION "${INSTALL_QSCONFDIR}")
 endif()

Components/Anim.qml

@@ -1,8 +0,0 @@
-import QtQuick
-import qs.Config
-
-NumberAnimation {
-	duration: MaterialEasing.standardTime
-	easing.bezierCurve: MaterialEasing.standard
-	easing.type: Easing.BezierSpline
-}

Components/CAnim.qml

@@ -1,8 +0,0 @@
-import QtQuick
-import qs.Config
-
-ColorAnimation {
-	duration: MaterialEasing.standardTime
-	easing.bezierCurve: MaterialEasing.standard
-	easing.type: Easing.BezierSpline
-}

Components/CircularIndicator.qml

@@ -1,4 +1,6 @@
+import qs.Helpers
 import qs.Config
+import qs.Modules
 import ZShell.Internal
 import QtQuick
 import QtQuick.Templates
@@ -6,54 +8,31 @@ import QtQuick.Templates
 BusyIndicator {
     id: root
 
-	enum AnimState {
-		Stopped,
-		Running,
-		Completing
-	}
     enum AnimType {
         Advance = 0,
         Retreat
     }
 
-	property int animState
+    enum AnimState {
-	property color bgColour: DynamicColors.palette.m3secondaryContainer
+        Stopped,
-	property color fgColour: DynamicColors.palette.m3primary
+        Running,
+        Completing
+    }
+
     property real implicitSize: Appearance.font.size.normal * 3
-	property real internalStrokeWidth: strokeWidth
-	readonly property alias progress: manager.progress
     property real strokeWidth: Appearance.padding.small * 0.8
+    property color fgColour: DynamicColors.palette.m3primary
+    property color bgColour: DynamicColors.palette.m3secondaryContainer
+
     property alias type: manager.indeterminateAnimationType
+    readonly property alias progress: manager.progress
+
+    property real internalStrokeWidth: strokeWidth
+    property int animState
 
-	implicitHeight: implicitSize
-	implicitWidth: implicitSize
     padding: 0
-
+    implicitWidth: implicitSize
-	contentItem: CircularProgress {
+    implicitHeight: implicitSize
-		anchors.fill: parent
-		bgColour: root.bgColour
-		fgColour: root.fgColour
-		padding: root.padding
-		rotation: manager.rotation
-		startAngle: manager.startFraction * 360
-		strokeWidth: root.internalStrokeWidth
-		value: manager.endFraction - manager.startFraction
-	}
-	states: State {
-		name: "stopped"
-		when: !root.running
-
-		PropertyChanges {
-			root.internalStrokeWidth: root.strokeWidth / 3
-			root.opacity: 0
-		}
-	}
-	transitions: Transition {
-		Anim {
-			duration: manager.completeEndDuration * Appearance.anim.durations.scale
-			properties: "opacity,internalStrokeWidth"
-		}
-	}
 
     Component.onCompleted: {
         if (running) {
@@ -61,6 +40,7 @@ BusyIndicator {
             running = true;
         }
     }
+
     onRunningChanged: {
         if (running) {
             manager.completeEndProgress = 0;
@@ -71,29 +51,55 @@ BusyIndicator {
         }
     }
 
+    states: State {
+        name: "stopped"
+        when: !root.running
+
+        PropertyChanges {
+            root.opacity: 0
+            root.internalStrokeWidth: root.strokeWidth / 3
+        }
+    }
+
+    transitions: Transition {
+        Anim {
+            properties: "opacity,internalStrokeWidth"
+            duration: manager.completeEndDuration * Appearance.anim.durations.scale
+        }
+    }
+
+    contentItem: CircularProgress {
+        anchors.fill: parent
+        strokeWidth: root.internalStrokeWidth
+        fgColour: root.fgColour
+        bgColour: root.bgColour
+        padding: root.padding
+        rotation: manager.rotation
+        startAngle: manager.startFraction * 360
+        value: manager.endFraction - manager.startFraction
+    }
+
     CircularIndicatorManager {
         id: manager
-
     }
 
     NumberAnimation {
-		duration: manager.duration * Appearance.anim.durations.scale
-		from: 0
-		loops: Animation.Infinite
-		property: "progress"
         running: root.animState !== CircularIndicator.Stopped
+        loops: Animation.Infinite
         target: manager
+        property: "progress"
+        from: 0
         to: 1
+        duration: manager.duration * Appearance.anim.durations.scale
     }
 
     NumberAnimation {
-		duration: manager.completeEndDuration * Appearance.anim.durations.scale
-		from: 0
-		property: "completeEndProgress"
         running: root.animState === CircularIndicator.Completing
         target: manager
+        property: "completeEndProgress"
+        from: 0
         to: 1
-
+        duration: manager.completeEndDuration * Appearance.anim.durations.scale
         onFinished: {
             if (root.animState === CircularIndicator.Completing)
                 root.animState = CircularIndicator.Stopped;

Components/CircularProgress.qml

@@ -1,66 +1,69 @@
 import QtQuick
 import QtQuick.Shapes
+import qs.Helpers
 import qs.Config
+import qs.Modules
 
 Shape {
     id: root
 
-	readonly property real arcRadius: (size - padding - strokeWidth) / 2
+    property real value
-	property color bgColour: DynamicColors.palette.m3secondaryContainer
-	property color fgColour: DynamicColors.palette.m3primary
-	readonly property real gapAngle: ((spacing + strokeWidth) / (arcRadius || 1)) * (180 / Math.PI)
-	property int padding: 0
-	readonly property real size: Math.min(width, height)
-	property int spacing: Appearance.spacing.small
     property int startAngle: -90
     property int strokeWidth: Appearance.padding.smaller
-	readonly property real vValue: value || 1 / 360
+    property int padding: 0
-	property real value
+    property int spacing: Appearance.spacing.small
+    property color fgColour: DynamicColors.palette.m3primary
+    property color bgColour: DynamicColors.palette.m3secondaryContainer
+
+    readonly property real size: Math.min(width, height)
+    readonly property real arcRadius: (size - padding - strokeWidth) / 2
+    readonly property real vValue: value || 1 / 360
+    readonly property real gapAngle: ((spacing + strokeWidth) / (arcRadius || 1)) * (180 / Math.PI)
 
-	asynchronous: true
     preferredRendererType: Shape.CurveRenderer
+    asynchronous: true
 
     ShapePath {
-		capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
         fillColor: "transparent"
         strokeColor: root.bgColour
         strokeWidth: root.strokeWidth
+        capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+
+        PathAngleArc {
+            startAngle: root.startAngle + 360 * root.vValue + root.gapAngle
+            sweepAngle: Math.max(-root.gapAngle, 360 * (1 - root.vValue) - root.gapAngle * 2)
+            radiusX: root.arcRadius
+            radiusY: root.arcRadius
+            centerX: root.size / 2
+            centerY: root.size / 2
+        }
 
         Behavior on strokeColor {
             CAnim {
                 duration: Appearance.anim.durations.large
             }
         }
-
-		PathAngleArc {
-			centerX: root.size / 2
-			centerY: root.size / 2
-			radiusX: root.arcRadius
-			radiusY: root.arcRadius
-			startAngle: root.startAngle + 360 * root.vValue + root.gapAngle
-			sweepAngle: Math.max(-root.gapAngle, 360 * (1 - root.vValue) - root.gapAngle * 2)
-		}
     }
 
     ShapePath {
-		capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
         fillColor: "transparent"
         strokeColor: root.fgColour
         strokeWidth: root.strokeWidth
+        capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+
+        PathAngleArc {
+            startAngle: root.startAngle
+            sweepAngle: 360 * root.vValue
+            radiusX: root.arcRadius
+            radiusY: root.arcRadius
+            centerX: root.size / 2
+            centerY: root.size / 2
+        }
 
         Behavior on strokeColor {
             CAnim {
                 duration: Appearance.anim.durations.large
             }
         }
-
-		PathAngleArc {
-			centerX: root.size / 2
-			centerY: root.size / 2
-			radiusX: root.arcRadius
-			radiusY: root.arcRadius
-			startAngle: root.startAngle
-			sweepAngle: 360 * root.vValue
-		}
     }
 }

Components/CollapsibleSection.qml

@@ -1,135 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Config
-
-ColumnLayout {
-	id: root
-
-	default property alias content: contentColumn.data
-	property string description: ""
-	property bool expanded: false
-	property bool nested: false
-	property bool showBackground: false
-	required property string title
-
-	signal toggleRequested
-
-	Layout.fillWidth: true
-	spacing: Appearance.spacing.small
-
-	Item {
-		id: sectionHeaderItem
-
-		Layout.fillWidth: true
-		Layout.preferredHeight: Math.max(titleRow.implicitHeight + Appearance.padding.normal * 2, 48)
-
-		RowLayout {
-			id: titleRow
-
-			anchors.left: parent.left
-			anchors.leftMargin: Appearance.padding.normal
-			anchors.right: parent.right
-			anchors.rightMargin: Appearance.padding.normal
-			anchors.verticalCenter: parent.verticalCenter
-			spacing: Appearance.spacing.normal
-
-			CustomText {
-				font.pointSize: Appearance.font.size.larger
-				font.weight: 500
-				text: root.title
-			}
-
-			Item {
-				Layout.fillWidth: true
-			}
-
-			MaterialIcon {
-				color: DynamicColors.palette.m3onSurfaceVariant
-				font.pointSize: Appearance.font.size.normal
-				rotation: root.expanded ? 180 : 0
-				text: "expand_more"
-
-				Behavior on rotation {
-					Anim {
-						duration: Appearance.anim.durations.small
-						easing.bezierCurve: Appearance.anim.curves.standard
-					}
-				}
-			}
-		}
-
-		StateLayer {
-			function onClicked(): void {
-				root.toggleRequested();
-				root.expanded = !root.expanded;
-			}
-
-			anchors.fill: parent
-			color: DynamicColors.palette.m3onSurface
-			radius: Appearance.rounding.normal
-			showHoverBackground: false
-		}
-	}
-
-	Item {
-		id: contentWrapper
-
-		Layout.fillWidth: true
-		Layout.preferredHeight: root.expanded ? (contentColumn.implicitHeight + Appearance.spacing.small * 2) : 0
-		clip: true
-
-		Behavior on Layout.preferredHeight {
-			Anim {
-				easing.bezierCurve: Appearance.anim.curves.standard
-			}
-		}
-
-		CustomRect {
-			id: backgroundRect
-
-			anchors.fill: parent
-			color: DynamicColors.transparency.enabled ? DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, root.nested ? 3 : 2) : (root.nested ? DynamicColors.palette.m3surfaceContainerHigh : DynamicColors.palette.m3surfaceContainer)
-			opacity: root.showBackground && root.expanded ? 1.0 : 0.0
-			radius: Appearance.rounding.normal
-			visible: root.showBackground
-
-			Behavior on opacity {
-				Anim {
-					easing.bezierCurve: Appearance.anim.curves.standard
-				}
-			}
-		}
-
-		ColumnLayout {
-			id: contentColumn
-
-			anchors.bottomMargin: Appearance.spacing.small
-			anchors.left: parent.left
-			anchors.leftMargin: Appearance.padding.normal
-			anchors.right: parent.right
-			anchors.rightMargin: Appearance.padding.normal
-			opacity: root.expanded ? 1.0 : 0.0
-			spacing: Appearance.spacing.small
-			y: Appearance.spacing.small
-
-			Behavior on opacity {
-				Anim {
-					easing.bezierCurve: Appearance.anim.curves.standard
-				}
-			}
-
-			CustomText {
-				id: descriptionText
-
-				Layout.bottomMargin: root.description !== "" ? Appearance.spacing.small : 0
-				Layout.fillWidth: true
-				Layout.topMargin: root.description !== "" ? Appearance.spacing.smaller : 0
-				color: DynamicColors.palette.m3onSurfaceVariant
-				font.pointSize: Appearance.font.size.small
-				text: root.description
-				visible: root.description !== ""
-				wrapMode: Text.Wrap
-			}
-		}
-	}
-}

Components/ColoredIcon.qml

@@ -10,17 +10,18 @@ IconImage {
     required property color color
 
     asynchronous: true
-	layer.enabled: true
 
+    layer.enabled: true
     layer.effect: Coloriser {
-		colorizationColor: root.color
         sourceColor: analyser.dominantColour
+        colorizationColor: root.color
     }
 
     layer.onEnabledChanged: {
         if (layer.enabled && status === Image.Ready)
             analyser.requestUpdate();
     }
+
     onStatusChanged: {
         if (layer.enabled && status === Image.Ready)
             analyser.requestUpdate();

Components/Coloriser.qml

@@ -1,14 +1,14 @@
 import QtQuick
 import QtQuick.Effects
+import qs.Modules
 
 MultiEffect {
     property color sourceColor: "black"
 
-	brightness: 1 - sourceColor.hslLightness
     colorization: 1
+    brightness: 1 - sourceColor.hslLightness
 
     Behavior on colorizationColor {
-		CAnim {
+        CAnim {}
-		}
     }
 }

Components/CustomAudioSlider.qml

@@ -1,69 +1,82 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Config
+import qs.Modules
 
 Slider {
     id: root
 
-	property color nonPeakColor: DynamicColors.tPalette.m3primary
 	required property real peak
+	property color nonPeakColor: DynamicColors.tPalette.m3primary
 	property color peakColor: DynamicColors.palette.m3primary
 
     background: Item {
         CustomRect {
-			anchors.bottom: parent.bottom
-			anchors.bottomMargin: root.implicitHeight / 3
-			anchors.left: parent.left
             anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
             anchors.topMargin: root.implicitHeight / 3
-			bottomRightRadius: root.implicitHeight / 15
+            anchors.bottomMargin: root.implicitHeight / 3
-			color: root.nonPeakColor
+
             implicitWidth: root.handle.x - root.implicitHeight
+
+            color: root.nonPeakColor
             radius: 1000
             topRightRadius: root.implicitHeight / 15
+            bottomRightRadius: root.implicitHeight / 15
 
 			CustomRect {
+				anchors.top: parent.top
 				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.top: parent.top
+
-				bottomRightRadius: root.implicitHeight / 15
-				color: root.peakColor
 				implicitWidth: parent.width * root.peak
 				radius: 1000
 				topRightRadius: root.implicitHeight / 15
+				bottomRightRadius: root.implicitHeight / 15
+
+				color: root.peakColor
 
 				Behavior on implicitWidth {
-					Anim {
+					Anim { duration: 50 }
-						duration: 50
-					}
 				}
 			}
         }
 
         CustomRect {
-			anchors.bottom: parent.bottom
-			anchors.bottomMargin: root.implicitHeight / 3
-			anchors.right: parent.right
             anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
             anchors.topMargin: root.implicitHeight / 3
-			bottomLeftRadius: root.implicitHeight / 15
+            anchors.bottomMargin: root.implicitHeight / 3
-			color: DynamicColors.tPalette.m3surfaceContainer
+
             implicitWidth: root.implicitWidth - root.handle.x - root.handle.implicitWidth - root.implicitHeight
+
+			Component.onCompleted: {
+				console.log(root.handle.x, implicitWidth)
+			}
+
+
+            color: DynamicColors.tPalette.m3surfaceContainer
             radius: 1000
             topLeftRadius: root.implicitHeight / 15
+            bottomLeftRadius: root.implicitHeight / 15
         }
     }
+
     handle: CustomRect {
-		anchors.verticalCenter: parent.verticalCenter
-		color: DynamicColors.palette.m3primary
-		implicitHeight: 15
-		implicitWidth: 5
-		radius: 1000
         x: root.visualPosition * root.availableWidth - implicitWidth / 2
 
+        implicitWidth: 5
+        implicitHeight: 15
+        anchors.verticalCenter: parent.verticalCenter
+
+        color: DynamicColors.palette.m3primary
+        radius: 1000
+
         MouseArea {
-			acceptedButtons: Qt.NoButton
             anchors.fill: parent
+            acceptedButtons: Qt.NoButton
             cursorShape: Qt.PointingHandCursor
         }
     }

Components/CustomBusyIndicator.qml

@@ -3,22 +3,20 @@ import QtQuick.Controls.Basic
 
 BusyIndicator {
     id: control
-
-	property int busySize: 64
 	property color color: delegate.color
+	property int busySize: 64
 
     contentItem: Item {
-		implicitHeight: control.busySize
         implicitWidth: control.busySize
+        implicitHeight: control.busySize
 
         Item {
             id: item
-
-			height: control.busySize
-			opacity: control.running ? 1 : 0
-			width: control.busySize
             x: parent.width / 2 - (control.busySize / 2)
             y: parent.height / 2 - (control.busySize / 2)
+            width: control.busySize
+            height: control.busySize
+            opacity: control.running ? 1 : 0
 
             Behavior on opacity {
                 OpacityAnimator {
@@ -27,30 +25,28 @@ BusyIndicator {
             }
 
             RotationAnimator {
-				duration: 1250
-				from: 0
-				loops: Animation.Infinite
-				running: control.visible && control.running
                 target: item
+                running: control.visible && control.running
+                from: 0
                 to: 360
+                loops: Animation.Infinite
+                duration: 1250
             }
 
             Repeater {
                 id: repeater
-
                 model: 6
 
                 CustomRect {
                     id: delegate
-
-					required property int index
-
-					color: control.color
-					implicitHeight: 10
-					implicitWidth: 10
-					radius: 5
                     x: item.width / 2 - width / 2
                     y: item.height / 2 - height / 2
+                    implicitWidth: 10
+                    implicitHeight: 10
+                    radius: 5
+                    color: control.color
+
+                    required property int index
 
                     transform: [
                         Translate {

Components/CustomButton.qml

@@ -4,28 +4,30 @@ import QtQuick.Controls
 Button {
 	id: control
 
+	required property color textColor
 	required property color bgColor
 	property int radius: 4
-	required property color textColor
 
-	background: CustomRect {
-		color: control.bgColor
-		opacity: control.enabled ? 1.0 : 0.5
-		radius: control.radius
-	}
 	contentItem: CustomText {
+		text: control.text
+
+		opacity: control.enabled ? 1.0 : 0.5
 		color: control.textColor
 		horizontalAlignment: Text.AlignHCenter
-		opacity: control.enabled ? 1.0 : 0.5
-		text: control.text
 		verticalAlignment: Text.AlignVCenter
 	}
 
+	background: CustomRect {
+		opacity: control.enabled ? 1.0 : 0.5
+
+		radius: control.radius
+		color: control.bgColor
+	}
+
 	StateLayer {
+		radius: control.radius
 		function onClicked(): void {
 			control.clicked();
 		}
-
-		radius: control.radius
 	}
 }

Components/CustomCheckbox.qml

@@ -5,33 +5,35 @@ import qs.Config
 CheckBox {
 	id: control
 
-	property int checkHeight: 20
 	property int checkWidth: 20
+	property int checkHeight: 20
 
-	contentItem: CustomText {
-		anchors.left: parent.left
-		anchors.leftMargin: control.checkWidth + control.leftPadding + 8
-		anchors.verticalCenter: parent.verticalCenter
-		font.pointSize: control.font.pointSize
-		text: control.text
-	}
 	indicator: CustomRect {
+		implicitWidth: control.checkWidth
+		implicitHeight: control.checkHeight
 		// x: control.leftPadding
 		// y: parent.implicitHeight / 2 - implicitHeight / 2
 		border.color: control.checked ? DynamicColors.palette.m3primary : "transparent"
 		color: DynamicColors.palette.m3surfaceVariant
-		implicitHeight: control.checkHeight
+
-		implicitWidth: control.checkWidth
 		radius: 4
 
 		CustomRect {
-			color: DynamicColors.palette.m3primary
-			implicitHeight: control.checkHeight - (y * 2)
 			implicitWidth: control.checkWidth - (x * 2)
-			radius: 3
+			implicitHeight: control.checkHeight - (y * 2)
-			visible: control.checked
 			x: 4
 			y: 4
+			radius: 3
+			color: DynamicColors.palette.m3primary
+			visible: control.checked
 		}
 	}
+
+	contentItem: CustomText {
+		text: control.text
+		font.pointSize: control.font.pointSize
+		anchors.verticalCenter: parent.verticalCenter
+		anchors.left: parent.left
+		anchors.leftMargin: control.checkWidth + control.leftPadding + 8
+	}
 }

Components/CustomClippingRect.qml

@@ -1,5 +1,6 @@
 import Quickshell.Widgets
 import QtQuick
+import qs.Modules
 
 ClippingRectangle {
     id: root
@@ -7,7 +8,6 @@ ClippingRectangle {
     color: "transparent"
 
     Behavior on color {
-		CAnim {
+        CAnim {}
-		}
     }
 }

Components/CustomFlickable.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import qs.Modules
 
 Flickable {
     id: root

Components/CustomListView.qml

@@ -1,4 +1,6 @@
 import QtQuick
+import qs.Config
+import qs.Modules
 
 ListView {
     id: root

Components/CustomRadioButton.qml

@@ -1,53 +1,56 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Config
+import qs.Modules
 
 RadioButton {
     id: root
 
     font.pointSize: 12
-	implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
-	implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
 
-	contentItem: CustomText {
+    implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
-		anchors.left: outerCircle.right
+    implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
-		anchors.leftMargin: 10
+
-		anchors.verticalCenter: parent.verticalCenter
-		font.pointSize: root.font.pointSize
-		text: root.text
-	}
     indicator: Rectangle {
         id: outerCircle
 
-		anchors.verticalCenter: parent.verticalCenter
+        implicitWidth: 16
+        implicitHeight: 16
+        radius: 1000
+        color: "transparent"
         border.color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurfaceVariant
         border.width: 2
-		color: "transparent"
+        anchors.verticalCenter: parent.verticalCenter
-		implicitHeight: 16
-		implicitWidth: 16
-		radius: 1000
-
-		Behavior on border.color {
-			CAnim {
-			}
-		}
 
         StateLayer {
-			function onClicked(): void {
-				root.click();
-			}
-
             anchors.margins: -7
             color: root.checked ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3primary
             z: -1
+
+            function onClicked(): void {
+                root.click();
+            }
         }
 
         CustomRect {
             anchors.centerIn: parent
-			color: Qt.alpha(DynamicColors.palette.m3primary, root.checked ? 1 : 0)
-			implicitHeight: 8
             implicitWidth: 8
+            implicitHeight: 8
+
             radius: 1000
+            color: Qt.alpha(DynamicColors.palette.m3primary, root.checked ? 1 : 0)
         }
+
+        Behavior on border.color {
+            CAnim {}
+        }
+    }
+
+    contentItem: CustomText {
+        text: root.text
+        font.pointSize: root.font.pointSize
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: outerCircle.right
+        anchors.leftMargin: 10
     }
 }

Components/CustomRect.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import qs.Modules
 
 Rectangle {
     id: root
@@ -6,7 +7,6 @@ Rectangle {
     color: "transparent"
 
     Behavior on color {
-		CAnim {
+        CAnim {}
-		}
     }
 }

Components/CustomScrollBar.qml

@@ -1,66 +1,16 @@
 import qs.Config
+import qs.Modules
 import QtQuick
 import QtQuick.Templates
 
 ScrollBar {
     id: root
 
-	property bool _updatingFromFlickable: false
-	property bool _updatingFromUser: false
-	property bool animating
     required property Flickable flickable
-	property real nonAnimPosition
     property bool shouldBeActive
+    property real nonAnimPosition
+    property bool animating
 
-	implicitWidth: 8
-
-	contentItem: CustomRect {
-		anchors.left: parent.left
-		anchors.right: parent.right
-		color: DynamicColors.palette.m3secondary
-		opacity: {
-			if (root.size === 1)
-				return 0;
-			if (fullMouse.pressed)
-				return 1;
-			if (mouse.containsMouse)
-				return 0.8;
-			if (root.policy === ScrollBar.AlwaysOn || root.shouldBeActive)
-				return 0.6;
-			return 0;
-		}
-		radius: 1000
-
-		Behavior on opacity {
-			Anim {
-			}
-		}
-
-		MouseArea {
-			id: mouse
-
-			acceptedButtons: Qt.NoButton
-			anchors.fill: parent
-			cursorShape: Qt.PointingHandCursor
-			hoverEnabled: true
-		}
-	}
-	Behavior on position {
-		enabled: !fullMouse.pressed
-
-		Anim {
-		}
-	}
-
-	Component.onCompleted: {
-		if (flickable) {
-			const contentHeight = flickable.contentHeight;
-			const height = flickable.height;
-			if (contentHeight > height) {
-				nonAnimPosition = Math.max(0, Math.min(1, flickable.contentY / (contentHeight - height)));
-			}
-		}
-	}
     onHoveredChanged: {
         if (hovered)
             shouldBeActive = true;
@@ -68,6 +18,9 @@ ScrollBar {
             shouldBeActive = flickable.moving;
     }
 
+    property bool _updatingFromFlickable: false
+    property bool _updatingFromUser: false
+
     // Sync nonAnimPosition with Qt's automatic position binding
     onPositionChanged: {
         if (_updatingFromUser) {
@@ -85,6 +38,7 @@ ScrollBar {
 
     // Sync nonAnimPosition with flickable when not animating
     Connections {
+        target: flickable
         function onContentYChanged() {
             if (!animating && !fullMouse.pressed) {
                 _updatingFromFlickable = true;
@@ -98,32 +52,111 @@ ScrollBar {
                 _updatingFromFlickable = false;
             }
         }
+    }
 
-		target: flickable
+    Component.onCompleted: {
+        if (flickable) {
+            const contentHeight = flickable.contentHeight;
+            const height = flickable.height;
+            if (contentHeight > height) {
+                nonAnimPosition = Math.max(0, Math.min(1, flickable.contentY / (contentHeight - height)));
+            }
+        }
+    }
+    implicitWidth: 8
+
+    contentItem: CustomRect {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        opacity: {
+            if (root.size === 1)
+                return 0;
+            if (fullMouse.pressed)
+                return 1;
+            if (mouse.containsMouse)
+                return 0.8;
+            if (root.policy === ScrollBar.AlwaysOn || root.shouldBeActive)
+                return 0.6;
+            return 0;
+        }
+        radius: 1000
+        color: DynamicColors.palette.m3secondary
+
+        MouseArea {
+            id: mouse
+
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
+            hoverEnabled: true
+            acceptedButtons: Qt.NoButton
+        }
+
+        Behavior on opacity {
+            Anim {}
+        }
     }
 
     Connections {
+        target: root.flickable
+
         function onMovingChanged(): void {
             if (root.flickable.moving)
                 root.shouldBeActive = true;
             else
                 hideDelay.restart();
         }
-
-		target: root.flickable
     }
 
     Timer {
         id: hideDelay
 
         interval: 600
-
         onTriggered: root.shouldBeActive = root.flickable.moving || root.hovered
     }
 
     CustomMouseArea {
         id: fullMouse
 
+        anchors.fill: parent
+        preventStealing: true
+
+        onPressed: event => {
+            root.animating = true;
+            root._updatingFromUser = true;
+            const newPos = Math.max(0, Math.min(1 - root.size, event.y / root.height - root.size / 2));
+            root.nonAnimPosition = newPos;
+            // Update flickable position
+            // Map scrollbar position [0, 1-size] to contentY [0, maxContentY]
+            if (root.flickable) {
+                const contentHeight = root.flickable.contentHeight;
+                const height = root.flickable.height;
+                if (contentHeight > height) {
+                    const maxContentY = contentHeight - height;
+                    const maxPos = 1 - root.size;
+                    const contentY = maxPos > 0 ? (newPos / maxPos) * maxContentY : 0;
+                    root.flickable.contentY = Math.max(0, Math.min(maxContentY, contentY));
+                }
+            }
+        }
+
+        onPositionChanged: event => {
+            root._updatingFromUser = true;
+            const newPos = Math.max(0, Math.min(1 - root.size, event.y / root.height - root.size / 2));
+            root.nonAnimPosition = newPos;
+            // Update flickable position
+            // Map scrollbar position [0, 1-size] to contentY [0, maxContentY]
+            if (root.flickable) {
+                const contentHeight = root.flickable.contentHeight;
+                const height = root.flickable.height;
+                if (contentHeight > height) {
+                    const maxContentY = contentHeight - height;
+                    const maxPos = 1 - root.size;
+                    const contentY = maxPos > 0 ? (newPos / maxPos) * maxContentY : 0;
+                    root.flickable.contentY = Math.max(0, Math.min(maxContentY, contentY));
+                }
+            }
+        }
+
         function onWheel(event: WheelEvent): void {
             root.animating = true;
             root._updatingFromUser = true;
@@ -146,44 +179,11 @@ ScrollBar {
                 }
             }
         }
+    }
 
-		anchors.fill: parent
+    Behavior on position {
-		preventStealing: true
+        enabled: !fullMouse.pressed
 
-		onPositionChanged: event => {
+        Anim {}
-			root._updatingFromUser = true;
-			const newPos = Math.max(0, Math.min(1 - root.size, event.y / root.height - root.size / 2));
-			root.nonAnimPosition = newPos;
-			// Update flickable position
-			// Map scrollbar position [0, 1-size] to contentY [0, maxContentY]
-			if (root.flickable) {
-				const contentHeight = root.flickable.contentHeight;
-				const height = root.flickable.height;
-				if (contentHeight > height) {
-					const maxContentY = contentHeight - height;
-					const maxPos = 1 - root.size;
-					const contentY = maxPos > 0 ? (newPos / maxPos) * maxContentY : 0;
-					root.flickable.contentY = Math.max(0, Math.min(maxContentY, contentY));
-				}
-			}
-		}
-		onPressed: event => {
-			root.animating = true;
-			root._updatingFromUser = true;
-			const newPos = Math.max(0, Math.min(1 - root.size, event.y / root.height - root.size / 2));
-			root.nonAnimPosition = newPos;
-			// Update flickable position
-			// Map scrollbar position [0, 1-size] to contentY [0, maxContentY]
-			if (root.flickable) {
-				const contentHeight = root.flickable.contentHeight;
-				const height = root.flickable.height;
-				if (contentHeight > height) {
-					const maxContentY = contentHeight - height;
-					const maxPos = 1 - root.size;
-					const contentY = maxPos > 0 ? (newPos / maxPos) * maxContentY : 0;
-					root.flickable.contentY = Math.max(0, Math.min(maxContentY, contentY));
-				}
-			}
-		}
     }
 }

Components/CustomSlider.qml

@@ -1,44 +1,52 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Config
+import qs.Modules
 
 Slider {
     id: root
 
     background: Item {
         CustomRect {
+            anchors.top: parent.top
             anchors.bottom: parent.bottom
             anchors.left: parent.left
-			anchors.top: parent.top
+
-			bottomRightRadius: root.implicitHeight / 6
-			color: DynamicColors.palette.m3primary
             implicitWidth: root.handle.x - root.implicitHeight / 2
+
+            color: DynamicColors.palette.m3primary
             radius: 1000
             topRightRadius: root.implicitHeight / 6
+            bottomRightRadius: root.implicitHeight / 6
         }
 
         CustomRect {
+            anchors.top: parent.top
             anchors.bottom: parent.bottom
             anchors.right: parent.right
-			anchors.top: parent.top
+
-			bottomLeftRadius: root.implicitHeight / 6
-			color: DynamicColors.tPalette.m3surfaceContainer
             implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2
+
+            color: DynamicColors.tPalette.m3surfaceContainer
             radius: 1000
             topLeftRadius: root.implicitHeight / 6
+            bottomLeftRadius: root.implicitHeight / 6
         }
     }
+
     handle: CustomRect {
-		anchors.verticalCenter: parent.verticalCenter
-		color: DynamicColors.palette.m3primary
-		implicitHeight: 15
-		implicitWidth: 5
-		radius: 1000
         x: root.visualPosition * root.availableWidth - implicitWidth / 2
 
+        implicitWidth: 5
+        implicitHeight: 15
+        anchors.verticalCenter: parent.verticalCenter
+
+        color: DynamicColors.palette.m3primary
+        radius: 1000
+
         MouseArea {
-			acceptedButtons: Qt.NoButton
             anchors.fill: parent
+            acceptedButtons: Qt.NoButton
             cursorShape: Qt.PointingHandCursor
         }
     }

Components/CustomSpinBox.qml

@@ -1,166 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import qs.Config
-
-RowLayout {
-	id: root
-
-	property string displayText: root.value.toString()
-	property bool isEditing: false
-	property real max: Infinity
-	property real min: -Infinity
-	property alias repeatRate: timer.interval
-	property real step: 1
-	property real value
-
-	signal valueModified(value: real)
-
-	spacing: Appearance.spacing.small
-
-	onValueChanged: {
-		if (!root.isEditing) {
-			root.displayText = root.value.toString();
-		}
-	}
-
-	CustomTextField {
-		id: textField
-
-		inputMethodHints: Qt.ImhFormattedNumbersOnly
-		leftPadding: Appearance.padding.normal
-		padding: Appearance.padding.small
-		rightPadding: Appearance.padding.normal
-		text: root.isEditing ? text : root.displayText
-
-		background: CustomRect {
-			color: DynamicColors.tPalette.m3surfaceContainerHigh
-			implicitWidth: 100
-			radius: Appearance.rounding.small
-		}
-		validator: DoubleValidator {
-			bottom: root.min
-			decimals: root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0
-			top: root.max
-		}
-
-		onAccepted: {
-			const numValue = parseFloat(text);
-			if (!isNaN(numValue)) {
-				const clampedValue = Math.max(root.min, Math.min(root.max, numValue));
-				root.value = clampedValue;
-				root.displayText = clampedValue.toString();
-				root.valueModified(clampedValue);
-			} else {
-				text = root.displayText;
-			}
-			root.isEditing = false;
-		}
-		onActiveFocusChanged: {
-			if (activeFocus) {
-				root.isEditing = true;
-			} else {
-				root.isEditing = false;
-				root.displayText = root.value.toString();
-			}
-		}
-		onEditingFinished: {
-			if (text !== root.displayText) {
-				const numValue = parseFloat(text);
-				if (!isNaN(numValue)) {
-					const clampedValue = Math.max(root.min, Math.min(root.max, numValue));
-					root.value = clampedValue;
-					root.displayText = clampedValue.toString();
-					root.valueModified(clampedValue);
-				} else {
-					text = root.displayText;
-				}
-			}
-			root.isEditing = false;
-		}
-	}
-
-	CustomRect {
-		color: DynamicColors.palette.m3primary
-		implicitHeight: upIcon.implicitHeight + Appearance.padding.small * 2
-		implicitWidth: implicitHeight
-		radius: Appearance.rounding.small
-
-		StateLayer {
-			id: upState
-
-			function onClicked(): void {
-				let newValue = Math.min(root.max, root.value + root.step);
-				// Round to avoid floating point precision errors
-				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
-				newValue = Math.round(newValue * Math.pow(10, decimals)) / Math.pow(10, decimals);
-				root.value = newValue;
-				root.displayText = newValue.toString();
-				root.valueModified(newValue);
-			}
-
-			color: DynamicColors.palette.m3onPrimary
-
-			onPressAndHold: timer.start()
-			onReleased: timer.stop()
-		}
-
-		MaterialIcon {
-			id: upIcon
-
-			anchors.centerIn: parent
-			color: DynamicColors.palette.m3onPrimary
-			text: "keyboard_arrow_up"
-		}
-	}
-
-	CustomRect {
-		color: DynamicColors.palette.m3primary
-		implicitHeight: downIcon.implicitHeight + Appearance.padding.small * 2
-		implicitWidth: implicitHeight
-		radius: Appearance.rounding.small
-
-		StateLayer {
-			id: downState
-
-			function onClicked(): void {
-				let newValue = Math.max(root.min, root.value - root.step);
-				// Round to avoid floating point precision errors
-				const decimals = root.step < 1 ? Math.max(1, Math.ceil(-Math.log10(root.step))) : 0;
-				newValue = Math.round(newValue * Math.pow(10, decimals)) / Math.pow(10, decimals);
-				root.value = newValue;
-				root.displayText = newValue.toString();
-				root.valueModified(newValue);
-			}
-
-			color: DynamicColors.palette.m3onPrimary
-
-			onPressAndHold: timer.start()
-			onReleased: timer.stop()
-		}
-
-		MaterialIcon {
-			id: downIcon
-
-			anchors.centerIn: parent
-			color: DynamicColors.palette.m3onPrimary
-			text: "keyboard_arrow_down"
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: 100
-		repeat: true
-		triggeredOnStart: true
-
-		onTriggered: {
-			if (upState.pressed)
-				upState.onClicked();
-			else if (downState.pressed)
-				downState.onClicked();
-		}
-	}
-}

Components/CustomSwitch.qml

@@ -1,142 +1,53 @@
+import qs.Config
+import qs.Modules
 import QtQuick
 import QtQuick.Templates
 import QtQuick.Shapes
-import qs.Config
 
 Switch {
     id: root
 
     property int cLayer: 1
 
-	implicitHeight: implicitIndicatorHeight
     implicitWidth: implicitIndicatorWidth
+    implicitHeight: implicitIndicatorHeight
 
     indicator: CustomRect {
-		color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: 13 + 7 * 2
-		implicitWidth: implicitHeight * 1.7
         radius: 1000
+        color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+
+        implicitWidth: implicitHeight * 1.7
+        implicitHeight: 13 + 7 * 2
 
         CustomRect {
             readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
 
-			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
-			implicitHeight: parent.implicitHeight - 10
-			implicitWidth: nonAnimWidth
             radius: 1000
-			x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
+            color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
 
-			Behavior on implicitWidth {
+            x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
-				Anim {
+            implicitWidth: nonAnimWidth
-				}
+            implicitHeight: parent.implicitHeight - 10
-			}
+            anchors.verticalCenter: parent.verticalCenter
-			Behavior on x {
-				Anim {
-				}
-			}
 
             CustomRect {
                 anchors.fill: parent
-				color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
-				opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
                 radius: parent.radius
 
+                color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
+                opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
+
                 Behavior on opacity {
-					Anim {
+                    Anim {}
-					}
-				}
-			}
-
-			Shape {
-				id: icon
-
-				property point end1: {
-					if (root.pressed) {
-						if (root.checked)
-							return Qt.point(width * 0.4, height / 2);
-						return Qt.point(width * 0.8, height / 2);
-					}
-					if (root.checked)
-						return Qt.point(width * 0.4, height * 0.7);
-					return Qt.point(width * 0.85, height * 0.85);
-				}
-				property point end2: {
-					if (root.pressed)
-						return Qt.point(width, height / 2);
-					if (root.checked)
-						return Qt.point(width * 0.85, height * 0.2);
-					return Qt.point(width * 0.85, height * 0.15);
-				}
-				property point start1: {
-					if (root.pressed)
-						return Qt.point(width * 0.1, height / 2);
-					if (root.checked)
-						return Qt.point(width * 0.15, height / 2);
-					return Qt.point(width * 0.15, height * 0.15);
-				}
-				property point start2: {
-					if (root.pressed) {
-						if (root.checked)
-							return Qt.point(width * 0.4, height / 2);
-						return Qt.point(width * 0.2, height / 2);
-					}
-					if (root.checked)
-						return Qt.point(width * 0.4, height * 0.7);
-					return Qt.point(width * 0.15, height * 0.85);
-				}
-
-				anchors.centerIn: parent
-				asynchronous: true
-				height: parent.implicitHeight - Appearance.padding.small * 2
-				preferredRendererType: Shape.CurveRenderer
-				width: height
-
-				Behavior on end1 {
-					PropAnim {
-					}
-				}
-				Behavior on end2 {
-					PropAnim {
-					}
-				}
-				Behavior on start1 {
-					PropAnim {
-					}
-				}
-				Behavior on start2 {
-					PropAnim {
                 }
             }
 
-				ShapePath {
+            Behavior on x {
-					capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+                Anim {}
-					fillColor: "transparent"
-					startX: icon.start1.x
-					startY: icon.start1.y
-					strokeColor: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
-					strokeWidth: Appearance.font.size.larger * 0.15
-
-					Behavior on strokeColor {
-						CAnim {
-						}
             }
 
-					PathLine {
+            Behavior on implicitWidth {
-						x: icon.end1.x
+                Anim {}
-						y: icon.end1.y
-					}
-
-					PathMove {
-						x: icon.start2.x
-						y: icon.start2.y
-					}
-
-					PathLine {
-						x: icon.end2.x
-						y: icon.end2.y
-					}
-				}
             }
         }
     }

Components/CustomText.qml

@@ -2,50 +2,48 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import qs.Config
+import qs.Modules
 
 Text {
     id: root
 
     property bool animate: false
-	property int animateDuration: 400
-	property real animateFrom: 0
     property string animateProp: "scale"
+    property real animateFrom: 0
     property real animateTo: 1
+    property int animateDuration: 400
 
-	color: DynamicColors.palette.m3onSurface
-	font.family: Appearance.font.family.sans
-	font.pointSize: Appearance.font.size.normal
     renderType: Text.NativeRendering
     textFormat: Text.PlainText
+    color: DynamicColors.palette.m3onSurface
+    font.family: Appearance.font.family.sans
+    font.pointSize: 12
 
     Behavior on color {
-		CAnim {
+        CAnim {}
-		}
     }
+
     Behavior on text {
         enabled: root.animate
 
         SequentialAnimation {
             Anim {
-				easing.bezierCurve: MaterialEasing.standardAccel
                 to: root.animateFrom
+                easing.bezierCurve: MaterialEasing.standardAccel
             }
-
+            PropertyAction {}
-			PropertyAction {
-			}
-
             Anim {
-				easing.bezierCurve: MaterialEasing.standardDecel
                 to: root.animateTo
+                easing.bezierCurve: MaterialEasing.standardDecel
             }
         }
     }
 
     component Anim: NumberAnimation {
+        target: root
+        property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
+        properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
         duration: root.animateDuration / 2
         easing.type: Easing.BezierSpline
-		properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
-		property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
-		target: root
     }
 }

Components/CustomTextField.qml

@@ -2,39 +2,34 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Controls
+import qs.Helpers
 import qs.Config
+import qs.Modules
 
 TextField {
     id: root
 
-	background: null
     color: DynamicColors.palette.m3onSurface
-	cursorVisible: !readOnly
+    placeholderTextColor: DynamicColors.palette.m3outline
     font.family: Appearance.font.family.sans
     font.pointSize: Appearance.font.size.smaller
-	placeholderTextColor: DynamicColors.palette.m3outline
     renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
+    cursorVisible: !readOnly
+
+    background: null
 
-	Behavior on color {
-		CAnim {
-		}
-	}
     cursorDelegate: CustomRect {
         id: cursor
 
         property bool disableBlink
 
-		color: DynamicColors.palette.m3primary
         implicitWidth: 2
+        color: DynamicColors.palette.m3primary
         radius: Appearance.rounding.normal
 
-		Behavior on opacity {
-			Anim {
-				duration: Appearance.anim.durations.small
-			}
-		}
-
         Connections {
+            target: root
+
             function onCursorPositionChanged(): void {
                 if (root.activeFocus && root.cursorVisible) {
                     cursor.opacity = 1;
@@ -42,34 +37,40 @@ TextField {
                     enableBlink.restart();
                 }
             }
-
-			target: root
         }
 
         Timer {
             id: enableBlink
 
             interval: 100
-
             onTriggered: cursor.disableBlink = false
         }
 
         Timer {
-			interval: 500
-			repeat: true
             running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+            repeat: true
             triggeredOnStart: true
-
+            interval: 500
             onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
         }
 
         Binding {
-			cursor.opacity: 0
             when: !root.activeFocus || !root.cursorVisible
+            cursor.opacity: 0
+        }
+
+        Behavior on opacity {
+            Anim {
+                duration: Appearance.anim.durations.small
             }
         }
+    }
+
+    Behavior on color {
+        CAnim {}
+    }
+
     Behavior on placeholderTextColor {
-		CAnim {
+        CAnim {}
-		}
     }
 }

Components/CustomTooltip.qml

@@ -4,22 +4,20 @@ import qs.Components
 
 ToolTip {
     id: root
-
-	property bool alternativeVisibleCondition: false
     property bool extraVisibleCondition: true
+    property bool alternativeVisibleCondition: false
     readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
-
-	background: null
-	horizontalPadding: 10
     verticalPadding: 5
+    horizontalPadding: 10
+    background: null
+
     visible: internalVisibleCondition
     
     contentItem: CustomTooltipContent {
         id: contentItem
-
-		horizontalPadding: root.horizontalPadding
-		shown: root.internalVisibleCondition
         text: root.text
+        shown: root.internalVisibleCondition
+        horizontalPadding: root.horizontalPadding
         verticalPadding: root.verticalPadding
     }
 }

Components/CustomTooltipContent.qml

@@ -1,53 +1,47 @@
 import QtQuick
 import qs.Components
+import qs.Modules
 import qs.Config
 
 Item {
     id: root
-
-	property real horizontalPadding: 10
-	property bool isVisible: backgroundRectangle.implicitHeight > 0
-	property bool shown: false
     required property string text
+    property bool shown: false
+    property real horizontalPadding: 10
     property real verticalPadding: 5
-
-	implicitHeight: tooltipTextObject.implicitHeight + 2 * root.verticalPadding
     implicitWidth: tooltipTextObject.implicitWidth + 2 * root.horizontalPadding
+    implicitHeight: tooltipTextObject.implicitHeight + 2 * root.verticalPadding
+
+    property bool isVisible: backgroundRectangle.implicitHeight > 0
 
     Rectangle {
         id: backgroundRectangle
-
-		clip: true
-		color: DynamicColors.tPalette.m3inverseSurface ?? "#3C4043"
-		implicitHeight: shown ? (tooltipTextObject.implicitHeight + 2 * root.verticalPadding) : 0
-		implicitWidth: shown ? (tooltipTextObject.implicitWidth + 2 * root.horizontalPadding) : 0
-		opacity: shown ? 1 : 0
-		radius: 8
-
-		Behavior on implicitHeight {
-			Anim {
-			}
-		}
-		Behavior on implicitWidth {
-			Anim {
-			}
-		}
-		Behavior on opacity {
-			Anim {
-			}
-		}
-
         anchors {
             bottom: root.bottom
             horizontalCenter: root.horizontalCenter
         }
+        color: DynamicColors.tPalette.m3inverseSurface ?? "#3C4043"
+        radius: 8
+        opacity: shown ? 1 : 0
+        implicitWidth: shown ? (tooltipTextObject.implicitWidth + 2 * root.horizontalPadding) : 0
+        implicitHeight: shown ? (tooltipTextObject.implicitHeight + 2 * root.verticalPadding) : 0
+        clip: true
+
+        Behavior on implicitWidth {
+            Anim {}
+        }
+        Behavior on implicitHeight {
+            Anim {}
+        }
+        Behavior on opacity {
+            Anim {}
+        }
 
         CustomText {
             id: tooltipTextObject
-
             anchors.centerIn: parent
-			color: DynamicColors.palette.m3inverseOnSurface ?? "#FFFFFF"
             text: root.text
+            color: DynamicColors.palette.m3inverseOnSurface ?? "#FFFFFF"
             wrapMode: Text.Wrap
         }
     }   

Components/Elevation.qml

@@ -1,18 +1,18 @@
 import qs.Config
+import qs.Modules
 import QtQuick
 import QtQuick.Effects
 
 RectangularShadow {
-	property real dp: [0, 1, 3, 6, 8, 12][level]
     property int level
+    property real dp: [0, 1, 3, 6, 8, 12][level]
 
-	blur: (dp * 5) ** 0.7
     color: Qt.alpha(DynamicColors.palette.m3shadow, 0.7)
-	offset.y: dp / 2
+    blur: (dp * 5) ** 0.7
     spread: -dp * 0.3 + (dp * 0.1) ** 2
+    offset.y: dp / 2
 
     Behavior on dp {
-		Anim {
+        Anim {}
-		}
     }
 }

Components/ExtraIndicator.qml

@@ -1,36 +1,28 @@
 import qs.Config
+import qs.Modules
 import QtQuick
 
 CustomRect {
     required property int extra
 
-	anchors.margins: 8
     anchors.right: parent.right
-	color: DynamicColors.palette.m3tertiary
+    anchors.margins: 8
-	implicitHeight: count.implicitHeight + 4 * 2
-	implicitWidth: count.implicitWidth + 8 * 2
-	opacity: extra > 0 ? 1 : 0
-	radius: 8
-	scale: extra > 0 ? 1 : 0.5
 
-	Behavior on opacity {
+    color: DynamicColors.palette.m3tertiary
-		Anim {
+    radius: 8
-			duration: MaterialEasing.expressiveEffectsTime
+
-		}
+    implicitWidth: count.implicitWidth + 8 * 2
-	}
+    implicitHeight: count.implicitHeight + 4 * 2
-	Behavior on scale {
+
-		Anim {
+    opacity: extra > 0 ? 1 : 0
-			duration: MaterialEasing.expressiveEffectsTime
+    scale: extra > 0 ? 1 : 0.5
-			easing.bezierCurve: MaterialEasing.expressiveEffects
-		}
-	}
 
     Elevation {
         anchors.fill: parent
-		level: 2
-		opacity: parent.opacity
         radius: parent.radius
+        opacity: parent.opacity
         z: -1
+        level: 2
     }
 
     CustomText {
@@ -38,7 +30,20 @@ CustomRect {
 
         anchors.centerIn: parent
         animate: parent.opacity > 0
-		color: DynamicColors.palette.m3onTertiary
         text: qsTr("+%1").arg(parent.extra)
+        color: DynamicColors.palette.m3onTertiary
+    }
+
+    Behavior on opacity {
+        Anim {
+			duration: MaterialEasing.expressiveEffectsTime
+        }
+    }
+
+    Behavior on scale {
+        Anim {
+			duration: MaterialEasing.expressiveEffectsTime
+			easing.bezierCurve: MaterialEasing.expressiveEffects
+        }
     }
 }

Components/FilledSlider.qml

@@ -1,14 +1,16 @@
 import QtQuick
 import QtQuick.Templates
+import qs.Helpers
 import qs.Config
+import qs.Modules
 
 Slider {
     id: root
 
-	property color color: DynamicColors.palette.m3secondary
     required property string icon
-	property bool initialized
     property real oldValue
+    property bool initialized
+	property color color: DynamicColors.palette.m3secondary
 
     orientation: Qt.Vertical
 
@@ -19,41 +21,45 @@ Slider {
         CustomRect {
             anchors.left: parent.left
             anchors.right: parent.right
-			color: root.color
+
-			implicitHeight: parent.height - y
-			radius: parent.radius
             y: root.handle.y
+            implicitHeight: parent.height - y
+
+            color: root.color
+            radius: parent.radius
         }
     }
+
     handle: Item {
         id: handle
 
         property alias moving: icon.moving
 
-		implicitHeight: root.width
-		implicitWidth: root.width
         y: root.visualPosition * (root.availableHeight - height)
+        implicitWidth: root.width
+        implicitHeight: root.width
 
         Elevation {
             anchors.fill: parent
-			level: handleInteraction.containsMouse ? 2 : 1
             radius: rect.radius
+            level: handleInteraction.containsMouse ? 2 : 1
         }
 
         CustomRect {
             id: rect
 
             anchors.fill: parent
+
             color: DynamicColors.palette.m3inverseSurface
             radius: Appearance.rounding.full
 
             MouseArea {
                 id: handleInteraction
 
-				acceptedButtons: Qt.NoButton
                 anchors.fill: parent
-				cursorShape: Qt.PointingHandCursor
                 hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                acceptedButtons: Qt.NoButton
             }
 
             MaterialIcon {
@@ -68,17 +74,17 @@ Slider {
                     font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material;
                 }
 
-				anchors.centerIn: parent
-				color: DynamicColors.palette.m3inverseOnSurface
                 text: root.icon
+                color: DynamicColors.palette.m3inverseOnSurface
+                anchors.centerIn: parent
 
                 onMovingChanged: anim.restart()
 
                 Binding {
                     id: binding
 
-					property: "text"
                     target: icon
+                    property: "text"
                     value: Math.round(root.value * 100)
                     when: false
                 }
@@ -87,35 +93,29 @@ Slider {
                     id: anim
 
                     Anim {
+                        target: icon
+                        property: "scale"
+                        to: 0
                         duration: Appearance.anim.durations.normal / 2
                         easing.bezierCurve: Appearance.anim.curves.standardAccel
-						property: "scale"
-						target: icon
-						to: 0
                     }
-
                     ScriptAction {
                         script: icon.update()
                     }
-
                     Anim {
+                        target: icon
+                        property: "scale"
+                        to: 1
                         duration: Appearance.anim.durations.normal / 2
                         easing.bezierCurve: Appearance.anim.curves.standardDecel
-						property: "scale"
-						target: icon
-						to: 1
                     }
                 }
             }
         }
     }
-	Behavior on value {
-		Anim {
-			duration: Appearance.anim.durations.large
-		}
-	}
 
     onPressedChanged: handle.moving = pressed
+
     onValueChanged: {
         if (!initialized) {
             initialized = true;
@@ -132,10 +132,15 @@ Slider {
         id: stateChangeDelay
 
         interval: 500
-
         onTriggered: {
             if (!root.pressed)
                 handle.moving = false;
         }
     }
+
+    Behavior on value {
+        Anim {
+            duration: Appearance.anim.durations.large
+        }
+    }
 }

Components/IconButton.qml

@@ -1,4 +1,5 @@
 import qs.Config
+import qs.Modules
 import QtQuick
 
 CustomRect {
@@ -10,59 +11,55 @@ CustomRect {
         Text
     }
 
-	property color activeColour: type === IconButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondary
-	property color activeOnColour: type === IconButton.Filled ? DynamicColors.palette.m3onPrimary : type === IconButton.Tonal ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3primary
-	property bool checked
-	property bool disabled
-	property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-	property color disabledOnColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
-	property alias font: label.font
     property alias icon: label.text
+    property bool checked
+    property bool toggle
+    property real padding: type === IconButton.Text ? 10 / 2 : 7
+    property alias font: label.font
+    property int type: IconButton.Filled
+    property bool disabled
+
+    property alias stateLayer: stateLayer
+    property alias label: label
+    property alias radiusAnim: radiusAnim
+
+    property bool internalChecked
+    property color activeColour: type === IconButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondary
     property color inactiveColour: {
         if (!toggle && type === IconButton.Filled)
             return DynamicColors.palette.m3primary;
         return type === IconButton.Filled ? DynamicColors.tPalette.m3surfaceContainer : DynamicColors.palette.m3secondaryContainer;
     }
+    property color activeOnColour: type === IconButton.Filled ? DynamicColors.palette.m3onPrimary : type === IconButton.Tonal ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3primary
     property color inactiveOnColour: {
         if (!toggle && type === IconButton.Filled)
             return DynamicColors.palette.m3onPrimary;
         return type === IconButton.Tonal ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant;
     }
-	property bool internalChecked
+    property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-	property alias label: label
+    property color disabledOnColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
-	property real padding: type === IconButton.Text ? 10 / 2 : 7
-	property alias radiusAnim: radiusAnim
-	property alias stateLayer: stateLayer
-	property bool toggle
-	property int type: IconButton.Filled
 
     signal clicked
 
-	color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
-	implicitHeight: label.implicitHeight + padding * 2
-	implicitWidth: implicitHeight
-	radius: internalChecked ? 6 : implicitHeight / 2 * Math.min(1, 1)
-
-	Behavior on radius {
-		Anim {
-			id: radiusAnim
-
-		}
-	}
-
     onCheckedChanged: internalChecked = checked
 
+    radius: internalChecked ? 6 : implicitHeight / 2 * Math.min(1, 1)
+    color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
+
+    implicitWidth: implicitHeight
+    implicitHeight: label.implicitHeight + padding * 2
+
     StateLayer {
         id: stateLayer
 
+        color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
+        disabled: root.disabled
+
         function onClicked(): void {
             if (root.toggle)
                 root.internalChecked = !root.internalChecked;
             root.clicked();
         }
-
-		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
-		disabled: root.disabled
     }
 
     MaterialIcon {
@@ -73,8 +70,13 @@ CustomRect {
         fill: !root.toggle || root.internalChecked ? 1 : 0
 
         Behavior on fill {
-			Anim {
+            Anim {}
         }
     }
+
+    Behavior on radius {
+        Anim {
+            id: radiusAnim
+        }
     }
 }

Components/MarqueeText.qml

@@ -1,221 +0,0 @@
-import QtQuick
-import qs.Config
-
-Item {
-	id: root
-
-	property alias anim: marqueeAnim
-	property bool animate: false
-	property color color: DynamicColors.palette.m3onSurface
-	property int fadeStrengthAnimMs: 180
-	property real fadeStrengthIdle: 0.0
-	property real fadeStrengthMoving: 1.0
-	property alias font: elideText.font
-	property int gap: 40
-	property alias horizontalAlignment: elideText.horizontalAlignment
-	property bool leftFadeEnabled: false
-	property real leftFadeStrength: overflowing && leftFadeEnabled ? fadeStrengthMoving : fadeStrengthIdle
-	property int leftFadeWidth: 28
-	property bool marqueeEnabled: true
-	readonly property bool overflowing: metrics.width > root.width
-	property int pauseMs: 1200
-	property real pixelsPerSecond: 40
-	property real rightFadeStrength: overflowing ? fadeStrengthMoving : fadeStrengthIdle
-	property int rightFadeWidth: 28
-	property bool sliding: false
-	property alias text: elideText.text
-
-	function durationForDistance(px): int {
-		return Math.max(1, Math.round(Math.abs(px) / root.pixelsPerSecond * 1000));
-	}
-
-	function resetMarquee() {
-		marqueeAnim.stop();
-		strip.x = 0;
-		root.sliding = false;
-		root.leftFadeEnabled = false;
-
-		if (root.marqueeEnabled && root.overflowing && root.visible) {
-			marqueeAnim.restart();
-		}
-	}
-
-	clip: true
-	implicitHeight: elideText.implicitHeight
-
-	Behavior on leftFadeStrength {
-		Anim {
-		}
-	}
-	Behavior on rightFadeStrength {
-		Anim {
-		}
-	}
-
-	onTextChanged: resetMarquee()
-	onVisibleChanged: if (!visible)
-		resetMarquee()
-	onWidthChanged: resetMarquee()
-
-	TextMetrics {
-		id: metrics
-
-		font: elideText.font
-		text: elideText.text
-	}
-
-	CustomText {
-		id: elideText
-
-		anchors.verticalCenter: parent.verticalCenter
-		animate: root.animate
-		animateProp: "scale,opacity"
-		color: root.color
-		elide: Text.ElideNone
-		visible: !root.overflowing
-		width: root.width
-	}
-
-	Item {
-		id: marqueeViewport
-
-		anchors.fill: parent
-		clip: true
-		layer.enabled: true
-		visible: root.overflowing
-
-		layer.effect: OpacityMask {
-			maskSource: rightFadeMask
-		}
-
-		Item {
-			id: strip
-
-			anchors.verticalCenter: parent.verticalCenter
-			height: t1.implicitHeight
-			width: t1.width + root.gap + t2.width
-			x: 0
-
-			CustomText {
-				id: t1
-
-				animate: root.animate
-				animateProp: "opacity"
-				color: root.color
-				text: elideText.text
-			}
-
-			CustomText {
-				id: t2
-
-				animate: root.animate
-				animateProp: "opacity"
-				color: root.color
-				text: t1.text
-				x: t1.width + root.gap
-			}
-		}
-
-		SequentialAnimation {
-			id: marqueeAnim
-
-			running: false
-
-			onFinished: pauseTimer.restart()
-
-			ScriptAction {
-				script: {
-					root.sliding = true;
-					root.leftFadeEnabled = true;
-				}
-			}
-
-			Anim {
-				duration: root.durationForDistance(t1.width)
-				easing.bezierCurve: Easing.Linear
-				easing.type: Easing.Linear
-				from: 0
-				property: "x"
-				target: strip
-				to: -t1.width
-			}
-
-			ScriptAction {
-				script: {
-					root.leftFadeEnabled = false;
-				}
-			}
-
-			Anim {
-				duration: root.durationForDistance(root.gap)
-				easing.bezierCurve: Easing.Linear
-				easing.type: Easing.Linear
-				from: -t1.width
-				property: "x"
-				target: strip
-				to: -(t1.width + root.gap)
-			}
-
-			ScriptAction {
-				script: {
-					root.sliding = false;
-					strip.x = 0;
-				}
-			}
-		}
-
-		Timer {
-			id: pauseTimer
-
-			interval: root.pauseMs
-			repeat: false
-			running: true
-
-			onTriggered: {
-				if (root.marqueeEnabled)
-					marqueeAnim.start();
-			}
-		}
-	}
-
-	Rectangle {
-		id: rightFadeMask
-
-		readonly property real fadeStartPos: {
-			const w = Math.max(1, width);
-			return Math.max(0, Math.min(1, (w - root.rightFadeWidth) / w));
-		}
-		readonly property real leftFadeEndPos: {
-			const w = Math.max(1, width);
-			return Math.max(0, Math.min(1, root.leftFadeWidth / w));
-		}
-
-		anchors.fill: marqueeViewport
-		layer.enabled: true
-		visible: false
-
-		gradient: Gradient {
-			orientation: Gradient.Horizontal
-
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0 - root.leftFadeStrength)
-				position: 0.0
-			}
-
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0)
-				position: rightFadeMask.leftFadeEndPos
-			}
-
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0)
-				position: rightFadeMask.fadeStartPos
-			}
-
-			GradientStop {
-				color: Qt.rgba(1, 1, 1, 1.0 - root.rightFadeStrength)
-				position: 1.0
-			}
-		}
-	}
-}

Components/Menu.qml

@@ -1,107 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import qs.Config
-
-Elevation {
-	id: root
-
-	property MenuItem active: items[0] ?? null
-	property bool expanded
-	property list<MenuItem> items
-
-	signal itemSelected(item: MenuItem)
-
-	implicitHeight: root.expanded ? column.implicitHeight : 0
-	implicitWidth: Math.max(200, column.implicitWidth)
-	level: 2
-	opacity: root.expanded ? 1 : 0
-	radius: Appearance.rounding.small / 2
-
-	Behavior on implicitHeight {
-		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		}
-	}
-	Behavior on opacity {
-		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
-		}
-	}
-
-	CustomClippingRect {
-		anchors.fill: parent
-		color: DynamicColors.palette.m3surfaceContainer
-		radius: parent.radius
-
-		ColumnLayout {
-			id: column
-
-			anchors.left: parent.left
-			anchors.right: parent.right
-			spacing: 0
-
-			Repeater {
-				model: root.items
-
-				CustomRect {
-					id: item
-
-					readonly property bool active: modelData === root.active
-					required property int index
-					required property MenuItem modelData
-
-					Layout.fillWidth: true
-					color: Qt.alpha(DynamicColors.palette.m3secondaryContainer, active ? 1 : 0)
-					implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.normal * 2
-					implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.normal * 2
-
-					StateLayer {
-						function onClicked(): void {
-							root.itemSelected(item.modelData);
-							root.active = item.modelData;
-							root.expanded = false;
-						}
-
-						color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
-						disabled: !root.expanded
-					}
-
-					RowLayout {
-						id: menuOptionRow
-
-						anchors.fill: parent
-						anchors.margins: Appearance.padding.normal
-						spacing: Appearance.spacing.small
-
-						MaterialIcon {
-							Layout.alignment: Qt.AlignVCenter
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant
-							text: item.modelData.icon
-						}
-
-						CustomText {
-							Layout.alignment: Qt.AlignVCenter
-							Layout.fillWidth: true
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
-							text: item.modelData.text
-						}
-
-						Loader {
-							Layout.alignment: Qt.AlignVCenter
-							active: item.modelData.trailingIcon.length > 0
-							visible: active
-
-							sourceComponent: MaterialIcon {
-								color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
-								text: item.modelData.trailingIcon
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}

Components/MenuItem.qml

@@ -1,12 +0,0 @@
-import QtQuick
-
-QtObject {
-	property string activeIcon: icon
-	property string activeText: text
-	property string icon
-	required property string text
-	property string trailingIcon
-	property var value
-
-	signal clicked
-}

Components/OpacityMask.qml

@@ -2,8 +2,8 @@ import Quickshell
 import QtQuick
 
 ShaderEffect {
-	required property Item maskSource
     required property Item source
+    required property Item maskSource
 
     fragmentShader: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/shaders/opacitymask.frag.qsb`)
 }

Components/SpinBoxRow.qml

@@ -1,50 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import qs.Config
-
-CustomRect {
-	id: root
-
-	required property string label
-	required property real max
-	required property real min
-	property var onValueModified: function (value) {}
-	property real step: 1
-	required property real value
-
-	Layout.fillWidth: true
-	color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
-	implicitHeight: row.implicitHeight + Appearance.padding.large * 2
-	radius: Appearance.rounding.normal
-
-	Behavior on implicitHeight {
-		Anim {
-		}
-	}
-
-	RowLayout {
-		id: row
-
-		anchors.left: parent.left
-		anchors.margins: Appearance.padding.large
-		anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
-		spacing: Appearance.spacing.normal
-
-		CustomText {
-			Layout.fillWidth: true
-			text: root.label
-		}
-
-		CustomSpinBox {
-			max: root.max
-			min: root.min
-			step: root.step
-			value: root.value
-
-			onValueModified: value => {
-				root.onValueModified(value);
-			}
-		}
-	}
-}

Components/StateLayer.qml

@@ -1,11 +1,12 @@
 import qs.Config
+import qs.Modules
 import QtQuick
 
 MouseArea {
     id: root
 
-	property color color: DynamicColors.palette.m3onSurface
     property bool disabled
+    property color color: DynamicColors.palette.m3onSurface
     property real radius: parent?.radius ?? 0
     property alias rect: hoverLayer
 
@@ -13,11 +14,11 @@ MouseArea {
     }
 
     anchors.fill: parent
-	cursorShape: disabled ? undefined : Qt.PointingHandCursor
+
     enabled: !disabled
+    cursorShape: disabled ? undefined : Qt.PointingHandCursor
     hoverEnabled: true
 
-	onClicked: event => !disabled && onClicked(event)
     onPressed: event => {
         if (disabled)
             return;
@@ -31,42 +32,40 @@ MouseArea {
         rippleAnim.restart();
     }
 
+    onClicked: event => !disabled && onClicked(event)
+
     SequentialAnimation {
         id: rippleAnim
 
-		property real radius
         property real x
         property real y
+        property real radius
 
         PropertyAction {
-			property: "x"
             target: ripple
+            property: "x"
             value: rippleAnim.x
         }
-
         PropertyAction {
-			property: "y"
             target: ripple
+            property: "y"
             value: rippleAnim.y
         }
-
         PropertyAction {
-			property: "opacity"
             target: ripple
+            property: "opacity"
             value: 0.08
         }
-
         Anim {
-			easing.bezierCurve: MaterialEasing.standardDecel
+            target: ripple
-			from: 0
             properties: "implicitWidth,implicitHeight"
-			target: ripple
+            from: 0
             to: rippleAnim.radius * 2
+            easing.bezierCurve: MaterialEasing.standardDecel
         }
-
         Anim {
-			property: "opacity"
             target: ripple
+            property: "opacity"
             to: 0
         }
     }
@@ -76,16 +75,17 @@ MouseArea {
 
         anchors.fill: parent
 		border.pixelAligned: false
+
         color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0)
         radius: root.radius
 
         CustomRect {
             id: ripple
 
-			border.pixelAligned: false
+            radius: 1000
             color: root.color
             opacity: 0
-			radius: 1000
+			border.pixelAligned: false
 
             transform: Translate {
                 x: -ripple.width / 2

Components/Toast/ToastItem.qml

@@ -1,7 +1,9 @@
 import ZShell
 import QtQuick
 import QtQuick.Layouts
+import qs.Modules
 import qs.Components
+import qs.Helpers
 import qs.Config
 
 CustomRect {
@@ -11,6 +13,20 @@ CustomRect {
 
     anchors.left: parent.left
     anchors.right: parent.right
+    implicitHeight: layout.implicitHeight + Appearance.padding.smaller * 2
+
+    radius: Appearance.rounding.normal
+    color: {
+        if (root.modelData.type === Toast.Success)
+            return DynamicColors.palette.m3successContainer;
+        if (root.modelData.type === Toast.Warning)
+            return DynamicColors.palette.m3secondary;
+        if (root.modelData.type === Toast.Error)
+            return DynamicColors.palette.m3errorContainer;
+        return DynamicColors.palette.m3surface;
+    }
+
+    border.width: 1
     border.color: {
         let colour = DynamicColors.palette.m3outlineVariant;
         if (root.modelData.type === Toast.Success)
@@ -21,42 +37,26 @@ CustomRect {
             colour = DynamicColors.palette.m3error;
         return Qt.alpha(colour, 0.3);
     }
-	border.width: 1
-	color: {
-		if (root.modelData.type === Toast.Success)
-			return DynamicColors.palette.m3successContainer;
-		if (root.modelData.type === Toast.Warning)
-			return DynamicColors.palette.m3secondary;
-		if (root.modelData.type === Toast.Error)
-			return DynamicColors.palette.m3errorContainer;
-		return DynamicColors.palette.m3surface;
-	}
-	implicitHeight: layout.implicitHeight + Appearance.padding.smaller * 2
-	radius: Appearance.rounding.normal
-
-	Behavior on border.color {
-		CAnim {
-		}
-	}
 
     Elevation {
         anchors.fill: parent
-		level: 3
-		opacity: parent.opacity
         radius: parent.radius
+        opacity: parent.opacity
         z: -1
+        level: 3
     }
 
     RowLayout {
         id: layout
 
         anchors.fill: parent
-		anchors.leftMargin: Appearance.padding.normal
         anchors.margins: Appearance.padding.smaller
+        anchors.leftMargin: Appearance.padding.normal
         anchors.rightMargin: Appearance.padding.normal
         spacing: Appearance.spacing.normal
 
         CustomRect {
+            radius: Appearance.rounding.normal
             color: {
                 if (root.modelData.type === Toast.Success)
                     return DynamicColors.palette.m3success;
@@ -66,14 +66,15 @@ CustomRect {
                     return DynamicColors.palette.m3error;
                 return DynamicColors.palette.m3surfaceContainerHigh;
             }
-			implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2
+
             implicitWidth: implicitHeight
-			radius: Appearance.rounding.normal
+            implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2
 
             MaterialIcon {
                 id: icon
 
                 anchors.centerIn: parent
+                text: root.modelData.icon
                 color: {
                     if (root.modelData.type === Toast.Success)
                         return DynamicColors.palette.m3onSuccess;
@@ -84,7 +85,6 @@ CustomRect {
                     return DynamicColors.palette.m3onSurfaceVariant;
                 }
                 font.pointSize: Math.round(Appearance.font.size.large * 1.2)
-				text: root.modelData.icon
             }
         }
 
@@ -96,6 +96,7 @@ CustomRect {
                 id: title
 
                 Layout.fillWidth: true
+                text: root.modelData.title
                 color: {
                     if (root.modelData.type === Toast.Success)
                         return DynamicColors.palette.m3onSuccessContainer;
@@ -105,13 +106,14 @@ CustomRect {
                         return DynamicColors.palette.m3onErrorContainer;
                     return DynamicColors.palette.m3onSurface;
                 }
-				elide: Text.ElideRight
                 font.pointSize: Appearance.font.size.normal
-				text: root.modelData.title
+                elide: Text.ElideRight
             }
 
             CustomText {
                 Layout.fillWidth: true
+                textFormat: Text.StyledText
+                text: root.modelData.message
                 color: {
                     if (root.modelData.type === Toast.Success)
                         return DynamicColors.palette.m3onSuccessContainer;
@@ -121,11 +123,13 @@ CustomRect {
                         return DynamicColors.palette.m3onErrorContainer;
                     return DynamicColors.palette.m3onSurface;
                 }
-				elide: Text.ElideRight
                 opacity: 0.8
-				text: root.modelData.message
+                elide: Text.ElideRight
-				textFormat: Text.StyledText
             }
         }
     }
+
+    Behavior on border.color {
+        CAnim {}
+    }
 }

Components/Toast/Toasts.qml

@@ -1,17 +1,19 @@
 pragma ComponentBehavior: Bound
 
+import qs.Components
+import qs.Config
+import qs.Modules
 import ZShell
 import Quickshell
 import QtQuick
-import qs.Components
-import qs.Config
 
 Item {
     id: root
 
-	property bool flag
     readonly property int spacing: Appearance.spacing.small
+    property bool flag
 
+    implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2
     implicitHeight: {
         let h = -spacing;
         for (let i = 0; i < repeater.count; i++) {
@@ -21,7 +23,6 @@ Item {
         }
         return h;
     }
-	implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2
 
     Repeater {
         id: repeater
@@ -40,12 +41,10 @@ Item {
                 }
                 return toasts;
             }
-
             onValuesChanged: root.flagChanged()
         }
 
-		ToastWrapper {
+        ToastWrapper {}
-		}
     }
 
     component ToastWrapper: MouseArea {
@@ -53,6 +52,7 @@ Item {
 
         required property int index
         required property Toast modelData
+
         readonly property bool previewHidden: {
             let extraHidden = 0;
             for (let i = 0; i < index; i++)
@@ -61,8 +61,14 @@ Item {
             return index >= Config.utilities.maxToasts + extraHidden;
         }
 
-		acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        onPreviewHiddenChanged: {
-		anchors.bottom: parent.bottom
+            if (initAnim.running && previewHidden)
+                initAnim.stop();
+        }
+
+        opacity: modelData.closed || previewHidden ? 0 : 1
+        scale: modelData.closed || previewHidden ? 0.7 : 1
+
         anchors.bottomMargin: {
             root.flag; // Force update
             let y = 0;
@@ -73,62 +79,43 @@ Item {
             }
             return y;
         }
+
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.bottom: parent.bottom
         implicitHeight: toastInner.implicitHeight
-		opacity: modelData.closed || previewHidden ? 0 : 1
-		scale: modelData.closed || previewHidden ? 0.7 : 1
 
-		Behavior on anchors.bottomMargin {
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-			Anim {
+        onClicked: modelData.close()
-				duration: Appearance.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-			}
-		}
-		Behavior on opacity {
-			Anim {
-			}
-		}
-		Behavior on scale {
-			Anim {
-			}
-		}
 
         Component.onCompleted: modelData.lock(this)
-		onClicked: modelData.close()
-		onPreviewHiddenChanged: {
-			if (initAnim.running && previewHidden)
-				initAnim.stop();
-		}
 
         Anim {
             id: initAnim
 
+            Component.onCompleted: running = !toast.previewHidden
+
+            target: toast
+            properties: "opacity,scale"
+            from: 0
+            to: 1
             duration: Appearance.anim.durations.expressiveDefaultSpatial
             easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-			from: 0
-			properties: "opacity,scale"
-			target: toast
-			to: 1
-
-			Component.onCompleted: running = !toast.previewHidden
         }
 
         ParallelAnimation {
             running: toast.modelData.closed
-
-			onFinished: toast.modelData.unlock(toast)
             onStarted: toast.anchors.bottomMargin = toast.anchors.bottomMargin
+            onFinished: toast.modelData.unlock(toast)
 
             Anim {
-				property: "opacity"
                 target: toast
+                property: "opacity"
                 to: 0
             }
-
             Anim {
-				property: "scale"
                 target: toast
+                property: "scale"
                 to: 0.7
             }
         }
@@ -138,5 +125,20 @@ Item {
 
             modelData: toast.modelData
         }
+
+        Behavior on opacity {
+            Anim {}
+        }
+
+        Behavior on scale {
+            Anim {}
+        }
+
+        Behavior on anchors.bottomMargin {
+            Anim {
+                duration: Appearance.anim.durations.expressiveDefaultSpatial
+                easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+            }
+        }
     }
 }

Config/AccentColor.qml

@@ -1,8 +1,7 @@
 import Quickshell.Io
 
 JsonObject {
-	property Accents accents: Accents {
+    property Accents accents: Accents {}
-	}
 
     component Accents: JsonObject {
         property string primary: "#4080ff"

Config/Appearance.qml

@@ -3,12 +3,12 @@ pragma Singleton
 import Quickshell
 
 Singleton {
-	readonly property AppearanceConf.Anim anim: Config.appearance.anim
-	readonly property AppearanceConf.FontStuff font: Config.appearance.font
-	readonly property AppearanceConf.Padding padding: Config.appearance.padding
     // Literally just here to shorten accessing stuff :woe:
     // Also kinda so I can keep accessing it with `Appearance.xxx` instead of `Conf.appearance.xxx`
     readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
     readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
+    readonly property AppearanceConf.Padding padding: Config.appearance.padding
+    readonly property AppearanceConf.FontStuff font: Config.appearance.font
+    readonly property AppearanceConf.Anim anim: Config.appearance.anim
     readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency
 }

Config/AppearanceConf.qml

@@ -1,95 +1,94 @@
 import Quickshell.Io
 
 JsonObject {
-	property Anim anim: Anim {
+    property Rounding rounding: Rounding {}
-	}
+    property Spacing spacing: Spacing {}
-	property FontStuff font: FontStuff {
+    property Padding padding: Padding {}
-	}
+    property FontStuff font: FontStuff {}
-	property Padding padding: Padding {
+    property Anim anim: Anim {}
-	}
+    property Transparency transparency: Transparency {}
-	property Rounding rounding: Rounding {
+
-	}
+    component Rounding: JsonObject {
-	property Spacing spacing: Spacing {
+        property real scale: 1
-	}
+        property int small: 12 * scale
-	property Transparency transparency: Transparency {
+        property int normal: 17 * scale
+        property int large: 25 * scale
+        property int full: 1000 * scale
     }
 
-	component Anim: JsonObject {
+    component Spacing: JsonObject {
-		property AnimCurves curves: AnimCurves {
+        property real scale: 1
+        property int small: 7 * scale
+        property int smaller: 10 * scale
+        property int normal: 12 * scale
+        property int larger: 15 * scale
+        property int large: 20 * scale
     }
-		property AnimDurations durations: AnimDurations {
+
+    component Padding: JsonObject {
+        property real scale: 1
+        property int small: 5 * scale
+        property int smaller: 7 * scale
+        property int normal: 10 * scale
+        property int larger: 12 * scale
+        property int large: 15 * scale
     }
-		property real mediaGifSpeedAdjustment: 300
+
-		property real sessionGifSpeed: 0.7
+    component FontFamily: JsonObject {
+        property string sans: "Segoe UI Variable Text"
+        property string mono: "CaskaydiaCove NF"
+        property string material: "Material Symbols Rounded"
+        property string clock: "Rubik"
     }
+
+    component FontSize: JsonObject {
+        property real scale: 1
+        property int small: 11 * scale
+        property int smaller: 12 * scale
+        property int normal: 13 * scale
+        property int larger: 15 * scale
+        property int large: 18 * scale
+        property int extraLarge: 28 * scale
+    }
+
+    component FontStuff: JsonObject {
+        property FontFamily family: FontFamily {}
+        property FontSize size: FontSize {}
+    }
+
     component AnimCurves: JsonObject {
         property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
         property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
         property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
-		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
-		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
-		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
         property list<real> standard: [0.2, 0, 0, 1, 1, 1]
         property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
         property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
+        property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+        property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
+        property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
     }
+
     component AnimDurations: JsonObject {
-		property int expressiveDefaultSpatial: 500 * scale
-		property int expressiveEffects: 200 * scale
-		property int expressiveFastSpatial: 350 * scale
-		property int extraLarge: 1000 * scale
-		property int large: 600 * scale
-		property int normal: 400 * scale
         property real scale: 1
         property int small: 200 * scale
+        property int normal: 400 * scale
+        property int large: 600 * scale
+        property int extraLarge: 1000 * scale
+        property int expressiveFastSpatial: 350 * scale
+        property int expressiveDefaultSpatial: 500 * scale
+        property int expressiveEffects: 200 * scale
     }
-	component FontFamily: JsonObject {
+
-		property string clock: "Rubik"
+    component Anim: JsonObject {
-		property string material: "Material Symbols Rounded"
+        property real mediaGifSpeedAdjustment: 300
-		property string mono: "CaskaydiaCove NF"
+        property real sessionGifSpeed: 0.7
-		property string sans: "Segoe UI Variable Text"
+        property AnimCurves curves: AnimCurves {}
-	}
+        property AnimDurations durations: AnimDurations {}
-	component FontSize: JsonObject {
-		property int extraLarge: 28 * scale
-		property int large: 18 * scale
-		property int larger: 15 * scale
-		property int normal: 13 * scale
-		property real scale: 1
-		property int small: 11 * scale
-		property int smaller: 12 * scale
-	}
-	component FontStuff: JsonObject {
-		property FontFamily family: FontFamily {
-		}
-		property FontSize size: FontSize {
-		}
-	}
-	component Padding: JsonObject {
-		property int large: 15 * scale
-		property int larger: 12 * scale
-		property int normal: 10 * scale
-		property real scale: 1
-		property int small: 5 * scale
-		property int smaller: 7 * scale
-	}
-	component Rounding: JsonObject {
-		property int full: 1000 * scale
-		property int large: 25 * scale
-		property int normal: 17 * scale
-		property real scale: 1
-		property int small: 12 * scale
-	}
-	component Spacing: JsonObject {
-		property int large: 20 * scale
-		property int larger: 15 * scale
-		property int normal: 12 * scale
-		property real scale: 1
-		property int small: 7 * scale
-		property int smaller: 10 * scale
     }
+
     component Transparency: JsonObject {
-		property real base: 0.85
         property bool enabled: false
+        property real base: 0.85
         property real layers: 0.4
     }
 }

Config/BackgroundConfig.qml

@@ -2,6 +2,6 @@ import Quickshell.Io
 import qs.Config
 
 JsonObject {
-	property bool enabled: true
     property int wallFadeDuration: MaterialEasing.standardTime
+    property bool enabled: true
 }

Config/BarConfig.qml

@@ -2,6 +2,9 @@ import Quickshell.Io
 
 JsonObject {
 	property bool autoHide: false
+	property int rounding: 8
+	property Popouts popouts: Popouts {}
+
 	property list<var> entries: [
 		{
 			id: "workspaces",
@@ -11,10 +14,6 @@ JsonObject {
 			id: "audio",
 			enabled: true
 		},
-		{
-			id: "media",
-			enabled: true
-		},
 		{
 			id: "resources",
 			enabled: true
@@ -60,17 +59,14 @@ JsonObject {
 			enabled: true
 		},
 	]
-	property Popouts popouts: Popouts {
-	}
-	property int rounding: 8
 
 	component Popouts: JsonObject {
-		property bool activeWindow: true
+		property bool tray: true
 		property bool audio: true
+		property bool activeWindow: true
+		property bool resources: true
 		property bool clock: true
 		property bool network: true
-		property bool resources: true
-		property bool tray: true
 		property bool upower: true
 	}
 }

Config/Config.qml

@@ -4,27 +4,27 @@ import Quickshell
 import Quickshell.Io
 import ZShell
 import QtQuick
+import qs.Modules as Modules
 import qs.Helpers
 import qs.Paths
 
 Singleton {
 	id: root
 
-	property alias appearance: adapter.appearance
     property alias background: adapter.background
     property alias barConfig: adapter.barConfig
-	property alias colors: adapter.colors
-	property alias dashboard: adapter.dashboard
-	property alias general: adapter.general
-	property alias launcher: adapter.launcher
     property alias lock: adapter.lock
-	property alias notifs: adapter.notifs
-	property alias osd: adapter.osd
 	property alias overview: adapter.overview
-	property bool recentlySaved: false
 	property alias services: adapter.services
+	property alias notifs: adapter.notifs
 	property alias sidebar: adapter.sidebar
 	property alias utilities: adapter.utilities
+	property alias general: adapter.general
+	property alias dashboard: adapter.dashboard
+	property alias appearance: adapter.appearance
+	property alias osd: adapter.osd
+	property alias launcher: adapter.launcher
+	property alias colors: adapter.colors
 
 	function save(): void {
 		saveTimer.restart();
@@ -32,71 +32,42 @@ Singleton {
 		recentSaveCooldown.restart();
 	}
 
-	function serializeAppearance(): var {
+	property bool recentlySaved: false
-		return {
+
-			rounding: {
+	ElapsedTimer {
-				scale: appearance.rounding.scale
+		id: timer
-			},
-			spacing: {
-				scale: appearance.spacing.scale
-			},
-			padding: {
-				scale: appearance.padding.scale
-			},
-			font: {
-				family: {
-					sans: appearance.font.family.sans,
-					mono: appearance.font.family.mono,
-					material: appearance.font.family.material,
-					clock: appearance.font.family.clock
-				},
-				size: {
-					scale: appearance.font.size.scale
-				}
-			},
-			anim: {
-				mediaGifSpeedAdjustment: 300,
-				sessionGifSpeed: 0.7,
-				durations: {
-					scale: appearance.anim.durations.scale
-				}
-			},
-			transparency: {
-				enabled: appearance.transparency.enabled,
-				base: appearance.transparency.base,
-				layers: appearance.transparency.layers
-			}
-		};
 	}
 
-	function serializeBackground(): var {
+	Timer {
-		return {
+		id: saveTimer
-			wallFadeDuration: background.wallFadeDuration,
+
-			enabled: background.enabled
+		interval: 500
-		};
+		onTriggered: {
+			timer.restart();
+			try {
+				let config = {};
+				try {
+					config = JSON.parse(fileView.text());
+				} catch (e) {
+					config = {};
 				}
 
-	function serializeBar(): var {
+				config = root.serializeConfig();
-		return {
+
-			autoHide: barConfig.autoHide,
+				fileView.setText(JSON.stringify(config, null, 4));
-			rounding: barConfig.rounding,
+			} catch (e) {
-			popouts: {
+				Toaster.toast(qsTr("Failed to serialize config"), e.message, "settings_alert", Toast.Error);
-				tray: barConfig.popouts.tray,
+			}
-				audio: barConfig.popouts.audio,
+		}
-				activeWindow: barConfig.popouts.activeWindow,
-				resources: barConfig.popouts.resources,
-				clock: barConfig.popouts.clock,
-				network: barConfig.popouts.network,
-				upower: barConfig.popouts.upower
-			},
-			entries: barConfig.entries
-		};
 	}
 
-	function serializeColors(): var {
+	Timer {
-		return {
+		id: recentSaveCooldown
-			schemeType: colors.schemeType
+
-		};
+		interval: 2000
+		onTriggered: {
+			root.recentlySaved = false;
+		}
 	}
 
 	function serializeConfig(): var {
@@ -114,37 +85,36 @@ Singleton {
 			background: serializeBackground(),
 			launcher: serializeLauncher(),
 			colors: serializeColors()
-		};
+		}
 	}
 
-	function serializeDashboard(): var {
+	function serializeBar(): var {
 		return {
-			enabled: dashboard.enabled,
+			autoHide: barConfig.autoHide,
-			mediaUpdateInterval: dashboard.mediaUpdateInterval,
+			rounding: barConfig.rounding,
-			resourceUpdateInterval: dashboard.resourceUpdateInterval,
+			popouts: {
-			dragThreshold: dashboard.dragThreshold,
+				tray: barConfig.popouts.tray,
-			performance: {
+				audio: barConfig.popouts.audio,
-				showBattery: dashboard.performance.showBattery,
+				activeWindow: barConfig.popouts.activeWindow,
-				showGpu: dashboard.performance.showGpu,
+				resources: barConfig.popouts.resources,
-				showCpu: dashboard.performance.showCpu,
+				clock: barConfig.popouts.clock,
-				showMemory: dashboard.performance.showMemory,
+				network: barConfig.popouts.network,
-				showStorage: dashboard.performance.showStorage,
+				upower: barConfig.popouts.upower
-				showNetwork: dashboard.performance.showNetwork
 			},
+			entries: barConfig.entries
+		}
+	}
+
+    function serializeLock(): var {
+        return {
+            recolorLogo: lock.recolorLogo,
+            enableFprint: lock.enableFprint,
+            maxFprintTries: lock.maxFprintTries,
+			blurAmount: lock.blurAmount,
             sizes: {
-				tabIndicatorHeight: dashboard.sizes.tabIndicatorHeight,
+                heightMult: lock.sizes.heightMult,
-				tabIndicatorSpacing: dashboard.sizes.tabIndicatorSpacing,
+                ratio: lock.sizes.ratio,
-				infoWidth: dashboard.sizes.infoWidth,
+                centerWidth: lock.sizes.centerWidth
-				infoIconSize: dashboard.sizes.infoIconSize,
-				dateTimeWidth: dashboard.sizes.dateTimeWidth,
-				mediaWidth: dashboard.sizes.mediaWidth,
-				mediaProgressSweep: dashboard.sizes.mediaProgressSweep,
-				mediaProgressThickness: dashboard.sizes.mediaProgressThickness,
-				resourceProgessThickness: dashboard.sizes.resourceProgessThickness,
-				weatherWidth: dashboard.sizes.weatherWidth,
-				mediaCoverArtSize: dashboard.sizes.mediaCoverArtSize,
-				mediaVisualiserSize: dashboard.sizes.mediaVisualiserSize,
-				resourceSize: dashboard.sizes.resourceSize
             }
         };
     }
@@ -165,48 +135,25 @@ Singleton {
 				terminal: general.apps.terminal,
 				audio: general.apps.audio,
 				playback: general.apps.playback,
-				explorer: general.apps.explorer
+				explorer: general.apps.explorer,
 			},
 			idle: {
 				timouts: general.idle.timeouts
 			}
-		};
+		}
 	}
 
-	function serializeLauncher(): var {
+    function serializeServices(): var {
         return {
-			maxAppsShown: launcher.maxAppsShown,
+            weatherLocation: services.weatherLocation,
-			maxWallpapers: launcher.maxWallpapers,
+            useFahrenheit: services.useFahrenheit,
-			actionPrefix: launcher.actionPrefix,
+            useTwelveHourClock: services.useTwelveHourClock,
-			specialPrefix: launcher.specialPrefix,
+            gpuType: services.gpuType,
-			useFuzzy: {
+            audioIncrement: services.audioIncrement,
-				apps: launcher.useFuzzy.apps,
+            brightnessIncrement: services.brightnessIncrement,
-				actions: launcher.useFuzzy.actions,
+            maxVolume: services.maxVolume,
-				schemes: launcher.useFuzzy.schemes,
+            defaultPlayer: services.defaultPlayer,
-				variants: launcher.useFuzzy.variants,
+            playerAliases: services.playerAliases
-				wallpapers: launcher.useFuzzy.wallpapers
-			},
-			sizes: {
-				itemWidth: launcher.sizes.itemWidth,
-				itemHeight: launcher.sizes.itemHeight,
-				wallpaperWidth: launcher.sizes.wallpaperWidth,
-				wallpaperHeight: launcher.sizes.wallpaperHeight
-			},
-			actions: launcher.actions
-		};
-	}
-
-	function serializeLock(): var {
-		return {
-			recolorLogo: lock.recolorLogo,
-			enableFprint: lock.enableFprint,
-			maxFprintTries: lock.maxFprintTries,
-			blurAmount: lock.blurAmount,
-			sizes: {
-				heightMult: lock.sizes.heightMult,
-				ratio: lock.sizes.ratio,
-				centerWidth: lock.sizes.centerWidth
-			}
         };
     }
 
@@ -214,7 +161,6 @@ Singleton {
         return {
             expire: notifs.expire,
             defaultExpireTimeout: notifs.defaultExpireTimeout,
-			appNotifCooldown: notifs.appNotifCooldown,
             clearThreshold: notifs.clearThreshold,
             expandThreshold: notifs.expandThreshold,
             actionOnClick: notifs.actionOnClick,
@@ -227,36 +173,6 @@ Singleton {
         };
     }
 
-	function serializeOsd(): var {
-		return {
-			enabled: osd.enabled,
-			hideDelay: osd.hideDelay,
-			enableBrightness: osd.enableBrightness,
-			enableMicrophone: osd.enableMicrophone,
-			allMonBrightness: osd.allMonBrightness,
-			sizes: {
-				sliderWidth: osd.sizes.sliderWidth,
-				sliderHeight: osd.sizes.sliderHeight
-			}
-		};
-	}
-
-	function serializeServices(): var {
-		return {
-			weatherLocation: services.weatherLocation,
-			useFahrenheit: services.useFahrenheit,
-			ddcutilService: services.ddcutilService,
-			useTwelveHourClock: services.useTwelveHourClock,
-			gpuType: services.gpuType,
-			audioIncrement: services.audioIncrement,
-			brightnessIncrement: services.brightnessIncrement,
-			maxVolume: services.maxVolume,
-			defaultPlayer: services.defaultPlayer,
-			playerAliases: services.playerAliases,
-			visualizerBars: services.visualizerBars
-		};
-	}
-
     function serializeSidebar(): var {
         return {
             enabled: sidebar.enabled,
@@ -294,42 +210,113 @@ Singleton {
         };
     }
 
-	ElapsedTimer {
+    function serializeDashboard(): var {
-		id: timer
+        return {
-
+            enabled: dashboard.enabled,
+            mediaUpdateInterval: dashboard.mediaUpdateInterval,
+            dragThreshold: dashboard.dragThreshold,
+            sizes: {
+                tabIndicatorHeight: dashboard.sizes.tabIndicatorHeight,
+                tabIndicatorSpacing: dashboard.sizes.tabIndicatorSpacing,
+                infoWidth: dashboard.sizes.infoWidth,
+                infoIconSize: dashboard.sizes.infoIconSize,
+                dateTimeWidth: dashboard.sizes.dateTimeWidth,
+                mediaWidth: dashboard.sizes.mediaWidth,
+                mediaProgressSweep: dashboard.sizes.mediaProgressSweep,
+                mediaProgressThickness: dashboard.sizes.mediaProgressThickness,
+                resourceProgessThickness: dashboard.sizes.resourceProgessThickness,
+                weatherWidth: dashboard.sizes.weatherWidth,
+                mediaCoverArtSize: dashboard.sizes.mediaCoverArtSize,
+                mediaVisualiserSize: dashboard.sizes.mediaVisualiserSize,
+                resourceSize: dashboard.sizes.resourceSize
+            }
+        };
     }
 
-	Timer {
+    function serializeOsd(): var {
-		id: saveTimer
+        return {
-
+            enabled: osd.enabled,
-		interval: 500
+            hideDelay: osd.hideDelay,
-
+            enableBrightness: osd.enableBrightness,
-		onTriggered: {
+            enableMicrophone: osd.enableMicrophone,
-			timer.restart();
+			allMonBrightness: osd.allMonBrightness,
-			try {
+            sizes: {
-				let config = {};
+                sliderWidth: osd.sizes.sliderWidth,
-				try {
+                sliderHeight: osd.sizes.sliderHeight
-					config = JSON.parse(fileView.text());
+            }
-				} catch (e) {
+        };
-					config = {};
     }
 
-				config = root.serializeConfig();
+	function serializeLauncher(): var {
-
+		return {
-				fileView.setText(JSON.stringify(config, null, 4));
+			maxAppsShown: launcher.maxAppsShown,
-			} catch (e) {
+			maxWallpapers: launcher.maxWallpapers,
-				Toaster.toast(qsTr("Failed to serialize config"), e.message, "settings_alert", Toast.Error);
+			actionPrefix: launcher.actionPrefix,
+			specialPrefix: launcher.specialPrefix,
+            useFuzzy: {
+                apps: launcher.useFuzzy.apps,
+                actions: launcher.useFuzzy.actions,
+                schemes: launcher.useFuzzy.schemes,
+                variants: launcher.useFuzzy.variants,
+                wallpapers: launcher.useFuzzy.wallpapers
+            },
+			sizes: {
+				itemWidth: launcher.sizes.itemWidth,
+				itemHeight: launcher.sizes.itemHeight,
+				wallpaperWidth: launcher.sizes.wallpaperWidth,
+				wallpaperHeight: launcher.sizes.wallpaperHeight
+			},
+			actions: launcher.actions
 		}
 	}
+
+	function serializeBackground(): var {
+		return {
+			wallFadeDuration: background.wallFadeDuration,
+			enabled: background.enabled
+		}
 	}
 
-	Timer {
+    function serializeAppearance(): var {
-		id: recentSaveCooldown
+        return {
+            rounding: {
+                scale: appearance.rounding.scale
+            },
+            spacing: {
+                scale: appearance.spacing.scale
+            },
+            padding: {
+                scale: appearance.padding.scale
+            },
+            font: {
+                family: {
+                    sans: appearance.font.family.sans,
+                    mono: appearance.font.family.mono,
+                    material: appearance.font.family.material,
+                    clock: appearance.font.family.clock
+                },
+                size: {
+                    scale: appearance.font.size.scale
+                }
+            },
+            anim: {
+                mediaGifSpeedAdjustment: 300,
+                sessionGifSpeed: 0.7,
+                durations: {
+                    scale: appearance.anim.durations.scale
+                }
+            },
+            transparency: {
+                enabled: appearance.transparency.enabled,
+                base: appearance.transparency.base,
+                layers: appearance.transparency.layers
+            }
+        };
+    }
 
-		interval: 2000
+	function serializeColors(): var {
-
+		return {
-		onTriggered: {
+			schemeType: colors.schemeType,
-			root.recentlySaved = false;
 		}
 	}
 
@@ -337,68 +324,57 @@ Singleton {
         id: fileView
 
         path: `${Paths.config}/config.json`
+
         watchChanges: true
 
         onFileChanged: {
-			if (!root.recentlySaved) {
+			if ( !root.recentlySaved ) {
 				timer.restart();
 				reload();
 			} else {
 				reload();
 			}
 		}
-		onLoadFailed: err => {
+
-			if (err !== FileViewError.FileNotFound)
-				Toaster.toast(qsTr("Failed to read config"), FileViewError.toString(err), "settings_alert", Toast.Warning);
-		}
 		onLoaded: {
 			ModeScheduler.checkStartup();
 			try {
 				JSON.parse(text());
 				const elapsed = timer.elapsedMs();
 
-				if (adapter.utilities.toasts.configLoaded && !root.recentlySaved) {
+				if ( adapter.utilities.toasts.configLoaded && !root.recentlySaved ) {
 					Toaster.toast(qsTr("Config loaded"), qsTr("Config loaded in %1ms").arg(elapsed), "rule_settings");
-				} else if (adapter.utilities.toasts.configLoaded && root.recentlySaved) {
+				} else if ( adapter.utilities.toasts.configLoaded && root.recentlySaved ) {
 					Toaster.toast(qsTr("Config saved"), qsTr("Config reloaded in %1ms").arg(elapsed), "settings_alert");
 				}
 			} catch (e) {
 				Toaster.toast(qsTr("Failed to load config"), e.message, "settings_alert", Toast.Error);
 			}
 		}
+
+		onLoadFailed: err => {
+			if ( err !== FileViewError.FileNotFound )
+				Toaster.toast(qsTr("Failed to read config"), FileViewError.toString(err), "settings_alert", Toast.Warning);
+		}
+
 		onSaveFailed: err => Toaster.toast(qsTr("Failed to save config"), FileViewError.toString(err), "settings_alert", Toast.Error)
 
         JsonAdapter {
             id: adapter
-
+            property BackgroundConfig background: BackgroundConfig {}
-			property AppearanceConf appearance: AppearanceConf {
+            property BarConfig barConfig: BarConfig {}
-			}
+            property LockConf lock: LockConf {}
-			property BackgroundConfig background: BackgroundConfig {
+			property Overview overview: Overview {}
-			}
+			property Services services: Services {}
-			property BarConfig barConfig: BarConfig {
+			property NotifConfig notifs: NotifConfig {}
-			}
+			property SidebarConfig sidebar: SidebarConfig {}
-			property Colors colors: Colors {
+			property UtilConfig utilities: UtilConfig {}
-			}
+			property General general: General {}
-			property DashboardConfig dashboard: DashboardConfig {
+			property DashboardConfig dashboard: DashboardConfig {}
-			}
+			property AppearanceConf appearance: AppearanceConf {}
-			property General general: General {
+			property Osd osd: Osd {}
-			}
+			property Launcher launcher: Launcher {}
-			property Launcher launcher: Launcher {
+			property Colors colors: Colors {}
-			}
-			property LockConf lock: LockConf {
-			}
-			property NotifConfig notifs: NotifConfig {
-			}
-			property Osd osd: Osd {
-			}
-			property Overview overview: Overview {
-			}
-			property Services services: Services {
-			}
-			property SidebarConfig sidebar: SidebarConfig {
-			}
-			property UtilConfig utilities: UtilConfig {
-			}
         }
     }
 }

Config/DashboardConfig.qml

@@ -1,36 +1,24 @@
 import Quickshell.Io
 
 JsonObject {
-	property int dragThreshold: 50
     property bool enabled: true
     property int mediaUpdateInterval: 500
-	property Performance performance: Performance {
+    property int dragThreshold: 50
-	}
+    property Sizes sizes: Sizes {}
-	property int resourceUpdateInterval: 1000
-	property Sizes sizes: Sizes {
-	}
 
-	component Performance: JsonObject {
-		property bool showBattery: true
-		property bool showCpu: true
-		property bool showGpu: true
-		property bool showMemory: true
-		property bool showNetwork: true
-		property bool showStorage: true
-	}
     component Sizes: JsonObject {
-		readonly property int dateTimeWidth: 110
-		readonly property int infoIconSize: 25
-		readonly property int infoWidth: 200
-		readonly property int mediaCoverArtSize: 150
-		readonly property int mediaProgressSweep: 180
-		readonly property int mediaProgressThickness: 8
-		readonly property int mediaVisualiserSize: 80
-		readonly property int mediaWidth: 200
-		readonly property int resourceProgessThickness: 10
-		readonly property int resourceSize: 200
         readonly property int tabIndicatorHeight: 3
         readonly property int tabIndicatorSpacing: 5
+        readonly property int infoWidth: 200
+        readonly property int infoIconSize: 25
+        readonly property int dateTimeWidth: 110
+        readonly property int mediaWidth: 200
+        readonly property int mediaProgressSweep: 180
+        readonly property int mediaProgressThickness: 8
+        readonly property int resourceProgessThickness: 10
         readonly property int weatherWidth: 250
+        readonly property int mediaCoverArtSize: 150
+        readonly property int mediaVisualiserSize: 80
+        readonly property int resourceSize: 200
     }
 }

Config/DynamicColors.qml

@@ -11,23 +11,25 @@ import qs.Paths
 Singleton {
     id: root
 
-	readonly property M3Palette current: M3Palette {
+    property bool showPreview
-	}
+    property string scheme
-	property bool currentLight
     property string flavour
     readonly property bool light: showPreview ? previewLight : currentLight
-	readonly property M3Palette palette: showPreview ? preview : current
+    property bool currentLight
-	readonly property M3Palette preview: M3Palette {
-	}
     property bool previewLight
-	property string scheme
+    readonly property M3Palette palette: showPreview ? preview : current
-	property bool showPreview
+    readonly property M3TPalette tPalette: M3TPalette {}
-	readonly property M3TPalette tPalette: M3TPalette {
+    readonly property M3Palette current: M3Palette {}
-	}
+    readonly property M3Palette preview: M3Palette {}
-	readonly property Transparency transparency: Transparency {
+    readonly property Transparency transparency: Transparency {}
-	}
     readonly property alias wallLuminance: analyser.luminance
 
+    function getLuminance(c: color): real {
+        if (c.r == 0 && c.g == 0 && c.b == 0)
+            return 0;
+        return Math.sqrt(0.299 * (c.r ** 2) + 0.587 * (c.g ** 2) + 0.114 * (c.b ** 2));
+    }
+
     function alterColor(c: color, a: real, layer: int): color {
         const luminance = getLuminance(c);
 
@@ -40,12 +42,6 @@ Singleton {
         return Qt.rgba(r, g, b, a);
     }
 
-	function getLuminance(c: color): real {
-		if (c.r == 0 && c.g == 0 && c.b == 0)
-			return 0;
-		return Math.sqrt(0.299 * (c.r ** 2) + 0.587 * (c.g ** 2) + 0.114 * (c.b ** 2));
-	}
-
     function layer(c: color, layer: var): color {
         if (!transparency.enabled)
             return c;
@@ -53,6 +49,12 @@ Singleton {
         return layer === 0 ? Qt.alpha(c, transparency.base) : alterColor(c, transparency.layers, layer ?? 1);
     }
 
+    function on(c: color): color {
+        if (c.hslLightness < 0.5)
+            return Qt.hsla(c.hslHue, c.hslSaturation, 0.9, 1);
+        return Qt.hsla(c.hslHue, c.hslSaturation, 0.1, 1);
+    }
+
     function load(data: string, isPreview: bool): void {
         const colors = isPreview ? preview : current;
         const scheme = JSON.parse(data);
@@ -72,16 +74,9 @@ Singleton {
         }
     }
 
-	function on(c: color): color {
-		if (c.hslLightness < 0.5)
-			return Qt.hsla(c.hslHue, c.hslSaturation, 0.9, 1);
-		return Qt.hsla(c.hslHue, c.hslSaturation, 0.1, 1);
-	}
-
     FileView {
         path: `${Paths.state}/scheme.json`
         watchChanges: true
-
         onFileChanged: reload()
         onLoaded: root.load(text(), false)
     }
@@ -92,189 +87,192 @@ Singleton {
         source: WallpaperPath.currentWallpaperPath
     }
 
-	component M3MaccchiatoPalette: QtObject {
+    component Transparency: QtObject {
-		property color m3background: "#131317"
+        readonly property bool enabled: Appearance.transparency.enabled
-		property color m3error: "#ffb4ab"
+        readonly property real base: Appearance.transparency.base - (root.light ? 0.1 : 0)
-		property color m3errorContainer: "#93000a"
+        readonly property real layers: Appearance.transparency.layers
-		property color m3inverseOnSurface: "#303034"
-		property color m3inversePrimary: "#525b92"
-		property color m3inverseSurface: "#e4e1e7"
-		property color m3neutral_paletteKeyColor: "#77767b"
-		property color m3neutral_variant_paletteKeyColor: "#767680"
-		property color m3onBackground: "#e4e1e7"
-		property color m3onError: "#690005"
-		property color m3onErrorContainer: "#ffdad6"
-		property color m3onPrimary: "#232c60"
-		property color m3onPrimaryContainer: "#ffffff"
-		property color m3onPrimaryFixed: "#0b154b"
-		property color m3onPrimaryFixedVariant: "#3a4378"
-		property color m3onSecondary: "#2c2f44"
-		property color m3onSecondaryContainer: "#b1b3ce"
-		property color m3onSecondaryFixed: "#171a2e"
-		property color m3onSecondaryFixedVariant: "#42455c"
-		property color m3onSuccess: "#213528"
-		property color m3onSuccessContainer: "#D1E9D6"
-		property color m3onSurface: "#e4e1e7"
-		property color m3onSurfaceVariant: "#c6c5d1"
-		property color m3onTertiary: "#4c1f48"
-		property color m3onTertiaryContainer: "#000000"
-		property color m3onTertiaryFixed: "#340831"
-		property color m3onTertiaryFixedVariant: "#66365f"
-		property color m3outline: "#90909a"
-		property color m3outlineVariant: "#46464f"
-		property color m3primary: "#bac3ff"
-		property color m3primaryContainer: "#6a73ac"
-		property color m3primaryFixed: "#dee0ff"
-		property color m3primaryFixedDim: "#bac3ff"
-		property color m3primary_paletteKeyColor: "#6a73ac"
-		property color m3scrim: "#000000"
-		property color m3secondary: "#c3c5e0"
-		property color m3secondaryContainer: "#42455c"
-		property color m3secondaryFixed: "#dfe1fd"
-		property color m3secondaryFixedDim: "#c3c5e0"
-		property color m3secondary_paletteKeyColor: "#72758e"
-		property color m3shadow: "#000000"
-		property color m3success: "#B5CCBA"
-		property color m3successContainer: "#374B3E"
-		property color m3surface: "#131317"
-		property color m3surfaceBright: "#39393d"
-		property color m3surfaceContainer: "#1f1f23"
-		property color m3surfaceContainerHigh: "#2a2a2e"
-		property color m3surfaceContainerHighest: "#353438"
-		property color m3surfaceContainerLow: "#1b1b1f"
-		property color m3surfaceContainerLowest: "#0e0e12"
-		property color m3surfaceDim: "#131317"
-		property color m3surfaceTint: "#bac3ff"
-		property color m3surfaceVariant: "#46464f"
-		property color m3tertiary: "#f1b3e5"
-		property color m3tertiaryContainer: "#b77ead"
-		property color m3tertiaryFixed: "#ffd7f4"
-		property color m3tertiaryFixedDim: "#f1b3e5"
-		property color m3tertiary_paletteKeyColor: "#9b6592"
-	}
-	component M3Palette: QtObject {
-		property color m3background: "#191114"
-		property color m3error: "#ffb4ab"
-		property color m3errorContainer: "#93000a"
-		property color m3inverseOnSurface: "#372e30"
-		property color m3inversePrimary: "#8b4a62"
-		property color m3inverseSurface: "#efdfe2"
-		property color m3neutral_paletteKeyColor: "#807477"
-		property color m3neutral_variant_paletteKeyColor: "#837377"
-		property color m3onBackground: "#efdfe2"
-		property color m3onError: "#690005"
-		property color m3onErrorContainer: "#ffdad6"
-		property color m3onPrimary: "#541d34"
-		property color m3onPrimaryContainer: "#ffd9e3"
-		property color m3onPrimaryFixed: "#39071f"
-		property color m3onPrimaryFixedVariant: "#6f334a"
-		property color m3onSecondary: "#422932"
-		property color m3onSecondaryContainer: "#ffd9e3"
-		property color m3onSecondaryFixed: "#2b151d"
-		property color m3onSecondaryFixedVariant: "#5a3f48"
-		property color m3onSuccess: "#213528"
-		property color m3onSuccessContainer: "#D1E9D6"
-		property color m3onSurface: "#efdfe2"
-		property color m3onSurfaceVariant: "#d5c2c6"
-		property color m3onTertiary: "#48290c"
-		property color m3onTertiaryContainer: "#000000"
-		property color m3onTertiaryFixed: "#2f1500"
-		property color m3onTertiaryFixedVariant: "#623f21"
-		property color m3outline: "#9e8c91"
-		property color m3outlineVariant: "#514347"
-		property color m3primary: "#ffb0ca"
-		property color m3primaryContainer: "#6f334a"
-		property color m3primaryFixed: "#ffd9e3"
-		property color m3primaryFixedDim: "#ffb0ca"
-		property color m3primary_paletteKeyColor: "#a8627b"
-		property color m3scrim: "#000000"
-		property color m3secondary: "#e2bdc7"
-		property color m3secondaryContainer: "#5a3f48"
-		property color m3secondaryFixed: "#ffd9e3"
-		property color m3secondaryFixedDim: "#e2bdc7"
-		property color m3secondary_paletteKeyColor: "#8e6f78"
-		property color m3shadow: "#000000"
-		property color m3success: "#B5CCBA"
-		property color m3successContainer: "#374B3E"
-		property color m3surface: "#191114"
-		property color m3surfaceBright: "#403739"
-		property color m3surfaceContainer: "#261d20"
-		property color m3surfaceContainerHigh: "#31282a"
-		property color m3surfaceContainerHighest: "#3c3235"
-		property color m3surfaceContainerLow: "#22191c"
-		property color m3surfaceContainerLowest: "#130c0e"
-		property color m3surfaceDim: "#191114"
-		property color m3surfaceTint: "#ffb0ca"
-		property color m3surfaceVariant: "#514347"
-		property color m3tertiary: "#f0bc95"
-		property color m3tertiaryContainer: "#b58763"
-		property color m3tertiaryFixed: "#ffdcc3"
-		property color m3tertiaryFixedDim: "#f0bc95"
-		property color m3tertiary_paletteKeyColor: "#986e4c"
     }
+
     component M3TPalette: QtObject {
-		readonly property color m3background: root.layer(root.palette.m3background, 0)
+        readonly property color m3primary_paletteKeyColor: root.layer(root.palette.m3primary_paletteKeyColor)
-		readonly property color m3error: root.layer(root.palette.m3error)
+        readonly property color m3secondary_paletteKeyColor: root.layer(root.palette.m3secondary_paletteKeyColor)
-		readonly property color m3errorContainer: root.layer(root.palette.m3errorContainer)
+        readonly property color m3tertiary_paletteKeyColor: root.layer(root.palette.m3tertiary_paletteKeyColor)
-		readonly property color m3inverseOnSurface: root.layer(root.palette.m3inverseOnSurface)
-		readonly property color m3inversePrimary: root.layer(root.palette.m3inversePrimary)
-		readonly property color m3inverseSurface: root.layer(root.palette.m3inverseSurface, 0)
         readonly property color m3neutral_paletteKeyColor: root.layer(root.palette.m3neutral_paletteKeyColor)
         readonly property color m3neutral_variant_paletteKeyColor: root.layer(root.palette.m3neutral_variant_paletteKeyColor)
+        readonly property color m3background: root.layer(root.palette.m3background, 0)
         readonly property color m3onBackground: root.layer(root.palette.m3onBackground)
-		readonly property color m3onError: root.layer(root.palette.m3onError)
-		readonly property color m3onErrorContainer: root.layer(root.palette.m3onErrorContainer)
-		readonly property color m3onPrimary: root.layer(root.palette.m3onPrimary)
-		readonly property color m3onPrimaryContainer: root.layer(root.palette.m3onPrimaryContainer)
-		readonly property color m3onPrimaryFixed: root.layer(root.palette.m3onPrimaryFixed)
-		readonly property color m3onPrimaryFixedVariant: root.layer(root.palette.m3onPrimaryFixedVariant)
-		readonly property color m3onSecondary: root.layer(root.palette.m3onSecondary)
-		readonly property color m3onSecondaryContainer: root.layer(root.palette.m3onSecondaryContainer)
-		readonly property color m3onSecondaryFixed: root.layer(root.palette.m3onSecondaryFixed)
-		readonly property color m3onSecondaryFixedVariant: root.layer(root.palette.m3onSecondaryFixedVariant)
-		readonly property color m3onSuccess: root.layer(root.palette.m3onSuccess)
-		readonly property color m3onSuccessContainer: root.layer(root.palette.m3onSuccessContainer)
-		readonly property color m3onSurface: root.layer(root.palette.m3onSurface)
-		readonly property color m3onSurfaceVariant: root.layer(root.palette.m3onSurfaceVariant)
-		readonly property color m3onTertiary: root.layer(root.palette.m3onTertiary)
-		readonly property color m3onTertiaryContainer: root.layer(root.palette.m3onTertiaryContainer)
-		readonly property color m3onTertiaryFixed: root.layer(root.palette.m3onTertiaryFixed)
-		readonly property color m3onTertiaryFixedVariant: root.layer(root.palette.m3onTertiaryFixedVariant)
-		readonly property color m3outline: root.layer(root.palette.m3outline)
-		readonly property color m3outlineVariant: root.layer(root.palette.m3outlineVariant)
-		readonly property color m3primary: root.layer(root.palette.m3primary)
-		readonly property color m3primaryContainer: root.layer(root.palette.m3primaryContainer)
-		readonly property color m3primaryFixed: root.layer(root.palette.m3primaryFixed)
-		readonly property color m3primaryFixedDim: root.layer(root.palette.m3primaryFixedDim)
-		readonly property color m3primary_paletteKeyColor: root.layer(root.palette.m3primary_paletteKeyColor)
-		readonly property color m3scrim: root.layer(root.palette.m3scrim)
-		readonly property color m3secondary: root.layer(root.palette.m3secondary)
-		readonly property color m3secondaryContainer: root.layer(root.palette.m3secondaryContainer)
-		readonly property color m3secondaryFixed: root.layer(root.palette.m3secondaryFixed)
-		readonly property color m3secondaryFixedDim: root.layer(root.palette.m3secondaryFixedDim)
-		readonly property color m3secondary_paletteKeyColor: root.layer(root.palette.m3secondary_paletteKeyColor)
-		readonly property color m3shadow: root.layer(root.palette.m3shadow)
-		readonly property color m3success: root.layer(root.palette.m3success)
-		readonly property color m3successContainer: root.layer(root.palette.m3successContainer)
         readonly property color m3surface: root.layer(root.palette.m3surface, 0)
+        readonly property color m3surfaceDim: root.layer(root.palette.m3surfaceDim, 0)
         readonly property color m3surfaceBright: root.layer(root.palette.m3surfaceBright, 0)
+        readonly property color m3surfaceContainerLowest: root.layer(root.palette.m3surfaceContainerLowest)
+        readonly property color m3surfaceContainerLow: root.layer(root.palette.m3surfaceContainerLow)
         readonly property color m3surfaceContainer: root.layer(root.palette.m3surfaceContainer)
         readonly property color m3surfaceContainerHigh: root.layer(root.palette.m3surfaceContainerHigh)
         readonly property color m3surfaceContainerHighest: root.layer(root.palette.m3surfaceContainerHighest)
-		readonly property color m3surfaceContainerLow: root.layer(root.palette.m3surfaceContainerLow)
+        readonly property color m3onSurface: root.layer(root.palette.m3onSurface)
-		readonly property color m3surfaceContainerLowest: root.layer(root.palette.m3surfaceContainerLowest)
-		readonly property color m3surfaceDim: root.layer(root.palette.m3surfaceDim, 0)
-		readonly property color m3surfaceTint: root.layer(root.palette.m3surfaceTint)
         readonly property color m3surfaceVariant: root.layer(root.palette.m3surfaceVariant, 0)
+        readonly property color m3onSurfaceVariant: root.layer(root.palette.m3onSurfaceVariant)
+        readonly property color m3inverseSurface: root.layer(root.palette.m3inverseSurface, 0)
+        readonly property color m3inverseOnSurface: root.layer(root.palette.m3inverseOnSurface)
+        readonly property color m3outline: root.layer(root.palette.m3outline)
+        readonly property color m3outlineVariant: root.layer(root.palette.m3outlineVariant)
+        readonly property color m3shadow: root.layer(root.palette.m3shadow)
+        readonly property color m3scrim: root.layer(root.palette.m3scrim)
+        readonly property color m3surfaceTint: root.layer(root.palette.m3surfaceTint)
+        readonly property color m3primary: root.layer(root.palette.m3primary)
+        readonly property color m3onPrimary: root.layer(root.palette.m3onPrimary)
+        readonly property color m3primaryContainer: root.layer(root.palette.m3primaryContainer)
+        readonly property color m3onPrimaryContainer: root.layer(root.palette.m3onPrimaryContainer)
+        readonly property color m3inversePrimary: root.layer(root.palette.m3inversePrimary)
+        readonly property color m3secondary: root.layer(root.palette.m3secondary)
+        readonly property color m3onSecondary: root.layer(root.palette.m3onSecondary)
+        readonly property color m3secondaryContainer: root.layer(root.palette.m3secondaryContainer)
+        readonly property color m3onSecondaryContainer: root.layer(root.palette.m3onSecondaryContainer)
         readonly property color m3tertiary: root.layer(root.palette.m3tertiary)
+        readonly property color m3onTertiary: root.layer(root.palette.m3onTertiary)
         readonly property color m3tertiaryContainer: root.layer(root.palette.m3tertiaryContainer)
+        readonly property color m3onTertiaryContainer: root.layer(root.palette.m3onTertiaryContainer)
+        readonly property color m3error: root.layer(root.palette.m3error)
+        readonly property color m3onError: root.layer(root.palette.m3onError)
+        readonly property color m3errorContainer: root.layer(root.palette.m3errorContainer)
+        readonly property color m3onErrorContainer: root.layer(root.palette.m3onErrorContainer)
+        readonly property color m3success: root.layer(root.palette.m3success)
+        readonly property color m3onSuccess: root.layer(root.palette.m3onSuccess)
+        readonly property color m3successContainer: root.layer(root.palette.m3successContainer)
+        readonly property color m3onSuccessContainer: root.layer(root.palette.m3onSuccessContainer)
+        readonly property color m3primaryFixed: root.layer(root.palette.m3primaryFixed)
+        readonly property color m3primaryFixedDim: root.layer(root.palette.m3primaryFixedDim)
+        readonly property color m3onPrimaryFixed: root.layer(root.palette.m3onPrimaryFixed)
+        readonly property color m3onPrimaryFixedVariant: root.layer(root.palette.m3onPrimaryFixedVariant)
+        readonly property color m3secondaryFixed: root.layer(root.palette.m3secondaryFixed)
+        readonly property color m3secondaryFixedDim: root.layer(root.palette.m3secondaryFixedDim)
+        readonly property color m3onSecondaryFixed: root.layer(root.palette.m3onSecondaryFixed)
+        readonly property color m3onSecondaryFixedVariant: root.layer(root.palette.m3onSecondaryFixedVariant)
         readonly property color m3tertiaryFixed: root.layer(root.palette.m3tertiaryFixed)
         readonly property color m3tertiaryFixedDim: root.layer(root.palette.m3tertiaryFixedDim)
-		readonly property color m3tertiary_paletteKeyColor: root.layer(root.palette.m3tertiary_paletteKeyColor)
+        readonly property color m3onTertiaryFixed: root.layer(root.palette.m3onTertiaryFixed)
+        readonly property color m3onTertiaryFixedVariant: root.layer(root.palette.m3onTertiaryFixedVariant)
     }
-	component Transparency: QtObject {
+
-		readonly property real base: Appearance.transparency.base - (root.light ? 0.1 : 0)
+    component M3Palette: QtObject {
-		readonly property bool enabled: Appearance.transparency.enabled
+        property color m3primary_paletteKeyColor: "#a8627b"
-		readonly property real layers: Appearance.transparency.layers
+        property color m3secondary_paletteKeyColor: "#8e6f78"
+        property color m3tertiary_paletteKeyColor: "#986e4c"
+        property color m3neutral_paletteKeyColor: "#807477"
+        property color m3neutral_variant_paletteKeyColor: "#837377"
+        property color m3background: "#191114"
+        property color m3onBackground: "#efdfe2"
+        property color m3surface: "#191114"
+        property color m3surfaceDim: "#191114"
+        property color m3surfaceBright: "#403739"
+        property color m3surfaceContainerLowest: "#130c0e"
+        property color m3surfaceContainerLow: "#22191c"
+        property color m3surfaceContainer: "#261d20"
+        property color m3surfaceContainerHigh: "#31282a"
+        property color m3surfaceContainerHighest: "#3c3235"
+        property color m3onSurface: "#efdfe2"
+        property color m3surfaceVariant: "#514347"
+        property color m3onSurfaceVariant: "#d5c2c6"
+        property color m3inverseSurface: "#efdfe2"
+        property color m3inverseOnSurface: "#372e30"
+        property color m3outline: "#9e8c91"
+        property color m3outlineVariant: "#514347"
+        property color m3shadow: "#000000"
+        property color m3scrim: "#000000"
+        property color m3surfaceTint: "#ffb0ca"
+        property color m3primary: "#ffb0ca"
+        property color m3onPrimary: "#541d34"
+        property color m3primaryContainer: "#6f334a"
+        property color m3onPrimaryContainer: "#ffd9e3"
+        property color m3inversePrimary: "#8b4a62"
+        property color m3secondary: "#e2bdc7"
+        property color m3onSecondary: "#422932"
+        property color m3secondaryContainer: "#5a3f48"
+        property color m3onSecondaryContainer: "#ffd9e3"
+        property color m3tertiary: "#f0bc95"
+        property color m3onTertiary: "#48290c"
+        property color m3tertiaryContainer: "#b58763"
+        property color m3onTertiaryContainer: "#000000"
+        property color m3error: "#ffb4ab"
+        property color m3onError: "#690005"
+        property color m3errorContainer: "#93000a"
+        property color m3onErrorContainer: "#ffdad6"
+        property color m3success: "#B5CCBA"
+        property color m3onSuccess: "#213528"
+        property color m3successContainer: "#374B3E"
+        property color m3onSuccessContainer: "#D1E9D6"
+        property color m3primaryFixed: "#ffd9e3"
+        property color m3primaryFixedDim: "#ffb0ca"
+        property color m3onPrimaryFixed: "#39071f"
+        property color m3onPrimaryFixedVariant: "#6f334a"
+        property color m3secondaryFixed: "#ffd9e3"
+        property color m3secondaryFixedDim: "#e2bdc7"
+        property color m3onSecondaryFixed: "#2b151d"
+        property color m3onSecondaryFixedVariant: "#5a3f48"
+        property color m3tertiaryFixed: "#ffdcc3"
+        property color m3tertiaryFixedDim: "#f0bc95"
+        property color m3onTertiaryFixed: "#2f1500"
+        property color m3onTertiaryFixedVariant: "#623f21"
+    }
+
+	component M3MaccchiatoPalette: QtObject {
+		property color m3primary_paletteKeyColor: "#6a73ac"
+		property color m3secondary_paletteKeyColor: "#72758e"
+		property color m3tertiary_paletteKeyColor: "#9b6592"
+		property color m3neutral_paletteKeyColor: "#77767b"
+		property color m3neutral_variant_paletteKeyColor: "#767680"
+		property color m3background: "#131317"
+		property color m3onBackground: "#e4e1e7"
+		property color m3surface: "#131317"
+		property color m3surfaceDim: "#131317"
+		property color m3surfaceBright: "#39393d"
+		property color m3surfaceContainerLowest: "#0e0e12"
+		property color m3surfaceContainerLow: "#1b1b1f"
+		property color m3surfaceContainer: "#1f1f23"
+		property color m3surfaceContainerHigh: "#2a2a2e"
+		property color m3surfaceContainerHighest: "#353438"
+		property color m3onSurface: "#e4e1e7"
+		property color m3surfaceVariant: "#46464f"
+		property color m3onSurfaceVariant: "#c6c5d1"
+		property color m3inverseSurface: "#e4e1e7"
+		property color m3inverseOnSurface: "#303034"
+		property color m3outline: "#90909a"
+		property color m3outlineVariant: "#46464f"
+		property color m3shadow: "#000000"
+		property color m3scrim: "#000000"
+		property color m3surfaceTint: "#bac3ff"
+		property color m3primary: "#bac3ff"
+		property color m3onPrimary: "#232c60"
+		property color m3primaryContainer: "#6a73ac"
+		property color m3onPrimaryContainer: "#ffffff"
+		property color m3inversePrimary: "#525b92"
+		property color m3secondary: "#c3c5e0"
+		property color m3onSecondary: "#2c2f44"
+		property color m3secondaryContainer: "#42455c"
+		property color m3onSecondaryContainer: "#b1b3ce"
+		property color m3tertiary: "#f1b3e5"
+		property color m3onTertiary: "#4c1f48"
+		property color m3tertiaryContainer: "#b77ead"
+		property color m3onTertiaryContainer: "#000000"
+		property color m3error: "#ffb4ab"
+		property color m3onError: "#690005"
+		property color m3errorContainer: "#93000a"
+		property color m3onErrorContainer: "#ffdad6"
+		property color m3primaryFixed: "#dee0ff"
+		property color m3primaryFixedDim: "#bac3ff"
+		property color m3onPrimaryFixed: "#0b154b"
+		property color m3onPrimaryFixedVariant: "#3a4378"
+		property color m3secondaryFixed: "#dfe1fd"
+		property color m3secondaryFixedDim: "#c3c5e0"
+		property color m3onSecondaryFixed: "#171a2e"
+		property color m3onSecondaryFixedVariant: "#42455c"
+		property color m3tertiaryFixed: "#ffd7f4"
+		property color m3tertiaryFixedDim: "#f1b3e5"
+		property color m3onTertiaryFixed: "#340831"
+		property color m3onTertiaryFixedVariant: "#66365f"
+		property color m3success: "#B5CCBA"
+		property color m3onSuccess: "#213528"
+		property color m3successContainer: "#374B3E"
+		property color m3onSuccessContainer: "#D1E9D6"
 	}
 }

Config/General.qml

@@ -2,29 +2,28 @@ import Quickshell.Io
 import Quickshell
 
 JsonObject {
-	property Apps apps: Apps {
-	}
-	property Color color: Color {
-	}
-	property Idle idle: Idle {
-	}
 	property string logo: ""
 	property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers"
+	property Color color: Color {}
+	property Apps apps: Apps {}
+    property Idle idle: Idle {}
+
+	component Color: JsonObject {
+		property bool wallust: false
+		property bool schemeGeneration: true
+		property string mode: "dark"
+		property int scheduleDarkStart: 0
+		property int scheduleDarkEnd: 0
+		property bool neovimColors: false
+	}
 
     component Apps: JsonObject {
-		property list<string> audio: ["pavucontrol"]
-		property list<string> explorer: ["dolphin"]
-		property list<string> playback: ["mpv"]
         property list<string> terminal: ["kitty"]
+        property list<string> audio: ["pavucontrol"]
+        property list<string> playback: ["mpv"]
+        property list<string> explorer: ["dolphin"]
     }
-	component Color: JsonObject {
+
-		property string mode: "dark"
-		property bool neovimColors: false
-		property int scheduleDarkEnd: 0
-		property int scheduleDarkStart: 0
-		property bool schemeGeneration: true
-		property bool wallust: false
-	}
 	component Idle: JsonObject {
 		property list<var> timeouts: [
 			{

Config/Launcher.qml

@@ -1,7 +1,28 @@
 import Quickshell.Io
 
 JsonObject {
+	property int maxAppsShown: 10
+	property int maxWallpapers: 7
 	property string actionPrefix: ">"
+    property string specialPrefix: "@"
+    property Sizes sizes: Sizes {}
+	property UseFuzzy useFuzzy: UseFuzzy {}
+
+    component UseFuzzy: JsonObject {
+        property bool apps: false
+        property bool actions: false
+        property bool schemes: false
+        property bool variants: false
+        property bool wallpapers: false
+    }
+
+    component Sizes: JsonObject {
+        property int itemWidth: 600
+        property int itemHeight: 50
+        property int wallpaperWidth: 280
+        property int wallpaperHeight: 200
+    }
+
 	property list<var> actions: [
 		{
 			name: "Calculator",
@@ -60,25 +81,4 @@ JsonObject {
             dangerous: false
         },
 	]
-	property int maxAppsShown: 10
-	property int maxWallpapers: 7
-	property Sizes sizes: Sizes {
-	}
-	property string specialPrefix: "@"
-	property UseFuzzy useFuzzy: UseFuzzy {
-	}
-
-	component Sizes: JsonObject {
-		property int itemHeight: 50
-		property int itemWidth: 600
-		property int wallpaperHeight: 200
-		property int wallpaperWidth: 280
-	}
-	component UseFuzzy: JsonObject {
-		property bool actions: false
-		property bool apps: false
-		property bool schemes: false
-		property bool variants: false
-		property bool wallpapers: false
-	}
 }

Config/LockConf.qml

@@ -1,16 +1,15 @@
 import Quickshell.Io
 
 JsonObject {
-	property int blurAmount: 40
+    property bool recolorLogo: false
     property bool enableFprint: true
     property int maxFprintTries: 3
-	property bool recolorLogo: false
+    property Sizes sizes: Sizes {}
-	property Sizes sizes: Sizes {
+	property int blurAmount: 40
-	}
 
     component Sizes: JsonObject {
-		property int centerWidth: 600
         property real heightMult: 0.7
         property real ratio: 16 / 9
+        property int centerWidth: 600
     }
 }

Config/MaterialEasing.qml

@@ -4,6 +4,8 @@ import Quickshell
 Singleton {
     id: root
 
+    property real scale: Appearance.anim.durations.scale
+
     readonly property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
     readonly property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
     readonly property int emphasizedAccelTime: 200 * scale
@@ -16,7 +18,6 @@ Singleton {
     readonly property int expressiveEffectsTime: 200 * scale
     readonly property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.90, 1, 1]
     readonly property int expressiveFastSpatialTime: 350 * scale
-	property real scale: Appearance.anim.durations.scale
     readonly property list<real> standard: [0.2, 0, 0, 1, 1, 1]
     readonly property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
     readonly property int standardAccelTime: 200 * scale

Config/NotifConfig.qml

@@ -1,20 +1,18 @@
 import Quickshell.Io
 
 JsonObject {
-	property bool actionOnClick: false
-	property int appNotifCooldown: 0
-	property real clearThreshold: 0.3
-	property int defaultExpireTimeout: 5000
-	property int expandThreshold: 20
     property bool expire: true
+    property int defaultExpireTimeout: 5000
+    property real clearThreshold: 0.3
+    property int expandThreshold: 20
+    property bool actionOnClick: false
     property int groupPreviewNum: 3
     property bool openExpanded: false
-	property Sizes sizes: Sizes {
+    property Sizes sizes: Sizes {}
-	}
 
     component Sizes: JsonObject {
-		property int badge: 20
-		property int image: 41
         property int width: 400
+        property int image: 41
+        property int badge: 20
     }
 }

Config/Osd.qml

@@ -1,16 +1,15 @@
 import Quickshell.Io
 
 JsonObject {
-	property bool allMonBrightness: false
-	property bool enableBrightness: true
-	property bool enableMicrophone: true
     property bool enabled: true
     property int hideDelay: 3000
-	property Sizes sizes: Sizes {
+    property bool enableBrightness: true
-	}
+    property bool enableMicrophone: true
+	property bool allMonBrightness: false
+    property Sizes sizes: Sizes {}
 
     component Sizes: JsonObject {
-		property int sliderHeight: 150
         property int sliderWidth: 30
+        property int sliderHeight: 150
     }
 }

Config/Overview.qml

@@ -1,8 +1,8 @@
 import Quickshell.Io
 
 JsonObject {
-	property int columns: 5
-	property bool enable: false
 	property int rows: 2
+	property int columns: 5
 	property real scale: 0.16
+	property bool enable: false
 }

Config/Services.qml

@@ -2,20 +2,18 @@ import Quickshell.Io
 import QtQuick
 
 JsonObject {
+    property string weatherLocation: ""
+    property bool useFahrenheit: false
+    property bool useTwelveHourClock: Qt.locale().timeFormat(Locale.ShortFormat).toLowerCase().includes("a")
+    property string gpuType: ""
     property real audioIncrement: 0.1
     property real brightnessIncrement: 0.1
-	property bool ddcutilService: false
-	property string defaultPlayer: "Spotify"
-	property string gpuType: ""
     property real maxVolume: 1.0
+    property string defaultPlayer: "Spotify"
     property list<var> playerAliases: [
         {
             "from": "com.github.th_ch.youtube_music",
             "to": "YT Music"
         }
     ]
-	property bool useFahrenheit: false
-	property bool useTwelveHourClock: Qt.locale().timeFormat(Locale.ShortFormat).toLowerCase().includes("a")
-	property int visualizerBars: 30
-	property string weatherLocation: ""
 }

Config/SidebarConfig.qml

@@ -2,8 +2,7 @@ import Quickshell.Io
 
 JsonObject {
     property bool enabled: true
-	property Sizes sizes: Sizes {
+    property Sizes sizes: Sizes {}
-	}
 
     component Sizes: JsonObject {
         property int width: 430

Config/Transparency.qml

@@ -1,7 +1,7 @@
 import Quickshell.Io
 
 JsonObject {
-	property real base: 0.85
     property bool enabled: false
+    property real base: 0.85
     property real layers: 0.4
 }

Config/UtilConfig.qml

@@ -3,31 +3,31 @@ import Quickshell.Io
 JsonObject {
     property bool enabled: true
     property int maxToasts: 4
-	property Sizes sizes: Sizes {
+
-	}
+    property Sizes sizes: Sizes {}
-	property Toasts toasts: Toasts {
+    property Toasts toasts: Toasts {}
-	}
+    property Vpn vpn: Vpn {}
-	property Vpn vpn: Vpn {
-	}
 
     component Sizes: JsonObject {
-		property int toastWidth: 430
         property int width: 430
+        property int toastWidth: 430
     }
+
     component Toasts: JsonObject {
-		property bool audioInputChanged: true
-		property bool audioOutputChanged: true
-		property bool capsLockChanged: true
-		property bool chargingChanged: true
         property bool configLoaded: true
-		property bool dndChanged: true
+        property bool chargingChanged: true
         property bool gameModeChanged: true
+        property bool dndChanged: true
+        property bool audioOutputChanged: true
+        property bool audioInputChanged: true
+        property bool capsLockChanged: true
+        property bool numLockChanged: true
         property bool kbLayoutChanged: true
         property bool kbLimit: true
-		property bool nowPlaying: false
-		property bool numLockChanged: true
         property bool vpnChanged: true
+        property bool nowPlaying: false
     }
+
     component Vpn: JsonObject {
         property bool enabled: false
         property list<var> provider: ["netbird"]

Config/WorkspaceWidget.qml

@@ -1,6 +1,6 @@
 import Quickshell.Io
 
 JsonObject {
-	property string inactiveTextColor: "white"
     property string textColor: "black"
+    property string inactiveTextColor: "white"
 }

Daemons/Audio.qml

@@ -1,18 +1,18 @@
 pragma Singleton
 
+import qs.Config
 import ZShell.Services
 import ZShell
 import Quickshell
 import Quickshell.Services.Pipewire
 import QtQuick
-import qs.Config
 
 Singleton {
     id: root
 
-	readonly property alias beatTracker: beatTracker
+    property string previousSinkName: ""
-	readonly property alias cava: cava
+    property string previousSourceName: ""
-	readonly property bool muted: !!sink?.audio?.muted
+
     readonly property var nodes: Pipewire.nodes.values.reduce((acc, node) => {
         if (!node.isStream) {
             if (node.isSink)
@@ -29,23 +29,73 @@ Singleton {
         sinks: [],
         streams: []
     })
-	property string previousSinkName: ""
+
-	property string previousSourceName: ""
-	readonly property PwNode sink: Pipewire.defaultAudioSink
     readonly property list<PwNode> sinks: nodes.sinks
-	readonly property PwNode source: Pipewire.defaultAudioSource
-	readonly property bool sourceMuted: !!source?.audio?.muted
-	readonly property real sourceVolume: source?.audio?.volume ?? 0
     readonly property list<PwNode> sources: nodes.sources
     readonly property list<PwNode> streams: nodes.streams
+
+    readonly property PwNode sink: Pipewire.defaultAudioSink
+    readonly property PwNode source: Pipewire.defaultAudioSource
+
+    readonly property bool muted: !!sink?.audio?.muted
     readonly property real volume: sink?.audio?.volume ?? 0
 
+    readonly property bool sourceMuted: !!source?.audio?.muted
+    readonly property real sourceVolume: source?.audio?.volume ?? 0
+
+    function setVolume(newVolume: real): void {
+        if (sink?.ready && sink?.audio) {
+            sink.audio.muted = false;
+            sink.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
+        }
+    }
+
+    function incrementVolume(amount: real): void {
+        setVolume(volume + (amount || Config.services.audioIncrement));
+    }
+
+    function decrementVolume(amount: real): void {
+        setVolume(volume - (amount || Config.services.audioIncrement));
+    }
+
+    function setSourceVolume(newVolume: real): void {
+        if (source?.ready && source?.audio) {
+            source.audio.muted = false;
+            source.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
+        }
+    }
+
+    function incrementSourceVolume(amount: real): void {
+        setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
+    }
+
     function decrementSourceVolume(amount: real): void {
         setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
     }
 
-	function decrementVolume(amount: real): void {
+    function setAudioSink(newSink: PwNode): void {
-		setVolume(volume - (amount || Config.services.audioIncrement));
+        Pipewire.preferredDefaultAudioSink = newSink;
+    }
+
+    function setAudioSource(newSource: PwNode): void {
+        Pipewire.preferredDefaultAudioSource = newSource;
+    }
+
+    function setStreamVolume(stream: PwNode, newVolume: real): void {
+        if (stream?.ready && stream?.audio) {
+            stream.audio.muted = false;
+            stream.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
+        }
+    }
+
+    function setStreamMuted(stream: PwNode, muted: bool): void {
+        if (stream?.ready && stream?.audio) {
+            stream.audio.muted = muted;
+        }
+    }
+
+    function getStreamVolume(stream: PwNode): real {
+        return stream?.audio?.volume ?? 0;
     }
 
     function getStreamMuted(stream: PwNode): bool {
@@ -59,57 +109,6 @@ Singleton {
         return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
     }
 
-	function getStreamVolume(stream: PwNode): real {
-		return stream?.audio?.volume ?? 0;
-	}
-
-	function incrementSourceVolume(amount: real): void {
-		setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
-	}
-
-	function incrementVolume(amount: real): void {
-		setVolume(volume + (amount || Config.services.audioIncrement));
-	}
-
-	function setAudioSink(newSink: PwNode): void {
-		Pipewire.preferredDefaultAudioSink = newSink;
-	}
-
-	function setAudioSource(newSource: PwNode): void {
-		Pipewire.preferredDefaultAudioSource = newSource;
-	}
-
-	function setSourceVolume(newVolume: real): void {
-		if (source?.ready && source?.audio) {
-			source.audio.muted = false;
-			source.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
-		}
-	}
-
-	function setStreamMuted(stream: PwNode, muted: bool): void {
-		if (stream?.ready && stream?.audio) {
-			stream.audio.muted = muted;
-		}
-	}
-
-	function setStreamVolume(stream: PwNode, newVolume: real): void {
-		if (stream?.ready && stream?.audio) {
-			stream.audio.muted = false;
-			stream.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
-		}
-	}
-
-	function setVolume(newVolume: real): void {
-		if (sink?.ready && sink?.audio) {
-			sink.audio.muted = false;
-			sink.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
-		}
-	}
-
-	Component.onCompleted: {
-		previousSinkName = sink?.description || sink?.name || qsTr("Unknown Device");
-		previousSourceName = source?.description || source?.name || qsTr("Unknown Device");
-	}
     onSinkChanged: {
         if (!sink?.ready)
             return;
@@ -121,6 +120,7 @@ Singleton {
 
         previousSinkName = newSinkName;
     }
+
     onSourceChanged: {
         if (!source?.ready)
             return;
@@ -133,15 +133,9 @@ Singleton {
         previousSourceName = newSourceName;
     }
 
-	CavaProvider {
+    Component.onCompleted: {
-		id: cava
+        previousSinkName = sink?.description || sink?.name || qsTr("Unknown Device");
-
+        previousSourceName = source?.description || source?.name || qsTr("Unknown Device");
-		bars: Config.services.visualizerBars
-	}
-
-	BeatTracker {
-		id: beatTracker
-
     }
 
     PwObjectTracker {

Daemons/Network.qml

@@ -1,326 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Io
-import QtQuick
-
-Singleton {
-	id: root
-
-	readonly property AccessPoint active: networks.find(n => n.active) ?? null
-	readonly property var activeEthernet: ethernetDevices.find(d => d.connected) ?? null
-	property int ethernetDeviceCount: 0
-	property var ethernetDeviceDetails: null
-	property list<var> ethernetDevices: []
-	property bool ethernetProcessRunning: false
-	readonly property list<AccessPoint> networks: []
-	property var pendingConnection: null
-	property list<string> savedConnectionSsids: []
-	property list<string> savedConnections: []
-	readonly property bool scanning: Nmcli.scanning
-	property bool wifiEnabled: true
-	property var wirelessDeviceDetails: null
-
-	signal connectionFailed(string ssid)
-
-	function cidrToSubnetMask(cidr: string): string {
-		// Convert CIDR notation (e.g., "24") to subnet mask (e.g., "255.255.255.0")
-		const cidrNum = parseInt(cidr);
-		if (isNaN(cidrNum) || cidrNum < 0 || cidrNum > 32) {
-			return "";
-		}
-
-		const mask = (0xffffffff << (32 - cidrNum)) >>> 0;
-		const octets = [(mask >>> 24) & 0xff, (mask >>> 16) & 0xff, (mask >>> 8) & 0xff, mask & 0xff];
-
-		return octets.join(".");
-	}
-
-	function connectEthernet(connectionName: string, interfaceName: string): void {
-		Nmcli.connectEthernet(connectionName, interfaceName, result => {
-			if (result.success) {
-				getEthernetDevices();
-				// Refresh device details after connection
-				Qt.callLater(() => {
-					const activeDevice = root.ethernetDevices.find(function (d) {
-						return d.connected;
-					});
-					if (activeDevice && activeDevice.interface) {
-						updateEthernetDeviceDetails(activeDevice.interface);
-					}
-				}, 1000);
-			}
-		});
-	}
-
-	function connectToNetwork(ssid: string, password: string, bssid: string, callback: var): void {
-		// Set up pending connection tracking if callback provided
-		if (callback) {
-			const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
-			root.pendingConnection = {
-				ssid: ssid,
-				bssid: hasBssid ? bssid : "",
-				callback: callback
-			};
-		}
-
-		Nmcli.connectToNetwork(ssid, password, bssid, result => {
-			if (result && result.success) {
-				// Connection successful
-				if (callback)
-					callback(result);
-				root.pendingConnection = null;
-			} else if (result && result.needsPassword) {
-				// Password needed - callback will handle showing dialog
-				if (callback)
-					callback(result);
-			} else {
-				// Connection failed
-				if (result && result.error) {
-					root.connectionFailed(ssid);
-				}
-				if (callback)
-					callback(result);
-				root.pendingConnection = null;
-			}
-		});
-	}
-
-	function connectToNetworkWithPasswordCheck(ssid: string, isSecure: bool, callback: var, bssid: string): void {
-		// Set up pending connection tracking
-		const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
-		root.pendingConnection = {
-			ssid: ssid,
-			bssid: hasBssid ? bssid : "",
-			callback: callback
-		};
-
-		Nmcli.connectToNetworkWithPasswordCheck(ssid, isSecure, result => {
-			if (result && result.success) {
-				// Connection successful
-				if (callback)
-					callback(result);
-				root.pendingConnection = null;
-			} else if (result && result.needsPassword) {
-				// Password needed - callback will handle showing dialog
-				if (callback)
-					callback(result);
-			} else {
-				// Connection failed
-				if (result && result.error) {
-					root.connectionFailed(ssid);
-				}
-				if (callback)
-					callback(result);
-				root.pendingConnection = null;
-			}
-		}, bssid);
-	}
-
-	function disconnectEthernet(connectionName: string): void {
-		Nmcli.disconnectEthernet(connectionName, result => {
-			if (result.success) {
-				getEthernetDevices();
-				// Clear device details after disconnection
-				Qt.callLater(() => {
-					root.ethernetDeviceDetails = null;
-				});
-			}
-		});
-	}
-
-	function disconnectFromNetwork(): void {
-		// Try to disconnect - use connection name if available, otherwise use device
-		Nmcli.disconnectFromNetwork();
-		// Refresh network list after disconnection
-		Qt.callLater(() => {
-			Nmcli.getNetworks(() => {
-				syncNetworksFromNmcli();
-			});
-		}, 500);
-	}
-
-	function enableWifi(enabled: bool): void {
-		Nmcli.enableWifi(enabled, result => {
-			if (result.success) {
-				root.getWifiStatus();
-				Nmcli.getNetworks(() => {
-					syncNetworksFromNmcli();
-				});
-			}
-		});
-	}
-
-	function forgetNetwork(ssid: string): void {
-		// Delete the connection profile for this network
-		// This will remove the saved password and connection settings
-		Nmcli.forgetNetwork(ssid, result => {
-			if (result.success) {
-				// Refresh network list after deletion
-				Qt.callLater(() => {
-					Nmcli.getNetworks(() => {
-						syncNetworksFromNmcli();
-					});
-				}, 500);
-			}
-		});
-	}
-
-	function getEthernetDevices(): void {
-		root.ethernetProcessRunning = true;
-		Nmcli.getEthernetInterfaces(interfaces => {
-			root.ethernetDevices = Nmcli.ethernetDevices;
-			root.ethernetDeviceCount = Nmcli.ethernetDevices.length;
-			root.ethernetProcessRunning = false;
-		});
-	}
-
-	function getWifiStatus(): void {
-		Nmcli.getWifiStatus(enabled => {
-			root.wifiEnabled = enabled;
-		});
-	}
-
-	function hasSavedProfile(ssid: string): bool {
-		// Use Nmcli's hasSavedProfile which has the same logic
-		return Nmcli.hasSavedProfile(ssid);
-	}
-
-	function rescanWifi(): void {
-		Nmcli.rescanWifi();
-	}
-
-	function syncNetworksFromNmcli(): void {
-		const rNetworks = root.networks;
-		const nNetworks = Nmcli.networks;
-
-		// Build a map of existing networks by key
-		const existingMap = new Map();
-		for (const rn of rNetworks) {
-			const key = `${rn.frequency}:${rn.ssid}:${rn.bssid}`;
-			existingMap.set(key, rn);
-		}
-
-		// Build a map of new networks by key
-		const newMap = new Map();
-		for (const nn of nNetworks) {
-			const key = `${nn.frequency}:${nn.ssid}:${nn.bssid}`;
-			newMap.set(key, nn);
-		}
-
-		// Remove networks that no longer exist
-		for (const [key, network] of existingMap) {
-			if (!newMap.has(key)) {
-				const index = rNetworks.indexOf(network);
-				if (index >= 0) {
-					rNetworks.splice(index, 1);
-					network.destroy();
-				}
-			}
-		}
-
-		// Add or update networks from Nmcli
-		for (const [key, nNetwork] of newMap) {
-			const existing = existingMap.get(key);
-			if (existing) {
-				// Update existing network's lastIpcObject
-				existing.lastIpcObject = nNetwork.lastIpcObject;
-			} else {
-				// Create new AccessPoint from Nmcli's data
-				rNetworks.push(apComp.createObject(root, {
-					lastIpcObject: nNetwork.lastIpcObject
-				}));
-			}
-		}
-	}
-
-	function toggleWifi(): void {
-		Nmcli.toggleWifi(result => {
-			if (result.success) {
-				root.getWifiStatus();
-				Nmcli.getNetworks(() => {
-					syncNetworksFromNmcli();
-				});
-			}
-		});
-	}
-
-	function updateEthernetDeviceDetails(interfaceName: string): void {
-		Nmcli.getEthernetDeviceDetails(interfaceName, details => {
-			root.ethernetDeviceDetails = details;
-		});
-	}
-
-	function updateWirelessDeviceDetails(): void {
-		// Find the wireless interface by looking for wifi devices
-		// Pass empty string to let Nmcli find the active interface automatically
-		Nmcli.getWirelessDeviceDetails("", details => {
-			root.wirelessDeviceDetails = details;
-		});
-	}
-
-	Component.onCompleted: {
-		// Trigger ethernet device detection after initialization
-		Qt.callLater(() => {
-			getEthernetDevices();
-		});
-		// Load saved connections on startup
-		Nmcli.loadSavedConnections(() => {
-			root.savedConnections = Nmcli.savedConnections;
-			root.savedConnectionSsids = Nmcli.savedConnectionSsids;
-		});
-		// Get initial WiFi status
-		Nmcli.getWifiStatus(enabled => {
-			root.wifiEnabled = enabled;
-		});
-		// Sync networks from Nmcli on startup
-		Qt.callLater(() => {
-			syncNetworksFromNmcli();
-		}, 100);
-	}
-
-	// Sync saved connections from Nmcli when they're updated
-	Connections {
-		function onSavedConnectionSsidsChanged() {
-			root.savedConnectionSsids = Nmcli.savedConnectionSsids;
-		}
-
-		function onSavedConnectionsChanged() {
-			root.savedConnections = Nmcli.savedConnections;
-		}
-
-		target: Nmcli
-	}
-
-	Component {
-		id: apComp
-
-		AccessPoint {
-		}
-	}
-
-	Process {
-		command: ["nmcli", "m"]
-		running: true
-
-		stdout: SplitParser {
-			onRead: {
-				Nmcli.getNetworks(() => {
-					syncNetworksFromNmcli();
-				});
-				getEthernetDevices();
-			}
-		}
-	}
-
-	component AccessPoint: QtObject {
-		readonly property bool active: lastIpcObject.active
-		readonly property string bssid: lastIpcObject.bssid
-		readonly property int frequency: lastIpcObject.frequency
-		readonly property bool isSecure: security.length > 0
-		required property var lastIpcObject
-		readonly property string security: lastIpcObject.security
-		readonly property string ssid: lastIpcObject.ssid
-		readonly property int strength: lastIpcObject.strength
-	}
-}

Daemons/NotifServer.qml

@@ -16,40 +16,19 @@ import qs.Config
 Singleton {
     id: root
 
-	readonly property var appCooldownMap: new Map()
-	property alias dnd: props.dnd
     property list<Notif> list: []
-	property bool loaded
+    readonly property list<Notif> notClosed: list.filter( n => !n.closed )
-	readonly property list<Notif> notClosed: list.filter(n => !n.closed)
+    readonly property list<Notif> popups: list.filter( n => n.popup )
-	readonly property list<Notif> popups: list.filter(n => n.popup)
+    property alias dnd: props.dnd
     property alias server: server
 
-	function shouldThrottle(appName: string): bool {
+    property bool loaded
-		if (props.dnd)
-			return false;
-
-		const key = (appName || "unknown").trim().toLowerCase();
-		const cooldownSec = Config.notifs.appNotifCooldown;
-		const cooldownMs = Math.max(0, cooldownSec * 1000);
-
-		if (cooldownMs <= 0)
-			return true;
-
-		const now = Date.now();
-		const until = appCooldownMap.get(key) ?? 0;
-
-		if (now < until)
-			return false;
-
-		appCooldownMap.set(key, now + cooldownMs);
-		return true;
-	}
 
     onListChanged: {
-		if (loaded) {
+        if ( loaded ) {
             saveTimer.restart();
         }
-		if (root.list.length > 0) {
+        if ( root.list.length > 0 ) {
             HasNotifications.hasNotifications = true;
         } else {
             HasNotifications.hasNotifications = false;
@@ -58,10 +37,8 @@ Singleton {
 
     Timer {
         id: saveTimer
-
         interval: 1000
-
+        onTriggered: storage.setText( JSON.stringify( root.notClosed.map( n => ({
-		onTriggered: storage.setText(JSON.stringify(root.notClosed.map(n => ({
                     time: n.time,
                     id: n.id,
                     summary: n.summary,
@@ -74,7 +51,7 @@ Singleton {
                     resident: n.resident,
                     hasActionIcons: n.hasActionIcons,
                     actions: n.actions
-				}))))
+                }))));
     }
 
     PersistentProperties {
@@ -88,21 +65,19 @@ Singleton {
     NotificationServer {
         id: server
 
+        keepOnReload: false
         actionsSupported: true
         bodyHyperlinksSupported: true
         bodyImagesSupported: true
         bodyMarkupSupported: true
         imageSupported: true
-		keepOnReload: false
         persistenceSupported: true
 
         onNotification: notif => {
             notif.tracked = true;
 
-			const is_popup = root.shouldThrottle(notif.appName);
-
             const comp = notifComp.createObject(root, {
-				popup: is_popup,
+                popup: !props.dnd,
                 notification: notif
             });
             root.list = [comp, ...root.list];
@@ -111,15 +86,8 @@ Singleton {
 
     FileView {
         id: storage
-
         path: `${Paths.state}/notifs.json`
 
-		onLoadFailed: err => {
-			if (err === FileViewError.FileNotFound) {
-				root.loaded = true;
-				setText("[]");
-			}
-		}
         onLoaded: {
             const data = JSON.parse(text());
             for (const notif of data)
@@ -127,12 +95,18 @@ Singleton {
             root.list.sort((a, b) => b.time - a.time);
             root.loaded = true;
         }
+
+        onLoadFailed: err => {
+            if (err === FileViewError.FileNotFound) {
+                root.loaded = true;
+                setText("[]");
+            }
+        }
     }
 
     CustomShortcut {
-		description: "Clear all notifications"
         name: "clearnotifs"
-
+        description: "Clear all notifications"
         onPressed: {
             for (const notif of root.list.slice())
                 notif.close();
@@ -140,19 +114,13 @@ Singleton {
     }
 
     IpcHandler {
+        target: "notifs"
+
         function clear(): void {
             for (const notif of root.list.slice())
                 notif.close();
         }
 
-		function disableDnd(): void {
-			props.dnd = false;
-		}
-
-		function enableDnd(): void {
-			props.dnd = true;
-		}
-
         function isDndEnabled(): bool {
             return props.dnd;
         }
@@ -161,87 +129,80 @@ Singleton {
             props.dnd = !props.dnd;
         }
 
-		target: "notifs"
+        function enableDnd(): void {
+            props.dnd = true;
         }
 
-	Component {
+        function disableDnd(): void {
-		id: notifComp
+            props.dnd = false;
-
-		Notif {
         }
     }
 
     component Notif: QtObject {
         id: notif
 
-		property list<var> actions
+        property bool popup
+        property bool closed
+        property var locks: new Set()
+
+        property date time: new Date()
+        readonly property string timeStr: {
+            const diff = Time.date.getTime() - time.getTime();
+            const m = Math.floor(diff / 60000);
+
+            if (m < 1)
+                return qsTr("now");
+
+            const h = Math.floor(m / 60);
+            const d = Math.floor(h / 24);
+
+            if (d > 0)
+                return `${d}d`;
+            if (h > 0)
+                return `${h}h`;
+            return `${m}m`;
+        }
+
+        property Notification notification
+        property string id
+        property string summary
+        property string body
         property string appIcon
         property string appName
-		property string body
+        property string image
-		property bool closed
+        property real expireTimeout: 5
-		readonly property Connections conn: Connections {
+        property int urgency: NotificationUrgency.Normal
-			function onActionsChanged(): void {
+        property bool resident
-				notif.actions = notif.notification.actions.map(a => ({
+        property bool hasActionIcons
-							identifier: a.identifier,
+        property list<var> actions
-							text: a.text,
+
-							invoke: () => a.invoke()
+        readonly property Timer timer: Timer {
-						}));
+			property int totalTime: Config.notifs.defaultExpireTimeout
+			property int remainingTime: totalTime
+			property bool paused: false
+
+            running: !paused
+			repeat: true
+            interval: 50
+            onTriggered: {
+				remainingTime -= interval;
+
+				if ( remainingTime <= 0 ) {
+					remainingTime = 0;
+					notif.popup = false;
+					stop();
+				}
+            }
         }
 
-			function onAppIconChanged(): void {
-				notif.appIcon = notif.notification.appIcon;
-			}
-
-			function onAppNameChanged(): void {
-				notif.appName = notif.notification.appName;
-			}
-
-			function onBodyChanged(): void {
-				notif.body = notif.notification.body;
-			}
-
-			function onClosed(): void {
-				notif.close();
-			}
-
-			function onExpireTimeoutChanged(): void {
-				notif.expireTimeout = notif.notification.expireTimeout;
-			}
-
-			function onHasActionIconsChanged(): void {
-				notif.hasActionIcons = notif.notification.hasActionIcons;
-			}
-
-			function onImageChanged(): void {
-				notif.image = notif.notification.image;
-				if (notif.notification?.image)
-					notif.dummyImageLoader.active = true;
-			}
-
-			function onResidentChanged(): void {
-				notif.resident = notif.notification.resident;
-			}
-
-			function onSummaryChanged(): void {
-				notif.summary = notif.notification.summary;
-			}
-
-			function onUrgencyChanged(): void {
-				notif.urgency = notif.notification.urgency;
-			}
-
-			target: notif.notification
-		}
         readonly property LazyLoader dummyImageLoader: LazyLoader {
             active: false
 
             PanelWindow {
-				color: "transparent"
-				implicitHeight: Config.notifs.sizes.image
                 implicitWidth: Config.notifs.sizes.image
-
+                implicitHeight: Config.notifs.sizes.image
-				mask: Region {
+                color: "transparent"
-				}
+                mask: Region {}
 
                 Image {
                     function tryCache(): void {
@@ -269,71 +230,70 @@ Singleton {
                     }
 
                     anchors.fill: parent
-					asynchronous: true
-					cache: false
-					fillMode: Image.PreserveAspectCrop
-					opacity: 0
                     source: Qt.resolvedUrl(notif.image)
+                    fillMode: Image.PreserveAspectCrop
+                    cache: false
+                    asynchronous: true
+                    opacity: 0
 
-					onHeightChanged: tryCache()
                     onStatusChanged: tryCache()
                     onWidthChanged: tryCache()
+                    onHeightChanged: tryCache()
                 }
             }
         }
-		property real expireTimeout: 5
-		property bool hasActionIcons
-		property string id
-		property string image
-		property var locks: new Set()
-		property Notification notification
-		property bool popup
-		property bool resident
-		property string summary
-		property date time: new Date()
-		readonly property string timeStr: {
-			const diff = Time.date.getTime() - time.getTime();
-			const m = Math.floor(diff / 60000);
 
-			if (m < 1)
+        readonly property Connections conn: Connections {
-				return qsTr("now");
+            target: notif.notification
 
-			const h = Math.floor(m / 60);
+            function onClosed(): void {
-			const d = Math.floor(h / 24);
+                notif.close();
-
-			if (d > 0)
-				return `${d}d`;
-			if (h > 0)
-				return `${h}h`;
-			return `${m}m`;
             }
-		readonly property Timer timer: Timer {
-			property bool paused: false
-			property int remainingTime: totalTime
-			property int totalTime: Config.notifs.defaultExpireTimeout
 
-			interval: 50
+            function onSummaryChanged(): void {
-			repeat: true
+                notif.summary = notif.notification.summary;
-			running: !paused
-
-			onTriggered: {
-				remainingTime -= interval;
-
-				if (remainingTime <= 0) {
-					remainingTime = 0;
-					notif.popup = false;
-					stop();
             }
-			}
-		}
-		property int urgency: NotificationUrgency.Normal
 
-		function close(): void {
+            function onBodyChanged(): void {
-			closed = true;
+                notif.body = notif.notification.body;
-			if (locks.size === 0 && root.list.includes(this)) {
+            }
-				root.list = root.list.filter(n => n !== this);
+
-				notification?.dismiss();
+            function onAppIconChanged(): void {
-				destroy();
+                notif.appIcon = notif.notification.appIcon;
+            }
+
+            function onAppNameChanged(): void {
+                notif.appName = notif.notification.appName;
+            }
+
+            function onImageChanged(): void {
+                notif.image = notif.notification.image;
+                if (notif.notification?.image)
+                    notif.dummyImageLoader.active = true;
+            }
+
+            function onExpireTimeoutChanged(): void {
+                notif.expireTimeout = notif.notification.expireTimeout;
+            }
+
+            function onUrgencyChanged(): void {
+                notif.urgency = notif.notification.urgency;
+            }
+
+            function onResidentChanged(): void {
+                notif.resident = notif.notification.resident;
+            }
+
+            function onHasActionIconsChanged(): void {
+                notif.hasActionIcons = notif.notification.hasActionIcons;
+            }
+
+            function onActionsChanged(): void {
+                notif.actions = notif.notification.actions.map(a => ({
+                            identifier: a.identifier,
+                            text: a.text,
+                            invoke: () => a.invoke()
+                        }));
             }
         }
 
@@ -347,6 +307,15 @@ Singleton {
                 close();
         }
 
+        function close(): void {
+            closed = true;
+            if (locks.size === 0 && root.list.includes(this)) {
+                root.list = root.list.filter(n => n !== this);
+                notification?.dismiss();
+                destroy();
+            }
+        }
+
         Component.onCompleted: {
             if (!notification)
                 return;
@@ -370,4 +339,10 @@ Singleton {
                     }));
         }
     }
+
+    Component {
+        id: notifComp
+
+        Notif {}
+    }
 }

Drawers/Backgrounds.qml

@@ -1,8 +1,6 @@
 import Quickshell
 import QtQuick
 import QtQuick.Shapes
-import qs.Components
-import qs.Config
 import qs.Modules as Modules
 import qs.Modules.Notifications as Notifications
 import qs.Modules.Notifications.Sidebar as Sidebar
@@ -10,86 +8,73 @@ import qs.Modules.Notifications.Sidebar.Utils as Utils
 import qs.Modules.Dashboard as Dashboard
 import qs.Modules.Osd as Osd
 import qs.Modules.Launcher as Launcher
-import qs.Modules.Resources as Resources
-
-// import qs.Modules.Settings as Settings
 
 Shape {
     id: root
 
-	required property Item bar
     required property Panels panels
+    required property Item bar
 	required property PersistentProperties visibilities
 
     anchors.fill: parent
     // anchors.margins: 8
-	anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? 0 : bar.implicitHeight
+    anchors.topMargin: bar.implicitHeight
     preferredRendererType: Shape.CurveRenderer
 
-	Behavior on anchors.topMargin {
+	Component.onCompleted: console.log(root.bar.implicitHeight, root.bar.anchors.topMargin)
-		Anim {
-		}
-	}
-
-	Resources.Background {
-		startX: 0 - rounding
-		startY: 0
-		wrapper: root.panels.resources
-	}
 
 	Osd.Background {
-		startX: root.width - root.panels.sidebar.width
-		startY: (root.height - wrapper.height) / 2 - rounding
 		wrapper: root.panels.osd
+
+		startX: root.width - root.panels.sidebar.width
+		startY: ( root.height - wrapper.height ) / 2 - rounding
 	}
 
     Modules.Background {
+        wrapper: root.panels.popouts
         invertBottomRounding: wrapper.x <= 0
+
         startX: wrapper.x - 8
         startY: wrapper.y
-		wrapper: root.panels.popouts
     }
 
 	Notifications.Background {
+		wrapper: root.panels.notifications
 		sidebar: sidebar
+
 		startX: root.width
 		startY: 0
-		wrapper: root.panels.notifications
 	}
 
 	Launcher.Background {
-		startX: (root.width - wrapper.width) / 2 - rounding
-		startY: root.height
 		wrapper: root.panels.launcher
+
+		startX: ( root.width - wrapper.width ) / 2 - rounding
+		startY: root.height
 	}
 
 	Dashboard.Background {
+		wrapper: root.panels.dashboard
+
 		startX: root.width - root.panels.dashboard.width - rounding
 		startY: 0
-		wrapper: root.panels.dashboard
 	}
 
 	Utils.Background {
+		wrapper: root.panels.utilities
 		sidebar: sidebar
+
 		startX: root.width
 		startY: root.height
-		wrapper: root.panels.utilities
 	}
 
 	Sidebar.Background {
 		id: sidebar
 
+		wrapper: root.panels.sidebar
 		panels: root.panels
+
 		startX: root.width
 		startY: root.panels.notifications.height
-		wrapper: root.panels.sidebar
 	}
-
-	// Settings.Background {
-	// 	id: settings
-	//
-	// 	startX: (root.width - wrapper.width) / 2 - rounding
-	// 	startY: 0
-	// 	wrapper: root.panels.settings
-	// }
 }

Drawers/Bar.qml

@@ -1,213 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Effects
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Hyprland
-import qs.Daemons
-import qs.Components
-import qs.Modules
-import qs.Modules.Bar
-import qs.Config
-import qs.Helpers
-import qs.Drawers
-
-Variants {
-	model: Quickshell.screens
-
-	Scope {
-		id: scope
-
-		required property var modelData
-
-		PanelWindow {
-			id: bar
-
-			property var root: Quickshell.shellDir
-			property bool trayMenuVisible: false
-
-			WlrLayershell.exclusionMode: ExclusionMode.Ignore
-			WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
-			WlrLayershell.namespace: "ZShell-Bar"
-			color: "transparent"
-			contentItem.focus: true
-			screen: scope.modelData
-
-			mask: Region {
-				id: region
-
-				height: bar.screen.height - backgroundRect.implicitHeight
-				intersection: Intersection.Xor
-				regions: popoutRegions.instances
-				width: bar.width
-				x: 0
-				y: Config.barConfig.autoHide && !visibilities.bar ? 4 : 34
-			}
-
-			contentItem.Keys.onEscapePressed: {
-				if (Config.barConfig.autoHide)
-					visibilities.bar = false;
-				visibilities.sidebar = false;
-				visibilities.dashboard = false;
-				visibilities.osd = false;
-				visibilities.settings = false;
-				visibilities.resources = false;
-			}
-
-			PanelWindow {
-				id: exclusionZone
-
-				WlrLayershell.exclusionMode: Config.barConfig.autoHide ? ExclusionMode.Ignore : ExclusionMode.Auto
-				WlrLayershell.layer: WlrLayer.Bottom
-				WlrLayershell.namespace: "ZShell-Bar-Exclusion"
-				color: "transparent"
-				implicitHeight: 34
-				screen: bar.screen
-
-				anchors {
-					left: true
-					right: true
-					top: true
-				}
-			}
-
-			anchors {
-				bottom: true
-				left: true
-				right: true
-				top: true
-			}
-
-			Variants {
-				id: popoutRegions
-
-				model: panels.children
-
-				Region {
-					required property Item modelData
-
-					height: modelData.height
-					intersection: Intersection.Subtract
-					width: modelData.width
-					x: modelData.x
-					y: modelData.y + backgroundRect.implicitHeight
-				}
-			}
-
-			HyprlandFocusGrab {
-				id: focusGrab
-
-				active: visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu"))
-				windows: [bar]
-
-				onCleared: {
-					visibilities.launcher = false;
-					visibilities.sidebar = false;
-					visibilities.dashboard = false;
-					visibilities.osd = false;
-					visibilities.settings = false;
-					visibilities.resources = false;
-					panels.popouts.hasCurrent = false;
-				}
-			}
-
-			PersistentProperties {
-				id: visibilities
-
-				property bool bar
-				property bool dashboard
-				property bool launcher
-				property bool notif: NotifServer.popups.length > 0
-				property bool osd
-				property bool resources
-				property bool settings
-				property bool sidebar
-
-				Component.onCompleted: Visibilities.load(scope.modelData, this)
-			}
-
-			Binding {
-				property: "bar"
-				target: visibilities
-				value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || visibilities.notif || visibilities.resources
-				when: Config.barConfig.autoHide
-			}
-
-			Item {
-				anchors.fill: parent
-				layer.enabled: true
-				opacity: Appearance.transparency.enabled ? DynamicColors.transparency.base : 1
-
-				layer.effect: MultiEffect {
-					blurMax: 32
-					shadowColor: Qt.alpha(DynamicColors.palette.m3shadow, 1)
-					shadowEnabled: true
-				}
-
-				Border {
-					bar: backgroundRect
-					visibilities: visibilities
-				}
-
-				Backgrounds {
-					bar: backgroundRect
-					panels: panels
-					visibilities: visibilities
-				}
-			}
-
-			Interactions {
-				id: mouseArea
-
-				anchors.fill: parent
-				bar: barLoader
-				panels: panels
-				popouts: panels.popouts
-				screen: scope.modelData
-				visibilities: visibilities
-
-				Panels {
-					id: panels
-
-					bar: backgroundRect
-					screen: scope.modelData
-					visibilities: visibilities
-				}
-
-				CustomRect {
-					id: backgroundRect
-
-					property Wrapper popouts: panels.popouts
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					anchors.top: parent.top
-					anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? -30 : 0
-					color: "transparent"
-					implicitHeight: 34
-					radius: 0
-
-					Behavior on anchors.topMargin {
-						Anim {
-						}
-					}
-					Behavior on color {
-						CAnim {
-						}
-					}
-
-					BarLoader {
-						id: barLoader
-
-						anchors.fill: parent
-						bar: bar
-						popouts: panels.popouts
-						screen: scope.modelData
-						visibilities: visibilities
-					}
-				}
-			}
-		}
-	}
-}

Drawers/Interactions.qml

@@ -7,18 +7,25 @@ import qs.Modules as BarPopouts
 CustomMouseArea {
     id: root
 
-	required property Item bar
-	property bool dashboardShortcutActive
-	property point dragStart
-	property bool osdShortcutActive
-	required property Panels panels
-	required property BarPopouts.Wrapper popouts
     required property ShellScreen screen
-	property bool utilitiesShortcutActive
+    required property BarPopouts.Wrapper popouts
     required property PersistentProperties visibilities
+    required property Panels panels
+    required property Item bar
 
-	function inBottomPanel(panel: Item, x: real, y: real): bool {
+    property point dragStart
-		return y > root.height - panel.height && withinPanelWidth(panel, x, y);
+    property bool dashboardShortcutActive
+    property bool osdShortcutActive
+    property bool utilitiesShortcutActive
+
+    function withinPanelHeight(panel: Item, x: real, y: real): bool {
+        const panelY = panel.y + bar.implicitHeight;
+        return y >= panelY && y <= panelY + panel.height;
+    }
+
+    function withinPanelWidth(panel: Item, x: real, y: real): bool {
+        const panelX = panel.x;
+        return x >= panelX && x <= panelX + panel.width;
     }
 
     function inLeftPanel(panel: Item, x: real, y: real): bool {
@@ -33,22 +40,16 @@ CustomMouseArea {
         return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
     }
 
+    function inBottomPanel(panel: Item, x: real, y: real): bool {
+        return y > root.height - panel.height && withinPanelWidth(panel, x, y);
+    }
+
     function onWheel(event: WheelEvent): void {
         if (event.x < bar.implicitWidth) {
             bar.handleWheel(event.y, event.angleDelta);
         }
     }
 
-	function withinPanelHeight(panel: Item, x: real, y: real): bool {
-		const panelY = panel.y + bar.implicitHeight;
-		return y >= panelY && y <= panelY + panel.height;
-	}
-
-	function withinPanelWidth(panel: Item, x: real, y: real): bool {
-		const panelX = panel.x;
-		return x >= panelX && x <= panelX + panel.width;
-	}
-
     anchors.fill: parent
     hoverEnabled: true
 
@@ -78,6 +79,7 @@ CustomMouseArea {
                 root.visibilities.bar = false;
         }
     }
+
     onPositionChanged: event => {
         if (popouts.isDetached)
             return;
@@ -198,22 +200,7 @@ CustomMouseArea {
 
     // Monitor individual visibility changes
     Connections {
-		function onDashboardChanged() {
+        target: root.visibilities
-			if (root.visibilities.dashboard) {
-				// Dashboard became visible, immediately check if this should be shortcut mode
-				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
-				if (!inDashboardArea) {
-					root.dashboardShortcutActive = true;
-				}
-
-				root.visibilities.sidebar = false;
-				root.popouts.hasCurrent = false;
-			} else {
-				// Dashboard hidden, clear shortcut flag
-				root.dashboardShortcutActive = false;
-				// root.visibilities.bar = false;
-			}
-		}
 
         function onLauncherChanged() {
             // If launcher is hidden, clear shortcut flags for dashboard and OSD
@@ -236,10 +223,36 @@ CustomMouseArea {
             }
         }
 
+		function onSidebarChanged() {
+			if ( root.visibilities.sidebar ) {
+				root.visibilities.dashboard = false;
+				root.popouts.hasCurrent = false;
+			}
+		}
+
+        function onDashboardChanged() {
+            if (root.visibilities.dashboard) {
+                // Dashboard became visible, immediately check if this should be shortcut mode
+                const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
+                if (!inDashboardArea) {
+                    root.dashboardShortcutActive = true;
+                }
+
+				root.visibilities.sidebar = false;
+				root.popouts.hasCurrent = false;
+
+            } else {
+                // Dashboard hidden, clear shortcut flag
+                root.dashboardShortcutActive = false;
+				// root.visibilities.bar = false;
+            }
+        }
+
         function onOsdChanged() {
             if (root.visibilities.osd) {
                 // OSD became visible, immediately check if this should be shortcut mode
                 const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+				console.log(inOsdArea);
                 if (!inOsdArea) {
                     root.osdShortcutActive = true;
                 }
@@ -249,13 +262,6 @@ CustomMouseArea {
             }
         }
 
-		function onSidebarChanged() {
-			if (root.visibilities.sidebar) {
-				root.visibilities.dashboard = false;
-				root.popouts.hasCurrent = false;
-			}
-		}
-
         function onUtilitiesChanged() {
             if (root.visibilities.utilities) {
                 // Utilities became visible, immediately check if this should be shortcut mode
@@ -268,7 +274,5 @@ CustomMouseArea {
                 root.utilitiesShortcutActive = false;
             }
         }
-
-		target: root.visibilities
     }
 }

Drawers/Panels.qml

@@ -1,6 +1,6 @@
 import Quickshell
 import QtQuick
-import qs.Components
+import QtQuick.Shapes
 import qs.Modules as Modules
 import qs.Modules.Notifications as Notifications
 import qs.Modules.Notifications.Sidebar as Sidebar
@@ -9,66 +9,56 @@ import qs.Modules.Dashboard as Dashboard
 import qs.Modules.Osd as Osd
 import qs.Components.Toast as Toasts
 import qs.Modules.Launcher as Launcher
-import qs.Modules.Resources as Resources
-// import qs.Modules.Settings as Settings
 import qs.Config
 
 Item {
     id: root
 
-	required property Item bar
-	readonly property alias dashboard: dashboard
-	readonly property alias launcher: launcher
-	readonly property alias notifications: notifications
-	readonly property alias osd: osd
-	readonly property alias popouts: popouts
-	readonly property alias resources: resources
     required property ShellScreen screen
-	// readonly property alias settings: settings
+    required property Item bar
-	readonly property alias sidebar: sidebar
-	readonly property alias toasts: toasts
-	readonly property alias utilities: utilities
 	required property PersistentProperties visibilities
 
+    readonly property alias popouts: popouts
+	readonly property alias sidebar: sidebar
+	readonly property alias notifications: notifications
+	readonly property alias utilities: utilities
+	readonly property alias dashboard: dashboard
+	readonly property alias osd: osd
+	readonly property alias toasts: toasts
+	readonly property alias launcher: launcher
+
     anchors.fill: parent
     // anchors.margins: 8
     anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? 0 : bar.implicitHeight
-
 	Behavior on anchors.topMargin {
-		Anim {
+		Modules.Anim {}
-		}
-	}
-
-	Resources.Wrapper {
-		id: resources
-
-		anchors.left: parent.left
-		anchors.top: parent.top
-		visibilities: root.visibilities
 	}
 
 	Osd.Wrapper {
 		id: osd
 
-		anchors.right: parent.right
-		anchors.rightMargin: sidebar.width
-		anchors.verticalCenter: parent.verticalCenter
 		clip: sidebar.width > 0
 		screen: root.screen
 		visibilities: root.visibilities
+
+		anchors.verticalCenter: parent.verticalCenter
+		anchors.right: parent.right
+		anchors.rightMargin: sidebar.width
 	}
 
     Modules.Wrapper {
         id: popouts
 
-		anchors.top: parent.top
         screen: root.screen
+
+        anchors.top: parent.top
+
         x: {
             const off = currentCenter - nonAnimWidth / 2;
             const diff = root.width - Math.floor(off + nonAnimWidth);
-			if (diff < 0)
+            if ( diff < 0 )
                 return off + diff;
-			return Math.floor(Math.max(off, 0));
+            return Math.floor( Math.max( off, 0 ));
         }
     }
 
@@ -76,63 +66,59 @@ Item {
 		id: toasts
 
 		anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
-		anchors.margins: Appearance.padding.normal
 		anchors.right: sidebar.left
+		anchors.margins: Appearance.padding.normal
 	}
 
 	Notifications.Wrapper {
 		id: notifications
 
-		anchors.right: parent.right
-		anchors.top: parent.top
-		panels: root
 		visibilities: root.visibilities
+		panels: root
+
+		anchors.top: parent.top
+		anchors.right: parent.right
 	}
 
 	Launcher.Wrapper {
 		id: launcher
 
-		anchors.bottom: parent.bottom
-		anchors.horizontalCenter: parent.horizontalCenter
-		panels: root
 		screen: root.screen
 		visibilities: root.visibilities
+		panels: root
+
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.bottom: parent.bottom
 	}
 
 	Utils.Wrapper {
 		id: utilities
 
+		visibilities: root.visibilities
+		sidebar: sidebar
+		popouts: popouts
+
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
-		popouts: popouts
-		sidebar: sidebar
-		visibilities: root.visibilities
 	}
 
 	Dashboard.Wrapper {
 		id: dashboard
 
+		visibilities: root.visibilities
+
 		anchors.right: parent.right
 		anchors.top: parent.top
-		visibilities: root.visibilities
 	}
 
 	Sidebar.Wrapper {
 		id: sidebar
 
+		visibilities: root.visibilities
+		panels: root
+
+		anchors.top: notifications.bottom
 		anchors.bottom: utilities.top
 		anchors.right: parent.right
-		anchors.top: notifications.bottom
-		panels: root
-		visibilities: root.visibilities
 	}
-
-	// Settings.Wrapper {
-	// 	id: settings
-	//
-	// 	anchors.horizontalCenter: parent.horizontalCenter
-	// 	anchors.top: parent.top
-	// 	panels: root
-	// 	visibilities: root.visibilities
-	// }
 }

Effects/ShadowRect.qml

@@ -3,31 +3,28 @@ import QtQuick.Effects
 
 Item {
     id: root
-
     property real radius
 
     Rectangle {
         id: shadowRect
-
         anchors.fill: root
-		color: "black"
-		layer.enabled: true
         radius: root.radius
+        layer.enabled: true
+        color: "black"
         visible: false
     }
 
     MultiEffect {
         id: effects
-
+        source: shadowRect
         anchors.fill: shadowRect
-		autoPaddingEnabled: true
-		maskEnabled: true
-		maskInverted: true
-		maskSource: shadowRect
         shadowBlur: 2.0
-		shadowColor: "black"
         shadowEnabled: true
         shadowOpacity: 1
-		source: shadowRect
+        shadowColor: "black"
+        maskSource: shadowRect
+        maskEnabled: true
+        maskInverted: true
+        autoPaddingEnabled: true
     }
 }

Helpers/AreaPicker.qml

@@ -11,35 +11,33 @@ Scope {
     LazyLoader {
         id: root
 
-		property bool closing
         property bool freeze
+        property bool closing
 
         Variants {
             model: Quickshell.screens
-
             PanelWindow {
                 id: win
+                color: "transparent"
 
                 required property ShellScreen modelData
 
-				WlrLayershell.exclusionMode: ExclusionMode.Ignore
-				WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive
-				WlrLayershell.layer: WlrLayer.Overlay
-				WlrLayershell.namespace: "areapicker"
-				color: "transparent"
-				mask: root.closing ? empty : null
                 screen: modelData
+                WlrLayershell.namespace: "areapicker"
+                WlrLayershell.exclusionMode: ExclusionMode.Ignore
+                WlrLayershell.layer: WlrLayer.Overlay
+                WlrLayershell.keyboardFocus: root.closing ? WlrKeyboardFocus.None : WlrKeyboardFocus.Exclusive
+                mask: root.closing ? empty : null
 
                 anchors {
+                    top: true
                     bottom: true
                     left: true
                     right: true
-					top: true
                 }
 
                 Region {
                     id: empty
-
                 }
 
                 Picker {
@@ -51,6 +49,8 @@ Scope {
     }
 
 	IpcHandler {
+		target: "picker"
+
 		function open(): void {
 			root.freeze = false;
 			root.closing = false;
@@ -62,13 +62,10 @@ Scope {
 			root.closing = false;
 			root.activeAsync = true;
 		}
-
-		target: "picker"
 	}
 
     CustomShortcut {
         name: "screenshot"
-
         onPressed: {
             root.freeze = false;
             root.closing = false;
@@ -78,7 +75,6 @@ Scope {
 
     CustomShortcut {
         name: "screenshotFreeze"
-
         onPressed: {
             root.freeze = true;
             root.closing = false;

Helpers/Brightness.qml

@@ -10,15 +10,12 @@ import qs.Components
 Singleton {
     id: root
 
-	property bool appleDisplayPresent: false
     property list<var> ddcMonitors: []
-	property list<var> ddcServiceMon: []
     readonly property list<Monitor> monitors: variants.instances
+    property bool appleDisplayPresent: false
 
-	function decreaseBrightness(): void {
+    function getMonitorForScreen(screen: ShellScreen): var {
-		const monitor = getMonitor("active");
+        return monitors.find(m => m.modelData === screen);
-		if (monitor)
-			monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement);
     }
 
     function getMonitor(query: string): var {
@@ -44,20 +41,20 @@ Singleton {
         return monitors.find(m => m.modelData.name === query);
     }
 
-	function getMonitorForScreen(screen: ShellScreen): var {
-		return monitors.find(m => m.modelData === screen);
-	}
-
     function increaseBrightness(): void {
         const monitor = getMonitor("active");
         if (monitor)
             monitor.setBrightness(monitor.brightness + Config.services.brightnessIncrement);
     }
 
+    function decreaseBrightness(): void {
+        const monitor = getMonitor("active");
+        if (monitor)
+            monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement);
+    }
+
     onMonitorsChanged: {
         ddcMonitors = [];
-		ddcServiceMon = [];
-		ddcServiceProc.running = true;
         ddcProc.running = true;
     }
 
@@ -66,14 +63,12 @@ Singleton {
 
         model: Quickshell.screens
 
-		Monitor {
+        Monitor {}
-		}
     }
 
     Process {
-		command: ["sh", "-c", "asdbctl get"]
         running: true
-
+        command: ["sh", "-c", "asdbctl get"] // To avoid warnings if asdbctl is not installed
         stdout: StdioCollector {
             onStreamFinished: root.appleDisplayPresent = text.trim().length > 0
         }
@@ -83,7 +78,6 @@ Singleton {
         id: ddcProc
 
         command: ["ddcutil", "detect", "--brief"]
-
         stdout: StdioCollector {
             onStreamFinished: root.ddcMonitors = text.trim().split("\n\n").filter(d => d.startsWith("Display ")).map(d => ({
                         busNum: d.match(/I2C bus:[ ]*\/dev\/i2c-([0-9]+)/)[1],
@@ -92,41 +86,21 @@ Singleton {
         }
     }
 
-	Process {
-		id: ddcServiceProc
-
-		command: ["ddcutil-client", "detect"]
-
-		// running: true
-
-		stdout: StdioCollector {
-			onStreamFinished: {
-				const t = text.replace(/\r\n/g, "\n").trim();
-
-				const output = ("\n" + t).split(/\n(?=display:\s*\d+\s*\n)/).filter(b => b.startsWith("display:")).map(b => ({
-							display: Number(b.match(/^display:\s*(\d+)/m)?.[1] ?? -1),
-							name: (b.match(/^\s*product_name:\s*(.*)$/m)?.[1] ?? "").trim()
-						})).filter(d => d.display > 0);
-				root.ddcServiceMon = output;
-			}
-		}
-	}
-
     CustomShortcut {
-		description: "Increase brightness"
         name: "brightnessUp"
-
+        description: "Increase brightness"
         onPressed: root.increaseBrightness()
     }
 
     CustomShortcut {
-		description: "Decrease brightness"
         name: "brightnessDown"
-
+        description: "Decrease brightness"
         onPressed: root.decreaseBrightness()
     }
 
     IpcHandler {
+        target: "brightness"
+
         function get(): real {
             return getFor("active");
         }
@@ -175,24 +149,22 @@ Singleton {
 
             return `Set monitor ${monitor.modelData.name} brightness to ${+monitor.brightness.toFixed(2)}`;
         }
-
-		target: "brightness"
     }
 
     component Monitor: QtObject {
         id: monitor
 
-		property real brightness
+        required property ShellScreen modelData
+        readonly property bool isDdc: root.ddcMonitors.some(m => m.connector === modelData.name)
         readonly property string busNum: root.ddcMonitors.find(m => m.connector === modelData.name)?.busNum ?? ""
-		readonly property string displayNum: root.ddcServiceMon.find(m => m.name === modelData.model)?.display ?? ""
+        readonly property bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
+        property real brightness
+        property real queuedBrightness: NaN
+
         readonly property Process initProc: Process {
             stdout: StdioCollector {
                 onStreamFinished: {
-					if (monitor.isDdcService) {
+                    if (monitor.isAppleDisplay) {
-						const output = text.split("\n").filter(o => o.startsWith("vcp_current_value:"))[0].split(":")[1];
-						const val = parseInt(output.trim());
-						monitor.brightness = val / 100;
-					} else if (monitor.isAppleDisplay) {
                         const val = parseInt(text.trim());
                         monitor.brightness = val / 101;
                     } else {
@@ -202,14 +174,9 @@ Singleton {
                 }
             }
         }
-		readonly property bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
+
-		readonly property bool isDdc: root.ddcMonitors.some(m => m.connector === modelData.name)
-		readonly property bool isDdcService: Config.services.ddcutilService
-		required property ShellScreen modelData
-		property real queuedBrightness: NaN
         readonly property Timer timer: Timer {
             interval: 500
-
             onTriggered: {
                 if (!isNaN(monitor.queuedBrightness)) {
                     monitor.setBrightness(monitor.queuedBrightness);
@@ -218,10 +185,32 @@ Singleton {
             }
         }
 
+        function setBrightness(value: real): void {
+            value = Math.max(0, Math.min(1, value));
+            const rounded = Math.round(value * 100);
+            if (Math.round(brightness * 100) === rounded)
+                return;
+
+            if (isDdc && timer.running) {
+                queuedBrightness = value;
+                return;
+            }
+
+            brightness = value;
+
+            if (isAppleDisplay)
+                Quickshell.execDetached(["asdbctl", "set", rounded]);
+            else if (isDdc)
+                Quickshell.execDetached(["ddcutil", "--disable-dynamic-sleep", "--sleep-multiplier", ".1", "--skip-ddc-checks", "-b", busNum, "setvcp", "10", rounded]);
+            else
+                Quickshell.execDetached(["brightnessctl", "s", `${rounded}%`]);
+
+            if (isDdc)
+                timer.restart();
+        }
+
         function initBrightness(): void {
-			if (isDdcService)
+            if (isAppleDisplay)
-				initProc.command = ["ddcutil-client", "-d", displayNum, "getvcp", "10"];
-			else if (isAppleDisplay)
                 initProc.command = ["asdbctl", "get"];
             else if (isDdc)
                 initProc.command = ["ddcutil", "-b", busNum, "getvcp", "10", "--brief"];
@@ -231,34 +220,7 @@ Singleton {
             initProc.running = true;
         }
 
-		function setBrightness(value: real): void {
-			value = Math.max(0, Math.min(1, value));
-			const rounded = Math.round(value * 100);
-			if (Math.round(brightness * 100) === rounded)
-				return;
-
-			if ((isDdc || isDdcService) && timer.running) {
-				queuedBrightness = value;
-				return;
-			}
-
-			brightness = value;
-
-			if (isDdcService)
-				Quickshell.execDetached(["ddcutil-client", "-d", displayNum, "setvcp", "10", rounded]);
-			else if (isAppleDisplay)
-				Quickshell.execDetached(["asdbctl", "set", rounded]);
-			else if (isDdc)
-				Quickshell.execDetached(["ddcutil", "--disable-dynamic-sleep", "--sleep-multiplier", ".1", "--skip-ddc-checks", "-b", busNum, "setvcp", "10", rounded]);
-			else
-				Quickshell.execDetached(["brightnessctl", "s", `${rounded}%`]);
-
-			if (isDdc || isDdcService)
-				timer.restart();
-		}
-
-		Component.onCompleted: initBrightness()
         onBusNumChanged: initBrightness()
-		onDisplayNumChanged: initBrightness()
+        Component.onCompleted: initBrightness()
     }
 }

Helpers/CachingImage.qml

@@ -12,17 +12,17 @@ Image {
     fillMode: Image.PreserveAspectCrop
 
     Connections {
+        target: QsWindow.window
+
         function onDevicePixelRatioChanged(): void {
             manager.updateSource();
         }
-
-		target: QsWindow.window
     }
 
     CachingImageManager {
         id: manager
 
-		cacheDir: Qt.resolvedUrl(Paths.imagecache)
         item: root
+        cacheDir: Qt.resolvedUrl(Paths.imagecache)
     }
 }

Helpers/Calendar.qml

@@ -10,53 +10,6 @@ Singleton {
 	property int displayYear: new Date().getFullYear()
 	readonly property int weekStartDay: 1 // 0 = Sunday, 1 = Monday
 
-	function getISOWeekNumber(date: var): int {
-		const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
-		const dayNum = d.getUTCDay() || 7;
-		d.setUTCDate(d.getUTCDate() + 4 - dayNum);
-		const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1));
-		return Math.ceil((((d - yearStart) / 86400000) + 1) / 7);
-	}
-
-	function getWeekNumbers(month: int, year: int): var {
-		const days = getWeeksForMonth(month, year);
-		const weekNumbers = [];
-		let lastWeekNumber = -1;
-
-		for (let i = 0; i < days.length; i++) {
-			// Only add week numbers for days that belong to the current month
-			if (days[i].isCurrentMonth) {
-				const dayDate = new Date(days[i].year, days[i].month, days[i].day);
-				const weekNumber = getISOWeekNumber(dayDate);
-
-				// Only push if this is a new week
-				if (weekNumber !== lastWeekNumber) {
-					weekNumbers.push(weekNumber);
-					lastWeekNumber = weekNumber;
-				}
-			}
-		}
-
-		return weekNumbers;
-	}
-
-	function getWeekStartIndex(month: int, year: int): int {
-		const today = new Date();
-		if (today.getMonth() !== month || today.getFullYear() !== year) {
-			return 0;
-		}
-
-		const days = getWeeksForMonth(month, year);
-		for (let i = 0; i < days.length; i++) {
-			if (days[i].isToday) {
-				// Return the start index of the week containing today
-				return Math.floor(i / 7) * 7;
-			}
-		}
-
-		return 0;
-	}
-
 	function getWeeksForMonth(month: int, year: int): var {
 		const firstDayOfMonth = new Date(year, month, 1);
 		const lastDayOfMonth = new Date(year, month + 1, 0);
@@ -90,8 +43,57 @@ Singleton {
 		return days;
 	}
 
+	function getWeekNumbers(month: int, year: int): var {
+		const days = getWeeksForMonth(month, year);
+		const weekNumbers = [];
+		let lastWeekNumber = -1;
+
+		for (let i = 0; i < days.length; i++) {
+			// Only add week numbers for days that belong to the current month
+			if (days[i].isCurrentMonth) {
+				const dayDate = new Date(days[i].year, days[i].month, days[i].day);
+				const weekNumber = getISOWeekNumber(dayDate);
+
+				// Only push if this is a new week
+				if (weekNumber !== lastWeekNumber) {
+					weekNumbers.push(weekNumber);
+					lastWeekNumber = weekNumber;
+				}
+			}
+		}
+
+		return weekNumbers;
+	}
+
+	function getISOWeekNumber(date: var): int {
+		const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
+		const dayNum = d.getUTCDay() || 7;
+		d.setUTCDate(d.getUTCDate() + 4 - dayNum);
+		const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1));
+		return Math.ceil((((d - yearStart) / 86400000) + 1) / 7);
+	}
+
 	function isDateToday(date: var): bool {
 		const today = new Date();
-		return date.getDate() === today.getDate() && date.getMonth() === today.getMonth() && date.getFullYear() === today.getFullYear();
+		return date.getDate() === today.getDate() &&
+			   date.getMonth() === today.getMonth() &&
+			   date.getFullYear() === today.getFullYear();
+	}
+
+	function getWeekStartIndex(month: int, year: int): int {
+		const today = new Date();
+		if (today.getMonth() !== month || today.getFullYear() !== year) {
+			return 0;
+		}
+
+		const days = getWeeksForMonth(month, year);
+		for (let i = 0; i < days.length; i++) {
+			if (days[i].isToday) {
+				// Return the start index of the week containing today
+				return Math.floor(i / 7) * 7;
+			}
+		}
+
+		return 0;
 	}
 }

Helpers/GetIcons.qml

@@ -1,17 +0,0 @@
-pragma Singleton
-
-import Quickshell
-
-Singleton {
-	id: root
-
-	function getTrayIcon(id: string, icon: string): string {
-		if (icon.includes("?path=")) {
-			const [name, path] = icon.split("?path=");
-			icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
-		} else if (icon.includes("qspixmap") && id === "chrome_status_icon_1") {
-			icon = icon.replace("qspixmap", "icon/discord-tray");
-		}
-		return icon;
-	}
-}

Helpers/HasNotifications.qml

@@ -10,7 +10,6 @@ Singleton {
 
     JsonObject {
         id: adapter
-
         property bool hasNotifications: false
     }
 }

Helpers/Hypr.qml

@@ -11,36 +11,41 @@ import qs.Components
 Singleton {
     id: root
 
-	property string activeName
-	readonly property HyprlandToplevel activeToplevel: Hyprland.activeToplevel
-	readonly property int activeWsId: focusedWorkspace?.id ?? 1
-	property string applicationDir: "/usr/share/applications/"
-	readonly property bool capsLock: keyboard?.capsLock ?? false
-	readonly property string defaultKbLayout: keyboard?.layout.split(",")[0] ?? "??"
-	property string desktopName: ""
-	readonly property alias devices: extras.devices
-	readonly property alias extras: extras
-	readonly property HyprlandMonitor focusedMonitor: Hyprland.focusedMonitor
-	readonly property HyprlandWorkspace focusedWorkspace: Hyprland.focusedWorkspace
-	property bool hadKeyboard
-	readonly property string kbLayout: kbMap.get(kbLayoutFull) ?? "??"
-	readonly property string kbLayoutFull: keyboard?.activeKeymap ?? "Unknown"
-	readonly property var kbMap: new Map()
-	readonly property HyprKeyboard keyboard: extras.devices.keyboards.find(kb => kb.main) ?? null
-	readonly property var monitors: Hyprland.monitors
-	readonly property bool numLock: keyboard?.numLock ?? false
-	readonly property alias options: extras.options
     readonly property var toplevels: Hyprland.toplevels
     readonly property var workspaces: Hyprland.workspaces
+    readonly property var monitors: Hyprland.monitors
+
+    readonly property HyprlandToplevel activeToplevel: Hyprland.activeToplevel
+    readonly property HyprlandWorkspace focusedWorkspace: Hyprland.focusedWorkspace
+    readonly property HyprlandMonitor focusedMonitor: Hyprland.focusedMonitor
+    readonly property int activeWsId: focusedWorkspace?.id ?? 1
+
+    property string activeName
+    property string applicationDir: "/usr/share/applications/"
+    property string desktopName: ""
+
+    readonly property HyprKeyboard keyboard: extras.devices.keyboards.find(kb => kb.main) ?? null
+    readonly property bool capsLock: keyboard?.capsLock ?? false
+    readonly property bool numLock: keyboard?.numLock ?? false
+    readonly property string defaultKbLayout: keyboard?.layout.split(",")[0] ?? "??"
+    readonly property string kbLayoutFull: keyboard?.activeKeymap ?? "Unknown"
+    readonly property string kbLayout: kbMap.get(kbLayoutFull) ?? "??"
+    readonly property var kbMap: new Map()
+
+    readonly property alias extras: extras
+    readonly property alias options: extras.options
+    readonly property alias devices: extras.devices
+
+    property bool hadKeyboard
 
     signal configReloaded
 
-	function dispatch(request: string): void {
+	function getActiveScreen(): ShellScreen {
-		Hyprland.dispatch(request);
+		return Quickshell.screens.find(screen => root.monitorFor(screen) === root.focusedMonitor)
 	}
 
-	function getActiveScreen(): ShellScreen {
+    function dispatch(request: string): void {
-		return Quickshell.screens.find(screen => root.monitorFor(screen) === root.focusedMonitor);
+        Hyprland.dispatch(request);
     }
 
     function monitorFor(screen: ShellScreen): HyprlandMonitor {
@@ -58,6 +63,8 @@ Singleton {
     // }
 
     Connections {
+        target: Hyprland
+
         function onRawEvent(event: HyprlandEvent): void {
             const n = event.name;
             if (n.endsWith("v2"))
@@ -85,8 +92,6 @@ Singleton {
                 // Qt.callLater( root.updateActiveWindow );
             }
         }
-
-		target: Hyprland
     }
 
     FileView {
@@ -95,11 +100,11 @@ Singleton {
         path: root.desktopName
 
         onLoaded: {
-			const lines = text().split("\n");
+            const lines = text().split( "\n" );
-			for (const line of lines) {
+            for ( const line of lines ) {
-				if (line.startsWith("Name=")) {
+                if ( line.startsWith( "Name=" )) {
-					let name = line.replace("Name=", "");
+                    let name = line.replace( "Name=", "" );
-					let caseFix = name[0].toUpperCase() + name.slice(1);
+                    let caseFix = name[ 0 ].toUpperCase() + name.slice( 1 );
                     root.activeName = caseFix;
                     break;
                 }
@@ -111,7 +116,6 @@ Singleton {
         id: kbLayoutFile
 
         path: Quickshell.env("ZSHELL_XKB_RULES_PATH") || "/usr/share/X11/xkb/rules/base.lst"
-
         onLoaded: {
             const layoutMatch = text().match(/! layout\n([\s\S]*?)\n\n/);
             if (layoutMatch) {
@@ -142,22 +146,20 @@ Singleton {
     }
 
     IpcHandler {
+        target: "hypr"
+
         function refreshDevices(): void {
             extras.refreshDevices();
         }
-
-		target: "hypr"
     }
 
     CustomShortcut {
         name: "refreshDevices"
-
         onPressed: extras.refreshDevices()
         onReleased: extras.refreshDevices()
     }
 
     HyprExtras {
         id: extras
-
     }
 }

Helpers/Icons.qml

@@ -8,6 +8,37 @@ import QtQuick
 Singleton {
     id: root
 
+    readonly property var weatherIcons: ({
+            "0": "clear_day",
+            "1": "clear_day",
+            "2": "partly_cloudy_day",
+            "3": "cloud",
+            "45": "foggy",
+            "48": "foggy",
+            "51": "rainy",
+            "53": "rainy",
+            "55": "rainy",
+            "56": "rainy",
+            "57": "rainy",
+            "61": "rainy",
+            "63": "rainy",
+            "65": "rainy",
+            "66": "rainy",
+            "67": "rainy",
+            "71": "cloudy_snowing",
+            "73": "cloudy_snowing",
+            "75": "snowing_heavy",
+            "77": "cloudy_snowing",
+            "80": "rainy",
+            "81": "rainy",
+            "82": "rainy",
+            "85": "cloudy_snowing",
+            "86": "snowing_heavy",
+            "95": "thunderstorm",
+            "96": "thunderstorm",
+            "99": "thunderstorm"
+        })
+
     readonly property var categoryIcons: ({
             WebBrowser: "web",
             Printing: "print",
@@ -47,36 +78,13 @@ Singleton {
             System: "host",
             Office: "content_paste"
         })
-	readonly property var weatherIcons: ({
+
-			"0": "clear_day",
+    function getAppIcon(name: string, fallback: string): string {
-			"1": "clear_day",
+        const icon = DesktopEntries.heuristicLookup(name)?.icon;
-			"2": "partly_cloudy_day",
+        if (fallback !== "undefined")
-			"3": "cloud",
+            return Quickshell.iconPath(icon, fallback);
-			"45": "foggy",
+        return Quickshell.iconPath(icon);
-			"48": "foggy",
+    }
-			"51": "rainy",
-			"53": "rainy",
-			"55": "rainy",
-			"56": "rainy",
-			"57": "rainy",
-			"61": "rainy",
-			"63": "rainy",
-			"65": "rainy",
-			"66": "rainy",
-			"67": "rainy",
-			"71": "cloudy_snowing",
-			"73": "cloudy_snowing",
-			"75": "snowing_heavy",
-			"77": "cloudy_snowing",
-			"80": "rainy",
-			"81": "rainy",
-			"82": "rainy",
-			"85": "cloudy_snowing",
-			"86": "snowing_heavy",
-			"95": "thunderstorm",
-			"96": "thunderstorm",
-			"99": "thunderstorm"
-		})
 
     function getAppCategoryIcon(name: string, fallback: string): string {
         const categories = DesktopEntries.heuristicLookup(name)?.categories;
@@ -88,33 +96,6 @@ Singleton {
         return fallback;
     }
 
-	function getAppIcon(name: string, fallback: string): string {
-		const icon = DesktopEntries.heuristicLookup(name)?.icon;
-		if (fallback !== "undefined")
-			return Quickshell.iconPath(icon, fallback);
-		return Quickshell.iconPath(icon);
-	}
-
-	function getBluetoothIcon(icon: string): string {
-		if (icon.includes("headset") || icon.includes("headphones"))
-			return "headphones";
-		if (icon.includes("audio"))
-			return "speaker";
-		if (icon.includes("phone"))
-			return "smartphone";
-		if (icon.includes("mouse"))
-			return "mouse";
-		if (icon.includes("keyboard"))
-			return "keyboard";
-		return "bluetooth";
-	}
-
-	function getMicVolumeIcon(volume: real, isMuted: bool): string {
-		if (!isMuted && volume > 0)
-			return "mic";
-		return "mic_off";
-	}
-
     function getNetworkIcon(strength: int, isSecure = false): string {
         if (isSecure) {
             if (strength >= 80)
@@ -139,6 +120,26 @@ Singleton {
         }
     }
 
+    function getBluetoothIcon(icon: string): string {
+        if (icon.includes("headset") || icon.includes("headphones"))
+            return "headphones";
+        if (icon.includes("audio"))
+            return "speaker";
+        if (icon.includes("phone"))
+            return "smartphone";
+        if (icon.includes("mouse"))
+            return "mouse";
+        if (icon.includes("keyboard"))
+            return "keyboard";
+        return "bluetooth";
+    }
+
+    function getWeatherIcon(code: string): string {
+        if (weatherIcons.hasOwnProperty(code))
+            return weatherIcons[code];
+        return "air";
+    }
+
     function getNotifIcon(summary: string, urgency: int): string {
         summary = summary.toLowerCase();
         if (summary.includes("reboot"))
@@ -178,9 +179,9 @@ Singleton {
         return "volume_mute";
     }
 
-	function getWeatherIcon(code: string): string {
+    function getMicVolumeIcon(volume: real, isMuted: bool): string {
-		if (weatherIcons.hasOwnProperty(code))
+        if (!isMuted && volume > 0)
-			return weatherIcons[code];
+            return "mic";
-		return "air";
+        return "mic_off";
     }
 }

Helpers/IdleInhibitor.qml

@@ -26,26 +26,16 @@ Singleton {
 
     IdleInhibitor {
         enabled: props.enabled
-
         window: PanelWindow {
-			WlrLayershell.namespace: "ZShell-IdleInhibitor"
-			color: "transparent"
-			implicitHeight: 0
             implicitWidth: 0
-
+            implicitHeight: 0
-			mask: Region {
+            color: "transparent"
-			}
+            mask: Region {}
         }
     }
 
     IpcHandler {
-		function disable(): void {
+        target: "idleInhibitor"
-			props.enabled = false;
-		}
-
-		function enable(): void {
-			props.enabled = true;
-		}
 
         function isEnabled(): bool {
             return props.enabled;
@@ -55,6 +45,12 @@ Singleton {
             props.enabled = !props.enabled;
         }
 
-		target: "idleInhibitor"
+        function enable(): void {
+            props.enabled = true;
+        }
+
+        function disable(): void {
+            props.enabled = false;
+        }
     }
 }

Helpers/InitialTitle.qml

@@ -6,11 +6,13 @@ import qs.Helpers
 
 Singleton {
     function getInitialTitle(callback) {
-		let activeWindow = Hypr.activeToplevel.title;
+        let activeWindow = Hypr.activeToplevel.title
-		let activeClass = Hypr.activeToplevel.lastIpcObject.class.toString();
+        let activeClass = Hypr.activeToplevel.lastIpcObject.class.toString()
-		let regex = new RegExp(activeClass, "i");
+        let regex = new RegExp(activeClass, "i")
 
-		const evalTitle = activeWindow.match(regex);
+        console.log("ActiveWindow", activeWindow, "ActiveClass", activeClass, "Regex", regex)
-		callback(evalTitle);
+
+        const evalTitle = activeWindow.match(regex)
+        callback(evalTitle)
     }
 }

Helpers/ModeScheduler.qml

@@ -10,11 +10,32 @@ import qs.Paths
 Singleton {
 	id: root
 
-	readonly property int darkEnd: Config.general.color.scheduleDarkEnd
 	readonly property int darkStart: Config.general.color.scheduleDarkStart
+	readonly property int darkEnd: Config.general.color.scheduleDarkEnd
+
+	Timer {
+		id: darkModeTimer
+
+		interval: 5000
+
+		running: true
+		repeat: true
+		onTriggered: {
+			if ( darkStart === darkEnd )
+				return;
+			var now = new Date();
+			if ( now.getHours() >= darkStart || now.getHours() < darkEnd ) {
+				if ( DynamicColors.light )
+					applyDarkMode();
+			} else {
+				if ( !DynamicColors.light )
+					applyLightMode();
+			}
+		}
+	}
 
 	function applyDarkMode() {
-		if (Config.general.color.schemeGeneration) {
+		if ( Config.general.color.schemeGeneration ) {
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${WallpaperPath.currentWallpaperPath}`, "--thumbnail-path", `${Paths.cache}/imagecache/thumbnail.jpg`, "--output", `${Paths.state}/scheme.json`, "--scheme", `${Config.colors.schemeType}`, "--mode", "dark"]);
 		} else {
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${DynamicColors.scheme}:${DynamicColors.flavour}`, "--output", `${Paths.state}/scheme.json`, "--mode", "dark"]);
@@ -22,18 +43,18 @@ Singleton {
 
 		Config.general.color.mode = "dark";
 
-		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-dark'"]);
+		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-dark'"])
 
-		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Light.colors/color_scheme_path=\\1Dark.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`]);
+		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Light.colors/color_scheme_path=\\1Dark.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`])
 
-		Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"tokyodark\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"]);
+		Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"tokyodark\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"])
 
-		if (Config.general.color.wallust)
+		if( Config.general.color.wallust )
 			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
 	}
 
 	function applyLightMode() {
-		if (Config.general.color.neovimColors) {
+		if ( Config.general.color.neovimColors ) {
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${WallpaperPath.currentWallpaperPath}`, "--thumbnail-path", `${Paths.cache}/imagecache/thumbnail.jpg`, "--output", `${Paths.state}/scheme.json`, "--scheme", `${Config.colors.schemeType}`, "--mode", "light"]);
 		} else {
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--preset", `${DynamicColors.scheme}:${DynamicColors.flavour}`, "--output", `${Paths.state}/scheme.json`, "--mode", "light"]);
@@ -41,46 +62,25 @@ Singleton {
 
 		Config.general.color.mode = "light";
 
-		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-light'"]);
+		Quickshell.execDetached(["gsettings", "set", "org.gnome.desktop.interface", "color-scheme", "'prefer-light'"])
 
-		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Dark.colors/color_scheme_path=\\1Light.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`]);
+		Quickshell.execDetached(["sh", "-c", `sed -i 's/color_scheme_path=\\(.*\\)Dark.colors/color_scheme_path=\\1Light.colors/' ${Paths.home}/.config/qt6ct/qt6ct.conf`])
 
-		if (Config.general.color.neovimColors)
+		if ( Config.general.color.neovimColors )
-			Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"onelight\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"]);
+			Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"onelight\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"])
 
-		if (Config.general.color.wallust)
+		if( Config.general.color.wallust )
 			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
 	}
 
 	function checkStartup() {
-		if (darkStart === darkEnd)
+		if ( darkStart === darkEnd )
 			return;
 		var now = new Date();
-		if (now.getHours() >= darkStart || now.getHours() < darkEnd) {
+		if ( now.getHours() >= darkStart || now.getHours() < darkEnd ) {
 			applyDarkMode();
 		} else {
 			applyLightMode();
 		}
 	}
-
-	Timer {
-		id: darkModeTimer
-
-		interval: 5000
-		repeat: true
-		running: true
-
-		onTriggered: {
-			if (darkStart === darkEnd)
-				return;
-			var now = new Date();
-			if (now.getHours() >= darkStart || now.getHours() < darkEnd) {
-				if (DynamicColors.light)
-					applyDarkMode();
-			} else {
-				if (!DynamicColors.light)
-					applyLightMode();
-			}
-		}
-	}
 }

Helpers/Network.qml

@@ -6,6 +6,6 @@ import Quickshell.Networking
 Singleton {
 	id: root
 
-	property NetworkDevice activeDevice: devices.find(d => d.connected)
 	property list<NetworkDevice> devices: Networking.devices.values
+	property NetworkDevice activeDevice: devices.find(d => d.connected)
 }

Helpers/NetworkUsage.qml

@@ -1,234 +0,0 @@
-pragma Singleton
-
-import qs.Config
-
-import Quickshell
-import Quickshell.Io
-
-import QtQuick
-
-Singleton {
-	id: root
-
-	property var _downloadHistory: []
-
-	// Private properties
-	property real _downloadSpeed: 0
-	property real _downloadTotal: 0
-
-	// Initial readings for calculating totals
-	property real _initialRxBytes: 0
-	property real _initialTxBytes: 0
-	property bool _initialized: false
-
-	// Previous readings for calculating speed
-	property real _prevRxBytes: 0
-	property real _prevTimestamp: 0
-	property real _prevTxBytes: 0
-	property var _uploadHistory: []
-	property real _uploadSpeed: 0
-	property real _uploadTotal: 0
-
-	// History of speeds for sparkline (most recent at end)
-	readonly property var downloadHistory: _downloadHistory
-
-	// Current speeds in bytes per second
-	readonly property real downloadSpeed: _downloadSpeed
-
-	// Total bytes transferred since tracking started
-	readonly property real downloadTotal: _downloadTotal
-	readonly property int historyLength: 30
-	property int refCount: 0
-	readonly property var uploadHistory: _uploadHistory
-	readonly property real uploadSpeed: _uploadSpeed
-	readonly property real uploadTotal: _uploadTotal
-
-	function formatBytes(bytes: real): var {
-		// Handle negative or invalid values
-		if (bytes < 0 || isNaN(bytes) || !isFinite(bytes)) {
-			return {
-				value: 0,
-				unit: "B/s"
-			};
-		}
-
-		if (bytes < 1024) {
-			return {
-				value: bytes,
-				unit: "B/s"
-			};
-		} else if (bytes < 1024 * 1024) {
-			return {
-				value: bytes / 1024,
-				unit: "KB/s"
-			};
-		} else if (bytes < 1024 * 1024 * 1024) {
-			return {
-				value: bytes / (1024 * 1024),
-				unit: "MB/s"
-			};
-		} else {
-			return {
-				value: bytes / (1024 * 1024 * 1024),
-				unit: "GB/s"
-			};
-		}
-	}
-
-	function formatBytesTotal(bytes: real): var {
-		// Handle negative or invalid values
-		if (bytes < 0 || isNaN(bytes) || !isFinite(bytes)) {
-			return {
-				value: 0,
-				unit: "B"
-			};
-		}
-
-		if (bytes < 1024) {
-			return {
-				value: bytes,
-				unit: "B"
-			};
-		} else if (bytes < 1024 * 1024) {
-			return {
-				value: bytes / 1024,
-				unit: "KB"
-			};
-		} else if (bytes < 1024 * 1024 * 1024) {
-			return {
-				value: bytes / (1024 * 1024),
-				unit: "MB"
-			};
-		} else {
-			return {
-				value: bytes / (1024 * 1024 * 1024),
-				unit: "GB"
-			};
-		}
-	}
-
-	function parseNetDev(content: string): var {
-		const lines = content.split("\n");
-		let totalRx = 0;
-		let totalTx = 0;
-
-		for (let i = 2; i < lines.length; i++) {
-			const line = lines[i].trim();
-			if (!line)
-				continue;
-
-			const parts = line.split(/\s+/);
-			if (parts.length < 10)
-				continue;
-
-			const iface = parts[0].replace(":", "");
-			// Skip loopback interface
-			if (iface === "lo")
-				continue;
-
-			const rxBytes = parseFloat(parts[1]) || 0;
-			const txBytes = parseFloat(parts[9]) || 0;
-
-			totalRx += rxBytes;
-			totalTx += txBytes;
-		}
-
-		return {
-			rx: totalRx,
-			tx: totalTx
-		};
-	}
-
-	FileView {
-		id: netDevFile
-
-		path: "/proc/net/dev"
-	}
-
-	Timer {
-		interval: Config.dashboard.resourceUpdateInterval
-		repeat: true
-		running: root.refCount > 0
-		triggeredOnStart: true
-
-		onTriggered: {
-			netDevFile.reload();
-			const content = netDevFile.text();
-			if (!content)
-				return;
-
-			const data = root.parseNetDev(content);
-			const now = Date.now();
-
-			if (!root._initialized) {
-				root._initialRxBytes = data.rx;
-				root._initialTxBytes = data.tx;
-				root._prevRxBytes = data.rx;
-				root._prevTxBytes = data.tx;
-				root._prevTimestamp = now;
-				root._initialized = true;
-				return;
-			}
-
-			const timeDelta = (now - root._prevTimestamp) / 1000; // seconds
-			if (timeDelta > 0) {
-				// Calculate byte deltas
-				let rxDelta = data.rx - root._prevRxBytes;
-				let txDelta = data.tx - root._prevTxBytes;
-
-				// Handle counter overflow (when counters wrap around from max to 0)
-				// This happens when counters exceed 32-bit or 64-bit limits
-				if (rxDelta < 0) {
-					// Counter wrapped around - assume 64-bit counter
-					rxDelta += Math.pow(2, 64);
-				}
-				if (txDelta < 0) {
-					txDelta += Math.pow(2, 64);
-				}
-
-				// Calculate speeds
-				root._downloadSpeed = rxDelta / timeDelta;
-				root._uploadSpeed = txDelta / timeDelta;
-
-				const maxHistory = root.historyLength + 1;
-
-				if (root._downloadSpeed >= 0 && isFinite(root._downloadSpeed)) {
-					let newDownHist = root._downloadHistory.slice();
-					newDownHist.push(root._downloadSpeed);
-					if (newDownHist.length > maxHistory) {
-						newDownHist.shift();
-					}
-					root._downloadHistory = newDownHist;
-				}
-
-				if (root._uploadSpeed >= 0 && isFinite(root._uploadSpeed)) {
-					let newUpHist = root._uploadHistory.slice();
-					newUpHist.push(root._uploadSpeed);
-					if (newUpHist.length > maxHistory) {
-						newUpHist.shift();
-					}
-					root._uploadHistory = newUpHist;
-				}
-			}
-
-			// Calculate totals with overflow handling
-			let downTotal = data.rx - root._initialRxBytes;
-			let upTotal = data.tx - root._initialTxBytes;
-
-			// Handle counter overflow for totals
-			if (downTotal < 0) {
-				downTotal += Math.pow(2, 64);
-			}
-			if (upTotal < 0) {
-				upTotal += Math.pow(2, 64);
-			}
-
-			root._downloadTotal = downTotal;
-			root._uploadTotal = upTotal;
-
-			root._prevRxBytes = data.rx;
-			root._prevTxBytes = data.tx;
-			root._prevTimestamp = now;
-		}
-	}
-}

Helpers/Picker.qml

@@ -5,13 +5,34 @@ import Quickshell
 import Quickshell.Wayland
 import QtQuick
 import QtQuick.Effects
-import qs.Components
+import qs.Modules
 import qs.Config
 import qs.Helpers
 
 MouseArea {
     id: root
 
+    required property LazyLoader loader
+    required property ShellScreen screen
+
+    property bool onClient
+
+    property real realBorderWidth: onClient ? (Hypr.options["general:border_size"] ?? 1) : 2
+    property real realRounding: onClient ? (Hypr.options["decoration:rounding"] ?? 0) : 0
+
+    property real ssx
+    property real ssy
+
+    property real sx: 0
+    property real sy: 0
+    property real ex: screen.width
+    property real ey: screen.height
+
+    property real rsx: Math.min(sx, ex)
+    property real rsy: Math.min(sy, ey)
+    property real sw: Math.abs(sx - ex)
+    property real sh: Math.abs(sy - ey)
+
     property list<var> clients: {
         const mon = Hypr.monitorFor(screen);
         if (!mon)
@@ -26,21 +47,6 @@ MouseArea {
             return (bc.pinned - ac.pinned) || ((bc.fullscreen !== 0) - (ac.fullscreen !== 0)) || (bc.floating - ac.floating);
         });
     }
-	property real ex: screen.width
-	property real ey: screen.height
-	required property LazyLoader loader
-	property bool onClient
-	property real realBorderWidth: onClient ? (Hypr.options["general:border_size"] ?? 1) : 2
-	property real realRounding: onClient ? (Hypr.options["decoration:rounding"] ?? 0) : 0
-	property real rsx: Math.min(sx, ex)
-	property real rsy: Math.min(sy, ey)
-	required property ShellScreen screen
-	property real sh: Math.abs(sy - ey)
-	property real ssx
-	property real ssy
-	property real sw: Math.abs(sx - ex)
-	property real sx: 0
-	property real sy: 0
 
     function checkClientRects(x: real, y: real): void {
         for (const client of clients) {
@@ -70,41 +76,12 @@ MouseArea {
         closeAnim.start();
     }
 
+    onClientsChanged: checkClientRects(mouseX, mouseY)
+
     anchors.fill: parent
-	cursorShape: Qt.CrossCursor
-	focus: true
-	hoverEnabled: true
     opacity: 0
-
+    hoverEnabled: true
-	Behavior on opacity {
+    cursorShape: Qt.CrossCursor
-		Anim {
-			duration: 300
-		}
-	}
-	Behavior on rsx {
-		enabled: !root.pressed
-
-		ExAnim {
-		}
-	}
-	Behavior on rsy {
-		enabled: !root.pressed
-
-		ExAnim {
-		}
-	}
-	Behavior on sh {
-		enabled: !root.pressed
-
-		ExAnim {
-		}
-	}
-	Behavior on sw {
-		enabled: !root.pressed
-
-		ExAnim {
-		}
-	}
 
     Component.onCompleted: {
         Hypr.extras.refreshOptions();
@@ -129,8 +106,25 @@ MouseArea {
             ey = screen.height / 2 + 100;
         }
     }
-	Keys.onEscapePressed: closeAnim.start()
+
-	onClientsChanged: checkClientRects(mouseX, mouseY)
+    onPressed: event => {
+        ssx = event.x;
+        ssy = event.y;
+    }
+
+    onReleased: {
+        if (closeAnim.running)
+            return;
+
+        if (root.loader.freeze) {
+            save();
+        } else {
+            overlay.visible = border.visible = false;
+            screencopy.visible = false;
+            screencopy.active = true;
+        }
+    }
+
     onPositionChanged: event => {
         const x = event.x;
         const y = event.y;
@@ -145,62 +139,44 @@ MouseArea {
             checkClientRects(x, y);
         }
     }
-	onPressed: event => {
-		ssx = event.x;
-		ssy = event.y;
-	}
-	onReleased: {
-		if (closeAnim.running)
-			return;
 
-		if (root.loader.freeze) {
+    focus: true
-			save();
+    Keys.onEscapePressed: closeAnim.start()
-		} else {
-			overlay.visible = border.visible = false;
-			screencopy.visible = false;
-			screencopy.active = true;
-		}
-	}
 
     SequentialAnimation {
         id: closeAnim
 
         PropertyAction {
-			property: "closing"
             target: root.loader
+            property: "closing"
             value: true
         }
-
         ParallelAnimation {
             Anim {
-				duration: 300
+                target: root
                 property: "opacity"
-				target: root
                 to: 0
+                duration: 300
             }
-
             ExAnim {
+                target: root
                 properties: "rsx,rsy"
-				target: root
                 to: 0
             }
-
             ExAnim {
-				property: "sw"
                 target: root
+                property: "sw"
                 to: root.screen.width
             }
-
             ExAnim {
-				property: "sh"
                 target: root
+                property: "sh"
                 to: root.screen.height
             }
         }
-
         PropertyAction {
-			property: "activeAsync"
             target: root.loader
+            property: "activeAsync"
             value: false
         }
     }
@@ -208,12 +184,14 @@ MouseArea {
     Loader {
         id: screencopy
 
-		active: root.loader.freeze
         anchors.fill: parent
+
+        active: root.loader.freeze
         asynchronous: true
 
         sourceComponent: ScreencopyView {
             captureSource: root.screen
+
             paintCursor: false
 
             onHasContentChanged: {
@@ -230,14 +208,15 @@ MouseArea {
 
         anchors.fill: parent
         color: "white"
-		layer.enabled: true
         opacity: 0.3
+
         radius: root.realRounding
 
+        layer.enabled: true
         layer.effect: MultiEffect {
+            maskSource: selectionWrapper
             maskEnabled: true
             maskInverted: true
-			maskSource: selectionWrapper
             maskSpreadAtMin: 1
             maskThresholdMin: 0.5
         }
@@ -253,30 +232,60 @@ MouseArea {
         Rectangle {
             id: selectionRect
 
-			implicitHeight: root.sh
-			implicitWidth: root.sw
             radius: root.realRounding
             x: root.rsx
             y: root.rsy
+            implicitWidth: root.sw
+            implicitHeight: root.sh
         }
     }
 
     Rectangle {
         id: border
 
-		border.color: DynamicColors.palette.m3primary
-		border.width: root.realBorderWidth
         color: "transparent"
-		implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
-		implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
         radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
+        border.width: root.realBorderWidth
+        border.color: DynamicColors.palette.m3primary
+
         x: selectionRect.x - root.realBorderWidth
         y: selectionRect.y - root.realBorderWidth
+        implicitWidth: selectionRect.implicitWidth + root.realBorderWidth * 2
+        implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2
 
         Behavior on border.color {
+            Anim {}
+        }
+    }
+
+    Behavior on opacity {
         Anim {
+            duration: 300
         }
     }
+
+    Behavior on rsx {
+        enabled: !root.pressed
+
+        ExAnim {}
+    }
+
+    Behavior on rsy {
+        enabled: !root.pressed
+
+        ExAnim {}
+    }
+
+    Behavior on sw {
+        enabled: !root.pressed
+
+        ExAnim {}
+    }
+
+    Behavior on sh {
+        enabled: !root.pressed
+
+        ExAnim {}
     }
 
     component ExAnim: Anim {

Helpers/Players.qml

@@ -11,8 +11,8 @@ import qs.Components
 Singleton {
     id: root
 
-	readonly property MprisPlayer active: props.manualActive ?? list.find(p => getIdentity(p) === Config.services.defaultPlayer) ?? list[0] ?? null
     readonly property list<MprisPlayer> list: Mpris.players.values
+    readonly property MprisPlayer active: props.manualActive ?? list.find(p => getIdentity(p) === Config.services.defaultPlayer) ?? list[0] ?? null
     property alias manualActive: props.manualActive
 
     function getIdentity(player: MprisPlayer): string {
@@ -21,13 +21,13 @@ Singleton {
     }
 
     Connections {
+        target: active
+
         function onPostTrackChanged() {
             if (!Config.utilities.toasts.nowPlaying) {
                 return;
             }
         }
-
-		target: active
     }
 
     PersistentProperties {
@@ -39,9 +39,8 @@ Singleton {
     }
 
     CustomShortcut {
-		description: "Toggle media playback"
         name: "mediaToggle"
-
+        description: "Toggle media playback"
         onPressed: {
             const active = root.active;
             if (active && active.canTogglePlaying)
@@ -50,9 +49,8 @@ Singleton {
     }
 
     CustomShortcut {
-		description: "Previous track"
         name: "mediaPrev"
-
+        description: "Previous track"
         onPressed: {
             const active = root.active;
             if (active && active.canGoPrevious)
@@ -61,9 +59,8 @@ Singleton {
     }
 
     CustomShortcut {
-		description: "Next track"
         name: "mediaNext"
-
+        description: "Next track"
         onPressed: {
             const active = root.active;
             if (active && active.canGoNext)
@@ -72,13 +69,14 @@ Singleton {
     }
 
     CustomShortcut {
-		description: "Stop media playback"
         name: "mediaStop"
-
+        description: "Stop media playback"
         onPressed: root.active?.stop()
     }
 
     IpcHandler {
+        target: "mpris"
+
         function getActive(prop: string): string {
             const active = root.active;
             return active ? active[prop] ?? "Invalid property" : "No active player";
@@ -88,10 +86,10 @@ Singleton {
             return root.list.map(p => root.getIdentity(p)).join("\n");
         }
 
-		function next(): void {
+        function play(): void {
             const active = root.active;
-			if (active?.canGoNext)
+            if (active?.canPlay)
-				active.next();
+                active.play();
         }
 
         function pause(): void {
@@ -100,12 +98,6 @@ Singleton {
                 active.pause();
         }
 
-		function play(): void {
-			const active = root.active;
-			if (active?.canPlay)
-				active.play();
-		}
-
         function playPause(): void {
             const active = root.active;
             if (active?.canTogglePlaying)
@@ -118,10 +110,14 @@ Singleton {
                 active.previous();
         }
 
+        function next(): void {
+            const active = root.active;
+            if (active?.canGoNext)
+                active.next();
+        }
+
         function stop(): void {
             root.active?.stop();
         }
-
-		target: "mpris"
     }
 }

Helpers/SearchWallpapers.qml

@@ -11,15 +11,10 @@ import qs.Paths
 Searcher {
     id: root
 
-	property string actualCurrent: WallpaperPath.currentWallpaperPath
+    property bool showPreview: false
     readonly property string current: showPreview ? previewPath : actualCurrent
     property string previewPath
-	property bool showPreview: false
+    property string actualCurrent: WallpaperPath.currentWallpaperPath
-
-	function preview(path: string): void {
-		previewPath = path;
-		showPreview = true;
-	}
 
     function setWallpaper(path: string): void {
         actualCurrent = path;
@@ -27,23 +22,28 @@ Searcher {
 		Quickshell.execDetached(["sh", "-c", `python3 ${Quickshell.shellPath("scripts/LockScreenBg.py")} --input_image=${root.actualCurrent} --output_path=${Paths.state}/lockscreen_bg.png`]);
     }
 
+    function preview(path: string): void {
+        previewPath = path;
+        showPreview = true;
+    }
+
     function stopPreview(): void {
         showPreview = false;
         Quickshell.execDetached(["sh", "-c", `python3 ${Quickshell.shellPath("scripts/SchemeColorGen.py")} --path=${root.actualCurrent} --thumbnail=${Paths.cache}/imagecache/thumbnail.jpg --output=${Paths.state}/scheme.json --scheme=${Config.colors.schemeType}`]);
     }
 
+    list: wallpapers.entries
+    key: "relativePath"
+    useFuzzy: true
     extraOpts: useFuzzy ? ({}) : ({
             forward: false
         })
-	key: "relativePath"
-	list: wallpapers.entries
-	useFuzzy: true
 
     FileSystemModel {
         id: wallpapers
 
-		filter: FileSystemModel.Images
-		path: Config.general.wallpaperPath
         recursive: true
+        path: Config.general.wallpaperPath
+        filter: FileSystemModel.Images
     }
 }

Helpers/Searcher.qml

@@ -4,7 +4,18 @@ import "../scripts/fuzzysort.js" as Fuzzy
 import QtQuick
 
 Singleton {
+    required property list<QtObject> list
+    property string key: "name"
+    property bool useFuzzy: false
     property var extraOpts: ({})
+
+    // Extra stuff for fuzzy
+    property list<string> keys: [key]
+    property list<real> weights: [1]
+
+    readonly property var fzf: useFuzzy ? [] : new Fzf.Finder(list, Object.assign({
+        selector
+    }, extraOpts))
     readonly property list<var> fuzzyPrepped: useFuzzy ? list.map(e => {
         const obj = {
             _item: e
@@ -13,16 +24,15 @@ Singleton {
             obj[k] = Fuzzy.prepare(e[k]);
         return obj;
     }) : []
-	readonly property var fzf: useFuzzy ? [] : new Fzf.Finder(list, Object.assign({
-		selector
-	}, extraOpts))
-	property string key: "name"
 
-	// Extra stuff for fuzzy
+    function transformSearch(search: string): string {
-	property list<string> keys: [key]
+        return search;
-	required property list<QtObject> list
+    }
-	property bool useFuzzy: false
+
-	property list<real> weights: [1]
+    function selector(item: var): string {
+        // Only for fzf
+        return item[key];
+    }
 
     function query(search: string): list<var> {
         search = transformSearch(search);
@@ -42,13 +52,4 @@ Singleton {
             return b.score - a.score;
         }).map(r => r.item);
     }
-
-	function selector(item: var): string {
-		// Only for fzf
-		return item[key];
-	}
-
-	function transformSearch(search: string): string {
-		return search;
-	}
 }

Helpers/SystemInfo.qml

@@ -8,22 +8,22 @@ import QtQuick
 Singleton {
     id: root
 
-	property bool isDefaultLogo: true
+    property string osName
+    property string osPrettyName
     property string osId
     property list<string> osIdLike
     property string osLogo
-	property string osName
+    property bool isDefaultLogo: true
-	property string osPrettyName
+
-	readonly property string shell: Quickshell.env("SHELL").split("/").pop()
     property string uptime
     readonly property string user: Quickshell.env("USER")
     readonly property string wm: Quickshell.env("XDG_CURRENT_DESKTOP") || Quickshell.env("XDG_SESSION_DESKTOP")
+    readonly property string shell: Quickshell.env("SHELL").split("/").pop()
 
     FileView {
         id: osRelease
 
         path: "/etc/os-release"
-
         onLoaded: {
             const lines = text().split("\n");
 
@@ -46,18 +46,17 @@ Singleton {
     }
 
     Connections {
+        target: Config.general
+
         function onLogoChanged(): void {
             osRelease.reload();
         }
-
-		target: Config.general
     }
 
     Timer {
-		interval: 15000
-		repeat: true
         running: true
-
+        repeat: true
+        interval: 15000
         onTriggered: fileUptime.reload()
     }
 
@@ -65,16 +64,18 @@ Singleton {
         id: fileUptime
 
         path: "/proc/uptime"
-
         onLoaded: {
             const up = parseInt(text().split(" ")[0] ?? 0);
 
-			const hours = Math.floor(up / 3600);
+            const days = Math.floor(up / 86400);
+            const hours = Math.floor((up % 86400) / 3600);
             const minutes = Math.floor((up % 3600) / 60);
 
             let str = "";
+            if (days > 0)
+                str += `${days} day${days === 1 ? "" : "s"}`;
             if (hours > 0)
-				str += `${hours} hour${hours === 1 ? "" : "s"}`;
+                str += `${str ? ", " : ""}${hours} hour${hours === 1 ? "" : "s"}`;
             if (minutes > 0 || !str)
                 str += `${str ? ", " : ""}${minutes} minute${minutes === 1 ? "" : "s"}`;
             root.uptime = str;

Helpers/SystemUsage.qml

@@ -8,42 +8,25 @@ import qs.Config
 Singleton {
     id: root
 
-	property string autoGpuType: "NONE"
-	property string cpuName: ""
     property real cpuPerc
     property real cpuTemp
-
+    readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
-	// Individual disks: Array of { mount, used, total, free, perc }
+    property string autoGpuType: "NONE"
-	property var disks: []
-	property real gpuMemTotal: 0
-	property real gpuMemUsed
-	property string gpuName: ""
     property real gpuPerc
     property real gpuTemp
-	readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
+	property real gpuMemUsed
+	property real gpuMemTotal: 0
+    property real memUsed
+    property real memTotal
+    readonly property real memPerc: memTotal > 0 ? memUsed / memTotal : 0
+    property real storageUsed
+    property real storageTotal
+    property real storagePerc: storageTotal > 0 ? storageUsed / storageTotal : 0
+
     property real lastCpuIdle
     property real lastCpuTotal
-	readonly property real memPerc: memTotal > 0 ? memUsed / memTotal : 0
+
-	property real memTotal
-	property real memUsed
     property int refCount
-	readonly property real storagePerc: {
-		let totalUsed = 0;
-		let totalSize = 0;
-		for (const disk of disks) {
-			totalUsed += disk.used;
-			totalSize += disk.total;
-		}
-		return totalSize > 0 ? totalUsed / totalSize : 0;
-	}
-
-	function cleanCpuName(name: string): string {
-		return name.replace(/\(R\)/gi, "").replace(/\(TM\)/gi, "").replace(/CPU/gi, "").replace(/\d+th Gen /gi, "").replace(/\d+nd Gen /gi, "").replace(/\d+rd Gen /gi, "").replace(/\d+st Gen /gi, "").replace(/Core /gi, "").replace(/Processor/gi, "").replace(/\s+/g, " ").trim();
-	}
-
-	function cleanGpuName(name: string): string {
-		return name.replace(/NVIDIA GeForce /gi, "").replace(/NVIDIA /gi, "").replace(/AMD Radeon /gi, "").replace(/AMD /gi, "").replace(/Intel /gi, "").replace(/\(R\)/gi, "").replace(/\(TM\)/gi, "").replace(/Graphics/gi, "").replace(/\s+/g, " ").trim();
-	}
 
     function formatKib(kib: real): var {
         const mib = 1024;
@@ -72,11 +55,10 @@ Singleton {
     }
 
     Timer {
-		interval: Config.dashboard.resourceUpdateInterval
-		repeat: true
         running: root.refCount > 0
+        interval: 3000
+        repeat: true
         triggeredOnStart: true
-
         onTriggered: {
             stat.reload();
             meminfo.reload();
@@ -86,23 +68,10 @@ Singleton {
         }
     }
 
-	FileView {
-		id: cpuinfoInit
-
-		path: "/proc/cpuinfo"
-
-		onLoaded: {
-			const nameMatch = text().match(/model name\s*:\s*(.+)/);
-			if (nameMatch)
-				root.cpuName = root.cleanCpuName(nameMatch[1]);
-		}
-	}
-
     FileView {
         id: stat
 
         path: "/proc/stat"
-
         onLoaded: {
             const data = text().match(/^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/);
             if (data) {
@@ -124,7 +93,6 @@ Singleton {
         id: meminfo
 
         path: "/proc/meminfo"
-
         onLoaded: {
             const data = text();
             root.memTotal = parseInt(data.match(/MemTotal: *(\d+)/)[1], 10) || 1;
@@ -135,116 +103,41 @@ Singleton {
     Process {
         id: storage
 
-		command: ["lsblk", "-b", "-o", "NAME,SIZE,TYPE,FSUSED,FSSIZE", "-P"]
+        command: ["sh", "-c", "df | grep '^/dev/' | awk '{print $1, $3, $4}'"]
-
         stdout: StdioCollector {
             onStreamFinished: {
-				const diskMap = {};  // Map disk name -> { name, totalSize, used, fsTotal }
+                const deviceMap = new Map();
-				const lines = text.trim().split("\n");
 
-				for (const line of lines) {
+                for (const line of text.trim().split("\n")) {
                     if (line.trim() === "")
                         continue;
-					const nameMatch = line.match(/NAME="([^"]+)"/);
-					const sizeMatch = line.match(/SIZE="([^"]+)"/);
-					const typeMatch = line.match(/TYPE="([^"]+)"/);
-					const fsusedMatch = line.match(/FSUSED="([^"]*)"/);
-					const fssizeMatch = line.match(/FSSIZE="([^"]*)"/);
 
-					if (!nameMatch || !typeMatch)
+                    const parts = line.trim().split(/\s+/);
-						continue;
+                    if (parts.length >= 3) {
+                        const device = parts[0];
+                        const used = parseInt(parts[1], 10) || 0;
+                        const avail = parseInt(parts[2], 10) || 0;
 
-					const name = nameMatch[1];
+                        // Only keep the entry with the largest total space for each device
-					const type = typeMatch[1];
+                        if (!deviceMap.has(device) || (used + avail) > (deviceMap.get(device).used + deviceMap.get(device).avail)) {
-					const size = parseInt(sizeMatch?.[1] || "0", 10);
+                            deviceMap.set(device, {
-					const fsused = parseInt(fsusedMatch?.[1] || "0", 10);
+                                used: used,
-					const fssize = parseInt(fssizeMatch?.[1] || "0", 10);
+                                avail: avail
-
-					if (type === "disk") {
-						// Skip zram (swap) devices
-						if (name.startsWith("zram"))
-							continue;
-
-						// Initialize disk entry
-						if (!diskMap[name]) {
-							diskMap[name] = {
-								name: name,
-								totalSize: size,
-								used: 0,
-								fsTotal: 0
-							};
-						}
-					} else if (type === "part") {
-						// Find parent disk (remove trailing numbers/p+numbers)
-						let parentDisk = name.replace(/p?\d+$/, "");
-						// For nvme devices like nvme0n1p1, parent is nvme0n1
-						if (name.match(/nvme\d+n\d+p\d+/))
-							parentDisk = name.replace(/p\d+$/, "");
-
-						// Aggregate partition usage to parent disk
-						if (diskMap[parentDisk]) {
-							diskMap[parentDisk].used += fsused;
-							diskMap[parentDisk].fsTotal += fssize;
-						}
-					}
-				}
-
-				const diskList = [];
-				let totalUsed = 0;
-				let totalSize = 0;
-
-				for (const diskName of Object.keys(diskMap).sort()) {
-					const disk = diskMap[diskName];
-					// Use filesystem total if available, otherwise use disk size
-					const total = disk.fsTotal > 0 ? disk.fsTotal : disk.totalSize;
-					const used = disk.used;
-					const perc = total > 0 ? used / total : 0;
-
-					// Convert bytes to KiB for consistency with formatKib
-					diskList.push({
-						mount: disk.name  // Using 'mount' property for compatibility
-						,
-						used: used / 1024,
-						total: total / 1024,
-						free: (total - used) / 1024,
-						perc: perc
                             });
-
-					totalUsed += used;
-					totalSize += total;
-				}
-
-				root.disks = diskList;
                         }
                     }
                 }
 
-	Process {
+                let totalUsed = 0;
-		id: gpuNameDetect
+                let totalAvail = 0;
 
-		command: ["sh", "-c", "nvidia-smi --query-gpu=name --format=csv,noheader 2>/dev/null || lspci 2>/dev/null | grep -i 'vga\\|3d\\|display' | head -1"]
+                for (const [device, stats] of deviceMap) {
-		running: true
+                    totalUsed += stats.used;
-
+                    totalAvail += stats.avail;
-		stdout: StdioCollector {
-			onStreamFinished: {
-				const output = text.trim();
-				if (!output)
-					return;
-
-				// Check if it's from nvidia-smi (clean GPU name)
-				if (output.toLowerCase().includes("nvidia") || output.toLowerCase().includes("geforce") || output.toLowerCase().includes("rtx") || output.toLowerCase().includes("gtx")) {
-					root.gpuName = root.cleanGpuName(output);
-				} else {
-					// Parse lspci output: extract name from brackets or after colon
-					const bracketMatch = output.match(/\[([^\]]+)\]/);
-					if (bracketMatch) {
-						root.gpuName = root.cleanGpuName(bracketMatch[1]);
-					} else {
-						const colonMatch = output.match(/:\s*(.+)/);
-						if (colonMatch)
-							root.gpuName = root.cleanGpuName(colonMatch[1]);
-					}
                 }
+
+                root.storageUsed = totalUsed;
+                root.storageTotal = totalUsed + totalAvail;
             }
         }
     }
@@ -252,9 +145,8 @@ Singleton {
     Process {
         id: gpuTypeCheck
 
-		command: ["sh", "-c", "if command -v nvidia-smi &>/dev/null && nvidia-smi -L &>/dev/null; then echo NVIDIA; elif ls /sys/class/drm/card*/device/gpu_busy_percent 2>/dev/null | grep -q .; then echo GENERIC; else echo NONE; fi"]
         running: !Config.services.gpuType
-
+        command: ["sh", "-c", "if command -v nvidia-smi &>/dev/null && nvidia-smi -L &>/dev/null; then echo NVIDIA; elif ls /sys/class/drm/card*/device/gpu_busy_percent 2>/dev/null | grep -q .; then echo GENERIC; else echo NONE; fi"]
         stdout: StdioCollector {
             onStreamFinished: root.autoGpuType = text.trim()
         }
@@ -262,14 +154,12 @@ Singleton {
 
     Process {
         id: oneshotMem
-
         command: ["nvidia-smi", "--query-gpu=memory.total", "--format=csv,noheader,nounits"]
         running: root.gpuType === "NVIDIA" && root.gpuMemTotal === 0
-
         stdout: StdioCollector {
             onStreamFinished: {
-				root.gpuMemTotal = Number(this.text.trim());
+                root.gpuMemTotal = Number(this.text.trim())
-				oneshotMem.running = false;
+                oneshotMem.running = false
             }
         }
     }
@@ -278,7 +168,6 @@ Singleton {
         id: gpuUsage
 
         command: root.gpuType === "GENERIC" ? ["sh", "-c", "cat /sys/class/drm/card*/device/gpu_busy_percent"] : root.gpuType === "NVIDIA" ? ["nvidia-smi", "--query-gpu=utilization.gpu,temperature.gpu,memory.used", "--format=csv,noheader,nounits"] : ["echo"]
-
         stdout: StdioCollector {
             onStreamFinished: {
                 if (root.gpuType === "GENERIC") {
@@ -306,7 +195,6 @@ Singleton {
                 LANG: "C.UTF-8",
                 LC_ALL: "C.UTF-8"
             })
-
         stdout: StdioCollector {
             onStreamFinished: {
                 let cpuTemp = text.match(/(?:Package id [0-9]+|Tdie):\s+((\+|-)[0-9.]+)(°| )C/);

Helpers/ThemeIcons.qml

@@ -6,10 +6,18 @@ import Quickshell
 Singleton {
 	id: root
 
-	property list<DesktopEntry> entryList: []
+	property real scoreThreshold: 0.2
-	property var preppedIcons: []
+
-	property var preppedIds: []
+	// Manual overrides for tricky apps
-	property var preppedNames: []
+	property var substitutions: ({
+			"code-url-handler": "visual-studio-code",
+			"Code": "visual-studio-code",
+			"gnome-tweaks": "org.gnome.tweaks",
+			"pavucontrol-qt": "pavucontrol",
+			"wps": "wps-office2019-kprometheus",
+			"wpsoffice": "wps-office2019-kprometheus",
+			"footclient": "foot"
+			})
 
 	// Dynamic fixups
 	property var regexSubstitutions: [
@@ -30,33 +38,156 @@ Singleton {
 		"replace": "system-lock-screen"
 	}
 	]
-	property real scoreThreshold: 0.2
 
-	// Manual overrides for tricky apps
+	property list<DesktopEntry> entryList: []
-	property var substitutions: ({
+	property var preppedNames: []
-			"code-url-handler": "visual-studio-code",
+	property var preppedIcons: []
-			"Code": "visual-studio-code",
+	property var preppedIds: []
-			"gnome-tweaks": "org.gnome.tweaks",
-			"pavucontrol-qt": "pavucontrol",
-			"wps": "wps-office2019-kprometheus",
-			"wpsoffice": "wps-office2019-kprometheus",
-			"footclient": "foot"
-		})
 
-	function checkCleanMatch(str) {
+	Component.onCompleted: refreshEntries()
-		if (!str || str.length <= 3)
+
+	Connections {
+		target: DesktopEntries.applications
+		function onValuesChanged() {
+			refreshEntries();
+		}
+	}
+
+	function refreshEntries() {
+		if (typeof DesktopEntries === 'undefined')
+			return;
+
+		const values = Array.from(DesktopEntries.applications.values);
+		if (values) {
+			entryList = values.sort((a, b) => a.name.localeCompare(b.name));
+			updatePreppedData();
+		}
+	}
+
+	function updatePreppedData() {
+		if (typeof FuzzySort === 'undefined')
+			return;
+
+		const list = Array.from(entryList);
+		preppedNames = list.map(a => ({
+				name: FuzzySort.prepare(`${a.name} `), entry: a}));
+				preppedIcons = list.map(a => ({
+				name: FuzzySort.prepare(`${a.icon} `),
+				entry: a
+				}));
+				preppedIds = list.map(a => ({
+				name: FuzzySort.prepare(`${a.id} `),
+				entry: a
+				}));
+	}
+
+	function iconForAppId(appId, fallbackName) {
+		const fallback = fallbackName || "application-x-executable";
+		if (!appId)
+			return iconFromName(fallback, fallback);
+
+		const entry = findAppEntry(appId);
+		if (entry) {
+			return iconFromName(entry.icon, fallback);
+		}
+
+		return iconFromName(appId, fallback);
+	}
+
+	// Robust lookup strategy
+	function findAppEntry(str) {
+		if (!str || str.length === 0)
 			return null;
+
+		let result = null;
+
+		if (result = checkHeuristic(str))
+			return result;
+		if (result = checkSubstitutions(str))
+			return result;
+		if (result = checkRegex(str))
+			return result;
+		if (result = checkSimpleTransforms(str))
+			return result;
+		if (result = checkFuzzySearch(str))
+			return result;
+		if (result = checkCleanMatch(str))
+			return result;
+
+		return null;
+	}
+
+	function iconFromName(iconName, fallbackName) {
+		const fallback = fallbackName || "application-x-executable";
+		try {
+			if (iconName && typeof Quickshell !== 'undefined' && Quickshell.iconPath) {
+				const p = Quickshell.iconPath(iconName, fallback);
+				if (p && p !== "")
+					return p;
+			}
+		} catch (e) {}
+
+		try {
+			return Quickshell.iconPath ? (Quickshell.iconPath(fallback, true) || "") : "";
+		} catch (e2) {
+			return "";
+		}
+	}
+
+	function distroLogoPath() {
+		try {
+			return (typeof OSInfo !== 'undefined' && OSInfo.distroIconPath) ? OSInfo.distroIconPath : "";
+		} catch (e) {
+			return "";
+		}
+	}
+
+	// --- Lookup Helpers ---
+
+	function checkHeuristic(str) {
+		if (typeof DesktopEntries !== 'undefined' && DesktopEntries.heuristicLookup) {
+			const entry = DesktopEntries.heuristicLookup(str);
+			if (entry)
+				return entry;
+		}
+		return null;
+	}
+
+	function checkSubstitutions(str) {
+		let effectiveStr = substitutions[str];
+		if (!effectiveStr)
+			effectiveStr = substitutions[str.toLowerCase()];
+
+		if (effectiveStr && effectiveStr !== str) {
+			return findAppEntry(effectiveStr);
+		}
+		return null;
+	}
+
+	function checkRegex(str) {
+		for (let i = 0; i < regexSubstitutions.length; i++) {
+			const sub = regexSubstitutions[i];
+			const replaced = str.replace(sub.regex, sub.replace);
+			if (replaced !== str) {
+				return findAppEntry(replaced);
+			}
+		}
+		return null;
+	}
+
+	function checkSimpleTransforms(str) {
 		if (typeof DesktopEntries === 'undefined' || !DesktopEntries.byId)
 			return null;
 
-		// Aggressive fallback: strip all separators
+		const lower = str.toLowerCase();
-		const cleanStr = str.toLowerCase().replace(/[\.\-_]/g, '');
-		const list = Array.from(entryList);
 
-		for (let i = 0; i < list.length; i++) {
+		const variants = [str, lower, getFromReverseDomain(str), getFromReverseDomain(str)?.toLowerCase(), normalizeWithHyphens(str), str.replace(/_/g, '-').toLowerCase(), str.replace(/-/g, '_').toLowerCase()];
-			const entry = list[i];
+
-			const cleanId = (entry.id || "").toLowerCase().replace(/[\.\-_]/g, '');
+		for (let i = 0; i < variants.length; i++) {
-			if (cleanId.includes(cleanStr) || cleanStr.includes(cleanId)) {
+			const variant = variants[i];
+			if (variant) {
+				const entry = DesktopEntries.byId(variant);
+				if (entry)
 					return entry;
 			}
 		}
@@ -96,89 +227,26 @@ Singleton {
 		return null;
 	}
 
-	// --- Lookup Helpers ---
+	function checkCleanMatch(str) {
-
+		if (!str || str.length <= 3)
-	function checkHeuristic(str) {
-		if (typeof DesktopEntries !== 'undefined' && DesktopEntries.heuristicLookup) {
-			const entry = DesktopEntries.heuristicLookup(str);
-			if (entry)
-				return entry;
-		}
 			return null;
-	}
-
-	function checkRegex(str) {
-		for (let i = 0; i < regexSubstitutions.length; i++) {
-			const sub = regexSubstitutions[i];
-			const replaced = str.replace(sub.regex, sub.replace);
-			if (replaced !== str) {
-				return findAppEntry(replaced);
-			}
-		}
-		return null;
-	}
-
-	function checkSimpleTransforms(str) {
 		if (typeof DesktopEntries === 'undefined' || !DesktopEntries.byId)
 			return null;
 
-		const lower = str.toLowerCase();
+		// Aggressive fallback: strip all separators
+		const cleanStr = str.toLowerCase().replace(/[\.\-_]/g, '');
+		const list = Array.from(entryList);
 
-		const variants = [str, lower, getFromReverseDomain(str), getFromReverseDomain(str)?.toLowerCase(), normalizeWithHyphens(str), str.replace(/_/g, '-').toLowerCase(), str.replace(/-/g, '_').toLowerCase()];
+		for (let i = 0; i < list.length; i++) {
-
+			const entry = list[i];
-		for (let i = 0; i < variants.length; i++) {
+			const cleanId = (entry.id || "").toLowerCase().replace(/[\.\-_]/g, '');
-			const variant = variants[i];
+			if (cleanId.includes(cleanStr) || cleanStr.includes(cleanId)) {
-			if (variant) {
-				const entry = DesktopEntries.byId(variant);
-				if (entry)
 				return entry;
 			}
 		}
 		return null;
 	}
 
-	function checkSubstitutions(str) {
-		let effectiveStr = substitutions[str];
-		if (!effectiveStr)
-			effectiveStr = substitutions[str.toLowerCase()];
-
-		if (effectiveStr && effectiveStr !== str) {
-			return findAppEntry(effectiveStr);
-		}
-		return null;
-	}
-
-	function distroLogoPath() {
-		try {
-			return (typeof OSInfo !== 'undefined' && OSInfo.distroIconPath) ? OSInfo.distroIconPath : "";
-		} catch (e) {
-			return "";
-		}
-	}
-
-	// Robust lookup strategy
-	function findAppEntry(str) {
-		if (!str || str.length === 0)
-			return null;
-
-		let result = null;
-
-		if (result = checkHeuristic(str))
-			return result;
-		if (result = checkSubstitutions(str))
-			return result;
-		if (result = checkRegex(str))
-			return result;
-		if (result = checkSimpleTransforms(str))
-			return result;
-		if (result = checkFuzzySearch(str))
-			return result;
-		if (result = checkCleanMatch(str))
-			return result;
-
-		return null;
-	}
-
 	function fuzzyQuery(search, preppedData) {
 		if (!search || !preppedData || preppedData.length === 0)
 			return [];
@@ -188,18 +256,6 @@ Singleton {
 	}).map(r => r.obj.entry);
 	}
 
-	function getFromReverseDomain(str) {
-		if (!str)
-			return "";
-		return str.split('.').slice(-1)[0];
-	}
-
-	// Deprecated shim
-	function guessIcon(str) {
-		const entry = findAppEntry(str);
-		return entry ? entry.icon : "image-missing";
-	}
-
 	function iconExists(iconName) {
 		if (!iconName || iconName.length === 0)
 			return false;
@@ -210,34 +266,10 @@ Singleton {
 		return path && path.length > 0 && !path.includes("image-missing");
 	}
 
-	function iconForAppId(appId, fallbackName) {
+	function getFromReverseDomain(str) {
-		const fallback = fallbackName || "application-x-executable";
+		if (!str)
-		if (!appId)
-			return iconFromName(fallback, fallback);
-
-		const entry = findAppEntry(appId);
-		if (entry) {
-			return iconFromName(entry.icon, fallback);
-		}
-
-		return iconFromName(appId, fallback);
-	}
-
-	function iconFromName(iconName, fallbackName) {
-		const fallback = fallbackName || "application-x-executable";
-		try {
-			if (iconName && typeof Quickshell !== 'undefined' && Quickshell.iconPath) {
-				const p = Quickshell.iconPath(iconName, fallback);
-				if (p && p !== "")
-					return p;
-			}
-		} catch (e) {}
-
-		try {
-			return Quickshell.iconPath ? (Quickshell.iconPath(fallback, true) || "") : "";
-		} catch (e2) {
 			return "";
-		}
+		return str.split('.').slice(-1)[0];
 	}
 
 	function normalizeWithHyphens(str) {
@@ -246,43 +278,9 @@ Singleton {
 		return str.toLowerCase().replace(/\s+/g, "-");
 	}
 
-	function refreshEntries() {
+	// Deprecated shim
-		if (typeof DesktopEntries === 'undefined')
+	function guessIcon(str) {
-			return;
+		const entry = findAppEntry(str);
-
+		return entry ? entry.icon : "image-missing";
-		const values = Array.from(DesktopEntries.applications.values);
-		if (values) {
-			entryList = values.sort((a, b) => a.name.localeCompare(b.name));
-			updatePreppedData();
-		}
-	}
-
-	function updatePreppedData() {
-		if (typeof FuzzySort === 'undefined')
-			return;
-
-		const list = Array.from(entryList);
-		preppedNames = list.map(a => ({
-					name: FuzzySort.prepare(`${a.name} `),
-					entry: a
-				}));
-		preppedIcons = list.map(a => ({
-					name: FuzzySort.prepare(`${a.icon} `),
-					entry: a
-				}));
-		preppedIds = list.map(a => ({
-					name: FuzzySort.prepare(`${a.id} `),
-					entry: a
-				}));
-	}
-
-	Component.onCompleted: refreshEntries()
-
-	Connections {
-		function onValuesChanged() {
-			refreshEntries();
-		}
-
-		target: DesktopEntries.applications
 	}
 }

Helpers/Time.qml

@@ -3,16 +3,17 @@ pragma Singleton
 import Quickshell
 
 Singleton {
-	readonly property string amPmStr: timeComponents[2] ?? ""
-	readonly property date date: clock.date
     property alias enabled: clock.enabled
-	readonly property string hourStr: timeComponents[0] ?? ""
+    readonly property date date: clock.date
     readonly property int hours: clock.hours
-	readonly property string minuteStr: timeComponents[1] ?? ""
     readonly property int minutes: clock.minutes
     readonly property int seconds: clock.seconds
-	readonly property list<string> timeComponents: timeStr.split(":")
+
     readonly property string timeStr: format("hh:mm")
+    readonly property list<string> timeComponents: timeStr.split(":")
+    readonly property string hourStr: timeComponents[0] ?? ""
+    readonly property string minuteStr: timeComponents[1] ?? ""
+    readonly property string amPmStr: timeComponents[2] ?? ""
 
     function format(fmt: string): string {
         return Qt.formatDateTime(clock.date, fmt);
@@ -20,7 +21,6 @@ Singleton {
 
     SystemClock {
         id: clock
-
         precision: SystemClock.Seconds
     }
 }

Helpers/UPower.qml

@@ -3,10 +3,11 @@ pragma Singleton
 import Quickshell
 import Quickshell.Services.UPower
 
+
 Singleton {
 	id: root
 
 	readonly property list<UPowerDevice> devices: UPower.devices.values
-	readonly property UPowerDevice displayDevice: UPower.displayDevice
 	readonly property bool onBattery: UPower.onBattery
+	readonly property UPowerDevice displayDevice: UPower.displayDevice
 }

Helpers/Visibilities.qml

@@ -3,14 +3,14 @@ pragma Singleton
 import Quickshell
 
 Singleton {
-	property var bars: new Map()
     property var screens: new Map()
-
+    property var bars: new Map()
-	function getForActive(): PersistentProperties {
-		return screens.get(Hypr.focusedMonitor);
-	}
 
     function load(screen: ShellScreen, visibilities: var): void {
         screens.set(Hypr.monitorFor(screen), visibilities);
     }
+
+    function getForActive(): PersistentProperties {
+        return screens.get(Hypr.focusedMonitor);
+    }
 }

Helpers/WallpaperPath.qml

@@ -12,16 +12,13 @@ Singleton {
 
     FileView {
         id: fileView
-
         path: `${Paths.state}/wallpaper_path.json`
+
         watchChanges: true
-
-		onAdapterUpdated: writeAdapter()
         onFileChanged: reload()
-
+        onAdapterUpdated: writeAdapter()
         JsonAdapter {
             id: adapter
-
             property string currentWallpaperPath: ""
 			property string lockscreenBg: `${Paths.state}/lockscreen_bg.png`
         }

Helpers/Wallpapers.qml

@@ -11,52 +11,52 @@ import qs.Paths
 Searcher {
     id: root
 
-	property string actualCurrent: WallpaperPath.currentWallpaperPath
+    property bool showPreview: false
     readonly property string current: showPreview ? previewPath : actualCurrent
     property string previewPath
-	property bool showPreview: false
+    property string actualCurrent: WallpaperPath.currentWallpaperPath
-
-	function preview(path: string): void {
-		previewPath = path;
-		if (Config.general.color.schemeGeneration)
-			Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path ${previewPath} --thumbnail-path ${Paths.cache}/imagecache/thumbnail.jpg --output ${Paths.state}/scheme.json --scheme ${Config.colors.schemeType} --mode ${Config.general.color.mode}`]);
-		showPreview = true;
-	}
 
     function setWallpaper(path: string): void {
         actualCurrent = path;
         WallpaperPath.currentWallpaperPath = path;
-		if (Config.general.color.wallust)
+		if ( Config.general.color.wallust )
 			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
 		Quickshell.execDetached(["sh", "-c", `zshell-cli wallpaper lockscreen --input-image=${root.actualCurrent} --output-path=${Paths.state}/lockscreen_bg.png --blur-amount=${Config.lock.blurAmount}`]);
     }
 
+    function preview(path: string): void {
+        previewPath = path;
+		if ( Config.general.color.schemeGeneration )
+			Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path ${previewPath} --thumbnail-path ${Paths.cache}/imagecache/thumbnail.jpg --output ${Paths.state}/scheme.json --scheme ${Config.colors.schemeType} --mode ${Config.general.color.mode}`]);
+        showPreview = true;
+    }
+
     function stopPreview(): void {
         showPreview = false;
-		if (Config.general.color.schemeGeneration)
+		if ( Config.general.color.schemeGeneration )
 			Quickshell.execDetached(["sh", "-c", `zshell-cli scheme generate --image-path ${root.actualCurrent} --thumbnail-path ${Paths.cache}/imagecache/thumbnail.jpg --output ${Paths.state}/scheme.json --scheme ${Config.colors.schemeType} --mode ${Config.general.color.mode}`]);
     }
 
+    list: wallpapers.entries
+    key: "relativePath"
+    useFuzzy: true
     extraOpts: useFuzzy ? ({}) : ({
             forward: false
         })
-	key: "relativePath"
-	list: wallpapers.entries
-	useFuzzy: true
 
 	IpcHandler {
+		target: "wallpaper"
+
 		function set(path: string): void {
 			root.setWallpaper(path);
 		}
-
-		target: "wallpaper"
 	}
 
     FileSystemModel {
         id: wallpapers
 
-		filter: FileSystemModel.Images
-		path: Config.general.wallpaperPath
         recursive: true
+        path: Config.general.wallpaperPath
+        filter: FileSystemModel.Images
     }
 }

Helpers/Wallust.qml

@@ -1,26 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Io
-import QtQuick
-import qs.Config
-
-Singleton {
-	id: root
-
-	property var args
-	readonly property string mode: Config.general.color.mode
-	readonly property string threshold: mode === "dark" ? "--threshold=9" : "--dynamic-threshold"
-
-	function generateColors(wallpaperPath) {
-		root.args = wallpaperPath;
-		wallustProc.running = true;
-	}
-
-	Process {
-		id: wallustProc
-
-		command: ["wallust", "run", root.args, `--palette=${root.mode}`, "--ignore-sequence=cursor", `${root.threshold}`]
-		running: false
-	}
-}

Helpers/Weather.qml

@@ -8,20 +8,44 @@ import qs.Config
 Singleton {
     id: root
 
-	readonly property var cachedCities: new Map()
-	property var cc
     property string city
-	readonly property string description: cc?.weatherDesc ?? qsTr("No weather")
+    property string loc
-	readonly property string feelsLike: `${cc?.feelsLikeC ?? 0}°C`
+    property var cc
     property list<var> forecast
     property list<var> hourlyForecast
-	readonly property int humidity: cc?.humidity ?? 0
+
     readonly property string icon: cc ? Icons.getWeatherIcon(cc.weatherCode) : "cloud_alert"
-	property string loc
+    readonly property string description: cc?.weatherDesc ?? qsTr("No weather")
+    readonly property string temp: `${cc?.tempC ?? 0}°C`
+    readonly property string feelsLike: `${cc?.feelsLikeC ?? 0}°C`
+    readonly property int humidity: cc?.humidity ?? 0
+    readonly property real windSpeed: cc?.windSpeed ?? 0
     readonly property string sunrise: cc ? Qt.formatDateTime(new Date(cc.sunrise), "h:mm") : "--:--"
     readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), "h:mm") : "--:--"
-	readonly property string temp: `${cc?.tempC ?? 0}°C`
+
-	readonly property real windSpeed: cc?.windSpeed ?? 0
+    readonly property var cachedCities: new Map()
+
+    function reload(): void {
+        const configLocation = Config.services.weatherLocation;
+
+        if (configLocation) {
+            if (configLocation.indexOf(",") !== -1 && !isNaN(parseFloat(configLocation.split(",")[0]))) {
+                loc = configLocation;
+                fetchCityFromCoords(configLocation);
+            } else {
+                fetchCoordsFromCity(configLocation);
+            }
+        } else if (!loc || timer.elapsed() > 900) {
+            Requests.get("https://ipinfo.io/json", text => {
+                const response = JSON.parse(text);
+                if (response.loc) {
+                    loc = response.loc;
+                    city = response.city ?? "";
+                    timer.restart();
+                }
+            });
+        }
+    }
 
     function fetchCityFromCoords(coords: string): void {
         if (cachedCities.has(coords)) {
@@ -116,6 +140,21 @@ Singleton {
         });
     }
 
+    function toFahrenheit(celcius: real): real {
+        return celcius * 9 / 5 + 32;
+    }
+
+    function getWeatherUrl(): string {
+        if (!loc || loc.indexOf(",") === -1)
+            return "";
+
+        const [lat, lon] = loc.split(",");
+        const baseUrl = "https://api.open-meteo.com/v1/forecast";
+        const params = ["latitude=" + lat, "longitude=" + lon, "hourly=weather_code,temperature_2m", "daily=weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset", "current=temperature_2m,relative_humidity_2m,apparent_temperature,is_day,weather_code,wind_speed_10m", "timezone=auto", "forecast_days=7"];
+
+        return baseUrl + "?" + params.join("&");
+    }
+
     function getWeatherCondition(code: string): string {
         const conditions = {
             "0": "Clear",
@@ -150,56 +189,17 @@ Singleton {
         return conditions[code] || "Unknown";
     }
 
-	function getWeatherUrl(): string {
-		if (!loc || loc.indexOf(",") === -1)
-			return "";
-
-		const [lat, lon] = loc.split(",");
-		const baseUrl = "https://api.open-meteo.com/v1/forecast";
-		const params = ["latitude=" + lat, "longitude=" + lon, "hourly=weather_code,temperature_2m", "daily=weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset", "current=temperature_2m,relative_humidity_2m,apparent_temperature,is_day,weather_code,wind_speed_10m", "timezone=auto", "forecast_days=7"];
-
-		return baseUrl + "?" + params.join("&");
-	}
-
-	function reload(): void {
-		const configLocation = Config.services.weatherLocation;
-
-		if (configLocation) {
-			if (configLocation.indexOf(",") !== -1 && !isNaN(parseFloat(configLocation.split(",")[0]))) {
-				loc = configLocation;
-				fetchCityFromCoords(configLocation);
-			} else {
-				fetchCoordsFromCity(configLocation);
-			}
-		} else if (!loc || timer.elapsed() > 900) {
-			Requests.get("https://ipinfo.io/json", text => {
-				const response = JSON.parse(text);
-				if (response.loc) {
-					loc = response.loc;
-					city = response.city ?? "";
-					timer.restart();
-				}
-			});
-		}
-	}
-
-	function toFahrenheit(celcius: real): real {
-		return celcius * 9 / 5 + 32;
-	}
-
     onLocChanged: fetchWeatherData()
 
     // Refresh current location hourly
     Timer {
         interval: 3600000 // 1 hour
-		repeat: true
         running: true
-
+        repeat: true
         onTriggered: fetchWeatherData()
     }
 
     ElapsedTimer {
         id: timer
-
     }
 }

Helpers/Year.qml

@@ -1,56 +1,420 @@
 import Quickshell.Io
 
 JsonObject {
-	property list<var> week_0: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_0: [
-	property list<var> week_1: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_10: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_11: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_12: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_13: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_14: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_15: [0, 0, 0, 0, 0, 0,]
+	]
-	property list<var> week_16: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_1: [
-	property list<var> week_17: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_18: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_19: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_2: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_20: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_21: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_22: [0, 0, 0, 0, 0, 0,]
+	]
-	property list<var> week_23: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_2: [
-	property list<var> week_24: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_25: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_26: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_27: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_28: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_29: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_3: [0, 0, 0, 0, 0, 0,]
+	]
-	property list<var> week_30: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_3: [
-	property list<var> week_31: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_32: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_33: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_34: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_35: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_36: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_37: [0, 0, 0, 0, 0, 0,]
+	]
-	property list<var> week_38: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_4: [
-	property list<var> week_39: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_4: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_40: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_41: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_42: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_43: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_44: [0, 0, 0, 0, 0, 0,]
+	]
-	property list<var> week_45: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_5: [
-	property list<var> week_46: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_47: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_48: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_49: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_5: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_50: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_51: [0, 0, 0, 0, 0, 0,]
+	]
-	property list<var> week_6: [0, 0, 0, 0, 0, 0,]
+	property list<var> week_6: [
-	property list<var> week_7: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_8: [0, 0, 0, 0, 0, 0,]
+		0,
-	property list<var> week_9: [0, 0, 0, 0, 0, 0,]
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_7: [
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_8: [
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_9: [
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_10:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_11:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_12:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_13:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_14:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_15:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_16:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_17:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_18:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_19:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_20:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_21:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_22:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_23:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_24:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_25:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_26:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_27:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_28:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_29:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_30:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_31:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_32:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_33:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_34:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_35:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_36:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_37:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_38:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_39:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_40:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_41:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_42:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_43:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_44:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_45:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_46:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_47:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_48:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_49:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_50:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
+	property list<var> week_51:[
+		0,
+		0,
+		0,
+		0,
+		0,
+		0,
+	]
 }

Modules/Anim.qml

@@ -0,0 +1,9 @@
+import QtQuick
+import qs.Modules
+import qs.Config
+
+NumberAnimation {
+    duration: MaterialEasing.standardTime
+    easing.type: Easing.BezierSpline
+    easing.bezierCurve: MaterialEasing.standard
+}

Modules/AudioPopup.qml

@@ -14,63 +14,66 @@ import qs.Helpers
 Item {
     id: root
 
-	readonly property int rounding: 6
-	readonly property int topMargin: 0
-	required property var wrapper
-
-	implicitHeight: layout.implicitHeight + 5 * 2
     implicitWidth: layout.implicitWidth + 5 * 2
+    implicitHeight: layout.implicitHeight + 5 * 2
+
+	readonly property int topMargin: 0
+	readonly property int rounding: 6
+
+    required property var wrapper
 
     ColumnLayout {
         id: layout
 
-		anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
 		implicitWidth: stack.currentItem ? stack.currentItem.childrenRect.height : 0
 		spacing: 12
 
 		RowLayout {
 			id: tabBar
-
+			spacing: 6
+			Layout.fillWidth: true
 			property int tabHeight: 36
 
-			Layout.fillWidth: true
-			spacing: 6
-
 			CustomClippingRect {
+				radius: 6
 				Layout.fillWidth: true
 				Layout.preferredHeight: tabBar.tabHeight
+
 				color: stack.currentIndex === 0 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
-				radius: 6
 
 				StateLayer {
+
 					function onClicked(): void {
 						stack.currentIndex = 0;
 					}
 
 					CustomText {
+						text: qsTr("Volumes")
 						anchors.centerIn: parent
 						color: stack.currentIndex === 0 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-						text: qsTr("Volumes")
 					}
 				}
 			}
 
 			CustomClippingRect {
+				radius: 6
 				Layout.fillWidth: true
 				Layout.preferredHeight: tabBar.tabHeight
+
 				color: stack.currentIndex === 1 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
-				radius: 6
 
 				StateLayer {
+
 					function onClicked(): void {
 						stack.currentIndex = 1;
 					}
 
 					CustomText {
+						text: qsTr("Devices")
 						anchors.centerIn: parent
 						color: stack.currentIndex === 1 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-						text: qsTr("Devices")
 					}
 				}
 			}
@@ -78,246 +81,175 @@ Item {
 
 		StackLayout {
 			id: stack
-
 			Layout.fillWidth: true
 			Layout.preferredHeight: currentIndex === 0 ? vol.childrenRect.height : dev.childrenRect.height
 			currentIndex: 0
 
+			VolumesTab { id: vol }
+			DevicesTab { id: dev }
+
 			Behavior on currentIndex {
 				SequentialAnimation {
 					ParallelAnimation {
 						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "opacity"
 							target: stack
+							property: "opacity"
 							to: 0
+							duration: MaterialEasing.expressiveEffectsTime
 						}
 
 						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "scale"
 							target: stack
+							property: "scale"
 							to: 0.9
+							duration: MaterialEasing.expressiveEffectsTime
 						}
 					}
 
-					PropertyAction {
+					PropertyAction {}
-					}
 
 					ParallelAnimation {
 						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "opacity"
 							target: stack
+							property: "opacity"
 							to: 1
+							duration: MaterialEasing.expressiveEffectsTime
 						}
 
 						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "scale"
 							target: stack
+							property: "scale"
 							to: 1
+							duration: MaterialEasing.expressiveEffectsTime
+						}
+					}
 				}
 			}
 		}
     }
 
-			VolumesTab {
-				id: vol
-
-			}
-
-			DevicesTab {
-				id: dev
-
-			}
-		}
-	}
-
-	component DevicesTab: ColumnLayout {
-		spacing: 12
-
-		ButtonGroup {
-			id: sinks
-
-		}
-
-		ButtonGroup {
-			id: sources
-
-		}
-
-		CustomText {
-			font.weight: 500
-			text: qsTr("Output device")
-		}
-
-		Repeater {
-			model: Audio.sinks
-
-			CustomRadioButton {
-				required property PwNode modelData
-
-				ButtonGroup.group: sinks
-				checked: Audio.sink?.id === modelData.id
-				text: modelData.description
-
-				onClicked: Audio.setAudioSink(modelData)
-			}
-		}
-
-		CustomText {
-			Layout.topMargin: 10
-			font.weight: 500
-			text: qsTr("Input device")
-		}
-
-		Repeater {
-			model: Audio.sources
-
-			CustomRadioButton {
-				required property PwNode modelData
-
-				ButtonGroup.group: sources
-				checked: Audio.source?.id === modelData.id
-				text: modelData.description
-
-				onClicked: Audio.setAudioSource(modelData)
-			}
-		}
-	}
 	component VolumesTab: ColumnLayout {
 		spacing: 12
 
 		CustomRect {
-			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
+			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.fillWidth: true
 			color: DynamicColors.tPalette.m3surfaceContainer
+
 			radius: root.rounding
 
 			RowLayout {
 				id: outputVolume
-
-				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
+				anchors.left: parent.left
+				anchors.right: parent.right
+				anchors.margins: Appearance.spacing.smaller
 				spacing: 15
-
 				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
 					Layout.preferredWidth: 40
+					Layout.preferredHeight: 40
+					Layout.alignment: Qt.AlignVCenter
 					color: DynamicColors.palette.m3primary
 					radius: 1000
-
 					MaterialIcon {
-						anchors.alignWhenCentered: false
 						anchors.centerIn: parent
 						color: DynamicColors.palette.m3onPrimary
-						font.pointSize: 22
 						text: "speaker"
+						font.pointSize: 22
 					}
 				}
 
 				ColumnLayout {
 					Layout.fillWidth: true
-
 					RowLayout {
 						Layout.fillWidth: true
 
 						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillWidth: true
 							text: "Output Volume"
+							Layout.fillWidth: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 						}
 
 						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+							text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`);
 							font.bold: true
-							text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
 						}
 					}
 
 					CustomMouseArea {
-						Layout.bottomMargin: 5
 						Layout.fillWidth: true
 						Layout.preferredHeight: 10
+						Layout.bottomMargin: 5
 
 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
 							implicitHeight: 10
 							value: Audio.volume
-
-							Behavior on value {
-								Anim {
-								}
-							}
-
 							onMoved: Audio.setVolume(value)
+
+							Behavior on value { Anim {} }
 						}
 					}
 				}
 			}
 		}
 
+
 		CustomRect {
+			Layout.topMargin: root.topMargin
 			Layout.fillWidth: true
 			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
-			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
+
 			radius: root.rounding
 
 			RowLayout {
 				id: inputVolume
-
-				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
+				anchors.left: parent.left
+				anchors.right: parent.right
+				anchors.margins: Appearance.spacing.smaller
 				spacing: 15
-
 				Rectangle {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
 					Layout.preferredWidth: 40
+					Layout.preferredHeight: 40
+					Layout.alignment: Qt.AlignVCenter
 					color: DynamicColors.palette.m3primary
 					radius: 1000
-
 					MaterialIcon {
-						anchors.alignWhenCentered: false
 						anchors.centerIn: parent
+						anchors.alignWhenCentered: false
 						color: DynamicColors.palette.m3onPrimary
-						font.pointSize: 22
 						text: "mic"
+						font.pointSize: 22
 					}
 				}
 
 				ColumnLayout {
 					Layout.fillWidth: true
-
 					RowLayout {
-						Layout.fillHeight: true
 						Layout.fillWidth: true
+						Layout.fillHeight: true
 
 						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillWidth: true
 							text: "Input Volume"
+							Layout.fillWidth: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 						}
 
 						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+							text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`);
 							font.bold: true
-							text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`)
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
 						}
 					}
 
 					CustomMouseArea {
-						Layout.bottomMargin: 5
 						Layout.fillWidth: true
+						Layout.bottomMargin: 5
 						implicitHeight: 10
 
 						CustomSlider {
@@ -325,13 +257,9 @@ Item {
 							anchors.right: parent.right
 							implicitHeight: 10
 							value: Audio.sourceVolume
-
-							Behavior on value {
-								Anim {
-								}
-							}
-
 							onMoved: Audio.setSourceVolume(value)
+
+							Behavior on value { Anim {} }
 						}
 					}
 				}
@@ -339,9 +267,10 @@ Item {
 		}
 
 		Rectangle {
+			Layout.topMargin: root.topMargin
 			Layout.fillWidth: true
 			Layout.preferredHeight: 1
-			Layout.topMargin: root.topMargin
+
 			color: DynamicColors.tPalette.m3outline
 		}
 
@@ -351,40 +280,39 @@ Item {
 			CustomRect {
 				id: appBox
 
-				required property int index
+				Layout.topMargin: root.topMargin
-				required property var modelData
-
 				Layout.fillWidth: true
 				Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
-				Layout.topMargin: root.topMargin
 				color: DynamicColors.tPalette.m3surfaceContainer
+
 				radius: root.rounding
 
+
+				required property var modelData
+				required property int index
+
 				RowLayout {
 					id: layoutVolume
-
 					anchors.fill: parent
 					anchors.margins: Appearance.spacing.smaller
 					spacing: 15
 
+
 					CustomRect {
-						Layout.alignment: Qt.AlignVCenter
-						Layout.preferredHeight: 40
 						Layout.preferredWidth: 40
+						Layout.preferredHeight: 40
+						Layout.alignment: Qt.AlignVCenter
 						color: DynamicColors.palette.m3primary
 						radius: 1000
-
 						MaterialIcon {
 							id: icon
-
 							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onPrimary
-							font.pointSize: 22
 							text: "volume_up"
+							font.pointSize: 22
+							color: DynamicColors.palette.m3onPrimary
 
 							StateLayer {
 								radius: 1000
-
 								onClicked: {
 									appBox.modelData.audio.muted = !appBox.modelData.audio.muted;
 								}
@@ -398,46 +326,42 @@ Item {
 
 						TextMetrics {
 							id: metrics
-
+							text: Audio.getStreamName(appBox.modelData)
 							elide: Text.ElideRight
 							elideWidth: root.width - 50
-							text: Audio.getStreamName(appBox.modelData)
 						}
 
 						RowLayout {
-							Layout.fillHeight: true
 							Layout.fillWidth: true
-
+							Layout.fillHeight: true
 							CustomText {
-								Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-								Layout.fillHeight: true
-								Layout.fillWidth: true
-								elide: Text.ElideRight
 								text: metrics.elidedText
+								elide: Text.ElideRight
+								Layout.fillWidth: true
+								Layout.fillHeight: true
+								Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 							}
 
 							CustomText {
-								Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+								text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`);
-								Layout.fillHeight: true
 								font.bold: true
-								text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`)
+								Layout.fillHeight: true
+								Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
 							}
 						}
 
 						CustomMouseArea {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillHeight: true
 							Layout.fillWidth: true
+							Layout.fillHeight: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 							implicitHeight: 10
-
 							CustomSlider {
 								anchors.left: parent.left
 								anchors.right: parent.right
 								implicitHeight: 10
 								value: appBox.modelData.audio.volume
-
 								onMoved: {
-									Audio.setStreamVolume(appBox.modelData, value);
+									Audio.setStreamVolume(appBox.modelData, value)
 								}
 							}
 						}
@@ -446,4 +370,48 @@ Item {
 			}
 		}
 	}
+
+	component DevicesTab: ColumnLayout {
+		spacing: 12
+
+		ButtonGroup { id: sinks }
+		ButtonGroup { id: sources }
+
+		CustomText {
+			text: qsTr("Output device")
+			font.weight: 500
+		}
+
+		Repeater {
+			model: Audio.sinks
+
+			CustomRadioButton {
+				required property PwNode modelData
+
+				ButtonGroup.group: sinks
+				checked: Audio.sink?.id === modelData.id
+				onClicked: Audio.setAudioSink(modelData)
+				text: modelData.description
+			}
+		}
+
+		CustomText {
+			Layout.topMargin: 10
+			text: qsTr("Input device")
+			font.weight: 500
+		}
+
+		Repeater {
+			model: Audio.sources
+
+			CustomRadioButton {
+				required property PwNode modelData
+
+				ButtonGroup.group: sources
+				checked: Audio.source?.id === modelData.id
+				onClicked: Audio.setAudioSource(modelData)
+				text: modelData.description
+			}
+		}
+	}
 }

Modules/AudioWidget.qml

@@ -9,13 +9,13 @@ import qs.Components
 
 Item {
     id: root
-
+    implicitWidth: expanded ? 300 : 150
-	property color barColor: DynamicColors.palette.m3primary
-	property color textColor: DynamicColors.palette.m3onSurface
-
-	anchors.bottom: parent.bottom
     anchors.top: parent.top
-	implicitWidth: 150
+    anchors.bottom: parent.bottom
+
+    property bool expanded: false
+    property color textColor: DynamicColors.palette.m3onSurface
+    property color barColor: DynamicColors.palette.m3primary
 
     Behavior on implicitWidth {
         NumberAnimation {
@@ -24,77 +24,95 @@ Item {
         }
     }
 
-	CustomRect {
+    Rectangle {
+        anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.right: parent.right
-		anchors.verticalCenter: parent.verticalCenter
-		color: DynamicColors.tPalette.m3surfaceContainer
         height: 22
         radius: height / 2
+        color: DynamicColors.tPalette.m3surfaceContainer
+
+        Behavior on color {
+            CAnim {}
+        }
+
+        Rectangle {
+            anchors.centerIn: parent
+            width: parent.width
+            height: parent.height
+            radius: width / 2
+            color: "transparent"
+            border.color: "#30ffffff"
+            border.width: 0
         }
 
         RowLayout {
-		id: layout
+            anchors {
-
+                fill: parent
-		anchors.fill: parent
+                leftMargin: 10
-		anchors.leftMargin: Appearance.padding.small
+                rightMargin: 15
-		anchors.rightMargin: Appearance.padding.small * 2
+            }
-		anchors.verticalCenter: parent.verticalCenter
 
             MaterialIcon {
                 Layout.alignment: Qt.AlignVCenter
-			animate: true
+                font.pixelSize: 18
-			color: Audio.muted ? DynamicColors.palette.m3error : root.textColor
-			font.pointSize: 14
                 text: Audio.muted ? "volume_off" : "volume_up"
+                color: Audio.muted ? DynamicColors.palette.m3error : root.textColor
             }
 
-		CustomRect {
+            Rectangle {
                 Layout.fillWidth: true
-			color: "#50ffffff"
+
                 implicitHeight: 4
                 radius: 20
+                color: "#50ffffff"
 
-			CustomRect {
+                Rectangle {
                     id: sinkVolumeBar
-
-				color: Audio.muted ? DynamicColors.palette.m3error : root.barColor
-				implicitWidth: parent.width * (Audio.volume ?? 0)
-				radius: parent.radius
-
                     anchors {
-					bottom: parent.bottom
                         left: parent.left
                         top: parent.top
+                        bottom: parent.bottom
+                    }
+
+                    implicitWidth: parent.width * ( Audio.volume ?? 0 )
+                    radius: parent.radius
+					color: Audio.muted ? DynamicColors.palette.m3error : root.barColor
+                    Behavior on color {
+                        CAnim {}
                     }
                 }
             }
 
             MaterialIcon {
                 Layout.alignment: Qt.AlignVCenter
-			animate: true
+                font.pixelSize: 18
-			color: (Audio.sourceMuted ?? false) ? DynamicColors.palette.m3error : root.textColor
-			font.pointSize: 14
                 text: Audio.sourceMuted ? "mic_off" : "mic"
+                color: ( Audio.sourceMuted ?? false ) ? DynamicColors.palette.m3error : root.textColor
             }
 
-		CustomRect {
+            Rectangle {
                 Layout.fillWidth: true
-			color: "#50ffffff"
+
                 implicitHeight: 4
                 radius: 20
+                color: "#50ffffff"
 
-			CustomRect {
+                Rectangle {
                     id: sourceVolumeBar
-
-				color: (Audio.sourceMuted ?? false) ? DynamicColors.palette.m3error : root.barColor
-				implicitWidth: parent.width * (Audio.sourceVolume ?? 0)
-				radius: parent.radius
-
                     anchors {
-					bottom: parent.bottom
                         left: parent.left
                         top: parent.top
+                        bottom: parent.bottom
+                    }
+
+                    implicitWidth: parent.width * ( Audio.sourceVolume ?? 0 )
+                    radius: parent.radius
+                    color: ( Audio.sourceMuted ?? false ) ? DynamicColors.palette.m3error : root.barColor
+
+                    Behavior on color {
+                        CAnim {}
+                    }
                 }
             }
         }

Modules/Background.qml

@@ -1,31 +1,25 @@
 import QtQuick
 import QtQuick.Shapes
-import qs.Components
 import qs.Config
 
 ShapePath {
     id: root
 
-	readonly property bool flatten: wrapper.height < rounding * 2
+    required property Wrapper wrapper
-	property real ibr: invertBottomRounding ? -1 : 1
     required property bool invertBottomRounding
     readonly property real rounding: 8
+    readonly property bool flatten: wrapper.height < rounding * 2
     readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
+    property real ibr: invertBottomRounding ? -1 : 1
 
-	fillColor: DynamicColors.palette.m3surface
     strokeWidth: -1
-
+    fillColor: DynamicColors.palette.m3surface
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
 
     PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
         relativeX: root.rounding
         relativeY: root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
     }
 
     PathLine {
@@ -34,11 +28,11 @@ ShapePath {
     }
 
     PathArc {
-		direction: root.invertBottomRounding ? PathArc.Clockwise : PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
         relativeX: root.rounding
         relativeY: root.roundingY * root.ibr
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+        direction: root.invertBottomRounding ? PathArc.Clockwise : PathArc.Counterclockwise
     }
 
     PathLine {
@@ -47,22 +41,26 @@ ShapePath {
     }
 
     PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
         relativeX: root.rounding
         relativeY: -root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+        direction: PathArc.Counterclockwise
     }
 
     PathLine {
         relativeX: 0
-		relativeY: -(root.wrapper.height - root.roundingY * 2)
+        relativeY: -( root.wrapper.height - root.roundingY * 2 )
     }
 
     PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
         relativeX: root.rounding
         relativeY: -root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+    }
+
+    Behavior on fillColor {
+        CAnim {}
     }
 }