esc handling for resources

WlrLayershell.namespace fix
resource popout
2026-02-28 18:18:52 +01:00 · 2026-02-28 14:03:51 +01:00 · 2026-02-28 13:57:29 +01:00 · 2026-02-28 00:23:29 +01:00 · 2026-02-27 14:46:09 +01:00 · 2026-02-26 16:27:05 +01:00
219 changed files with 17672 additions and 13831 deletions
@@ -0,0 +1,10 @@
+[General]
+FunctionsSpacing=true
+IndentWidth=4
+MaxColumnWidth=-1
+NewlineType=native
+NormalizeOrder=true
+ObjectsSpacing=true
+SemicolonRule=always
+SortImports=false
+UseTabs=true
@@ -1,197 +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 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
-                    }
-                }
-            }
-        }
-    }
-}
@@ -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 Bar.qml Wallpaper.qml DESTINATION "${INSTALL_QSCONFDIR}")
+	install(FILES shell.qml DESTINATION "${INSTALL_QSCONFDIR}")
 endif()
@@ -0,0 +1,8 @@
+import QtQuick
+import qs.Config
+
+NumberAnimation {
+	duration: MaterialEasing.standardTime
+	easing.bezierCurve: MaterialEasing.standard
+	easing.type: Easing.BezierSpline
+}
@@ -0,0 +1,8 @@
+import QtQuick
+import qs.Config
+
+ColorAnimation {
+	duration: MaterialEasing.standardTime
+	easing.bezierCurve: MaterialEasing.standard
+	easing.type: Easing.BezierSpline
+}
@@ -1,108 +1,102 @@
-import qs.Helpers
 import qs.Config
-import qs.Modules
 import ZShell.Internal
 import QtQuick
 import QtQuick.Templates

 BusyIndicator {
-    id: root
+	id: root

-    enum AnimType {
-        Advance = 0,
-        Retreat
-    }
+	enum AnimState {
+		Stopped,
+		Running,
+		Completing
+	}
+	enum AnimType {
+		Advance = 0,
+		Retreat
+	}

-    enum AnimState {
-        Stopped,
-        Running,
-        Completing
-    }
+	property int animState
+	property color bgColour: DynamicColors.palette.m3secondaryContainer
+	property color fgColour: DynamicColors.palette.m3primary
+	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 alias type: manager.indeterminateAnimationType

-    property real implicitSize: Appearance.font.size.normal * 3
-    property real strokeWidth: Appearance.padding.small * 0.8
-    property color fgColour: DynamicColors.palette.m3primary
-    property color bgColour: DynamicColors.palette.m3secondaryContainer
+	implicitHeight: implicitSize
+	implicitWidth: implicitSize
+	padding: 0

-    property alias type: manager.indeterminateAnimationType
-    readonly property alias progress: manager.progress
+	contentItem: CircularProgress {
+		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

-    property real internalStrokeWidth: strokeWidth
-    property int animState
+		PropertyChanges {
+			root.internalStrokeWidth: root.strokeWidth / 3
+			root.opacity: 0
+		}
+	}
+	transitions: Transition {
+		Anim {
+			duration: manager.completeEndDuration * Appearance.anim.durations.scale
+			properties: "opacity,internalStrokeWidth"
+		}
+	}

-    padding: 0
-    implicitWidth: implicitSize
-    implicitHeight: implicitSize
+	Component.onCompleted: {
+		if (running) {
+			running = false;
+			running = true;
+		}
+	}
+	onRunningChanged: {
+		if (running) {
+			manager.completeEndProgress = 0;
+			animState = CircularIndicator.Running;
+		} else {
+			if (animState == CircularIndicator.Running)
+				animState = CircularIndicator.Completing;
+		}
+	}

-    Component.onCompleted: {
-        if (running) {
-            running = false;
-            running = true;
-        }
-    }
+	CircularIndicatorManager {
+		id: manager

-    onRunningChanged: {
-        if (running) {
-            manager.completeEndProgress = 0;
-            animState = CircularIndicator.Running;
-        } else {
-            if (animState == CircularIndicator.Running)
-                animState = CircularIndicator.Completing;
-        }
-    }
+	}

-    states: State {
-        name: "stopped"
-        when: !root.running
+	NumberAnimation {
+		duration: manager.duration * Appearance.anim.durations.scale
+		from: 0
+		loops: Animation.Infinite
+		property: "progress"
+		running: root.animState !== CircularIndicator.Stopped
+		target: manager
+		to: 1
+	}

-        PropertyChanges {
-            root.opacity: 0
-            root.internalStrokeWidth: root.strokeWidth / 3
-        }
-    }
+	NumberAnimation {
+		duration: manager.completeEndDuration * Appearance.anim.durations.scale
+		from: 0
+		property: "completeEndProgress"
+		running: root.animState === CircularIndicator.Completing
+		target: manager
+		to: 1

-    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 {
-        running: root.animState !== CircularIndicator.Stopped
-        loops: Animation.Infinite
-        target: manager
-        property: "progress"
-        from: 0
-        to: 1
-        duration: manager.duration * Appearance.anim.durations.scale
-    }
-
-    NumberAnimation {
-        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;
-        }
-    }
+		onFinished: {
+			if (root.animState === CircularIndicator.Completing)
+				root.animState = CircularIndicator.Stopped;
+		}
+	}
 }
@@ -1,69 +1,66 @@
 import QtQuick
 import QtQuick.Shapes
-import qs.Helpers
 import qs.Config
-import qs.Modules

 Shape {
-    id: root
+	id: root

-    property real value
-    property int startAngle: -90
-    property int strokeWidth: Appearance.padding.smaller
-    property int padding: 0
-    property int spacing: Appearance.spacing.small
-    property color fgColour: DynamicColors.palette.m3primary
-    property color bgColour: DynamicColors.palette.m3secondaryContainer
+	readonly property real arcRadius: (size - padding - strokeWidth) / 2
+	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 real value

-    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

-    preferredRendererType: Shape.CurveRenderer
-    asynchronous: true
+	ShapePath {
+		capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+		fillColor: "transparent"
+		strokeColor: root.bgColour
+		strokeWidth: root.strokeWidth

-    ShapePath {
-        fillColor: "transparent"
-        strokeColor: root.bgColour
-        strokeWidth: root.strokeWidth
-        capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+		Behavior on strokeColor {
+			CAnim {
+				duration: Appearance.anim.durations.large
+			}
+		}

-        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
-        }
+		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)
+		}
+	}

-        Behavior on strokeColor {
-            CAnim {
-                duration: Appearance.anim.durations.large
-            }
-        }
-    }
+	ShapePath {
+		capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+		fillColor: "transparent"
+		strokeColor: root.fgColour
+		strokeWidth: root.strokeWidth

-    ShapePath {
-        fillColor: "transparent"
-        strokeColor: root.fgColour
-        strokeWidth: root.strokeWidth
-        capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+		Behavior on strokeColor {
+			CAnim {
+				duration: Appearance.anim.durations.large
+			}
+		}

-        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
+		}
+	}
 }
@@ -0,0 +1,135 @@
+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
+			}
+		}
+	}
+}
@@ -5,31 +5,30 @@ import Quickshell.Widgets
 import QtQuick

 IconImage {
-    id: root
+	id: root

-    required property color color
+	required property color color

-    asynchronous: true
+	asynchronous: true
+	layer.enabled: true

-    layer.enabled: true
-    layer.effect: Coloriser {
-        sourceColor: analyser.dominantColour
-        colorizationColor: root.color
-    }
+	layer.effect: Coloriser {
+		colorizationColor: root.color
+		sourceColor: analyser.dominantColour
+	}

-    layer.onEnabledChanged: {
-        if (layer.enabled && status === Image.Ready)
-            analyser.requestUpdate();
-    }
+	layer.onEnabledChanged: {
+		if (layer.enabled && status === Image.Ready)
+			analyser.requestUpdate();
+	}
+	onStatusChanged: {
+		if (layer.enabled && status === Image.Ready)
+			analyser.requestUpdate();
+	}

-    onStatusChanged: {
-        if (layer.enabled && status === Image.Ready)
-            analyser.requestUpdate();
-    }
+	ImageAnalyser {
+		id: analyser

-    ImageAnalyser {
-        id: analyser
-
-        sourceItem: root
-    }
+		sourceItem: root
+	}
 }
@@ -1,14 +1,14 @@
 import QtQuick
 import QtQuick.Effects
-import qs.Modules

 MultiEffect {
-    property color sourceColor: "black"
+	property color sourceColor: "black"

-    colorization: 1
-    brightness: 1 - sourceColor.hslLightness
+	brightness: 1 - sourceColor.hslLightness
+	colorization: 1

-    Behavior on colorizationColor {
-        CAnim {}
-    }
+	Behavior on colorizationColor {
+		CAnim {
+		}
+	}
 }
@@ -1,83 +1,70 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Config
-import qs.Modules

 Slider {
-    id: root
+	id: root

-	required property real peak
 	property color nonPeakColor: DynamicColors.tPalette.m3primary
+	required property real peak
 	property color peakColor: DynamicColors.palette.m3primary

-    background: Item {
-        CustomRect {
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.topMargin: root.implicitHeight / 3
-            anchors.bottomMargin: root.implicitHeight / 3
-
-            implicitWidth: root.handle.x - root.implicitHeight
-
-            color: root.nonPeakColor
-            radius: 1000
-            topRightRadius: root.implicitHeight / 15
-            bottomRightRadius: root.implicitHeight / 15
+	background: Item {
+		CustomRect {
+			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 3
+			anchors.left: parent.left
+			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 3
+			bottomRightRadius: root.implicitHeight / 15
+			color: root.nonPeakColor
+			implicitWidth: root.handle.x - root.implicitHeight
+			radius: 1000
+			topRightRadius: 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 { duration: 50 }
+					Anim {
+						duration: 50
+					}
 				}
 			}
-        }
+		}

-        CustomRect {
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            anchors.topMargin: root.implicitHeight / 3
-            anchors.bottomMargin: root.implicitHeight / 3
+		CustomRect {
+			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 3
+			anchors.right: parent.right
+			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 3
+			bottomLeftRadius: root.implicitHeight / 15
+			color: DynamicColors.tPalette.m3surfaceContainer
+			implicitWidth: root.implicitWidth - root.handle.x - root.handle.implicitWidth - root.implicitHeight
+			radius: 1000
+			topLeftRadius: 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: 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 {
-        x: root.visualPosition * root.availableWidth - implicitWidth / 2
-
-        implicitWidth: 5
-        implicitHeight: 15
-        anchors.verticalCenter: parent.verticalCenter
-
-        color: DynamicColors.palette.m3primary
-        radius: 1000
-
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.NoButton
-            cursorShape: Qt.PointingHandCursor
-        }
-    }
+		MouseArea {
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+		}
+	}
 }
@@ -2,64 +2,68 @@ import QtQuick
 import QtQuick.Controls.Basic

 BusyIndicator {
-    id: control
-	property color color: delegate.color
+	id: control
+
 	property int busySize: 64
+	property color color: delegate.color

-    contentItem: Item {
-        implicitWidth: control.busySize
-        implicitHeight: control.busySize
+	contentItem: Item {
+		implicitHeight: control.busySize
+		implicitWidth: control.busySize

-        Item {
-            id: item
-            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
+		Item {
+			id: item

-            Behavior on opacity {
-                OpacityAnimator {
-                    duration: 250
-                }
-            }
+			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)

-            RotationAnimator {
-                target: item
-                running: control.visible && control.running
-                from: 0
-                to: 360
-                loops: Animation.Infinite
-                duration: 1250
-            }
+			Behavior on opacity {
+				OpacityAnimator {
+					duration: 250
+				}
+			}

-            Repeater {
-                id: repeater
-                model: 6
+			RotationAnimator {
+				duration: 1250
+				from: 0
+				loops: Animation.Infinite
+				running: control.visible && control.running
+				target: item
+				to: 360
+			}

-                CustomRect {
-                    id: delegate
-                    x: item.width / 2 - width / 2
-                    y: item.height / 2 - height / 2
-                    implicitWidth: 10
-                    implicitHeight: 10
-                    radius: 5
-                    color: control.color
+			Repeater {
+				id: repeater

-                    required property int index
+				model: 6

-                    transform: [
-                        Translate {
-                            y: -Math.min(item.width, item.height) * 0.5 + 5
-                        },
-                        Rotation {
-                            angle: delegate.index / repeater.count * 360
-                            origin.x: 5
-                            origin.y: 5
-                        }
-                    ]
-                }
-            }
-        }
-    }
+				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
+
+					transform: [
+						Translate {
+							y: -Math.min(item.width, item.height) * 0.5 + 5
+						},
+						Rotation {
+							angle: delegate.index / repeater.count * 360
+							origin.x: 5
+							origin.y: 5
+						}
+					]
+				}
+			}
+		}
+	}
 }
@@ -4,30 +4,28 @@ import QtQuick.Controls
 Button {
 	id: control

-	required property color textColor
 	required property color bgColor
 	property int radius: 4
+	required property color textColor

-	contentItem: CustomText {
-		text: control.text
-
+	background: CustomRect {
+		color: control.bgColor
 		opacity: control.enabled ? 1.0 : 0.5
+		radius: control.radius
+	}
+	contentItem: CustomText {
 		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
 	}
 }
@@ -5,35 +5,33 @@ import qs.Config
 CheckBox {
 	id: control

-	property int checkWidth: 20
 	property int checkHeight: 20
+	property int checkWidth: 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 {
-			implicitWidth: control.checkWidth - (x * 2)
+			color: DynamicColors.palette.m3primary
 			implicitHeight: control.checkHeight - (y * 2)
+			implicitWidth: control.checkWidth - (x * 2)
+			radius: 3
+			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
-	}
 }
@@ -1,13 +1,13 @@
 import Quickshell.Widgets
 import QtQuick
-import qs.Modules

 ClippingRectangle {
-    id: root
+	id: root

-    color: "transparent"
+	color: "transparent"

-    Behavior on color {
-        CAnim {}
-    }
+	Behavior on color {
+		CAnim {
+		}
+	}
 }
@@ -1,14 +1,13 @@
 import QtQuick
-import qs.Modules

 Flickable {
-    id: root
+	id: root

-    maximumFlickVelocity: 3000
+	maximumFlickVelocity: 3000

-    rebound: Transition {
-        Anim {
-            properties: "x,y"
-        }
-    }
+	rebound: Transition {
+		Anim {
+			properties: "x,y"
+		}
+	}
 }
@@ -4,7 +4,7 @@ import Quickshell.Widgets
 import QtQuick

 IconImage {
-    id: root
+	id: root

-    asynchronous: true
+	asynchronous: true
 }
@@ -1,15 +1,13 @@
 import QtQuick
-import qs.Config
-import qs.Modules

 ListView {
-    id: root
+	id: root

-    maximumFlickVelocity: 3000
+	maximumFlickVelocity: 3000

-    rebound: Transition {
-        Anim {
-            properties: "x,y"
-        }
-    }
+	rebound: Transition {
+		Anim {
+			properties: "x,y"
+		}
+	}
 }
@@ -1,19 +1,19 @@
 import QtQuick

 MouseArea {
-    property int scrollAccumulatedY: 0
+	property int scrollAccumulatedY: 0

-    function onWheel(event: WheelEvent): void {
-    }
+	function onWheel(event: WheelEvent): void {
+	}

-    onWheel: event => {
-        if (Math.sign(event.angleDelta.y) !== Math.sign(scrollAccumulatedY))
-            scrollAccumulatedY = 0;
-        scrollAccumulatedY += event.angleDelta.y;
+	onWheel: event => {
+		if (Math.sign(event.angleDelta.y) !== Math.sign(scrollAccumulatedY))
+			scrollAccumulatedY = 0;
+		scrollAccumulatedY += event.angleDelta.y;

-        if (Math.abs(scrollAccumulatedY) >= 120) {
-            onWheel(event);
-            scrollAccumulatedY = 0;
-        }
-    }
+		if (Math.abs(scrollAccumulatedY) >= 120) {
+			onWheel(event);
+			scrollAccumulatedY = 0;
+		}
+	}
 }
@@ -1,56 +1,53 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Config
-import qs.Modules

 RadioButton {
-    id: root
+	id: root

-    font.pointSize: 12
+	font.pointSize: 12
+	implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
+	implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin

-    implicitWidth: implicitIndicatorWidth + implicitContentWidth + contentItem.anchors.leftMargin
-    implicitHeight: Math.max(implicitIndicatorHeight, implicitContentHeight)
+	contentItem: CustomText {
+		anchors.left: outerCircle.right
+		anchors.leftMargin: 10
+		anchors.verticalCenter: parent.verticalCenter
+		font.pointSize: root.font.pointSize
+		text: root.text
+	}
+	indicator: Rectangle {
+		id: outerCircle

-    indicator: Rectangle {
-        id: outerCircle
+		anchors.verticalCenter: parent.verticalCenter
+		border.color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurfaceVariant
+		border.width: 2
+		color: "transparent"
+		implicitHeight: 16
+		implicitWidth: 16
+		radius: 1000

-        implicitWidth: 16
-        implicitHeight: 16
-        radius: 1000
-        color: "transparent"
-        border.color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurfaceVariant
-        border.width: 2
-        anchors.verticalCenter: parent.verticalCenter
+		Behavior on border.color {
+			CAnim {
+			}
+		}

-        StateLayer {
-            anchors.margins: -7
-            color: root.checked ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3primary
-            z: -1
+		StateLayer {
+			function onClicked(): void {
+				root.click();
+			}

-            function onClicked(): void {
-                root.click();
-            }
-        }
+			anchors.margins: -7
+			color: root.checked ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3primary
+			z: -1
+		}

-        CustomRect {
-            anchors.centerIn: parent
-            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
-    }
+		CustomRect {
+			anchors.centerIn: parent
+			color: Qt.alpha(DynamicColors.palette.m3primary, root.checked ? 1 : 0)
+			implicitHeight: 8
+			implicitWidth: 8
+			radius: 1000
+		}
+	}
 }
@@ -1,12 +1,12 @@
 import QtQuick
-import qs.Modules

 Rectangle {
-    id: root
+	id: root

-    color: "transparent"
+	color: "transparent"

-    Behavior on color {
-        CAnim {}
-    }
+	Behavior on color {
+		CAnim {
+		}
+	}
 }
@@ -1,189 +1,189 @@
 import qs.Config
-import qs.Modules
 import QtQuick
 import QtQuick.Templates

 ScrollBar {
-    id: root
+	id: root

-    required property Flickable flickable
-    property bool shouldBeActive
-    property real nonAnimPosition
-    property bool animating
+	property bool _updatingFromFlickable: false
+	property bool _updatingFromUser: false
+	property bool animating
+	required property Flickable flickable
+	property real nonAnimPosition
+	property bool shouldBeActive

-    onHoveredChanged: {
-        if (hovered)
-            shouldBeActive = true;
-        else
-            shouldBeActive = flickable.moving;
-    }
+	implicitWidth: 8

-    property bool _updatingFromFlickable: false
-    property bool _updatingFromUser: false
+	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

-    // Sync nonAnimPosition with Qt's automatic position binding
-    onPositionChanged: {
-        if (_updatingFromUser) {
-            _updatingFromUser = false;
-            return;
-        }
-        if (position === nonAnimPosition) {
-            animating = false;
-            return;
-        }
-        if (!animating && !_updatingFromFlickable && !fullMouse.pressed) {
-            nonAnimPosition = position;
-        }
-    }
+		Behavior on opacity {
+			Anim {
+			}
+		}

-    // Sync nonAnimPosition with flickable when not animating
-    Connections {
-        target: flickable
-        function onContentYChanged() {
-            if (!animating && !fullMouse.pressed) {
-                _updatingFromFlickable = true;
-                const contentHeight = flickable.contentHeight;
-                const height = flickable.height;
-                if (contentHeight > height) {
-                    nonAnimPosition = Math.max(0, Math.min(1, flickable.contentY / (contentHeight - height)));
-                } else {
-                    nonAnimPosition = 0;
-                }
-                _updatingFromFlickable = false;
-            }
-        }
-    }
+		MouseArea {
+			id: mouse

-    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
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+			hoverEnabled: true
+		}
+	}
+	Behavior on position {
+		enabled: !fullMouse.pressed

-    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
+		Anim {
+		}
+	}

-        MouseArea {
-            id: mouse
+	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;
+		else
+			shouldBeActive = flickable.moving;
+	}

-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-            hoverEnabled: true
-            acceptedButtons: Qt.NoButton
-        }
+	// Sync nonAnimPosition with Qt's automatic position binding
+	onPositionChanged: {
+		if (_updatingFromUser) {
+			_updatingFromUser = false;
+			return;
+		}
+		if (position === nonAnimPosition) {
+			animating = false;
+			return;
+		}
+		if (!animating && !_updatingFromFlickable && !fullMouse.pressed) {
+			nonAnimPosition = position;
+		}
+	}

-        Behavior on opacity {
-            Anim {}
-        }
-    }
+	// Sync nonAnimPosition with flickable when not animating
+	Connections {
+		function onContentYChanged() {
+			if (!animating && !fullMouse.pressed) {
+				_updatingFromFlickable = true;
+				const contentHeight = flickable.contentHeight;
+				const height = flickable.height;
+				if (contentHeight > height) {
+					nonAnimPosition = Math.max(0, Math.min(1, flickable.contentY / (contentHeight - height)));
+				} else {
+					nonAnimPosition = 0;
+				}
+				_updatingFromFlickable = false;
+			}
+		}

-    Connections {
-        target: root.flickable
+		target: flickable
+	}

-        function onMovingChanged(): void {
-            if (root.flickable.moving)
-                root.shouldBeActive = true;
-            else
-                hideDelay.restart();
-        }
-    }
+	Connections {
+		function onMovingChanged(): void {
+			if (root.flickable.moving)
+				root.shouldBeActive = true;
+			else
+				hideDelay.restart();
+		}

-    Timer {
-        id: hideDelay
+		target: root.flickable
+	}

-        interval: 600
-        onTriggered: root.shouldBeActive = root.flickable.moving || root.hovered
-    }
+	Timer {
+		id: hideDelay

-    CustomMouseArea {
-        id: fullMouse
+		interval: 600

-        anchors.fill: parent
-        preventStealing: true
+		onTriggered: root.shouldBeActive = root.flickable.moving || root.hovered
+	}

-        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));
-                }
-            }
-        }
+	CustomMouseArea {
+		id: fullMouse

-        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;
+			let newPos = root.nonAnimPosition;
+			if (event.angleDelta.y > 0)
+				newPos = Math.max(0, root.nonAnimPosition - 0.1);
+			else if (event.angleDelta.y < 0)
+				newPos = Math.min(1 - root.size, root.nonAnimPosition + 0.1);
+			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;
-            let newPos = root.nonAnimPosition;
-            if (event.angleDelta.y > 0)
-                newPos = Math.max(0, root.nonAnimPosition - 0.1);
-            else if (event.angleDelta.y < 0)
-                newPos = Math.min(1 - root.size, root.nonAnimPosition + 0.1);
-            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));
-                }
-            }
-        }
-    }
+		anchors.fill: parent
+		preventStealing: true

-    Behavior on position {
-        enabled: !fullMouse.pressed
-
-        Anim {}
-    }
+		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));
+				}
+			}
+		}
+		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));
+				}
+			}
+		}
+	}
 }
@@ -1,53 +1,45 @@
 import QtQuick
 import QtQuick.Templates
 import qs.Config
-import qs.Modules

 Slider {
-    id: root
+	id: root

-    background: Item {
-        CustomRect {
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
+	background: Item {
+		CustomRect {
+			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
+			radius: 1000
+			topRightRadius: root.implicitHeight / 6
+		}

-            implicitWidth: root.handle.x - root.implicitHeight / 2
+		CustomRect {
+			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
+			radius: 1000
+			topLeftRadius: 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

-            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
-
-            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 {
-        x: root.visualPosition * root.availableWidth - implicitWidth / 2
-
-        implicitWidth: 5
-        implicitHeight: 15
-        anchors.verticalCenter: parent.verticalCenter
-
-        color: DynamicColors.palette.m3primary
-        radius: 1000
-
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.NoButton
-            cursorShape: Qt.PointingHandCursor
-        }
-    }
+		MouseArea {
+			acceptedButtons: Qt.NoButton
+			anchors.fill: parent
+			cursorShape: Qt.PointingHandCursor
+		}
+	}
 }
@@ -0,0 +1,166 @@
+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();
+		}
+	}
+}
@@ -1,66 +1,155 @@
-import qs.Config
-import qs.Modules
 import QtQuick
 import QtQuick.Templates
 import QtQuick.Shapes
+import qs.Config

 Switch {
-    id: root
+	id: root

-    property int cLayer: 1
+	property int cLayer: 1

-    implicitWidth: implicitIndicatorWidth
-    implicitHeight: implicitIndicatorHeight
+	implicitHeight: implicitIndicatorHeight
+	implicitWidth: implicitIndicatorWidth

-    indicator: CustomRect {
-        radius: 1000
-        color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+	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

-        implicitWidth: implicitHeight * 1.7
-        implicitHeight: 13 + 7 * 2
+		CustomRect {
+			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight

-        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

-            radius: 1000
-            color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
+			Behavior on implicitWidth {
+				Anim {
+				}
+			}
+			Behavior on x {
+				Anim {
+				}
+			}

-            x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
-            implicitWidth: nonAnimWidth
-            implicitHeight: parent.implicitHeight - 10
-            anchors.verticalCenter: parent.verticalCenter
+			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

-            CustomRect {
-                anchors.fill: parent
-                radius: parent.radius
+				Behavior on opacity {
+					Anim {
+					}
+				}
+			}

-                color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
-                opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
+			Shape {
+				id: icon

-                Behavior on opacity {
-                    Anim {}
-                }
-            }
+				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);
+				}

-            Behavior on x {
-                Anim {}
-            }
+				anchors.centerIn: parent
+				asynchronous: true
+				height: parent.implicitHeight - Appearance.padding.small * 2
+				preferredRendererType: Shape.CurveRenderer
+				width: height

-            Behavior on implicitWidth {
-                Anim {}
-            }
-        }
-    }
+				Behavior on end1 {
+					PropAnim {
+					}
+				}
+				Behavior on end2 {
+					PropAnim {
+					}
+				}
+				Behavior on start1 {
+					PropAnim {
+					}
+				}
+				Behavior on start2 {
+					PropAnim {
+					}
+				}

-    MouseArea {
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-        enabled: false
-    }
+				ShapePath {
+					capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+					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

-    component PropAnim: PropertyAnimation {
+					Behavior on strokeColor {
+						CAnim {
+						}
+					}
+
+					PathLine {
+						x: icon.end1.x
+						y: icon.end1.y
+					}
+
+					PathMove {
+						x: icon.start2.x
+						y: icon.start2.y
+					}
+
+					PathLine {
+						x: icon.end2.x
+						y: icon.end2.y
+					}
+				}
+			}
+		}
+	}
+
+	MouseArea {
+		anchors.fill: parent
+		cursorShape: Qt.PointingHandCursor
+		enabled: false
+	}
+
+	component PropAnim: PropertyAnimation {
 		duration: MaterialEasing.expressiveEffectsTime
 		easing.bezierCurve: MaterialEasing.expressiveEffects
-        easing.type: Easing.BezierSpline
-    }
+		easing.type: Easing.BezierSpline
+	}
 }
