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

ideas
adjusted README.md to include zshell-cli as an input to environment.systemPacakges
2026-02-25 19:14:58 +01:00 · 2026-02-25 17:30:25 +01:00 · 2026-02-22 23:03:36 +01:00 · 2026-02-22 22:56:50 +01:00 · 2026-02-22 21:49:51 +01:00 · 2026-02-22 21:43:51 +01:00
172 changed files with 10540 additions and 3145 deletions
@@ -5,3 +5,8 @@
 build/
 compile_commands.json
 testpython
+pkg/
+*.tar.*
+uv.lock
+.qtcreator/
+dist/
@@ -1,6 +0,0 @@
-{
-    "$schema": "https://download.qt.io/official_releases/qtcreator/latest/installer_source/jsonschemas/project.json",
-    "files.exclude": [
-        ".qtcreator/project.json.user"
-    ]
-}
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 18.0.2, 2026-02-05T15:11:49. -->
-<qtcreator>
- <data>
-  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{ec8acdf5-a16b-4fc5-819b-8b986eb013bb}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="qlonglong">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoDetect">true</value>
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.LineEndingBehavior">0</value>
-   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
-   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value>
-   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value>
-   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap">
-   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
-    <value type="bool" key="AutoTest.Framework.Boost">true</value>
-    <value type="bool" key="AutoTest.Framework.CTest">false</value>
-    <value type="bool" key="AutoTest.Framework.Catch">true</value>
-    <value type="bool" key="AutoTest.Framework.GTest">true</value>
-    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
-    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
-   </valuemap>
-   <value type="bool" key="AutoTest.ApplyFilter">false</value>
-   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
-   <valuelist type="QVariantList" key="AutoTest.PathFilters"/>
-   <value type="int" key="AutoTest.RunAfterBuild">0</value>
-   <value type="bool" key="AutoTest.UseGlobal">true</value>
-   <valuemap type="QVariantMap" key="ClangTools">
-    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
-    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
-    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
-    <value type="int" key="ClangTools.ParallelJobs">10</value>
-    <value type="bool" key="ClangTools.PreferConfigFile">true</value>
-    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
-    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
-    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
-    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
-   </valuemap>
-   <value type="int" key="RcSync">0</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="DeviceType">Desktop</value>
-   <value type="bool" key="HasPerBcDcs">true</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{6f820de3-bb35-4a43-a7c9-dfd1617a8619}</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/zach/GitProjects/z-bar-qt/build</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">WorkspaceProject.BuildConfiguration</value>
-    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-      <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-     <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
-     <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-    </valuemap>
-    <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-     <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-     <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-     <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
-     <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-     <valuelist type="QVariantList" key="CustomOutputParsers"/>
-     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-     <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
-     <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph dwarf,4096 -F 250</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
-     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
-     <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
-     <value type="QString" key="ProjectExplorer.RunConfiguration.UniqueId"></value>
-     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-     <value type="QString" key="RunConfiguration.WorkingDirectory.default">%{RunConfig:Executable:Path}</value>
-    </valuemap>
-    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
-    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="CustomOutputParsers"/>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
-    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph dwarf,4096 -F 250</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
-    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.UniqueId"></value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">%{RunConfig:Executable:Path}</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="qlonglong">1</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">22</value>
- </data>
-</qtcreator>
@@ -2,11 +2,11 @@ pragma ComponentBehavior: Bound

 import QtQuick
 import QtQuick.Effects
-import QtQuick.Layouts
 import Quickshell
-import Quickshell.Io
 import Quickshell.Wayland
 import Quickshell.Hyprland
+import qs.Daemons
+import qs.Components
 import qs.Modules
 import qs.Modules.Bar
 import qs.Config
