Update VERSION to v0.3.3 (from DMS)

fixes #597

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,6 +24,8 @@ assignees: ""
 
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 - [ ] Other (specify)
 
 ## Distribution

.github/ISSUE_TEMPLATE/feature_request.md

@@ -21,6 +21,8 @@ Is this feature specific to one compositor?
 - [ ] All compositors
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 
 ## Proposed Solution
 

.github/ISSUE_TEMPLATE/support_request.md

@@ -10,6 +10,8 @@ assignees: ""
 
 - [ ] niri
 - [ ] Hyprland
+- [ ] dwl (MangoWC)
+- [ ] sway
 - [ ] other
 
 ## Distribution

.github/workflows/copr-release.yml

@@ -86,15 +86,16 @@ jobs:
 
           BuildRequires:  gzip
           BuildRequires:  wget
+          BuildRequires:  systemd-rpm-macros
 
           Requires:       (quickshell or quickshell-git)
           Requires:       accountsservice
           Requires:       dms-cli
           Requires:       dgop
 
-          Recommends:     brightnessctl
           Recommends:     cava
           Recommends:     cliphist
+          Recommends:     danksearch
           Recommends:     hyprpicker
           Recommends:     matugen
           Recommends:     wl-clipboard
@@ -171,6 +172,8 @@ jobs:
           install -Dm755 %{_builddir}/dms-cli %{buildroot}%{_bindir}/dms
           install -Dm755 %{_builddir}/dgop %{buildroot}%{_bindir}/dgop
 
+          install -Dm644 %{_builddir}/dms-qml/assets/systemd/dms.service %{buildroot}%{_userunitdir}/dms.service
+
           install -dm755 %{buildroot}%{_datadir}/quickshell/dms
           cp -r %{_builddir}/dms-qml/* %{buildroot}%{_datadir}/quickshell/dms/
 
@@ -224,6 +227,7 @@ jobs:
           %license LICENSE
           %doc README.md CONTRIBUTING.md
           %{_datadir}/quickshell/dms/
+          %{_userunitdir}/dms.service
 
           %files -n dms-cli
           %{_bindir}/dms

.github/workflows/poeditor-export.yml

@@ -112,8 +112,10 @@ jobs:
           LANGUAGES=(
             "ja:translations/poexports/ja.json"
             "zh-Hans:translations/poexports/zh_CN.json"
+            "zh-Hant:translations/poexports/zh_TW.json"
             "pt-br:translations/poexports/pt.json"
             "tr:translations/poexports/tr.json"
+            "it:translations/poexports/it.json"
           )
 
           ANY_CHANGED=false

.github/workflows/release.yml

@@ -49,9 +49,9 @@ jobs:
           set -e
           PREVIOUS_TAG=$(git describe --tags --abbrev=0 "${TAG}^" 2>/dev/null || echo "")
           if [ -z "$PREVIOUS_TAG" ]; then
-            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" --author='^(?!github-actions\[bot\])' | head -50)
+            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /' | head -50)
           else
-            CHANGELOG=$(git log --oneline --pretty=format:"- %s (%h)" --author='^(?!github-actions\[bot\])' "${PREVIOUS_TAG}..${TAG}")
+            CHANGELOG=$(git log --oneline --pretty=format:"%an|%s (%h)" "${PREVIOUS_TAG}..${TAG}" | grep -v "^github-actions\[bot\]|" | sed 's/^[^|]*|/- /')
           fi
 
           cat > RELEASE_BODY.md << 'EOF'

Common/CacheData.qml

@@ -22,6 +22,57 @@ Singleton {
     property string wallpaperLastPath: ""
     property string profileLastPath: ""
 
+    property var fileBrowserSettings: ({
+        "wallpaper": {
+            "lastPath": "",
+            "viewMode": "grid",
+            "sortBy": "name",
+            "sortAscending": true,
+            "iconSizeIndex": 1,
+            "showSidebar": true
+        },
+        "profile": {
+            "lastPath": "",
+            "viewMode": "grid",
+            "sortBy": "name",
+            "sortAscending": true,
+            "iconSizeIndex": 1,
+            "showSidebar": true
+        },
+        "notepad_save": {
+            "lastPath": "",
+            "viewMode": "list",
+            "sortBy": "name",
+            "sortAscending": true,
+            "iconSizeIndex": 1,
+            "showSidebar": true
+        },
+        "notepad_load": {
+            "lastPath": "",
+            "viewMode": "list",
+            "sortBy": "name",
+            "sortAscending": true,
+            "iconSizeIndex": 1,
+            "showSidebar": true
+        },
+        "generic": {
+            "lastPath": "",
+            "viewMode": "list",
+            "sortBy": "name",
+            "sortAscending": true,
+            "iconSizeIndex": 1,
+            "showSidebar": true
+        },
+        "default": {
+            "lastPath": "",
+            "viewMode": "list",
+            "sortBy": "name",
+            "sortAscending": true,
+            "iconSizeIndex": 1,
+            "showSidebar": true
+        }
+    })
+
     Component.onCompleted: {
         if (!isGreeterMode) {
             loadCache()
@@ -43,6 +94,37 @@ Singleton {
                 wallpaperLastPath = cache.wallpaperLastPath !== undefined ? cache.wallpaperLastPath : ""
                 profileLastPath = cache.profileLastPath !== undefined ? cache.profileLastPath : ""
 
+                if (cache.fileBrowserSettings !== undefined) {
+                    fileBrowserSettings = cache.fileBrowserSettings
+                } else if (cache.fileBrowserViewMode !== undefined) {
+                    fileBrowserSettings = {
+                        "wallpaper": {
+                            "lastPath": cache.wallpaperLastPath || "",
+                            "viewMode": cache.fileBrowserViewMode || "grid",
+                            "sortBy": cache.fileBrowserSortBy || "name",
+                            "sortAscending": cache.fileBrowserSortAscending !== undefined ? cache.fileBrowserSortAscending : true,
+                            "iconSizeIndex": cache.fileBrowserIconSizeIndex !== undefined ? cache.fileBrowserIconSizeIndex : 1,
+                            "showSidebar": cache.fileBrowserShowSidebar !== undefined ? cache.fileBrowserShowSidebar : true
+                        },
+                        "profile": {
+                            "lastPath": cache.profileLastPath || "",
+                            "viewMode": cache.fileBrowserViewMode || "grid",
+                            "sortBy": cache.fileBrowserSortBy || "name",
+                            "sortAscending": cache.fileBrowserSortAscending !== undefined ? cache.fileBrowserSortAscending : true,
+                            "iconSizeIndex": cache.fileBrowserIconSizeIndex !== undefined ? cache.fileBrowserIconSizeIndex : 1,
+                            "showSidebar": cache.fileBrowserShowSidebar !== undefined ? cache.fileBrowserShowSidebar : true
+                        },
+                        "file": {
+                            "lastPath": "",
+                            "viewMode": "list",
+                            "sortBy": "name",
+                            "sortAscending": true,
+                            "iconSizeIndex": 1,
+                            "showSidebar": true
+                        }
+                    }
+                }
+
                 if (cache.configVersion === undefined) {
                     migrateFromUndefinedToV1(cache)
                     cleanupUnusedKeys()
@@ -62,6 +144,7 @@ Singleton {
         cacheFile.setText(JSON.stringify({
                                              "wallpaperLastPath": wallpaperLastPath,
                                              "profileLastPath": profileLastPath,
+                                             "fileBrowserSettings": fileBrowserSettings,
                                              "configVersion": cacheConfigVersion
                                          }, null, 2))
     }
@@ -74,6 +157,7 @@ Singleton {
         const validKeys = [
             "wallpaperLastPath",
             "profileLastPath",
+            "fileBrowserSettings",
             "configVersion"
         ]
 

Common/Proc.qml

@@ -9,20 +9,24 @@ Singleton {
     id: root
 
     property int defaultDebounceMs: 50
-    property var _procDebouncers: ({}) // id -> { timer, command, callback, waitMs }
+    property int defaultTimeoutMs: 10000
+    property var _procDebouncers: ({})
 
-    function runCommand(id, command, callback, debounceMs) {
+    function runCommand(id, command, callback, debounceMs, timeoutMs) {
         const wait = (typeof debounceMs === "number" && debounceMs >= 0) ? debounceMs : defaultDebounceMs
-        let procId = id ? id : Math.random()        
+        const timeout = (typeof timeoutMs === "number" && timeoutMs > 0) ? timeoutMs : defaultTimeoutMs
+        let procId = id ? id : Math.random()
+        const isRandomId = !id
 
         if (!_procDebouncers[procId]) {
             const t = Qt.createQmlObject('import QtQuick; Timer { repeat: false }', root)
-            t.triggered.connect(function() { _launchProc(procId) })
-            _procDebouncers[procId] = { timer: t, command: command, callback: callback, waitMs: wait }
+            t.triggered.connect(function() { _launchProc(procId, isRandomId) })
+            _procDebouncers[procId] = { timer: t, command: command, callback: callback, waitMs: wait, timeoutMs: timeout, isRandomId: isRandomId }
         } else {
             _procDebouncers[procId].command = command
             _procDebouncers[procId].callback = callback
             _procDebouncers[procId].waitMs = wait
+            _procDebouncers[procId].timeoutMs = timeout
         }
 
         const entry = _procDebouncers[procId]
@@ -30,41 +34,77 @@ Singleton {
         entry.timer.restart()
     }
 
-    function _launchProc(id) {
+    function _launchProc(id, isRandomId) {
         const entry = _procDebouncers[id]
         if (!entry) return
 
         const proc = Qt.createQmlObject('import Quickshell.Io; Process { running: false }', root)
         const out = Qt.createQmlObject('import Quickshell.Io; StdioCollector {}', proc)
         const err = Qt.createQmlObject('import Quickshell.Io; StdioCollector {}', proc)
+        const timeoutTimer = Qt.createQmlObject('import QtQuick; Timer { repeat: false }', root)
 
         proc.stdout = out
         proc.stderr = err
         proc.command = entry.command
 
         let capturedOut = ""
+        let capturedErr = ""
         let exitSeen = false
         let exitCodeValue = -1
+        let outSeen = false
+        let errSeen = false
+        let timedOut = false
+
+        timeoutTimer.interval = entry.timeoutMs
+        timeoutTimer.triggered.connect(function() {
+            if (!exitSeen) {
+                timedOut = true
+                proc.running = false
+                exitSeen = true
+                exitCodeValue = 124
+                maybeComplete()
+            }
+        })
 
         out.streamFinished.connect(function() {
             capturedOut = out.text || ""
+            outSeen = true
+            maybeComplete()
+        })
+
+        err.streamFinished.connect(function() {
+            capturedErr = err.text || ""
+            errSeen = true
             maybeComplete()
         })
 
         proc.exited.connect(function(code) {
+            timeoutTimer.stop()
             exitSeen = true
             exitCodeValue = code
             maybeComplete()
         })
 
         function maybeComplete() {
-            if (!exitSeen) return
+            if (!exitSeen || !outSeen || !errSeen) return
+            timeoutTimer.stop()
             if (typeof entry.callback === "function") {
                 try { entry.callback(capturedOut, exitCodeValue) } catch (e) { console.warn("runCommand callback error:", e) }
             }
             try { proc.destroy() } catch (_) {}
+            try { timeoutTimer.destroy() } catch (_) {}
+
+            if (isRandomId || entry.isRandomId) {
+                Qt.callLater(function() {
+                    if (_procDebouncers[id]) {
+                        try { _procDebouncers[id].timer.destroy() } catch (_) {}
+                        delete _procDebouncers[id]
+                    }
+                })
+            }
         }
 
         proc.running = true
+        timeoutTimer.start()
     }
 }

Common/SessionData.qml

@@ -1,4 +1,5 @@
 pragma Singleton
+
 pragma ComponentBehavior: Bound
 
 import QtCore
@@ -20,6 +21,7 @@ Singleton {
 
     property bool isLightMode: false
     property bool doNotDisturb: false
+    property bool isSwitchingMode: false
 
     property string wallpaperPath: ""
     property bool perMonitorWallpaper: false
@@ -41,6 +43,7 @@ Singleton {
 
     property bool nightModeEnabled: false
     property int nightModeTemperature: 4500
+    property int nightModeHighTemperature: 6500
     property bool nightModeAutoEnabled: false
     property string nightModeAutoMode: "time"
     property int nightModeStartHour: 18
@@ -82,7 +85,21 @@ Singleton {
             if (content && content.trim()) {
                 var settings = JSON.parse(content)
                 isLightMode = settings.isLightMode !== undefined ? settings.isLightMode : false
-                wallpaperPath = settings.wallpaperPath !== undefined ? settings.wallpaperPath : ""
+
+                if (settings.wallpaperPath && settings.wallpaperPath.startsWith("we:")) {
+                    console.warn("WallpaperEngine wallpaper detected, resetting wallpaper")
+                    wallpaperPath = ""
+                    Quickshell.execDetached([
+                        "notify-send",
+                        "-u", "critical",
+                        "-a", "DMS",
+                        "-i", "dialog-warning",
+                        "WallpaperEngine Support Moved",
+                        "WallpaperEngine support has been moved to a plugin. Please enable the Linux Wallpaper Engine plugin in Settings → Plugins to continue using WallpaperEngine."
+                    ])
+                } else {
+                    wallpaperPath = settings.wallpaperPath !== undefined ? settings.wallpaperPath : ""
+                }
                 perMonitorWallpaper = settings.perMonitorWallpaper !== undefined ? settings.perMonitorWallpaper : false
                 monitorWallpapers = settings.monitorWallpapers !== undefined ? settings.monitorWallpapers : {}
                 perModeWallpaper = settings.perModeWallpaper !== undefined ? settings.perModeWallpaper : false
@@ -93,6 +110,7 @@ Singleton {
                 doNotDisturb = settings.doNotDisturb !== undefined ? settings.doNotDisturb : false
                 nightModeEnabled = settings.nightModeEnabled !== undefined ? settings.nightModeEnabled : false
                 nightModeTemperature = settings.nightModeTemperature !== undefined ? settings.nightModeTemperature : 4500
+                nightModeHighTemperature = settings.nightModeHighTemperature !== undefined ? settings.nightModeHighTemperature : 6500
                 nightModeAutoEnabled = settings.nightModeAutoEnabled !== undefined ? settings.nightModeAutoEnabled : false
                 nightModeAutoMode = settings.nightModeAutoMode !== undefined ? settings.nightModeAutoMode : "time"
                 if (settings.nightModeStartTime !== undefined) {
@@ -144,6 +162,10 @@ Singleton {
                         Theme.generateSystemThemesFromCurrentTheme()
                     }
                 }
+
+                if (typeof WallpaperCyclingService !== "undefined") {
+                    WallpaperCyclingService.updateCyclingState()
+                }
             }
         } catch (e) {
 
@@ -151,7 +173,8 @@ Singleton {
     }
 
     function saveSettings() {
-        if (isGreeterMode) return
+        if (isGreeterMode)
+            return
         settingsFile.setText(JSON.stringify({
                                                 "isLightMode": isLightMode,
                                                 "wallpaperPath": wallpaperPath,
@@ -165,6 +188,7 @@ Singleton {
                                                 "doNotDisturb": doNotDisturb,
                                                 "nightModeEnabled": nightModeEnabled,
                                                 "nightModeTemperature": nightModeTemperature,
+                                                "nightModeHighTemperature": nightModeHighTemperature,
                                                 "nightModeAutoEnabled": nightModeAutoEnabled,
                                                 "nightModeAutoMode": nightModeAutoMode,
                                                 "nightModeStartHour": nightModeStartHour,
@@ -244,23 +268,12 @@ Singleton {
     }
 
     function cleanupUnusedKeys() {
-        const validKeys = [
-            "isLightMode", "wallpaperPath", "perMonitorWallpaper", "monitorWallpapers", "perModeWallpaper",
-            "wallpaperPathLight", "wallpaperPathDark", "monitorWallpapersLight",
-            "monitorWallpapersDark", "doNotDisturb", "nightModeEnabled",
-            "nightModeTemperature", "nightModeAutoEnabled", "nightModeAutoMode",
-            "nightModeStartHour", "nightModeStartMinute", "nightModeEndHour",
-            "nightModeEndMinute", "latitude", "longitude", "nightModeUseIPLocation", "nightModeLocationProvider",
-            "pinnedApps", "selectedGpuIndex", "nvidiaGpuTempEnabled",
-            "nonNvidiaGpuTempEnabled", "enabledGpuPciIds", "wallpaperCyclingEnabled",
-            "wallpaperCyclingMode", "wallpaperCyclingInterval", "wallpaperCyclingTime",
-            "monitorCyclingSettings", "lastBrightnessDevice", "launchPrefix", "wallpaperTransition",
-            "includedTransitions", "recentColors", "showThirdPartyPlugins", "configVersion"
-        ]
+        const validKeys = ["isLightMode", "wallpaperPath", "perMonitorWallpaper", "monitorWallpapers", "perModeWallpaper", "wallpaperPathLight", "wallpaperPathDark", "monitorWallpapersLight", "monitorWallpapersDark", "doNotDisturb", "nightModeEnabled", "nightModeTemperature", "nightModeHighTemperature", "nightModeAutoEnabled", "nightModeAutoMode", "nightModeStartHour", "nightModeStartMinute", "nightModeEndHour", "nightModeEndMinute", "latitude", "longitude", "nightModeUseIPLocation", "nightModeLocationProvider", "pinnedApps", "selectedGpuIndex", "nvidiaGpuTempEnabled", "nonNvidiaGpuTempEnabled", "enabledGpuPciIds", "wallpaperCyclingEnabled", "wallpaperCyclingMode", "wallpaperCyclingInterval", "wallpaperCyclingTime", "monitorCyclingSettings", "lastBrightnessDevice", "launchPrefix", "wallpaperTransition", "includedTransitions", "recentColors", "showThirdPartyPlugins", "configVersion"]
 
         try {
             const content = settingsFile.text()
-            if (!content || !content.trim()) return
+            if (!content || !content.trim())
+                return
 
             const settings = JSON.parse(content)
             let needsSave = false
@@ -282,9 +295,11 @@ Singleton {
     }
 
     function setLightMode(lightMode) {
+        isSwitchingMode = true
         isLightMode = lightMode
         syncWallpaperForCurrentMode()
         saveSettings()
+        Qt.callLater(() => { isSwitchingMode = false })
     }
 
     function setDoNotDisturb(enabled) {
@@ -425,10 +440,13 @@ Singleton {
 
         saveSettings()
 
-        if (typeof Theme !== "undefined" && typeof Quickshell !== "undefined") {
+        if (typeof Theme !== "undefined" && typeof Quickshell !== "undefined" && typeof SettingsData !== "undefined") {
             var screens = Quickshell.screens
-            if (screens.length > 0 && screenName === screens[0].name) {
-                Theme.generateSystemThemesFromCurrentTheme()
+            if (screens.length > 0) {
+                var targetMonitor = (SettingsData.matugenTargetMonitor && SettingsData.matugenTargetMonitor !== "") ? SettingsData.matugenTargetMonitor : screens[0].name
+                if (screenName === targetMonitor) {
+                    Theme.generateSystemThemesFromCurrentTheme()
+                }
             }
         }
     }
@@ -461,7 +479,12 @@ Singleton {
     function setMonitorCyclingEnabled(screenName, enabled) {
         var newSettings = Object.assign({}, monitorCyclingSettings)
         if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
+            newSettings[screenName] = {
+                "enabled": false,
+                "mode": "interval",
+                "interval": 300,
+                "time": "06:00"
+            }
         }
         newSettings[screenName].enabled = enabled
         monitorCyclingSettings = newSettings
@@ -471,7 +494,12 @@ Singleton {
     function setMonitorCyclingMode(screenName, mode) {
         var newSettings = Object.assign({}, monitorCyclingSettings)
         if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
+            newSettings[screenName] = {
+                "enabled": false,
+                "mode": "interval",
+                "interval": 300,
+                "time": "06:00"
+            }
         }
         newSettings[screenName].mode = mode
         monitorCyclingSettings = newSettings
@@ -481,7 +509,12 @@ Singleton {
     function setMonitorCyclingInterval(screenName, interval) {
         var newSettings = Object.assign({}, monitorCyclingSettings)
         if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
+            newSettings[screenName] = {
+                "enabled": false,
+                "mode": "interval",
+                "interval": 300,
+                "time": "06:00"
+            }
         }
         newSettings[screenName].interval = interval
         monitorCyclingSettings = newSettings
@@ -491,7 +524,12 @@ Singleton {
     function setMonitorCyclingTime(screenName, time) {
         var newSettings = Object.assign({}, monitorCyclingSettings)
         if (!newSettings[screenName]) {
-            newSettings[screenName] = { enabled: false, mode: "interval", interval: 300, time: "06:00" }
+            newSettings[screenName] = {
+                "enabled": false,
+                "mode": "interval",
+                "interval": 300,
+                "time": "06:00"
+            }
         }
         newSettings[screenName].time = time
         monitorCyclingSettings = newSettings
@@ -508,6 +546,11 @@ Singleton {
         saveSettings()
     }
 
+    function setNightModeHighTemperature(temperature) {
+        nightModeHighTemperature = temperature
+        saveSettings()
+    }
+
     function setNightModeAutoEnabled(enabled) {
         console.log("SessionData: Setting nightModeAutoEnabled to", enabled)
         nightModeAutoEnabled = enabled
@@ -592,7 +635,8 @@ Singleton {
         let recent = recentColors.slice()
         recent = recent.filter(c => c !== colorStr)
         recent.unshift(colorStr)
-        if (recent.length > 5) recent = recent.slice(0, 5)
+        if (recent.length > 5)
+            recent = recent.slice(0, 5)
         recentColors = recent
         saveSettings()
     }
@@ -633,7 +677,8 @@ Singleton {
     }
 
     function syncWallpaperForCurrentMode() {
-        if (!perModeWallpaper) return
+        if (!perModeWallpaper)
+            return
 
         if (perMonitorWallpaper) {
             monitorWallpapers = isLightMode ? Object.assign({}, monitorWallpapersLight) : Object.assign({}, monitorWallpapersDark)
@@ -652,10 +697,10 @@ Singleton {
 
     function getMonitorCyclingSettings(screenName) {
         return monitorCyclingSettings[screenName] || {
-            enabled: false,
-            mode: "interval",
-            interval: 300,
-            time: "06:00"
+            "enabled": false,
+            "mode": "interval",
+            "interval": 300,
+            "time": "06:00"
         }
     }
 

Common/SettingsData.qml

@@ -51,6 +51,7 @@ Singleton {
     property string customThemeFile: ""
     property string matugenScheme: "scheme-tonal-spot"
     property bool runUserMatugenTemplates: true
+    property string matugenTargetMonitor: ""
     property real dankBarTransparency: 1.0
     property real dankBarWidgetTransparency: 1.0
     property real popupTransparency: 1.0
@@ -90,16 +91,39 @@ Singleton {
     property bool controlCenterShowNetworkIcon: true
     property bool controlCenterShowBluetoothIcon: true
     property bool controlCenterShowAudioIcon: true
-    property var controlCenterWidgets: [
-        {"id": "volumeSlider", "enabled": true, "width": 50},
-        {"id": "brightnessSlider", "enabled": true, "width": 50},
-        {"id": "wifi", "enabled": true, "width": 50},
-        {"id": "bluetooth", "enabled": true, "width": 50},
-        {"id": "audioOutput", "enabled": true, "width": 50},
-        {"id": "audioInput", "enabled": true, "width": 50},
-        {"id": "nightMode", "enabled": true, "width": 50},
-        {"id": "darkMode", "enabled": true, "width": 50}
-    ]
+    property var controlCenterWidgets: [{
+            "id": "volumeSlider",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "brightnessSlider",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "wifi",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "bluetooth",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "audioOutput",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "audioInput",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "nightMode",
+            "enabled": true,
+            "width": 50
+        }, {
+            "id": "darkMode",
+            "enabled": true,
+            "width": 50
+        }]
 
     property bool showWorkspaceIndex: false
     property bool showWorkspacePadding: false
@@ -107,11 +131,13 @@ Singleton {
     property bool showWorkspaceApps: false
     property int maxWorkspaceIcons: 3
     property bool workspacesPerMonitor: true
+    property bool dwlShowAllTags: false
     property var workspaceNameIcons: ({})
     property bool waveProgressEnabled: true
     property bool clockCompactMode: false
     property bool focusedWindowCompactMode: false
     property bool runningAppsCompactMode: true
+    property bool keyboardLayoutNameCompactMode: false
     property bool runningAppsCurrentWorkspace: false
     property bool runningAppsGroupByApp: false
     property string clockDateFormat: ""
@@ -133,6 +159,7 @@ Singleton {
     property bool weatherEnabled: true
 
     property string networkPreference: "auto"
+    property string vpnLastConnected: ""
 
     property string iconTheme: "System Default"
     property var availableIconThemes: ["System Default"]
@@ -273,6 +300,7 @@ Singleton {
             loadSettings()
             initializeListModels()
             fprintdDetectionProcess.running = true
+            pluginSettingsCheckProcess.running = true
         }
     }
 
@@ -329,8 +357,14 @@ Singleton {
                 customThemeFile = settings.customThemeFile !== undefined ? settings.customThemeFile : ""
                 matugenScheme = settings.matugenScheme !== undefined ? settings.matugenScheme : "scheme-tonal-spot"
                 runUserMatugenTemplates = settings.runUserMatugenTemplates !== undefined ? settings.runUserMatugenTemplates : true
-                dankBarTransparency = settings.dankBarTransparency !== undefined ? (settings.dankBarTransparency > 1 ? settings.dankBarTransparency / 100 : settings.dankBarTransparency) : (settings.topBarTransparency !== undefined ? (settings.topBarTransparency > 1 ? settings.topBarTransparency / 100 : settings.topBarTransparency) : 1.0)
-                dankBarWidgetTransparency = settings.dankBarWidgetTransparency !== undefined ? (settings.dankBarWidgetTransparency > 1 ? settings.dankBarWidgetTransparency / 100 : settings.dankBarWidgetTransparency) : (settings.topBarWidgetTransparency !== undefined ? (settings.topBarWidgetTransparency > 1 ? settings.topBarWidgetTransparency / 100 : settings.topBarWidgetTransparency) : 1.0)
+                matugenTargetMonitor = settings.matugenTargetMonitor !== undefined ? settings.matugenTargetMonitor : ""
+                dankBarTransparency = settings.dankBarTransparency
+                        !== undefined ? (settings.dankBarTransparency > 1 ? settings.dankBarTransparency
+                                                                            / 100 : settings.dankBarTransparency) : (settings.topBarTransparency !== undefined ? (settings.topBarTransparency > 1 ? settings.topBarTransparency / 100 : settings.topBarTransparency) : 1.0)
+                dankBarWidgetTransparency = settings.dankBarWidgetTransparency
+                        !== undefined ? (settings.dankBarWidgetTransparency
+                                         > 1 ? settings.dankBarWidgetTransparency
+                                               / 100 : settings.dankBarWidgetTransparency) : (settings.topBarWidgetTransparency !== undefined ? (settings.topBarWidgetTransparency > 1 ? settings.topBarWidgetTransparency / 100 : settings.topBarWidgetTransparency) : 1.0)
                 popupTransparency = settings.popupTransparency !== undefined ? (settings.popupTransparency > 1 ? settings.popupTransparency / 100 : settings.popupTransparency) : 1.0
                 dockTransparency = settings.dockTransparency !== undefined ? (settings.dockTransparency > 1 ? settings.dockTransparency / 100 : settings.dockTransparency) : 1
                 use24HourClock = settings.use24HourClock !== undefined ? settings.use24HourClock : true
@@ -361,16 +395,39 @@ Singleton {
                 controlCenterShowNetworkIcon = settings.controlCenterShowNetworkIcon !== undefined ? settings.controlCenterShowNetworkIcon : true
                 controlCenterShowBluetoothIcon = settings.controlCenterShowBluetoothIcon !== undefined ? settings.controlCenterShowBluetoothIcon : true
                 controlCenterShowAudioIcon = settings.controlCenterShowAudioIcon !== undefined ? settings.controlCenterShowAudioIcon : true
-                controlCenterWidgets = settings.controlCenterWidgets !== undefined ? settings.controlCenterWidgets : [
-                    {"id": "volumeSlider", "enabled": true, "width": 50},
-                    {"id": "brightnessSlider", "enabled": true, "width": 50},
-                    {"id": "wifi", "enabled": true, "width": 50},
-                    {"id": "bluetooth", "enabled": true, "width": 50},
-                    {"id": "audioOutput", "enabled": true, "width": 50},
-                    {"id": "audioInput", "enabled": true, "width": 50},
-                    {"id": "nightMode", "enabled": true, "width": 50},
-                    {"id": "darkMode", "enabled": true, "width": 50}
-                ]
+                controlCenterWidgets = settings.controlCenterWidgets !== undefined ? settings.controlCenterWidgets : [{
+                                                                                                                          "id": "volumeSlider",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "brightnessSlider",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "wifi",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "bluetooth",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "audioOutput",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "audioInput",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "nightMode",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }, {
+                                                                                                                          "id": "darkMode",
+                                                                                                                          "enabled": true,
+                                                                                                                          "width": 50
+                                                                                                                      }]
                 showWorkspaceIndex = settings.showWorkspaceIndex !== undefined ? settings.showWorkspaceIndex : false
                 showWorkspacePadding = settings.showWorkspacePadding !== undefined ? settings.showWorkspacePadding : false
                 workspaceScrolling = settings.workspaceScrolling !== undefined ? settings.workspaceScrolling : false
@@ -378,10 +435,12 @@ Singleton {
                 maxWorkspaceIcons = settings.maxWorkspaceIcons !== undefined ? settings.maxWorkspaceIcons : 3
                 workspaceNameIcons = settings.workspaceNameIcons !== undefined ? settings.workspaceNameIcons : ({})
                 workspacesPerMonitor = settings.workspacesPerMonitor !== undefined ? settings.workspacesPerMonitor : true
+                dwlShowAllTags = settings.dwlShowAllTags !== undefined ? settings.dwlShowAllTags : false
                 waveProgressEnabled = settings.waveProgressEnabled !== undefined ? settings.waveProgressEnabled : true
                 clockCompactMode = settings.clockCompactMode !== undefined ? settings.clockCompactMode : false
                 focusedWindowCompactMode = settings.focusedWindowCompactMode !== undefined ? settings.focusedWindowCompactMode : false
                 runningAppsCompactMode = settings.runningAppsCompactMode !== undefined ? settings.runningAppsCompactMode : true
+                keyboardLayoutNameCompactMode = settings.keyboardLayoutNameCompactMode !== undefined ? settings.keyboardLayoutNameCompactMode : true
                 runningAppsCurrentWorkspace = settings.runningAppsCurrentWorkspace !== undefined ? settings.runningAppsCurrentWorkspace : false
                 runningAppsGroupByApp = settings.runningAppsGroupByApp !== undefined ? settings.runningAppsGroupByApp : false
                 clockDateFormat = settings.clockDateFormat !== undefined ? settings.clockDateFormat : ""
@@ -390,18 +449,19 @@ Singleton {
                 if (settings.dankBarWidgetOrder || settings.topBarWidgetOrder) {
                     var widgetOrder = settings.dankBarWidgetOrder || settings.topBarWidgetOrder
                     dankBarLeftWidgets = widgetOrder.filter(w => {
-                                                                              return ["launcherButton", "workspaceSwitcher", "focusedWindow"].includes(w)
-                                                                          })
+                                                                return ["launcherButton", "workspaceSwitcher", "focusedWindow"].includes(w)
+                                                            })
                     dankBarCenterWidgets = widgetOrder.filter(w => {
-                                                                                return ["clock", "music", "weather"].includes(w)
-                                                                            })
+                                                                  return ["clock", "music", "weather"].includes(w)
+                                                              })
                     dankBarRightWidgets = widgetOrder.filter(w => {
-                                                                               return ["systemTray", "clipboard", "systemResources", "notificationButton", "battery", "controlCenterButton"].includes(w)
-                                                                           })
+                                                                 return ["systemTray", "clipboard", "systemResources", "notificationButton", "battery", "controlCenterButton"].includes(w)
+                                                             })
                 } else {
                     var leftWidgets = settings.dankBarLeftWidgets !== undefined ? settings.dankBarLeftWidgets : (settings.topBarLeftWidgets !== undefined ? settings.topBarLeftWidgets : ["launcherButton", "workspaceSwitcher", "focusedWindow"])
                     var centerWidgets = settings.dankBarCenterWidgets !== undefined ? settings.dankBarCenterWidgets : (settings.topBarCenterWidgets !== undefined ? settings.topBarCenterWidgets : ["music", "clock", "weather"])
-                    var rightWidgets = settings.dankBarRightWidgets !== undefined ? settings.dankBarRightWidgets : (settings.topBarRightWidgets !== undefined ? settings.topBarRightWidgets : ["systemTray", "clipboard", "cpuUsage", "memUsage", "notificationButton", "battery", "controlCenterButton"])
+                    var rightWidgets = settings.dankBarRightWidgets
+                            !== undefined ? settings.dankBarRightWidgets : (settings.topBarRightWidgets !== undefined ? settings.topBarRightWidgets : ["systemTray", "clipboard", "cpuUsage", "memUsage", "notificationButton", "battery", "controlCenterButton"])
                     dankBarLeftWidgets = leftWidgets
                     dankBarCenterWidgets = centerWidgets
                     dankBarRightWidgets = rightWidgets
@@ -413,6 +473,7 @@ Singleton {
                 spotlightModalViewMode = settings.spotlightModalViewMode !== undefined ? settings.spotlightModalViewMode : "list"
                 sortAppsAlphabetically = settings.sortAppsAlphabetically !== undefined ? settings.sortAppsAlphabetically : false
                 networkPreference = settings.networkPreference !== undefined ? settings.networkPreference : "auto"
+                vpnLastConnected = settings.vpnLastConnected !== undefined ? settings.vpnLastConnected : ""
                 iconTheme = settings.iconTheme !== undefined ? settings.iconTheme : "System Default"
                 if (settings.useOSLogo !== undefined) {
                     launcherLogoMode = settings.useOSLogo ? "os" : "apps"
@@ -473,9 +534,9 @@ Singleton {
                 customPowerActionHibernate = settings.customPowerActionHibernate != undefined ? settings.customPowerActionHibernate : ""
                 customPowerActionReboot = settings.customPowerActionReboot != undefined ? settings.customPowerActionReboot : ""
                 customPowerActionPowerOff = settings.customPowerActionPowerOff != undefined ? settings.customPowerActionPowerOff : ""
-                updaterUseCustomCommand = settings.updaterUseCustomCommand !== undefined ? settings.updaterUseCustomCommand : false;
-                updaterCustomCommand = settings.updaterCustomCommand !== undefined ? settings.updaterCustomCommand : "";
-                updaterTerminalAdditionalParams = settings.updaterTerminalAdditionalParams !== undefined ? settings.updaterTerminalAdditionalParams : "";
+                updaterUseCustomCommand = settings.updaterUseCustomCommand !== undefined ? settings.updaterUseCustomCommand : false
+                updaterCustomCommand = settings.updaterCustomCommand !== undefined ? settings.updaterCustomCommand : ""
+                updaterTerminalAdditionalParams = settings.updaterTerminalAdditionalParams !== undefined ? settings.updaterTerminalAdditionalParams : ""
                 dankBarSpacing = settings.dankBarSpacing !== undefined ? settings.dankBarSpacing : (settings.topBarSpacing !== undefined ? settings.topBarSpacing : 4)
                 dankBarBottomGap = settings.dankBarBottomGap !== undefined ? settings.dankBarBottomGap : (settings.topBarBottomGap !== undefined ? settings.topBarBottomGap : 0)
                 dankBarInnerPadding = settings.dankBarInnerPadding !== undefined ? settings.dankBarInnerPadding : (settings.topBarInnerPadding !== undefined ? settings.topBarInnerPadding : 4)
@@ -488,7 +549,8 @@ Singleton {
                 dankBarBorderThickness = settings.dankBarBorderThickness !== undefined ? settings.dankBarBorderThickness : 1
                 popupGapsAuto = settings.popupGapsAuto !== undefined ? settings.popupGapsAuto : true
                 popupGapsManual = settings.popupGapsManual !== undefined ? settings.popupGapsManual : 4
-                dankBarPosition = settings.dankBarPosition !== undefined ? settings.dankBarPosition : (settings.dankBarAtBottom !== undefined ? (settings.dankBarAtBottom ? SettingsData.Position.Bottom : SettingsData.Position.Top) : (settings.topBarAtBottom !== undefined ? (settings.topBarAtBottom ? SettingsData.Position.Bottom : SettingsData.Position.Top) : SettingsData.Position.Top))
+                dankBarPosition = settings.dankBarPosition
+                        !== undefined ? settings.dankBarPosition : (settings.dankBarAtBottom !== undefined ? (settings.dankBarAtBottom ? SettingsData.Position.Bottom : SettingsData.Position.Top) : (settings.topBarAtBottom !== undefined ? (settings.topBarAtBottom ? SettingsData.Position.Bottom : SettingsData.Position.Top) : SettingsData.Position.Top))
                 lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true
                 enableFprint = settings.enableFprint !== undefined ? settings.enableFprint : false
                 maxFprintTries = settings.maxFprintTries !== undefined ? settings.maxFprintTries : 3
@@ -549,6 +611,7 @@ Singleton {
                                                 "customThemeFile": customThemeFile,
                                                 "matugenScheme": matugenScheme,
                                                 "runUserMatugenTemplates": runUserMatugenTemplates,
+                                                "matugenTargetMonitor": matugenTargetMonitor,
                                                 "dankBarTransparency": dankBarTransparency,
                                                 "dankBarWidgetTransparency": dankBarWidgetTransparency,
                                                 "popupTransparency": popupTransparency,
@@ -588,11 +651,13 @@ Singleton {
                                                 "showWorkspaceApps": showWorkspaceApps,
                                                 "maxWorkspaceIcons": maxWorkspaceIcons,
                                                 "workspacesPerMonitor": workspacesPerMonitor,
+                                                "dwlShowAllTags": dwlShowAllTags,
                                                 "workspaceNameIcons": workspaceNameIcons,
                                                 "waveProgressEnabled": waveProgressEnabled,
                                                 "clockCompactMode": clockCompactMode,
                                                 "focusedWindowCompactMode": focusedWindowCompactMode,
                                                 "runningAppsCompactMode": runningAppsCompactMode,
+                                                "keyboardLayoutNameCompactMode": keyboardLayoutNameCompactMode,
                                                 "runningAppsCurrentWorkspace": runningAppsCurrentWorkspace,
                                                 "runningAppsGroupByApp": runningAppsGroupByApp,
                                                 "clockDateFormat": clockDateFormat,
@@ -605,6 +670,7 @@ Singleton {
                                                 "spotlightModalViewMode": spotlightModalViewMode,
                                                 "sortAppsAlphabetically": sortAppsAlphabetically,
                                                 "networkPreference": networkPreference,
+                                                "vpnLastConnected": vpnLastConnected,
                                                 "iconTheme": iconTheme,
                                                 "launcherLogoMode": launcherLogoMode,
                                                 "launcherLogoCustomPath": launcherLogoCustomPath,
@@ -714,52 +780,12 @@ Singleton {
     }
 
     function cleanupUnusedKeys() {
-        const validKeys = [
-            "currentThemeName", "customThemeFile", "matugenScheme", "runUserMatugenTemplates",
-            "dankBarTransparency", "dankBarWidgetTransparency", "popupTransparency", "dockTransparency",
-            "use24HourClock", "showSeconds", "useFahrenheit", "nightModeEnabled", "weatherLocation",
-            "weatherCoordinates", "useAutoLocation", "weatherEnabled", "showLauncherButton",
-            "showWorkspaceSwitcher", "showFocusedWindow", "showWeather", "showMusic",
-            "showClipboard", "showCpuUsage", "showMemUsage", "showCpuTemp", "showGpuTemp",
-            "selectedGpuIndex", "enabledGpuPciIds", "showSystemTray", "showClock",
-            "showNotificationButton", "showBattery", "showControlCenterButton",
-            "controlCenterShowNetworkIcon", "controlCenterShowBluetoothIcon", "controlCenterShowAudioIcon",
-            "controlCenterWidgets", "showWorkspaceIndex", "workspaceScrolling", "showWorkspacePadding", "showWorkspaceApps",
-            "maxWorkspaceIcons", "workspacesPerMonitor", "workspaceNameIcons", "waveProgressEnabled",
-            "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode",
-            "runningAppsCurrentWorkspace", "runningAppsGroupByApp", "clockDateFormat", "lockDateFormat", "mediaSize",
-            "dankBarLeftWidgets", "dankBarCenterWidgets", "dankBarRightWidgets",
-            "appLauncherViewMode", "spotlightModalViewMode", "sortAppsAlphabetically",
-            "networkPreference", "iconTheme", "launcherLogoMode", "launcherLogoCustomPath",
-            "launcherLogoColorOverride", "launcherLogoColorInvertOnMode", "launcherLogoBrightness",
-            "launcherLogoContrast", "launcherLogoSizeOffset", "fontFamily", "monoFontFamily",
-            "fontWeight", "fontScale", "dankBarFontScale", "notepadUseMonospace",
-            "notepadFontFamily", "notepadFontSize", "notepadShowLineNumbers",
-            "notepadTransparencyOverride", "notepadLastCustomTransparency", "soundsEnabled",
-            "useSystemSoundTheme", "soundNewNotification", "soundVolumeChanged", "soundPluggedIn", "gtkThemingEnabled",
-            "qtThemingEnabled", "syncModeWithPortal", "showDock", "dockAutoHide", "dockGroupByApp",
-            "dockOpenOnOverview", "dockPosition", "dockSpacing", "dockBottomGap", "dockIconSize", "dockIndicatorStyle",
-            "cornerRadius", "notificationOverlayEnabled", "dankBarAutoHide",
-            "dankBarOpenOnOverview", "dankBarVisible", "dankBarSpacing", "dankBarBottomGap",
-            "dankBarInnerPadding", "dankBarSquareCorners", "dankBarNoBackground",
-            "dankBarGothCornersEnabled", "dankBarBorderEnabled", "dankBarBorderColor",
-            "dankBarBorderOpacity", "dankBarBorderThickness", "popupGapsAuto", "popupGapsManual",
-            "dankBarPosition", "lockScreenShowPowerActions", "enableFprint", "maxFprintTries",
-            "hideBrightnessSlider", "widgetBackgroundColor", "surfaceBase", "wallpaperFillMode",
-            "blurredWallpaperLayer", "blurWallpaperOnOverview", "notificationTimeoutLow", "notificationTimeoutNormal", "notificationTimeoutCritical",
-            "notificationPopupPosition", "osdAlwaysShowValue", "powerActionConfirm",
-            "customPowerActionLock", "customPowerActionLogout", "customPowerActionSuspend",
-            "customPowerActionHibernate", "customPowerActionReboot", "customPowerActionPowerOff",
-            "updaterUseCustomCommand", "updaterCustomCommand", "updaterTerminalAdditionalParams",
-            "screenPreferences", "showOnLastDisplay", "animationSpeed", "customAnimationDuration", "acMonitorTimeout", "acLockTimeout",
-            "acSuspendTimeout", "acHibernateTimeout", "batteryMonitorTimeout", "batteryLockTimeout",
-            "batterySuspendTimeout", "batteryHibernateTimeout", "lockBeforeSuspend",
-            "loginctlLockIntegration", "launchPrefix", "brightnessDevicePins", "configVersion"
-        ]
+        const validKeys = ["currentThemeName", "customThemeFile", "matugenScheme", "runUserMatugenTemplates", "matugenTargetMonitor", "dankBarTransparency", "dankBarWidgetTransparency", "popupTransparency", "dockTransparency", "use24HourClock", "showSeconds", "useFahrenheit", "nightModeEnabled", "weatherLocation", "weatherCoordinates", "useAutoLocation", "weatherEnabled", "showLauncherButton", "showWorkspaceSwitcher", "showFocusedWindow", "showWeather", "showMusic", "showClipboard", "showCpuUsage", "showMemUsage", "showCpuTemp", "showGpuTemp", "selectedGpuIndex", "enabledGpuPciIds", "showSystemTray", "showClock", "showNotificationButton", "showBattery", "showControlCenterButton", "controlCenterShowNetworkIcon", "controlCenterShowBluetoothIcon", "controlCenterShowAudioIcon", "controlCenterWidgets", "showWorkspaceIndex", "workspaceScrolling", "showWorkspacePadding", "showWorkspaceApps", "maxWorkspaceIcons", "workspacesPerMonitor", "dwlShowAllTags", "workspaceNameIcons", "waveProgressEnabled", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "runningAppsCurrentWorkspace", "runningAppsGroupByApp", "clockDateFormat", "lockDateFormat", "mediaSize", "dankBarLeftWidgets", "dankBarCenterWidgets", "dankBarRightWidgets", "appLauncherViewMode", "spotlightModalViewMode", "sortAppsAlphabetically", "networkPreference", "vpnLastConnected", "iconTheme", "launcherLogoMode", "launcherLogoCustomPath", "launcherLogoColorOverride", "launcherLogoColorInvertOnMode", "launcherLogoBrightness", "launcherLogoContrast", "launcherLogoSizeOffset", "fontFamily", "monoFontFamily", "fontWeight", "fontScale", "dankBarFontScale", "notepadUseMonospace", "notepadFontFamily", "notepadFontSize", "notepadShowLineNumbers", "notepadTransparencyOverride", "notepadLastCustomTransparency", "soundsEnabled", "useSystemSoundTheme", "soundNewNotification", "soundVolumeChanged", "soundPluggedIn", "gtkThemingEnabled", "qtThemingEnabled", "syncModeWithPortal", "showDock", "dockAutoHide", "dockGroupByApp", "dockOpenOnOverview", "dockPosition", "dockSpacing", "dockBottomGap", "dockIconSize", "dockIndicatorStyle", "cornerRadius", "notificationOverlayEnabled", "dankBarAutoHide", "dankBarOpenOnOverview", "dankBarVisible", "dankBarSpacing", "dankBarBottomGap", "dankBarInnerPadding", "dankBarSquareCorners", "dankBarNoBackground", "dankBarGothCornersEnabled", "dankBarBorderEnabled", "dankBarBorderColor", "dankBarBorderOpacity", "dankBarBorderThickness", "popupGapsAuto", "popupGapsManual", "dankBarPosition", "lockScreenShowPowerActions", "enableFprint", "maxFprintTries", "hideBrightnessSlider", "widgetBackgroundColor", "surfaceBase", "wallpaperFillMode", "blurredWallpaperLayer", "blurWallpaperOnOverview", "notificationTimeoutLow", "notificationTimeoutNormal", "notificationTimeoutCritical", "notificationPopupPosition", "osdAlwaysShowValue", "powerActionConfirm", "customPowerActionLock", "customPowerActionLogout", "customPowerActionSuspend", "customPowerActionHibernate", "customPowerActionReboot", "customPowerActionPowerOff", "updaterUseCustomCommand", "updaterCustomCommand", "updaterTerminalAdditionalParams", "screenPreferences", "showOnLastDisplay", "animationSpeed", "customAnimationDuration", "acMonitorTimeout", "acLockTimeout", "acSuspendTimeout", "acHibernateTimeout", "batteryMonitorTimeout", "batteryLockTimeout", "batterySuspendTimeout", "batteryHibernateTimeout", "lockBeforeSuspend", "loginctlLockIntegration", "launchPrefix", "brightnessDevicePins", "configVersion"]
 
         try {
             const content = settingsFile.text()
-            if (!content || !content.trim()) return
+            if (!content || !content.trim())
+                return
 
             const settings = JSON.parse(content)
             let needsSave = false
@@ -784,7 +810,7 @@ Singleton {
         if (use24HourClock) {
             return showSeconds ? "hh:mm:ss" : "hh:mm"
         } else {
-            return showSeconds ? "h:mm:ss AP": "h:mm AP"
+            return showSeconds ? "h:mm:ss AP" : "h:mm AP"
         }
     }
 
@@ -895,10 +921,12 @@ Singleton {
                 PortalService.setSystemIconTheme(gtkThemeName)
             }
 
-            var configScript = "mkdir -p " + _configDir + "/gtk-3.0 " + _configDir + "/gtk-4.0\n" + "\n" + "for config_dir in " + _configDir + "/gtk-3.0 " + _configDir + "/gtk-4.0; do\n"
-                    + "    settings_file=\"$config_dir/settings.ini\"\n" + "    if [ -f \"$settings_file\" ]; then\n" + "        if grep -q '^gtk-icon-theme-name=' \"$settings_file\"; then\n" + "            sed -i 's/^gtk-icon-theme-name=.*/gtk-icon-theme-name=" + gtkThemeName + "/' \"$settings_file\"\n" + "        else\n"
-                    + "            if grep -q '\\[Settings\\]' \"$settings_file\"; then\n" + "                sed -i '/\\[Settings\\]/a gtk-icon-theme-name=" + gtkThemeName + "' \"$settings_file\"\n" + "            else\n" + "                echo -e '\\n[Settings]\\ngtk-icon-theme-name=" + gtkThemeName + "' >> \"$settings_file\"\n" + "            fi\n"
-                    + "        fi\n" + "    else\n" + "        echo -e '[Settings]\\ngtk-icon-theme-name=" + gtkThemeName + "' > \"$settings_file\"\n" + "    fi\n" + "done\n" + "\n" + "rm -rf ~/.cache/icon-cache ~/.cache/thumbnails 2>/dev/null || true\n" + "pkill -HUP -f 'gtk' 2>/dev/null || true\n"
+            var configScript = "mkdir -p " + _configDir + "/gtk-3.0 " + _configDir + "/gtk-4.0\n" + "\n" + "for config_dir in " + _configDir + "/gtk-3.0 "
+                    + _configDir + "/gtk-4.0; do\n" + "    settings_file=\"$config_dir/settings.ini\"\n" + "    if [ -f \"$settings_file\" ]; then\n"
+                    + "        if grep -q '^gtk-icon-theme-name=' \"$settings_file\"; then\n" + "            sed -i 's/^gtk-icon-theme-name=.*/gtk-icon-theme-name=" + gtkThemeName + "/' \"$settings_file\"\n"
+                    + "        else\n" + "            if grep -q '\\[Settings\\]' \"$settings_file\"; then\n" + "                sed -i '/\\[Settings\\]/a gtk-icon-theme-name=" + gtkThemeName
+                    + "' \"$settings_file\"\n" + "            else\n" + "                echo -e '\\n[Settings]\\ngtk-icon-theme-name=" + gtkThemeName + "' >> \"$settings_file\"\n" + "            fi\n" + "        fi\n" + "    else\n"
+                    + "        echo -e '[Settings]\\ngtk-icon-theme-name=" + gtkThemeName + "' > \"$settings_file\"\n" + "    fi\n" + "done\n" + "\n" + "rm -rf ~/.cache/icon-cache ~/.cache/thumbnails 2>/dev/null || true\n" + "pkill -HUP -f 'gtk' 2>/dev/null || true\n"
             Quickshell.execDetached(["sh", "-lc", configScript])
         }
     }
@@ -910,9 +938,11 @@ Singleton {
             return
         }
         var script = "mkdir -p " + _configDir + "/qt5ct " + _configDir + "/qt6ct " + _configDir + "/environment.d 2>/dev/null || true\n" + "update_qt_icon_theme() {\n" + "  local config_file=\"$1\"\n"
-                + "  local theme_name=\"$2\"\n" + "  if [ -f \"$config_file\" ]; then\n" + "    if grep -q '^\\[Appearance\\]' \"$config_file\"; then\n" + "      if grep -q '^icon_theme=' \"$config_file\"; then\n" + "        sed -i \"s/^icon_theme=.*/icon_theme=$theme_name/\" \"$config_file\"\n" + "      else\n" + "        sed -i \"/^\\[Appearance\\]/a icon_theme=$theme_name\" \"$config_file\"\n" + "      fi\n"
-                + "    else\n" + "      printf '\\n[Appearance]\\nicon_theme=%s\\n' \"$theme_name\" >> \"$config_file\"\n" + "    fi\n" + "  else\n" + "    printf '[Appearance]\\nicon_theme=%s\\n' \"$theme_name\" > \"$config_file\"\n" + "  fi\n" + "}\n" + "update_qt_icon_theme " + _configDir + "/qt5ct/qt5ct.conf " + _shq(
-                    qtThemeName) + "\n" + "update_qt_icon_theme " + _configDir + "/qt6ct/qt6ct.conf " + _shq(qtThemeName) + "\n" + "rm -rf " + home + "/.cache/icon-cache " + home + "/.cache/thumbnails 2>/dev/null || true\n"
+                + "  local theme_name=\"$2\"\n" + "  if [ -f \"$config_file\" ]; then\n" + "    if grep -q '^\\[Appearance\\]' \"$config_file\"; then\n" + "      if grep -q '^icon_theme=' \"$config_file\"; then\n"
+                + "        sed -i \"s/^icon_theme=.*/icon_theme=$theme_name/\" \"$config_file\"\n" + "      else\n" + "        sed -i \"/^\\[Appearance\\]/a icon_theme=$theme_name\" \"$config_file\"\n" + "      fi\n"
+                + "    else\n" + "      printf '\\n[Appearance]\\nicon_theme=%s\\n' \"$theme_name\" >> \"$config_file\"\n" + "    fi\n" + "  else\n"
+                + "    printf '[Appearance]\\nicon_theme=%s\\n' \"$theme_name\" > \"$config_file\"\n" + "  fi\n" + "}\n" + "update_qt_icon_theme " + _configDir + "/qt5ct/qt5ct.conf " + _shq(qtThemeName)
+                + "\n" + "update_qt_icon_theme " + _configDir + "/qt6ct/qt6ct.conf " + _shq(qtThemeName) + "\n" + "rm -rf " + home + "/.cache/icon-cache " + home + "/.cache/thumbnails 2>/dev/null || true\n"
         Quickshell.execDetached(["sh", "-lc", script])
     }
 
@@ -934,15 +964,15 @@ Singleton {
 
         if (dankBarPosition === SettingsData.Position.Left || dankBarPosition === SettingsData.Position.Right) {
             return {
-                x: relativeY,
-                y: barThickness + dankBarSpacing + Theme.popupDistance,
-                width: widgetWidth
+                "x": relativeY,
+                "y": barThickness + dankBarSpacing + Theme.popupDistance,
+                "width": widgetWidth
             }
         }
         return {
-            x: relativeX,
-            y: barThickness + dankBarSpacing + dankBarBottomGap + Theme.popupDistance,
-            width: widgetWidth
+            "x": relativeX,
+            "y": barThickness + dankBarSpacing + Theme.popupDistance,
+            "width": widgetWidth
         }
     }
 
@@ -965,11 +995,7 @@ Singleton {
     }
 
     function sendTestNotification(index) {
-        const notifications = [
-            ["Notification Position Test", "DMS test notification 1 of 3 ~ Hi there!", "preferences-system"],
-            ["Second Test", "DMS Notification 2 of 3 ~ Check it out!", "applications-graphics"],
-            ["Third Test", "DMS notification 3 of 3 ~ Enjoy!", "face-smile"]
-        ]
+        const notifications = [["Notification Position Test", "DMS test notification 1 of 3 ~ Hi there!", "preferences-system"], ["Second Test", "DMS Notification 2 of 3 ~ Check it out!", "applications-graphics"], ["Third Test", "DMS notification 3 of 3 ~ Enjoy!", "face-smile"]]
 
         if (index < 0 || index >= notifications.length) {
             return
@@ -1019,6 +1045,18 @@ Singleton {
         }
     }
 
+    function setMatugenTargetMonitor(monitorName) {
+        if (matugenTargetMonitor === monitorName)
+            return
+
+        matugenTargetMonitor = monitorName
+        saveSettings()
+
+        if (typeof Theme !== "undefined") {
+            Theme.generateSystemThemesFromCurrentTheme()
+        }
+    }
+
     function setDankBarTransparency(transparency) {
         dankBarTransparency = transparency
         saveSettings()
@@ -1238,6 +1276,11 @@ Singleton {
         saveSettings()
     }
 
+    function setDwlShowAllTags(enabled) {
+        dwlShowAllTags = enabled
+        saveSettings()
+    }
+
     function setWorkspaceNameIcon(workspaceName, iconData) {
         var iconMap = JSON.parse(JSON.stringify(workspaceNameIcons))
         iconMap[workspaceName] = iconData
@@ -1278,6 +1321,11 @@ Singleton {
         saveSettings()
     }
 
+    function setKeyboardLayoutNameCompactMode(enabled) {
+        keyboardLayoutNameCompactMode = enabled
+        saveSettings()
+    }
+
     function setRunningAppsCurrentWorkspace(enabled) {
         runningAppsCurrentWorkspace = enabled
         saveSettings()
@@ -1390,6 +1438,11 @@ Singleton {
         saveSettings()
     }
 
+    function setVpnLastConnected(uuid) {
+        vpnLastConnected = uuid
+        saveSettings()
+    }
+
     function setIconTheme(themeName) {
         iconTheme = themeName
         updateGtkIconTheme(themeName)
@@ -1781,53 +1834,53 @@ Singleton {
     }
 
     function setPowerActionConfirm(confirm) {
-        powerActionConfirm = confirm;
-        saveSettings();
+        powerActionConfirm = confirm
+        saveSettings()
     }
 
     function setCustomPowerActionLock(command) {
-        customPowerActionLock = command;
-        saveSettings();
+        customPowerActionLock = command
+        saveSettings()
     }
 
     function setCustomPowerActionLogout(command) {
-        customPowerActionLogout = command;
-        saveSettings();
+        customPowerActionLogout = command
+        saveSettings()
     }
 
     function setCustomPowerActionSuspend(command) {
-        customPowerActionSuspend = command;
-        saveSettings();
+        customPowerActionSuspend = command
+        saveSettings()
     }
 
     function setCustomPowerActionHibernate(command) {
-        customPowerActionHibernate = command;
-        saveSettings();
+        customPowerActionHibernate = command
+        saveSettings()
     }
 
     function setCustomPowerActionReboot(command) {
-        customPowerActionReboot = command;
-        saveSettings();
+        customPowerActionReboot = command
+        saveSettings()
     }
 
     function setCustomPowerActionPowerOff(command) {
-        customPowerActionPowerOff = command;
-        saveSettings();
+        customPowerActionPowerOff = command
+        saveSettings()
     }
 
     function setUpdaterUseCustomCommandEnabled(enabled) {
-        updaterUseCustomCommand = enabled;
-        saveSettings();
+        updaterUseCustomCommand = enabled
+        saveSettings()
     }
 
     function setUpdaterCustomCommand(command) {
-        updaterCustomCommand = command;
-        saveSettings();
+        updaterCustomCommand = command
+        saveSettings()
     }
 
     function setUpdaterTerminalAdditionalParams(customArgs) {
-        updaterTerminalAdditionalParams = customArgs;
-        saveSettings();
+        updaterTerminalAdditionalParams = customArgs
+        saveSettings()
     }
 
     function setScreenPreferences(prefs) {
@@ -1933,7 +1986,7 @@ Singleton {
     FileView {
         id: pluginSettingsFile
 
-        path: isGreeterMode ? "" : pluginSettingsPath
+        path: isGreeterMode ? "" : (pluginSettingsFileExists ? pluginSettingsPath : "")
         blockLoading: true
         blockWrites: true
         atomicWrites: true
@@ -1950,6 +2003,17 @@ Singleton {
         }
     }
 
+    property bool pluginSettingsFileExists: false
+
+    Process {
+        id: pluginSettingsCheckProcess
+        command: ["test", "-f", pluginSettingsPath]
+
+        onExited: (exitCode) => {
+            pluginSettingsFileExists = (exitCode === 0)
+        }
+    }
+
     Process {
         id: systemDefaultDetectionProcess
 

Common/Theme.qml

@@ -9,6 +9,7 @@ import Quickshell.Io
 import Quickshell.Services.UPower
 import qs.Common
 import qs.Services
+import qs.Modules.Greetd
 import "StockThemes.js" as StockThemes
 
 Singleton {
@@ -19,7 +20,8 @@ Singleton {
     readonly property bool envDisableMatugen: Quickshell.env("DMS_DISABLE_MATUGEN") === "1" || Quickshell.env("DMS_DISABLE_MATUGEN") === "true"
 
     readonly property real popupDistance: {
-        if (typeof SettingsData === "undefined") return 4
+        if (typeof SettingsData === "undefined")
+        return 4
         return SettingsData.popupGapsAuto ? Math.max(4, SettingsData.dankBarSpacing) : SettingsData.popupGapsManual
     }
 
@@ -29,41 +31,16 @@ Singleton {
     property bool colorsFileLoadFailed: false
 
     readonly property string dynamic: "dynamic"
-    readonly property string custom : "custom"
+    readonly property string custom: "custom"
 
     readonly property string homeDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.HomeLocation))
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation))
     readonly property string shellDir: Paths.strip(Qt.resolvedUrl(".").toString()).replace("/Common/", "")
     readonly property string wallpaperPath: {
-        if (typeof SessionData === "undefined") return ""
+        if (typeof SessionData === "undefined")
+        return ""
 
         if (SessionData.perMonitorWallpaper) {
-            var screens = Quickshell.screens
-            if (screens.length > 0) {
-                var firstMonitorWallpaper = SessionData.getMonitorWallpaper(screens[0].name)
-                var wallpaperPath = firstMonitorWallpaper || SessionData.wallpaperPath
-
-                if (wallpaperPath && wallpaperPath.startsWith("we:")) {
-                    return stateDir + "/we_screenshots/" + wallpaperPath.substring(3) + ".jpg"
-                }
-
-                return wallpaperPath
-            }
-        }
-
-        var wallpaperPath = SessionData.wallpaperPath
-        var screens = Quickshell.screens
-        if (screens.length > 0 && wallpaperPath && wallpaperPath.startsWith("we:")) {
-            return stateDir + "/we_screenshots/" + wallpaperPath.substring(3) + ".jpg"
-        }
-
-        return wallpaperPath
-    }
-    readonly property string rawWallpaperPath: {
-        if (typeof SessionData === "undefined") return ""
-
-        if (SessionData.perMonitorWallpaper) {
-            // Use first monitor's wallpaper for dynamic theming
             var screens = Quickshell.screens
             if (screens.length > 0) {
                 var firstMonitorWallpaper = SessionData.getMonitorWallpaper(screens[0].name)
@@ -73,6 +50,34 @@ Singleton {
 
         return SessionData.wallpaperPath
     }
+    readonly property string rawWallpaperPath: {
+        if (typeof SessionData === "undefined")
+        return ""
+
+        if (SessionData.perMonitorWallpaper) {
+            var screens = Quickshell.screens
+            if (screens.length > 0) {
+                var targetMonitor = (typeof SettingsData !== "undefined" && SettingsData.matugenTargetMonitor && SettingsData.matugenTargetMonitor !== "") ? SettingsData.matugenTargetMonitor : screens[0].name
+
+                var targetMonitorExists = false
+                for (var i = 0; i < screens.length; i++) {
+                    if (screens[i].name === targetMonitor) {
+                        targetMonitorExists = true
+                        break
+                    }
+                }
+
+                if (!targetMonitorExists) {
+                    targetMonitor = screens[0].name
+                }
+
+                var targetMonitorWallpaper = SessionData.getMonitorWallpaper(targetMonitor)
+                return targetMonitorWallpaper || SessionData.wallpaperPath
+            }
+        }
+
+        return SessionData.wallpaperPath
+    }
 
     property bool matugenAvailable: false
     property bool gtkThemingEnabled: typeof SettingsData !== "undefined" ? SettingsData.gtkAvailable : false
@@ -84,59 +89,56 @@ Singleton {
     Component.onCompleted: {
         Quickshell.execDetached(["mkdir", "-p", stateDir])
         Proc.runCommand("matugenCheck", ["which", "matugen"], (output, code) => {
-            matugenAvailable = (code === 0) && !envDisableMatugen
-            const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
+                            matugenAvailable = (code === 0) && !envDisableMatugen
+                            const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
 
-            if (!matugenAvailable || isGreeterMode) {
-                return
-            }
+                            if (!matugenAvailable || isGreeterMode) {
+                                return
+                            }
 
-            if (colorsFileLoadFailed && currentTheme === dynamic && wallpaperPath) {
-                console.info("Theme: Matugen now available, regenerating colors for dynamic theme")
-                const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
-                const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
-                Quickshell.execDetached(["rm", "-f", stateDir + "/matugen.key"])
-                const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
-                if (wallpaperPath.startsWith("#")) {
-                    setDesiredTheme("hex", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                } else {
-                    setDesiredTheme("image", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                }
-                return
-            }
+                            if (colorsFileLoadFailed && currentTheme === dynamic && rawWallpaperPath) {
+                                console.info("Theme: Matugen now available, regenerating colors for dynamic theme")
+                                const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
+                                const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
+                                const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
+                                if (rawWallpaperPath.startsWith("#")) {
+                                    setDesiredTheme("hex", rawWallpaperPath, isLight, iconTheme, selectedMatugenType)
+                                } else {
+                                    setDesiredTheme("image", rawWallpaperPath, isLight, iconTheme, selectedMatugenType)
+                                }
+                                return
+                            }
 
-            const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
-            const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
+                            const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode)
+                            const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
 
-            if (currentTheme === dynamic) {
-                if (wallpaperPath) {
-                    Quickshell.execDetached(["rm", "-f", stateDir + "/matugen.key"])
-                    const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
-                    if (wallpaperPath.startsWith("#")) {
-                        setDesiredTheme("hex", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                    } else {
-                        setDesiredTheme("image", wallpaperPath, isLight, iconTheme, selectedMatugenType)
-                    }
-                }
-            } else {
-                let primaryColor
-                let matugenType
-                if (currentTheme === "custom") {
-                    if (customThemeData && customThemeData.primary) {
-                        primaryColor = customThemeData.primary
-                        matugenType = customThemeData.matugen_type
-                    }
-                } else {
-                    primaryColor = currentThemeData.primary
-                    matugenType = currentThemeData.matugen_type
-                }
+                            if (currentTheme === dynamic) {
+                                if (rawWallpaperPath) {
+                                    const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
+                                    if (rawWallpaperPath.startsWith("#")) {
+                                        setDesiredTheme("hex", rawWallpaperPath, isLight, iconTheme, selectedMatugenType)
+                                    } else {
+                                        setDesiredTheme("image", rawWallpaperPath, isLight, iconTheme, selectedMatugenType)
+                                    }
+                                }
+                            } else {
+                                let primaryColor
+                                let matugenType
+                                if (currentTheme === "custom") {
+                                    if (customThemeData && customThemeData.primary) {
+                                        primaryColor = customThemeData.primary
+                                        matugenType = customThemeData.matugen_type
+                                    }
+                                } else {
+                                    primaryColor = currentThemeData.primary
+                                    matugenType = currentThemeData.matugen_type
+                                }
 
-                if (primaryColor) {
-                    Quickshell.execDetached(["rm", "-f", stateDir + "/matugen.key"])
-                    setDesiredTheme("hex", primaryColor, isLight, iconTheme, matugenType)
-                }
-            }
-        }, 0)
+                                if (primaryColor) {
+                                    setDesiredTheme("hex", primaryColor, isLight, iconTheme, matugenType)
+                                }
+                            }
+                        }, 0)
         if (typeof SessionData !== "undefined") {
             SessionData.isLightModeChanged.connect(root.onLightModeChanged)
         }
@@ -194,22 +196,51 @@ Singleton {
         }
     }
 
-    readonly property var availableMatugenSchemes: [
-        ({ "value": "scheme-tonal-spot", "label": "Tonal Spot", "description": I18n.tr("Balanced palette with focused accents (default).") }),
-        ({ "value": "scheme-vibrant-spot", "label": "Vibrant Spot", "description": I18n.tr("Lively palette with saturated accents.") }),
-        ({ "value": "scheme-dynamic-contrast", "label": "Dynamic Contrast", "description": I18n.tr("High-contrast palette for strong visual distinction.") }),
-        ({ "value": "scheme-content", "label": "Content", "description": I18n.tr("Derives colors that closely match the underlying image.") }),
-        ({ "value": "scheme-expressive", "label": "Expressive", "description": I18n.tr("Vibrant palette with playful saturation.") }),
-        ({ "value": "scheme-fidelity", "label": "Fidelity", "description": I18n.tr("High-fidelity palette that preserves source hues.") }),
-        ({ "value": "scheme-fruit-salad", "label": "Fruit Salad", "description": I18n.tr("Colorful mix of bright contrasting accents.") }),
-        ({ "value": "scheme-monochrome", "label": "Monochrome", "description": I18n.tr("Minimal palette built around a single hue.") }),
-        ({ "value": "scheme-neutral", "label": "Neutral", "description": I18n.tr("Muted palette with subdued, calming tones.") }),
-        ({ "value": "scheme-rainbow", "label": "Rainbow", "description": I18n.tr("Diverse palette spanning the full spectrum.") })
-    ]
+    readonly property var availableMatugenSchemes: [({
+                                                         "value": "scheme-tonal-spot",
+                                                         "label": "Tonal Spot",
+                                                         "description": I18n.tr("Balanced palette with focused accents (default).")
+                                                     }), ({
+                                                              "value": "scheme-vibrant-spot",
+                                                              "label": "Vibrant Spot",
+                                                              "description": I18n.tr("Lively palette with saturated accents.")
+                                                          }), ({
+                                                                   "value": "scheme-dynamic-contrast",
+                                                                   "label": "Dynamic Contrast",
+                                                                   "description": I18n.tr("High-contrast palette for strong visual distinction.")
+                                                               }), ({
+                                                                        "value": "scheme-content",
+                                                                        "label": "Content",
+                                                                        "description": I18n.tr("Derives colors that closely match the underlying image.")
+                                                                    }), ({
+                                                                             "value": "scheme-expressive",
+                                                                             "label": "Expressive",
+                                                                             "description": I18n.tr("Vibrant palette with playful saturation.")
+                                                                         }), ({
+                                                                                  "value": "scheme-fidelity",
+                                                                                  "label": "Fidelity",
+                                                                                  "description": I18n.tr("High-fidelity palette that preserves source hues.")
+                                                                              }), ({
+                                                                                       "value": "scheme-fruit-salad",
+                                                                                       "label": "Fruit Salad",
+                                                                                       "description": I18n.tr("Colorful mix of bright contrasting accents.")
+                                                                                   }), ({
+                                                                                            "value": "scheme-monochrome",
+                                                                                            "label": "Monochrome",
+                                                                                            "description": I18n.tr("Minimal palette built around a single hue.")
+                                                                                        }), ({
+                                                                                                 "value": "scheme-neutral",
+                                                                                                 "label": "Neutral",
+                                                                                                 "description": I18n.tr("Muted palette with subdued, calming tones.")
+                                                                                             }), ({
+                                                                                                      "value": "scheme-rainbow",
+                                                                                                      "label": "Rainbow",
+                                                                                                      "description": I18n.tr("Diverse palette spanning the full spectrum.")
+                                                                                                  })]
 
     function getMatugenScheme(value) {
         const schemes = availableMatugenSchemes
-        for (let i = 0; i < schemes.length; i++) {
+        for (var i = 0; i < schemes.length; i++) {
             if (schemes[i].value === value)
                 return schemes[i]
         }
@@ -296,13 +327,37 @@ Singleton {
     property color shadowMedium: Qt.rgba(0, 0, 0, 0.08)
     property color shadowStrong: Qt.rgba(0, 0, 0, 0.3)
 
-    readonly property var animationDurations: [
-        { shorter: 0, short: 0, medium: 0, long: 0, extraLong: 0 },
-        { shorter: 50, short: 75, medium: 150, long: 250, extraLong: 500 },
-        { shorter: 100, short: 150, medium: 300, long: 500, extraLong: 1000 },
-        { shorter: 150, short: 225, medium: 450, long: 750, extraLong: 1500 },
-        { shorter: 200, short: 300, medium: 600, long: 1000, extraLong: 2000 }
-    ]
+    readonly property var animationDurations: [{
+            "shorter": 0,
+            "short": 0,
+            "medium": 0,
+            "long": 0,
+            "extraLong": 0
+        }, {
+            "shorter": 50,
+            "short": 75,
+            "medium": 150,
+            "long": 250,
+            "extraLong": 500
+        }, {
+            "shorter": 100,
+            "short": 150,
+            "medium": 300,
+            "long": 500,
+            "extraLong": 1000
+        }, {
+            "shorter": 150,
+            "short": 225,
+            "medium": 450,
+            "long": 750,
+            "extraLong": 1500
+        }, {
+            "shorter": 200,
+            "short": 300,
+            "medium": 600,
+            "long": 1000,
+            "extraLong": 2000
+        }]
 
     readonly property int currentAnimationSpeed: typeof SettingsData !== "undefined" ? SettingsData.animationSpeed : SettingsData.AnimationSpeed.Short
     readonly property var currentDurations: animationDurations[currentAnimationSpeed] || animationDurations[SettingsData.AnimationSpeed.Short]
@@ -335,12 +390,13 @@ Singleton {
     }
 
     readonly property int currentAnimationBaseDuration: {
-        if (typeof SettingsData === "undefined") return 500
-        
+        if (typeof SettingsData === "undefined")
+        return 500
+
         if (SettingsData.animationSpeed === SettingsData.AnimationSpeed.Custom) {
             return SettingsData.customAnimationDuration
         }
-        
+
         const presetMap = [0, 250, 500, 750]
         return presetMap[SettingsData.animationSpeed] !== undefined ? presetMap[SettingsData.animationSpeed] : 500
     }
@@ -370,7 +426,12 @@ Singleton {
         }
     }
 
-    property real cornerRadius: typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12
+    property real cornerRadius: {
+        if (typeof SessionData !== "undefined" && SessionData.isGreeterMode && typeof GreetdSettings !== "undefined") {
+            return GreetdSettings.cornerRadius
+        }
+        return typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12
+    }
     property real spacingXS: 4
     property real spacingS: 8
     property real spacingM: 12
@@ -485,20 +546,40 @@ Singleton {
 
     function getCatppuccinColor(variantName) {
         const catColors = {
-            "cat-rosewater": "#f5e0dc", "cat-flamingo": "#f2cdcd", "cat-pink": "#f5c2e7", "cat-mauve": "#cba6f7",
-            "cat-red": "#f38ba8", "cat-maroon": "#eba0ac", "cat-peach": "#fab387", "cat-yellow": "#f9e2af",
-            "cat-green": "#a6e3a1", "cat-teal": "#94e2d5", "cat-sky": "#89dceb", "cat-sapphire": "#74c7ec",
-            "cat-blue": "#89b4fa", "cat-lavender": "#b4befe"
+            "cat-rosewater": "#f5e0dc",
+            "cat-flamingo": "#f2cdcd",
+            "cat-pink": "#f5c2e7",
+            "cat-mauve": "#cba6f7",
+            "cat-red": "#f38ba8",
+            "cat-maroon": "#eba0ac",
+            "cat-peach": "#fab387",
+            "cat-yellow": "#f9e2af",
+            "cat-green": "#a6e3a1",
+            "cat-teal": "#94e2d5",
+            "cat-sky": "#89dceb",
+            "cat-sapphire": "#74c7ec",
+            "cat-blue": "#89b4fa",
+            "cat-lavender": "#b4befe"
         }
         return catColors[variantName] || "#cba6f7"
     }
 
     function getCatppuccinVariantName(variantName) {
         const catNames = {
-            "cat-rosewater": "Rosewater", "cat-flamingo": "Flamingo", "cat-pink": "Pink", "cat-mauve": "Mauve",
-            "cat-red": "Red", "cat-maroon": "Maroon", "cat-peach": "Peach", "cat-yellow": "Yellow",
-            "cat-green": "Green", "cat-teal": "Teal", "cat-sky": "Sky", "cat-sapphire": "Sapphire",
-            "cat-blue": "Blue", "cat-lavender": "Lavender"
+            "cat-rosewater": "Rosewater",
+            "cat-flamingo": "Flamingo",
+            "cat-pink": "Pink",
+            "cat-mauve": "Mauve",
+            "cat-red": "Red",
+            "cat-maroon": "Maroon",
+            "cat-peach": "Peach",
+            "cat-yellow": "Yellow",
+            "cat-green": "Green",
+            "cat-teal": "Teal",
+            "cat-sky": "Sky",
+            "cat-sapphire": "Sapphire",
+            "cat-blue": "Blue",
+            "cat-lavender": "Lavender"
         }
         return catNames[variantName] || "Unknown"
     }
@@ -541,14 +622,14 @@ Singleton {
         const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch"
         switch (colorMode) {
             case "s":
-                return surface
+            return surface
             case "sc":
-                return surfaceContainer
+            return surfaceContainer
             case "sch":
-                return surfaceContainerHigh
+            return surfaceContainerHigh
             case "sth":
             default:
-                return surfaceTextHover
+            return surfaceTextHover
         }
     }
 
@@ -562,14 +643,14 @@ Singleton {
         const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch"
         switch (colorMode) {
             case "s":
-                return Qt.rgba(surface.r, surface.g, surface.b, widgetTransparency)
+            return Qt.rgba(surface.r, surface.g, surface.b, widgetTransparency)
             case "sc":
-                return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, widgetTransparency)
+            return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, widgetTransparency)
             case "sch":
-                return Qt.rgba(surfaceContainerHigh.r, surfaceContainerHigh.g, surfaceContainerHigh.b, widgetTransparency)
+            return Qt.rgba(surfaceContainerHigh.r, surfaceContainerHigh.g, surfaceContainerHigh.b, widgetTransparency)
             case "sth":
             default:
-                return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, widgetTransparency)
+            return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, widgetTransparency)
         }
     }
 
@@ -593,8 +674,10 @@ Singleton {
     function barTextSize(barThickness) {
         const scale = barThickness / 48
         const dankBarScale = (typeof SettingsData !== "undefined" ? SettingsData.dankBarFontScale : 1.0)
-        if (scale <= 0.75) return fontSizeSmall * 0.9 * dankBarScale
-        if (scale >= 1.25) return fontSizeMedium * dankBarScale
+        if (scale <= 0.75)
+            return fontSizeSmall * 0.9 * dankBarScale
+        if (scale >= 1.25)
+            return fontSizeMedium * dankBarScale
         return fontSizeSmall * dankBarScale
     }
 
@@ -688,7 +771,6 @@ Singleton {
         }
     }
 
-
     function onLightModeChanged() {
         if (currentTheme === "custom" && customThemeFileView.path) {
             customThemeFileView.reload()
@@ -723,16 +805,8 @@ Singleton {
         Quickshell.execDetached(["sh", "-c", `mkdir -p '${stateDir}' && cat > '${desiredPath}' << 'EOF'\n${json}\nEOF`])
         workerRunning = true
         const syncModeWithPortal = (typeof SettingsData !== "undefined" && SettingsData.syncModeWithPortal) ? "true" : "false"
-        if (rawWallpaperPath.startsWith("we:")) {
-            console.log("Theme: Starting matugen worker (WE wallpaper)")
-            systemThemeGenerator.command = [
-                "sh", "-c",
-                `sleep 1 && ${shellDir}/scripts/matugen-worker.sh '${stateDir}' '${shellDir}' '${configDir}' '${syncModeWithPortal}' --run`
-            ]
-        } else {
-            console.log("Theme: Starting matugen worker")
-            systemThemeGenerator.command = [shellDir + "/scripts/matugen-worker.sh", stateDir, shellDir, configDir, syncModeWithPortal, "--run"]
-        }
+        console.log("Theme: Starting matugen worker")
+        systemThemeGenerator.command = [shellDir + "/scripts/matugen-worker.sh", stateDir, shellDir, configDir, syncModeWithPortal, "--run"]
         systemThemeGenerator.running = true
     }
 
@@ -745,14 +819,14 @@ Singleton {
         const iconTheme = (typeof SettingsData !== "undefined" && SettingsData.iconTheme) ? SettingsData.iconTheme : "System Default"
 
         if (currentTheme === dynamic) {
-            if (!wallpaperPath) {
+            if (!rawWallpaperPath) {
                 return
             }
             const selectedMatugenType = (typeof SettingsData !== "undefined" && SettingsData.matugenScheme) ? SettingsData.matugenScheme : "scheme-tonal-spot"
-            if (wallpaperPath.startsWith("#")) {
-                setDesiredTheme("hex", wallpaperPath, isLight, iconTheme, selectedMatugenType)
+            if (rawWallpaperPath.startsWith("#")) {
+                setDesiredTheme("hex", rawWallpaperPath, isLight, iconTheme, selectedMatugenType)
             } else {
-                setDesiredTheme("image", wallpaperPath, isLight, iconTheme, selectedMatugenType)
+                setDesiredTheme("image", rawWallpaperPath, isLight, iconTheme, selectedMatugenType)
             }
         } else {
             let primaryColor
@@ -787,16 +861,16 @@ Singleton {
 
         const isLight = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "true" : "false"
         Proc.runCommand("gtkApplier", [shellDir + "/scripts/gtk.sh", configDir, isLight, shellDir], (output, exitCode) => {
-            if (exitCode === 0) {
-                if (typeof ToastService !== "undefined" && typeof NiriService !== "undefined" && !NiriService.matugenSuppression) {
-                    ToastService.showInfo("GTK colors applied successfully")
-                }
-            } else {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showError("Failed to apply GTK colors")
-                }
-            }
-        })
+                            if (exitCode === 0) {
+                                if (typeof ToastService !== "undefined" && typeof NiriService !== "undefined" && !NiriService.matugenSuppression) {
+                                    ToastService.showInfo("GTK colors applied successfully")
+                                }
+                            } else {
+                                if (typeof ToastService !== "undefined") {
+                                    ToastService.showError("Failed to apply GTK colors")
+                                }
+                            }
+                        })
     }
 
     function applyQtColors() {
@@ -808,32 +882,42 @@ Singleton {
         }
 
         Proc.runCommand("qtApplier", [shellDir + "/scripts/qt.sh", configDir], (output, exitCode) => {
-            if (exitCode === 0) {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showInfo("Qt colors applied successfully")
-                }
-            } else {
-                if (typeof ToastService !== "undefined") {
-                    ToastService.showError("Failed to apply Qt colors")
-                }
-            }
-        })
+                            if (exitCode === 0) {
+                                if (typeof ToastService !== "undefined") {
+                                    ToastService.showInfo("Qt colors applied successfully")
+                                }
+                            } else {
+                                if (typeof ToastService !== "undefined") {
+                                    ToastService.showError("Failed to apply Qt colors")
+                                }
+                            }
+                        })
     }
 
-    function withAlpha(c, a) { return Qt.rgba(c.r, c.g, c.b, a); }
+    function withAlpha(c, a) {
+        return Qt.rgba(c.r, c.g, c.b, a)
+    }
 
     function getFillMode(modeName) {
-        switch(modeName) {
-            case "Stretch": return Image.Stretch
-            case "Fit":
-            case "PreserveAspectFit": return Image.PreserveAspectFit
-            case "Fill":
-            case "PreserveAspectCrop": return Image.PreserveAspectCrop
-            case "Tile": return Image.Tile
-            case "TileVertically": return Image.TileVertically
-            case "TileHorizontally": return Image.TileHorizontally
-            case "Pad": return Image.Pad
-            default: return Image.PreserveAspectCrop
+        switch (modeName) {
+        case "Stretch":
+            return Image.Stretch
+        case "Fit":
+        case "PreserveAspectFit":
+            return Image.PreserveAspectFit
+        case "Fill":
+        case "PreserveAspectCrop":
+            return Image.PreserveAspectCrop
+        case "Tile":
+            return Image.Tile
+        case "TileVertically":
+            return Image.TileVertically
+        case "TileHorizontally":
+            return Image.TileHorizontally
+        case "Pad":
+            return Image.Pad
+        default:
+            return Image.PreserveAspectCrop
         }
     }
 
@@ -852,40 +936,48 @@ Singleton {
     }
 
     function invertHex(hex) {
-        hex = hex.replace('#', '');
+        hex = hex.replace('#', '')
 
         if (!/^[0-9A-Fa-f]{6}$/.test(hex)) {
-            return hex;
+            return hex
         }
 
-        const r = parseInt(hex.substr(0, 2), 16);
-        const g = parseInt(hex.substr(2, 2), 16);
-        const b = parseInt(hex.substr(4, 2), 16);
+        const r = parseInt(hex.substr(0, 2), 16)
+        const g = parseInt(hex.substr(2, 2), 16)
+        const b = parseInt(hex.substr(4, 2), 16)
 
-        const invR = (255 - r).toString(16).padStart(2, '0');
-        const invG = (255 - g).toString(16).padStart(2, '0');
-        const invB = (255 - b).toString(16).padStart(2, '0');
+        const invR = (255 - r).toString(16).padStart(2, '0')
+        const invG = (255 - g).toString(16).padStart(2, '0')
+        const invB = (255 - b).toString(16).padStart(2, '0')
 
-        return `#${invR}${invG}${invB}`;
+        return `#${invR}${invG}${invB}`
     }
 
     property string baseLogoColor: {
-        if (typeof SettingsData === "undefined") return ""
+        if (typeof SettingsData === "undefined")
+        return ""
         const colorOverride = SettingsData.launcherLogoColorOverride
-        if (!colorOverride || colorOverride === "") return ""
-        if (colorOverride === "primary") return primary
-        if (colorOverride === "surface") return surfaceText
+        if (!colorOverride || colorOverride === "")
+        return ""
+        if (colorOverride === "primary")
+        return primary
+        if (colorOverride === "surface")
+        return surfaceText
         return colorOverride
     }
 
     property string effectiveLogoColor: {
-        if (typeof SettingsData === "undefined") return ""
+        if (typeof SettingsData === "undefined")
+        return ""
 
         const colorOverride = SettingsData.launcherLogoColorOverride
-        if (!colorOverride || colorOverride === "") return ""
+        if (!colorOverride || colorOverride === "")
+        return ""
 
-        if (colorOverride === "primary") return primary
-        if (colorOverride === "surface") return surfaceText
+        if (colorOverride === "primary")
+        return primary
+        if (colorOverride === "surface")
+        return surfaceText
 
         if (!SettingsData.launcherLogoColorInvertOnMode) {
             return colorOverride
@@ -898,8 +990,6 @@ Singleton {
         return colorOverride
     }
 
-
-
     Process {
         id: systemThemeGenerator
         running: false
@@ -956,9 +1046,7 @@ Singleton {
         id: dynamicColorsFileView
         path: {
             const greetCfgDir = Quickshell.env("DMS_GREET_CFG_DIR") || "/etc/greetd/.dms"
-            const colorsPath = SessionData.isGreeterMode
-                ? greetCfgDir + "/colors.json"
-                : stateDir + "/dms-colors.json"
+            const colorsPath = SessionData.isGreeterMode ? greetCfgDir + "/colors.json" : stateDir + "/dms-colors.json"
             return colorsPath
         }
         watchChanges: currentTheme === dynamic && !SessionData.isGreeterMode
@@ -1000,7 +1088,7 @@ Singleton {
                 console.warn("Theme: Dynamic colors file load failed, marking for regeneration")
                 colorsFileLoadFailed = true
                 const isGreeterMode = (typeof SessionData !== "undefined" && SessionData.isGreeterMode)
-                if (!isGreeterMode && matugenAvailable && wallpaperPath) {
+                if (!isGreeterMode && matugenAvailable && rawWallpaperPath) {
                     console.log("Theme: Matugen available, triggering immediate regeneration")
                     generateSystemThemesFromCurrentTheme()
                 }

DMSShell.qml

@@ -54,7 +54,7 @@ Item {
 
     Loader {
         id: blurredWallpaperBackgroundLoader
-        active: SettingsData.blurredWallpaperLayer
+        active: SettingsData.blurredWallpaperLayer && CompositorService.isNiri
         asynchronous: false
 
         sourceComponent: BlurredWallpaperBackground {}
@@ -213,10 +213,30 @@ Item {
         }
     }
 
+    PolkitAuthModal {
+        id: polkitAuthModal
+    }
+
+    property string lastCredentialsToken: ""
+    property var lastCredentialsTime: 0
+
     Connections {
         target: NetworkService
 
         function onCredentialsNeeded(token, ssid, setting, fields, hints, reason, connType, connName, vpnService) {
+            const now = Date.now()
+            const timeSinceLastPrompt = now - lastCredentialsTime
+
+            if (wifiPasswordModal.shouldBeVisible && timeSinceLastPrompt < 1000) {
+                NetworkService.cancelCredentials(lastCredentialsToken)
+                lastCredentialsToken = token
+                lastCredentialsTime = now
+                wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService)
+                return
+            }
+
+            lastCredentialsToken = token
+            lastCredentialsTime = now
             wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService)
         }
     }

DMSShellIPC.qml

@@ -135,24 +135,22 @@ Item {
         }
 
         function toggle(tab: string): string {
-            root.dankDashPopoutLoader.active = true
-            if (root.dankDashPopoutLoader.item) {
-                if (root.dankDashPopoutLoader.item.dashVisible) {
-                    root.dankDashPopoutLoader.item.dashVisible = false
-                } else {
+            if (root.dankBarLoader.item && root.dankBarLoader.item.triggerWallpaperBrowserOnFocusedScreen()) {
+                if (root.dankDashPopoutLoader.item) {
                     switch (tab.toLowerCase()) {
                     case "media":
                         root.dankDashPopoutLoader.item.currentTabIndex = 1
                         break
+                    case "wallpaper":
+                        root.dankDashPopoutLoader.item.currentTabIndex = 2
+                        break
                     case "weather":
-                        root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 2 : 0
+                        root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0
                         break
                     default:
                         root.dankDashPopoutLoader.item.currentTabIndex = 0
                         break
                     }
-                    root.dankDashPopoutLoader.item.setTriggerPosition(Screen.width / 2, Theme.barHeight + Theme.spacingS, 100, "center", Screen)
-                    root.dankDashPopoutLoader.item.dashVisible = true
                 }
                 return "DASH_TOGGLE_SUCCESS"
             }

Modals/Common/ConfirmModal.qml

@@ -58,7 +58,7 @@ DankModal {
     shouldBeVisible: false
     allowStacking: true
     width: 350
-    height: 160
+    height: contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 160
     enableShadow: true
     shouldHaveFocus: true
     onBackgroundClicked: {
@@ -158,11 +158,17 @@ DankModal {
     content: Component {
         Item {
             anchors.fill: parent
+            implicitHeight: mainColumn.implicitHeight
 
             Column {
-                anchors.centerIn: parent
-                width: parent.width - Theme.spacingM * 2
-                spacing: Theme.spacingM
+                id: mainColumn
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.leftMargin: Theme.spacingL
+                anchors.rightMargin: Theme.spacingL
+                anchors.topMargin: Theme.spacingL
+                spacing: 0
 
                 StyledText {
                     text: confirmTitle
@@ -173,6 +179,11 @@ DankModal {
                     horizontalAlignment: Text.AlignHCenter
                 }
 
+                Item {
+                    width: 1
+                    height: Theme.spacingL
+                }
+
                 StyledText {
                     text: confirmMessage
                     font.pixelSize: Theme.fontSizeMedium
@@ -183,7 +194,8 @@ DankModal {
                 }
 
                 Item {
-                    height: Theme.spacingS
+                    width: 1
+                    height: Theme.spacingL * 1.5
                 }
 
                 Row {
@@ -265,6 +277,11 @@ DankModal {
                         }
                     }
                 }
+
+                Item {
+                    width: 1
+                    height: Theme.spacingL
+                }
             }
         }
     }

Modals/Common/DankModal.qml

@@ -17,17 +17,7 @@ PanelWindow {
     property real height: 300
     readonly property real screenWidth: screen ? screen.width : 1920
     readonly property real screenHeight: screen ? screen.height : 1080
-    readonly property real dpr: {
-        if (CompositorService.isNiri && screen) {
-            const niriScale = NiriService.displayScales[screen.name]
-            if (niriScale !== undefined) return niriScale
-        }
-        if (CompositorService.isHyprland && screen) {
-            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === screen.name)
-            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
-        }
-        return (screen?.devicePixelRatio) || 1
-    }
+    readonly property real dpr: CompositorService.getScreenScale(screen)
     property bool showBackground: true
     property real backgroundOpacity: 0.5
     property string positioning: "center"
@@ -181,6 +171,8 @@ PanelWindow {
         clip: false
         layer.enabled: true
         layer.smooth: true
+        layer.textureSize: Qt.size(width * Math.max(2, root.screen?.devicePixelRatio || 1), height * Math.max(2, root.screen?.devicePixelRatio || 1))
+        layer.samples: 4
         opacity: root.shouldBeVisible ? 1 : 0
         transform: [scaleTransform, motionTransform]
 

Modals/DankColorPickerModal.qml

@@ -45,6 +45,12 @@ DankModal {
         close()
     }
 
+    function hideInstant() {
+        onColorSelectedCallback = null
+        shouldBeVisible = false
+        visible = false
+    }
+
     onColorSelected: (color) => {
         if (onColorSelectedCallback) {
             onColorSelectedCallback(color)
@@ -78,7 +84,7 @@ DankModal {
     }
 
     function pickColorFromScreen() {
-        hide()
+        hideInstant()
         Proc.runCommand("hyprpicker", ["hyprpicker", "--format=hex"], (output, errorCode) => {
             if (errorCode !== 0) {
                 console.warn("hyprpicker exited with code:", errorCode)

Modals/FileBrowser/FileBrowserGridDelegate.qml

@@ -0,0 +1,204 @@
+import QtQuick
+import QtQuick.Effects
+import qs.Common
+import qs.Widgets
+
+StyledRect {
+    id: delegateRoot
+
+    required property bool fileIsDir
+    required property string filePath
+    required property string fileName
+    required property int index
+
+    property bool weMode: false
+    property var iconSizes: [80, 120, 160, 200]
+    property int iconSizeIndex: 1
+    property int selectedIndex: -1
+    property bool keyboardNavigationActive: false
+
+    signal itemClicked(int index, string path, string name, bool isDir)
+    signal itemSelected(int index, string path, string name, bool isDir)
+
+    function getFileExtension(fileName) {
+        const parts = fileName.split('.')
+        if (parts.length > 1) {
+            return parts[parts.length - 1].toLowerCase()
+        }
+        return ""
+    }
+
+    function determineFileType(fileName) {
+        const ext = getFileExtension(fileName)
+
+        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
+        if (imageExts.includes(ext)) {
+            return "image"
+        }
+
+        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
+        if (videoExts.includes(ext)) {
+            return "video"
+        }
+
+        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
+        if (audioExts.includes(ext)) {
+            return "audio"
+        }
+
+        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
+        if (codeExts.includes(ext)) {
+            return "code"
+        }
+
+        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
+        if (docExts.includes(ext)) {
+            return "document"
+        }
+
+        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
+        if (archiveExts.includes(ext)) {
+            return "archive"
+        }
+
+        if (!ext || fileName.indexOf('.') === -1) {
+            return "binary"
+        }
+
+        return "file"
+    }
+
+    function isImageFile(fileName) {
+        if (!fileName) {
+            return false
+        }
+        return determineFileType(fileName) === "image"
+    }
+
+    function getIconForFile(fileName) {
+        const lowerName = fileName.toLowerCase()
+        if (lowerName.startsWith("dockerfile")) {
+            return "docker"
+        }
+        const ext = fileName.split('.').pop()
+        return ext || ""
+    }
+
+    width: weMode ? 245 : iconSizes[iconSizeIndex] + 16
+    height: weMode ? 205 : iconSizes[iconSizeIndex] + 48
+    radius: Theme.cornerRadius
+    color: {
+        if (keyboardNavigationActive && delegateRoot.index === selectedIndex)
+            return Theme.surfacePressed
+
+        return mouseArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
+    }
+    border.color: keyboardNavigationActive && delegateRoot.index === selectedIndex ? Theme.primary : "transparent"
+    border.width: (keyboardNavigationActive && delegateRoot.index === selectedIndex) ? 2 : 0
+
+    Component.onCompleted: {
+        if (keyboardNavigationActive && delegateRoot.index === selectedIndex)
+            itemSelected(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir)
+    }
+
+    onSelectedIndexChanged: {
+        if (keyboardNavigationActive && selectedIndex === delegateRoot.index)
+            itemSelected(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir)
+    }
+
+    Column {
+        anchors.centerIn: parent
+        spacing: Theme.spacingS
+
+        Item {
+            width: weMode ? 225 : (iconSizes[iconSizeIndex] - 8)
+            height: weMode ? 165 : (iconSizes[iconSizeIndex] - 8)
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            CachingImage {
+                id: gridPreviewImage
+                anchors.fill: parent
+                anchors.margins: 2
+                property var weExtensions: [".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tga"]
+                property int weExtIndex: 0
+                source: {
+                    if (weMode && delegateRoot.fileIsDir) {
+                        return "file://" + delegateRoot.filePath + "/preview" + weExtensions[weExtIndex]
+                    }
+                    return (!delegateRoot.fileIsDir && isImageFile(delegateRoot.fileName)) ? ("file://" + delegateRoot.filePath) : ""
+                }
+                onStatusChanged: {
+                    if (weMode && delegateRoot.fileIsDir && status === Image.Error) {
+                        if (weExtIndex < weExtensions.length - 1) {
+                            weExtIndex++
+                            source = "file://" + delegateRoot.filePath + "/preview" + weExtensions[weExtIndex]
+                        } else {
+                            source = ""
+                        }
+                    }
+                }
+                fillMode: Image.PreserveAspectCrop
+                maxCacheSize: weMode ? 225 : iconSizes[iconSizeIndex]
+                visible: false
+            }
+
+            MultiEffect {
+                anchors.fill: parent
+                anchors.margins: 2
+                source: gridPreviewImage
+                maskEnabled: true
+                maskSource: gridImageMask
+                visible: gridPreviewImage.status === Image.Ready && ((!delegateRoot.fileIsDir && isImageFile(delegateRoot.fileName)) || (weMode && delegateRoot.fileIsDir))
+                maskThresholdMin: 0.5
+                maskSpreadAtMin: 1
+            }
+
+            Item {
+                id: gridImageMask
+                anchors.fill: parent
+                anchors.margins: 2
+                layer.enabled: true
+                layer.smooth: true
+                visible: false
+
+                Rectangle {
+                    anchors.fill: parent
+                    radius: Theme.cornerRadius
+                    color: "black"
+                    antialiasing: true
+                }
+            }
+
+            DankNFIcon {
+                anchors.centerIn: parent
+                name: delegateRoot.fileIsDir ? "folder" : getIconForFile(delegateRoot.fileName)
+                size: iconSizes[iconSizeIndex] * 0.45
+                color: delegateRoot.fileIsDir ? Theme.primary : Theme.surfaceText
+                visible: (!delegateRoot.fileIsDir && !isImageFile(delegateRoot.fileName)) || (delegateRoot.fileIsDir && !weMode)
+            }
+        }
+
+        StyledText {
+            text: delegateRoot.fileName || ""
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceText
+            width: delegateRoot.width - Theme.spacingM
+            elide: Text.ElideRight
+            horizontalAlignment: Text.AlignHCenter
+            anchors.horizontalCenter: parent.horizontalCenter
+            maximumLineCount: 2
+            wrapMode: Text.Wrap
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+
+        anchors.fill: parent
+        hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+            itemClicked(delegateRoot.index, delegateRoot.filePath, delegateRoot.fileName, delegateRoot.fileIsDir)
+        }
+    }
+}

Modals/FileBrowser/FileBrowserListDelegate.qml

@@ -0,0 +1,209 @@
+import QtQuick
+import QtQuick.Effects
+import qs.Common
+import qs.Widgets
+
+StyledRect {
+    id: listDelegateRoot
+
+    required property bool fileIsDir
+    required property string filePath
+    required property string fileName
+    required property int index
+    required property var fileModified
+    required property int fileSize
+
+    property int selectedIndex: -1
+    property bool keyboardNavigationActive: false
+
+    signal itemClicked(int index, string path, string name, bool isDir)
+    signal itemSelected(int index, string path, string name, bool isDir)
+
+    function getFileExtension(fileName) {
+        const parts = fileName.split('.')
+        if (parts.length > 1) {
+            return parts[parts.length - 1].toLowerCase()
+        }
+        return ""
+    }
+
+    function determineFileType(fileName) {
+        const ext = getFileExtension(fileName)
+
+        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
+        if (imageExts.includes(ext)) {
+            return "image"
+        }
+
+        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
+        if (videoExts.includes(ext)) {
+            return "video"
+        }
+
+        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
+        if (audioExts.includes(ext)) {
+            return "audio"
+        }
+
+        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
+        if (codeExts.includes(ext)) {
+            return "code"
+        }
+
+        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
+        if (docExts.includes(ext)) {
+            return "document"
+        }
+
+        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
+        if (archiveExts.includes(ext)) {
+            return "archive"
+        }
+
+        if (!ext || fileName.indexOf('.') === -1) {
+            return "binary"
+        }
+
+        return "file"
+    }
+
+    function isImageFile(fileName) {
+        if (!fileName) {
+            return false
+        }
+        return determineFileType(fileName) === "image"
+    }
+
+    function getIconForFile(fileName) {
+        const lowerName = fileName.toLowerCase()
+        if (lowerName.startsWith("dockerfile")) {
+            return "docker"
+        }
+        const ext = fileName.split('.').pop()
+        return ext || ""
+    }
+
+    function formatFileSize(size) {
+        if (size < 1024)
+            return size + " B"
+        if (size < 1024 * 1024)
+            return (size / 1024).toFixed(1) + " KB"
+        if (size < 1024 * 1024 * 1024)
+            return (size / (1024 * 1024)).toFixed(1) + " MB"
+        return (size / (1024 * 1024 * 1024)).toFixed(1) + " GB"
+    }
+
+    height: 44
+    radius: Theme.cornerRadius
+    color: {
+        if (keyboardNavigationActive && listDelegateRoot.index === selectedIndex)
+            return Theme.surfacePressed
+        return listMouseArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
+    }
+    border.color: keyboardNavigationActive && listDelegateRoot.index === selectedIndex ? Theme.primary : "transparent"
+    border.width: (keyboardNavigationActive && listDelegateRoot.index === selectedIndex) ? 2 : 0
+
+    Component.onCompleted: {
+        if (keyboardNavigationActive && listDelegateRoot.index === selectedIndex)
+            itemSelected(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
+    }
+
+    onSelectedIndexChanged: {
+        if (keyboardNavigationActive && selectedIndex === listDelegateRoot.index)
+            itemSelected(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
+    }
+
+    Row {
+        anchors.fill: parent
+        anchors.leftMargin: Theme.spacingS
+        anchors.rightMargin: Theme.spacingS
+        spacing: Theme.spacingS
+
+        Item {
+            width: 28
+            height: 28
+            anchors.verticalCenter: parent.verticalCenter
+
+            CachingImage {
+                id: listPreviewImage
+                anchors.fill: parent
+                source: (!listDelegateRoot.fileIsDir && isImageFile(listDelegateRoot.fileName)) ? ("file://" + listDelegateRoot.filePath) : ""
+                fillMode: Image.PreserveAspectCrop
+                maxCacheSize: 32
+                visible: false
+            }
+
+            MultiEffect {
+                anchors.fill: parent
+                source: listPreviewImage
+                maskEnabled: true
+                maskSource: listImageMask
+                visible: listPreviewImage.status === Image.Ready && !listDelegateRoot.fileIsDir && isImageFile(listDelegateRoot.fileName)
+                maskThresholdMin: 0.5
+                maskSpreadAtMin: 1
+            }
+
+            Item {
+                id: listImageMask
+                anchors.fill: parent
+                layer.enabled: true
+                layer.smooth: true
+                visible: false
+
+                Rectangle {
+                    anchors.fill: parent
+                    radius: Theme.cornerRadius
+                    color: "black"
+                    antialiasing: true
+                }
+            }
+
+            DankNFIcon {
+                anchors.centerIn: parent
+                name: listDelegateRoot.fileIsDir ? "folder" : getIconForFile(listDelegateRoot.fileName)
+                size: Theme.iconSize - 2
+                color: listDelegateRoot.fileIsDir ? Theme.primary : Theme.surfaceText
+                visible: listDelegateRoot.fileIsDir || !isImageFile(listDelegateRoot.fileName)
+            }
+        }
+
+        StyledText {
+            text: listDelegateRoot.fileName || ""
+            font.pixelSize: Theme.fontSizeMedium
+            color: Theme.surfaceText
+            width: parent.width - 280
+            elide: Text.ElideRight
+            anchors.verticalCenter: parent.verticalCenter
+            maximumLineCount: 1
+            clip: true
+        }
+
+        StyledText {
+            text: listDelegateRoot.fileIsDir ? "" : formatFileSize(listDelegateRoot.fileSize)
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceTextMedium
+            width: 70
+            horizontalAlignment: Text.AlignRight
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        StyledText {
+            text: Qt.formatDateTime(listDelegateRoot.fileModified, "MMM d, yyyy h:mm AP")
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceTextMedium
+            width: 140
+            horizontalAlignment: Text.AlignRight
+            anchors.verticalCenter: parent.verticalCenter
+        }
+    }
+
+    MouseArea {
+        id: listMouseArea
+        anchors.fill: parent
+        hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+            itemClicked(listDelegateRoot.index, listDelegateRoot.filePath, listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
+        }
+    }
+}

Modals/FileBrowser/FileBrowserNavigation.qml

@@ -0,0 +1,130 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+Row {
+    id: navigation
+
+    property string currentPath: ""
+    property string homeDir: ""
+    property bool backButtonFocused: false
+    property bool keyboardNavigationActive: false
+    property bool showSidebar: true
+    property bool pathEditMode: false
+    property bool pathInputHasFocus: false
+
+    signal navigateUp()
+    signal navigateTo(string path)
+    signal pathInputFocusChanged(bool hasFocus)
+
+    height: 40
+    leftPadding: Theme.spacingM
+    rightPadding: Theme.spacingM
+    spacing: Theme.spacingS
+
+    StyledRect {
+        width: 32
+        height: 32
+        radius: Theme.cornerRadius
+        color: (backButtonMouseArea.containsMouse || (backButtonFocused && keyboardNavigationActive)) && currentPath !== homeDir ? Theme.surfaceVariant : "transparent"
+        opacity: currentPath !== homeDir ? 1 : 0
+        anchors.verticalCenter: parent.verticalCenter
+
+        DankIcon {
+            anchors.centerIn: parent
+            name: "arrow_back"
+            size: Theme.iconSizeSmall
+            color: Theme.surfaceText
+        }
+
+        MouseArea {
+            id: backButtonMouseArea
+
+            anchors.fill: parent
+            hoverEnabled: currentPath !== homeDir
+            cursorShape: currentPath !== homeDir ? Qt.PointingHandCursor : Qt.ArrowCursor
+            enabled: currentPath !== homeDir
+            onClicked: navigation.navigateUp()
+        }
+    }
+
+    Item {
+        width: Math.max(0, (parent?.width ?? 0) - 40 - Theme.spacingS - (showSidebar ? 0 : 80))
+        height: 32
+        anchors.verticalCenter: parent.verticalCenter
+
+        StyledRect {
+            anchors.fill: parent
+            radius: Theme.cornerRadius
+            color: pathEditMode ? Theme.surfaceContainer : "transparent"
+            border.color: pathEditMode ? Theme.primary : "transparent"
+            border.width: pathEditMode ? 1 : 0
+            visible: !pathEditMode
+
+            StyledText {
+                id: pathDisplay
+                text: currentPath.replace("file://", "")
+                font.pixelSize: Theme.fontSizeMedium
+                color: Theme.surfaceText
+                font.weight: Font.Medium
+                anchors.fill: parent
+                anchors.leftMargin: Theme.spacingS
+                anchors.rightMargin: Theme.spacingS
+                elide: Text.ElideMiddle
+                verticalAlignment: Text.AlignVCenter
+                maximumLineCount: 1
+                wrapMode: Text.NoWrap
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.IBeamCursor
+                onClicked: {
+                    pathEditMode = true
+                    pathInput.text = currentPath.replace("file://", "")
+                    Qt.callLater(() => pathInput.forceActiveFocus())
+                }
+            }
+        }
+
+        DankTextField {
+            id: pathInput
+            anchors.fill: parent
+            visible: pathEditMode
+            topPadding: Theme.spacingXS
+            bottomPadding: Theme.spacingXS
+            onAccepted: {
+                const newPath = text.trim()
+                if (newPath !== "") {
+                    navigation.navigateTo(newPath)
+                }
+                pathEditMode = false
+            }
+            Keys.onEscapePressed: {
+                pathEditMode = false
+            }
+            Keys.onDownPressed: {
+                pathEditMode = false
+            }
+            onActiveFocusChanged: {
+                navigation.pathInputFocusChanged(activeFocus)
+                if (!activeFocus && pathEditMode) {
+                    pathEditMode = false
+                }
+            }
+        }
+    }
+
+    Row {
+        spacing: Theme.spacingXS
+        visible: !showSidebar
+        anchors.verticalCenter: parent.verticalCenter
+
+        DankActionButton {
+            circular: false
+            iconName: "sort"
+            iconSize: Theme.iconSize - 6
+            iconColor: Theme.surfaceText
+        }
+    }
+}

Modals/FileBrowser/FileBrowserOverwriteDialog.qml

@@ -0,0 +1,127 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+Item {
+    id: overwriteDialog
+
+    property bool showDialog: false
+    property string pendingFilePath: ""
+
+    signal confirmed(string filePath)
+    signal cancelled()
+
+    visible: showDialog
+    focus: showDialog
+
+    Keys.onEscapePressed: {
+        cancelled()
+    }
+
+    Keys.onReturnPressed: {
+        confirmed(pendingFilePath)
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: Theme.shadowStrong
+        opacity: 0.8
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                cancelled()
+            }
+        }
+    }
+
+    StyledRect {
+        anchors.centerIn: parent
+        width: 400
+        height: 160
+        color: Theme.surfaceContainer
+        radius: Theme.cornerRadius
+        border.color: Theme.outlineMedium
+        border.width: 1
+
+        Column {
+            anchors.centerIn: parent
+            width: parent.width - Theme.spacingL * 2
+            spacing: Theme.spacingM
+
+            StyledText {
+                text: I18n.tr("File Already Exists")
+                font.pixelSize: Theme.fontSizeLarge
+                font.weight: Font.Medium
+                color: Theme.surfaceText
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            StyledText {
+                text: I18n.tr("A file with this name already exists. Do you want to overwrite it?")
+                font.pixelSize: Theme.fontSizeMedium
+                color: Theme.surfaceTextMedium
+                width: parent.width
+                wrapMode: Text.WordWrap
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            Row {
+                anchors.horizontalCenter: parent.horizontalCenter
+                spacing: Theme.spacingM
+
+                StyledRect {
+                    width: 80
+                    height: 36
+                    radius: Theme.cornerRadius
+                    color: cancelArea.containsMouse ? Theme.surfaceVariantHover : Theme.surfaceVariant
+                    border.color: Theme.outline
+                    border.width: 1
+
+                    StyledText {
+                        anchors.centerIn: parent
+                        text: I18n.tr("Cancel")
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.surfaceText
+                        font.weight: Font.Medium
+                    }
+
+                    MouseArea {
+                        id: cancelArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            cancelled()
+                        }
+                    }
+                }
+
+                StyledRect {
+                    width: 90
+                    height: 36
+                    radius: Theme.cornerRadius
+                    color: overwriteArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
+
+                    StyledText {
+                        anchors.centerIn: parent
+                        text: I18n.tr("Overwrite")
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.background
+                        font.weight: Font.Medium
+                    }
+
+                    MouseArea {
+                        id: overwriteArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            confirmed(pendingFilePath)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Modals/FileBrowser/FileBrowserSaveRow.qml

@@ -0,0 +1,74 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+Row {
+    id: saveRow
+
+    property bool saveMode: false
+    property string defaultFileName: ""
+    property string currentPath: ""
+
+    signal saveRequested(string filePath)
+
+    height: saveMode ? 40 : 0
+    visible: saveMode
+    spacing: Theme.spacingM
+
+    DankTextField {
+        id: fileNameInput
+
+        width: parent.width - saveButton.width - Theme.spacingM
+        height: 40
+        text: defaultFileName
+        placeholderText: I18n.tr("Enter filename...")
+        ignoreLeftRightKeys: false
+        focus: saveMode
+        topPadding: Theme.spacingS
+        bottomPadding: Theme.spacingS
+        Component.onCompleted: {
+            if (saveMode)
+                Qt.callLater(() => {
+                                 forceActiveFocus()
+                             })
+        }
+        onAccepted: {
+            if (text.trim() !== "") {
+                var basePath = currentPath.replace(/^file:\/\//, '')
+                var fullPath = basePath + "/" + text.trim()
+                fullPath = fullPath.replace(/\/+/g, '/')
+                saveRequested(fullPath)
+            }
+        }
+    }
+
+    StyledRect {
+        id: saveButton
+
+        width: 80
+        height: 40
+        color: fileNameInput.text.trim() !== "" ? Theme.primary : Theme.surfaceVariant
+        radius: Theme.cornerRadius
+
+        StyledText {
+            anchors.centerIn: parent
+            text: I18n.tr("Save")
+            color: fileNameInput.text.trim() !== "" ? Theme.primaryText : Theme.surfaceVariantText
+            font.pixelSize: Theme.fontSizeMedium
+        }
+
+        StateLayer {
+            stateColor: Theme.primary
+            cornerRadius: Theme.cornerRadius
+            enabled: fileNameInput.text.trim() !== ""
+            onClicked: {
+                if (fileNameInput.text.trim() !== "") {
+                    var basePath = currentPath.replace(/^file:\/\//, '')
+                    var fullPath = basePath + "/" + fileNameInput.text.trim()
+                    fullPath = fullPath.replace(/\/+/g, '/')
+                    saveRequested(fullPath)
+                }
+            }
+        }
+    }
+}

Modals/FileBrowser/FileBrowserSidebar.qml

@@ -0,0 +1,70 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+StyledRect {
+    id: sidebar
+
+    property var quickAccessLocations: []
+    property string currentPath: ""
+    signal locationSelected(string path)
+
+    width: 200
+    color: Theme.surface
+    clip: true
+
+    Column {
+        anchors.fill: parent
+        anchors.margins: Theme.spacingS
+        spacing: 4
+
+        StyledText {
+            text: "Quick Access"
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceTextMedium
+            font.weight: Font.Medium
+            leftPadding: Theme.spacingS
+            bottomPadding: Theme.spacingXS
+        }
+
+        Repeater {
+            model: quickAccessLocations
+
+            StyledRect {
+                width: parent?.width ?? 0
+                height: 38
+                radius: Theme.cornerRadius
+                color: quickAccessMouseArea.containsMouse ? Theme.surfaceContainerHigh : (currentPath === modelData?.path ? Theme.surfacePressed : "transparent")
+
+                Row {
+                    anchors.fill: parent
+                    anchors.leftMargin: Theme.spacingM
+                    spacing: Theme.spacingS
+
+                    DankIcon {
+                        name: modelData?.icon ?? ""
+                        size: Theme.iconSize - 2
+                        color: currentPath === modelData?.path ? Theme.primary : Theme.surfaceText
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    StyledText {
+                        text: modelData?.name ?? ""
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: currentPath === modelData?.path ? Theme.primary : Theme.surfaceText
+                        font.weight: currentPath === modelData?.path ? Font.Medium : Font.Normal
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+                }
+
+                MouseArea {
+                    id: quickAccessMouseArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: locationSelected(modelData?.path ?? "")
+                }
+            }
+        }
+    }
+}

Modals/FileBrowser/FileBrowserSortMenu.qml

@@ -0,0 +1,183 @@
+import QtQuick
+import qs.Common
+import qs.Widgets
+
+StyledRect {
+    id: sortMenu
+
+    property string sortBy: "name"
+    property bool sortAscending: true
+
+    signal sortBySelected(string value)
+    signal sortOrderSelected(bool ascending)
+
+    width: 200
+    height: sortColumn.height + Theme.spacingM * 2
+    color: Theme.surfaceContainer
+    radius: Theme.cornerRadius
+    border.color: Theme.outlineMedium
+    border.width: 1
+    visible: false
+    z: 100
+
+    Column {
+        id: sortColumn
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.margins: Theme.spacingM
+        spacing: Theme.spacingXS
+
+        StyledText {
+            text: "Sort By"
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceTextMedium
+            font.weight: Font.Medium
+        }
+
+        Repeater {
+            model: [{
+                    "name": "Name",
+                    "value": "name"
+                }, {
+                    "name": "Size",
+                    "value": "size"
+                }, {
+                    "name": "Modified",
+                    "value": "modified"
+                }, {
+                    "name": "Type",
+                    "value": "type"
+                }]
+
+            StyledRect {
+                width: sortColumn?.width ?? 0
+                height: 32
+                radius: Theme.cornerRadius
+                color: sortMouseArea.containsMouse ? Theme.surfaceVariant : (sortBy === modelData?.value ? Theme.surfacePressed : "transparent")
+
+                Row {
+                    anchors.fill: parent
+                    anchors.leftMargin: Theme.spacingS
+                    spacing: Theme.spacingS
+
+                    DankIcon {
+                        name: sortBy === modelData?.value ? "check" : ""
+                        size: Theme.iconSizeSmall
+                        color: Theme.primary
+                        anchors.verticalCenter: parent.verticalCenter
+                        visible: sortBy === modelData?.value
+                    }
+
+                    StyledText {
+                        text: modelData?.name ?? ""
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: sortBy === modelData?.value ? Theme.primary : Theme.surfaceText
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+                }
+
+                MouseArea {
+                    id: sortMouseArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        sortMenu.sortBySelected(modelData?.value ?? "name")
+                        sortMenu.visible = false
+                    }
+                }
+            }
+        }
+
+        StyledRect {
+            width: sortColumn.width
+            height: 1
+            color: Theme.outline
+        }
+
+        StyledText {
+            text: "Order"
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceTextMedium
+            font.weight: Font.Medium
+            topPadding: Theme.spacingXS
+        }
+
+        StyledRect {
+            width: sortColumn?.width ?? 0
+            height: 32
+            radius: Theme.cornerRadius
+            color: ascMouseArea.containsMouse ? Theme.surfaceVariant : (sortAscending ? Theme.surfacePressed : "transparent")
+
+            Row {
+                anchors.fill: parent
+                anchors.leftMargin: Theme.spacingS
+                spacing: Theme.spacingS
+
+                DankIcon {
+                    name: "arrow_upward"
+                    size: Theme.iconSizeSmall
+                    color: sortAscending ? Theme.primary : Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: "Ascending"
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: sortAscending ? Theme.primary : Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+
+            MouseArea {
+                id: ascMouseArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    sortMenu.sortOrderSelected(true)
+                    sortMenu.visible = false
+                }
+            }
+        }
+
+        StyledRect {
+            width: sortColumn?.width ?? 0
+            height: 32
+            radius: Theme.cornerRadius
+            color: descMouseArea.containsMouse ? Theme.surfaceVariant : (!sortAscending ? Theme.surfacePressed : "transparent")
+
+            Row {
+                anchors.fill: parent
+                anchors.leftMargin: Theme.spacingS
+                spacing: Theme.spacingS
+
+                DankIcon {
+                    name: "arrow_downward"
+                    size: Theme.iconSizeSmall
+                    color: !sortAscending ? Theme.primary : Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: "Descending"
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: !sortAscending ? Theme.primary : Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+
+            MouseArea {
+                id: descMouseArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    sortMenu.sortOrderSelected(false)
+                    sortMenu.visible = false
+                }
+            }
+        }
+    }
+}

Modals/PolkitAuthModal.qml

@@ -0,0 +1,356 @@
+import QtQuick
+import qs.Common
+import qs.Modals.Common
+import qs.Services
+import qs.Widgets
+
+DankModal {
+    id: root
+
+    property string passwordInput: ""
+    property var currentFlow: PolkitService.agent?.flow
+    property bool isLoading: false
+    property real minHeight: 240
+
+    function show() {
+        passwordInput = ""
+        isLoading = false
+        open()
+        Qt.callLater(() => {
+            if (contentLoader.item && contentLoader.item.passwordField) {
+                contentLoader.item.passwordField.forceActiveFocus()
+            }
+        })
+    }
+
+    shouldBeVisible: false
+    width: 420
+    height: Math.max(minHeight, contentLoader.item ? contentLoader.item.implicitHeight + Theme.spacingM * 2 : 240)
+
+    Connections {
+        target: contentLoader.item
+        function onImplicitHeightChanged() {
+            if (shouldBeVisible && contentLoader.item) {
+                const newHeight = contentLoader.item.implicitHeight + Theme.spacingM * 2
+                if (newHeight > minHeight) {
+                    minHeight = newHeight
+                }
+            }
+        }
+    }
+
+    onOpened: {
+        Qt.callLater(() => {
+            if (contentLoader.item && contentLoader.item.passwordField) {
+                contentLoader.item.passwordField.forceActiveFocus()
+            }
+        })
+    }
+
+    onClosed: {
+        passwordInput = ""
+        isLoading = false
+    }
+
+    onBackgroundClicked: () => {
+        if (currentFlow && !isLoading) {
+            currentFlow.cancelAuthenticationRequest()
+        }
+    }
+
+    Connections {
+        target: PolkitService.agent
+        enabled: PolkitService.polkitAvailable
+
+        function onAuthenticationRequestStarted() {
+            show()
+        }
+
+        function onIsActiveChanged() {
+            if (!(PolkitService.agent?.isActive ?? false)) {
+                close()
+            }
+        }
+    }
+
+    Connections {
+        target: currentFlow
+        enabled: currentFlow !== null
+
+        function onIsResponseRequiredChanged() {
+            if (currentFlow.isResponseRequired) {
+                isLoading = false
+                passwordInput = ""
+                if (contentLoader.item && contentLoader.item.passwordField) {
+                    contentLoader.item.passwordField.forceActiveFocus()
+                }
+            }
+        }
+
+        function onAuthenticationSucceeded() {
+            close()
+        }
+
+        function onAuthenticationFailed() {
+            isLoading = false
+        }
+
+        function onAuthenticationRequestCancelled() {
+            close()
+        }
+    }
+
+    content: Component {
+        FocusScope {
+            id: authContent
+
+            property alias passwordField: passwordField
+
+            anchors.fill: parent
+            focus: true
+            implicitHeight: headerRow.implicitHeight + mainColumn.implicitHeight + Theme.spacingM
+
+            Keys.onEscapePressed: event => {
+                if (currentFlow && !isLoading) {
+                    currentFlow.cancelAuthenticationRequest()
+                }
+                event.accepted = true
+            }
+
+            Row {
+                id: headerRow
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.leftMargin: Theme.spacingM
+                anchors.rightMargin: Theme.spacingM
+                anchors.topMargin: Theme.spacingM
+
+                Column {
+                    width: parent.width - 40
+                    spacing: Theme.spacingXS
+
+                    StyledText {
+                        text: I18n.tr("Authentication Required")
+                        font.pixelSize: Theme.fontSizeLarge
+                        color: Theme.surfaceText
+                        font.weight: Font.Medium
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingXS
+
+                        StyledText {
+                            text: currentFlow?.message ?? ""
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: Theme.surfaceTextMedium
+                            width: parent.width
+                            wrapMode: Text.Wrap
+                        }
+
+                        StyledText {
+                            visible: (currentFlow?.supplementaryMessage ?? "") !== ""
+                            text: currentFlow?.supplementaryMessage ?? ""
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: (currentFlow?.supplementaryIsError ?? false) ? Theme.error : Theme.surfaceTextMedium
+                            width: parent.width
+                            wrapMode: Text.Wrap
+                            opacity: (currentFlow?.supplementaryIsError ?? false) ? 1 : 0.8
+                        }
+                    }
+                }
+
+                DankActionButton {
+                    iconName: "close"
+                    iconSize: Theme.iconSize - 4
+                    iconColor: Theme.surfaceText
+                    enabled: !isLoading
+                    opacity: enabled ? 1 : 0.5
+                    onClicked: () => {
+                        if (currentFlow) {
+                            currentFlow.cancelAuthenticationRequest()
+                        }
+                    }
+                }
+            }
+
+            Column {
+                id: mainColumn
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+                anchors.leftMargin: Theme.spacingM
+                anchors.rightMargin: Theme.spacingM
+                anchors.bottomMargin: Theme.spacingM
+                spacing: Theme.spacingM
+
+                StyledText {
+                    text: currentFlow?.inputPrompt ?? ""
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: Theme.surfaceText
+                    width: parent.width
+                    visible: (currentFlow?.inputPrompt ?? "") !== ""
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 50
+                    radius: Theme.cornerRadius
+                    color: Theme.surfaceHover
+                    border.color: passwordField.activeFocus ? Theme.primary : Theme.outlineStrong
+                    border.width: passwordField.activeFocus ? 2 : 1
+                    opacity: isLoading ? 0.5 : 1
+
+                    MouseArea {
+                        anchors.fill: parent
+                        enabled: !isLoading
+                        onClicked: () => {
+                            passwordField.forceActiveFocus()
+                        }
+                    }
+
+                    DankTextField {
+                        id: passwordField
+
+                        anchors.fill: parent
+                        font.pixelSize: Theme.fontSizeMedium
+                        textColor: Theme.surfaceText
+                        text: passwordInput
+                        echoMode: (currentFlow?.responseVisible ?? false) ? TextInput.Normal : TextInput.Password
+                        placeholderText: ""
+                        backgroundColor: "transparent"
+                        enabled: !isLoading
+                        onTextEdited: () => {
+                            passwordInput = text
+                        }
+                        onAccepted: () => {
+                            if (passwordInput.length > 0 && currentFlow && !isLoading) {
+                                isLoading = true
+                                currentFlow.submit(passwordInput)
+                                passwordInput = ""
+                            }
+                        }
+                    }
+                }
+
+                Item {
+                    width: parent.width
+                    height: (currentFlow?.failed ?? false) ? failedText.implicitHeight : 0
+                    visible: height > 0
+
+                    StyledText {
+                        id: failedText
+                        text: I18n.tr("Authentication failed, please try again")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.error
+                        width: parent.width
+                        opacity: (currentFlow?.failed ?? false) ? 1 : 0
+
+                        Behavior on opacity {
+                            NumberAnimation {
+                                duration: Theme.shortDuration
+                                easing.type: Theme.standardEasing
+                            }
+                        }
+                    }
+
+                    Behavior on height {
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Theme.standardEasing
+                        }
+                    }
+                }
+
+                Item {
+                    width: parent.width
+                    height: 40
+
+                    Row {
+                        anchors.right: parent.right
+                        anchors.verticalCenter: parent.verticalCenter
+                        spacing: Theme.spacingM
+
+                        Rectangle {
+                            width: Math.max(70, cancelText.contentWidth + Theme.spacingM * 2)
+                            height: 36
+                            radius: Theme.cornerRadius
+                            color: cancelArea.containsMouse ? Theme.surfaceTextHover : "transparent"
+                            border.color: Theme.surfaceVariantAlpha
+                            border.width: 1
+                            enabled: !isLoading
+                            opacity: enabled ? 1 : 0.5
+
+                            StyledText {
+                                id: cancelText
+
+                                anchors.centerIn: parent
+                                text: I18n.tr("Cancel")
+                                font.pixelSize: Theme.fontSizeMedium
+                                color: Theme.surfaceText
+                                font.weight: Font.Medium
+                            }
+
+                            MouseArea {
+                                id: cancelArea
+
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: parent.enabled
+                                onClicked: () => {
+                                    if (currentFlow) {
+                                        currentFlow.cancelAuthenticationRequest()
+                                    }
+                                }
+                            }
+                        }
+
+                        Rectangle {
+                            width: Math.max(80, authText.contentWidth + Theme.spacingM * 2)
+                            height: 36
+                            radius: Theme.cornerRadius
+                            color: authArea.containsMouse ? Qt.darker(Theme.primary, 1.1) : Theme.primary
+                            enabled: !isLoading && (passwordInput.length > 0 || !(currentFlow?.isResponseRequired ?? true))
+                            opacity: enabled ? 1 : 0.5
+
+                            StyledText {
+                                id: authText
+
+                                anchors.centerIn: parent
+                                text: I18n.tr("Authenticate")
+                                font.pixelSize: Theme.fontSizeMedium
+                                color: Theme.background
+                                font.weight: Font.Medium
+                            }
+
+                            MouseArea {
+                                id: authArea
+
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                cursorShape: Qt.PointingHandCursor
+                                enabled: parent.enabled
+                                onClicked: () => {
+                                    if (currentFlow && !isLoading) {
+                                        isLoading = true
+                                        currentFlow.submit(passwordInput)
+                                        passwordInput = ""
+                                    }
+                                }
+                            }
+
+                            Behavior on color {
+                                ColorAnimation {
+                                    duration: Theme.shortDuration
+                                    easing.type: Theme.standardEasing
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Modals/Settings/SettingsModal.qml

@@ -34,8 +34,8 @@ DankModal {
     }
 
     objectName: "settingsModal"
-    width: 800
-    height: 800
+    width: Math.min(800, screenWidth * 0.9)
+    height: Math.min(800, screenHeight * 0.85)
     visible: false
     onBackgroundClicked: () => {
         return hide();

Modals/Settings/SettingsSidebar.qml

@@ -58,84 +58,93 @@ Rectangle {
     color: Theme.surfaceContainer
     radius: Theme.cornerRadius
 
-    Column {
+    DankFlickable {
         anchors.fill: parent
-        anchors.leftMargin: Theme.spacingS
-        anchors.rightMargin: Theme.spacingS
-        anchors.bottomMargin: Theme.spacingS
-        anchors.topMargin: Theme.spacingM + 2
-        spacing: Theme.spacingXS
+        clip: true
+        contentHeight: sidebarColumn.implicitHeight
 
-        ProfileSection {
-            parentModal: sidebarContainer.parentModal
-        }
+        Column {
+            id: sidebarColumn
 
-        Rectangle {
-            width: parent.width - Theme.spacingS * 2
-            height: 1
-            color: Theme.outline
-            opacity: 0.2
-        }
-
-        Item {
             width: parent.width
-            height: Theme.spacingL
-        }
+            anchors.leftMargin: Theme.spacingS
+            anchors.rightMargin: Theme.spacingS
+            anchors.bottomMargin: Theme.spacingS
+            anchors.topMargin: Theme.spacingM + 2
+            spacing: Theme.spacingXS
 
-        Repeater {
-            id: sidebarRepeater
-
-            model: sidebarContainer.sidebarItems
-
-            delegate: Rectangle {
-                required property int index
-                required property var modelData
-
-                property bool isActive: sidebarContainer.currentIndex === index
+            ProfileSection {
+                parentModal: sidebarContainer.parentModal
+            }
 
+            Rectangle {
                 width: parent.width - Theme.spacingS * 2
-                height: 44
-                radius: Theme.cornerRadius
-                color: isActive ? Theme.primary : tabMouseArea.containsMouse ? Theme.surfaceHover : "transparent"
+                height: 1
+                color: Theme.outline
+                opacity: 0.2
+            }
 
-                Row {
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.spacingM
-                    anchors.verticalCenter: parent.verticalCenter
-                    spacing: Theme.spacingM
+            Item {
+                width: parent.width
+                height: Theme.spacingL
+            }
 
-                    DankIcon {
-                        name: modelData.icon || ""
-                        size: Theme.iconSize - 2
-                        color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
+            Repeater {
+                id: sidebarRepeater
+
+                model: sidebarContainer.sidebarItems
+
+                delegate: Rectangle {
+                    required property int index
+                    required property var modelData
+
+                    property bool isActive: sidebarContainer.currentIndex === index
+
+                    width: sidebarColumn.width - Theme.spacingS * 2
+                    height: 44
+                    radius: Theme.cornerRadius
+                    color: isActive ? Theme.primary : tabMouseArea.containsMouse ? Theme.surfaceHover : "transparent"
+
+                    Row {
+                        anchors.left: parent.left
+                        anchors.leftMargin: Theme.spacingM
                         anchors.verticalCenter: parent.verticalCenter
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: modelData.icon || ""
+                            size: Theme.iconSize - 2
+                            color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: modelData.text || ""
+                            font.pixelSize: Theme.fontSizeMedium
+                            color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
+                            font.weight: parent.parent.isActive ? Font.Medium : Font.Normal
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
                     }
 
-                    StyledText {
-                        text: modelData.text || ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: parent.parent.isActive ? Theme.primaryText : Theme.surfaceText
-                        font.weight: parent.parent.isActive ? Font.Medium : Font.Normal
-                        anchors.verticalCenter: parent.verticalCenter
+                    MouseArea {
+                        id: tabMouseArea
+
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: () => {
+                            sidebarContainer.currentIndex = index;
+                        }
                     }
 
-                }
+                    Behavior on color {
+                        ColorAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Theme.standardEasing
+                        }
 
-                MouseArea {
-                    id: tabMouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: () => {
-                        sidebarContainer.currentIndex = index;
-                    }
-                }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
                     }
 
                 }

Modals/Spotlight/FileSearchController.qml

@@ -0,0 +1,237 @@
+import QtQuick
+import Quickshell.Io
+import qs.Services
+
+Item {
+    id: controller
+
+    property string searchQuery: ""
+    property alias model: fileModel
+    property int selectedIndex: 0
+    property bool keyboardNavigationActive: false
+    property bool isSearching: false
+    property int totalResults: 0
+    property string searchField: "filename"
+
+    signal searchCompleted
+
+    ListModel {
+        id: fileModel
+    }
+
+    function performSearch() {
+        if (!DSearchService.dsearchAvailable) {
+            model.clear()
+            totalResults = 0
+            isSearching = false
+            return
+        }
+
+        if (searchQuery.length === 0) {
+            model.clear()
+            totalResults = 0
+            isSearching = false
+            return
+        }
+
+        isSearching = true
+        const params = {
+            "limit": 50,
+            "fuzzy": true,
+            "sort": "score",
+            "desc": true
+        }
+
+        if (searchField && searchField !== "all") {
+            params.field = searchField
+        }
+
+        DSearchService.search(searchQuery, params, response => {
+                                  if (response.error) {
+                                      model.clear()
+                                      totalResults = 0
+                                      isSearching = false
+                                      return
+                                  }
+
+                                  if (response.result) {
+                                      updateModel(response.result)
+                                  }
+
+                                  isSearching = false
+                                  searchCompleted()
+                              })
+    }
+
+    function updateModel(result) {
+        model.clear()
+        totalResults = result.total_hits || 0
+        selectedIndex = 0
+        keyboardNavigationActive = true
+
+        if (!result.hits || result.hits.length === 0) {
+            selectedIndex = -1
+            keyboardNavigationActive = false
+            return
+        }
+
+        for (var i = 0; i < result.hits.length; i++) {
+            const hit = result.hits[i]
+            const filePath = hit.id || ""
+            const fileName = getFileName(filePath)
+            const fileExt = getFileExtension(fileName)
+            const fileType = determineFileType(fileName, filePath)
+            const dirPath = getDirPath(filePath)
+
+            model.append({
+                             "filePath": filePath,
+                             "fileName": fileName,
+                             "fileExtension": fileExt,
+                             "fileType": fileType,
+                             "dirPath": dirPath,
+                             "score": hit.score || 0
+                         })
+        }
+    }
+
+    function getFileName(path) {
+        const parts = path.split('/')
+        return parts[parts.length - 1] || path
+    }
+
+    function getFileExtension(fileName) {
+        const parts = fileName.split('.')
+        if (parts.length > 1) {
+            return parts[parts.length - 1].toLowerCase()
+        }
+        return ""
+    }
+
+    function getDirPath(path) {
+        const lastSlash = path.lastIndexOf('/')
+        if (lastSlash > 0) {
+            return path.substring(0, lastSlash)
+        }
+        return ""
+    }
+
+    function determineFileType(fileName, filePath) {
+        const ext = getFileExtension(fileName)
+
+        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
+        if (imageExts.includes(ext)) {
+            return "image"
+        }
+
+        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
+        if (videoExts.includes(ext)) {
+            return "video"
+        }
+
+        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
+        if (audioExts.includes(ext)) {
+            return "audio"
+        }
+
+        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
+        if (codeExts.includes(ext)) {
+            return "code"
+        }
+
+        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
+        if (docExts.includes(ext)) {
+            return "document"
+        }
+
+        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
+        if (archiveExts.includes(ext)) {
+            return "archive"
+        }
+
+        if (!ext || fileName.indexOf('.') === -1) {
+            return "binary"
+        }
+
+        return "file"
+    }
+
+    function selectNext() {
+        if (model.count === 0) {
+            return
+        }
+        keyboardNavigationActive = true
+        selectedIndex = Math.min(selectedIndex + 1, model.count - 1)
+    }
+
+    function selectPrevious() {
+        if (model.count === 0) {
+            return
+        }
+        keyboardNavigationActive = true
+        selectedIndex = Math.max(selectedIndex - 1, 0)
+    }
+
+    signal fileOpened
+
+    function openFile(filePath) {
+        if (!filePath || filePath.length === 0) {
+            return
+        }
+
+        let url = filePath
+        if (!url.startsWith("file://")) {
+            url = "file://" + filePath
+        }
+
+        Qt.openUrlExternally(url)
+        fileOpened()
+    }
+
+    function openFolder(filePath) {
+        if (!filePath || filePath.length === 0) {
+            return
+        }
+
+        const lastSlash = filePath.lastIndexOf('/')
+        if (lastSlash <= 0) {
+            return
+        }
+
+        const dirPath = filePath.substring(0, lastSlash)
+        let url = dirPath
+        if (!url.startsWith("file://")) {
+            url = "file://" + dirPath
+        }
+
+        Qt.openUrlExternally(url)
+        fileOpened()
+    }
+
+    function openSelected() {
+        if (model.count === 0 || selectedIndex < 0 || selectedIndex >= model.count) {
+            return
+        }
+
+        const item = model.get(selectedIndex)
+        if (item && item.filePath) {
+            openFile(item.filePath)
+        }
+    }
+
+    function reset() {
+        searchQuery = ""
+        model.clear()
+        selectedIndex = -1
+        keyboardNavigationActive = false
+        isSearching = false
+        totalResults = 0
+    }
+
+    onSearchQueryChanged: {
+        performSearch()
+    }
+
+    onSearchFieldChanged: {
+        performSearch()
+    }
+}

Modals/Spotlight/FileSearchEntry.qml

@@ -0,0 +1,155 @@
+import QtQuick
+import QtQuick.Effects
+import Quickshell
+import qs.Common
+import qs.Widgets
+
+Rectangle {
+    id: entry
+
+    required property string filePath
+    required property string fileName
+    required property string fileExtension
+    required property string fileType
+    required property string dirPath
+    required property bool isSelected
+    required property int itemIndex
+
+    signal clicked()
+
+    readonly property int iconSize: 40
+
+    radius: Theme.cornerRadius
+    color: isSelected ? Theme.primaryPressed : mouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
+
+    Row {
+        anchors.fill: parent
+        anchors.margins: Theme.spacingM
+        spacing: Theme.spacingL
+
+        Item {
+            width: iconSize
+            height: iconSize
+            anchors.verticalCenter: parent.verticalCenter
+
+            Image {
+                id: imagePreview
+                anchors.fill: parent
+                source: fileType === "image" ? `file://${filePath}` : ""
+                fillMode: Image.PreserveAspectCrop
+                smooth: true
+                cache: true
+                asynchronous: true
+                visible: fileType === "image" && status === Image.Ready
+                sourceSize.width: 128
+                sourceSize.height: 128
+            }
+
+            MultiEffect {
+                anchors.fill: parent
+                source: imagePreview
+                maskEnabled: true
+                maskSource: imageMask
+                visible: fileType === "image" && imagePreview.status === Image.Ready
+                maskThresholdMin: 0.5
+                maskSpreadAtMin: 1
+            }
+
+            Item {
+                id: imageMask
+                width: iconSize
+                height: iconSize
+                layer.enabled: true
+                layer.smooth: true
+                visible: false
+
+                Rectangle {
+                    anchors.fill: parent
+                    radius: width / 2
+                    color: "black"
+                    antialiasing: true
+                }
+            }
+
+            Rectangle {
+                anchors.fill: parent
+                radius: width / 2
+                color: getFileTypeColor()
+                visible: fileType !== "image" || imagePreview.status !== Image.Ready
+
+                StyledText {
+                    anchors.centerIn: parent
+                    text: getFileIconText()
+                    font.pixelSize: fileExtension.length > 0 ? (fileExtension.length > 3 ? Theme.fontSizeSmall - 2 : Theme.fontSizeSmall) : Theme.fontSizeMedium
+                    color: Theme.surfaceText
+                    font.weight: Font.Bold
+                }
+            }
+        }
+
+        Column {
+            anchors.verticalCenter: parent.verticalCenter
+            width: parent.width - iconSize - Theme.spacingL
+            spacing: Theme.spacingXS
+
+            StyledText {
+                width: parent.width
+                text: fileName
+                font.pixelSize: Theme.fontSizeLarge
+                color: Theme.surfaceText
+                font.weight: Font.Medium
+                elide: Text.ElideMiddle
+                wrapMode: Text.NoWrap
+                maximumLineCount: 1
+            }
+
+            StyledText {
+                width: parent.width
+                text: dirPath
+                font.pixelSize: Theme.fontSizeMedium
+                color: Theme.surfaceVariantText
+                elide: Text.ElideMiddle
+                maximumLineCount: 1
+            }
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
+        onClicked: entry.clicked()
+    }
+
+    function getFileTypeColor() {
+        switch (fileType) {
+        case "code":
+            return Theme.codeFileColor || Theme.primarySelected
+        case "document":
+            return Theme.docFileColor || Theme.secondarySelected
+        case "video":
+            return Theme.videoFileColor || Theme.tertiarySelected
+        case "audio":
+            return Theme.audioFileColor || Theme.errorSelected
+        case "archive":
+            return Theme.archiveFileColor || Theme.warningSelected
+        case "binary":
+            return Theme.binaryFileColor || Theme.surfaceDim
+        default:
+            return Theme.surfaceLight
+        }
+    }
+
+    function getFileIconText() {
+        if (fileType === "binary") {
+            return "bin"
+        }
+
+        if (fileExtension.length > 0) {
+            return fileExtension
+        }
+
+        return fileName.charAt(0).toUpperCase()
+    }
+}

Modals/Spotlight/FileSearchResults.qml

@@ -0,0 +1,246 @@
+import QtQuick
+import QtQuick.Effects
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Rectangle {
+    id: resultsContainer
+
+    property var fileSearchController: null
+
+    function resetScroll() {
+        filesList.contentY = 0
+    }
+
+    color: "transparent"
+    clip: true
+
+    DankListView {
+        id: filesList
+
+        property int itemHeight: 60
+        property int itemSpacing: Theme.spacingS
+        property bool hoverUpdatesSelection: false
+        property bool keyboardNavigationActive: fileSearchController ? fileSearchController.keyboardNavigationActive : false
+
+        signal keyboardNavigationReset
+        signal itemClicked(int index)
+        signal itemRightClicked(int index)
+
+        function ensureVisible(index) {
+            if (index < 0 || index >= count)
+                return
+
+            const itemY = index * (itemHeight + itemSpacing)
+            const itemBottom = itemY + itemHeight
+            if (itemY < contentY)
+                contentY = itemY
+            else if (itemBottom > contentY + height)
+                contentY = itemBottom - height
+        }
+
+        anchors.fill: parent
+        anchors.margins: Theme.spacingS
+        model: fileSearchController ? fileSearchController.model : null
+        currentIndex: fileSearchController ? fileSearchController.selectedIndex : -1
+        clip: true
+        spacing: itemSpacing
+        focus: true
+        interactive: true
+        cacheBuffer: Math.max(0, Math.min(height * 2, 1000))
+        reuseItems: true
+
+        onCurrentIndexChanged: {
+            if (keyboardNavigationActive)
+                ensureVisible(currentIndex)
+        }
+
+        onItemClicked: function (index) {
+            if (fileSearchController) {
+                const item = fileSearchController.model.get(index)
+                fileSearchController.openFile(item.filePath)
+            }
+        }
+
+        onItemRightClicked: function (index) {
+            if (fileSearchController) {
+                const item = fileSearchController.model.get(index)
+                fileSearchController.openFolder(item.filePath)
+            }
+        }
+
+        onKeyboardNavigationReset: {
+            if (fileSearchController)
+                fileSearchController.keyboardNavigationActive = false
+        }
+
+        delegate: Rectangle {
+            required property int index
+            required property string filePath
+            required property string fileName
+            required property string fileExtension
+            required property string fileType
+            required property string dirPath
+
+            width: ListView.view.width
+            height: filesList.itemHeight
+            radius: Theme.cornerRadius
+            color: ListView.isCurrentItem ? Theme.primaryPressed : fileMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
+
+            Row {
+                anchors.fill: parent
+                anchors.margins: Theme.spacingM
+                spacing: Theme.spacingL
+
+                Item {
+                    width: 40
+                    height: 40
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    Rectangle {
+                        id: iconBackground
+                        anchors.fill: parent
+                        radius: width / 2
+                        color: Theme.surfaceLight
+                        visible: fileType !== "image"
+
+                        DankNFIcon {
+                            id: nerdIcon
+                            anchors.centerIn: parent
+                            name: {
+                                const lowerName = fileName.toLowerCase()
+                                if (lowerName.startsWith("dockerfile"))
+                                    return "docker"
+                                if (lowerName.startsWith("makefile"))
+                                    return "makefile"
+                                if (lowerName.startsWith("license"))
+                                    return "license"
+                                if (lowerName.startsWith("readme"))
+                                    return "readme"
+                                return fileExtension.toLowerCase()
+                            }
+                            size: Theme.fontSizeXLarge
+                            color: Theme.surfaceText
+                        }
+
+                        StyledText {
+                            anchors.centerIn: parent
+                            text: fileExtension ? (fileExtension.length > 4 ? fileExtension.substring(0, 4) : fileExtension) : "?"
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceText
+                            font.weight: Font.Bold
+                            visible: !nerdIcon.visible
+                        }
+                    }
+
+                    Loader {
+                        anchors.fill: parent
+                        active: fileType === "image"
+                        sourceComponent: Image {
+                            anchors.fill: parent
+                            source: "file://" + filePath
+                            fillMode: Image.PreserveAspectCrop
+                            asynchronous: true
+                            cache: false
+                            layer.enabled: true
+                            layer.effect: MultiEffect {
+                                maskEnabled: true
+                                maskThresholdMin: 0.5
+                                maskSpreadAtMin: 1.0
+                                maskSource: ShaderEffectSource {
+                                    sourceItem: Rectangle {
+                                        width: 40
+                                        height: 40
+                                        radius: 20
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Column {
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: parent.width - 40 - Theme.spacingL
+                    spacing: Theme.spacingXS
+
+                    StyledText {
+                        width: parent.width
+                        text: fileName || ""
+                        font.pixelSize: Theme.fontSizeLarge
+                        color: Theme.surfaceText
+                        font.weight: Font.Medium
+                        elide: Text.ElideMiddle
+                        maximumLineCount: 1
+                    }
+
+                    StyledText {
+                        width: parent.width
+                        text: dirPath || ""
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.surfaceVariantText
+                        elide: Text.ElideMiddle
+                        maximumLineCount: 1
+                    }
+                }
+            }
+
+            MouseArea {
+                id: fileMouseArea
+
+                anchors.fill: parent
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                z: 10
+                onEntered: {
+                    if (filesList.hoverUpdatesSelection && !filesList.keyboardNavigationActive)
+                        filesList.currentIndex = index
+                }
+                onPositionChanged: {
+                    filesList.keyboardNavigationReset()
+                }
+                onClicked: mouse => {
+                               if (mouse.button === Qt.LeftButton) {
+                                   filesList.itemClicked(index)
+                               } else if (mouse.button === Qt.RightButton) {
+                                   filesList.itemRightClicked(index)
+                               }
+                           }
+            }
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+        visible: !fileSearchController || !fileSearchController.model || fileSearchController.model.count === 0
+
+        StyledText {
+            property string displayText: {
+                if (!fileSearchController) {
+                    return ""
+                }
+                if (!DSearchService.dsearchAvailable) {
+                    return I18n.tr("DankSearch not available")
+                }
+                if (fileSearchController.isSearching) {
+                    return I18n.tr("Searching...")
+                }
+                if (fileSearchController.searchQuery.length === 0) {
+                    return I18n.tr("Enter a search query")
+                }
+                if (!fileSearchController.model || fileSearchController.model.count === 0) {
+                    return I18n.tr("No files found")
+                }
+                return ""
+            }
+
+            text: displayText
+            anchors.centerIn: parent
+            font.pixelSize: Theme.fontSizeMedium
+            color: Theme.surfaceVariantText
+            visible: displayText.length > 0
+        }
+    }
+}

Modals/Spotlight/SpotlightContent.qml

@@ -11,10 +11,40 @@ Item {
 
     property alias appLauncher: appLauncher
     property alias searchField: searchField
+    property alias fileSearchController: fileSearchController
     property var parentModal: null
+    property string searchMode: "apps"
 
     function resetScroll() {
-        resultsView.resetScroll()
+        if (searchMode === "apps") {
+            resultsView.resetScroll()
+        } else {
+            fileSearchResults.resetScroll()
+        }
+    }
+
+    function updateSearchMode() {
+        if (searchField.text.startsWith("/")) {
+            if (searchMode !== "files") {
+                searchMode = "files"
+            }
+            const query = searchField.text.substring(1)
+            fileSearchController.searchQuery = query
+        } else {
+            if (searchMode !== "apps") {
+                searchMode = "apps"
+                fileSearchController.reset()
+                appLauncher.searchQuery = searchField.text
+            }
+        }
+    }
+
+    onSearchModeChanged: {
+        if (searchMode === "files") {
+            appLauncher.keyboardNavigationActive = false
+        } else {
+            fileSearchController.keyboardNavigationActive = false
+        }
     }
 
     anchors.fill: parent
@@ -27,59 +57,95 @@ Item {
 
                             event.accepted = true
                         } else if (event.key === Qt.Key_Down) {
-                            appLauncher.selectNext()
+                            if (searchMode === "apps") {
+                                appLauncher.selectNext()
+                            } else {
+                                fileSearchController.selectNext()
+                            }
                             event.accepted = true
                         } else if (event.key === Qt.Key_Up) {
-                            appLauncher.selectPrevious()
+                            if (searchMode === "apps") {
+                                appLauncher.selectPrevious()
+                            } else {
+                                fileSearchController.selectPrevious()
+                            }
                             event.accepted = true
-                        } else if (event.key === Qt.Key_Right && appLauncher.viewMode === "grid") {
+                        } else if (event.key === Qt.Key_Right && searchMode === "apps" && appLauncher.viewMode === "grid") {
                             appLauncher.selectNextInRow()
                             event.accepted = true
-                        } else if (event.key === Qt.Key_Left && appLauncher.viewMode === "grid") {
+                        } else if (event.key === Qt.Key_Left && searchMode === "apps" && appLauncher.viewMode === "grid") {
                             appLauncher.selectPreviousInRow()
                             event.accepted = true
                         } else if (event.key == Qt.Key_J && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectNext()
+                            if (searchMode === "apps") {
+                                appLauncher.selectNext()
+                            } else {
+                                fileSearchController.selectNext()
+                            }
                             event.accepted = true
                         } else if (event.key == Qt.Key_K && event.modifiers & Qt.ControlModifier) {
-                            appLauncher.selectPrevious()
+                            if (searchMode === "apps") {
+                                appLauncher.selectPrevious()
+                            } else {
+                                fileSearchController.selectPrevious()
+                            }
                             event.accepted = true
-                        } else if (event.key == Qt.Key_L && event.modifiers & Qt.ControlModifier && appLauncher.viewMode === "grid") {
+                        } else if (event.key == Qt.Key_L && event.modifiers & Qt.ControlModifier && searchMode === "apps" && appLauncher.viewMode === "grid") {
                             appLauncher.selectNextInRow()
                             event.accepted = true
-                        } else if (event.key == Qt.Key_H && event.modifiers & Qt.ControlModifier && appLauncher.viewMode === "grid") {
+                        } else if (event.key == Qt.Key_H && event.modifiers & Qt.ControlModifier && searchMode === "apps" && appLauncher.viewMode === "grid") {
                             appLauncher.selectPreviousInRow()
                             event.accepted = true
                         } else if (event.key === Qt.Key_Tab) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectNextInRow()
+                            if (searchMode === "apps") {
+                                if (appLauncher.viewMode === "grid") {
+                                    appLauncher.selectNextInRow()
+                                } else {
+                                    appLauncher.selectNext()
+                                }
                             } else {
-                                appLauncher.selectNext()
+                                fileSearchController.selectNext()
                             }
                             event.accepted = true
                         } else if (event.key === Qt.Key_Backtab) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectPreviousInRow()
+                            if (searchMode === "apps") {
+                                if (appLauncher.viewMode === "grid") {
+                                    appLauncher.selectPreviousInRow()
+                                } else {
+                                    appLauncher.selectPrevious()
+                                }
                             } else {
-                                appLauncher.selectPrevious()
+                                fileSearchController.selectPrevious()
                             }
                             event.accepted = true
                         } else if (event.key === Qt.Key_N && event.modifiers & Qt.ControlModifier) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectNextInRow()
+                            if (searchMode === "apps") {
+                                if (appLauncher.viewMode === "grid") {
+                                    appLauncher.selectNextInRow()
+                                } else {
+                                    appLauncher.selectNext()
+                                }
                             } else {
-                                appLauncher.selectNext()
+                                fileSearchController.selectNext()
                             }
                             event.accepted = true
                         } else if (event.key === Qt.Key_P && event.modifiers & Qt.ControlModifier) {
-                            if (appLauncher.viewMode === "grid") {
-                                appLauncher.selectPreviousInRow()
+                            if (searchMode === "apps") {
+                                if (appLauncher.viewMode === "grid") {
+                                    appLauncher.selectPreviousInRow()
+                                } else {
+                                    appLauncher.selectPrevious()
+                                }
                             } else {
-                                appLauncher.selectPrevious()
+                                fileSearchController.selectPrevious()
                             }
                             event.accepted = true
                         } else if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                            appLauncher.launchSelected()
+                            if (searchMode === "apps") {
+                                appLauncher.launchSelected()
+                            } else if (searchMode === "files") {
+                                fileSearchController.openSelected()
+                            }
                             event.accepted = true
                         }
                     }
@@ -98,6 +164,15 @@ Item {
                             }
     }
 
+    FileSearchController {
+        id: fileSearchController
+
+        onFileOpened: () => {
+                          if (parentModal)
+                          parentModal.hide()
+                      }
+    }
+
     Column {
         anchors.fill: parent
         anchors.margins: Theme.spacingM
@@ -118,7 +193,7 @@ Item {
                 backgroundColor: Theme.surfaceContainerHigh
                 normalBorderColor: Theme.outlineMedium
                 focusedBorderColor: Theme.primary
-                leftIconName: "search"
+                leftIconName: searchMode === "files" ? "folder" : "search"
                 leftIconSize: Theme.iconSize
                 leftIconColor: Theme.surfaceVariantText
                 leftIconFocusedColor: Theme.primary
@@ -126,14 +201,18 @@ Item {
                 textColor: Theme.surfaceText
                 font.pixelSize: Theme.fontSizeLarge
                 enabled: parentModal ? parentModal.spotlightOpen : true
-                placeholderText: ""
+                placeholderText: searchMode === "files" ? "Search files..." : "Search apps..."
                 ignoreLeftRightKeys: appLauncher.viewMode !== "list"
                 ignoreTabKeys: true
                 keyForwardTargets: [spotlightKeyHandler]
-                text: appLauncher.searchQuery
-                onTextEdited: () => {
-                                  appLauncher.searchQuery = text
-                              }
+                onTextChanged: {
+                    if (searchMode === "apps") {
+                        appLauncher.searchQuery = text
+                    }
+                }
+                onTextEdited: {
+                    updateSearchMode()
+                }
                 Keys.onPressed: event => {
                                     if (event.key === Qt.Key_Escape) {
                                         if (parentModal)
@@ -141,12 +220,18 @@ Item {
 
                                         event.accepted = true
                                     } else if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length > 0) {
-                                        if (appLauncher.keyboardNavigationActive && appLauncher.model.count > 0)
-                                        appLauncher.launchSelected()
-                                        else if (appLauncher.model.count > 0)
-                                        appLauncher.launchApp(appLauncher.model.get(0))
+                                        if (searchMode === "apps") {
+                                            if (appLauncher.keyboardNavigationActive && appLauncher.model.count > 0)
+                                            appLauncher.launchSelected()
+                                            else if (appLauncher.model.count > 0)
+                                            appLauncher.launchApp(appLauncher.model.get(0))
+                                        } else if (searchMode === "files") {
+                                            if (fileSearchController.model.count > 0)
+                                            fileSearchController.openSelected()
+                                        }
                                         event.accepted = true
-                                    } else if (event.key === Qt.Key_Down || event.key === Qt.Key_Up || event.key === Qt.Key_Left || event.key === Qt.Key_Right || event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab || ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length === 0)) {
+                                    } else if (event.key === Qt.Key_Down || event.key === Qt.Key_Up || event.key === Qt.Key_Left || event.key === Qt.Key_Right || event.key === Qt.Key_Tab || event.key
+                                               === Qt.Key_Backtab || ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && text.length === 0)) {
                                         event.accepted = false
                                     }
                                 }
@@ -154,7 +239,7 @@ Item {
 
             Row {
                 spacing: Theme.spacingXS
-                visible: appLauncher.model.count > 0
+                visible: searchMode === "apps" && appLauncher.model.count > 0
                 anchors.verticalCenter: parent.verticalCenter
 
                 Rectangle {
@@ -207,12 +292,116 @@ Item {
                     }
                 }
             }
+
+            Row {
+                spacing: Theme.spacingXS
+                visible: searchMode === "files"
+                anchors.verticalCenter: parent.verticalCenter
+
+                Rectangle {
+                    id: filenameFilterButton
+
+                    width: 36
+                    height: 36
+                    radius: Theme.cornerRadius
+                    color: fileSearchController.searchField === "filename" ? Theme.primaryHover : filenameFilterArea.containsMouse ? Theme.surfaceHover : "transparent"
+
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: "title"
+                        size: 18
+                        color: fileSearchController.searchField === "filename" ? Theme.primary : Theme.surfaceText
+                    }
+
+                    MouseArea {
+                        id: filenameFilterArea
+
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: () => {
+                                       fileSearchController.searchField = "filename"
+                                   }
+                        onEntered: {
+                            filenameTooltipLoader.active = true
+                            Qt.callLater(() => {
+                                             if (filenameTooltipLoader.item) {
+                                                 const p = mapToItem(null, width / 2, height + Theme.spacingXS)
+                                                 filenameTooltipLoader.item.show(I18n.tr("Search filenames"), p.x, p.y, null)
+                                             }
+                                         })
+                        }
+                        onExited: {
+                            if (filenameTooltipLoader.item)
+                                filenameTooltipLoader.item.hide()
+
+                            filenameTooltipLoader.active = false
+                        }
+                    }
+                }
+
+                Rectangle {
+                    id: contentFilterButton
+
+                    width: 36
+                    height: 36
+                    radius: Theme.cornerRadius
+                    color: fileSearchController.searchField === "body" ? Theme.primaryHover : contentFilterArea.containsMouse ? Theme.surfaceHover : "transparent"
+
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: "description"
+                        size: 18
+                        color: fileSearchController.searchField === "body" ? Theme.primary : Theme.surfaceText
+                    }
+
+                    MouseArea {
+                        id: contentFilterArea
+
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: () => {
+                                       fileSearchController.searchField = "body"
+                                   }
+                        onEntered: {
+                            contentTooltipLoader.active = true
+                            Qt.callLater(() => {
+                                             if (contentTooltipLoader.item) {
+                                                 const p = mapToItem(null, width / 2, height + Theme.spacingXS)
+                                                 contentTooltipLoader.item.show(I18n.tr("Search file contents"), p.x, p.y, null)
+                                             }
+                                         })
+                        }
+                        onExited: {
+                            if (contentTooltipLoader.item)
+                                contentTooltipLoader.item.hide()
+
+                            contentTooltipLoader.active = false
+                        }
+                    }
+                }
+            }
         }
 
-        SpotlightResults {
-            id: resultsView
-            appLauncher: spotlightKeyHandler.appLauncher
-            contextMenu: contextMenu
+        Item {
+            width: parent.width
+            height: parent.height - y
+
+            SpotlightResults {
+                id: resultsView
+                anchors.fill: parent
+                appLauncher: spotlightKeyHandler.appLauncher
+                contextMenu: contextMenu
+                visible: searchMode === "apps"
+            }
+
+            FileSearchResults {
+                id: fileSearchResults
+                anchors.fill: parent
+                fileSearchController: spotlightKeyHandler.fileSearchController
+                visible: searchMode === "files"
+            }
         }
     }
 
@@ -233,7 +422,6 @@ Item {
 
         MouseArea {
 
-            // Prevent closing when clicking on the menu itself
             x: contextMenu.x
             y: contextMenu.y
             width: contextMenu.width
@@ -241,4 +429,18 @@ Item {
             onClicked: () => {}
         }
     }
+
+    Loader {
+        id: filenameTooltipLoader
+
+        active: false
+        sourceComponent: DankTooltip {}
+    }
+
+    Loader {
+        id: contentTooltipLoader
+
+        active: false
+        sourceComponent: DankTooltip {}
+    }
 }

Modals/Spotlight/SpotlightModal.qml

@@ -20,10 +20,10 @@ DankModal {
         open()
 
         Qt.callLater(() => {
-            if (spotlightContent && spotlightContent.searchField) {
-                spotlightContent.searchField.forceActiveFocus()
-            }
-        })
+                         if (spotlightContent && spotlightContent.searchField) {
+                             spotlightContent.searchField.forceActiveFocus()
+                         }
+                     })
     }
 
     function showWithQuery(query) {
@@ -40,10 +40,10 @@ DankModal {
         open()
 
         Qt.callLater(() => {
-            if (spotlightContent && spotlightContent.searchField) {
-                spotlightContent.searchField.forceActiveFocus()
-            }
-        })
+                         if (spotlightContent && spotlightContent.searchField) {
+                             spotlightContent.searchField.forceActiveFocus()
+                         }
+                     })
     }
 
     function hide() {
@@ -58,6 +58,9 @@ DankModal {
                 spotlightContent.appLauncher.selectedIndex = 0
                 spotlightContent.appLauncher.setCategory(I18n.tr("All"))
             }
+            if (spotlightContent.fileSearchController) {
+                spotlightContent.fileSearchController.reset()
+            }
             if (spotlightContent.resetScroll) {
                 spotlightContent.resetScroll()
             }
@@ -111,17 +114,17 @@ DankModal {
     }
 
     IpcHandler {
-        function open(): string  {
+        function open(): string {
             spotlightModal.show()
             return "SPOTLIGHT_OPEN_SUCCESS"
         }
 
-        function close(): string  {
+        function close(): string {
             spotlightModal.hide()
             return "SPOTLIGHT_CLOSE_SUCCESS"
         }
 
-        function toggle(): string  {
+        function toggle(): string {
             spotlightModal.toggle()
             return "SPOTLIGHT_TOGGLE_SUCCESS"
         }

Modals/Spotlight/SpotlightResults.qml

@@ -7,10 +7,6 @@ import qs.Widgets
 Rectangle {
     id: resultsContainer
 
-    // DEVELOPER NOTE: This component renders the Spotlight launcher (accessed via Mod+Space).
-    // Changes to launcher behavior, especially item rendering, filtering, or model structure,
-    // likely require corresponding updates in Modules/AppDrawer/AppLauncher.qml and vice versa.
-
     property var appLauncher: null
     property var contextMenu: null
 
@@ -19,8 +15,6 @@ Rectangle {
         resultsGrid.contentY = 0
     }
 
-    width: parent.width
-    height: parent.height - y
     radius: Theme.cornerRadius
     color: "transparent"
     clip: true
@@ -79,115 +73,22 @@ Rectangle {
                                        appLauncher.keyboardNavigationActive = false
                                    }
 
-        delegate: Rectangle {
-            width: ListView.view.width
-            height: resultsList.itemHeight
-            radius: Theme.cornerRadius
-            color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-            Row {
-                anchors.fill: parent
-                anchors.margins: Theme.spacingM
-                spacing: Theme.spacingL
-
-                Item {
-                    width: resultsList.iconSize
-                    height: resultsList.iconSize
-                    anchors.verticalCenter: parent.verticalCenter
-                    visible: model.icon !== undefined && model.icon !== ""
-
-                    property string iconValue: model.icon || ""
-                    property bool isMaterial: iconValue.indexOf("material:") === 0
-                    property string materialName: isMaterial ? iconValue.substring(9) : ""
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: parent.materialName
-                        size: resultsList.iconSize
-                        color: Theme.surfaceText
-                        visible: parent.isMaterial
-                    }
-
-                    IconImage {
-                        id: listIconImg
-
-                        anchors.fill: parent
-                        source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
-                        asynchronous: true
-                        visible: !parent.isMaterial && status === Image.Ready
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !parent.isMaterial && !listIconImg.visible
-                        color: Theme.surfaceLight
-                        radius: Theme.cornerRadius
-                        border.width: 1
-                        border.color: Theme.primarySelected
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                            font.pixelSize: resultsList.iconSize * 0.4
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                        }
-                    }
-                }
-
-                Column {
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: (model.icon !== undefined && model.icon !== "") ? (parent.width - resultsList.iconSize - Theme.spacingL) : parent.width
-                    spacing: Theme.spacingXS
-
-                    StyledText {
-                        width: parent.width
-                        text: model.name || ""
-                        font.pixelSize: Theme.fontSizeLarge
-                        color: Theme.surfaceText
-                        font.weight: Font.Medium
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
-                        maximumLineCount: 1
-                    }
-
-                    StyledText {
-                        width: parent.width
-                        text: model.comment || "Application"
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceVariantText
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                        visible: resultsList.showDescription && model.comment && model.comment.length > 0
-                    }
-                }
-            }
-
-            MouseArea {
-                id: listMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                z: 10
-                onEntered: () => {
-                               if (resultsList.hoverUpdatesSelection && !resultsList.keyboardNavigationActive)
-                               resultsList.currentIndex = index
-                           }
-                onPositionChanged: () => {
-                                       resultsList.keyboardNavigationReset()
-                                   }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   resultsList.itemClicked(index, model)
-                               } else if (mouse.button === Qt.RightButton && !model.isPlugin) {
-                                   const globalPos = mapToItem(null, mouse.x, mouse.y)
-                                   const modalPos = resultsContainer.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                   resultsList.itemRightClicked(index, model, modalPos.x, modalPos.y)
-                               }
-                           }
+        delegate: AppLauncherListDelegate {
+            listView: resultsList
+            itemHeight: resultsList.itemHeight
+            iconSize: resultsList.iconSize
+            showDescription: resultsList.showDescription
+            hoverUpdatesSelection: resultsList.hoverUpdatesSelection
+            keyboardNavigationActive: resultsList.keyboardNavigationActive
+            isCurrentItem: ListView.isCurrentItem
+            iconMaterialSizeAdjustment: 0
+            iconUnicodeScale: 0.8
+            onItemClicked: (idx, modelData) => resultsList.itemClicked(idx, modelData)
+            onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
+                const modalPos = resultsContainer.parent.mapFromItem(null, mouseX, mouseY)
+                resultsList.itemRightClicked(idx, modelData, modalPos.x, modalPos.y)
             }
+            onKeyboardNavigationReset: resultsList.keyboardNavigationReset
         }
     }
 
@@ -256,103 +157,23 @@ Rectangle {
                                        appLauncher.keyboardNavigationActive = false
                                    }
 
-        delegate: Rectangle {
-            width: resultsGrid.cellWidth - resultsGrid.cellPadding
-            height: resultsGrid.cellHeight - resultsGrid.cellPadding
-            radius: Theme.cornerRadius
-            color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-            Column {
-                anchors.centerIn: parent
-                spacing: Theme.spacingS
-
-                Item {
-                    property int iconSize: Math.min(resultsGrid.maxIconSize, Math.max(resultsGrid.minIconSize, resultsGrid.cellWidth * resultsGrid.iconSizeRatio))
-
-                    width: iconSize
-                    height: iconSize
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    visible: model.icon !== undefined && model.icon !== ""
-
-                    property string iconValue: model.icon || ""
-                    property bool isMaterial: iconValue.indexOf("material:") === 0
-                    property string materialName: isMaterial ? iconValue.substring(9) : ""
-
-                    DankIcon {
-                        anchors.centerIn: parent
-                        name: parent.materialName
-                        size: parent.iconSize
-                        color: Theme.surfaceText
-                        visible: parent.isMaterial
-                    }
-
-                    IconImage {
-                        id: gridIconImg
-
-                        anchors.fill: parent
-                        source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
-                        smooth: true
-                        asynchronous: true
-                        visible: !parent.isMaterial && status === Image.Ready
-                    }
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !parent.isMaterial && !gridIconImg.visible
-                        color: Theme.surfaceLight
-                        radius: Theme.cornerRadius
-                        border.width: 1
-                        border.color: Theme.primarySelected
-
-                        StyledText {
-                            anchors.centerIn: parent
-                            text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                            font.pixelSize: Math.min(28, parent.width * 0.5)
-                            color: Theme.primary
-                            font.weight: Font.Bold
-                        }
-                    }
-                }
-
-                StyledText {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    width: resultsGrid.cellWidth - 12
-                    text: model.name || ""
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    elide: Text.ElideRight
-                    horizontalAlignment: Text.AlignHCenter
-                    maximumLineCount: 1
-                    wrapMode: Text.NoWrap
-                }
-            }
-
-            MouseArea {
-                id: gridMouseArea
-
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                z: 10
-                onEntered: () => {
-                               if (resultsGrid.hoverUpdatesSelection && !resultsGrid.keyboardNavigationActive)
-                               resultsGrid.currentIndex = index
-                           }
-                onPositionChanged: () => {
-                                       resultsGrid.keyboardNavigationReset()
-                                   }
-                onClicked: mouse => {
-                               if (mouse.button === Qt.LeftButton) {
-                                   resultsGrid.itemClicked(index, model)
-                               } else if (mouse.button === Qt.RightButton && !model.isPlugin) {
-                                   const globalPos = mapToItem(null, mouse.x, mouse.y)
-                                   const modalPos = resultsContainer.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                   resultsGrid.itemRightClicked(index, model, modalPos.x, modalPos.y)
-                               }
-                           }
+        delegate: AppLauncherGridDelegate {
+            gridView: resultsGrid
+            cellWidth: resultsGrid.cellWidth
+            cellHeight: resultsGrid.cellHeight
+            cellPadding: resultsGrid.cellPadding
+            minIconSize: resultsGrid.minIconSize
+            maxIconSize: resultsGrid.maxIconSize
+            iconSizeRatio: resultsGrid.iconSizeRatio
+            hoverUpdatesSelection: resultsGrid.hoverUpdatesSelection
+            keyboardNavigationActive: resultsGrid.keyboardNavigationActive
+            currentIndex: resultsGrid.currentIndex
+            onItemClicked: (idx, modelData) => resultsGrid.itemClicked(idx, modelData)
+            onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
+                const modalPos = resultsContainer.parent.mapFromItem(null, mouseX, mouseY)
+                resultsGrid.itemRightClicked(idx, modelData, modalPos.x, modalPos.y)
             }
+            onKeyboardNavigationReset: resultsGrid.keyboardNavigationReset
         }
     }
 }

Modules/AppDrawer/AppDrawerPopout.qml

@@ -389,124 +389,27 @@ DankPopout {
                                 appLauncher.keyboardNavigationActive = false
                             }
 
-                            delegate: Rectangle {
-                                width: ListView.view.width
-                                height: appList.itemHeight
-                                radius: Theme.cornerRadius
-                                color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-                                Row {
-                                    anchors.fill: parent
-                                    anchors.margins: Theme.spacingM
-                                    spacing: Theme.spacingL
-
-                                    Item {
-                                        width: appList.iconSize
-                                        height: appList.iconSize
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        visible: model.icon !== undefined && model.icon !== ""
-
-                                        property string iconValue: model.icon || ""
-                                        property bool isMaterial: iconValue.indexOf("material:") === 0
-                                        property string materialName: isMaterial ? iconValue.substring(9) : ""
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            name: parent.materialName
-                                            size: appList.iconSize - Theme.spacingM
-                                            color: Theme.surfaceText
-                                            visible: parent.isMaterial
-                                        }
-
-                                        IconImage {
-                                            id: listIconImg
-
-                                            anchors.fill: parent
-                                            anchors.margins: Theme.spacingXS
-                                            source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
-                                            smooth: true
-                                            asynchronous: true
-                                            visible: !parent.isMaterial && status === Image.Ready
-                                        }
-
-                                        Rectangle {
-                                            anchors.fill: parent
-                                            anchors.leftMargin: Theme.spacingS
-                                            anchors.rightMargin: Theme.spacingS
-                                            anchors.bottomMargin: Theme.spacingM
-                                            visible: !parent.isMaterial && listIconImg.status !== Image.Ready
-                                            color: Theme.surfaceLight
-                                            radius: Theme.cornerRadius
-                                            border.width: 0
-                                            border.color: Theme.primarySelected
-
-                                            StyledText {
-                                                anchors.centerIn: parent
-                                                text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                                                font.pixelSize: appList.iconSize * 0.4
-                                                color: Theme.primary
-                                                font.weight: Font.Bold
-                                            }
-                                        }
-
-                                    }
-
-                                    Column {
-                                        anchors.verticalCenter: parent.verticalCenter
-                                        width: (model.icon !== undefined && model.icon !== "") ? (parent.width - appList.iconSize - Theme.spacingL) : parent.width
-                                        spacing: Theme.spacingXS
-
-                                        StyledText {
-                                            width: parent.width
-                                            text: model.name || ""
-                                            font.pixelSize: Theme.fontSizeLarge
-                                            color: Theme.surfaceText
-                                            font.weight: Font.Medium
-                                            elide: Text.ElideRight
-                                            wrapMode: Text.NoWrap
-                                            maximumLineCount: 1
-                                        }
-
-                                        StyledText {
-                                            width: parent.width
-                                            text: model.comment || "Application"
-                                            font.pixelSize: Theme.fontSizeMedium
-                                            color: Theme.surfaceVariantText
-                                            elide: Text.ElideRight
-                                            maximumLineCount: 1
-                                            visible: appList.showDescription && model.comment && model.comment.length > 0
-                                        }
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: listMouseArea
-
-                                    anchors.fill: parent
-                                    anchors.leftMargin: Theme.spacingS
-                                    anchors.rightMargin: Theme.spacingS
-                                    anchors.bottomMargin: Theme.spacingM
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                                    z: 10
-                                    onEntered: {
-                                        if (appList.hoverUpdatesSelection && !appList.keyboardNavigationActive)
-                                            appList.currentIndex = index
-                                    }
-                                    onPositionChanged: {
-                                        appList.keyboardNavigationReset()
-                                    }
-                                    onClicked: mouse => {
-                                                   if (mouse.button === Qt.LeftButton) {
-                                                       appList.itemClicked(index, model)
-                                                   } else if (mouse.button === Qt.RightButton) {
-                                                       var globalPos = mapToItem(null, mouse.x, mouse.y)
-                                                       var panelPos = contextMenu.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                                       appList.itemRightClicked(index, model, panelPos.x, panelPos.y)
-                                                   }
-                                               }
+                            delegate: AppLauncherListDelegate {
+                                listView: appList
+                                itemHeight: appList.itemHeight
+                                iconSize: appList.iconSize
+                                showDescription: appList.showDescription
+                                hoverUpdatesSelection: appList.hoverUpdatesSelection
+                                keyboardNavigationActive: appList.keyboardNavigationActive
+                                isCurrentItem: ListView.isCurrentItem
+                                mouseAreaLeftMargin: Theme.spacingS
+                                mouseAreaRightMargin: Theme.spacingS
+                                mouseAreaBottomMargin: Theme.spacingM
+                                iconMargins: Theme.spacingXS
+                                iconFallbackLeftMargin: Theme.spacingS
+                                iconFallbackRightMargin: Theme.spacingS
+                                iconFallbackBottomMargin: Theme.spacingM
+                                onItemClicked: (idx, modelData) => appList.itemClicked(idx, modelData)
+                                onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
+                                    const panelPos = contextMenu.parent.mapFromItem(null, mouseX, mouseY)
+                                    appList.itemRightClicked(idx, modelData, panelPos.x, panelPos.y)
                                 }
+                                onKeyboardNavigationReset: appList.keyboardNavigationReset
                             }
                         }
 
@@ -577,112 +480,30 @@ DankPopout {
                                 appLauncher.keyboardNavigationActive = false
                             }
 
-                            delegate: Rectangle {
-                                width: appGrid.cellWidth - appGrid.cellPadding
-                                height: appGrid.cellHeight - appGrid.cellPadding
-                                radius: Theme.cornerRadius
-                                color: appGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Theme.surfaceContainerHigh
-
-                                Column {
-                                    anchors.centerIn: parent
-                                    spacing: Theme.spacingS
-
-                                    Item {
-                                        property int iconSize: Math.min(appGrid.maxIconSize, Math.max(appGrid.minIconSize, appGrid.cellWidth * appGrid.iconSizeRatio))
-
-                                        width: iconSize
-                                        height: iconSize
-                                        anchors.horizontalCenter: parent.horizontalCenter
-                                        visible: model.icon !== undefined && model.icon !== ""
-
-                                        property string iconValue: model.icon || ""
-                                        property bool isMaterial: iconValue.indexOf("material:") === 0
-                                        property string materialName: isMaterial ? iconValue.substring(9) : ""
-
-                                        DankIcon {
-                                            anchors.centerIn: parent
-                                            name: parent.materialName
-                                            size: parent.iconSize - Theme.spacingL
-                                            color: Theme.surfaceText
-                                            visible: parent.isMaterial
-                                        }
-
-                                        IconImage {
-                                            id: gridIconImg
-
-                                            anchors.fill: parent
-                            anchors.leftMargin: Theme.spacingS
-                            anchors.rightMargin: Theme.spacingS
-                            anchors.bottomMargin: Theme.spacingS
-                                            source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
-                                            smooth: true
-                                            asynchronous: true
-                                            visible: !parent.isMaterial && status === Image.Ready
-                                        }
-
-                                        Rectangle {
-                                            anchors.fill: parent
-                            anchors.leftMargin: Theme.spacingS
-                            anchors.rightMargin: Theme.spacingS
-                            anchors.bottomMargin: Theme.spacingS
-                                            visible: !parent.isMaterial && gridIconImg.status !== Image.Ready
-                                            color: Theme.surfaceLight
-                                            radius: Theme.cornerRadius
-                                            border.width: 0
-                                            border.color: Theme.primarySelected
-
-                                            StyledText {
-                                                anchors.centerIn: parent
-                                                text: (model.name && model.name.length > 0) ? model.name.charAt(0).toUpperCase() : "A"
-                                                font.pixelSize: Math.min(28, parent.width * 0.5)
-                                                color: Theme.primary
-                                                font.weight: Font.Bold
-                                            }
-                                        }
-                                    }
-
-                                    StyledText {
-                                        anchors.horizontalCenter: parent.horizontalCenter
-                                        width: appGrid.cellWidth - 12
-                                        text: model.name || ""
-                                        font.pixelSize: Theme.fontSizeSmall
-                                        color: Theme.surfaceText
-                                        font.weight: Font.Medium
-                                        elide: Text.ElideRight
-                                        horizontalAlignment: Text.AlignHCenter
-                                        maximumLineCount: 1
-                                        wrapMode: Text.NoWrap
-                                    }
-                                }
-
-                                MouseArea {
-                                    id: gridMouseArea
-
-                                    anchors.fill: parent
-                            anchors.leftMargin: Theme.spacingS
-                            anchors.rightMargin: Theme.spacingS
-                            anchors.bottomMargin: Theme.spacingS
-                                    hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
-                                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                                    z: 10
-                                    onEntered: {
-                                        if (appGrid.hoverUpdatesSelection && !appGrid.keyboardNavigationActive)
-                                            appGrid.currentIndex = index
-                                    }
-                                    onPositionChanged: {
-                                        appGrid.keyboardNavigationReset()
-                                    }
-                                    onClicked: mouse => {
-                                                   if (mouse.button === Qt.LeftButton) {
-                                                       appGrid.itemClicked(index, model)
-                                                   } else if (mouse.button === Qt.RightButton) {
-                                                       var globalPos = mapToItem(null, mouse.x, mouse.y)
-                                                       var panelPos = contextMenu.parent.mapFromItem(null, globalPos.x, globalPos.y)
-                                                       appGrid.itemRightClicked(index, model, panelPos.x, panelPos.y)
-                                                   }
-                                               }
+                            delegate: AppLauncherGridDelegate {
+                                gridView: appGrid
+                                cellWidth: appGrid.cellWidth
+                                cellHeight: appGrid.cellHeight
+                                cellPadding: appGrid.cellPadding
+                                minIconSize: appGrid.minIconSize
+                                maxIconSize: appGrid.maxIconSize
+                                iconSizeRatio: appGrid.iconSizeRatio
+                                hoverUpdatesSelection: appGrid.hoverUpdatesSelection
+                                keyboardNavigationActive: appGrid.keyboardNavigationActive
+                                currentIndex: appGrid.currentIndex
+                                mouseAreaLeftMargin: Theme.spacingS
+                                mouseAreaRightMargin: Theme.spacingS
+                                mouseAreaBottomMargin: Theme.spacingS
+                                iconFallbackLeftMargin: Theme.spacingS
+                                iconFallbackRightMargin: Theme.spacingS
+                                iconFallbackBottomMargin: Theme.spacingS
+                                iconMaterialSizeAdjustment: Theme.spacingL
+                                onItemClicked: (idx, modelData) => appGrid.itemClicked(idx, modelData)
+                                onItemRightClicked: (idx, modelData, mouseX, mouseY) => {
+                                    const panelPos = contextMenu.parent.mapFromItem(null, mouseX, mouseY)
+                                    appGrid.itemRightClicked(idx, modelData, panelPos.x, panelPos.y)
                                 }
+                                onKeyboardNavigationReset: appGrid.keyboardNavigationReset
                             }
                         }
                     }

Modules/BlurredWallpaperBackground.qml

@@ -7,6 +7,7 @@ import Quickshell.Io
 import qs.Common
 import qs.Widgets
 import qs.Modules
+import qs.Services
 
 Variants {
     model: {
@@ -54,52 +55,90 @@ Variants {
             }
 
             function getFillMode(modeName) {
-                switch(modeName) {
-                    case "Stretch": return Image.Stretch
-                    case "Fit":
-                    case "PreserveAspectFit": return Image.PreserveAspectFit
-                    case "Fill":
-                    case "PreserveAspectCrop": return Image.PreserveAspectCrop
-                    case "Tile": return Image.Tile
-                    case "TileVertically": return Image.TileVertically
-                    case "TileHorizontally": return Image.TileHorizontally
-                    case "Pad": return Image.Pad
-                    default: return Image.PreserveAspectCrop
+                switch (modeName) {
+                case "Stretch":
+                    return Image.Stretch
+                case "Fit":
+                case "PreserveAspectFit":
+                    return Image.PreserveAspectFit
+                case "Fill":
+                case "PreserveAspectCrop":
+                    return Image.PreserveAspectCrop
+                case "Tile":
+                    return Image.Tile
+                case "TileVertically":
+                    return Image.TileVertically
+                case "TileHorizontally":
+                    return Image.TileHorizontally
+                case "Pad":
+                    return Image.Pad
+                default:
+                    return Image.PreserveAspectCrop
                 }
             }
 
-            WallpaperEngineProc {
-                id: weProc
-                monitor: modelData.name
-            }
-
             Component.onCompleted: {
                 if (source) {
                     const formattedSource = source.startsWith("file://") ? source : "file://" + source
-                    wallpaperImage.source = formattedSource
+                    setWallpaperImmediate(formattedSource)
+                }
+                isInitialized = true
+            }
+
+            property bool isInitialized: false
+            property real transitionProgress: 0
+            readonly property bool transitioning: transitionAnimation.running
+
+            onSourceChanged: {
+                const isColor = source.startsWith("#")
+
+                if (!source) {
+                    setWallpaperImmediate("")
+                } else if (isColor) {
+                    setWallpaperImmediate("")
+                } else {
+                    if (!isInitialized || !currentWallpaper.source) {
+                        setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
+                        isInitialized = true
+                    } else if (CompositorService.isNiri && SessionData.isSwitchingMode) {
+                        setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
+                    } else {
+                        changeWallpaper(source.startsWith("file://") ? source : "file://" + source)
+                    }
                 }
             }
 
-            Component.onDestruction: {
-                weProc.stop()
+            function setWallpaperImmediate(newSource) {
+                transitionAnimation.stop()
+                root.transitionProgress = 0.0
+                currentWallpaper.source = newSource
+                nextWallpaper.source = ""
+                currentWallpaper.opacity = 1
+                nextWallpaper.opacity = 0
             }
 
-            onSourceChanged: {
-                const isWE = source.startsWith("we:")
-                const isColor = source.startsWith("#")
+            function changeWallpaper(newPath) {
+                if (newPath === currentWallpaper.source)
+                    return
+                if (!newPath || newPath.startsWith("#"))
+                    return
 
-                if (isWE) {
-                    wallpaperImage.source = ""
-                    weProc.start(source.substring(3))
-                } else {
-                    weProc.stop()
-                    if (!source) {
-                        wallpaperImage.source = ""
-                    } else if (isColor) {
-                        wallpaperImage.source = ""
-                    } else {
-                        wallpaperImage.source = source.startsWith("file://") ? source : "file://" + source
-                    }
+                if (root.transitioning) {
+                    transitionAnimation.stop()
+                    root.transitionProgress = 0
+                    currentWallpaper.source = nextWallpaper.source
+                    nextWallpaper.source = ""
+                }
+
+                if (!currentWallpaper.source) {
+                    setWallpaperImmediate(newPath)
+                    return
+                }
+
+                nextWallpaper.source = newPath
+
+                if (nextWallpaper.status === Image.Ready) {
+                    transitionAnimation.start()
                 }
             }
 
@@ -114,21 +153,78 @@ Variants {
             }
 
             Image {
-                id: wallpaperImage
+                id: currentWallpaper
                 anchors.fill: parent
                 visible: false
+                opacity: 1
                 asynchronous: true
                 smooth: true
                 cache: true
-                fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
+                fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
             }
 
-            MultiEffect {
+            Image {
+                id: nextWallpaper
                 anchors.fill: parent
-                source: wallpaperImage
-                blurEnabled: true
-                blur: 0.8
-                blurMax: 48
+                visible: false
+                opacity: 0
+                asynchronous: true
+                smooth: true
+                cache: true
+                fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
+
+                onStatusChanged: {
+                    if (status !== Image.Ready)
+                        return
+
+                    if (!root.transitioning) {
+                        transitionAnimation.start()
+                    }
+                }
+            }
+
+            Item {
+                id: blurredLayer
+                anchors.fill: parent
+
+                MultiEffect {
+                    anchors.fill: parent
+                    source: currentWallpaper
+                    blurEnabled: true
+                    blur: 0.8
+                    blurMax: 75
+                    opacity: 1 - root.transitionProgress
+                }
+
+                MultiEffect {
+                    anchors.fill: parent
+                    source: nextWallpaper
+                    blurEnabled: true
+                    blur: 0.8
+                    blurMax: 75
+                    opacity: root.transitionProgress
+                }
+            }
+
+            NumberAnimation {
+                id: transitionAnimation
+                target: root
+                property: "transitionProgress"
+                from: 0.0
+                to: 1.0
+                duration: 1000
+                easing.type: Easing.InOutCubic
+                onFinished: {
+                    Qt.callLater(() => {
+                                     if (nextWallpaper.source && nextWallpaper.status === Image.Ready && !nextWallpaper.source.toString().startsWith("#")) {
+                                         currentWallpaper.source = nextWallpaper.source
+                                     }
+                                     nextWallpaper.source = ""
+                                     currentWallpaper.opacity = 1
+                                     nextWallpaper.opacity = 0
+                                     root.transitionProgress = 0.0
+                                 })
+                }
             }
         }
     }

Modules/ControlCenter/BuiltinPlugins/VpnWidget.qml

@@ -13,6 +13,7 @@ PluginComponent {
         service: DMSNetworkService
     }
 
+
     ccWidgetIcon: DMSNetworkService.isBusy ? "sync" : (DMSNetworkService.connected ? "vpn_lock" : "vpn_key_off")
     ccWidgetPrimaryText: "VPN"
     ccWidgetSecondaryText: {
@@ -26,11 +27,7 @@ PluginComponent {
     ccWidgetIsActive: DMSNetworkService.connected
 
     onCcWidgetToggled: {
-        if (DMSNetworkService.connected) {
-            DMSNetworkService.disconnectAllActive()
-        } else if (DMSNetworkService.profiles.length > 0) {
-            DMSNetworkService.connect(DMSNetworkService.profiles[0].uuid)
-        }
+        DMSNetworkService.toggleVpn()
     }
 
     ccDetailContent: Component {
@@ -62,10 +59,10 @@ PluginComponent {
                         font.pixelSize: Theme.fontSizeMedium
                         color: Theme.surfaceText
                         font.weight: Font.Medium
-                    }
-
-                    Item {
+                        elide: Text.ElideRight
+                        wrapMode: Text.NoWrap
                         Layout.fillWidth: true
+                        Layout.maximumWidth: parent.width - 120
                     }
 
                     Rectangle {
@@ -75,6 +72,7 @@ PluginComponent {
                         visible: DMSNetworkService.connected
                         width: 110
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                        opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
 
                         Row {
                             anchors.centerIn: parent
@@ -98,7 +96,8 @@ PluginComponent {
                             id: discAllArea
                             anchors.fill: parent
                             hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
+                            cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
+                            enabled: !DMSNetworkService.isBusy
                             onClicked: DMSNetworkService.disconnectAllActive()
                         }
                     }
@@ -165,6 +164,7 @@ PluginComponent {
                                 color: rowArea.containsMouse ? Theme.primaryHoverLight : (DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primaryPressed : Theme.surfaceLight)
                                 border.width: DMSNetworkService.isActiveUuid(modelData.uuid) ? 2 : 1
                                 border.color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.outlineLight
+                                opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
 
                                 RowLayout {
                                     anchors.left: parent.left
@@ -183,11 +183,15 @@ PluginComponent {
                                     Column {
                                         spacing: 2
                                         Layout.alignment: Qt.AlignVCenter
+                                        Layout.fillWidth: true
 
                                         StyledText {
                                             text: modelData.name
                                             font.pixelSize: Theme.fontSizeMedium
                                             color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.surfaceText
+                                            elide: Text.ElideRight
+                                            wrapMode: Text.NoWrap
+                                            width: parent.width
                                         }
 
                                         StyledText {
@@ -233,7 +237,8 @@ PluginComponent {
                                     id: rowArea
                                     anchors.fill: parent
                                     hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
+                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
+                                    enabled: !DMSNetworkService.isBusy
                                     onClicked: DMSNetworkService.toggle(modelData.uuid)
                                 }
                             }

Modules/ControlCenter/Components/DragDropGrid.qml

@@ -219,9 +219,13 @@ Column {
                 {
                     if (NetworkService.wifiToggling)
                         return "sync"
-                    if (NetworkService.networkStatus === "ethernet")
+
+                    const status = NetworkService.networkStatus
+                    if (status === "ethernet")
                         return "settings_ethernet"
-                    if (NetworkService.networkStatus === "wifi")
+                    if (status === "vpn")
+                        return NetworkService.ethernetConnected ? "settings_ethernet" : NetworkService.wifiSignalIcon
+                    if (status === "wifi")
                         return NetworkService.wifiSignalIcon
                     if (NetworkService.wifiEnabled)
                         return "wifi_off"
@@ -266,9 +270,17 @@ Column {
                 {
                     if (NetworkService.wifiToggling)
                         return NetworkService.wifiEnabled ? "Disabling WiFi..." : "Enabling WiFi..."
-                    if (NetworkService.networkStatus === "ethernet")
+
+                    const status = NetworkService.networkStatus
+                    if (status === "ethernet")
                         return "Ethernet"
-                    if (NetworkService.networkStatus === "wifi" && NetworkService.currentWifiSSID)
+                    if (status === "vpn") {
+                        if (NetworkService.ethernetConnected)
+                            return "Ethernet"
+                        if (NetworkService.wifiConnected && NetworkService.currentWifiSSID)
+                            return NetworkService.currentWifiSSID
+                    }
+                    if (status === "wifi" && NetworkService.currentWifiSSID)
                         return NetworkService.currentWifiSSID
                     if (NetworkService.wifiEnabled)
                         return "Not connected"
@@ -298,9 +310,17 @@ Column {
                 {
                     if (NetworkService.wifiToggling)
                         return "Please wait..."
-                    if (NetworkService.networkStatus === "ethernet")
+
+                    const status = NetworkService.networkStatus
+                    if (status === "ethernet")
                         return "Connected"
-                    if (NetworkService.networkStatus === "wifi")
+                    if (status === "vpn") {
+                        if (NetworkService.ethernetConnected)
+                            return "Connected"
+                        if (NetworkService.wifiConnected)
+                            return NetworkService.wifiSignalStrength > 0 ? NetworkService.wifiSignalStrength + "%" : "Connected"
+                    }
+                    if (status === "wifi")
                         return NetworkService.wifiSignalStrength > 0 ? NetworkService.wifiSignalStrength + "%" : "Connected"
                     if (NetworkService.wifiEnabled)
                         return "Select network"
@@ -358,9 +378,13 @@ Column {
                 {
                     if (NetworkService.wifiToggling)
                         return false
-                    if (NetworkService.networkStatus === "ethernet")
+
+                    const status = NetworkService.networkStatus
+                    if (status === "ethernet")
                         return true
-                    if (NetworkService.networkStatus === "wifi")
+                    if (status === "vpn")
+                        return NetworkService.ethernetConnected || NetworkService.wifiConnected
+                    if (status === "wifi")
                         return true
                     return NetworkService.wifiEnabled
                 }

Modules/ControlCenter/Details/BrightnessDetail.qml

@@ -47,6 +47,16 @@ Rectangle {
             }
         }
 
+        const backlight = DisplayService.devices.find(d => d.class === "backlight")
+        if (backlight) {
+            return backlight.name
+        }
+
+        const ddc = DisplayService.devices.find(d => d.class === "ddc")
+        if (ddc) {
+            return ddc.name
+        }
+
         return DisplayService.devices.length > 0 ? DisplayService.devices[0].name : ""
     }
 
@@ -224,8 +234,10 @@ Rectangle {
 
                                     if (deviceClass === "backlight" || deviceClass === "ddc") {
                                         const brightness = DisplayService.getDeviceBrightness(modelData.name)
-                                        if (brightness <= 33) return "brightness_low"
-                                        if (brightness <= 66) return "brightness_medium"
+                                        if (brightness <= 33)
+                                            return "brightness_low"
+                                        if (brightness <= 66)
+                                            return "brightness_medium"
                                         return "brightness_high"
                                     } else if (deviceName.includes("kbd")) {
                                         return "keyboard"
@@ -277,9 +289,12 @@ Rectangle {
                             StyledText {
                                 text: {
                                     const deviceClass = modelData.class || ""
-                                    if (deviceClass === "backlight") return "Backlight device"
-                                    if (deviceClass === "ddc") return "DDC/CI monitor"
-                                    if (deviceClass === "leds") return "LED device"
+                                    if (deviceClass === "backlight")
+                                        return "Backlight device"
+                                    if (deviceClass === "ddc")
+                                        return "DDC/CI monitor"
+                                    if (deviceClass === "leds")
+                                        return "LED device"
                                     return deviceClass
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
@@ -295,11 +310,17 @@ Rectangle {
                         hoverEnabled: true
                         cursorShape: Qt.PointingHandCursor
                         onClicked: {
+                            if (screenName && screenName.length > 0 && modelData.name !== currentDeviceName) {
+                                const pins = JSON.parse(JSON.stringify(SettingsData.brightnessDevicePins || {}))
+                                if (pins[screenName]) {
+                                    delete pins[screenName]
+                                    SettingsData.setBrightnessDevicePins(pins)
+                                }
+                            }
                             currentDeviceName = modelData.name
                             deviceNameChanged(modelData.name)
                         }
                     }
-
                 }
             }
         }

Modules/ControlCenter/Details/NetworkDetail.qml

@@ -376,6 +376,9 @@ Rectangle {
         contentHeight: wifiColumn.height
         clip: true
 
+        property var frozenNetworks: []
+        property bool menuOpen: false
+
         Column {
             id: wifiColumn
             width: parent.width
@@ -403,7 +406,7 @@ Rectangle {
             }
 
             Repeater {
-                model: sortedNetworks
+                model: wifiContent.menuOpen ? wifiContent.frozenNetworks : sortedNetworks
 
                 property var sortedNetworks: {
                     const ssid = NetworkService.currentWifiSSID
@@ -414,6 +417,9 @@ Rectangle {
                         if (b.ssid === ssid) return 1
                         return b.signal - a.signal
                     })
+                    if (!wifiContent.menuOpen) {
+                        wifiContent.frozenNetworks = sorted
+                    }
                     return sorted
                 }
                 delegate: Rectangle {
@@ -494,11 +500,13 @@ Rectangle {
                             if (networkContextMenu.visible) {
                                 networkContextMenu.close()
                             } else {
+                                wifiContent.menuOpen = true
                                 networkContextMenu.currentSSID = modelData.ssid
                                 networkContextMenu.currentSecured = modelData.secured
                                 networkContextMenu.currentConnected = modelData.ssid === NetworkService.currentWifiSSID
                                 networkContextMenu.currentSaved = modelData.saved
                                 networkContextMenu.currentSignal = modelData.signal
+                                networkContextMenu.currentAutoconnect = modelData.autoconnect || false
                                 networkContextMenu.popup(optionsButton, -networkContextMenu.width + optionsButton.width, optionsButton.height + Theme.spacingXS)
                             }
                         }
@@ -541,6 +549,11 @@ Rectangle {
         property bool currentConnected: false
         property bool currentSaved: false
         property int currentSignal: 0
+        property bool currentAutoconnect: false
+
+        onClosed: {
+            wifiContent.menuOpen = false
+        }
 
         background: Rectangle {
             color: Theme.popupBackground()
@@ -606,6 +619,29 @@ Rectangle {
             }
         }
 
+        MenuItem {
+            text: networkContextMenu.currentAutoconnect ? I18n.tr("Disable Autoconnect") : I18n.tr("Enable Autoconnect")
+            height: (networkContextMenu.currentSaved || networkContextMenu.currentConnected) && DMSService.apiVersion > 13 ? 32 : 0
+            visible: (networkContextMenu.currentSaved || networkContextMenu.currentConnected) && DMSService.apiVersion > 13
+
+            contentItem: StyledText {
+                text: parent.text
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.surfaceText
+                leftPadding: Theme.spacingS
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            background: Rectangle {
+                color: parent.hovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : "transparent"
+                radius: Theme.cornerRadius / 2
+            }
+
+            onTriggered: {
+                NetworkService.setWifiAutoconnect(networkContextMenu.currentSSID, !networkContextMenu.currentAutoconnect)
+            }
+        }
+
         MenuItem {
             text: I18n.tr("Forget Network")
             height: networkContextMenu.currentSaved || networkContextMenu.currentConnected ? 32 : 0

Modules/ControlCenter/Widgets/BrightnessSliderRow.qml

@@ -13,7 +13,7 @@ Row {
     property string screenName: ""
     property var parentScreen: null
 
-    signal iconClicked()
+    signal iconClicked
 
     height: 40
     spacing: 0
@@ -36,13 +36,27 @@ Row {
 
         if (deviceName && deviceName.length > 0) {
             const found = DisplayService.devices.find(dev => dev.name === deviceName)
-            return found ? found.name : ""
+            if (found) {
+                return found.name
+            }
         }
 
         const currentDeviceName = DisplayService.currentDevice
         if (currentDeviceName) {
             const found = DisplayService.devices.find(dev => dev.name === currentDeviceName)
-            return found ? found.name : ""
+            if (found) {
+                return found.name
+            }
+        }
+
+        const backlight = DisplayService.devices.find(d => d.class === "backlight")
+        if (backlight) {
+            return backlight.name
+        }
+
+        const ddc = DisplayService.devices.find(d => d.class === "ddc")
+        if (ddc) {
+            return ddc.name
         }
 
         return DisplayService.devices.length > 0 ? DisplayService.devices[0].name : ""
@@ -69,9 +83,7 @@ Row {
         height: Theme.iconSize + Theme.spacingS * 2
         anchors.verticalCenter: parent.verticalCenter
         radius: (Theme.iconSize + Theme.spacingS * 2) / 2
-        color: iconArea.containsMouse
-               ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
-               : Theme.withAlpha(Theme.primary, 0)
+        color: iconArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.primary, 0)
 
         MouseArea {
             id: iconArea
@@ -112,8 +124,10 @@ Row {
 
                     if (targetDevice.class === "backlight" || targetDevice.class === "ddc") {
                         const brightness = targetBrightness
-                        if (brightness <= 33) return "brightness_low"
-                        if (brightness <= 66) return "brightness_medium"
+                        if (brightness <= 33)
+                            return "brightness_low"
+                        if (brightness <= 66)
+                            return "brightness_medium"
                         return "brightness_high"
                     } else if (targetDevice.name.includes("kbd")) {
                         return "keyboard"
@@ -131,10 +145,13 @@ Row {
         anchors.verticalCenter: parent.verticalCenter
         width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
         enabled: DisplayService.brightnessAvailable && targetDeviceName.length > 0
-        minimum: 1
+        minimum: {
+            if (!targetDevice) return 1
+            return (targetDevice.class === "backlight" || targetDevice.class === "ddc") ? 1 : 0
+        }
         maximum: 100
         value: targetBrightness
-        onSliderValueChanged: function(newValue) {
+        onSliderValueChanged: function (newValue) {
             if (DisplayService.brightnessAvailable && targetDeviceName) {
                 DisplayService.setBrightness(newValue, targetDeviceName, true)
             }
@@ -148,4 +165,4 @@ Row {
         active: false
         sourceComponent: DankTooltip {}
     }
-}
+}

Modules/DankBar/BarCanvas.qml

@@ -18,17 +18,7 @@ Item {
     anchors.topMargin: -(SettingsData.dankBarGothCornersEnabled && !axis.isVertical && axis.edge === "bottom" ? barWindow._wingR : 0)
     anchors.bottomMargin: -(SettingsData.dankBarGothCornersEnabled && !axis.isVertical && axis.edge === "top" ? barWindow._wingR : 0)
 
-    readonly property real dpr: {
-        if (CompositorService.isNiri && barWindow.screen) {
-            const niriScale = NiriService.displayScales[barWindow.screen.name]
-            if (niriScale !== undefined) return niriScale
-        }
-        if (CompositorService.isHyprland && barWindow.screen) {
-            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === barWindow.screen.name)
-            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
-        }
-        return barWindow.screen?.devicePixelRatio || 1
-    }
+    readonly property real dpr: CompositorService.getScreenScale(barWindow.screen)
 
     function requestRepaint() {
         debounceTimer.restart()

Modules/DankBar/DankBar.qml

@@ -4,6 +4,7 @@ import QtQuick.Effects
 import QtQuick.Shapes
 import Quickshell
 import Quickshell.Hyprland
+import Quickshell.I3
 import Quickshell.Io
 import Quickshell.Services.Mpris
 import Quickshell.Services.Notifications
@@ -31,6 +32,9 @@ Item {
             focusedScreenName = Hyprland.focusedWorkspace.monitor.name
         } else if (CompositorService.isNiri && NiriService.currentOutput) {
             focusedScreenName = NiriService.currentOutput
+        } else if (CompositorService.isSway) {
+            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true)
+            focusedScreenName = focusedWs?.monitor?.name || ""
         }
 
         if (!focusedScreenName && barVariants.instances.length > 0) {
@@ -55,6 +59,9 @@ Item {
             focusedScreenName = Hyprland.focusedWorkspace.monitor.name
         } else if (CompositorService.isNiri && NiriService.currentOutput) {
             focusedScreenName = NiriService.currentOutput
+        } else if (CompositorService.isSway) {
+            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true)
+            focusedScreenName = focusedWs?.monitor?.name || ""
         }
 
         if (!focusedScreenName && barVariants.instances.length > 0) {
@@ -110,9 +117,9 @@ Item {
                     return
                 }
 
-                if (clockButtonRef && dankDashPopoutLoader.item.setTriggerPosition) {
-                    const globalPos = clockButtonRef.mapToGlobal(0, 0)
-                    const pos = SettingsData.getPopupTriggerPosition(globalPos, barWindow.screen, barWindow.effectiveBarThickness, clockButtonRef.width)
+                if (clockButtonRef && clockButtonRef.visualContent && dankDashPopoutLoader.item.setTriggerPosition) {
+                    const globalPos = clockButtonRef.visualContent.mapToGlobal(0, 0)
+                    const pos = SettingsData.getPopupTriggerPosition(globalPos, barWindow.screen, barWindow.effectiveBarThickness, clockButtonRef.visualWidth)
                     const section = clockButtonRef.section || "center"
                     dankDashPopoutLoader.item.setTriggerPosition(pos.x, pos.y, pos.width, section, barWindow.screen)
                 } else {
@@ -173,19 +180,7 @@ Item {
             readonly property color _surfaceContainer: Theme.surfaceContainer
             readonly property real _backgroundAlpha: topBarCore?.backgroundTransparency ?? SettingsData.dankBarTransparency
             readonly property color _bgColor: Theme.withAlpha(_surfaceContainer, _backgroundAlpha)
-            readonly property real _dpr: {
-                if (CompositorService.isNiri && barWindow.screen) {
-                    const niriScale = NiriService.displayScales[barWindow.screen.name]
-                    if (niriScale !== undefined)
-                        return niriScale
-                }
-                if (CompositorService.isHyprland && barWindow.screen) {
-                    const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === barWindow.screen.name)
-                    if (hyprlandMonitor?.scale !== undefined)
-                        return hyprlandMonitor.scale
-                }
-                return (barWindow.screen?.devicePixelRatio) || 1
-            }
+            readonly property real _dpr: CompositorService.getScreenScale(barWindow.screen)
 
             property string screenName: modelData.name
             readonly property int notificationCount: NotificationService.notifications.length
@@ -536,6 +531,61 @@ Item {
                                 axis: axis
                             }
 
+                            MouseArea {
+                                id: scrollArea
+                                anchors.fill: parent
+                                acceptedButtons: Qt.NoButton
+                                propagateComposedEvents: true
+                                z: -1
+
+                                property real scrollAccumulator: 0
+                                property real touchpadThreshold: 500
+                                property bool actionInProgress: false
+
+                                Timer {
+                                    id: cooldownTimer
+                                    interval: 100
+                                    onTriggered: parent.actionInProgress = false
+                                }
+
+                                onWheel: wheel => {
+                                    if (actionInProgress) {
+                                        wheel.accepted = false
+                                        return
+                                    }
+
+                                    const deltaY = wheel.angleDelta.y
+                                    const deltaX = wheel.angleDelta.x
+
+                                    if (CompositorService.isNiri && Math.abs(deltaX) > Math.abs(deltaY)) {
+                                        topBarContent.switchApp(deltaX)
+                                        wheel.accepted = false
+                                        return
+                                    }
+
+                                    const isMouseWheel = Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0
+                                    const direction = deltaY < 0 ? 1 : -1
+
+                                    if (isMouseWheel) {
+                                        topBarContent.switchWorkspace(direction)
+                                        actionInProgress = true
+                                        cooldownTimer.restart()
+                                    } else {
+                                        scrollAccumulator += deltaY
+
+                                        if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
+                                            const touchDirection = scrollAccumulator < 0 ? 1 : -1
+                                            topBarContent.switchWorkspace(touchDirection)
+                                            scrollAccumulator = 0
+                                            actionInProgress = true
+                                            cooldownTimer.restart()
+                                        }
+                                    }
+
+                                    wheel.accepted = false
+                                }
+                            }
+
                             Item {
                                 id: topBarContent
                                 anchors.fill: parent
@@ -551,6 +601,163 @@ Item {
                                     componentMapRevision++
                                 }
 
+                                readonly property var sortedToplevels: {
+                                    return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, barWindow.screenName);
+                                }
+
+                                function getRealWorkspaces() {
+                                    if (CompositorService.isNiri) {
+                                        if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+                                            return NiriService.getCurrentOutputWorkspaceNumbers()
+                                        }
+                                        const workspaces = NiriService.allWorkspaces.filter(ws => ws.output === barWindow.screenName).map(ws => ws.idx + 1)
+                                        return workspaces.length > 0 ? workspaces : [1, 2]
+                                    } else if (CompositorService.isHyprland) {
+                                        const workspaces = Hyprland.workspaces?.values || []
+
+                                        if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+                                            const sorted = workspaces.slice().sort((a, b) => a.id - b.id)
+                                            const filtered = sorted.filter(ws => ws.id > -1)
+                                            return filtered.length > 0 ? filtered : [{"id": 1, "name": "1"}]
+                                        }
+
+                                        const monitorWorkspaces = workspaces.filter(ws => {
+                                            return ws.lastIpcObject && ws.lastIpcObject.monitor === barWindow.screenName && ws.id > -1
+                                        })
+
+                                        if (monitorWorkspaces.length === 0) {
+                                            return [{"id": 1, "name": "1"}]
+                                        }
+
+                                        return monitorWorkspaces.sort((a, b) => a.id - b.id)
+                                    } else if (CompositorService.isDwl) {
+                                        if (!DwlService.dwlAvailable) {
+                                            return [0]
+                                        }
+                                        if (SettingsData.dwlShowAllTags) {
+                                            return Array.from({length: DwlService.tagCount}, (_, i) => i)
+                                        }
+                                        return DwlService.getVisibleTags(barWindow.screenName)
+                                    } else if (CompositorService.isSway) {
+                                        const workspaces = I3.workspaces?.values || []
+                                        if (workspaces.length === 0) return [{"num": 1}]
+
+                                        if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+                                            return workspaces.slice().sort((a, b) => a.num - b.num)
+                                        }
+
+                                        const monitorWorkspaces = workspaces.filter(ws => ws.monitor?.name === barWindow.screenName)
+                                        return monitorWorkspaces.length > 0 ? monitorWorkspaces.sort((a, b) => a.num - b.num) : [{"num": 1}]
+                                    }
+                                    return [1]
+                                }
+
+                                function getCurrentWorkspace() {
+                                    if (CompositorService.isNiri) {
+                                        if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+                                            return NiriService.getCurrentWorkspaceNumber()
+                                        }
+                                        const activeWs = NiriService.allWorkspaces.find(ws => ws.output === barWindow.screenName && ws.is_active)
+                                        return activeWs ? activeWs.idx + 1 : 1
+                                    } else if (CompositorService.isHyprland) {
+                                        const monitors = Hyprland.monitors?.values || []
+                                        const currentMonitor = monitors.find(monitor => monitor.name === barWindow.screenName)
+                                        return currentMonitor?.activeWorkspace?.id ?? 1
+                                    } else if (CompositorService.isDwl) {
+                                        if (!DwlService.dwlAvailable) return 0
+                                        const outputState = DwlService.getOutputState(barWindow.screenName)
+                                        if (!outputState || !outputState.tags) return 0
+                                        const activeTags = DwlService.getActiveTags(barWindow.screenName)
+                                        return activeTags.length > 0 ? activeTags[0] : 0
+                                    } else if (CompositorService.isSway) {
+                                        if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+                                            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true)
+                                            return focusedWs ? focusedWs.num : 1
+                                        }
+
+                                        const focusedWs = I3.workspaces?.values?.find(ws => ws.monitor?.name === barWindow.screenName && ws.focused === true)
+                                        return focusedWs ? focusedWs.num : 1
+                                    }
+                                    return 1
+                                }
+
+                                function switchWorkspace(direction) {
+                                    const realWorkspaces = getRealWorkspaces()
+                                    if (realWorkspaces.length < 2) {
+                                        return
+                                    }
+
+                                    if (CompositorService.isNiri) {
+                                        const currentWs = getCurrentWorkspace()
+                                        const currentIndex = realWorkspaces.findIndex(ws => ws === currentWs)
+                                        const validIndex = currentIndex === -1 ? 0 : currentIndex
+                                        const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0)
+
+                                        if (nextIndex !== validIndex) {
+                                            NiriService.switchToWorkspace(realWorkspaces[nextIndex] - 1)
+                                        }
+                                    } else if (CompositorService.isHyprland) {
+                                        const currentWs = getCurrentWorkspace()
+                                        const currentIndex = realWorkspaces.findIndex(ws => ws.id === currentWs)
+                                        const validIndex = currentIndex === -1 ? 0 : currentIndex
+                                        const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0)
+
+                                        if (nextIndex !== validIndex) {
+                                            Hyprland.dispatch(`workspace ${realWorkspaces[nextIndex].id}`)
+                                        }
+                                    } else if (CompositorService.isDwl) {
+                                        const currentTag = getCurrentWorkspace()
+                                        const currentIndex = realWorkspaces.findIndex(tag => tag === currentTag)
+                                        const validIndex = currentIndex === -1 ? 0 : currentIndex
+                                        const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0)
+
+                                        if (nextIndex !== validIndex) {
+                                            DwlService.switchToTag(barWindow.screenName, realWorkspaces[nextIndex])
+                                        }
+                                    } else if (CompositorService.isSway) {
+                                        const currentWs = getCurrentWorkspace()
+                                        const currentIndex = realWorkspaces.findIndex(ws => ws.num === currentWs)
+                                        const validIndex = currentIndex === -1 ? 0 : currentIndex
+                                        const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0)
+
+                                        if (nextIndex !== validIndex) {
+                                            try { I3.dispatch(`workspace number ${realWorkspaces[nextIndex].num}`) } catch(_){}
+                                        }
+                                    }
+                                }
+
+                                function switchApp(deltaY) {
+                                    const windows = sortedToplevels;
+                                    if (windows.length < 2) {
+                                        return;
+                                    }
+                                    let currentIndex = -1;
+                                    for (let i = 0; i < windows.length; i++) {
+                                        if (windows[i].activated) {
+                                            currentIndex = i;
+                                            break;
+                                        }
+                                    }
+                                    let nextIndex;
+                                    if (deltaY < 0) {
+                                        if (currentIndex === -1) {
+                                            nextIndex = 0;
+                                        } else {
+                                            nextIndex = currentIndex + 1;
+                                        }
+                                    } else {
+                                        if (currentIndex === -1) {
+                                            nextIndex = windows.length - 1;
+                                        } else {
+                                            nextIndex = currentIndex - 1;
+                                        }
+                                    }
+                                    const nextWindow = windows[nextIndex];
+                                    if (nextWindow) {
+                                        nextWindow.activate();
+                                    }
+                                }
+
                                 readonly property int availableWidth: width
                                 readonly property int launcherButtonWidth: 40
                                 readonly property int workspaceSwitcherWidth: 120

Modules/DankBar/Popouts/VpnPopout.qml

@@ -17,6 +17,15 @@ DankPopout {
         service: DMSNetworkService
     }
 
+    property bool wasVisible: false
+
+    onShouldBeVisibleChanged: {
+        if (shouldBeVisible && !wasVisible) {
+            DMSNetworkService.getState()
+        }
+        wasVisible = shouldBeVisible
+    }
+
     property var triggerScreen: null
 
     function setTriggerPosition(x, y, width, section, screen) {
@@ -175,11 +184,10 @@ DankPopout {
                                 font.pixelSize: Theme.fontSizeMedium
                                 color: Theme.surfaceText
                                 font.weight: Font.Medium
-                            }
-
-                            Item {
+                                elide: Text.ElideRight
+                                wrapMode: Text.NoWrap
                                 Layout.fillWidth: true
-                                height: 1
+                                Layout.maximumWidth: parent.width - 140
                             }
 
                             // Removed Quick Connect for clarity
@@ -198,6 +206,7 @@ DankPopout {
                                 Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
                                 border.width: 0
                                 border.color: Theme.outlineLight
+                                opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
 
                                 Row {
                                     anchors.centerIn: parent
@@ -223,7 +232,8 @@ DankPopout {
 
                                     anchors.fill: parent
                                     hoverEnabled: true
-                                    cursorShape: Qt.PointingHandCursor
+                                    cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
+                                    enabled: !DMSNetworkService.isBusy
                                     onClicked: DMSNetworkService.disconnectAllActive()
                                 }
 
@@ -295,6 +305,7 @@ DankPopout {
                                         color: rowArea.containsMouse ? Theme.primaryHoverLight : (DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primaryPressed : Theme.surfaceLight)
                                         border.width: DMSNetworkService.isActiveUuid(modelData.uuid) ? 2 : 1
                                         border.color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.outlineLight
+                                        opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
 
                                         RowLayout {
                                             anchors.left: parent.left
@@ -313,11 +324,15 @@ DankPopout {
                                             Column {
                                                 spacing: 2
                                                 Layout.alignment: Qt.AlignVCenter
+                                                Layout.fillWidth: true
 
                                                 StyledText {
                                                     text: modelData.name
                                                     font.pixelSize: Theme.fontSizeMedium
                                                     color: DMSNetworkService.isActiveUuid(modelData.uuid) ? Theme.primary : Theme.surfaceText
+                                                    elide: Text.ElideRight
+                                                    wrapMode: Text.NoWrap
+                                                    width: parent.width
                                                 }
 
                                                 StyledText {
@@ -391,7 +406,8 @@ DankPopout {
 
                                             anchors.fill: parent
                                             hoverEnabled: true
-                                            cursorShape: Qt.PointingHandCursor
+                                            cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
+                                            enabled: !DMSNetworkService.isBusy
                                             onClicked: DMSNetworkService.toggle(modelData.uuid)
                                         }
 

Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -31,10 +31,15 @@ BasePill {
                             return "sync"
                         }
 
-                        if (NetworkService.networkStatus === "ethernet") {
+                        const status = NetworkService.networkStatus
+                        if (status === "ethernet") {
                             return "lan"
                         }
 
+                        if (status === "vpn") {
+                            return NetworkService.ethernetConnected ? "lan" : NetworkService.wifiSignalIcon
+                        }
+
                         return NetworkService.wifiSignalIcon
                     }
                     size: Theme.barIconSize(root.barThickness)
@@ -125,22 +130,27 @@ BasePill {
 
                     name: {
                         if (NetworkService.wifiToggling) {
-                            return "sync";
+                            return "sync"
                         }
 
-                        if (NetworkService.networkStatus === "ethernet") {
-                            return "lan";
+                        const status = NetworkService.networkStatus
+                        if (status === "ethernet") {
+                            return "lan"
                         }
 
-                        return NetworkService.wifiSignalIcon;
+                        if (status === "vpn") {
+                            return NetworkService.ethernetConnected ? "lan" : NetworkService.wifiSignalIcon
+                        }
+
+                        return NetworkService.wifiSignalIcon
                     }
                     size: Theme.barIconSize(root.barThickness)
                     color: {
                         if (NetworkService.wifiToggling) {
-                            return Theme.primary;
+                            return Theme.primary
                         }
 
-                        return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
+                        return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
                     }
                     anchors.verticalCenter: parent.verticalCenter
                     visible: root.showNetworkIcon && NetworkService.networkAvailable

Modules/DankBar/Widgets/KeyboardLayoutName.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import Quickshell
+import Quickshell.Hyprland
 import Quickshell.Io
 import qs.Common
 import qs.Modules.Plugins
@@ -11,7 +12,8 @@ import qs.Widgets
 BasePill {
     id: root
 
-    property string currentLayout: ""
+    property bool compactMode: SettingsData.keyboardLayoutNameCompactMode
+    property string currentLayout: CompositorService.isNiri ? NiriService.getCurrentKeyboardLayoutName() : ""
     property string hyprlandKeyboard: ""
 
     content: Component {
@@ -77,29 +79,29 @@ BasePill {
                     root.hyprlandKeyboard,
                     "next"
                 ])
+            }
+        }
+    }
+
+    Connections {
+        target: CompositorService.isHyprland ? Hyprland : null
+        enabled: CompositorService.isHyprland
+
+        function onRawEvent(event) {
+            if (event.name === "activelayout") {
                 updateLayout()
             }
         }
     }
 
-    Timer {
-        id: updateTimer
-        interval: 1000
-        running: true
-        repeat: true
-        onTriggered: {
+    Component.onCompleted: {
+        if (CompositorService.isHyprland) {
             updateLayout()
         }
     }
 
-    Component.onCompleted: {
-        updateLayout()
-    }
-
     function updateLayout() {
-        if (CompositorService.isNiri) {
-            root.currentLayout = NiriService.getCurrentKeyboardLayoutName()
-        } else if (CompositorService.isHyprland) {
+        if (CompositorService.isHyprland) {
             Proc.runCommand(null, ["hyprctl", "-j", "devices"], (output, exitCode) => {
                 if (exitCode !== 0) {
                     root.currentLayout = "Unknown"
@@ -109,8 +111,31 @@ BasePill {
                     const data = JSON.parse(output)
                     const mainKeyboard = data.keyboards.find(kb => kb.main === true)
                     root.hyprlandKeyboard = mainKeyboard.name
-                    if (mainKeyboard && mainKeyboard.active_keymap) {
-                        root.currentLayout = mainKeyboard.active_keymap
+
+                    if (mainKeyboard) {
+    					const layout = mainKeyboard.layout
+    					const variant = mainKeyboard.variant
+    					const index = mainKeyboard.active_layout_index
+
+                        if (root.compactMode && layout && variant && index !== undefined) {
+    						const layouts = mainKeyboard.layout.split(",")
+    						const variants = mainKeyboard.variant.split(",")
+    						const index = mainKeyboard.active_layout_index
+    						
+    						if (layouts[index] && variants[index] !== undefined) {
+    							if (variants[index] === "") {
+    								root.currentLayout = layouts[index]
+                                } else {
+    								root.currentLayout = layouts[index] + "-" + variants[index]
+                                }
+                            } else {
+    							root.currentLayout = "Unknown"
+                            }
+                        } else if (mainKeyboard && mainKeyboard.active_keymap) {
+                            root.currentLayout = mainKeyboard.active_keymap
+                        } else {
+                            root.currentLayout = "Unknown"
+                        }
                     } else {
                         root.currentLayout = "Unknown"
                     }

Modules/DankBar/Widgets/LauncherButton.qml

@@ -37,7 +37,26 @@ BasePill {
             }
 
             IconImage {
-                visible: SettingsData.launcherLogoMode === "compositor"
+                visible: SettingsData.launcherLogoMode === "dank"
+                anchors.centerIn: parent
+                width: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                height: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                smooth: true
+                mipmap: true
+                asynchronous: true
+                source: "file://" + Theme.shellDir + "/assets/danklogo.svg"
+                layer.enabled: Theme.effectiveLogoColor !== ""
+                layer.smooth: true
+                layer.mipmap: true
+                layer.effect: MultiEffect {
+                    saturation: 0
+                    colorization: 1
+                    colorizationColor: Theme.effectiveLogoColor
+                }
+            }
+
+            IconImage {
+                visible: SettingsData.launcherLogoMode === "compositor" && (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway)
                 anchors.centerIn: parent
                 width: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
                 height: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
@@ -48,6 +67,10 @@ BasePill {
                         return "file://" + Theme.shellDir + "/assets/niri.svg"
                     } else if (CompositorService.isHyprland) {
                         return "file://" + Theme.shellDir + "/assets/hyprland.svg"
+                    } else if (CompositorService.isDwl) {
+                        return "file://" + Theme.shellDir + "/assets/mango.png"
+                    } else if (CompositorService.isSway) {
+                        return "file://" + Theme.shellDir + "/assets/sway.svg"
                     }
                     return ""
                 }
@@ -56,8 +79,12 @@ BasePill {
                     saturation: 0
                     colorization: 1
                     colorizationColor: Theme.effectiveLogoColor
-                    brightness: SettingsData.launcherLogoBrightness
-                    contrast: SettingsData.launcherLogoContrast
+                    brightness: {
+                        SettingsData.launcherLogoBrightness
+                    }
+                    contrast: {
+                        SettingsData.launcherLogoContrast
+                    }
                 }
             }
 
@@ -81,17 +108,11 @@ BasePill {
         }
     }
 
-    MouseArea {
-        id: customMouseArea
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.RightButton
-        onPressed: function (mouse){
-            if (CompositorService.isNiri) {
-                NiriService.toggleOverview()
-            } else if (root.hyprlandOverviewLoader?.item) {
-                root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen
-            }
+    onRightClicked: {
+        if (CompositorService.isNiri) {
+            NiriService.toggleOverview()
+        } else if (root.hyprlandOverviewLoader?.item) {
+            root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen
         }
     }
 }

Modules/DankBar/Widgets/RunningApps.qml

@@ -289,10 +289,10 @@ Item {
                         IconImage {
                             id: iconImg
                             anchors.left: parent.left
-                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
+                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - Theme.barIconSize(root.barThickness)) / 2 : Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
-                            width: 18
-                            height: 18
+                            width: Theme.barIconSize(root.barThickness)
+                            height: Theme.barIconSize(root.barThickness)
                             source: {
                                 root._desktopEntriesUpdateTrigger
                                 const moddedId = Paths.moddedAppId(appId)
@@ -309,9 +309,9 @@ Item {
 
                         DankIcon {
                             anchors.left: parent.left
-                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
+                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - Theme.barIconSize(root.barThickness)) / 2 : Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
-                            size: 18
+                            size: Theme.barIconSize(root.barThickness)
                             name: "sports_esports"
                             color: Theme.surfaceText
                             visible: {
@@ -517,10 +517,10 @@ Item {
                         IconImage {
                             id: iconImg
                             anchors.left: parent.left
-                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
+                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - Theme.barIconSize(root.barThickness)) / 2 : Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
-                            width: 18
-                            height: 18
+                            width: Theme.barIconSize(root.barThickness)
+                            height: Theme.barIconSize(root.barThickness)
                             source: {
                                 root._desktopEntriesUpdateTrigger
                                 const moddedId = Paths.moddedAppId(appId)
@@ -537,9 +537,9 @@ Item {
 
                         DankIcon {
                             anchors.left: parent.left
-                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - 18) / 2 : Theme.spacingXS
+                            anchors.leftMargin: SettingsData.runningAppsCompactMode ? (parent.width - Theme.barIconSize(root.barThickness)) / 2 : Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
-                            size: 18
+                            size: Theme.barIconSize(root.barThickness)
                             name: "sports_esports"
                             color: Theme.surfaceText
                             visible: {

Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -116,13 +116,29 @@ Item {
                         color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
 
                         IconImage {
+                            id: iconImg
                             anchors.centerIn: parent
-                            width: 16
-                            height: 16
+                            width: Theme.barIconSize(root.barThickness)
+                            height: Theme.barIconSize(root.barThickness)
                             source: delegateRoot.iconSource
                             asynchronous: true
                             smooth: true
                             mipmap: true
+                            visible: status === Image.Ready
+                        }
+
+                        Text {
+                            anchors.centerIn: parent
+                            visible: !iconImg.visible
+                            text: {
+                                const itemId = trayItem?.id || ""
+                                if (!itemId) {
+                                    return "?"
+                                }
+                                return itemId.charAt(0).toUpperCase()
+                            }
+                            font.pixelSize: 10
+                            color: Theme.surfaceText
                         }
                     }
 
@@ -130,6 +146,7 @@ Item {
                         id: trayItemArea
 
                         anchors.fill: parent
+                        hoverEnabled: true
                         acceptedButtons: Qt.LeftButton | Qt.RightButton
                         cursorShape: Qt.PointingHandCursor
                         onClicked: (mouse) => {
@@ -202,13 +219,29 @@ Item {
                         color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
 
                         IconImage {
+                            id: iconImg
                             anchors.centerIn: parent
-                            width: 16
-                            height: 16
+                            width: Theme.barIconSize(root.barThickness)
+                            height: Theme.barIconSize(root.barThickness)
                             source: delegateRoot.iconSource
                             asynchronous: true
                             smooth: true
                             mipmap: true
+                            visible: status === Image.Ready
+                        }
+
+                        Text {
+                            anchors.centerIn: parent
+                            visible: !iconImg.visible
+                            text: {
+                                const itemId = trayItem?.id || ""
+                                if (!itemId) {
+                                    return "?"
+                                }
+                                return itemId.charAt(0).toUpperCase()
+                            }
+                            font.pixelSize: 10
+                            color: Theme.surfaceText
                         }
                     }
 
@@ -216,6 +249,7 @@ Item {
                         id: trayItemArea
 
                         anchors.fill: parent
+                        hoverEnabled: true
                         acceptedButtons: Qt.LeftButton | Qt.RightButton
                         cursorShape: Qt.PointingHandCursor
                         onClicked: (mouse) => {

Modules/DankBar/Widgets/Vpn.qml

@@ -25,10 +25,18 @@ BasePill {
             DankIcon {
                 id: icon
 
-                name: DMSNetworkService.isBusy ? "sync" : (DMSNetworkService.connected ? "vpn_lock" : "vpn_key_off")
+                name: DMSNetworkService.connected ? "vpn_lock" : "vpn_key_off"
                 size: Theme.barIconSize(root.barThickness, -4)
                 color: DMSNetworkService.connected ? Theme.primary : Theme.surfaceText
+                opacity: DMSNetworkService.isBusy ? 0.5 : 1.0
                 anchors.centerIn: parent
+
+                Behavior on opacity {
+                    NumberAnimation {
+                        duration: Theme.shortDuration
+                        easing.type: Easing.InOutQuad
+                    }
+                }
             }
         }
     }
@@ -44,8 +52,9 @@ BasePill {
 
         anchors.fill: parent
         hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
+        cursorShape: DMSNetworkService.isBusy ? Qt.BusyCursor : Qt.PointingHandCursor
         acceptedButtons: Qt.LeftButton
+        enabled: !DMSNetworkService.isBusy
         onPressed: {
             if (popoutTarget && popoutTarget.setTriggerPosition) {
                 const globalPos = root.visualContent.mapToGlobal(0, 0)
@@ -65,9 +74,15 @@ BasePill {
                     } else {
                         const names = DMSNetworkService.activeNames || []
                         if (names.length <= 1) {
-                            tooltipText = "VPN Connected • " + (names[0] || "")
+                            const name = names[0] || ""
+                            const maxLength = 25
+                            const displayName = name.length > maxLength ? name.substring(0, maxLength) + "..." : name
+                            tooltipText = "VPN Connected • " + displayName
                         } else {
-                            tooltipText = "VPN Connected • " + names[0] + " +" + (names.length - 1)
+                            const name = names[0]
+                            const maxLength = 20
+                            const displayName = name.length > maxLength ? name.substring(0, maxLength) + "..." : name
+                            tooltipText = "VPN Connected • " + displayName + " +" + (names.length - 1)
                         }
                     }
 

Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Hyprland
+import Quickshell.I3
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -17,17 +18,37 @@ Item {
     property real barThickness: 48
     property var hyprlandOverviewLoader: null
     property var parentScreen: null
+    property int _desktopEntriesUpdateTrigger: 0
     readonly property var sortedToplevels: {
         return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
     }
+
+    Connections {
+        target: DesktopEntries
+        function onApplicationsChanged() {
+            _desktopEntriesUpdateTrigger++
+        }
+    }
+
     property int currentWorkspace: {
         if (CompositorService.isNiri) {
             return getNiriActiveWorkspace()
         } else if (CompositorService.isHyprland) {
             return getHyprlandActiveWorkspace()
+        } else if (CompositorService.isDwl) {
+            const activeTags = getDwlActiveTags()
+            return activeTags.length > 0 ? activeTags[0] : -1
+        } else if (CompositorService.isSway) {
+            return getSwayActiveWorkspace()
         }
         return 1
     }
+    property var dwlActiveTags: {
+        if (CompositorService.isDwl) {
+            return getDwlActiveTags()
+        }
+        return []
+    }
     property var workspaceList: {
         if (CompositorService.isNiri) {
             const baseList = getNiriWorkspaces()
@@ -35,14 +56,44 @@ Item {
         }
         if (CompositorService.isHyprland) {
             const baseList = getHyprlandWorkspaces()
-            // Filter out special workspaces
 			const filteredList = baseList.filter(ws => ws.id > -1)
             return SettingsData.showWorkspacePadding ? padWorkspaces(filteredList) : filteredList
         }
+        if (CompositorService.isDwl) {
+            const baseList = getDwlTags()
+            return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
+        }
+        if (CompositorService.isSway) {
+            const baseList = getSwayWorkspaces()
+            return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
+        }
         return [1]
     }
 
+    function getSwayWorkspaces() {
+        const workspaces = I3.workspaces?.values || []
+        if (workspaces.length === 0) return [{"num": 1}]
+
+        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+            return workspaces.slice().sort((a, b) => a.num - b.num)
+        }
+
+        const monitorWorkspaces = workspaces.filter(ws => ws.monitor?.name === root.screenName)
+        return monitorWorkspaces.length > 0 ? monitorWorkspaces.sort((a, b) => a.num - b.num) : [{"num": 1}]
+    }
+
+    function getSwayActiveWorkspace() {
+        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true)
+            return focusedWs ? focusedWs.num : 1
+        }
+
+        const focusedWs = I3.workspaces?.values?.find(ws => ws.monitor?.name === root.screenName && ws.focused === true)
+        return focusedWs ? focusedWs.num : 1
+    }
+
     function getWorkspaceIcons(ws) {
+        _desktopEntriesUpdateTrigger
         if (!SettingsData.showWorkspaceApps || !ws) {
             return []
         }
@@ -60,15 +111,35 @@ Item {
             targetWorkspaceId = workspace.id
         } else if (CompositorService.isHyprland) {
             targetWorkspaceId = ws.id !== undefined ? ws.id : ws
+        } else if (CompositorService.isDwl) {
+            if (typeof ws !== "object" || ws.tag === undefined) {
+                return []
+            }
+            targetWorkspaceId = ws.tag
+        } else if (CompositorService.isSway) {
+            targetWorkspaceId = ws.num !== undefined ? ws.num : ws
         } else {
             return []
         }
 
         const wins = CompositorService.isNiri ? (NiriService.windows || []) : CompositorService.sortedToplevels
 
-
         const byApp = {}
-        const isActiveWs = CompositorService.isNiri ? NiriService.allWorkspaces.some(ws => ws.id === targetWorkspaceId && ws.is_active) : targetWorkspaceId === root.currentWorkspace
+        let isActiveWs = false
+        if (CompositorService.isNiri) {
+            isActiveWs = NiriService.allWorkspaces.some(ws => ws.id === targetWorkspaceId && ws.is_active)
+        } else if (CompositorService.isSway) {
+            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true)
+            isActiveWs = focusedWs ? (focusedWs.num === targetWorkspaceId) : false
+        } else if (CompositorService.isDwl) {
+            const output = DwlService.getOutputState(root.screenName)
+            if (output && output.tags) {
+                const tag = output.tags.find(t => t.tag === targetWorkspaceId)
+                isActiveWs = tag ? (tag.state === 1) : false
+            }
+        } else {
+            isActiveWs = targetWorkspaceId === root.currentWorkspace
+        }
 
         wins.forEach((w, i) => {
                          if (!w) {
@@ -78,8 +149,9 @@ Item {
                          let winWs = null
                          if (CompositorService.isNiri) {
                              winWs = w.workspace_id
+                         } else if (CompositorService.isSway) {
+                             winWs = w.workspace?.num
                          } else {
-                             // For Hyprland, we need to find the corresponding Hyprland toplevel to get workspace
                              const hyprlandToplevels = Array.from(Hyprland.toplevels?.values || [])
                              const hyprToplevel = hyprlandToplevels.find(ht => ht.wayland === w)
                              winWs = hyprToplevel?.workspace?.id
@@ -101,14 +173,14 @@ Item {
                                  "type": "icon",
                                  "icon": icon,
                                  "isSteamApp": isSteamApp,
-                                 "active": !!(w.activated || (CompositorService.isNiri && w.is_focused)),
+                                 "active": !!((w.activated || w.is_focused) || (CompositorService.isNiri && w.is_focused)),
                                  "count": 1,
                                  "windowId": w.address || w.id,
                                  "fallbackText": w.appId || w.class || w.title || ""
                              }
                          } else {
                              byApp[key].count++
-                             if (w.activated || (CompositorService.isNiri && w.is_focused)) {
+                             if ((w.activated || w.is_focused) || (CompositorService.isNiri && w.is_focused)) {
                                  byApp[key].active = true
                              }
                          }
@@ -119,10 +191,16 @@ Item {
 
     function padWorkspaces(list) {
         const padded = list.slice()
-        const placeholder = CompositorService.isHyprland ? {
-                                                               "id": -1,
-                                                               "name": ""
-                                                           } : -1
+        let placeholder
+        if (CompositorService.isHyprland) {
+            placeholder = {"id": -1, "name": ""}
+        } else if (CompositorService.isDwl) {
+            placeholder = {"tag": -1}
+        } else if (CompositorService.isSway) {
+            placeholder = {"num": -1}
+        } else {
+            placeholder = -1
+        }
         while (padded.length < 3) {
             padded.push(placeholder)
         }
@@ -190,7 +268,6 @@ Item {
             return Hyprland.focusedWorkspace ? Hyprland.focusedWorkspace.id : 1
         }
 
-        // Find the monitor object for this screen
         const monitors = Hyprland.monitors?.values || []
         const currentMonitor = monitors.find(monitor => monitor.name === root.screenName)
 
@@ -198,10 +275,44 @@ Item {
             return 1
         }
 
-        // Use the monitor's active workspace ID (like original config)
         return currentMonitor.activeWorkspace?.id ?? 1
     }
 
+    function getDwlTags() {
+        if (!DwlService.dwlAvailable) {
+            return []
+        }
+
+        const output = DwlService.getOutputState(root.screenName)
+        if (!output || !output.tags || output.tags.length === 0) {
+            return []
+        }
+
+        if (SettingsData.dwlShowAllTags) {
+            return output.tags.map(tag => ({"tag": tag.tag, "state": tag.state, "clients": tag.clients, "focused": tag.focused}))
+        }
+
+        const visibleTagIndices = DwlService.getVisibleTags(root.screenName)
+        return visibleTagIndices.map(tagIndex => {
+            const tagData = output.tags.find(t => t.tag === tagIndex)
+            return {
+                "tag": tagIndex,
+                "state": tagData?.state ?? 0,
+                "clients": tagData?.clients ?? 0,
+                "focused": tagData?.focused ?? false
+            }
+        })
+    }
+
+    function getDwlActiveTags() {
+        if (!DwlService.dwlAvailable) {
+            return []
+        }
+
+        const activeTags = DwlService.getActiveTags(root.screenName)
+        return activeTags
+    }
+
     readonly property real padding: Math.max(Theme.spacingXS, Theme.spacingS * (widgetHeight / 30))
     readonly property real visualWidth: isVertical ? widgetHeight : (workspaceRow.implicitWidth + padding * 2)
     readonly property real visualHeight: isVertical ? (workspaceRow.implicitHeight + padding * 2) : widgetHeight
@@ -210,6 +321,10 @@ Item {
         return root.workspaceList.filter(ws => {
                                              if (CompositorService.isHyprland) {
                                                  return ws && ws.id !== -1
+                                             } else if (CompositorService.isDwl) {
+                                                 return ws && ws.tag !== -1
+                                             } else if (CompositorService.isSway) {
+                                                 return ws && ws.num !== -1
                                              }
                                              return ws !== -1
                                          })
@@ -246,12 +361,42 @@ Item {
             }
 
             Hyprland.dispatch(`workspace ${realWorkspaces[nextIndex].id}`)
+        } else if (CompositorService.isDwl) {
+            const realWorkspaces = getRealWorkspaces()
+            if (realWorkspaces.length < 2) {
+                return
+            }
+
+            const currentIndex = realWorkspaces.findIndex(ws => ws.tag === root.currentWorkspace)
+            const validIndex = currentIndex === -1 ? 0 : currentIndex
+            const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0)
+
+            if (nextIndex === validIndex) {
+                return
+            }
+
+            DwlService.switchToTag(root.screenName, realWorkspaces[nextIndex].tag)
+        } else if (CompositorService.isSway) {
+            const realWorkspaces = getRealWorkspaces()
+            if (realWorkspaces.length < 2) {
+                return
+            }
+
+            const currentIndex = realWorkspaces.findIndex(ws => ws.num === root.currentWorkspace)
+            const validIndex = currentIndex === -1 ? 0 : currentIndex
+            const nextIndex = direction > 0 ? Math.min(validIndex + 1, realWorkspaces.length - 1) : Math.max(validIndex - 1, 0)
+
+            if (nextIndex === validIndex) {
+                return
+            }
+
+            try { I3.dispatch(`workspace number ${realWorkspaces[nextIndex].num}`) } catch(_){}
         }
     }
 
     width: isVertical ? barThickness : visualWidth
     height: isVertical ? visualHeight : barThickness
-    visible: CompositorService.isNiri || CompositorService.isHyprland
+    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway
 
     Rectangle {
         id: visualBackground
@@ -271,104 +416,11 @@ Item {
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
 
-        property real scrollAccumulator: 0
-        property real touchpadThreshold: 500
-
         onClicked: mouse => {
             if (mouse.button === Qt.RightButton && CompositorService.isHyprland && root.hyprlandOverviewLoader?.item) {
                 root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen
             }
         }
-
-        onWheel: wheel => {
-                     const deltaY = wheel.angleDelta.y
-                     const isMouseWheel = Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0
-                     const direction = deltaY < 0 ? 1 : -1
-
-                     if (isMouseWheel) {
-                        if (!SettingsData.workspaceScrolling || !CompositorService.isNiri) {
-                            switchWorkspace(direction)
-                        }
-                        else {
-                            const windows = root.sortedToplevels;
-                            if (windows.length < 2) {
-                                return;
-                            }
-                         let currentIndex = -1;
-                         for (let i = 0; i < windows.length; i++) {
-                            if (windows[i].activated) {
-                                currentIndex = i;
-                                break;
-                            }
-
-                         }
-                         let nextIndex;
-                         if (deltaY < 0) {
-                            if (currentIndex === -1) {
-                                nextIndex = 0;
-                            } else {
-                                nextIndex = currentIndex +1;
-                            }
-                         } else {
-                            if (currentIndex === -1) {
-                                nextIndex = windows.length -1;
-                            } else {
-                                nextIndex = currentIndex - 1
-                            }
-                         }
-                         const nextWindow = windows[nextIndex];
-                         if (nextWindow) {
-                            nextWindow.activate();
-                         }
-                        }
-
-                     } else {
-                         scrollAccumulator += deltaY
-
-                         if (Math.abs(scrollAccumulator) >= touchpadThreshold) {
-                             const touchDirection = scrollAccumulator < 0 ? 1 : -1
-                             if (!SettingsData.workspaceScrolling || !CompositorService.isNiri) {
-                                switchWorkspace(touchDirection)
-                             }
-                             else {
-                                const windows = root.sortedToplevels;
-                                if (windows.length < 2) {
-                                    return;
-                                }
-                                let currentIndex = -1;
-                                for (let i = 0; i < windows.length; i++) {
-                                    if (windows[i].activated) {
-                                        currentIndex = i;
-                                        break;
-                                    }
-
-                                }
-                                let nextIndex;
-                                if (deltaY < 0) {
-                                    if (currentIndex === -1) {
-                                    nextIndex = 0;
-                                } else {
-                                    nextIndex = currentIndex +1;
-                                }
-                            } else {
-                                if (currentIndex === -1) {
-                                    nextIndex = windows.length -1;
-                                } else {
-                                    nextIndex = currentIndex - 1
-                                }
-                            }
-                            const nextWindow = windows[nextIndex];
-                            if (nextWindow) {
-                                nextWindow.activate();
-                            }
-                        }
-
-                            scrollAccumulator = 0
-                         }
-                     }
-
-                     wheel.accepted = true
-                 }
     }
 
     Flow {
@@ -387,12 +439,20 @@ Item {
                 property bool isActive: {
                     if (CompositorService.isHyprland) {
                         return modelData && modelData.id === root.currentWorkspace
+                    } else if (CompositorService.isDwl) {
+                        return modelData && root.dwlActiveTags.includes(modelData.tag)
+                    } else if (CompositorService.isSway) {
+                        return modelData && modelData.num === root.currentWorkspace
                     }
                     return modelData === root.currentWorkspace
                 }
                 property bool isPlaceholder: {
                     if (CompositorService.isHyprland) {
                         return modelData && modelData.id === -1
+                    } else if (CompositorService.isDwl) {
+                        return modelData && modelData.tag === -1
+                    } else if (CompositorService.isSway) {
+                        return modelData && modelData.num === -1
                     }
                     return modelData === -1
                 }
@@ -403,8 +463,11 @@ Item {
                 property bool isUrgent: {
                     if (CompositorService.isHyprland) {
                         return modelData?.urgent ?? false
-                    }
-                    if (CompositorService.isNiri) {
+                    } else if (CompositorService.isNiri) {
+                        return loadedIsUrgent
+                    } else if (CompositorService.isDwl) {
+                        return modelData?.state === 2
+                    } else if (CompositorService.isSway) {
                         return loadedIsUrgent
                     }
                     return false
@@ -447,15 +510,29 @@ Item {
                     hoverEnabled: !isPlaceholder
                     cursorShape: isPlaceholder ? Qt.ArrowCursor : Qt.PointingHandCursor
                     enabled: !isPlaceholder
-                    onClicked: {
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+                    onClicked: mouse => {
                         if (isPlaceholder) {
                             return
                         }
 
+                        const isRightClick = mouse.button === Qt.RightButton
+
                         if (CompositorService.isNiri) {
                             NiriService.switchToWorkspace(modelData - 1)
                         } else if (CompositorService.isHyprland && modelData?.id) {
                             Hyprland.dispatch(`workspace ${modelData.id}`)
+                        } else if (CompositorService.isDwl && modelData?.tag !== undefined) {
+                            console.log("DWL click - tag:", modelData.tag, "rightClick:", isRightClick)
+                            if (isRightClick) {
+                                console.log("Calling toggleTag")
+                                DwlService.toggleTag(root.screenName, modelData.tag)
+                            } else {
+                                console.log("Calling switchToTag")
+                                DwlService.switchToTag(root.screenName, modelData.tag)
+                            }
+                        } else if (CompositorService.isSway && modelData?.num) {
+                            try { I3.dispatch(`workspace number ${modelData.num}`) } catch(_){}
                         }
                     }
                 }
@@ -478,9 +555,13 @@ Item {
                             wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.screenName) || null;
                         } else if (CompositorService.isHyprland) {
                             wsData = modelData;
+                        } else if (CompositorService.isDwl) {
+                            wsData = modelData;
+                        } else if (CompositorService.isSway) {
+                            wsData = modelData;
                         }
                         delegateRoot.loadedWorkspaceData = wsData;
-                        delegateRoot.loadedIsUrgent = wsData?.is_urgent ?? false;
+                        delegateRoot.loadedIsUrgent = wsData?.urgent ?? false;
 
                         var icData = null;
                         if (wsData?.name) {
@@ -490,7 +571,11 @@ Item {
                         delegateRoot.loadedHasIcon = icData !== null;
 
                         if (SettingsData.showWorkspaceApps) {
-                            delegateRoot.loadedIcons = root.getWorkspaceIcons(CompositorService.isHyprland ? modelData : (modelData === -1 ? null : modelData));
+                            if (CompositorService.isDwl || CompositorService.isSway) {
+                                delegateRoot.loadedIcons = root.getWorkspaceIcons(modelData);
+                            } else {
+                                delegateRoot.loadedIcons = root.getWorkspaceIcons(CompositorService.isHyprland ? modelData : (modelData === -1 ? null : modelData));
+                            }
                         } else {
                             delegateRoot.loadedIcons = [];
                         }
@@ -512,8 +597,14 @@ Item {
                     radius: Theme.cornerRadius
                     color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.outlineButton : Theme.surfaceTextAlpha
 
-                    border.width: isUrgent && !isActive ? 2 : 0
-                    border.color: isUrgent && !isActive ? Theme.error : Theme.withAlpha(Theme.error, 0)
+                    border.width: {
+                        if (isUrgent && !isActive) return 2
+                        return 0
+                    }
+                    border.color: {
+                        if (isUrgent && !isActive) return Theme.error
+                        return Theme.withAlpha(Theme.error, 0)
+                    }
 
                     Behavior on width {
                         enabled: (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
@@ -545,6 +636,13 @@ Item {
                         }
                     }
 
+                    Behavior on border.color {
+                        ColorAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
                     Loader {
                         id: appIconsLoader
                         anchors.fill: parent
@@ -735,11 +833,29 @@ Item {
                         StyledText {
                             anchors.centerIn: parent
                             text: {
-                                const isPlaceholder = CompositorService.isHyprland ? (modelData?.id === -1) : (modelData === -1)
+                                let isPlaceholder
+                                if (CompositorService.isHyprland) {
+                                    isPlaceholder = modelData?.id === -1
+                                } else if (CompositorService.isDwl) {
+                                    isPlaceholder = modelData?.tag === -1
+                                } else if (CompositorService.isSway) {
+                                    isPlaceholder = modelData?.num === -1
+                                } else {
+                                    isPlaceholder = modelData === -1
+                                }
+
                                 if (isPlaceholder) {
                                     return index + 1
                                 }
-                                return CompositorService.isHyprland ? (modelData?.id || "") : (modelData - 1);
+
+                                if (CompositorService.isHyprland) {
+                                    return modelData?.id || ""
+                                } else if (CompositorService.isDwl) {
+                                    return (modelData?.tag !== undefined) ? (modelData.tag + 1) : ""
+                                } else if (CompositorService.isSway) {
+                                    return modelData?.num || ""
+                                }
+                                return modelData - 1
                             }
                             color: (isActive || isUrgent) ? Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
                             font.pixelSize: Theme.barTextSize(barThickness)
@@ -767,6 +883,16 @@ Item {
                     function onShowWorkspaceAppsChanged() { delegateRoot.updateAllData() }
                     function onWorkspaceNameIconsChanged() { delegateRoot.updateAllData() }
                 }
+                Connections {
+                    target: DwlService
+                    enabled: CompositorService.isDwl
+                    function onStateChanged() { delegateRoot.updateAllData() }
+                }
+                Connections {
+                    target: I3.workspaces
+                    enabled: CompositorService.isSway
+                    function onValuesChanged() { delegateRoot.updateAllData() }
+                }
             }
         }
     }

Modules/DankDash/DankDashPopout.qml

@@ -49,12 +49,16 @@ DankPopout {
     property bool __contentReady: false
 
     function __tryFocusOnce() {
-        if (!__focusArmed) return
+        if (!__focusArmed)
+            return
         const win = root.window
-        if (!win || !win.visible) return
-        if (!contentLoader.item) return
+        if (!win || !win.visible)
+            return
+        if (!contentLoader.item)
+            return
 
-        if (win.requestActivate) win.requestActivate()
+        if (win.requestActivate)
+            win.requestActivate()
         contentLoader.item.forceActiveFocus(Qt.TabFocusReason)
 
         if (contentLoader.item.activeFocus)
@@ -78,14 +82,18 @@ DankPopout {
         target: contentLoader
         function onLoaded() {
             __contentReady = true
-            if (__focusArmed) __tryFocusOnce()
+            if (__focusArmed)
+                __tryFocusOnce()
         }
     }
 
     Connections {
         target: root.window ? root.window : null
         enabled: !!root.window
-        function onVisibleChanged() { if (__focusArmed) __tryFocusOnce() }
+        function onVisibleChanged() {
+            if (__focusArmed)
+                __tryFocusOnce()
+        }
     }
 
     onBackgroundClicked: {
@@ -111,14 +119,14 @@ DankPopout {
                 target: root
                 function onShouldBeVisibleChanged() {
                     if (root.shouldBeVisible) {
-                        Qt.callLater(function() {
+                        Qt.callLater(function () {
                             mainContainer.forceActiveFocus()
                         })
                     }
                 }
             }
 
-            Keys.onPressed: function(event) {
+            Keys.onPressed: function (event) {
                 if (event.key === Qt.Key_Escape) {
                     root.dashVisible = false
                     event.accepted = true
@@ -216,32 +224,43 @@ DankPopout {
                     }
 
                     model: {
-                        let tabs = [
-                            { icon: "dashboard", text: I18n.tr("Overview") },
-                            { icon: "music_note", text: I18n.tr("Media") },
-                            { icon: "wallpaper", text: I18n.tr("Wallpapers") }
-                        ]
+                        let tabs = [{
+                                        "icon": "dashboard",
+                                        "text": I18n.tr("Overview")
+                                    }, {
+                                        "icon": "music_note",
+                                        "text": I18n.tr("Media")
+                                    }, {
+                                        "icon": "wallpaper",
+                                        "text": I18n.tr("Wallpapers")
+                                    }]
 
                         if (SettingsData.weatherEnabled) {
-                            tabs.push({ icon: "wb_sunny", text: I18n.tr("Weather") })
+                            tabs.push({
+                                          "icon": "wb_sunny",
+                                          "text": I18n.tr("Weather")
+                                      })
                         }
 
-                        tabs.push({ icon: "settings", text: I18n.tr("Settings"), isAction: true })
+                        tabs.push({
+                                      "icon": "settings",
+                                      "text": I18n.tr("Settings"),
+                                      "isAction": true
+                                  })
                         return tabs
                     }
 
-                    onTabClicked: function(index) {
+                    onTabClicked: function (index) {
                         root.currentTabIndex = index
                     }
 
-                    onActionTriggered: function(index) {
+                    onActionTriggered: function (index) {
                         let settingsIndex = SettingsData.weatherEnabled ? 4 : 3
                         if (index === settingsIndex) {
                             dashVisible = false
                             settingsModal.show()
                         }
                     }
-
                 }
 
                 Item {
@@ -253,10 +272,14 @@ DankPopout {
                     id: pages
                     width: parent.width
                     implicitHeight: {
-                        if (currentIndex === 0) return overviewTab.implicitHeight
-                        if (currentIndex === 1) return mediaTab.implicitHeight
-                        if (currentIndex === 2) return wallpaperTab.implicitHeight
-                        if (SettingsData.weatherEnabled && currentIndex === 3) return weatherTab.implicitHeight
+                        if (currentIndex === 0)
+                            return overviewTab.implicitHeight
+                        if (currentIndex === 1)
+                            return mediaTab.implicitHeight
+                        if (currentIndex === 2)
+                            return wallpaperTab.implicitHeight
+                        if (SettingsData.weatherEnabled && currentIndex === 3)
+                            return weatherTab.implicitHeight
                         return overviewTab.implicitHeight
                     }
                     currentIndex: root.currentTabIndex
@@ -264,6 +287,10 @@ DankPopout {
                     OverviewTab {
                         id: overviewTab
 
+                        onCloseDash: {
+                            root.dashVisible = false
+                        }
+
                         onSwitchToWeatherTab: {
                             if (SettingsData.weatherEnabled) {
                                 tabBar.currentIndex = 3
@@ -286,6 +313,7 @@ DankPopout {
                         active: root.currentTabIndex === 2
                         tabBarItem: tabBar
                         keyForwardTarget: mainContainer
+                        targetScreen: root.triggerScreen
                     }
 
                     WeatherTab {
@@ -296,4 +324,4 @@ DankPopout {
             }
         }
     }
-}
+}

Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -13,6 +13,8 @@ Rectangle {
     property var selectedDateEvents: []
     property bool hasEvents: selectedDateEvents && selectedDateEvents.length > 0
 
+    signal closeDash()
+
     function weekStartJs() {
         return Qt.locale().firstDayOfWeek % 7
     }
@@ -428,24 +430,12 @@ Rectangle {
                         if (modelData.url && modelData.url !== "") {
                             if (Qt.openUrlExternally(modelData.url) === false) {
                                 console.warn("Failed to open URL: " + modelData.url)
+                            } else {
+                                root.closeDash()
                             }
                         }
                     }
                 }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
-
-                Behavior on border.color {
-                    ColorAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
             }
         }
     }

Modules/DankDash/Overview/UserInfoCard.qml

@@ -58,6 +58,9 @@ Card {
                     text: {
                         if (CompositorService.isNiri) return "on niri"
                         if (CompositorService.isHyprland) return "on Hyprland"
+                        // technically they might not be on mangowc, but its what we support in the docs
+                        if (CompositorService.isDwl) return "on MangoWC"
+                        if (CompositorService.isSway) return "on Sway"
                         return ""
                     }
                     font.pixelSize: Theme.fontSizeSmall

Modules/DankDash/OverviewTab.qml

@@ -14,6 +14,7 @@ Item {
 
     signal switchToWeatherTab()
     signal switchToMediaTab()
+    signal closeDash()
 
     Item {
         anchors.fill: parent
@@ -58,6 +59,8 @@ Item {
             y: 100 + Theme.spacingM
             width: parent.width * 0.6
             height: 300
+
+            onCloseDash: root.closeDash()
         }
 
         // Media - bottom right (narrow and taller)

Modules/DankDash/WallpaperTab.qml

@@ -29,9 +29,26 @@ Item {
     property bool enableAnimation: false
     property string homeDir: StandardPaths.writableLocation(StandardPaths.HomeLocation)
     property string selectedFileName: ""
+    property var targetScreen: null
+    property string targetScreenName: targetScreen ? targetScreen.name : ""
 
     signal requestTabChange(int newIndex)
 
+    function getCurrentWallpaper() {
+        if (SessionData.perMonitorWallpaper && targetScreenName) {
+            return SessionData.getMonitorWallpaper(targetScreenName)
+        }
+        return SessionData.wallpaperPath
+    }
+
+    function setCurrentWallpaper(path) {
+        if (SessionData.perMonitorWallpaper && targetScreenName) {
+            SessionData.setMonitorWallpaper(targetScreenName, path)
+        } else {
+            SessionData.setWallpaper(path)
+        }
+    }
+
     onCurrentPageChanged: {
         if (currentPage !== lastPage) {
             enableAnimation = false
@@ -71,7 +88,7 @@ Item {
                 if (absoluteIndex < wallpaperFolderModel.count) {
                     const filePath = wallpaperFolderModel.get(absoluteIndex, "filePath")
                     if (filePath) {
-                        SessionData.setWallpaper(filePath.toString().replace(/^file:\/\//, ''))
+                        setCurrentWallpaper(filePath.toString().replace(/^file:\/\//, ''))
                     }
                 }
             }
@@ -151,34 +168,41 @@ Item {
     }
 
     function setInitialSelection() {
-        if (!SessionData.wallpaperPath || wallpaperFolderModel.count === 0) {
+        const currentWallpaper = getCurrentWallpaper()
+        if (!currentWallpaper || wallpaperFolderModel.count === 0) {
             gridIndex = 0
             updateSelectedFileName()
-            Qt.callLater(() => { enableAnimation = true })
+            Qt.callLater(() => {
+                             enableAnimation = true
+                         })
             return
         }
 
-        for (let i = 0; i < wallpaperFolderModel.count; i++) {
+        for (var i = 0; i < wallpaperFolderModel.count; i++) {
             const filePath = wallpaperFolderModel.get(i, "filePath")
-            if (filePath && filePath.toString().replace(/^file:\/\//, '') === SessionData.wallpaperPath) {
+            if (filePath && filePath.toString().replace(/^file:\/\//, '') === currentWallpaper) {
                 const targetPage = Math.floor(i / itemsPerPage)
                 const targetIndex = i % itemsPerPage
                 currentPage = targetPage
                 gridIndex = targetIndex
                 updateSelectedFileName()
-                Qt.callLater(() => { enableAnimation = true })
+                Qt.callLater(() => {
+                                 enableAnimation = true
+                             })
                 return
             }
         }
         gridIndex = 0
         updateSelectedFileName()
-        Qt.callLater(() => { enableAnimation = true })
+        Qt.callLater(() => {
+                         enableAnimation = true
+                     })
     }
 
     function loadWallpaperDirectory() {
-        const currentWallpaper = SessionData.wallpaperPath
+        const currentWallpaper = getCurrentWallpaper()
 
-        if (!currentWallpaper || currentWallpaper.startsWith("#") || currentWallpaper.startsWith("we:")) {
+        if (!currentWallpaper || currentWallpaper.startsWith("#")) {
             if (CacheData.wallpaperLastPath && CacheData.wallpaperLastPath !== "") {
                 wallpaperDir = CacheData.wallpaperLastPath
             } else {
@@ -216,6 +240,19 @@ Item {
                 setInitialSelection()
             }
         }
+        function onMonitorWallpapersChanged() {
+            loadWallpaperDirectory()
+            if (visible && active) {
+                setInitialSelection()
+            }
+        }
+    }
+
+    onTargetScreenNameChanged: {
+        loadWallpaperDirectory()
+        if (visible && active) {
+            setInitialSelection()
+        }
     }
 
     Connections {
@@ -267,18 +304,18 @@ Item {
             fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
             allowStacking: true
 
-            onFileSelected: (path) => {
-                const cleanPath = path.replace(/^file:\/\//, '')
-                SessionData.setWallpaper(cleanPath)
+            onFileSelected: path => {
+                                const cleanPath = path.replace(/^file:\/\//, '')
+                                setCurrentWallpaper(cleanPath)
 
-                const dirPath = cleanPath.substring(0, cleanPath.lastIndexOf('/'))
-                if (dirPath) {
-                    wallpaperDir = dirPath
-                    CacheData.wallpaperLastPath = dirPath
-                    CacheData.saveCache()
-                }
-                close()
-            }
+                                const dirPath = cleanPath.substring(0, cleanPath.lastIndexOf('/'))
+                                if (dirPath) {
+                                    wallpaperDir = dirPath
+                                    CacheData.wallpaperLastPath = dirPath
+                                    CacheData.saveCache()
+                                }
+                                close()
+                            }
 
             onDialogClosed: {
                 Qt.callLater(() => wallpaperBrowserLoader.active = false)
@@ -327,7 +364,7 @@ Item {
                     const startIndex = currentPage * itemsPerPage
                     const endIndex = Math.min(startIndex + itemsPerPage, wallpaperFolderModel.count)
                     const items = []
-                    for (let i = startIndex; i < endIndex; i++) {
+                    for (var i = startIndex; i < endIndex; i++) {
                         const filePath = wallpaperFolderModel.get(i, "filePath")
                         if (filePath) {
                             items.push(filePath.toString().replace(/^file:\/\//, ''))
@@ -369,7 +406,7 @@ Item {
                     height: wallpaperGrid.cellHeight
 
                     property string wallpaperPath: modelData || ""
-                    property bool isSelected: SessionData.wallpaperPath === modelData
+                    property bool isSelected: getCurrentWallpaper() === modelData
 
                     Rectangle {
                         id: wallpaperCard
@@ -437,7 +474,7 @@ Item {
                             onClicked: {
                                 gridIndex = index
                                 if (modelData) {
-                                    SessionData.setWallpaper(modelData)
+                                    setCurrentWallpaper(modelData)
                                 }
                             }
                         }

Modules/Dock/DockApps.qml

@@ -213,13 +213,6 @@ Item {
                     anchors.centerIn: parent
                 }
 
-                MouseArea {
-                    visible: model.type === "separator"
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    acceptedButtons: Qt.NoButton
-                }
-
                 DockAppButton {
                     id: button
                     visible: model.type !== "separator"

Modules/Greetd/GreetdSettings.qml

@@ -43,6 +43,7 @@ Singleton {
     property bool lockScreenShowPowerActions: true
     property var screenPreferences: ({})
     property int animationSpeed: 2
+    property string wallpaperFillMode: "Fill"
 
     readonly property string defaultFontFamily: "Inter Variable"
     readonly property string defaultMonoFontFamily: "Fira Code"
@@ -78,6 +79,7 @@ Singleton {
                 lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true
                 screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({})
                 animationSpeed = settings.animationSpeed !== undefined ? settings.animationSpeed : 2
+                wallpaperFillMode = settings.wallpaperFillMode !== undefined ? settings.wallpaperFillMode : "Fill"
                 settingsLoaded = true
 
                 if (typeof Theme !== "undefined") {

Modules/Greetd/GreeterContent.qml

@@ -147,15 +147,9 @@ Item {
         anchors.fill: parent
         source: {
             var currentWallpaper = SessionData.getMonitorWallpaper(screenName)
-            if (screenName && currentWallpaper && currentWallpaper.startsWith("we:")) {
-                const cacheHome = StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()
-                const baseDir = Paths.strip(cacheHome)
-                const screenshotPath = baseDir + "/DankMaterialShell/we_screenshots" + "/" + currentWallpaper.substring(3) + ".jpg"
-                return screenshotPath
-            }
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
-        fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
+        fillMode: Theme.getFillMode(GreetdSettings.wallpaperFillMode)
         smooth: true
         asynchronous: false
         cache: true
@@ -496,14 +490,16 @@ Item {
                                     if (parent.showPassword) {
                                         return GreeterState.passwordBuffer
                                     }
-                                    return "•".repeat(Math.min(GreeterState.passwordBuffer.length, 25))
+                                    return "•".repeat(GreeterState.passwordBuffer.length)
                                 }
                                 return GreeterState.usernameInput
                             }
                             color: Theme.surfaceText
                             font.pixelSize: (GreeterState.showPasswordInput && !parent.showPassword) ? Theme.fontSizeLarge : Theme.fontSizeMedium
                             opacity: (GreeterState.showPasswordInput ? GreeterState.passwordBuffer.length > 0 : GreeterState.usernameInput.length > 0) ? 1 : 0
-                            elide: Text.ElideRight
+                            clip: true
+                            elide: Text.ElideNone
+                            horizontalAlignment: implicitWidth > width ? Text.AlignRight : Text.AlignLeft
 
                             Behavior on opacity {
                                 NumberAnimation {

Modules/Greetd/assets/dms-greeter

@@ -166,6 +166,10 @@ NIRI_EOF
             cat > "$TEMP_CONFIG" << HYPRLAND_EOF
 env = DMS_RUN_GREETER,1
 
+misc {
+    disable_hyprland_logo = true
+}
+
 exec = sh -c "$QS_CMD; hyprctl dispatch exit"
 HYPRLAND_EOF
             COMPOSITOR_CONFIG="$TEMP_CONFIG"

Modules/Lock/LockScreenContent.qml

@@ -62,6 +62,7 @@ Item {
 
     function sendLockerReadyOnce() {
         if (lockerReadySent) return;
+        if (root.unlocking) return;
         lockerReadySent = true;
         if (SessionService.loginctlAvailable && DMSService.apiVersion >= 2) {
             DMSService.sendRequest("loginctl.lockerReady", null, resp => {
@@ -73,9 +74,10 @@ Item {
 
     function maybeSend() {
         if (!lockerReadyArmed) return;
+        if (root.unlocking) return;
         if (!root.visible || root.opacity <= 0) return;
         Qt.callLater(() => {
-            if (root.visible && root.opacity > 0)
+            if (root.visible && root.opacity > 0 && !root.unlocking)
                 sendLockerReadyOnce();
         });
     }
@@ -157,12 +159,6 @@ Item {
         anchors.fill: parent
         source: {
             var currentWallpaper = SessionData.getMonitorWallpaper(screenName)
-            if (screenName && currentWallpaper && currentWallpaper.startsWith("we:")) {
-                const cacheHome = StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()
-                const baseDir = Paths.strip(cacheHome)
-                const screenshotPath = baseDir + "/DankMaterialShell/we_screenshots" + "/" + currentWallpaper.substring(3) + ".jpg"
-                return screenshotPath
-            }
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
         fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
@@ -551,12 +547,14 @@ Item {
                             if (parent.showPassword) {
                                 return root.passwordBuffer
                             }
-                            return "•".repeat(Math.min(root.passwordBuffer.length, 25))
+                            return "•".repeat(root.passwordBuffer.length)
                         }
                         color: Theme.surfaceText
                         font.pixelSize: parent.showPassword ? Theme.fontSizeMedium : Theme.fontSizeLarge
                         opacity: (demoMode || root.passwordBuffer.length > 0) ? 1 : 0
-                        elide: Text.ElideRight
+                        clip: true
+                        elide: Text.ElideNone
+                        horizontalAlignment: implicitWidth > width ? Text.AlignRight : Text.AlignLeft
 
                         Behavior on opacity {
                             NumberAnimation {
@@ -1245,6 +1243,7 @@ Item {
         lockSecured: !demoMode
         onUnlockRequested: {
             root.unlocking = true
+            lockerReadyArmed = false
             passwordField.text = ""
             root.passwordBuffer = ""
             root.unlockRequested()

Modules/Lock/Pam.qml

@@ -11,6 +11,7 @@ Scope {
     id: root
 
     property bool lockSecured: false
+    property bool unlockInProgress: false
 
     readonly property alias passwd: passwd
     readonly property alias fprint: fprint
@@ -50,7 +51,11 @@ Scope {
 
         onCompleted: res => {
             if (res === PamResult.Success) {
-                root.unlockRequested();
+                if (!root.unlockInProgress) {
+                    root.unlockInProgress = true;
+                    fprint.abort();
+                    root.unlockRequested();
+                }
                 return;
             }
 
@@ -92,7 +97,11 @@ Scope {
                 return;
 
             if (res === PamResult.Success) {
-                root.unlockRequested();
+                if (!root.unlockInProgress) {
+                    root.unlockInProgress = true;
+                    passwd.abort();
+                    root.unlockRequested();
+                }
                 return;
             }
 
@@ -162,8 +171,11 @@ Scope {
             root.state = "";
             root.fprintState = "";
             root.lockMessage = "";
+            root.unlockInProgress = false;
         } else {
             fprint.abort();
+            passwd.abort();
+            root.unlockInProgress = false;
         }
     }
 

Modules/OSD/BrightnessOSD.qml

@@ -11,19 +11,6 @@ DankOSD {
     autoHideInterval: 3000
     enableMouseInteraction: true
 
-    property var brightnessDebounceTimer: Timer {
-        property int pendingValue: 0
-
-        interval: {
-            const deviceInfo = DisplayService.getCurrentDeviceInfo()
-            return (deviceInfo && deviceInfo.class === "ddc") ? 200 : 50
-        }
-        repeat: false
-        onTriggered: {
-            DisplayService.setBrightnessInternal(pendingValue, DisplayService.lastIpcDevice)
-        }
-    }
-
     Connections {
         target: DisplayService
         function onBrightnessChanged() {
@@ -73,7 +60,11 @@ DankOSD {
                 height: 40
                 x: parent.gap * 2 + Theme.iconSize
                 anchors.verticalCenter: parent.verticalCenter
-                minimum: 1
+                minimum: {
+                    const deviceInfo = DisplayService.getCurrentDeviceInfo()
+                    if (!deviceInfo) return 1
+                    return (deviceInfo.class === "backlight" || deviceInfo.class === "ddc") ? 1 : 0
+                }
                 maximum: 100
                 enabled: DisplayService.brightnessAvailable
                 showValue: true
@@ -89,8 +80,7 @@ DankOSD {
 
                 onSliderValueChanged: newValue => {
                                           if (DisplayService.brightnessAvailable) {
-                                              root.brightnessDebounceTimer.pendingValue = newValue
-                                              root.brightnessDebounceTimer.restart()
+                                              DisplayService.setBrightness(newValue, DisplayService.lastIpcDevice, true)
                                               resetHideTimer()
                                           }
                                       }
@@ -101,8 +91,7 @@ DankOSD {
 
                 onSliderDragFinished: finalValue => {
                                           if (DisplayService.brightnessAvailable) {
-                                              root.brightnessDebounceTimer.stop()
-                                              DisplayService.setBrightnessInternal(finalValue, DisplayService.lastIpcDevice)
+                                              DisplayService.setBrightness(finalValue, DisplayService.lastIpcDevice, true)
                                           }
                                       }
 
@@ -110,13 +99,13 @@ DankOSD {
                     target: DisplayService
 
                     function onBrightnessChanged() {
-                        if (!brightnessSlider.pressed) {
+                        if (!brightnessSlider.pressed && brightnessSlider.value !== DisplayService.brightnessLevel) {
                             brightnessSlider.value = DisplayService.brightnessLevel
                         }
                     }
 
                     function onDeviceSwitched() {
-                        if (!brightnessSlider.pressed) {
+                        if (!brightnessSlider.pressed && brightnessSlider.value !== DisplayService.brightnessLevel) {
                             brightnessSlider.value = DisplayService.brightnessLevel
                         }
                     }
@@ -124,13 +113,4 @@ DankOSD {
             }
         }
     }
-
-    onOsdShown: {
-        if (DisplayService.brightnessAvailable && contentLoader.item) {
-            const slider = contentLoader.item.children[0].children[1]
-            if (slider) {
-                slider.value = DisplayService.brightnessLevel
-            }
-        }
-    }
 }

Modules/Plugins/BasePill.qml

@@ -33,6 +33,7 @@ Item {
     readonly property real bottomMargin: isVerticalOrientation ? (isBottomBarEdge && isLast ? barEdgeExtension : (isLast ? gapExtension : gapExtension / 2)) : 0
 
     signal clicked()
+    signal rightClicked()
 
     width: isVerticalOrientation ? barThickness : visualWidth
     height: isVerticalOrientation ? visualHeight : barThickness
@@ -69,8 +70,12 @@ Item {
         height: root.height + root.topMargin + root.bottomMargin
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+        onPressed: function (mouse) {
+            if (mouse.button === Qt.RightButton) {
+                root.rightClicked()
+                return
+            }
             if (popoutTarget && popoutTarget.setTriggerPosition) {
                 const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen

Modules/Settings/AboutTab.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Effects
+import Quickshell.Widgets
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -9,6 +10,59 @@ Item {
     id: aboutTab
 
     property bool isHyprland: CompositorService.isHyprland
+    property bool isNiri: CompositorService.isNiri
+    property bool isSway: CompositorService.isSway
+    property bool isDwl: CompositorService.isDwl
+
+    property string compositorName: {
+        if (isHyprland) return "hyprland"
+        if (isSway) return "sway"
+        if (isDwl) return "mangowc"
+        return "niri"
+    }
+
+    property string compositorLogo: {
+        if (isHyprland) return "/assets/hyprland.svg"
+        if (isSway) return "/assets/sway.svg"
+        if (isDwl) return "/assets/mango.png"
+        return "/assets/niri.svg"
+    }
+
+    property string compositorUrl: {
+        if (isHyprland) return "https://hypr.land"
+        if (isSway) return "https://swaywm.org"
+        if (isDwl) return "https://github.com/DreamMaoMao/mangowc"
+        return "https://github.com/YaLTeR/niri"
+    }
+
+    property string compositorTooltip: {
+        if (isHyprland) return "Hyprland Website"
+        if (isSway) return "Sway Website"
+        if (isDwl) return "mangowc GitHub"
+        return "niri GitHub"
+    }
+
+    property string dmsDiscordUrl: "https://discord.gg/vT8Sfjy7sx"
+    property string dmsDiscordTooltip: "niri/dms Discord"
+
+    property string compositorDiscordUrl: {
+        if (isHyprland) return "https://discord.com/invite/hQ9XvMUjjr"
+        if (isDwl) return "https://discord.gg/CPjbDxesh5"
+        return ""
+    }
+
+    property string compositorDiscordTooltip: {
+        if (isHyprland) return "Hyprland Discord Server"
+        if (isDwl) return "mangowc Discord Server"
+        return ""
+    }
+
+    property string redditUrl: "https://reddit.com/r/niri"
+    property string redditTooltip: "r/niri Subreddit"
+
+    property bool showMatrix: isNiri && !isHyprland && !isSway && !isDwl
+    property bool showCompositorDiscord: isHyprland || isDwl
+    property bool showReddit: isNiri && !isHyprland && !isSway && !isDwl
 
     DankFlickable {
         anchors.fill: parent
@@ -40,18 +94,44 @@ Item {
                     anchors.margins: Theme.spacingL
                     spacing: Theme.spacingM
 
-                    Item {
-                        width: parent.width
-                        height: asciiText.implicitHeight
+                    Row {
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        spacing: Theme.spacingL
 
-                        StyledText {
-                            id: asciiText
+                        Image {
+                            id: logoImage
 
-                            text: "██████╗  █████╗ ███╗   ██╗██╗  ██╗\n██╔══██╗██╔══██╗████╗  ██║██║ ██╔╝\n██║  ██║███████║██╔██╗ ██║█████╔╝ \n██║  ██║██╔══██║██║╚██╗██║██╔═██╗ \n██████╔╝██║  ██║██║ ╚████║██║  ██╗\n╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝╚═╝  ╚═╝"
-                            isMonospace: true
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.primary
-                            anchors.centerIn: parent
+                            anchors.verticalCenter: parent.verticalCenter
+                            width: 120
+                            height: width * (569.94629 / 506.50931)
+                            fillMode: Image.PreserveAspectFit
+                            smooth: true
+                            mipmap: true
+                            asynchronous: true
+                            source: "file://" + Theme.shellDir + "/assets/danklogonormal.svg"
+                            layer.enabled: true
+                            layer.smooth: true
+                            layer.mipmap: true
+                            layer.effect: MultiEffect {
+                                saturation: 0
+                                colorization: 1
+                                colorizationColor: Theme.primary
+                            }
+                        }
+
+                        Text {
+                            anchors.verticalCenter: parent.verticalCenter
+                            text: "DANK LINUX"
+                            font.pixelSize: 48
+                            font.weight: Font.Bold
+                            font.family: interFont.name
+                            color: Theme.surfaceText
+                            antialiasing: true
+
+                            FontLoader {
+                                id: interFont
+                                source: Qt.resolvedUrl("../../assets/fonts/inter/InterVariable.ttf")
+                            }
                         }
                     }
 
@@ -69,14 +149,19 @@ Item {
                         anchors.horizontalCenter: parent.horizontalCenter
                         height: 24
                         width: {
-                            if (isHyprland) {
-                                return compositorButton.width + discordButton.width + Theme.spacingM + redditButton.width + Theme.spacingM
-                            } else {
-                                return compositorButton.width + matrixButton.width + 4 + discordButton.width + Theme.spacingM + redditButton.width + Theme.spacingM
+                            let baseWidth = compositorButton.width + dmsDiscordButton.width + Theme.spacingM
+                            if (showMatrix) {
+                                baseWidth += matrixButton.width + 4
                             }
+                            if (showCompositorDiscord) {
+                                baseWidth += compositorDiscordButton.width + Theme.spacingM
+                            }
+                            if (showReddit) {
+                                baseWidth += redditButton.width + Theme.spacingM
+                            }
+                            return baseWidth
                         }
 
-                        // Compositor logo (Niri or Hyprland)
                         Item {
                             id: compositorButton
                             width: 24
@@ -86,14 +171,14 @@ Item {
                             x: 0
 
                             property bool hovered: false
-                            property string tooltipText: isHyprland ? "Hyprland Website" : "niri GitHub"
+                            property string tooltipText: compositorTooltip
 
                             Image {
                                 anchors.fill: parent
                                 source: Qt.resolvedUrl(".").toString().replace(
                                             "file://", "").replace(
                                             "/Modules/Settings/",
-                                            "") + (isHyprland ? "/assets/hyprland.svg" : "/assets/niri.svg")
+                                            "") + compositorLogo
                                 sourceSize: Qt.size(24, 24)
                                 smooth: true
                                 fillMode: Image.PreserveAspectFit
@@ -105,18 +190,16 @@ Item {
                                 hoverEnabled: true
                                 onEntered: parent.hovered = true
                                 onExited: parent.hovered = false
-                                onClicked: Qt.openUrlExternally(
-                                               isHyprland ? "https://hypr.land" : "https://github.com/YaLTeR/niri")
+                                onClicked: Qt.openUrlExternally(compositorUrl)
                             }
                         }
 
-                        // Matrix button (only for Niri)
                         Item {
                             id: matrixButton
                             width: 30
                             height: 24
                             x: compositorButton.x + compositorButton.width + 4
-                            visible: !isHyprland
+                            visible: showMatrix
 
                             property bool hovered: false
                             property string tooltipText: "niri Matrix Chat"
@@ -149,16 +232,15 @@ Item {
                             }
                         }
 
-                        // Discord button
                         Item {
-                            id: discordButton
+                            id: dmsDiscordButton
                             width: 20
                             height: 20
-                            x: isHyprland ? compositorButton.x + compositorButton.width + Theme.spacingM : matrixButton.x + matrixButton.width + Theme.spacingM
+                            x: showMatrix ? matrixButton.x + matrixButton.width + Theme.spacingM : compositorButton.x + compositorButton.width + Theme.spacingM
                             anchors.verticalCenter: parent.verticalCenter
 
                             property bool hovered: false
-                            property string tooltipText: isHyprland ? "Hyprland Discord Server" : "niri Discord Server"
+                            property string tooltipText: dmsDiscordTooltip
 
                             Image {
                                 anchors.fill: parent
@@ -177,21 +259,52 @@ Item {
                                 hoverEnabled: true
                                 onEntered: parent.hovered = true
                                 onExited: parent.hovered = false
-                                onClicked: Qt.openUrlExternally(
-                                               isHyprland ? "https://discord.com/invite/hQ9XvMUjjr" : "https://discord.gg/vT8Sfjy7sx")
+                                onClicked: Qt.openUrlExternally(dmsDiscordUrl)
+                            }
+                        }
+
+                        Item {
+                            id: compositorDiscordButton
+                            width: 20
+                            height: 20
+                            x: dmsDiscordButton.x + dmsDiscordButton.width + Theme.spacingM
+                            anchors.verticalCenter: parent.verticalCenter
+                            visible: showCompositorDiscord
+
+                            property bool hovered: false
+                            property string tooltipText: compositorDiscordTooltip
+
+                            Image {
+                                anchors.fill: parent
+                                source: Qt.resolvedUrl(".").toString().replace(
+                                            "file://", "").replace(
+                                            "/Modules/Settings/",
+                                            "") + "/assets/discord.svg"
+                                sourceSize: Qt.size(20, 20)
+                                smooth: true
+                                fillMode: Image.PreserveAspectFit
+                            }
+
+                            MouseArea {
+                                anchors.fill: parent
+                                cursorShape: Qt.PointingHandCursor
+                                hoverEnabled: true
+                                onEntered: parent.hovered = true
+                                onExited: parent.hovered = false
+                                onClicked: Qt.openUrlExternally(compositorDiscordUrl)
                             }
                         }
 
-                        // Reddit button
                         Item {
                             id: redditButton
                             width: 20
                             height: 20
-                            x: discordButton.x + discordButton.width + Theme.spacingM
+                            x: showCompositorDiscord ? compositorDiscordButton.x + compositorDiscordButton.width + Theme.spacingM : dmsDiscordButton.x + dmsDiscordButton.width + Theme.spacingM
                             anchors.verticalCenter: parent.verticalCenter
+                            visible: showReddit
 
                             property bool hovered: false
-                            property string tooltipText: isHyprland ? "r/hyprland Subreddit" : "r/niri Subreddit"
+                            property string tooltipText: redditTooltip
 
                             Image {
                                 anchors.fill: parent
@@ -210,8 +323,7 @@ Item {
                                 hoverEnabled: true
                                 onEntered: parent.hovered = true
                                 onExited: parent.hovered = false
-                                onClicked: Qt.openUrlExternally(
-                                               isHyprland ? "https://reddit.com/r/hyprland" : "https://reddit.com/r/niri")
+                                onClicked: Qt.openUrlExternally(redditUrl)
                             }
                         }
                     }
@@ -506,8 +618,9 @@ Item {
         property var hoveredButton: {
             if (compositorButton.hovered) return compositorButton
             if (matrixButton.visible && matrixButton.hovered) return matrixButton
-            if (discordButton.hovered) return discordButton
-            if (redditButton.hovered) return redditButton
+            if (dmsDiscordButton.hovered) return dmsDiscordButton
+            if (compositorDiscordButton.visible && compositorDiscordButton.hovered) return compositorDiscordButton
+            if (redditButton.visible && redditButton.hovered) return redditButton
             return null
         }
 

Modules/Settings/DankBarTab.qml

@@ -1781,6 +1781,9 @@ Item {
                                                   } else if (widgetId === "runningApps") {
                                                       SettingsData.setRunningAppsCompactMode(
                                                           value)
+                                                  } else if (widgetId === "keyboard_layout_name") {
+                                                      SettingsData.setKeyboardLayoutNameCompactMode(
+                                                          value)
                                                   }
                                               }
                         onControlCenterSettingChanged: (sectionId, widgetIndex, settingName, value) => {
@@ -1857,6 +1860,9 @@ Item {
                                                   } else if (widgetId === "runningApps") {
                                                       SettingsData.setRunningAppsCompactMode(
                                                           value)
+                                                  } else if (widgetId === "keyboard_layout_name") {
+                                                      SettingsData.setKeyboardLayoutNameCompactMode(
+                                                          value)
                                                   }
                                               }
                         onControlCenterSettingChanged: (sectionId, widgetIndex, settingName, value) => {
@@ -1933,6 +1939,9 @@ Item {
                                                   } else if (widgetId === "runningApps") {
                                                       SettingsData.setRunningAppsCompactMode(
                                                           value)
+                                                  } else if (widgetId === "keyboard_layout_name") {
+                                                      SettingsData.setKeyboardLayoutNameCompactMode(
+                                                          value)
                                                   }
                                               }
                         onControlCenterSettingChanged: (sectionId, widgetIndex, settingName, value) => {

Modules/Settings/DisplaysTab.qml

@@ -145,14 +145,14 @@ Item {
 
                     Column {
                         width: parent.width
-                        spacing: 0
+                        spacing: Theme.spacingS
                         leftPadding: Theme.spacingM
                         rightPadding: Theme.spacingM
                         visible: DisplayService.gammaControlAvailable
 
                         DankDropdown {
                             width: parent.width - parent.leftPadding - parent.rightPadding
-                            text: I18n.tr("Temperature")
+                            text: I18n.tr("Night Temperature")
                             description: I18n.tr("Color temperature for night mode")
                             currentValue: SessionData.nightModeTemperature + "K"
                             options: {
@@ -165,6 +165,30 @@ Item {
                             onValueChanged: value => {
                                                 var temp = parseInt(value.replace("K", ""))
                                                 SessionData.setNightModeTemperature(temp)
+                                                if (SessionData.nightModeHighTemperature < temp) {
+                                                    SessionData.setNightModeHighTemperature(temp)
+                                                }
+                                            }
+                        }
+
+                        DankDropdown {
+                            width: parent.width - parent.leftPadding - parent.rightPadding
+                            text: I18n.tr("Day Temperature")
+                            description: I18n.tr("Color temperature for day time")
+                            currentValue: SessionData.nightModeHighTemperature + "K"
+                            options: {
+                                var temps = []
+                                var minTemp = SessionData.nightModeTemperature
+                                for (var i = Math.max(2500, minTemp); i <= 10000; i += 500) {
+                                    temps.push(i + "K")
+                                }
+                                return temps
+                            }
+                            onValueChanged: value => {
+                                                var temp = parseInt(value.replace("K", ""))
+                                                if (temp >= SessionData.nightModeTemperature) {
+                                                    SessionData.setNightModeHighTemperature(temp)
+                                                }
                                             }
                         }
                     }
@@ -697,7 +721,7 @@ Item {
                                         text: I18n.tr("Show on Last Display")
                                         description: I18n.tr("Always show when there's only one connected display")
                                         checked: displaysTab.getShowOnLastDisplay(parent.componentId)
-                                        visible: !displaysTab.getScreenPreferences(parent.componentId).includes("all") && ["dankBar", "dock", "notifications", "osd", "toast"].includes(parent.componentId)
+                                        visible: !displaysTab.getScreenPreferences(parent.componentId).includes("all") && ["dankBar", "dock", "notifications", "osd", "toast", "notepad", "systemTray"].includes(parent.componentId)
                                         onToggled: (checked) => {
                                             displaysTab.setShowOnLastDisplay(parent.componentId, checked);
                                         }

Modules/Settings/LauncherTab.qml

@@ -86,10 +86,17 @@ Item {
                             id: logoModeGroup
                             anchors.horizontalCenter: parent.horizontalCenter
                             model: {
-                                const modes = [I18n.tr("Apps Icon"), I18n.tr("OS Logo")]
-                                if (CompositorService.isNiri || CompositorService.isHyprland) {
-                                    const compositorName = CompositorService.isNiri ? "niri" : "Hyprland"
-                                    modes.push(compositorName)
+                                const modes = [I18n.tr("Apps Icon"), I18n.tr("OS Logo"), I18n.tr("Dank")]
+                                if (CompositorService.isNiri) {
+                                    modes.push("niri")
+                                } else if (CompositorService.isHyprland) {
+                                    modes.push("Hyprland")
+                                } else if (CompositorService.isDwl) {
+                                    modes.push("mango")
+                                } else if (CompositorService.isSway) {
+                                    modes.push("Sway")
+                                } else {
+                                    modes.push(I18n.tr("Compositor"))
                                 }
                                 modes.push(I18n.tr("Custom"))
                                 return modes
@@ -97,12 +104,9 @@ Item {
                             currentIndex: {
                                 if (SettingsData.launcherLogoMode === "apps") return 0
                                 if (SettingsData.launcherLogoMode === "os") return 1
-                                if (SettingsData.launcherLogoMode === "compositor") {
-                                    return (CompositorService.isNiri || CompositorService.isHyprland) ? 2 : -1
-                                }
-                                if (SettingsData.launcherLogoMode === "custom") {
-                                    return (CompositorService.isNiri || CompositorService.isHyprland) ? 3 : 2
-                                }
+                                if (SettingsData.launcherLogoMode === "dank") return 2
+                                if (SettingsData.launcherLogoMode === "compositor") return 3
+                                if (SettingsData.launcherLogoMode === "custom") return 4
                                 return 0
                             }
                             onSelectionChanged: (index, selected) => {
@@ -111,13 +115,11 @@ Item {
                                     SettingsData.setLauncherLogoMode("apps")
                                 } else if (index === 1) {
                                     SettingsData.setLauncherLogoMode("os")
-                                } else if (CompositorService.isNiri || CompositorService.isHyprland) {
-                                    if (index === 2) {
-                                        SettingsData.setLauncherLogoMode("compositor")
-                                    } else if (index === 3) {
-                                        SettingsData.setLauncherLogoMode("custom")
-                                    }
                                 } else if (index === 2) {
+                                    SettingsData.setLauncherLogoMode("dank")
+                                } else if (index === 3) {
+                                    SettingsData.setLauncherLogoMode("compositor")
+                                } else if (index === 4) {
                                     SettingsData.setLauncherLogoMode("custom")
                                 }
                             }

Modules/Settings/PersonalizationTab.qml

@@ -130,32 +130,10 @@ Item {
                             CachingImage {
                                 anchors.fill: parent
                                 anchors.margins: 1
-                                property var weExtensions: [".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tga"]
-                                property int weExtIndex: 0
                                 source: {
                                     var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
-                                    if (currentWallpaper && currentWallpaper.startsWith("we:")) {
-                                        var sceneId = currentWallpaper.substring(3)
-                                        return StandardPaths.writableLocation(StandardPaths.HomeLocation)
-                                            + "/.local/share/Steam/steamapps/workshop/content/431960/"
-                                            + sceneId + "/preview" + weExtensions[weExtIndex]
-                                    }
                                     return (currentWallpaper !== "" && !currentWallpaper.startsWith("#")) ? "file://" + currentWallpaper : ""
                                 }
-                                onStatusChanged: {
-                                    var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
-                                    if (currentWallpaper && currentWallpaper.startsWith("we:") && status === Image.Error) {
-                                        if (weExtIndex < weExtensions.length - 1) {
-                                            weExtIndex++
-                                            source = StandardPaths.writableLocation(StandardPaths.HomeLocation)
-                                                + "/.local/share/Steam/steamapps/workshop/content/431960/"
-                                                + currentWallpaper.substring(3)
-                                                + "/preview" + weExtensions[weExtIndex]
-                                        } else {
-                                            visible = false
-                                        }
-                                    }
-                                }
                                 fillMode: Image.PreserveAspectCrop
                                 visible: {
                                     var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
@@ -241,7 +219,6 @@ Item {
                                         }
                                     }
 
-
                                     Rectangle {
                                         width: 32
                                         height: 32
@@ -263,7 +240,7 @@ Item {
                                                     var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
                                                     PopoutService.colorPickerModal.selectedColor = currentWallpaper.startsWith("#") ? currentWallpaper : Theme.primary
                                                     PopoutService.colorPickerModal.pickerTitle = "Choose Wallpaper Color"
-                                                    PopoutService.colorPickerModal.onColorSelectedCallback = function(selectedColor) {
+                                                    PopoutService.colorPickerModal.onColorSelectedCallback = function (selectedColor) {
                                                         if (SessionData.perMonitorWallpaper) {
                                                             SessionData.setMonitorWallpaper(selectedMonitorName, selectedColor)
                                                         } else {
@@ -434,11 +411,11 @@ Item {
                                 return modes.indexOf(SettingsData.wallpaperFillMode)
                             }
                             onSelectionChanged: (index, selected) => {
-                                if (selected) {
-                                    const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
-                                    SettingsData.setWallpaperFillMode(modes[index])
-                                }
-                            }
+                                                    if (selected) {
+                                                        const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
+                                                        SettingsData.setWallpaperFillMode(modes[index])
+                                                    }
+                                                }
 
                             Connections {
                                 target: SettingsData
@@ -452,67 +429,14 @@ Item {
                                 target: personalizationTab
                                 function onSelectedMonitorNameChanged() {
                                     Qt.callLater(() => {
-                                        const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
-                                        fillModeGroup.currentIndex = modes.indexOf(SettingsData.wallpaperFillMode)
-                                    })
+                                                     const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
+                                                     fillModeGroup.currentIndex = modes.indexOf(SettingsData.wallpaperFillMode)
+                                                 })
                                 }
                             }
                         }
                     }
 
-                    Rectangle {
-                        width: parent.width
-                        height: 1
-                        color: Theme.outline
-                        opacity: 0.2
-                        visible: CompositorService.isNiri
-                    }
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-                        visible: CompositorService.isNiri
-
-                        DankIcon {
-                            name: "blur_on"
-                            size: Theme.iconSize
-                            color: SettingsData.blurWallpaperOnOverview ? Theme.primary : Theme.surfaceVariantText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        Column {
-                            width: parent.width - Theme.iconSize - Theme.spacingM - blurOverviewToggle.width - Theme.spacingM
-                            spacing: Theme.spacingXS
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            StyledText {
-                                text: I18n.tr("Blur on Overview")
-                                font.pixelSize: Theme.fontSizeLarge
-                                font.weight: Font.Medium
-                                color: Theme.surfaceText
-                            }
-
-                            StyledText {
-                                text: I18n.tr("Blur wallpaper when niri overview is open")
-                                font.pixelSize: Theme.fontSizeSmall
-                                color: Theme.surfaceVariantText
-                                wrapMode: Text.WordWrap
-                                width: parent.width
-                            }
-                        }
-
-                        DankToggle {
-                            id: blurOverviewToggle
-
-                            anchors.verticalCenter: parent.verticalCenter
-                            checked: SettingsData.blurWallpaperOnOverview
-                            onToggled: checked => {
-                                SettingsData.setBlurWallpaperOnOverview(checked)
-                            }
-                        }
-                    }
-
-                    // Per-Mode Wallpaper Section - Full Width
                     Rectangle {
                         width: parent.width
                         height: 1
@@ -567,9 +491,450 @@ Item {
                                            }
                             }
                         }
+
+                        Column {
+                            width: parent.width
+                            spacing: Theme.spacingM
+                            visible: SessionData.perModeWallpaper
+
+                            Row {
+                                anchors.horizontalCenter: parent.horizontalCenter
+                                width: parent.width
+                                spacing: Theme.spacingL
+
+                                Column {
+                                    width: (parent.width - Theme.spacingL) / 2
+                                    spacing: Theme.spacingS
+
+                                    StyledText {
+                                        text: I18n.tr("Light Mode")
+                                        font.pixelSize: Theme.fontSizeMedium
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                    }
+
+                                    StyledRect {
+                                        width: parent.width
+                                        height: width * 9 / 16
+                                        radius: Theme.cornerRadius
+                                        color: Theme.surfaceVariant
+                                        border.color: Theme.outline
+                                        border.width: 0
+
+                                        CachingImage {
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            source: {
+                                                var lightWallpaper = SessionData.wallpaperPathLight
+                                                return (lightWallpaper !== "" && !lightWallpaper.startsWith("#")) ? "file://" + lightWallpaper : ""
+                                            }
+                                            fillMode: Image.PreserveAspectCrop
+                                            visible: {
+                                                var lightWallpaper = SessionData.wallpaperPathLight
+                                                return lightWallpaper !== "" && !lightWallpaper.startsWith("#")
+                                            }
+                                            maxCacheSize: 160
+                                            layer.enabled: true
+
+                                            layer.effect: MultiEffect {
+                                                maskEnabled: true
+                                                maskSource: lightMask
+                                                maskThresholdMin: 0.5
+                                                maskSpreadAtMin: 1
+                                            }
+                                        }
+
+                                        Rectangle {
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            radius: Theme.cornerRadius - 1
+                                            color: {
+                                                var lightWallpaper = SessionData.wallpaperPathLight
+                                                return lightWallpaper.startsWith("#") ? lightWallpaper : "transparent"
+                                            }
+                                            visible: {
+                                                var lightWallpaper = SessionData.wallpaperPathLight
+                                                return lightWallpaper !== "" && lightWallpaper.startsWith("#")
+                                            }
+                                        }
+
+                                        Rectangle {
+                                            id: lightMask
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            radius: Theme.cornerRadius - 1
+                                            color: "black"
+                                            visible: false
+                                            layer.enabled: true
+                                        }
+
+                                        DankIcon {
+                                            anchors.centerIn: parent
+                                            name: "light_mode"
+                                            size: Theme.iconSizeLarge
+                                            color: Theme.surfaceVariantText
+                                            visible: SessionData.wallpaperPathLight === ""
+                                        }
+
+                                        Rectangle {
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            radius: Theme.cornerRadius - 1
+                                            color: Qt.rgba(0, 0, 0, 0.7)
+                                            visible: lightModeMouseArea.containsMouse
+
+                                            Row {
+                                                anchors.centerIn: parent
+                                                spacing: 4
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: Qt.rgba(255, 255, 255, 0.9)
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: "folder_open"
+                                                        size: 16
+                                                        color: "black"
+                                                    }
+
+                                                    MouseArea {
+                                                        anchors.fill: parent
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            lightWallpaperBrowserLoader.active = true
+                                                        }
+                                                    }
+                                                }
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: Qt.rgba(255, 255, 255, 0.9)
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: "palette"
+                                                        size: 16
+                                                        color: "black"
+                                                    }
+
+                                                    MouseArea {
+                                                        anchors.fill: parent
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            if (PopoutService.colorPickerModal) {
+                                                                var lightWallpaper = SessionData.wallpaperPathLight
+                                                                PopoutService.colorPickerModal.selectedColor = lightWallpaper.startsWith("#") ? lightWallpaper : Theme.primary
+                                                                PopoutService.colorPickerModal.pickerTitle = "Choose Light Mode Color"
+                                                                PopoutService.colorPickerModal.onColorSelectedCallback = function(selectedColor) {
+                                                                    SessionData.wallpaperPathLight = selectedColor
+                                                                    SessionData.syncWallpaperForCurrentMode()
+                                                                    SessionData.saveSettings()
+                                                                }
+                                                                PopoutService.colorPickerModal.show()
+                                                            }
+                                                        }
+                                                    }
+                                                }
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: Qt.rgba(255, 255, 255, 0.9)
+                                                    visible: SessionData.wallpaperPathLight !== ""
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: "clear"
+                                                        size: 16
+                                                        color: "black"
+                                                    }
+
+                                                    MouseArea {
+                                                        anchors.fill: parent
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            SessionData.wallpaperPathLight = ""
+                                                            SessionData.syncWallpaperForCurrentMode()
+                                                            SessionData.saveSettings()
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        MouseArea {
+                                            id: lightModeMouseArea
+                                            anchors.fill: parent
+                                            hoverEnabled: true
+                                            cursorShape: Qt.PointingHandCursor
+                                            propagateComposedEvents: true
+                                            acceptedButtons: Qt.NoButton
+                                        }
+                                    }
+
+                                    StyledText {
+                                        text: {
+                                            var lightWallpaper = SessionData.wallpaperPathLight
+                                            return lightWallpaper ? lightWallpaper.split('/').pop() : "Not set"
+                                        }
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceVariantText
+                                        elide: Text.ElideMiddle
+                                        maximumLineCount: 1
+                                        width: parent.width
+                                    }
+                                }
+
+                                Column {
+                                    width: (parent.width - Theme.spacingL) / 2
+                                    spacing: Theme.spacingS
+
+                                    StyledText {
+                                        text: I18n.tr("Dark Mode")
+                                        font.pixelSize: Theme.fontSizeMedium
+                                        color: Theme.surfaceText
+                                        font.weight: Font.Medium
+                                    }
+
+                                    StyledRect {
+                                        width: parent.width
+                                        height: width * 9 / 16
+                                        radius: Theme.cornerRadius
+                                        color: Theme.surfaceVariant
+                                        border.color: Theme.outline
+                                        border.width: 0
+
+                                        CachingImage {
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            source: {
+                                                var darkWallpaper = SessionData.wallpaperPathDark
+                                                return (darkWallpaper !== "" && !darkWallpaper.startsWith("#")) ? "file://" + darkWallpaper : ""
+                                            }
+                                            fillMode: Image.PreserveAspectCrop
+                                            visible: {
+                                                var darkWallpaper = SessionData.wallpaperPathDark
+                                                return darkWallpaper !== "" && !darkWallpaper.startsWith("#")
+                                            }
+                                            maxCacheSize: 160
+                                            layer.enabled: true
+
+                                            layer.effect: MultiEffect {
+                                                maskEnabled: true
+                                                maskSource: darkMask
+                                                maskThresholdMin: 0.5
+                                                maskSpreadAtMin: 1
+                                            }
+                                        }
+
+                                        Rectangle {
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            radius: Theme.cornerRadius - 1
+                                            color: {
+                                                var darkWallpaper = SessionData.wallpaperPathDark
+                                                return darkWallpaper.startsWith("#") ? darkWallpaper : "transparent"
+                                            }
+                                            visible: {
+                                                var darkWallpaper = SessionData.wallpaperPathDark
+                                                return darkWallpaper !== "" && darkWallpaper.startsWith("#")
+                                            }
+                                        }
+
+                                        Rectangle {
+                                            id: darkMask
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            radius: Theme.cornerRadius - 1
+                                            color: "black"
+                                            visible: false
+                                            layer.enabled: true
+                                        }
+
+                                        DankIcon {
+                                            anchors.centerIn: parent
+                                            name: "dark_mode"
+                                            size: Theme.iconSizeLarge
+                                            color: Theme.surfaceVariantText
+                                            visible: SessionData.wallpaperPathDark === ""
+                                        }
+
+                                        Rectangle {
+                                            anchors.fill: parent
+                                            anchors.margins: 1
+                                            radius: Theme.cornerRadius - 1
+                                            color: Qt.rgba(0, 0, 0, 0.7)
+                                            visible: darkModeMouseArea.containsMouse
+
+                                            Row {
+                                                anchors.centerIn: parent
+                                                spacing: 4
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: Qt.rgba(255, 255, 255, 0.9)
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: "folder_open"
+                                                        size: 16
+                                                        color: "black"
+                                                    }
+
+                                                    MouseArea {
+                                                        anchors.fill: parent
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            darkWallpaperBrowserLoader.active = true
+                                                        }
+                                                    }
+                                                }
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: Qt.rgba(255, 255, 255, 0.9)
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: "palette"
+                                                        size: 16
+                                                        color: "black"
+                                                    }
+
+                                                    MouseArea {
+                                                        anchors.fill: parent
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            if (PopoutService.colorPickerModal) {
+                                                                var darkWallpaper = SessionData.wallpaperPathDark
+                                                                PopoutService.colorPickerModal.selectedColor = darkWallpaper.startsWith("#") ? darkWallpaper : Theme.primary
+                                                                PopoutService.colorPickerModal.pickerTitle = "Choose Dark Mode Color"
+                                                                PopoutService.colorPickerModal.onColorSelectedCallback = function(selectedColor) {
+                                                                    SessionData.wallpaperPathDark = selectedColor
+                                                                    SessionData.syncWallpaperForCurrentMode()
+                                                                    SessionData.saveSettings()
+                                                                }
+                                                                PopoutService.colorPickerModal.show()
+                                                            }
+                                                        }
+                                                    }
+                                                }
+
+                                                Rectangle {
+                                                    width: 28
+                                                    height: 28
+                                                    radius: 14
+                                                    color: Qt.rgba(255, 255, 255, 0.9)
+                                                    visible: SessionData.wallpaperPathDark !== ""
+
+                                                    DankIcon {
+                                                        anchors.centerIn: parent
+                                                        name: "clear"
+                                                        size: 16
+                                                        color: "black"
+                                                    }
+
+                                                    MouseArea {
+                                                        anchors.fill: parent
+                                                        cursorShape: Qt.PointingHandCursor
+                                                        onClicked: {
+                                                            SessionData.wallpaperPathDark = ""
+                                                            SessionData.syncWallpaperForCurrentMode()
+                                                            SessionData.saveSettings()
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+
+                                        MouseArea {
+                                            id: darkModeMouseArea
+                                            anchors.fill: parent
+                                            hoverEnabled: true
+                                            cursorShape: Qt.PointingHandCursor
+                                            propagateComposedEvents: true
+                                            acceptedButtons: Qt.NoButton
+                                        }
+                                    }
+
+                                    StyledText {
+                                        text: {
+                                            var darkWallpaper = SessionData.wallpaperPathDark
+                                            return darkWallpaper ? darkWallpaper.split('/').pop() : "Not set"
+                                        }
+                                        font.pixelSize: Theme.fontSizeSmall
+                                        color: Theme.surfaceVariantText
+                                        elide: Text.ElideMiddle
+                                        maximumLineCount: 1
+                                        width: parent.width
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    Rectangle {
+                        width: parent.width
+                        height: 1
+                        color: Theme.outline
+                        opacity: 0.2
+                        visible: CompositorService.isNiri
+                    }
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+                        visible: CompositorService.isNiri
+
+                        DankIcon {
+                            name: "blur_on"
+                            size: Theme.iconSize
+                            color: SettingsData.blurWallpaperOnOverview ? Theme.primary : Theme.surfaceVariantText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Column {
+                            width: parent.width - Theme.iconSize - Theme.spacingM - blurOverviewToggle.width - Theme.spacingM
+                            spacing: Theme.spacingXS
+                            anchors.verticalCenter: parent.verticalCenter
+
+                            StyledText {
+                                text: I18n.tr("Blur on Overview")
+                                font.pixelSize: Theme.fontSizeLarge
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                            }
+
+                            StyledText {
+                                text: I18n.tr("Blur wallpaper when niri overview is open")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                wrapMode: Text.WordWrap
+                                width: parent.width
+                            }
+                        }
+
+                        DankToggle {
+                            id: blurOverviewToggle
+
+                            anchors.verticalCenter: parent.verticalCenter
+                            checked: SettingsData.blurWallpaperOnOverview
+                            onToggled: checked => {
+                                           SettingsData.setBlurWallpaperOnOverview(checked)
+                                       }
+                        }
                     }
 
-                    // Per-Monitor Wallpaper Section - Full Width
                     Rectangle {
                         width: parent.width
                         height: 1
@@ -641,7 +1006,7 @@ Item {
                             DankDropdown {
                                 id: monitorDropdown
 
-                                text: I18n.tr("Monitor")
+                                text: I18n.tr("Wallpaper Monitor")
                                 description: I18n.tr("Select monitor to configure wallpaper")
                                 currentValue: selectedMonitorName || "No monitors"
                                 options: {
@@ -656,6 +1021,36 @@ Item {
                                                     selectedMonitorName = value
                                                 }
                             }
+
+                            DankDropdown {
+                                id: matugenTargetDropdown
+
+                                text: I18n.tr("Matugen Target Monitor")
+                                description: I18n.tr("Monitor whose wallpaper drives dynamic theming colors")
+                                currentValue: {
+                                    if (!SettingsData.matugenTargetMonitor || SettingsData.matugenTargetMonitor === "") {
+                                        var screens = Quickshell.screens
+                                        return screens.length > 0 ? screens[0].name + " (Default)" : "No monitors"
+                                    }
+                                    return SettingsData.matugenTargetMonitor
+                                }
+                                options: {
+                                    var screenNames = []
+                                    var screens = Quickshell.screens
+                                    for (var i = 0; i < screens.length; i++) {
+                                        var label = screens[i].name
+                                        if (i === 0 && (!SettingsData.matugenTargetMonitor || SettingsData.matugenTargetMonitor === "")) {
+                                            label += " (Default)"
+                                        }
+                                        screenNames.push(label)
+                                    }
+                                    return screenNames
+                                }
+                                onValueChanged: value => {
+                                                    var cleanValue = value.replace(" (Default)", "")
+                                                    SettingsData.setMatugenTargetMonitor(cleanValue)
+                                                }
+                            }
                         }
                     }
 
@@ -720,8 +1115,8 @@ Item {
                                     target: personalizationTab
                                     function onSelectedMonitorNameChanged() {
                                         cyclingToggle.checked = Qt.binding(() => {
-                                            return SessionData.perMonitorWallpaper ? SessionData.getMonitorCyclingSettings(selectedMonitorName).enabled : SessionData.wallpaperCyclingEnabled
-                                        })
+                                                                               return SessionData.perMonitorWallpaper ? SessionData.getMonitorCyclingSettings(selectedMonitorName).enabled : SessionData.wallpaperCyclingEnabled
+                                                                           })
                                     }
                                 }
                             }
@@ -779,12 +1174,12 @@ Item {
                                             target: personalizationTab
                                             function onSelectedMonitorNameChanged() {
                                                 modeTabBar.currentIndex = Qt.binding(() => {
-                                                    if (SessionData.perMonitorWallpaper) {
-                                                        return SessionData.getMonitorCyclingSettings(selectedMonitorName).mode === "time" ? 1 : 0
-                                                    } else {
-                                                        return SessionData.wallpaperCyclingMode === "time" ? 1 : 0
-                                                    }
-                                                })
+                                                                                         if (SessionData.perMonitorWallpaper) {
+                                                                                             return SessionData.getMonitorCyclingSettings(selectedMonitorName).mode === "time" ? 1 : 0
+                                                                                         } else {
+                                                                                             return SessionData.wallpaperCyclingMode === "time" ? 1 : 0
+                                                                                         }
+                                                                                     })
                                                 Qt.callLater(modeTabBar.updateIndicator)
                                             }
                                         }
@@ -835,15 +1230,15 @@ Item {
                                     function onSelectedMonitorNameChanged() {
                                         // Force dropdown to refresh its currentValue
                                         Qt.callLater(() => {
-                                            var currentSeconds
-                                            if (SessionData.perMonitorWallpaper) {
-                                                currentSeconds = SessionData.getMonitorCyclingSettings(selectedMonitorName).interval
-                                            } else {
-                                                currentSeconds = SessionData.wallpaperCyclingInterval
-                                            }
-                                            const index = intervalDropdown.intervalValues.indexOf(currentSeconds)
-                                            intervalDropdown.currentValue = index >= 0 ? intervalDropdown.intervalOptions[index] : "5 minutes"
-                                        })
+                                                         var currentSeconds
+                                                         if (SessionData.perMonitorWallpaper) {
+                                                             currentSeconds = SessionData.getMonitorCyclingSettings(selectedMonitorName).interval
+                                                         } else {
+                                                             currentSeconds = SessionData.wallpaperCyclingInterval
+                                                         }
+                                                         const index = intervalDropdown.intervalValues.indexOf(currentSeconds)
+                                                         intervalDropdown.currentValue = index >= 0 ? intervalDropdown.intervalOptions[index] : "5 minutes"
+                                                     })
                                     }
                                 }
                             }
@@ -925,12 +1320,12 @@ Item {
                                         function onSelectedMonitorNameChanged() {
                                             // Force text field to refresh its value
                                             Qt.callLater(() => {
-                                                if (SessionData.perMonitorWallpaper) {
-                                                    timeTextField.text = SessionData.getMonitorCyclingSettings(selectedMonitorName).time
-                                                } else {
-                                                    timeTextField.text = SessionData.wallpaperCyclingTime
-                                                }
-                                            })
+                                                             if (SessionData.perMonitorWallpaper) {
+                                                                 timeTextField.text = SessionData.getMonitorCyclingSettings(selectedMonitorName).time
+                                                             } else {
+                                                                 timeTextField.text = SessionData.wallpaperCyclingTime
+                                                             }
+                                                         })
                                         }
                                     }
                                 }
@@ -956,14 +1351,15 @@ Item {
                         text: I18n.tr("Transition Effect")
                         description: I18n.tr("Visual effect used when wallpaper changes")
                         currentValue: {
-                            if (SessionData.wallpaperTransition === "random") return "Random"
+                            if (SessionData.wallpaperTransition === "random")
+                                return "Random"
                             return SessionData.wallpaperTransition.charAt(0).toUpperCase() + SessionData.wallpaperTransition.slice(1)
                         }
                         options: ["Random"].concat(SessionData.availableWallpaperTransitions.map(t => t.charAt(0).toUpperCase() + t.slice(1)))
                         onValueChanged: value => {
-                            var transition = value.toLowerCase()
-                            SessionData.setWallpaperTransition(transition)
-                        }
+                                            var transition = value.toLowerCase()
+                                            SessionData.setWallpaperTransition(transition)
+                                        }
                     }
 
                     Column {
@@ -995,17 +1391,17 @@ Item {
                             currentSelection: SessionData.includedTransitions
 
                             onSelectionChanged: (index, selected) => {
-                                const transition = model[index]
-                                let newIncluded = [...SessionData.includedTransitions]
+                                                    const transition = model[index]
+                                                    let newIncluded = [...SessionData.includedTransitions]
 
-                                if (selected && !newIncluded.includes(transition)) {
-                                    newIncluded.push(transition)
-                                } else if (!selected && newIncluded.includes(transition)) {
-                                    newIncluded = newIncluded.filter(t => t !== transition)
-                                }
+                                                    if (selected && !newIncluded.includes(transition)) {
+                                                        newIncluded.push(transition)
+                                                    } else if (!selected && newIncluded.includes(transition)) {
+                                                        newIncluded = newIncluded.filter(t => t !== transition)
+                                                    }
 
-                                SessionData.includedTransitions = newIncluded
-                            }
+                                                    SessionData.includedTransitions = newIncluded
+                                                }
                         }
                     }
                 }
@@ -1065,8 +1461,8 @@ Item {
                             anchors.verticalCenter: parent.verticalCenter
                             checked: SettingsData.blurredWallpaperLayer
                             onToggled: checked => {
-                                SettingsData.setBlurredWallpaperLayer(checked)
-                            }
+                                           SettingsData.setBlurredWallpaperLayer(checked)
+                                       }
                         }
                     }
                 }
@@ -1122,9 +1518,9 @@ Item {
                         anchors.verticalCenter: parent.verticalCenter
                         checked: SessionData.isLightMode
                         onToggleCompleted: checked => {
-                                       Theme.screenTransition()
-                                       Theme.setLightMode(checked)
-                                   }
+                                               Theme.screenTransition()
+                                               Theme.setLightMode(checked)
+                                           }
                     }
                 }
             }
@@ -1176,10 +1572,10 @@ Item {
                             selectionMode: "single"
                             currentIndex: SettingsData.animationSpeed
                             onSelectionChanged: (index, selected) => {
-                                if (selected) {
-                                    SettingsData.setAnimationSpeed(index)
-                                }
-                            }
+                                                    if (selected) {
+                                                        SettingsData.setAnimationSpeed(index)
+                                                    }
+                                                }
 
                             Connections {
                                 target: SettingsData
@@ -1257,10 +1653,10 @@ Item {
                                         showValue: false
                                         wheelEnabled: false
 
-                                        onSliderValueChanged: (newValue) => {
-                                            SettingsData.setAnimationSpeed(SettingsData.AnimationSpeed.Custom)
-                                            SettingsData.setCustomAnimationDuration(newValue)
-                                        }
+                                        onSliderValueChanged: newValue => {
+                                                                  SettingsData.setAnimationSpeed(SettingsData.AnimationSpeed.Custom)
+                                                                  SettingsData.setCustomAnimationDuration(newValue)
+                                                              }
 
                                         Connections {
                                             target: SettingsData
@@ -1388,19 +1784,21 @@ Item {
                         id: personalizationMatugenPaletteDropdown
                         text: I18n.tr("Matugen Palette")
                         description: I18n.tr("Select the palette algorithm used for wallpaper-based colors")
-                        options: Theme.availableMatugenSchemes.map(function (option) { return option.label })
+                        options: Theme.availableMatugenSchemes.map(function (option) {
+                            return option.label
+                        })
                         currentValue: Theme.getMatugenScheme(SettingsData.matugenScheme).label
                         enabled: Theme.matugenAvailable
                         opacity: enabled ? 1 : 0.4
                         onValueChanged: value => {
-                            for (var i = 0; i < Theme.availableMatugenSchemes.length; i++) {
-                                var option = Theme.availableMatugenSchemes[i]
-                                if (option.label === value) {
-                                    SettingsData.setMatugenScheme(option.value)
-                                    break
-                                }
-                            }
-                        }
+                                            for (var i = 0; i < Theme.availableMatugenSchemes.length; i++) {
+                                                var option = Theme.availableMatugenSchemes[i]
+                                                if (option.label === value) {
+                                                    SettingsData.setMatugenScheme(option.value)
+                                                    break
+                                                }
+                                            }
+                                        }
                     }
 
                     StyledText {
@@ -1459,8 +1857,8 @@ Item {
                             checked: SettingsData.runUserMatugenTemplates
                             enabled: Theme.matugenAvailable
                             onToggled: checked => {
-                                SettingsData.setRunUserMatugenTemplates(checked)
-                            }
+                                           SettingsData.setRunUserMatugenTemplates(checked)
+                                       }
                         }
                     }
 
@@ -1528,8 +1926,8 @@ Item {
                             anchors.verticalCenter: parent.verticalCenter
                             checked: SettingsData.soundsEnabled
                             onToggled: checked => {
-                                SettingsData.setSoundsEnabled(checked)
-                            }
+                                           SettingsData.setSoundsEnabled(checked)
+                                       }
                         }
                     }
 
@@ -1576,8 +1974,8 @@ Item {
                                 anchors.verticalCenter: parent.verticalCenter
                                 checked: SettingsData.useSystemSoundTheme
                                 onToggled: checked => {
-                                    SettingsData.setUseSystemSoundTheme(checked)
-                                }
+                                               SettingsData.setUseSystemSoundTheme(checked)
+                                           }
                             }
                         }
 
@@ -1598,10 +1996,10 @@ Item {
                                 return AudioService.availableSoundThemes.length > 0 ? AudioService.availableSoundThemes[0] : ""
                             }
                             onValueChanged: value => {
-                                if (value && value !== AudioService.currentSoundTheme) {
-                                    AudioService.setSoundTheme(value)
-                                }
-                            }
+                                                if (value && value !== AudioService.currentSoundTheme) {
+                                                    AudioService.setSoundTheme(value)
+                                                }
+                                            }
                         }
 
                         Rectangle {
@@ -1641,8 +2039,8 @@ Item {
                                 anchors.verticalCenter: parent.verticalCenter
                                 checked: SettingsData.soundNewNotification
                                 onToggled: checked => {
-                                    SettingsData.setSoundNewNotification(checked)
-                                }
+                                               SettingsData.setSoundNewNotification(checked)
+                                           }
                             }
                         }
 
@@ -1675,8 +2073,8 @@ Item {
                                 anchors.verticalCenter: parent.verticalCenter
                                 checked: SettingsData.soundVolumeChanged
                                 onToggled: checked => {
-                                    SettingsData.setSoundVolumeChanged(checked)
-                                }
+                                               SettingsData.setSoundVolumeChanged(checked)
+                                           }
                             }
                         }
 
@@ -1710,8 +2108,8 @@ Item {
                                 anchors.verticalCenter: parent.verticalCenter
                                 checked: SettingsData.soundPluggedIn
                                 onToggled: checked => {
-                                    SettingsData.setSoundPluggedIn(checked)
-                                }
+                                               SettingsData.setSoundPluggedIn(checked)
+                                           }
                             }
                         }
                     }
@@ -1748,4 +2146,58 @@ Item {
             }
         }
     }
+
+    Loader {
+        id: lightWallpaperBrowserLoader
+        active: false
+        asynchronous: true
+
+        sourceComponent: FileBrowserModal {
+            parentModal: personalizationTab.parentModal
+            Component.onCompleted: {
+                open()
+            }
+            browserTitle: "Select Light Mode Wallpaper"
+            browserIcon: "light_mode"
+            browserType: "wallpaper"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                                SessionData.wallpaperPathLight = path
+                                SessionData.syncWallpaperForCurrentMode()
+                                SessionData.saveSettings()
+                                close()
+                            }
+            onDialogClosed: {
+                Qt.callLater(() => lightWallpaperBrowserLoader.active = false)
+            }
+        }
+    }
+
+    Loader {
+        id: darkWallpaperBrowserLoader
+        active: false
+        asynchronous: true
+
+        sourceComponent: FileBrowserModal {
+            parentModal: personalizationTab.parentModal
+            Component.onCompleted: {
+                open()
+            }
+            browserTitle: "Select Dark Mode Wallpaper"
+            browserIcon: "dark_mode"
+            browserType: "wallpaper"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                                SessionData.wallpaperPathDark = path
+                                SessionData.syncWallpaperForCurrentMode()
+                                SessionData.saveSettings()
+                                close()
+                            }
+            onDialogClosed: {
+                Qt.callLater(() => darkWallpaperBrowserLoader.active = false)
+            }
+        }
+    }
 }

Modules/Settings/PluginBrowser.qml

@@ -0,0 +1,646 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import qs.Common
+import qs.Modals.Common
+import qs.Services
+import qs.Widgets
+
+DankModal {
+    id: root
+
+    property var allPlugins: []
+    property string searchQuery: ""
+    property var filteredPlugins: []
+    property int selectedIndex: -1
+    property bool keyboardNavigationActive: false
+    property bool isLoading: false
+    property var parentModal: null
+
+    width: 600
+    height: 650
+    allowStacking: true
+    backgroundOpacity: 0
+    closeOnEscapeKey: false
+
+    function updateFilteredPlugins() {
+        var filtered = []
+        var query = searchQuery ? searchQuery.toLowerCase() : ""
+
+        for (var i = 0; i < allPlugins.length; i++) {
+            var plugin = allPlugins[i]
+            var isFirstParty = plugin.firstParty || false
+
+            if (!SessionData.showThirdPartyPlugins && !isFirstParty) {
+                continue
+            }
+
+            if (query.length > 0) {
+                var name = plugin.name ? plugin.name.toLowerCase() : ""
+                var description = plugin.description ? plugin.description.toLowerCase() : ""
+                var author = plugin.author ? plugin.author.toLowerCase() : ""
+
+                if (name.indexOf(query) !== -1 ||
+                    description.indexOf(query) !== -1 ||
+                    author.indexOf(query) !== -1) {
+                    filtered.push(plugin)
+                }
+            } else {
+                filtered.push(plugin)
+            }
+        }
+
+        filteredPlugins = filtered
+        selectedIndex = -1
+        keyboardNavigationActive = false
+    }
+
+    function selectNext() {
+        if (filteredPlugins.length === 0) return
+        keyboardNavigationActive = true
+        selectedIndex = Math.min(selectedIndex + 1, filteredPlugins.length - 1)
+    }
+
+    function selectPrevious() {
+        if (filteredPlugins.length === 0) return
+        keyboardNavigationActive = true
+        selectedIndex = Math.max(selectedIndex - 1, -1)
+        if (selectedIndex === -1) {
+            keyboardNavigationActive = false
+        }
+    }
+
+    function installPlugin(pluginName) {
+        ToastService.showInfo("Installing plugin: " + pluginName)
+        DMSService.install(pluginName, response => {
+            if (response.error) {
+                ToastService.showError("Install failed: " + response.error)
+            } else {
+                ToastService.showInfo("Plugin installed: " + pluginName)
+                PluginService.scanPlugins()
+                refreshPlugins()
+            }
+        })
+    }
+
+    function refreshPlugins() {
+        isLoading = true
+        DMSService.listPlugins()
+        if (DMSService.apiVersion >= 8) {
+            DMSService.listInstalled()
+        }
+    }
+
+    function show() {
+        if (parentModal) {
+            parentModal.shouldHaveFocus = false
+        }
+        open()
+        Qt.callLater(() => {
+            if (contentLoader.item && contentLoader.item.searchField) {
+                contentLoader.item.searchField.forceActiveFocus()
+            }
+        })
+    }
+
+    function hide() {
+        close()
+        if (parentModal) {
+            parentModal.shouldHaveFocus = Qt.binding(() => {
+                return parentModal.shouldBeVisible
+            })
+        }
+    }
+
+    onOpened: {
+        refreshPlugins()
+    }
+
+    onDialogClosed: () => {
+        allPlugins = []
+        searchQuery = ""
+        filteredPlugins = []
+        selectedIndex = -1
+        keyboardNavigationActive = false
+        isLoading = false
+    }
+
+    onBackgroundClicked: () => {
+        hide()
+    }
+
+    content: Component {
+        FocusScope {
+            id: browserKeyHandler
+            property alias searchField: browserSearchField
+
+            anchors.fill: parent
+            focus: true
+
+            Keys.onPressed: event => {
+                if (event.key === Qt.Key_Escape) {
+                    root.close()
+                    event.accepted = true
+                } else if (event.key === Qt.Key_Down) {
+                    root.selectNext()
+                    event.accepted = true
+                } else if (event.key === Qt.Key_Up) {
+                    root.selectPrevious()
+                    event.accepted = true
+                }
+            }
+
+            Item {
+                id: browserContent
+                anchors.fill: parent
+                anchors.margins: Theme.spacingL
+
+                Item {
+                    id: headerArea
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    height: Math.max(headerIcon.height, headerText.height, refreshButton.height, closeButton.height)
+
+                    DankIcon {
+                        id: headerIcon
+                        name: "store"
+                        size: Theme.iconSize
+                        color: Theme.primary
+                        anchors.left: parent.left
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    StyledText {
+                        id: headerText
+                        text: I18n.tr("Browse Plugins")
+                        font.pixelSize: Theme.fontSizeLarge
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                        anchors.left: headerIcon.right
+                        anchors.leftMargin: Theme.spacingM
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    Row {
+                        anchors.right: parent.right
+                        anchors.verticalCenter: parent.verticalCenter
+                        spacing: Theme.spacingXS
+
+                        DankButton {
+                            id: thirdPartyButton
+                            text: SessionData.showThirdPartyPlugins ? "Hide 3rd Party" : "Show 3rd Party"
+                            iconName: SessionData.showThirdPartyPlugins ? "visibility_off" : "visibility"
+                            height: 28
+                            onClicked: {
+                                if (SessionData.showThirdPartyPlugins) {
+                                    SessionData.setShowThirdPartyPlugins(false)
+                                    root.updateFilteredPlugins()
+                                } else {
+                                    thirdPartyConfirmModal.open()
+                                }
+                            }
+                        }
+
+                        DankActionButton {
+                            id: refreshButton
+                            iconName: "refresh"
+                            iconSize: 18
+                            iconColor: Theme.primary
+                            visible: !root.isLoading
+                            onClicked: root.refreshPlugins()
+                        }
+
+                        DankActionButton {
+                            id: closeButton
+                            iconName: "close"
+                            iconSize: Theme.iconSize - 2
+                            iconColor: Theme.outline
+                            onClicked: root.close()
+                        }
+                    }
+                }
+
+                StyledText {
+                    id: descriptionText
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: headerArea.bottom
+                    anchors.topMargin: Theme.spacingM
+                    text: I18n.tr("Install plugins from the DMS plugin registry")
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.outline
+                    wrapMode: Text.WordWrap
+                }
+
+                DankTextField {
+                    id: browserSearchField
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: descriptionText.bottom
+                    anchors.topMargin: Theme.spacingM
+                    height: 48
+                    cornerRadius: Theme.cornerRadius
+                    backgroundColor: Theme.surfaceContainerHigh
+                    normalBorderColor: Theme.outlineMedium
+                    focusedBorderColor: Theme.primary
+                    leftIconName: "search"
+                    leftIconSize: Theme.iconSize
+                    leftIconColor: Theme.surfaceVariantText
+                    leftIconFocusedColor: Theme.primary
+                    showClearButton: true
+                    textColor: Theme.surfaceText
+                    font.pixelSize: Theme.fontSizeMedium
+                    placeholderText: I18n.tr("Search plugins...")
+                    text: root.searchQuery
+                    focus: true
+                    ignoreLeftRightKeys: true
+                    keyForwardTargets: [browserKeyHandler]
+                    onTextEdited: {
+                        root.searchQuery = text
+                        root.updateFilteredPlugins()
+                    }
+                }
+
+                Item {
+                    id: listArea
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.top: browserSearchField.bottom
+                    anchors.topMargin: Theme.spacingM
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: Theme.spacingM
+
+                    Item {
+                        anchors.fill: parent
+                        visible: root.isLoading
+
+                        Column {
+                            anchors.centerIn: parent
+                            spacing: Theme.spacingM
+
+                            DankIcon {
+                                name: "sync"
+                                size: 48
+                                color: Theme.primary
+                                anchors.horizontalCenter: parent.horizontalCenter
+
+                                RotationAnimator on rotation {
+                                    from: 0
+                                    to: 360
+                                    duration: 1000
+                                    loops: Animation.Infinite
+                                    running: root.isLoading
+                                }
+                            }
+
+                            StyledText {
+                                text: I18n.tr("Loading plugins...")
+                                font.pixelSize: Theme.fontSizeMedium
+                                color: Theme.surfaceVariantText
+                                anchors.horizontalCenter: parent.horizontalCenter
+                            }
+                        }
+                    }
+
+                    DankListView {
+                        id: pluginBrowserList
+
+                        anchors.fill: parent
+                        anchors.leftMargin: Theme.spacingM
+                        anchors.rightMargin: Theme.spacingM
+                        anchors.topMargin: Theme.spacingS
+                        anchors.bottomMargin: Theme.spacingS
+                        spacing: Theme.spacingS
+                        model: root.filteredPlugins
+                        clip: true
+                        visible: !root.isLoading
+
+                        ScrollBar.vertical: DankScrollbar {
+                            id: browserScrollbar
+                        }
+
+                        delegate: Rectangle {
+                            width: pluginBrowserList.width
+                            height: pluginDelegateColumn.implicitHeight + Theme.spacingM * 2
+                            radius: Theme.cornerRadius
+                            property bool isSelected: root.keyboardNavigationActive && index === root.selectedIndex
+                            property bool isInstalled: modelData.installed || false
+                            property bool isFirstParty: modelData.firstParty || false
+                            color: isSelected ? Theme.primarySelected :
+                                   Qt.rgba(Theme.surfaceVariant.r,
+                                           Theme.surfaceVariant.g,
+                                           Theme.surfaceVariant.b,
+                                           0.3)
+                            border.color: isSelected ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g,
+                                            Theme.outline.b, 0.2)
+                            border.width: isSelected ? 2 : 1
+
+                            Column {
+                                id: pluginDelegateColumn
+                                anchors.fill: parent
+                                anchors.margins: Theme.spacingM
+                                spacing: Theme.spacingXS
+
+                                Row {
+                                    width: parent.width
+                                    spacing: Theme.spacingM
+
+                                    DankIcon {
+                                        name: modelData.icon || "extension"
+                                        size: Theme.iconSize
+                                        color: Theme.primary
+                                        anchors.verticalCenter: parent.verticalCenter
+                                    }
+
+                                    Column {
+                                        width: parent.width - Theme.iconSize - Theme.spacingM - installButton.width - Theme.spacingM
+                                        spacing: 2
+
+                                        Row {
+                                            spacing: Theme.spacingXS
+
+                                            StyledText {
+                                                text: modelData.name
+                                                font.pixelSize: Theme.fontSizeMedium
+                                                font.weight: Font.Medium
+                                                color: Theme.surfaceText
+                                                elide: Text.ElideRight
+                                                anchors.verticalCenter: parent.verticalCenter
+                                            }
+
+                                            Rectangle {
+                                                height: 16
+                                                width: firstPartyText.implicitWidth + Theme.spacingXS * 2
+                                                radius: 8
+                                                color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15)
+                                                border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4)
+                                                border.width: 1
+                                                visible: isFirstParty
+                                                anchors.verticalCenter: parent.verticalCenter
+
+                                                StyledText {
+                                                    id: firstPartyText
+                                                    anchors.centerIn: parent
+                                                    text: I18n.tr("official")
+                                                    font.pixelSize: Theme.fontSizeSmall - 2
+                                                    color: Theme.primary
+                                                    font.weight: Font.Medium
+                                                }
+                                            }
+
+                                            Rectangle {
+                                                height: 16
+                                                width: thirdPartyText.implicitWidth + Theme.spacingXS * 2
+                                                radius: 8
+                                                color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.15)
+                                                border.color: Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.4)
+                                                border.width: 1
+                                                visible: !isFirstParty
+                                                anchors.verticalCenter: parent.verticalCenter
+
+                                                StyledText {
+                                                    id: thirdPartyText
+                                                    anchors.centerIn: parent
+                                                    text: I18n.tr("3rd party")
+                                                    font.pixelSize: Theme.fontSizeSmall - 2
+                                                    color: Theme.warning
+                                                    font.weight: Font.Medium
+                                                }
+                                            }
+                                        }
+
+                                        StyledText {
+                                            text: {
+                                                const author = "by " + (modelData.author || "Unknown")
+                                                const source = modelData.repo ? ` • <a href="${modelData.repo}" style="text-decoration:none; color:${Theme.primary};">source</a>` : ""
+                                                return author + source
+                                            }
+                                            font.pixelSize: Theme.fontSizeSmall
+                                            color: Theme.outline
+                                            linkColor: Theme.primary
+                                            textFormat: Text.RichText
+                                            elide: Text.ElideRight
+                                            width: parent.width
+                                            onLinkActivated: url => Qt.openUrlExternally(url)
+
+                                            MouseArea {
+                                                anchors.fill: parent
+                                                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                                                acceptedButtons: Qt.NoButton
+                                                propagateComposedEvents: true
+                                            }
+                                        }
+                                    }
+
+                                    Rectangle {
+                                        id: installButton
+                                        width: 80
+                                        height: 32
+                                        radius: Theme.cornerRadius
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        color: isInstalled ? Theme.surfaceVariant : Theme.primary
+                                        opacity: isInstalled ? 1 : (installMouseArea.containsMouse ? 0.9 : 1)
+                                        border.width: isInstalled ? 1 : 0
+                                        border.color: Theme.outline
+
+                                        Behavior on opacity {
+                                            NumberAnimation {
+                                                duration: Theme.shortDuration
+                                                easing.type: Theme.standardEasing
+                                            }
+                                        }
+
+                                        Row {
+                                            anchors.centerIn: parent
+                                            spacing: Theme.spacingXS
+
+                                            DankIcon {
+                                                name: isInstalled ? "check" : "download"
+                                                size: 14
+                                                color: isInstalled ? Theme.surfaceText : Theme.surface
+                                                anchors.verticalCenter: parent.verticalCenter
+                                            }
+
+                                            StyledText {
+                                                text: isInstalled ? "Installed" : "Install"
+                                                font.pixelSize: Theme.fontSizeSmall
+                                                font.weight: Font.Medium
+                                                color: isInstalled ? Theme.surfaceText : Theme.surface
+                                                anchors.verticalCenter: parent.verticalCenter
+                                            }
+                                        }
+
+                                        MouseArea {
+                                            id: installMouseArea
+                                            anchors.fill: parent
+                                            hoverEnabled: true
+                                            cursorShape: isInstalled ? Qt.ArrowCursor : Qt.PointingHandCursor
+                                            enabled: !isInstalled
+                                            onClicked: {
+                                                if (!isInstalled) {
+                                                    root.installPlugin(modelData.name)
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                StyledText {
+                                    text: modelData.description || ""
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    color: Theme.outline
+                                    width: parent.width
+                                    wrapMode: Text.WordWrap
+                                    visible: modelData.description && modelData.description.length > 0
+                                }
+
+                                Flow {
+                                    width: parent.width
+                                    spacing: Theme.spacingXS
+                                    visible: modelData.capabilities && modelData.capabilities.length > 0
+
+                                    Repeater {
+                                        model: modelData.capabilities || []
+
+                                        Rectangle {
+                                            height: 18
+                                            width: capabilityText.implicitWidth + Theme.spacingXS * 2
+                                            radius: 9
+                                            color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1)
+                                            border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3)
+                                            border.width: 1
+
+                                            StyledText {
+                                                id: capabilityText
+                                                anchors.centerIn: parent
+                                                text: modelData
+                                                font.pixelSize: Theme.fontSizeSmall - 2
+                                                color: Theme.primary
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    StyledText {
+                        anchors.centerIn: listArea
+                        text: I18n.tr("No plugins found")
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.surfaceVariantText
+                        visible: !root.isLoading && root.filteredPlugins.length === 0
+                    }
+                }
+            }
+        }
+    }
+
+    DankModal {
+        id: thirdPartyConfirmModal
+
+        width: 500
+        height: 300
+        allowStacking: true
+        backgroundOpacity: 0.4
+        closeOnEscapeKey: true
+
+        content: Component {
+            FocusScope {
+                anchors.fill: parent
+                focus: true
+
+                Keys.onPressed: event => {
+                    if (event.key === Qt.Key_Escape) {
+                        thirdPartyConfirmModal.close()
+                        event.accepted = true
+                    }
+                }
+
+                Column {
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingL
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "warning"
+                            size: Theme.iconSize
+                            color: Theme.warning
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Third-Party Plugin Warning")
+                            font.pixelSize: Theme.fontSizeLarge
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    StyledText {
+                        width: parent.width
+                        text: I18n.tr("Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\n\nThese plugins may pose security and privacy risks - install at your own risk.")
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.surfaceText
+                        wrapMode: Text.WordWrap
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingS
+
+                        StyledText {
+                            text: I18n.tr("• Plugins may contain bugs or security issues")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
+
+                        StyledText {
+                            text: I18n.tr("• Review code before installation when possible")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
+
+                        StyledText {
+                            text: I18n.tr("• Install only from trusted sources")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
+                    }
+
+                    Item {
+                        width: parent.width
+                        height: parent.height - parent.spacing * 3 - y
+                    }
+
+                    Row {
+                        anchors.right: parent.right
+                        spacing: Theme.spacingM
+
+                        DankButton {
+                            text: I18n.tr("Cancel")
+                            iconName: "close"
+                            onClicked: thirdPartyConfirmModal.close()
+                        }
+
+                        DankButton {
+                            text: I18n.tr("I Understand")
+                            iconName: "check"
+                            onClicked: {
+                                SessionData.setShowThirdPartyPlugins(true)
+                                root.updateFilteredPlugins()
+                                thirdPartyConfirmModal.close()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Modules/Settings/PluginListItem.qml

@@ -0,0 +1,396 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+StyledRect {
+    id: root
+
+    property var pluginData: null
+    property string expandedPluginId: ""
+    property bool hasUpdate: false
+    property bool isReloading: false
+
+    property string pluginId: pluginData ? pluginData.id : ""
+    property string pluginDirectoryName: {
+        if (pluginData && pluginData.pluginDirectory) {
+            var path = pluginData.pluginDirectory
+            return path.substring(path.lastIndexOf('/') + 1)
+        }
+        return pluginId
+    }
+    property string pluginName: pluginData ? (pluginData.name || pluginData.id) : ""
+    property string pluginVersion: pluginData ? (pluginData.version || "1.0.0") : ""
+    property string pluginAuthor: pluginData ? (pluginData.author || "Unknown") : ""
+    property string pluginDescription: pluginData ? (pluginData.description || "") : ""
+    property string pluginIcon: pluginData ? (pluginData.icon || "extension") : "extension"
+    property string pluginSettingsPath: pluginData ? (pluginData.settingsPath || "") : ""
+    property var pluginPermissions: pluginData ? (pluginData.permissions || []) : []
+    property bool hasSettings: pluginData && pluginData.settings !== undefined && pluginData.settings !== ""
+    property bool isExpanded: expandedPluginId === pluginId
+
+    width: parent.width
+    height: pluginItemColumn.implicitHeight + Theme.spacingM * 2 + settingsContainer.height
+    radius: Theme.cornerRadius
+    color: (pluginMouseArea.containsMouse || updateArea.containsMouse || uninstallArea.containsMouse || reloadArea.containsMouse) ? Theme.surfacePressed : (isExpanded ? Theme.surfaceContainerHighest : Theme.surfaceContainerHigh)
+    border.width: 0
+
+    MouseArea {
+        id: pluginMouseArea
+        anchors.fill: parent
+        anchors.bottomMargin: root.isExpanded ? settingsContainer.height : 0
+        hoverEnabled: true
+        cursorShape: root.hasSettings ? Qt.PointingHandCursor : Qt.ArrowCursor
+        enabled: root.hasSettings
+        onClicked: {
+            root.expandedPluginId = root.expandedPluginId === root.pluginId ? "" : root.pluginId
+        }
+    }
+
+    Column {
+        id: pluginItemColumn
+        width: parent.width
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: Theme.spacingM
+        spacing: Theme.spacingM
+
+        Row {
+            width: parent.width
+            spacing: Theme.spacingM
+
+            DankIcon {
+                name: root.pluginIcon
+                size: Theme.iconSize
+                color: PluginService.isPluginLoaded(root.pluginId) ? Theme.primary : Theme.surfaceVariantText
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Column {
+                width: parent.width - Theme.iconSize - Theme.spacingM - toggleRow.width - Theme.spacingM
+                spacing: Theme.spacingXS
+                anchors.verticalCenter: parent.verticalCenter
+
+                Row {
+                    spacing: Theme.spacingXS
+                    width: parent.width
+
+                    StyledText {
+                        text: root.pluginName
+                        font.pixelSize: Theme.fontSizeLarge
+                        color: Theme.surfaceText
+                        font.weight: Font.Medium
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    DankIcon {
+                        name: root.hasSettings ? (root.isExpanded ? "expand_less" : "expand_more") : ""
+                        size: 16
+                        color: root.hasSettings ? Theme.primary : "transparent"
+                        anchors.verticalCenter: parent.verticalCenter
+                        visible: root.hasSettings
+                    }
+                }
+
+                StyledText {
+                    text: "v" + root.pluginVersion + " by " + root.pluginAuthor
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.surfaceVariantText
+                    width: parent.width
+                }
+            }
+
+            Row {
+                id: toggleRow
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Theme.spacingXS
+
+                Rectangle {
+                    width: 28
+                    height: 28
+                    radius: 14
+                    color: updateArea.containsMouse ? Theme.surfaceContainerHighest : "transparent"
+                    visible: DMSService.dmsAvailable && PluginService.isPluginLoaded(root.pluginId) && root.hasUpdate
+
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: "download"
+                        size: 16
+                        color: updateArea.containsMouse ? Theme.primary : Theme.surfaceVariantText
+                    }
+
+                    MouseArea {
+                        id: updateArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            const currentPluginName = root.pluginName
+                            const currentPluginId = root.pluginId
+                            DMSService.update(currentPluginName, response => {
+                                if (response.error) {
+                                    ToastService.showError("Update failed: " + response.error)
+                                } else {
+                                    ToastService.showInfo("Plugin updated: " + currentPluginName)
+                                    PluginService.forceRescanPlugin(currentPluginId)
+                                    if (DMSService.apiVersion >= 8) {
+                                        DMSService.listInstalled()
+                                    }
+                                }
+                            })
+                        }
+                        onEntered: {
+                            tooltipLoader.active = true
+                            if (tooltipLoader.item) {
+                                const p = mapToItem(null, width / 2, 0)
+                                tooltipLoader.item.show(I18n.tr("Update Plugin"), p.x, p.y - 40, null)
+                            }
+                        }
+                        onExited: {
+                            if (tooltipLoader.item) {
+                                tooltipLoader.item.hide()
+                            }
+                            tooltipLoader.active = false
+                        }
+                    }
+                }
+
+                Rectangle {
+                    width: 28
+                    height: 28
+                    radius: 14
+                    color: uninstallArea.containsMouse ? Theme.surfaceContainerHighest : "transparent"
+                    visible: DMSService.dmsAvailable
+
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: "delete"
+                        size: 16
+                        color: uninstallArea.containsMouse ? Theme.error : Theme.surfaceVariantText
+                    }
+
+                    MouseArea {
+                        id: uninstallArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            const currentPluginName = root.pluginName
+                            DMSService.uninstall(currentPluginName, response => {
+                                if (response.error) {
+                                    ToastService.showError("Uninstall failed: " + response.error)
+                                } else {
+                                    ToastService.showInfo("Plugin uninstalled: " + currentPluginName)
+                                    PluginService.scanPlugins()
+                                    if (root.isExpanded) {
+                                        root.expandedPluginId = ""
+                                    }
+                                }
+                            })
+                        }
+                        onEntered: {
+                            tooltipLoader.active = true
+                            if (tooltipLoader.item) {
+                                const p = mapToItem(null, width / 2, 0)
+                                tooltipLoader.item.show(I18n.tr("Uninstall Plugin"), p.x, p.y - 40, null)
+                            }
+                        }
+                        onExited: {
+                            if (tooltipLoader.item) {
+                                tooltipLoader.item.hide()
+                            }
+                            tooltipLoader.active = false
+                        }
+                    }
+                }
+
+                Rectangle {
+                    width: 28
+                    height: 28
+                    radius: 14
+                    color: reloadArea.containsMouse ? Theme.surfaceContainerHighest : "transparent"
+                    visible: PluginService.isPluginLoaded(root.pluginId)
+
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: "refresh"
+                        size: 16
+                        color: reloadArea.containsMouse ? Theme.primary : Theme.surfaceVariantText
+                    }
+
+                    MouseArea {
+                        id: reloadArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            const currentPluginId = root.pluginId
+                            const currentPluginName = root.pluginName
+                            root.isReloading = true
+                            if (PluginService.reloadPlugin(currentPluginId)) {
+                                ToastService.showInfo("Plugin reloaded: " + currentPluginName)
+                            } else {
+                                ToastService.showError("Failed to reload plugin: " + currentPluginName)
+                                root.isReloading = false
+                            }
+                        }
+                        onEntered: {
+                            tooltipLoader.active = true
+                            if (tooltipLoader.item) {
+                                const p = mapToItem(null, width / 2, 0)
+                                tooltipLoader.item.show(I18n.tr("Reload Plugin"), p.x, p.y - 40, null)
+                            }
+                        }
+                        onExited: {
+                            if (tooltipLoader.item) {
+                                tooltipLoader.item.hide()
+                            }
+                            tooltipLoader.active = false
+                        }
+                    }
+                }
+
+                DankToggle {
+                    id: pluginToggle
+                    anchors.verticalCenter: parent.verticalCenter
+                    checked: PluginService.isPluginLoaded(root.pluginId)
+                    onToggled: isChecked => {
+                        const currentPluginId = root.pluginId
+                        const currentPluginName = root.pluginName
+
+                        if (isChecked) {
+                            if (PluginService.enablePlugin(currentPluginId)) {
+                                ToastService.showInfo("Plugin enabled: " + currentPluginName)
+                            } else {
+                                ToastService.showError("Failed to enable plugin: " + currentPluginName)
+                                checked = false
+                            }
+                        } else {
+                            if (PluginService.disablePlugin(currentPluginId)) {
+                                ToastService.showInfo("Plugin disabled: " + currentPluginName)
+                                if (root.isExpanded) {
+                                    root.expandedPluginId = ""
+                                }
+                            } else {
+                                ToastService.showError("Failed to disable plugin: " + currentPluginName)
+                                checked = true
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        StyledText {
+            width: parent.width
+            text: root.pluginDescription
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceVariantText
+            wrapMode: Text.WordWrap
+            visible: root.pluginDescription !== ""
+        }
+
+        Flow {
+            width: parent.width
+            spacing: Theme.spacingXS
+            visible: root.pluginPermissions && Array.isArray(root.pluginPermissions) && root.pluginPermissions.length > 0
+
+            Repeater {
+                model: root.pluginPermissions
+
+                Rectangle {
+                    height: 20
+                    width: permissionText.implicitWidth + Theme.spacingXS * 2
+                    radius: 10
+                    color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1)
+                    border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3)
+                    border.width: 1
+
+                    StyledText {
+                        id: permissionText
+                        anchors.centerIn: parent
+                        text: modelData
+                        font.pixelSize: Theme.fontSizeSmall - 1
+                        color: Theme.primary
+                    }
+                }
+            }
+        }
+    }
+
+    FocusScope {
+        id: settingsContainer
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: root.isExpanded && root.hasSettings ? (settingsLoader.item ? settingsLoader.item.implicitHeight + Theme.spacingL * 2 : 0) : 0
+        clip: true
+        focus: root.isExpanded && root.hasSettings
+
+        Keys.onPressed: event => {
+            event.accepted = true
+        }
+
+        Rectangle {
+            anchors.fill: parent
+            color: Theme.surfaceContainerHighest
+            radius: Theme.cornerRadius
+            anchors.topMargin: Theme.spacingXS
+            border.width: 0
+        }
+
+        Loader {
+            id: settingsLoader
+            anchors.fill: parent
+            anchors.margins: Theme.spacingL
+            active: root.isExpanded && root.hasSettings && PluginService.isPluginLoaded(root.pluginId)
+            asynchronous: false
+
+            source: {
+                if (active && root.pluginSettingsPath) {
+                    var path = root.pluginSettingsPath
+                    if (!path.startsWith("file://")) {
+                        path = "file://" + path
+                    }
+                    return path
+                }
+                return ""
+            }
+
+            onLoaded: {
+                if (item && typeof PluginService !== "undefined") {
+                    item.pluginService = PluginService
+                }
+                if (item && typeof PopoutService !== "undefined" && "popoutService" in item) {
+                    item.popoutService = PopoutService
+                }
+                if (item) {
+                    Qt.callLater(() => {
+                        settingsContainer.focus = true
+                        item.forceActiveFocus()
+                    })
+                }
+            }
+        }
+
+        StyledText {
+            anchors.centerIn: parent
+            text: !PluginService.isPluginLoaded(root.pluginId) ?
+                  "Enable plugin to access settings" :
+                  (settingsLoader.status === Loader.Error ?
+                   "Failed to load settings" :
+                   "No configurable settings")
+            font.pixelSize: Theme.fontSizeSmall
+            color: Theme.surfaceVariantText
+            visible: root.isExpanded && (!settingsLoader.active || settingsLoader.status === Loader.Error)
+        }
+    }
+
+    Loader {
+        id: tooltipLoader
+        active: false
+        sourceComponent: DankTooltip {}
+    }
+}

Modules/Settings/WidgetTweaksTab.qml

@@ -65,17 +65,6 @@ Item {
                                            checked)
                                    }
                     }
-                    DankToggle {
-                        width: parent.width
-                        text: I18n.tr("Window Scrolling")
-                        description: I18n.tr("Scroll through windows, rather than workspaces")
-                        checked: SettingsData.workspaceScrolling
-                        visible: CompositorService.isNiri
-                        onToggled: checked => {
-                            return SettingsData.setWorkspaceScrolling(checked)
-                        }
-                    }
-
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Workspace Padding")
@@ -149,6 +138,17 @@ Item {
                             return SettingsData.setWorkspacesPerMonitor(checked);
                         }
                     }
+
+                    DankToggle {
+                        width: parent.width
+                        text: I18n.tr("Show All Tags")
+                        description: I18n.tr("Show all 9 tags instead of only occupied tags (DWL only)")
+                        checked: SettingsData.dwlShowAllTags
+                        visible: CompositorService.isDwl
+                        onToggled: checked => {
+                            return SettingsData.setDwlShowAllTags(checked);
+                        }
+                    }
                 }
             }
 

Modules/Settings/WidgetsTabSection.qml

@@ -321,6 +321,7 @@ Column {
                                      || modelData.id === "music"
                                      || modelData.id === "focusedWindow"
                                      || modelData.id === "runningApps"
+									 || modelData.id === "keyboard_layout_name"
 
                             DankActionButton {
                                 id: smallSizeButton
@@ -406,6 +407,7 @@ Column {
                                 visible: modelData.id === "clock"
                                          || modelData.id === "focusedWindow"
                                          || modelData.id === "runningApps"
+										 || modelData.id === "keyboard_layout_name"
                                 iconName: {
                                     if (modelData.id === "clock")
                                         return SettingsData.clockCompactMode ? "zoom_out" : "zoom_in"
@@ -413,6 +415,8 @@ Column {
                                         return SettingsData.focusedWindowCompactMode ? "zoom_out" : "zoom_in"
                                     if (modelData.id === "runningApps")
                                         return SettingsData.runningAppsCompactMode ? "zoom_out" : "zoom_in"
+                                    if (modelData.id === "keyboard_layout_name")
+										return SettingsData.keyboardLayoutNameCompactMode ? "zoom_out" : "zoom_in"
                                     return "zoom_in"
                                 }
                                 iconSize: 16
@@ -423,6 +427,8 @@ Column {
                                         return SettingsData.focusedWindowCompactMode ? Theme.primary : Theme.outline
                                     if (modelData.id === "runningApps")
                                         return SettingsData.runningAppsCompactMode ? Theme.primary : Theme.outline
+                                    if (modelData.id === "keyboard_layout_name")
+                                        return SettingsData.keyboardLayoutNameCompactMode ? Theme.primary : Theme.outline
                                     return Theme.outline
                                 }
                                 onClicked: {
@@ -438,6 +444,10 @@ Column {
                                         root.compactModeChanged(
                                                     "runningApps",
                                                     !SettingsData.runningAppsCompactMode)
+                                    } else if (modelData.id === "keyboard_layout_name") {
+										root.compactModeChanged(
+													"keyboard_layout_name",
+													!SettingsData.keyboardLayoutNameCompactMode)
                                     }
                                 }
                                 onEntered: {
@@ -450,6 +460,8 @@ Column {
                                             tooltipText = SettingsData.focusedWindowCompactMode ? "Full Size" : "Compact"
                                         } else if (modelData.id === "runningApps") {
                                             tooltipText = SettingsData.runningAppsCompactMode ? "Full Size" : "Compact"
+                                        } else  if (modelData.id === "keyboard_layout_name") {
+                                            tooltipText = SettingsData.keyboardLayoutNameCompactMode ? "Full Size" : "Compact"
                                         }
                                         const p = compactModeButton.mapToItem(null, compactModeButton.width / 2, 0)
                                         compactTooltipLoader.item.show(tooltipText, p.x, p.y - 40, null)

Modules/Toast.qml

@@ -67,7 +67,7 @@ PanelWindow {
             }
         }
 
-        width: shouldBeVisible ? Math.min(900, messageText.implicitWidth + statusIcon.width + Theme.spacingM + (ToastService.hasDetails ? (expandButton.width + closeButton.width + 4) : 0) + Theme.spacingL * 2 + Theme.spacingM * 2) : frozenWidth
+        width: shouldBeVisible ? Math.min(900, messageText.implicitWidth + statusIcon.width + Theme.spacingM + (ToastService.hasDetails ? (expandButton.width + closeButton.width + 4) : (ToastService.currentLevel === ToastService.levelError ? closeButton.width + Theme.spacingS : 0)) + Theme.spacingL * 2 + Theme.spacingM * 2) : frozenWidth
         height: toastContent.height + Theme.spacingL * 2
         anchors.horizontalCenter: parent.horizontalCenter
         y: Theme.barHeight - 4 + SettingsData.dankBarSpacing + 2
@@ -146,8 +146,10 @@ PanelWindow {
                     font.weight: Font.Medium
                     anchors.left: statusIcon.right
                     anchors.leftMargin: Theme.spacingM
+                    anchors.right: ToastService.hasDetails ? expandButton.left : parent.right
+                    anchors.rightMargin: ToastService.hasDetails ? Theme.spacingS : 0
                     anchors.verticalCenter: parent.verticalCenter
-                    width: implicitWidth
+                    elide: Text.ElideRight
                     wrapMode: Text.NoWrap
                 }
 
@@ -196,7 +198,7 @@ PanelWindow {
                     buttonSize: Theme.iconSize + 8
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
-                    visible: ToastService.hasDetails
+                    visible: ToastService.hasDetails || ToastService.currentLevel === ToastService.levelError
 
                     onClicked: {
                         ToastService.hideToast()

Modules/WallpaperBackground.qml

@@ -104,11 +104,6 @@ Variants {
                 }
             }
 
-            WallpaperEngineProc {
-                id: weProc
-                monitor: modelData.name
-            }
-
             Component.onCompleted: {
                 if (source) {
                     const formattedSource = source.startsWith("file://") ? source : "file://" + source
@@ -117,30 +112,21 @@ Variants {
                 isInitialized = true
             }
 
-            Component.onDestruction: {
-                weProc.stop()
-            }
-
             onSourceChanged: {
-                const isWE = source.startsWith("we:")
                 const isColor = source.startsWith("#")
 
-                if (isWE) {
+                if (!source) {
+                    setWallpaperImmediate("")
+                } else if (isColor) {
                     setWallpaperImmediate("")
-                    weProc.start(source.substring(3))
                 } else {
-                    weProc.stop()
-                    if (!source) {
-                        setWallpaperImmediate("")
-                    } else if (isColor) {
-                        setWallpaperImmediate("")
+                    if (!isInitialized || !currentWallpaper.source) {
+                        setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
+                        isInitialized = true
+                    } else if (CompositorService.isNiri && SessionData.isSwitchingMode) {
+                        setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
                     } else {
-                        if (!isInitialized || !currentWallpaper.source) {
-                            setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
-                            isInitialized = true
-                        } else {
-                            changeWallpaper(source.startsWith("file://") ? source : "file://" + source)
-                        }
+                        changeWallpaper(source.startsWith("file://") ? source : "file://" + source)
                     }
                 }
             }
@@ -476,7 +462,7 @@ Variants {
                 visible: CompositorService.isNiri && SettingsData.blurWallpaperOnOverview && NiriService.inOverview
                 blurEnabled: true
                 blur: 0.8
-                blurMax: 48
+                blurMax: 75
             }
         }
     }

Modules/WallpaperEngineProc.qml

@@ -1,63 +0,0 @@
-import QtCore
-import QtQuick
-import Quickshell.Io
-import Quickshell
-import qs.Common
-
-Item {
-    id: root
-    property string monitor: ""
-    property string sceneId: ""
-    property string pendingSceneId: ""
-
-    Process {
-        id: weProcess
-        running: false
-        command: []
-    }
-
-    Process {
-        id: killer
-        running: false
-        command: []
-        onExited: (code) => {
-            if (pendingSceneId !== "") {
-                const cacheHome = StandardPaths.writableLocation(StandardPaths.GenericCacheLocation).toString()
-                const baseDir = Paths.strip(cacheHome)
-                const outDir = baseDir + "/DankMaterialShell/we_screenshots" 
-                const outPath = outDir + "/" + pendingSceneId + ".jpg"
-
-                Quickshell.execDetached(["mkdir", "-p", outDir])
-                weProcess.command = [
-                    "linux-wallpaperengine",
-                    "--screen-root", monitor,
-                    "--screenshot", outPath,
-                    "--bg", pendingSceneId,
-                    "--silent"
-                ]
-                weProcess.running = true
-                sceneId = pendingSceneId
-                pendingSceneId = ""
-            }
-        }
-    }
-
-    function start(newSceneId) {
-        if (sceneId === newSceneId && weProcess.running) {
-            return
-        }
-        pendingSceneId = newSceneId
-        stop()
-    }
-
-    function stop() {
-        if (weProcess.running) {
-            weProcess.running = false
-        }
-        killer.command = [
-            "pkill", "-f",
-            "linux-wallpaperengine --screen-root " + monitor
-        ]
-        killer.running = true
-    }
-}

PLUGINS/LauncherExample/LauncherExampleLauncher.qml

@@ -45,6 +45,13 @@ Item {
                 action: "toast:Test Item 3 activated!",
                 categories: ["LauncherExample"]
             },
+            {
+                name: "Unicode Icon Example",
+                icon: "unicode:🚀",
+                comment: "Demonstrates unicode/emoji icon support",
+                action: "toast:Unicode icons work great!",
+                categories: ["LauncherExample"]
+            },
             {
                 name: "Example Copy Action",
                 icon: "material:content_copy",

PLUGINS/LauncherExample/README.md

@@ -97,7 +97,7 @@ function executeItem(item): void
 
 **Icon Types**:
 
-The `icon` field supports three formats:
+The `icon` field supports four formats:
 
 1. **Material Design Icons** - Use `material:` prefix:
    ```javascript
@@ -105,13 +105,19 @@ The `icon` field supports three formats:
    ```
    Examples: `material:star`, `material:favorite`, `material:settings`
 
-2. **Desktop Theme Icons** - Use icon name directly:
+2. **Unicode/Emoji Icons** - Use `unicode:` prefix:
+   ```javascript
+   icon: "unicode:🚀"  // Unicode character or emoji
+   ```
+   Display any Unicode character or emoji as the icon. Examples: `unicode:😀`, `unicode:⚡`, `unicode:🎨`
+
+3. **Desktop Theme Icons** - Use icon name directly:
    ```javascript
    icon: "firefox"  // Uses system icon theme
    ```
    Examples: `firefox`, `chrome`, `folder`, `text-editor`
 
-3. **No Icon** - Omit the `icon` field entirely:
+4. **No Icon** - Omit the `icon` field entirely:
    ```javascript
    {
        name: "😀  Grinning Face",
@@ -121,7 +127,7 @@ The `icon` field supports three formats:
        categories: ["MyPlugin"]
    }
    ```
-   Perfect for emoji pickers or text-only items where the icon area should be hidden
+   When icon is omitted, the launcher hides the icon area and displays only text
 
 **Action Format**: `type:data` where:
 - `type` - Action handler (toast, copy, script, etc.)

PLUGINS/README.md

@@ -1228,7 +1228,7 @@ Each item returned by `getItems()` must include:
 
 ### Icon Types
 
-The `icon` field supports three formats:
+The `icon` field supports four formats:
 
 **1. Material Design Icons** - Use the `material:` prefix:
 ```javascript
@@ -1242,7 +1242,19 @@ The `icon` field supports three formats:
 ```
 Available icons: Any icon from Material Symbols font (e.g., `lightbulb`, `star`, `favorite`, `settings`, `terminal`, `translate`, `sentiment_satisfied`)
 
-**2. Desktop Theme Icons** - Use icon name directly:
+**2. Unicode/Emoji Icons** - Use the `unicode:` prefix:
+```javascript
+{
+    name: "Grinning Face",
+    icon: "unicode:😀",  // Unicode character or emoji
+    comment: "Copy emoji to clipboard",
+    action: "copy:😀",
+    categories: ["MyPlugin"]
+}
+```
+Display any Unicode character or emoji as the icon. The character is rendered at 70-80% of the icon size with proper theming. Perfect for emoji pickers, symbol selectors, or character libraries.
+
+**3. Desktop Theme Icons** - Use icon name directly:
 ```javascript
 {
     name: "Firefox",
@@ -1254,7 +1266,7 @@ Available icons: Any icon from Material Symbols font (e.g., `lightbulb`, `star`,
 ```
 Uses the user's installed icon theme. Common examples: `firefox`, `chrome`, `folder`, `text-editor`
 
-**3. No Icon** - Omit the `icon` field entirely:
+**4. No Icon** - Omit the `icon` field entirely:
 ```javascript
 {
     name: "😀  Grinning Face",
@@ -1264,7 +1276,7 @@ Uses the user's installed icon theme. Common examples: `firefox`, `chrome`, `fol
     categories: ["MyPlugin"]
 }
 ```
-When `icon` is omitted, the launcher hides the icon area and displays only the text, giving full width to the item name. Perfect for emoji pickers or text-only items.
+When `icon` is omitted, the launcher hides the icon area and displays only the text, giving full width to the item name. Useful when you want emojis or symbols to be part of the item name itself.
 
 ### Trigger System
 

README.md

@@ -1,824 +1,175 @@
 # DankMaterialShell (dms)
 
-<div align=center>
+<div align="center">
+  <a href="https://danklinux.com">
+    <img src="assets/danklogo2.svg" alt="DankMaterialShell Logo" width="200">
+  </a>
 
+  ### A modern Wayland desktop shell
+
+  Built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/)
+
+[![Documentation](https://img.shields.io/badge/docs-danklinux.com-9ccbfb?style=for-the-badge&labelColor=101418)](https://danklinux.com/docs)
 [![GitHub stars](https://img.shields.io/github/stars/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=ffd700)](https://github.com/AvengeMedia/DankMaterialShell/stargazers)
 [![GitHub License](https://img.shields.io/github/license/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=b9c8da)](https://github.com/AvengeMedia/DankMaterialShell/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/v/release/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/releases)
-[![GitHub last commit](https://img.shields.io/github/last-commit/AvengeMedia/DankMaterialShell?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://github.com/AvengeMedia/DankMaterialShell/commits/master)
 [![AUR version](https://img.shields.io/aur/version/dms-shell-bin?style=for-the-badge&labelColor=101418&color=9ccbfb)](https://aur.archlinux.org/packages/dms-shell-bin)
 [![AUR version (git)](https://img.shields.io/aur/version/dms-shell-git?style=for-the-badge&labelColor=101418&color=9ccbfb&label=AUR%20(git))](https://aur.archlinux.org/packages/dms-shell-git)
 [![Ko-Fi donate](https://img.shields.io/badge/donate-kofi?style=for-the-badge&logo=ko-fi&logoColor=ffffff&label=ko-fi&labelColor=101418&color=f16061&link=https%3A%2F%2Fko-fi.com%2Favengemediallc)](https://ko-fi.com/avengemediallc)
 
 </div>
 
-A modern Wayland desktop shell built with [Quickshell](https://quickshell.org/) and [Go](https://go.dev/). Optimized for the [niri](https://github.com/YaLTeR/niri) and [Hyprland](https://hyprland.org/) compositors.
+DankMaterialShell is a complete desktop shell for [niri](https://github.com/YaLTeR/niri), [Hyprland](https://hypr.land), [MangoWC](https://github.com/DreamMaoMao/mangowc), [Sway](https://swaywm.org), and other Wayland compositors. It replaces waybar, swaylock, swayidle, mako, fuzzel, polkit, and everything else you'd normally stitch together to make a desktop - all in one cohesive package with a gorgeous interface.
 
-Features notifications, app launcher, wallpaper customization, and fully customizable with [plugins](https://github.com/AvengeMedia/dms-plugin-registry).
+## Components
 
-## Screenshots
+DankMaterialShell combines two main components:
 
-<div align="center">
-<div style="max-width: 700px; margin: 0 auto;">
+- **[QML/UI Layer](https://github.com/AvengeMedia/DankMaterialShell)** (this repo) - All the visual components, widgets, and shell interface built with Quickshell
+- **[Go Backend](https://github.com/AvengeMedia/danklinux)** - System integration, IPC, process management, and core services
 
-https://github.com/user-attachments/assets/40d2c56e-c1c9-4671-b04f-8f8b7b83b9ec
+---
 
-</div>
-</div>
-
-<details><summary><strong>View More Screenshots</strong></summary>
-
-<br>
+## See it in Action
 
 <div align="center">
 
-### Desktop Overview
+https://github.com/user-attachments/assets/1200a739-7770-4601-8b85-695ca527819a
 
-<img src="https://github.com/user-attachments/assets/203a9678-c3b7-4720-bb97-853a511ac5c8" width="600" alt="DankMaterialShell Desktop" />
+</div>
 
-### Dashboard
+<details><summary><strong>More Screenshots</strong></summary>
 
-<img width="600" alt="DankDash" src="https://github.com/user-attachments/assets/a937cf35-a43b-4558-8c39-5694ff5fcac4" />
+<div align="center">
 
-### Application Launcher
+<img src="https://github.com/user-attachments/assets/203a9678-c3b7-4720-bb97-853a511ac5c8" width="600" alt="Desktop" />
 
-<img src="https://github.com/user-attachments/assets/2da00ea1-8921-4473-a2a9-44a44535a822" width="450" alt="Spotlight Launcher" />
+<img src="https://github.com/user-attachments/assets/a937cf35-a43b-4558-8c39-5694ff5fcac4" width="600" alt="Dashboard" />
 
-### Control Center
+<img src="https://github.com/user-attachments/assets/2da00ea1-8921-4473-a2a9-44a44535a822" width="450" alt="Launcher" />
 
-<img width="600" alt="Control Center" src="https://github.com/user-attachments/assets/732c30de-5f4a-4a2b-a995-c8ab656cecd5" />
-
-### System Monitor
-
-<img src="https://github.com/user-attachments/assets/b3c817ec-734d-4974-929f-2d11a1065349" width="600" alt="System Monitor" />
-
-### Widget Customization
-
-<img src="https://github.com/user-attachments/assets/903f7c60-146f-4fb3-a75d-a4823828f298" width="500" alt="Widget Customization" />
-
-### Lock Screen
-
-<img src="https://github.com/user-attachments/assets/3fa07de2-c1b0-4e57-8f25-3830ac6baf4f" width="600" alt="Lock Screen" />
-
-### Dynamic Theming
-
-<img src="https://github.com/user-attachments/assets/a81a68e3-4f7e-4246-8199-0fef1013d4cf" width="700" alt="Auto Theme" />
-
-### Notification Center
-
-<img src="https://github.com/user-attachments/assets/07cbde9a-0242-4989-9f97-5765c6458c85" width="350" alt="Notification Center" />
-
-### Dock
-
-<img src="https://github.com/user-attachments/assets/e6999daf-f7bf-4329-98fa-0ce4f0e7219c" width="400" alt="Dock" />
+<img src="https://github.com/user-attachments/assets/732c30de-5f4a-4a2b-a995-c8ab656cecd5" width="600" alt="Control Center" />
 
 </div>
 
 </details>
 
-## Quick start (full dotfiles, most distros)
+---
+
+## Quick Install
 
 ```bash
 curl -fsSL https://install.danklinux.com | sh
 ```
-*Or skip to [Installation](https://github.com/AvengeMedia/DankMaterialShell?tab=readme-ov-file#installation)*
 
-<details><summary><strong>Features</strong></summary>
+That's it. One command installs dms and all dependencies on Arch, Fedora, Debian, Ubuntu, or openSUSE.
 
-**Core Widgets:**
-- **TopBar**: fully customizable bar where widgets can be added, removed, and re-arranged.
-  - **App Launcher** with fuzzy search, categories, and auto-sorting by most used apps.
-  - **Workspace Switcher** Configurable workspace switcher.
-  - **Focused Window** Displays the currently focused window app name and title.
-  - **Running Apps** A view of all running apps, sorted by monitor, workspace, then position on workspace.
-  - **Media Player** Short form media player with equalizer, song title, and controls.
-  - **Clock** Clock and date widget
-  - **Weather** Weather widget with customizable location
-  - **System Tray** System tray applets with context menus.
-  - **Process Monitor** CPU, RAM, and GPU usage percentages, temperatures. (requires [dgop](https://github.com/AvengeMedia/dgop))
-  - **Power/Battery** Power/Battery widget for battery metrics and power profile changing.
-  - **Notifications** Notification bell with a notification center popup
-  - **Control Center** High-level view of network, bluetooth, and audio status
-  - **Privacy Indicator** Attempts to reveal if a microphone or screen recording session is active, relying on Pipewire data sources
-  - **Idle Inhibitor** Creates a systemd idle inhibitor to prevent sleep/locking from occuring.
-- **Spotlight Launcher** A central app launcher/search that can be triggered via an IPC keybinding.
-- **Central Command** A combined music, weather, calendar, and events PopUp.
-- **Process List** A process list, with system metrics and information. More detailed modal available via IPC.
-- **Notification Center** A center for notifications that has support for grouping.
-- **Dock** A dock with pinned apps support, recent apps support, and currently running application support.
-- **Control Center** A full control center with user profile information, network, bluetooth, audio input/output, display controls, and night mode automation.
-- **Lock Screen** Using quickshell's WlSessionLock with embedded virtual keyboard for Niri (Niri doesn't support placing virtual keyboard above lockscreen natively: [issue](https://github.com/YaLTeR/niri/issues/2201))
-- **Notepad** A simple text notepad/scratchpad with auto-save to session data and file export/import functionality.
+**[Manual Installation Guide →](https://danklinux.com/docs/dankmaterialshell/installation)**
 
-</details>
+---
 
-## Highlights
+## What You Get
 
-- Auto-theming GTK, QT, Terminal apps, and more with [matugen](https://github.com/InioX/matugen) + optional theme generation from wallpaper.
-- 20+ widgets that can be added and re-arranged on the bar.
-- Process list, temperature monitoring, and resource monitoring with [dgop](https://github.com/AvengeMedia/dgop)
-- Notification service with support for grouping and richtext
-- App launcher + Spotlighht launcher with fuzzy search
-- Control center with mpris player, weather, and calendar integration.
-- Clipboard history view with image previews.
-- A dock for running apps + pinned apps
-- Configure bluetooth, wifi, and audio input+output devices.
-- A lock screen
-- Idle monitoring - configure auto lock, screen off, suspend, and hibernate with different knobs for battery + AC power.
-- A greeter
-- A comprehensive plugin system for endless customization possibilities.
+**Dynamic Theming**
+Wallpaper-based color schemes that automatically theme GTK, Qt, terminals, editors (like vscode), and more with [matugen](https://github.com/InioX/matugen) and [dank16](https://github.com/AvengeMedia/danklinux/blob/master/internal/dank16/dank16.go).
 
-**TL;DR** *dms replaces your waybar, swaylock, swayidle, hypridle, hyprlock, fuzzels, walker, mako, and basically everything you use to stitch a desktop together*
+**System Monitoring**
+Real-time CPU, RAM, GPU metrics and temps with [dgop](https://github.com/AvengeMedia/dgop). Full process list with search and management.
 
-## Installation
+**Powerful Launcher**
+Spotlight-style search for apps, files (via [dsearch](https://github.com/AvengeMedia/danksearch)), emojis, running windows, calculator, commands - extensible with plugins.
 
-### Compositor Setup
+**Control Center**
+Network, Bluetooth, audio devices, display settings, night mode - all in one clean interface.
 
-DankMaterialShell particularly aims at supporting the **niri** and **Hyprland** compositors, but it does support more wayland compositors with a diminished feature set (no monitor off, workspace switcher, overview integration, etc.):
+**Smart Notifications**
+Notification center with grouping, rich text support, and keyboard navigation.
 
-**Niri**:
-```bash
-# Arch Linux
-sudo pacman -S niri
+**Media Integration**
+MPRIS player controls, calendar sync, weather widgets, clipboard history with image previews.
 
-# Fedora  
-sudo dnf copr enable yalter/niri && sudo dnf install niri
-```
+**Complete Session Management**
+Lock screen, idle detection, auto-lock/suspend with separate AC/battery settings, greeter support.
 
-For detailed niri installation instructions, see the [niri Getting Started guide](https://yalter.github.io/niri/Getting-Started.html).
+**Plugin System**
+Endless customization with the [plugin registry](https://plugins.danklinux.com).
 
-**Hyprland**:
-```bash
-# Arch Linux
-sudo pacman -S hyprland
+**TL;DR** - One shell replaces waybar, swaylock, swayidle, mako, fuzzel, polkit and everything else you normally piece together to create a linux desktop.
 
-# Or from AUR for latest
-paru -S hyprland-git
+---
 
-# Fedora
-sudo dnf install hyprland
+## Supported Compositors
 
-# Or use Copr for latest builds
-sudo dnf copr enable solopasha/hyprland && sudo dnf install hyprland
-```
+DankMaterialShell works best with **[niri](https://github.com/YaLTeR/niri)**, **[Hyprland](https://hyprland.org/)**, **[sway](https://swaywm.org/)**, and **[dwl/MangoWC](https://github.com/DreamMaoMao/mangowc)** - with full workspace switching, overview integration, and monitor management.
 
-For detailed Hyprland installation instructions, see the [Hyprland wiki](https://wiki.hypr.land/Getting-Started/Installation/).
+Other Wayland compositors work too, just with a reduced feature set.
 
-### Dank Shell Installation
+**[Compositor configuration guide →](https://danklinux.com/docs/dankmaterialshell/compositors)**
 
-*feel free to contribute steps for other distributions*
+---
 
-#### Arch Linux - via AUR
+## Keybinds & IPC
 
-```bash
-# Stable release
-paru -S dms-shell-bin
-# Latest -git
-paru -S dms-shell-git
-```
+Control everything from the command line or keybinds:
 
-#### Fedora - via COPR
-
-```bash
-# Stable release
-sudo dnf copr enable avengemedia/dms && sudo dnf install dms
-# Latest -git
-sudo dnf copr enable avengemedia/dms-git && sudo dnf install dms
-```
-
-#### NixOS - via flake
-
-```bash
-nix profile install github:AvengeMedia/DankMaterialShell
-```
-
-#### NixOS - via home-manager
-
-To install using home-manager, you need to add this repo into your flake inputs:
-
-``` nix
-dgop = {
-  url = "github:AvengeMedia/dgop";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-dms-cli = {
-  url = "github:AvengeMedia/danklinux";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-dankMaterialShell = {
-  url = "github:AvengeMedia/DankMaterialShell";
-  inputs.nixpkgs.follows = "nixpkgs";
-  inputs.dgop.follows = "dgop";
-  inputs.dms-cli.follows = "dms-cli";
-};
-```
-
-Then somewhere in your home-manager config, add this to the imports:
-
-``` nix
-imports = [
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-];
-```
-
-If you use Niri, the `niri` homeModule provides additional options for Niri integration, such as key bindings and spawn:
-
-``` nix
-imports = [
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.default
-  inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
-];
-```
-
-> [!IMPORTANT]
-> To use the `niri` homeModule, you must have `sobidoo/niri-flake` in your inputs:
-
-``` nix
-niri = {
-  url = "github:sodiboo/niri-flake";
-  inputs.nixpkgs.follows = "nixpkgs";
-};
-```
-
-And import it in home-manager:
-
-``` nix
-imports = [
-  inputs.niri.homeModules.niri
-];
-```
-
-Now you can enable it with:
-
-``` nix
-programs.dankMaterialShell.enable = true;
-```
-
-There are a lot of possible configurations that you can enable/disable in the flake, check [nix/default.nix](nix/default.nix) and [nix/niri.nix](nix/niri.nix) to see them all.
-
-#### Other Distributions - via manual installation
-
-#### 1. Install Quickshell (Varies by Distribution)
-```bash
-# Arch
-paru -S quickshell-git
-# Fedora
-sudo dnf copr enable avengemedia/danklinux && sudo dnf install quickshell-git
-# ! TODO - document other distros
-```
-
-#### 2. Install the shell
-
-#### 2.1. Clone latest QML
-
-```bash
-mkdir ~/.config/quickshell && git clone https://github.com/AvengeMedia/DankMaterialShell.git ~/.config/quickshell/dms
-```
-
-**FOR Stable Version, Checkout the latest tag**
-
-```bash
-cd ~/.config/quickshell/dms
-# You'll have to re-run this, to update to the latest version.
-git checkout $(git describe --tags --abbrev=0)
-```
-
-#### 2.2. Install latest dms CLI
-
-```bash
-sudo sh -c "curl -L https://github.com/AvengeMedia/danklinux/releases/latest/download/dms-$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').gz | gunzip | tee /usr/local/bin/dms > /dev/null && chmod +x /usr/local/bin/dms"
-```
-**Note:** this is the latest *stable* dms CLI. If you are using QML/master (not pinned to a tag), then you may  periodically be missing features, etc.
-
-If preferred, you can build the dms-cli yourself (requires GO 1.24+)
-
-```bash
-git clone https://github.com/AvengeMedia/danklinux.git && cd danklinux
-make && sudo make install
-```
-
-#### 3. Optional Features (system monitoring, clipboard history, brightness controls, etc.)
-
-#### 3.1 Core optional dependencies
-```bash
-# Arch Linux
-sudo pacman -S cava wl-clipboard cliphist brightnessctl qt6-multimedia accountsservice
-paru -S matugen-bin dgop
-
-# Fedora
-sudo dnf install cava wl-clipboard brightnessctl qt6-qtmultimedia accountsservice
-sudo dnf copr enable avengemedia/danklinux && sudo dnf install cliphist ghostty hyprpicker matugen 
-```
-Note: by enabling and installing the avengemedia/dms copr above, these core dependencies will automatically be available for use. 
-
-*Other distros will just need to find sources for the above packages*
-
-#### 3.2 - dgop manual installation
-
-`dgop` is available via AUR and a nix flake, other distributions can install it manually.
-
-```bash
-sudo sh -c "curl -L https://github.com/AvengeMedia/dgop/releases/latest/download/dgop-linux-$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').gz | gunzip | tee /usr/local/bin/dgop > /dev/null && chmod +x /usr/local/bin/dgop"
-```
-
-**Optional Requirement Overview**
-
-- `dgop`: Ability to have system resource widgets, process list modal, and temperature monitoring.
-- `matugen`: Wallpaper-based dynamic theming
-- `brightnessctl`: Backlight and LED brightness control
-- `wl-clipboard`: Required for copying various elements to clipboard.
-- `cava`: Audio visualizer
-- `cliphist`: Clipboard history
-- `qt6-multimedia`: System sound support
-- `accountsservice`: Ability to sync 
-
-## Compositor Configuration
-
-A lot of options are subject to personal preference, but the below sets a good starting point for most features.
-
-### niri Integration
-
-Add to your niri config
-
-```kdl
-// Required for clipboard history integration
-spawn-at-startup "bash" "-c" "wl-paste --watch cliphist store &"
-
-// Recommended (must install polkit-mate before hand) for elevation prompts
-spawn-at-startup "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1"
-// This may be a different path on different distributions, the above is for the arch linux mate-polkit package
-
-// Starts DankShell
-spawn-at-startup "dms" "run"
-
-// If using niri newer than 271534e115e5915231c99df287bbfe396185924d (~aug 17 2025)
-// you can add this to disable built in config load errors since dank shell provides this
-config-notification {
-    disable-failed
-}
-
-// Dank keybinds
-// 1. These should not be in conflict with any pre-existing keybindings
-// 2. You need to merge them with your existing config if you want to use these
-// 3. You can change the keys to whatever you want, if you prefer something different
-// 4. For the increment/decrement ones you can change the steps to whatever you like too
-binds {
-   Mod+Space hotkey-overlay-title="Application Launcher" {
-      spawn "dms" "ipc" "call" "spotlight" "toggle";
-   }
-   Mod+V hotkey-overlay-title="Clipboard Manager" {
-      spawn "dms" "ipc" "call" "clipboard" "toggle";
-   }
-   Mod+M hotkey-overlay-title="Task Manager" {
-      spawn "dms" "ipc" "call" "processlist" "toggle";
-   }
-   Mod+N hotkey-overlay-title="Notification Center" {
-      spawn "dms" "ipc" "call" "notifications" "toggle";
-   }
-   Mod+Comma hotkey-overlay-title="Settings" {
-      spawn "dms" "ipc" "call" "settings" "toggle";
-   }
-   Mod+P hotkey-overlay-title="Notepad" {
-      spawn "dms" "ipc" "call" "notepad" "toggle";
-   }
-   Super+Alt+L hotkey-overlay-title="Lock Screen" {
-      spawn "dms" "ipc" "call" "lock" "lock";
-   }
-   Mod+X hotkey-overlay-title="Power Menu" {
-      spawn "dms" "ipc" "call" "powermenu" "toggle";
-   }
-   Mod+C hotkey-overlay-title="Control Center" {
-      spawn "dms" "ipc" "call" "control-center" "toggle";
-   }
-   Mod+Y hotkey-overlay-title="Browse Wallpapers" {
-      spawn "dms" "ipc" "call" "dankdash" "wallpaper";
-   }
-   XF86AudioRaiseVolume allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "increment" "3";
-   }
-   XF86AudioLowerVolume allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "decrement" "3";
-   }
-   XF86AudioMute allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "mute";
-   }
-   XF86AudioMicMute allow-when-locked=true {
-      spawn "dms" "ipc" "call" "audio" "micmute";
-   }
-   XF86MonBrightnessUp allow-when-locked=true {
-      spawn "dms" "ipc" "call" "brightness" "increment" "5" "";
-   }
-   // You can override the default device for e.g. keyboards by adding the device name to the last param
-   XF86MonBrightnessDown allow-when-locked=true {
-      spawn "dms" "ipc" "call" "brightness" "decrement" "5" "";
-   }
-   // Night mode toggle
-   Mod+Shift+N allow-when-locked=true {
-      spawn "dms" "ipc" "call" "night" "toggle";
-   }
-}
-
-// You probably want this too
-debug {
-   honor-xdg-activation-with-invalid-serial
-}
-```
-
-#### niri - place wallpaper on overview (blurred or non-blurred)
-
-Place the wallpaper on backdrop using a layer-rule for a contiguous surface.
-
-```kdl
-layer-rule {
-    match namespace="quickshell"
-    place-within-backdrop true
-}
-```
-
-If using "Blur Layer" option, you may want the blurred layer to appear on overview only, that can be done with some layer rules:
-
-```kdl
-layer-rule {
-    match namespace="dms:blurwallpaper"
-    opacity 0.0
-}
-
-layer-rule {
-    match namespace="dms:blurwallpaper"
-    place-within-backdrop true
-    opacity 1.0
-}
-```
-
-#### niri theming
-
-If using a niri build newer than [3933903](https://github.com/YaLTeR/niri/commit/39339032cee3453faa54c361a38db6d83756f750), you can synchronize colors and gaps with the shell settings by adding the following to your niri config.
-
-```bash
-# For colors
-echo -e 'include "dms/colors.kdl"' >> ~/.config/niri/config.kdl
-# For gaps, border widths, certain window rules
-echo -e 'include "dms/layout.kdl"' >> ~/.config/niri/config.kdl
-```
-
-### Hyprland Integration
-
-Add to your Hyprland config (`~/.config/hypr/hyprland.conf`):
-
-```bash
-# Required for clipboard history integration
-exec-once = bash -c "wl-paste --watch cliphist store &"
-
-# Recommended (must install polkit-mate beforehand) for elevation prompts  
-exec-once = /usr/lib/mate-polkit/polkit-mate-authentication-agent-1
-# This may be a different path on different distributions, the above is for the arch linux mate-polkit package
-
-# Starts DankShell
-exec-once = dms run
-
-# Dank keybinds
-# 1. These should not be in conflict with any pre-existing keybindings
-# 2. You need to merge them with your existing config if you want to use these
-# 3. You can change the keys to whatever you want, if you prefer something different
-# 4. For the increment/decrement ones you can change the steps to whatever you like too
-
-# Application and system controls
-bind = SUPER, Space, exec, dms ipc call spotlight toggle
-bind = SUPER, V, exec, dms ipc call clipboard toggle
-bind = SUPER, M, exec, dms ipc call processlist toggle
-bind = SUPER, N, exec, dms ipc call notifications toggle
-bind = SUPER, comma, exec, dms ipc call settings toggle
-bind = SUPER, P, exec, dms ipc call notepad toggle
-bind = SUPERALT, L, exec, dms ipc call lock lock
-bind = SUPER, X, exec, dms ipc call powermenu toggle
-bind = SUPER, Y, exec, dms ipc call dankdash wallpaper
-bind = SUPER, C, exec, dms ipc call control-center toggle
-bind = SUPER, TAB, exec, dms ipc call hypr toggleOverview
-
-# Audio controls (function keys)
-bindl = , XF86AudioRaiseVolume, exec, dms ipc call audio increment 3
-bindl = , XF86AudioLowerVolume, exec, dms ipc call audio decrement 3
-bindl = , XF86AudioMute, exec, dms ipc call audio mute
-bindl = , XF86AudioMicMute, exec, dms ipc call audio micmute
-
-# Brightness controls (function keys)
-bindl = , XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 ""
-# You can override the default device for e.g. keyboards by adding the device name to the last param
-bindl = , XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 ""
-
-# Night mode toggle
-bind = SUPERSHIFT, N, exec, dms ipc call night toggle
-```
-
-## Greeter
-
-You can install a matching [greetd](https://github.com/kennylevinsen/greetd) greeter, that will give you a greeter that matches the lock screen.
-
-It's as simple as running `dms greeter install` in most cases, but more information is in the [Greetd module](Modules/Greetd/README.md)
-
-## IPC Commands
-
-Control everything from the command line, or via keybinds. For comprehensive documentation of all available IPC commands, see [docs/IPC.md](docs/IPC.md).
-
-### Audio control
-```bash
-dms ipc call audio setvolume 50
-dms ipc call audio mute
-```
-### Launch applications
 ```bash
 dms ipc call spotlight toggle
-dms ipc call notepad toggle
-dms ipc call processlist toggle
-dms ipc call powermenu toggle
-```
-### System control
-```
+dms ipc call audio setvolume 50
 dms ipc call wallpaper set /path/to/image.jpg
 dms ipc call theme toggle
-dms ipc call night toggle
-dms ipc call lock lock
-```
-### Media control
-```
-dms ipc call mpris playPause
-dms ipc call mpris next
 ```
 
+**[Full keybind and IPC documentation →](https://danklinux.com/docs/dankmaterialshell/keybinds-ipc)**
+
+---
+
 ## Theming
 
-dms will spawn a matugen process on theme changes to generate color palettes for installed and supported apps. If you do not want these files generated, you can set the env variable `DMS_DISABLE_MATUGEN=1` to disable it entirely.
+DankMaterialShell automatically generates color schemes from your wallpaper or theme and applies them to GTK, Qt, terminals, and more.
 
-### Custom Themes
+DMS is not opinionated or forcing these themes - they are created as optional themes you can enable. You can refer to the documentation if you want to use them:
 
-DankMaterialShell supports custom color themes! You can create your own Material Design 3 color schemes or use pre-made themes like Cyberpunk Electric, Hotline Miami, and Miami Vice.
+**Application theming:** [GTK, Qt, Firefox, terminals, vscode →](https://danklinux.com/docs/dankmaterialshell/application-themes)
 
-For detailed instructions on creating and using custom themes, see [docs/CUSTOM_THEMES.md](docs/CUSTOM_THEMES.md).
+**Custom themes:** [Create your own color schemes →](https://danklinux.com/docs/dankmaterialshell/custom-themes)
 
-### System App Integration
-
-There's two toggles in the appearance section of settings, for GTK and QT apps.
-
-These settings will override some local GTK and QT configuration files, you can still integrate auto-theming if you do not wish DankShell to mess with your QTCT/GTK files.
-
-No matter what when matugen is enabled the files will be created on wallpaper changes:
-
-- ~/.config/gtk-3.0/dank-colors.css
-- ~/.config/gtk-4.0/dank-colors.css
-- ~/.config/qt6ct/colors/matugen.conf
-- ~/.config/qt5ct/colors/matugen.conf
-
-If you do not like our theme path, you can integrate this with other GTK themes, matugen themes, etc.
-
-#### GTK Apps
-
-1. Install adw-gtk3
-
-```bash
-# Arch
-sudo pacman -S adw-gtk-theme
-# Fedora
-sudo dnf install adw-gtk3-theme
-```
-
-In dms settings, navigate to Theme & Colors, and "apply GTK themes"
-
-This will create symlinks from `~/.config/gtk-3.0/4.0/dank-colors.css` to `~/.config/gtk-3.0/4.0/gtk.css` which enables theming.
-
-#### QT: basic gtk3 based theme (Option 1)
-
-If you mostly use gtk apps, you'll probably be happy to just set the QT platform theme to gtk3.
-
-```kdl
-environment {
-  // Add to existing environment block
-  QT_QPA_PLATFORMTHEME "gtk3"
-  QT_QPA_PLATFORMTHEME_QT6 "gtk3"
-}
-```
-
-#### QT: better theming (Option 2)
-
-1. Install qt6ct-kde
-
-```bash
-# Arch
-paru -S qt6ct-kde
-```
-
-*I'm not sure what it is on other distros, but you can manually install via instructions provides on [qt6ct-kde github](https://www.opencode.net/trialuser/qt6ct)
-
-2. **Configure Environment in niri**
-
-```kdl
-  // Add to existing environment block
-  QT_QPA_PLATFORMTHEME "qt6ct"
-  QT_QPA_PLATFORMTHEME_QT6 "qt6ct"
-```
-
-You'll have to restart your session for themes to take effect.
-
-Nevigate to dms settings -> themes & colors -> and click "Apply QT Themes"
-
-#### Firefox
-
-There are two theme paths for Firefox, using with [pywalfox](https://github.com/Frewacom/pywalfox) or [material fox](https://github.com/edelvarden/material-fox-updated)
-
-**(Option 1) - pywalfox**
-
-1. **Install [pywalfox](https://github.com/Frewacom/pywalfox)** on system.
-- Available in AUR via `paru -S python-pywalfox`
-
-2. **Install [pywalfox extension](https://addons.mozilla.org/firefox/addon/pywalfox/)** in firefox.
-
-3. **Restart dms and create symlink** to generate palette and then enable dank colors.
-- Run `ln -sf ~/.cache/wal/dank-pywalfox.json ~/.cache/wal/colors.json`
-
-
-**(Option 2) - Chrome-like theme with dynamic colors**
-
-Firefox does use the GTK3 theme, but it doesn't look that good on the stock theme IMO. A separate matugen css is generated for the [material fox](https://github.com/edelvarden/material-fox-updated) theme, you can configure that theme with dynamic colors by following the steps below.
-
-1. **In firefox, navigate to `about:config`**
-- set `toolkit.legacyuserprofilecustomizations.stylesheets` to `true`
-- set `svg.context-properties.content.enabled` to `true`
-- Create a new property called `userChrome.theme-material` and type `boolean`
-  - set to `true`
-
-<details><summary><strong>Expand for firefox screenshots</strong></summary>
-<img width="1262" height="104" alt="image" src="https://github.com/user-attachments/assets/4bca43d1-5735-4401-9b91-5ee4f0b1e357" />
-<img width="1262" height="104" alt="image" src="https://github.com/user-attachments/assets/348d37e0-5c6c-4db8-b7c9-89cabf282c25" />
-<img width="1244" height="106" alt="image" src="https://github.com/user-attachments/assets/75fd4972-bc4a-4657-b756-b31ef8061b3b" />
-</details>
-
-2. **Install material fox theme**
-```bash
-# Find Firefox profile directory
-export PROFILE_DIR=$(find ~/.mozilla/firefox -maxdepth 1 -type d -name "*.default-release" | head -n 1)
-
-# Download, extract to profile dir, and cleanup
-curl -L -o "$PROFILE_DIR/chrome.zip" https://github.com/edelvarden/material-fox-updated/releases/download/v2.0.0/chrome.zip
-unzip -o "$PROFILE_DIR/chrome.zip" -d "$PROFILE_DIR"
-rm "$PROFILE_DIR/chrome.zip"
-```
-
-3. **Configure dynamic colors for material fox theme**
-```bash
-export PROFILE_DIR=$(find ~/.mozilla/firefox -maxdepth 1 -type d -name "*.default-release" | head -n 1)
-rm -f "$PROFILE_DIR/chrome/theme-material-blue.css"
-ln -sf ~/.config/DankMaterialShell/firefox.css "$PROFILE_DIR/chrome/theme-material-blue.css"
-```
-
-### Terminal Integration
-
-The matugen integration will automatically generate new colors for certain apps only if they are installed.
-
-You can enable the dynamic color schemes in supported terminal apps by modifying their configurations:
-
-**Ghostty**:
-
-```bash
-echo "config-file = ./config-dankcolors" >> ~/.config/ghostty/config
-```
-
-If you want to disable excessive config reloaded popup sin ghostty, you may wish to also add this:
-
-```bash
-# These are the default danklinux options, if you still want config reloaded and copied to clipboard popups you can skip it.
-echo "app-notifications = no-clipboard-copy,no-config-reload" >> ~/.config/ghostty/config
-```
-
-**kitty**:
-
-```bash
-echo "include dank-theme.conf" >> ~/.config/kitty/kitty.conf
-```
+---
 
 ## Plugins
 
-[Plugin registry](https://github.com/AvengeMedia/dms-plugin-registry) - collection of available dms plugins.
+Extend dms with the plugin system. Browse community plugins at [plugins.danklinux.com](https://plugins.danklinux.com).
 
-dms features a plugin system - meaning you can create your own widgets and load other user widgets.
+**[Plugin development guide →](https://danklinux.com/docs/dankmaterialshell/plugins-overview)**
 
-More comprehensive details available in the [PLUGINS](PLUGINS/README.md) - and examples [Emoji Plugin](PLUGINS/ExampleEmojiPlugin) and [Wallpaper Change Hook](PLUGINS/WallpaperWatcherDaemon) are available for reference.
+---
 
-Install an example plugin by:
+## Documentation
 
-```bash
-mkdir ~/.config/DankMaterialShell/plugins
-cp -R ./PLUGINS/ExampleEmojiPlugin ~/.config/DankMaterialShell/plugins
-```
+**Website:** [danklinux.com](https://danklinux.com)
 
-**Only install plugins from TRUSTED sources.** Plugins execute QML and javascript at runtime, plugins from third parties should be reviewed before enabling them in dms.
+**Docs:** [danklinux.com/docs](https://danklinux.com/docs)
 
-### NixOS - via home-manager
+**Support:** [Ko-fi](https://ko-fi.com/avengemediallc)
 
-Add the following to your home-manager config to install a plugin:
-
-```nix
-programs.dankMaterialShell.plugins = {
-    ExampleEmojiPlugin.src = "${inputs.dankMaterialShell}/PLUGINS/ExampleEmojiPlugin";
-};
-```
-
-### Calendar Setup
-
-Sync your caldev compatible calendar (Google, Office365, etc.) for dashboard integration:
-
-<details><summary>Configuration Steps</summary>
-
-**Install dependencies:**
-
-#### Arch
-```bash
-sudo pacman -S vdirsyncer khal python-aiohttp-oauthlib
-```
-
-#### Fedora
-```bash
-sudo dnf install python3-vdirsyncer khal python3-aiohttp-oauthlib
-```
-
-**Configure vdirsyncer** (`~/.vdirsyncer/config`):
-
-```ini
-[general]
-status_path = "~/.calendars/status"
-
-[pair personal_sync]
-a = "personal"
-b = "personallocal"
-collections = ["from a", "from b"]
-conflict_resolution = "a wins"
-metadata = ["color"]
-
-[storage personal]
-type = "google_calendar"
-token_file = "~/.vdirsyncer/google_calendar_token"
-client_id = "your_client_id"
-client_secret = "your_client_secret"
-
-[storage personallocal]
-type = "filesystem"
-path = "~/.calendars/Personal"
-fileext = ".ics"
-```
-
-**Setup sync:**
-
-```bash
-vdirsyncer sync
-khal configure
-```
-
-#### Auto-sync every 5 minutes
-```bash
-crontab -e
-# Add: */5 * * * * /usr/bin/vdirsyncer sync
-```
-
-</details>
-
-## Configuration
-
-All settings are configurable in
-```
-~/.config/DankMaterialShell/settings.json`, or more intuitively the built-in settings modal.
-```
-
-**Key configuration areas:**
-
-- Widget positioning and behavior
-- Theme and color preferences
-- Time format, weather units and location
-- Light/Dark modes
-- Wallpaper and Profile picture
-- Dock enable/disable and various tunes.
-
-## Troubleshooting
-
-**Common issues:**
-
-- **No dynamic theming:** Install matugen and enable in settings
-- **Qt apps not themed:** Configure qt5ct/qt6ct and set QT_QPA_PLATFORMTHEME
-- **Calendar not syncing:** Check vdirsyncer credentials and network connectivity
-
-**Getting help:**
-
-- Check the [issues](https://github.com/AvengeMedia/DankMaterialShell/issues) for known problems
-- Re-run the shell with `dms kill && dms run` to capture logs.
-- Join the niri community for compositor-specific questions
+---
 
 ## Contributing
 
-DankMaterialShell welcomes contributions! Whether it's bug fixes, new widgets, theme improvements, or documentation updates - all help is appreciated.
+Contributions welcome! Bug fixes, new widgets, theme improvements, or docs - it all helps.
 
-**Areas that need attention:**
+**Contributing Code:**
+1. Fork the repository
+2. Make your changes
+3. Open a pull request
 
-- More widget options and customization
-- Additional compositor compatibility
-- Performance optimizations
-- Documentation and examples
+**Contributing Documentation:**
+1. Fork the [DankLinux-Docs](https://github.com/AvengeMedia/DankLinux-Docs) repository
+2. Update files in the `docs/` folder
+3. Open a pull request
+
+Check the [issues](https://github.com/AvengeMedia/DankMaterialShell/issues) or join the community.
+
+---
 
 ## Credits
 

Services/AudioService.qml

@@ -2,6 +2,7 @@ pragma Singleton
 
 pragma ComponentBehavior: Bound
 
+import QtCore
 import QtQuick
 import Quickshell
 import Quickshell.Io
@@ -27,6 +28,9 @@ Singleton {
     property var normalNotificationSound: null
     property var criticalNotificationSound: null
 
+    property var mediaDevices: null
+    property var mediaDevicesConnections: null
+
     signal micMuteChanged
 
     Timer {
@@ -68,8 +72,8 @@ Singleton {
     function scanSoundThemes() {
         const xdgDataDirs = Quickshell.env("XDG_DATA_DIRS")
         const searchPaths = xdgDataDirs && xdgDataDirs.trim() !== ""
-            ? xdgDataDirs.split(":")
-            : ["/usr/share", "/usr/local/share", StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/.local/share"]
+            ? xdgDataDirs.split(":").concat(Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericDataLocation)))
+            : ["/usr/share", "/usr/local/share", Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericDataLocation))]
 
         const basePaths = searchPaths.map(p => p + "/sounds").join(" ")
         const script = `
@@ -134,8 +138,8 @@ Singleton {
 
         const xdgDataDirs = Quickshell.env("XDG_DATA_DIRS")
         const searchPaths = xdgDataDirs && xdgDataDirs.trim() !== ""
-            ? xdgDataDirs.split(":")
-            : ["/usr/share", "/usr/local/share", StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/.local/share"]
+            ? xdgDataDirs.split(":").concat(Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericDataLocation)))
+            : ["/usr/share", "/usr/local/share", Paths.strip(StandardPaths.writableLocation(StandardPaths.GenericDataLocation))]
 
         const extensions = ["oga", "ogg", "wav", "mp3", "flac"]
         const themesToSearch = themeName !== "freedesktop" ? `${themeName} freedesktop` : themeName
@@ -240,6 +244,42 @@ Singleton {
         }
     }
 
+    function setupMediaDevices() {
+        if (!soundsAvailable || mediaDevices) {
+            return
+        }
+
+        try {
+            mediaDevices = Qt.createQmlObject(`
+                import QtQuick
+                import QtMultimedia
+                MediaDevices {
+                    id: devices
+                    Component.onCompleted: {
+                        console.log("AudioService: MediaDevices initialized, default output:", defaultAudioOutput?.description)
+                    }
+                }
+            `, root, "AudioService.MediaDevices")
+
+            if (mediaDevices) {
+                mediaDevicesConnections = Qt.createQmlObject(`
+                    import QtQuick
+                    Connections {
+                        target: root.mediaDevices
+                        function onDefaultAudioOutputChanged() {
+                            console.log("AudioService: Default audio output changed, recreating sound players")
+                            root.destroySoundPlayers()
+                            root.createSoundPlayers()
+                        }
+                    }
+                `, root, "AudioService.MediaDevicesConnections")
+            }
+        } catch (e) {
+            console.log("AudioService: MediaDevices not available, using default audio output")
+            mediaDevices = null
+        }
+    }
+
     function destroySoundPlayers() {
         if (volumeChangeSound) {
             volumeChangeSound.destroy()
@@ -268,14 +308,20 @@ Singleton {
             return
         }
 
+        setupMediaDevices()
+
         try {
+            const deviceProperty = mediaDevices ? `device: root.mediaDevices.defaultAudioOutput\n                    ` : ""
+
             const volumeChangePath = getSoundPath("audio-volume-change")
             volumeChangeSound = Qt.createQmlObject(`
                 import QtQuick
                 import QtMultimedia
                 MediaPlayer {
                     source: "${volumeChangePath}"
-                    audioOutput: AudioOutput { volume: 1.0 }
+                    audioOutput: AudioOutput {
+                        ${deviceProperty}volume: 1.0
+                    }
                 }
             `, root, "AudioService.VolumeChangeSound")
 
@@ -285,7 +331,9 @@ Singleton {
                 import QtMultimedia
                 MediaPlayer {
                     source: "${powerPlugPath}"
-                    audioOutput: AudioOutput { volume: 1.0 }
+                    audioOutput: AudioOutput {
+                        ${deviceProperty}volume: 1.0
+                    }
                 }
             `, root, "AudioService.PowerPlugSound")
 
@@ -295,7 +343,9 @@ Singleton {
                 import QtMultimedia
                 MediaPlayer {
                     source: "${powerUnplugPath}"
-                    audioOutput: AudioOutput { volume: 1.0 }
+                    audioOutput: AudioOutput {
+                        ${deviceProperty}volume: 1.0
+                    }
                 }
             `, root, "AudioService.PowerUnplugSound")
 
@@ -305,7 +355,9 @@ Singleton {
                 import QtMultimedia
                 MediaPlayer {
                     source: "${messagePath}"
-                    audioOutput: AudioOutput { volume: 1.0 }
+                    audioOutput: AudioOutput {
+                        ${deviceProperty}volume: 1.0
+                    }
                 }
             `, root, "AudioService.NormalNotificationSound")
 
@@ -315,7 +367,9 @@ Singleton {
                 import QtMultimedia
                 MediaPlayer {
                     source: "${messageNewInstantPath}"
-                    audioOutput: AudioOutput { volume: 1.0 }
+                    audioOutput: AudioOutput {
+                        ${deviceProperty}volume: 1.0
+                    }
                 }
             `, root, "AudioService.CriticalNotificationSound")
         } catch (e) {

Services/CalendarService.qml

@@ -223,6 +223,13 @@ Singleton {
                         let eventId = event.title + "_" + event['start-date']
                         + "_" + (event['start-time'] || 'allday')
                         // Create event object template
+                        let extractedUrl = ""
+                        if (!event.url && event.description) {
+                            let urlMatch = event.description.match(/https?:\/\/[^\s]+/)
+                            if (urlMatch) {
+                                extractedUrl = urlMatch[0]
+                            }
+                        }
                         let eventTemplate = {
                             "id": eventId,
                             "title": event.title || "Untitled Event",
@@ -230,7 +237,7 @@ Singleton {
                             "end": endTime,
                             "location": event.location || "",
                             "description": event.description || "",
-                            "url": event.url || "",
+                            "url": event.url || extractedUrl,
                             "calendar": "",
                             "color": "",
                             "allDay": event['all-day'] === "True",

Services/CompositorService.qml

@@ -12,10 +12,13 @@ Singleton {
 
     property bool isHyprland: false
     property bool isNiri: false
+    property bool isDwl: false
+    property bool isSway: false
     property string compositor: "unknown"
 
     readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
     readonly property string niriSocket: Quickshell.env("NIRI_SOCKET")
+    readonly property string swaySocket: Quickshell.env("SWAYSOCK")
     property bool useNiriSorting: isNiri && NiriService
 
     property var sortedToplevels: sortedToplevelsCache
@@ -26,6 +29,30 @@ Singleton {
     property bool _hasRefreshedOnce: false
 
     property var _coordCache: ({})
+    property int _refreshCount: 0
+    property real _refreshWindowStart: 0
+    readonly property int _maxRefreshesPerSecond: 3
+
+    function getScreenScale(screen) {
+        if (!screen) return 1
+
+        if (isNiri && screen) {
+            const niriScale = NiriService.displayScales[screen.name]
+            if (niriScale !== undefined) return niriScale
+        }
+
+        if (isHyprland && screen) {
+            const hyprlandMonitor = Hyprland.monitors.values.find(m => m.name === screen.name)
+            if (hyprlandMonitor?.scale !== undefined) return hyprlandMonitor.scale
+        }
+
+        if (isDwl && screen) {
+            const dwlScale = DwlService.getOutputScale(screen.name)
+            if (dwlScale !== undefined && dwlScale > 0) return dwlScale
+        }
+
+        return screen?.devicePixelRatio || 1
+    }
 
     Timer {
         id: refreshTimer
@@ -53,6 +80,19 @@ Singleton {
     function scheduleRefresh() {
         if (!isHyprland) return
         if (_refreshScheduled) return
+
+        const now = Date.now()
+        if (now - _refreshWindowStart > 1000) {
+            _refreshCount = 0
+            _refreshWindowStart = now
+        }
+
+        if (_refreshCount >= _maxRefreshesPerSecond) {
+            console.warn("CompositorService: Refresh rate limit exceeded, skipping refresh")
+            return
+        }
+
+        _refreshCount++
         _refreshScheduled = true
         refreshTimer.restart()
     }
@@ -87,6 +127,15 @@ Singleton {
         Qt.callLater(() => NiriService.generateNiriLayoutConfig())
     }
 
+    Connections {
+        target: DwlService
+        function onStateChanged() {
+            if (isDwl && !isHyprland && !isNiri) {
+                scheduleSort()
+            }
+        }
+    }
+
     function computeSortedToplevels() {
         if (!ToplevelManager.toplevels || !ToplevelManager.toplevels.values)
             return []
@@ -125,6 +174,18 @@ Singleton {
             } catch(e) { return fb }
         }
 
+        let currentAddresses = new Set()
+        for (let i = 0; i < items.length; i++) {
+            const addr = items[i]?.address
+            if (addr) currentAddresses.add(addr)
+        }
+
+        for (let cachedAddr in _coordCache) {
+            if (!currentAddresses.has(cachedAddr)) {
+                delete _coordCache[cachedAddr]
+            }
+        }
+
         let snap = []
         let missingAnyPosition = false
         let hasNewWindow = false
@@ -331,6 +392,8 @@ Singleton {
         if (hyprlandSignature && hyprlandSignature.length > 0) {
             isHyprland = true
             isNiri = false
+            isDwl = false
+            isSway = false
             compositor = "hyprland"
             console.info("CompositorService: Detected Hyprland")
             try {
@@ -344,33 +407,103 @@ Singleton {
                 if (exitCode === 0) {
                     isNiri = true
                     isHyprland = false
+                    isDwl = false
+                    isSway = false
                     compositor = "niri"
                     console.info("CompositorService: Detected Niri with socket:", niriSocket)
                     NiriService.generateNiriBinds()
-                } else {
-                    isHyprland = false
-                    isNiri = true
-                    compositor = "niri"
-                    console.warn("CompositorService: Niri socket check failed, defaulting to Niri anyway")
+                    NiriService.generateNiriBlurrule()
                 }
             }, 0)
+            return
+        }
+
+        if (swaySocket && swaySocket.length > 0) {
+            Proc.runCommand("swaySocketCheck", ["test", "-S", swaySocket], (output, exitCode) => {
+                if (exitCode === 0) {
+                    isNiri = false
+                    isHyprland = false
+                    isDwl = false
+                    isSway = true
+                    compositor = "sway"
+                    console.info("CompositorService: Detected Sway with socket:", swaySocket)
+                }
+            }, 0)
+            return            
+        }
+        
+        if (DMSService.dmsAvailable) {
+            Qt.callLater(checkForDwl)
         } else {
             isHyprland = false
             isNiri = false
+            isDwl = false
+            isSway = false
             compositor = "unknown"
             console.warn("CompositorService: No compositor detected")
         }
     }
 
+    Connections {
+        target: DMSService
+        function onCapabilitiesReceived() {
+            if (!isHyprland && !isNiri && !isDwl) {
+                checkForDwl()
+            }
+        }
+    }
+
+    function checkForDwl() {
+        if (DMSService.apiVersion >= 12 && DMSService.capabilities.includes("dwl")) {
+            isHyprland = false
+            isNiri = false
+            isDwl = true
+            compositor = "dwl"
+            console.info("CompositorService: Detected DWL via DMS capability")
+        }
+    }
+
     function powerOffMonitors() {
         if (isNiri) return NiriService.powerOffMonitors()
         if (isHyprland) return Hyprland.dispatch("dpms off")
+        if (isDwl) return _dwlPowerOffMonitors()
+        if (isSway) { try { I3.dispatch("output * dpms off") } catch(_){} return }
         console.warn("CompositorService: Cannot power off monitors, unknown compositor")
     }
 
     function powerOnMonitors() {
         if (isNiri) return NiriService.powerOnMonitors()
         if (isHyprland) return Hyprland.dispatch("dpms on")
+        if (isDwl) return _dwlPowerOnMonitors()
+        if (isSway) { try { I3.dispatch("output * dpms on") } catch(_){} return }
         console.warn("CompositorService: Cannot power on monitors, unknown compositor")
     }
+
+    function _dwlPowerOffMonitors() {
+        if (!Quickshell.screens || Quickshell.screens.length === 0) {
+            console.warn("CompositorService: No screens available for DWL power off")
+            return
+        }
+
+        for (let i = 0; i < Quickshell.screens.length; i++) {
+            const screen = Quickshell.screens[i]
+            if (screen && screen.name) {
+                Quickshell.execDetached(["mmsg", "-d", "disable_monitor," + screen.name])
+            }
+        }
+    }
+
+    function _dwlPowerOnMonitors() {
+        if (!Quickshell.screens || Quickshell.screens.length === 0) {
+            console.warn("CompositorService: No screens available for DWL power on")
+            return
+        }
+
+        for (let i = 0; i < Quickshell.screens.length; i++) {
+            const screen = Quickshell.screens[i]
+            if (screen && screen.name) {
+                Quickshell.execDetached(["mmsg", "-d", "enable_monitor," + screen.name])
+            }
+        }
+    }
 }

Services/DMSNetworkService.qml

@@ -37,7 +37,7 @@ Singleton {
     property var savedConnections: []
     property var ssidToConnectionName: ({})
     property var wifiSignalIcon: {
-        if (!wifiConnected || networkStatus !== "wifi") {
+        if (!wifiConnected) {
             return "wifi_off"
         }
         if (wifiSignalStrength >= 50) {
@@ -73,6 +73,9 @@ Singleton {
     property var vpnActive: []
     property bool vpnAvailable: false
     property bool vpnIsBusy: false
+    property string lastConnectedVpnUuid: ""
+    property string pendingVpnUuid: ""
+    property var vpnBusyStartTime: 0
 
     property alias profiles: root.vpnProfiles
     property alias activeConnections: root.vpnActive
@@ -118,6 +121,7 @@ Singleton {
 
     Component.onCompleted: {
         root.userPreference = SettingsData.networkPreference
+        lastConnectedVpnUuid = SettingsData.vpnLastConnected || ""
         if (socketPath && socketPath.length > 0) {
             checkDMSCapabilities()
         }
@@ -271,8 +275,41 @@ Singleton {
             vpnProfiles = state.vpnProfiles
         }
 
+        const previousVpnActive = vpnActive
         vpnActive = state.vpnActive || []
 
+        if (vpnConnected && activeUuid) {
+            lastConnectedVpnUuid = activeUuid
+            SettingsData.setVpnLastConnected(activeUuid)
+        }
+
+        if (vpnIsBusy) {
+            const busyDuration = Date.now() - vpnBusyStartTime
+            const timeout = 30000
+
+            if (busyDuration > timeout) {
+                console.warn("DMSNetworkService: VPN operation timed out after", timeout, "ms")
+                vpnIsBusy = false
+                pendingVpnUuid = ""
+                vpnBusyStartTime = 0
+            } else if (pendingVpnUuid) {
+                const isPendingVpnActive = activeUuids.includes(pendingVpnUuid)
+                if (isPendingVpnActive) {
+                    vpnIsBusy = false
+                    pendingVpnUuid = ""
+                    vpnBusyStartTime = 0
+                }
+            } else {
+                const previousCount = previousVpnActive ? previousVpnActive.length : 0
+                const currentCount = vpnActive ? vpnActive.length : 0
+
+                if (previousCount !== currentCount) {
+                    vpnIsBusy = false
+                    vpnBusyStartTime = 0
+                }
+            }
+        }
+
         userPreference = state.preference || "auto"
         isConnecting = state.isConnecting || false
         connectingSSID = state.connectingSSID || ""
@@ -730,6 +767,8 @@ Singleton {
         if (!vpnAvailable || vpnIsBusy) return
 
         vpnIsBusy = true
+        pendingVpnUuid = uuidOrName
+        vpnBusyStartTime = Date.now()
 
         const params = {
             uuidOrName: uuidOrName,
@@ -737,12 +776,11 @@ Singleton {
         }
 
         DMSService.sendRequest("network.vpn.connect", params, response => {
-            vpnIsBusy = false
-
             if (response.error) {
+                vpnIsBusy = false
+                pendingVpnUuid = ""
+                vpnBusyStartTime = 0
                 ToastService.showError(I18n.tr("Failed to connect VPN"))
-            } else {
-                Qt.callLater(() => getState())
             }
         })
     }
@@ -755,18 +793,18 @@ Singleton {
         if (!vpnAvailable || vpnIsBusy) return
 
         vpnIsBusy = true
+        pendingVpnUuid = ""
+        vpnBusyStartTime = Date.now()
 
         const params = {
             uuidOrName: uuidOrName
         }
 
         DMSService.sendRequest("network.vpn.disconnect", params, response => {
-            vpnIsBusy = false
-
             if (response.error) {
+                vpnIsBusy = false
+                vpnBusyStartTime = 0
                 ToastService.showError(I18n.tr("Failed to disconnect VPN"))
-            } else {
-                Qt.callLater(() => getState())
             }
         })
     }
@@ -779,14 +817,12 @@ Singleton {
         if (!vpnAvailable || vpnIsBusy) return
 
         vpnIsBusy = true
+        pendingVpnUuid = ""
 
         DMSService.sendRequest("network.vpn.disconnectAll", null, response => {
-            vpnIsBusy = false
-
             if (response.error) {
+                vpnIsBusy = false
                 ToastService.showError(I18n.tr("Failed to disconnect VPNs"))
-            } else {
-                Qt.callLater(() => getState())
             }
         })
     }
@@ -805,8 +841,14 @@ Singleton {
             return
         }
 
-        if (vpnProfiles.length > 0) {
-            connectVpn(vpnProfiles[0].uuid)
+        if (vpnConnected) {
+            disconnectAllVpns()
+            return
+        }
+
+        const targetUuid = lastConnectedVpnUuid || (vpnProfiles.length > 0 ? vpnProfiles[0].uuid : "")
+        if (targetUuid) {
+            connectVpn(targetUuid)
         }
     }
 
@@ -827,4 +869,22 @@ Singleton {
             getState()
         }
     }
+
+    function setWifiAutoconnect(ssid, autoconnect) {
+        if (!networkAvailable || DMSService.apiVersion <= 13) return
+
+        const params = {
+            ssid: ssid,
+            autoconnect: autoconnect
+        }
+
+        DMSService.sendRequest("network.wifi.setAutoconnect", params, response => {
+            if (response.error) {
+                ToastService.showError(I18n.tr("Failed to update autoconnect"))
+            } else {
+                ToastService.showInfo(autoconnect ? I18n.tr("Autoconnect enabled") : I18n.tr("Autoconnect disabled"))
+                Qt.callLater(() => getState())
+            }
+        })
+    }
 }

Services/DMSService.qml

@@ -1,6 +1,6 @@
 pragma Singleton
 
-pragma ComponentBehavior: Bound
+pragma ComponentBehavior
 
 import QtCore
 import QtQuick
@@ -34,14 +34,18 @@ Singleton {
     signal searchResultsReceived(var plugins)
     signal operationSuccess(string message)
     signal operationError(string error)
-    signal connectionStateChanged()
+    signal connectionStateChanged
 
     signal networkStateUpdate(var data)
+    signal cupsStateUpdate(var data)
     signal loginctlStateUpdate(var data)
     signal loginctlEvent(var event)
-    signal capabilitiesReceived()
+    signal capabilitiesReceived
     signal credentialsRequest(var data)
     signal bluetoothPairingRequest(var data)
+    signal dwlStateUpdate(var data)
+    signal brightnessStateUpdate(var data)
+    signal brightnessDeviceUpdate(var device)
 
     Component.onCompleted: {
         if (socketPath && socketPath.length > 0) {
@@ -225,11 +229,7 @@ Singleton {
             if (response.error.includes("unknown method") && response.error.includes("subscribe")) {
                 if (!shownOutdatedError) {
                     console.error("DMSService: Server does not support subscribe method")
-                    ToastService.showError(
-                        I18n.tr("DMS out of date"),
-                        I18n.tr("To update, run the following command:"),
-                        updateCommand
-                    )
+                    ToastService.showError(I18n.tr("DMS out of date"), I18n.tr("To update, run the following command:"), updateCommand)
                     shownOutdatedError = true
                 }
             }
@@ -266,6 +266,16 @@ Singleton {
             }
         } else if (service === "bluetooth.pairing") {
             bluetoothPairingRequest(data)
+        } else if (service === "cups") {
+            cupsStateUpdate(data)
+        } else if (service === "dwl") {
+            dwlStateUpdate(data)
+        } else if (service === "brightness") {
+            brightnessStateUpdate(data)
+        } else if (service === "brightness.update") {
+            if (data.device) {
+                brightnessDeviceUpdate(data.device)
+            }
         }
     }
 
@@ -274,8 +284,8 @@ Singleton {
             console.warn("DMSService.sendRequest: Not connected, method:", method)
             if (callback) {
                 callback({
-                    "error": "not connected to DMS socket"
-                })
+                             "error": "not connected to DMS socket"
+                         })
             }
             return
         }

Services/DSearchService.qml

@@ -0,0 +1,143 @@
+pragma Singleton
+
+pragma ComponentBehavior
+
+import QtCore
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import qs.Common
+
+Singleton {
+    id: root
+
+    property bool dsearchAvailable: false
+    property int searchIdCounter: 0
+
+    signal searchResultsReceived(var results)
+    signal statsReceived(var stats)
+    signal errorOccurred(string error)
+
+    Process {
+        id: checkProcess
+        command: ["sh", "-c", "command -v dsearch"]
+        running: true
+
+        stdout: SplitParser {
+            onRead: line => {
+                if (line && line.trim().length > 0) {
+                    root.dsearchAvailable = true
+                }
+            }
+        }
+
+        onExited: exitCode => {
+            if (exitCode !== 0) {
+                root.dsearchAvailable = false
+            }
+        }
+    }
+
+    function ping(callback) {
+        if (!dsearchAvailable) {
+            if (callback) {
+                callback({ "error": "dsearch not available" })
+            }
+            return
+        }
+
+        Proc.runCommand("dsearch-ping", ["dsearch", "ping", "--json"], (stdout, exitCode) => {
+            if (callback) {
+                if (exitCode === 0) {
+                    try {
+                        const response = JSON.parse(stdout)
+                        callback({ "result": response })
+                    } catch (e) {
+                        callback({ "error": "failed to parse ping response" })
+                    }
+                } else {
+                    callback({ "error": "ping failed" })
+                }
+            }
+        })
+    }
+
+    function search(query, params, callback) {
+        if (!query || query.length === 0) {
+            if (callback) {
+                callback({ "error": "query is required" })
+            }
+            return
+        }
+
+        if (!dsearchAvailable) {
+            if (callback) {
+                callback({ "error": "dsearch not available" })
+            }
+            return
+        }
+
+        const args = ["dsearch", "search", query, "--json"]
+
+        if (params) {
+            if (params.limit !== undefined) {
+                args.push("-n", String(params.limit))
+            }
+            if (params.ext) {
+                args.push("-e", params.ext)
+            }
+            if (params.field) {
+                args.push("-f", params.field)
+            }
+            if (params.fuzzy) {
+                args.push("--fuzzy")
+            }
+            if (params.sort) {
+                args.push("--sort", params.sort)
+            }
+            if (params.desc !== undefined) {
+                args.push("--desc=" + (params.desc ? "true" : "false"))
+            }
+            if (params.minSize !== undefined) {
+                args.push("--min-size", String(params.minSize))
+            }
+            if (params.maxSize !== undefined) {
+                args.push("--max-size", String(params.maxSize))
+            }
+        }
+
+        Proc.runCommand("dsearch-search", args, (stdout, exitCode) => {
+            if (exitCode === 0) {
+                try {
+                    const response = JSON.parse(stdout)
+                    searchResultsReceived(response)
+                    if (callback) {
+                        callback({ "result": response })
+                    }
+                } catch (e) {
+                    const error = "failed to parse search response"
+                    errorOccurred(error)
+                    if (callback) {
+                        callback({ "error": error })
+                    }
+                }
+            } else if (exitCode === 124) {
+                const error = "search timed out"
+                errorOccurred(error)
+                if (callback) {
+                    callback({ "error": error })
+                }
+            } else {
+                const error = "search failed"
+                errorOccurred(error)
+                if (callback) {
+                    callback({ "error": error })
+                }
+            }
+        }, 100, 5000)
+    }
+
+    function rediscover() {
+        checkProcess.running = true
+    }
+}

Services/DwlService.qml

@@ -0,0 +1,259 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+
+Singleton {
+    id: root
+
+    property bool dwlAvailable: false
+    property var outputs: ({})
+    property var tagCount: 9
+    property var layouts: []
+    property string activeOutput: ""
+    property var outputScales: ({})
+
+    signal stateChanged()
+
+    Connections {
+        target: DMSService
+        function onCapabilitiesReceived() {
+            checkCapabilities()
+        }
+        function onConnectionStateChanged() {
+            if (DMSService.isConnected) {
+                checkCapabilities()
+            } else {
+                dwlAvailable = false
+            }
+        }
+        function onDwlStateUpdate(data) {
+            if (dwlAvailable) {
+                handleStateUpdate(data)
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        if (DMSService.dmsAvailable) {
+            checkCapabilities()
+        }
+        if (dwlAvailable) {
+            refreshOutputScales()
+        }
+    }
+
+    function checkCapabilities() {
+        if (!DMSService.capabilities || !Array.isArray(DMSService.capabilities)) {
+            dwlAvailable = false
+            return
+        }
+
+        const hasDwl = DMSService.capabilities.includes("dwl")
+        if (hasDwl && !dwlAvailable) {
+            dwlAvailable = true
+            console.info("DwlService: DWL capability detected")
+            requestState()
+            refreshOutputScales()
+        } else if (!hasDwl) {
+            dwlAvailable = false
+        }
+    }
+
+    function requestState() {
+        if (!DMSService.isConnected || !dwlAvailable) {
+            return
+        }
+
+        DMSService.sendRequest("dwl.getState", null, response => {
+            if (response.result) {
+                handleStateUpdate(response.result)
+            }
+        })
+    }
+
+    function handleStateUpdate(state) {
+        outputs = state.outputs || {}
+        tagCount = state.tagCount || 9
+        layouts = state.layouts || []
+        activeOutput = state.activeOutput || ""
+        stateChanged()
+    }
+
+    function setTags(outputName, tagmask, toggleTagset) {
+        if (!DMSService.isConnected || !dwlAvailable) {
+            return
+        }
+
+        DMSService.sendRequest("dwl.setTags", {
+            "output": outputName,
+            "tagmask": tagmask,
+            "toggleTagset": toggleTagset
+        }, response => {
+            if (response.error) {
+                console.warn("DwlService: setTags error:", response.error)
+            }
+        })
+    }
+
+    function setClientTags(outputName, andTags, xorTags) {
+        if (!DMSService.isConnected || !dwlAvailable) {
+            return
+        }
+
+        DMSService.sendRequest("dwl.setClientTags", {
+            "output": outputName,
+            "andTags": andTags,
+            "xorTags": xorTags
+        }, response => {
+            if (response.error) {
+                console.warn("DwlService: setClientTags error:", response.error)
+            }
+        })
+    }
+
+    function setLayout(outputName, index) {
+        if (!DMSService.isConnected || !dwlAvailable) {
+            return
+        }
+
+        DMSService.sendRequest("dwl.setLayout", {
+            "output": outputName,
+            "index": index
+        }, response => {
+            if (response.error) {
+                console.warn("DwlService: setLayout error:", response.error)
+            }
+        })
+    }
+
+    function getOutputState(outputName) {
+        if (!outputs || !outputs[outputName]) {
+            return null
+        }
+        return outputs[outputName]
+    }
+
+    function getActiveTags(outputName) {
+        const output = getOutputState(outputName)
+        if (!output || !output.tags) {
+            return []
+        }
+        return output.tags.filter(tag => tag.state === 1).map(tag => tag.tag)
+    }
+
+    function getTagsWithClients(outputName) {
+        const output = getOutputState(outputName)
+        if (!output || !output.tags) {
+            return []
+        }
+        return output.tags.filter(tag => tag.clients > 0).map(tag => tag.tag)
+    }
+
+    function getUrgentTags(outputName) {
+        const output = getOutputState(outputName)
+        if (!output || !output.tags) {
+            return []
+        }
+        return output.tags.filter(tag => tag.state === 2).map(tag => tag.tag)
+    }
+
+    function switchToTag(outputName, tagIndex) {
+        const tagmask = 1 << tagIndex
+        setTags(outputName, tagmask, 0)
+    }
+
+    function toggleTag(outputName, tagIndex) {
+        const output = getOutputState(outputName)
+        if (!output || !output.tags) {
+            console.log("toggleTag: no output or tags for", outputName)
+            return
+        }
+
+        let currentMask = 0
+        output.tags.forEach(tag => {
+            if (tag.state === 1) {
+                currentMask |= (1 << tag.tag)
+            }
+        })
+
+        const clickedMask = 1 << tagIndex
+        const newMask = currentMask ^ clickedMask
+
+        console.log("toggleTag:", outputName, "tag:", tagIndex, "currentMask:", currentMask.toString(2), "clickedMask:", clickedMask.toString(2), "newMask:", newMask.toString(2))
+
+        if (newMask === 0) {
+            console.log("toggleTag: newMask is 0, switching to tag", tagIndex)
+            setTags(outputName, 1 << tagIndex, 0)
+        } else {
+            console.log("toggleTag: setting combined mask", newMask)
+            setTags(outputName, newMask, 0)
+        }
+    }
+
+    function quit() {
+        Quickshell.execDetached(["mmsg", "-d", "quit"])
+    }
+
+    Process {
+        id: scaleQueryProcess
+        command: ["mmsg", "-A"]
+        running: false
+
+        stdout: StdioCollector {
+            onStreamFinished: {
+                try {
+                    const newScales = {}
+                    const lines = text.trim().split('\n')
+                    for (const line of lines) {
+                        const parts = line.trim().split(/\s+/)
+                        if (parts.length >= 3 && parts[1] === "scale_factor") {
+                            const outputName = parts[0]
+                            const scale = parseFloat(parts[2])
+                            if (!isNaN(scale)) {
+                                newScales[outputName] = scale
+                            }
+                        }
+                    }
+                    outputScales = newScales
+                } catch (e) {
+                    console.warn("DwlService: Failed to parse mmsg output:", e)
+                }
+            }
+        }
+
+        onExited: exitCode => {
+            if (exitCode !== 0) {
+                console.warn("DwlService: mmsg failed with exit code:", exitCode)
+            }
+        }
+    }
+
+    function refreshOutputScales() {
+        if (!dwlAvailable) return
+        scaleQueryProcess.running = true
+    }
+
+    function getOutputScale(outputName) {
+        return outputScales[outputName]
+    }
+
+    function getVisibleTags(outputName) {
+        const output = getOutputState(outputName)
+        if (!output || !output.tags) {
+            return []
+        }
+
+        const visibleTags = new Set()
+
+        output.tags.forEach(tag => {
+            if (tag.state === 1 || tag.clients > 0) {
+                visibleTags.add(tag.tag)
+            }
+        })
+
+        return Array.from(visibleTags).sort((a, b) => a - b)
+    }
+}

Services/HyprKeybindsService.qml

@@ -10,8 +10,6 @@ import qs.Common
 Singleton {
     id: root
 
-    readonly property string shellDir: Paths.strip(Qt.resolvedUrl(".").toString()).replace("/Services/", "")
-    property string scriptPath: `${shellDir}/scripts/hyprland_keybinds.py`
     readonly property string _configUrl: StandardPaths.writableLocation(StandardPaths.ConfigLocation)
     readonly property string _configDir: Paths.strip(_configUrl)
     property string hyprConfigPath: `${_configDir}/hypr`
@@ -19,8 +17,8 @@ Singleton {
 
     Process {
         id: getKeybinds
-        running: true
-        command: [root.scriptPath, "--path", root.hyprConfigPath]
+        running: false
+        command: ["dms", "hyprland", "keybinds", "--path", root.hyprConfigPath]
 
         stdout: SplitParser {
             onRead: data => {
@@ -31,9 +29,22 @@ Singleton {
                 }
             }
         }
+
+        onExited: (code) => {
+            if (code !== 0) {
+                console.warn("[HyprKeybindsService] Process exited with code:", code)
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        getKeybinds.running = true
     }
 
     function reload() {
-        getKeybinds.running = true
+        getKeybinds.running = false
+        Qt.callLater(function() {
+            getKeybinds.running = true
+        })
     }
 }

Services/LegacyNetworkService.qml

@@ -10,7 +10,6 @@ import qs.Common
 Singleton {
     id: root
 
-    property int refCount: 0
     property bool isActive: false
     property string networkStatus: "disconnected"
     property string primaryConnection: ""
@@ -56,8 +55,6 @@ Singleton {
     property string connectionError: ""
 
     property bool isScanning: false
-    property bool autoScan: false
-
     property bool wifiAvailable: true
     property bool wifiToggling: false
     property bool changingPreference: false
@@ -66,7 +63,6 @@ Singleton {
     property string connectionStatus: ""
     property string lastConnectionError: ""
     property bool passwordDialogShouldReopen: false
-    property bool autoRefreshEnabled: false
     property string wifiPassword: ""
     property string forgetSSID: ""
 
@@ -109,114 +105,20 @@ Singleton {
         root.userPreference = SettingsData.networkPreference
     }
 
-    Component.onDestruction: {
-        nmStateMonitor.running = false
-    }
-
     function activate() {
         if (!isActive) {
             isActive = true
             console.info("LegacyNetworkService: Activating...")
-            initializeDBusMonitors()
+            doRefreshNetworkState()
         }
     }
 
-    function addRef() {
-        refCount++
-        if (refCount === 1) {
-            startAutoScan()
-        }
-    }
-
-    function removeRef() {
-        refCount = Math.max(0, refCount - 1)
-        if (refCount === 0) {
-            stopAutoScan()
-        }
-    }
-
-    function initializeDBusMonitors() {
-        nmStateMonitor.running = true
-        doRefreshNetworkState()
-    }
-
-    Process {
-        id: nmStateMonitor
-        command: lowPriorityCmd.concat(["gdbus", "monitor", "--system", "--dest", "org.freedesktop.NetworkManager"])
-        running: false
-
-        property var lastRefreshTime: 0
-        property int minRefreshInterval: 1000
-
-        stdout: SplitParser {
-            splitMarker: "\n"
-            onRead: line => {
-                const now = Date.now()                    
-                    if (line.includes("PropertiesChanged") && line.includes("org.freedesktop.NetworkManager.AccessPoint")) {
-                        if (line.includes("'Strength'") && root.activeAccessPointPath && line.includes(root.activeAccessPointPath)) {
-                            parseSignalStrengthFromDbus(line)
-                        }
-                        return
-                    }
-
-                    if (line.includes("StateChanged") || 
-                        line.includes("PrimaryConnectionChanged") || 
-                        line.includes("WirelessEnabled") || 
-                        (line.includes("ActiveConnection") && line.includes("State"))) {
-
-                        if (now - nmStateMonitor.lastRefreshTime > nmStateMonitor.minRefreshInterval) {
-                            nmStateMonitor.lastRefreshTime = now
-                            refreshNetworkState()
-                        }
-                    }
-            }
-        }
-
-        onExited: exitCode => {
-            if (exitCode !== 0 && !restartTimer.running) {
-                console.warn("NetworkManager monitor failed, restarting in 5s")
-                restartTimer.start()
-            }
-        }
-    }
-
-    Timer {
-        id: restartTimer
-        interval: 5000
-        running: false
-        onTriggered: nmStateMonitor.running = true
-    }
-
-    Timer {
-        id: refreshDebounceTimer
-        interval: 100
-        running: false
-        onTriggered: doRefreshNetworkState()
-    }
-
-    function refreshNetworkState() {
-        refreshDebounceTimer.restart()
-    }
-
-    function parseSignalStrengthFromDbus(line) {
-        const strengthMatch = line.match(/'Strength': <byte (0x[0-9a-fA-F]+)>/)
-        if (strengthMatch) {
-            const hexValue = strengthMatch[1]
-            const strength = parseInt(hexValue, 16)
-            if (strength >= 0 && strength <= 100) {
-                root.wifiSignalStrength = strength
-            }
-        }
-    }
 
     function doRefreshNetworkState() {
         updatePrimaryConnection()
         updateDeviceStates()
         updateActiveConnections()
         updateWifiState()
-        if (root.refCount > 0 && root.wifiEnabled) {
-            scanWifiNetworks()
-        }
     }
 
     function updatePrimaryConnection() {
@@ -333,9 +235,6 @@ Singleton {
                     getEthernetIP.running = true
                 } else {
                     root.ethernetIP = ""
-                    if (root.networkStatus === "ethernet") {
-                        updatePrimaryConnection()
-                    }
                 }
             }
         }
@@ -907,18 +806,6 @@ Singleton {
         }
     }
 
-    function startAutoScan() {
-        root.autoScan = true
-        root.autoRefreshEnabled = true
-        if (root.wifiEnabled) {
-            scanWifi()
-        }
-    }
-
-    function stopAutoScan() {
-        root.autoScan = false
-        root.autoRefreshEnabled = false
-    }
 
     function fetchNetworkInfo(ssid) {
         root.networkInfoSSID = ssid

Services/NetworkService.qml

@@ -283,4 +283,10 @@ Singleton {
             activeService.cancelCredentials(token)
         }
     }
+
+    function setWifiAutoconnect(ssid, autoconnect) {
+        if (activeService && activeService.setWifiAutoconnect) {
+            activeService.setWifiAutoconnect(ssid, autoconnect)
+        }
+    }
 }

Services/NiriService.qml

@@ -39,6 +39,11 @@ Singleton {
 
     signal windowUrgentChanged
 
+    function setWorkspaces(newMap) {
+        root.workspaces = newMap
+        allWorkspaces = Object.values(newMap).sort((a, b) => a.idx - b.idx)
+    }
+
     Component.onCompleted: fetchOutputs()
 
     Timer {
@@ -280,8 +285,7 @@ Singleton {
             }
         }
 
-        root.workspaces = newWorkspaces
-        allWorkspaces = Object.values(newWorkspaces).sort((a, b) => a.idx - b.idx)
+        setWorkspaces(newWorkspaces)
 
         focusedWorkspaceIndex = allWorkspaces.findIndex(w => w.is_focused)
         if (focusedWorkspaceIndex >= 0) {
@@ -325,18 +329,15 @@ Singleton {
             updatedWorkspaces[id] = updatedWs
         }
 
-        root.workspaces = updatedWorkspaces
+        setWorkspaces(updatedWorkspaces)
 
         focusedWorkspaceId = data.id
-        focusedWorkspaceIndex = Object.values(updatedWorkspaces).findIndex(w => w.id === data.id)
+        focusedWorkspaceIndex = allWorkspaces.findIndex(w => w.id === data.id)
 
         if (focusedWorkspaceIndex >= 0) {
-            const ws = Object.values(updatedWorkspaces)[focusedWorkspaceIndex]
-            currentOutput = ws.output || ""
+            currentOutput = allWorkspaces[focusedWorkspaceIndex].output || ""
         }
 
-        allWorkspaces = Object.values(updatedWorkspaces).sort((a, b) => a.idx - b.idx)
-
         updateCurrentOutputWorkspaces()
     }
 
@@ -377,7 +378,7 @@ Singleton {
                 for (const id in root.workspaces) {
                     updatedWorkspaces[id] = id === focusedWindow.workspace_id ? updatedWs : root.workspaces[id]
                 }
-                root.workspaces = updatedWorkspaces
+                setWorkspaces(updatedWorkspaces)
             }
         }
     }
@@ -395,7 +396,7 @@ Singleton {
             for (const id in root.workspaces) {
                 updatedWorkspaces[id] = id === data.workspace_id ? updatedWs : root.workspaces[id]
             }
-            root.workspaces = updatedWorkspaces
+            setWorkspaces(updatedWorkspaces)
         }
 
         const updatedWindows = []
@@ -533,9 +534,7 @@ Singleton {
         for (const id in root.workspaces) {
             updatedWorkspaces[id] = id === data.id ? updatedWs : root.workspaces[id]
         }
-        root.workspaces = updatedWorkspaces
-
-        allWorkspaces = Object.values(updatedWorkspaces).sort((a, b) => a.idx - b.idx)
+        setWorkspaces(updatedWorkspaces)
 
         windowUrgentChanged()
     }
@@ -892,4 +891,17 @@ window-rule {
         writeBindsProcess.command = ["sh", "-c", `mkdir -p "${niriDmsDir}" && cp --no-preserve=mode "${sourceBindsPath}" "${bindsPath}"`]
         writeBindsProcess.running = true
     }
+
+    function generateNiriBlurrule() {
+        console.log("NiriService: Generating wpblur config...")
+
+        const configDir = Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation))
+        const niriDmsDir = configDir + "/niri/dms"
+        const blurrulePath = niriDmsDir + "/wpblur.kdl"
+        const sourceBlurrulePath = Paths.strip(Qt.resolvedUrl("niri-wpblur.kdl"))
+
+        writeBindsProcess.bindsPath = blurrulePath
+        writeBindsProcess.command = ["sh", "-c", `mkdir -p "${niriDmsDir}" && cp --no-preserve=mode "${sourceBlurrulePath}" "${blurrulePath}"`]
+        writeBindsProcess.running = true
+    }
 }

Services/NotepadStorageService.qml

@@ -21,6 +21,10 @@ Singleton {
     property var tabsBeingCreated: ({})
     property bool metadataLoaded: false
 
+    Component.onCompleted: {
+        ensureDirectories()
+    }
+
     FileView {
         id: metadataFile
         path: root.refCount > 0 ? root.metadataPath : ""
@@ -33,15 +37,15 @@ Singleton {
                 root.tabs = data.tabs || []
                 root.currentTabIndex = data.currentTabIndex || 0
                 root.metadataLoaded = true
-                validateTabs()
+                root.validateTabs()
             } catch(e) {
                 console.warn("Failed to parse notepad metadata:", e)
-                createDefaultTab()
+                root.createDefaultTab()
             }
         }
 
         onLoadFailed: {
-            createDefaultTab()
+            root.createDefaultTab()
         }
     }
 
@@ -52,6 +56,9 @@ Singleton {
         }
     }
 
+    function ensureDirectories() {
+        mkdirProcess.running = true
+    }
 
     function loadMetadata() {
         metadataFile.path = ""
@@ -67,7 +74,7 @@ Singleton {
         newTabsBeingCreated[id] = true
         tabsBeingCreated = newTabsBeingCreated
 
-        createEmptyFile(fullPath, function() {
+        root.createEmptyFile(fullPath, function() {
             root.tabs = [{
                 id: id,
                 title: I18n.tr("Untitled"),
@@ -82,7 +89,7 @@ Singleton {
             var updatedTabsBeingCreated = Object.assign({}, tabsBeingCreated)
             delete updatedTabsBeingCreated[id]
             tabsBeingCreated = updatedTabsBeingCreated
-            saveMetadata()
+            root.saveMetadata()
         })
     }
 
@@ -112,9 +119,20 @@ Singleton {
             })
             return
         }
-        var loader = tabFileLoaderComponent.createObject(root, {
+
+        var fileChecker = fileExistsComponent.createObject(root, {
             path: fullPath,
-            callback: callback
+            callback: (exists) => {
+                if (exists) {
+                    var loader = tabFileLoaderComponent.createObject(root, {
+                        path: fullPath,
+                        callback: callback
+                    })
+                } else {
+                    console.warn("Tab file does not exist:", fullPath)
+                    callback("")
+                }
+            }
         })
     }
 
@@ -268,7 +286,7 @@ Singleton {
         tabs = validTabs
 
         if (tabs.length === 0) {
-            createDefaultTab()
+            root.createDefaultTab()
         }
     }
 
@@ -291,6 +309,22 @@ Singleton {
         }
     }
 
+    Component {
+        id: fileExistsComponent
+        Process {
+            property string path
+            property var callback
+            command: ["test", "-f", path]
+
+            Component.onCompleted: running = true
+
+            onExited: (exitCode) => {
+                callback(exitCode === 0)
+                destroy()
+            }
+        }
+    }
+
     Component {
         id: tabFileSaverComponent
         FileView {
@@ -305,7 +339,7 @@ Singleton {
 
             onSaved: {
                 if (tabIndex >= 0) {
-                    updateTabMetadata(tabIndex, {})
+                    root.updateTabMetadata(tabIndex, {})
                 }
                 if (creationCallback) {
                     creationCallback()
@@ -390,4 +424,9 @@ Singleton {
         property string filePath
         command: ["rm", "-f", filePath]
     }
+
+    Process {
+        id: mkdirProcess
+        command: ["mkdir", "-p", root.baseDir, root.filesDir]
+    }
 }

Services/PluginService.qml

@@ -573,6 +573,12 @@ Singleton {
     function getPluginTrigger(pluginId) {
         const plugin = getLauncherPlugin(pluginId)
         if (plugin) {
+            // Check if noTrigger is set (always active mode)
+            const noTrigger = SettingsData.getPluginSetting(pluginId, "noTrigger", false)
+            if (noTrigger) {
+                return ""
+            }
+            // Otherwise load the custom trigger, defaulting to plugin manifest trigger
             const customTrigger = SettingsData.getPluginSetting(pluginId, "trigger", plugin.trigger || "!")
             return customTrigger
         }

Services/PolkitService.qml

@@ -0,0 +1,40 @@
+pragma Singleton
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+
+Singleton {
+    id: root
+
+    readonly property bool disablePolkitIntegration: Quickshell.env("DMS_DISABLE_POLKIT") === "1"
+
+    property bool polkitAvailable: false
+    property var agent: null
+
+    function createPolkitAgent() {
+        try {
+            const qmlString = `
+                import QtQuick
+                import Quickshell.Services.Polkit
+
+                PolkitAgent {
+                }
+            `
+
+            agent = Qt.createQmlObject(qmlString, root, "PolkitService.Agent")
+            polkitAvailable = true
+            console.info("PolkitService: Initialized successfully")
+        } catch (e) {
+            polkitAvailable = false
+            console.warn("PolkitService: Polkit not available - authentication prompts disabled. This requires a newer version of Quickshell.")
+        }
+    }
+
+    Component.onCompleted: {
+        if (disablePolkitIntegration) {
+            return
+        }
+        createPolkitAgent()
+    }
+}

Services/SessionService.qml

@@ -6,6 +6,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import Quickshell.Hyprland
+import Quickshell.I3
 import Quickshell.Wayland
 import qs.Common
 
@@ -184,7 +185,16 @@ Singleton {
                 return
             }
 
-            // Hyprland fallback
+            if (CompositorService.isDwl) {
+                DwlService.quit()
+                return
+            }
+
+            if (CompositorService.isSway) {
+                try { I3.dispatch("exit") } catch(_){}
+                return
+            }
+
             Hyprland.dispatch("exit")
         } else {
             Quickshell.execDetached(["sh", "-c", SettingsData.customPowerActionLogout])

Services/WallpaperCyclingService.qml

@@ -16,9 +16,6 @@ Singleton {
     property var monitorTimers: ({})
     property var monitorLastTimeChecks: ({})
     property var monitorProcesses: ({})
-    Component.onCompleted: {
-        updateCyclingState()
-    }
 
     Component {
         id: monitorTimerComponent
@@ -126,7 +123,7 @@ Singleton {
             var settings = SessionData.getMonitorCyclingSettings(screenName)
             var wallpaper = SessionData.getMonitorWallpaper(screenName)
 
-            if (settings.enabled && wallpaper && !wallpaper.startsWith("#") && !wallpaper.startsWith("we:")) {
+            if (settings.enabled && wallpaper && !wallpaper.startsWith("#")) {
                 startMonitorCycling(screenName, settings)
             } else {
                 stopMonitorCycling(screenName)
@@ -333,7 +330,7 @@ Singleton {
             var settings = SessionData.getMonitorCyclingSettings(screenName)
             var wallpaper = SessionData.getMonitorWallpaper(screenName)
 
-            if (settings.enabled && settings.mode === "time" && wallpaper && !wallpaper.startsWith("#") && !wallpaper.startsWith("we:")) {
+            if (settings.enabled && settings.mode === "time" && wallpaper && !wallpaper.startsWith("#")) {
                 var lastCheck = monitorLastTimeChecks[screenName] || ""
 
                 if (currentTime === settings.time && currentTime !== lastCheck) {

Services/WeatherService.qml

@@ -322,7 +322,7 @@ Singleton {
 
     Process {
         id: ipLocationFetcher
-        command: lowPriorityCmd.concat(curlBaseCmd).concat(["http://ipinfo.io/json"])
+        command: lowPriorityCmd.concat(curlBaseCmd).concat(["http://ip-api.com/json/"])
         running: false
 
         stdout: StdioCollector {
@@ -335,23 +335,17 @@ Singleton {
 
                 try {
                     const data = JSON.parse(raw)
-                    const coords = data.loc
+
+                    if (data.status === "fail") {
+                        throw new Error("IP location lookup failed")
+                    }
+
+                    const lat = parseFloat(data.lat)
+                    const lon = parseFloat(data.lon)
                     const city = data.city
 
-                    if (!coords || !city) {
-                        throw new Error("Missing location data")
-                    }
-
-                    const coordsParts = coords.split(",")
-                    if (coordsParts.length !== 2) {
-                        throw new Error("Invalid coordinates format")
-                    }
-
-                    const lat = parseFloat(coordsParts[0])
-                    const lon = parseFloat(coordsParts[1])
-
-                    if (isNaN(lat) || isNaN(lon)) {
-                        throw new Error("Invalid coordinate values")
+                    if (!city || isNaN(lat) || isNaN(lon)) {
+                        throw new Error("Missing or invalid location data")
                     }
 
                     root.location = {

Services/niri-wpblur.kdl

@@ -0,0 +1,4 @@
+layer-rule {
+    match namespace="dms:blurwallpaper"
+    place-within-backdrop true
+}

Shaders/frag/wp_disc.frag

@@ -120,5 +120,7 @@ void main() {
     // Mix the textures (factor = 0 inside disc, 1 outside)
     fragColor = mix(color2, color1, factor);
     
+    if (ubuf.progress <= 0.0) fragColor = color1;
+
     fragColor *= ubuf.qt_Opacity;
 }