@@ -2,48 +2,50 @@ pragma ComponentBehavior: Bound

 import QtQuick
 import qs.Config
-import qs.Modules

 Text {
-    id: root
+	id: root

-    property bool animate: false
-    property string animateProp: "scale"
-    property real animateFrom: 0
-    property real animateTo: 1
-    property int animateDuration: 400
+	property bool animate: false
+	property int animateDuration: 400
+	property real animateFrom: 0
+	property string animateProp: "scale"
+	property real animateTo: 1

-    renderType: Text.NativeRendering
-    textFormat: Text.PlainText
-    color: DynamicColors.palette.m3onSurface
-    font.family: Appearance.font.family.sans
-    font.pointSize: 12
+	color: DynamicColors.palette.m3onSurface
+	font.family: Appearance.font.family.sans
+	font.pointSize: Appearance.font.size.normal
+	renderType: Text.NativeRendering
+	textFormat: Text.PlainText

-    Behavior on color {
-        CAnim {}
-    }
+	Behavior on color {
+		CAnim {
+		}
+	}
+	Behavior on text {
+		enabled: root.animate

-    Behavior on text {
-        enabled: root.animate
+		SequentialAnimation {
+			Anim {
+				easing.bezierCurve: MaterialEasing.standardAccel
+				to: root.animateFrom
+			}

-        SequentialAnimation {
-            Anim {
-                to: root.animateFrom
-                easing.bezierCurve: MaterialEasing.standardAccel
-            }
-            PropertyAction {}
-            Anim {
-                to: root.animateTo
-                easing.bezierCurve: MaterialEasing.standardDecel
-            }
-        }
-    }
+			PropertyAction {
+			}

-    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
-    }
+			Anim {
+				easing.bezierCurve: MaterialEasing.standardDecel
+				to: root.animateTo
+			}
+		}
+	}
+
+	component Anim: NumberAnimation {
+		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
+	}
 }
@@ -2,75 +2,74 @@ pragma ComponentBehavior: Bound

 import QtQuick
 import QtQuick.Controls
-import qs.Helpers
 import qs.Config
-import qs.Modules

 TextField {
-    id: root
+	id: root

-    color: DynamicColors.palette.m3onSurface
-    placeholderTextColor: DynamicColors.palette.m3outline
-    font.family: Appearance.font.family.sans
-    font.pointSize: Appearance.font.size.smaller
-    renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
-    cursorVisible: !readOnly
+	background: null
+	color: DynamicColors.palette.m3onSurface
+	cursorVisible: !readOnly
+	font.family: Appearance.font.family.sans
+	font.pointSize: Appearance.font.size.smaller
+	placeholderTextColor: DynamicColors.palette.m3outline
+	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering

-    background: null
+	Behavior on color {
+		CAnim {
+		}
+	}
+	cursorDelegate: CustomRect {
+		id: cursor

-    cursorDelegate: CustomRect {
-        id: cursor
+		property bool disableBlink

-        property bool disableBlink
+		color: DynamicColors.palette.m3primary
+		implicitWidth: 2
+		radius: Appearance.rounding.normal

-        implicitWidth: 2
-        color: DynamicColors.palette.m3primary
-        radius: Appearance.rounding.normal
+		Behavior on opacity {
+			Anim {
+				duration: Appearance.anim.durations.small
+			}
+		}

-        Connections {
-            target: root
+		Connections {
+			function onCursorPositionChanged(): void {
+				if (root.activeFocus && root.cursorVisible) {
+					cursor.opacity = 1;
+					cursor.disableBlink = true;
+					enableBlink.restart();
+				}
+			}

-            function onCursorPositionChanged(): void {
-                if (root.activeFocus && root.cursorVisible) {
-                    cursor.opacity = 1;
-                    cursor.disableBlink = true;
-                    enableBlink.restart();
-                }
-            }
-        }
+			target: root
+		}

-        Timer {
-            id: enableBlink
+		Timer {
+			id: enableBlink

-            interval: 100
-            onTriggered: cursor.disableBlink = false
-        }
+			interval: 100

-        Timer {
-            running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
-            repeat: true
-            triggeredOnStart: true
-            interval: 500
-            onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
-        }
+			onTriggered: cursor.disableBlink = false
+		}

-        Binding {
-            when: !root.activeFocus || !root.cursorVisible
-            cursor.opacity: 0
-        }
+		Timer {
+			interval: 500
+			repeat: true
+			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+			triggeredOnStart: true

-        Behavior on opacity {
-            Anim {
-                duration: Appearance.anim.durations.small
-            }
-        }
-    }
+			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+		}

-    Behavior on color {
-        CAnim {}
-    }
-
-    Behavior on placeholderTextColor {
-        CAnim {}
-    }
+		Binding {
+			cursor.opacity: 0
+			when: !root.activeFocus || !root.cursorVisible
+		}
+	}
+	Behavior on placeholderTextColor {
+		CAnim {
+		}
+	}
 }
@@ -3,21 +3,23 @@ import QtQuick.Controls
 import qs.Components

 ToolTip {
-    id: root
-    property bool extraVisibleCondition: true
-    property bool alternativeVisibleCondition: false
-    readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition
-    verticalPadding: 5
-    horizontalPadding: 10
-    background: null
+	id: root

-    visible: internalVisibleCondition
+	property bool alternativeVisibleCondition: false
+	property bool extraVisibleCondition: true
+	readonly property bool internalVisibleCondition: (extraVisibleCondition && (parent.hovered === undefined || parent?.hovered)) || alternativeVisibleCondition

-    contentItem: CustomTooltipContent {
-        id: contentItem
-        text: root.text
-        shown: root.internalVisibleCondition
-        horizontalPadding: root.horizontalPadding
-        verticalPadding: root.verticalPadding
-    }
+	background: null
+	horizontalPadding: 10
+	verticalPadding: 5
+	visible: internalVisibleCondition
+
+	contentItem: CustomTooltipContent {
+		id: contentItem
+
+		horizontalPadding: root.horizontalPadding
+		shown: root.internalVisibleCondition
+		text: root.text
+		verticalPadding: root.verticalPadding
+	}
 }
@@ -1,48 +1,54 @@
 import QtQuick
 import qs.Components
-import qs.Modules
 import qs.Config

 Item {
-    id: root
-    required property string text
-    property bool shown: false
-    property real horizontalPadding: 10
-    property real verticalPadding: 5
-    implicitWidth: tooltipTextObject.implicitWidth + 2 * root.horizontalPadding
-    implicitHeight: tooltipTextObject.implicitHeight + 2 * root.verticalPadding
+	id: root

-    property bool isVisible: backgroundRectangle.implicitHeight > 0
+	property real horizontalPadding: 10
+	property bool isVisible: backgroundRectangle.implicitHeight > 0
+	property bool shown: false
+	required property string text
+	property real verticalPadding: 5

-    Rectangle {
-        id: backgroundRectangle
-        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
+	implicitHeight: tooltipTextObject.implicitHeight + 2 * root.verticalPadding
+	implicitWidth: tooltipTextObject.implicitWidth + 2 * root.horizontalPadding

-        Behavior on implicitWidth {
-            Anim {}
-        }
-        Behavior on implicitHeight {
-            Anim {}
-        }
-        Behavior on opacity {
-            Anim {}
-        }
+	Rectangle {
+		id: backgroundRectangle

-        CustomText {
-            id: tooltipTextObject
-            anchors.centerIn: parent
-            text: root.text
-            color: DynamicColors.palette.m3inverseOnSurface ?? "#FFFFFF"
-            wrapMode: Text.Wrap
-        }
-    }   
+		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
+		}
+
+		CustomText {
+			id: tooltipTextObject
+
+			anchors.centerIn: parent
+			color: DynamicColors.palette.m3inverseOnSurface ?? "#FFFFFF"
+			text: root.text
+			wrapMode: Text.Wrap
+		}
+	}
 }
@@ -1,18 +1,18 @@
 import qs.Config
-import qs.Modules
 import QtQuick
 import QtQuick.Effects

 RectangularShadow {
-    property int level
-    property real dp: [0, 1, 3, 6, 8, 12][level]
+	property real dp: [0, 1, 3, 6, 8, 12][level]
+	property int level

-    color: Qt.alpha(DynamicColors.palette.m3shadow, 0.7)
-    blur: (dp * 5) ** 0.7
-    spread: -dp * 0.3 + (dp * 0.1) ** 2
-    offset.y: dp / 2
+	blur: (dp * 5) ** 0.7
+	color: Qt.alpha(DynamicColors.palette.m3shadow, 0.7)
+	offset.y: dp / 2
+	spread: -dp * 0.3 + (dp * 0.1) ** 2

-    Behavior on dp {
-        Anim {}
-    }
+	Behavior on dp {
+		Anim {
+		}
+	}
 }
@@ -1,49 +1,44 @@
 import qs.Config
-import qs.Modules
 import QtQuick

 CustomRect {
-    required property int extra
+	required property int extra

-    anchors.right: parent.right
-    anchors.margins: 8
+	anchors.margins: 8
+	anchors.right: parent.right
+	color: DynamicColors.palette.m3tertiary
+	implicitHeight: count.implicitHeight + 4 * 2
+	implicitWidth: count.implicitWidth + 8 * 2
+	opacity: extra > 0 ? 1 : 0
+	radius: 8
+	scale: extra > 0 ? 1 : 0.5

-    color: DynamicColors.palette.m3tertiary
-    radius: 8
-
-    implicitWidth: count.implicitWidth + 8 * 2
-    implicitHeight: count.implicitHeight + 4 * 2
-
-    opacity: extra > 0 ? 1 : 0
-    scale: extra > 0 ? 1 : 0.5
-
-    Elevation {
-        anchors.fill: parent
-        radius: parent.radius
-        opacity: parent.opacity
-        z: -1
-        level: 2
-    }
-
-    CustomText {
-        id: count
-
-        anchors.centerIn: parent
-        animate: parent.opacity > 0
-        text: qsTr("+%1").arg(parent.extra)
-        color: DynamicColors.palette.m3onTertiary
-    }
-
-    Behavior on opacity {
-        Anim {
+	Behavior on opacity {
+		Anim {
 			duration: MaterialEasing.expressiveEffectsTime
-        }
-    }
-
-    Behavior on scale {
-        Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
 			duration: MaterialEasing.expressiveEffectsTime
 			easing.bezierCurve: MaterialEasing.expressiveEffects
-        }
-    }
+		}
+	}
+
+	Elevation {
+		anchors.fill: parent
+		level: 2
+		opacity: parent.opacity
+		radius: parent.radius
+		z: -1
+	}
+
+	CustomText {
+		id: count
+
+		anchors.centerIn: parent
+		animate: parent.opacity > 0
+		color: DynamicColors.palette.m3onTertiary
+		text: qsTr("+%1").arg(parent.extra)
+	}
 }
@@ -1,146 +1,141 @@
 import QtQuick
 import QtQuick.Templates
-import qs.Helpers
 import qs.Config
-import qs.Modules

 Slider {
-    id: root
+	id: root

-    required property string icon
-    property real oldValue
-    property bool initialized
 	property color color: DynamicColors.palette.m3secondary
+	required property string icon
+	property bool initialized
+	property real oldValue

-    orientation: Qt.Vertical
+	orientation: Qt.Vertical

-    background: CustomRect {
-        color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
-        radius: Appearance.rounding.full
+	background: CustomRect {
+		color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
+		radius: Appearance.rounding.full

-        CustomRect {
-            anchors.left: parent.left
-            anchors.right: parent.right
+		CustomRect {
+			anchors.left: parent.left
+			anchors.right: parent.right
+			color: root.color
+			implicitHeight: parent.height - y
+			radius: parent.radius
+			y: root.handle.y
+		}
+	}
+	handle: Item {
+		id: handle

-            y: root.handle.y
-            implicitHeight: parent.height - y
+		property alias moving: icon.moving

-            color: root.color
-            radius: parent.radius
-        }
-    }
+		implicitHeight: root.width
+		implicitWidth: root.width
+		y: root.visualPosition * (root.availableHeight - height)

-    handle: Item {
-        id: handle
+		Elevation {
+			anchors.fill: parent
+			level: handleInteraction.containsMouse ? 2 : 1
+			radius: rect.radius
+		}

-        property alias moving: icon.moving
+		CustomRect {
+			id: rect

-        y: root.visualPosition * (root.availableHeight - height)
-        implicitWidth: root.width
-        implicitHeight: root.width
+			anchors.fill: parent
+			color: DynamicColors.palette.m3inverseSurface
+			radius: Appearance.rounding.full

-        Elevation {
-            anchors.fill: parent
-            radius: rect.radius
-            level: handleInteraction.containsMouse ? 2 : 1
-        }
+			MouseArea {
+				id: handleInteraction

-        CustomRect {
-            id: rect
+				acceptedButtons: Qt.NoButton
+				anchors.fill: parent
+				cursorShape: Qt.PointingHandCursor
+				hoverEnabled: true
+			}

-            anchors.fill: parent
+			MaterialIcon {
+				id: icon

-            color: DynamicColors.palette.m3inverseSurface
-            radius: Appearance.rounding.full
+				property bool moving

-            MouseArea {
-                id: handleInteraction
+				function update(): void {
+					animate = !moving;
+					binding.when = moving;
+					font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.larger;
+					font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material;
+				}

-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.NoButton
-            }
+				anchors.centerIn: parent
+				color: DynamicColors.palette.m3inverseOnSurface
+				text: root.icon

-            MaterialIcon {
-                id: icon
+				onMovingChanged: anim.restart()

-                property bool moving
+				Binding {
+					id: binding

-                function update(): void {
-                    animate = !moving;
-                    binding.when = moving;
-                    font.pointSize = moving ? Appearance.font.size.small : Appearance.font.size.larger;
-                    font.family = moving ? Appearance.font.family.sans : Appearance.font.family.material;
-                }
+					property: "text"
+					target: icon
+					value: Math.round(root.value * 100)
+					when: false
+				}

-                text: root.icon
-                color: DynamicColors.palette.m3inverseOnSurface
-                anchors.centerIn: parent
+				SequentialAnimation {
+					id: anim

-                onMovingChanged: anim.restart()
+					Anim {
+						duration: Appearance.anim.durations.normal / 2
+						easing.bezierCurve: Appearance.anim.curves.standardAccel
+						property: "scale"
+						target: icon
+						to: 0
+					}

-                Binding {
-                    id: binding
+					ScriptAction {
+						script: icon.update()
+					}

-                    target: icon
-                    property: "text"
-                    value: Math.round(root.value * 100)
-                    when: false
-                }
+					Anim {
+						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
+		}
+	}

-                SequentialAnimation {
-                    id: anim
+	onPressedChanged: handle.moving = pressed
+	onValueChanged: {
+		if (!initialized) {
+			initialized = true;
+			return;
+		}
+		if (Math.abs(value - oldValue) < 0.01)
+			return;
+		oldValue = value;
+		handle.moving = true;
+		stateChangeDelay.restart();
+	}

-                    Anim {
-                        target: icon
-                        property: "scale"
-                        to: 0
-                        duration: Appearance.anim.durations.normal / 2
-                        easing.bezierCurve: Appearance.anim.curves.standardAccel
-                    }
-                    ScriptAction {
-                        script: icon.update()
-                    }
-                    Anim {
-                        target: icon
-                        property: "scale"
-                        to: 1
-                        duration: Appearance.anim.durations.normal / 2
-                        easing.bezierCurve: Appearance.anim.curves.standardDecel
-                    }
-                }
-            }
-        }
-    }
+	Timer {
+		id: stateChangeDelay

-    onPressedChanged: handle.moving = pressed
+		interval: 500

-    onValueChanged: {
-        if (!initialized) {
-            initialized = true;
-            return;
-        }
-        if (Math.abs(value - oldValue) < 0.01)
-            return;
-        oldValue = value;
-        handle.moving = true;
-        stateChangeDelay.restart();
-    }
-
-    Timer {
-        id: stateChangeDelay
-
-        interval: 500
-        onTriggered: {
-            if (!root.pressed)
-                handle.moving = false;
-        }
-    }
-
-    Behavior on value {
-        Anim {
-            duration: Appearance.anim.durations.large
-        }
-    }
+		onTriggered: {
+			if (!root.pressed)
+				handle.moving = false;
+		}
+	}
 }
@@ -1,82 +1,80 @@
 import qs.Config
-import qs.Modules
 import QtQuick

 CustomRect {
-    id: root
+	id: root

-    enum Type {
-        Filled,
-        Tonal,
-        Text
-    }
+	enum Type {
+		Filled,
+		Tonal,
+		Text
+	}

-    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 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 color inactiveColour: {
+		if (!toggle && type === IconButton.Filled)
+			return DynamicColors.palette.m3primary;
+		return type === IconButton.Filled ? DynamicColors.tPalette.m3surfaceContainer : DynamicColors.palette.m3secondaryContainer;
+	}
+	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 alias label: label
+	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

-    property alias stateLayer: stateLayer
-    property alias label: label
-    property alias radiusAnim: radiusAnim
+	signal clicked

-    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 color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-    property color disabledOnColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	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)

-    signal clicked
+	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
+	onCheckedChanged: internalChecked = checked

-    implicitWidth: implicitHeight
-    implicitHeight: label.implicitHeight + padding * 2
+	StateLayer {
+		id: stateLayer

-    StateLayer {
-        id: stateLayer
+		function onClicked(): void {
+			if (root.toggle)
+				root.internalChecked = !root.internalChecked;
+			root.clicked();
+		}

-        color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
-        disabled: root.disabled
+		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
+		disabled: root.disabled
+	}

-        function onClicked(): void {
-            if (root.toggle)
-                root.internalChecked = !root.internalChecked;
-            root.clicked();
-        }
-    }
+	MaterialIcon {
+		id: label

-    MaterialIcon {
-        id: label
+		anchors.centerIn: parent
+		color: root.disabled ? root.disabledOnColour : root.internalChecked ? root.activeOnColour : root.inactiveOnColour
+		fill: !root.toggle || root.internalChecked ? 1 : 0

-        anchors.centerIn: parent
-        color: root.disabled ? root.disabledOnColour : root.internalChecked ? root.activeOnColour : root.inactiveOnColour
-        fill: !root.toggle || root.internalChecked ? 1 : 0
-
-        Behavior on fill {
-            Anim {}
-        }
-    }
-
-    Behavior on radius {
-        Anim {
-            id: radiusAnim
-        }
-    }
+		Behavior on fill {
+			Anim {
+			}
+		}
+	}
 }
@@ -0,0 +1,221 @@
+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
+			}
+		}
+	}
+}
@@ -1,15 +1,15 @@
 import qs.Config

 CustomText {
-    property real fill
-    property int grade: DynamicColors.light ? 0 : -25
+	property real fill
+	property int grade: DynamicColors.light ? 0 : -25

-    font.family: "Material Symbols Rounded"
-    font.pointSize: 15
-    font.variableAxes: ({
-            FILL: fill.toFixed(1),
-            GRAD: grade,
-            opsz: fontInfo.pixelSize,
-            wght: fontInfo.weight
-        })
+	font.family: "Material Symbols Rounded"
+	font.pointSize: 15
+	font.variableAxes: ({
+			FILL: fill.toFixed(1),
+			GRAD: grade,
+			opsz: fontInfo.pixelSize,
+			wght: fontInfo.weight
+		})
 }
@@ -0,0 +1,107 @@
+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
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,12 @@
+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
+}
@@ -2,8 +2,8 @@ import Quickshell
 import QtQuick

 ShaderEffect {
-    required property Item source
-    required property Item maskSource
+	required property Item maskSource
+	required property Item source

-    fragmentShader: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/shaders/opacitymask.frag.qsb`)
+	fragmentShader: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/shaders/opacitymask.frag.qsb`)
 }
@@ -1,8 +1,8 @@
 import QtQuick

 QtObject {
-    required property var service
+	required property var service

-    Component.onCompleted: service.refCount++
-    Component.onDestruction: service.refCount--
+	Component.onCompleted: service.refCount++
+	Component.onDestruction: service.refCount--
 }
@@ -0,0 +1,50 @@
+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);
+			}
+		}
+	}
+}
@@ -1,96 +1,96 @@
 import qs.Config
-import qs.Modules
 import QtQuick

 MouseArea {
-    id: root
+	id: root

-    property bool disabled
-    property color color: DynamicColors.palette.m3onSurface
-    property real radius: parent?.radius ?? 0
-    property alias rect: hoverLayer
+	property color color: DynamicColors.palette.m3onSurface
+	property bool disabled
+	property real radius: parent?.radius ?? 0
+	property alias rect: hoverLayer

-    function onClicked(): void {
-    }
+	function onClicked(): void {
+	}

-    anchors.fill: parent
+	anchors.fill: parent
+	cursorShape: disabled ? undefined : Qt.PointingHandCursor
+	enabled: !disabled
+	hoverEnabled: true

-    enabled: !disabled
-    cursorShape: disabled ? undefined : Qt.PointingHandCursor
-    hoverEnabled: true
+	onClicked: event => !disabled && onClicked(event)
+	onPressed: event => {
+		if (disabled)
+			return;

-    onPressed: event => {
-        if (disabled)
-            return;
+		rippleAnim.x = event.x;
+		rippleAnim.y = event.y;

-        rippleAnim.x = event.x;
-        rippleAnim.y = event.y;
+		const dist = (ox, oy) => ox * ox + oy * oy;
+		rippleAnim.radius = Math.sqrt(Math.max(dist(event.x, event.y), dist(event.x, height - event.y), dist(width - event.x, event.y), dist(width - event.x, height - event.y)));

-        const dist = (ox, oy) => ox * ox + oy * oy;
-        rippleAnim.radius = Math.sqrt(Math.max(dist(event.x, event.y), dist(event.x, height - event.y), dist(width - event.x, event.y), dist(width - event.x, height - event.y)));
+		rippleAnim.restart();
+	}

-        rippleAnim.restart();
-    }
+	SequentialAnimation {
+		id: rippleAnim

-    onClicked: event => !disabled && onClicked(event)
+		property real radius
+		property real x
+		property real y

-    SequentialAnimation {
-        id: rippleAnim
+		PropertyAction {
+			property: "x"
+			target: ripple
+			value: rippleAnim.x
+		}

-        property real x
-        property real y
-        property real radius
+		PropertyAction {
+			property: "y"
+			target: ripple
+			value: rippleAnim.y
+		}

-        PropertyAction {
-            target: ripple
-            property: "x"
-            value: rippleAnim.x
-        }
-        PropertyAction {
-            target: ripple
-            property: "y"
-            value: rippleAnim.y
-        }
-        PropertyAction {
-            target: ripple
-            property: "opacity"
-            value: 0.08
-        }
-        Anim {
-            target: ripple
-            properties: "implicitWidth,implicitHeight"
-            from: 0
-            to: rippleAnim.radius * 2
-            easing.bezierCurve: MaterialEasing.standardDecel
-        }
-        Anim {
-            target: ripple
-            property: "opacity"
-            to: 0
-        }
-    }
+		PropertyAction {
+			property: "opacity"
+			target: ripple
+			value: 0.08
+		}

-    CustomClippingRect {
-        id: hoverLayer
+		Anim {
+			easing.bezierCurve: MaterialEasing.standardDecel
+			from: 0
+			properties: "implicitWidth,implicitHeight"
+			target: ripple
+			to: rippleAnim.radius * 2
+		}

-        anchors.fill: parent
+		Anim {
+			property: "opacity"
+			target: ripple
+			to: 0
+		}
+	}
+
+	CustomClippingRect {
+		id: hoverLayer
+
+		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

-        color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0)
-        radius: root.radius
+		CustomRect {
+			id: ripple

-        CustomRect {
-            id: ripple
-
-            radius: 1000
-            color: root.color
-            opacity: 0
 			border.pixelAligned: false
+			color: root.color
+			opacity: 0
+			radius: 1000

-            transform: Translate {
-                x: -ripple.width / 2
-                y: -ripple.height / 2
-            }
-        }
-    }
+			transform: Translate {
+				x: -ripple.width / 2
+				y: -ripple.height / 2
+			}
+		}
+	}
 }
@@ -1,135 +1,131 @@
 import ZShell
 import QtQuick
 import QtQuick.Layouts
-import qs.Modules
 import qs.Components