@@ -27,12 +27,24 @@ Variants {

 			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
@@ -50,17 +62,17 @@ Variants {
            }

            mask: Region {
+				id: region
                x: 0
-                y: 34
+                y: Config.barConfig.autoHide && !visibilities.bar ? 4 : 34

 				property list<Region> nullRegions: []
-				property bool hcurrent: ( panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu") ) || visibilities.sidebar || visibilities.dashboard

-                width: hcurrent ? 0 : bar.width
-                height: hcurrent ? 0 : bar.screen.height - backgroundRect.implicitHeight
+                width: bar.width
+                height: bar.screen.height - backgroundRect.implicitHeight
                intersection: Intersection.Xor

-                regions: hcurrent ? nullRegions : popoutRegions.instances
+                regions: popoutRegions.instances
            }

            Variants {
@@ -78,12 +90,17 @@ Variants {
                }
            }

-			GlobalShortcut {
-				name: "toggle-nc"
-				appid: "zshell-nc"
+			HyprlandFocusGrab {
+				id: focusGrab

-				onPressed: {
-					visibilities.sidebar = !visibilities.sidebar
+				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;
 				}
 			}

@@ -92,13 +109,24 @@ Variants {

 				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: Config.transparency.enabled ? DynamicColors.transparency.base : 1
+                opacity: Appearance.transparency.enabled ? DynamicColors.transparency.base : 1
                layer.enabled: true
                layer.effect: MultiEffect {
                    shadowEnabled: true
@@ -108,48 +136,24 @@ Variants {

                Border {
                    bar: backgroundRect
+					visibilities: visibilities
                }

                Backgrounds {
+					visibilities: visibilities
                    panels: panels
                    bar: backgroundRect
                }
            }

-            MouseArea {
+            Interactions {
+				id: mouseArea
+				screen: scope.modelData
+				popouts: panels.popouts
+				visibilities: visibilities
+				panels: panels
+				bar: barLoader
                anchors.fill: parent
-                hoverEnabled: true
-
-                onContainsMouseChanged: {
-                    if ( !containsMouse ) {
-                        panels.popouts.hasCurrent = false;
-                    }
-                }
-
-                onPositionChanged: event => {
-                    if ( mouseY < backgroundRect.implicitHeight ) {
-                        barLoader.checkPopout(mouseX);
-                    }
-                }
-
-				onPressed: event => {
-					var traywithinX = mouseX >= panels.popouts.x + 8 && mouseX < panels.popouts.x + panels.popouts.implicitWidth;
-					var traywithinY = mouseY >= panels.popouts.y + exclusionZone.implicitHeight && mouseY < panels.popouts.y + exclusionZone.implicitHeight + panels.popouts.implicitHeight;
-					var sidebarwithinX = mouseX >= bar.width - panels.sidebar.width
-					var dashboardWithinX = mouseX <= panels.dashboard.width + panels.dashboard.x && mouseX >= panels.dashboard.x
-					var dashboardWithinY = mouseY <= backgroundRect.implicitHeight + panels.dashboard.implicitHeight
-
-					if ( panels.popouts.hasCurrent ) {
-						if ( traywithinX && traywithinY ) {
-						} else {
-							panels.popouts.hasCurrent = false;
-						}
-					} else if ( visibilities.sidebar && !sidebarwithinX ) {
-						visibilities.sidebar = false;
-					} else if ( visibilities.dashboard && ( !dashboardWithinX || !dashboardWithinY )) {
-						visibilities.dashboard = false;
-					}
-				}

                Panels {
                    id: panels
@@ -158,20 +162,26 @@ Variants {
 					visibilities: visibilities
                }

-                Rectangle {
+                CustomRect {
                    id: backgroundRect
                    property Wrapper popouts: panels.popouts
+					anchors.top: parent.top
                    anchors.left: parent.left
                    anchors.right: parent.right
-                    anchors.top: parent.top
                    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
@@ -7,10 +7,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(ENABLE_MODULES "plugin" CACHE STRING "Modules to build/install")
+set(ENABLE_MODULES "plugin;shell" CACHE STRING "Modules to build/install")

 set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
 set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
+set(INSTALL_QSCONFDIR "etc/xdg/quickshell/zshell" CACHE STRING "Quickshell config install dir")

 add_compile_options(
    -Wall -Wextra -Wpedantic -Wshadow -Wconversion
@@ -0,0 +1,108 @@
+import qs.Helpers
+import qs.Config
+import qs.Modules
+import ZShell.Internal
+import QtQuick
+import QtQuick.Templates
+
+BusyIndicator {
+    id: root
+
+    enum AnimType {
+        Advance = 0,
+        Retreat
+    }
+
+    enum AnimState {
+        Stopped,
+        Running,
+        Completing
+    }
+
+    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
+
+    property alias type: manager.indeterminateAnimationType
+    readonly property alias progress: manager.progress
+
+    property real internalStrokeWidth: strokeWidth
+    property int animState
+
+    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;
+        }
+    }
+
+    states: State {
+        name: "stopped"
+        when: !root.running
+
+        PropertyChanges {
+            root.opacity: 0
+            root.internalStrokeWidth: root.strokeWidth / 3
+        }
+    }
+
+    transitions: Transition {
+        Anim {
+            properties: "opacity,internalStrokeWidth"
+            duration: manager.completeEndDuration * Appearance.anim.durations.scale
+        }
+    }
+
+    contentItem: CircularProgress {
+        anchors.fill: parent
+        strokeWidth: root.internalStrokeWidth
+        fgColour: root.fgColour
+        bgColour: root.bgColour
+        padding: root.padding
+        rotation: manager.rotation
+        startAngle: manager.startFraction * 360
+        value: manager.endFraction - manager.startFraction
+    }
+
+    CircularIndicatorManager {
+        id: manager
+    }
+
+    NumberAnimation {
+        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;
+        }
+    }
+}
@@ -0,0 +1,69 @@
+import QtQuick
+import QtQuick.Shapes
+import qs.Helpers
+import qs.Config
+import qs.Modules
+
+Shape {
+    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 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)
+
+    preferredRendererType: Shape.CurveRenderer
+    asynchronous: true
+
+    ShapePath {
+        fillColor: "transparent"
+        strokeColor: root.bgColour
+        strokeWidth: root.strokeWidth
+        capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+
+        PathAngleArc {
+            startAngle: root.startAngle + 360 * root.vValue + root.gapAngle
+            sweepAngle: Math.max(-root.gapAngle, 360 * (1 - root.vValue) - root.gapAngle * 2)
+            radiusX: root.arcRadius
+            radiusY: root.arcRadius
+            centerX: root.size / 2
+            centerY: root.size / 2
+        }
+
+        Behavior on strokeColor {
+            CAnim {
+                duration: Appearance.anim.durations.large
+            }
+        }
+    }
+
+    ShapePath {
+        fillColor: "transparent"
+        strokeColor: root.fgColour
+        strokeWidth: root.strokeWidth
+        capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+
+        PathAngleArc {
+            startAngle: root.startAngle
+            sweepAngle: 360 * root.vValue
+            radiusX: root.arcRadius
+            radiusY: root.arcRadius
+            centerX: root.size / 2
+            centerY: root.size / 2
+        }
+
+        Behavior on strokeColor {
+            CAnim {
+                duration: Appearance.anim.durations.large
+            }
+        }
+    }
+}
@@ -7,6 +7,8 @@ Slider {
    id: root

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

    background: Item {
        CustomRect {
@@ -16,9 +18,9 @@ Slider {
            anchors.topMargin: root.implicitHeight / 3
            anchors.bottomMargin: root.implicitHeight / 3

-            implicitWidth: root.handle.x - root.implicitHeight / 6
+            implicitWidth: root.handle.x - root.implicitHeight

-            color: DynamicColors.palette.m3primaryContainer
+            color: root.nonPeakColor
            radius: 1000
            topRightRadius: root.implicitHeight / 15
            bottomRightRadius: root.implicitHeight / 15
@@ -33,7 +35,7 @@ Slider {
 				topRightRadius: root.implicitHeight / 15
 				bottomRightRadius: root.implicitHeight / 15

-				color: DynamicColors.palette.m3primary
+				color: root.peakColor

 				Behavior on implicitWidth {
 					Anim { duration: 50 }
@@ -48,7 +50,12 @@ Slider {
            anchors.topMargin: root.implicitHeight / 3
            anchors.bottomMargin: root.implicitHeight / 3

-            implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6
+            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
@@ -11,30 +11,26 @@ Slider {
            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 / 6
+            implicitWidth: root.handle.x - root.implicitHeight / 2

            color: DynamicColors.palette.m3primary
            radius: 1000
-            topRightRadius: root.implicitHeight / 15
-            bottomRightRadius: root.implicitHeight / 15
+            topRightRadius: root.implicitHeight / 6
+            bottomRightRadius: root.implicitHeight / 6
        }

        CustomRect {
            anchors.top: parent.top
            anchors.bottom: parent.bottom
            anchors.right: parent.right
-            anchors.topMargin: root.implicitHeight / 3
-            anchors.bottomMargin: root.implicitHeight / 3

-            implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6
+            implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2

            color: DynamicColors.tPalette.m3surfaceContainer
            radius: 1000
-            topLeftRadius: root.implicitHeight / 15
-            bottomLeftRadius: root.implicitHeight / 15
+            topLeftRadius: root.implicitHeight / 6
+            bottomLeftRadius: root.implicitHeight / 6
        }
    }

@@ -16,7 +16,7 @@ Text {
    renderType: Text.NativeRendering
    textFormat: Text.PlainText
    color: DynamicColors.palette.m3onSurface
-    font.family: Config.baseFont
+    font.family: Appearance.font.family.sans
    font.pointSize: 12

    Behavior on color {
@@ -0,0 +1,76 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import qs.Helpers
+import qs.Config
+import qs.Modules
+
+TextField {
+    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
+
+    cursorDelegate: CustomRect {
+        id: cursor
+
+        property bool disableBlink
+
+        implicitWidth: 2
+        color: DynamicColors.palette.m3primary
+        radius: Appearance.rounding.normal
+
+        Connections {
+            target: root
+
+            function onCursorPositionChanged(): void {
+                if (root.activeFocus && root.cursorVisible) {
+                    cursor.opacity = 1;
+                    cursor.disableBlink = true;
+                    enableBlink.restart();
+                }
+            }
+        }
+
+        Timer {
+            id: enableBlink
+
+            interval: 100
+            onTriggered: cursor.disableBlink = false
+        }
+
+        Timer {
+            running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
+            repeat: true
+            triggeredOnStart: true
+            interval: 500
+            onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
+        }
+
+        Binding {
+            when: !root.activeFocus || !root.cursorVisible
+            cursor.opacity: 0
+        }
+
+        Behavior on opacity {
+            Anim {
+                duration: Appearance.anim.durations.small
+            }
+        }
+    }
+
+    Behavior on color {
+        CAnim {}
+    }
+
+    Behavior on placeholderTextColor {
+        CAnim {}
+    }
+}
@@ -0,0 +1,146 @@
+import QtQuick
+import QtQuick.Templates
+import qs.Helpers
+import qs.Config
+import qs.Modules
+
+Slider {
+    id: root
+
+    required property string icon
+    property real oldValue
+    property bool initialized
+	property color color: DynamicColors.palette.m3secondary
+
+    orientation: Qt.Vertical
+
+    background: CustomRect {
+        color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
+        radius: Appearance.rounding.full
+
+        CustomRect {
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            y: root.handle.y
+            implicitHeight: parent.height - y
+
+            color: root.color
+            radius: parent.radius
+        }
+    }
+
+    handle: Item {
+        id: handle
+
+        property alias moving: icon.moving
+
+        y: root.visualPosition * (root.availableHeight - height)
+        implicitWidth: root.width
+        implicitHeight: root.width
+
+        Elevation {
+            anchors.fill: parent
+            radius: rect.radius
+            level: handleInteraction.containsMouse ? 2 : 1
+        }
+
+        CustomRect {
+            id: rect
+
+            anchors.fill: parent
+
+            color: DynamicColors.palette.m3inverseSurface
+            radius: Appearance.rounding.full
+
+            MouseArea {
+                id: handleInteraction
+
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                acceptedButtons: Qt.NoButton
+            }
+
+            MaterialIcon {
+                id: icon
+
+                property bool moving
+
+                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;
+                }
+
+                text: root.icon
+                color: DynamicColors.palette.m3inverseOnSurface
+                anchors.centerIn: parent
+
+                onMovingChanged: anim.restart()
+
+                Binding {
+                    id: binding
+
+                    target: icon
+                    property: "text"
+                    value: Math.round(root.value * 100)
+                    when: false
+                }
+
+                SequentialAnimation {
+                    id: anim
+
+                    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
+                    }
+                }
+            }
+        }
+    }
+
+    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();
+    }
+
+    Timer {
+        id: stateChangeDelay
+
+        interval: 500
+        onTriggered: {
+            if (!root.pressed)
+                handle.moving = false;
+        }
+    }
+
+    Behavior on value {
+        Anim {
+            duration: Appearance.anim.durations.large
+        }
+    }
+}
@@ -0,0 +1,135 @@
+import ZShell
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+CustomRect {
+    id: root
+
+    required property Toast modelData
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+    implicitHeight: layout.implicitHeight + Appearance.padding.smaller * 2
+
+    radius: Appearance.rounding.normal
+    color: {
+        if (root.modelData.type === Toast.Success)
+            return DynamicColors.palette.m3successContainer;
+        if (root.modelData.type === Toast.Warning)
+            return DynamicColors.palette.m3secondary;
+        if (root.modelData.type === Toast.Error)
+            return DynamicColors.palette.m3errorContainer;
+        return DynamicColors.palette.m3surface;
+    }
+
+    border.width: 1
+    border.color: {
+        let colour = DynamicColors.palette.m3outlineVariant;
+        if (root.modelData.type === Toast.Success)
+            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
+        radius: parent.radius
+        opacity: parent.opacity
+        z: -1
+        level: 3
+    }
+
+    RowLayout {
+        id: layout
+
+        anchors.fill: parent
+        anchors.margins: Appearance.padding.smaller
+        anchors.leftMargin: Appearance.padding.normal
+        anchors.rightMargin: Appearance.padding.normal
+        spacing: Appearance.spacing.normal
+
+        CustomRect {
+            radius: Appearance.rounding.normal
+            color: {
+                if (root.modelData.type === Toast.Success)
+                    return DynamicColors.palette.m3success;
+                if (root.modelData.type === Toast.Warning)
+                    return DynamicColors.palette.m3secondaryContainer;
+                if (root.modelData.type === Toast.Error)
+                    return DynamicColors.palette.m3error;
+                return DynamicColors.palette.m3surfaceContainerHigh;
+            }
+
+            implicitWidth: implicitHeight
+            implicitHeight: icon.implicitHeight + Appearance.padding.smaller * 2
+
+            MaterialIcon {
+                id: icon
+
+                anchors.centerIn: parent
+                text: root.modelData.icon
+                color: {
+                    if (root.modelData.type === Toast.Success)
+                        return DynamicColors.palette.m3onSuccess;
+                    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)
+            }
+        }
+
+        ColumnLayout {
+            Layout.fillWidth: true
+            spacing: 0
+
+            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 {}
+    }
+}
@@ -0,0 +1,144 @@
+pragma ComponentBehavior: Bound
+
+import qs.Components
+import qs.Config
+import qs.Modules
+import ZShell
+import Quickshell
+import QtQuick
+
+Item {
+    id: root
+
+    readonly property int spacing: Appearance.spacing.small
+    property bool flag
+
+    implicitWidth: Config.utilities.sizes.toastWidth - Appearance.padding.normal * 2
+    implicitHeight: {
+        let h = -spacing;
+        for (let i = 0; i < repeater.count; i++) {
+            const item = repeater.itemAt(i) as ToastWrapper;
+            if (!item.modelData.closed && !item.previewHidden)
+                h += item.implicitHeight + spacing;
+        }
+        return h;
+    }
+
+    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()
+        }
+
+        ToastWrapper {}
+    }
+
+    component ToastWrapper: MouseArea {
+        id: toast
+
+        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();
+        }
+
+        opacity: modelData.closed || previewHidden ? 0 : 1
+        scale: modelData.closed || previewHidden ? 0.7 : 1
+
+        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
+        anchors.bottom: parent.bottom
+        implicitHeight: toastInner.implicitHeight
+
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        onClicked: modelData.close()
+
+        Component.onCompleted: modelData.lock(this)
+
+        Anim {
+            id: initAnim
+
+            Component.onCompleted: running = !toast.previewHidden
+
+            target: toast
+            properties: "opacity,scale"
+            from: 0
+            to: 1
+            duration: Appearance.anim.durations.expressiveDefaultSpatial
+            easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+        }
+
+        ParallelAnimation {
+            running: toast.modelData.closed
+            onStarted: toast.anchors.bottomMargin = toast.anchors.bottomMargin
+            onFinished: toast.modelData.unlock(toast)
+
+            Anim {
+                target: toast
+                property: "opacity"
+                to: 0
+            }
+            Anim {
+                target: toast
+                property: "scale"
+                to: 0.7
+            }
+        }
+
+        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
+            }
+        }
+    }
+}
@@ -35,7 +35,7 @@ JsonObject {
    }

    component FontFamily: JsonObject {
-        property string sans: "Rubik"
+        property string sans: "Segoe UI Variable Text"
        property string mono: "CaskaydiaCove NF"
        property string material: "Material Symbols Rounded"
        property string clock: "Rubik"
@@ -1,5 +1,4 @@
 import Quickshell.Io
-import qs.Modules
 import qs.Config

 JsonObject {
@@ -1,6 +1,8 @@
 import Quickshell.Io

 JsonObject {
+	property bool autoHide: false
+	property int rounding: 8
 	property Popouts popouts: Popouts {}

 	property list<var> entries: [
@@ -1,10 +1,5 @@
 import Quickshell.Io

 JsonObject {
-    property BgColors backgrounds: BgColors {}
 	property string schemeType: "vibrant"
-
-    component BgColors: JsonObject {
-        property string hover: "#15ffffff"
-    }
 }
@@ -2,28 +2,18 @@ pragma Singleton

 import Quickshell
 import Quickshell.Io
-import qs.Modules
+import ZShell
+import QtQuick
+import qs.Modules as Modules
+import qs.Helpers
+import qs.Paths

 Singleton {
+	id: root

-    property alias appCount: adapter.appCount
-    property alias baseBgColor: adapter.baseBgColor
-    property alias baseBorderColor: adapter.baseBorderColor
-    property alias accentColor: adapter.accentColor
-    property alias wallpaperPath: adapter.wallpaperPath
-    property alias maxWallpapers: adapter.maxWallpapers
-    property alias wallust: adapter.wallust
-    property alias workspaceWidget: adapter.workspaceWidget
-    property alias colors: adapter.colors
-    property alias gpuType: adapter.gpuType
    property alias background: adapter.background
-    property alias useDynamicColors: adapter.useDynamicColors
    property alias barConfig: adapter.barConfig
-    property alias transparency: adapter.transparency
-    property alias baseFont: adapter.baseFont
-    property alias animScale: adapter.animScale
    property alias lock: adapter.lock
-	property alias idle: adapter.idle
 	property alias overview: adapter.overview
 	property alias services: adapter.services
 	property alias notifs: adapter.notifs
@@ -32,38 +22,348 @@ Singleton {
 	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();
+		recentlySaved = true;
+		recentSaveCooldown.restart();
+	}
+
+	property bool recentlySaved: false
+
+	ElapsedTimer {
+		id: timer
+	}
+
+	Timer {
+		id: saveTimer
+
+		interval: 500
+		onTriggered: {
+			timer.restart();
+			try {
+				let config = {};
+				try {
+					config = JSON.parse(fileView.text());
+				} catch (e) {
+					config = {};
+				}
+
+				config = root.serializeConfig();
+
+				fileView.setText(JSON.stringify(config, null, 4));
+			} catch (e) {
+				Toaster.toast(qsTr("Failed to serialize config"), e.message, "settings_alert", Toast.Error);
+			}
+		}
+	}
+
+	Timer {
+		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()
+		}
+	}
+
+	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 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: root
-        property var configRoot: Quickshell.env("HOME")
+        id: fileView

-        path: configRoot + "/.config/z-bar/config.json"
+        path: `${Paths.config}/config.json`

        watchChanges: true
-        onFileChanged: reload()

-        onAdapterChanged: writeAdapter()
+        onFileChanged: {
+			if ( !root.recentlySaved ) {
+				timer.restart();
+				reload();
+			} else {
+				reload();
+			}
+		}
+
+		onLoaded: {
+			ModeScheduler.checkStartup();
+			try {
+				JSON.parse(text());
+				const elapsed = timer.elapsedMs();
+
+				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 ) {
+					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 int appCount: 20
-            property string wallpaperPath: Quickshell.env("HOME") + "/Pictures/Wallpapers"
-            property string baseBgColor: "#801a1a1a"
-            property string baseBorderColor: "#444444"
-            property AccentColor accentColor: AccentColor {}
-            property int maxWallpapers: 7
-            property bool wallust: false
-            property WorkspaceWidget workspaceWidget: WorkspaceWidget {}
-            property Colors colors: Colors {}
-            property string gpuType: ""
            property BackgroundConfig background: BackgroundConfig {}
-            property bool useDynamicColors: false
            property BarConfig barConfig: BarConfig {}
-            property Transparency transparency: Transparency {}
-            property string baseFont: "Segoe UI Variable Text"
-            property real animScale: 1.0
            property LockConf lock: LockConf {}
-			property IdleTimeout idle: IdleTimeout {}
 			property Overview overview: Overview {}
 			property Services services: Services {}
 			property NotifConfig notifs: NotifConfig {}
@@ -72,6 +372,9 @@ Singleton {
 			property General general: General {}
 			property DashboardConfig dashboard: DashboardConfig {}
 			property AppearanceConf appearance: AppearanceConf {}
+			property Osd osd: Osd {}
+			property Launcher launcher: Launcher {}
+			property Colors colors: Colors {}
        }
    }
 }
@@ -2,7 +2,6 @@ import Quickshell.Io

 JsonObject {
    property bool enabled: true
-    property bool showOnHover: true
    property int mediaUpdateInterval: 500
    property int dragThreshold: 50
    property Sizes sizes: Sizes {}
@@ -61,7 +61,7 @@ Singleton {

        if (!isPreview) {
            root.scheme = scheme.name;
-            flavour = scheme.flavour;
+            flavour = scheme.flavor;
            currentLight = scheme.mode === "light";
        } else {
            previewLight = scheme.mode === "light";
@@ -88,9 +88,9 @@ Singleton {
    }

    component Transparency: QtObject {
-        readonly property bool enabled: Config.transparency.enabled
-        readonly property real base: Config.transparency.base - (root.light ? 0.1 : 0)
-        readonly property real layers: Config.transparency.layers
+        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 {
@@ -214,4 +214,65 @@ Singleton {
        property color m3onTertiaryFixed: "#2f1500"
        property color m3onTertiaryFixedVariant: "#623f21"
    }
+
+	component M3MaccchiatoPalette: QtObject {
+		property color m3primary_paletteKeyColor: "#6a73ac"
+		property color m3secondary_paletteKeyColor: "#72758e"
+		property color m3tertiary_paletteKeyColor: "#9b6592"
+		property color m3neutral_paletteKeyColor: "#77767b"
+		property color m3neutral_variant_paletteKeyColor: "#767680"
+		property color m3background: "#131317"
+		property color m3onBackground: "#e4e1e7"
+		property color m3surface: "#131317"
+		property color m3surfaceDim: "#131317"
+		property color m3surfaceBright: "#39393d"
+		property color m3surfaceContainerLowest: "#0e0e12"
+		property color m3surfaceContainerLow: "#1b1b1f"
+		property color m3surfaceContainer: "#1f1f23"
+		property color m3surfaceContainerHigh: "#2a2a2e"
+		property color m3surfaceContainerHighest: "#353438"
+		property color m3onSurface: "#e4e1e7"
+		property color m3surfaceVariant: "#46464f"
+		property color m3onSurfaceVariant: "#c6c5d1"
+		property color m3inverseSurface: "#e4e1e7"
+		property color m3inverseOnSurface: "#303034"
+		property color m3outline: "#90909a"
+		property color m3outlineVariant: "#46464f"
+		property color m3shadow: "#000000"
+		property color m3scrim: "#000000"
+		property color m3surfaceTint: "#bac3ff"
+		property color m3primary: "#bac3ff"
+		property color m3onPrimary: "#232c60"
+		property color m3primaryContainer: "#6a73ac"
+		property color m3onPrimaryContainer: "#ffffff"
+		property color m3inversePrimary: "#525b92"
+		property color m3secondary: "#c3c5e0"
+		property color m3onSecondary: "#2c2f44"
+		property color m3secondaryContainer: "#42455c"
+		property color m3onSecondaryContainer: "#b1b3ce"
+		property color m3tertiary: "#f1b3e5"
+		property color m3onTertiary: "#4c1f48"
+		property color m3tertiaryContainer: "#b77ead"
+		property color m3onTertiaryContainer: "#000000"
+		property color m3error: "#ffb4ab"
+		property color m3onError: "#690005"
+		property color m3errorContainer: "#93000a"
+		property color m3onErrorContainer: "#ffdad6"
+		property color m3primaryFixed: "#dee0ff"
+		property color m3primaryFixedDim: "#bac3ff"
+		property color m3onPrimaryFixed: "#0b154b"
+		property color m3onPrimaryFixedVariant: "#3a4378"
+		property color m3secondaryFixed: "#dfe1fd"
+		property color m3secondaryFixedDim: "#c3c5e0"
+		property color m3onSecondaryFixed: "#171a2e"
+		property color m3onSecondaryFixedVariant: "#42455c"
+		property color m3tertiaryFixed: "#ffd7f4"
+		property color m3tertiaryFixedDim: "#f1b3e5"
+		property color m3onTertiaryFixed: "#340831"
+		property color m3onTertiaryFixedVariant: "#66365f"
+		property color m3success: "#B5CCBA"
+		property color m3onSuccess: "#213528"
+		property color m3successContainer: "#374B3E"
+		property color m3onSuccessContainer: "#D1E9D6"
+	}
 }
@@ -1,5 +1,40 @@
 import Quickshell.Io
+import Quickshell

 JsonObject {
 	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> terminal: ["kitty"]
+        property list<string> audio: ["pavucontrol"]
+        property list<string> playback: ["mpv"]
+        property list<string> explorer: ["dolphin"]
+    }
+
+	component Idle: JsonObject {
+		property list<var> timeouts: [
+			{
+				timeout: 180,
+				idleAction: "lock"
+			},
+			{
+				timeout: 300,
+				idleAction: "dpms off",
+				activeAction: "dpms on"
+			}
+		]
+	}
 }
@@ -0,0 +1,84 @@
+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",
+			icon: "calculate",
+			description: "Do simple math equations (powered by Qalc)",
+			command: ["autocomplete", "calc"],
+			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
+        },
+	]
+}
@@ -1,6 +1,15 @@
 import Quickshell.Io

 JsonObject {
-	property bool fixLockScreen: false
-	property bool useWallpaper: true
+    property bool recolorLogo: false
+    property bool enableFprint: true
+    property int maxFprintTries: 3
+    property Sizes sizes: Sizes {}
+	property int blurAmount: 40
+
+    component Sizes: JsonObject {
+        property real heightMult: 0.7
+        property real ratio: 16 / 9
+        property int centerWidth: 600
+    }
 }
@@ -4,7 +4,7 @@ import Quickshell
 Singleton {
    id: root

-    property real scale: Config.animScale
+    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]
@@ -0,0 +1,15 @@
+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 {}
+
+    component Sizes: JsonObject {
+        property int sliderWidth: 30
+        property int sliderHeight: 150
+    }
+}
@@ -2,13 +2,18 @@ import Quickshell.Io
 import QtQuick

 JsonObject {
-	property string weatherLocation: ""
-	property real brightnessIncrement: 0.1
-	property string defaultPlayer: "Spotify"
-	property list<var> playerAliases: [
-		{
-			"from": "com.github.th_ch.youtube_music",
-			"to": "YT Music"
-		}
-	]
+    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"
+        }
+    ]
 }
@@ -1,6 +1,8 @@
 pragma Singleton

 import qs.Config
+import ZShell.Services
+import ZShell
 import Quickshell
 import Quickshell.Services.Pipewire
 import QtQuick
@@ -17,15 +19,20 @@ Singleton {
                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: []
+        sinks: [],
+        streams: []
    })

    readonly property list<PwNode> sinks: nodes.sinks
    readonly property list<PwNode> sources: nodes.sources
+    readonly property list<PwNode> streams: nodes.streams

    readonly property PwNode sink: Pipewire.defaultAudioSink
    readonly property PwNode source: Pipewire.defaultAudioSource
@@ -39,31 +46,31 @@ Singleton {
    function setVolume(newVolume: real): void {
        if (sink?.ready && sink?.audio) {
            sink.audio.muted = false;
-            sink.audio.volume = Math.max(0, Math.min(100, newVolume));
+            sink.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
        }
    }

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

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

    function setSourceVolume(newVolume: real): void {
        if (source?.ready && source?.audio) {
            source.audio.muted = false;
-            source.audio.volume = Math.max(0, Math.min(100, newVolume));
+            source.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
        }
    }

    function incrementSourceVolume(amount: real): void {
-        setSourceVolume(sourceVolume + (amount || 5));
+        setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
    }

    function decrementSourceVolume(amount: real): void {
-        setSourceVolume(sourceVolume - (amount || 5));
+        setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
    }

    function setAudioSink(newSink: PwNode): void {
@@ -74,12 +81,33 @@ Singleton {
        Pipewire.preferredDefaultAudioSource = newSource;
    }

-	function setAppAudioVolume(appStream: PwNode, newVolume: real): void {
-		if ( appStream?.ready && appStream?.audio ) {
-			appStream.audio.muted = false;
-			appStream.audio.volume = Math.max(0, Math.min(100, 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));
+        }
+    }
+
+    function setStreamMuted(stream: PwNode, muted: bool): void {
+        if (stream?.ready && stream?.audio) {
+            stream.audio.muted = muted;
+        }
+    }
+
+    function getStreamVolume(stream: PwNode): real {
+        return stream?.audio?.volume ?? 0;
+    }
+
+    function getStreamMuted(stream: PwNode): bool {
+        return !!stream?.audio?.muted;
+    }
+
+    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");
+    }

    onSinkChanged: {
        if (!sink?.ready)
@@ -87,6 +115,9 @@ Singleton {

        const newSinkName = sink.description || sink.name || qsTr("Unknown Device");

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

@@ -96,6 +127,9 @@ Singleton {

        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;
    }

@@ -105,112 +139,6 @@ Singleton {
    }

    PwObjectTracker {
-        objects: [...root.sinks, ...root.sources]
+        objects: [...root.sinks, ...root.sources, ...root.streams]
    }
-
-	PwNodeLinkTracker {
-		id: sinkLinkTracker
-		node: root.sink
-	}
-
-	PwObjectTracker {
-		objects: root.appStreams
-	}
-
-	readonly property var appStreams: {
-		var defaultSink = root.sink;
-		var defaultSinkId = defaultSink.id;
-		var connectedStreamIds = {};
-		var connectedStreams = [];
-
-		if ( !sinkLinkTracker.linkGroups ) {
-			return [];
-		}
-
-		var linkGroupsCount = 0;
-		if (sinkLinkTracker.linkGroups.length !== undefined) {
-			linkGroupsCount = sinkLinkTracker.linkGroups.length;
-		} else if (sinkLinkTracker.linkGroups.count !== undefined) {
-			linkGroupsCount = sinkLinkTracker.linkGroups.count;
-		} else {
-			return [];
-		}
-
-		if ( linkGroupsCount === 0 ) {
-			return [];
-		}
-
-		var intermediateNodeIds = {};
-		var nodesToCheck = [];
-
-		for (var i = 0; i < linkGroupsCount; i++) {
-			var linkGroup;
-			if (sinkLinkTracker.linkGroups.get) {
-				linkGroup = sinkLinkTracker.linkGroups.get(i);
-			} else {
-				linkGroup = sinkLinkTracker.linkGroups[i];
-			}
-
-			if (!linkGroup || !linkGroup.source) {
-				continue;
-			}
-
-			var sourceNode = linkGroup.source;
-
-			if (sourceNode.isStream && sourceNode.audio) {
-				if (!connectedStreamIds[sourceNode.id]) {
-					connectedStreamIds[sourceNode.id] = true;
-					connectedStreams.push(sourceNode);
-				}
-			} else {
-				intermediateNodeIds[sourceNode.id] = true;
-				nodesToCheck.push(sourceNode);
-			}
-		}
-
-		if (nodesToCheck.length > 0 || connectedStreams.length === 0) {
-			try {
-				var allNodes = [];
-				if (Pipewire.nodes) {
-					if (Pipewire.nodes.count !== undefined) {
-						var nodeCount = Pipewire.nodes.count;
-						for (var n = 0; n < nodeCount; n++) {
-							var node;
-							if (Pipewire.nodes.get) {
-								node = Pipewire.nodes.get(n);
-							} else {
-								node = Pipewire.nodes[n];
-							}
-							if (node)
-								allNodes.push(node);
-						}
-					} else if (Pipewire.nodes.values) {
-						allNodes = Pipewire.nodes.values;
-					}
-				}
-
-				for (var j = 0; j < allNodes.length; j++) {
-					var node = allNodes[j];
-					if (!node || !node.isStream || !node.audio) {
-						continue;
-					}
-
-					var streamId = node.id;
-					if (connectedStreamIds[streamId]) {
-						continue;
-					}
-
-					if (Object.keys(intermediateNodeIds).length > 0) {
-						connectedStreamIds[streamId] = true;
-						connectedStreams.push(node);
-					} else if (connectedStreams.length === 0) {
-						connectedStreamIds[streamId] = true;
-						connectedStreams.push(node);
-					}
-				}
-			} catch (e)
-			{}
-		}
-		return connectedStreams;
-	}
 }
@@ -7,6 +7,7 @@ import Quickshell.Services.Notifications
 import Quickshell.Hyprland
 import QtQuick
 import ZShell
+import qs.Components
 import qs.Modules
 import qs.Helpers
 import qs.Paths
@@ -103,9 +104,8 @@ Singleton {
        }
    }

-    GlobalShortcut {
+    CustomShortcut {
        name: "clearnotifs"
-		appid: "zshell-notif"
        description: "Clear all notifications"
        onPressed: {
            for (const notif of root.list.slice())
@@ -177,7 +177,7 @@ Singleton {
        property list<var> actions

        readonly property Timer timer: Timer {
-			property int totalTime: 5000
+			property int totalTime: Config.notifs.defaultExpireTimeout
 			property int remainingTime: totalTime
 			property bool paused: false

@@ -1,3 +1,4 @@
+import Quickshell
 import QtQuick
 import QtQuick.Shapes
 import qs.Modules as Modules
@@ -5,18 +6,30 @@ import qs.Modules.Notifications as Notifications
 import qs.Modules.Notifications.Sidebar as Sidebar
 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

 Shape {
    id: root

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

    anchors.fill: parent
    // anchors.margins: 8
    anchors.topMargin: 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
+	}
+
    Modules.Background {
        wrapper: root.panels.popouts
        invertBottomRounding: wrapper.x <= 0
@@ -33,6 +46,13 @@ Shape {
 		startY: 0
 	}

+	Launcher.Background {
+		wrapper: root.panels.launcher
+
+		startX: ( root.width - wrapper.width ) / 2 - rounding
+		startY: root.height
+	}
+
 	Dashboard.Background {
 		wrapper: root.panels.dashboard

@@ -0,0 +1,278 @@
+import Quickshell
+import QtQuick
+import qs.Components
+import qs.Config
+import qs.Modules as BarPopouts
+
+CustomMouseArea {
+    id: root
+
+    required property ShellScreen screen
+    required property BarPopouts.Wrapper popouts
+    required property PersistentProperties visibilities
+    required property Panels panels
+    required property Item bar
+
+    property point dragStart
+    property bool dashboardShortcutActive
+    property bool osdShortcutActive
+    property bool utilitiesShortcutActive
+
+    function withinPanelHeight(panel: Item, x: real, y: real): bool {
+        const panelY = panel.y + bar.implicitHeight;
+        return y >= panelY && y <= panelY + panel.height;
+    }
+
+    function withinPanelWidth(panel: Item, x: real, y: real): bool {
+        const panelX = panel.x;
+        return x >= panelX && x <= panelX + panel.width;
+    }
+
+    function inLeftPanel(panel: Item, x: real, y: real): bool {
+        return x < panel.x + panel.width && withinPanelHeight(panel, x, y);
+    }
+
+    function inRightPanel(panel: Item, x: real, y: real): bool {
+        return x > panel.x && withinPanelHeight(panel, x, y);
+    }
+
+    function inTopPanel(panel: Item, x: real, y: real): bool {
+        return y < bar.implicitHeight + panel.height && withinPanelWidth(panel, x, y);
+    }
+
+    function inBottomPanel(panel: Item, x: real, y: real): bool {
+        return y > root.height - panel.height && withinPanelWidth(panel, x, y);
+    }
+
+    function onWheel(event: WheelEvent): void {
+        if (event.x < bar.implicitWidth) {
+            bar.handleWheel(event.y, event.angleDelta);
+        }
+    }
+
+    anchors.fill: parent
+    hoverEnabled: true
+
+	//    onPressed: event => {
+	// 	if ( root.popouts.hasCurrent && !inTopPanel( root.popouts, event.x, event.y )) {
+	// 		root.popouts.hasCurrent = false;
+	// 	} else if (root.visibilities.sidebar && !inRightPanel( panels.sidebar, event.x, event.y )) {
+	// 		root.visibilities.sidebar = false;
+	// 	} else if (root.visibilities.dashboard && !inTopPanel( panels.dashboard, event.x, event.y )) {
+	// 		root.visibilities.dashboard = 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 (Config.barConfig.autoHide && !root.visibilities.sidebar && !root.visibilities.dashboard)
+                root.visibilities.bar = false;
+        }
+    }
+
+    onPositionChanged: event => {
+        if (popouts.isDetached)
+            return;
+
+        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;
+
+        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;
+            }
+
+            // 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;
+        }
+
+        // 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);
+        }
+    }
+
+    // Monitor individual visibility changes
+    Connections {
+        target: root.visibilities
+
+        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);
+
+                if (!inDashboardArea) {
+                    root.visibilities.dashboard = false;
+                }
+                if (!inOsdArea) {
+                    root.visibilities.osd = false;
+                    root.panels.osd.hovered = false;
+                }
+            }
+        }
+
+		function onSidebarChanged() {
+			if ( root.visibilities.sidebar ) {
+				root.visibilities.dashboard = false;
+				root.popouts.hasCurrent = false;
+			}
+		}
+
+        function onDashboardChanged() {
+            if (root.visibilities.dashboard) {
+                // Dashboard became visible, immediately check if this should be shortcut mode
+                const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
+                if (!inDashboardArea) {
+                    root.dashboardShortcutActive = true;
+                }
+
+				root.visibilities.sidebar = false;
+				root.popouts.hasCurrent = false;
+
+            } else {
+                // Dashboard hidden, clear shortcut flag
+                root.dashboardShortcutActive = false;
+				// root.visibilities.bar = false;
+            }
+        }
+
+        function onOsdChanged() {
+            if (root.visibilities.osd) {
+                // OSD became visible, immediately check if this should be shortcut mode
+                const inOsdArea = root.inRightPanel(root.panels.osd, root.mouseX, root.mouseY);
+				console.log(inOsdArea);
+                if (!inOsdArea) {
+                    root.osdShortcutActive = true;
+                }
+            } 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;
+            }
+        }
+    }
+}
@@ -6,6 +6,9 @@ import qs.Modules.Notifications as Notifications
 import qs.Modules.Notifications.Sidebar as Sidebar
 import qs.Modules.Notifications.Sidebar.Utils as Utils
 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.Config

 Item {
@@ -20,10 +23,28 @@ Item {
 	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: bar.implicitHeight
+    anchors.topMargin: Config.barConfig.autoHide && !visibilities.bar ? 0 : bar.implicitHeight
+	Behavior on anchors.topMargin {
+		Modules.Anim {}
+	}
+
+	Osd.Wrapper {
+		id: osd
+
+		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
@@ -41,6 +62,14 @@ Item {
        }
    }

+	Toasts.Toasts {
+		id: toasts
+
+		anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
+		anchors.right: sidebar.left
+		anchors.margins: Appearance.padding.normal
+	}
+
 	Notifications.Wrapper {
 		id: notifications

@@ -51,6 +80,17 @@ Item {
 		anchors.right: parent.right
 	}

+	Launcher.Wrapper {
+		id: launcher
+
+		screen: root.screen
+		visibilities: root.visibilities
+		panels: root
+
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.bottom: parent.bottom
+	}
+
 	Utils.Wrapper {
 		id: utilities

@@ -5,6 +5,7 @@ import Quickshell.Wayland
 import Quickshell.Io
 import Quickshell.Hyprland
 import ZShell
+import qs.Components

 Scope {
    LazyLoader {
@@ -47,9 +48,24 @@ Scope {
        }
    }

-    GlobalShortcut {
+	IpcHandler {
+		target: "picker"
+
+		function open(): void {
+			root.freeze = false;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+
+		function openFreeze(): void {
+			root.freeze = true;
+			root.closing = false;
+			root.activeAsync = true;
+		}
+	}
+
+    CustomShortcut {
        name: "screenshot"
-        appid: "ZShell"
        onPressed: {
            root.freeze = false;
            root.closing = false;
@@ -57,9 +73,8 @@ Scope {
        }
    }

-    GlobalShortcut {
+    CustomShortcut {
        name: "screenshotFreeze"
-        appid: "ZShell"
        onPressed: {
            root.freeze = true;
            root.closing = false;
@@ -201,7 +201,7 @@ Singleton {
            if (isAppleDisplay)
                Quickshell.execDetached(["asdbctl", "set", rounded]);
            else if (isDdc)
-                Quickshell.execDetached(["ddcutil", "-b", busNum, "setvcp", "10", rounded]);
+                Quickshell.execDetached(["ddcutil", "--disable-dynamic-sleep", "--sleep-multiplier", ".1", "--skip-ddc-checks", "-b", busNum, "setvcp", "10", rounded]);
            else
                Quickshell.execDetached(["brightnessctl", "s", `${rounded}%`]);

@@ -6,6 +6,7 @@ import Quickshell
 import Quickshell.Hyprland
 import Quickshell.Io
 import QtQuick
+import qs.Components

 Singleton {
    id: root
@@ -52,7 +53,7 @@ Singleton {
    }

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

    Component.onCompleted: reloadDynamicConfs()
@@ -114,7 +115,7 @@ Singleton {
    FileView {
        id: kbLayoutFile

-        path: Quickshell.env("CAELESTIA_XKB_RULES_PATH") || "/usr/share/X11/xkb/rules/base.lst"
+        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) {
@@ -152,9 +153,8 @@ Singleton {
        }
    }

-    GlobalShortcut {
+    CustomShortcut {
        name: "refreshDevices"
-        appid: "ZShell"
        onPressed: extras.refreshDevices()
        onReleased: extras.refreshDevices()
    }
@@ -0,0 +1,86 @@
+pragma Singleton
+
+import Quickshell
+import QtQuick
+import qs.Modules
+import qs.Helpers
+import qs.Config
+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();
+			}
+		}
+	}
+
+	function applyDarkMode() {
+		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"]);
+		}
+
+		Config.general.color.mode = "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(["sed", "-i", "'s/\\(vim.cmd.colorscheme \\).*/\\1\"tokyodark\"/'", "~/.config/nvim/lua/config/load-colorscheme.lua"])
+
+		if( Config.general.color.wallust )
+			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
+	}
+
+	function applyLightMode() {
+		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"]);
+		}
+
+		Config.general.color.mode = "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`])
+
+		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 )
+			Wallust.generateColors(WallpaperPath.currentWallpaperPath);
+	}
+
+	function checkStartup() {
+		if ( darkStart === darkEnd )
+			return;
+		var now = new Date();
+		if ( now.getHours() >= darkStart || now.getHours() < darkEnd ) {
+			applyDarkMode();
+		} else {
+			applyLightMode();
+		}
+	}
+}
@@ -246,7 +246,7 @@ MouseArea {
        color: "transparent"
        radius: root.realRounding > 0 ? root.realRounding + root.realBorderWidth : 0
        border.width: root.realBorderWidth
-        border.color: Config.accentColor.accents.primary
+        border.color: DynamicColors.palette.m3primary

        x: selectionRect.x - root.realBorderWidth
        y: selectionRect.y - root.realBorderWidth
@@ -19,7 +19,7 @@ Searcher {
    function setWallpaper(path: string): void {
        actualCurrent = path;
        WallpaperPath.currentWallpaperPath = path;
-		Quickshell.execDetached(["python3", Quickshell.shellPath("scripts/LockScreenBg.py"), `--input_image=${root.actualCurrent}`, `--output_path=${Paths.state}/lockscreen_bg.png`]);
+		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 {
@@ -29,7 +29,7 @@ Searcher {

    function stopPreview(): void {
        showPreview = false;
-        Quickshell.execDetached(["python3", Quickshell.shellPath("scripts/SchemeColorGen.py"), `--path=${root.actualCurrent}`, `--thumbnail=${Paths.cache}/imagecache/thumbnail.jpg`, `--output=${Paths.state}/scheme.json`, `--scheme=${Config.colors.schemeType}`]);
+        Quickshell.execDetached(["sh", "-c", `python3 ${Quickshell.shellPath("scripts/SchemeColorGen.py")} --path=${root.actualCurrent} --thumbnail=${Paths.cache}/imagecache/thumbnail.jpg --output=${Paths.state}/scheme.json --scheme=${Config.colors.schemeType}`]);
    }

    list: wallpapers.entries
@@ -43,7 +43,7 @@ Searcher {
        id: wallpapers

        recursive: true
-        path: Config.wallpaperPath
+        path: Config.general.wallpaperPath
        filter: FileSystemModel.Images
    }
 }
@@ -10,7 +10,7 @@ Singleton {

    property real cpuPerc
    property real cpuTemp
-    readonly property string gpuType: Config.gpuType.toUpperCase() || autoGpuType
+    readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
    property string autoGpuType: "NONE"
    property real gpuPerc
    property real gpuTemp
@@ -145,7 +145,7 @@ Singleton {
    Process {
        id: gpuTypeCheck

-        running: !Config.gpuType
+        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()
@@ -12,7 +12,7 @@ Singleton {

    FileView {
        id: fileView
-        path: Quickshell.env("HOME") + "/.local/state/z-bar/wallpaper_path.json"
+        path: `${Paths.state}/wallpaper_path.json`

        watchChanges: true
        onFileChanged: reload()
@@ -0,0 +1,62 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Io
+import ZShell.Models
+import qs.Config
+import qs.Modules
+import qs.Helpers
+import qs.Paths
+
+Searcher {
+    id: root
+
+    property bool showPreview: false
+    readonly property string current: showPreview ? previewPath : actualCurrent
+    property string previewPath
+    property string actualCurrent: WallpaperPath.currentWallpaperPath
+
+    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 )
+			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
+        })
+
+	IpcHandler {
+		target: "wallpaper"
+
+		function set(path: string): void {
+			root.setWallpaper(path);
+		}
+	}
+
+    FileSystemModel {
+        id: wallpapers
+
+        recursive: true
+        path: Config.general.wallpaperPath
+        filter: FileSystemModel.Images
+    }
+}
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -1,72 +0,0 @@
-import Quickshell
-import Quickshell.Widgets
-import QtQuick
-import qs
-
-Item {
-    id: root
-
-    required property DesktopEntry modelData
-
-    implicitHeight: 48
-
-    anchors.left: parent?.left
-    anchors.right: parent?.right
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        onClicked: event => onClicked(event)
-        function onClicked(): void {
-            Search.launch(root.modelData);
-        }
-    }
-
-    Item {
-        anchors.fill: parent
-        anchors.leftMargin: 8
-        anchors.rightMargin: 8
-        anchors.margins: 4
-
-        IconImage {
-            id: icon
-
-            source: Quickshell.iconPath( root.modelData?.icon, "image-missing" )
-            implicitSize: parent.height * 0.8
-
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Item {
-            anchors.left: icon.right
-            anchors.leftMargin: 8
-            anchors.verticalCenter: icon.verticalCenter
-
-            implicitWidth: parent.width - icon.width
-            implicitHeight: name.implicitHeight + comment.implicitHeight
-
-            Text {
-                id: name
-
-                text: root.modelData?.name || qsTr("Unknown Application")
-                font.pointSize: 12
-                color: mouseArea.containsMouse ? "#ffffff" : "#cccccc"
-                elide: Text.ElideRight
-            }
-
-            Text {
-                id: comment
-
-                text: ( root.modelData?.comment || root.modelData?.genericName || root.modelData?.name ) ?? ""
-                font.pointSize: 10
-                color: mouseArea.containsMouse ? "#dddddd" : "#888888"
-
-                elide: Text.ElideRight
-                width: root.width - icon.width - 4 * 2
-
-                anchors.top: name.bottom
-            }
-        }
-    }
-}
@@ -14,8 +14,11 @@ import qs.Helpers
 Item {
    id: root

-    implicitWidth: layout.implicitWidth + 10 * 2
-    implicitHeight: layout.implicitHeight + 10 * 2
+    implicitWidth: layout.implicitWidth + 5 * 2
+    implicitHeight: layout.implicitHeight + 5 * 2
+
+	readonly property int topMargin: 0
+	readonly property int rounding: 6

    required property var wrapper

@@ -38,7 +41,7 @@ Item {
 				Layout.fillWidth: true
 				Layout.preferredHeight: tabBar.tabHeight

-				color: stack.currentIndex === 0 ? DynamicColors.tPalette.m3primaryContainer : "transparent"
+				color: stack.currentIndex === 0 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer

 				StateLayer {

@@ -49,6 +52,7 @@ Item {
 					CustomText {
 						text: qsTr("Volumes")
 						anchors.centerIn: parent
+						color: stack.currentIndex === 0 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
 					}
 				}
 			}
@@ -58,7 +62,7 @@ Item {
 				Layout.fillWidth: true
 				Layout.preferredHeight: tabBar.tabHeight

-				color: stack.currentIndex === 1 ? DynamicColors.tPalette.m3primaryContainer : "transparent"
+				color: stack.currentIndex === 1 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer

 				StateLayer {

@@ -69,6 +73,7 @@ Item {
 					CustomText {
 						text: qsTr("Devices")
 						anchors.centerIn: parent
+						color: stack.currentIndex === 1 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
 					}
 				}
 			}
@@ -126,113 +131,143 @@ Item {
 	component VolumesTab: ColumnLayout {
 		spacing: 12

-		RowLayout {
-			Layout.topMargin: 10
-			spacing: 15
-			Rectangle {
-				Layout.preferredWidth: 40
-				Layout.preferredHeight: 40
-				Layout.alignment: Qt.AlignVCenter
-				color: DynamicColors.tPalette.m3primaryContainer
-				radius: 1000
-				MaterialIcon {
-					anchors.centerIn: parent
-					color: DynamicColors.palette.m3onPrimaryContainer
-					text: "volume_up"
-					font.pointSize: 22
+		CustomRect {
+			Layout.topMargin: root.topMargin
+			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.fillWidth: true
+			color: DynamicColors.tPalette.m3surfaceContainer
+
+			radius: root.rounding
+
+			RowLayout {
+				id: outputVolume
+				anchors.verticalCenter: parent.verticalCenter
+				anchors.left: parent.left
+				anchors.right: parent.right
+				anchors.margins: Appearance.spacing.smaller
+				spacing: 15
+				CustomRect {
+					Layout.preferredWidth: 40
+					Layout.preferredHeight: 40
+					Layout.alignment: Qt.AlignVCenter
+					color: DynamicColors.palette.m3primary
+					radius: 1000
+					MaterialIcon {
+						anchors.centerIn: parent
+						color: DynamicColors.palette.m3onPrimary
+						text: "speaker"
+						font.pointSize: 22
+					}
 				}
-			}

-			ColumnLayout {
-				Layout.fillWidth: true
-				RowLayout {
+				ColumnLayout {
 					Layout.fillWidth: true
-
-					CustomText {
-						text: "Output Volume"
+					RowLayout {
 						Layout.fillWidth: true
-						Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+
+						CustomText {
+							text: "Output Volume"
+							Layout.fillWidth: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+						}
+
+						CustomText {
+							text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`);
+							font.bold: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+						}
 					}

-					CustomText {
-						text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`);
-						font.bold: true
-						Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-					}
-				}
+					CustomMouseArea {
+						Layout.fillWidth: true
+						Layout.preferredHeight: 10
+						Layout.bottomMargin: 5

-				CustomMouseArea {
-					Layout.fillWidth: true
-					Layout.preferredHeight: 10
-					Layout.bottomMargin: 5
+						CustomSlider {
+							anchors.left: parent.left
+							anchors.right: parent.right
+							implicitHeight: 10
+							value: Audio.volume
+							onMoved: Audio.setVolume(value)

-					CustomSlider {
-						anchors.fill: parent
-						value: Audio.volume
-						onMoved: Audio.setVolume(value)
-
-						Behavior on value { Anim {} }
+							Behavior on value { Anim {} }
+						}
 					}
 				}
 			}
 		}


-		RowLayout {
-			Layout.topMargin: 10
-			spacing: 15
-			Rectangle {
-				Layout.preferredWidth: 40
-				Layout.preferredHeight: 40
-				Layout.alignment: Qt.AlignVCenter
-				color: DynamicColors.tPalette.m3primaryContainer
-				radius: 1000
-				MaterialIcon {
-					anchors.centerIn: parent
-					anchors.alignWhenCentered: false
-					color: DynamicColors.palette.m3onPrimaryContainer
-					text: "mic"
-					font.pointSize: 22
+		CustomRect {
+			Layout.topMargin: root.topMargin
+			Layout.fillWidth: true
+			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			color: DynamicColors.tPalette.m3surfaceContainer
+
+			radius: root.rounding
+
+			RowLayout {
+				id: inputVolume
+				anchors.verticalCenter: parent.verticalCenter
+				anchors.left: parent.left
+				anchors.right: parent.right
+				anchors.margins: Appearance.spacing.smaller
+				spacing: 15
+				Rectangle {
+					Layout.preferredWidth: 40
+					Layout.preferredHeight: 40
+					Layout.alignment: Qt.AlignVCenter
+					color: DynamicColors.palette.m3primary
+					radius: 1000
+					MaterialIcon {
+						anchors.centerIn: parent
+						anchors.alignWhenCentered: false
+						color: DynamicColors.palette.m3onPrimary
+						text: "mic"
+						font.pointSize: 22
+					}
 				}
-			}

-			ColumnLayout {
-				Layout.fillWidth: true
-				RowLayout {
+				ColumnLayout {
 					Layout.fillWidth: true
-					Layout.fillHeight: true
-
-					CustomText {
-						text: "Input Volume"
+					RowLayout {
 						Layout.fillWidth: true
-						Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+						Layout.fillHeight: true
+
+						CustomText {
+							text: "Input Volume"
+							Layout.fillWidth: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+						}
+
+						CustomText {
+							text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`);
+							font.bold: true
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+						}
 					}

-					CustomText {
-						text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`);
-						font.bold: true
-						Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-					}
-				}
+					CustomMouseArea {
+						Layout.fillWidth: true
+						Layout.bottomMargin: 5
+						implicitHeight: 10

-				CustomMouseArea {
-					Layout.fillWidth: true
-					Layout.bottomMargin: 5
-					implicitHeight: 10
+						CustomSlider {
+							anchors.left: parent.left
+							anchors.right: parent.right
+							implicitHeight: 10
+							value: Audio.sourceVolume
+							onMoved: Audio.setSourceVolume(value)

-					CustomSlider {
-						anchors.fill: parent
-						value: Audio.sourceVolume
-						onMoved: Audio.setSourceVolume(value)
-
-						Behavior on value { Anim {} }
+							Behavior on value { Anim {} }
+						}
 					}
 				}
 			}
 		}

 		Rectangle {
-			Layout.topMargin: 10
+			Layout.topMargin: root.topMargin
 			Layout.fillWidth: true
 			Layout.preferredHeight: 1

@@ -240,147 +275,47 @@ Item {
 		}

 		Repeater {
-			model: Audio.appStreams
+			model: Audio.streams.filter(s => s.isSink)

-			Item {
+			CustomRect {
 				id: appBox

-				Layout.topMargin: 10
+				Layout.topMargin: root.topMargin
 				Layout.fillWidth: true
-				Layout.preferredHeight: 42
-				visible: !isCaptureStream
-				required property PwNode modelData
+				Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+				color: DynamicColors.tPalette.m3surfaceContainer

-                function isValidMatch(searchTerm, entry) {
-					if (!entry)
-						return false;
-					var search = searchTerm.toLowerCase();
-					var id = (entry.id || "").toLowerCase();
-					var name = (entry.name || "").toLowerCase();
-					var icon = (entry.icon || "").toLowerCase();
-					// Match is valid if search term appears in entry or entry appears in search
-					return id.includes(search) || name.includes(search) || icon.includes(search) || search.includes(id.split('.').pop()) || search.includes(name.replace(/\s+/g, ''));
-                }
+				radius: root.rounding

-				readonly property string appName: {
-					if (!modelData)
-						return "Unknown App";

-					var props = modelData.properties;
-					var desc = modelData.description || "";
-					var name = modelData.name || "";
-					var mediaName = props["media.name"] || "";
-
-					if ( mediaName !== "playStream" ) {
-						return mediaName;
-					}
-
-					if (!props) {
-						if (desc)
-							return desc;
-						if (name) {
-							var nameParts = name.split(/[-_]/);
-							if (nameParts.length > 0 && nameParts[0])
-								return nameParts[0].charAt(0).toUpperCase() + nameParts[0].slice(1);
-							return name;
-						}
-						return "Unknown App";
-					}
-
-					var binaryName = props["application.process.binary"] || "";
-
-					// Try binary name first (fixes Electron apps like vesktop)
-					if (binaryName) {
-						var binParts = binaryName.split("/");
-						if (binParts.length > 0) {
-							var binName = binParts[binParts.length - 1].toLowerCase();
-							var entry = ThemeIcons.findAppEntry(binName);
-							// Only use entry if it's actually related to binary name
-							if (entry && entry.name && isValidMatch(binName, entry))
-								return entry.name;
-						}
-					}
-
-					var computedAppName = props["application.name"] || "";
-					var mediaName = props["media.name"] || "";
-					var appId = props["application.id"] || "";
-
-					if (appId) {
-						var entry = ThemeIcons.findAppEntry(appId);
-						if (entry && entry.name && isValidMatch(appId, entry))
-							return entry.name;
-						if (!computedAppName) {
-							var parts = appId.split(".");
-							if (parts.length > 0 && parts[0])
-								computedAppName = parts[0].charAt(0).toUpperCase() + parts[0].slice(1);
-						}
-					}
-
-					if (!computedAppName && binaryName) {
-						var binParts = binaryName.split("/");
-						if (binParts.length > 0 && binParts[binParts.length - 1])
-							computedAppName = binParts[binParts.length - 1].charAt(0).toUpperCase() + binParts[binParts.length - 1].slice(1);
-					}
-
-					var result = computedAppName || mediaTitle || mediaName || binaryName || desc || name;
-
-					if (!result || result === "" || result === "Unknown App") {
-						if (name) {
-							var nameParts = name.split(/[-_]/);
-							if (nameParts.length > 0 && nameParts[0])
-								result = nameParts[0].charAt(0).toUpperCase() + nameParts[0].slice(1);
-						}
-					}
-
-					return result || "Unknown App";
-				}
-
-				PwObjectTracker {
-					objects: appBox.modelData ? [appBox.modelData] : []
-				}
-
-				PwNodePeakMonitor {
-					id: peak
-					node: appBox.modelData
-				}
-
-				readonly property bool isCaptureStream: {
-					if (!modelData || !modelData.properties)
-						return false;
-					const props = modelData.properties;
-					// Exclude capture streams - check for stream.capture.sink property
-					if (props["stream.capture.sink"] !== undefined) {
-						return true;
-					}
-					const mediaClass = props["media.class"] || "";
-					// Exclude Stream/Input (capture) but allow Stream/Output (playback)
-					if (mediaClass.includes("Capture") || mediaClass === "Stream/Input" || mediaClass === "Stream/Input/Audio") {
-						return true;
-					}
-					const mediaRole = props["media.role"] || "";
-					if (mediaRole === "Capture") {
-						return true;
-					}
-					return false;
-				}
+				required property var modelData
+				required property int index

 				RowLayout {
 					id: layoutVolume
 					anchors.fill: parent
+					anchors.margins: Appearance.spacing.smaller
 					spacing: 15

-					IconImage {
-						id: icon
-						property string iconPath1: Quickshell.iconPath(DesktopEntries.byId(appBox.modelData.name).icon);
-						property string iconPath2: Quickshell.iconPath(DesktopEntries.byId(appBox.appName).icon);
-						source: iconPath1 !== "" ? iconPath1 : iconPath2
-						Layout.alignment: Qt.AlignVCenter
-						implicitSize: 42

-						StateLayer {
-							radius: 1000
-							onClicked: {
-								appBox.modelData.audio.muted = !appBox.modelData.audio.muted;
+					CustomRect {
+						Layout.preferredWidth: 40
+						Layout.preferredHeight: 40
+						Layout.alignment: Qt.AlignVCenter
+						color: DynamicColors.palette.m3primary
+						radius: 1000
+						MaterialIcon {
+							id: icon
+							anchors.centerIn: parent
+							text: "volume_up"
+							font.pointSize: 22
+							color: DynamicColors.palette.m3onPrimary
+
+							StateLayer {
+								radius: 1000
+								onClicked: {
+									appBox.modelData.audio.muted = !appBox.modelData.audio.muted;
+								}
 							}
 						}
 					}
@@ -391,7 +326,7 @@ Item {

 						TextMetrics {
 							id: metrics
-							text: appBox.appName
+							text: Audio.getStreamName(appBox.modelData)
 							elide: Text.ElideRight
 							elideWidth: root.width - 50
 						}
@@ -419,15 +354,14 @@ Item {
 							Layout.fillWidth: true
 							Layout.fillHeight: true
 							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.bottomMargin: 5
 							implicitHeight: 10
-							CustomAudioSlider {
-								anchors.fill: parent
+							CustomSlider {
+								anchors.left: parent.left
+								anchors.right: parent.right
+								implicitHeight: 10
 								value: appBox.modelData.audio.volume
-								peak: peak.peak
 								onMoved: {
-									Audio.setAppAudioVolume(appBox.modelData, value)
-									console.log(icon.iconPath1, icon.iconPath2)
+									Audio.setStreamVolume(appBox.modelData, value)
 								}
 							}
 						}
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell.Io
 import Quickshell.Services.Pipewire
+import qs.Daemons
 import qs.Modules
 import qs.Config
 import qs.Components
@@ -13,8 +14,8 @@ Item {
    anchors.bottom: parent.bottom

    property bool expanded: false
-    property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3tertiaryFixed : "#ffffff"
-    property color barColor: Config.useDynamicColors ? DynamicColors.palette.m3primary : "#ffffff"
+    property color textColor: DynamicColors.palette.m3onSurface
+    property color barColor: DynamicColors.palette.m3primary

    Behavior on implicitWidth {
        NumberAnimation {
@@ -23,21 +24,13 @@ Item {
        }
    }

-	PwObjectTracker {
-		objects: [ Pipewire.defaultAudioSink ]
-	}
-
-    PwObjectTracker {
-        objects: [ Pipewire.defaultAudioSource ]
-    }
-
    Rectangle {
        anchors.verticalCenter: parent.verticalCenter
        anchors.left: parent.left
        anchors.right: parent.right
        height: 22
        radius: height / 2
-        color: Config.useDynamicColors ? DynamicColors.tPalette.m3surfaceContainer : "#40000000"
+        color: DynamicColors.tPalette.m3surfaceContainer

        Behavior on color {
            CAnim {}
@@ -63,8 +56,8 @@ Item {
            MaterialIcon {
                Layout.alignment: Qt.AlignVCenter
                font.pixelSize: 18
-                text: "volume_up"
-                color: root.textColor
+                text: Audio.muted ? "volume_off" : "volume_up"
+                color: Audio.muted ? DynamicColors.palette.m3error : root.textColor
            }

            Rectangle {
@@ -82,10 +75,9 @@ Item {
                        bottom: parent.bottom
                    }

-                    implicitWidth: parent.width * ( Pipewire.defaultAudioSink?.audio.volume ?? 0 )
+                    implicitWidth: parent.width * ( Audio.volume ?? 0 )
                    radius: parent.radius
-                    color: root.barColor
-
+					color: Audio.muted ? DynamicColors.palette.m3error : root.barColor
                    Behavior on color {
                        CAnim {}
                    }
@@ -95,8 +87,8 @@ Item {
            MaterialIcon {
                Layout.alignment: Qt.AlignVCenter
                font.pixelSize: 18
-                text: Pipewire.defaultAudioSource?.audio.muted ? "mic_off" : "mic"
-                color: ( Pipewire.defaultAudioSource?.audio.muted ?? false ) ? (Config.useDynamicColors ? DynamicColors.palette.m3onError : "#ff4444") : root.textColor
+                text: Audio.sourceMuted ? "mic_off" : "mic"
+                color: ( Audio.sourceMuted ?? false ) ? DynamicColors.palette.m3error : root.textColor
            }

            Rectangle {
@@ -114,9 +106,9 @@ Item {
                        bottom: parent.bottom
                    }

-                    implicitWidth: parent.width * ( Pipewire.defaultAudioSource?.audio.volume ?? 0 )
+                    implicitWidth: parent.width * ( Audio.sourceVolume ?? 0 )
                    radius: parent.radius
-                    color: ( Pipewire.defaultAudioSource?.audio.muted ?? false ) ? (Config.useDynamicColors ? DynamicColors.palette.m3onError : "#ff4444") : root.barColor
+                    color: ( Audio.sourceMuted ?? false ) ? DynamicColors.palette.m3error : root.barColor

                    Behavior on color {
                        CAnim {}
@@ -4,11 +4,10 @@ import Quickshell
 import Quickshell.Hyprland
 import QtQuick
 import QtQuick.Layouts
+import qs.Components
 import qs.Modules
 import qs.Config
 import qs.Helpers
-import qs.Daemons
-import qs.Modules.Polkit
 import qs.Modules.UPower
 import qs.Modules.Network

@@ -23,10 +22,11 @@ RowLayout {
 	required property ShellScreen screen

 	function checkPopout(x: real): void {
-		const ch = childAt(x, height / 2) as WrappedLoader;
+		const ch = childAt(x, 2) as WrappedLoader;

-		if (!ch && !popouts.currentName.includes("traymenu")) {
-			popouts.hasCurrent = false;
+		if (!ch) {
+			if ( !popouts.currentName.includes("traymenu") )
+				popouts.hasCurrent = false;
 			return;
 		}

@@ -74,9 +74,8 @@ RowLayout {
 		}
 	}

-	GlobalShortcut {
+	CustomShortcut {
 		name: "toggle-overview"
-		appid: "zshell"

 		onPressed: {
 			Hyprland.refreshWorkspaces();
@@ -1,5 +1,6 @@
 pragma ComponentBehavior: Bound

+import Quickshell
 import QtQuick
 import QtQuick.Effects
 import qs.Modules
@@ -10,12 +11,13 @@ Item {
    id: root

    required property Item bar
+	required property PersistentProperties visibilities

    anchors.fill: parent

    CustomRect {
        anchors.fill: parent
-        color: DynamicColors.palette.m3surface
+        color: Config.barConfig.autoHide && !root.visibilities.bar ? "transparent" : DynamicColors.palette.m3surface

        layer.enabled: true

@@ -36,9 +38,12 @@ Item {

        Rectangle {
            anchors.fill: parent
-            anchors.topMargin: root.bar.implicitHeight
+            anchors.topMargin: Config.barConfig.autoHide && !root.visibilities.bar ? 4 : root.bar.implicitHeight
            topLeftRadius: 8
            topRightRadius: 8
+			Behavior on anchors.topMargin {
+				Anim {}
+			}
        }
    }
 }
@@ -7,6 +7,7 @@ import qs.Helpers as Helpers
 import qs.Components

 Item {
+	id: root
 	required property PersistentProperties visibilities
 	required property Wrapper popouts
 	required property RowLayout loader
@@ -26,8 +27,8 @@ Item {

 			anchors.centerIn: parent

-			text: Time.time
-			color: Config.useDynamicColors ? DynamicColors.palette.m3tertiary : "white"
+			text: Time.dateStr
+			color: DynamicColors.palette.m3onSurface

 			Behavior on color {
 				CAnim {}
@@ -38,15 +39,6 @@ Item {
 			acceptedButtons: Qt.LeftButton
 			onClicked: {
 				root.visibilities.dashboard = !root.visibilities.dashboard;
-				if ( root.visibilities.sidebar || root.popouts.hasCurrent ) {
-					// Helpers.Calendar.displayYear = new Date().getFullYear();
-					// Helpers.Calendar.displayMonth = new Date().getMonth();
-					// root.popouts.currentName = "calendar";
-					// root.popouts.currentCenter = Qt.binding( () => item.mapToItem( root.loader, root.implicitWidth / 2, 0 ).x );
-					// root.popouts.hasCurrent = true;
-					root.popouts.hasCurrent = false;
-					root.visibilities.sidebar = false;
-				}
 			}
 		}
 	}
@@ -1,101 +0,0 @@
-import Quickshell
-import QtQuick
-import QtQuick.Controls
-import qs.Helpers
-import qs.Config
-import qs.Paths
-
-TextField {
-    id: root
-    color: "white"
-    horizontalAlignment: Text.AlignLeft
-    echoMode: TextInput.Normal
-    placeholderText: qsTr("Search applications...")
-    background: null
-    renderType: TextInput.NativeRendering
-
-    font.family: "Rubik"
-
-    cursorDelegate: Rectangle {
-        id: cursor
-
-        property bool disableBlink
-
-        implicitWidth: 2
-        color: "white"
-        radius: 2
-
-        Connections {
-            target: root
-
-            function onCursorPositionChanged(): void {
-                if ( root.activeFocus && root.cursorVisible ) {
-                    cursor.opacity = 1;
-                    cursor.disableBlink = true;
-                    enableBlink.restart();
-                }
-            }
-        }
-
-        Timer {
-            id: enableBlink
-
-            interval: 100
-            onTriggered: cursor.disableBlink = false
-        }
-
-        Timer {
-            running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
-            repeat: true
-            triggeredOnStart: true
-            interval: 500
-            onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
-        }
-
-        Binding {
-            when: !root.activeFocus || !root.cursorVisible
-            cursor.opacity: 0
-        }
-
-        Behavior on opacity {
-            Anim {
-                duration: 200
-            }
-        }
-    }
-
-    Keys.onPressed: {
-        if ( event.key === Qt.Key_Down ) {
-            if ( appListLoader.active ) {
-                appListLoader.item.decrementCurrentIndex();
-            } else {
-                wallpaperPickerLoader.item.decrementCurrentIndex();
-            }
-            event.accepted = true;
-        } else if ( event.key === Qt.Key_Up ) {
-            if ( appListLoader.active ) {
-                appListLoader.item.incrementCurrentIndex();
-            } else {
-                wallpaperPickerLoader.item.incrementCurrentIndex();
-            }
-            event.accepted = true;
-        } else if ( event.key === Qt.Key_Return || event.key === Qt.Key_Enter ) {
-            if ( appListLoader.active ) {
-                Search.launch(appListLoader.item.currentItem.modelData);
-                launcherWindow.visible = false;
-            } else if ( wallpaperPickerLoader.active ) {
-                SearchWallpapers.setWallpaper(wallpaperPickerLoader.item.currentItem.modelData.path)
-                if ( Config.wallust ) {
-                    Wallust.generateColors(WallpaperPath.currentWallpaperPath);
-                }
-                closeAnim.start();
-            }
-            event.accepted = true;
-        } else if ( event.key === Qt.Key_Escape ) {
-            if ( wallpaperPickerLoader.active )
-                SearchWallpapers.stopPreview();
-            closeAnim.start();
-            event.accepted = true;
-        }
-    }
-}
@@ -1,144 +0,0 @@
-pragma Singleton
-
-import qs.Config
-import ZShell.Services
-import ZShell
-import Quickshell
-import Quickshell.Services.Pipewire
-import QtQuick
-
-Singleton {
-    id: root
-
-    property string previousSinkName: ""
-    property string previousSourceName: ""
-
-    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: []
-    })
-
-    readonly property list<PwNode> sinks: nodes.sinks
-    readonly property list<PwNode> sources: nodes.sources
-    readonly property list<PwNode> streams: nodes.streams
-
-    readonly property PwNode sink: Pipewire.defaultAudioSink
-    readonly property PwNode source: Pipewire.defaultAudioSource
-
-    readonly property bool muted: !!sink?.audio?.muted
-    readonly property real volume: sink?.audio?.volume ?? 0
-
-    readonly property bool sourceMuted: !!source?.audio?.muted
-    readonly property real sourceVolume: source?.audio?.volume ?? 0
-
-    readonly property alias beatTracker: beatTracker
-
-    function setVolume(newVolume: real): void {
-        if (sink?.ready && sink?.audio) {
-            sink.audio.muted = false;
-            sink.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
-        }
-    }
-
-    function incrementVolume(amount: real): void {
-        setVolume(volume + (amount || Config.services.audioIncrement));
-    }
-
-    function decrementVolume(amount: real): void {
-        setVolume(volume - (amount || Config.services.audioIncrement));
-    }
-
-    function setSourceVolume(newVolume: real): void {
-        if (source?.ready && source?.audio) {
-            source.audio.muted = false;
-            source.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
-        }
-    }
-
-    function incrementSourceVolume(amount: real): void {
-        setSourceVolume(sourceVolume + (amount || Config.services.audioIncrement));
-    }
-
-    function decrementSourceVolume(amount: real): void {
-        setSourceVolume(sourceVolume - (amount || Config.services.audioIncrement));
-    }
-
-    function setAudioSink(newSink: PwNode): void {
-        Pipewire.preferredDefaultAudioSink = newSink;
-    }
-
-    function setAudioSource(newSource: PwNode): void {
-        Pipewire.preferredDefaultAudioSource = newSource;
-    }
-
-    function setStreamVolume(stream: PwNode, newVolume: real): void {
-        if (stream?.ready && stream?.audio) {
-            stream.audio.muted = false;
-            stream.audio.volume = Math.max(0, Math.min(Config.services.maxVolume, newVolume));
-        }
-    }
-
-    function setStreamMuted(stream: PwNode, muted: bool): void {
-        if (stream?.ready && stream?.audio) {
-            stream.audio.muted = muted;
-        }
-    }
-
-    function getStreamVolume(stream: PwNode): real {
-        return stream?.audio?.volume ?? 0;
-    }
-
-    function getStreamMuted(stream: PwNode): bool {
-        return !!stream?.audio?.muted;
-    }
-
-    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");
-    }
-
-    onSinkChanged: {
-        if (!sink?.ready)
-            return;
-
-        const newSinkName = sink.description || sink.name || qsTr("Unknown Device");
-
-        previousSinkName = newSinkName;
-    }
-
-    onSourceChanged: {
-        if (!source?.ready)
-            return;
-
-        const newSourceName = source.description || source.name || qsTr("Unknown Device");
-
-        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]
-    }
-
-    BeatTracker {
-        id: beatTracker
-    }
-}
@@ -1,6 +1,7 @@
 import ZShell.Services
 import QtQuick
 import QtQuick.Shapes
+import qs.Daemons
 import qs.Components
 import qs.Config
 import qs.Helpers
@@ -202,24 +203,6 @@ Item {
        }
    }

-    AnimatedImage {
-        id: bongocat
-
-        anchors.top: controls.bottom
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: Appearance.spacing.small
-        anchors.bottomMargin: Appearance.padding.large
-        anchors.margins: Appearance.padding.large * 2
-
-        playing: Players.active?.isPlaying ?? false
-        speed: Audio.beatTracker.bpm / Appearance.anim.mediaGifSpeedAdjustment
-        source: Paths.absolutePath(Config.paths.mediaGif)
-        asynchronous: true
-        fillMode: AnimatedImage.PreserveAspectFit
-    }
-
    component Control: CustomRect {
        id: control

@@ -32,19 +32,19 @@ Row {
    Resource {
        icon: "gamepad"
        value: SystemUsage.gpuPerc
-        color: DynamicColors.palette.m3primaryFixed
+        color: DynamicColors.palette.m3tertiary
    }

    Resource {
        icon: "host"
        value: SystemUsage.gpuMemUsed
-        color: DynamicColors.palette.m3secondaryFixed
+        color: DynamicColors.palette.m3primary
    }

    Resource {
        icon: "hard_disk"
        value: SystemUsage.storagePerc
-        color: DynamicColors.palette.m3tertiary
+        color: DynamicColors.palette.m3secondary
    }

    component Resource: Item {
@@ -1,153 +0,0 @@
-import Quickshell
-import Quickshell.Widgets
-import QtQuick
-import QtQuick.Layouts
-import qs.Config
-import qs.Daemons
-
-Repeater {
-    model: ScriptModel {
-        values: {
-            const map = new Map();
-            for ( const n of NotifServer.notClosed )
-            map.set( n.appName, null );
-            for ( const n of NotifServer.list )
-            map.set( n.appName, null );
-            return [ ...map.keys() ];
-        }
-        onValuesChanged: {
-            root.flagChanged();
-        }
-    }
-
-    Column {
-        id: groupColumn
-        required property string modelData
-        property list<var> notifications: NotifServer.list.filter( n => n.appName === modelData )
-        width: parent.width
-        spacing: 10
-
-        property bool shouldShow: false
-        property bool isExpanded: false
-        property bool collapseAnimRunning: false
-        property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3onSurface : "white"
-
-        function closeAll(): void {
-            for ( const n of NotifServer.notClosed.filter( n => n.appName === modelData ))
-            n.close();
-        }
-
-        Behavior on height {
-            Anim {}
-        }
-
-        Behavior on y {
-            Anim {
-                duration: MaterialEasing.expressiveEffectsTime
-                easing.bezierCurve: MaterialEasing.expressiveEffects
-            }
-        }
-
-        add: Transition {
-            id: addTrans
-            SequentialAnimation {
-                PauseAnimation {
-                    duration: ( addTrans.ViewTransition.index - addTrans.ViewTransition.targetIndexes[ 0 ]) * 30
-                }
-                ParallelAnimation {
-                    NumberAnimation {
-                        properties: "y";
-                        from: addTrans.ViewTransition.destination.y - (height / 2);
-                        to: addTrans.ViewTransition.destination.y;
-                        duration: 100;
-                        easing.type: Easing.OutCubic
-                    }
-                    NumberAnimation {
-                        properties: "opacity";
-                        from: 0;
-                        to: 1;
-                        duration: 100;
-                        easing.type: Easing.OutCubic
-                    }
-                    NumberAnimation {
-                        properties: "scale";
-                        from: 0.7;
-                        to: 1.0;
-                        duration: 100
-                        easing.type: Easing.InOutQuad
-                    }
-                }
-            }
-        }
-
-        Timer {
-            interval: addTrans.ViewTransition.targetIndexes.length * 30 + 100
-            running: groupColumn.isExpanded
-            repeat: false
-            onTriggered: {
-                groupColumn.shouldShow = true;
-                console.log("ran timer");
-            }
-        }
-
-        move: Transition {
-            id: moveTrans
-            NumberAnimation {
-                properties: "y";
-                duration: 100;
-                easing.type: Easing.OutCubic
-            }
-
-            NumberAnimation {
-                properties: "opacity, scale";
-                to: 1.0;
-            }
-        }
-
-        RowLayout {
-            width: parent.width
-            height: 30
-
-            Text {
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-                Layout.leftMargin: 5
-                text: groupColumn.modelData
-                color: groupColumn.textColor
-                font.pointSize: 14
-                font.bold: true
-            }
-
-            Rectangle {
-                id: collapseRect
-
-                property color notifyBgColor: Config.useDynamicColors ? DynamicColors.palette.m3primary : "#E53935"
-                property color notifyColor: Config.useDynamicColors ? DynamicColors.palette.m3onPrimary : "#FFCDD2"
-
-                Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-                Layout.fillHeight: true
-                Layout.preferredWidth: 30
-                color: !groupColumn.isExpanded ? collapseRect.notifyBgColor : ( collapseArea.containsMouse ? "#15FFFFFF" : "transparent" )
-                radius: groupColumn.isExpanded ? 4 : height / 2
-                visible: true
-
-                Text {
-                    anchors.centerIn: parent
-                    text: groupColumn.isExpanded ? "\ue944" : groupColumn.notifications.length
-                    font.family: groupColumn.isExpanded ? "Material Symbols Rounded" : "Rubik"
-                    font.pointSize: 18
-                    color: groupColumn.isExpanded ? groupColumn.textColor : collapseRect.notifyColor
-                }
-
-                MouseArea {
-                    id: collapseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    onClicked: {
-                        groupColumn.collapseAnimRunning = true;
-                    }
-                }
-            }
-        }
-        NotifGroupRepeater { id: groupRepeater }
-    }
-}
@@ -1,542 +0,0 @@
-import Quickshell
-import Quickshell.Wayland
-import Quickshell.Hyprland
-import QtQuick
-import QtQuick.Controls
-import qs.Config
-import qs.Helpers
-import qs.Effects
-import qs.Paths
-
-Scope {
-    id: root
-
-    PanelWindow {
-        id: launcherWindow
-        anchors {
-            top: true
-            left: true
-            right: true
-            bottom: true
-        }
-        color: "transparent"
-        visible: false
-
-		WlrLayershell.namespace: "ZShell-Launcher"
-        WlrLayershell.layer: WlrLayer.Overlay
-        WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
-
-        onVisibleChanged: {
-            if ( !visible ) {
-                searchInput.text = "";
-                appListLoader.item.currentIndex = 0;
-                appListLoader.item.positionViewAtBeginning();
-            }
-        }
-
-        GlobalShortcut {
-            appid: "z-cast"
-            name: "toggle-launcher"
-            onPressed: {
-                if ( !launcherWindow.visible ) {
-                    if ( !openAnim.running ) {
-                        openAnim.start();
-                    }
-                } else if ( launcherWindow.visible ) {
-                    if ( !closeAnim.running ) {
-                        closeAnim.start();
-                    }
-                }
-                searchInput.forceActiveFocus();
-            }
-        }
-
-        ShadowRect {
-            id: effects
-            anchors {
-                top: appListRect.top
-                bottom: backgroundRect.bottom
-                left: appListRect.left
-                right: appListRect.right
-            }
-            radius: 8
-        }
-
-        Rectangle {
-            id: backgroundRect
-
-            property color backgroundColor: Config.useDynamicColors ? DynamicColors.tPalette.m3surface : Config.baseBgColor
-
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: Config.useDynamicColors ? 0 : -1
-            implicitHeight: mainLayout.childrenRect.height + 20
-            implicitWidth: appListRect.implicitWidth
-            x: Math.round(( parent.width - width ) / 2 )
-            color: backgroundColor
-            opacity: 1
-            border.width: Config.useDynamicColors ? 0 : 1
-            border.color: Config.useDynamicColors ? "transparent" : Config.baseBorderColor
-
-            ParallelAnimation {
-                id: openAnim
-                Anim {
-                    target: appListRect
-                    duration: MaterialEasing.expressiveDefaultSpatialTime
-                    easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
-                    property: "implicitHeight"
-                    from: 40
-                    to: appListContainer.implicitHeight + 20
-                }
-                Anim {
-                    target: appListRect
-                    duration: 50
-                    property: "opacity"
-                    from: 0
-                    to: 1
-                }
-                Anim {
-                    target: backgroundRect
-                    duration: 50
-                    property: "opacity"
-                    from: 0
-                    to: 1
-                }
-                Anim {
-                    target: effects
-                    duration: 50
-                    property: "opacity"
-                    from: 0
-                    to: 1
-                }
-                onStarted: {
-                    launcherWindow.visible = true;
-                }
-            }
-
-            ParallelAnimation {
-                id: closeAnim
-                Anim {
-                    target: appListRect
-                    duration: MaterialEasing.expressiveDefaultSpatialTime
-                    easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
-                    property: "implicitHeight"
-                    from: appListContainer.implicitHeight
-                    to: 0
-                }
-                SequentialAnimation {
-                    PauseAnimation { duration: 120 }
-
-                    ParallelAnimation {
-                        Anim {
-                            target: backgroundRect
-                            duration: 50
-                            property: "opacity"
-                            from: 1
-                            to: 0
-                        }
-                        Anim {
-                            target: appListRect
-                            duration: 50
-                            property: "opacity"
-                            from: 1
-                            to: 0
-                        }
-                        Anim {
-                            target: effects
-                            duration: 50
-                            property: "opacity"
-                            from: 1
-                            to: 0
-                        }
-                    }
-                }
-                onStopped: {
-                    launcherWindow.visible = false;
-                }
-            }
-
-            Column {
-                id: mainLayout
-                anchors.fill: parent
-                anchors.margins: 10
-                spacing: 5
-                clip: true
-
-                CustomTextField {
-                    id: searchInput
-                    implicitHeight: 30
-                    implicitWidth: parent.width
-                }
-            }
-        }
-
-        Rectangle {
-            id: appListRect
-            x: Math.round(( parent.width - width ) / 2 )
-            implicitWidth: appListContainer.implicitWidth + 20
-            implicitHeight: appListContainer.implicitHeight + 20
-            anchors.bottom: backgroundRect.top
-            anchors.bottomMargin: Config.useDynamicColors ? 0 : -1
-            color: backgroundRect.color
-            topRightRadius: 8
-            topLeftRadius: 8
-            border.color: Config.useDynamicColors ? "transparent" : backgroundRect.border.color
-            clip: true
-
-            Behavior on implicitHeight {
-                Anim {
-                    duration: MaterialEasing.expressiveFastSpatialTime
-                    easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
-                }
-            }
-
-            Behavior on implicitWidth {
-                Anim {
-                    duration: MaterialEasing.expressiveFastSpatialTime
-                    easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
-                }
-            }
-
-            Item {
-                anchors.centerIn: parent
-                id: appListContainer
-                visible: true
-                clip: true
-                property var showWallpapers: searchInput.text.startsWith(">")
-                state: showWallpapers ? "wallpaperpicker" : "apps"
-                states: [
-                    State {
-                        name: "apps"
-                        PropertyChanges {
-                            appListLoader.active: true
-                            appListContainer.implicitHeight: appListLoader.implicitHeight
-                            appListContainer.implicitWidth: 600
-                        }
-                    },
-                    State {
-                        name: "wallpaperpicker"
-                        PropertyChanges {
-                            wallpaperPickerLoader.active: true
-                            appListContainer.implicitHeight: wallpaperPickerLoader.implicitHeight 
-                            appListContainer.implicitWidth: wallpaperPickerLoader.implicitWidth
-                        }
-                    }
-                ]
-                Loader {
-                    id: wallpaperPickerLoader
-                    active: false
-                    anchors.fill: parent
-                    sourceComponent: PathView {
-                        id: wallpaperPickerView
-                        anchors.fill: parent
-                        model: ScriptModel {
-                            id: wallpaperModel
-                            readonly property string search: searchInput.text.split(" ").slice(1).join(" ")
-
-                            values: SearchWallpapers.query( search )
-                            onValuesChanged: wallpaperPickerView.currentIndex = SearchWallpapers.list.findIndex( w => w.path === WallpaperPath.currentWallpaperPath )
-                        }
-
-                        readonly property int itemWidth: 288 + 10
-                        readonly property int numItems: {
-                            const screen = QsWindow.window?.screen;
-                            if (!screen)
-                                return 0;
-
-                            // Screen width - 4x outer rounding - 2x max side thickness (cause centered)
-                            const margins = 10;
-                            const maxWidth = screen.width - margins * 2;
-
-                            if ( maxWidth <= 0 )
-                                return 0;
-
-
-                            const maxItemsOnScreen = Math.floor( maxWidth / itemWidth );
-                            const visible = Math.min( maxItemsOnScreen, Config.maxWallpapers, wallpaperModel.values.length );
-
-                            if ( visible === 2 )
-                                return 1;
-                            if ( visible > 1 && visible % 2 === 0 )
-                                return visible - 1;
-                            return visible;
-                        }
-
-                        Component.onCompleted: currentIndex = SearchWallpapers.list.findIndex( w => w.path === WallpaperPath.currentWallpaperPath )
-                        Component.onDestruction: SearchWallpapers.stopPreview()
-
-                        onCurrentItemChanged: {
-                            if ( currentItem )
-                                SearchWallpapers.preview( currentItem.modelData.path );
-                                Quickshell.execDetached(["python3", Quickshell.shellPath("scripts/SchemeColorGen.py"), `--path=${currentItem.modelData.path}`, `--thumbnail=${Paths.cache}/imagecache/thumbnail.jpg`, `--output=${Paths.state}/scheme.json`, `--scheme=${Config.colors.schemeType}`]);
-                        }
-
-                        cacheItemCount: 5
-                        snapMode: PathView.SnapToItem
-                        preferredHighlightBegin: 0.5
-                        preferredHighlightEnd: 0.5
-                        highlightRangeMode: PathView.StrictlyEnforceRange
-
-                        pathItemCount: numItems
-                        implicitHeight: 212
-                        implicitWidth: Math.min( numItems, count ) * itemWidth
-
-                        path: Path {
-                            startY: wallpaperPickerView.height / 2
-
-                            PathAttribute {
-                                name: "z"
-                                value: 0
-                            }
-                            PathLine {
-                                x: wallpaperPickerView.width / 2
-                                relativeY: 0
-                            }
-                            PathAttribute {
-                                name: "z"
-                                value: 1
-                            }
-                            PathLine {
-                                x: wallpaperPickerView.width
-                                relativeY: 0
-                            }
-                        }
-
-                        focus: true
-
-                        delegate: WallpaperItem { }
-                    }
-                }
-                Loader {
-                    id: appListLoader
-                    active: false
-                    anchors.fill: parent
-                    sourceComponent: ListView {
-                        id: appListView
-
-                        property color highlightColor: Config.useDynamicColors ? DynamicColors.tPalette.m3onSurface : "#FFFFFF"
-
-                        anchors.fill: parent
-                        model: ScriptModel {
-                            id: appModel
-
-                            onValuesChanged: {
-                                appListView.currentIndex = 0;
-                            }
-                        }
-
-                        verticalLayoutDirection: ListView.BottomToTop
-                        implicitHeight: Math.min( count, Config.appCount ) * 48
-
-                        preferredHighlightBegin: 0
-                        preferredHighlightEnd: appListView.height
-                        highlightFollowsCurrentItem: false
-                        highlightRangeMode: ListView.ApplyRange
-                        focus: true
-                        highlight: Rectangle {
-                            radius: 4
-                            color: appListView.highlightColor
-                            opacity: Config.useDynamicColors ? 0.20 : 0.08
-
-                            y: appListView.currentItem?.y
-                            implicitWidth: appListView.width
-                            implicitHeight: appListView.currentItem?.implicitHeight ?? 0
-
-                            Behavior on y {
-                                Anim {
-                                    duration: MaterialEasing.expressiveEffectsTime
-                                    easing.bezierCurve: MaterialEasing.expressiveEffects
-                                }
-                            }
-                        }
-
-                        property list<var> search: Search.search( searchInput.text )
-
-                        state: {
-                            const text = searchInput.text
-                            if ( search.length === 0 ) {
-                                return "noresults"
-                            } else {
-                                return "apps"
-                            }
-                        }
-
-                        states: [
-                            State {
-                                name: "apps"
-                                PropertyChanges {
-                                    appModel.values: Search.search(searchInput.text)
-                                    appListView.delegate: appItem
-                                }
-                            },
-                            State {
-                                name: "noresults"
-                                PropertyChanges {
-                                    appModel.values: [1]
-                                    appListView.delegate: noResultsItem
-                                }
-                            }
-                        ]
-
-                        Component {
-                            id: appItem
-                            AppItem {
-                            }
-                        }
-
-                        Component {
-                            id: noResultsItem
-                            Item {
-                                width: appListView.width
-                                height: 48
-                                Text {
-                                    id: icon
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    property real fill: 0
-                                    text: "\ue000"
-                                    color: "#cccccc"
-                                    renderType: Text.NativeRendering
-                                    font.pointSize: 28
-                                    font.family: "Material Symbols Outlined"
-                                    font.variableAxes: ({
-                                        FILL: fill.toFixed(1),
-                                        GRAD: -25,
-                                        opsz: fontInfo.pixelSize,
-                                        wght: fontInfo.weight
-                                    })
-                                }
-
-                                Text {
-                                    anchors.left: icon.right
-                                    anchors.leftMargin: 10
-                                    anchors.verticalCenter: parent.verticalCenter
-                                    text: "No results found"
-                                    color: "#cccccc"
-                                    renderType: Text.NativeRendering
-                                    
-                                    font.pointSize: 12
-                                    font.family: "Rubik"
-                                }
-                            }
-                        }
-
-                        Component {
-                            id: wallpaperItem
-                            WallpaperItem { }
-                        }
-
-                        transitions: Transition {
-                            SequentialAnimation {
-                                ParallelAnimation {
-                                    Anim {
-                                        target: appListView
-                                        property: "opacity"
-                                        from: 1
-                                        to: 0
-                                        duration: 200
-                                        easing.bezierCurve: MaterialEasing.standardAccel
-                                    }
-                                    Anim {
-                                        target: appListView
-                                        property: "scale"
-                                        from: 1
-                                        to: 0.9
-                                        duration: 200
-                                        easing.bezierCurve: MaterialEasing.standardAccel
-                                    }
-                                }
-                                PropertyAction {
-                                    targets: [model, appListView]
-                                    properties: "values,delegate"
-                                }
-                                ParallelAnimation {
-                                    Anim {
-                                        target: appListView
-                                        property: "opacity"
-                                        from: 0
-                                        to: 1
-                                        duration: 200
-                                        easing.bezierCurve: MaterialEasing.standardDecel
-                                    }
-                                    Anim {
-                                        target: appListView
-                                        property: "scale"
-                                        from: 0.9
-                                        to: 1
-                                        duration: 200
-                                        easing.bezierCurve: MaterialEasing.standardDecel
-                                    }
-                                }
-                                PropertyAction {
-                                    targets: [appListView.add, appListView.remove]
-                                    property: "enabled"
-                                    value: true
-                                }
-                            }
-                        }
-
-                        add: Transition {
-                            enabled: !appListView.state
-                            Anim {
-                                properties: "opacity"
-                                from: 0
-                                to: 1
-                            }
-
-                            Anim {
-                                properties: "scale"
-                                from: 0.95
-                                to: 1
-                            }
-                        }
-
-                        remove: Transition {
-                            enabled: !appListView.state
-                            Anim {
-                                properties: "opacity"
-                                from: 1
-                                to: 0
-                            }
-
-                            Anim {
-                                properties: "scale"
-                                from: 1
-                                to: 0.95
-                            }
-                        }
-
-                        move: Transition {
-                            Anim {
-                                property: "y"
-                            }
-                            Anim {
-                                properties: "opacity,scale"
-                                to: 1
-                            }
-                        }
-
-                        addDisplaced: Transition {
-                            Anim {
-                                property: "y"
-                                duration: 200
-                            }
-                            Anim {
-                                properties: "opacity,scale"
-                                to: 1
-                            }
-                        }
-
-                        displaced: Transition {
-                            Anim {
-                                property: "y"
-                            }
-                            Anim {
-                                properties: "opacity,scale"
-                                to: 1
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
@@ -0,0 +1,220 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Modules.Launcher.Services
+import qs.Modules.Launcher.Items
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules as Modules
+
+CustomListView {
+    id: root
+
+    required property CustomTextField search
+    required property PersistentProperties visibilities
+
+    model: ScriptModel {
+        id: model
+
+        onValuesChanged: root.currentIndex = 0
+    }
+
+	verticalLayoutDirection: ListView.BottomToTop
+    spacing: Appearance.spacing.small
+    orientation: Qt.Vertical
+    implicitHeight: (Config.launcher.sizes.itemHeight + spacing) * Math.min(Config.launcher.maxAppsShown, count) - spacing
+
+    preferredHighlightBegin: 0
+    preferredHighlightEnd: height
+    highlightRangeMode: ListView.ApplyRange
+
+    highlightFollowsCurrentItem: false
+    highlight: CustomRect {
+        radius: 8
+        color: DynamicColors.palette.m3onSurface
+        opacity: 0.08
+
+        y: root.currentItem?.y ?? 0
+        implicitWidth: root.width
+        implicitHeight: root.currentItem?.implicitHeight ?? 0
+
+        Behavior on y {
+            Modules.Anim {
+                duration: Appearance.anim.durations.small
+                easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+            }
+        }
+    }
+
+    state: {
+        const text = search.text;
+        const prefix = Config.launcher.actionPrefix;
+        if (text.startsWith(prefix)) {
+            for (const action of ["calc", "scheme", "variant"])
+                if (text.startsWith(`${prefix}${action} `))
+                    return action;
+
+            return "actions";
+        }
+
+        return "apps";
+    }
+
+    states: [
+        State {
+            name: "apps"
+
+            PropertyChanges {
+                model.values: Apps.search(search.text)
+                root.delegate: appItem
+            }
+        },
+        State {
+            name: "actions"
+
+            PropertyChanges {
+                model.values: Actions.query(search.text)
+                root.delegate: actionItem
+            }
+        },
+        State {
+            name: "calc"
+
+            PropertyChanges {
+                model.values: [0]
+                root.delegate: calcItem
+            }
+        },
+    ]
+
+    transitions: Transition {
+        SequentialAnimation {
+            ParallelAnimation {
+                Modules.Anim {
+                    target: root
+                    property: "opacity"
+                    from: 1
+                    to: 0
+                    duration: Appearance.anim.durations.small
+                    easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+                }
+                Modules.Anim {
+                    target: root
+                    property: "scale"
+                    from: 1
+                    to: 0.9
+                    duration: Appearance.anim.durations.small
+                    easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+                }
+            }
+            PropertyAction {
+                targets: [model, root]
+                properties: "values,delegate"
+            }
+            ParallelAnimation {
+                Modules.Anim {
+                    target: root
+                    property: "opacity"
+                    from: 0
+                    to: 1
+                    duration: Appearance.anim.durations.small
+                    easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+                }
+                Modules.Anim {
+                    target: root
+                    property: "scale"
+                    from: 0.9
+                    to: 1
+                    duration: Appearance.anim.durations.small
+                    easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+                }
+            }
+            PropertyAction {
+                targets: [root.add, root.remove]
+                property: "enabled"
+                value: true
+            }
+        }
+    }
+
+    CustomScrollBar.vertical: CustomScrollBar {
+        flickable: root
+    }
+
+    add: Transition {
+        enabled: !root.state
+
+        Modules.Anim {
+            properties: "opacity,scale"
+            from: 0
+            to: 1
+        }
+    }
+
+    remove: Transition {
+        enabled: !root.state
+
+        Modules.Anim {
+            properties: "opacity,scale"
+            from: 1
+            to: 0
+        }
+    }
+
+    move: Transition {
+        Modules.Anim {
+            property: "y"
+        }
+        Modules.Anim {
+            properties: "opacity,scale"
+            to: 1
+        }
+    }
+
+    addDisplaced: Transition {
+        Modules.Anim {
+            property: "y"
+            duration: Appearance.anim.durations.small
+        }
+        Modules.Anim {
+            properties: "opacity,scale"
+            to: 1
+        }
+    }
+
+    displaced: Transition {
+        Modules.Anim {
+            property: "y"
+        }
+        Modules.Anim {
+            properties: "opacity,scale"
+            to: 1
+        }
+    }
+
+    Component {
+        id: appItem
+
+        AppItem {
+            visibilities: root.visibilities
+        }
+    }
+
+    Component {
+        id: actionItem
+
+        ActionItem {
+            list: root
+        }
+    }
+
+    Component {
+        id: calcItem
+
+        CalcItem {
+            list: root
+        }
+    }
+}
@@ -0,0 +1,61 @@
+import QtQuick
+import QtQuick.Shapes
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules as Modules
+
+ShapePath {
+    id: root
+
+    required property Wrapper wrapper
+    readonly property real rounding: Config.barConfig.rounding + 5
+    readonly property bool flatten: wrapper.height < rounding * 2
+    readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
+
+    strokeWidth: -1
+    fillColor: DynamicColors.palette.m3surface
+
+    PathArc {
+        relativeX: root.rounding
+        relativeY: -root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+        direction: PathArc.Counterclockwise
+    }
+    PathLine {
+        relativeX: 0
+        relativeY: -(root.wrapper.height - root.roundingY * 2)
+    }
+    PathArc {
+        relativeX: root.rounding
+        relativeY: -root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+    }
+    PathLine {
+        relativeX: root.wrapper.width - root.rounding * 2
+        relativeY: 0
+    }
+    PathArc {
+        relativeX: root.rounding
+        relativeY: root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+    }
+    PathLine {
+        relativeX: 0
+        relativeY: root.wrapper.height - root.roundingY * 2
+    }
+    PathArc {
+        relativeX: root.rounding
+        relativeY: root.roundingY
+        radiusX: root.rounding
+        radiusY: Math.min(root.rounding, root.wrapper.height)
+        direction: PathArc.Counterclockwise
+    }
+
+    Behavior on fillColor {
+        Modules.CAnim {}
+    }
+}
@@ -0,0 +1,191 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Modules.Launcher.Services
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules as Modules
+
+Item {
+    id: root
+
+    required property PersistentProperties visibilities
+    required property var panels
+    required property real maxHeight
+
+    readonly property int padding: Appearance.padding.small
+    readonly property int rounding: Appearance.rounding.large
+
+    implicitWidth: listWrapper.width + padding * 2
+    implicitHeight: searchWrapper.height + listWrapper.height + padding * 2
+
+    Item {
+        id: listWrapper
+
+        implicitWidth: list.width
+        implicitHeight: list.height + root.padding
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: searchWrapper.top
+        anchors.bottomMargin: root.padding
+
+        ContentList {
+            id: list
+
+            content: root
+            visibilities: root.visibilities
+            panels: root.panels
+            maxHeight: root.maxHeight - searchWrapper.implicitHeight - root.padding * 3
+            search: search
+            padding: root.padding
+            rounding: root.rounding
+        }
+    }
+
+    CustomRect {
+        id: searchWrapper
+
+        color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainer, 2)
+        radius: 8
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        anchors.margins: root.padding
+
+        implicitHeight: Math.max(searchIcon.implicitHeight, search.implicitHeight, clearIcon.implicitHeight)
+
+        MaterialIcon {
+            id: searchIcon
+
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            anchors.leftMargin: root.padding + 10
+
+            text: "search"
+            color: DynamicColors.palette.m3onSurfaceVariant
+        }
+
+        CustomTextField {
+            id: search
+
+            anchors.left: searchIcon.right
+            anchors.right: clearIcon.left
+            anchors.leftMargin: Appearance.spacing.small
+            anchors.rightMargin: Appearance.spacing.small
+
+            topPadding: Appearance.padding.larger
+            bottomPadding: Appearance.padding.larger
+
+            placeholderText: qsTr("Type \"%1\" for commands").arg(Config.launcher.actionPrefix)
+
+            onAccepted: {
+                const currentItem = list.currentList?.currentItem;
+                if (currentItem) {
+                    if (list.showWallpapers) {
+                        if (DynamicColors.scheme === "dynamic" && currentItem.modelData.path !== Wallpapers.actualCurrent)
+                            Wallpapers.previewColourLock = true;
+                        Wallpapers.setWallpaper(currentItem.modelData.path);
+                        root.visibilities.launcher = false;
+                    } else if (text.startsWith(Config.launcher.actionPrefix)) {
+                        if (text.startsWith(`${Config.launcher.actionPrefix}calc `))
+                            currentItem.onClicked();
+                        else
+                            currentItem.modelData.onClicked(list.currentList);
+                    } else {
+                        Apps.launch(currentItem.modelData);
+                        root.visibilities.launcher = false;
+                    }
+                }
+            }
+
+            Keys.onUpPressed: list.currentList?.incrementCurrentIndex()
+            Keys.onDownPressed: list.currentList?.decrementCurrentIndex()
+
+            Keys.onEscapePressed: root.visibilities.launcher = false
+
+            Keys.onPressed: event => {
+                if (!Config.launcher.vimKeybinds)
+                    return;
+
+                if (event.modifiers & Qt.ControlModifier) {
+                    if (event.key === Qt.Key_J) {
+                        list.currentList?.incrementCurrentIndex();
+                        event.accepted = true;
+                    } else if (event.key === Qt.Key_K) {
+                        list.currentList?.decrementCurrentIndex();
+                        event.accepted = true;
+                    }
+                } else if (event.key === Qt.Key_Tab) {
+                    list.currentList?.incrementCurrentIndex();
+                    event.accepted = true;
+                } else if (event.key === Qt.Key_Backtab || (event.key === Qt.Key_Tab && (event.modifiers & Qt.ShiftModifier))) {
+                    list.currentList?.decrementCurrentIndex();
+                    event.accepted = true;
+                }
+            }
+
+            Component.onCompleted: forceActiveFocus()
+
+            Connections {
+                target: root.visibilities
+
+                function onLauncherChanged(): void {
+                    if (!root.visibilities.launcher)
+                        search.text = "";
+                }
+
+                function onSessionChanged(): void {
+                    if (!root.visibilities.session)
+                        search.forceActiveFocus();
+                }
+            }
+        }
+
+        MaterialIcon {
+            id: clearIcon
+
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            anchors.rightMargin: root.padding + 10
+
+            width: search.text ? implicitWidth : implicitWidth / 2
+            opacity: {
+                if (!search.text)
+                    return 0;
+                if (mouse.pressed)
+                    return 0.7;
+                if (mouse.containsMouse)
+                    return 0.8;
+                return 1;
+            }
+
+            text: "close"
+            color: DynamicColors.palette.m3onSurfaceVariant
+
+            MouseArea {
+                id: mouse
+
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: search.text ? Qt.PointingHandCursor : undefined
+
+                onClicked: search.text = ""
+            }
+
+            Behavior on width {
+                Modules.Anim {
+                    duration: Appearance.anim.durations.small
+                }
+            }
+
+            Behavior on opacity {
+                Modules.Anim {
+                    duration: Appearance.anim.durations.small
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,170 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Paths
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+Item {
+    id: root
+
+    required property var content
+    required property PersistentProperties visibilities
+    required property var panels
+    required property real maxHeight
+    required property CustomTextField search
+    required property int padding
+    required property int rounding
+
+    readonly property bool showWallpapers: search.text.startsWith(`${Config.launcher.actionPrefix}wallpaper `)
+    readonly property Item currentList: showWallpapers ? wallpaperList.item : appList.item
+
+    anchors.horizontalCenter: parent.horizontalCenter
+    anchors.bottom: parent.bottom
+
+    clip: true
+    state: showWallpapers ? "wallpapers" : "apps"
+
+    states: [
+        State {
+            name: "apps"
+
+            PropertyChanges {
+                root.implicitWidth: Config.launcher.sizes.itemWidth
+                root.implicitHeight: Math.min(root.maxHeight, appList.implicitHeight > 0 ? appList.implicitHeight : empty.implicitHeight)
+                appList.active: true
+            }
+
+            AnchorChanges {
+                anchors.left: root.parent.left
+                anchors.right: root.parent.right
+            }
+        },
+        State {
+            name: "wallpapers"
+
+            PropertyChanges {
+                root.implicitWidth: Math.max(Config.launcher.sizes.itemWidth * 1.2, wallpaperList.implicitWidth)
+                root.implicitHeight: Config.launcher.sizes.wallpaperHeight
+                wallpaperList.active: true
+            }
+        }
+    ]
+
+    Behavior on state {
+        SequentialAnimation {
+            Anim {
+                target: root
+                property: "opacity"
+                from: 1
+                to: 0
+                duration: Appearance.anim.durations.small
+            }
+            PropertyAction {}
+            Anim {
+                target: root
+                property: "opacity"
+                from: 0
+                to: 1
+                duration: Appearance.anim.durations.small
+            }
+        }
+    }
+
+    Loader {
+        id: appList
+
+        active: false
+
+        anchors.fill: parent
+
+        sourceComponent: AppList {
+            search: root.search
+            visibilities: root.visibilities
+        }
+    }
+
+    Loader {
+        id: wallpaperList
+
+        active: false
+
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        sourceComponent: WallpaperList {
+            search: root.search
+            visibilities: root.visibilities
+            panels: root.panels
+            content: root.content
+        }
+    }
+
+    Row {
+        id: empty
+
+        opacity: root.currentList?.count === 0 ? 1 : 0
+        scale: root.currentList?.count === 0 ? 1 : 0.5
+
+        spacing: Appearance.spacing.normal
+        padding: Appearance.padding.large
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
+
+        MaterialIcon {
+            text: root.state === "wallpapers" ? "wallpaper_slideshow" : "manage_search"
+            color: DynamicColors.palette.m3onSurfaceVariant
+            font.pointSize: Appearance.font.size.extraLarge
+
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Column {
+            anchors.verticalCenter: parent.verticalCenter
+
+            CustomText {
+                text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results")
+                color: DynamicColors.palette.m3onSurfaceVariant
+                font.pointSize: Appearance.font.size.larger
+                font.weight: 500
+            }
+
+            CustomText {
+                text: root.state === "wallpapers" && Wallpapers.list.length === 0 ? qsTr("Try putting some wallpapers in %1").arg(Paths.shortenHome(Paths.wallsdir)) : qsTr("Try searching for something else")
+                color: DynamicColors.palette.m3onSurfaceVariant
+                font.pointSize: Appearance.font.size.normal
+            }
+        }
+
+        Behavior on opacity {
+            Anim {}
+        }
+
+        Behavior on scale {
+            Anim {}
+        }
+    }
+
+    Behavior on implicitWidth {
+        enabled: root.visibilities.launcher
+
+        Anim {
+            duration: Appearance.anim.durations.small
+            easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+        }
+    }
+
+    Behavior on implicitHeight {
+        enabled: root.visibilities.launcher
+
+        Anim {
+            duration: Appearance.anim.durations.small
+            easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+        }
+    }
+}
@@ -0,0 +1,70 @@
+import QtQuick
+import qs.Modules.Launcher.Services
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+Item {
+    id: root
+
+    required property var modelData
+    required property var list
+
+    implicitHeight: Config.launcher.sizes.itemHeight
+
+    anchors.left: parent?.left
+    anchors.right: parent?.right
+
+    StateLayer {
+        radius: Appearance.rounding.normal
+
+        function onClicked(): void {
+            root.modelData?.onClicked(root.list);
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+        anchors.leftMargin: Appearance.padding.larger
+        anchors.rightMargin: Appearance.padding.larger
+        anchors.margins: Appearance.padding.smaller
+
+        MaterialIcon {
+            id: icon
+
+            text: root.modelData?.icon ?? ""
+            font.pointSize: Appearance.font.size.extraLarge
+
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Item {
+            anchors.left: icon.right
+            anchors.leftMargin: Appearance.spacing.normal
+            anchors.verticalCenter: icon.verticalCenter
+
+            implicitWidth: parent.width - icon.width
+            implicitHeight: name.implicitHeight + desc.implicitHeight
+
+            CustomText {
+                id: name
+
+                text: root.modelData?.name ?? ""
+                font.pointSize: Appearance.font.size.normal
+            }
+
+            CustomText {
+                id: desc
+
+                text: root.modelData?.desc ?? ""
+                font.pointSize: Appearance.font.size.small
+                color: DynamicColors.palette.m3outline
+
+                elide: Text.ElideRight
+                width: root.width - icon.width - Appearance.rounding.normal * 2
+
+                anchors.top: name.bottom
+            }
+        }
+    }
+}
@@ -0,0 +1,74 @@
+import Quickshell
+import Quickshell.Widgets
+import QtQuick
+import qs.Modules.Launcher.Services
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules
+
+Item {
+    id: root
+
+    required property DesktopEntry modelData
+    required property PersistentProperties visibilities
+
+    implicitHeight: Config.launcher.sizes.itemHeight
+
+    anchors.left: parent?.left
+    anchors.right: parent?.right
+
+    StateLayer {
+        radius: 8
+
+        function onClicked(): void {
+            Apps.launch(root.modelData);
+            root.visibilities.launcher = false;
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+        anchors.leftMargin: Appearance.padding.larger
+        anchors.rightMargin: Appearance.padding.larger
+        anchors.margins: Appearance.padding.smaller
+
+        IconImage {
+            id: icon
+
+            source: Quickshell.iconPath(root.modelData?.icon, "image-missing")
+            implicitSize: parent.height
+
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Item {
+            anchors.left: icon.right
+            anchors.leftMargin: Appearance.spacing.normal
+            anchors.verticalCenter: icon.verticalCenter
+
+            implicitWidth: parent.width - icon.width
+            implicitHeight: name.implicitHeight + comment.implicitHeight
+
+            CustomText {
+                id: name
+
+                text: root.modelData?.name ?? ""
+                font.pointSize: Appearance.font.size.normal
+            }
+
+            CustomText {
+                id: comment
+
+                text: (root.modelData?.comment || root.modelData?.genericName || root.modelData?.name) ?? ""
+                font.pointSize: Appearance.font.size.small
+                color: DynamicColors.palette.m3outline
+
+                elide: Text.ElideRight
+                width: root.width - icon.width - Appearance.rounding.normal * 2
+
+                anchors.top: name.bottom
+            }
+        }
+    }
+}
@@ -0,0 +1,124 @@
+import ZShell
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Components
+import qs.Modules
+import qs.Helpers
+import qs.Config
+
+Item {
+    id: root
+
+    required property var list
+    readonly property string math: list.search.text.slice(`${Config.launcher.actionPrefix}calc `.length)
+
+    function onClicked(): void {
+        Quickshell.execDetached(["wl-copy", Qalculator.eval(math, false)]);
+        root.list.visibilities.launcher = false;
+    }
+
+    implicitHeight: Config.launcher.sizes.itemHeight
+
+    anchors.left: parent?.left
+    anchors.right: parent?.right
+
+    StateLayer {
+        radius: Appearance.rounding.normal
+
+        function onClicked(): void {
+            root.onClicked();
+        }
+    }
+
+    RowLayout {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.margins: Appearance.padding.larger
+
+        spacing: Appearance.spacing.normal
+
+        MaterialIcon {
+            text: "function"
+            font.pointSize: Appearance.font.size.extraLarge
+            Layout.alignment: Qt.AlignVCenter
+        }
+
+        CustomText {
+            id: result
+
+            color: {
+                if (text.includes("error: ") || text.includes("warning: "))
+                    return DynamicColors.palette.m3error;
+                if (!root.math)
+                    return DynamicColors.palette.m3onSurfaceVariant;
+                return DynamicColors.palette.m3onSurface;
+            }
+
+            text: root.math.length > 0 ? Qalculator.eval(root.math) : qsTr("Type an expression to calculate")
+            elide: Text.ElideLeft
+
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignVCenter
+        }
+
+        CustomRect {
+            color: DynamicColors.palette.m3tertiary
+            radius: Appearance.rounding.normal
+            clip: true
+
+            implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Appearance.padding.normal * 2
+            implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Appearance.padding.small * 2
+
+            Layout.alignment: Qt.AlignVCenter
+
+            StateLayer {
+                id: stateLayer
+
+                color: DynamicColors.palette.m3onTertiary
+
+                function onClicked(): void {
+                    Quickshell.execDetached(["app2unit", "--", ...Config.general.apps.terminal, "fish", "-C", `exec qalc -i '${root.math}'`]);
+                    root.list.visibilities.launcher = false;
+                }
+            }
+
+            CustomText {
+                id: label
+
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: icon.left
+                anchors.rightMargin: Appearance.spacing.small
+
+                text: qsTr("Open in calculator")
+                color: DynamicColors.palette.m3onTertiary
+                font.pointSize: Appearance.font.size.normal
+
+                opacity: stateLayer.containsMouse ? 1 : 0
+
+                Behavior on opacity {
+                    Anim {}
+                }
+            }
+
+            MaterialIcon {
+                id: icon
+
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.right: parent.right
+                anchors.rightMargin: Appearance.padding.normal
+
+                text: "open_in_new"
+                color: DynamicColors.palette.m3onTertiary
+                font.pointSize: Appearance.font.size.large
+            }
+
+            Behavior on implicitWidth {
+                Anim {
+                    easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,98 @@
+import ZShell.Models
+import Quickshell
+import QtQuick
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules
+
+Item {
+    id: root
+
+    required property FileSystemEntry modelData
+    required property PersistentProperties visibilities
+
+    scale: 0.5
+    opacity: 0
+    z: PathView.z ?? 0
+
+    Component.onCompleted: {
+        scale = Qt.binding(() => PathView.isCurrentItem ? 1 : PathView.onPath ? 0.8 : 0);
+        opacity = Qt.binding(() => PathView.onPath ? 1 : 0);
+    }
+
+    implicitWidth: image.width + Appearance.padding.larger * 2
+    implicitHeight: image.height + label.height + Appearance.spacing.small / 2 + Appearance.padding.large + Appearance.padding.normal
+
+    StateLayer {
+        radius: Appearance.rounding.normal
+
+        function onClicked(): void {
+			console.log(root.modelData.path);
+            Wallpapers.setWallpaper(root.modelData.path);
+            root.visibilities.launcher = false;
+        }
+    }
+
+    Elevation {
+        anchors.fill: image
+        radius: image.radius
+        opacity: root.PathView.isCurrentItem ? 1 : 0
+        level: 4
+
+        Behavior on opacity {
+            Anim {}
+        }
+    }
+
+    CustomClippingRect {
+        id: image
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: Appearance.padding.large
+        color: DynamicColors.tPalette.m3surfaceContainer
+        radius: Appearance.rounding.normal
+
+        implicitWidth: Config.launcher.sizes.wallpaperWidth
+        implicitHeight: implicitWidth / 16 * 9
+
+        MaterialIcon {
+            anchors.centerIn: parent
+            text: "image"
+            color: DynamicColors.tPalette.m3outline
+            font.pointSize: Appearance.font.size.extraLarge * 2
+            font.weight: 600
+        }
+
+        CachingImage {
+            path: root.modelData.path
+            smooth: !root.PathView.view.moving
+            cache: true
+
+            anchors.fill: parent
+        }
+    }
+
+    CustomText {
+        id: label
+
+        anchors.top: image.bottom
+        anchors.topMargin: Appearance.spacing.small / 2
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        width: image.width - Appearance.padding.normal * 2
+        horizontalAlignment: Text.AlignHCenter
+        elide: Text.ElideRight
+        renderType: Text.QtRendering
+        text: root.modelData.relativePath
+        font.pointSize: Appearance.font.size.normal
+    }
+
+    Behavior on scale {
+        Anim {}
+    }
+
+    Behavior on opacity {
+        Anim {}
+    }
+}
@@ -0,0 +1,51 @@
+pragma Singleton
+
+import qs.Modules.Launcher
+import qs.Helpers
+import qs.Config
+import Quickshell
+import QtQuick
+
+Searcher {
+    id: root
+
+    function transformSearch(search: string): string {
+        return search.slice(Config.launcher.actionPrefix.length);
+    }
+
+    list: variants.instances
+    useFuzzy: Config.launcher.useFuzzy.actions
+
+    Variants {
+        id: variants
+
+        model: Config.launcher.actions.filter(a => (a.enabled ?? true))
+
+        Action {}
+    }
+
+    component Action: QtObject {
+        required property var modelData
+        readonly property string name: modelData.name ?? qsTr("Unnamed")
+        readonly property string desc: modelData.description ?? qsTr("No description")
+        readonly property string icon: modelData.icon ?? "help_outline"
+        readonly property list<string> command: modelData.command ?? []
+        readonly property bool enabled: modelData.enabled ?? true
+        readonly property bool dangerous: modelData.dangerous ?? false
+
+        function onClicked(list: AppList): void {
+            if (command.length === 0)
+                return;
+
+            if (command[0] === "autocomplete" && command.length > 1) {
+                list.search.text = `${Config.launcher.actionPrefix}${command[1]} `;
+            } else if (command[0] === "setMode" && command.length > 1) {
+                list.visibilities.launcher = false;
+                Colours.setMode(command[1]);
+            } else {
+                list.visibilities.launcher = false;
+                Quickshell.execDetached(command);
+            }
+        }
+    }
+}
@@ -2,26 +2,31 @@ pragma Singleton

 import ZShell
 import Quickshell
-import Quickshell.Io
+import qs.Config
+import qs.Helpers
+import qs.Paths

 Searcher {
    id: root

-    readonly property string home: Quickshell.env("HOME")
-
    function launch(entry: DesktopEntry): void {
        appDb.incrementFrequency(entry.id);

-        console.log( "Search command:", entry.command );
-
-        Quickshell.execDetached({
-            command: ["app2unit", "--", ...entry.command],
-            workingDirectory: entry.workingDirectory || Quickshell.env("HOME")
-        });
+        if (entry.runInTerminal)
+            Quickshell.execDetached({
+                command: ["app2unit", "--", ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command],
+                workingDirectory: entry.workingDirectory
+            });
+        else
+            Quickshell.execDetached({
+                command: ["app2unit", "--", ...entry.command],
+                workingDirectory: entry.workingDirectory
+            });
    }

    function search(search: string): list<var> {
-        const prefix = ">";
+        const prefix = Config.launcher.specialPrefix;
+
        if (search.startsWith(`${prefix}i `)) {
            keys = ["id", "name"];
            weights = [0.9, 0.1];
@@ -62,12 +67,12 @@ Searcher {
    }

    list: appDb.apps
-    useFuzzy: true
+    useFuzzy: Config.launcher.useFuzzy.apps

    AppDb {
        id: appDb

-        path: `${root.home}/.local/share/z-cast-qt/apps.sqlite`
+        path: `${Paths.state}/apps.sqlite`
        entries: DesktopEntries.applications.values
    }
 }
@@ -0,0 +1,97 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules.Launcher.Items
+
+PathView {
+    id: root
+
+    required property CustomTextField search
+    required property var visibilities
+    required property var panels
+    required property var content
+
+    readonly property int itemWidth: Config.launcher.sizes.wallpaperWidth * 0.8 + Appearance.padding.larger * 2
+
+    readonly property int numItems: {
+        const screen = QsWindow.window?.screen;
+        if (!screen)
+            return 0;
+
+        // Screen width - 4x outer rounding - 2x max side thickness (cause centered)
+        const barMargins = panels.bar.implicitWidth;
+        let outerMargins = 0;
+        if (panels.popouts.hasCurrent && panels.popouts.currentCenter + panels.popouts.nonAnimHeight / 2 > screen.height - content.implicitHeight)
+            outerMargins = panels.popouts.nonAnimWidth;
+        if ((visibilities.utilities || visibilities.sidebar) && panels.utilities.implicitWidth > outerMargins)
+            outerMargins = panels.utilities.implicitWidth;
+        const maxWidth = screen.width - Config.barConfig.rounding * 4 - (barMargins + outerMargins) * 2;
+
+        if (maxWidth <= 0)
+            return 0;
+
+        const maxItemsOnScreen = Math.floor(maxWidth / itemWidth);
+        const visible = Math.min(maxItemsOnScreen, Config.launcher.maxWallpapers, scriptModel.values.length);
+
+        if (visible === 2)
+            return 1;
+        if (visible > 1 && visible % 2 === 0)
+            return visible - 1;
+        return visible;
+    }
+
+    model: ScriptModel {
+        id: scriptModel
+
+        readonly property string search: root.search.text.split(" ").slice(1).join(" ")
+
+        values: Wallpapers.query(search)
+        onValuesChanged: root.currentIndex = search ? 0 : values.findIndex(w => w.path === Wallpapers.actualCurrent)
+    }
+
+    Component.onCompleted: currentIndex = Wallpapers.list.findIndex(w => w.path === Wallpapers.actualCurrent)
+    Component.onDestruction: Wallpapers.stopPreview()
+
+    onCurrentItemChanged: {
+        if (currentItem)
+            Wallpapers.preview(currentItem.modelData.path);
+    }
+
+    implicitWidth: Math.min(numItems, count) * itemWidth
+    pathItemCount: numItems
+    cacheItemCount: 4
+
+    snapMode: PathView.SnapToItem
+    preferredHighlightBegin: 0.5
+    preferredHighlightEnd: 0.5
+    highlightRangeMode: PathView.StrictlyEnforceRange
+
+    delegate: WallpaperItem {
+        visibilities: root.visibilities
+    }
+
+    path: Path {
+        startY: root.height / 2
+
+        PathAttribute {
+            name: "z"
+            value: 0
+        }
+        PathLine {
+            x: root.width / 2
+            relativeY: 0
+        }
+        PathAttribute {
+            name: "z"
+            value: 1
+        }
+        PathLine {
+            x: root.width
+            relativeY: 0
+        }
+    }
+}
@@ -0,0 +1,131 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Components
+import qs.Config
+import qs.Modules as Modules
+
+Item {
+    id: root
+
+    required property ShellScreen screen
+    required property PersistentProperties visibilities
+    required property var panels
+
+    readonly property bool shouldBeActive: visibilities.launcher
+    property int contentHeight
+
+    readonly property real maxHeight: {
+        let max = screen.height - Appearance.spacing.large;
+        if (visibilities.dashboard)
+            max -= panels.dashboard.nonAnimHeight;
+        return max;
+    }
+
+    onMaxHeightChanged: timer.start()
+
+    visible: height > 0
+    implicitHeight: 0
+    implicitWidth: content.implicitWidth
+
+    onShouldBeActiveChanged: {
+        if (shouldBeActive) {
+            timer.stop();
+            hideAnim.stop();
+            showAnim.start();
+        } else {
+            showAnim.stop();
+            hideAnim.start();
+        }
+    }
+
+    SequentialAnimation {
+        id: showAnim
+
+        Modules.Anim {
+            target: root
+            property: "implicitHeight"
+            to: root.contentHeight
+            duration: Appearance.anim.durations.small
+            easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+        }
+        ScriptAction {
+            script: root.implicitHeight = Qt.binding(() => content.implicitHeight)
+        }
+    }
+
+    SequentialAnimation {
+        id: hideAnim
+
+        ScriptAction {
+            script: root.implicitHeight = root.implicitHeight
+        }
+        Modules.Anim {
+            target: root
+            property: "implicitHeight"
+            to: 0
+            easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+        }
+    }
+
+    Connections {
+        target: Config.launcher
+
+        function onEnabledChanged(): void {
+            timer.start();
+        }
+
+        function onMaxShownChanged(): void {
+            timer.start();
+        }
+    }
+
+    Connections {
+        target: DesktopEntries.applications
+
+        function onValuesChanged(): void {
+            if (DesktopEntries.applications.values.length < Config.launcher.maxAppsShown)
+                timer.start();
+        }
+    }
+
+    Timer {
+        id: timer
+
+        interval: Appearance.anim.durations.small
+        onRunningChanged: {
+            if (running && !root.shouldBeActive) {
+                content.visible = false;
+                content.active = true;
+            } else {
+                root.contentHeight = Math.min(root.maxHeight, content.implicitHeight);
+                content.active = Qt.binding(() => root.shouldBeActive || root.visible);
+                content.visible = true;
+                if (showAnim.running) {
+                    showAnim.stop();
+                    showAnim.start();
+                }
+            }
+        }
+    }
+
+    Loader {
+        id: content
+
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        visible: false
+        active: false
+        Component.onCompleted: timer.start()
+
+        sourceComponent: Content {
+            visibilities: root.visibilities
+            panels: root.panels
+            maxHeight: root.maxHeight
+
+            Component.onCompleted: root.contentHeight = implicitHeight
+        }
+    }
+}
@@ -0,0 +1,399 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Paths
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules
+
+ColumnLayout {
+    id: root
+
+    required property var lock
+    readonly property real centerScale: Math.min(1, (lock.screen?.height ?? 1440) / 1440)
+    readonly property int centerWidth: Config.lock.sizes.centerWidth * centerScale
+
+    Layout.preferredWidth: centerWidth
+    Layout.fillWidth: false
+    Layout.fillHeight: true
+
+    spacing: Appearance.spacing.large * 2
+
+    RowLayout {
+        Layout.alignment: Qt.AlignHCenter
+        spacing: Appearance.spacing.small
+
+        CustomText {
+            Layout.alignment: Qt.AlignVCenter
+            text: Time.hourStr
+            color: DynamicColors.palette.m3secondary
+            font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale)
+            font.family: Appearance.font.family.clock
+            font.bold: true
+        }
+
+        CustomText {
+            Layout.alignment: Qt.AlignVCenter
+            text: ":"
+            color: DynamicColors.palette.m3primary
+            font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale)
+            font.family: Appearance.font.family.clock
+            font.bold: true
+        }
+
+        CustomText {
+            Layout.alignment: Qt.AlignVCenter
+            text: Time.minuteStr
+            color: DynamicColors.palette.m3secondary
+            font.pointSize: Math.floor(Appearance.font.size.extraLarge * 3 * root.centerScale)
+            font.family: Appearance.font.family.clock
+            font.bold: true
+        }
+    }
+
+    CustomText {
+        Layout.alignment: Qt.AlignHCenter
+        Layout.topMargin: -Appearance.padding.large * 2
+
+        text: Time.format("dddd, d MMMM yyyy")
+        color: DynamicColors.palette.m3tertiary
+        font.pointSize: Math.floor(Appearance.font.size.extraLarge * root.centerScale)
+        font.family: Appearance.font.family.mono
+        font.bold: true
+    }
+
+    CustomClippingRect {
+        Layout.topMargin: Appearance.spacing.large * 2
+        Layout.alignment: Qt.AlignHCenter
+
+        implicitWidth: root.centerWidth / 2
+        implicitHeight: root.centerWidth / 2
+
+        color: DynamicColors.tPalette.m3surfaceContainer
+        radius: Appearance.rounding.full
+
+        MaterialIcon {
+            anchors.centerIn: parent
+
+            text: "person"
+            color: DynamicColors.palette.m3onSurfaceVariant
+            font.pointSize: Math.floor(root.centerWidth / 4)
+        }
+
+        CachingImage {
+            id: pfp
+
+            anchors.fill: parent
+            path: `${Paths.home}/.face`
+        }
+    }
+
+    CustomRect {
+        Layout.alignment: Qt.AlignHCenter
+
+        implicitWidth: root.centerWidth * 0.8
+        implicitHeight: input.implicitHeight + Appearance.padding.small * 2
+
+        color: DynamicColors.tPalette.m3surfaceContainer
+        radius: Appearance.rounding.full
+
+        focus: true
+        onActiveFocusChanged: {
+            if (!activeFocus)
+                forceActiveFocus();
+        }
+
+        Keys.onPressed: event => {
+            if (root.lock.unlocking)
+                return;
+
+            if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return)
+                inputField.placeholder.animate = false;
+
+            root.lock.pam.handleKey(event);
+        }
+
+        StateLayer {
+            hoverEnabled: false
+            cursorShape: Qt.IBeamCursor
+
+            function onClicked(): void {
+                parent.forceActiveFocus();
+            }
+        }
+
+        RowLayout {
+            id: input
+
+            anchors.fill: parent
+            anchors.margins: Appearance.padding.small
+            spacing: Appearance.spacing.normal
+
+            Item {
+                implicitWidth: implicitHeight
+                implicitHeight: fprintIcon.implicitHeight + Appearance.padding.small * 2
+
+                MaterialIcon {
+                    id: fprintIcon
+
+                    anchors.centerIn: parent
+                    animate: true
+                    text: {
+                        if (root.lock.pam.fprint.tries >= Config.lock.maxFprintTries)
+                            return "fingerprint_off";
+                        if (root.lock.pam.fprint.active)
+                            return "fingerprint";
+                        return "lock";
+                    }
+                    color: root.lock.pam.fprint.tries >= Config.lock.maxFprintTries ? DynamicColors.palette.m3error : DynamicColors.palette.m3onSurface
+                    opacity: root.lock.pam.passwd.active ? 0 : 1
+
+                    Behavior on opacity {
+                        Anim {}
+                    }
+                }
+
+                CircularIndicator {
+                    anchors.fill: parent
+                    running: root.lock.pam.passwd.active
+                }
+            }
+
+            InputField {
+                id: inputField
+
+                pam: root.lock.pam
+            }
+
+            CustomRect {
+                implicitWidth: implicitHeight
+                implicitHeight: enterIcon.implicitHeight + Appearance.padding.small * 2
+
+                color: root.lock.pam.buffer ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
+                radius: Appearance.rounding.full
+
+                StateLayer {
+                    color: root.lock.pam.buffer ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+
+                    function onClicked(): void {
+                        root.lock.pam.passwd.start();
+                    }
+                }
+
+                MaterialIcon {
+                    id: enterIcon
+
+                    anchors.centerIn: parent
+                    text: "arrow_forward"
+                    color: root.lock.pam.buffer ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+                    font.weight: 500
+                }
+            }
+        }
+    }
+
+    Item {
+        Layout.fillWidth: true
+        Layout.topMargin: -Appearance.spacing.large
+
+        implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
+
+        Behavior on implicitHeight {
+            Anim {}
+        }
+
+        CustomText {
+            id: stateMessage
+
+            readonly property string msg: {
+                if (Hypr.kbLayout !== Hypr.defaultKbLayout) {
+                    if (Hypr.capsLock && Hypr.numLock)
+                        return qsTr("Caps lock and Num lock are ON.\nKeyboard layout: %1").arg(Hypr.kbLayoutFull);
+                    if (Hypr.capsLock)
+                        return qsTr("Caps lock is ON. Kb layout: %1").arg(Hypr.kbLayoutFull);
+                    if (Hypr.numLock)
+                        return qsTr("Num lock is ON. Kb layout: %1").arg(Hypr.kbLayoutFull);
+                    return qsTr("Keyboard layout: %1").arg(Hypr.kbLayoutFull);
+                }
+
+                if (Hypr.capsLock && Hypr.numLock)
+                    return qsTr("Caps lock and Num lock are ON.");
+                if (Hypr.capsLock)
+                    return qsTr("Caps lock is ON.");
+                if (Hypr.numLock)
+                    return qsTr("Num lock is ON.");
+
+                return "";
+            }
+
+            property bool shouldBeVisible
+
+            onMsgChanged: {
+                if (msg) {
+                    if (opacity > 0) {
+                        animate = true;
+                        text = msg;
+                        animate = false;
+                    } else {
+                        text = msg;
+                    }
+                    shouldBeVisible = true;
+                } else {
+                    shouldBeVisible = false;
+                }
+            }
+
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            scale: shouldBeVisible && !message.msg ? 1 : 0.7
+            opacity: shouldBeVisible && !message.msg ? 1 : 0
+            color: DynamicColors.palette.m3onSurfaceVariant
+            animateProp: "opacity"
+
+            font.family: Appearance.font.family.mono
+            horizontalAlignment: Qt.AlignHCenter
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            lineHeight: 1.2
+
+            Behavior on scale {
+                Anim {}
+            }
+
+            Behavior on opacity {
+                Anim {}
+            }
+        }
+
+        CustomText {
+            id: message
+
+            readonly property Pam pam: root.lock.pam
+            readonly property string msg: {
+                if (pam.fprintState === "error")
+                    return qsTr("FP ERROR: %1").arg(pam.fprint.message);
+                if (pam.state === "error")
+                    return qsTr("PW ERROR: %1").arg(pam.passwd.message);
+
+                if (pam.lockMessage)
+                    return pam.lockMessage;
+
+                if (pam.state === "max" && pam.fprintState === "max")
+                    return qsTr("Maximum password and fingerprint attempts reached.");
+                if (pam.state === "max") {
+                    if (pam.fprint.available)
+                        return qsTr("Maximum password attempts reached. Please use fingerprint.");
+                    return qsTr("Maximum password attempts reached.");
+                }
+                if (pam.fprintState === "max")
+                    return qsTr("Maximum fingerprint attempts reached. Please use password.");
+
+                if (pam.state === "fail") {
+                    if (pam.fprint.available)
+                        return qsTr("Incorrect password. Please try again or use fingerprint.");
+                    return qsTr("Incorrect password. Please try again.");
+                }
+                if (pam.fprintState === "fail")
+                    return qsTr("Fingerprint not recognized (%1/%2). Please try again or use password.").arg(pam.fprint.tries).arg(Config.lock.maxFprintTries);
+
+                return "";
+            }
+
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            scale: 0.7
+            opacity: 0
+            color: DynamicColors.palette.m3error
+
+            font.pointSize: Appearance.font.size.small
+            font.family: Appearance.font.family.mono
+            horizontalAlignment: Qt.AlignHCenter
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+
+            onMsgChanged: {
+                if (msg) {
+                    if (opacity > 0) {
+                        animate = true;
+                        text = msg;
+                        animate = false;
+
+                        exitAnim.stop();
+                        if (scale < 1)
+                            appearAnim.restart();
+                        else
+                            flashAnim.restart();
+                    } else {
+                        text = msg;
+                        exitAnim.stop();
+                        appearAnim.restart();
+                    }
+                } else {
+                    appearAnim.stop();
+                    flashAnim.stop();
+                    exitAnim.start();
+                }
+            }
+
+            Connections {
+                target: root.lock.pam
+
+                function onFlashMsg(): void {
+                    exitAnim.stop();
+                    if (message.scale < 1)
+                        appearAnim.restart();
+                    else
+                        flashAnim.restart();
+                }
+            }
+
+            Anim {
+                id: appearAnim
+
+                target: message
+                properties: "scale,opacity"
+                to: 1
+                onFinished: flashAnim.restart()
+            }
+
+            SequentialAnimation {
+                id: flashAnim
+
+                loops: 2
+
+                FlashAnim {
+                    to: 0.3
+                }
+                FlashAnim {
+                    to: 1
+                }
+            }
+
+            ParallelAnimation {
+                id: exitAnim
+
+                Anim {
+                    target: message
+                    property: "scale"
+                    to: 0.7
+                    duration: Appearance.anim.durations.large
+                }
+                Anim {
+                    target: message
+                    property: "opacity"
+                    to: 0
+                    duration: Appearance.anim.durations.large
+                }
+            }
+        }
+    }
+
+    component FlashAnim: NumberAnimation {
+        target: message
+        property: "opacity"
+        duration: Appearance.anim.durations.small
+        easing.type: Easing.Linear
+    }
+}
@@ -0,0 +1,82 @@
+import QtQuick
+import QtQuick.Layouts
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+RowLayout {
+    id: root
+
+    required property var lock
+
+    spacing: Appearance.spacing.large * 2
+
+    ColumnLayout {
+        Layout.fillWidth: true
+        spacing: Appearance.spacing.normal
+
+        CustomRect {
+            Layout.fillWidth: true
+            implicitHeight: weather.implicitHeight
+
+            topLeftRadius: Appearance.rounding.large
+            radius: Appearance.rounding.small
+            color: DynamicColors.tPalette.m3surfaceContainer
+
+            WeatherInfo {
+                id: weather
+
+                rootHeight: root.height
+            }
+        }
+
+        CustomRect {
+            Layout.fillWidth: true
+            implicitHeight: resources.implicitHeight
+
+            radius: Appearance.rounding.small
+            color: DynamicColors.tPalette.m3surfaceContainer
+
+            Resources {
+				id: resources
+			}
+        }
+
+        CustomClippingRect {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            bottomLeftRadius: Appearance.rounding.large
+            radius: Appearance.rounding.small
+            color: DynamicColors.tPalette.m3surfaceContainer
+
+            Media {
+                id: media
+
+                lock: root.lock
+            }
+        }
+    }
+
+    Center {
+        lock: root.lock
+    }
+
+    ColumnLayout {
+        Layout.fillWidth: true
+        spacing: Appearance.spacing.normal
+        CustomRect {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            topRightRadius: Appearance.rounding.large
+            bottomRightRadius: Appearance.rounding.large
+            radius: Appearance.rounding.small
+            color: DynamicColors.tPalette.m3surfaceContainer
+
+            NotifDock {
+                lock: root.lock
+            }
+        }
+    }
+}
@@ -0,0 +1,164 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell.Services.UPower
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+ColumnLayout {
+    id: root
+
+    anchors.fill: parent
+    anchors.margins: Appearance.padding.large * 2
+    anchors.topMargin: Appearance.padding.large
+
+    spacing: Appearance.spacing.small
+
+    RowLayout {
+        Layout.fillWidth: true
+        Layout.fillHeight: false
+        spacing: Appearance.spacing.normal
+
+        CustomRect {
+            implicitWidth: prompt.implicitWidth + Appearance.padding.normal * 2
+            implicitHeight: prompt.implicitHeight + Appearance.padding.normal * 2
+
+            color: DynamicColors.palette.m3primary
+            radius: Appearance.rounding.small
+
+            MonoText {
+                id: prompt
+
+                anchors.centerIn: parent
+                text: ">"
+                font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal
+                color: DynamicColors.palette.m3onPrimary
+            }
+        }
+
+        MonoText {
+            Layout.fillWidth: true
+            text: "caelestiafetch.sh"
+            font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal
+            elide: Text.ElideRight
+        }
+
+        WrappedLoader {
+            Layout.fillHeight: true
+            active: !iconLoader.active
+
+            sourceComponent: OsLogo {}
+        }
+    }
+
+    RowLayout {
+        Layout.fillWidth: true
+        Layout.fillHeight: false
+        spacing: height * 0.15
+
+        WrappedLoader {
+            id: iconLoader
+
+            Layout.fillHeight: true
+            active: root.width > 320
+
+            sourceComponent: OsLogo {}
+        }
+
+        ColumnLayout {
+            Layout.fillWidth: true
+            Layout.topMargin: Appearance.padding.normal
+            Layout.bottomMargin: Appearance.padding.normal
+            Layout.leftMargin: iconLoader.active ? 0 : width * 0.1
+            spacing: Appearance.spacing.normal
+
+            WrappedLoader {
+                Layout.fillWidth: true
+                active: !batLoader.active && root.height > 200
+
+                sourceComponent: FetchText {
+                    text: `OS  : ${SystemInfo.osPrettyName || SysInfo.osName}`
+                }
+            }
+
+            WrappedLoader {
+                Layout.fillWidth: true
+                active: root.height > (batLoader.active ? 200 : 110)
+
+                sourceComponent: FetchText {
+                    text: `WM  : ${SystemInfo.wm}`
+                }
+            }
+
+            WrappedLoader {
+                Layout.fillWidth: true
+                active: !batLoader.active || root.height > 110
+
+                sourceComponent: FetchText {
+                    text: `USER: ${SystemInfo.user}`
+                }
+            }
+
+            FetchText {
+                text: `UP  : ${SystemInfo.uptime}`
+            }
+
+            WrappedLoader {
+                id: batLoader
+
+                Layout.fillWidth: true
+                active: UPower.displayDevice.isLaptopBattery
+
+                sourceComponent: FetchText {
+                    text: `BATT: ${[UPowerDeviceState.Charging, UPowerDeviceState.FullyCharged, UPowerDeviceState.PendingCharge].includes(UPower.displayDevice.state) ? "(+) " : ""}${Math.round(UPower.displayDevice.percentage * 100)}%`
+                }
+            }
+        }
+    }
+
+    WrappedLoader {
+        Layout.alignment: Qt.AlignHCenter
+        active: root.height > 180
+
+        sourceComponent: RowLayout {
+            spacing: Appearance.spacing.large
+
+            Repeater {
+                model: Math.max(0, Math.min(8, root.width / (Appearance.font.size.larger * 2 + Appearance.spacing.large)))
+
+                CustomRect {
+                    required property int index
+
+                    implicitWidth: implicitHeight
+                    implicitHeight: Appearance.font.size.larger * 2
+                    color: DynamicColors.palette[`term${index}`]
+                    radius: Appearance.rounding.small
+                }
+            }
+        }
+    }
+
+    component WrappedLoader: Loader {
+        visible: active
+    }
+
+    component OsLogo: ColoredIcon {
+        source: SystemInfo.osLogo
+        implicitSize: height
+        color: DynamicColors.palette.m3primary
+        layer.enabled: Config.lock.recolorLogo || SystemInfo.isDefaultLogo
+    }
+
+    component FetchText: MonoText {
+        Layout.fillWidth: true
+        font.pointSize: root.width > 400 ? Appearance.font.size.larger : Appearance.font.size.normal
+        elide: Text.ElideRight
+    }
+
+    component MonoText: CustomText {
+        font.family: Appearance.font.family.mono
+    }
+}
@@ -26,7 +26,7 @@ Scope {
 	}

 	Variants {
-		model: Config.idle.timeouts
+		model: Config.general.idle.timeouts

 		IdleMonitor {
 			required property var modelData
@@ -0,0 +1,150 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+Item {
+    id: root
+
+    required property Pam pam
+    readonly property alias placeholder: placeholder
+    property string buffer
+
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+
+    clip: true
+
+    Connections {
+        target: root.pam
+
+        function onBufferChanged(): void {
+            if (root.pam.buffer.length > root.buffer.length) {
+                charList.bindImWidth();
+            } else if (root.pam.buffer.length === 0) {
+                charList.implicitWidth = charList.implicitWidth;
+                placeholder.animate = true;
+            }
+
+            root.buffer = root.pam.buffer;
+        }
+    }
+
+    CustomText {
+        id: placeholder
+
+        anchors.centerIn: parent
+
+        text: {
+            if (root.pam.passwd.active)
+                return qsTr("Loading...");
+            if (root.pam.state === "max")
+                return qsTr("You have reached the maximum number of tries");
+            return qsTr("Enter your password");
+        }
+
+        animate: true
+        color: root.pam.passwd.active ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline
+        font.pointSize: Appearance.font.size.normal
+        font.family: Appearance.font.family.mono
+
+        opacity: root.buffer ? 0 : 1
+
+        Behavior on opacity {
+            Anim {}
+        }
+    }
+
+    ListView {
+        id: charList
+
+        readonly property int fullWidth: count * (implicitHeight + spacing) - spacing
+
+        function bindImWidth(): void {
+            imWidthBehavior.enabled = false;
+            implicitWidth = Qt.binding(() => fullWidth);
+            imWidthBehavior.enabled = true;
+        }
+
+        anchors.centerIn: parent
+        anchors.horizontalCenterOffset: implicitWidth > root.width ? -(implicitWidth - root.width) / 2 : 0
+
+        implicitWidth: fullWidth
+        implicitHeight: Appearance.font.size.normal
+
+        orientation: Qt.Horizontal
+        spacing: Appearance.spacing.small / 2
+        interactive: false
+
+        model: ScriptModel {
+            values: root.buffer.split("")
+        }
+
+        delegate: CustomRect {
+            id: ch
+
+            implicitWidth: implicitHeight
+            implicitHeight: charList.implicitHeight
+
+            color: DynamicColors.palette.m3onSurface
+            radius: Appearance.rounding.small / 2
+
+            opacity: 0
+            scale: 0
+            Component.onCompleted: {
+                opacity = 1;
+                scale = 1;
+            }
+            ListView.onRemove: removeAnim.start()
+
+            SequentialAnimation {
+                id: removeAnim
+
+                PropertyAction {
+                    target: ch
+                    property: "ListView.delayRemove"
+                    value: true
+                }
+                ParallelAnimation {
+                    Anim {
+                        target: ch
+                        property: "opacity"
+                        to: 0
+                    }
+                    Anim {
+                        target: ch
+                        property: "scale"
+                        to: 0.5
+                    }
+                }
+                PropertyAction {
+                    target: ch
+                    property: "ListView.delayRemove"
+                    value: false
+                }
+            }
+
+            Behavior on opacity {
+                Anim {}
+            }
+
+            Behavior on scale {
+                Anim {
+                    duration: Appearance.anim.durations.expressiveFastSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+                }
+            }
+        }
+
+        Behavior on implicitWidth {
+            id: imWidthBehavior
+
+            Anim {}
+        }
+    }
+}
@@ -3,8 +3,10 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Hyprland
+import Quickshell.Io
 import QtQuick
 import QtQuick.Effects
+import qs.Components
 import qs.Config

 Scope {
@@ -13,18 +15,6 @@ Scope {
 	property alias lock: lock
 	property int seenOnce: 0

-	Timer {
-		interval: 500
-		running: true
-		repeat: false
-		onTriggered: {
-			if ( Config.lock.fixLockScreen ) {
-				Quickshell.execDetached(["hyprctl", "keyword", "misc:session_lock_xray", "true"]);
-				console.log("Fixed lock screen X-ray issue.");
-			}
-		}
-	}
-
 	WlSessionLock {
 		id: lock

@@ -35,7 +25,6 @@ Scope {
 			id: lockSurface
 			lock: lock
 			pam: pam
-			scope: root
 		}
 	}

@@ -45,10 +34,17 @@ Scope {
 		lock: lock
 	}

-	GlobalShortcut {
+	IpcHandler {
+		target: "lock"
+
+		function lock() {
+			return lock.locked = true;
+		}
+	}
+
+	CustomShortcut {
 		name: "lock"
 		description: "Lock the current session"
-		appid: "zshell-lock"
 		onPressed: {
 			lock.locked = true;
 		}
@@ -10,379 +10,188 @@ import qs.Config
 import qs.Helpers
 import qs.Effects
 import qs.Components
-import qs.Modules
+import qs.Modules as Modules

 WlSessionLockSurface {
-	id: root
+    id: root

-	required property WlSessionLock lock
-	required property Pam pam
-	required property Scope scope
+    required property WlSessionLock lock
+    required property Pam pam

-	property string buffer
+    readonly property alias unlocking: unlockAnim.running

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

-	Connections {
-		target: root.pam
+    Connections {
+        target: root.lock

-		function onBufferChanged(): void {
-			if (root.pam.buffer.length > root.buffer.length) {
-				charList.bindImWidth();
-			} else if (root.pam.buffer.length === 0) {
-				charList.implicitWidth = charList.implicitWidth;
-			}
+        function onUnlock(): void {
+            unlockAnim.start();
+        }
+    }

-			root.buffer = root.pam.buffer;
-		}
-	}
+    SequentialAnimation {
+        id: unlockAnim

-	Timer {
-		interval: 5
-		running: true
-		repeat: false
-		onTriggered: {
-			if ( Config.lock.fixLockScreen && root.scope.seenOnce === 0 ) {
-				Quickshell.execDetached(["hyprctl", "keyword", "misc:session_lock_xray", "false;"]);
-				root.scope.seenOnce += 1;
-			}
-		}
-	}
+        ParallelAnimation {
+            Modules.Anim {
+                target: lockContent
+                properties: "implicitWidth,implicitHeight"
+                to: lockContent.size
+                duration: Appearance.anim.durations.expressiveDefaultSpatial
+                easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+            }
+            Modules.Anim {
+                target: lockBg
+                property: "radius"
+                to: lockContent.radius
+            }
+            Modules.Anim {
+                target: content
+                property: "scale"
+                to: 0
+                duration: Appearance.anim.durations.expressiveDefaultSpatial
+                easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+            }
+            Modules.Anim {
+                target: content
+                property: "opacity"
+                to: 0
+                duration: Appearance.anim.durations.small
+            }
+            Modules.Anim {
+                target: lockIcon
+                property: "opacity"
+                to: 1
+                duration: Appearance.anim.durations.large
+            }
+            SequentialAnimation {
+                PauseAnimation {
+                    duration: Appearance.anim.durations.small
+                }
+                Modules.Anim {
+                    target: lockContent
+                    property: "opacity"
+                    to: 0
+                }
+            }
+        }
+        PropertyAction {
+            target: root.lock
+            property: "locked"
+            value: false
+        }
+    }

-	TextInput {
-		id: hiddenInput
-		focus: true
-		visible: false
+    ParallelAnimation {
+        id: initAnim

-		Keys.onPressed: function(event: KeyEvent): void {
-			root.pam.handleKey(event);
-			event.accepted = true;
-		}
+        running: true

-		onTextChanged: text = ""
-	}
+        SequentialAnimation {
+            ParallelAnimation {
+                Modules.Anim {
+                    target: lockContent
+                    property: "scale"
+                    to: 1
+                    duration: Appearance.anim.durations.expressiveFastSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+                }
+            }
+            ParallelAnimation {
+                Modules.Anim {
+                    target: lockIcon
+                    property: "opacity"
+                    to: 0
+                }
+                Modules.Anim {
+                    target: content
+                    property: "opacity"
+                    to: 1
+                }
+                Modules.Anim {
+                    target: content
+                    property: "scale"
+                    to: 1
+                    duration: Appearance.anim.durations.expressiveDefaultSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+                }
+                Modules.Anim {
+                    target: lockBg
+                    property: "radius"
+                    to: Appearance.rounding.large * 1.5
+                }
+                Modules.Anim {
+                    target: lockContent
+                    property: "implicitWidth"
+                    to: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio
+                    duration: Appearance.anim.durations.expressiveDefaultSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+                }
+                Modules.Anim {
+                    target: lockContent
+                    property: "implicitHeight"
+                    to: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult
+                    duration: Appearance.anim.durations.expressiveDefaultSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+                }
+            }
+        }
+    }

-	ScreencopyView {
+	Image {
 		id: background
-
-		live: false
-
 		anchors.fill: parent
-		captureSource: root.screen
-		opacity: 1
-		visible: !Config.lock.useWallpaper
-
-		layer.enabled: true
-		layer.effect: MultiEffect {
-			autoPaddingEnabled: false
-			blurEnabled: true
-			blur: 0.8
-			blurMax: 64
-			blurMultiplier: 1
-			brightness: 0
-		}
+		source: WallpaperPath.lockscreenBg
 	}

-	CachingImage {
-		id: backgroundImage
-		anchors.fill: parent
-		asynchronous: false
-		path: WallpaperPath.currentWallpaperPath
-		visible: Config.lock.useWallpaper
+    Item {
+        id: lockContent

-		Component.onCompleted: {
-			console.log(source);
-		}
-	}
+        readonly property int size: lockIcon.implicitHeight + Appearance.padding.large * 4
+        readonly property int radius: size / 4 * Appearance.rounding.scale

-	Rectangle {
-		id: overlay
-		anchors.fill: parent
-		color: "transparent"
+        anchors.centerIn: parent
+        implicitWidth: size
+        implicitHeight: size

-		visible: background.hasContent
+        scale: 0

-		Rectangle {
-			id: contentBox
-			anchors.bottom: !Config.lock.useWallpaper ? "" : parent.bottom
-			anchors.centerIn: !Config.lock.useWallpaper ? parent : ""
-			anchors.horizontalCenter: !Config.lock.useWallpaper ? "" : parent.horizontalCenter
+        CustomRect {
+            id: lockBg

-			color: DynamicColors.tPalette.m3surfaceContainer
-			radius: 28
+            anchors.fill: parent
+            color: DynamicColors.palette.m3surface
+			radius: lockContent.radius
+            opacity: DynamicColors.transparency.enabled ? DynamicColors.transparency.base : 1

-			implicitWidth: Math.floor(childrenRect.width + 48)
-			implicitHeight: Math.floor(childrenRect.height + 64)
+            layer.enabled: true
+            layer.effect: MultiEffect {
+                shadowEnabled: true
+                blurMax: 15
+                shadowColor: Qt.alpha(DynamicColors.palette.m3shadow, 0.7)
+            }
+        }

-			layer.enabled: true
-			layer.effect: MultiEffect {
-				source: contentBox
-				blurEnabled: false
-				blurMax: 12
-				shadowBlur: 1
-				shadowColor: DynamicColors.palette.m3shadow
-				shadowOpacity: 1
-				shadowEnabled: true
-				autoPaddingEnabled: true
-			}
+        MaterialIcon {
+            id: lockIcon

-			ColumnLayout {
-				id: mainLayout
-				anchors.centerIn: parent
-				width: childrenRect.width
-				spacing: 0
+            anchors.centerIn: parent
+            text: "lock"
+            font.pointSize: Appearance.font.size.extraLarge * 4
+            font.bold: true
+        }

-				RowLayout {
-					Layout.alignment: Qt.AlignHCenter
-					Layout.bottomMargin: 16
-					spacing: 16
+        Content {
+            id: content

-					UserImage {
-						Layout.alignment: Qt.AlignHCenter | Qt.AlignLeft
-						Layout.bottomMargin: 16
-						Layout.preferredWidth: 128
-						Layout.preferredHeight: 128
-					}
+            anchors.centerIn: parent
+            width: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult * Config.lock.sizes.ratio - Appearance.padding.large * 2
+            height: (root.screen?.height ?? 0) * Config.lock.sizes.heightMult - Appearance.padding.large * 2

-					LockTime {
-						Layout.alignment: Qt.AlignHCenter
-						Layout.bottomMargin: 8
-					}
-				}
-
-				Rectangle {
-					id: inputContainer
-					Layout.alignment: Qt.AlignHCenter
-					Layout.bottomMargin: 16
-
-					Layout.preferredWidth: 320
-					Layout.preferredHeight: 48
-
-					color: DynamicColors.tPalette.m3surfaceContainerHigh
-					radius: 1000
-
-					border.width: 1
-					border.color: {
-						if (root.pam.state === "error" || root.pam.state === "fail") {
-							return DynamicColors.palette.m3error;
-						}
-						return DynamicColors.palette.m3outline;
-					}
-
-					clip: true
-
-					Behavior on border.color {
-						ColorAnimation { duration: 150 }
-					}
-
-					transform: Translate {
-						id: wobbleTransform
-						x: 0
-					}
-
-					SequentialAnimation {
-						id: wobbleAnimation
-
-						ColorAnimation {
-							target: inputContainer
-							property: "color"
-							to: DynamicColors.tPalette.m3onError
-							duration: MaterialEasing.expressiveEffectsTime
-						}
-						ParallelAnimation {
-							NumberAnimation {
-								target: wobbleTransform
-								property: "x"
-								to: -8
-								duration: MaterialEasing.expressiveFastSpatialTime / 4
-								easing.bezierCurve: MaterialEasing.expressiveFastSpatial
-							}
-						}
-						NumberAnimation {
-							target: wobbleTransform
-							property: "x"
-							to: 8
-							duration: MaterialEasing.expressiveFastSpatialTime / 4
-							easing.bezierCurve: MaterialEasing.expressiveFastSpatial
-						}
-						NumberAnimation {
-							target: wobbleTransform
-							property: "x"
-							to: -8
-							duration: MaterialEasing.expressiveFastSpatialTime / 4
-							easing.bezierCurve: MaterialEasing.expressiveFastSpatial
-						}
-						NumberAnimation {
-							target: wobbleTransform
-							property: "x"
-							to: 0
-							duration: MaterialEasing.expressiveFastSpatialTime / 4
-							easing.bezierCurve: MaterialEasing.expressiveFastSpatial
-						}
-						ColorAnimation {
-							target: inputContainer
-							property: "color"
-							to: DynamicColors.tPalette.m3surfaceContainerHigh
-							duration: MaterialEasing.expressiveEffectsTime
-						}
-					}
-
-					Connections {
-						target: root.pam
-
-						function onStateChanged(): void {
-							if (root.pam.state === "error" || root.pam.state === "fail") {
-								wobbleAnimation.start();
-							}
-						}
-					}
-
-					CustomText {
-						id: messageDisplay
-
-						anchors.centerIn: inputContainer
-
-						text: {
-							if ( root.pam.buffer.length > 0 || root.pam.passwd.active ) {
-								return "";
-							}
-							if (root.pam.lockMessage) {
-								return root.pam.lockMessage;
-							}
-							if (root.pam.state === "error") {
-								return "Authentication error";
-							}
-							if (root.pam.state === "fail") {
-								return "Invalid password";
-							}
-							if (root.pam.state === "max") {
-								return "Maximum attempts reached";
-							}
-							return "Enter your password";
-						}
-						visible: true
-						font.pointSize: 14
-						font.weight: Font.Medium
-
-						animate: true
-
-						Behavior on text {
-							SequentialAnimation {
-								OAnim {
-									target: messageDisplay
-									property: "opacity"
-									to: 0
-								}
-								PropertyAction {}
-								OAnim {
-									target: messageDisplay
-									property: "opacity"
-									to: 1
-								}
-							}
-						}
-
-						component OAnim: NumberAnimation {
-							target: messageDisplay
-							property: "opacity"
-							duration: 100
-						}
-
-						color: root.pam.state === "max" ? DynamicColors.palette.m3error : DynamicColors.palette.m3onSurfaceVariant
-						wrapMode: Text.WordWrap
-						horizontalAlignment: Text.AlignHCenter
-					}
-
-					ListView {
-						id: charList
-
-						readonly property int fullWidth: count * (implicitHeight + spacing)
-
-						function bindImWidth(): void {
-							imWidthBehavior.enabled = false;
-							implicitWidth = Qt.binding(() => fullWidth);
-							imWidthBehavior.enabled = true;
-						}
-
-						anchors.centerIn: parent
-						anchors.horizontalCenterOffset: implicitWidth > inputContainer.width - 20 ? -(implicitWidth - inputContainer.width + 20) / 2 : 0
-
-						implicitWidth: fullWidth
-						implicitHeight: 16
-
-						orientation: Qt.Horizontal
-						spacing: 8
-						interactive: false
-
-						model: ScriptModel {
-							values: root.pam.buffer.split("")
-						}
-
-						delegate: CustomRect {
-							id: ch
-
-							implicitWidth: implicitHeight
-							implicitHeight: charList.implicitHeight
-
-							color: DynamicColors.palette.m3onSurface
-							radius: 1000
-
-							opacity: 0
-							scale: 0
-							Component.onCompleted: {
-								opacity = 1;
-								scale = 1;
-							}
-							ListView.onRemove: removeAnim.start()
-
-							SequentialAnimation {
-								id: removeAnim
-
-								PropertyAction {
-									target: ch
-									property: "ListView.delayRemove"
-									value: true
-								}
-								ParallelAnimation {
-									Anim {
-										target: ch
-										property: "opacity"
-										to: 0
-									}
-									Anim {
-										target: ch
-										property: "scale"
-										to: 0.5
-									}
-								}
-								PropertyAction {
-									target: ch
-									property: "ListView.delayRemove"
-									value: false
-								}
-							}
-
-							Behavior on opacity {
-								Anim {}
-							}
-
-							Behavior on scale {
-								Anim {
-									duration: MaterialEasing.expressiveFastSpatialTime
-									easing.bezierCurve: MaterialEasing.expressiveFastSpatial
-								}
-							}
-						}
-
-						Behavior on implicitWidth {
-							id: imWidthBehavior
-
-							Anim {}
-						}
-					}
-				}
-			}
-		}
-		Component.onCompleted: hiddenInput.forceActiveFocus()
-	}
+            lock: root
+            opacity: 0
+            scale: 0
+        }
+    }
 }
@@ -1,95 +0,0 @@
-import Quickshell
-import QtQuick
-import QtQuick.Layouts
-import qs.Modules
-import qs.Components
-import qs.Config
-
-RowLayout {
-	id: root
-
-	property list<string> time: Time.longTime.split("")
-
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		animate: true
-
-		text: root.time[0]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		animate: true
-
-		text: root.time[1]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		Layout.bottomMargin: 8
-		animate: true
-
-		text: root.time[2]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		animate: true
-
-		text: root.time[3]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		animate: true
-
-		text: root.time[4]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		Layout.bottomMargin: 8
-		animate: true
-
-		text: root.time[5]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		animate: true
-
-		text: root.time[6]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-	CustomText {
-		Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-		animate: true
-
-		text: root.time[7]
-		font.pixelSize: 64
-		font.weight: Font.Normal
-		font.letterSpacing: 0.5
-		color: DynamicColors.palette.m3onSurface
-	}
-}
@@ -0,0 +1,205 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+Item {
+    id: root
+
+    required property var lock
+
+	anchors.fill: parent
+
+    Image {
+        anchors.fill: parent
+        source: Players.active?.trackArtUrl ?? ""
+
+        asynchronous: true
+        fillMode: Image.PreserveAspectCrop
+        sourceSize.width: width
+        sourceSize.height: height
+
+        layer.enabled: true
+        layer.effect: OpacityMask {
+            maskSource: mask
+        }
+
+        opacity: status === Image.Ready ? 1 : 0
+
+        Behavior on opacity {
+            Anim {
+                duration: Appearance.anim.durations.extraLarge
+            }
+        }
+    }
+
+    Rectangle {
+        id: mask
+
+        anchors.fill: parent
+        layer.enabled: true
+        visible: false
+
+        gradient: Gradient {
+            orientation: Gradient.Horizontal
+
+            GradientStop {
+                position: 0
+                color: Qt.rgba(0, 0, 0, 0.5)
+            }
+            GradientStop {
+                position: 0.4
+                color: Qt.rgba(0, 0, 0, 0.2)
+            }
+            GradientStop {
+                position: 0.8
+                color: Qt.rgba(0, 0, 0, 0)
+            }
+        }
+    }
+
+    ColumnLayout {
+        id: layout
+
+        anchors.fill: parent
+        anchors.margins: Appearance.padding.large
+
+        CustomText {
+            Layout.topMargin: Appearance.padding.large
+            Layout.bottomMargin: Appearance.spacing.larger
+            text: qsTr("Now playing")
+            color: DynamicColors.palette.m3onSurfaceVariant
+            font.family: Appearance.font.family.mono
+            font.weight: 500
+        }
+
+        CustomText {
+            Layout.fillWidth: true
+            animate: true
+            text: Players.active?.trackArtist ?? qsTr("No media")
+            color: DynamicColors.palette.m3primary
+            horizontalAlignment: Text.AlignHCenter
+            font.pointSize: Appearance.font.size.large
+            font.family: Appearance.font.family.mono
+            font.weight: 600
+            elide: Text.ElideRight
+        }
+
+        CustomText {
+            Layout.fillWidth: true
+            animate: true
+            text: Players.active?.trackTitle ?? qsTr("No media")
+            horizontalAlignment: Text.AlignHCenter
+            font.pointSize: Appearance.font.size.larger
+            font.family: Appearance.font.family.mono
+            elide: Text.ElideRight
+        }
+
+        RowLayout {
+            Layout.alignment: Qt.AlignHCenter
+            Layout.topMargin: Appearance.spacing.large * 1.2
+            Layout.bottomMargin: Appearance.padding.large
+
+            spacing: Appearance.spacing.large
+
+            PlayerControl {
+                icon: "skip_previous"
+
+                function onClicked(): void {
+                    if (Players.active?.canGoPrevious)
+                        Players.active.previous();
+                }
+            }
+
+            PlayerControl {
+                animate: true
+                icon: active ? "pause" : "play_arrow"
+                colour: "Primary"
+                level: active ? 2 : 1
+                active: Players.active?.isPlaying ?? false
+
+                function onClicked(): void {
+                    if (Players.active?.canTogglePlaying)
+                        Players.active.togglePlaying();
+                }
+            }
+
+            PlayerControl {
+                icon: "skip_next"
+
+                function onClicked(): void {
+                    if (Players.active?.canGoNext)
+                        Players.active.next();
+                }
+            }
+        }
+    }
+
+    component PlayerControl: CustomRect {
+        id: control
+
+        property alias animate: controlIcon.animate
+        property alias icon: controlIcon.text
+        property bool active
+        property string colour: "Secondary"
+        property int level: 1
+
+        function onClicked(): void {
+        }
+
+        Layout.preferredWidth: implicitWidth + (controlState.pressed ? Appearance.padding.normal * 2 : active ? Appearance.padding.small * 2 : 0)
+        implicitWidth: controlIcon.implicitWidth + Appearance.padding.large * 2
+        implicitHeight: controlIcon.implicitHeight + Appearance.padding.normal * 2
+
+        color: active ? DynamicColors.palette[`m3${colour.toLowerCase()}`] : DynamicColors.palette[`m3${colour.toLowerCase()}Container`]
+        radius: active || controlState.pressed ? Appearance.rounding.small : Appearance.rounding.normal
+
+        Elevation {
+            anchors.fill: parent
+            radius: parent.radius
+            z: -1
+            level: controlState.containsMouse && !controlState.pressed ? control.level + 1 : control.level
+        }
+
+        StateLayer {
+            id: controlState
+
+            color: control.active ? DynamicColors.palette[`m3on${control.colour}`] : DynamicColors.palette[`m3on${control.colour}Container`]
+
+            function onClicked(): void {
+                control.onClicked();
+            }
+        }
+
+        MaterialIcon {
+            id: controlIcon
+
+            anchors.centerIn: parent
+            color: control.active ? DynamicColors.palette[`m3on${control.colour}`] : DynamicColors.palette[`m3on${control.colour}Container`]
+            font.pointSize: Appearance.font.size.large
+            fill: control.active ? 1 : 0
+
+            Behavior on fill {
+                Anim {}
+            }
+        }
+
+        Behavior on Layout.preferredWidth {
+            Anim {
+                duration: Appearance.anim.durations.expressiveFastSpatial
+                easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+            }
+        }
+
+        Behavior on radius {
+            Anim {
+                duration: Appearance.anim.durations.expressiveFastSpatial
+                easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+            }
+        }
+    }
+}
@@ -0,0 +1,145 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Widgets
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Daemons
+
+ColumnLayout {
+    id: root
+
+    required property var lock
+
+    anchors.fill: parent
+    anchors.margins: Appearance.padding.large
+
+    spacing: Appearance.spacing.smaller
+
+    CustomText {
+        Layout.fillWidth: true
+        text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
+        color: DynamicColors.palette.m3outline
+        font.family: Appearance.font.family.mono
+        font.weight: 500
+        elide: Text.ElideRight
+    }
+
+    ClippingRectangle {
+        id: clipRect
+
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+
+        radius: Appearance.rounding.small
+        color: "transparent"
+
+        Loader {
+            anchors.centerIn: parent
+            active: opacity > 0
+            opacity: NotifServer.list.length > 0 ? 0 : 1
+
+            sourceComponent: ColumnLayout {
+                spacing: Appearance.spacing.large
+
+                Image {
+                    asynchronous: true
+                    source: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/dino.png`)
+                    fillMode: Image.PreserveAspectFit
+                    sourceSize.width: clipRect.width * 0.8
+
+                    layer.enabled: true
+                    layer.effect: Coloriser {
+                        colorizationColor: DynamicColors.palette.m3outlineVariant
+                        brightness: 1
+                    }
+                }
+
+                CustomText {
+                    Layout.alignment: Qt.AlignHCenter
+                    text: qsTr("No Notifications")
+                    color: DynamicColors.palette.m3outlineVariant
+                    font.pointSize: Appearance.font.size.large
+                    font.family: Appearance.font.family.mono
+                    font.weight: 500
+                }
+            }
+
+            Behavior on opacity {
+                Anim {
+                    duration: Appearance.anim.durations.extraLarge
+                }
+            }
+        }
+
+        CustomListView {
+            anchors.fill: parent
+
+            spacing: Appearance.spacing.small
+            clip: true
+
+            model: ScriptModel {
+                values: {
+                    const list = NotifServer.notClosed.map(n => [n.appName, null]);
+                    return [...new Map(list).keys()];
+                }
+            }
+
+            delegate: NotifGroup {}
+
+            add: Transition {
+                Anim {
+                    property: "opacity"
+                    from: 0
+                    to: 1
+                }
+                Anim {
+                    property: "scale"
+                    from: 0
+                    to: 1
+                    duration: Appearance.anim.durations.expressiveDefaultSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+                }
+            }
+
+            remove: Transition {
+                Anim {
+                    property: "opacity"
+                    to: 0
+                }
+                Anim {
+                    property: "scale"
+                    to: 0.6
+                }
+            }
+
+            move: Transition {
+                Anim {
+                    properties: "opacity,scale"
+                    to: 1
+                }
+                Anim {
+                    property: "y"
+                    duration: Appearance.anim.durations.expressiveDefaultSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+                }
+            }
+
+            displaced: Transition {
+                Anim {
+                    properties: "opacity,scale"
+                    to: 1
+                }
+                Anim {
+                    property: "y"
+                    duration: Appearance.anim.durations.expressiveDefaultSpatial
+                    easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,316 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Widgets
+import Quickshell.Services.Notifications
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Daemons
+
+CustomRect {
+    id: root
+
+    required property string modelData
+
+    readonly property list<var> notifs: NotifServer.list.filter(notif => notif.appName === modelData)
+    readonly property string image: notifs.find(n => n.image.length > 0)?.image ?? ""
+    readonly property string appIcon: notifs.find(n => n.appIcon.length > 0)?.appIcon ?? ""
+    readonly property string urgency: notifs.some(n => n.urgency === NotificationUrgency.Critical) ? "critical" : notifs.some(n => n.urgency === NotificationUrgency.Normal) ? "normal" : "low"
+
+    property bool expanded
+
+    anchors.left: parent?.left
+    anchors.right: parent?.right
+    implicitHeight: content.implicitHeight + Appearance.padding.normal * 2
+
+    clip: true
+    radius: Appearance.rounding.normal
+    color: root.urgency === "critical" ? DynamicColors.palette.m3secondaryContainer : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
+
+    RowLayout {
+        id: content
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.margins: Appearance.padding.normal
+
+        spacing: Appearance.spacing.normal
+
+        Item {
+            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+            implicitWidth: Config.notifs.sizes.image
+            implicitHeight: Config.notifs.sizes.image
+
+            Component {
+                id: imageComp
+
+                Image {
+                    source: Qt.resolvedUrl(root.image)
+                    fillMode: Image.PreserveAspectCrop
+                    cache: false
+                    asynchronous: true
+                    width: Config.notifs.sizes.image
+                    height: Config.notifs.sizes.image
+                }
+            }
+
+            Component {
+                id: appIconComp
+
+                ColoredIcon {
+                    implicitSize: Math.round(Config.notifs.sizes.image * 0.6)
+                    source: Quickshell.iconPath(root.appIcon)
+                    color: root.urgency === "critical" ? DynamicColors.palette.m3onError : root.urgency === "low" ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSecondaryContainer
+                    layer.enabled: root.appIcon.endsWith("symbolic")
+                }
+            }
+
+            Component {
+                id: materialIconComp
+
+                MaterialIcon {
+                    text: Icons.getNotifIcon(root.notifs[0]?.summary, root.urgency)
+                    color: root.urgency === "critical" ? DynamicColors.palette.m3onError : root.urgency === "low" ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSecondaryContainer
+                    font.pointSize: Appearance.font.size.large
+                }
+            }
+
+            ClippingRectangle {
+                anchors.fill: parent
+                color: root.urgency === "critical" ? DynamicColors.palette.m3error : root.urgency === "low" ? DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 3) : DynamicColors.palette.m3secondaryContainer
+                radius: Appearance.rounding.full
+
+                Loader {
+                    anchors.centerIn: parent
+                    sourceComponent: root.image ? imageComp : root.appIcon ? appIconComp : materialIconComp
+                }
+            }
+
+            Loader {
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+                active: root.appIcon && root.image
+
+                sourceComponent: CustomRect {
+                    implicitWidth: Config.notifs.sizes.badge
+                    implicitHeight: Config.notifs.sizes.badge
+
+                    color: root.urgency === "critical" ? DynamicColors.palette.m3error : root.urgency === "low" ? DynamicColors.palette.m3surfaceContainerHighest : DynamicColors.palette.m3secondaryContainer
+                    radius: Appearance.rounding.full
+
+                    ColoredIcon {
+                        anchors.centerIn: parent
+                        implicitSize: Math.round(Config.notifs.sizes.badge * 0.6)
+                        source: Quickshell.iconPath(root.appIcon)
+                        color: root.urgency === "critical" ? DynamicColors.palette.m3onError : root.urgency === "low" ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSecondaryContainer
+                        layer.enabled: root.appIcon.endsWith("symbolic")
+                    }
+                }
+            }
+        }
+
+        ColumnLayout {
+            Layout.topMargin: -Appearance.padding.small
+            Layout.bottomMargin: -Appearance.padding.small / 2 - (root.expanded ? 0 : spacing)
+            Layout.fillWidth: true
+            spacing: Math.round(Appearance.spacing.small / 2)
+
+            RowLayout {
+                Layout.bottomMargin: -parent.spacing
+                Layout.fillWidth: true
+                spacing: Appearance.spacing.smaller
+
+                CustomText {
+                    Layout.fillWidth: true
+                    text: root.modelData
+                    color: DynamicColors.palette.m3onSurfaceVariant
+                    font.pointSize: Appearance.font.size.small
+                    elide: Text.ElideRight
+                }
+
+                CustomText {
+                    animate: true
+                    text: root.notifs[0]?.timeStr ?? ""
+                    color: DynamicColors.palette.m3outline
+                    font.pointSize: Appearance.font.size.small
+                }
+
+                CustomRect {
+                    implicitWidth: expandBtn.implicitWidth + Appearance.padding.smaller * 2
+                    implicitHeight: groupCount.implicitHeight + Appearance.padding.small
+
+                    color: root.urgency === "critical" ? DynamicColors.palette.m3error : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)
+                    radius: Appearance.rounding.full
+
+                    opacity: root.notifs.length > Config.notifs.groupPreviewNum ? 1 : 0
+                    Layout.preferredWidth: root.notifs.length > Config.notifs.groupPreviewNum ? implicitWidth : 0
+
+                    StateLayer {
+                        color: root.urgency === "critical" ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
+
+                        function onClicked(): void {
+                            root.expanded = !root.expanded;
+                        }
+                    }
+
+                    RowLayout {
+                        id: expandBtn
+
+                        anchors.centerIn: parent
+                        spacing: Appearance.spacing.small / 2
+
+                        CustomText {
+                            id: groupCount
+
+                            Layout.leftMargin: Appearance.padding.small / 2
+                            animate: true
+                            text: root.notifs.length
+                            color: root.urgency === "critical" ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
+                            font.pointSize: Appearance.font.size.small
+                        }
+
+                        MaterialIcon {
+                            Layout.rightMargin: -Appearance.padding.small / 2
+                            animate: true
+                            text: root.expanded ? "expand_less" : "expand_more"
+                            color: root.urgency === "critical" ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onSurface
+                        }
+                    }
+
+                    Behavior on opacity {
+                        Anim {}
+                    }
+
+                    Behavior on Layout.preferredWidth {
+                        Anim {}
+                    }
+                }
+            }
+
+            Repeater {
+                model: ScriptModel {
+                    values: root.notifs.slice(0, Config.notifs.groupPreviewNum)
+                }
+
+                NotifLine {
+                    id: notif
+
+                    ParallelAnimation {
+                        running: true
+
+                        Anim {
+                            target: notif
+                            property: "opacity"
+                            from: 0
+                            to: 1
+                        }
+                        Anim {
+                            target: notif
+                            property: "scale"
+                            from: 0.7
+                            to: 1
+                        }
+                        Anim {
+                            target: notif.Layout
+                            property: "preferredHeight"
+                            from: 0
+                            to: notif.implicitHeight
+                        }
+                    }
+
+                    ParallelAnimation {
+                        running: notif.modelData.closed
+                        onFinished: notif.modelData.unlock(notif)
+
+                        Anim {
+                            target: notif
+                            property: "opacity"
+                            to: 0
+                        }
+                        Anim {
+                            target: notif
+                            property: "scale"
+                            to: 0.7
+                        }
+                        Anim {
+                            target: notif.Layout
+                            property: "preferredHeight"
+                            to: 0
+                        }
+                    }
+                }
+            }
+
+            Loader {
+                Layout.fillWidth: true
+
+                opacity: root.expanded ? 1 : 0
+                Layout.preferredHeight: root.expanded ? implicitHeight : 0
+                active: opacity > 0
+
+                sourceComponent: ColumnLayout {
+                    Repeater {
+                        model: ScriptModel {
+                            values: root.notifs.slice(Config.notifs.groupPreviewNum)
+                        }
+
+                        NotifLine {}
+                    }
+                }
+
+                Behavior on opacity {
+                    Anim {}
+                }
+            }
+        }
+    }
+
+    Behavior on implicitHeight {
+        Anim {
+            duration: Appearance.anim.durations.expressiveDefaultSpatial
+            easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+        }
+    }
+
+    component NotifLine: CustomText {
+        id: notifLine
+
+        required property NotifServer.Notif modelData
+
+        Layout.fillWidth: true
+        textFormat: Text.MarkdownText
+        text: {
+            const summary = modelData.summary.replace(/\n/g, " ");
+            const body = modelData.body.replace(/\n/g, " ");
+            const color = root.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline;
+
+            if (metrics.text === metrics.elidedText)
+                return `${summary} <span style='color:${color}'>${body}</span>`;
+
+            const t = metrics.elidedText.length - 3;
+            if (t < summary.length)
+                return `${summary.slice(0, t)}...`;
+
+            return `${summary} <span style='color:${color}'>${body.slice(0, t - summary.length)}...</span>`;
+        }
+        color: root.urgency === "critical" ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+
+        Component.onCompleted: modelData.lock(this)
+        Component.onDestruction: modelData.unlock(this)
+
+        TextMetrics {
+            id: metrics
+
+            text: `${notifLine.modelData.summary} ${notifLine.modelData.body}`.replace(/\n/g, " ")
+            font.pointSize: notifLine.font.pointSize
+            font.family: notifLine.font.family
+            elideWidth: notifLine.width
+            elide: Text.ElideRight
+        }
+    }
+}
@@ -1,97 +1,193 @@
 import Quickshell
+import Quickshell.Io
 import Quickshell.Wayland
 import Quickshell.Services.Pam
 import QtQuick
+import qs.Config

 Scope {
-	id: root
+    id: root

-	required property WlSessionLock lock
+    required property WlSessionLock lock

-	readonly property alias passwd: passwd
-	property string lockMessage
-	property string state
-	property string fprintState
-	property string buffer
+    readonly property alias passwd: passwd
+    readonly property alias fprint: fprint
+    property string lockMessage
+    property string state
+    property string fprintState
+    property string buffer

-	signal flashMsg
+    signal flashMsg

-	function handleKey(event: KeyEvent): void {
-		if (passwd.active || state === "max")
-		return;
+    function handleKey(event: KeyEvent): void {
+        if (passwd.active || state === "max")
+            return;

-		if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
-			passwd.start();
-		} else if (event.key === Qt.Key_Backspace) {
-			if ( event.modifiers & Qt.ControlModifier ) {
-				buffer = "";
-			} else {
-				buffer = buffer.slice(0, -1);
-			}
-		} else if ( event.key === Qt.Key_Escape ) {
-			buffer = "";
-		} else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) {
-			buffer += event.text;
-		}
-	}
+        if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
+            passwd.start();
+        } else if (event.key === Qt.Key_Backspace) {
+            if (event.modifiers & Qt.ControlModifier) {
+                buffer = "";
+            } else {
+                buffer = buffer.slice(0, -1);
+            }
+        } else if (" abcdefghijklmnopqrstuvwxyz1234567890`~!@#$%^&*()-_=+[{]}\\|;:'\",<.>/?".includes(event.text.toLowerCase())) {
+            // No illegal characters (you are insane if you use unicode in your password)
+            buffer += event.text;
+        }
+    }

-	PamContext {
-		id: passwd
+    PamContext {
+        id: passwd

-		config: "passwd"
-		configDirectory: Quickshell.shellDir + "/assets/pam.d"
+        config: "passwd"
+        configDirectory: Quickshell.shellDir + "/assets/pam.d"

-		onMessageChanged: {
-			if ( message.startsWith( "The account is locked" ))
-			root.lockMessage = message;
-			else if ( root.lockMessage && message.endsWith( " left to unlock)" ))
-			root.lockMessage += "\n" + message;
-		}
+        onMessageChanged: {
+            if (message.startsWith("The account is locked"))
+                root.lockMessage = message;
+            else if (root.lockMessage && message.endsWith(" left to unlock)"))
+                root.lockMessage += "\n" + message;
+        }

-		onResponseRequiredChanged: {
-			if ( !responseRequired )
-			return;
+        onResponseRequiredChanged: {
+            if (!responseRequired)
+                return;

-			respond(root.buffer);
-			root.buffer = "";
-		}
+            respond(root.buffer);
+            root.buffer = "";
+        }

-		onCompleted: res => {
-			if (res === PamResult.Success)
-			return root.lock.locked = false;
+        onCompleted: res => {
+            if (res === PamResult.Success)
+                return root.lock.unlock();

-			if (res === PamResult.Error)
-			root.state = "error";
-			else if (res === PamResult.MaxTries)
-			root.state = "max";
-			else if (res === PamResult.Failed)
-			root.state = "fail";
+            if (res === PamResult.Error)
+                root.state = "error";
+            else if (res === PamResult.MaxTries)
+                root.state = "max";
+            else if (res === PamResult.Failed)
+                root.state = "fail";

-			root.flashMsg();
-			stateReset.restart();
-		}
-	}
+            root.flashMsg();
+            stateReset.restart();
+        }
+    }

-	Timer {
-		id: stateReset
+    PamContext {
+        id: fprint

-		interval: 4000
-		onTriggered: {
-			if (root.state !== "max")
-			root.state = "";
-		}
-	}
+        property bool available
+        property int tries
+        property int errorTries

-	Connections {
-		target: root.lock
+        function checkAvail(): void {
+            if (!available || !Config.lock.enableFprint || !root.lock.secure) {
+                abort();
+                return;
+            }

-		function onSecureChanged(): void {
-			if (root.lock.secure) {
-				root.buffer = "";
-				root.state = "";
-				root.fprintState = "";
-				root.lockMessage = "";
-			}
-		}
-	}
+            tries = 0;
+            errorTries = 0;
+            start();
+        }
+
+        config: "fprint"
+        configDirectory: Quickshell.shellDir + "/assets/pam.d"
+
+        onCompleted: res => {
+            if (!available)
+                return;
+
+            if (res === PamResult.Success)
+                return root.lock.unlock();
+
+            if (res === PamResult.Error) {
+                root.fprintState = "error";
+                errorTries++;
+                if (errorTries < 5) {
+                    abort();
+                    errorRetry.restart();
+                }
+            } else if (res === PamResult.MaxTries) {
+                // Isn't actually the real max tries as pam only reports completed
+                // when max tries is reached.
+                tries++;
+                if (tries < Config.lock.maxFprintTries) {
+                    // Restart if not actually real max tries
+                    root.fprintState = "fail";
+                    start();
+                } else {
+                    root.fprintState = "max";
+                    abort();
+                }
+            }
+
+            root.flashMsg();
+            fprintStateReset.start();
+        }
+    }
+
+    Process {
+        id: availProc
+
+        command: ["sh", "-c", "fprintd-list $USER"]
+        onExited: code => {
+            fprint.available = code === 0;
+            fprint.checkAvail();
+        }
+    }
+
+    Timer {
+        id: errorRetry
+
+        interval: 800
+        onTriggered: fprint.start()
+    }
+
+    Timer {
+        id: stateReset
+
+        interval: 4000
+        onTriggered: {
+            if (root.state !== "max")
+                root.state = "";
+        }
+    }
+
+    Timer {
+        id: fprintStateReset
+
+        interval: 4000
+        onTriggered: {
+            root.fprintState = "";
+            fprint.errorTries = 0;
+        }
+    }
+
+    Connections {
+        target: root.lock
+
+        function onSecureChanged(): void {
+            if (root.lock.secure) {
+                availProc.running = true;
+                root.buffer = "";
+                root.state = "";
+                root.fprintState = "";
+                root.lockMessage = "";
+            }
+        }
+
+        function onUnlock(): void {
+            fprint.abort();
+        }
+    }
+
+    Connections {
+        target: Config.lock
+
+        function onEnableFprintChanged(): void {
+            fprint.checkAvail();
+        }
+    }
 }
@@ -0,0 +1,80 @@
+import QtQuick
+import QtQuick.Layouts
+import qs.Modules
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+GridLayout {
+    id: root
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.margins: Appearance.padding.large
+
+    rowSpacing: Appearance.spacing.large
+    columnSpacing: Appearance.spacing.large
+    rows: 1
+    columns: 2
+
+    Ref {
+        service: SystemUsage
+    }
+
+    Resource {
+        Layout.bottomMargin: Appearance.padding.large
+        Layout.topMargin: Appearance.padding.large
+        icon: "memory"
+        value: SystemUsage.cpuPerc
+        colour: DynamicColors.palette.m3primary
+    }
+
+    Resource {
+        Layout.bottomMargin: Appearance.padding.large
+        Layout.topMargin: Appearance.padding.large
+        icon: "memory_alt"
+        value: SystemUsage.memPerc
+        colour: DynamicColors.palette.m3secondary
+    }
+
+    component Resource: CustomRect {
+        id: res
+
+        required property string icon
+        required property real value
+        required property color colour
+
+        Layout.fillWidth: true
+        implicitHeight: width
+
+        color: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHigh, 2)
+        radius: Appearance.rounding.large
+
+        CircularProgress {
+            id: circ
+
+            anchors.fill: parent
+            value: res.value
+            padding: Appearance.padding.large * 3
+            fgColour: res.colour
+            bgColour: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 3)
+            strokeWidth: width < 200 ? Appearance.padding.smaller : Appearance.padding.normal
+        }
+
+        MaterialIcon {
+            id: icon
+
+            anchors.centerIn: parent
+            text: res.icon
+            color: res.colour
+            font.pointSize: (circ.arcRadius * 0.7) || 1
+            font.weight: 600
+        }
+
+        Behavior on value {
+            Anim {
+                duration: Appearance.anim.durations.large
+            }
+        }
+    }
+}
@@ -0,0 +1,175 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Components
+import qs.Helpers
+import qs.Config
+
+ColumnLayout {
+    id: root
+
+    required property int rootHeight
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.margins: Appearance.padding.large * 2
+
+    spacing: Appearance.spacing.small
+
+    Loader {
+        Layout.topMargin: Appearance.padding.large * 2
+        Layout.bottomMargin: -Appearance.padding.large
+        Layout.alignment: Qt.AlignHCenter
+
+        active: root.rootHeight > 610
+        visible: active
+
+        sourceComponent: CustomText {
+            text: qsTr("Weather")
+            color: DynamicColors.palette.m3primary
+            font.pointSize: Appearance.font.size.extraLarge
+            font.weight: 500
+        }
+    }
+
+    RowLayout {
+        Layout.fillWidth: true
+        spacing: Appearance.spacing.large
+
+        MaterialIcon {
+            animate: true
+            text: Weather.icon
+            color: DynamicColors.palette.m3secondary
+            font.pointSize: Appearance.font.size.extraLarge * 2.5
+        }
+
+        ColumnLayout {
+            spacing: Appearance.spacing.small
+
+            CustomText {
+                Layout.fillWidth: true
+
+                animate: true
+                text: Weather.description
+                color: DynamicColors.palette.m3secondary
+                font.pointSize: Appearance.font.size.large
+                font.weight: 500
+                elide: Text.ElideRight
+            }
+
+            CustomText {
+                Layout.fillWidth: true
+
+                animate: true
+                text: qsTr("Humidity: %1%").arg(Weather.humidity)
+                color: DynamicColors.palette.m3onSurfaceVariant
+                font.pointSize: Appearance.font.size.normal
+                elide: Text.ElideRight
+            }
+        }
+
+        Loader {
+            Layout.rightMargin: Appearance.padding.smaller
+            active: root.width > 400
+            visible: active
+
+            sourceComponent: ColumnLayout {
+                spacing: Appearance.spacing.small
+
+                CustomText {
+                    Layout.fillWidth: true
+
+                    animate: true
+                    text: Weather.temp
+                    color: DynamicColors.palette.m3primary
+                    horizontalAlignment: Text.AlignRight
+                    font.pointSize: Appearance.font.size.extraLarge
+                    font.weight: 500
+                    elide: Text.ElideLeft
+                }
+
+                CustomText {
+                    Layout.fillWidth: true
+
+                    animate: true
+                    text: qsTr("Feels like: %1").arg(Weather.feelsLike)
+                    color: DynamicColors.palette.m3outline
+                    horizontalAlignment: Text.AlignRight
+                    font.pointSize: Appearance.font.size.smaller
+                    elide: Text.ElideLeft
+                }
+            }
+        }
+    }
+
+    Loader {
+        id: forecastLoader
+
+        Layout.topMargin: Appearance.spacing.smaller
+        Layout.bottomMargin: Appearance.padding.large * 2
+        Layout.fillWidth: true
+
+        active: root.rootHeight > 820
+        visible: active
+
+        sourceComponent: RowLayout {
+            spacing: Appearance.spacing.large
+
+            Repeater {
+                model: {
+                    const forecast = Weather.hourlyForecast;
+                    const count = root.width < 320 ? 3 : root.width < 400 ? 4 : 5;
+                    if (!forecast)
+                        return Array.from({
+                            length: count
+                        }, () => null);
+
+                    return forecast.slice(0, count);
+                }
+
+                ColumnLayout {
+                    id: forecastHour
+
+                    required property var modelData
+
+                    Layout.fillWidth: true
+                    spacing: Appearance.spacing.small
+
+                    CustomText {
+                        Layout.fillWidth: true
+                        text: {
+                            const hour = forecastHour.modelData?.hour ?? 0;
+                            return hour > 12 ? `${(hour - 12).toString().padStart(2, "0")} PM` : `${hour.toString().padStart(2, "0")} AM`;
+                        }
+                        color: DynamicColors.palette.m3outline
+                        horizontalAlignment: Text.AlignHCenter
+                        font.pointSize: Appearance.font.size.larger
+                    }
+
+                    MaterialIcon {
+                        Layout.alignment: Qt.AlignHCenter
+                        text: forecastHour.modelData?.icon ?? "cloud_alert"
+                        font.pointSize: Appearance.font.size.extraLarge * 1.5
+                        font.weight: 500
+                    }
+
+                    CustomText {
+                        Layout.alignment: Qt.AlignHCenter
+                        text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
+                        color: DynamicColors.palette.m3secondary
+                        font.pointSize: Appearance.font.size.larger
+                    }
+                }
+            }
+        }
+    }
+
+    Timer {
+        running: true
+        triggeredOnStart: true
+        repeat: true
+        interval: 900000 // 15 minutes
+        onTriggered: Weather.reload()
+    }
+}
@@ -26,7 +26,7 @@ Item {

 			anchors.centerIn: parent

-			property color iconColor: Config.useDynamicColors ? DynamicColors.palette.m3tertiaryFixed : "white"
+			property color iconColor: DynamicColors.palette.m3onSurface

 			text: HasNotifications.hasNotifications ? "\uf4fe" : "\ue7f4"
 			font.family: "Material Symbols Rounded"
@@ -42,10 +42,6 @@ Item {
 			cursorShape: Qt.PointingHandCursor
 			onClicked: {
 				root.visibilities.sidebar = !root.visibilities.sidebar;
-				if ( root.visibilities.dashboard || root.popouts.hasCurrent ) {
-					root.popouts.hasCurrent = false;
-					root.visibilities.dashboard = false;
-				}
 			}
 		}
 	}
@@ -18,8 +18,10 @@ ShapePath {
    readonly property real utilsWidthDiff: panels.utilities.width - wrapper.width
    readonly property real utilsRoundingX: utilsWidthDiff < rounding * 2 ? utilsWidthDiff / 2 : rounding

+	readonly property bool flatten: wrapper.width < rounding * 2
+
    strokeWidth: -1
-    fillColor: DynamicColors.palette.m3surface
+	fillColor: flatten ? "transparent" : DynamicColors.palette.m3surface

    PathLine {
        relativeX: -root.wrapper.width - root.notifsRoundingX
@@ -2,9 +2,6 @@ import qs.Components
 import qs.Config
 import qs.Modules
 import qs.Daemons
-import Quickshell
-import Quickshell.Bluetooth
-import Quickshell.Hyprland
 import QtQuick
 import QtQuick.Layouts

@@ -40,9 +37,8 @@ CustomRect {
        }
    }

-	GlobalShortcut {
+	CustomShortcut {
 		name: "toggle-dnd"
-		appid: "zshell-nc"

 		onPressed: {
 			toggle.clicked();
@@ -0,0 +1,61 @@
+import QtQuick
+import QtQuick.Shapes
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules as Modules
+
+ShapePath {
+    id: root
+
+    required property Wrapper wrapper
+    readonly property real rounding: 10
+    readonly property bool flatten: wrapper.width < rounding * 2
+    readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
+
+    strokeWidth: -1
+    fillColor: DynamicColors.palette.m3surface
+
+    PathArc {
+        relativeX: -root.roundingX
+        relativeY: root.rounding
+        radiusX: Math.min(root.rounding, root.wrapper.width)
+        radiusY: root.rounding
+    }
+    PathLine {
+        relativeX: -(root.wrapper.width - root.roundingX * 3)
+        relativeY: 0
+    }
+    PathArc {
+        relativeX: -root.roundingX * 2
+        relativeY: root.rounding * 2
+        radiusX: Math.min(root.rounding * 2, root.wrapper.width)
+        radiusY: root.rounding * 2
+        direction: PathArc.Counterclockwise
+    }
+    PathLine {
+        relativeX: 0
+        relativeY: root.wrapper.height - root.rounding * 4
+    }
+    PathArc {
+        relativeX: root.roundingX * 2
+        relativeY: root.rounding * 2
+        radiusX: Math.min(root.rounding * 2, root.wrapper.width)
+        radiusY: root.rounding * 2
+        direction: PathArc.Counterclockwise
+    }
+    PathLine {
+        relativeX: root.wrapper.width - root.roundingX * 3
+        relativeY: 0
+    }
+    PathArc {
+        relativeX: root.roundingX
+        relativeY: root.rounding
+        radiusX: Math.min(root.rounding, root.wrapper.width)
+        radiusY: root.rounding
+    }
+
+    Behavior on fillColor {
+        Modules.CAnim {}
+    }
+}
@@ -0,0 +1,137 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Layouts
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Daemons
+import qs.Modules as Modules
+
+Item {
+    id: root
+
+    required property Brightness.Monitor monitor
+    required property var visibilities
+
+    required property real volume
+    required property bool muted
+    required property real sourceVolume
+    required property bool sourceMuted
+    required property real brightness
+
+    implicitWidth: layout.implicitWidth + Appearance.padding.small * 2
+    implicitHeight: layout.implicitHeight + Appearance.padding.small * 2
+
+    ColumnLayout {
+        id: layout
+
+        anchors.centerIn: parent
+        spacing: Appearance.spacing.normal
+
+        // Speaker volume
+        CustomMouseArea {
+            implicitWidth: Config.osd.sizes.sliderWidth
+            implicitHeight: Config.osd.sizes.sliderHeight
+
+            function onWheel(event: WheelEvent) {
+                if (event.angleDelta.y > 0)
+                    Audio.incrementVolume();
+                else if (event.angleDelta.y < 0)
+                    Audio.decrementVolume();
+            }
+
+            FilledSlider {
+                anchors.fill: parent
+
+                icon: Icons.getVolumeIcon(value, root.muted)
+                value: root.volume
+				to: Config.services.maxVolume
+				color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3secondary
+                onMoved: Audio.setVolume(value)
+            }
+        }
+
+        // Microphone volume
+        WrappedLoader {
+            shouldBeActive: Config.osd.enableMicrophone && (!Config.osd.enableBrightness || !root.visibilities.session)
+
+            sourceComponent: CustomMouseArea {
+                implicitWidth: Config.osd.sizes.sliderWidth
+                implicitHeight: Config.osd.sizes.sliderHeight
+
+                function onWheel(event: WheelEvent) {
+                    if (event.angleDelta.y > 0)
+                        Audio.incrementSourceVolume();
+                    else if (event.angleDelta.y < 0)
+                        Audio.decrementSourceVolume();
+                }
+
+                FilledSlider {
+                    anchors.fill: parent
+
+                    icon: Icons.getMicVolumeIcon(value, root.sourceMuted)
+                    value: root.sourceVolume
+                    to: Config.services.maxVolume
+					color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3secondary
+                    onMoved: Audio.setSourceVolume(value)
+                }
+            }
+        }
+
+        // Brightness
+        WrappedLoader {
+            shouldBeActive: Config.osd.enableBrightness
+
+            sourceComponent: CustomMouseArea {
+                implicitWidth: Config.osd.sizes.sliderWidth
+                implicitHeight: Config.osd.sizes.sliderHeight
+
+                function onWheel(event: WheelEvent) {
+                    const monitor = root.monitor;
+                    if (!monitor)
+                        return;
+                    if (event.angleDelta.y > 0)
+                        monitor.setBrightness(monitor.brightness + Config.services.brightnessIncrement);
+                    else if (event.angleDelta.y < 0)
+                        monitor.setBrightness(monitor.brightness - Config.services.brightnessIncrement);
+                }
+
+                FilledSlider {
+                    anchors.fill: parent
+
+                    icon: `brightness_${(Math.round(value * 6) + 1)}`
+                    value: root.brightness
+                    onMoved: {
+						if ( Config.osd.allMonBrightness ) {
+							root.monitor?.setBrightness(value)
+						} else {
+							for (const mon of Brightness.monitors) {
+								mon.setBrightness(value)
+							}
+						}
+					}
+                }
+            }
+        }
+    }
+
+    component WrappedLoader: Loader {
+        required property bool shouldBeActive
+
+        Layout.preferredHeight: shouldBeActive ? Config.osd.sizes.sliderHeight : 0
+        opacity: shouldBeActive ? 1 : 0
+        active: opacity > 0
+        visible: active
+
+        Behavior on Layout.preferredHeight {
+            Modules.Anim {
+                easing.bezierCurve: Appearance.anim.curves.emphasized
+            }
+        }
+
+        Behavior on opacity {
+            Modules.Anim {}
+        }
+    }
+}
@@ -0,0 +1,136 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import qs.Components
+import qs.Helpers
+import qs.Config
+import qs.Modules as Modules
+import qs.Daemons
+
+Item {
+    id: root
+
+    required property ShellScreen screen
+    required property var visibilities
+    property bool hovered
+    readonly property Brightness.Monitor monitor: Brightness.getMonitorForScreen(root.screen)
+    readonly property bool shouldBeActive: visibilities.osd && Config.osd.enabled && !(visibilities.utilities && Config.utilities.enabled)
+
+    property real volume
+    property bool muted
+    property real sourceVolume
+    property bool sourceMuted
+    property real brightness
+
+    function show(): void {
+        visibilities.osd = true;
+        timer.restart();
+    }
+
+    Component.onCompleted: {
+        volume = Audio.volume;
+        muted = Audio.muted;
+        sourceVolume = Audio.sourceVolume;
+        sourceMuted = Audio.sourceMuted;
+        brightness = root.monitor?.brightness ?? 0;
+    }
+
+    visible: width > 0
+    implicitWidth: 0
+    implicitHeight: content.implicitHeight
+
+    states: State {
+        name: "visible"
+        when: root.shouldBeActive
+
+        PropertyChanges {
+            root.implicitWidth: content.implicitWidth
+        }
+    }
+
+    transitions: [
+        Transition {
+            from: ""
+            to: "visible"
+
+            Modules.Anim {
+                target: root
+                property: "implicitWidth"
+                easing.bezierCurve: MaterialEasing.expressiveEffects
+            }
+        },
+        Transition {
+            from: "visible"
+            to: ""
+
+            Modules.Anim {
+                target: root
+                property: "implicitWidth"
+                easing.bezierCurve: MaterialEasing.expressiveEffects
+            }
+        }
+    ]
+
+    Connections {
+        target: Audio
+
+        function onMutedChanged(): void {
+            root.show();
+            root.muted = Audio.muted;
+        }
+
+        function onVolumeChanged(): void {
+            root.show();
+            root.volume = Audio.volume;
+        }
+
+        function onSourceMutedChanged(): void {
+            root.show();
+            root.sourceMuted = Audio.sourceMuted;
+        }
+
+        function onSourceVolumeChanged(): void {
+            root.show();
+            root.sourceVolume = Audio.sourceVolume;
+        }
+    }
+
+    Connections {
+        target: root.monitor
+
+        function onBrightnessChanged(): void {
+            root.show();
+            root.brightness = root.monitor?.brightness ?? 0;
+        }
+    }
+
+    Timer {
+        id: timer
+
+        interval: Config.osd.hideDelay
+        onTriggered: {
+            if (!root.hovered)
+                root.visibilities.osd = false;
+        }
+    }
+
+    Loader {
+        id: content
+
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+
+        Component.onCompleted: active = Qt.binding(() => root.shouldBeActive || root.visible)
+
+        sourceComponent: Content {
+            monitor: root.monitor
+            visibilities: root.visibilities
+            volume: root.volume
+            muted: root.muted
+            sourceVolume: root.sourceVolume
+            sourceMuted: root.sourceMuted
+            brightness: root.brightness
+        }
+    }
+}
@@ -15,8 +15,9 @@ Item {
    implicitWidth: resourceRowLayout.x < 0 ? 0 : resourceRowLayout.implicitWidth
    implicitHeight: 22
    property bool warning: percentage * 100 >= warningThreshold
-    property color usageColor: Config.useDynamicColors ? ( warning ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary ) : ( warning ? Config.accentColor.accents.warning : Config.accentColor.accents.primary )
-    property color borderColor: Config.useDynamicColors ? ( warning ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary ) : ( warning ? Config.accentColor.accents.warningAlt : Config.accentColor.accents.primaryAlt )
+	required property color mainColor
+    property color usageColor: warning ? DynamicColors.palette.m3error : mainColor
+    property color borderColor: warning ? DynamicColors.palette.m3onError : mainColor

    Behavior on percentage {
        NumberAnimation {
@@ -11,9 +11,9 @@ Item {
    required property int warningThreshold
    required property string details
    required property string iconString
-    property color barColor: Config.useDynamicColors ? DynamicColors.palette.m3primary : Config.accentColor.accents.primary
-    property color warningBarColor: Config.useDynamicColors ? DynamicColors.palette.m3error : Config.accentColor.accents.warning
-    property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3onSurface : "#ffffff"
+    property color barColor: DynamicColors.palette.m3primary
+    property color warningBarColor: DynamicColors.palette.m3error
+    property color textColor: DynamicColors.palette.m3onSurface

    Layout.preferredWidth: 158
    Layout.preferredHeight: columnLayout.implicitHeight
@@ -69,7 +69,7 @@ Item {
            Layout.alignment: Qt.AlignLeft
            text: root.details
            font.pointSize: 10
-            color: "#cccccc"
+            color: root.textColor
        }
    }
 }
@@ -21,7 +21,7 @@ Singleton {
    property double gpuUsage: 0
    property double gpuMemUsage: 0
    property double totalMem: 0
-    readonly property string gpuType: Config.gpuType.toUpperCase() || autoGpuType
+    readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType
    property string autoGpuType: "NONE"

 	Timer {
@@ -70,7 +70,7 @@ Singleton {
    Process {
        id: gpuTypeCheck

-        running: !Config.gpuType
+        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()
@@ -13,7 +13,6 @@ Item {
    id: root
    implicitWidth: rowLayout.implicitWidth + rowLayout.anchors.leftMargin + rowLayout.anchors.rightMargin
    implicitHeight: 34
-    property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3tertiaryFixed : "#ffffff"
    clip: true

    Rectangle {
@@ -24,7 +23,7 @@ Item {
            verticalCenter: parent.verticalCenter
        }
        implicitHeight: 22
-        color: Config.useDynamicColors ? DynamicColors.tPalette.m3surfaceContainer : "#40000000"
+        color: DynamicColors.tPalette.m3surfaceContainer
        radius: height / 2
        Behavior on color {
            CAnim {}
@@ -41,46 +40,50 @@ Item {
                Layout.alignment: Qt.AlignVCenter
                font.pixelSize: 18
                text: "memory_alt"
-                color: root.textColor
+                color: DynamicColors.palette.m3onSurface
            }

            Resource {
                percentage: ResourceUsage.memoryUsedPercentage
                warningThreshold: 95
+                mainColor: DynamicColors.palette.m3primary
            }

            MaterialIcon {
                Layout.alignment: Qt.AlignVCenter
                font.pixelSize: 18
                text: "memory"
-                color: root.textColor
+                color: DynamicColors.palette.m3onSurface
            }

            Resource {
                percentage: ResourceUsage.cpuUsage
                warningThreshold: 80
+                mainColor: DynamicColors.palette.m3secondary
            }

            MaterialIcon {
                Layout.alignment: Qt.AlignVCenter
                font.pixelSize: 18
                text: "gamepad"
-                color: root.textColor
+                color: DynamicColors.palette.m3onSurface
            }

            Resource {
                percentage: ResourceUsage.gpuUsage
+                mainColor: DynamicColors.palette.m3tertiary
            }

            MaterialIcon {
                Layout.alignment: Qt.AlignVCenter
                font.pixelSize: 18
                text: "developer_board"
-                color: root.textColor
+                color: DynamicColors.palette.m3onSurface
            }

            Resource {
                percentage: ResourceUsage.gpuMemUsage
+                mainColor: DynamicColors.palette.m3primary
            }
        }
    }
@@ -0,0 +1,44 @@
+import ZShell
+import Quickshell
+import Quickshell.Io
+import qs.Components
+import qs.Helpers
+
+Scope {
+	id: root
+
+	property bool launcherInterrupted
+	readonly property bool hasFullscreen: Hypr.focusedWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen === 2) ?? false
+
+
+    CustomShortcut {
+        name: "toggle-launcher"
+        description: "Toggle launcher"
+        onPressed: root.launcherInterrupted = false
+        onReleased: {
+            if (!root.launcherInterrupted && !root.hasFullscreen) {
+                const visibilities = Visibilities.getForActive();
+                visibilities.launcher = !visibilities.launcher;
+            }
+            root.launcherInterrupted = false;
+        }
+    }
+
+	CustomShortcut {
+		name: "toggle-nc"
+
+		onPressed: {
+			const visibilities = Visibilities.getForActive()
+			visibilities.sidebar = !visibilities.sidebar
+		}
+	}
+
+	CustomShortcut {
+		name: "show-osd"
+
+		onPressed: {
+			const visibilities = Visibilities.getForActive()
+			visibilities.osd = !visibilities.osd
+		}
+	}
+}
@@ -5,17 +5,22 @@ import QtQuick

 Singleton {
 	id: root
-	readonly property string time: {
-		Qt.formatDateTime(clock.date, "ddd d MMM - hh:mm:ss")
-	}
+    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 shortTime: {
-		Qt.formatDateTime(clock.date, "hh:mm")
-	}
+    readonly property string timeStr: format("hh:mm:ss")
+	readonly property string dateStr: format("ddd d MMM - hh:mm:ss")
+    readonly property list<string> timeComponents: timeStr.split(":")
+    readonly property string hourStr: timeComponents[0] ?? ""
+    readonly property string minuteStr: timeComponents[1] ?? ""
+    readonly property string secondStr: timeComponents[2] ?? ""

-	readonly property string longTime: {
-		Qt.formatDateTime(clock.date, "hh:mm:ss")
-	}
+    function format(fmt: string): string {
+        return Qt.formatDateTime(clock.date, fmt);
+    }

 	SystemClock {
 		id: clock
@@ -1,248 +0,0 @@
-import Quickshell
-import Quickshell.Widgets
-import Quickshell.Wayland
-import Quickshell.Hyprland
-import QtQuick.Layouts
-import QtQuick
-import qs.Components
-import qs.Config
-import qs.Daemons
-import qs.Helpers
-import qs.Effects
-
-PanelWindow {
-    id: root
-    color: "transparent"
-
-    anchors {
-        top: true
-        right: true
-        left: true
-        bottom: true
-    }
-
-	WlrLayershell.namespace: "ZShell-Notifs"
-	WlrLayershell.layer: WlrLayer.Overlay
-
-    mask: Region { regions: root.notifRegions }
-    exclusionMode: ExclusionMode.Ignore
-    property list<Region> notifRegions: []
-    required property bool centerShown
-    property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3onSurface : "white"
-    property color backgroundColor: Config.useDynamicColors ? DynamicColors.tPalette.m3surface : Config.baseBgColor
-    // visible: Hyprland.monitorFor(screen).focused
-
-    ListView {
-        id: notifListView
-        model: ScriptModel {
-            values: NotifServer.list.filter( n => n.popup )
-            onValuesChanged: {
-                if ( values.length === 0 )
-                    root.notifRegions = [];
-            }
-        }
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        x: root.centerShown ? root.screen.width - width - 420 : root.screen.width - width - 20
-        z: 0
-        anchors.topMargin: 54
-        width: 400
-        spacing: 10
-
-        Behavior on x {
-            NumberAnimation {
-                duration: MaterialEasing.expressiveEffectsTime
-                easing.bezierCurve: MaterialEasing.expressiveEffects
-            }
-        }
-
-        displaced: Transition {
-            NumberAnimation {
-                property: "y"
-                duration: 100
-                easing.type: Easing.InOutQuad
-            }
-        }
-
-        remove: Transition {
-            id: hideTransition
-            ParallelAnimation {
-                NumberAnimation {
-                    property: "opacity"
-                    from: 1
-                    to: 0
-                    duration: 200
-                    easing.type: Easing.InOutQuad
-                }
-
-                NumberAnimation {
-                    property: "x"
-                    to: hideTransition.ViewTransition.destination.x + 200
-                    duration: 200
-                    easing.type: Easing.InOutQuad
-                }
-            }
-        }
-
-        add: Transition {
-            id: showTransition
-            ParallelAnimation {
-                NumberAnimation {
-                    property: "opacity"
-                    from: 0
-                    to: 1
-                    duration: 200
-                    easing.type: Easing.InOutQuad
-                }
-
-                NumberAnimation {
-                    property: "x"
-                    from: showTransition.ViewTransition.destination.x + 200
-                    to: showTransition.ViewTransition.destination.x
-                    duration: 200
-                    easing.type: Easing.InOutQuad
-                }
-            }
-        }
-
-        component NotifRegion: Region { }
-
-        Component {
-            id: notifRegion
-            NotifRegion {}
-        }
-
-        delegate: Item {
-            id: rootItem
-            implicitWidth: 400
-            implicitHeight: contentLayout.childrenRect.height + 16
-            required property NotifServer.Notif modelData
-
-            ShadowRect {
-                anchors.fill: backgroundRect
-                radius: backgroundRect.radius
-            }
-
-            CustomClippingRect {
-                id: backgroundRect
-                implicitWidth: 400
-                implicitHeight: contentLayout.childrenRect.height + 16
-                color: root.backgroundColor
-                border.width: Config.useDynamicColors ? 0 : 1
-                border.color: "#555555"
-                radius: 8
-
-				CustomRect {
-					anchors.bottom: parent.bottom
-					anchors.right: parent.right
-					color: DynamicColors.palette.m3primary
-
-					implicitHeight: 4
-					implicitWidth: ( rootItem.modelData.timer.remainingTime / rootItem.modelData.timer.totalTime ) * parent.width
-
-					Behavior on implicitWidth {
-						Anim {}
-					}
-				}
-
-                Component.onCompleted: {
-                    root.notifRegions.push( notifRegion.createObject(root, { item: backgroundRect }));
-                }
-
-                Column {
-                    id: contentLayout
-                    z: 0
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.margins: 10
-                    spacing: 8
-                    RowLayout {
-                        spacing: 12
-                        IconImage {
-                            source: rootItem.modelData.image === "" ? Qt.resolvedUrl(rootItem.modelData.appIcon) : Qt.resolvedUrl(rootItem.modelData.image)
-                            Layout.preferredWidth: 48
-                            Layout.preferredHeight: 48
-                            Layout.alignment: Qt.AlignHCenter | Qt.AlignLeft
-                            // visible: rootItem.modelData.image !== ""
-                        }
-
-                        ColumnLayout {
-                            Layout.fillWidth: true
-                            Layout.fillHeight: true
-                            Layout.leftMargin: 0
-                            Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-
-                            Text {
-                                text: rootItem.modelData.appName
-                                color: root.textColor
-                                font.bold: true
-                                font.pointSize: 14
-                                elide: Text.ElideRight
-                                wrapMode: Text.NoWrap
-                                Layout.fillWidth: true
-                            }
-
-                            Text {
-                                text: rootItem.modelData.summary
-                                color: root.textColor
-                                font.pointSize: 12
-                                font.bold: true
-                                elide: Text.ElideRight
-                                wrapMode: Text.WordWrap
-                                Layout.fillWidth: true
-                            }
-
-                        }
-                    }
-                    Text {
-                        text: rootItem.modelData.body
-                        color: root.textColor
-                        font.pointSize: 14
-                        textFormat: Text.MarkdownText
-                        elide: Text.ElideRight
-                        wrapMode: Text.WordWrap
-                        maximumLineCount: 4
-                        width: parent.width
-                        linkColor: Config.accentColor.accents.primaryAlt
-
-                        onLinkActivated: link => {
-                            Quickshell.execDetached(["app2unit", "-O", "--", link]);
-                        }
-                    }
-                }
-
-                Rectangle {
-                    anchors.right: parent.right
-                    anchors.top: parent.top
-                    anchors.rightMargin: 6
-                    anchors.topMargin: 6
-                    width: 18
-                    height: 18
-                    color: closeArea.containsMouse ? "#FF6077" : "transparent"
-                    radius: 9
-
-                    Text {
-                        anchors.centerIn: parent
-                        text: "✕"
-                        color: closeArea.containsMouse ? "white" : "#888888"
-                        font.pointSize: 12
-                    }
-
-                    MouseArea {
-                        id: closeArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        onClicked: {
-                            rootItem.modelData.close();
-                        }
-                    }
-                }
-
-                ElapsedTimer {
-                    id: timer
-                }
-            }
-        }
-    }
-}
@@ -39,21 +39,31 @@ Item {
 		}
 	}

-    Image {
-        id: icon
+	ColoredIcon {
+		id: icon

-        property bool batteryHDPI: root.bar.screen.x < 0 && root.item.icon.includes("battery")
-        property bool nmHDPI: root.bar.screen.x < 0 && root.item.icon.includes("nm-")
+		anchors.centerIn: parent
+		source: root.item.icon
+		implicitSize: 22
+		color: DynamicColors.palette.m3onSurface
+		layer.enabled: DynamicColors.light
+	}

-        anchors.centerIn: parent
-        width: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 )
-        height: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 )
-        source: root.item.icon
-        mipmap: true
-        smooth: ( batteryHDPI || nmHDPI ) ? false : true
-        asynchronous: true
-        sourceSize.width: ( batteryHDPI || nmHDPI ) ? 16 : 22
-        sourceSize.height: ( batteryHDPI || nmHDPI ) ? 16 : 22
-        fillMode: Image.PreserveAspectFit
-    }
+    // Image {
+    //     id: icon
+    //
+    //     property bool batteryHDPI: root.bar.screen.x < 0 && root.item.icon.includes("battery")
+    //     property bool nmHDPI: root.bar.screen.x < 0 && root.item.icon.includes("nm-")
+    //
+    //     anchors.centerIn: parent
+    //     width: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 )
+    //     height: batteryHDPI ? 26 : ( nmHDPI ? 25 : 22 )
+    //     source: root.item.icon
+    //     mipmap: true
+    //     smooth: ( batteryHDPI || nmHDPI ) ? false : true
+    //     asynchronous: true
+    //     sourceSize.width: ( batteryHDPI || nmHDPI ) ? 16 : 22
+    //     sourceSize.height: ( batteryHDPI || nmHDPI ) ? 16 : 22
+    //     fillMode: Image.PreserveAspectFit
+    // }
 }
@@ -26,11 +26,11 @@ PanelWindow {
    property int biggestWidth: 0
    property int menuItemCount: menuOpener.children.values.length

-    property color backgroundColor: Config.useDynamicColors ? DynamicColors.tPalette.m3surface : Config.baseBgColor
-    property color highlightColor: Config.useDynamicColors ? DynamicColors.tPalette.m3primaryContainer : "#15FFFFFF"
-    property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3onSurface : "white"
-    property color disabledHighlightColor: Config.useDynamicColors ? DynamicColors.layer(DynamicColors.palette.m3primaryContainer, 0) : "#08FFFFFF"
-    property color disabledTextColor: Config.useDynamicColors ? DynamicColors.layer(DynamicColors.palette.m3onSurface, 0) : "#80FFFFFF"
+    property color backgroundColor: DynamicColors.tPalette.m3surface
+    property color highlightColor: DynamicColors.tPalette.m3primaryContainer
+    property color textColor: DynamicColors.palette.m3onSurface
+    property color disabledHighlightColor: DynamicColors.layer(DynamicColors.palette.m3primaryContainer, 0)
+    property color disabledTextColor: DynamicColors.layer(DynamicColors.palette.m3onSurface, 0)

    QsMenuOpener {
        id: menuOpener
@@ -193,8 +193,6 @@ PanelWindow {
        implicitHeight: listLayout.contentHeight + ( root.menuStack.length > 0 ? root.entryHeight + 10 : 10 )
        color: root.backgroundColor
        radius: 8
-        border.width: Config.useDynamicColors ? 0 : 1
-        border.color: "#40FFFFFF"
        clip: true

        Behavior on implicitWidth {
@@ -16,8 +16,8 @@ Item {

 	CustomRect {
 		anchors.fill: parent
-		anchors.topMargin: 3
-		anchors.bottomMargin: 3
+		anchors.topMargin: 4
+		anchors.bottomMargin: 4
 		color: DynamicColors.tPalette.m3surfaceContainer
 		radius: 1000
 	}
@@ -9,7 +9,7 @@ Item {
    implicitWidth: textMetrics.width + contentRow.spacing + 30
    anchors.top: parent.top
    anchors.bottom: parent.bottom
-    property color textColor: Config.useDynamicColors ? DynamicColors.palette.m3tertiaryFixed : "#ffffff"
+    property color textColor: DynamicColors.palette.m3onSurface

    Rectangle {
        anchors.left: parent.left
@@ -17,7 +17,7 @@ Item {
        anchors.verticalCenter: parent.verticalCenter
        implicitHeight: 22
        radius: height / 2
-        color: Config.useDynamicColors ? DynamicColors.tPalette.m3surfaceContainer : "#40000000"
+        color: DynamicColors.tPalette.m3surfaceContainer
        Behavior on color {
            CAnim {}
        }
@@ -7,7 +7,7 @@ import qs.Config
 Item {
    id: root

-    property string source: SearchWallpapers.current
+    property string source: Wallpapers.current
    property Image current: one

    anchors.fill: parent
@@ -50,7 +50,7 @@ Item {
        anchors.fill: parent

        opacity: 0
-        scale: SearchWallpapers.showPreview ? 1 : 0.8
+        scale: Wallpapers.showPreview ? 1 : 0.8
        asynchronous: true
        onStatusChanged: {
            if (status === Image.Ready) {
@@ -1,44 +0,0 @@
-import Quickshell
-import Quickshell.Widgets
-import QtQuick
-import ZShell.Models
-
-Item {
-    id: root
-    required property FileSystemEntry modelData
-    implicitWidth: 288
-    implicitHeight: 162
-
-    scale: 0.5
-    opacity: 0
-    z: PathView.z ?? 0
-
-    Component.onCompleted: {
-        scale = Qt.binding(() => PathView.isCurrentItem ? 1 : PathView.onPath ? 0.8 : 0);
-        opacity = Qt.binding(() => PathView.onPath ? 1 : 0);
-    }
-
-    ClippingRectangle {
-        anchors.fill: parent
-        radius: 8
-        color: "#10FFFFFF"
-        Image {
-            id: thumbnailImage
-
-            asynchronous: true
-            anchors.fill: parent
-            fillMode: Image.PreserveAspectCrop
-            source: root.modelData.path
-            sourceSize.width: 960
-            sourceSize.height: 540
-        }
-    }
-
-    Behavior on scale {
-        Anim {}
-    }
-
-    Behavior on opacity {
-        Anim {}
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aram Markarov	7861ba5c51	cava reintroduced : uses libcava or cava for nix : needs nixos fixing, but could be isolated issue	2026-02-25 19:14:58 +01:00
Zacharias-Brohn	6faebc986d	ideas	2026-02-25 17:30:25 +01:00
Aram Markarov	5cd8014092	adjusted README.md to include zshell-cli as an input to environment.systemPacakges	2026-02-22 23:03:36 +01:00
Aram Markarov	f729481ab0	hotfix zshell-cli -> worked in nix develop, testing on install	2026-02-22 22:56:50 +01:00
Zacharias-Brohn	2c56913367	osd visibility	2026-02-22 21:49:51 +01:00
Zach	33423f68c3	Merge pull request #9 from Zacharias-Brohn/cli-tool Cli tool	2026-02-22 21:43:51 +01:00
Aram Markarov	73cf01b3c5	fixed flake update, actually works : nix run builds now : devshell updated to include zshell and cli correctly	2026-02-21 22:07:40 +01:00
Zacharias-Brohn	f1bb1ec82d	osd audio muted color fix	2026-02-21 21:36:31 +01:00
Aram Markarov	0cefee8e4f	nix fix attempt -> Zach fix pls	2026-02-21 21:33:25 +01:00
Zacharias-Brohn	f33f3f19a8	nix	2026-02-21 21:27:41 +01:00
Zacharias-Brohn	ab02c679ca	fix for certain things	2026-02-21 18:32:03 +01:00
Zacharias-Brohn	23ccc0e1e8	several changes to cleaner code	2026-02-21 01:00:07 +01:00
Zacharias-Brohn	cff2a85d9d	auto light/dark scheme for neovim	2026-02-19 16:55:42 +01:00
Zacharias-Brohn	fb8f8284d4	auto light/dark scheme for neovim	2026-02-19 16:54:43 +01:00
Zacharias-Brohn	79428bb209	auto light/dark scheme	2026-02-19 14:41:42 +01:00
Zacharias-Brohn	d97cb0d583	scheme refactor	2026-02-19 13:06:45 +01:00
Zacharias-Brohn	b701badbc7	scheme refactor	2026-02-19 13:05:30 +01:00
Zacharias-Brohn	ee62e61b06	scheme refactor	2026-02-19 12:40:00 +01:00
Zacharias-Brohn	c4d51f82c3	actually fixed	2026-02-19 10:51:52 +01:00
Zacharias-Brohn	3d39e7a16d	test fix	2026-02-19 10:50:13 +01:00
Zacharias-Brohn	1322afe7f0	test fix	2026-02-19 10:48:41 +01:00
Zacharias-Brohn	efa4dbdc29	test fix	2026-02-19 10:47:59 +01:00
Zacharias-Brohn	96de958c98	test fix	2026-02-19 10:47:08 +01:00
Zacharias-Brohn	6bbb1c7656	test fix	2026-02-19 10:38:49 +01:00
Zacharias-Brohn	37323a032f	revert	2026-02-19 02:55:17 +01:00
Zacharias-Brohn	e36066c4e0	revert	2026-02-19 02:52:50 +01:00
Zacharias-Brohn	be471dcf20	test fix	2026-02-19 02:48:17 +01:00
Zacharias-Brohn	f435182f1e	test fix	2026-02-19 02:36:48 +01:00
Zacharias-Brohn	cfa1902797	test fix	2026-02-19 02:35:02 +01:00
Zacharias-Brohn	7f8a516b4b	scheme setter, light mode?	2026-02-19 01:10:46 +01:00
Zacharias-Brohn	646f70a98d	fix lockscreen wallpaper set call	2026-02-18 23:44:02 +01:00
Zacharias-Brohn	5d5d9575b6	general ipc calls	2026-02-18 23:39:06 +01:00
Zacharias-Brohn	e2eb0631cf	screenshot ipc	2026-02-18 23:21:46 +01:00
Zacharias-Brohn	77060d2457	binary + installer	2026-02-18 22:13:35 +01:00
Zacharias-Brohn	c8e6687bc3	binary + installer	2026-02-18 19:07:31 +01:00
Zacharias-Brohn	457007f74d	binary + installer	2026-02-18 18:53:11 +01:00
Zacharias-Brohn	01e94a10ab	ESC to close panels	2026-02-18 12:39:05 +01:00
Zacharias-Brohn	97784f6101	oopsie conditional fixed	2026-02-18 12:15:10 +01:00
Zacharias-Brohn	e551b6bbf1	unhide bar on panel visibilities	2026-02-18 12:09:03 +01:00
Zacharias-Brohn	b3bb593b54	fix colorscheme setting	2026-02-17 22:38:57 +01:00
Zacharias-Brohn	01e130dd6e	checklist ideas.md, launcher rounding	2026-02-17 22:28:51 +01:00
Zacharias-Brohn	33825d1000	checklist ideas.md	2026-02-17 22:03:14 +01:00
Zacharias-Brohn	fc20156852	remove config write	2026-02-17 21:55:21 +01:00
AramMarkarov	9ce8f3f54c	added/adjusted plans/ideas.md	2026-02-17 18:52:48 +01:00
Zacharias-Brohn	9cf054a1c6	launcher overhaul	2026-02-17 17:12:34 +01:00
Zacharias-Brohn	dbb930f39a	launcher overhaul	2026-02-17 16:32:43 +01:00
Zacharias-Brohn	e818ac5515	config fixes	2026-02-17 12:46:25 +01:00
Zacharias-Brohn	7d9ba3d570	lockscreen?	2026-02-17 00:28:57 +01:00
Zacharias-Brohn	b22e79a2c5	osd	2026-02-16 19:46:26 +01:00
Zacharias-Brohn	168c0cd686	fix globalshortcut names	2026-02-16 19:25:16 +01:00
Zacharias-Brohn	ded3ab06df	osd	2026-02-16 18:54:36 +01:00
Zacharias-Brohn	b77e728313	autohide fix	2026-02-14 18:30:00 +01:00
Zacharias-Brohn	4bbfd94419	autohide	2026-02-14 18:23:08 +01:00
Zacharias-Brohn	c5b769b6e0	autohide	2026-02-14 18:20:28 +01:00
Aram Markarov	4286122a97	when python meets nixos	2026-02-14 17:03:35 +01:00
Zacharias-Brohn	c5959c4d8e	test script color scheme	2026-02-14 16:48:37 +01:00
Zacharias-Brohn	39e37b4c97	test script color scheme	2026-02-14 16:45:46 +01:00
Zacharias-Brohn	b77fc7e133	test script color scheme	2026-02-14 16:42:09 +01:00