-import qs.Helpers
 import qs.Config

 CustomRect {
-    id: root
+	id: root

-    required property Toast modelData
+	required property Toast modelData

-    anchors.left: parent.left
-    anchors.right: parent.right
-    implicitHeight: layout.implicitHeight + Appearance.padding.smaller * 2
+	anchors.left: parent.left
+	anchors.right: parent.right
+	border.color: {
+		let colour = DynamicColors.palette.m3outlineVariant;
+		if (root.modelData.type === Toast.Success)
+			colour = DynamicColors.palette.m3success;
+		if (root.modelData.type === Toast.Warning)
+			colour = DynamicColors.palette.m3secondaryContainer;
+		if (root.modelData.type === Toast.Error)
+			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

-    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;
-    }
+	Behavior on border.color {
+		CAnim {
+		}
+	}

-    border.width: 1
-    border.color: {
-        let colour = DynamicColors.palette.m3outlineVariant;
-        if (root.modelData.type === Toast.Success)
-            colour = DynamicColors.palette.m3success;
-        if (root.modelData.type === Toast.Warning)
-            colour = DynamicColors.palette.m3secondaryContainer;
-        if (root.modelData.type === Toast.Error)
-            colour = DynamicColors.palette.m3error;
-        return Qt.alpha(colour, 0.3);
-    }
+	Elevation {
+		anchors.fill: parent
+		level: 3
+		opacity: parent.opacity
+		radius: parent.radius
+		z: -1
+	}

-    Elevation {
-        anchors.fill: parent
-        radius: parent.radius
-        opacity: parent.opacity
-        z: -1
-        level: 3
-    }
+	RowLayout {
+		id: layout

-    RowLayout {
-        id: layout
+		anchors.fill: parent
+		anchors.leftMargin: Appearance.padding.normal
+		anchors.margins: Appearance.padding.smaller
+		anchors.rightMargin: Appearance.padding.normal
+		spacing: Appearance.spacing.normal

-        anchors.fill: parent
-        anchors.margins: Appearance.padding.smaller
-        anchors.leftMargin: Appearance.padding.normal
-        anchors.rightMargin: Appearance.padding.normal
-        spacing: Appearance.spacing.normal
+		CustomRect {
+			color: {
+				if (root.modelData.type === Toast.Success)
+					return DynamicColors.palette.m3success;
+				if (root.modelData.type === Toast.Warning)
+					return DynamicColors.palette.m3secondaryContainer;
+				if (root.modelData.type === Toast.Error)
+					return DynamicColors.palette.m3error;
+				return DynamicColors.palette.m3surfaceContainerHigh;
+			}
+			implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2
+			implicitWidth: implicitHeight
+			radius: Appearance.rounding.normal

-        CustomRect {
-            radius: Appearance.rounding.normal
-            color: {
-                if (root.modelData.type === Toast.Success)
-                    return DynamicColors.palette.m3success;
-                if (root.modelData.type === Toast.Warning)
-                    return DynamicColors.palette.m3secondaryContainer;
-                if (root.modelData.type === Toast.Error)
-                    return DynamicColors.palette.m3error;
-                return DynamicColors.palette.m3surfaceContainerHigh;
-            }
+			MaterialIcon {
+				id: icon

-            implicitWidth: implicitHeight
-            implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2
+				anchors.centerIn: parent
+				color: {
+					if (root.modelData.type === Toast.Success)
+						return DynamicColors.palette.m3onSuccess;
+					if (root.modelData.type === Toast.Warning)
+						return DynamicColors.palette.m3onSecondaryContainer;
+					if (root.modelData.type === Toast.Error)
+						return DynamicColors.palette.m3onError;
+					return DynamicColors.palette.m3onSurfaceVariant;
+				}
+				font.pointSize: Math.round(Appearance.font.size.large * 1.2)
+				text: root.modelData.icon
+			}
+		}

-            MaterialIcon {
-                id: icon
+		ColumnLayout {
+			Layout.fillWidth: true
+			spacing: 0

-                anchors.centerIn: parent
-                text: root.modelData.icon
-                color: {
-                    if (root.modelData.type === Toast.Success)
-                        return DynamicColors.palette.m3onSuccess;
-                    if (root.modelData.type === Toast.Warning)
-                        return DynamicColors.palette.m3onSecondaryContainer;
-                    if (root.modelData.type === Toast.Error)
-                        return DynamicColors.palette.m3onError;
-                    return DynamicColors.palette.m3onSurfaceVariant;
-                }
-                font.pointSize: Math.round(Appearance.font.size.large * 1.2)
-            }
-        }
+			CustomText {
+				id: title

-        ColumnLayout {
-            Layout.fillWidth: true
-            spacing: 0
+				Layout.fillWidth: true
+				color: {
+					if (root.modelData.type === Toast.Success)
+						return DynamicColors.palette.m3onSuccessContainer;
+					if (root.modelData.type === Toast.Warning)
+						return DynamicColors.palette.m3onSecondary;
+					if (root.modelData.type === Toast.Error)
+						return DynamicColors.palette.m3onErrorContainer;
+					return DynamicColors.palette.m3onSurface;
+				}
+				elide: Text.ElideRight
+				font.pointSize: Appearance.font.size.normal
+				text: root.modelData.title
+			}

-            CustomText {
-                id: title
-
-                Layout.fillWidth: true
-                text: root.modelData.title
-                color: {
-                    if (root.modelData.type === Toast.Success)
-                        return DynamicColors.palette.m3onSuccessContainer;
-                    if (root.modelData.type === Toast.Warning)
-                        return DynamicColors.palette.m3onSecondary;
-                    if (root.modelData.type === Toast.Error)
-                        return DynamicColors.palette.m3onErrorContainer;
-                    return DynamicColors.palette.m3onSurface;
-                }
-                font.pointSize: Appearance.font.size.normal
-                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;
-                    if (root.modelData.type === Toast.Warning)
-                        return DynamicColors.palette.m3onSecondary;
-                    if (root.modelData.type === Toast.Error)
-                        return DynamicColors.palette.m3onErrorContainer;
-                    return DynamicColors.palette.m3onSurface;
-                }
-                opacity: 0.8
-                elide: Text.ElideRight
-            }
-        }
-    }
-
-    Behavior on border.color {
-        CAnim {}
-    }
+			CustomText {
+				Layout.fillWidth: true
+				color: {
+					if (root.modelData.type === Toast.Success)
+						return DynamicColors.palette.m3onSuccessContainer;
+					if (root.modelData.type === Toast.Warning)
+						return DynamicColors.palette.m3onSecondary;
+					if (root.modelData.type === Toast.Error)
+						return DynamicColors.palette.m3onErrorContainer;
+					return DynamicColors.palette.m3onSurface;
+				}
+				elide: Text.ElideRight
+				opacity: 0.8
+				text: root.modelData.message
+				textFormat: Text.StyledText
+			}
+		}
+	}
 }
@@ -1,144 +1,142 @@
 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
+	id: root

-    readonly property int spacing: Appearance.spacing.small
-    property bool flag
+	property bool flag
+	readonly property int spacing: Appearance.spacing.small

-    implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2
-    implicitHeight: {
-        let h = -spacing;
-        for (let i = 0; i < repeater.count; i++) {
-            const item = repeater.itemAt(i) as ToastWrapper;
-            if (!item.modelData.closed && !item.previewHidden)
-                h += item.implicitHeight + spacing;
-        }
-        return h;
-    }
+	implicitHeight: {
+		let h = -spacing;
+		for (let i = 0; i < repeater.count; i++) {
+			const item = repeater.itemAt(i) as ToastWrapper;
+			if (!item.modelData.closed && !item.previewHidden)
+				h += item.implicitHeight + spacing;
+		}
+		return h;
+	}
+	implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2

-    Repeater {
-        id: repeater
+	Repeater {
+		id: repeater

-        model: ScriptModel {
-            values: {
-                const toasts = [];
-                let count = 0;
-                for (const toast of Toaster.toasts) {
-                    toasts.push(toast);
-                    if (!toast.closed) {
-                        count++;
-                        if (count > Config.utilities.maxToasts)
-                            break;
-                    }
-                }
-                return toasts;
-            }
-            onValuesChanged: root.flagChanged()
-        }
+		model: ScriptModel {
+			values: {
+				const toasts = [];
+				let count = 0;
+				for (const toast of Toaster.toasts) {
+					toasts.push(toast);
+					if (!toast.closed) {
+						count++;
+						if (count > Config.utilities.maxToasts)
+							break;
+					}
+				}
+				return toasts;
+			}

-        ToastWrapper {}
-    }
+			onValuesChanged: root.flagChanged()
+		}

-    component ToastWrapper: MouseArea {
-        id: toast
+		ToastWrapper {
+		}
+	}

-        required property int index
-        required property Toast modelData
+	component ToastWrapper: MouseArea {
+		id: toast

-        readonly property bool previewHidden: {
-            let extraHidden = 0;
-            for (let i = 0; i < index; i++)
-                if (Toaster.toasts[i].closed)
-                    extraHidden++;
-            return index >= Config.utilities.maxToasts + extraHidden;
-        }
+		required property int index
+		required property Toast modelData
+		readonly property bool previewHidden: {
+			let extraHidden = 0;
+			for (let i = 0; i < index; i++)
+				if (Toaster.toasts[i].closed)
+					extraHidden++;
+			return index >= Config.utilities.maxToasts + extraHidden;
+		}

-        onPreviewHiddenChanged: {
-            if (initAnim.running && previewHidden)
-                initAnim.stop();
-        }
+		acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+		anchors.bottom: parent.bottom
+		anchors.bottomMargin: {
+			root.flag; // Force update
+			let y = 0;
+			for (let i = 0; i < index; i++) {
+				const item = repeater.itemAt(i) as ToastWrapper;
+				if (item && !item.modelData.closed && !item.previewHidden)
+					y += item.implicitHeight + root.spacing;
+			}
+			return y;
+		}
+		anchors.left: parent.left
+		anchors.right: parent.right
+		implicitHeight: toastInner.implicitHeight
+		opacity: modelData.closed || previewHidden ? 0 : 1
+		scale: modelData.closed || previewHidden ? 0.7 : 1

-        opacity: modelData.closed || previewHidden ? 0 : 1
-        scale: modelData.closed || previewHidden ? 0.7 : 1
+		Behavior on anchors.bottomMargin {
+			Anim {
+				duration: Appearance.anim.durations.expressiveDefaultSpatial
+				easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+			}
+		}
+		Behavior on opacity {
+			Anim {
+			}
+		}
+		Behavior on scale {
+			Anim {
+			}
+		}

-        anchors.bottomMargin: {
-            root.flag; // Force update
-            let y = 0;
-            for (let i = 0; i < index; i++) {
-                const item = repeater.itemAt(i) as ToastWrapper;
-                if (item && !item.modelData.closed && !item.previewHidden)
-                    y += item.implicitHeight + root.spacing;
-            }
-            return y;
-        }
+		Component.onCompleted: modelData.lock(this)
+		onClicked: modelData.close()
+		onPreviewHiddenChanged: {
+			if (initAnim.running && previewHidden)
+				initAnim.stop();
+		}

-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        implicitHeight: toastInner.implicitHeight
+		Anim {
+			id: initAnim

-        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-        onClicked: modelData.close()
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+			from: 0
+			properties: "opacity,scale"
+			target: toast
+			to: 1

-        Component.onCompleted: modelData.lock(this)
+			Component.onCompleted: running = !toast.previewHidden
+		}

-        Anim {
-            id: initAnim
+		ParallelAnimation {
+			running: toast.modelData.closed

-            Component.onCompleted: running = !toast.previewHidden
+			onFinished: toast.modelData.unlock(toast)
+			onStarted: toast.anchors.bottomMargin = toast.anchors.bottomMargin

-            target: toast
-            properties: "opacity,scale"
-            from: 0
-            to: 1
-            duration: Appearance.anim.durations.expressiveDefaultSpatial
-            easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-        }
+			Anim {
+				property: "opacity"
+				target: toast
+				to: 0
+			}

-        ParallelAnimation {
-            running: toast.modelData.closed
-            onStarted: toast.anchors.bottomMargin = toast.anchors.bottomMargin
-            onFinished: toast.modelData.unlock(toast)
+			Anim {
+				property: "scale"
+				target: toast
+				to: 0.7
+			}
+		}

-            Anim {
-                target: toast
-                property: "opacity"
-                to: 0
-            }
-            Anim {
-                target: toast
-                property: "scale"
-                to: 0.7
-            }
-        }
+		ToastItem {
+			id: toastInner

-        ToastItem {
-            id: toastInner
-
-            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
-            }
-        }
-    }
+			modelData: toast.modelData
+		}
+	}
 }
@@ -1,12 +1,13 @@
 import Quickshell.Io

 JsonObject {
-    property Accents accents: Accents {}
+	property Accents accents: Accents {
+	}

-    component Accents: JsonObject {
-        property string primary: "#4080ff"
-        property string primaryAlt: "#60a0ff"
-        property string warning: "#ff6b6b"
-        property string warningAlt: "#ff8787"
-    }
+	component Accents: JsonObject {
+		property string primary: "#4080ff"
+		property string primaryAlt: "#60a0ff"
+		property string warning: "#ff6b6b"
+		property string warningAlt: "#ff8787"
+	}
 }
@@ -3,12 +3,12 @@ pragma Singleton
 import Quickshell

 Singleton {
-    // 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
+	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.Transparency transparency: Config.appearance.transparency
 }
@@ -1,94 +1,95 @@
 import Quickshell.Io

 JsonObject {
-    property Rounding rounding: Rounding {}
-    property Spacing spacing: Spacing {}
-    property Padding padding: Padding {}
-    property FontStuff font: FontStuff {}
-    property Anim anim: Anim {}
-    property Transparency transparency: Transparency {}
+	property Anim anim: Anim {
+	}
+	property FontStuff font: FontStuff {
+	}
+	property Padding padding: Padding {
+	}
+	property Rounding rounding: Rounding {
+	}
+	property Spacing spacing: Spacing {
+	}
+	property Transparency transparency: Transparency {
+	}

-    component Rounding: JsonObject {
-        property real scale: 1
-        property int small: 12 * scale
-        property int normal: 17 * scale
-        property int large: 25 * scale
-        property int full: 1000 * scale
-    }
-
-    component Spacing: JsonObject {
-        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
-    }
-
-    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
-    }
-
-    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> 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 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 Anim: JsonObject {
-        property real mediaGifSpeedAdjustment: 300
-        property real sessionGifSpeed: 0.7
-        property AnimCurves curves: AnimCurves {}
-        property AnimDurations durations: AnimDurations {}
-    }
-
-    component Transparency: JsonObject {
-        property bool enabled: false
-        property real base: 0.85
-        property real layers: 0.4
-    }
+	component Anim: JsonObject {
+		property AnimCurves curves: AnimCurves {
+		}
+		property AnimDurations durations: AnimDurations {
+		}
+		property real mediaGifSpeedAdjustment: 300
+		property real sessionGifSpeed: 0.7
+	}
+	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]
+	}
+	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
+	}
+	component FontFamily: JsonObject {
+		property string clock: "Rubik"
+		property string material: "Material Symbols Rounded"
+		property string mono: "CaskaydiaCove NF"
+		property string sans: "Segoe UI Variable Text"
+	}
+	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 layers: 0.4
+	}
 }
@@ -2,6 +2,6 @@ import Quickshell.Io
 import qs.Config

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

 JsonObject {
 	property bool autoHide: false
-	property int rounding: 8
-	property Popouts popouts: Popouts {}
-
 	property list<var> entries: [
 		{
 			id: "workspaces",
@@ -14,6 +11,10 @@ JsonObject {
 			id: "audio",
 			enabled: true
 		},
+		{
+			id: "media",
+			enabled: true
+		},
 		{
 			id: "resources",
 			enabled: true
@@ -59,14 +60,17 @@ JsonObject {
 			enabled: true
 		},
 	]
+	property Popouts popouts: Popouts {
+	}
+	property int rounding: 8

 	component Popouts: JsonObject {
-		property bool tray: true
-		property bool audio: true
 		property bool activeWindow: true
-		property bool resources: true
+		property bool audio: true
 		property bool clock: true
 		property bool network: true
+		property bool resources: true
+		property bool tray: true
 		property bool upower: true
 	}
 }
@@ -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 background: adapter.background
-    property alias barConfig: adapter.barConfig
-    property alias lock: adapter.lock
-	property alias overview: adapter.overview
-	property alias services: adapter.services
+	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 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,16 +32,278 @@ Singleton {
 		recentSaveCooldown.restart();
 	}

-	property bool recentlySaved: false
+	function serializeAppearance(): var {
+		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
+			}
+		};
+	}
+
+	function serializeBackground(): var {
+		return {
+			wallFadeDuration: background.wallFadeDuration,
+			enabled: background.enabled
+		};
+	}
+
+	function serializeBar(): var {
+		return {
+			autoHide: barConfig.autoHide,
+			rounding: barConfig.rounding,
+			popouts: {
+				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 {
+		return {
+			schemeType: colors.schemeType
+		};
+	}
+
+	function serializeConfig(): var {
+		return {
+			barConfig: serializeBar(),
+			lock: serializeLock(),
+			general: serializeGeneral(),
+			services: serializeServices(),
+			notifs: serializeNotifs(),
+			sidebar: serializeSidebar(),
+			utilities: serializeUtilities(),
+			dashboard: serializeDashboard(),
+			appearance: serializeAppearance(),
+			osd: serializeOsd(),
+			background: serializeBackground(),
+			launcher: serializeLauncher(),
+			colors: serializeColors()
+		};
+	}
+
+	function serializeDashboard(): var {
+		return {
+			enabled: dashboard.enabled,
+			mediaUpdateInterval: dashboard.mediaUpdateInterval,
+			resourceUpdateInterval: dashboard.resourceUpdateInterval,
+			dragThreshold: dashboard.dragThreshold,
+			performance: {
+				showBattery: dashboard.performance.showBattery,
+				showGpu: dashboard.performance.showGpu,
+				showCpu: dashboard.performance.showCpu,
+				showMemory: dashboard.performance.showMemory,
+				showStorage: dashboard.performance.showStorage,
+				showNetwork: dashboard.performance.showNetwork
+			},
+			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
+			}
+		};
+	}
+
+	function serializeGeneral(): var {
+		return {
+			logo: general.logo,
+			wallpaperPath: general.wallpaperPath,
+			color: {
+				wallust: general.color.wallust,
+				mode: general.color.mode,
+				schemeGeneration: general.color.schemeGeneration,
+				scheduleDarkStart: general.color.scheduleDarkStart,
+				scheduleDarkEnd: general.color.scheduleDarkEnd,
+				neovimColors: general.color.neovimColors
+			},
+			apps: {
+				terminal: general.apps.terminal,
+				audio: general.apps.audio,
+				playback: general.apps.playback,
+				explorer: general.apps.explorer
+			},
+			idle: {
+				timouts: general.idle.timeouts
+			}
+		};
+	}
+
+	function serializeLauncher(): var {
+		return {
+			maxAppsShown: launcher.maxAppsShown,
+			maxWallpapers: launcher.maxWallpapers,
+			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 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
+			}
+		};
+	}
+
+	function serializeNotifs(): var {
+		return {
+			expire: notifs.expire,
+			defaultExpireTimeout: notifs.defaultExpireTimeout,
+			appNotifCooldown: notifs.appNotifCooldown,
+			clearThreshold: notifs.clearThreshold,
+			expandThreshold: notifs.expandThreshold,
+			actionOnClick: notifs.actionOnClick,
+			groupPreviewNum: notifs.groupPreviewNum,
+			sizes: {
+				width: notifs.sizes.width,
+				image: notifs.sizes.image,
+				badge: notifs.sizes.badge
+			}
+		};
+	}
+
+	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,
+			sizes: {
+				width: sidebar.sizes.width
+			}
+		};
+	}
+
+	function serializeUtilities(): var {
+		return {
+			enabled: utilities.enabled,
+			maxToasts: utilities.maxToasts,
+			sizes: {
+				width: utilities.sizes.width,
+				toastWidth: utilities.sizes.toastWidth
+			},
+			toasts: {
+				configLoaded: utilities.toasts.configLoaded,
+				chargingChanged: utilities.toasts.chargingChanged,
+				gameModeChanged: utilities.toasts.gameModeChanged,
+				dndChanged: utilities.toasts.dndChanged,
+				audioOutputChanged: utilities.toasts.audioOutputChanged,
+				audioInputChanged: utilities.toasts.audioInputChanged,
+				capsLockChanged: utilities.toasts.capsLockChanged,
+				numLockChanged: utilities.toasts.numLockChanged,
+				kbLayoutChanged: utilities.toasts.kbLayoutChanged,
+				vpnChanged: utilities.toasts.vpnChanged,
+				nowPlaying: utilities.toasts.nowPlaying
+			},
+			vpn: {
+				enabled: utilities.vpn.enabled,
+				provider: utilities.vpn.provider
+			}
+		};
+	}

 	ElapsedTimer {
 		id: timer
+
 	}

 	Timer {
 		id: saveTimer

 		interval: 500
+
 		onTriggered: {
 			timer.restart();
 			try {
@@ -65,316 +327,78 @@ Singleton {
 		id: recentSaveCooldown

 		interval: 2000
+
 		onTriggered: {
 			root.recentlySaved = false;
 		}
 	}

-	function serializeConfig(): var {
-		return {
-			barConfig: serializeBar(),
-			lock: serializeLock(),
-			general: serializeGeneral(),
-			services: serializeServices(),
-			notifs: serializeNotifs(),
-			sidebar: serializeSidebar(),
-			utilities: serializeUtilities(),
-			dashboard: serializeDashboard(),
-			appearance: serializeAppearance(),
-			osd: serializeOsd(),
-			background: serializeBackground(),
-			launcher: serializeLauncher(),
-			colors: serializeColors()
-		}
-	}
+	FileView {
+		id: fileView

-	function serializeBar(): var {
-		return {
-			autoHide: barConfig.autoHide,
-			rounding: barConfig.rounding,
-			popouts: {
-				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
-		}
-	}
+		path: `${Paths.config}/config.json`
+		watchChanges: true

-    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
-            }
-        };
-    }
-
-	function serializeGeneral(): var {
-		return {
-			logo: general.logo,
-			wallpaperPath: general.wallpaperPath,
-			color: {
-				wallust: general.color.wallust,
-				mode: general.color.mode,
-				schemeGeneration: general.color.schemeGeneration,
-				scheduleDarkStart: general.color.scheduleDarkStart,
-				scheduleDarkEnd: general.color.scheduleDarkEnd,
-				neovimColors: general.color.neovimColors
-			},
-			apps: {
-				terminal: general.apps.terminal,
-				audio: general.apps.audio,
-				playback: general.apps.playback,
-				explorer: general.apps.explorer,
-			},
-			idle: {
-				timouts: general.idle.timeouts
-			}
-		}
-	}
-
-    function serializeServices(): var {
-        return {
-            weatherLocation: services.weatherLocation,
-            useFahrenheit: services.useFahrenheit,
-            useTwelveHourClock: services.useTwelveHourClock,
-            gpuType: services.gpuType,
-            audioIncrement: services.audioIncrement,
-            brightnessIncrement: services.brightnessIncrement,
-            maxVolume: services.maxVolume,
-            defaultPlayer: services.defaultPlayer,
-            playerAliases: services.playerAliases
-        };
-    }
-
-    function serializeNotifs(): var {
-        return {
-            expire: notifs.expire,
-            defaultExpireTimeout: notifs.defaultExpireTimeout,
-            clearThreshold: notifs.clearThreshold,
-            expandThreshold: notifs.expandThreshold,
-            actionOnClick: notifs.actionOnClick,
-            groupPreviewNum: notifs.groupPreviewNum,
-            sizes: {
-                width: notifs.sizes.width,
-                image: notifs.sizes.image,
-                badge: notifs.sizes.badge
-            }
-        };
-    }
-
-    function serializeSidebar(): var {
-        return {
-            enabled: sidebar.enabled,
-            sizes: {
-                width: sidebar.sizes.width
-            }
-        };
-    }
-
-    function serializeUtilities(): var {
-        return {
-            enabled: utilities.enabled,
-            maxToasts: utilities.maxToasts,
-            sizes: {
-                width: utilities.sizes.width,
-                toastWidth: utilities.sizes.toastWidth
-            },
-            toasts: {
-                configLoaded: utilities.toasts.configLoaded,
-                chargingChanged: utilities.toasts.chargingChanged,
-                gameModeChanged: utilities.toasts.gameModeChanged,
-                dndChanged: utilities.toasts.dndChanged,
-                audioOutputChanged: utilities.toasts.audioOutputChanged,
-                audioInputChanged: utilities.toasts.audioInputChanged,
-                capsLockChanged: utilities.toasts.capsLockChanged,
-                numLockChanged: utilities.toasts.numLockChanged,
-                kbLayoutChanged: utilities.toasts.kbLayoutChanged,
-                vpnChanged: utilities.toasts.vpnChanged,
-                nowPlaying: utilities.toasts.nowPlaying
-            },
-            vpn: {
-                enabled: utilities.vpn.enabled,
-                provider: utilities.vpn.provider
-            }
-        };
-    }
-
-    function serializeDashboard(): var {
-        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
-            }
-        };
-    }
-
-    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 serializeLauncher(): var {
-		return {
-			maxAppsShown: launcher.maxAppsShown,
-			maxWallpapers: launcher.maxWallpapers,
-			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
-		}
-	}
-
-    function serializeAppearance(): var {
-        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
-            }
-        };
-    }
-
-	function serializeColors(): var {
-		return {
-			schemeType: colors.schemeType,
-		}
-	}
-
-    FileView {
-        id: fileView
-
-        path: `${Paths.config}/config.json`
-
-        watchChanges: true
-
-        onFileChanged: {
-			if ( !root.recentlySaved ) {
+		onFileChanged: {
+			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 BarConfig barConfig: BarConfig {}
-            property LockConf lock: LockConf {}
-			property Overview overview: Overview {}
-			property Services services: Services {}
-			property NotifConfig notifs: NotifConfig {}
-			property SidebarConfig sidebar: SidebarConfig {}
-			property UtilConfig utilities: UtilConfig {}
-			property General general: General {}
-			property DashboardConfig dashboard: DashboardConfig {}
-			property AppearanceConf appearance: AppearanceConf {}
-			property Osd osd: Osd {}
-			property Launcher launcher: Launcher {}
-			property Colors colors: Colors {}
-        }
-    }
+		JsonAdapter {
+			id: adapter
+
+			property AppearanceConf appearance: AppearanceConf {
+			}
+			property BackgroundConfig background: BackgroundConfig {
+			}
+			property BarConfig barConfig: BarConfig {
+			}
+			property Colors colors: Colors {
+			}
+			property DashboardConfig dashboard: DashboardConfig {
+			}
+			property General general: General {
+			}
+			property Launcher launcher: Launcher {
+			}
+			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 {
+			}
+		}
+	}
 }
@@ -1,24 +1,36 @@
 import Quickshell.Io

 JsonObject {
-    property bool enabled: true
-    property int mediaUpdateInterval: 500
-    property int dragThreshold: 50
-    property Sizes sizes: Sizes {}
+	property int dragThreshold: 50
+	property bool enabled: true
+	property int mediaUpdateInterval: 500
+	property Performance performance: Performance {
+	}
+	property int resourceUpdateInterval: 1000
+	property Sizes sizes: Sizes {
+	}

-    component Sizes: JsonObject {
-        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
-    }
+	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 weatherWidth: 250
+	}
 }
@@ -9,270 +9,272 @@ import qs.Helpers
 import qs.Paths

 Singleton {
-    id: root
+	id: root

-    property bool showPreview
-    property string scheme
-    property string flavour
-    readonly property bool light: showPreview ? previewLight : currentLight
-    property bool currentLight
-    property bool previewLight
-    readonly property M3Palette palette: showPreview ? preview : current
-    readonly property M3TPalette tPalette: M3TPalette {}
-    readonly property M3Palette current: M3Palette {}
-    readonly property M3Palette preview: M3Palette {}
-    readonly property Transparency transparency: Transparency {}
-    readonly property alias wallLuminance: analyser.luminance
+	readonly property M3Palette current: M3Palette {
+	}
+	property bool currentLight
+	property string flavour
+	readonly property bool light: showPreview ? previewLight : currentLight
+	readonly property M3Palette palette: showPreview ? preview : current
+	readonly property M3Palette preview: M3Palette {
+	}
+	property bool previewLight
+	property string scheme
+	property bool showPreview
+	readonly property M3TPalette tPalette: M3TPalette {
+	}
+	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);

-    function alterColor(c: color, a: real, layer: int): color {
-        const luminance = getLuminance(c);
+		const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (1 - transparency.base) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
+		const scale = (luminance + offset) / luminance;
+		const r = Math.max(0, Math.min(1, c.r * scale));
+		const g = Math.max(0, Math.min(1, c.g * scale));
+		const b = Math.max(0, Math.min(1, c.b * scale));

-        const offset = (!light || layer == 1 ? 1 : -layer / 2) * (light ? 0.2 : 0.3) * (1 - transparency.base) * (1 + wallLuminance * (light ? (layer == 1 ? 3 : 1) : 2.5));
-        const scale = (luminance + offset) / luminance;
-        const r = Math.max(0, Math.min(1, c.r * scale));
-        const g = Math.max(0, Math.min(1, c.g * scale));
-        const b = Math.max(0, Math.min(1, c.b * scale));
+		return Qt.rgba(r, g, b, a);
+	}

-        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;
+	function layer(c: color, layer: var): color {
+		if (!transparency.enabled)
+			return c;

-        return layer === 0 ? Qt.alpha(c, transparency.base) : alterColor(c, transparency.layers, layer ?? 1);
-    }
+		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);

-    function load(data: string, isPreview: bool): void {
-        const colors = isPreview ? preview : current;
-        const scheme = JSON.parse(data);
+		if (!isPreview) {
+			root.scheme = scheme.name;
+			flavour = scheme.flavor;
+			currentLight = scheme.mode === "light";
+		} else {
+			previewLight = scheme.mode === "light";
+		}

-        if (!isPreview) {
-            root.scheme = scheme.name;
-            flavour = scheme.flavor;
-            currentLight = scheme.mode === "light";
-        } else {
-            previewLight = scheme.mode === "light";
-        }
+		for (const [name, color] of Object.entries(scheme.colors)) {
+			const propName = name.startsWith("term") ? name : `m3${name}`;
+			if (colors.hasOwnProperty(propName))
+				colors[propName] = `${color}`;
+		}
+	}

-        for (const [name, color] of Object.entries(scheme.colors)) {
-            const propName = name.startsWith("term") ? name : `m3${name}`;
-            if (colors.hasOwnProperty(propName))
-                colors[propName] = `${color}`;
-        }
-    }
+	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)
-    }
+	FileView {
+		path: `${Paths.state}/scheme.json`
+		watchChanges: true

-    ImageAnalyser {
-        id: analyser
+		onFileChanged: reload()
+		onLoaded: root.load(text(), false)
+	}

-        source: WallpaperPath.currentWallpaperPath
-    }
+	ImageAnalyser {
+		id: analyser

-    component Transparency: QtObject {
-        readonly property bool enabled: Appearance.transparency.enabled
-        readonly property real base: Appearance.transparency.base - (root.light ? 0.1 : 0)
-        readonly property real layers: Appearance.transparency.layers
-    }
-
-    component M3TPalette: QtObject {
-        readonly property color m3primary_paletteKeyColor: root.layer(root.palette.m3primary_paletteKeyColor)
-        readonly property color m3secondary_paletteKeyColor: root.layer(root.palette.m3secondary_paletteKeyColor)
-        readonly property color m3tertiary_paletteKeyColor: root.layer(root.palette.m3tertiary_paletteKeyColor)
-        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 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 m3onSurface: root.layer(root.palette.m3onSurface)
-        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 m3onTertiaryFixed: root.layer(root.palette.m3onTertiaryFixed)
-        readonly property color m3onTertiaryFixedVariant: root.layer(root.palette.m3onTertiaryFixedVariant)
-    }
-
-    component M3Palette: QtObject {
-        property color m3primary_paletteKeyColor: "#a8627b"
-        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"
-    }
+		source: WallpaperPath.currentWallpaperPath
+	}

 	component M3MaccchiatoPalette: QtObject {
-		property color m3primary_paletteKeyColor: "#6a73ac"
-		property color m3secondary_paletteKeyColor: "#72758e"
-		property color m3tertiary_paletteKeyColor: "#9b6592"
+		property color m3background: "#131317"
+		property color m3error: "#ffb4ab"
+		property color m3errorContainer: "#93000a"
+		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 m3background: "#131317"
 		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 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 m3surfaceContainerLow: "#1b1b1f"
+		property color m3surfaceContainerLowest: "#0e0e12"
+		property color m3surfaceDim: "#131317"
 		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 m3surfaceVariant: "#46464f"
 		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 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 m3successContainer: "#374B3E"
 		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 m3error: root.layer(root.palette.m3error)
+		readonly property color m3errorContainer: root.layer(root.palette.m3errorContainer)
+		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 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 m3surfaceBright: root.layer(root.palette.m3surfaceBright, 0)
+		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 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 m3tertiary: root.layer(root.palette.m3tertiary)
+		readonly property color m3tertiaryContainer: root.layer(root.palette.m3tertiaryContainer)
+		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)
+	}
+	component Transparency: QtObject {
+		readonly property real base: Appearance.transparency.base - (root.light ? 0.1 : 0)
+		readonly property bool enabled: Appearance.transparency.enabled
+		readonly property real layers: Appearance.transparency.layers
 	}
 }
@@ -2,28 +2,29 @@ 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"]
+	}
+	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 Apps: JsonObject {
-        property list<string> terminal: ["kitty"]
-        property list<string> audio: ["pavucontrol"]
-        property list<string> playback: ["mpv"]
-        property list<string> explorer: ["dolphin"]
-    }
-
 	component Idle: JsonObject {
 		property list<var> timeouts: [
 			{
@@ -1,28 +1,7 @@
 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",
@@ -32,53 +11,74 @@ JsonObject {
 			enabled: true,
 			dangerous: false
 		},
-        {
-            name: "Wallpaper",
-            icon: "image",
-            description: "Change the current wallpaper",
-            command: ["autocomplete", "wallpaper"],
-            enabled: true,
-            dangerous: false
-        },
-        {
-            name: "Shutdown",
-            icon: "power_settings_new",
-            description: "Shutdown the system",
-            command: ["systemctl", "poweroff"],
-            enabled: true,
-            dangerous: true
-        },
-        {
-            name: "Reboot",
-            icon: "cached",
-            description: "Reboot the system",
-            command: ["systemctl", "reboot"],
-            enabled: true,
-            dangerous: true
-        },
-        {
-            name: "Logout",
-            icon: "exit_to_app",
-            description: "Log out of the current session",
-            command: ["loginctl", "terminate-user", ""],
-            enabled: true,
-            dangerous: true
-        },
-        {
-            name: "Lock",
-            icon: "lock",
-            description: "Lock the current session",
-            command: ["loginctl", "lock-session"],
-            enabled: true,
-            dangerous: false
-        },
-        {
-            name: "Sleep",
-            icon: "bedtime",
-            description: "Suspend then hibernate",
-            command: ["systemctl", "suspend-then-hibernate"],
-            enabled: true,
-            dangerous: false
-        },
+		{
+			name: "Wallpaper",
+			icon: "image",
+			description: "Change the current wallpaper",
+			command: ["autocomplete", "wallpaper"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Shutdown",
+			icon: "power_settings_new",
+			description: "Shutdown the system",
+			command: ["systemctl", "poweroff"],
+			enabled: true,
+			dangerous: true
+		},
+		{
+			name: "Reboot",
+			icon: "cached",
+			description: "Reboot the system",
+			command: ["systemctl", "reboot"],
+			enabled: true,
+			dangerous: true
+		},
+		{
+			name: "Logout",
+			icon: "exit_to_app",
+			description: "Log out of the current session",
+			command: ["loginctl", "terminate-user", ""],
+			enabled: true,
+			dangerous: true
+		},
+		{
+			name: "Lock",
+			icon: "lock",
+			description: "Lock the current session",
+			command: ["loginctl", "lock-session"],
+			enabled: true,
+			dangerous: false
+		},
+		{
+			name: "Sleep",
+			icon: "bedtime",
+			description: "Suspend then hibernate",
+			command: ["systemctl", "suspend-then-hibernate"],
+			enabled: true,
+			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
+	}
 }
@@ -1,15 +1,16 @@
 import Quickshell.Io

 JsonObject {
-    property bool recolorLogo: false
-    property bool enableFprint: true
-    property int maxFprintTries: 3
-    property Sizes sizes: Sizes {}
 	property int blurAmount: 40
+	property bool enableFprint: true
+	property int maxFprintTries: 3
+	property bool recolorLogo: false
+	property Sizes sizes: Sizes {
+	}

-    component Sizes: JsonObject {
-        property real heightMult: 0.7
-        property real ratio: 16 / 9
-        property int centerWidth: 600
-    }
+	component Sizes: JsonObject {
+		property int centerWidth: 600
+		property real heightMult: 0.7
+		property real ratio: 16 / 9
+	}
 }
@@ -2,26 +2,25 @@ pragma Singleton
 import Quickshell

 Singleton {
-    id: root
+	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
-    readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
-    readonly property int emphasizedDecelTime: 400 * scale
-    readonly property int emphasizedTime: 500 * scale
-    readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1.00, 1, 1]
-    readonly property int expressiveDefaultSpatialTime: 500 * scale
-    readonly property list<real> expressiveEffects: [0.34, 0.80, 0.34, 1.00, 1, 1]
-    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
-    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
-    readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
-    readonly property int standardDecelTime: 250 * scale
-    readonly property int standardTime: 300 * 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
+	readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+	readonly property int emphasizedDecelTime: 400 * scale
+	readonly property int emphasizedTime: 500 * scale
+	readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1.00, 1, 1]
+	readonly property int expressiveDefaultSpatialTime: 500 * scale
+	readonly property list<real> expressiveEffects: [0.34, 0.80, 0.34, 1.00, 1, 1]
+	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
+	readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
+	readonly property int standardDecelTime: 250 * scale
+	readonly property int standardTime: 300 * scale
 }
@@ -1,18 +1,20 @@
 import Quickshell.Io

 JsonObject {
-    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 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 groupPreviewNum: 3
+	property bool openExpanded: false
+	property Sizes sizes: Sizes {
+	}

-    component Sizes: JsonObject {
-        property int width: 400
-        property int image: 41
-        property int badge: 20
-    }
+	component Sizes: JsonObject {
+		property int badge: 20
+		property int image: 41
+		property int width: 400
+	}
 }
@@ -1,15 +1,16 @@
 import Quickshell.Io

 JsonObject {
-    property bool enabled: true
-    property int hideDelay: 3000
-    property bool enableBrightness: true
-    property bool enableMicrophone: true
 	property bool allMonBrightness: false
-    property Sizes sizes: Sizes {}
+	property bool enableBrightness: true
+	property bool enableMicrophone: true
+	property bool enabled: true
+	property int hideDelay: 3000
+	property Sizes sizes: Sizes {
+	}

-    component Sizes: JsonObject {
-        property int sliderWidth: 30
-        property int sliderHeight: 150
-    }
+	component Sizes: JsonObject {
+		property int sliderHeight: 150
+		property int sliderWidth: 30
+	}
 }
@@ -1,8 +1,8 @@
 import Quickshell.Io

 JsonObject {
-	property int rows: 2
 	property int columns: 5
-	property real scale: 0.16
 	property bool enable: false
+	property int rows: 2
+	property real scale: 0.16
 }
@@ -2,18 +2,20 @@ 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 real maxVolume: 1.0
-    property string defaultPlayer: "Spotify"
-    property list<var> playerAliases: [
-        {
-            "from": "com.github.th_ch.youtube_music",
-            "to": "YT Music"
-        }
-    ]
+	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 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: ""
 }
@@ -1,10 +1,11 @@
 import Quickshell.Io

 JsonObject {
-    property bool enabled: true
-    property Sizes sizes: Sizes {}
+	property bool enabled: true
+	property Sizes sizes: Sizes {
+	}

-    component Sizes: JsonObject {
-        property int width: 430
-    }
+	component Sizes: JsonObject {
+		property int width: 430
+	}
 }
@@ -1,7 +1,7 @@
 import Quickshell.Io

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

 JsonObject {
-    property bool enabled: true
-    property int maxToasts: 4
+	property bool enabled: true
+	property int maxToasts: 4
+	property Sizes sizes: Sizes {
+	}
+	property Toasts toasts: Toasts {
+	}
+	property Vpn vpn: Vpn {
+	}

-    property Sizes sizes: Sizes {}
-    property Toasts toasts: Toasts {}
-    property Vpn vpn: Vpn {}
-
-    component Sizes: JsonObject {
-        property int width: 430
-        property int toastWidth: 430
-    }
-
-    component Toasts: JsonObject {
-        property bool configLoaded: 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 vpnChanged: true
-        property bool nowPlaying: false
-    }
-
-    component Vpn: JsonObject {
-        property bool enabled: false
-        property list<var> provider: ["netbird"]
-    }
+	component Sizes: JsonObject {
+		property int toastWidth: 430
+		property int width: 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 gameModeChanged: true
+		property bool kbLayoutChanged: true
+		property bool kbLimit: true
+		property bool nowPlaying: false
+		property bool numLockChanged: true
+		property bool vpnChanged: true
+	}
+	component Vpn: JsonObject {
+		property bool enabled: false
+		property list<var> provider: ["netbird"]
+	}
 }
@@ -1,6 +1,6 @@
 import Quickshell.Io

 JsonObject {
-    property string textColor: "black"
-    property string inactiveTextColor: "white"
+	property string inactiveTextColor: "white"
+	property string textColor: "black"
 }
@@ -1,144 +1,150 @@
 pragma Singleton

-import qs.Config
 import ZShell.Services
 import ZShell
 import Quickshell
 import Quickshell.Services.Pipewire
 import QtQuick
+import qs.Config

 Singleton {
-    id: root
+	id: root

-    property string previousSinkName: ""
-    property string previousSourceName: ""
+	readonly property alias beatTracker: beatTracker
+	readonly property alias cava: cava
+	readonly property bool muted: !!sink?.audio?.muted
+	readonly property var nodes: Pipewire.nodes.values.reduce((acc, node) => {
+		if (!node.isStream) {
+			if (node.isSink)
+				acc.sinks.push(node);
+			else if (node.audio)
+				acc.sources.push(node);
+		} else if (node.isStream && node.audio) {
+			// Application streams (output streams)
+			acc.streams.push(node);
+		}
+		return acc;
+	}, {
+		sources: [],
+		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 real volume: sink?.audio?.volume ?? 0

-    readonly property var nodes: Pipewire.nodes.values.reduce((acc, node) => {
-        if (!node.isStream) {
-            if (node.isSink)
-                acc.sinks.push(node);
-            else if (node.audio)
-                acc.sources.push(node);
-        } else if (node.isStream && node.audio) {
-            // Application streams (output streams)
-            acc.streams.push(node);
-        }
-        return acc;
-    }, {
-        sources: [],
-        sinks: [],
-        streams: []
-    })
+	function decrementSourceVolume(amount: real): void {
+		setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
+	}

-    readonly property list<PwNode> sinks: nodes.sinks
-    readonly property list<PwNode> sources: nodes.sources
-    readonly property list<PwNode> streams: nodes.streams
+	function decrementVolume(amount: real): void {
+		setVolume(volume - (amount || Config.services.audioIncrement));
+	}

-    readonly property PwNode sink: Pipewire.defaultAudioSink
-    readonly property PwNode source: Pipewire.defaultAudioSource
+	function getStreamMuted(stream: PwNode): bool {
+		return !!stream?.audio?.muted;
+	}

-    readonly property bool muted: !!sink?.audio?.muted
-    readonly property real volume: sink?.audio?.volume ?? 0
+	function getStreamName(stream: PwNode): string {
+		if (!stream)
+			return qsTr("Unknown");
+		// Try application name first, then description, then name
+		return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
+	}

-    readonly property bool sourceMuted: !!source?.audio?.muted
-    readonly property real sourceVolume: source?.audio?.volume ?? 0
+	function getStreamVolume(stream: PwNode): real {
+		return stream?.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 incrementSourceVolume(amount: real): void {
+		setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
+	}

-    function incrementVolume(amount: real): void {
-        setVolume(volume + (amount || Config.services.audioIncrement));
-    }
+	function incrementVolume(amount: real): void {
+		setVolume(volume + (amount || Config.services.audioIncrement));
+	}

-    function decrementVolume(amount: real): void {
-        setVolume(volume - (amount || Config.services.audioIncrement));
-    }
+	function setAudioSink(newSink: PwNode): void {
+		Pipewire.preferredDefaultAudioSink = newSink;
+	}

-    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 setAudioSource(newSource: PwNode): void {
+		Pipewire.preferredDefaultAudioSource = newSource;
+	}

-    function incrementSourceVolume(amount: real): void {
-        setSourceVolume(sourceVolume + (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 decrementSourceVolume(amount: real): void {
-        setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
-    }
+	function setStreamMuted(stream: PwNode, muted: bool): void {
+		if (stream?.ready && stream?.audio) {
+			stream.audio.muted = muted;
+		}
+	}

-    function setAudioSink(newSink: PwNode): void {
-        Pipewire.preferredDefaultAudioSink = newSink;
-    }
+	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 setAudioSource(newSource: PwNode): void {
-        Pipewire.preferredDefaultAudioSource = newSource;
-    }
+	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 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));
-        }
-    }
+	Component.onCompleted: {
+		previousSinkName = sink?.description || sink?.name || qsTr("Unknown Device");
+		previousSourceName = source?.description || source?.name || qsTr("Unknown Device");
+	}
+	onSinkChanged: {
+		if (!sink?.ready)
+			return;

-    function setStreamMuted(stream: PwNode, muted: bool): void {
-        if (stream?.ready && stream?.audio) {
-            stream.audio.muted = muted;
-        }
-    }
+		const newSinkName = sink.description || sink.name || qsTr("Unknown Device");

-    function getStreamVolume(stream: PwNode): real {
-        return stream?.audio?.volume ?? 0;
-    }
+		if (previousSinkName && previousSinkName !== newSinkName && Config.utilities.toasts.audioOutputChanged)
+			Toaster.toast(qsTr("Audio output changed"), qsTr("Now using: %1").arg(newSinkName), "volume_up");

-    function getStreamMuted(stream: PwNode): bool {
-        return !!stream?.audio?.muted;
-    }
+		previousSinkName = newSinkName;
+	}
+	onSourceChanged: {
+		if (!source?.ready)
+			return;

-    function getStreamName(stream: PwNode): string {
-        if (!stream)
-            return qsTr("Unknown");
-        // Try application name first, then description, then name
-        return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
-    }
+		const newSourceName = source.description || source.name || qsTr("Unknown Device");

-    onSinkChanged: {
-        if (!sink?.ready)
-            return;
+		if (previousSourceName && previousSourceName !== newSourceName && Config.utilities.toasts.audioInputChanged)
+			Toaster.toast(qsTr("Audio input changed"), qsTr("Now using: %1").arg(newSourceName), "mic");

-        const newSinkName = sink.description || sink.name || qsTr("Unknown Device");
+		previousSourceName = newSourceName;
+	}

-        if (previousSinkName && previousSinkName !== newSinkName && Config.utilities.toasts.audioOutputChanged)
-            Toaster.toast(qsTr("Audio output changed"), qsTr("Now using: %1").arg(newSinkName), "volume_up");
+	CavaProvider {
+		id: cava

-        previousSinkName = newSinkName;
-    }
+		bars: Config.services.visualizerBars
+	}

-    onSourceChanged: {
-        if (!source?.ready)
-            return;
+	BeatTracker {
+		id: beatTracker

-        const newSourceName = source.description || source.name || qsTr("Unknown Device");
+	}

-        if (previousSourceName && previousSourceName !== newSourceName && Config.utilities.toasts.audioInputChanged)
-            Toaster.toast(qsTr("Audio input changed"), qsTr("Now using: %1").arg(newSourceName), "mic");
-
-        previousSourceName = newSourceName;
-    }
-
-    Component.onCompleted: {
-        previousSinkName = sink?.description || sink?.name || qsTr("Unknown Device");
-        previousSourceName = source?.description || source?.name || qsTr("Unknown Device");
-    }
-
-    PwObjectTracker {
-        objects: [...root.sinks, ...root.sources, ...root.streams]
-    }
+	PwObjectTracker {
+		objects: [...root.sinks, ...root.sources, ...root.streams]
+	}
 }
@@ -0,0 +1,326 @@
+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
+	}
+}
@@ -14,335 +14,360 @@ import qs.Paths
 import qs.Config

 Singleton {
-    id: root
+	id: root

-    property list<Notif> list: []
-    readonly property list<Notif> notClosed: list.filter( n => !n.closed )
-    readonly property list<Notif> popups: list.filter( n => n.popup )
-    property alias dnd: props.dnd
-    property alias server: server
+	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> popups: list.filter(n => n.popup)
+	property alias server: server

-    property bool loaded
+	function shouldThrottle(appName: string): bool {
+		if (props.dnd)
+			return false;

-    onListChanged: {
-        if ( loaded ) {
-            saveTimer.restart();
-        }
-        if ( root.list.length > 0 ) {
-            HasNotifications.hasNotifications = true;
-        } else {
-            HasNotifications.hasNotifications = false;
-        }
-    }
+		const key = (appName || "unknown").trim().toLowerCase();
+		const cooldownSec = Config.notifs.appNotifCooldown;
+		const cooldownMs = Math.max(0, cooldownSec * 1000);

-    Timer {
-        id: saveTimer
-        interval: 1000
-        onTriggered: storage.setText( JSON.stringify( root.notClosed.map( n => ({
-                    time: n.time,
-                    id: n.id,
-                    summary: n.summary,
-                    body: n.body,
-                    appIcon: n.appIcon,
-                    appName: n.appName,
-                    image: n.image,
-                    expireTimeout: n.expireTimeout,
-                    urgency: n.urgency,
-                    resident: n.resident,
-                    hasActionIcons: n.hasActionIcons,
-                    actions: n.actions
-                }))));
-    }
+		if (cooldownMs <= 0)
+			return true;

-    PersistentProperties {
-        id: props
+		const now = Date.now();
+		const until = appCooldownMap.get(key) ?? 0;

-        property bool dnd
+		if (now < until)
+			return false;

-        reloadableId: "notifs"
-    }
+		appCooldownMap.set(key, now + cooldownMs);
+		return true;
+	}

-    NotificationServer {
-        id: server
+	onListChanged: {
+		if (loaded) {
+			saveTimer.restart();
+		}
+		if (root.list.length > 0) {
+			HasNotifications.hasNotifications = true;
+		} else {
+			HasNotifications.hasNotifications = false;
+		}
+	}

-        keepOnReload: false
-        actionsSupported: true
-        bodyHyperlinksSupported: true
-        bodyImagesSupported: true
-        bodyMarkupSupported: true
-        imageSupported: true
-        persistenceSupported: true
+	Timer {
+		id: saveTimer

-        onNotification: notif => {
-            notif.tracked = true;
+		interval: 1000

-            const comp = notifComp.createObject(root, {
-                popup: !props.dnd,
-                notification: notif
-            });
-            root.list = [comp, ...root.list];
-        }
-    }
+		onTriggered: storage.setText(JSON.stringify(root.notClosed.map(n => ({
+					time: n.time,
+					id: n.id,
+					summary: n.summary,
+					body: n.body,
+					appIcon: n.appIcon,
+					appName: n.appName,
+					image: n.image,
+					expireTimeout: n.expireTimeout,
+					urgency: n.urgency,
+					resident: n.resident,
+					hasActionIcons: n.hasActionIcons,
+					actions: n.actions
+				}))))
+	}

-    FileView {
-        id: storage
-        path: `${Paths.state}/notifs.json`
+	PersistentProperties {
+		id: props

-        onLoaded: {
-            const data = JSON.parse(text());
-            for (const notif of data)
-                root.list.push(notifComp.createObject(root, notif));
-            root.list.sort((a, b) => b.time - a.time);
-            root.loaded = true;
-        }
+		property bool dnd

-        onLoadFailed: err => {
-            if (err === FileViewError.FileNotFound) {
-                root.loaded = true;
-                setText("[]");
-            }
-        }
-    }
+		reloadableId: "notifs"
+	}

-    CustomShortcut {
-        name: "clearnotifs"
-        description: "Clear all notifications"
-        onPressed: {
-            for (const notif of root.list.slice())
-                notif.close();
-        }
-    }
+	NotificationServer {
+		id: server

-    IpcHandler {
-        target: "notifs"
+		actionsSupported: true
+		bodyHyperlinksSupported: true
+		bodyImagesSupported: true
+		bodyMarkupSupported: true
+		imageSupported: true
+		keepOnReload: false
+		persistenceSupported: true

-        function clear(): void {
-            for (const notif of root.list.slice())
-                notif.close();
-        }
+		onNotification: notif => {
+			notif.tracked = true;

-        function isDndEnabled(): bool {
-            return props.dnd;
-        }
+			const is_popup = root.shouldThrottle(notif.appName);

-        function toggleDnd(): void {
-            props.dnd = !props.dnd;
-        }
+			const comp = notifComp.createObject(root, {
+				popup: is_popup,
+				notification: notif
+			});
+			root.list = [comp, ...root.list];
+		}
+	}

-        function enableDnd(): void {
-            props.dnd = true;
-        }
+	FileView {
+		id: storage

-        function disableDnd(): void {
-            props.dnd = false;
-        }
-    }
+		path: `${Paths.state}/notifs.json`

-    component Notif: QtObject {
-        id: notif
+		onLoadFailed: err => {
+			if (err === FileViewError.FileNotFound) {
+				root.loaded = true;
+				setText("[]");
+			}
+		}
+		onLoaded: {
+			const data = JSON.parse(text());
+			for (const notif of data)
+				root.list.push(notifComp.createObject(root, notif));
+			root.list.sort((a, b) => b.time - a.time);
+			root.loaded = true;
+		}
+	}

-        property bool popup
-        property bool closed
-        property var locks: new Set()
+	CustomShortcut {
+		description: "Clear all notifications"
+		name: "clearnotifs"

-        property date time: new Date()
-        readonly property string timeStr: {
-            const diff = Time.date.getTime() - time.getTime();
-            const m = Math.floor(diff / 60000);
+		onPressed: {
+			for (const notif of root.list.slice())
+				notif.close();
+		}
+	}

-            if (m < 1)
-                return qsTr("now");
+	IpcHandler {
+		function clear(): void {
+			for (const notif of root.list.slice())
+				notif.close();
+		}

-            const h = Math.floor(m / 60);
-            const d = Math.floor(h / 24);
+		function disableDnd(): void {
+			props.dnd = false;
+		}

-            if (d > 0)
-                return `${d}d`;
-            if (h > 0)
-                return `${h}h`;
-            return `${m}m`;
-        }
+		function enableDnd(): void {
+			props.dnd = true;
+		}

-        property Notification notification
-        property string id
-        property string summary
-        property string body
-        property string appIcon
-        property string appName
-        property string image
-        property real expireTimeout: 5
-        property int urgency: NotificationUrgency.Normal
-        property bool resident
-        property bool hasActionIcons
-        property list<var> actions
+		function isDndEnabled(): bool {
+			return props.dnd;
+		}

-        readonly property Timer timer: Timer {
-			property int totalTime: Config.notifs.defaultExpireTimeout
-			property int remainingTime: totalTime
-			property bool paused: false
+		function toggleDnd(): void {
+			props.dnd = !props.dnd;
+		}

-            running: !paused
-			repeat: true
-            interval: 50
-            onTriggered: {
-				remainingTime -= interval;
+		target: "notifs"
+	}

-				if ( remainingTime <= 0 ) {
-					remainingTime = 0;
-					notif.popup = false;
-					stop();
+	Component {
+		id: notifComp
+
+		Notif {
+		}
+	}
+
+	component Notif: QtObject {
+		id: notif
+
+		property list<var> actions
+		property string appIcon
+		property string appName
+		property string body
+		property bool closed
+		readonly property Connections conn: Connections {
+			function onActionsChanged(): void {
+				notif.actions = notif.notification.actions.map(a => ({
+							identifier: a.identifier,
+							text: a.text,
+							invoke: () => a.invoke()
+						}));
+			}
+
+			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
+
+				mask: Region {
 				}
-            }
-        }

-        readonly property LazyLoader dummyImageLoader: LazyLoader {
-            active: false
+				Image {
+					function tryCache(): void {
+						if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image)
+							return;

-            PanelWindow {
-                implicitWidth: Config.notifs.sizes.image
-                implicitHeight: Config.notifs.sizes.image
-                color: "transparent"
-                mask: Region {}
+						const cacheKey = notif.appName + notif.summary + notif.id;
+						let h1 = 0xdeadbeef, h2 = 0x41c6ce57, ch;
+						for (let i = 0; i < cacheKey.length; i++) {
+							ch = cacheKey.charCodeAt(i);
+							h1 = Math.imul(h1 ^ ch, 2654435761);
+							h2 = Math.imul(h2 ^ ch, 1597334677);
+						}
+						h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
+						h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+						h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
+						h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+						const hash = (h2 >>> 0).toString(16).padStart(8, 0) + (h1 >>> 0).toString(16).padStart(8, 0);

-                Image {
-                    function tryCache(): void {
-                        if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image)
-                            return;
-
-                        const cacheKey = notif.appName + notif.summary + notif.id;
-                        let h1 = 0xdeadbeef, h2 = 0x41c6ce57, ch;
-                        for (let i = 0; i < cacheKey.length; i++) {
-                            ch = cacheKey.charCodeAt(i);
-                            h1 = Math.imul(h1 ^ ch, 2654435761);
-                            h2 = Math.imul(h2 ^ ch, 1597334677);
-                        }
-                        h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
-                        h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
-                        h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
-                        h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
-                        const hash = (h2 >>> 0).toString(16).padStart(8, 0) + (h1 >>> 0).toString(16).padStart(8, 0);
-
-                        const cache = `${Paths.notifimagecache}/${hash}.png`;
+						const cache = `${Paths.notifimagecache}/${hash}.png`;
 						ZShellIo.saveItem(this, Qt.resolvedUrl(cache), () => {
 							notif.image = cache;
 							notif.dummyImageLoader.active = false;
 						});
-                    }
+					}

-                    anchors.fill: parent
-                    source: Qt.resolvedUrl(notif.image)
-                    fillMode: Image.PreserveAspectCrop
-                    cache: false
-                    asynchronous: true
-                    opacity: 0
+					anchors.fill: parent
+					asynchronous: true
+					cache: false
+					fillMode: Image.PreserveAspectCrop
+					opacity: 0
+					source: Qt.resolvedUrl(notif.image)

-                    onStatusChanged: tryCache()
-                    onWidthChanged: tryCache()
-                    onHeightChanged: tryCache()
-                }
-            }
-        }
+					onHeightChanged: tryCache()
+					onStatusChanged: tryCache()
+					onWidthChanged: 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);

-        readonly property Connections conn: Connections {
-            target: notif.notification
+			if (m < 1)
+				return qsTr("now");

-            function onClosed(): void {
-                notif.close();
-            }
+			const h = Math.floor(m / 60);
+			const d = Math.floor(h / 24);

-            function onSummaryChanged(): void {
-                notif.summary = notif.notification.summary;
-            }
+			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

-            function onBodyChanged(): void {
-                notif.body = notif.notification.body;
-            }
+			interval: 50
+			repeat: true
+			running: !paused

-            function onAppIconChanged(): void {
-                notif.appIcon = notif.notification.appIcon;
-            }
+			onTriggered: {
+				remainingTime -= interval;

-            function onAppNameChanged(): void {
-                notif.appName = notif.notification.appName;
-            }
+				if (remainingTime <= 0) {
+					remainingTime = 0;
+					notif.popup = false;
+					stop();
+				}
+			}
+		}
+		property int urgency: NotificationUrgency.Normal

-            function onImageChanged(): void {
-                notif.image = notif.notification.image;
-                if (notif.notification?.image)
-                    notif.dummyImageLoader.active = true;
-            }
+		function close(): void {
+			closed = true;
+			if (locks.size === 0 && root.list.includes(this)) {
+				root.list = root.list.filter(n => n !== this);
+				notification?.dismiss();
+				destroy();
+			}
+		}

-            function onExpireTimeoutChanged(): void {
-                notif.expireTimeout = notif.notification.expireTimeout;
-            }
+		function lock(item: Item): void {
+			locks.add(item);
+		}

-            function onUrgencyChanged(): void {
-                notif.urgency = notif.notification.urgency;
-            }
+		function unlock(item: Item): void {
+			locks.delete(item);
+			if (closed)
+				close();
+		}

-            function onResidentChanged(): void {
-                notif.resident = notif.notification.resident;
-            }
+		Component.onCompleted: {
+			if (!notification)
+				return;

-            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()
-                        }));
-            }
-        }
-
-        function lock(item: Item): void {
-            locks.add(item);
-        }
-
-        function unlock(item: Item): void {
-            locks.delete(item);
-            if (closed)
-                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;
-
-            id = notification.id;
-            summary = notification.summary;
-            body = notification.body;
-            appIcon = notification.appIcon;
-            appName = notification.appName;
-            image = notification.image;
-            if (notification?.image)
-                dummyImageLoader.active = true;
-            expireTimeout = notification.expireTimeout;
-            urgency = notification.urgency;
-            resident = notification.resident;
-            hasActionIcons = notification.hasActionIcons;
-            actions = notification.actions.map(a => ({
-                        identifier: a.identifier,
-                        text: a.text,
-                        invoke: () => a.invoke()
-                    }));
-        }
-    }
-
-    Component {
-        id: notifComp
-
-        Notif {}
-    }
+			id = notification.id;
+			summary = notification.summary;
+			body = notification.body;
+			appIcon = notification.appIcon;
+			appName = notification.appName;
+			image = notification.image;
+			if (notification?.image)
+				dummyImageLoader.active = true;
+			expireTimeout = notification.expireTimeout;
+			urgency = notification.urgency;
+			resident = notification.resident;
+			hasActionIcons = notification.hasActionIcons;
+			actions = notification.actions.map(a => ({
+						identifier: a.identifier,
+						text: a.text,
+						invoke: () => a.invoke()
+					}));
+		}
+	}
 }
@@ -1,6 +1,8 @@
 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
@@ -8,73 +10,86 @@ 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
+	id: root

-    required property Panels panels
-    required property Item bar
+	required property Item bar
+	required property Panels panels
 	required property PersistentProperties visibilities

-    anchors.fill: parent
-    // anchors.margins: 8
-    anchors.topMargin: bar.implicitHeight
-    preferredRendererType: Shape.CurveRenderer
+	anchors.fill: parent
+	// anchors.margins: 8
+	anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? 0 : bar.implicitHeight
+	preferredRendererType: Shape.CurveRenderer

-	Component.onCompleted: console.log(root.bar.implicitHeight, root.bar.anchors.topMargin)
-
-	Osd.Background {
-		wrapper: root.panels.osd
-
-		startX: root.width - root.panels.sidebar.width
-		startY: ( root.height - wrapper.height ) / 2 - rounding
+	Behavior on anchors.topMargin {
+		Anim {
+		}
 	}

-    Modules.Background {
-        wrapper: root.panels.popouts
-        invertBottomRounding: wrapper.x <= 0
+	Resources.Background {
+		startX: 0 - rounding
+		startY: 0
+		wrapper: root.panels.resources
+	}

-        startX: wrapper.x - 8
-        startY: wrapper.y
-    }
+	Osd.Background {
+		startX: root.width - root.panels.sidebar.width
+		startY: (root.height - wrapper.height) / 2 - rounding
+		wrapper: root.panels.osd
+	}
+
+	Modules.Background {
+		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 {
-		wrapper: root.panels.launcher
-
-		startX: ( root.width - wrapper.width ) / 2 - rounding
+		startX: (root.width - wrapper.width) / 2 - rounding
 		startY: root.height
+		wrapper: root.panels.launcher
 	}

 	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
+	// }
 }
@@ -0,0 +1,213 @@
+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
+					}
+				}
+			}
+		}
+	}
+}
@@ -5,53 +5,52 @@ import qs.Config
 import qs.Modules as BarPopouts

 CustomMouseArea {
-    id: root
+	id: root

-    required property ShellScreen screen
-    required property BarPopouts.Wrapper popouts
-    required property PersistentProperties visibilities
-    required property Panels panels
-    required property Item bar
+	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 PersistentProperties visibilities

-    property point dragStart
-    property bool dashboardShortcutActive
-    property bool osdShortcutActive
-    property bool utilitiesShortcutActive
+	function inBottomPanel(panel: Item, x: real, y: real): bool {
+		return y > root.height - panel.height && withinPanelWidth(panel, x, y);
+	}

-    function withinPanelHeight(panel: Item, x: real, y: real): bool {
-        const panelY = panel.y + bar.implicitHeight;
-        return y >= panelY && y <= panelY + panel.height;
-    }
+	function inLeftPanel(panel: Item, x: real, y: real): bool {
+		return x < panel.x + panel.width && withinPanelHeight(panel, x, y);
+	}

-    function withinPanelWidth(panel: Item, x: real, y: real): bool {
-        const panelX = panel.x;
-        return x >= panelX && x <= panelX + panel.width;
-    }
+	function inRightPanel(panel: Item, x: real, y: real): bool {
+		return x > panel.x && withinPanelHeight(panel, x, y);
+	}

-    function inLeftPanel(panel: Item, x: real, y: real): bool {
-        return x < panel.x + panel.width && withinPanelHeight(panel, x, y);
-    }
+	function inTopPanel(panel: Item, x: real, y: real): bool {
+		return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
+	}

-    function inRightPanel(panel: Item, x: real, y: real): bool {
-        return x > panel.x && withinPanelHeight(panel, x, y);
-    }
+	function onWheel(event: WheelEvent): void {
+		if (event.x < bar.implicitWidth) {
+			bar.handleWheel(event.y, event.angleDelta);
+		}
+	}

-    function inTopPanel(panel: Item, x: real, y: real): bool {
-        return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
-    }
+	function withinPanelHeight(panel: Item, x: real, y: real): bool {
+		const panelY = panel.y + bar.implicitHeight;
+		return y >= panelY && y <= panelY + panel.height;
+	}

-    function inBottomPanel(panel: Item, x: real, y: real): bool {
-        return y > root.height - panel.height && withinPanelWidth(panel, x, y);
-    }
+	function withinPanelWidth(panel: Item, x: real, y: real): bool {
+		const panelX = panel.x;
+		return x >= panelX && x <= panelX + panel.width;
+	}

-    function onWheel(event: WheelEvent): void {
-        if (event.x < bar.implicitWidth) {
-            bar.handleWheel(event.y, event.angleDelta);
-        }
-    }
-
-    anchors.fill: parent
-    hoverEnabled: true
+	anchors.fill: parent
+	hoverEnabled: true

 	//    onPressed: event => {
 	// 	if ( root.popouts.hasCurrent && !inTopPanel( root.popouts, event.x, event.y )) {
@@ -63,216 +62,213 @@ CustomMouseArea {
 	// 	}
 	// }

-    onContainsMouseChanged: {
-        if (!containsMouse) {
-            // Only hide if not activated by shortcut
-            if (!osdShortcutActive) {
-                visibilities.osd = false;
-                root.panels.osd.hovered = false;
-            }
+	onContainsMouseChanged: {
+		if (!containsMouse) {
+			// Only hide if not activated by shortcut
+			if (!osdShortcutActive) {
+				visibilities.osd = false;
+				root.panels.osd.hovered = false;
+			}

-            if (!popouts.currentName.startsWith("traymenu")) {
-                popouts.hasCurrent = false;
-            }
+			if (!popouts.currentName.startsWith("traymenu")) {
+				popouts.hasCurrent = false;
+			}

-            if (Config.barConfig.autoHide && !root.visibilities.sidebar && !root.visibilities.dashboard)
-                root.visibilities.bar = false;
-        }
-    }
+			if (Config.barConfig.autoHide && !root.visibilities.sidebar && !root.visibilities.dashboard)
+				root.visibilities.bar = false;
+		}
+	}
+	onPositionChanged: event => {
+		if (popouts.isDetached)
+			return;

-    onPositionChanged: event => {
-        if (popouts.isDetached)
-            return;
+		const x = event.x;
+		const y = event.y;
+		const dragX = x - dragStart.x;
+		const dragY = y - dragStart.y;

-        const x = event.x;
-        const y = event.y;
-        const dragX = x - dragStart.x;
-        const dragY = y - dragStart.y;
+		// Show bar in non-exclusive mode on hover
+		if (!visibilities.bar && Config.barConfig.autoHide && y < bar.implicitHeight + bar.anchors.topMargin)
+			visibilities.bar = true;

-        // Show bar in non-exclusive mode on hover
-        if (!visibilities.bar && Config.barConfig.autoHide && y < bar.implicitHeight + bar.anchors.topMargin)
-            visibilities.bar = true;
+		if (panels.sidebar.width === 0) {
+			// Show osd on hover
+			const showOsd = inRightPanel(panels.osd, x, y);

-        if (panels.sidebar.width === 0) {
-            // Show osd on hover
-            const showOsd = inRightPanel(panels.osd, x, y);
+			// // Always update visibility based on hover if not in shortcut mode
+			if (!osdShortcutActive) {
+				visibilities.osd = showOsd;
+				root.panels.osd.hovered = showOsd;
+			} else if (showOsd) {
+				// If hovering over OSD area while in shortcut mode, transition to hover control
+				osdShortcutActive = false;
+				root.panels.osd.hovered = true;
+			}

-            // // Always update visibility based on hover if not in shortcut mode
-            if (!osdShortcutActive) {
-                visibilities.osd = showOsd;
-                root.panels.osd.hovered = showOsd;
-            } else if (showOsd) {
-                // If hovering over OSD area while in shortcut mode, transition to hover control
-                osdShortcutActive = false;
-                root.panels.osd.hovered = true;
-            }
+			// const showSidebar = pressed && dragStart.x > bar.implicitWidth + panels.sidebar.x;
+			//
+			// // Show/hide session on drag
+			// if (pressed && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
+			//     if (dragX < -Config.session.dragThreshold)
+			//         visibilities.session = true;
+			//     else if (dragX > Config.session.dragThreshold)
+			//         visibilities.session = false;
+			//
+			//     // Show sidebar on drag if in session area and session is nearly fully visible
+			//     if (showSidebar && panels.session.width >= panels.session.nonAnimWidth && dragX < -Config.sidebar.dragThreshold)
+			//         visibilities.sidebar = true;
+			// } else if (showSidebar && dragX < -Config.sidebar.dragThreshold) {
+			//     // Show sidebar on drag if not in session area
+			//     visibilities.sidebar = true;
+			// }
+		} else {
+			const outOfSidebar = x < width - panels.sidebar.width;
+			// Show osd on hover
+			const showOsd = outOfSidebar && inRightPanel(panels.osd, x, y);

-            // const showSidebar = pressed && dragStart.x > bar.implicitWidth + panels.sidebar.x;
-            //
-            // // Show/hide session on drag
-            // if (pressed && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
-            //     if (dragX < -Config.session.dragThreshold)
-            //         visibilities.session = true;
-            //     else if (dragX > Config.session.dragThreshold)
-            //         visibilities.session = false;
-            //
-            //     // Show sidebar on drag if in session area and session is nearly fully visible
-            //     if (showSidebar && panels.session.width >= panels.session.nonAnimWidth && dragX < -Config.sidebar.dragThreshold)
-            //         visibilities.sidebar = true;
-            // } else if (showSidebar && dragX < -Config.sidebar.dragThreshold) {
-            //     // Show sidebar on drag if not in session area
-            //     visibilities.sidebar = true;
-            // }
-        } else {
-            const outOfSidebar = x < width - panels.sidebar.width;
-            // Show osd on hover
-            const showOsd = outOfSidebar && inRightPanel(panels.osd, x, y);
+			// Always update visibility based on hover if not in shortcut mode
+			if (!osdShortcutActive) {
+				visibilities.osd = showOsd;
+				root.panels.osd.hovered = showOsd;
+			} else if (showOsd) {
+				// If hovering over OSD area while in shortcut mode, transition to hover control
+				osdShortcutActive = false;
+				root.panels.osd.hovered = true;
+			}
+			//
+			// // Show/hide session on drag
+			// if (pressed && outOfSidebar && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
+			//     if (dragX < -Config.session.dragThreshold)
+			//         visibilities.session = true;
+			//     else if (dragX > Config.session.dragThreshold)
+			//         visibilities.session = false;
+			// }
+			//
+			// // Hide sidebar on drag
+			// if (pressed && inRightPanel(panels.sidebar, dragStart.x, 0) && dragX > Config.sidebar.dragThreshold)
+			//     visibilities.sidebar = false;
+		}

-            // Always update visibility based on hover if not in shortcut mode
-            if (!osdShortcutActive) {
-                visibilities.osd = showOsd;
-                root.panels.osd.hovered = showOsd;
-            } else if (showOsd) {
-                // If hovering over OSD area while in shortcut mode, transition to hover control
-                osdShortcutActive = false;
-                root.panels.osd.hovered = true;
-            }
-            //
-            // // Show/hide session on drag
-            // if (pressed && outOfSidebar && inRightPanel(panels.session, dragStart.x, dragStart.y) && withinPanelHeight(panels.session, x, y)) {
-            //     if (dragX < -Config.session.dragThreshold)
-            //         visibilities.session = true;
-            //     else if (dragX > Config.session.dragThreshold)
-            //         visibilities.session = false;
-            // }
-            //
-            // // Hide sidebar on drag
-            // if (pressed && inRightPanel(panels.sidebar, dragStart.x, 0) && dragX > Config.sidebar.dragThreshold)
-            //     visibilities.sidebar = false;
-        }
+		// Show launcher on hover, or show/hide on drag if hover is disabled
+		// if (Config.launcher.showOnHover) {
+		//     if (!visibilities.launcher && inBottomPanel(panels.launcher, x, y))
+		//         visibilities.launcher = true;
+		// } else if (pressed && inBottomPanel(panels.launcher, dragStart.x, dragStart.y) && withinPanelWidth(panels.launcher, x, y)) {
+		//     if (dragY < -Config.launcher.dragThreshold)
+		//         visibilities.launcher = true;
+		//     else if (dragY > Config.launcher.dragThreshold)
+		//         visibilities.launcher = false;
+		// }
+		//
+		// // Show dashboard on hover
+		// const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboard, x, y);
+		//
+		// // Always update visibility based on hover if not in shortcut mode
+		// if (!dashboardShortcutActive) {
+		//     visibilities.dashboard = showDashboard;
+		// } else if (showDashboard) {
+		//     // If hovering over dashboard area while in shortcut mode, transition to hover control
+		//     dashboardShortcutActive = false;
+		// }
+		//
+		// // Show/hide dashboard on drag (for touchscreen devices)
+		// if (pressed && inTopPanel(panels.dashboard, dragStart.x, dragStart.y) && withinPanelWidth(panels.dashboard, x, y)) {
+		//     if (dragY > Config.dashboard.dragThreshold)
+		//         visibilities.dashboard = true;
+		//     else if (dragY < -Config.dashboard.dragThreshold)
+		//         visibilities.dashboard = false;
+		// }
+		//
+		// // Show utilities on hover
+		// const showUtilities = inBottomPanel(panels.utilities, x, y);
+		//
+		// // Always update visibility based on hover if not in shortcut mode
+		// if (!utilitiesShortcutActive) {
+		//     visibilities.utilities = showUtilities;
+		// } else if (showUtilities) {
+		//     // If hovering over utilities area while in shortcut mode, transition to hover control
+		//     utilitiesShortcutActive = false;
+		// }

-        // Show launcher on hover, or show/hide on drag if hover is disabled
-        // if (Config.launcher.showOnHover) {
-        //     if (!visibilities.launcher && inBottomPanel(panels.launcher, x, y))
-        //         visibilities.launcher = true;
-        // } else if (pressed && inBottomPanel(panels.launcher, dragStart.x, dragStart.y) && withinPanelWidth(panels.launcher, x, y)) {
-        //     if (dragY < -Config.launcher.dragThreshold)
-        //         visibilities.launcher = true;
-        //     else if (dragY > Config.launcher.dragThreshold)
-        //         visibilities.launcher = false;
-        // }
-        //
-        // // Show dashboard on hover
-        // const showDashboard = Config.dashboard.showOnHover && inTopPanel(panels.dashboard, x, y);
-        //
-        // // Always update visibility based on hover if not in shortcut mode
-        // if (!dashboardShortcutActive) {
-        //     visibilities.dashboard = showDashboard;
-        // } else if (showDashboard) {
-        //     // If hovering over dashboard area while in shortcut mode, transition to hover control
-        //     dashboardShortcutActive = false;
-        // }
-        //
-        // // Show/hide dashboard on drag (for touchscreen devices)
-        // if (pressed && inTopPanel(panels.dashboard, dragStart.x, dragStart.y) && withinPanelWidth(panels.dashboard, x, y)) {
-        //     if (dragY > Config.dashboard.dragThreshold)
-        //         visibilities.dashboard = true;
-        //     else if (dragY < -Config.dashboard.dragThreshold)
-        //         visibilities.dashboard = false;
-        // }
-        //
-        // // Show utilities on hover
-        // const showUtilities = inBottomPanel(panels.utilities, x, y);
-        //
-        // // Always update visibility based on hover if not in shortcut mode
-        // if (!utilitiesShortcutActive) {
-        //     visibilities.utilities = showUtilities;
-        // } else if (showUtilities) {
-        //     // If hovering over utilities area while in shortcut mode, transition to hover control
-        //     utilitiesShortcutActive = false;
-        // }
+		// Show popouts on hover
+		if (y < bar.implicitHeight) {
+			bar.checkPopout(x);
+		}
+	}

-        // Show popouts on hover
-        if (y < bar.implicitHeight) {
-            bar.checkPopout(x);
-        }
-    }
+	// Monitor individual visibility changes
+	Connections {
+		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;
+				}

-    // Monitor individual visibility changes
-    Connections {
-        target: root.visibilities
+				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
-            if (!root.visibilities.launcher) {
-                root.dashboardShortcutActive = false;
-                root.osdShortcutActive = false;
-                root.utilitiesShortcutActive = false;
+		function onLauncherChanged() {
+			// If launcher is hidden, clear shortcut flags for dashboard and OSD
+			if (!root.visibilities.launcher) {
+				root.dashboardShortcutActive = false;
+				root.osdShortcutActive = false;
+				root.utilitiesShortcutActive = false;

-                // Also hide dashboard and OSD if they're not being hovered
-                const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
-                const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+				// Also hide dashboard and OSD if they're not being hovered
+				const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
+				const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);

-                if (!inDashboardArea) {
-                    root.visibilities.dashboard = false;
-                }
-                if (!inOsdArea) {
-                    root.visibilities.osd = false;
-                    root.panels.osd.hovered = false;
-                }
-            }
-        }
+				if (!inDashboardArea) {
+					root.visibilities.dashboard = false;
+				}
+				if (!inOsdArea) {
+					root.visibilities.osd = false;
+					root.panels.osd.hovered = 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);
+				if (!inOsdArea) {
+					root.osdShortcutActive = true;
+				}
+			} else {
+				// OSD hidden, clear shortcut flag
+				root.osdShortcutActive = false;
+			}
+		}

 		function onSidebarChanged() {
-			if ( root.visibilities.sidebar ) {
+			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;
-                }
+		function onUtilitiesChanged() {
+			if (root.visibilities.utilities) {
+				// Utilities became visible, immediately check if this should be shortcut mode
+				const inUtilitiesArea = root.inBottomPanel(root.panels.utilities, root.mouseX, root.mouseY);
+				if (!inUtilitiesArea) {
+					root.utilitiesShortcutActive = true;
+				}
+			} else {
+				// Utilities hidden, clear shortcut flag
+				root.utilitiesShortcutActive = false;
+			}
+		}

-				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;
-                }
-            } else {
-                // OSD hidden, clear shortcut flag
-                root.osdShortcutActive = false;
-            }
-        }
-
-        function onUtilitiesChanged() {
-            if (root.visibilities.utilities) {
-                // Utilities became visible, immediately check if this should be shortcut mode
-                const inUtilitiesArea = root.inBottomPanel(root.panels.utilities, root.mouseX, root.mouseY);
-                if (!inUtilitiesArea) {
-                    root.utilitiesShortcutActive = true;
-                }
-            } else {
-                // Utilities hidden, clear shortcut flag
-                root.utilitiesShortcutActive = false;
-            }
-        }
-    }
+		target: root.visibilities
+	}
 }
@@ -1,6 +1,6 @@
 import Quickshell
 import QtQuick
-import QtQuick.Shapes
+import qs.Components
 import qs.Modules as Modules
 import qs.Modules.Notifications as Notifications
 import qs.Modules.Notifications.Sidebar as Sidebar
@@ -9,116 +9,130 @@ 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
+	id: root

-    required property ShellScreen screen
-    required property Item bar
+	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
+	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

-    anchors.fill: parent
-    // anchors.margins: 8
-    anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? 0 : bar.implicitHeight
 	Behavior on anchors.topMargin {
-		Modules.Anim {}
+		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
+	Modules.Wrapper {
+		id: popouts

-        screen: root.screen
-
-        anchors.top: parent.top
-
-        x: {
-            const off = currentCenter - nonAnimWidth / 2;
-            const diff = root.width - Math.floor(off + nonAnimWidth);
-            if ( diff < 0 )
-                return off + diff;
-            return Math.floor( Math.max( off, 0 ));
-        }
-    }
+		anchors.top: parent.top
+		screen: root.screen
+		x: {
+			const off = currentCenter - nonAnimWidth / 2;
+			const diff = root.width - Math.floor(off + nonAnimWidth);
+			if (diff < 0)
+				return off + diff;
+			return Math.floor(Math.max(off, 0));
+		}
+	}

 	Toasts.Toasts {
 		id: toasts

 		anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
-		anchors.right: sidebar.left
 		anchors.margins: Appearance.padding.normal
+		anchors.right: sidebar.left
 	}

 	Notifications.Wrapper {
 		id: notifications

-		visibilities: root.visibilities
-		panels: root
-
-		anchors.top: parent.top
 		anchors.right: parent.right
+		anchors.top: parent.top
+		panels: root
+		visibilities: root.visibilities
 	}

 	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
+	// }
 }
@@ -2,29 +2,32 @@ import QtQuick
 import QtQuick.Effects

 Item {
-    id: root
-    property real radius
+	id: root

-    Rectangle {
-        id: shadowRect
-        anchors.fill: root
-        radius: root.radius
-        layer.enabled: true
-        color: "black"
-        visible: false
-    }
+	property real radius

-    MultiEffect {
-        id: effects
-        source: shadowRect
-        anchors.fill: shadowRect
-        shadowBlur: 2.0
-        shadowEnabled: true
-        shadowOpacity: 1
-        shadowColor: "black"
-        maskSource: shadowRect
-        maskEnabled: true
-        maskInverted: true
-        autoPaddingEnabled: true
-    }
+	Rectangle {
+		id: shadowRect
+
+		anchors.fill: root
+		color: "black"
+		layer.enabled: true
+		radius: root.radius
+		visible: false
+	}
+
+	MultiEffect {
+		id: effects
+
+		anchors.fill: shadowRect
+		autoPaddingEnabled: true
+		maskEnabled: true
+		maskInverted: true
+		maskSource: shadowRect
+		shadowBlur: 2.0
+		shadowColor: "black"
+		shadowEnabled: true
+		shadowOpacity: 1
+		source: shadowRect
+	}
 }
@@ -8,49 +8,49 @@ import ZShell
 import qs.Components

 Scope {
-    LazyLoader {
-        id: root
+	LazyLoader {
+		id: root

-        property bool freeze
-        property bool closing
+		property bool closing
+		property bool freeze

-        Variants {
-            model: Quickshell.screens
-            PanelWindow {
-                id: win
-                color: "transparent"
+		Variants {
+			model: Quickshell.screens

-                required property ShellScreen modelData
+			PanelWindow {
+				id: win

-                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
+				required property ShellScreen modelData

-                anchors {
-                    top: true
-                    bottom: true
-                    left: true
-                    right: true
-                }
+				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

-                Region {
-                    id: empty
-                }
+				anchors {
+					bottom: true
+					left: true
+					right: true
+					top: true
+				}

-                Picker {
-                    loader: root
-                    screen: win.modelData
-                }
-            }
-        }
-    }
+				Region {
+					id: empty
+
+				}
+
+				Picker {
+					loader: root
+					screen: win.modelData
+				}
+			}
+		}
+	}

 	IpcHandler {
-		target: "picker"
-
 		function open(): void {
 			root.freeze = false;
 			root.closing = false;
@@ -62,23 +62,27 @@ Scope {
 			root.closing = false;
 			root.activeAsync = true;
 		}
+
+		target: "picker"
 	}

-    CustomShortcut {
-        name: "screenshot"
-        onPressed: {
-            root.freeze = false;
-            root.closing = false;
-            root.activeAsync = true;
-        }
-    }
+	CustomShortcut {
+		name: "screenshot"

-    CustomShortcut {
-        name: "screenshotFreeze"
-        onPressed: {
-            root.freeze = true;
-            root.closing = false;
-            root.activeAsync = true;
-        }
-    }
+		onPressed: {
+			root.freeze = false;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
+
+	CustomShortcut {
+		name: "screenshotFreeze"
+
+		onPressed: {
+			root.freeze = true;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
 }
@@ -8,219 +8,257 @@ import qs.Config
 import qs.Components

 Singleton {
-    id: root
+	id: root

-    property list<var> ddcMonitors: []
-    readonly property list<Monitor> monitors: variants.instances
-    property bool appleDisplayPresent: false
+	property bool appleDisplayPresent: false
+	property list<var> ddcMonitors: []
+	property list<var> ddcServiceMon: []
+	readonly property list<Monitor> monitors: variants.instances

-    function getMonitorForScreen(screen: ShellScreen): var {
-        return monitors.find(m => m.modelData === screen);
-    }
+	function decreaseBrightness(): void {
+		const monitor = getMonitor("active");
+		if (monitor)
+			monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement);
+	}

-    function getMonitor(query: string): var {
-        if (query === "active") {
-            return monitors.find(m => Hypr.monitorFor(m.modelData)?.focused);
-        }
+	function getMonitor(query: string): var {
+		if (query === "active") {
+			return monitors.find(m => Hypr.monitorFor(m.modelData)?.focused);
+		}

-        if (query.startsWith("model:")) {
-            const model = query.slice(6);
-            return monitors.find(m => m.modelData.model === model);
-        }
+		if (query.startsWith("model:")) {
+			const model = query.slice(6);
+			return monitors.find(m => m.modelData.model === model);
+		}

-        if (query.startsWith("serial:")) {
-            const serial = query.slice(7);
-            return monitors.find(m => m.modelData.serialNumber === serial);
-        }
+		if (query.startsWith("serial:")) {
+			const serial = query.slice(7);
+			return monitors.find(m => m.modelData.serialNumber === serial);
+		}

-        if (query.startsWith("id:")) {
-            const id = parseInt(query.slice(3), 10);
-            return monitors.find(m => Hypr.monitorFor(m.modelData)?.id === id);
-        }
+		if (query.startsWith("id:")) {
+			const id = parseInt(query.slice(3), 10);
+			return monitors.find(m => Hypr.monitorFor(m.modelData)?.id === id);
+		}

-        return monitors.find(m => m.modelData.name === query);
-    }
+		return monitors.find(m => m.modelData.name === query);
+	}

-    function increaseBrightness(): void {
-        const monitor = getMonitor("active");
-        if (monitor)
-            monitor.setBrightness(monitor.brightness + Config.services.brightnessIncrement);
-    }
+	function getMonitorForScreen(screen: ShellScreen): var {
+		return monitors.find(m => m.modelData === screen);
+	}

-    function decreaseBrightness(): void {
-        const monitor = getMonitor("active");
-        if (monitor)
-            monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement);
-    }
+	function increaseBrightness(): void {
+		const monitor = getMonitor("active");
+		if (monitor)
+			monitor.setBrightness(monitor.brightness + Config.services.brightnessIncrement);
+	}

-    onMonitorsChanged: {
-        ddcMonitors = [];
-        ddcProc.running = true;
-    }
+	onMonitorsChanged: {
+		ddcMonitors = [];
+		ddcServiceMon = [];
+		ddcServiceProc.running = true;
+		ddcProc.running = true;
+	}

-    Variants {
-        id: variants
+	Variants {
+		id: variants

-        model: Quickshell.screens
+		model: Quickshell.screens

-        Monitor {}
-    }
+		Monitor {
+		}
+	}

-    Process {
-        running: true
-        command: ["sh", "-c", "asdbctl get"] // To avoid warnings if asdbctl is not installed
-        stdout: StdioCollector {
-            onStreamFinished: root.appleDisplayPresent = text.trim().length > 0
-        }
-    }
+	Process {
+		command: ["sh", "-c", "asdbctl get"]
+		running: true

-    Process {
-        id: ddcProc
+		stdout: StdioCollector {
+			onStreamFinished: root.appleDisplayPresent = text.trim().length > 0
+		}
+	}

-        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],
-                        connector: d.match(/DRM connector:\s+(.*)/)[1].replace(/^card\d+-/, "") // strip "card1-"
-                    }))
-        }
-    }
+	Process {
+		id: ddcProc

-    CustomShortcut {
-        name: "brightnessUp"
-        description: "Increase brightness"
-        onPressed: root.increaseBrightness()
-    }
+		command: ["ddcutil", "detect", "--brief"]

-    CustomShortcut {
-        name: "brightnessDown"
-        description: "Decrease brightness"
-        onPressed: root.decreaseBrightness()
-    }
+		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],
+						connector: d.match(/DRM connector:\s+(.*)/)[1].replace(/^card\d+-/, "") // strip "card1-"
+					}))
+		}
+	}

-    IpcHandler {
-        target: "brightness"
+	Process {
+		id: ddcServiceProc

-        function get(): real {
-            return getFor("active");
-        }
+		command: ["ddcutil-client", "detect"]

-        // Allows searching by active/model/serial/id/name
-        function getFor(query: string): real {
-            return root.getMonitor(query)?.brightness ?? -1;
-        }
+		// running: true

-        function set(value: string): string {
-            return setFor("active", value);
-        }
+		stdout: StdioCollector {
+			onStreamFinished: {
+				const t = text.replace(/\r\n/g, "\n").trim();

-        // Handles brightness value like brightnessctl: 0.1, +0.1, 0.1-, 10%, +10%, 10%-
-        function setFor(query: string, value: string): string {
-            const monitor = root.getMonitor(query);
-            if (!monitor)
-                return "Invalid monitor: " + query;
+				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;
+			}
+		}
+	}

-            let targetBrightness;
-            if (value.endsWith("%-")) {
-                const percent = parseFloat(value.slice(0, -2));
-                targetBrightness = monitor.brightness - (percent / 100);
-            } else if (value.startsWith("+") && value.endsWith("%")) {
-                const percent = parseFloat(value.slice(1, -1));
-                targetBrightness = monitor.brightness + (percent / 100);
-            } else if (value.endsWith("%")) {
-                const percent = parseFloat(value.slice(0, -1));
-                targetBrightness = percent / 100;
-            } else if (value.startsWith("+")) {
-                const increment = parseFloat(value.slice(1));
-                targetBrightness = monitor.brightness + increment;
-            } else if (value.endsWith("-")) {
-                const decrement = parseFloat(value.slice(0, -1));
-                targetBrightness = monitor.brightness - decrement;
-            } else if (value.includes("%") || value.includes("-") || value.includes("+")) {
-                return `Invalid brightness format: ${value}\nExpected: 0.1, +0.1, 0.1-, 10%, +10%, 10%-`;
-            } else {
-                targetBrightness = parseFloat(value);
-            }
+	CustomShortcut {
+		description: "Increase brightness"
+		name: "brightnessUp"

-            if (isNaN(targetBrightness))
-                return `Failed to parse value: ${value}\nExpected: 0.1, +0.1, 0.1-, 10%, +10%, 10%-`;
+		onPressed: root.increaseBrightness()
+	}

-            monitor.setBrightness(targetBrightness);
+	CustomShortcut {
+		description: "Decrease brightness"
+		name: "brightnessDown"

-            return `Set monitor ${monitor.modelData.name} brightness to ${+monitor.brightness.toFixed(2)}`;
-        }
-    }
+		onPressed: root.decreaseBrightness()
+	}

-    component Monitor: QtObject {
-        id: monitor
+	IpcHandler {
+		function get(): real {
+			return getFor("active");
+		}

-        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 bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
-        property real brightness
-        property real queuedBrightness: NaN
+		// Allows searching by active/model/serial/id/name
+		function getFor(query: string): real {
+			return root.getMonitor(query)?.brightness ?? -1;
+		}

-        readonly property Process initProc: Process {
-            stdout: StdioCollector {
-                onStreamFinished: {
-                    if (monitor.isAppleDisplay) {
-                        const val = parseInt(text.trim());
-                        monitor.brightness = val / 101;
-                    } else {
-                        const [, , , cur, max] = text.split(" ");
-                        monitor.brightness = parseInt(cur) / parseInt(max);
-                    }
-                }
-            }
-        }
+		function set(value: string): string {
+			return setFor("active", value);
+		}

-        readonly property Timer timer: Timer {
-            interval: 500
-            onTriggered: {
-                if (!isNaN(monitor.queuedBrightness)) {
-                    monitor.setBrightness(monitor.queuedBrightness);
-                    monitor.queuedBrightness = NaN;
-                }
-            }
-        }
+		// Handles brightness value like brightnessctl: 0.1, +0.1, 0.1-, 10%, +10%, 10%-
+		function setFor(query: string, value: string): string {
+			const monitor = root.getMonitor(query);
+			if (!monitor)
+				return "Invalid monitor: " + query;

-        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;
+			let targetBrightness;
+			if (value.endsWith("%-")) {
+				const percent = parseFloat(value.slice(0, -2));
+				targetBrightness = monitor.brightness - (percent / 100);
+			} else if (value.startsWith("+") && value.endsWith("%")) {
+				const percent = parseFloat(value.slice(1, -1));
+				targetBrightness = monitor.brightness + (percent / 100);
+			} else if (value.endsWith("%")) {
+				const percent = parseFloat(value.slice(0, -1));
+				targetBrightness = percent / 100;
+			} else if (value.startsWith("+")) {
+				const increment = parseFloat(value.slice(1));
+				targetBrightness = monitor.brightness + increment;
+			} else if (value.endsWith("-")) {
+				const decrement = parseFloat(value.slice(0, -1));
+				targetBrightness = monitor.brightness - decrement;
+			} else if (value.includes("%") || value.includes("-") || value.includes("+")) {
+				return `Invalid brightness format: ${value}\nExpected: 0.1, +0.1, 0.1-, 10%, +10%, 10%-`;
+			} else {
+				targetBrightness = parseFloat(value);
+			}

-            if (isDdc && timer.running) {
-                queuedBrightness = value;
-                return;
-            }
+			if (isNaN(targetBrightness))
+				return `Failed to parse value: ${value}\nExpected: 0.1, +0.1, 0.1-, 10%, +10%, 10%-`;

-            brightness = value;
+			monitor.setBrightness(targetBrightness);

-            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}%`]);
+			return `Set monitor ${monitor.modelData.name} brightness to ${+monitor.brightness.toFixed(2)}`;
+		}

-            if (isDdc)
-                timer.restart();
-        }
+		target: "brightness"
+	}

-        function initBrightness(): void {
-            if (isAppleDisplay)
-                initProc.command = ["asdbctl", "get"];
-            else if (isDdc)
-                initProc.command = ["ddcutil", "-b", busNum, "getvcp", "10", "--brief"];
-            else
-                initProc.command = ["sh", "-c", "echo a b c $(brightnessctl g) $(brightnessctl m)"];
+	component Monitor: QtObject {
+		id: monitor

-            initProc.running = true;
-        }
+		property real brightness
+		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 Process initProc: Process {
+			stdout: StdioCollector {
+				onStreamFinished: {
+					if (monitor.isDdcService) {
+						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 {
+						const [, , , cur, max] = text.split(" ");
+						monitor.brightness = parseInt(cur) / parseInt(max);
+					}
+				}
+			}
+		}
+		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

-        onBusNumChanged: initBrightness()
-        Component.onCompleted: initBrightness()
-    }
+			onTriggered: {
+				if (!isNaN(monitor.queuedBrightness)) {
+					monitor.setBrightness(monitor.queuedBrightness);
+					monitor.queuedBrightness = NaN;
+				}
+			}
+		}
+
+		function initBrightness(): void {
+			if (isDdcService)
+				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"];
+			else
+				initProc.command = ["sh", "-c", "echo a b c $(brightnessctl g) $(brightnessctl m)"];
+
+			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()
+	}
 }
@@ -4,25 +4,25 @@ import QtQuick
 import qs.Paths

 Image {
-    id: root
+	id: root

-    property alias path: manager.path
+	property alias path: manager.path

-    asynchronous: true
-    fillMode: Image.PreserveAspectCrop
+	asynchronous: true
+	fillMode: Image.PreserveAspectCrop

-    Connections {
-        target: QsWindow.window
+	Connections {
+		function onDevicePixelRatioChanged(): void {
+			manager.updateSource();
+		}

-        function onDevicePixelRatioChanged(): void {
-            manager.updateSource();
-        }
-    }
+		target: QsWindow.window
+	}

-    CachingImageManager {
-        id: manager
+	CachingImageManager {
+		id: manager

-        item: root
-        cacheDir: Qt.resolvedUrl(Paths.imagecache)
-    }
+		cacheDir: Qt.resolvedUrl(Paths.imagecache)
+		item: root
+	}
 }
@@ -10,6 +10,53 @@ 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);
@@ -43,57 +90,8 @@ 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();
-	}
-
-	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;
+		return date.getDate() === today.getDate() && date.getMonth() === today.getMonth() && date.getFullYear() === today.getFullYear();
 	}
 }
@@ -0,0 +1,17 @@
+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;
+	}
+}
@@ -4,12 +4,13 @@ import Quickshell
 import Quickshell.Io

 Singleton {
-    id: root
+	id: root

-    property alias hasNotifications: adapter.hasNotifications
+	property alias hasNotifications: adapter.hasNotifications

-    JsonObject {
-        id: adapter
-        property bool hasNotifications: false
-    }
+	JsonObject {
+		id: adapter
+
+		property bool hasNotifications: false
+	}
 }
@@ -9,157 +9,155 @@ import QtQuick
 import qs.Components

 Singleton {
-    id: root
+	id: root

-    readonly property var toplevels: Hyprland.toplevels
-    readonly property var workspaces: Hyprland.workspaces
-    readonly property var monitors: Hyprland.monitors
+	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 HyprlandToplevel activeToplevel: Hyprland.activeToplevel
-    readonly property HyprlandWorkspace focusedWorkspace: Hyprland.focusedWorkspace
-    readonly property HyprlandMonitor focusedMonitor: Hyprland.focusedMonitor
-    readonly property int activeWsId: focusedWorkspace?.id ?? 1
+	signal configReloaded

-    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 getActiveScreen(): ShellScreen {
-		return Quickshell.screens.find(screen => root.monitorFor(screen) === root.focusedMonitor)
+	function dispatch(request: string): void {
+		Hyprland.dispatch(request);
 	}

-    function dispatch(request: string): void {
-        Hyprland.dispatch(request);
-    }
+	function getActiveScreen(): ShellScreen {
+		return Quickshell.screens.find(screen => root.monitorFor(screen) === root.focusedMonitor);
+	}

-    function monitorFor(screen: ShellScreen): HyprlandMonitor {
-        return Hyprland.monitorFor(screen);
-    }
+	function monitorFor(screen: ShellScreen): HyprlandMonitor {
+		return Hyprland.monitorFor(screen);
+	}

-    function reloadDynamicConfs(): void {
-        extras.batchMessage(["keyword bindlni ,Caps_Lock,global,zshell:refreshDevices", "keyword bindlni ,Num_Lock,global,zshell:refreshDevices"]);
-    }
+	function reloadDynamicConfs(): void {
+		extras.batchMessage(["keyword bindlni ,Caps_Lock,global,zshell:refreshDevices", "keyword bindlni ,Num_Lock,global,zshell:refreshDevices"]);
+	}

-    Component.onCompleted: reloadDynamicConfs()
+	Component.onCompleted: reloadDynamicConfs()

-    // function updateActiveWindow(): void {
-    //     root.desktopName = root.applicationDir + root.activeToplevel?.lastIpcObject.class + ".desktop";
-    // }
+	// function updateActiveWindow(): void {
+	//     root.desktopName = root.applicationDir + root.activeToplevel?.lastIpcObject.class + ".desktop";
+	// }

-    Connections {
-        target: Hyprland
+	Connections {
+		function onRawEvent(event: HyprlandEvent): void {
+			const n = event.name;
+			if (n.endsWith("v2"))
+				return;

-        function onRawEvent(event: HyprlandEvent): void {
-            const n = event.name;
-            if (n.endsWith("v2"))
-                return;
+			if (n === "configreloaded") {
+				root.configReloaded();
+				root.reloadDynamicConfs();
+			} else if (["workspace", "moveworkspace", "activespecial", "focusedmon"].includes(n)) {
+				Hyprland.refreshWorkspaces();
+				Hyprland.refreshMonitors();
+				// Qt.callLater( root.updateActiveWindow );
+			} else if (["openwindow", "closewindow", "movewindow"].includes(n)) {
+				Hyprland.refreshToplevels();
+				Hyprland.refreshWorkspaces();
+				// Qt.callLater( root.updateActiveWindow );
+			} else if (n.includes("mon")) {
+				Hyprland.refreshMonitors();
+				// Qt.callLater( root.updateActiveWindow );
+			} else if (n.includes("workspace")) {
+				Hyprland.refreshWorkspaces();
+				// Qt.callLater( root.updateActiveWindow );
+			} else if (n.includes("window") || n.includes("group") || ["pin", "fullscreen", "changefloatingmode", "minimize"].includes(n)) {
+				Hyprland.refreshToplevels();
+				// Qt.callLater( root.updateActiveWindow );
+			}
+		}

-            if (n === "configreloaded") {
-                root.configReloaded();
-                root.reloadDynamicConfs();
-            } else if (["workspace", "moveworkspace", "activespecial", "focusedmon"].includes(n)) {
-                Hyprland.refreshWorkspaces();
-                Hyprland.refreshMonitors();
-                // Qt.callLater( root.updateActiveWindow );
-            } else if (["openwindow", "closewindow", "movewindow"].includes(n)) {
-                Hyprland.refreshToplevels();
-                Hyprland.refreshWorkspaces();
-                // Qt.callLater( root.updateActiveWindow );
-            } else if (n.includes("mon")) {
-                Hyprland.refreshMonitors();
-                // Qt.callLater( root.updateActiveWindow );
-            } else if (n.includes("workspace")) {
-                Hyprland.refreshWorkspaces();
-                // Qt.callLater( root.updateActiveWindow );
-            } else if (n.includes("window") || n.includes("group") || ["pin", "fullscreen", "changefloatingmode", "minimize"].includes(n)) {
-                Hyprland.refreshToplevels();
-                // Qt.callLater( root.updateActiveWindow );
-            }
-        }
-    }
+		target: Hyprland
+	}

-    FileView {
-        id: desktopEntryName
+	FileView {
+		id: desktopEntryName

-        path: root.desktopName
+		path: root.desktopName

-        onLoaded: {
-            const lines = text().split( "\n" );
-            for ( const line of lines ) {
-                if ( line.startsWith( "Name=" )) {
-                    let name = line.replace( "Name=", "" );
-                    let caseFix = name[ 0 ].toUpperCase() + name.slice( 1 );
-                    root.activeName = caseFix;
-                    break;
-                }
-            }
-        }
-    }
+		onLoaded: {
+			const lines = text().split("\n");
+			for (const line of lines) {
+				if (line.startsWith("Name=")) {
+					let name = line.replace("Name=", "");
+					let caseFix = name[0].toUpperCase() + name.slice(1);
+					root.activeName = caseFix;
+					break;
+				}
+			}
+		}
+	}

-    FileView {
-        id: kbLayoutFile
+	FileView {
+		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) {
-                const lines = layoutMatch[1].split("\n");
-                for (const line of lines) {
-                    if (!line.trim() || line.trim().startsWith("!"))
-                        continue;
+		path: Quickshell.env("ZSHELL_XKB_RULES_PATH") || "/usr/share/X11/xkb/rules/base.lst"

-                    const match = line.match(/^\s*([a-z]{2,})\s+([a-zA-Z() ]+)$/);
-                    if (match)
-                        root.kbMap.set(match[2], match[1]);
-                }
-            }
+		onLoaded: {
+			const layoutMatch = text().match(/! layout\n([\s\S]*?)\n\n/);
+			if (layoutMatch) {
+				const lines = layoutMatch[1].split("\n");
+				for (const line of lines) {
+					if (!line.trim() || line.trim().startsWith("!"))
+						continue;

-            const variantMatch = text().match(/! variant\n([\s\S]*?)\n\n/);
-            if (variantMatch) {
-                const lines = variantMatch[1].split("\n");
-                for (const line of lines) {
-                    if (!line.trim() || line.trim().startsWith("!"))
-                        continue;
+					const match = line.match(/^\s*([a-z]{2,})\s+([a-zA-Z() ]+)$/);
+					if (match)
+						root.kbMap.set(match[2], match[1]);
+				}
+			}

-                    const match = line.match(/^\s*([a-zA-Z0-9_-]+)\s+([a-z]{2,}): (.+)$/);
-                    if (match)
-                        root.kbMap.set(match[3], match[2]);
-                }
-            }
-        }
-    }
+			const variantMatch = text().match(/! variant\n([\s\S]*?)\n\n/);
+			if (variantMatch) {
+				const lines = variantMatch[1].split("\n");
+				for (const line of lines) {
+					if (!line.trim() || line.trim().startsWith("!"))
+						continue;

-    IpcHandler {
-        target: "hypr"
+					const match = line.match(/^\s*([a-zA-Z0-9_-]+)\s+([a-z]{2,}): (.+)$/);
+					if (match)
+						root.kbMap.set(match[3], match[2]);
+				}
+			}
+		}
+	}

-        function refreshDevices(): void {
-            extras.refreshDevices();
-        }
-    }
+	IpcHandler {
+		function refreshDevices(): void {
+			extras.refreshDevices();
+		}

-    CustomShortcut {
-        name: "refreshDevices"
-        onPressed: extras.refreshDevices()
-        onReleased: extras.refreshDevices()
-    }
+		target: "hypr"
+	}

-    HyprExtras {
-        id: extras
-    }
+	CustomShortcut {
+		name: "refreshDevices"
+
+		onPressed: extras.refreshDevices()
+		onReleased: extras.refreshDevices()
+	}
+
+	HyprExtras {
+		id: extras
+
+	}
 }
@@ -6,182 +6,181 @@ import Quickshell.Services.Notifications
 import QtQuick

 Singleton {
-    id: root
+	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",
+			Security: "security",
+			Network: "chat",
+			Archiving: "archive",
+			Compression: "archive",
+			Development: "code",
+			IDE: "code",
+			TextEditor: "edit_note",
+			Audio: "music_note",
+			Music: "music_note",
+			Player: "music_note",
+			Recorder: "mic",
+			Game: "sports_esports",
+			FileTools: "files",
+			FileManager: "files",
+			Filesystem: "files",
+			FileTransfer: "files",
+			Settings: "settings",
+			DesktopSettings: "settings",
+			HardwareSettings: "settings",
+			TerminalEmulator: "terminal",
+			ConsoleOnly: "terminal",
+			Utility: "build",
+			Monitor: "monitor_heart",
+			Midi: "graphic_eq",
+			Mixer: "graphic_eq",
+			AudioVideoEditing: "video_settings",
+			AudioVideo: "music_video",
+			Video: "videocam",
+			Building: "construction",
+			Graphics: "photo_library",
+			"2DGraphics": "photo_library",
+			RasterGraphics: "photo_library",
+			TV: "tv",
+			System: "host",
+			Office: "content_paste"
+		})
+	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",
-            Security: "security",
-            Network: "chat",
-            Archiving: "archive",
-            Compression: "archive",
-            Development: "code",
-            IDE: "code",
-            TextEditor: "edit_note",
-            Audio: "music_note",
-            Music: "music_note",
-            Player: "music_note",
-            Recorder: "mic",
-            Game: "sports_esports",
-            FileTools: "files",
-            FileManager: "files",
-            Filesystem: "files",
-            FileTransfer: "files",
-            Settings: "settings",
-            DesktopSettings: "settings",
-            HardwareSettings: "settings",
-            TerminalEmulator: "terminal",
-            ConsoleOnly: "terminal",
-            Utility: "build",
-            Monitor: "monitor_heart",
-            Midi: "graphic_eq",
-            Mixer: "graphic_eq",
-            AudioVideoEditing: "video_settings",
-            AudioVideo: "music_video",
-            Video: "videocam",
-            Building: "construction",
-            Graphics: "photo_library",
-            "2DGraphics": "photo_library",
-            RasterGraphics: "photo_library",
-            TV: "tv",
-            System: "host",
-            Office: "content_paste"
-        })
+	function getAppCategoryIcon(name: string, fallback: string): string {
+		const categories = DesktopEntries.heuristicLookup(name)?.categories;

-    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);
-    }
+		if (categories)
+			for (const [key, value] of Object.entries(categoryIcons))
+				if (categories.includes(key))
+					return value;
+		return fallback;
+	}

-    function getAppCategoryIcon(name: string, fallback: string): string {
-        const categories = DesktopEntries.heuristicLookup(name)?.categories;
+	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);
+	}

-        if (categories)
-            for (const [key, value] of Object.entries(categoryIcons))
-                if (categories.includes(key))
-                    return value;
-        return fallback;
-    }
+	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 getNetworkIcon(strength: int, isSecure = false): string {
-        if (isSecure) {
-            if (strength >= 80)
-                return "network_wifi_locked";
-            if (strength >= 60)
-                return "network_wifi_3_bar_locked";
-            if (strength >= 40)
-                return "network_wifi_2_bar_locked";
-            if (strength >= 20)
-                return "network_wifi_1_bar_locked";
-            return "signal_wifi_0_bar";
-        } else {
-            if (strength >= 80)
-                return "network_wifi";
-            if (strength >= 60)
-                return "network_wifi_3_bar";
-            if (strength >= 40)
-                return "network_wifi_2_bar";
-            if (strength >= 20)
-                return "network_wifi_1_bar";
-            return "signal_wifi_0_bar";
-        }
-    }
+	function getMicVolumeIcon(volume: real, isMuted: bool): string {
+		if (!isMuted && volume > 0)
+			return "mic";
+		return "mic_off";
+	}

-    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 getNetworkIcon(strength: int, isSecure = false): string {
+		if (isSecure) {
+			if (strength >= 80)
+				return "network_wifi_locked";
+			if (strength >= 60)
+				return "network_wifi_3_bar_locked";
+			if (strength >= 40)
+				return "network_wifi_2_bar_locked";
+			if (strength >= 20)
+				return "network_wifi_1_bar_locked";
+			return "signal_wifi_0_bar";
+		} else {
+			if (strength >= 80)
+				return "network_wifi";
+			if (strength >= 60)
+				return "network_wifi_3_bar";
+			if (strength >= 40)
+				return "network_wifi_2_bar";
+			if (strength >= 20)
+				return "network_wifi_1_bar";
+			return "signal_wifi_0_bar";
+		}
+	}

-    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"))
+			return "restart_alt";
+		if (summary.includes("recording"))
+			return "screen_record";
+		if (summary.includes("battery"))
+			return "power";
+		if (summary.includes("screenshot"))
+			return "screenshot_monitor";
+		if (summary.includes("welcome"))
+			return "waving_hand";
+		if (summary.includes("time") || summary.includes("a break"))
+			return "schedule";
+		if (summary.includes("installed"))
+			return "download";
+		if (summary.includes("update"))
+			return "update";
+		if (summary.includes("unable to"))
+			return "deployed_code_alert";
+		if (summary.includes("profile"))
+			return "person";
+		if (summary.includes("file"))
+			return "folder_copy";
+		if (urgency === NotificationUrgency.Critical)
+			return "release_alert";
+		return "chat";
+	}

-    function getNotifIcon(summary: string, urgency: int): string {
-        summary = summary.toLowerCase();
-        if (summary.includes("reboot"))
-            return "restart_alt";
-        if (summary.includes("recording"))
-            return "screen_record";
-        if (summary.includes("battery"))
-            return "power";
-        if (summary.includes("screenshot"))
-            return "screenshot_monitor";
-        if (summary.includes("welcome"))
-            return "waving_hand";
-        if (summary.includes("time") || summary.includes("a break"))
-            return "schedule";
-        if (summary.includes("installed"))
-            return "download";
-        if (summary.includes("update"))
-            return "update";
-        if (summary.includes("unable to"))
-            return "deployed_code_alert";
-        if (summary.includes("profile"))
-            return "person";
-        if (summary.includes("file"))
-            return "folder_copy";
-        if (urgency === NotificationUrgency.Critical)
-            return "release_alert";
-        return "chat";
-    }
+	function getVolumeIcon(volume: real, isMuted: bool): string {
+		if (isMuted)
+			return "no_sound";
+		if (volume >= 0.5)
+			return "volume_up";
+		if (volume > 0)
+			return "volume_down";
+		return "volume_mute";
+	}

-    function getVolumeIcon(volume: real, isMuted: bool): string {
-        if (isMuted)
-            return "no_sound";
-        if (volume >= 0.5)
-            return "volume_up";
-        if (volume > 0)
-            return "volume_down";
-        return "volume_mute";
-    }
-
-    function getMicVolumeIcon(volume: real, isMuted: bool): string {
-        if (!isMuted && volume > 0)
-            return "mic";
-        return "mic_off";
-    }
+	function getWeatherIcon(code: string): string {
+		if (weatherIcons.hasOwnProperty(code))
+			return weatherIcons[code];
+		return "air";
+	}
 }
@@ -5,52 +5,56 @@ import Quickshell.Io
 import Quickshell.Wayland

 Singleton {
-    id: root
+	id: root

-    property alias enabled: props.enabled
-    readonly property alias enabledSince: props.enabledSince
+	property alias enabled: props.enabled
+	readonly property alias enabledSince: props.enabledSince

-    onEnabledChanged: {
-        if (enabled)
-            props.enabledSince = new Date();
-    }
+	onEnabledChanged: {
+		if (enabled)
+			props.enabledSince = new Date();
+	}

-    PersistentProperties {
-        id: props
+	PersistentProperties {
+		id: props

-        property bool enabled
-        property date enabledSince
+		property bool enabled
+		property date enabledSince

-        reloadableId: "idleInhibitor"
-    }
+		reloadableId: "idleInhibitor"
+	}

-    IdleInhibitor {
-        enabled: props.enabled
-        window: PanelWindow {
-            implicitWidth: 0
-            implicitHeight: 0
-            color: "transparent"
-            mask: Region {}
-        }
-    }
+	IdleInhibitor {
+		enabled: props.enabled

-    IpcHandler {
-        target: "idleInhibitor"
+		window: PanelWindow {
+			WlrLayershell.namespace: "ZShell-IdleInhibitor"
+			color: "transparent"
+			implicitHeight: 0
+			implicitWidth: 0

-        function isEnabled(): bool {
-            return props.enabled;
-        }
+			mask: Region {
+			}
+		}
+	}

-        function toggle(): void {
-            props.enabled = !props.enabled;
-        }
+	IpcHandler {
+		function disable(): void {
+			props.enabled = false;
+		}

-        function enable(): void {
-            props.enabled = true;
-        }
+		function enable(): void {
+			props.enabled = true;
+		}

-        function disable(): void {
-            props.enabled = false;
-        }
-    }
+		function isEnabled(): bool {
+			return props.enabled;
+		}
+
+		function toggle(): void {
+			props.enabled = !props.enabled;
+		}
+
+		target: "idleInhibitor"
+	}
 }
@@ -5,14 +5,12 @@ import Quickshell.Hyprland
 import qs.Helpers

 Singleton {
-    function getInitialTitle(callback) {
-        let activeWindow = Hypr.activeToplevel.title
-        let activeClass = Hypr.activeToplevel.lastIpcObject.class.toString()
-        let regex = new RegExp(activeClass, "i")
+	function getInitialTitle(callback) {
+		let activeWindow = Hypr.activeToplevel.title;
+		let activeClass = Hypr.activeToplevel.lastIpcObject.class.toString();
+		let regex = new RegExp(activeClass, "i");

-        console.log("ActiveWindow", activeWindow, "ActiveClass", activeClass, "Regex", regex)
-
-        const evalTitle = activeWindow.match(regex)
-        callback(evalTitle)
-    }
+		const evalTitle = activeWindow.match(regex);
+		callback(evalTitle);
+	}
 }
@@ -10,32 +10,11 @@ import qs.Paths
 Singleton {
 	id: root

-	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();
-			}
-		}
-	}
+	readonly property int darkStart: Config.general.color.scheduleDarkStart

 	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"]);
@@ -43,18 +22,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"]);
@@ -62,25 +41,46 @@ 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 )
-			Quickshell.execDetached(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"onelight\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"])
+		if (Config.general.color.neovimColors)
+			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();
+			}
+		}
+	}
 }
@@ -6,6 +6,6 @@ import Quickshell.Networking
 Singleton {
 	id: root

-	property list<NetworkDevice> devices: Networking.devices.values
 	property NetworkDevice activeDevice: devices.find(d => d.connected)
+	property list<NetworkDevice> devices: Networking.devices.values
 }
@@ -0,0 +1,234 @@
+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;
+		}
+	}
+}
@@ -4,13 +4,13 @@ import Quickshell
 import Quickshell.Io

 Singleton {
-    id: root
+	id: root

-    property alias centerX: notifCenterSpacing.centerX
+	property alias centerX: notifCenterSpacing.centerX

-    JsonAdapter {
-        id: notifCenterSpacing
+	JsonAdapter {
+		id: notifCenterSpacing

-        property int centerX
-    }
+		property int centerX
+	}
 }
@@ -4,13 +4,13 @@ import Quickshell.Io
 import Quickshell

 Singleton {
-    id: root
+	id: root

-    property alias notifPath: storage.notifPath
+	property alias notifPath: storage.notifPath

-    JsonAdapter {
-        id: storage
+	JsonAdapter {
+		id: storage

-        property string notifPath: Quickshell.statePath("notifications.json")
-    }
+		property string notifPath: Quickshell.statePath("notifications.json")
+	}
 }
@@ -5,291 +5,282 @@ import Quickshell
 import Quickshell.Wayland
 import QtQuick
 import QtQuick.Effects
-import qs.Modules
+import qs.Components
 import qs.Config
 import qs.Helpers

 MouseArea {
-    id: root
+	id: root

-    required property LazyLoader loader
-    required property ShellScreen screen
+	property list<var> clients: {
+		const mon = Hypr.monitorFor(screen);
+		if (!mon)
+			return [];

-    property bool onClient
+		const special = mon.lastIpcObject.specialWorkspace;
+		const wsId = special.name ? special.id : mon.activeWorkspace.id;

-    property real realBorderWidth: onClient ? (Hypr.options["general:border_size"] ?? 1) : 2
-    property real realRounding: onClient ? (Hypr.options["decoration:rounding"] ?? 0) : 0
+		return Hypr.toplevels.values.filter(c => c.workspace?.id === wsId).sort((a, b) => {
+			const ac = a.lastIpcObject;
+			const bc = b.lastIpcObject;
+			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

-    property real ssx
-    property real ssy
+	function checkClientRects(x: real, y: real): void {
+		for (const client of clients) {
+			if (!client)
+				continue;

-    property real sx: 0
-    property real sy: 0
-    property real ex: screen.width
-    property real ey: screen.height
+			let {
+				at: [cx, cy],
+				size: [cw, ch]
+			} = client.lastIpcObject;
+			cx -= screen.x;
+			cy -= screen.y;
+			if (cx <= x && cy <= y && cx + cw >= x && cy + ch >= y) {
+				onClient = true;
+				sx = cx;
+				sy = cy;
+				ex = cx + cw;
+				ey = cy + ch;
+				break;
+			}
+		}
+	}

-    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)
+	function save(): void {
+		const tmpfile = Qt.resolvedUrl(`/tmp/zshell-picker-${Quickshell.processId}-${Date.now()}.png`);
+		ZShellIo.saveItem(screencopy, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => Quickshell.execDetached(["swappy", "-f", path]));
+		closeAnim.start();
+	}

-    property list<var> clients: {
-        const mon = Hypr.monitorFor(screen);
-        if (!mon)
-            return [];
+	anchors.fill: parent
+	cursorShape: Qt.CrossCursor
+	focus: true
+	hoverEnabled: true
+	opacity: 0

-        const special = mon.lastIpcObject.specialWorkspace;
-        const wsId = special.name ? special.id : mon.activeWorkspace.id;
+	Behavior on opacity {
+		Anim {
+			duration: 300
+		}
+	}
+	Behavior on rsx {
+		enabled: !root.pressed

-        return Hypr.toplevels.values.filter(c => c.workspace?.id === wsId).sort((a, b) => {
-            const ac = a.lastIpcObject;
-            const bc = b.lastIpcObject;
-            return (bc.pinned - ac.pinned) || ((bc.fullscreen !== 0) - (ac.fullscreen !== 0)) || (bc.floating - ac.floating);
-        });
-    }
+		ExAnim {
+		}
+	}
+	Behavior on rsy {
+		enabled: !root.pressed

-    function checkClientRects(x: real, y: real): void {
-        for (const client of clients) {
-            if (!client)
-                continue;
+		ExAnim {
+		}
+	}
+	Behavior on sh {
+		enabled: !root.pressed

-            let {
-                at: [cx, cy],
-                size: [cw, ch]
-            } = client.lastIpcObject;
-            cx -= screen.x;
-            cy -= screen.y;
-            if (cx <= x && cy <= y && cx + cw >= x && cy + ch >= y) {
-                onClient = true;
-                sx = cx;
-                sy = cy;
-                ex = cx + cw;
-                ey = cy + ch;
-                break;
-            }
-        }
-    }
+		ExAnim {
+		}
+	}
+	Behavior on sw {
+		enabled: !root.pressed

-    function save(): void {
-        const tmpfile = Qt.resolvedUrl(`/tmp/zshell-picker-${Quickshell.processId}-${Date.now()}.png`);
-        ZShellIo.saveItem(screencopy, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => Quickshell.execDetached(["swappy", "-f", path]));
-        closeAnim.start();
-    }
+		ExAnim {
+		}
+	}

-    onClientsChanged: checkClientRects(mouseX, mouseY)
+	Component.onCompleted: {
+		Hypr.extras.refreshOptions();
+		if (loader.freeze)
+			clients = clients;

-    anchors.fill: parent
-    opacity: 0
-    hoverEnabled: true
-    cursorShape: Qt.CrossCursor
+		opacity = 1;

-    Component.onCompleted: {
-        Hypr.extras.refreshOptions();
-        if (loader.freeze)
-            clients = clients;
+		const c = clients[0];
+		if (c) {
+			const cx = c.lastIpcObject.at[0] - screen.x;
+			const cy = c.lastIpcObject.at[1] - screen.y;
+			onClient = true;
+			sx = cx;
+			sy = cy;
+			ex = cx + c.lastIpcObject.size[0];
+			ey = cy + c.lastIpcObject.size[1];
+		} else {
+			sx = screen.width / 2 - 100;
+			sy = screen.height / 2 - 100;
+			ex = screen.width / 2 + 100;
+			ey = screen.height / 2 + 100;
+		}
+	}
+	Keys.onEscapePressed: closeAnim.start()
+	onClientsChanged: checkClientRects(mouseX, mouseY)
+	onPositionChanged: event => {
+		const x = event.x;
+		const y = event.y;

-        opacity = 1;
+		if (pressed) {
+			onClient = false;
+			sx = ssx;
+			sy = ssy;
+			ex = x;
+			ey = y;
+		} else {
+			checkClientRects(x, y);
+		}
+	}
+	onPressed: event => {
+		ssx = event.x;
+		ssy = event.y;
+	}
+	onReleased: {
+		if (closeAnim.running)
+			return;

-        const c = clients[0];
-        if (c) {
-            const cx = c.lastIpcObject.at[0] - screen.x;
-            const cy = c.lastIpcObject.at[1] - screen.y;
-            onClient = true;
-            sx = cx;
-            sy = cy;
-            ex = cx + c.lastIpcObject.size[0];
-            ey = cy + c.lastIpcObject.size[1];
-        } else {
-            sx = screen.width / 2 - 100;
-            sy = screen.height / 2 - 100;
-            ex = screen.width / 2 + 100;
-            ey = screen.height / 2 + 100;
-        }
-    }
+		if (root.loader.freeze) {
+			save();
+		} else {
+			overlay.visible = border.visible = false;
+			screencopy.visible = false;
+			screencopy.active = true;
+		}
+	}

-    onPressed: event => {
-        ssx = event.x;
-        ssy = event.y;
-    }
+	SequentialAnimation {
+		id: closeAnim

-    onReleased: {
-        if (closeAnim.running)
-            return;
+		PropertyAction {
+			property: "closing"
+			target: root.loader
+			value: true
+		}

-        if (root.loader.freeze) {
-            save();
-        } else {
-            overlay.visible = border.visible = false;
-            screencopy.visible = false;
-            screencopy.active = true;
-        }
-    }
+		ParallelAnimation {
+			Anim {
+				duration: 300
+				property: "opacity"
+				target: root
+				to: 0
+			}

-    onPositionChanged: event => {
-        const x = event.x;
-        const y = event.y;
+			ExAnim {
+				properties: "rsx,rsy"
+				target: root
+				to: 0
+			}

-        if (pressed) {
-            onClient = false;
-            sx = ssx;
-            sy = ssy;
-            ex = x;
-            ey = y;
-        } else {
-            checkClientRects(x, y);
-        }
-    }
+			ExAnim {
+				property: "sw"
+				target: root
+				to: root.screen.width
+			}

-    focus: true
-    Keys.onEscapePressed: closeAnim.start()
+			ExAnim {
+				property: "sh"
+				target: root
+				to: root.screen.height
+			}
+		}

-    SequentialAnimation {
-        id: closeAnim
+		PropertyAction {
+			property: "activeAsync"
+			target: root.loader
+			value: false
+		}
+	}

-        PropertyAction {
-            target: root.loader
-            property: "closing"
-            value: true
-        }
-        ParallelAnimation {
-            Anim {
-                target: root
-                property: "opacity"
-                to: 0
-                duration: 300
-            }
-            ExAnim {
-                target: root
-                properties: "rsx,rsy"
-                to: 0
-            }
-            ExAnim {
-                target: root
-                property: "sw"
-                to: root.screen.width
-            }
-            ExAnim {
-                target: root
-                property: "sh"
-                to: root.screen.height
-            }
-        }
-        PropertyAction {
-            target: root.loader
-            property: "activeAsync"
-            value: false
-        }
-    }
+	Loader {
+		id: screencopy

-    Loader {
-        id: screencopy
+		active: root.loader.freeze
+		anchors.fill: parent
+		asynchronous: true

-        anchors.fill: parent
+		sourceComponent: ScreencopyView {
+			captureSource: root.screen
+			paintCursor: false

-        active: root.loader.freeze
-        asynchronous: true
+			onHasContentChanged: {
+				if (hasContent && !root.loader.freeze) {
+					overlay.visible = border.visible = true;
+					root.save();
+				}
+			}
+		}
+	}

-        sourceComponent: ScreencopyView {
-            captureSource: root.screen
+	Rectangle {
+		id: overlay

-            paintCursor: false
+		anchors.fill: parent
+		color: "white"
+		layer.enabled: true
+		opacity: 0.3
+		radius: root.realRounding

-            onHasContentChanged: {
-                if (hasContent && !root.loader.freeze) {
-                    overlay.visible = border.visible = true;
-                    root.save();
-                }
-            }
-        }
-    }
+		layer.effect: MultiEffect {
+			maskEnabled: true
+			maskInverted: true
+			maskSource: selectionWrapper
+			maskSpreadAtMin: 1
+			maskThresholdMin: 0.5
+		}
+	}

-    Rectangle {
-        id: overlay
+	Item {
+		id: selectionWrapper

-        anchors.fill: parent
-        color: "white"
-        opacity: 0.3
+		anchors.fill: parent
+		layer.enabled: true
+		visible: false

-        radius: root.realRounding
+		Rectangle {
+			id: selectionRect

-        layer.enabled: true
-        layer.effect: MultiEffect {
-            maskSource: selectionWrapper
-            maskEnabled: true
-            maskInverted: true
-            maskSpreadAtMin: 1
-            maskThresholdMin: 0.5
-        }
-    }
+			implicitHeight: root.sh
+			implicitWidth: root.sw
+			radius: root.realRounding
+			x: root.rsx
+			y: root.rsy
+		}
+	}

-    Item {
-        id: selectionWrapper
+	Rectangle {
+		id: border

-        anchors.fill: parent
-        layer.enabled: true
-        visible: false
+		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
+		x: selectionRect.x - root.realBorderWidth
+		y: selectionRect.y - root.realBorderWidth

-        Rectangle {
-            id: selectionRect
+		Behavior on border.color {
+			Anim {
+			}
+		}
+	}

-            radius: root.realRounding
-            x: root.rsx
-            y: root.rsy
-            implicitWidth: root.sw
-            implicitHeight: root.sh
-        }
-    }
-
-    Rectangle {
-        id: border
-
-        color: "transparent"
-        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 {
-        duration: MaterialEasing.expressiveEffectsTime
-        easing.bezierCurve: MaterialEasing.expressiveEffects
-    }
+	component ExAnim: Anim {
+		duration: MaterialEasing.expressiveEffectsTime
+		easing.bezierCurve: MaterialEasing.expressiveEffects
+	}
 }
@@ -9,115 +9,119 @@ import qs.Config
 import qs.Components

 Singleton {
-    id: root
+	id: root

-    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
+	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
+	property alias manualActive: props.manualActive

-    function getIdentity(player: MprisPlayer): string {
-        const alias = Config.services.playerAliases.find(a => a.from === player.identity);
-        return alias?.to ?? player.identity;
-    }
+	function getIdentity(player: MprisPlayer): string {
+		const alias = Config.services.playerAliases.find(a => a.from === player.identity);
+		return alias?.to ?? player.identity;
+	}

-    Connections {
-        target: active
+	Connections {
+		function onPostTrackChanged() {
+			if (!Config.utilities.toasts.nowPlaying) {
+				return;
+			}
+		}

-        function onPostTrackChanged() {
-            if (!Config.utilities.toasts.nowPlaying) {
-                return;
-            }
-        }
-    }
+		target: active
+	}

-    PersistentProperties {
-        id: props
+	PersistentProperties {
+		id: props

-        property MprisPlayer manualActive
+		property MprisPlayer manualActive

-        reloadableId: "players"
-    }
+		reloadableId: "players"
+	}

-    CustomShortcut {
-        name: "mediaToggle"
-        description: "Toggle media playback"
-        onPressed: {
-            const active = root.active;
-            if (active && active.canTogglePlaying)
-                active.togglePlaying();
-        }
-    }
+	CustomShortcut {
+		description: "Toggle media playback"
+		name: "mediaToggle"

-    CustomShortcut {
-        name: "mediaPrev"
-        description: "Previous track"
-        onPressed: {
-            const active = root.active;
-            if (active && active.canGoPrevious)
-                active.previous();
-        }
-    }
+		onPressed: {
+			const active = root.active;
+			if (active && active.canTogglePlaying)
+				active.togglePlaying();
+		}
+	}

-    CustomShortcut {
-        name: "mediaNext"
-        description: "Next track"
-        onPressed: {
-            const active = root.active;
-            if (active && active.canGoNext)
-                active.next();
-        }
-    }
+	CustomShortcut {
+		description: "Previous track"
+		name: "mediaPrev"

-    CustomShortcut {
-        name: "mediaStop"
-        description: "Stop media playback"
-        onPressed: root.active?.stop()
-    }
+		onPressed: {
+			const active = root.active;
+			if (active && active.canGoPrevious)
+				active.previous();
+		}
+	}

-    IpcHandler {
-        target: "mpris"
+	CustomShortcut {
+		description: "Next track"
+		name: "mediaNext"

-        function getActive(prop: string): string {
-            const active = root.active;
-            return active ? active[prop] ?? "Invalid property" : "No active player";
-        }
+		onPressed: {
+			const active = root.active;
+			if (active && active.canGoNext)
+				active.next();
+		}
+	}

-        function list(): string {
-            return root.list.map(p => root.getIdentity(p)).join("\n");
-        }
+	CustomShortcut {
+		description: "Stop media playback"
+		name: "mediaStop"

-        function play(): void {
-            const active = root.active;
-            if (active?.canPlay)
-                active.play();
-        }
+		onPressed: root.active?.stop()
+	}

-        function pause(): void {
-            const active = root.active;
-            if (active?.canPause)
-                active.pause();
-        }
+	IpcHandler {
+		function getActive(prop: string): string {
+			const active = root.active;
+			return active ? active[prop] ?? "Invalid property" : "No active player";
+		}

-        function playPause(): void {
-            const active = root.active;
-            if (active?.canTogglePlaying)
-                active.togglePlaying();
-        }
+		function list(): string {
+			return root.list.map(p => root.getIdentity(p)).join("\n");
+		}

-        function previous(): void {
-            const active = root.active;
-            if (active?.canGoPrevious)
-                active.previous();
-        }
+		function next(): void {
+			const active = root.active;
+			if (active?.canGoNext)
+				active.next();
+		}

-        function next(): void {
-            const active = root.active;
-            if (active?.canGoNext)
-                active.next();
-        }
+		function pause(): void {
+			const active = root.active;
+			if (active?.canPause)
+				active.pause();
+		}

-        function stop(): void {
-            root.active?.stop();
-        }
-    }
+		function play(): void {
+			const active = root.active;
+			if (active?.canPlay)
+				active.play();
+		}
+
+		function playPause(): void {
+			const active = root.active;
+			if (active?.canTogglePlaying)
+				active.togglePlaying();
+		}
+
+		function previous(): void {
+			const active = root.active;
+			if (active?.canGoPrevious)
+				active.previous();
+		}
+
+		function stop(): void {
+			root.active?.stop();
+		}
+
+		target: "mpris"
+	}
 }
@@ -9,41 +9,41 @@ import qs.Helpers
 import qs.Paths

 Searcher {
-    id: root
+	id: root

-    property bool showPreview: false
-    readonly property string current: showPreview ? previewPath : actualCurrent
-    property string previewPath
-    property string actualCurrent: WallpaperPath.currentWallpaperPath
+	property string actualCurrent: WallpaperPath.currentWallpaperPath
+	readonly property string current: showPreview ? previewPath : actualCurrent
+	property string previewPath
+	property bool showPreview: false

-    function setWallpaper(path: string): void {
-        actualCurrent = path;
-        WallpaperPath.currentWallpaperPath = path;
+	function preview(path: string): void {
+		previewPath = path;
+		showPreview = true;
+	}
+
+	function setWallpaper(path: string): void {
+		actualCurrent = path;
+		WallpaperPath.currentWallpaperPath = path;
 		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}`]);
+	}

-    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}`]);
-    }
+	extraOpts: useFuzzy ? ({}) : ({
+			forward: false
+		})
+	key: "relativePath"
+	list: wallpapers.entries
+	useFuzzy: true

-    list: wallpapers.entries
-    key: "relativePath"
-    useFuzzy: true
-    extraOpts: useFuzzy ? ({}) : ({
-            forward: false
-        })
+	FileSystemModel {
+		id: wallpapers

-    FileSystemModel {
-        id: wallpapers
-
-        recursive: true
-        path: Config.general.wallpaperPath
-        filter: FileSystemModel.Images
-    }
+		filter: FileSystemModel.Images
+		path: Config.general.wallpaperPath
+		recursive: true
+	}
 }
@@ -4,52 +4,51 @@ 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: ({})
+	property var extraOpts: ({})
+	readonly property list<var> fuzzyPrepped: useFuzzy ? list.map(e => {
+		const obj = {
+			_item: e
+		};
+		for (const k of keys)
+			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
-    property list<string> keys: [key]
-    property list<real> weights: [1]
+	// Extra stuff for fuzzy
+	property list<string> keys: [key]
+	required property list<QtObject> list
+	property bool useFuzzy: false
+	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
-        };
-        for (const k of keys)
-            obj[k] = Fuzzy.prepare(e[k]);
-        return obj;
-    }) : []
+	function query(search: string): list<var> {
+		search = transformSearch(search);
+		if (!search)
+			return [...list];

-    function transformSearch(search: string): string {
-        return search;
-    }
+		if (useFuzzy)
+			return Fuzzy.go(search, fuzzyPrepped, Object.assign({
+				all: true,
+				keys,
+				scoreFn: r => weights.reduce((a, w, i) => a + r[i].score * w, 0)
+			}, extraOpts)).map(r => r.obj._item);

-    function selector(item: var): string {
-        // Only for fzf
-        return item[key];
-    }
+		return fzf.find(search).sort((a, b) => {
+			if (a.score === b.score)
+				return selector(a.item).trim().length - selector(b.item).trim().length;
+			return b.score - a.score;
+		}).map(r => r.item);
+	}

-    function query(search: string): list<var> {
-        search = transformSearch(search);
-        if (!search)
-            return [...list];
+	function selector(item: var): string {
+		// Only for fzf
+		return item[key];
+	}

-        if (useFuzzy)
-            return Fuzzy.go(search, fuzzyPrepped, Object.assign({
-                all: true,
-                keys,
-                scoreFn: r => weights.reduce((a, w, i) => a + r[i].score * w, 0)
-            }, extraOpts)).map(r => r.obj._item);
-
-        return fzf.find(search).sort((a, b) => {
-            if (a.score === b.score)
-                return selector(a.item).trim().length - selector(b.item).trim().length;
-            return b.score - a.score;
-        }).map(r => r.item);
-    }
+	function transformSearch(search: string): string {
+		return search;
+	}
 }
@@ -6,79 +6,78 @@ import Quickshell.Io
 import QtQuick

 Singleton {
-    id: root
+	id: root

-    property string osName
-    property string osPrettyName
-    property string osId
-    property list<string> osIdLike
-    property string osLogo
-    property bool isDefaultLogo: true
+	property bool isDefaultLogo: true
+	property string osId
+	property list<string> osIdLike
+	property string osLogo
+	property string osName
+	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")

-    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

-    FileView {
-        id: osRelease
+		path: "/etc/os-release"

-        path: "/etc/os-release"
-        onLoaded: {
-            const lines = text().split("\n");
+		onLoaded: {
+			const lines = text().split("\n");

-            const fd = key => lines.find(l => l.startsWith(`${key}=`))?.split("=")[1].replace(/"/g, "") ?? "";
+			const fd = key => lines.find(l => l.startsWith(`${key}=`))?.split("=")[1].replace(/"/g, "") ?? "";

-            root.osName = fd("NAME");
-            root.osPrettyName = fd("PRETTY_NAME");
-            root.osId = fd("ID");
-            root.osIdLike = fd("ID_LIKE").split(" ");
+			root.osName = fd("NAME");
+			root.osPrettyName = fd("PRETTY_NAME");
+			root.osId = fd("ID");
+			root.osIdLike = fd("ID_LIKE").split(" ");

-            const logo = Quickshell.iconPath(fd("LOGO"), true);
-            if (Config.general.logo) {
-                root.osLogo = Quickshell.iconPath(Config.general.logo, true) || "file://" + Paths.absolutePath(Config.general.logo);
-                root.isDefaultLogo = false;
-            } else if (logo) {
-                root.osLogo = logo;
-                root.isDefaultLogo = false;
-            }
-        }
-    }
+			const logo = Quickshell.iconPath(fd("LOGO"), true);
+			if (Config.general.logo) {
+				root.osLogo = Quickshell.iconPath(Config.general.logo, true) || "file://" + Paths.absolutePath(Config.general.logo);
+				root.isDefaultLogo = false;
+			} else if (logo) {
+				root.osLogo = logo;
+				root.isDefaultLogo = false;
+			}
+		}
+	}

-    Connections {
-        target: Config.general
+	Connections {
+		function onLogoChanged(): void {
+			osRelease.reload();
+		}

-        function onLogoChanged(): void {
-            osRelease.reload();
-        }
-    }
+		target: Config.general
+	}

-    Timer {
-        running: true
-        repeat: true
-        interval: 15000
-        onTriggered: fileUptime.reload()
-    }
+	Timer {
+		interval: 15000
+		repeat: true
+		running: true

-    FileView {
-        id: fileUptime
+		onTriggered: fileUptime.reload()
+	}

-        path: "/proc/uptime"
-        onLoaded: {
-            const up = parseInt(text().split(" ")[0] ?? 0);
+	FileView {
+		id: fileUptime

-            const days = Math.floor(up / 86400);
-            const hours = Math.floor((up % 86400) / 3600);
-            const minutes = Math.floor((up % 3600) / 60);
+		path: "/proc/uptime"

-            let str = "";
-            if (days > 0)
-                str += `${days} day${days === 1 ? "" : "s"}`;
-            if (hours > 0)
-                str += `${str ? ", " : ""}${hours} hour${hours === 1 ? "" : "s"}`;
-            if (minutes > 0 || !str)
-                str += `${str ? ", " : ""}${minutes} minute${minutes === 1 ? "" : "s"}`;
-            root.uptime = str;
-        }
-    }
+		onLoaded: {
+			const up = parseInt(text().split(" ")[0] ?? 0);
+
+			const hours = Math.floor(up / 3600);
+			const minutes = Math.floor((up % 3600) / 60);
+
+			let str = "";
+			if (hours > 0)
+				str += `${hours} hour${hours === 1 ? "" : "s"}`;
+			if (minutes > 0 || !str)
+				str += `${str ? ", " : ""}${minutes} minute${minutes === 1 ? "" : "s"}`;
+			root.uptime = str;
+		}
+	}
 }
@@ -6,232 +6,344 @@ import QtQuick
 import qs.Config

 Singleton {
-    id: root
+	id: root

-    property real cpuPerc
-    property real cpuTemp
-    readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
-    property string autoGpuType: "NONE"
-    property real gpuPerc
-    property real gpuTemp
-	property real gpuMemUsed
+	property string autoGpuType: "NONE"
+	property string cpuName: ""
+	property real cpuPerc
+	property real cpuTemp
+
+	// Individual disks: Array of { mount, used, total, free, perc }
+	property var disks: []
 	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 gpuMemUsed
+	property string gpuName: ""
+	property real gpuPerc
+	property real gpuTemp
+	readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
+	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;
+	}

-    property real lastCpuIdle
-    property real lastCpuTotal
+	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();
+	}

-    property int refCount
+	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;
-        const gib = 1024 ** 2;
-        const tib = 1024 ** 3;
+	function formatKib(kib: real): var {
+		const mib = 1024;
+		const gib = 1024 ** 2;
+		const tib = 1024 ** 3;

-        if (kib >= tib)
-            return {
-                value: kib / tib,
-                unit: "TiB"
-            };
-        if (kib >= gib)
-            return {
-                value: kib / gib,
-                unit: "GiB"
-            };
-        if (kib >= mib)
-            return {
-                value: kib / mib,
-                unit: "MiB"
-            };
-        return {
-            value: kib,
-            unit: "KiB"
-        };
-    }
+		if (kib >= tib)
+			return {
+				value: kib / tib,
+				unit: "TiB"
+			};
+		if (kib >= gib)
+			return {
+				value: kib / gib,
+				unit: "GiB"
+			};
+		if (kib >= mib)
+			return {
+				value: kib / mib,
+				unit: "MiB"
+			};
+		return {
+			value: kib,
+			unit: "KiB"
+		};
+	}

-    Timer {
-        running: root.refCount > 0
-        interval: 3000
-        repeat: true
-        triggeredOnStart: true
-        onTriggered: {
-            stat.reload();
-            meminfo.reload();
-            storage.running = true;
-            gpuUsage.running = true;
-            sensors.running = true;
-        }
-    }
+	Timer {
+		interval: Config.dashboard.resourceUpdateInterval
+		repeat: true
+		running: root.refCount > 0
+		triggeredOnStart: true

-    FileView {
-        id: stat
+		onTriggered: {
+			stat.reload();
+			meminfo.reload();
+			storage.running = true;
+			gpuUsage.running = true;
+			sensors.running = true;
+		}
+	}

-        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) {
-                const stats = data.slice(1).map(n => parseInt(n, 10));
-                const total = stats.reduce((a, b) => a + b, 0);
-                const idle = stats[3] + (stats[4] ?? 0);
+	FileView {
+		id: cpuinfoInit

-                const totalDiff = total - root.lastCpuTotal;
-                const idleDiff = idle - root.lastCpuIdle;
-                root.cpuPerc = totalDiff > 0 ? (1 - idleDiff / totalDiff) : 0;
+		path: "/proc/cpuinfo"

-                root.lastCpuTotal = total;
-                root.lastCpuIdle = idle;
-            }
-        }
-    }
+		onLoaded: {
+			const nameMatch = text().match(/model name\s*:\s*(.+)/);
+			if (nameMatch)
+				root.cpuName = root.cleanCpuName(nameMatch[1]);
+		}
+	}

-    FileView {
-        id: meminfo
+	FileView {
+		id: stat

-        path: "/proc/meminfo"
-        onLoaded: {
-            const data = text();
-            root.memTotal = parseInt(data.match(/MemTotal: *(\d+)/)[1], 10) || 1;
-            root.memUsed = (root.memTotal - parseInt(data.match(/MemAvailable: *(\d+)/)[1], 10)) || 0;
-        }
-    }
+		path: "/proc/stat"

-    Process {
-        id: storage
+		onLoaded: {
+			const data = text().match(/^cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/);
+			if (data) {
+				const stats = data.slice(1).map(n => parseInt(n, 10));
+				const total = stats.reduce((a, b) => a + b, 0);
+				const idle = stats[3] + (stats[4] ?? 0);

-        command: ["sh", "-c", "df | grep '^/dev/' | awk '{print $1, $3, $4}'"]
-        stdout: StdioCollector {
-            onStreamFinished: {
-                const deviceMap = new Map();
+				const totalDiff = total - root.lastCpuTotal;
+				const idleDiff = idle - root.lastCpuIdle;
+				root.cpuPerc = totalDiff > 0 ? (1 - idleDiff / totalDiff) : 0;

-                for (const line of text.trim().split("\n")) {
-                    if (line.trim() === "")
-                        continue;
+				root.lastCpuTotal = total;
+				root.lastCpuIdle = idle;
+			}
+		}
+	}

-                    const parts = line.trim().split(/\s+/);
-                    if (parts.length >= 3) {
-                        const device = parts[0];
-                        const used = parseInt(parts[1], 10) || 0;
-                        const avail = parseInt(parts[2], 10) || 0;
+	FileView {
+		id: meminfo

-                        // Only keep the entry with the largest total space for each device
-                        if (!deviceMap.has(device) || (used + avail) > (deviceMap.get(device).used + deviceMap.get(device).avail)) {
-                            deviceMap.set(device, {
-                                used: used,
-                                avail: avail
-                            });
-                        }
-                    }
-                }
+		path: "/proc/meminfo"

-                let totalUsed = 0;
-                let totalAvail = 0;
+		onLoaded: {
+			const data = text();
+			root.memTotal = parseInt(data.match(/MemTotal: *(\d+)/)[1], 10) || 1;
+			root.memUsed = (root.memTotal - parseInt(data.match(/MemAvailable: *(\d+)/)[1], 10)) || 0;
+		}
+	}

-                for (const [device, stats] of deviceMap) {
-                    totalUsed += stats.used;
-                    totalAvail += stats.avail;
-                }
+	Process {
+		id: storage

-                root.storageUsed = totalUsed;
-                root.storageTotal = totalUsed + totalAvail;
-            }
-        }
-    }
+		command: ["lsblk", "-b", "-o", "NAME,SIZE,TYPE,FSUSED,FSSIZE", "-P"]

-    Process {
-        id: gpuTypeCheck
+		stdout: StdioCollector {
+			onStreamFinished: {
+				const diskMap = {};  // Map disk name -> { name, totalSize, used, fsTotal }
+				const lines = text.trim().split("\n");

-        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()
-        }
-    }
+				for (const line of lines) {
+					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="([^"]*)"/);

-    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())
-                oneshotMem.running = false
-            }
-        }
-    }
+					if (!nameMatch || !typeMatch)
+						continue;

-    Process {
-        id: gpuUsage
+					const name = nameMatch[1];
+					const type = typeMatch[1];
+					const size = parseInt(sizeMatch?.[1] || "0", 10);
+					const fsused = parseInt(fsusedMatch?.[1] || "0", 10);
+					const fssize = parseInt(fssizeMatch?.[1] || "0", 10);

-        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") {
-                    const percs = text.trim().split("\n");
-                    const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0);
-                    root.gpuPerc = sum / percs.length / 100;
-                } else if (root.gpuType === "NVIDIA") {
-                    const [usage, temp, mem] = text.trim().split(",");
-                    root.gpuPerc = parseInt(usage, 10) / 100;
-                    root.gpuTemp = parseInt(temp, 10);
+					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 {
+		id: gpuNameDetect
+
+		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"]
+		running: true
+
+		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]);
+					}
+				}
+			}
+		}
+	}
+
+	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
+
+		stdout: StdioCollector {
+			onStreamFinished: root.autoGpuType = text.trim()
+		}
+	}
+
+	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());
+				oneshotMem.running = false;
+			}
+		}
+	}
+
+	Process {
+		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") {
+					const percs = text.trim().split("\n");
+					const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0);
+					root.gpuPerc = sum / percs.length / 100;
+				} else if (root.gpuType === "NVIDIA") {
+					const [usage, temp, mem] = text.trim().split(",");
+					root.gpuPerc = parseInt(usage, 10) / 100;
+					root.gpuTemp = parseInt(temp, 10);
 					root.gpuMemUsed = parseInt(mem, 10) / root.gpuMemTotal;
-                } else {
-                    root.gpuPerc = 0;
-                    root.gpuTemp = 0;
-                }
-            }
-        }
-    }
+				} else {
+					root.gpuPerc = 0;
+					root.gpuTemp = 0;
+				}
+			}
+		}
+	}

-    Process {
-        id: sensors
+	Process {
+		id: sensors

-        command: ["sensors"]
-        environment: ({
-                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/);
-                if (!cpuTemp)
-                    // If AMD Tdie pattern failed, try fallback on Tctl
-                    cpuTemp = text.match(/Tctl:\s+((\+|-)[0-9.]+)(°| )C/);
+		command: ["sensors"]
+		environment: ({
+				LANG: "C.UTF-8",
+				LC_ALL: "C.UTF-8"
+			})

-                if (cpuTemp)
-                    root.cpuTemp = parseFloat(cpuTemp[1]);
+		stdout: StdioCollector {
+			onStreamFinished: {
+				let cpuTemp = text.match(/(?:Package id [0-9]+|Tdie):\s+((\+|-)[0-9.]+)(°| )C/);
+				if (!cpuTemp)
+					// If AMD Tdie pattern failed, try fallback on Tctl
+					cpuTemp = text.match(/Tctl:\s+((\+|-)[0-9.]+)(°| )C/);

-                if (root.gpuType !== "GENERIC")
-                    return;
+				if (cpuTemp)
+					root.cpuTemp = parseFloat(cpuTemp[1]);

-                let eligible = false;
-                let sum = 0;
-                let count = 0;
+				if (root.gpuType !== "GENERIC")
+					return;

-                for (const line of text.trim().split("\n")) {
-                    if (line === "Adapter: PCI adapter")
-                        eligible = true;
-                    else if (line === "")
-                        eligible = false;
-                    else if (eligible) {
-                        let match = line.match(/^(temp[0-9]+|GPU core|edge)+:\s+\+([0-9]+\.[0-9]+)(°| )C/);
-                        if (!match)
-                            // Fall back to junction/mem if GPU doesn't have edge temp (for AMD GPUs)
-                            match = line.match(/^(junction|mem)+:\s+\+([0-9]+\.[0-9]+)(°| )C/);
+				let eligible = false;
+				let sum = 0;
+				let count = 0;

-                        if (match) {
-                            sum += parseFloat(match[2]);
-                            count++;
-                        }
-                    }
-                }
+				for (const line of text.trim().split("\n")) {
+					if (line === "Adapter: PCI adapter")
+						eligible = true;
+					else if (line === "")
+						eligible = false;
+					else if (eligible) {
+						let match = line.match(/^(temp[0-9]+|GPU core|edge)+:\s+\+([0-9]+\.[0-9]+)(°| )C/);
+						if (!match)
+							// Fall back to junction/mem if GPU doesn't have edge temp (for AMD GPUs)
+							match = line.match(/^(junction|mem)+:\s+\+([0-9]+\.[0-9]+)(°| )C/);

-                root.gpuTemp = count > 0 ? sum / count : 0;
-            }
-        }
-    }
+						if (match) {
+							sum += parseFloat(match[2]);
+							count++;
+						}
+					}
+				}
+
+				root.gpuTemp = count > 0 ? sum / count : 0;
+			}
+		}
+	}
 }
@@ -1,6 +1,6 @@
 import QtQuick

 Text {
-    renderType: Text.NativeRendering
-    textFormat: Text.PlainText
+	renderType: Text.NativeRendering
+	textFormat: Text.PlainText
 }
@@ -6,6 +6,30 @@ import Quickshell
 Singleton {
 	id: root

+	property list<DesktopEntry> entryList: []
+	property var preppedIcons: []
+	property var preppedIds: []
+	property var preppedNames: []
+
+	// Dynamic fixups
+	property var regexSubstitutions: [
+		{
+			"regex": /^steam_app_(\d+)$/,
+			"replace": "steam_icon_$1"
+		},
+		{
+			"regex": /Minecraft.*/,
+			"replace": "minecraft-launcher"
+		},
+		{
+			"regex": /.*polkit.*/,
+			"replace": "system-lock-screen"
+		},
+		{
+			"regex": /gcr.prompter/,
+			"replace": "system-lock-screen"
+		}
+	]
 	property real scoreThreshold: 0.2

 	// Manual overrides for tricky apps
@@ -17,178 +41,23 @@ Singleton {
 			"wps": "wps-office2019-kprometheus",
 			"wpsoffice": "wps-office2019-kprometheus",
 			"footclient": "foot"
-			})
+		})

-	// Dynamic fixups
-	property var regexSubstitutions: [
-	{
-		"regex": /^steam_app_(\d+)$/,
-			"replace": "steam_icon_$1"
-	},
-	{
-		"regex": /Minecraft.*/,
-		"replace": "minecraft-launcher"
-	},
-	{
-		"regex": /.*polkit.*/,
-		"replace": "system-lock-screen"
-	},
-	{
-		"regex": /gcr.prompter/,
-		"replace": "system-lock-screen"
-	}
-	]
-
-	property list<DesktopEntry> entryList: []
-	property var preppedNames: []
-	property var preppedIcons: []
-	property var preppedIds: []
-
-	Component.onCompleted: refreshEntries()
-
-	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)
+	function checkCleanMatch(str) {
+		if (!str || str.length <= 3)
 			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;

-		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 < variants.length; i++) {
-			const variant = variants[i];
-			if (variant) {
-				const entry = DesktopEntries.byId(variant);
-				if (entry)
-					return entry;
+		for (let i = 0; i < list.length; i++) {
+			const entry = list[i];
+			const cleanId = (entry.id || "").toLowerCase().replace(/[\.\-_]/g, '');
+			if (cleanId.includes(cleanStr) || cleanStr.includes(cleanId)) {
+				return entry;
 			}
 		}
 		return null;
@@ -227,33 +96,108 @@ Singleton {
 		return null;
 	}

-	function checkCleanMatch(str) {
-		if (!str || str.length <= 3)
-			return null;
+	// --- Lookup Helpers ---
+
+	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;

-		// Aggressive fallback: strip all separators
-		const cleanStr = str.toLowerCase().replace(/[\.\-_]/g, '');
-		const list = Array.from(entryList);
+		const lower = str.toLowerCase();

-		for (let i = 0; i < list.length; i++) {
-			const entry = list[i];
-			const cleanId = (entry.id || "").toLowerCase().replace(/[\.\-_]/g, '');
-			if (cleanId.includes(cleanStr) || cleanStr.includes(cleanId)) {
-				return entry;
+		const variants = [str, lower, getFromReverseDomain(str), getFromReverseDomain(str)?.toLowerCase(), normalizeWithHyphens(str), str.replace(/_/g, '-').toLowerCase(), str.replace(/-/g, '_').toLowerCase()];
+
+		for (let i = 0; i < variants.length; i++) {
+			const variant = variants[i];
+			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 [];
 		return FuzzySort.go(search, preppedData, {
-	all: true,
-	key: "name"
-	}).map(r => r.obj.entry);
+			all: true,
+			key: "name"
+		}).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) {
@@ -266,10 +210,34 @@ Singleton {
 		return path && path.length > 0 && !path.includes("image-missing");
 	}

-	function getFromReverseDomain(str) {
-		if (!str)
+	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);
+	}
+
+	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) {
@@ -278,9 +246,43 @@ Singleton {
 		return str.toLowerCase().replace(/\s+/g, "-");
 	}

-	// Deprecated shim
-	function guessIcon(str) {
-		const entry = findAppEntry(str);
-		return entry ? entry.icon : "image-missing";
+	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
+				}));
+	}
+
+	Component.onCompleted: refreshEntries()
+
+	Connections {
+		function onValuesChanged() {
+			refreshEntries();
+		}
+
+		target: DesktopEntries.applications
 	}
 }
@@ -3,24 +3,24 @@ pragma Singleton
 import Quickshell

 Singleton {
-    property alias enabled: clock.enabled
-    readonly property date date: clock.date
-    readonly property int hours: clock.hours
-    readonly property int minutes: clock.minutes
-    readonly property int seconds: clock.seconds
+	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 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 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);
+	}

-    function format(fmt: string): string {
-        return Qt.formatDateTime(clock.date, fmt);
-    }
+	SystemClock {
+		id: clock

-    SystemClock {
-        id: clock
-        precision: SystemClock.Seconds
-    }
+		precision: SystemClock.Seconds
+	}
 }
@@ -3,11 +3,10 @@ pragma Singleton
 import Quickshell
 import Quickshell.Services.UPower

-
 Singleton {
 	id: root

 	readonly property list<UPowerDevice> devices: UPower.devices.values
-	readonly property bool onBattery: UPower.onBattery
 	readonly property UPowerDevice displayDevice: UPower.displayDevice
+	readonly property bool onBattery: UPower.onBattery
 }
@@ -3,14 +3,14 @@ pragma Singleton
 import Quickshell

 Singleton {
-    property var screens: new Map()
-    property var bars: new Map()
+	property var bars: new Map()
+	property var screens: new Map()

-    function load(screen: ShellScreen, visibilities: var): void {
-        screens.set(Hypr.monitorFor(screen), visibilities);
-    }
+	function getForActive(): PersistentProperties {
+		return screens.get(Hypr.focusedMonitor);
+	}

-    function getForActive(): PersistentProperties {
-        return screens.get(Hypr.focusedMonitor);
-    }
+	function load(screen: ShellScreen, visibilities: var): void {
+		screens.set(Hypr.monitorFor(screen), visibilities);
+	}
 }
@@ -5,22 +5,25 @@ import Quickshell.Io
 import qs.Paths

 Singleton {
-    id: root
+	id: root

-    property alias currentWallpaperPath: adapter.currentWallpaperPath
+	property alias currentWallpaperPath: adapter.currentWallpaperPath
 	property alias lockscreenBg: adapter.lockscreenBg

-    FileView {
-        id: fileView
-        path: `${Paths.state}/wallpaper_path.json`
+	FileView {
+		id: fileView

-        watchChanges: true
-        onFileChanged: reload()
-        onAdapterUpdated: writeAdapter()
-        JsonAdapter {
-            id: adapter
-            property string currentWallpaperPath: ""
+		path: `${Paths.state}/wallpaper_path.json`
+		watchChanges: true
+
+		onAdapterUpdated: writeAdapter()
+		onFileChanged: reload()
+
+		JsonAdapter {
+			id: adapter
+
+			property string currentWallpaperPath: ""
 			property string lockscreenBg: `${Paths.state}/lockscreen_bg.png`
-        }
-    }
+		}
+	}
 }
@@ -9,54 +9,54 @@ import qs.Helpers
 import qs.Paths

 Searcher {
-    id: root
+	id: root

-    property bool showPreview: false
-    readonly property string current: showPreview ? previewPath : actualCurrent
-    property string previewPath
-    property string actualCurrent: WallpaperPath.currentWallpaperPath
+	property string actualCurrent: WallpaperPath.currentWallpaperPath
+	readonly property string current: showPreview ? previewPath : actualCurrent
+	property string previewPath
+	property bool showPreview: false

-    function setWallpaper(path: string): void {
-        actualCurrent = path;
-        WallpaperPath.currentWallpaperPath = path;
-		if ( Config.general.color.wallust )
+	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)
 			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 )
+	function stopPreview(): void {
+		showPreview = false;
+		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
-        })
+	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
+	FileSystemModel {
+		id: wallpapers

-        recursive: true
-        path: Config.general.wallpaperPath
-        filter: FileSystemModel.Images
-    }
+		filter: FileSystemModel.Images
+		path: Config.general.wallpaperPath
+		recursive: true
+	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zacharias-Brohn	eabff9b18f	esc handling for resources	2026-02-28 18:18:52 +01:00
Zacharias-Brohn	e71a15f2e2	WlrLayershell.namespace fix	2026-02-28 14:03:51 +01:00
Zacharias-Brohn	b28eec5930	resource popout	2026-02-28 13:57:29 +01:00
Zacharias-Brohn	65adecfa21	ddcutil-service usage	2026-02-28 00:23:29 +01:00
Zacharias-Brohn	178375d861	ddcutil-service usage	2026-02-27 14:46:09 +01:00
Zacharias-Brohn	afb736102d	cava + nix	2026-02-26 16:27:05 +01:00
Zacharias-Brohn	09a93d9420	cava test	2026-02-26 14:55:13 +01:00
Zacharias-Brohn	74ee1b48f9	cava test	2026-02-26 14:52:24 +01:00
Zacharias-Brohn	dd02b2636e	cava test	2026-02-26 14:47:46 +01:00
Zacharias-Brohn	f138bf7bdc	cava test	2026-02-26 14:44:31 +01:00
Zacharias-Brohn	e4e3cab22d	cava test	2026-02-26 14:33:49 +01:00
Zacharias-Brohn	0e67c4d6cb	cava test	2026-02-26 14:26:20 +01:00
Zacharias-Brohn	116dca6440	oops lol	2026-02-25 22:19:56 +01:00
Zacharias-Brohn	6d953661b3	oops lol	2026-02-25 22:18:26 +01:00
Zacharias-Brohn	5f875915f4	update	2026-02-25 22:12:29 +01:00
Zacharias-Brohn	ed9e0d1c85	updates module + remove pixelSize usage	2026-02-25 18:13:09 +01:00
Zacharias-Brohn	11da456048	formatter	2026-02-25 17:29:14 +01:00
Zacharias-Brohn	15a112eaf7	ideas	2026-02-25 17:28:09 +01:00
Zacharias-Brohn	eafb176d6e	notification cooldown	2026-02-25 17:08:04 +01:00
Zacharias-Brohn	419214f4bd	oops lol	2026-02-25 14:35:23 +01:00
Zacharias-Brohn	bd246247ac	.qmlformat.ini	2026-02-25 14:29:54 +01:00
Zacharias-Brohn	c3af6575e7	lmao	2026-02-25 14:20:11 +01:00
Zacharias-Brohn	ca04c7d2f1	horizontal media widget	2026-02-25 14:19:27 +01:00
Zacharias-Brohn	d56a0260fb	formatter	2026-02-24 23:20:11 +01:00
Zacharias-Brohn	40cd984b6d	fix the switch	2026-02-23 23:24:11 +01:00
inorishio	412119aa89	plans	2026-02-23 22:48:01 +01:00
Zacharias-Brohn	f645c90dbd	category highlight	2026-02-23 22:37:40 +01:00
Zacharias-Brohn	22015bf61d	custom switch	2026-02-23 21:38:45 +01:00
Zach	fa63746dfd	Merge pull request #13 from Zacharias-Brohn/settingsWindow Settings window	2026-02-23 19:35:57 +01:00
inorishio	14b6af90f9	stupid idea's from daivin	2026-02-23 18:56:07 +01:00
Zacharias-Brohn	0ff4ffc869	bluetooth toggle	2026-02-23 18:50:18 +01:00
Zach	83db3a39cb	Merge pull request #12 from Zacharias-Brohn/organize Organize	2026-02-23 18:23:28 +01:00
inorishio	3893213637	Merge branch 'settingsWindow' into organize Merge.	2026-02-23 18:22:04 +01:00
Zach	f8eb115c34	Merge pull request #11 from Zacharias-Brohn/main merge main	2026-02-23 18:16:25 +01:00
inorishio	728b78a69e	settings?	2026-02-23 18:15:18 +01:00
inorishio	944ea84b5a	Start of settings window	2026-02-23 16:52:05 +01:00
Zacharias-Brohn	dee783df77	cmake oopsie	2026-02-23 16:38:38 +01:00
Zach	427ee50213	Merge pull request #10 from Zacharias-Brohn/main oops merge	2026-02-23 16:24:00 +01:00
Zacharias-Brohn	cdefe3706f	organize files	2026-02-23 16:22:28 +01:00