Update VERSION to v0.2.0 (from DMS)

- Fitt's law stuff, whole height on horiz, whole width in vertical
- Probably missed stuff or breaks stuff, pretty big refactor

.github/workflows/copr-release.yml

@@ -106,7 +106,6 @@ jobs:
           Recommends:     hyprpicker
           Recommends:     matugen
           Recommends:     wl-clipboard
-          Recommends:     gammastep
           Recommends:     NetworkManager
           Recommends:     qt6-qtmultimedia
           Suggests:       qt6ct

.github/workflows/poeditor-export.yml

@@ -17,9 +17,91 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
       - name: Install jq
         run: sudo apt-get update && sudo apt-get install -y jq
 
+      - name: Extract source strings from codebase
+        env:
+          API_TOKEN: ${{ secrets.POEDITOR_API_TOKEN }}
+          PROJECT_ID: ${{ secrets.POEDITOR_PROJECT_ID }}
+        run: |
+          set -euo pipefail
+
+          echo "::group::Extracting strings from QML files"
+          python3 translations/extract_translations.py
+          echo "::endgroup::"
+
+          echo "::group::Checking for changes in en.json"
+          if [[ -f "translations/en.json" ]]; then
+            jq -S . "translations/en.json" > /tmp/en_new.json
+            if [[ -f "translations/en.json.orig" ]]; then
+              jq -S . "translations/en.json.orig" > /tmp/en_old.json
+            else
+              git show HEAD:translations/en.json > /tmp/en_old.json 2>/dev/null || echo "[]" > /tmp/en_old.json
+              jq -S . /tmp/en_old.json > /tmp/en_old.json.tmp && mv /tmp/en_old.json.tmp /tmp/en_old.json
+            fi
+
+            if diff -q /tmp/en_new.json /tmp/en_old.json >/dev/null 2>&1; then
+              echo "No changes in source strings"
+              echo "source_changed=false" >> "$GITHUB_OUTPUT"
+            else
+              echo "Detected changes in source strings"
+              echo "source_changed=true" >> "$GITHUB_OUTPUT"
+
+              echo "::group::Uploading source strings to POEditor"
+              RESP=$(curl -sS -X POST https://api.poeditor.com/v2/projects/upload \
+                -F api_token="$API_TOKEN" \
+                -F id="$PROJECT_ID" \
+                -F updating="terms" \
+                -F file=@"translations/en.json")
+
+              STATUS=$(echo "$RESP" | jq -r '.response.status')
+              if [[ "$STATUS" != "success" ]]; then
+                echo "::warning::POEditor upload failed: $RESP"
+              else
+                TERMS_ADDED=$(echo "$RESP" | jq -r '.result.terms.added // 0')
+                TERMS_UPDATED=$(echo "$RESP" | jq -r '.result.terms.updated // 0')
+                TERMS_DELETED=$(echo "$RESP" | jq -r '.result.terms.deleted // 0')
+                echo "Terms added: $TERMS_ADDED, updated: $TERMS_UPDATED, deleted: $TERMS_DELETED"
+              fi
+              echo "::endgroup::"
+            fi
+          else
+            echo "::warning::translations/en.json not found"
+            echo "source_changed=false" >> "$GITHUB_OUTPUT"
+          fi
+          echo "::endgroup::"
+        id: extract
+
+      - name: Commit and push source strings
+        if: steps.extract.outputs.source_changed == 'true'
+        run: |
+          set -euo pipefail
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git add translations/en.json translations/template.json
+          git commit -m "i18n: update source strings from codebase"
+
+          for attempt in 1 2 3; do
+            if git push; then
+              echo "Successfully pushed source string updates"
+              exit 0
+            fi
+            echo "Push attempt $attempt failed, pulling and retrying..."
+            git pull --rebase
+            sleep $((attempt*2))
+          done
+
+          echo "Failed to push after retries" >&2
+          exit 1
+
       - name: Export and update translations from POEditor
         env:
           API_TOKEN: ${{ secrets.POEDITOR_API_TOKEN }}

CLAUDE.md

@@ -191,9 +191,9 @@ shell.qml           # Main entry point (minimal orchestration)
 
    Singleton {
        id: root
-       
+
        property type value: defaultValue
-       
+
        function performAction() { /* implementation */ }
    }
    ```
@@ -251,23 +251,23 @@ shell.qml           # Main entry point (minimal orchestration)
    // For regular components
    Item {
        id: root
-       
+
        property type name: value
-       
+
        signal customSignal(type param)
-       
+
        onSignal: { /* handler */ }
-       
+
        Component { /* children */ }
    }
-   
+
    // For services (singletons)
    Singleton {
        id: root
-       
+
        property bool featureAvailable: false
        property type currentValue: defaultValue
-       
+
        function performAction(param) { /* implementation */ }
    }
    ```
@@ -305,7 +305,7 @@ shell.qml           # Main entry point (minimal orchestration)
    ```qml
    // In services - detect capabilities
    property bool brightnessAvailable: false
-   
+
    // In modules - adapt UI accordingly
    DankSlider {
        visible: DisplayService.brightnessAvailable
@@ -335,7 +335,7 @@ shell.qml           # Main entry point (minimal orchestration)
    console.log("Info message")           // General info
    console.warn("Warning message")       // Warnings
    console.error("Error message")        // Errors
-   
+
    // Include context in service operations
    onExited: (exitCode) => {
        if (exitCode !== 0) {

Common/I18n.qml

@@ -16,7 +16,7 @@ Singleton {
         return [fullUnderscore, fullHyphen, _lang].filter(c => c && c !== "en");
     }
 
-  
+
     readonly property url translationsFolder: Qt.resolvedUrl("../translations/poexports")
 
     property string currentLocale: "en"

Common/SessionData.qml

@@ -49,6 +49,7 @@ Singleton {
     property int nightModeEndMinute: 0
     property real latitude: 0.0
     property real longitude: 0.0
+    property bool nightModeUseIPLocation: false
     property string nightModeLocationProvider: ""
 
     property var pinnedApps: []
@@ -112,6 +113,7 @@ Singleton {
                 }
                 latitude = settings.latitude !== undefined ? settings.latitude : 0.0
                 longitude = settings.longitude !== undefined ? settings.longitude : 0.0
+                nightModeUseIPLocation = settings.nightModeUseIPLocation !== undefined ? settings.nightModeUseIPLocation : false
                 nightModeLocationProvider = settings.nightModeLocationProvider !== undefined ? settings.nightModeLocationProvider : ""
                 pinnedApps = settings.pinnedApps !== undefined ? settings.pinnedApps : []
                 selectedGpuIndex = settings.selectedGpuIndex !== undefined ? settings.selectedGpuIndex : 0
@@ -171,6 +173,7 @@ Singleton {
                                                 "nightModeEndMinute": nightModeEndMinute,
                                                 "latitude": latitude,
                                                 "longitude": longitude,
+                                                "nightModeUseIPLocation": nightModeUseIPLocation,
                                                 "nightModeLocationProvider": nightModeLocationProvider,
                                                 "pinnedApps": pinnedApps,
                                                 "selectedGpuIndex": selectedGpuIndex,
@@ -247,11 +250,11 @@ Singleton {
             "monitorWallpapersDark", "doNotDisturb", "nightModeEnabled",
             "nightModeTemperature", "nightModeAutoEnabled", "nightModeAutoMode",
             "nightModeStartHour", "nightModeStartMinute", "nightModeEndHour",
-            "nightModeEndMinute", "latitude", "longitude", "nightModeLocationProvider",
+            "nightModeEndMinute", "latitude", "longitude", "nightModeUseIPLocation", "nightModeLocationProvider",
             "pinnedApps", "selectedGpuIndex", "nvidiaGpuTempEnabled",
             "nonNvidiaGpuTempEnabled", "enabledGpuPciIds", "wallpaperCyclingEnabled",
             "wallpaperCyclingMode", "wallpaperCyclingInterval", "wallpaperCyclingTime",
-            "monitorCyclingSettings", "lastBrightnessDevice", "wallpaperTransition",
+            "monitorCyclingSettings", "lastBrightnessDevice", "launchPrefix", "wallpaperTransition",
             "includedTransitions", "recentColors", "showThirdPartyPlugins", "configVersion"
         ]
 
@@ -536,6 +539,11 @@ Singleton {
         saveSettings()
     }
 
+    function setNightModeUseIPLocation(use) {
+        nightModeUseIPLocation = use
+        saveSettings()
+    }
+
     function setLatitude(lat) {
         console.log("SessionData: Setting latitude to", lat)
         latitude = lat

Common/SettingsData.qml

@@ -25,10 +25,10 @@ Singleton {
 
     enum AnimationSpeed {
         None,
-        Shortest,
         Short,
         Medium,
-        Long
+        Long,
+        Custom
     }
 
     readonly property string defaultFontFamily: "Inter Variable"
@@ -64,6 +64,8 @@ Singleton {
     property bool useFahrenheit: false
     property bool nightModeEnabled: false
     property int animationSpeed: SettingsData.AnimationSpeed.Short
+    property int customAnimationDuration: 500
+    property string wallpaperFillMode: "Fill"
 
     property bool showLauncherButton: true
     property bool showWorkspaceSwitcher: true
@@ -109,6 +111,7 @@ Singleton {
     property bool focusedWindowCompactMode: false
     property bool runningAppsCompactMode: true
     property bool runningAppsCurrentWorkspace: false
+    property bool runningAppsGroupByApp: false
     property string clockDateFormat: ""
     property string lockDateFormat: ""
     property int mediaSize: 1
@@ -204,6 +207,9 @@ Singleton {
     property bool dankBarAutoHide: false
     property bool dankBarOpenOnOverview: false
     property bool dankBarVisible: true
+    property int overviewRows: 2
+    property int overviewColumns: 5
+    property real overviewScale: 0.16
     property real dankBarSpacing: 4
     property real dankBarBottomGap: 0
     property real dankBarInnerPadding: 4
@@ -373,6 +379,7 @@ Singleton {
                 focusedWindowCompactMode = settings.focusedWindowCompactMode !== undefined ? settings.focusedWindowCompactMode : false
                 runningAppsCompactMode = settings.runningAppsCompactMode !== undefined ? settings.runningAppsCompactMode : true
                 runningAppsCurrentWorkspace = settings.runningAppsCurrentWorkspace !== undefined ? settings.runningAppsCurrentWorkspace : false
+                runningAppsGroupByApp = settings.runningAppsGroupByApp !== undefined ? settings.runningAppsGroupByApp : false
                 clockDateFormat = settings.clockDateFormat !== undefined ? settings.clockDateFormat : ""
                 lockDateFormat = settings.lockDateFormat !== undefined ? settings.lockDateFormat : ""
                 mediaSize = settings.mediaSize !== undefined ? settings.mediaSize : (settings.mediaCompactMode !== undefined ? (settings.mediaCompactMode ? 0 : 1) : 1)
@@ -484,7 +491,9 @@ Singleton {
                 widgetBackgroundColor = settings.widgetBackgroundColor !== undefined ? settings.widgetBackgroundColor : "sch"
                 surfaceBase = settings.surfaceBase !== undefined ? settings.surfaceBase : "s"
                 screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({})
+                wallpaperFillMode = settings.wallpaperFillMode !== undefined ? settings.wallpaperFillMode : "Fill"
                 animationSpeed = settings.animationSpeed !== undefined ? settings.animationSpeed : SettingsData.AnimationSpeed.Short
+                customAnimationDuration = settings.customAnimationDuration !== undefined ? settings.customAnimationDuration : 500
                 acMonitorTimeout = settings.acMonitorTimeout !== undefined ? settings.acMonitorTimeout : 0
                 acLockTimeout = settings.acLockTimeout !== undefined ? settings.acLockTimeout : 0
                 acSuspendTimeout = settings.acSuspendTimeout !== undefined ? settings.acSuspendTimeout : 0
@@ -576,6 +585,7 @@ Singleton {
                                                 "focusedWindowCompactMode": focusedWindowCompactMode,
                                                 "runningAppsCompactMode": runningAppsCompactMode,
                                                 "runningAppsCurrentWorkspace": runningAppsCurrentWorkspace,
+                                                "runningAppsGroupByApp": runningAppsGroupByApp,
                                                 "clockDateFormat": clockDateFormat,
                                                 "lockDateFormat": lockDateFormat,
                                                 "mediaSize": mediaSize,
@@ -645,6 +655,7 @@ Singleton {
                                                 "hideBrightnessSlider": hideBrightnessSlider,
                                                 "widgetBackgroundColor": widgetBackgroundColor,
                                                 "surfaceBase": surfaceBase,
+                                                "wallpaperFillMode": wallpaperFillMode,
                                                 "notificationTimeoutLow": notificationTimeoutLow,
                                                 "notificationTimeoutNormal": notificationTimeoutNormal,
                                                 "notificationTimeoutCritical": notificationTimeoutCritical,
@@ -662,6 +673,7 @@ Singleton {
                                                 "updaterTerminalAdditionalParams": updaterTerminalAdditionalParams,
                                                 "screenPreferences": screenPreferences,
                                                 "animationSpeed": animationSpeed,
+                                                "customAnimationDuration": customAnimationDuration,
                                                 "acMonitorTimeout": acMonitorTimeout,
                                                 "acLockTimeout": acLockTimeout,
                                                 "acSuspendTimeout": acSuspendTimeout,
@@ -701,7 +713,7 @@ Singleton {
             "controlCenterWidgets", "showWorkspaceIndex", "workspaceScrolling", "showWorkspacePadding", "showWorkspaceApps",
             "maxWorkspaceIcons", "workspacesPerMonitor", "workspaceNameIcons", "waveProgressEnabled",
             "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode",
-            "runningAppsCurrentWorkspace", "clockDateFormat", "lockDateFormat", "mediaSize",
+            "runningAppsCurrentWorkspace", "runningAppsGroupByApp", "clockDateFormat", "lockDateFormat", "mediaSize",
             "dankBarLeftWidgets", "dankBarCenterWidgets", "dankBarRightWidgets",
             "appLauncherViewMode", "spotlightModalViewMode", "sortAppsAlphabetically",
             "networkPreference", "iconTheme", "launcherLogoMode", "launcherLogoCustomPath",
@@ -719,13 +731,13 @@ Singleton {
             "dankBarGothCornersEnabled", "dankBarBorderEnabled", "dankBarBorderColor",
             "dankBarBorderOpacity", "dankBarBorderThickness", "popupGapsAuto", "popupGapsManual",
             "dankBarPosition", "lockScreenShowPowerActions", "enableFprint", "maxFprintTries",
-            "hideBrightnessSlider", "widgetBackgroundColor", "surfaceBase",
+            "hideBrightnessSlider", "widgetBackgroundColor", "surfaceBase", "wallpaperFillMode",
             "notificationTimeoutLow", "notificationTimeoutNormal", "notificationTimeoutCritical",
             "notificationPopupPosition", "osdAlwaysShowValue", "powerActionConfirm",
             "customPowerActionLock", "customPowerActionLogout", "customPowerActionSuspend",
             "customPowerActionHibernate", "customPowerActionReboot", "customPowerActionPowerOff",
             "updaterUseCustomCommand", "updaterCustomCommand", "updaterTerminalAdditionalParams",
-            "screenPreferences", "animationSpeed", "acMonitorTimeout", "acLockTimeout",
+            "screenPreferences", "animationSpeed", "customAnimationDuration", "acMonitorTimeout", "acLockTimeout",
             "acSuspendTimeout", "acHibernateTimeout", "batteryMonitorTimeout", "batteryLockTimeout",
             "batterySuspendTimeout", "batteryHibernateTimeout", "lockBeforeSuspend",
             "loginctlLockIntegration", "launchPrefix", "configVersion"
@@ -1052,6 +1064,16 @@ Singleton {
         saveSettings()
     }
 
+    function setCustomAnimationDuration(duration) {
+        customAnimationDuration = duration
+        saveSettings()
+    }
+
+    function setWallpaperFillMode(mode) {
+        wallpaperFillMode = mode
+        saveSettings()
+    }
+
     function setShowLauncherButton(enabled) {
         showLauncherButton = enabled
         saveSettings()
@@ -1161,7 +1183,7 @@ Singleton {
         showWorkspaceIndex = enabled
         saveSettings()
     }
-    
+
     function setWorkspaceScrolling(enabled) {
         workspaceScrolling = enabled
         saveSettings()
@@ -1232,6 +1254,11 @@ Singleton {
         saveSettings()
     }
 
+    function setRunningAppsGroupByApp(enabled) {
+        runningAppsGroupByApp = enabled
+        saveSettings()
+    }
+
     function setClockDateFormat(format) {
         clockDateFormat = format || ""
         saveSettings()

Common/Theme.qml

@@ -61,7 +61,7 @@ Singleton {
     }
     readonly property string rawWallpaperPath: {
         if (typeof SessionData === "undefined") return ""
-        
+
         if (SessionData.perMonitorWallpaper) {
             // Use first monitor's wallpaper for dynamic theming
             var screens = Quickshell.screens
@@ -195,14 +195,16 @@ Singleton {
     }
 
     readonly property var availableMatugenSchemes: [
-        ({ "value": "scheme-tonal-spot", "label": "Tonal Spot", "description": "Balanced palette with focused accents (default)." }),
-        ({ "value": "scheme-content", "label": "Content", "description": "Derives colors that closely match the underlying image." }),
-        ({ "value": "scheme-expressive", "label": "Expressive", "description": "Vibrant palette with playful saturation." }),
-        ({ "value": "scheme-fidelity", "label": "Fidelity", "description": "High-fidelity palette that preserves source hues." }),
-        ({ "value": "scheme-fruit-salad", "label": "Fruit Salad", "description": "Colorful mix of bright contrasting accents." }),
-        ({ "value": "scheme-monochrome", "label": "Monochrome", "description": "Minimal palette built around a single hue." }),
-        ({ "value": "scheme-neutral", "label": "Neutral", "description": "Muted palette with subdued, calming tones." }),
-        ({ "value": "scheme-rainbow", "label": "Rainbow", "description": "Diverse palette spanning the full spectrum." })
+        ({ "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) {
@@ -313,6 +315,61 @@ Singleton {
     property int standardEasing: Easing.OutCubic
     property int emphasizedEasing: Easing.OutQuart
 
+    readonly property var expressiveCurves: {
+        "emphasized": [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1],
+        "emphasizedAccel": [0.3, 0, 0.8, 0.15, 1, 1],
+        "emphasizedDecel": [0.05, 0.7, 0.1, 1, 1, 1],
+        "standard": [0.2, 0, 0, 1, 1, 1],
+        "standardAccel": [0.3, 0, 1, 1, 1, 1],
+        "standardDecel": [0, 0, 0, 1, 1, 1],
+        "expressiveFastSpatial": [0.42, 1.67, 0.21, 0.9, 1, 1],
+        "expressiveDefaultSpatial": [0.38, 1.21, 0.22, 1, 1, 1],
+        "expressiveEffects": [0.34, 0.8, 0.34, 1, 1, 1]
+    }
+
+    readonly property var animationPresetDurations: {
+        "none": 0,
+        "short": 250,
+        "medium": 500,
+        "long": 750
+    }
+
+    readonly property int currentAnimationBaseDuration: {
+        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
+    }
+
+    readonly property var expressiveDurations: {
+        if (typeof SettingsData === "undefined") {
+            return {
+                "fast": 200,
+                "normal": 400,
+                "large": 600,
+                "extraLarge": 1000,
+                "expressiveFastSpatial": 350,
+                "expressiveDefaultSpatial": 500,
+                "expressiveEffects": 200
+            }
+        }
+
+        const baseDuration = currentAnimationBaseDuration
+        return {
+            "fast": baseDuration * 0.4,
+            "normal": baseDuration * 0.8,
+            "large": baseDuration * 1.2,
+            "extraLarge": baseDuration * 2.0,
+            "expressiveFastSpatial": baseDuration * 0.7,
+            "expressiveDefaultSpatial": baseDuration,
+            "expressiveEffects": baseDuration * 0.4
+        }
+    }
+
     property real cornerRadius: typeof SettingsData !== "undefined" ? SettingsData.cornerRadius : 12
     property real spacingXS: 4
     property real spacingS: 8
@@ -384,7 +441,10 @@ Singleton {
         if (savePrefs && typeof SessionData !== "undefined" && !isGreeterMode)
             SessionData.setLightMode(light)
         if (!isGreeterMode) {
-            PortalService.setLightMode(light)
+            // Skip with matugen becuase, our script runner will do it.
+            if (!matugenAvailable) {
+                PortalService.setLightMode(light)
+            }
             generateSystemThemesFromCurrentTheme()
         }
     }
@@ -662,15 +722,16 @@ 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}' --run`
+                `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, "--run"]
+            systemThemeGenerator.command = [shellDir + "/scripts/matugen-worker.sh", stateDir, shellDir, configDir, syncModeWithPortal, "--run"]
         }
         systemThemeGenerator.running = true
     }
@@ -761,6 +822,21 @@ Singleton {
 
     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
+        }
+    }
+
     function snap(value, dpr) {
         const s = dpr || 1
         return Math.round(value * s) / s

DMSGreeter.qml

@@ -1,29 +1,11 @@
 import QtQuick
 import Quickshell
-import Quickshell.Wayland
 import Quickshell.Services.Greetd
 import qs.Common
 import qs.Modules.Greetd
 
-Item {
+Scope {
     id: root
 
-    WlSessionLock {
-        id: sessionLock
-        locked: false
-
-        Component.onCompleted: {
-            Qt.callLater(() => { locked = true })
-        }
-
-        onLockedChanged: {
-            if (!locked) {
-                console.log("Greetd session unlocked, exiting")
-            }
-        }
-
-        GreeterSurface {
-            lock: sessionLock
-        }
-    }
+    GreeterSurface {}
 }

DMSShell.qml

@@ -22,6 +22,7 @@ import qs.Modules.ProcessList
 import qs.Modules.Settings
 import qs.Modules.DankBar
 import qs.Modules.DankBar.Popouts
+import qs.Modules.HyprWorkspaces
 import qs.Modules.Plugins
 import qs.Services
 
@@ -63,8 +64,11 @@ Item {
 
         property var currentPosition: SettingsData.dankBarPosition
         property bool initialized: false
+        property var hyprlandOverviewLoaderRef: hyprlandOverviewLoader
 
         sourceComponent: DankBar {
+            hyprlandOverviewLoader: dankBarLoader.hyprlandOverviewLoaderRef
+
             onColorPickerRequested: {
                 if (colorPickerModal.shouldBeVisible) {
                     colorPickerModal.close()
@@ -193,17 +197,19 @@ Item {
         }
     }
 
-    LazyLoader {
-        id: wifiPasswordModalLoader
+    WifiPasswordModal {
+        id: wifiPasswordModal
 
-        active: false
+        Component.onCompleted: {
+            PopoutService.wifiPasswordModal = wifiPasswordModal
+        }
+    }
 
-        WifiPasswordModal {
-            id: wifiPasswordModal
+    Connections {
+        target: NetworkService
 
-            Component.onCompleted: {
-                PopoutService.wifiPasswordModal = wifiPasswordModal
-            }
+        function onCredentialsNeeded(token, ssid, setting, fields, hints, reason) {
+            wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason)
         }
     }
 
@@ -496,6 +502,7 @@ Item {
         notepadSlideoutVariants: notepadSlideoutVariants
         hyprKeybindsModalLoader: hyprKeybindsModalLoader
         dankBarLoader: dankBarLoader
+        hyprlandOverviewLoader: hyprlandOverviewLoader
     }
 
     Variants {
@@ -538,4 +545,12 @@ Item {
             modelData: item
         }
     }
+
+    LazyLoader {
+        id: hyprlandOverviewLoader
+        active: CompositorService.isHyprland
+        component: HyprlandOverview {
+            id: hyprlandOverview
+        }
+    }
 }

DMSShellIPC.qml

@@ -15,6 +15,7 @@ Item {
     required property var notepadSlideoutVariants
     required property var hyprKeybindsModalLoader
     required property var dankBarLoader
+    required property var hyprlandOverviewLoader
 
     IpcHandler {
         function open() {
@@ -347,6 +348,41 @@ Item {
             return "HYPR_KEYBINDS_TOGGLE_FAILED"
         }
 
+        function toggleOverview(): string {
+            if (!CompositorService.isHyprland || !root.hyprlandOverviewLoader.item) {
+                return "HYPR_NOT_AVAILABLE"
+            }
+            root.hyprlandOverviewLoader.item.overviewOpen = !root.hyprlandOverviewLoader.item.overviewOpen
+            return root.hyprlandOverviewLoader.item.overviewOpen ? "OVERVIEW_OPEN_SUCCESS" : "OVERVIEW_CLOSE_SUCCESS"
+        }
+
+        function closeOverview(): string {
+            if (!CompositorService.isHyprland || !root.hyprlandOverviewLoader.item) {
+                return "HYPR_NOT_AVAILABLE"
+            }
+            root.hyprlandOverviewLoader.item.overviewOpen = false
+            return "OVERVIEW_CLOSE_SUCCESS"
+        }
+
+        function openOverview(): string {
+            if (!CompositorService.isHyprland || !root.hyprlandOverviewLoader.item) {
+                return "HYPR_NOT_AVAILABLE"
+            }
+            root.hyprlandOverviewLoader.item.overviewOpen = true
+            return "OVERVIEW_OPEN_SUCCESS"
+        }
+
         target: "hypr"
     }
+
+    IpcHandler {
+        function wallpaper(): string {
+            if (root.dankBarLoader.item && root.dankBarLoader.item.triggerWallpaperBrowserOnFocusedScreen()) {
+                return "SUCCESS: Toggled wallpaper browser"
+            }
+            return "ERROR: Failed to toggle wallpaper browser"
+        }
+
+        target: "dankdash"
+    }
 }

Modals/Clipboard/ClipboardContent.qml

@@ -84,7 +84,7 @@ Item {
                 id: clipboardListView
                 anchors.fill: parent
                 model: filteredModel
-                
+
                 currentIndex: clipboardContent.modal ? clipboardContent.modal.selectedIndex : 0
                 spacing: Theme.spacingXS
                 interactive: true
@@ -94,7 +94,7 @@ Item {
                 boundsMovement: Flickable.FollowBoundsBehavior
                 pressDelay: 0
                 flickableDirection: Flickable.VerticalFlick
-                
+
                 function ensureVisible(index) {
                     if (index < 0 || index >= count) {
                         return
@@ -108,13 +108,13 @@ Item {
                         contentY = itemBottom - height
                     }
                 }
-                
+
                 onCurrentIndexChanged: {
                     if (clipboardContent.modal && clipboardContent.modal.keyboardNavigationActive && currentIndex >= 0) {
                         ensureVisible(currentIndex)
                     }
                 }
-                
+
                 StyledText {
                     text: I18n.tr("No clipboard entries found")
                     anchors.centerIn: parent
@@ -122,11 +122,11 @@ Item {
                     color: Theme.surfaceVariantText
                     visible: filteredModel.count === 0
                 }
-                
+
                 delegate: ClipboardEntry {
                     required property int index
                     required property var model
-                    
+
                     width: clipboardListView.width
                     height: ClipboardConstants.itemHeight
                     entryData: model.entry

Modals/Common/DankModal.qml

@@ -35,8 +35,11 @@ PanelWindow {
     property bool closeOnEscapeKey: true
     property bool closeOnBackgroundClick: true
     property string animationType: "scale"
-    property int animationDuration: Theme.shortDuration
-    property var animationEasing: Theme.emphasizedEasing
+    property int animationDuration: Theme.expressiveDurations.expressiveDefaultSpatial
+    property real animationScaleCollapsed: 0.96
+    property real animationOffset: Theme.spacingL
+    property list<real> animationEnterCurve: Theme.expressiveCurves.expressiveDefaultSpatial
+    property list<real> animationExitCurve: Theme.expressiveCurves.emphasized
     property color backgroundColor: Theme.surfaceContainer
     property color borderColor: Theme.outlineMedium
     property real borderWidth: 1
@@ -104,7 +107,7 @@ PanelWindow {
     Timer {
         id: closeTimer
 
-        interval: animationDuration + 100
+        interval: animationDuration + 120
         onTriggered: {
             visible = false
         }
@@ -139,7 +142,8 @@ PanelWindow {
         Behavior on opacity {
             NumberAnimation {
                 duration: root.animationDuration
-                easing.type: root.animationEasing
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
             }
         }
     }
@@ -176,23 +180,67 @@ PanelWindow {
         border.width: root.borderWidth
         clip: false
         layer.enabled: true
+        layer.smooth: true
         opacity: root.shouldBeVisible ? 1 : 0
-        transform: root.animationType === "slide" ? slideTransform : null
+        transform: [scaleTransform, motionTransform]
+
+        Scale {
+            id: scaleTransform
+
+            origin.x: contentContainer.width / 2
+            origin.y: contentContainer.height / 2
+            xScale: root.shouldBeVisible ? 1 : root.animationScaleCollapsed
+            yScale: root.shouldBeVisible ? 1 : root.animationScaleCollapsed
+
+            Behavior on xScale {
+                NumberAnimation {
+                    duration: root.animationDuration
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+
+            Behavior on yScale {
+                NumberAnimation {
+                    duration: root.animationDuration
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+        }
 
         Translate {
-            id: slideTransform
+            id: motionTransform
 
-            readonly property real rawX: root.shouldBeVisible ? 0 : 15
-            readonly property real rawY: root.shouldBeVisible ? 0 : -30
+            readonly property bool slide: root.animationType === "slide"
+            readonly property real hiddenX: slide ? 15 : 0
+            readonly property real hiddenY: slide ? -30 : root.animationOffset
 
-            x: Theme.snap(rawX, root.dpr)
-            y: Theme.snap(rawY, root.dpr)
+            x: Theme.snap(root.shouldBeVisible ? 0 : hiddenX, root.dpr)
+            y: Theme.snap(root.shouldBeVisible ? 0 : hiddenY, root.dpr)
+
+            Behavior on x {
+                NumberAnimation {
+                    duration: root.animationDuration
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
+
+            Behavior on y {
+                NumberAnimation {
+                    duration: root.animationDuration
+                    easing.type: Easing.BezierSpline
+                    easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
+                }
+            }
         }
 
         Behavior on opacity {
             NumberAnimation {
                 duration: animationDuration
-                easing.type: animationEasing
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: root.shouldBeVisible ? root.animationEnterCurve : root.animationExitCurve
             }
         }
 

Modals/FileBrowser/FileBrowserModal.qml

@@ -111,18 +111,18 @@ DankModal {
         if (!normalizedPath.startsWith("file://")) {
             normalizedPath = "file://" + filePath
         }
-        
+
         // Check if file exists by looking through the folder model
         var exists = false
         var fileName = filePath.split('/').pop()
-        
+
         for (var i = 0; i < folderModel.count; i++) {
             if (folderModel.get(i, "fileName") === fileName && !folderModel.get(i, "fileIsDir")) {
                 exists = true
                 break
             }
         }
-        
+
         if (exists) {
             pendingFilePath = normalizedPath
             showOverwriteConfirmation = true
@@ -139,7 +139,7 @@ DankModal {
     Component.onCompleted: {
         currentPath = getLastPath()
     }
-    
+
     property var steamPaths: [
         StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/.steam/steam/steamapps/workshop/content/431960",
         StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/.local/share/Steam/steamapps/workshop/content/431960",
@@ -147,17 +147,17 @@ DankModal {
         StandardPaths.writableLocation(StandardPaths.HomeLocation) + "/snap/steam/common/.local/share/Steam/steamapps/workshop/content/431960"
     ]
     property int currentPathIndex: 0
-    
+
     function discoverWallpaperEngine() {
         currentPathIndex = 0
         checkNextPath()
     }
-    
+
     function checkNextPath() {
         if (currentPathIndex >= steamPaths.length) {
             return
         }
-        
+
         const wePath = steamPaths[currentPathIndex]
         const cleanPath = wePath.replace(/^file:\/\//, '')
         weDiscoveryProcess.command = ["test", "-d", cleanPath]
@@ -451,13 +451,13 @@ DankModal {
             executeKeyboardSelection(targetIndex)
         }
     }
-    
+
     Process {
         id: weDiscoveryProcess
-        
+
         property string wePath: ""
         running: false
-        
+
         onExited: exitCode => {
             if (exitCode === 0) {
                 fileBrowserModal.weAvailable = true
@@ -532,7 +532,7 @@ DankModal {
                                 }
                             }
                         }
-                        
+
                         DankActionButton {
                             circular: false
                             iconName: "info"
@@ -875,26 +875,26 @@ DankModal {
                 id: overwriteDialog
                 anchors.fill: parent
                 visible: showOverwriteConfirmation
-                
+
                 Keys.onEscapePressed: {
                     showOverwriteConfirmation = false
                     pendingFilePath = ""
                 }
-                
+
                 Keys.onReturnPressed: {
                     showOverwriteConfirmation = false
                     fileSelected(pendingFilePath)
                     pendingFilePath = ""
                     Qt.callLater(() => fileBrowserModal.close())
                 }
-                
+
                 focus: showOverwriteConfirmation
-                
+
                 Rectangle {
                     anchors.fill: parent
                     color: Theme.shadowStrong
                     opacity: 0.8
-                    
+
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
@@ -903,7 +903,7 @@ DankModal {
                         }
                     }
                 }
-                
+
                 StyledRect {
                     anchors.centerIn: parent
                     width: 400
@@ -912,12 +912,12 @@ DankModal {
                     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
@@ -925,7 +925,7 @@ DankModal {
                             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
@@ -934,11 +934,11 @@ DankModal {
                             wrapMode: Text.WordWrap
                             horizontalAlignment: Text.AlignHCenter
                         }
-                        
+
                         Row {
                             anchors.horizontalCenter: parent.horizontalCenter
                             spacing: Theme.spacingM
-                            
+
                             StyledRect {
                                 width: 80
                                 height: 36
@@ -946,7 +946,7 @@ DankModal {
                                 color: cancelArea.containsMouse ? Theme.surfaceVariantHover : Theme.surfaceVariant
                                 border.color: Theme.outline
                                 border.width: 1
-                                
+
                                 StyledText {
                                     anchors.centerIn: parent
                                     text: I18n.tr("Cancel")
@@ -954,7 +954,7 @@ DankModal {
                                     color: Theme.surfaceText
                                     font.weight: Font.Medium
                                 }
-                                
+
                                 MouseArea {
                                     id: cancelArea
                                     anchors.fill: parent
@@ -966,13 +966,13 @@ DankModal {
                                     }
                                 }
                             }
-                            
+
                             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")
@@ -980,7 +980,7 @@ DankModal {
                                     color: Theme.background
                                     font.weight: Font.Medium
                                 }
-                                
+
                                 MouseArea {
                                     id: overwriteArea
                                     anchors.fill: parent

Modals/NotificationModal.qml

@@ -20,7 +20,7 @@ DankModal {
         if (modalKeyboardController && notificationListRef) {
             modalKeyboardController.listView = notificationListRef
             modalKeyboardController.rebuildFlatNavigation()
-            
+
             Qt.callLater(() => {
                 modalKeyboardController.keyboardNavigationActive = true
                 modalKeyboardController.selectedFlatIndex = 0

Modals/Settings/SettingsContent.qml

@@ -2,12 +2,11 @@ import QtQuick
 import qs.Common
 import qs.Modules.Settings
 
-FocusScope {
+Item {
     id: root
 
     property int currentIndex: 0
     property var parentModal: null
-    focus: true
 
     Rectangle {
         anchors.fill: parent
@@ -23,7 +22,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 0
             visible: active
-            asynchronous: true
 
             sourceComponent: Component {
                 PersonalizationTab {
@@ -40,7 +38,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 1
             visible: active
-            asynchronous: true
 
             sourceComponent: TimeWeatherTab {
             }
@@ -53,7 +50,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 2
             visible: active
-            asynchronous: true
 
             sourceComponent: DankBarTab {
                 parentModal: root.parentModal
@@ -67,7 +63,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 3
             visible: active
-            asynchronous: true
 
             sourceComponent: WidgetTweaksTab {
             }
@@ -80,7 +75,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 4
             visible: active
-            asynchronous: true
 
             sourceComponent: Component {
                 DockTab {
@@ -96,7 +90,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 5
             visible: active
-            asynchronous: true
 
             sourceComponent: DisplaysTab {
             }
@@ -109,7 +102,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 6
             visible: active
-            asynchronous: true
 
             sourceComponent: LauncherTab {
             }
@@ -122,7 +114,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 7
             visible: active
-            asynchronous: true
 
             sourceComponent: ThemeColorsTab {
             }
@@ -135,7 +126,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 8
             visible: active
-            asynchronous: true
 
             sourceComponent: PowerSettings {
             }
@@ -148,7 +138,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 9
             visible: active
-            asynchronous: true
 
             sourceComponent: PluginsTab {
                 parentModal: root.parentModal
@@ -162,7 +151,6 @@ FocusScope {
             anchors.fill: parent
             active: root.currentIndex === 10
             visible: active
-            asynchronous: true
 
             sourceComponent: AboutTab {
             }

Modals/Settings/SettingsModal.qml

@@ -13,6 +13,7 @@ DankModal {
 
     property Component settingsContent
     property alias profileBrowser: profileBrowser
+    property int currentTabIndex: 0
 
     signal closingModal()
 
@@ -40,6 +41,25 @@ DankModal {
         return hide();
     }
     content: settingsContent
+    onOpened: () => {
+        Qt.callLater(() => modalFocusScope.forceActiveFocus())
+    }
+    modalFocusScope.Keys.onPressed: event => {
+        const tabCount = 11
+        if (event.key === Qt.Key_Down) {
+            currentTabIndex = (currentTabIndex + 1) % tabCount
+            event.accepted = true
+        } else if (event.key === Qt.Key_Up) {
+            currentTabIndex = (currentTabIndex - 1 + tabCount) % tabCount
+            event.accepted = true
+        } else if (event.key === Qt.Key_Tab && !event.modifiers) {
+            currentTabIndex = (currentTabIndex + 1) % tabCount
+            event.accepted = true
+        } else if (event.key === Qt.Key_Backtab || (event.key === Qt.Key_Tab && event.modifiers & Qt.ShiftModifier)) {
+            currentTabIndex = (currentTabIndex - 1 + tabCount) % tabCount
+            event.accepted = true
+        }
+    }
 
     IpcHandler {
         function open(): string {
@@ -82,6 +102,7 @@ DankModal {
         browserTitle: "Select Profile Image"
         browserIcon: "person"
         browserType: "profile"
+        showHiddenFiles: true
         fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
         onFileSelected: (path) => {
             PortalService.setProfileImage(path);
@@ -100,6 +121,7 @@ DankModal {
         browserTitle: "Select Wallpaper"
         browserIcon: "wallpaper"
         browserType: "wallpaper"
+        showHiddenFiles: true
         fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
         onFileSelected: (path) => {
             SessionData.setWallpaper(path);
@@ -111,9 +133,9 @@ DankModal {
     }
 
     settingsContent: Component {
-        FocusScope {
+        Item {
+            id: rootScope
             anchors.fill: parent
-            focus: true
 
             Column {
                 anchors.fill: parent
@@ -172,7 +194,10 @@ DankModal {
                         id: sidebar
 
                         parentModal: settingsModal
-                        onCurrentIndexChanged: content.currentIndex = currentIndex
+                        currentIndex: settingsModal.currentTabIndex
+                        onCurrentIndexChanged: {
+                            settingsModal.currentTabIndex = currentIndex
+                        }
                     }
 
                     SettingsContent {
@@ -181,7 +206,7 @@ DankModal {
                         width: parent.width - sidebar.width
                         height: parent.height
                         parentModal: settingsModal
-                        currentIndex: sidebar.currentIndex
+                        currentIndex: settingsModal.currentTabIndex
                     }
 
                 }

Modals/Settings/SettingsSidebar.qml

@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import qs.Common
 import qs.Modals.Settings
@@ -43,6 +45,14 @@ Rectangle {
         "icon": "info"
     }]
 
+    function navigateNext() {
+        currentIndex = (currentIndex + 1) % sidebarItems.length
+    }
+
+    function navigatePrevious() {
+        currentIndex = (currentIndex - 1 + sidebarItems.length) % sidebarItems.length
+    }
+
     width: 270
     height: parent.height
     color: Theme.surfaceContainer
@@ -77,7 +87,10 @@ Rectangle {
 
             model: sidebarContainer.sidebarItems
 
-            Rectangle {
+            delegate: Rectangle {
+                required property int index
+                required property var modelData
+
                 property bool isActive: sidebarContainer.currentIndex === index
 
                 width: parent.width - Theme.spacingS * 2

Modals/Spotlight/SpotlightResults.qml

@@ -7,6 +7,10 @@ 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
 
@@ -90,19 +94,32 @@ Rectangle {
                     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: Quickshell.iconPath(model.icon, true)
+                        source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
                         asynchronous: true
-                        visible: status === Image.Ready
+                        visible: !parent.isMaterial && status === Image.Ready
                     }
 
                     Rectangle {
                         anchors.fill: parent
-                        visible: !listIconImg.visible
+                        visible: !parent.isMaterial && !listIconImg.visible
                         color: Theme.surfaceLight
                         radius: Theme.cornerRadius
                         border.width: 1
@@ -120,7 +137,7 @@ Rectangle {
 
                 Column {
                     anchors.verticalCenter: parent.verticalCenter
-                    width: parent.width - resultsList.iconSize - Theme.spacingL
+                    width: (model.icon !== undefined && model.icon !== "") ? (parent.width - resultsList.iconSize - Theme.spacingL) : parent.width
                     spacing: Theme.spacingXS
 
                     StyledText {
@@ -255,20 +272,33 @@ Rectangle {
                     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: Quickshell.iconPath(model.icon, true)
+                        source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
                         smooth: true
                         asynchronous: true
-                        visible: status === Image.Ready
+                        visible: !parent.isMaterial && status === Image.Ready
                     }
 
                     Rectangle {
                         anchors.fill: parent
-                        visible: !gridIconImg.visible
+                        visible: !parent.isMaterial && !gridIconImg.visible
                         color: Theme.surfaceLight
                         radius: Theme.cornerRadius
                         border.width: 1

Modals/WifiPasswordModal.qml

@@ -15,12 +15,23 @@ DankModal {
     property string wifiAnonymousIdentityInput: ""
     property string wifiDomainInput: ""
 
+    property bool isPromptMode: false
+    property string promptToken: ""
+    property string promptReason: ""
+    property var promptFields: []
+    property string promptSetting: ""
+
     function show(ssid) {
         wifiPasswordSSID = ssid
         wifiPasswordInput = ""
         wifiUsernameInput = ""
         wifiAnonymousIdentityInput = ""
         wifiDomainInput = ""
+        isPromptMode = false
+        promptToken = ""
+        promptReason = ""
+        promptFields = []
+        promptSetting = ""
 
         const network = NetworkService.wifiNetworks.find(n => n.ssid === ssid)
         requiresEnterprise = network?.enterprise || false
@@ -37,6 +48,41 @@ DankModal {
                      })
     }
 
+    function showFromPrompt(token, ssid, setting, fields, hints, reason) {
+        wifiPasswordSSID = ssid
+        isPromptMode = true
+        promptToken = token
+        promptReason = reason
+        promptFields = fields || []
+        promptSetting = setting || "802-11-wireless-security"
+
+        requiresEnterprise = setting === "802-1x"
+
+        if (reason === "wrong-password") {
+            wifiPasswordInput = ""
+            wifiUsernameInput = ""
+        } else {
+            wifiPasswordInput = ""
+            wifiUsernameInput = ""
+            wifiAnonymousIdentityInput = ""
+            wifiDomainInput = ""
+        }
+
+        open()
+        Qt.callLater(() => {
+                         if (contentLoader.item) {
+                             if (reason === "wrong-password" && contentLoader.item.passwordInput) {
+                                 contentLoader.item.passwordInput.text = ""
+                                 contentLoader.item.passwordInput.forceActiveFocus()
+                             } else if (requiresEnterprise && contentLoader.item.usernameInput) {
+                                 contentLoader.item.usernameInput.forceActiveFocus()
+                             } else if (contentLoader.item.passwordInput) {
+                                 contentLoader.item.passwordInput.forceActiveFocus()
+                             }
+                         }
+                     })
+    }
+
     shouldBeVisible: false
     width: 420
     height: requiresEnterprise ? 430 : 230
@@ -60,6 +106,9 @@ DankModal {
                      })
     }
     onBackgroundClicked: () => {
+                             if (isPromptMode) {
+                                 NetworkService.cancelCredentials(promptToken)
+                             }
                              close()
                              wifiPasswordInput = ""
                              wifiUsernameInput = ""
@@ -90,6 +139,9 @@ DankModal {
             anchors.fill: parent
             focus: true
             Keys.onEscapePressed: event => {
+                                      if (isPromptMode) {
+                                          NetworkService.cancelCredentials(promptToken)
+                                      }
                                       close()
                                       wifiPasswordInput = ""
                                       wifiUsernameInput = ""
@@ -117,12 +169,28 @@ DankModal {
                             font.weight: Font.Medium
                         }
 
-                        StyledText {
-                            text: requiresEnterprise ? I18n.tr("Enter credentials for ") + wifiPasswordSSID : I18n.tr("Enter password for ") + wifiPasswordSSID
-                            font.pixelSize: Theme.fontSizeMedium
-                            color: Theme.surfaceTextMedium
+                        Column {
                             width: parent.width
-                            elide: Text.ElideRight
+                            spacing: Theme.spacingXS
+
+                            StyledText {
+                                text: {
+                                    const prefix = requiresEnterprise ? I18n.tr("Enter credentials for ") : I18n.tr("Enter password for ")
+                                    return prefix + wifiPasswordSSID
+                                }
+                                font.pixelSize: Theme.fontSizeMedium
+                                color: Theme.surfaceTextMedium
+                                width: parent.width
+                                elide: Text.ElideRight
+                            }
+
+                            StyledText {
+                                visible: isPromptMode && promptReason === "wrong-password"
+                                text: I18n.tr("Incorrect password")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.error
+                                width: parent.width
+                            }
                         }
                     }
 
@@ -131,6 +199,9 @@ DankModal {
                         iconSize: Theme.iconSize - 4
                         iconColor: Theme.surfaceText
                         onClicked: () => {
+                                       if (isPromptMode) {
+                                           NetworkService.cancelCredentials(promptToken)
+                                       }
                                        close()
                                        wifiPasswordInput = ""
                                        wifiUsernameInput = ""
@@ -208,14 +279,26 @@ DankModal {
                                           wifiPasswordInput = text
                                       }
                         onAccepted: () => {
-                                        const username = requiresEnterprise ? usernameInput.text : ""
-                                        NetworkService.connectToWifi(
-                                            wifiPasswordSSID,
-                                            passwordInput.text,
-                                            username,
-                                            wifiAnonymousIdentityInput,
-                                            wifiDomainInput
-                                        )
+                                        if (isPromptMode) {
+                                            const secrets = {}
+                                            if (promptSetting === "802-11-wireless-security") {
+                                                secrets["psk"] = passwordInput.text
+                                            } else if (promptSetting === "802-1x") {
+                                                if (usernameInput.text) secrets["identity"] = usernameInput.text
+                                                if (passwordInput.text) secrets["password"] = passwordInput.text
+                                                if (wifiAnonymousIdentityInput) secrets["anonymous-identity"] = wifiAnonymousIdentityInput
+                                            }
+                                            NetworkService.submitCredentials(promptToken, secrets, true)
+                                        } else {
+                                            const username = requiresEnterprise ? usernameInput.text : ""
+                                            NetworkService.connectToWifi(
+                                                wifiPasswordSSID,
+                                                passwordInput.text,
+                                                username,
+                                                wifiAnonymousIdentityInput,
+                                                wifiDomainInput
+                                            )
+                                        }
                                         close()
                                         wifiPasswordInput = ""
                                         wifiUsernameInput = ""
@@ -395,6 +478,9 @@ DankModal {
                                 hoverEnabled: true
                                 cursorShape: Qt.PointingHandCursor
                                 onClicked: () => {
+                                               if (isPromptMode) {
+                                                   NetworkService.cancelCredentials(promptToken)
+                                               }
                                                close()
                                                wifiPasswordInput = ""
                                                wifiUsernameInput = ""
@@ -430,14 +516,26 @@ DankModal {
                                 cursorShape: Qt.PointingHandCursor
                                 enabled: parent.enabled
                                 onClicked: () => {
-                                               const username = requiresEnterprise ? usernameInput.text : ""
-                                               NetworkService.connectToWifi(
-                                                   wifiPasswordSSID,
-                                                   passwordInput.text,
-                                                   username,
-                                                   wifiAnonymousIdentityInput,
-                                                   wifiDomainInput
-                                               )
+                                               if (isPromptMode) {
+                                                   const secrets = {}
+                                                   if (promptSetting === "802-11-wireless-security") {
+                                                       secrets["psk"] = passwordInput.text
+                                                   } else if (promptSetting === "802-1x") {
+                                                       if (usernameInput.text) secrets["identity"] = usernameInput.text
+                                                       if (passwordInput.text) secrets["password"] = passwordInput.text
+                                                       if (wifiAnonymousIdentityInput) secrets["anonymous-identity"] = wifiAnonymousIdentityInput
+                                                   }
+                                                   NetworkService.submitCredentials(promptToken, secrets, true)
+                                               } else {
+                                                   const username = requiresEnterprise ? usernameInput.text : ""
+                                                   NetworkService.connectToWifi(
+                                                       wifiPasswordSSID,
+                                                       passwordInput.text,
+                                                       username,
+                                                       wifiAnonymousIdentityInput,
+                                                       wifiDomainInput
+                                                   )
+                                               }
                                                close()
                                                wifiPasswordInput = ""
                                                wifiUsernameInput = ""

Modules/AppDrawer/AppDrawerPopout.qml

@@ -404,16 +404,29 @@ DankPopout {
                                         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: Quickshell.iconPath(model.icon, true)
+                                            source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
                                             smooth: true
                                             asynchronous: true
-                                            visible: status === Image.Ready
+                                            visible: !parent.isMaterial && status === Image.Ready
                                         }
 
                                         Rectangle {
@@ -421,7 +434,7 @@ DankPopout {
                                             anchors.leftMargin: Theme.spacingS
                                             anchors.rightMargin: Theme.spacingS
                                             anchors.bottomMargin: Theme.spacingM
-                                            visible: !listIconImg.visible
+                                            visible: !parent.isMaterial && listIconImg.status !== Image.Ready
                                             color: Theme.surfaceLight
                                             radius: Theme.cornerRadius
                                             border.width: 0
@@ -435,11 +448,12 @@ DankPopout {
                                                 font.weight: Font.Bold
                                             }
                                         }
+
                                     }
 
                                     Column {
                                         anchors.verticalCenter: parent.verticalCenter
-                                        width: parent.width - appList.iconSize - Theme.spacingL
+                                        width: (model.icon !== undefined && model.icon !== "") ? (parent.width - appList.iconSize - Theme.spacingL) : parent.width
                                         spacing: Theme.spacingXS
 
                                         StyledText {
@@ -513,6 +527,7 @@ DankPopout {
                             property int baseCellWidth: adaptiveColumns ? Math.max(minCellWidth, Math.min(maxCellWidth, width / columns)) : (width - Theme.spacingS * 2) / columns
                             property int baseCellHeight: baseCellWidth + 20
                             property int actualColumns: adaptiveColumns ? Math.floor(width / cellWidth) : columns
+
                             property int remainingSpace: width - (actualColumns * cellWidth)
 
                             signal keyboardNavigationReset
@@ -578,6 +593,19 @@ DankPopout {
                                         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
@@ -586,10 +614,10 @@ DankPopout {
                             anchors.leftMargin: Theme.spacingS
                             anchors.rightMargin: Theme.spacingS
                             anchors.bottomMargin: Theme.spacingS
-                                            source: Quickshell.iconPath(model.icon, true)
+                                            source: parent.isMaterial ? "" : Quickshell.iconPath(parent.iconValue, true)
                                             smooth: true
                                             asynchronous: true
-                                            visible: status === Image.Ready
+                                            visible: !parent.isMaterial && status === Image.Ready
                                         }
 
                                         Rectangle {
@@ -597,7 +625,7 @@ DankPopout {
                             anchors.leftMargin: Theme.spacingS
                             anchors.rightMargin: Theme.spacingS
                             anchors.bottomMargin: Theme.spacingS
-                                            visible: !gridIconImg.visible
+                                            visible: !parent.isMaterial && gridIconImg.status !== Image.Ready
                                             color: Theme.surfaceLight
                                             radius: Theme.cornerRadius
                                             border.width: 0

Modules/AppDrawer/AppLauncher.qml

@@ -8,6 +8,10 @@ import qs.Widgets
 Item {
     id: root
 
+    // DEVELOPER NOTE: This component manages the AppDrawer launcher (accessed via DankBar icon).
+    // Changes to launcher behavior, especially item rendering, filtering, or model structure,
+    // likely require corresponding updates in Modals/Spotlight/SpotlightResults.qml and vice versa.
+
     property string searchQuery: ""
     property string selectedCategory: I18n.tr("All")
     property string viewMode: "list" // "list" or "grid"
@@ -163,7 +167,7 @@ Item {
                              filteredModel.append({
                                                       "name": app.name || "",
                                                       "exec": app.execString || app.exec || app.action || "",
-                                                      "icon": app.icon || "application-x-executable",
+                                                      "icon": app.icon !== undefined ? app.icon : (isPluginItem ? "" : "application-x-executable"),
                                                       "comment": app.comment || "",
                                                       "categories": app.categories || [],
                                                       "isPlugin": isPluginItem,
@@ -285,12 +289,12 @@ Item {
         }
 
         const triggers = PluginService.getAllPluginTriggers()
-        
+
         for (const trigger in triggers) {
             if (query.startsWith(trigger)) {
                 const pluginId = triggers[trigger]
                 const plugin = PluginService.getLauncherPlugin(pluginId)
-                
+
                 if (plugin) {
                     const remainingQuery = query.substring(trigger.length).trim()
                     const result = {
@@ -304,7 +308,7 @@ Item {
                 }
             }
         }
-        
+
         return { triggered: false, pluginCategory: "", query: "" }
     }
 

Modules/ControlCenter/Components/DragDropGrid.qml

@@ -230,18 +230,6 @@ Column {
                         return "bluetooth_disabled"
                     if (!BluetoothService.adapter || !BluetoothService.adapter.enabled)
                         return "bluetooth_disabled"
-                    const primaryDevice = (() => {
-                                               if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
-                                               return null
-                                               let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
-                                               for (let device of devices) {
-                                                   if (device && device.connected)
-                                                   return device
-                                               }
-                                               return null
-                                           })()
-                    if (primaryDevice)
-                        return BluetoothService.getDeviceIcon(primaryDevice)
                     return "bluetooth"
                 }
                 case "audioOutput":

Modules/ControlCenter/Details/AudioInputDetail.qml

@@ -17,7 +17,7 @@ Rectangle {
     color: Theme.surfaceContainerHigh
     border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
     border.width: 0
-    
+
     Row {
         id: headerRow
         anchors.left: parent.left
@@ -27,7 +27,7 @@ Rectangle {
         anchors.rightMargin: Theme.spacingM
         anchors.topMargin: Theme.spacingS
         height: 40
-        
+
         StyledText {
             id: headerText
             text: I18n.tr("Input Devices")
@@ -37,7 +37,7 @@ Rectangle {
             anchors.verticalCenter: parent.verticalCenter
         }
     }
-    
+
     Row {
         id: volumeSlider
         anchors.left: parent.left
@@ -105,7 +105,7 @@ Rectangle {
             }
         }
     }
-    
+
     DankFlickable {
         id: audioContent
         anchors.top: hasInputVolumeSliderInCC ? headerRow.bottom : volumeSlider.bottom
@@ -116,34 +116,34 @@ Rectangle {
         anchors.topMargin: hasInputVolumeSliderInCC ? Theme.spacingM : Theme.spacingS
         contentHeight: audioColumn.height
         clip: true
-        
+
         Column {
             id: audioColumn
             width: parent.width
             spacing: Theme.spacingS
-            
+
             Repeater {
                 model: Pipewire.nodes.values.filter(node => {
                     return node.audio && !node.isSink && !node.isStream
                 })
-                
+
                 delegate: Rectangle {
                     required property var modelData
                     required property int index
-                    
+
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
                     color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
                     border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                     border.width: 0
-                    
+
                     Row {
                         anchors.left: parent.left
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.leftMargin: Theme.spacingM
                         spacing: Theme.spacingS
-                        
+
                         DankIcon {
                             name: {
                                 if (modelData.name.includes("bluez"))
@@ -157,11 +157,11 @@ Rectangle {
                             color: modelData === AudioService.source ? Theme.primary : Theme.surfaceText
                             anchors.verticalCenter: parent.verticalCenter
                         }
-                        
+
                         Column {
                             anchors.verticalCenter: parent.verticalCenter
                             width: parent.parent.width - parent.parent.anchors.leftMargin - parent.spacing - Theme.iconSize - Theme.spacingM
-                            
+
                             StyledText {
                                 text: AudioService.displayName(modelData)
                                 font.pixelSize: Theme.fontSizeMedium
@@ -171,7 +171,7 @@ Rectangle {
                                 width: parent.width
                                 wrapMode: Text.NoWrap
                             }
-                            
+
                             StyledText {
                                 text: modelData === AudioService.source ? "Active" : "Available"
                                 font.pixelSize: Theme.fontSizeSmall
@@ -182,7 +182,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     MouseArea {
                         id: deviceMouseArea
                         anchors.fill: parent

Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -17,7 +17,7 @@ Rectangle {
     color: Theme.surfaceContainerHigh
     border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
     border.width: 0
-    
+
     Row {
         id: headerRow
         anchors.left: parent.left
@@ -27,7 +27,7 @@ Rectangle {
         anchors.rightMargin: Theme.spacingM
         anchors.topMargin: Theme.spacingS
         height: 40
-        
+
         StyledText {
             id: headerText
             text: I18n.tr("Audio Devices")
@@ -121,34 +121,34 @@ Rectangle {
         anchors.topMargin: volumeSlider.visible ? Theme.spacingS : Theme.spacingM
         contentHeight: audioColumn.height
         clip: true
-        
+
         Column {
             id: audioColumn
             width: parent.width
             spacing: Theme.spacingS
-            
+
             Repeater {
                 model: Pipewire.nodes.values.filter(node => {
                     return node.audio && node.isSink && !node.isStream
                 })
-                
+
                 delegate: Rectangle {
                     required property var modelData
                     required property int index
-                    
+
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
                     color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
                     border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                     border.width: 0
-                    
+
                     Row {
                         anchors.left: parent.left
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.leftMargin: Theme.spacingM
                         spacing: Theme.spacingS
-                        
+
                         DankIcon {
                             name: {
                                 if (modelData.name.includes("bluez"))
@@ -164,11 +164,11 @@ Rectangle {
                             color: modelData === AudioService.sink ? Theme.primary : Theme.surfaceText
                             anchors.verticalCenter: parent.verticalCenter
                         }
-                        
+
                         Column {
                             anchors.verticalCenter: parent.verticalCenter
                             width: parent.parent.width - parent.parent.anchors.leftMargin - parent.spacing - Theme.iconSize - Theme.spacingM
-                            
+
                             StyledText {
                                 text: AudioService.displayName(modelData)
                                 font.pixelSize: Theme.fontSizeMedium
@@ -178,7 +178,7 @@ Rectangle {
                                 width: parent.width
                                 wrapMode: Text.NoWrap
                             }
-                            
+
                             StyledText {
                                 text: modelData === AudioService.sink ? "Active" : "Available"
                                 font.pixelSize: Theme.fontSizeSmall
@@ -189,7 +189,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     MouseArea {
                         id: deviceMouseArea
                         anchors.fill: parent

Modules/ControlCenter/Details/BluetoothCodecSelector.qml

@@ -83,12 +83,12 @@ Item {
         hoverEnabled: true
         preventStealing: true
         propagateComposedEvents: false
-        
+
         onClicked: root.hide()
         onWheel: (wheel) => { wheel.accepted = true }
         onPositionChanged: (mouse) => { mouse.accepted = true }
     }
-    
+
     Rectangle {
         id: modalBackground
         anchors.fill: parent

Modules/ControlCenter/Details/BluetoothDetail.qml

@@ -12,11 +12,11 @@ Rectangle {
     color: Theme.surfaceContainerHigh
     border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
     border.width: 0
-    
+
     property var bluetoothCodecModalRef: null
-    
+
     signal showCodecSelector(var device)
-    
+
     function updateDeviceCodecDisplay(deviceAddress, codecName) {
         for (let i = 0; i < pairedRepeater.count; i++) {
             let item = pairedRepeater.itemAt(i)
@@ -26,7 +26,7 @@ Rectangle {
             }
         }
     }
-    
+
     Row {
         id: headerRow
         anchors.left: parent.left
@@ -36,7 +36,7 @@ Rectangle {
         anchors.rightMargin: Theme.spacingM
         anchors.topMargin: Theme.spacingS
         height: 40
-        
+
         StyledText {
             id: headerText
             text: I18n.tr("Bluetooth Settings")
@@ -45,12 +45,12 @@ Rectangle {
             font.weight: Font.Medium
             anchors.verticalCenter: parent.verticalCenter
         }
-        
+
         Item {
             width: Math.max(0, parent.width - headerText.implicitWidth - scanButton.width - Theme.spacingM)
             height: parent.height
         }
-        
+
         Rectangle {
             id: scanButton
             width: 100
@@ -64,18 +64,18 @@ Rectangle {
             border.color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
             border.width: 0
             visible: BluetoothService.adapter && BluetoothService.adapter.enabled
-            
+
             Row {
                 anchors.centerIn: parent
                 spacing: Theme.spacingXS
-                
+
                 DankIcon {
                     name: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "bluetooth_searching"
                     size: 18
                     color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceVariantText
                     anchors.verticalCenter: parent.verticalCenter
                 }
-                
+
                 StyledText {
                     text: BluetoothService.adapter && BluetoothService.adapter.discovering ? "Scanning" : "Scan"
                     color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Theme.surfaceVariantText
@@ -84,7 +84,7 @@ Rectangle {
                     anchors.verticalCenter: parent.verticalCenter
                 }
             }
-            
+
             MouseArea {
                 id: scanMouseArea
                 anchors.fill: parent
@@ -98,7 +98,7 @@ Rectangle {
             }
         }
     }
-    
+
     DankFlickable {
         id: bluetoothContent
         anchors.top: headerRow.bottom
@@ -110,19 +110,19 @@ Rectangle {
         visible: BluetoothService.adapter && BluetoothService.adapter.enabled
         contentHeight: bluetoothColumn.height
         clip: true
-        
+
         Column {
             id: bluetoothColumn
             width: parent.width
             spacing: Theme.spacingS
-            
-            
+
+
             Repeater {
                 id: pairedRepeater
                 model: {
                     if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
                         return []
-                    
+
                     let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
                     devices.sort((a, b) => {
                         if (a.connected && !b.connected) return -1
@@ -131,17 +131,17 @@ Rectangle {
                     })
                     return devices
                 }
-                
+
                 delegate: Rectangle {
                     required property var modelData
                     required property int index
-                    
+
                     property string currentCodec: BluetoothService.deviceCodecs[modelData.address] || ""
-                    
+
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
-                    
+
                     Component.onCompleted: {
                         if (modelData.connected && BluetoothService.isAudioDevice(modelData)) {
                             BluetoothService.refreshDeviceCodec(modelData)
@@ -162,13 +162,13 @@ Rectangle {
                         return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                     }
                     border.width: 0
-                    
+
                     Row {
                         anchors.left: parent.left
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.leftMargin: Theme.spacingM
                         spacing: Theme.spacingS
-                        
+
                         DankIcon {
                             name: BluetoothService.getDeviceIcon(modelData)
                             size: Theme.iconSize - 4
@@ -181,11 +181,11 @@ Rectangle {
                             }
                             anchors.verticalCenter: parent.verticalCenter
                         }
-                        
+
                         Column {
                             anchors.verticalCenter: parent.verticalCenter
                             width: 200
-                            
+
                             StyledText {
                                 text: modelData.name || modelData.deviceName || "Unknown Device"
                                 font.pixelSize: Theme.fontSizeMedium
@@ -194,10 +194,10 @@ Rectangle {
                                 elide: Text.ElideRight
                                 width: parent.width
                             }
-                            
+
                             Row {
                                 spacing: Theme.spacingXS
-                                
+
                                 StyledText {
                                     text: {
                                         if (modelData.state === BluetoothDeviceState.Connecting)
@@ -218,12 +218,12 @@ Rectangle {
                                         return Theme.surfaceVariantText
                                     }
                                 }
-                                
+
                                 StyledText {
                                     text: {
                                         if (modelData.batteryAvailable && modelData.battery > 0)
                                             return "• " + Math.round(modelData.battery * 100) + "%"
-                                        
+
                                         var btBattery = BatteryService.bluetoothDevices.find(dev => {
                                             return dev.name === (modelData.name || modelData.deviceName) ||
                                                    dev.name.toLowerCase().includes((modelData.name || modelData.deviceName).toLowerCase()) ||
@@ -235,7 +235,7 @@ Rectangle {
                                     color: Theme.surfaceVariantText
                                     visible: text.length > 0
                                 }
-                                
+
                                 StyledText {
                                     text: modelData.signalStrength !== undefined && modelData.signalStrength > 0 ? "• " + modelData.signalStrength + "%" : ""
                                     font.pixelSize: Theme.fontSizeSmall
@@ -245,7 +245,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     DankActionButton {
                         id: pairedOptionsButton
                         anchors.right: parent.right
@@ -262,7 +262,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     MouseArea {
                         id: deviceMouseArea
                         anchors.fill: parent
@@ -279,26 +279,26 @@ Rectangle {
                     }
                 }
             }
-            
+
             Rectangle {
                 width: parent.width
                 height: 1
                 color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                 visible: pairedRepeater.count > 0 && availableRepeater.count > 0
             }
-            
-            
+
+
             Item {
                 width: parent.width
                 height: 80
                 visible: BluetoothService.adapter && BluetoothService.adapter.discovering && availableRepeater.count === 0
-                
+
                 DankIcon {
                     anchors.centerIn: parent
                     name: "sync"
                     size: 24
                     color: Qt.rgba(Theme.surfaceText.r || 0.8, Theme.surfaceText.g || 0.8, Theme.surfaceText.b || 0.8, 0.4)
-                    
+
                     RotationAnimation on rotation {
                         running: parent.visible && BluetoothService.adapter && BluetoothService.adapter.discovering && availableRepeater.count === 0
                         loops: Animation.Infinite
@@ -308,27 +308,27 @@ Rectangle {
                     }
                 }
             }
-            
+
             Repeater {
                 id: availableRepeater
                 model: {
                     if (!BluetoothService.adapter || !BluetoothService.adapter.discovering || !Bluetooth.devices)
                         return []
-                    
+
                     var filtered = Bluetooth.devices.values.filter(dev => {
                         return dev && !dev.paired && !dev.pairing && !dev.blocked &&
                                (dev.signalStrength === undefined || dev.signalStrength > 0)
                     })
                     return BluetoothService.sortDevices(filtered)
                 }
-                
+
                 delegate: Rectangle {
                     required property var modelData
                     required property int index
-                    
+
                     property bool canConnect: BluetoothService.canConnect(modelData)
                     property bool isBusy: BluetoothService.isDeviceBusy(modelData)
-                    
+
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
@@ -336,24 +336,24 @@ Rectangle {
                     border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                     border.width: 0
                     opacity: canConnect ? 1 : 0.6
-                    
+
                     Row {
                         anchors.left: parent.left
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.leftMargin: Theme.spacingM
                         spacing: Theme.spacingS
-                        
+
                         DankIcon {
                             name: BluetoothService.getDeviceIcon(modelData)
                             size: Theme.iconSize - 4
                             color: Theme.surfaceText
                             anchors.verticalCenter: parent.verticalCenter
                         }
-                        
+
                         Column {
                             anchors.verticalCenter: parent.verticalCenter
                             width: 200
-                            
+
                             StyledText {
                                 text: modelData.name || modelData.deviceName || "Unknown Device"
                                 font.pixelSize: Theme.fontSizeMedium
@@ -361,10 +361,10 @@ Rectangle {
                                 elide: Text.ElideRight
                                 width: parent.width
                             }
-                            
+
                             Row {
                                 spacing: Theme.spacingXS
-                                
+
                                 StyledText {
                                     text: {
                                         if (modelData.pairing) return "Pairing..."
@@ -374,7 +374,7 @@ Rectangle {
                                     font.pixelSize: Theme.fontSizeSmall
                                     color: Theme.surfaceVariantText
                                 }
-                                
+
                                 StyledText {
                                     text: modelData.signalStrength !== undefined && modelData.signalStrength > 0 ? "• " + modelData.signalStrength + "%" : ""
                                     font.pixelSize: Theme.fontSizeSmall
@@ -384,7 +384,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     StyledText {
                         anchors.right: parent.right
                         anchors.rightMargin: Theme.spacingM
@@ -398,7 +398,7 @@ Rectangle {
                         color: canConnect ? Theme.primary : Theme.surfaceVariantText
                         font.weight: Font.Medium
                     }
-                    
+
                     MouseArea {
                         id: availableMouseArea
                         anchors.fill: parent
@@ -411,15 +411,15 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                 }
             }
-            
+
             Item {
                 width: parent.width
                 height: 60
                 visible: !BluetoothService.adapter
-                
+
                 StyledText {
                     anchors.centerIn: parent
                     text: I18n.tr("No Bluetooth adapter found")
@@ -429,25 +429,25 @@ Rectangle {
             }
         }
     }
-    
+
     Menu {
         id: bluetoothContextMenu
         width: 150
         closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-        
+
         property var currentDevice: null
-        
+
         background: Rectangle {
             color: Theme.popupBackground()
             radius: Theme.cornerRadius
             border.width: 0
             border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
         }
-        
+
         MenuItem {
             text: bluetoothContextMenu.currentDevice && bluetoothContextMenu.currentDevice.connected ? "Disconnect" : "Connect"
             height: 32
-            
+
             contentItem: StyledText {
                 text: parent.text
                 font.pixelSize: Theme.fontSizeSmall
@@ -455,12 +455,12 @@ Rectangle {
                 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: {
                 if (bluetoothContextMenu.currentDevice) {
                     if (bluetoothContextMenu.currentDevice.connected) {
@@ -471,12 +471,12 @@ Rectangle {
                 }
             }
         }
-        
+
         MenuItem {
             text: I18n.tr("Audio Codec")
             height: bluetoothContextMenu.currentDevice && BluetoothService.isAudioDevice(bluetoothContextMenu.currentDevice) && bluetoothContextMenu.currentDevice.connected ? 32 : 0
             visible: bluetoothContextMenu.currentDevice && BluetoothService.isAudioDevice(bluetoothContextMenu.currentDevice) && bluetoothContextMenu.currentDevice.connected
-            
+
             contentItem: StyledText {
                 text: parent.text
                 font.pixelSize: Theme.fontSizeSmall
@@ -484,23 +484,23 @@ Rectangle {
                 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: {
                 if (bluetoothContextMenu.currentDevice) {
                     showCodecSelector(bluetoothContextMenu.currentDevice)
                 }
             }
         }
-        
+
         MenuItem {
             text: I18n.tr("Forget Device")
             height: 32
-            
+
             contentItem: StyledText {
                 text: parent.text
                 font.pixelSize: Theme.fontSizeSmall
@@ -508,12 +508,12 @@ Rectangle {
                 leftPadding: Theme.spacingS
                 verticalAlignment: Text.AlignVCenter
             }
-            
+
             background: Rectangle {
                 color: parent.hovered ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08) : "transparent"
                 radius: Theme.cornerRadius / 2
             }
-            
+
             onTriggered: {
                 if (bluetoothContextMenu.currentDevice) {
                     bluetoothContextMenu.currentDevice.forget()
@@ -521,5 +521,5 @@ Rectangle {
             }
         }
     }
-    
+
 }

Modules/ControlCenter/Details/NetworkDetail.qml

@@ -28,7 +28,7 @@ Rectangle {
     Component.onDestruction: {
         NetworkService.removeRef()
     }
-    
+
     property int currentPreferenceIndex: {
         if (DMSService.apiVersion < 5) {
             return 1
@@ -88,7 +88,7 @@ Rectangle {
             }
         }
     }
-    
+
     Item {
         id: wifiToggleContent
         anchors.top: headerRow.bottom
@@ -127,7 +127,7 @@ Rectangle {
             }
         }
     }
-    
+
     Item {
         id: wifiOffContent
         anchors.top: headerRow.bottom
@@ -137,19 +137,19 @@ Rectangle {
         anchors.topMargin: Theme.spacingM
         visible: currentPreferenceIndex === 1 && !NetworkService.wifiEnabled && !NetworkService.wifiToggling
         height: visible ? 120 : 0
-        
+
         Column {
             anchors.centerIn: parent
             spacing: Theme.spacingL
             width: parent.width
-            
+
             DankIcon {
                 anchors.horizontalCenter: parent.horizontalCenter
                 name: "wifi_off"
                 size: 48
                 color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.5)
             }
-            
+
             StyledText {
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: I18n.tr("WiFi is off")
@@ -158,7 +158,7 @@ Rectangle {
                 font.weight: Font.Medium
                 horizontalAlignment: Text.AlignHCenter
             }
-            
+
             Rectangle {
                 anchors.horizontalCenter: parent.horizontalCenter
                 width: 120
@@ -167,7 +167,7 @@ Rectangle {
                 color: enableWifiButton.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
                 border.width: 0
                 border.color: Theme.primary
-                
+
                 StyledText {
                     anchors.centerIn: parent
                     text: I18n.tr("Enable WiFi")
@@ -175,7 +175,7 @@ Rectangle {
                     font.pixelSize: Theme.fontSizeMedium
                     font.weight: Font.Medium
                 }
-                
+
                 MouseArea {
                     id: enableWifiButton
                     anchors.fill: parent
@@ -257,7 +257,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     DankActionButton {
                         id: wiredOptionsButton
                         anchors.right: parent.right
@@ -295,7 +295,7 @@ Rectangle {
             }
         }
     }
-    
+
     Menu {
         id: wiredNetworkContextMenu
         width: 150
@@ -376,7 +376,7 @@ Rectangle {
             id: wifiColumn
             width: parent.width
             spacing: Theme.spacingS
-            
+
             Item {
                 width: parent.width
                 height: 200
@@ -397,7 +397,7 @@ Rectangle {
                     }
                 }
             }
-            
+
             Repeater {
                 model: sortedNetworks
 
@@ -415,20 +415,20 @@ Rectangle {
                 delegate: Rectangle {
                     required property var modelData
                     required property int index
-                    
+
                     width: parent.width
                     height: 50
                     radius: Theme.cornerRadius
                     color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHighest
                     border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
                     border.width: 0
-                    
+
                     Row {
                         anchors.left: parent.left
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.leftMargin: Theme.spacingM
                         spacing: Theme.spacingS
-                        
+
                         DankIcon {
                             name: {
                                 let strength = modelData.signal || 0
@@ -440,11 +440,11 @@ Rectangle {
                             color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Theme.surfaceText
                             anchors.verticalCenter: parent.verticalCenter
                         }
-                        
+
                         Column {
                             anchors.verticalCenter: parent.verticalCenter
                             width: 200
-                            
+
                             StyledText {
                                 text: modelData.ssid || "Unknown Network"
                                 font.pixelSize: Theme.fontSizeMedium
@@ -462,14 +462,14 @@ Rectangle {
                                     font.pixelSize: Theme.fontSizeSmall
                                     color: Theme.surfaceVariantText
                                 }
-                                
+
                                 StyledText {
                                     text: modelData.saved ? "Saved" : ""
                                     font.pixelSize: Theme.fontSizeSmall
                                     color: Theme.primary
                                     visible: text.length > 0
                                 }
-                                
+
                                 StyledText {
                                     text: (modelData.saved ? "• " : "") + modelData.signal + "%"
                                     font.pixelSize: Theme.fontSizeSmall
@@ -478,7 +478,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     DankActionButton {
                         id: optionsButton
                         anchors.right: parent.right
@@ -499,7 +499,7 @@ Rectangle {
                             }
                         }
                     }
-                    
+
                     MouseArea {
                         id: networkMouseArea
                         anchors.fill: parent
@@ -509,7 +509,11 @@ Rectangle {
                         onClicked: function(event) {
                             if (modelData.ssid !== NetworkService.currentWifiSSID) {
                                 if (modelData.secured && !modelData.saved) {
-                                    wifiPasswordModal.show(modelData.ssid)
+                                    if (DMSService.apiVersion >= 7) {
+                                        NetworkService.connectToWifi(modelData.ssid)
+                                    } else if (PopoutService.wifiPasswordModal) {
+                                        PopoutService.wifiPasswordModal.show(modelData.ssid)
+                                    }
                                 } else {
                                     NetworkService.connectToWifi(modelData.ssid)
                                 }
@@ -517,34 +521,34 @@ Rectangle {
                             event.accepted = true
                         }
                     }
-                    
+
                 }
             }
         }
     }
-    
+
     Menu {
         id: networkContextMenu
         width: 150
         closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-        
+
         property string currentSSID: ""
         property bool currentSecured: false
         property bool currentConnected: false
         property bool currentSaved: false
         property int currentSignal: 0
-        
+
         background: Rectangle {
             color: Theme.popupBackground()
             radius: Theme.cornerRadius
             border.width: 0
             border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
         }
-        
+
         MenuItem {
             text: networkContextMenu.currentConnected ? "Disconnect" : "Connect"
             height: 32
-            
+
             contentItem: StyledText {
                 text: parent.text
                 font.pixelSize: Theme.fontSizeSmall
@@ -552,29 +556,33 @@ Rectangle {
                 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: {
                 if (networkContextMenu.currentConnected) {
                     NetworkService.disconnectWifi()
                 } else {
                     if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
-                        wifiPasswordModal.show(networkContextMenu.currentSSID)
+                        if (DMSService.apiVersion >= 7) {
+                            NetworkService.connectToWifi(networkContextMenu.currentSSID)
+                        } else if (PopoutService.wifiPasswordModal) {
+                            PopoutService.wifiPasswordModal.show(networkContextMenu.currentSSID)
+                        }
                     } else {
                         NetworkService.connectToWifi(networkContextMenu.currentSSID)
                     }
                 }
             }
         }
-        
+
         MenuItem {
             text: I18n.tr("Network Info")
             height: 32
-            
+
             contentItem: StyledText {
                 text: parent.text
                 font.pixelSize: Theme.fontSizeSmall
@@ -582,23 +590,23 @@ Rectangle {
                 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: {
                 let networkData = NetworkService.getNetworkInfo(networkContextMenu.currentSSID)
                 networkInfoModal.showNetworkInfo(networkContextMenu.currentSSID, networkData)
             }
         }
-        
+
         MenuItem {
             text: I18n.tr("Forget Network")
             height: networkContextMenu.currentSaved || networkContextMenu.currentConnected ? 32 : 0
             visible: networkContextMenu.currentSaved || networkContextMenu.currentConnected
-            
+
             contentItem: StyledText {
                 text: parent.text
                 font.pixelSize: Theme.fontSizeSmall
@@ -606,26 +614,22 @@ Rectangle {
                 leftPadding: Theme.spacingS
                 verticalAlignment: Text.AlignVCenter
             }
-            
+
             background: Rectangle {
                 color: parent.hovered ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.08) : "transparent"
                 radius: Theme.cornerRadius / 2
             }
-            
+
             onTriggered: {
                 NetworkService.forgetWifiNetwork(networkContextMenu.currentSSID)
             }
         }
     }
-    
-    WifiPasswordModal {
-        id: wifiPasswordModal
-    }
 
     NetworkInfoModal {
         id: networkInfoModal
     }
-    
+
     NetworkWiredInfoModal {
         id: networkWiredInfoModal
     }

Modules/ControlCenter/Widgets/BluetoothPill.qml

@@ -1,70 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import Quickshell
-import qs.Common
-import qs.Services
-import qs.Widgets
-import qs.Modules.ControlCenter.Widgets
-
-CompoundPill {
-    id: root
-
-    property var primaryDevice: {
-        if (!BluetoothService.adapter || !BluetoothService.adapter.devices) {
-            return null
-        }
-
-        let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
-        for (let device of devices) {
-            if (device && device.connected) {
-                return device
-            }
-        }
-        return null
-    }
-
-    iconName: {
-        if (!BluetoothService.available) {
-            return "bluetooth_disabled"
-        }
-        if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
-            return "bluetooth_disabled"
-        }
-        return "bluetooth"
-    }
-
-    isActive: !!(BluetoothService.available && BluetoothService.adapter && BluetoothService.adapter.enabled)
-    showExpandArea: BluetoothService.available
-
-    primaryText: {
-        if (!BluetoothService.available) {
-            return "Bluetooth"
-        }
-        if (!BluetoothService.adapter) {
-            return "No adapter"
-        }
-        if (!BluetoothService.adapter.enabled) {
-            return "Disabled"
-        }
-        return "Enabled"
-    }
-
-    secondaryText: {
-        if (!BluetoothService.available) {
-            return "No adapters"
-        }
-        if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) {
-            return "Off"
-        }
-        if (primaryDevice) {
-            return primaryDevice.name || primaryDevice.alias || primaryDevice.deviceName || "Connected Device"
-        }
-        return "No devices"
-    }
-
-    onToggled: {
-        if (BluetoothService.available && BluetoothService.adapter) {
-            BluetoothService.adapter.enabled = !BluetoothService.adapter.enabled
-        }
-    }
-}

Modules/ControlCenter/Widgets/CompactSlider.qml

@@ -14,7 +14,7 @@ Rectangle {
     property real maximumValue: 1.0
     property real minimumValue: 0.0
     property bool enabled: true
-    
+
     signal sliderValueChanged(real value)
 
     width: parent ? parent.width : 200

Modules/DankBar/BarCanvas.qml

@@ -244,7 +244,6 @@ Item {
     Canvas {
         id: barBorder
         anchors.fill: parent
-        antialiasing: false
         visible: SettingsData.dankBarBorderEnabled
         renderTarget: Canvas.FramebufferObject
         renderStrategy: Canvas.Cooperative
@@ -257,6 +256,8 @@ Item {
         property real rt: SettingsData.dankBarSquareCorners ? 0 : Theme.px(Theme.cornerRadius, dpr)
         property bool borderEnabled: SettingsData.dankBarBorderEnabled
 
+        antialiasing: rt > 0 || wing > 0
+
         onWingChanged: root.requestRepaint()
         onRtChanged: root.requestRepaint()
         onBorderEnabledChanged: root.requestRepaint()
@@ -306,38 +307,6 @@ Item {
             const spacing = SettingsData.dankBarSpacing
             const hasEdgeGap = spacing > 0 || RT > 0
 
-            function drawTopBorder() {
-                ctx.beginPath()
-
-                if (!hasEdgeGap) {
-                    ctx.moveTo(0, H)
-                    ctx.lineTo(W, H)
-                } else {
-                    ctx.moveTo(RT, 0)
-                    ctx.lineTo(W - RT, 0)
-                    ctx.arcTo(W, 0, W, RT, RT)
-                    ctx.lineTo(W, H)
-
-                    if (R > 0) {
-                        ctx.lineTo(W, H + R)
-                        ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
-                        ctx.lineTo(R, H)
-                        ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
-                        ctx.lineTo(0, H + R)
-                    } else {
-                        ctx.lineTo(W, H - RT)
-                        ctx.arcTo(W, H, W - RT, H, RT)
-                        ctx.lineTo(RT, H)
-                        ctx.arcTo(0, H, 0, H - RT, RT)
-                    }
-
-                    ctx.lineTo(0, RT)
-                    ctx.arcTo(0, 0, RT, 0, RT)
-                }
-
-                ctx.closePath()
-            }
-
             ctx.reset()
             ctx.clearRect(0, 0, W, H_raw)
 
@@ -353,20 +322,85 @@ Item {
                 ctx.rotate(Math.PI / 2)
             }
 
-            drawTopBorder()
-            ctx.restore()
+            const uiThickness = Math.max(1, SettingsData.dankBarBorderThickness ?? 1)
+            const devThickness = Math.max(1, Math.round(Theme.px(uiThickness, dpr)))
 
             const key = SettingsData.dankBarBorderColor || "surfaceText"
             const base = (key === "surfaceText") ? Theme.surfaceText
                        : (key === "primary") ? Theme.primary
                        : Theme.secondary
             const color = Theme.withAlpha(base, SettingsData.dankBarBorderOpacity ?? 1.0)
-            const thickness = Math.max(1, SettingsData.dankBarBorderThickness ?? 1)
 
             ctx.globalCompositeOperation = "source-over"
-            ctx.lineWidth = thickness
-            ctx.strokeStyle = color
-            ctx.stroke()
+            ctx.fillStyle = color
+
+            function drawTopBorder() {
+                if (!hasEdgeGap) {
+                    ctx.beginPath()
+                    ctx.rect(0, H - devThickness, W, devThickness)
+                    ctx.fill()
+                } else {
+                    const thk = devThickness
+                    const RTi = Math.max(0, RT - thk)
+                    const Ri = Math.max(0, R - thk)
+
+                    ctx.beginPath()
+
+                    if (R > 0 && Ri > 0) {
+                        ctx.moveTo(RT, 0)
+                        ctx.lineTo(W - RT, 0)
+                        ctx.arcTo(W, 0, W, RT, RT)
+                        ctx.lineTo(W, H)
+                        ctx.lineTo(W, H + R)
+                        ctx.arc(W - R, H + R, R, 0, -Math.PI / 2, true)
+                        ctx.lineTo(R, H)
+                        ctx.arc(R, H + R, R, -Math.PI / 2, -Math.PI, true)
+                        ctx.lineTo(0, H + R)
+                        ctx.lineTo(0, RT)
+                        ctx.arcTo(0, 0, RT, 0, RT)
+                        ctx.closePath()
+
+                        ctx.moveTo(RT, thk)
+                        ctx.arcTo(thk, thk, thk, RT, RTi)
+                        ctx.lineTo(thk, H + R)
+                        ctx.arc(R, H + R, Ri, -Math.PI, -Math.PI / 2, false)
+                        ctx.lineTo(W - R, H + thk)
+                        ctx.arc(W - R, H + R, Ri, -Math.PI / 2, 0, false)
+                        ctx.lineTo(W - thk, H + R)
+                        ctx.lineTo(W - thk, RT)
+                        ctx.arcTo(W - thk, thk, W - RT, thk, RTi)
+                        ctx.lineTo(RT, thk)
+                        ctx.closePath()
+                    } else {
+                        ctx.moveTo(RT, 0)
+                        ctx.lineTo(W - RT, 0)
+                        ctx.arcTo(W, 0, W, RT, RT)
+                        ctx.lineTo(W, H - RT)
+                        ctx.arcTo(W, H, W - RT, H, RT)
+                        ctx.lineTo(RT, H)
+                        ctx.arcTo(0, H, 0, H - RT, RT)
+                        ctx.lineTo(0, RT)
+                        ctx.arcTo(0, 0, RT, 0, RT)
+                        ctx.closePath()
+
+                        ctx.moveTo(RT, thk)
+                        ctx.arcTo(thk, thk, thk, RT, RTi)
+                        ctx.lineTo(thk, H - RT)
+                        ctx.arcTo(thk, H - thk, RT, H - thk, RTi)
+                        ctx.lineTo(W - RT, H - thk)
+                        ctx.arcTo(W - thk, H - thk, W - thk, H - RT, RTi)
+                        ctx.lineTo(W - thk, RT)
+                        ctx.arcTo(W - thk, thk, W - RT, thk, RTi)
+                        ctx.lineTo(RT, thk)
+                        ctx.closePath()
+                    }
+
+                    ctx.fill("evenodd")
+                }
+            }
+
+            drawTopBorder()
+            ctx.restore()
         }
     }
 }

Modules/DankBar/DankBar.qml

@@ -23,6 +23,7 @@ Item {
     signal colorPickerRequested
 
     property alias barVariants: barVariants
+    property var hyprlandOverviewLoader: null
 
     function triggerControlCenterOnFocusedScreen() {
         let focusedScreenName = ""
@@ -48,6 +49,30 @@ Item {
         return false
     }
 
+    function triggerWallpaperBrowserOnFocusedScreen() {
+        let focusedScreenName = ""
+        if (CompositorService.isHyprland && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor) {
+            focusedScreenName = Hyprland.focusedWorkspace.monitor.name
+        } else if (CompositorService.isNiri && NiriService.currentOutput) {
+            focusedScreenName = NiriService.currentOutput
+        }
+
+        if (!focusedScreenName && barVariants.instances.length > 0) {
+            const firstBar = barVariants.instances[0]
+            firstBar.triggerWallpaperBrowser()
+            return true
+        }
+
+        for (var i = 0; i < barVariants.instances.length; i++) {
+            const barInstance = barVariants.instances[i]
+            if (barInstance.modelData && barInstance.modelData.name === focusedScreenName) {
+                barInstance.triggerWallpaperBrowser()
+                return true
+            }
+        }
+        return false
+    }
+
     Variants {
         id: barVariants
         model: SettingsData.getFilteredScreens("dankBar")
@@ -56,6 +81,7 @@ Item {
             id: barWindow
 
             property var controlCenterButtonRef: null
+            property var clockButtonRef: null
 
             function triggerControlCenter() {
                 controlCenterLoader.active = true
@@ -78,6 +104,27 @@ Item {
                 }
             }
 
+            function triggerWallpaperBrowser() {
+                dankDashPopoutLoader.active = true
+                if (!dankDashPopoutLoader.item) {
+                    return
+                }
+
+                if (clockButtonRef && dankDashPopoutLoader.item.setTriggerPosition) {
+                    const globalPos = clockButtonRef.mapToGlobal(0, 0)
+                    const pos = SettingsData.getPopupTriggerPosition(globalPos, barWindow.screen, barWindow.effectiveBarThickness, clockButtonRef.width)
+                    const section = clockButtonRef.section || "center"
+                    dankDashPopoutLoader.item.setTriggerPosition(pos.x, pos.y, pos.width, section, barWindow.screen)
+                } else {
+                    dankDashPopoutLoader.item.triggerScreen = barWindow.screen
+                }
+
+                if (!dankDashPopoutLoader.item.dashVisible) {
+                    dankDashPopoutLoader.item.currentTabIndex = 2
+                }
+                dankDashPopoutLoader.item.dashVisible = !dankDashPopoutLoader.item.dashVisible
+            }
+
             readonly property var dBarLayer: {
                 switch (Quickshell.env("DMS_DANKBAR_LAYER")) {
                 case "bottom":
@@ -499,9 +546,9 @@ Item {
                                 anchors.fill: parent
                                 anchors.leftMargin: !barWindow.isVertical ? Math.max(Theme.spacingXS, SettingsData.dankBarInnerPadding * 0.8) : SettingsData.dankBarInnerPadding / 2
                                 anchors.rightMargin: !barWindow.isVertical ? Math.max(Theme.spacingXS, SettingsData.dankBarInnerPadding * 0.8) : SettingsData.dankBarInnerPadding / 2
-                                anchors.topMargin: !barWindow.isVertical ? SettingsData.dankBarInnerPadding / 2 : Math.max(Theme.spacingXS, SettingsData.dankBarInnerPadding * 0.8)
-                                anchors.bottomMargin: !barWindow.isVertical ? SettingsData.dankBarInnerPadding / 2 : Math.max(Theme.spacingXS, SettingsData.dankBarInnerPadding * 0.8)
-                                clip: true
+                                anchors.topMargin: !barWindow.isVertical ? 0 : Math.max(Theme.spacingXS, SettingsData.dankBarInnerPadding * 0.8)
+                                anchors.bottomMargin: !barWindow.isVertical ? 0 : Math.max(Theme.spacingXS, SettingsData.dankBarInnerPadding * 0.8)
+                                clip: false
 
                                 property int componentMapRevision: 0
 
@@ -754,6 +801,7 @@ Item {
                                     ClipboardButton {
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent)
                                         parentScreen: barWindow.screen
                                         onClicked: {
@@ -770,8 +818,9 @@ Item {
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
                                         section: topBarContent.getWidgetSection(parent)
-                                        popupTarget: appDrawerLoader.item
+                                        popoutTarget: appDrawerLoader.item
                                         parentScreen: barWindow.screen
+                                        hyprlandOverviewLoader: root.hyprlandOverviewLoader
                                         onClicked: {
                                             appDrawerLoader.active = true
                                             appDrawerLoader.item?.toggle()
@@ -783,8 +832,12 @@ Item {
                                     id: workspaceSwitcherComponent
 
                                     WorkspaceSwitcher {
+                                        axis: barWindow.axis
                                         screenName: barWindow.screenName
                                         widgetHeight: barWindow.widgetThickness
+                                        barThickness: barWindow.effectiveBarThickness
+                                        parentScreen: barWindow.screen
+                                        hyprlandOverviewLoader: root.hyprlandOverviewLoader
                                     }
                                 }
 
@@ -792,8 +845,10 @@ Item {
                                     id: focusedWindowComponent
 
                                     FocusedApp {
+                                        axis: barWindow.axis
                                         availableWidth: topBarContent.leftToMediaGap
                                         widgetThickness: barWindow.widgetThickness
+                                        barThickness: barWindow.effectiveBarThickness
                                         parentScreen: barWindow.screen
                                     }
                                 }
@@ -813,15 +868,27 @@ Item {
                                     id: clockComponent
 
                                     Clock {
+                                        axis: barWindow.axis
                                         compactMode: topBarContent.overlapping
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
                                         section: topBarContent.getWidgetSection(parent) || "center"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             dankDashPopoutLoader.active = true
                                             return dankDashPopoutLoader.item
                                         }
                                         parentScreen: barWindow.screen
+
+                                        Component.onCompleted: {
+                                            barWindow.clockButtonRef = this
+                                        }
+
+                                        Component.onDestruction: {
+                                            if (barWindow.clockButtonRef === this) {
+                                                barWindow.clockButtonRef = null
+                                            }
+                                        }
+
                                         onClockClicked: {
                                             dankDashPopoutLoader.active = true
                                             if (dankDashPopoutLoader.item) {
@@ -836,11 +903,12 @@ Item {
                                     id: mediaComponent
 
                                     Media {
+                                        axis: barWindow.axis
                                         compactMode: topBarContent.spacingTight || topBarContent.overlapping
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
                                         section: topBarContent.getWidgetSection(parent) || "center"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             dankDashPopoutLoader.active = true
                                             return dankDashPopoutLoader.item
                                         }
@@ -859,10 +927,11 @@ Item {
                                     id: weatherComponent
 
                                     Weather {
+                                        axis: barWindow.axis
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
                                         section: topBarContent.getWidgetSection(parent) || "center"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             dankDashPopoutLoader.active = true
                                             return dankDashPopoutLoader.item
                                         }
@@ -871,7 +940,7 @@ Item {
                                             dankDashPopoutLoader.active = true
                                             if (dankDashPopoutLoader.item) {
                                                 dankDashPopoutLoader.item.dashVisible = !dankDashPopoutLoader.item.dashVisible
-                                                dankDashPopoutLoader.item.currentTabIndex = 2
+                                                dankDashPopoutLoader.item.currentTabIndex = 3
                                             }
                                         }
                                     }
@@ -905,8 +974,9 @@ Item {
                                     CpuMonitor {
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             processListPopoutLoader.active = true
                                             return processListPopoutLoader.item
                                         }
@@ -925,8 +995,9 @@ Item {
                                     RamMonitor {
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             processListPopoutLoader.active = true
                                             return processListPopoutLoader.item
                                         }
@@ -955,8 +1026,9 @@ Item {
                                     CpuTemperature {
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             processListPopoutLoader.active = true
                                             return processListPopoutLoader.item
                                         }
@@ -975,8 +1047,9 @@ Item {
                                     GpuTemperature {
                                         barThickness: barWindow.effectiveBarThickness
                                         widgetThickness: barWindow.widgetThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             processListPopoutLoader.active = true
                                             return processListPopoutLoader.item
                                         }
@@ -1003,8 +1076,9 @@ Item {
                                         isActive: notificationCenterLoader.item ? notificationCenterLoader.item.shouldBeVisible : false
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             notificationCenterLoader.active = true
                                             return notificationCenterLoader.item
                                         }
@@ -1023,8 +1097,9 @@ Item {
                                         batteryPopupVisible: batteryPopoutLoader.item ? batteryPopoutLoader.item.shouldBeVisible : false
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             batteryPopoutLoader.active = true
                                             return batteryPopoutLoader.item
                                         }
@@ -1042,8 +1117,9 @@ Item {
                                     Vpn {
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             vpnPopoutLoader.active = true
                                             return vpnPopoutLoader.item
                                         }
@@ -1062,8 +1138,9 @@ Item {
                                         isActive: controlCenterLoader.item ? controlCenterLoader.item.shouldBeVisible : false
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             controlCenterLoader.active = true
                                             return controlCenterLoader.item
                                         }
@@ -1157,9 +1234,9 @@ Item {
                                     id: notepadButtonComponent
 
                                     NotepadButton {
-                                        isVertical: barWindow.isVertical
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
                                         parentScreen: barWindow.screen
                                     }
@@ -1186,8 +1263,9 @@ Item {
                                         isActive: systemUpdateLoader.item ? systemUpdateLoader.item.shouldBeVisible : false
                                         widgetThickness: barWindow.widgetThickness
                                         barThickness: barWindow.effectiveBarThickness
+                                        axis: barWindow.axis
                                         section: topBarContent.getWidgetSection(parent) || "right"
-                                        popupTarget: {
+                                        popoutTarget: {
                                             systemUpdateLoader.active = true
                                             return systemUpdateLoader.item
                                         }

Modules/DankBar/Widgets/Battery.qml

@@ -1,124 +1,112 @@
 import QtQuick
 import Quickshell.Services.UPower
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: battery
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool batteryPopupVisible: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
+    property var popoutTarget: null
 
     signal toggleBatteryPopup()
 
-    width: isVertical ? widgetThickness : (batteryContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (batteryColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = batteryArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
     visible: true
 
-    Column {
-        id: batteryColumn
-        visible: battery.isVertical
-        anchors.centerIn: parent
-        spacing: 1
+    content: Component {
+        Item {
+            implicitWidth: battery.isVerticalOrientation ? (battery.widgetThickness - battery.horizontalPadding * 2) : batteryContent.implicitWidth
+            implicitHeight: battery.isVerticalOrientation ? batteryColumn.implicitHeight : (battery.widgetThickness - battery.horizontalPadding * 2)
 
-        DankIcon {
-            name: BatteryService.getBatteryIcon()
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (!BatteryService.batteryAvailable) {
-                    return Theme.surfaceText
+            Column {
+                id: batteryColumn
+                visible: battery.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: BatteryService.getBatteryIcon()
+                    size: Theme.barIconSize(battery.barThickness)
+                    color: {
+                        if (!BatteryService.batteryAvailable) {
+                            return Theme.surfaceText
+                        }
+
+                        if (BatteryService.isLowBattery && !BatteryService.isCharging) {
+                            return Theme.error
+                        }
+
+                        if (BatteryService.isCharging || BatteryService.isPluggedIn) {
+                            return Theme.primary
+                        }
+
+                        return Theme.surfaceText
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
                 }
 
-                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
-                    return Theme.error
+                StyledText {
+                    text: BatteryService.batteryLevel.toString()
+                    font.pixelSize: Theme.barTextSize(battery.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: BatteryService.batteryAvailable
                 }
-
-                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
-                    return Theme.primary
-                }
-
-                return Theme.surfaceText
             }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
 
-        StyledText {
-            text: BatteryService.batteryLevel.toString()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: BatteryService.batteryAvailable
-        }
-    }
+            Row {
+                id: batteryContent
+                visible: !battery.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: SettingsData.dankBarNoBackground ? 1 : 2
 
-    Row {
-        id: batteryContent
-        visible: !battery.isVertical
-        anchors.centerIn: parent
-        spacing: SettingsData.dankBarNoBackground ? 1 : 2
+                DankIcon {
+                    name: BatteryService.getBatteryIcon()
+                    size: Theme.barIconSize(battery.barThickness, -4)
+                    color: {
+                        if (!BatteryService.batteryAvailable) {
+                            return Theme.surfaceText;
+                        }
 
-        DankIcon {
-            name: BatteryService.getBatteryIcon()
-            size: Theme.barIconSize(barThickness, -4)
-            color: {
-                if (!BatteryService.batteryAvailable) {
-                    return Theme.surfaceText;
+                        if (BatteryService.isLowBattery && !BatteryService.isCharging) {
+                            return Theme.error;
+                        }
+
+                        if (BatteryService.isCharging || BatteryService.isPluggedIn) {
+                            return Theme.primary;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.verticalCenter: parent.verticalCenter
                 }
 
-                if (BatteryService.isLowBattery && !BatteryService.isCharging) {
-                    return Theme.error;
+                StyledText {
+                    text: `${BatteryService.batteryLevel}%`
+                    font.pixelSize: Theme.barTextSize(battery.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: BatteryService.batteryAvailable
                 }
-
-                if (BatteryService.isCharging || BatteryService.isPluggedIn) {
-                    return Theme.primary;
-                }
-
-                return Theme.surfaceText;
             }
-            anchors.verticalCenter: parent.verticalCenter
         }
-
-        StyledText {
-            text: `${BatteryService.batteryLevel}%`
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: BatteryService.batteryAvailable
-        }
-
     }
 
     MouseArea {
-        id: batteryArea
-
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = battery.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, battery.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
             toggleBatteryPopup();
         }

Modules/DankBar/Widgets/ClipboardButton.qml

@@ -1,57 +1,25 @@
 import QtQuick
 import qs.Common
+import qs.Modules.Plugins
 import qs.Widgets
 
-Item {
+BasePill {
     id: root
 
     property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
     property var clipboardHistoryModal: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
-    signal clicked()
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
 
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: clipboardArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            root.clicked()
-        }
-    }
-
-    Rectangle {
-        id: clipboardContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent"
+            DankIcon {
+                anchors.centerIn: parent
+                name: "content_paste"
+                size: Theme.barIconSize(root.barThickness)
+                color: Theme.surfaceText
             }
-
-            const baseColor = clipboardArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-        }
-
-        DankIcon {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            name: "content_paste"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
         }
     }
 }

Modules/DankBar/Widgets/Clock.qml

@@ -1,270 +1,254 @@
 import QtQuick
 import Quickshell
 import qs.Common
+import qs.Modules.Plugins
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool compactMode: false
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-
     signal clockClicked
 
-    width: isVertical ? widgetThickness : (clockRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (clockColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = clockMouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    Column {
-        id: clockColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: -2
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    if (SettingsData.use24HourClock) {
-                        return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(0)
-                    } else {
-                        const hours = systemClock?.date?.getHours()
-                        const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
-                        return String(display).padStart(2, '0').charAt(0)
-                    }
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    if (SettingsData.use24HourClock) {
-                        return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(1)
-                    } else {
-                        const hours = systemClock?.date?.getHours()
-                        const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
-                        return String(display).padStart(2, '0').charAt(1)
-                    }
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(0)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(1)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            visible: SettingsData.showSeconds
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(0)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(1)
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.surfaceText
-                font.weight: Font.Normal
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
+    content: Component {
         Item {
-            width: 12
-            height: Theme.spacingM
-            anchors.horizontalCenter: parent.horizontalCenter
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : clockRow.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? clockColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
-            Rectangle {
-                width: 12
-                height: 1
-                color: Theme.outlineButton
+            Column {
+                id: clockColumn
+                visible: root.isVerticalOrientation
                 anchors.centerIn: parent
-            }
-        }
+                spacing: -2
 
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
+                Row {
+                    spacing: 0
+                    anchors.horizontalCenter: parent.horizontalCenter
 
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0')
-                    return value.charAt(0)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
+                    StyledText {
+                        text: {
+                            if (SettingsData.use24HourClock) {
+                                return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(0)
+                            } else {
+                                const hours = systemClock?.date?.getHours()
+                                const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
+                                return String(display).padStart(2, '0').charAt(0)
+                            }
+                        }
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
 
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0')
-                    return value.charAt(1)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-
-        Row {
-            spacing: 0
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0')
-                    return value.charAt(0)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-
-            StyledText {
-                text: {
-                    const locale = Qt.locale()
-                    const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
-                    const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
-                    const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0')
-                    return value.charAt(1)
-                }
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.primary
-                font.weight: Font.Light
-                width: 9
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-    }
-
-    Row {
-        id: clockRow
-
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-
-        StyledText {
-            text: {
-                return systemClock?.date?.toLocaleTimeString(Qt.locale(), SettingsData.getEffectiveTimeFormat())
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: "•"
-            font.pixelSize: Theme.fontSizeSmall
-            color: Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !SettingsData.clockCompactMode
-        }
-
-        StyledText {
-            text: {
-                if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0) {
-                    return systemClock?.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat)
+                    StyledText {
+                        text: {
+                            if (SettingsData.use24HourClock) {
+                                return String(systemClock?.date?.getHours()).padStart(2, '0').charAt(1)
+                            } else {
+                                const hours = systemClock?.date?.getHours()
+                                const display = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours
+                                return String(display).padStart(2, '0').charAt(1)
+                            }
+                        }
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
                 }
 
-                return systemClock?.date?.toLocaleDateString(Qt.locale(), "ddd d")
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !SettingsData.clockCompactMode
-        }
-    }
+                Row {
+                    spacing: 0
+                    anchors.horizontalCenter: parent.horizontalCenter
 
-    SystemClock {
-        id: systemClock
-        precision: SystemClock.Seconds
+                    StyledText {
+                        text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(0)
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+
+                    StyledText {
+                        text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(1)
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+                }
+
+                Row {
+                    visible: SettingsData.showSeconds
+                    spacing: 0
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    StyledText {
+                        text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(0)
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+
+                    StyledText {
+                        text: String(systemClock?.date?.getSeconds()).padStart(2, '0').charAt(1)
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.surfaceText
+                        font.weight: Font.Normal
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+                }
+
+                Item {
+                    width: 12
+                    height: Theme.spacingM
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    Rectangle {
+                        width: 12
+                        height: 1
+                        color: Theme.outlineButton
+                        anchors.centerIn: parent
+                    }
+                }
+
+                Row {
+                    spacing: 0
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    StyledText {
+                        text: {
+                            const locale = Qt.locale()
+                            const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
+                            const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
+                            const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0')
+                            return value.charAt(0)
+                        }
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.primary
+                        font.weight: Font.Light
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+
+                    StyledText {
+                        text: {
+                            const locale = Qt.locale()
+                            const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
+                            const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
+                            const value = dayFirst ? String(systemClock?.date?.getDate()).padStart(2, '0') : String(systemClock?.date?.getMonth() + 1).padStart(2, '0')
+                            return value.charAt(1)
+                        }
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.primary
+                        font.weight: Font.Light
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+                }
+
+                Row {
+                    spacing: 0
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    StyledText {
+                        text: {
+                            const locale = Qt.locale()
+                            const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
+                            const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
+                            const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0')
+                            return value.charAt(0)
+                        }
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.primary
+                        font.weight: Font.Light
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+
+                    StyledText {
+                        text: {
+                            const locale = Qt.locale()
+                            const dateFormatShort = locale.dateFormat(Locale.ShortFormat)
+                            const dayFirst = dateFormatShort.indexOf('d') < dateFormatShort.indexOf('M')
+                            const value = dayFirst ? String(systemClock?.date?.getMonth() + 1).padStart(2, '0') : String(systemClock?.date?.getDate()).padStart(2, '0')
+                            return value.charAt(1)
+                        }
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.primary
+                        font.weight: Font.Light
+                        width: 9
+                        horizontalAlignment: Text.AlignHCenter
+                    }
+                }
+            }
+
+            Row {
+                id: clockRow
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: Theme.spacingS
+
+                StyledText {
+                    text: {
+                        return systemClock?.date?.toLocaleTimeString(Qt.locale(), SettingsData.getEffectiveTimeFormat())
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: "•"
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: Theme.outlineButton
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: !SettingsData.clockCompactMode
+                }
+
+                StyledText {
+                    text: {
+                        if (SettingsData.clockDateFormat && SettingsData.clockDateFormat.length > 0) {
+                            return systemClock?.date?.toLocaleDateString(Qt.locale(), SettingsData.clockDateFormat)
+                        }
+
+                        return systemClock?.date?.toLocaleDateString(Qt.locale(), "ddd d")
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: !SettingsData.clockCompactMode
+                }
+            }
+
+            SystemClock {
+                id: systemClock
+                precision: SystemClock.Seconds
+            }
+        }
     }
 
     MouseArea {
         id: clockMouseArea
-
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
+            if (root.popoutTarget && root.popoutTarget.setTriggerPosition) {
                 const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const currentScreen = root.parentScreen || Screen
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, width)
+                root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
             }
             root.clockClicked()
         }
     }
-
 }

Modules/DankBar/Widgets/ColorPicker.qml

@@ -1,54 +1,36 @@
 import QtQuick
 import qs.Common
+import qs.Modules.Plugins
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
-    signal clicked()
+    signal colorPickerRequested()
 
-    width: isVertical ? widgetThickness : (colorPickerIcon.width + horizontalPadding * 2)
-    height: isVertical ? (colorPickerIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
+
+            DankIcon {
+                anchors.centerIn: parent
+                name: "palette"
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: root.isActive ? Theme.primary : Theme.surfaceText
+            }
         }
-
-        const baseColor = colorPickerArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: colorPickerIcon
-
-        anchors.centerIn: parent
-        name: "palette"
-        size: Theme.barIconSize(barThickness, -4)
-        color: colorPickerArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
     }
 
     MouseArea {
-        id: colorPickerArea
-
+        z: 1
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         onPressed: {
-            root.colorPickerRequested();
+            root.colorPickerRequested()
         }
     }
-
-    signal colorPickerRequested()
-
-}
+}

Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -1,266 +1,245 @@
 import QtQuick
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
+    property var popoutTarget: null
     property var widgetData: null
     property bool showNetworkIcon: SettingsData.controlCenterShowNetworkIcon
     property bool showBluetoothIcon: SettingsData.controlCenterShowBluetoothIcon
     property bool showAudioIcon: SettingsData.controlCenterShowAudioIcon
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
-    signal clicked()
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : controlIndicators.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? controlColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
-    width: isVertical ? widgetThickness : (controlIndicators.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (controlColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
+            Column {
+                id: controlColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: Theme.spacingXS
 
-        const baseColor = controlCenterArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
+                DankIcon {
+                    name: {
+                        if (NetworkService.wifiToggling) {
+                            return "sync"
+                        }
 
-    Column {
-        id: controlColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
+                        if (NetworkService.networkStatus === "ethernet") {
+                            return "lan"
+                        }
 
-        DankIcon {
-            name: {
-                if (NetworkService.wifiToggling) {
-                    return "sync"
+                        return NetworkService.wifiSignalIcon
+                    }
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (NetworkService.wifiToggling) {
+                            return Theme.primary
+                        }
+
+                        return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: root.showNetworkIcon && NetworkService.networkAvailable
                 }
 
-                if (NetworkService.networkStatus === "ethernet") {
-                    return "lan"
+                DankIcon {
+                    name: "bluetooth"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: BluetoothService.connected ? Theme.primary : Theme.outlineButton
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
                 }
 
-                return NetworkService.wifiSignalIcon
-            }
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (NetworkService.wifiToggling) {
-                    return Theme.primary
-                }
+                Rectangle {
+                    width: audioIconV.implicitWidth + 4
+                    height: audioIconV.implicitHeight + 4
+                    color: "transparent"
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: root.showAudioIcon
 
-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showNetworkIcon && NetworkService.networkAvailable
-        }
+                    DankIcon {
+                        id: audioIconV
 
-        DankIcon {
-            name: "bluetooth"
-            size: Theme.barIconSize(barThickness)
-            color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
-        }
-
-        Rectangle {
-            width: audioIconV.implicitWidth + 4
-            height: audioIconV.implicitHeight + 4
-            color: "transparent"
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: root.showAudioIcon
-
-            DankIcon {
-                id: audioIconV
-
-                name: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
-                            return "volume_off"
-                        } else if (AudioService.sink.audio.volume * 100 < 33) {
-                            return "volume_down"
-                        } else {
+                        name: {
+                            if (AudioService.sink && AudioService.sink.audio) {
+                                if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
+                                    return "volume_off"
+                                } else if (AudioService.sink.audio.volume * 100 < 33) {
+                                    return "volume_down"
+                                } else {
+                                    return "volume_up"
+                                }
+                            }
                             return "volume_up"
                         }
+                        size: Theme.barIconSize(root.barThickness)
+                        color: Theme.surfaceText
+                        anchors.centerIn: parent
                     }
-                    return "volume_up"
-                }
-                size: Theme.barIconSize(barThickness)
-                color: Theme.surfaceText
-                anchors.centerIn: parent
-            }
 
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.NoButton
-                onWheel: function(wheelEvent) {
-                    let delta = wheelEvent.angleDelta.y
-                    let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0
-                    let newVolume
-                    if (delta > 0) {
-                        newVolume = Math.min(100, currentVolume + 5)
-                    } else {
-                        newVolume = Math.max(0, currentVolume - 5)
-                    }
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = false
-                        AudioService.sink.audio.volume = newVolume / 100
-                    }
-                    wheelEvent.accepted = true
-                }
-            }
-        }
-
-        DankIcon {
-            name: "settings"
-            size: Theme.barIconSize(barThickness)
-            color: controlCenterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-            visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
-        }
-    }
-
-    Row {
-        id: controlIndicators
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            id: networkIcon
-
-            name: {
-                if (NetworkService.wifiToggling) {
-                    return "sync";
-                }
-
-                if (NetworkService.networkStatus === "ethernet") {
-                    return "lan";
-                }
-
-                return NetworkService.wifiSignalIcon;
-            }
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (NetworkService.wifiToggling) {
-                    return Theme.primary;
-                }
-
-                return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showNetworkIcon && NetworkService.networkAvailable
-
-
-        }
-
-        DankIcon {
-            id: bluetoothIcon
-
-            name: "bluetooth"
-            size: Theme.barIconSize(barThickness)
-            color: BluetoothService.enabled ? Theme.primary : Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
-        }
-
-        Rectangle {
-            width: audioIcon.implicitWidth + 4
-            height: audioIcon.implicitHeight + 4
-            color: "transparent"
-            anchors.verticalCenter: parent.verticalCenter
-            visible: root.showAudioIcon
-
-            DankIcon {
-                id: audioIcon
-
-                name: {
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
-                            return "volume_off";
-                        } else if (AudioService.sink.audio.volume * 100 < 33) {
-                            return "volume_down";
-                        } else {
-                            return "volume_up";
+                    MouseArea {
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        acceptedButtons: Qt.NoButton
+                        onWheel: function(wheelEvent) {
+                            let delta = wheelEvent.angleDelta.y
+                            let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0
+                            let newVolume
+                            if (delta > 0) {
+                                newVolume = Math.min(100, currentVolume + 5)
+                            } else {
+                                newVolume = Math.max(0, currentVolume - 5)
+                            }
+                            if (AudioService.sink && AudioService.sink.audio) {
+                                AudioService.sink.audio.muted = false
+                                AudioService.sink.audio.volume = newVolume / 100
+                            }
+                            wheelEvent.accepted = true
                         }
                     }
-                    return "volume_up";
                 }
-                size: Theme.barIconSize(barThickness)
-                color: Theme.surfaceText
+
+                DankIcon {
+                    name: "settings"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: root.isActive ? Theme.primary : Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
+                }
+            }
+
+            Row {
+                id: controlIndicators
+                visible: !root.isVerticalOrientation
                 anchors.centerIn: parent
-            }
+                spacing: Theme.spacingXS
 
-            MouseArea {
-                id: audioWheelArea
+                DankIcon {
+                    id: networkIcon
 
-                anchors.fill: parent
-                hoverEnabled: true
-                acceptedButtons: Qt.NoButton
-                onWheel: function(wheelEvent) {
-                    let delta = wheelEvent.angleDelta.y;
-                    let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0;
-                    let newVolume;
-                    if (delta > 0) {
-                        newVolume = Math.min(100, currentVolume + 5);
-                    } else {
-                        newVolume = Math.max(0, currentVolume - 5);
+                    name: {
+                        if (NetworkService.wifiToggling) {
+                            return "sync";
+                        }
+
+                        if (NetworkService.networkStatus === "ethernet") {
+                            return "lan";
+                        }
+
+                        return NetworkService.wifiSignalIcon;
                     }
-                    if (AudioService.sink && AudioService.sink.audio) {
-                        AudioService.sink.audio.muted = false;
-                        AudioService.sink.audio.volume = newVolume / 100;
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (NetworkService.wifiToggling) {
+                            return Theme.primary;
+                        }
+
+                        return NetworkService.networkStatus !== "disconnected" ? Theme.primary : Theme.outlineButton;
                     }
-                    wheelEvent.accepted = true;
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: root.showNetworkIcon && NetworkService.networkAvailable
+                }
+
+                DankIcon {
+                    id: bluetoothIcon
+
+                    name: "bluetooth"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: BluetoothService.connected ? Theme.primary : Theme.outlineButton
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
+                }
+
+                Rectangle {
+                    width: audioIcon.implicitWidth + 4
+                    height: audioIcon.implicitHeight + 4
+                    color: "transparent"
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: root.showAudioIcon
+
+                    DankIcon {
+                        id: audioIcon
+
+                        name: {
+                            if (AudioService.sink && AudioService.sink.audio) {
+                                if (AudioService.sink.audio.muted || AudioService.sink.audio.volume === 0) {
+                                    return "volume_off";
+                                } else if (AudioService.sink.audio.volume * 100 < 33) {
+                                    return "volume_down";
+                                } else {
+                                    return "volume_up";
+                                }
+                            }
+                            return "volume_up";
+                        }
+                        size: Theme.barIconSize(root.barThickness)
+                        color: Theme.surfaceText
+                        anchors.centerIn: parent
+                    }
+
+                    MouseArea {
+                        id: audioWheelArea
+
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        acceptedButtons: Qt.NoButton
+                        onWheel: function(wheelEvent) {
+                            let delta = wheelEvent.angleDelta.y;
+                            let currentVolume = (AudioService.sink && AudioService.sink.audio && AudioService.sink.audio.volume * 100) || 0;
+                            let newVolume;
+                            if (delta > 0) {
+                                newVolume = Math.min(100, currentVolume + 5);
+                            } else {
+                                newVolume = Math.max(0, currentVolume - 5);
+                            }
+                            if (AudioService.sink && AudioService.sink.audio) {
+                                AudioService.sink.audio.muted = false;
+                                AudioService.sink.audio.volume = newVolume / 100;
+                            }
+                            wheelEvent.accepted = true;
+                        }
+                    }
+                }
+
+                DankIcon {
+                    name: "mic"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: Theme.primary
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: false
+                }
+
+                DankIcon {
+                    name: "settings"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: root.isActive ? Theme.primary : Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
                 }
             }
-
         }
-
-        DankIcon {
-            name: "mic"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
-            visible: false // TODO: Add mic detection
-        }
-
-        // Fallback settings icon when all other icons are hidden
-        DankIcon {
-            name: "settings"
-            size: Theme.barIconSize(barThickness)
-            color: controlCenterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon
-        }
-
     }
 
     MouseArea {
-        id: controlCenterArea
-
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
-            root.clicked();
+            root.clicked()
         }
     }
-
-
 }

Modules/DankBar/Widgets/CpuMonitor.qml

@@ -1,37 +1,20 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool showPercentage: true
     property bool showIcon: true
     property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
+    property var popoutTarget: null
     property var widgetData: null
     property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
-    width: isVertical ? widgetThickness : (cpuContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (cpuColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = cpuArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
     Component.onCompleted: {
         DgopService.addRef(["cpu"]);
     }
@@ -39,120 +22,123 @@ Rectangle {
         DgopService.removeRef(["cpu"]);
     }
 
-    MouseArea {
-        id: cpuArea
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : cpuContent.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? cpuColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
+            Column {
+                id: cpuColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: "memory"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (DgopService.cpuUsage > 80) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (DgopService.cpuUsage > 60) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
+                            return "--";
+                        }
+
+                        return DgopService.cpuUsage.toFixed(0);
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: cpuContent
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 3
+
+                DankIcon {
+                    name: "memory"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (DgopService.cpuUsage > 80) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (DgopService.cpuUsage > 60) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
+                            return "--%";
+                        }
+
+                        return DgopService.cpuUsage.toFixed(0) + "%";
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    horizontalAlignment: Text.AlignLeft
+                    elide: Text.ElideNone
+
+                    StyledTextMetrics {
+                        id: cpuBaseline
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        text: "100%"
+                    }
+
+                    width: root.minimumWidth ? Math.max(cpuBaseline.width, paintedWidth) : paintedWidth
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 120
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    MouseArea {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
             DgopService.setSortBy("cpu");
             if (root.toggleProcessList) {
                 root.toggleProcessList();
             }
-
         }
     }
-
-    Column {
-        id: cpuColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "memory"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuUsage > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuUsage > 60) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
-                    return "--";
-                }
-
-                return DgopService.cpuUsage.toFixed(0);
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: cpuContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "memory"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuUsage > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuUsage > 60) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuUsage === undefined || DgopService.cpuUsage === null || DgopService.cpuUsage === 0) {
-                    return "--%";
-                }
-
-                return DgopService.cpuUsage.toFixed(0) + "%";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: cpuBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: root.minimumWidth ? Math.max(cpuBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
 }

Modules/DankBar/Widgets/CpuTemperature.qml

@@ -1,37 +1,20 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool showPercentage: true
     property bool showIcon: true
     property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
+    property var popoutTarget: null
     property var widgetData: null
     property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
-    width: isVertical ? widgetThickness : (cpuTempContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (cpuTempColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = cpuTempArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
     Component.onCompleted: {
         DgopService.addRef(["cpu"]);
     }
@@ -39,121 +22,123 @@ Rectangle {
         DgopService.removeRef(["cpu"]);
     }
 
-    MouseArea {
-        id: cpuTempArea
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : cpuTempContent.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? cpuTempColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
+            Column {
+                id: cpuTempColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: "device_thermostat"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (DgopService.cpuTemperature > 85) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (DgopService.cpuTemperature > 69) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
+                            return "--";
+                        }
+
+                        return Math.round(DgopService.cpuTemperature).toString();
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: cpuTempContent
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 3
+
+                DankIcon {
+                    name: "device_thermostat"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (DgopService.cpuTemperature > 85) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (DgopService.cpuTemperature > 69) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
+                            return "--°";
+                        }
+
+                        return Math.round(DgopService.cpuTemperature) + "°";
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    horizontalAlignment: Text.AlignLeft
+                    elide: Text.ElideNone
+
+                    StyledTextMetrics {
+                        id: tempBaseline
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        text: "100°"
+                    }
+
+                    width: root.minimumWidth ? Math.max(tempBaseline.width, paintedWidth) : paintedWidth
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 120
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    MouseArea {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
             DgopService.setSortBy("cpu");
             if (root.toggleProcessList) {
                 root.toggleProcessList();
             }
-
         }
     }
-
-    Column {
-        id: cpuTempColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "device_thermostat"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuTemperature > 85) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuTemperature > 69) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
-                    return "--";
-                }
-
-                return Math.round(DgopService.cpuTemperature).toString();
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: cpuTempContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "device_thermostat"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.cpuTemperature > 85) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.cpuTemperature > 69) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.cpuTemperature === undefined || DgopService.cpuTemperature === null || DgopService.cpuTemperature < 0) {
-                    return "--°";
-                }
-
-                return Math.round(DgopService.cpuTemperature) + "°";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: tempBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100°"
-            }
-
-            width: root.minimumWidth ? Math.max(tempBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
-
 }

Modules/DankBar/Widgets/DiskUsage.qml

@@ -1,44 +1,35 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property var widgetData: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
     property string mountPath: (widgetData && widgetData.mountPath !== undefined) ? widgetData.mountPath : "/"
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
     property var selectedMount: {
         if (!DgopService.diskMounts || DgopService.diskMounts.length === 0) {
             return null
         }
 
-        // Force re-evaluation when mountPath changes
         const currentMountPath = root.mountPath || "/"
 
-        // First try to find exact match
         for (let i = 0; i < DgopService.diskMounts.length; i++) {
             if (DgopService.diskMounts[i].mount === currentMountPath) {
                 return DgopService.diskMounts[i]
             }
         }
 
-        // Fallback to root
         for (let i = 0; i < DgopService.diskMounts.length; i++) {
             if (DgopService.diskMounts[i].mount === "/") {
                 return DgopService.diskMounts[i]
             }
         }
 
-        // Last resort - first mount
         return DgopService.diskMounts[0] || null
     }
 
@@ -50,17 +41,6 @@ Rectangle {
         return parseFloat(percentStr) || 0
     }
 
-    width: isVertical ? widgetThickness : (diskContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (diskColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent"
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
     Component.onCompleted: {
         DgopService.addRef(["diskmounts"])
     }
@@ -70,7 +50,6 @@ Rectangle {
 
     Connections {
         function onWidgetDataChanged() {
-            // Force property re-evaluation by triggering change detection
             root.mountPath = Qt.binding(() => {
                 return (root.widgetData && root.widgetData.mountPath !== undefined) ? root.widgetData.mountPath : "/"
             })
@@ -82,21 +61,18 @@ Rectangle {
 
                 const currentMountPath = root.mountPath || "/"
 
-                // First try to find exact match
                 for (let i = 0; i < DgopService.diskMounts.length; i++) {
                     if (DgopService.diskMounts[i].mount === currentMountPath) {
                         return DgopService.diskMounts[i]
                     }
                 }
 
-                // Fallback to root
                 for (let i = 0; i < DgopService.diskMounts.length; i++) {
                     if (DgopService.diskMounts[i].mount === "/") {
                         return DgopService.diskMounts[i]
                     }
                 }
 
-                // Last resort - first mount
                 return DgopService.diskMounts[0] || null
             })
         }
@@ -104,6 +80,116 @@ Rectangle {
         target: SettingsData
     }
 
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : diskContent.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? diskColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
+
+            Column {
+                id: diskColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: "storage"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (root.diskUsagePercent > 90) {
+                            return Theme.tempDanger
+                        }
+                        if (root.diskUsagePercent > 75) {
+                            return Theme.tempWarning
+                        }
+                        return Theme.surfaceText
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
+                            return "--"
+                        }
+                        return root.diskUsagePercent.toFixed(0)
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: diskContent
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 3
+
+                DankIcon {
+                    name: "storage"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (root.diskUsagePercent > 90) {
+                            return Theme.tempDanger
+                        }
+                        if (root.diskUsagePercent > 75) {
+                            return Theme.tempWarning
+                        }
+                        return Theme.surfaceText
+                    }
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (!root.selectedMount) {
+                            return "--"
+                        }
+                        return root.selectedMount.mount
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    horizontalAlignment: Text.AlignLeft
+                    elide: Text.ElideNone
+                }
+
+                StyledText {
+                    text: {
+                        if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
+                            return "--%"
+                        }
+                        return root.diskUsagePercent.toFixed(0) + "%"
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    horizontalAlignment: Text.AlignLeft
+                    elide: Text.ElideNone
+
+                    StyledTextMetrics {
+                        id: diskBaseline
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        text: "100%"
+                    }
+
+                    width: Math.max(diskBaseline.width, paintedWidth)
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 120
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     Loader {
         id: tooltipLoader
         active: false
@@ -111,11 +197,11 @@ Rectangle {
     }
 
     MouseArea {
-        id: diskArea
+        z: 1
         anchors.fill: parent
-        hoverEnabled: root.isVertical
+        hoverEnabled: root.isVerticalOrientation
         onEntered: {
-            if (root.isVertical && root.selectedMount) {
+            if (root.isVerticalOrientation && root.selectedMount) {
                 tooltipLoader.active = true
                 if (tooltipLoader.item) {
                     const globalPos = mapToGlobal(width / 2, height / 2)
@@ -136,107 +222,4 @@ Rectangle {
             tooltipLoader.active = false
         }
     }
-
-    Column {
-        id: diskColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "storage"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.diskUsagePercent > 90) {
-                    return Theme.tempDanger
-                }
-                if (root.diskUsagePercent > 75) {
-                    return Theme.tempWarning
-                }
-                return Theme.surfaceText
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
-                    return "--"
-                }
-                return root.diskUsagePercent.toFixed(0)
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: diskContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "storage"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.diskUsagePercent > 90) {
-                    return Theme.tempDanger
-                }
-                if (root.diskUsagePercent > 75) {
-                    return Theme.tempWarning
-                }
-                return Theme.surfaceText
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (!root.selectedMount) {
-                    return "--"
-                }
-                return root.selectedMount.mount
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-        }
-
-        StyledText {
-            text: {
-                if (root.diskUsagePercent === undefined || root.diskUsagePercent === null || root.diskUsagePercent === 0) {
-                    return "--%"
-                }
-                return root.diskUsagePercent.toFixed(0) + "%"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: diskBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: Math.max(diskBaseline.width, paintedWidth)
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-    }
-}
+}

Modules/DankBar/Widgets/FocusedApp.qml

@@ -4,21 +4,15 @@ import Quickshell.Wayland
 import Quickshell.Widgets
 import Quickshell.Hyprland
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property var parentScreen
     property bool compactMode: SettingsData.focusedWindowCompactMode
     property int availableWidth: 400
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property int baseWidth: contentRow.implicitWidth + horizontalPadding * 2
     readonly property int maxNormalWidth: 456
     readonly property int maxCompactWidth: 288
     readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
@@ -74,161 +68,160 @@ Rectangle {
                 return false
             }
 
-            const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-            const activeHyprToplevel = hyprlandToplevels.find(t => t.wayland === activeWindow)
+            try {
+                if (!Hyprland.toplevels) return false
+                const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
+                const activeHyprToplevel = hyprlandToplevels.find(t => t?.wayland === activeWindow)
 
-            if (!activeHyprToplevel || !activeHyprToplevel.workspace) {
+                if (!activeHyprToplevel || !activeHyprToplevel.workspace) {
+                    return false
+                }
+
+                return activeHyprToplevel.workspace.id === Hyprland.focusedWorkspace.id
+            } catch (e) {
+                console.error("FocusedApp: hasWindowsOnCurrentWorkspace error:", e)
                 return false
             }
-
-            return activeHyprToplevel.workspace.id === Hyprland.focusedWorkspace.id
         }
 
         return activeWindow && activeWindow.title
     }
 
-    width: !hasWindowsOnCurrentWorkspace ? 0 : (isVertical ? widgetThickness : (compactMode ? Math.min(baseWidth, maxCompactWidth) : Math.min(baseWidth, maxNormalWidth)))
-    height: !hasWindowsOnCurrentWorkspace ? 0 : (isVertical ? widgetThickness : widgetThickness)
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (!activeWindow || !activeWindow.title) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    clip: true
     visible: hasWindowsOnCurrentWorkspace
 
-    IconImage {
-        id: appIcon
-        anchors.centerIn: parent
-        width: 18
-        height: 18
-        visible: root.isVertical && activeWindow && status === Image.Ready
-        source: {
-            if (!activeWindow || !activeWindow.appId) return ""
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            if (moddedId.toLowerCase().includes("steam_app")) return ""
-            return Quickshell.iconPath(activeDesktopEntry?.icon, true)
-        }
-        smooth: true
-        mipmap: true
-        asynchronous: true
-    }
-
-    DankIcon {
-        anchors.centerIn: parent
-        size: 18
-        name: "sports_esports"
-        color: Theme.surfaceText
-        visible: {
-            if (!root.isVertical || !activeWindow || !activeWindow.appId) return false
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            return moddedId.toLowerCase().includes("steam_app")
-        }
-    }
-
-    Text {
-        anchors.centerIn: parent
-        visible: {
-            if (!root.isVertical || !activeWindow || !activeWindow.appId) return false
-            if (appIcon.status === Image.Ready) return false
-            const moddedId = Paths.moddedAppId(activeWindow.appId)
-            return !moddedId.toLowerCase().includes("steam_app")
-        }
-        text: {
-            if (!activeWindow || !activeWindow.appId) return "?"
-            if (activeDesktopEntry && activeDesktopEntry.name) {
-                return activeDesktopEntry.name.charAt(0).toUpperCase()
+    content: Component {
+        Item {
+            implicitWidth: {
+                if (!root.hasWindowsOnCurrentWorkspace) return 0
+                if (root.isVerticalOrientation) return root.widgetThickness - root.horizontalPadding * 2
+                const baseWidth = contentRow.implicitWidth
+                return compactMode ? Math.min(baseWidth, maxCompactWidth - root.horizontalPadding * 2) : Math.min(baseWidth, maxNormalWidth - root.horizontalPadding * 2)
             }
-            return activeWindow.appId.charAt(0).toUpperCase()
-        }
-        font.pixelSize: 10
-        color: Theme.surfaceText
-        font.weight: Font.Medium
-    }
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
+            clip: true
 
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        StyledText {
-            id: appText
-
-            text: {
-                if (!activeWindow || !activeWindow.appId) {
-                    return "";
+            IconImage {
+                id: appIcon
+                anchors.centerIn: parent
+                width: 18
+                height: 18
+                visible: root.isVerticalOrientation && activeWindow && status === Image.Ready
+                source: {
+                    if (!activeWindow || !activeWindow.appId) return ""
+                    const moddedId = Paths.moddedAppId(activeWindow.appId)
+                    if (moddedId.toLowerCase().includes("steam_app")) return ""
+                    return Quickshell.iconPath(activeDesktopEntry?.icon, true)
                 }
-
-                const desktopEntry = DesktopEntries.heuristicLookup(activeWindow.appId);
-                return desktopEntry && desktopEntry.name ? desktopEntry.name : activeWindow.appId;
+                smooth: true
+                mipmap: true
+                asynchronous: true
             }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            elide: Text.ElideRight
-            maximumLineCount: 1
-            width: Math.min(implicitWidth, compactMode ? 80 : 180)
-            visible: !compactMode && text.length > 0
-        }
 
-        StyledText {
-            text: "•"
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.outlineButton
-            anchors.verticalCenter: parent.verticalCenter
-            visible: !compactMode && appText.text && titleText.text
-        }
-
-        StyledText {
-            id: titleText
-
-            text: {
-                const title = activeWindow && activeWindow.title ? activeWindow.title : "";
-                const appName = appText.text;
-                if (!title || !appName) {
-                    return title;
+            DankIcon {
+                anchors.centerIn: parent
+                size: 18
+                name: "sports_esports"
+                color: Theme.surfaceText
+                visible: {
+                    if (!root.isVerticalOrientation || !activeWindow || !activeWindow.appId) return false
+                    const moddedId = Paths.moddedAppId(activeWindow.appId)
+                    return moddedId.toLowerCase().includes("steam_app")
                 }
-
-                if (title.endsWith(" - " + appName)) {
-                    return title.substring(0, title.length - (" - " + appName).length);
-                }
-
-                if (title.endsWith(appName)) {
-                    return title.substring(0, title.length - appName.length).replace(/ - $/, "");
-                }
-
-                return title;
             }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            elide: Text.ElideRight
-            maximumLineCount: 1
-            width: Math.min(implicitWidth, compactMode ? 280 : 250)
-            visible: text.length > 0
-        }
 
+            Text {
+                anchors.centerIn: parent
+                visible: {
+                    if (!root.isVerticalOrientation || !activeWindow || !activeWindow.appId) return false
+                    if (appIcon.status === Image.Ready) return false
+                    const moddedId = Paths.moddedAppId(activeWindow.appId)
+                    return !moddedId.toLowerCase().includes("steam_app")
+                }
+                text: {
+                    if (!activeWindow || !activeWindow.appId) return "?"
+                    if (activeDesktopEntry && activeDesktopEntry.name) {
+                        return activeDesktopEntry.name.charAt(0).toUpperCase()
+                    }
+                    return activeWindow.appId.charAt(0).toUpperCase()
+                }
+                font.pixelSize: 10
+                color: Theme.surfaceText
+                font.weight: Font.Medium
+            }
+
+            Row {
+                id: contentRow
+                anchors.centerIn: parent
+                spacing: Theme.spacingS
+                visible: !root.isVerticalOrientation
+
+                StyledText {
+                    id: appText
+                    text: {
+                        if (!activeWindow || !activeWindow.appId) {
+                            return "";
+                        }
+
+                        const desktopEntry = DesktopEntries.heuristicLookup(activeWindow.appId);
+                        return desktopEntry && desktopEntry.name ? desktopEntry.name : activeWindow.appId;
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    width: Math.min(implicitWidth, compactMode ? 80 : 180)
+                    visible: !compactMode && text.length > 0
+                }
+
+                StyledText {
+                    text: "•"
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    color: Theme.outlineButton
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: !compactMode && appText.text && titleText.text
+                }
+
+                StyledText {
+                    id: titleText
+                    text: {
+                        const title = activeWindow && activeWindow.title ? activeWindow.title : "";
+                        const appName = appText.text;
+                        if (!title || !appName) {
+                            return title;
+                        }
+
+                        if (title.endsWith(" - " + appName)) {
+                            return title.substring(0, title.length - (" - " + appName).length);
+                        }
+
+                        if (title.endsWith(appName)) {
+                            return title.substring(0, title.length - appName.length).replace(/ - $/, "");
+                        }
+
+                        return title;
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    width: Math.min(implicitWidth, compactMode ? 280 : 250)
+                    visible: text.length > 0
+                }
+            }
+        }
     }
 
     MouseArea {
         id: mouseArea
-
         anchors.fill: parent
-        hoverEnabled: root.isVertical
+        hoverEnabled: root.isVerticalOrientation
+        acceptedButtons: Qt.NoButton
         onEntered: {
-            if (root.isVertical && activeWindow && activeWindow.appId && root.parentScreen) {
+            if (root.isVerticalOrientation && activeWindow && activeWindow.appId && root.parentScreen) {
                 tooltipLoader.active = true
                 if (tooltipLoader.item) {
                     const globalPos = mapToGlobal(width / 2, height / 2)
@@ -260,14 +253,4 @@ Rectangle {
         active: false
         sourceComponent: DankTooltip {}
     }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-
-    }
-
 }

Modules/DankBar/Widgets/GpuTemperature.qml

@@ -1,26 +1,20 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool showPercentage: true
     property bool showIcon: true
     property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
+    property var popoutTarget: null
     property var widgetData: null
-    property real barThickness: 48
-    property real widgetThickness: 30
     property int selectedGpuIndex: (widgetData && widgetData.selectedGpuIndex !== undefined) ? widgetData.selectedGpuIndex : 0
     property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
     property real displayTemp: {
         if (!DgopService.availableGpus || DgopService.availableGpus.length === 0) {
             return 0;
@@ -34,7 +28,6 @@ Rectangle {
     }
 
     function updateWidgetPciId(pciId) {
-        // Find and update this widget's pciId in the settings
         const sections = ["left", "center", "right"];
         for (let s = 0; s < sections.length; s++) {
             const sectionId = sections[s];
@@ -68,17 +61,6 @@ Rectangle {
         }
     }
 
-    width: isVertical ? widgetThickness : (gpuTempContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (gpuTempColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = gpuArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
     Component.onCompleted: {
         DgopService.addRef(["gpu"]);
         if (widgetData && widgetData.pciId) {
@@ -92,12 +74,10 @@ Rectangle {
         if (widgetData && widgetData.pciId) {
             DgopService.removeGpuPciId(widgetData.pciId);
         }
-
     }
 
     Connections {
         function onWidgetDataChanged() {
-            // Force property re-evaluation by triggering change detection
             root.selectedGpuIndex = Qt.binding(() => {
                 return (root.widgetData && root.widgetData.selectedGpuIndex !== undefined) ? root.widgetData.selectedGpuIndex : 0;
             });
@@ -106,122 +86,126 @@ Rectangle {
         target: SettingsData
     }
 
-    MouseArea {
-        id: gpuArea
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : gpuTempContent.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? gpuTempColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
+            Column {
+                id: gpuTempColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: "auto_awesome_mosaic"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (root.displayTemp > 80) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (root.displayTemp > 65) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
+                            return "--";
+                        }
+
+                        return Math.round(root.displayTemp).toString();
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: gpuTempContent
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 3
+
+                DankIcon {
+                    name: "auto_awesome_mosaic"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (root.displayTemp > 80) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (root.displayTemp > 65) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
+                            return "--°";
+                        }
+
+                        return Math.round(root.displayTemp) + "°";
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    horizontalAlignment: Text.AlignLeft
+                    elide: Text.ElideNone
+
+                    StyledTextMetrics {
+                        id: gpuTempBaseline
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        text: "100°"
+                    }
+
+                    width: root.minimumWidth ? Math.max(gpuTempBaseline.width, paintedWidth) : paintedWidth
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 120
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    MouseArea {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
             DgopService.setSortBy("cpu");
             if (root.toggleProcessList) {
                 root.toggleProcessList();
             }
-
         }
     }
 
-    Column {
-        id: gpuTempColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "auto_awesome_mosaic"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.displayTemp > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (root.displayTemp > 65) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
-                    return "--";
-                }
-
-                return Math.round(root.displayTemp).toString();
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: gpuTempContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "auto_awesome_mosaic"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (root.displayTemp > 80) {
-                    return Theme.tempDanger;
-                }
-
-                if (root.displayTemp > 65) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (root.displayTemp === undefined || root.displayTemp === null || root.displayTemp === 0) {
-                    return "--°";
-                }
-
-                return Math.round(root.displayTemp) + "°";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: gpuTempBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100°"
-            }
-
-            width: root.minimumWidth ? Math.max(gpuTempBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
     Timer {
         id: autoSaveTimer
 
@@ -231,13 +215,10 @@ Rectangle {
             if (DgopService.availableGpus && DgopService.availableGpus.length > 0) {
                 const firstGpu = DgopService.availableGpus[0];
                 if (firstGpu && firstGpu.pciId) {
-                    // Save the first GPU's PCI ID to this widget's settings
                     updateWidgetPciId(firstGpu.pciId);
                     DgopService.addGpuPciId(firstGpu.pciId);
                 }
             }
         }
     }
-
-
 }

Modules/DankBar/Widgets/IdleInhibitor.qml

@@ -2,51 +2,34 @@ import QtQuick
 import QtQuick.Controls
 import Quickshell
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
 
-    width: isVertical ? widgetThickness : (idleIcon.width + horizontalPadding * 2)
-    height: isVertical ? (idleIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
+            DankIcon {
+                anchors.centerIn: parent
+                name: SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle"
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: Theme.surfaceText
+            }
         }
-
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: idleIcon
-
-        anchors.centerIn: parent
-        name: SessionService.idleInhibited ? "motion_sensor_active" : "motion_sensor_idle"
-        size: Theme.barIconSize(barThickness, -4)
-        color: Theme.surfaceText
     }
 
     MouseArea {
-        id: mouseArea
-
+        z: 1
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         onClicked: {
-            SessionService.toggleIdleInhibit();
+            SessionService.toggleIdleInhibit()
         }
     }
-
-
 }

Modules/DankBar/Widgets/KeyboardLayoutName.qml

@@ -3,36 +3,69 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Io
 import qs.Common
+import qs.Modules.Plugins
 import qs.Modules.ProcessList
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
     property string currentLayout: ""
     property string hyprlandKeyboard: ""
 
-    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : contentRow.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? contentColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
+            Column {
+                id: contentColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: "keyboard"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (!root.currentLayout) return ""
+                        const parts = root.currentLayout.split(" ")
+                        if (parts.length > 0) {
+                            return parts[0].substring(0, 2).toUpperCase()
+                        }
+                        return root.currentLayout.substring(0, 2).toUpperCase()
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: contentRow
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: Theme.spacingS
+
+                StyledText {
+                    text: root.currentLayout
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+        }
     }
 
     MouseArea {
-        id: mouseArea
-
+        z: 1
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
@@ -51,53 +84,6 @@ Rectangle {
         }
     }
 
-    Column {
-        id: contentColumn
-
-        anchors.centerIn: parent
-        spacing: 1
-        visible: root.isVertical
-
-        DankIcon {
-            name: "keyboard"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (!currentLayout) return ""
-                const parts = currentLayout.split(" ")
-                if (parts.length > 0) {
-                    return parts[0].substring(0, 2).toUpperCase()
-                }
-                return currentLayout.substring(0, 2).toUpperCase()
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        StyledText {
-            text: currentLayout
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-    }
-
-
     Timer {
         id: updateTimer
         interval: 1000

Modules/DankBar/Widgets/LauncherButton.qml

@@ -3,124 +3,95 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Widgets
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Item {
+BasePill {
     id: root
 
     property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "left"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
+    property var hyprlandOverviewLoader: null
 
-    signal clicked()
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
 
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: launcherArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onPressed: function (mouse){
-            if (mouse.button === Qt.RightButton) {
-                if (CompositorService.isNiri) {
-                    NiriService.toggleOverview()
-                }
-                return
+            DankIcon {
+                visible: SettingsData.launcherLogoMode === "apps"
+                anchors.centerIn: parent
+                name: "apps"
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: Theme.surfaceText
             }
-            
-            root.clicked();
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0);
-                const currentScreen = parentScreen || Screen;
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width);
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen);
+
+            SystemLogo {
+                visible: SettingsData.launcherLogoMode === "os"
+                anchors.centerIn: parent
+                width: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                height: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                colorOverride: Theme.effectiveLogoColor
+                brightnessOverride: SettingsData.launcherLogoBrightness
+                contrastOverride: SettingsData.launcherLogoContrast
+            }
+
+            IconImage {
+                visible: SettingsData.launcherLogoMode === "compositor"
+                anchors.centerIn: parent
+                width: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                height: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                smooth: true
+                asynchronous: true
+                source: {
+                    if (CompositorService.isNiri) {
+                        return "file://" + Theme.shellDir + "/assets/niri.svg"
+                    } else if (CompositorService.isHyprland) {
+                        return "file://" + Theme.shellDir + "/assets/hyprland.svg"
+                    }
+                    return ""
+                }
+                layer.enabled: Theme.effectiveLogoColor !== ""
+                layer.effect: MultiEffect {
+                    saturation: 0
+                    colorization: 1
+                    colorizationColor: Theme.effectiveLogoColor
+                    brightness: SettingsData.launcherLogoBrightness
+                    contrast: SettingsData.launcherLogoContrast
+                }
+            }
+
+            IconImage {
+                visible: SettingsData.launcherLogoMode === "custom" && SettingsData.launcherLogoCustomPath !== ""
+                anchors.centerIn: parent
+                width: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                height: Theme.barIconSize(root.barThickness, SettingsData.launcherLogoSizeOffset)
+                smooth: true
+                asynchronous: true
+                source: SettingsData.launcherLogoCustomPath ? "file://" + SettingsData.launcherLogoCustomPath.replace("file://", "") : ""
+                layer.enabled: Theme.effectiveLogoColor !== ""
+                layer.effect: MultiEffect {
+                    saturation: 0
+                    colorization: 1
+                    colorizationColor: Theme.effectiveLogoColor
+                    brightness: SettingsData.launcherLogoBrightness
+                    contrast: SettingsData.launcherLogoContrast
+                }
             }
         }
     }
 
-    Rectangle {
-        id: launcherContent
-
+    MouseArea {
+        id: customMouseArea
         anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent";
-            }
-
-            const baseColor = launcherArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-        }
-
-        DankIcon {
-            visible: SettingsData.launcherLogoMode === "apps"
-            anchors.centerIn: parent
-            name: "apps"
-            size: Theme.barIconSize(barThickness, -4)
-            color: Theme.surfaceText
-        }
-
-        SystemLogo {
-            visible: SettingsData.launcherLogoMode === "os"
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            colorOverride: Theme.effectiveLogoColor
-            brightnessOverride: SettingsData.launcherLogoBrightness
-            contrastOverride: SettingsData.launcherLogoContrast
-        }
-
-        IconImage {
-            visible: SettingsData.launcherLogoMode === "compositor"
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            smooth: true
-            asynchronous: true
-            source: {
-                if (CompositorService.isNiri) {
-                    return "file://" + Theme.shellDir + "/assets/niri.svg"
-                } else if (CompositorService.isHyprland) {
-                    return "file://" + Theme.shellDir + "/assets/hyprland.svg"
-                }
-                return ""
-            }
-            layer.enabled: Theme.effectiveLogoColor !== ""
-            layer.effect: MultiEffect {
-                saturation: 0
-                colorization: 1
-                colorizationColor: Theme.effectiveLogoColor
-                brightness: SettingsData.launcherLogoBrightness
-                contrast: SettingsData.launcherLogoContrast
-            }
-        }
-
-        IconImage {
-            visible: SettingsData.launcherLogoMode === "custom" && SettingsData.launcherLogoCustomPath !== ""
-            anchors.centerIn: parent
-            width: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            height: Theme.barIconSize(barThickness, SettingsData.launcherLogoSizeOffset)
-            smooth: true
-            asynchronous: true
-            source: SettingsData.launcherLogoCustomPath ? "file://" + SettingsData.launcherLogoCustomPath.replace("file://", "") : ""
-            layer.enabled: Theme.effectiveLogoColor !== ""
-            layer.effect: MultiEffect {
-                saturation: 0
-                colorization: 1
-                colorizationColor: Theme.effectiveLogoColor
-                brightness: SettingsData.launcherLogoBrightness
-                contrast: SettingsData.launcherLogoContrast
+        hoverEnabled: true
+        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
             }
         }
     }

Modules/DankBar/Widgets/Media.qml

@@ -1,412 +1,358 @@
 import QtQuick
 import Quickshell.Services.Mpris
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     readonly property MprisPlayer activePlayer: MprisController.activePlayer
     readonly property bool playerAvailable: activePlayer !== null
     property bool compactMode: false
     readonly property int textWidth: {
         switch (SettingsData.mediaSize) {
         case 0:
-            return 0; // No text in small mode
+            return 0;
         case 2:
-            return 180; // Large text area
+            return 180;
         default:
-            return 120; // Medium text area
+            return 120;
         }
     }
     readonly property int currentContentWidth: {
-        if (isVertical) {
-            return widgetThickness;
+        if (isVerticalOrientation) {
+            return widgetThickness - horizontalPadding * 2;
         }
         const controlsWidth = 20 + Theme.spacingXS + 24 + Theme.spacingXS + 20;
         const audioVizWidth = 20;
         const contentWidth = audioVizWidth + Theme.spacingXS + controlsWidth;
-        return contentWidth + (textWidth > 0 ? textWidth + Theme.spacingXS : 0) + horizontalPadding * 2;
+        return contentWidth + (textWidth > 0 ? textWidth + Theme.spacingXS : 0);
     }
     readonly property int currentContentHeight: {
-        if (!isVertical) {
-            return widgetThickness;
+        if (!isVerticalOrientation) {
+            return widgetThickness - horizontalPadding * 2;
         }
         const audioVizHeight = 20;
         const playButtonHeight = 24;
-        return audioVizHeight + Theme.spacingXS + playButtonHeight + horizontalPadding * 2;
-    }
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
-    width: currentContentWidth
-    height: currentContentHeight
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-    states: [
-        State {
-            name: "shown"
-            when: playerAvailable
-
-            PropertyChanges {
-                target: root
-                opacity: 1
-                width: currentContentWidth
-                height: currentContentHeight
-            }
-
-        },
-        State {
-            name: "hidden"
-            when: !playerAvailable
-
-            PropertyChanges {
-                target: root
-                opacity: 0
-                width: isVertical ? widgetThickness : 0
-                height: isVertical ? 0 : widgetThickness
-            }
-
-        }
-    ]
-    transitions: [
-        Transition {
-            from: "shown"
-            to: "hidden"
-
-            SequentialAnimation {
-                PauseAnimation {
-                    duration: 500
-                }
-
-                NumberAnimation {
-                    properties: isVertical ? "opacity,height" : "opacity,width"
-                    duration: Theme.shortDuration
-                    easing.type: Theme.standardEasing
-                }
-
-            }
-
-        },
-        Transition {
-            from: "hidden"
-            to: "shown"
-
-            NumberAnimation {
-                properties: isVertical ? "opacity,height" : "opacity,width"
-                duration: Theme.shortDuration
-                easing.type: Theme.standardEasing
-            }
-
-        }
-    ]
-
-    Column {
-        id: verticalLayout
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        AudioVisualization {
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    if (root.popupTarget && root.popupTarget.setTriggerPosition) {
-                        const globalPos = parent.mapToGlobal(0, 0)
-                        const currentScreen = root.parentScreen || Screen
-                        const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, parent.width)
-                        root.popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
-                    }
-                    root.clicked()
-                }
-            }
-        }
-
-        Rectangle {
-            width: 24
-            height: 24
-            radius: 12
-            anchors.horizontalCenter: parent.horizontalCenter
-            color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
-            visible: root.playerAvailable
-            opacity: activePlayer ? 1 : 0.3
-
-            DankIcon {
-                anchors.centerIn: parent
-                name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
-                size: 14
-                color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                enabled: root.playerAvailable
-                cursorShape: Qt.PointingHandCursor
-                acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
-                onClicked: (mouse) => {
-                    if (!activePlayer) return
-                    if (mouse.button === Qt.LeftButton) {
-                        activePlayer.togglePlaying()
-                    } else if (mouse.button === Qt.MiddleButton) {
-                        activePlayer.previous()
-                    } else if (mouse.button === Qt.RightButton) {
-                        activePlayer.next()
-                    }
-                }
-            }
-        }
+        return audioVizHeight + Theme.spacingXS + playButtonHeight;
     }
 
-    Row {
-        id: mediaRow
+    content: Component {
+        Item {
+            implicitWidth: root.playerAvailable ? root.currentContentWidth : 0
+            implicitHeight: root.playerAvailable ? root.currentContentHeight : 0
+            opacity: root.playerAvailable ? 1 : 0
 
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        Row {
-            id: mediaInfo
-
-            spacing: Theme.spacingXS
-
-            AudioVisualization {
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            Rectangle {
-                id: textContainer
-
-                property string displayText: {
-                    if (!activePlayer || !activePlayer.trackTitle) {
-                        return "";
+            states: [
+                State {
+                    name: "shown"
+                    when: root.playerAvailable
+                    PropertyChanges {
+                        target: parent
+                        opacity: 1
+                        implicitWidth: root.currentContentWidth
+                        implicitHeight: root.currentContentHeight
                     }
-
-                    let identity = activePlayer.identity || "";
-                    let isWebMedia = identity.toLowerCase().includes("firefox") || identity.toLowerCase().includes("chrome") || identity.toLowerCase().includes("chromium") || identity.toLowerCase().includes("edge") || identity.toLowerCase().includes("safari");
-                    let title = "";
-                    let subtitle = "";
-                    if (isWebMedia && activePlayer.trackTitle) {
-                        title = activePlayer.trackTitle;
-                        subtitle = activePlayer.trackArtist || identity;
-                    } else {
-                        title = activePlayer.trackTitle || "Unknown Track";
-                        subtitle = activePlayer.trackArtist || "";
+                },
+                State {
+                    name: "hidden"
+                    when: !root.playerAvailable
+                    PropertyChanges {
+                        target: parent
+                        opacity: 0
+                        implicitWidth: 0
+                        implicitHeight: 0
                     }
-                    return subtitle.length > 0 ? title + " • " + subtitle : title;
                 }
-
-                anchors.verticalCenter: parent.verticalCenter
-                width: textWidth
-                height: 20
-                visible: SettingsData.mediaSize > 0
-                clip: true
-                color: "transparent"
-
-                StyledText {
-                    id: mediaText
-
-                    property bool needsScrolling: implicitWidth > textContainer.width
-                    property real scrollOffset: 0
-
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: textContainer.displayText
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    color: Theme.surfaceText
-                    font.weight: Font.Medium
-                    wrapMode: Text.NoWrap
-                    x: needsScrolling ? -scrollOffset : 0
-                    onTextChanged: {
-                        scrollOffset = 0;
-                        scrollAnimation.restart();
-                    }
-
+            ]
+            transitions: [
+                Transition {
+                    from: "shown"
+                    to: "hidden"
                     SequentialAnimation {
-                        id: scrollAnimation
-
-                        running: mediaText.needsScrolling && textContainer.visible
-                        loops: Animation.Infinite
-
                         PauseAnimation {
-                            duration: 2000
+                            duration: 500
                         }
-
                         NumberAnimation {
-                            target: mediaText
-                            property: "scrollOffset"
-                            from: 0
-                            to: mediaText.implicitWidth - textContainer.width + 5
-                            duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                            easing.type: Easing.Linear
+                            properties: "opacity,implicitWidth,implicitHeight"
+                            duration: Theme.shortDuration
+                            easing.type: Theme.standardEasing
                         }
-
-                        PauseAnimation {
-                            duration: 2000
-                        }
-
-                        NumberAnimation {
-                            target: mediaText
-                            property: "scrollOffset"
-                            to: 0
-                            duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
-                            easing.type: Easing.Linear
-                        }
-
                     }
-
+                },
+                Transition {
+                    from: "hidden"
+                    to: "shown"
+                    NumberAnimation {
+                        properties: "opacity,implicitWidth,implicitHeight"
+                        duration: Theme.shortDuration
+                        easing.type: Theme.standardEasing
+                    }
                 }
+            ]
 
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    cursorShape: Qt.PointingHandCursor
-                    onPressed: {
-                        if (root.popupTarget && root.popupTarget.setTriggerPosition) {
-                            const globalPos = mapToGlobal(0, 0)
-                            const currentScreen = root.parentScreen || Screen
-                            const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.width)
-                            root.popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
+            Column {
+                id: verticalLayout
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: Theme.spacingXS
+
+                AudioVisualization {
+                    anchors.horizontalCenter: parent.horizontalCenter
+
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            if (root.popoutTarget && root.popoutTarget.setTriggerPosition) {
+                                const globalPos = parent.mapToGlobal(0, 0)
+                                const currentScreen = root.parentScreen || Screen
+                                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, parent.width)
+                                root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
+                            }
+                            root.clicked()
                         }
-                        root.clicked()
                     }
                 }
 
+                Rectangle {
+                    width: 24
+                    height: 24
+                    radius: 12
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
+                    visible: root.playerAvailable
+                    opacity: activePlayer ? 1 : 0.3
+
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
+                        size: 14
+                        color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        enabled: root.playerAvailable
+                        cursorShape: Qt.PointingHandCursor
+                        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+                        onClicked: (mouse) => {
+                            if (!activePlayer) return
+                            if (mouse.button === Qt.LeftButton) {
+                                activePlayer.togglePlaying()
+                            } else if (mouse.button === Qt.MiddleButton) {
+                                activePlayer.previous()
+                            } else if (mouse.button === Qt.RightButton) {
+                                activePlayer.next()
+                            }
+                        }
+                    }
+                }
             }
 
-        }
+            Row {
+                id: mediaRow
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: Theme.spacingXS
 
-        Row {
-            spacing: Theme.spacingXS
-            anchors.verticalCenter: parent.verticalCenter
+                Row {
+                    id: mediaInfo
+                    spacing: Theme.spacingXS
 
-            Rectangle {
-                width: 20
-                height: 20
-                radius: 10
-                anchors.verticalCenter: parent.verticalCenter
-                color: prevArea.containsMouse ? Theme.primaryHover : "transparent"
-                visible: root.playerAvailable
-                opacity: (activePlayer && activePlayer.canGoPrevious) ? 1 : 0.3
+                    AudioVisualization {
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
 
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "skip_previous"
-                    size: 12
-                    color: Theme.surfaceText
-                }
+                    Rectangle {
+                        id: textContainer
+                        property string displayText: {
+                            if (!activePlayer || !activePlayer.trackTitle) {
+                                return "";
+                            }
 
-                MouseArea {
-                    id: prevArea
+                            let identity = activePlayer.identity || "";
+                            let isWebMedia = identity.toLowerCase().includes("firefox") || identity.toLowerCase().includes("chrome") || identity.toLowerCase().includes("chromium") || identity.toLowerCase().includes("edge") || identity.toLowerCase().includes("safari");
+                            let title = "";
+                            let subtitle = "";
+                            if (isWebMedia && activePlayer.trackTitle) {
+                                title = activePlayer.trackTitle;
+                                subtitle = activePlayer.trackArtist || identity;
+                            } else {
+                                title = activePlayer.trackTitle || "Unknown Track";
+                                subtitle = activePlayer.trackArtist || "";
+                            }
+                            return subtitle.length > 0 ? title + " • " + subtitle : title;
+                        }
 
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.previous();
+                        anchors.verticalCenter: parent.verticalCenter
+                        width: textWidth
+                        height: 20
+                        visible: SettingsData.mediaSize > 0
+                        clip: true
+                        color: "transparent"
+
+                        StyledText {
+                            id: mediaText
+                            property bool needsScrolling: implicitWidth > textContainer.width
+                            property real scrollOffset: 0
+
+                            anchors.verticalCenter: parent.verticalCenter
+                            text: textContainer.displayText
+                            font.pixelSize: Theme.barTextSize(root.barThickness)
+                            color: Theme.surfaceText
+                            font.weight: Font.Medium
+                            wrapMode: Text.NoWrap
+                            x: needsScrolling ? -scrollOffset : 0
+                            onTextChanged: {
+                                scrollOffset = 0;
+                                scrollAnimation.restart();
+                            }
+
+                            SequentialAnimation {
+                                id: scrollAnimation
+                                running: mediaText.needsScrolling && textContainer.visible
+                                loops: Animation.Infinite
+
+                                PauseAnimation {
+                                    duration: 2000
+                                }
+
+                                NumberAnimation {
+                                    target: mediaText
+                                    property: "scrollOffset"
+                                    from: 0
+                                    to: mediaText.implicitWidth - textContainer.width + 5
+                                    duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
+                                    easing.type: Easing.Linear
+                                }
+
+                                PauseAnimation {
+                                    duration: 2000
+                                }
+
+                                NumberAnimation {
+                                    target: mediaText
+                                    property: "scrollOffset"
+                                    to: 0
+                                    duration: Math.max(1000, (mediaText.implicitWidth - textContainer.width + 5) * 60)
+                                    easing.type: Easing.Linear
+                                }
+                            }
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            enabled: root.playerAvailable
+                            cursorShape: Qt.PointingHandCursor
+                            onPressed: {
+                                if (root.popoutTarget && root.popoutTarget.setTriggerPosition) {
+                                    const globalPos = mapToGlobal(0, 0)
+                                    const currentScreen = root.parentScreen || Screen
+                                    const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, root.barThickness, root.width)
+                                    root.popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, root.section, currentScreen)
+                                }
+                                root.clicked()
+                            }
                         }
                     }
                 }
 
-            }
+                Row {
+                    spacing: Theme.spacingXS
+                    anchors.verticalCenter: parent.verticalCenter
 
-            Rectangle {
-                width: 24
-                height: 24
-                radius: 12
-                anchors.verticalCenter: parent.verticalCenter
-                color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
-                visible: root.playerAvailable
-                opacity: activePlayer ? 1 : 0.3
+                    Rectangle {
+                        width: 20
+                        height: 20
+                        radius: 10
+                        anchors.verticalCenter: parent.verticalCenter
+                        color: prevArea.containsMouse ? Theme.primaryHover : "transparent"
+                        visible: root.playerAvailable
+                        opacity: (activePlayer && activePlayer.canGoPrevious) ? 1 : 0.3
 
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
-                    size: 14
-                    color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
-                }
+                        DankIcon {
+                            anchors.centerIn: parent
+                            name: "skip_previous"
+                            size: 12
+                            color: Theme.surfaceText
+                        }
 
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.togglePlaying();
+                        MouseArea {
+                            id: prevArea
+                            anchors.fill: parent
+                            enabled: root.playerAvailable
+                            hoverEnabled: true
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                if (activePlayer) {
+                                    activePlayer.previous();
+                                }
+                            }
+                        }
+                    }
+
+                    Rectangle {
+                        width: 24
+                        height: 24
+                        radius: 12
+                        anchors.verticalCenter: parent.verticalCenter
+                        color: activePlayer && activePlayer.playbackState === 1 ? Theme.primary : Theme.primaryHover
+                        visible: root.playerAvailable
+                        opacity: activePlayer ? 1 : 0.3
+
+                        DankIcon {
+                            anchors.centerIn: parent
+                            name: activePlayer && activePlayer.playbackState === 1 ? "pause" : "play_arrow"
+                            size: 14
+                            color: activePlayer && activePlayer.playbackState === 1 ? Theme.background : Theme.primary
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            enabled: root.playerAvailable
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                if (activePlayer) {
+                                    activePlayer.togglePlaying();
+                                }
+                            }
+                        }
+                    }
+
+                    Rectangle {
+                        width: 20
+                        height: 20
+                        radius: 10
+                        anchors.verticalCenter: parent.verticalCenter
+                        color: nextArea.containsMouse ? Theme.primaryHover : "transparent"
+                        visible: playerAvailable
+                        opacity: (activePlayer && activePlayer.canGoNext) ? 1 : 0.3
+
+                        DankIcon {
+                            anchors.centerIn: parent
+                            name: "skip_next"
+                            size: 12
+                            color: Theme.surfaceText
+                        }
+
+                        MouseArea {
+                            id: nextArea
+                            anchors.fill: parent
+                            enabled: root.playerAvailable
+                            hoverEnabled: true
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                if (activePlayer) {
+                                    activePlayer.next();
+                                }
+                            }
                         }
                     }
                 }
-
             }
-
-            Rectangle {
-                width: 20
-                height: 20
-                radius: 10
-                anchors.verticalCenter: parent.verticalCenter
-                color: nextArea.containsMouse ? Theme.primaryHover : "transparent"
-                visible: playerAvailable
-                opacity: (activePlayer && activePlayer.canGoNext) ? 1 : 0.3
-
-                DankIcon {
-                    anchors.centerIn: parent
-                    name: "skip_next"
-                    size: 12
-                    color: Theme.surfaceText
-                }
-
-                MouseArea {
-                    id: nextArea
-
-                    anchors.fill: parent
-                    enabled: root.playerAvailable
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        if (activePlayer) {
-                            activePlayer.next();
-                        }
-                    }
-                }
-
-            }
-
-        }
-
-    }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
         }
     }
-
-    Behavior on height {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-    }
-
 }

Modules/DankBar/Widgets/NetworkMonitor.qml

@@ -1,194 +1,167 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
+import qs.Modules.Plugins
 import qs.Modules.ProcessList
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property int availableWidth: 400
-    readonly property int baseWidth: contentRow.implicitWidth + Theme.spacingS * 2
-    readonly property int maxNormalWidth: 456
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
     function formatNetworkSpeed(bytesPerSec) {
         if (bytesPerSec < 1024) {
-            return bytesPerSec.toFixed(0) + " B/s";
+            return bytesPerSec.toFixed(0) + " B/s"
         } else if (bytesPerSec < 1024 * 1024) {
-            return (bytesPerSec / 1024).toFixed(1) + " KB/s";
+            return (bytesPerSec / 1024).toFixed(1) + " KB/s"
         } else if (bytesPerSec < 1024 * 1024 * 1024) {
-            return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s";
+            return (bytesPerSec / (1024 * 1024)).toFixed(1) + " MB/s"
         } else {
-            return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s";
+            return (bytesPerSec / (1024 * 1024 * 1024)).toFixed(1) + " GB/s"
         }
     }
 
-    width: isVertical ? widgetThickness : (contentRow.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (contentColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = networkArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
     Component.onCompleted: {
-        DgopService.addRef(["network"]);
+        DgopService.addRef(["network"])
     }
     Component.onDestruction: {
-        DgopService.removeRef(["network"]);
+        DgopService.removeRef(["network"])
     }
 
-    MouseArea {
-        id: networkArea
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : contentRow.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? contentColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-    }
+            Column {
+                id: contentColumn
+                anchors.centerIn: parent
+                spacing: 2
+                visible: root.isVerticalOrientation
 
-    Column {
-        id: contentColumn
-
-        anchors.centerIn: parent
-        spacing: 2
-        visible: root.isVertical
-
-        DankIcon {
-            name: "network_check"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const rate = DgopService.networkRxRate
-                if (rate < 1024) return rate.toFixed(0)
-                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
-                return (rate / (1024 * 1024)).toFixed(0) + "M"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.info
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const rate = DgopService.networkTxRate
-                if (rate < 1024) return rate.toFixed(0)
-                if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
-                return (rate / (1024 * 1024)).toFixed(0) + "M"
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.error
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: contentRow
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-        visible: !root.isVertical
-
-        DankIcon {
-            name: "network_check"
-            size: Theme.barIconSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Row {
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 4
-
-            StyledText {
-                text: "↓"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.info
-            }
-
-            StyledText {
-                text: DgopService.networkRxRate > 0 ? formatNetworkSpeed(DgopService.networkRxRate) : "0 B/s"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignLeft
-                elide: Text.ElideNone
-                wrapMode: Text.NoWrap
-
-                StyledTextMetrics {
-                    id: rxBaseline
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    font.weight: Font.Medium
-                    text: "88.8 MB/s"
+                DankIcon {
+                    name: "network_check"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
                 }
 
-                width: Math.max(rxBaseline.width, paintedWidth)
+                StyledText {
+                    text: {
+                        const rate = DgopService.networkRxRate
+                        if (rate < 1024) return rate.toFixed(0)
+                        if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
+                        return (rate / (1024 * 1024)).toFixed(0) + "M"
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.info
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
 
-                Behavior on width {
-                    NumberAnimation {
-                        duration: 120
-                        easing.type: Easing.OutCubic
+                StyledText {
+                    text: {
+                        const rate = DgopService.networkTxRate
+                        if (rate < 1024) return rate.toFixed(0)
+                        if (rate < 1024 * 1024) return (rate / 1024).toFixed(0) + "K"
+                        return (rate / (1024 * 1024)).toFixed(0) + "M"
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.error
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: contentRow
+                anchors.centerIn: parent
+                spacing: Theme.spacingS
+                visible: !root.isVerticalOrientation
+
+                DankIcon {
+                    name: "network_check"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                Row {
+                    anchors.verticalCenter: parent.verticalCenter
+                    spacing: 4
+
+                    StyledText {
+                        text: "↓"
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.info
+                    }
+
+                    StyledText {
+                        text: DgopService.networkRxRate > 0 ? root.formatNetworkSpeed(DgopService.networkRxRate) : "0 B/s"
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                        anchors.verticalCenter: parent.verticalCenter
+                        horizontalAlignment: Text.AlignLeft
+                        elide: Text.ElideNone
+                        wrapMode: Text.NoWrap
+
+                        StyledTextMetrics {
+                            id: rxBaseline
+                            font.pixelSize: Theme.barTextSize(root.barThickness)
+                            font.weight: Font.Medium
+                            text: "88.8 MB/s"
+                        }
+
+                        width: Math.max(rxBaseline.width, paintedWidth)
+
+                        Behavior on width {
+                            NumberAnimation {
+                                duration: 120
+                                easing.type: Easing.OutCubic
+                            }
+                        }
+                    }
+                }
+
+                Row {
+                    anchors.verticalCenter: parent.verticalCenter
+                    spacing: 4
+
+                    StyledText {
+                        text: "↑"
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        color: Theme.error
+                    }
+
+                    StyledText {
+                        text: DgopService.networkTxRate > 0 ? root.formatNetworkSpeed(DgopService.networkTxRate) : "0 B/s"
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        color: Theme.surfaceText
+                        anchors.verticalCenter: parent.verticalCenter
+                        horizontalAlignment: Text.AlignLeft
+                        elide: Text.ElideNone
+                        wrapMode: Text.NoWrap
+
+                        StyledTextMetrics {
+                            id: txBaseline
+                            font.pixelSize: Theme.barTextSize(root.barThickness)
+                            font.weight: Font.Medium
+                            text: "88.8 MB/s"
+                        }
+
+                        width: Math.max(txBaseline.width, paintedWidth)
+
+                        Behavior on width {
+                            NumberAnimation {
+                                duration: 120
+                                easing.type: Easing.OutCubic
+                            }
+                        }
                     }
                 }
             }
-
         }
-
-        Row {
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 4
-
-            StyledText {
-                text: "↑"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                color: Theme.error
-            }
-
-            StyledText {
-                text: DgopService.networkTxRate > 0 ? formatNetworkSpeed(DgopService.networkTxRate) : "0 B/s"
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                color: Theme.surfaceText
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignLeft
-                elide: Text.ElideNone
-                wrapMode: Text.NoWrap
-
-                StyledTextMetrics {
-                    id: txBaseline
-                    font.pixelSize: Theme.barTextSize(barThickness)
-                    font.weight: Font.Medium
-                    text: "88.8 MB/s"
-                }
-
-                width: Math.max(txBaseline.width, paintedWidth)
-
-                Behavior on width {
-                    NumberAnimation {
-                        duration: 120
-                        easing.type: Easing.OutCubic
-                    }
-                }
-            }
-
-        }
-
     }
-
-
 }

Modules/DankBar/Widgets/NotepadButton.qml

@@ -1,22 +1,13 @@
 import QtQuick
 import Quickshell.Hyprland
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    signal clicked()
-
     readonly property string focusedScreenName: (
         CompositorService.isHyprland && typeof Hyprland !== "undefined" && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor ? (Hyprland.focusedWorkspace.monitor.name || "") :
         CompositorService.isNiri && typeof NiriService !== "undefined" && NiriService.currentOutput ? NiriService.currentOutput : ""
@@ -43,54 +34,43 @@ Rectangle {
     readonly property var notepadInstance: resolveNotepadInstance()
     readonly property bool isActive: notepadInstance?.isVisible ?? false
 
-    width: isVertical ? widgetThickness : (notepadIcon.width + horizontalPadding * 2)
-    height: isVertical ? (notepadIcon.height + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
+
+            DankIcon {
+                id: notepadIcon
+
+                anchors.centerIn: parent
+                name: "assignment"
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: root.isActive ? Theme.primary : Theme.surfaceText
+            }
+
+            Rectangle {
+                width: 6
+                height: 6
+                radius: 3
+                color: Theme.primary
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 4
+                anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 4
+                visible: NotepadStorageService.tabs && NotepadStorageService.tabs.length > 0
+                opacity: 0.8
+            }
         }
-
-        const baseColor = notepadArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: notepadIcon
-
-        anchors.centerIn: parent
-        name: "assignment"
-        size: Theme.barIconSize(barThickness, -4)
-        color: notepadArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText
-    }
-
-    Rectangle {
-        width: 6
-        height: 6
-        radius: 3
-        color: Theme.primary
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 4
-        anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 4
-        visible: NotepadStorageService.tabs && NotepadStorageService.tabs.length > 0
-        opacity: 0.8
     }
 
     MouseArea {
-        id: notepadArea
-
         anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
             const inst = root.notepadInstance
             if (inst) {
                 inst.toggle()
             }
-            root.clicked()
         }
     }
-
-
 }

Modules/DankBar/Widgets/NotificationCenterButton.qml

@@ -1,76 +1,36 @@
 import QtQuick
 import qs.Common
+import qs.Modules.Plugins
 import qs.Widgets
 
-Item {
+BasePill {
     id: root
 
     property bool hasUnread: false
     property bool isActive: false
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
 
-    signal clicked()
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
 
-    width: widgetThickness
-    height: widgetThickness
-
-    MouseArea {
-        id: notificationArea
-
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        acceptedButtons: Qt.LeftButton
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
-            }
-            root.clicked()
-        }
-    }
-
-    Rectangle {
-        id: notificationContent
-
-        anchors.fill: parent
-        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-        color: {
-            if (SettingsData.dankBarNoBackground) {
-                return "transparent"
+            DankIcon {
+                id: notifIcon
+                anchors.centerIn: parent
+                name: SessionData.doNotDisturb ? "notifications_off" : "notifications"
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: SessionData.doNotDisturb ? Theme.error : (root.isActive ? Theme.primary : Theme.surfaceText)
             }
 
-            const baseColor = notificationArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-        }
-
-        DankIcon {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            name: SessionData.doNotDisturb ? "notifications_off" : "notifications"
-            size: Theme.barIconSize(barThickness, -4)
-            color: SessionData.doNotDisturb ? Theme.error : (notificationArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText)
-        }
-
-        Rectangle {
-            width: 8
-            height: 8
-            radius: 4
-            color: Theme.error
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
-            anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
-            visible: root.hasUnread
+            Rectangle {
+                width: 6
+                height: 6
+                radius: 3
+                color: Theme.error
+                anchors.right: notifIcon.right
+                anchors.top: notifIcon.top
+                visible: root.hasUnread
+            }
         }
     }
 }

Modules/DankBar/Widgets/PrivacyIndicator.qml

@@ -4,7 +4,7 @@ import qs.Common
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+Item {
     id: root
 
     property bool isVertical: axis?.isVertical ?? false
@@ -19,26 +19,167 @@ Rectangle {
     readonly property int activeCount: PrivacyService.microphoneActive + PrivacyService.cameraActive + PrivacyService.screensharingActive
     readonly property real contentWidth: hasActivePrivacy ? (activeCount * 18 + (activeCount - 1) * Theme.spacingXS) : 0
     readonly property real contentHeight: hasActivePrivacy ? (activeCount * 18 + (activeCount - 1) * Theme.spacingXS) : 0
+    readonly property real visualWidth: isVertical ? widgetThickness : (hasActivePrivacy ? (contentWidth + horizontalPadding * 2) : 0)
+    readonly property real visualHeight: isVertical ? (hasActivePrivacy ? (contentHeight + horizontalPadding * 2) : 0) : widgetThickness
 
-    width: isVertical ? widgetThickness : (hasActivePrivacy ? (contentWidth + horizontalPadding * 2) : 0)
-    height: isVertical ? (hasActivePrivacy ? (contentHeight + horizontalPadding * 2) : 0) : (hasActivePrivacy ? widgetThickness : 0)
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
+    width: isVertical ? barThickness : visualWidth
+    height: isVertical ? visualHeight : barThickness
     visible: hasActivePrivacy
     opacity: hasActivePrivacy ? 1 : 0
     enabled: hasActivePrivacy
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
+
+    Rectangle {
+        id: visualContent
+        width: root.visualWidth
+        height: root.visualHeight
+        anchors.centerIn: parent
+        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
+        color: {
+            if (SettingsData.dankBarNoBackground) {
+                return "transparent"
+            }
+
+            return Qt.rgba(privacyArea.containsMouse ? Theme.errorPressed.r : Theme.errorHover.r, privacyArea.containsMouse ? Theme.errorPressed.g : Theme.errorHover.g, privacyArea.containsMouse ? Theme.errorPressed.b : Theme.errorHover.b, (privacyArea.containsMouse ? Theme.errorPressed.a : Theme.errorHover.a) * Theme.widgetTransparency)
         }
 
-        return Qt.rgba(privacyArea.containsMouse ? Theme.errorPressed.r : Theme.errorHover.r, privacyArea.containsMouse ? Theme.errorPressed.g : Theme.errorHover.g, privacyArea.containsMouse ? Theme.errorPressed.b : Theme.errorHover.b, (privacyArea.containsMouse ? Theme.errorPressed.a : Theme.errorHover.a) * Theme.widgetTransparency);
+        Column {
+            anchors.centerIn: parent
+            spacing: Theme.spacingXS
+            visible: root.isVertical && root.hasActivePrivacy
+
+            Item {
+                width: 18
+                height: 18
+                visible: PrivacyService.microphoneActive
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                DankIcon {
+                    name: {
+                        const sourceAudio = AudioService.source?.audio
+                        const muted = !sourceAudio || sourceAudio.muted || sourceAudio.volume === 0.0
+                        if (muted) return "mic_off"
+                        return "mic"
+                    }
+                    size: Theme.iconSizeSmall
+                    color: Theme.error
+                    filled: true
+                    anchors.centerIn: parent
+                }
+            }
+
+            Item {
+                width: 18
+                height: 18
+                visible: PrivacyService.cameraActive
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                DankIcon {
+                    name: "camera_video"
+                    size: Theme.iconSizeSmall
+                    color: Theme.surfaceText
+                    filled: true
+                    anchors.centerIn: parent
+                }
+
+                Rectangle {
+                    width: 6
+                    height: 6
+                    radius: 3
+                    color: Theme.error
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    anchors.rightMargin: -2
+                    anchors.topMargin: -1
+                }
+            }
+
+            Item {
+                width: 18
+                height: 18
+                visible: PrivacyService.screensharingActive
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                DankIcon {
+                    name: "screen_share"
+                    size: Theme.iconSizeSmall
+                    color: Theme.warning
+                    filled: true
+                    anchors.centerIn: parent
+                }
+            }
+        }
+
+        Row {
+            anchors.centerIn: parent
+            spacing: Theme.spacingXS
+            visible: !root.isVertical && root.hasActivePrivacy
+
+            Item {
+                width: 18
+                height: 18
+                visible: PrivacyService.microphoneActive
+                anchors.verticalCenter: parent.verticalCenter
+
+                DankIcon {
+                    name: {
+                        const sourceAudio = AudioService.source?.audio
+                        const muted = !sourceAudio || sourceAudio.muted || sourceAudio.volume === 0.0
+                        if (muted) return "mic_off"
+                        return "mic"
+                    }
+                    size: Theme.iconSizeSmall
+                    color: Theme.error
+                    filled: true
+                    anchors.centerIn: parent
+                }
+            }
+
+            Item {
+                width: 18
+                height: 18
+                visible: PrivacyService.cameraActive
+                anchors.verticalCenter: parent.verticalCenter
+
+                DankIcon {
+                    name: "camera_video"
+                    size: Theme.iconSizeSmall
+                    color: Theme.surfaceText
+                    filled: true
+                    anchors.centerIn: parent
+                }
+
+                Rectangle {
+                    width: 6
+                    height: 6
+                    radius: 3
+                    color: Theme.error
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    anchors.rightMargin: -2
+                    anchors.topMargin: -1
+                }
+            }
+
+            Item {
+                width: 18
+                height: 18
+                visible: PrivacyService.screensharingActive
+                anchors.verticalCenter: parent.verticalCenter
+
+                DankIcon {
+                    name: "screen_share"
+                    size: Theme.iconSizeSmall
+                    color: Theme.warning
+                    filled: true
+                    anchors.centerIn: parent
+                }
+            }
+        }
     }
 
     MouseArea {
-        // Privacy indicator click handler
-
         id: privacyArea
-
+        z: -1
         anchors.fill: parent
         hoverEnabled: hasActivePrivacy
         enabled: hasActivePrivacy
@@ -47,141 +188,8 @@ Rectangle {
         }
     }
 
-    Column {
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: root.isVertical && hasActivePrivacy
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.microphoneActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "mic"
-                size: Theme.iconSizeSmall
-                color: Theme.error
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.cameraActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "camera_video"
-                size: Theme.iconSizeSmall
-                color: Theme.surfaceText
-                filled: true
-                anchors.centerIn: parent
-            }
-
-            Rectangle {
-                width: 6
-                height: 6
-                radius: 3
-                color: Theme.error
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.rightMargin: -2
-                anchors.topMargin: -1
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.screensharingActive
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            DankIcon {
-                name: "screen_share"
-                size: Theme.iconSizeSmall
-                color: Theme.warning
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-    }
-
-    Row {
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: !root.isVertical && hasActivePrivacy
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.microphoneActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "mic"
-                size: Theme.iconSizeSmall
-                color: Theme.error
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.cameraActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "camera_video"
-                size: Theme.iconSizeSmall
-                color: Theme.surfaceText
-                filled: true
-                anchors.centerIn: parent
-            }
-
-            Rectangle {
-                width: 6
-                height: 6
-                radius: 3
-                color: Theme.error
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.rightMargin: -2
-                anchors.topMargin: -1
-            }
-
-        }
-
-        Item {
-            width: 18
-            height: 18
-            visible: PrivacyService.screensharingActive
-            anchors.verticalCenter: parent.verticalCenter
-
-            DankIcon {
-                name: "screen_share"
-                size: Theme.iconSizeSmall
-                color: Theme.warning
-                filled: true
-                anchors.centerIn: parent
-            }
-
-        }
-
-    }
-
     Rectangle {
         id: tooltip
-
         width: tooltipText.contentWidth + Theme.spacingM * 2
         height: tooltipText.contentHeight + Theme.spacingS * 2
         radius: Theme.cornerRadius
@@ -196,7 +204,6 @@ Rectangle {
 
         StyledText {
             id: tooltipText
-
             anchors.centerIn: parent
             text: PrivacyService.getPrivacySummary()
             font.pixelSize: Theme.barTextSize(barThickness)
@@ -222,9 +229,7 @@ Rectangle {
                 duration: Theme.shortDuration
                 easing.type: Theme.standardEasing
             }
-
         }
-
     }
 
     Behavior on width {
@@ -234,7 +239,6 @@ Rectangle {
             duration: Theme.mediumDuration
             easing.type: Theme.emphasizedEasing
         }
-
     }
 
     Behavior on height {
@@ -244,7 +248,5 @@ Rectangle {
             duration: Theme.mediumDuration
             easing.type: Theme.emphasizedEasing
         }
-
     }
-
 }

Modules/DankBar/Widgets/RamMonitor.qml

@@ -1,37 +1,19 @@
 import QtQuick
 import QtQuick.Controls
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool showPercentage: true
     property bool showIcon: true
     property var toggleProcessList
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
+    property var popoutTarget: null
     property var widgetData: null
     property bool minimumWidth: (widgetData && widgetData.minimumWidth !== undefined) ? widgetData.minimumWidth : true
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
-
-    width: isVertical ? widgetThickness : (ramContent.implicitWidth + horizontalPadding * 2)
-    height: isVertical ? (ramColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = ramArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
 
     Component.onCompleted: {
         DgopService.addRef(["memory"]);
@@ -40,120 +22,123 @@ Rectangle {
         DgopService.removeRef(["memory"]);
     }
 
-    MouseArea {
-        id: ramArea
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : ramContent.implicitWidth
+            implicitHeight: root.isVerticalOrientation ? ramColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
+            Column {
+                id: ramColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
+
+                DankIcon {
+                    name: "developer_board"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (DgopService.memoryUsage > 90) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (DgopService.memoryUsage > 75) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
+                            return "--";
+                        }
+
+                        return DgopService.memoryUsage.toFixed(0);
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Row {
+                id: ramContent
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 3
+
+                DankIcon {
+                    name: "developer_board"
+                    size: Theme.barIconSize(root.barThickness)
+                    color: {
+                        if (DgopService.memoryUsage > 90) {
+                            return Theme.tempDanger;
+                        }
+
+                        if (DgopService.memoryUsage > 75) {
+                            return Theme.tempWarning;
+                        }
+
+                        return Theme.surfaceText;
+                    }
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StyledText {
+                    text: {
+                        if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
+                            return "--%";
+                        }
+
+                        return DgopService.memoryUsage.toFixed(0) + "%";
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    horizontalAlignment: Text.AlignLeft
+                    elide: Text.ElideNone
+
+                    StyledTextMetrics {
+                        id: ramBaseline
+                        font.pixelSize: Theme.barTextSize(root.barThickness)
+                        font.weight: Font.Medium
+                        text: "100%"
+                    }
+
+                    width: root.minimumWidth ? Math.max(ramBaseline.width, paintedWidth) : paintedWidth
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 120
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    MouseArea {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
             DgopService.setSortBy("memory");
             if (root.toggleProcessList) {
                 root.toggleProcessList();
             }
-
         }
     }
-
-    Column {
-        id: ramColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: "developer_board"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.memoryUsage > 90) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.memoryUsage > 75) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                    return "--";
-                }
-
-                return DgopService.memoryUsage.toFixed(0);
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Row {
-        id: ramContent
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: 3
-
-        DankIcon {
-            name: "developer_board"
-            size: Theme.barIconSize(barThickness)
-            color: {
-                if (DgopService.memoryUsage > 90) {
-                    return Theme.tempDanger;
-                }
-
-                if (DgopService.memoryUsage > 75) {
-                    return Theme.tempWarning;
-                }
-
-                return Theme.surfaceText;
-            }
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                if (DgopService.memoryUsage === undefined || DgopService.memoryUsage === null || DgopService.memoryUsage === 0) {
-                    return "--%";
-                }
-
-                return DgopService.memoryUsage.toFixed(0) + "%";
-            }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-            horizontalAlignment: Text.AlignLeft
-            elide: Text.ElideNone
-
-            StyledTextMetrics {
-                id: ramBaseline
-                font.pixelSize: Theme.barTextSize(barThickness)
-                font.weight: Font.Medium
-                text: "100%"
-            }
-
-            width: root.minimumWidth ? Math.max(ramBaseline.width, paintedWidth) : paintedWidth
-
-            Behavior on width {
-                NumberAnimation {
-                    duration: 120
-                    easing.type: Easing.OutCubic
-                }
-            }
-        }
-
-    }
-
 }

Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -7,7 +7,7 @@ import Quickshell.Widgets
 import qs.Common
 import qs.Widgets
 
-Rectangle {
+Item {
     id: root
 
     property bool isVertical: axis?.isVertical ?? false
@@ -15,26 +15,49 @@ Rectangle {
     property var parentWindow: null
     property var parentScreen: null
     property real widgetThickness: 30
+    property real barThickness: 48
     property bool isAtBottom: false
     readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-    readonly property int calculatedSize: SystemTray.items.values.length > 0 ? SystemTray.items.values.length * 24 + horizontalPadding * 2 : 0
-
-    width: isVertical ? widgetThickness : calculatedSize
-    height: isVertical ? calculatedSize : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SystemTray.items.values.length === 0) {
-            return "transparent";
-        }
-
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
+    readonly property var hiddenTrayIds: {
+        const envValue = Quickshell.env("DMS_HIDE_TRAYIDS") || ""
+        return envValue ? envValue.split(",").map(id => id.trim().toLowerCase()) : []
+    }
+    readonly property var visibleTrayItems: {
+        if (!hiddenTrayIds.length) {
+            return SystemTray.items.values
+        }
+        return SystemTray.items.values.filter(item => {
+            const itemId = item?.id || ""
+            return !hiddenTrayIds.includes(itemId.toLowerCase())
+        })
+    }
+    readonly property int calculatedSize: visibleTrayItems.length > 0 ? visibleTrayItems.length * 24 + horizontalPadding * 2 : 0
+    readonly property real visualWidth: isVertical ? widgetThickness : calculatedSize
+    readonly property real visualHeight: isVertical ? calculatedSize : widgetThickness
+
+    width: isVertical ? barThickness : visualWidth
+    height: isVertical ? visualHeight : barThickness
+    visible: visibleTrayItems.length > 0
+
+    Rectangle {
+        id: visualBackground
+        width: root.visualWidth
+        height: root.visualHeight
+        anchors.centerIn: parent
+        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
+        color: {
+            if (visibleTrayItems.length === 0) {
+                return "transparent";
+            }
+
+            if (SettingsData.dankBarNoBackground) {
+                return "transparent";
+            }
+
+            const baseColor = Theme.widgetBaseBackgroundColor;
+            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
+        }
     }
-    visible: SystemTray.items.values.length > 0
 
     Loader {
         id: layoutLoader
@@ -48,84 +71,84 @@ Rectangle {
             spacing: 0
 
             Repeater {
-                model: SystemTray.items.values
+                model: root.visibleTrayItems
 
                 delegate: Item {
-                property var trayItem: modelData
-                property string iconSource: {
-                    let icon = trayItem && trayItem.icon;
-                    if (typeof icon === 'string' || icon instanceof String) {
-                        if (icon === "") {
-                            return "";
-                        }
-                        if (icon.includes("?path=")) {
-                            const split = icon.split("?path=");
-                            if (split.length !== 2) {
-                                return icon;
+                    id: delegateRoot
+                    property var trayItem: modelData
+                    property string iconSource: {
+                        let icon = trayItem && trayItem.icon;
+                        if (typeof icon === 'string' || icon instanceof String) {
+                            if (icon === "") {
+                                return "";
                             }
+                            if (icon.includes("?path=")) {
+                                const split = icon.split("?path=");
+                                if (split.length !== 2) {
+                                    return icon;
+                                }
 
-                            const name = split[0];
-                            const path = split[1];
-                            let fileName = name.substring(name.lastIndexOf("/") + 1);
-                            if (fileName.startsWith("dropboxstatus")) {
-                                fileName = `hicolor/16x16/status/${fileName}`;
+                                const name = split[0];
+                                const path = split[1];
+                                let fileName = name.substring(name.lastIndexOf("/") + 1);
+                                if (fileName.startsWith("dropboxstatus")) {
+                                    fileName = `hicolor/16x16/status/${fileName}`;
+                                }
+                                return `file://${path}/${fileName}`;
                             }
-                            return `file://${path}/${fileName}`;
+                            if (icon.startsWith("/") && !icon.startsWith("file://")) {
+                                return `file://${icon}`;
+                            }
+                            return icon;
                         }
-                        if (icon.startsWith("/") && !icon.startsWith("file://")) {
-                            return `file://${icon}`;
-                        }
-                        return icon;
+                        return "";
                     }
-                    return "";
-                }
 
-                width: 24
-                height: 24
+                    width: 24
+                    height: root.barThickness
 
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
+                    Rectangle {
+                        id: visualContent
+                        width: 24
+                        height: 24
+                        anchors.centerIn: parent
+                        radius: Theme.cornerRadius
+                        color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
 
-
-                }
-
-                IconImage {
-                    anchors.centerIn: parent
-                    width: 16
-                    height: 16
-                    source: parent.iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                }
-
-                MouseArea {
-                    id: trayItemArea
-
-                    anchors.fill: parent
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: (mouse) => {
-                        if (!trayItem) {
-                            return;
+                        IconImage {
+                            anchors.centerIn: parent
+                            width: 16
+                            height: 16
+                            source: delegateRoot.iconSource
+                            asynchronous: true
+                            smooth: true
+                            mipmap: true
                         }
+                    }
 
-                        if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                            trayItem.activate();
-                            return ;
-                        }
-                        if (trayItem.hasMenu) {
-                            root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
+                    MouseArea {
+                        id: trayItemArea
+
+                        anchors.fill: parent
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: (mouse) => {
+                            if (!delegateRoot.trayItem) {
+                                return;
+                            }
+
+                            if (mouse.button === Qt.LeftButton && !delegateRoot.trayItem.onlyMenu) {
+                                delegateRoot.trayItem.activate();
+                                return ;
+                            }
+                            if (delegateRoot.trayItem.hasMenu) {
+                                root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
+                            }
                         }
                     }
                 }
-
             }
-
-        }
         }
     }
 
@@ -135,82 +158,84 @@ Rectangle {
             spacing: 0
 
             Repeater {
-                model: SystemTray.items.values
+                model: root.visibleTrayItems
 
                 delegate: Item {
-                property var trayItem: modelData
-                property string iconSource: {
-                    let icon = trayItem && trayItem.icon;
-                    if (typeof icon === 'string' || icon instanceof String) {
-                        if (icon === "") {
-                            return "";
-                        }
-                        if (icon.includes("?path=")) {
-                            const split = icon.split("?path=");
-                            if (split.length !== 2) {
-                                return icon;
+                    id: delegateRoot
+                    property var trayItem: modelData
+                    property string iconSource: {
+                        let icon = trayItem && trayItem.icon;
+                        if (typeof icon === 'string' || icon instanceof String) {
+                            if (icon === "") {
+                                return "";
                             }
+                            if (icon.includes("?path=")) {
+                                const split = icon.split("?path=");
+                                if (split.length !== 2) {
+                                    return icon;
+                                }
 
-                            const name = split[0];
-                            const path = split[1];
-                            let fileName = name.substring(name.lastIndexOf("/") + 1);
-                            if (fileName.startsWith("dropboxstatus")) {
-                                fileName = `hicolor/16x16/status/${fileName}`;
+                                const name = split[0];
+                                const path = split[1];
+                                let fileName = name.substring(name.lastIndexOf("/") + 1);
+                                if (fileName.startsWith("dropboxstatus")) {
+                                    fileName = `hicolor/16x16/status/${fileName}`;
+                                }
+                                return `file://${path}/${fileName}`;
                             }
-                            return `file://${path}/${fileName}`;
+                            if (icon.startsWith("/") && !icon.startsWith("file://")) {
+                                return `file://${icon}`;
+                            }
+                            return icon;
                         }
-                        if (icon.startsWith("/") && !icon.startsWith("file://")) {
-                            return `file://${icon}`;
-                        }
-                        return icon;
+                        return "";
                     }
-                    return "";
-                }
 
-                width: 24
-                height: 24
+                    width: root.barThickness
+                    height: 24
 
-                Rectangle {
-                    anchors.fill: parent
-                    radius: Theme.cornerRadius
-                    color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
-                }
+                    Rectangle {
+                        id: visualContent
+                        width: 24
+                        height: 24
+                        anchors.centerIn: parent
+                        radius: Theme.cornerRadius
+                        color: trayItemArea.containsMouse ? Theme.primaryHover : "transparent"
 
-                IconImage {
-                    anchors.centerIn: parent
-                    width: 16
-                    height: 16
-                    source: parent.iconSource
-                    asynchronous: true
-                    smooth: true
-                    mipmap: true
-                }
-
-                MouseArea {
-                    id: trayItemArea
-
-                    anchors.fill: parent
-                    acceptedButtons: Qt.LeftButton | Qt.RightButton
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: (mouse) => {
-                        if (!trayItem) {
-                            return;
+                        IconImage {
+                            anchors.centerIn: parent
+                            width: 16
+                            height: 16
+                            source: delegateRoot.iconSource
+                            asynchronous: true
+                            smooth: true
+                            mipmap: true
                         }
+                    }
 
-                        if (mouse.button === Qt.LeftButton && !trayItem.onlyMenu) {
-                            trayItem.activate();
-                            return ;
-                        }
-                        if (trayItem.hasMenu) {
-                            root.showForTrayItem(trayItem, parent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
+                    MouseArea {
+                        id: trayItemArea
+
+                        anchors.fill: parent
+                        acceptedButtons: Qt.LeftButton | Qt.RightButton
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: (mouse) => {
+                            if (!delegateRoot.trayItem) {
+                                return;
+                            }
+
+                            if (mouse.button === Qt.LeftButton && !delegateRoot.trayItem.onlyMenu) {
+                                delegateRoot.trayItem.activate();
+                                return ;
+                            }
+                            if (delegateRoot.trayItem.hasMenu) {
+                                root.showForTrayItem(delegateRoot.trayItem, visualContent, parentScreen, root.isAtBottom, root.isVertical, root.axis);
+                            }
                         }
                     }
                 }
-
             }
-
-        }
         }
     }
 

Modules/DankBar/Widgets/SystemUpdate.qml

@@ -1,158 +1,138 @@
 import QtQuick
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
     property bool isActive: false
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real widgetThickness: 30
-    property real barThickness: 48
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
     readonly property bool hasUpdates: SystemUpdateService.updateCount > 0
     readonly property bool isChecking: SystemUpdateService.isChecking
 
-    signal clicked()
-
     Ref {
         service: SystemUpdateService
     }
 
-    width: isVertical ? widgetThickness : (updaterIcon.width + horizontalPadding * 2)
-    height: isVertical ? widgetThickness : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
+    content: Component {
+        Item {
+            implicitWidth: root.isVerticalOrientation ? (root.widgetThickness - root.horizontalPadding * 2) : updaterIcon.implicitWidth
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
 
-        const baseColor = updaterArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: statusIcon
-
-        anchors.centerIn: parent
-        visible: root.isVertical
-        name: {
-            if (isChecking) return "refresh";
-            if (SystemUpdateService.hasError) return "error";
-            if (hasUpdates) return "system_update_alt";
-            return "check_circle";
-        }
-        size: Theme.barIconSize(barThickness, -4)
-        color: {
-            if (SystemUpdateService.hasError) return Theme.error;
-            if (hasUpdates) return Theme.primary;
-            return (updaterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText);
-        }
-
-        RotationAnimation {
-            id: rotationAnimation
-            target: statusIcon
-            property: "rotation"
-            from: 0
-            to: 360
-            duration: 1000
-            running: isChecking
-            loops: Animation.Infinite
-
-            onRunningChanged: {
-                if (!running) {
-                    statusIcon.rotation = 0
+            DankIcon {
+                id: statusIcon
+                anchors.centerIn: parent
+                visible: root.isVerticalOrientation
+                name: {
+                    if (root.isChecking) return "refresh"
+                    if (SystemUpdateService.hasError) return "error"
+                    if (root.hasUpdates) return "system_update_alt"
+                    return "check_circle"
+                }
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: {
+                    if (SystemUpdateService.hasError) return Theme.error
+                    if (root.hasUpdates) return Theme.primary
+                    return root.isActive ? Theme.primary : Theme.surfaceText
                 }
-            }
-        }
-    }
 
-    Rectangle {
-        width: 8
-        height: 8
-        radius: 4
-        color: Theme.error
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
-        anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
-        visible: root.isVertical && root.hasUpdates && !root.isChecking
-    }
+                RotationAnimation {
+                    id: rotationAnimation
+                    target: statusIcon
+                    property: "rotation"
+                    from: 0
+                    to: 360
+                    duration: 1000
+                    running: root.isChecking
+                    loops: Animation.Infinite
 
-    Row {
-        id: updaterIcon
-
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-        visible: !root.isVertical
-
-        DankIcon {
-            id: statusIconHorizontal
-
-            anchors.verticalCenter: parent.verticalCenter
-            name: {
-                if (isChecking) return "refresh";
-                if (SystemUpdateService.hasError) return "error";
-                if (hasUpdates) return "system_update_alt";
-                return "check_circle";
-            }
-            size: Theme.barIconSize(barThickness, -4)
-            color: {
-                if (SystemUpdateService.hasError) return Theme.error;
-                if (hasUpdates) return Theme.primary;
-                return (updaterArea.containsMouse || root.isActive ? Theme.primary : Theme.surfaceText);
-            }
-
-            RotationAnimation {
-                id: rotationAnimationHorizontal
-                target: statusIconHorizontal
-                property: "rotation"
-                from: 0
-                to: 360
-                duration: 1000
-                running: isChecking
-                loops: Animation.Infinite
-
-                onRunningChanged: {
-                    if (!running) {
-                        statusIconHorizontal.rotation = 0
+                    onRunningChanged: {
+                        if (!running) {
+                            statusIcon.rotation = 0
+                        }
                     }
                 }
             }
-        }
 
-        StyledText {
-            id: countText
+            Rectangle {
+                width: 8
+                height: 8
+                radius: 4
+                color: Theme.error
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.rightMargin: SettingsData.dankBarNoBackground ? 0 : 6
+                anchors.topMargin: SettingsData.dankBarNoBackground ? 0 : 6
+                visible: root.isVerticalOrientation && root.hasUpdates && !root.isChecking
+            }
 
-            anchors.verticalCenter: parent.verticalCenter
-            text: SystemUpdateService.updateCount.toString()
-            font.pixelSize: Theme.barTextSize(barThickness)
-            font.weight: Font.Medium
-            color: Theme.surfaceText
-            visible: hasUpdates && !isChecking
+            Row {
+                id: updaterIcon
+                anchors.centerIn: parent
+                spacing: Theme.spacingXS
+                visible: !root.isVerticalOrientation
+
+                DankIcon {
+                    id: statusIconHorizontal
+                    anchors.verticalCenter: parent.verticalCenter
+                    name: {
+                        if (root.isChecking) return "refresh"
+                        if (SystemUpdateService.hasError) return "error"
+                        if (root.hasUpdates) return "system_update_alt"
+                        return "check_circle"
+                    }
+                    size: Theme.barIconSize(root.barThickness, -4)
+                    color: {
+                        if (SystemUpdateService.hasError) return Theme.error
+                        if (root.hasUpdates) return Theme.primary
+                        return root.isActive ? Theme.primary : Theme.surfaceText
+                    }
+
+                    RotationAnimation {
+                        id: rotationAnimationHorizontal
+                        target: statusIconHorizontal
+                        property: "rotation"
+                        from: 0
+                        to: 360
+                        duration: 1000
+                        running: root.isChecking
+                        loops: Animation.Infinite
+
+                        onRunningChanged: {
+                            if (!running) {
+                                statusIconHorizontal.rotation = 0
+                            }
+                        }
+                    }
+                }
+
+                StyledText {
+                    id: countText
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: SystemUpdateService.updateCount.toString()
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    font.weight: Font.Medium
+                    color: Theme.surfaceText
+                    visible: root.hasUpdates && !root.isChecking
+                }
+            }
         }
     }
 
     MouseArea {
-        id: updaterArea
-
+        z: 1
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
-            root.clicked();
+            root.clicked()
         }
     }
-
-}
+}

Modules/DankBar/Widgets/Vpn.qml

@@ -1,46 +1,35 @@
 import QtQuick
 import Quickshell
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
     Ref {
         service: VpnService
     }
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property int widgetThickness: 28
-    property int barThickness: 32
-    property string section: "right"
-    property var popupTarget: null
-    property var parentScreen: null
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
+    property var popoutTarget: null
 
     signal toggleVpnPopup()
 
-    width: isVertical ? widgetThickness : (Theme.iconSize + horizontalPadding * 2)
-    height: isVertical ? (Theme.iconSize + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
+    content: Component {
+        Item {
+            implicitWidth: root.widgetThickness - root.horizontalPadding * 2
+            implicitHeight: root.widgetThickness - root.horizontalPadding * 2
+
+            DankIcon {
+                id: icon
+
+                name: VpnService.isBusy ? "sync" : (VpnService.connected ? "vpn_lock" : "vpn_key_off")
+                size: Theme.barIconSize(root.barThickness, -4)
+                color: VpnService.connected ? Theme.primary : Theme.surfaceText
+                anchors.centerIn: parent
+            }
         }
-
-        const baseColor = clickArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
-
-    DankIcon {
-        id: icon
-
-        name: VpnService.isBusy ? "sync" : (VpnService.connected ? "vpn_lock" : "vpn_key_off")
-        size: Theme.barIconSize(barThickness, -4)
-        color: VpnService.connected ? Theme.primary : Theme.surfaceText
-        anchors.centerIn: parent
     }
 
     Loader {
@@ -55,17 +44,18 @@ Rectangle {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.LeftButton
         onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
+            if (popoutTarget && popoutTarget.setTriggerPosition) {
+                const globalPos = root.visualContent.mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
+                popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
             root.toggleVpnPopup();
         }
         onEntered: {
-            if (root.parentScreen && !(popupTarget && popupTarget.shouldBeVisible)) {
+            if (root.parentScreen && !(popoutTarget && popoutTarget.shouldBeVisible)) {
                 tooltipLoader.active = true
                 if (tooltipLoader.item) {
                     let tooltipText = ""
@@ -80,7 +70,7 @@ Rectangle {
                         }
                     }
 
-                    if (root.isVertical) {
+                    if (root.isVerticalOrientation) {
                         const globalPos = mapToGlobal(width / 2, height / 2)
                         const screenX = root.parentScreen ? root.parentScreen.x : 0
                         const screenY = root.parentScreen ? root.parentScreen.y : 0
@@ -103,5 +93,4 @@ Rectangle {
             tooltipLoader.active = false
         }
     }
-
 }

Modules/DankBar/Widgets/Weather.qml

@@ -1,120 +1,81 @@
 import QtQuick
 import qs.Common
+import qs.Modules.Plugins
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+BasePill {
     id: root
 
-    property bool isVertical: axis?.isVertical ?? false
-    property var axis: null
-    property string section: "center"
-    property var popupTarget: null
-    property var parentScreen: null
-    property real barThickness: 48
-    property real widgetThickness: 30
-    readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 2 : Theme.spacingS
-
-    signal clicked()
-
     visible: SettingsData.weatherEnabled
-    width: isVertical ? widgetThickness : (visible ? Math.min(100, weatherRow.implicitWidth + horizontalPadding * 2) : 0)
-    height: isVertical ? (weatherColumn.implicitHeight + horizontalPadding * 2) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent";
-        }
-
-        const baseColor = weatherArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor;
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency);
-    }
 
     Ref {
         service: WeatherService
     }
 
-    Column {
-        id: weatherColumn
-        visible: root.isVertical
-        anchors.centerIn: parent
-        spacing: 1
-
-        DankIcon {
-            name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
-            size: Theme.barIconSize(barThickness, -6)
-            color: Theme.primary
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        StyledText {
-            text: {
-                const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
-                if (temp === undefined || temp === null || temp === 0) {
-                    return "--";
-                }
-                return temp;
+    content: Component {
+        Item {
+            implicitWidth: {
+                if (!SettingsData.weatherEnabled) return 0
+                if (root.isVerticalOrientation) return root.widgetThickness - root.horizontalPadding * 2
+                return Math.min(100 - root.horizontalPadding * 2, weatherRow.implicitWidth)
             }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
+            implicitHeight: root.isVerticalOrientation ? weatherColumn.implicitHeight : (root.widgetThickness - root.horizontalPadding * 2)
 
-    Row {
-        id: weatherRow
+            Column {
+                id: weatherColumn
+                visible: root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: 1
 
-        visible: !root.isVertical
-        anchors.centerIn: parent
-        spacing: Theme.spacingXS
-
-        DankIcon {
-            name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
-            size: Theme.barIconSize(barThickness, -6)
-            color: Theme.primary
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: {
-                const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
-                if (temp === undefined || temp === null || temp === 0) {
-                    return "--°" + (SettingsData.useFahrenheit ? "F" : "C");
+                DankIcon {
+                    name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
+                    size: Theme.barIconSize(root.barThickness, -6)
+                    color: Theme.primary
+                    anchors.horizontalCenter: parent.horizontalCenter
                 }
 
-                return temp + "°" + (SettingsData.useFahrenheit ? "F" : "C");
+                StyledText {
+                    text: {
+                        const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
+                        if (temp === undefined || temp === null || temp === 0) {
+                            return "--";
+                        }
+                        return temp;
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
             }
-            font.pixelSize: Theme.barTextSize(barThickness)
-            color: Theme.surfaceText
-            anchors.verticalCenter: parent.verticalCenter
-        }
 
-    }
+            Row {
+                id: weatherRow
+                visible: !root.isVerticalOrientation
+                anchors.centerIn: parent
+                spacing: Theme.spacingXS
 
-    MouseArea {
-        id: weatherArea
+                DankIcon {
+                    name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
+                    size: Theme.barIconSize(root.barThickness, -6)
+                    color: Theme.primary
+                    anchors.verticalCenter: parent.verticalCenter
+                }
 
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onPressed: {
-            if (popupTarget && popupTarget.setTriggerPosition) {
-                const globalPos = mapToGlobal(0, 0)
-                const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
-                popupTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
+                StyledText {
+                    text: {
+                        const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
+                        if (temp === undefined || temp === null || temp === 0) {
+                            return "--°" + (SettingsData.useFahrenheit ? "F" : "C");
+                        }
+
+                        return temp + "°" + (SettingsData.useFahrenheit ? "F" : "C");
+                    }
+                    font.pixelSize: Theme.barTextSize(root.barThickness)
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                }
             }
-            root.clicked();
         }
     }
-
-
-    Behavior on width {
-        NumberAnimation {
-            duration: Theme.shortDuration
-            easing.type: Theme.standardEasing
-        }
-
-    }
-
 }

Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -7,7 +7,7 @@ import qs.Common
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+Item {
     id: root
 
     property bool isVertical: axis?.isVertical ?? false
@@ -15,6 +15,8 @@ Rectangle {
     property string screenName: ""
     property real widgetHeight: 30
     property real barThickness: 48
+    property var hyprlandOverviewLoader: null
+    property var parentScreen: null
     readonly property var sortedToplevels: {
         return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, parentScreen?.name);
     }
@@ -200,9 +202,9 @@ Rectangle {
         return currentMonitor.activeWorkspace?.id ?? 1
     }
 
-    readonly property real padding: isVertical
-        ? Math.max(Theme.spacingXS, Theme.spacingS * (widgetHeight / 30))
-        : (widgetHeight - workspaceRow.implicitHeight) / 2
+    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
 
     function getRealWorkspaces() {
         return root.workspaceList.filter(ws => {
@@ -231,24 +233,37 @@ Rectangle {
         }
     }
 
-    width: isVertical ? widgetHeight : (workspaceRow.implicitWidth + padding * 2)
-    height: isVertical ? (workspaceRow.implicitHeight + padding * 2) : widgetHeight
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground)
-            return "transparent"
-        const baseColor = Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
+    width: isVertical ? barThickness : visualWidth
+    height: isVertical ? visualHeight : barThickness
     visible: CompositorService.isNiri || CompositorService.isHyprland
 
+    Rectangle {
+        id: visualBackground
+        width: root.visualWidth
+        height: root.visualHeight
+        anchors.centerIn: parent
+        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
+        color: {
+            if (SettingsData.dankBarNoBackground)
+                return "transparent"
+            const baseColor = Theme.widgetBaseBackgroundColor
+            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
+        }
+    }
+
     MouseArea {
         anchors.fill: parent
-        acceptedButtons: Qt.NoButton
+        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
@@ -290,7 +305,7 @@ Rectangle {
                             nextWindow.activate();
                          }
                         }
-                         
+
                      } else {
                          scrollAccumulator += deltaY
 
@@ -331,7 +346,7 @@ Rectangle {
                                 nextWindow.activate();
                             }
                         }
-                             
+
                             scrollAccumulator = 0
                          }
                      }
@@ -350,7 +365,7 @@ Rectangle {
         Repeater {
             model: root.workspaceList
 
-            Rectangle {
+            Item {
                 id: delegateRoot
 
                 property bool isActive: {
@@ -382,6 +397,33 @@ Rectangle {
                 property bool loadedHasIcon: false
                 property var loadedIcons: []
 
+                readonly property real visualWidth: {
+                    if (root.isVertical) {
+                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5
+                    } else {
+                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
+                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons)
+                            const iconsWidth = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0)
+                            const baseWidth = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7
+                            return baseWidth + iconsWidth
+                        }
+                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7
+                    }
+                }
+                readonly property real visualHeight: {
+                    if (root.isVertical) {
+                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
+                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons)
+                            const iconsHeight = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0)
+                            const baseHeight = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7
+                            return baseHeight + iconsHeight
+                        }
+                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7
+                    } else {
+                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5
+                    }
+                }
+
                 Timer {
                     id: dataUpdateTimer
                     interval: 50
@@ -423,92 +465,54 @@ Rectangle {
                     dataUpdateTimer.restart()
                 }
 
-                width: {
-                    if (root.isVertical) {
-                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5;
-                    } else {
-                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
-                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                            const iconsWidth = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0);
-                            const baseWidth = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7;
-                            return baseWidth + iconsWidth;
-                        }
-                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7;
-                    }
-                }
-                height: {
-                    if (root.isVertical) {
-                        if (SettingsData.showWorkspaceApps && loadedIcons.length > 0) {
-                            const numIcons = Math.min(loadedIcons.length, SettingsData.maxWorkspaceIcons);
-                            const iconsHeight = numIcons * 18 + (numIcons > 0 ? (numIcons - 1) * Theme.spacingXS : 0);
-                            const baseHeight = isActive ? root.widgetHeight * 0.9 + Theme.spacingXS : root.widgetHeight * 0.7;
-                            return baseHeight + iconsHeight;
-                        }
-                        return isActive ? root.widgetHeight * 1.05 : root.widgetHeight * 0.7;
-                    } else {
-                        return SettingsData.showWorkspaceApps ? widgetHeight * 0.7 : widgetHeight * 0.5;
-                    }
-                }
-                radius: Theme.cornerRadius
-                color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.outlineButton : Theme.surfaceTextAlpha
+                width: root.isVertical ? root.barThickness : visualWidth
+                height: root.isVertical ? visualHeight : root.barThickness
 
-                border.width: isUrgent && !isActive ? 2 : 0
-                border.color: isUrgent && !isActive ? Theme.error : Theme.withAlpha(Theme.error, 0)
+                Rectangle {
+                    id: visualContent
+                    width: delegateRoot.visualWidth
+                    height: delegateRoot.visualHeight
+                    anchors.centerIn: parent
+                    radius: Theme.cornerRadius
+                    color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.outlineButton : Theme.surfaceTextAlpha
 
-                Behavior on width {
-                    enabled: (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
+                    border.width: isUrgent && !isActive ? 2 : 0
+                    border.color: isUrgent && !isActive ? Theme.error : Theme.withAlpha(Theme.error, 0)
 
-                Behavior on height {
-                    enabled: root.isVertical && (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
-                    NumberAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on color {
-                    ColorAnimation {
-                        duration: Theme.mediumDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                Behavior on border.width {
-                    NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.emphasizedEasing
-                    }
-                }
-
-                MouseArea {
-                    id: mouseArea
-
-                    anchors.fill: parent
-                    hoverEnabled: !isPlaceholder
-                    cursorShape: isPlaceholder ? Qt.ArrowCursor : Qt.PointingHandCursor
-                    enabled: !isPlaceholder
-                    onClicked: {
-                        if (isPlaceholder) {
-                            return
-                        }
-
-                        if (CompositorService.isNiri) {
-                            NiriService.switchToWorkspace(modelData - 1)
-                        } else if (CompositorService.isHyprland && modelData?.id) {
-                            Hyprland.dispatch(`workspace ${modelData.id}`)
+                    Behavior on width {
+                        enabled: (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
                         }
                     }
-                }
 
-                Loader {
-                    id: appIconsLoader
-                    anchors.fill: parent
-                    active: SettingsData.showWorkspaceApps
+                    Behavior on height {
+                        enabled: root.isVertical && (!SettingsData.showWorkspaceApps || SettingsData.maxWorkspaceIcons <= 3)
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on color {
+                        ColorAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on border.width {
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Loader {
+                        id: appIconsLoader
+                        anchors.fill: parent
+                        active: SettingsData.showWorkspaceApps
                     sourceComponent: Item {
                         Loader {
                             id: contentRow
@@ -709,8 +713,27 @@ Rectangle {
                         }
                     }
                 }
+                }
+
+                MouseArea {
+                    id: mouseArea
+                    anchors.fill: parent
+                    hoverEnabled: !isPlaceholder
+                    cursorShape: isPlaceholder ? Qt.ArrowCursor : Qt.PointingHandCursor
+                    enabled: !isPlaceholder
+                    onClicked: {
+                        if (isPlaceholder) {
+                            return
+                        }
+
+                        if (CompositorService.isNiri) {
+                            NiriService.switchToWorkspace(modelData - 1)
+                        } else if (CompositorService.isHyprland && modelData?.id) {
+                            Hyprland.dispatch(`workspace ${modelData.id}`)
+                        }
+                    }
+                }
 
-                // --- LOGIC / TRIGGERS ---
                 Component.onCompleted: updateAllData()
 
                 Connections {

Modules/DankDash/DankDashPopout.qml

@@ -16,6 +16,8 @@ DankPopout {
     property var triggerScreen: null
     property int currentTabIndex: 0
 
+    keyboardFocusMode: WlrKeyboardFocus.Exclusive
+
     function setTriggerPosition(x, y, width, section, screen) {
         triggerSection = section
         triggerScreen = screen
@@ -43,15 +45,49 @@ DankPopout {
     shouldBeVisible: dashVisible
     visible: shouldBeVisible
 
+    property bool __focusArmed: false
+    property bool __contentReady: false
+
+    function __tryFocusOnce() {
+        if (!__focusArmed) return
+        const win = root.window
+        if (!win || !win.visible) return
+        if (!contentLoader.item) return
+
+        if (win.requestActivate) win.requestActivate()
+        contentLoader.item.forceActiveFocus(Qt.TabFocusReason)
+
+        if (contentLoader.item.activeFocus)
+            __focusArmed = false
+    }
 
     onDashVisibleChanged: {
         if (dashVisible) {
+            __focusArmed = true
+            __contentReady = !!contentLoader.item
             open()
+            __tryFocusOnce()
         } else {
+            __focusArmed = false
+            __contentReady = false
             close()
         }
     }
 
+    Connections {
+        target: contentLoader
+        function onLoaded() {
+            __contentReady = true
+            if (__focusArmed) __tryFocusOnce()
+        }
+    }
+
+    Connections {
+        target: root.window ? root.window : null
+        enabled: !!root.window
+        function onVisibleChanged() { if (__focusArmed) __tryFocusOnce() }
+    }
+
     onBackgroundClicked: {
         dashVisible = false
     }
@@ -67,18 +103,12 @@ DankPopout {
 
             Component.onCompleted: {
                 if (root.shouldBeVisible) {
-                    forceActiveFocus()
-                }
-            }
-
-            Keys.onPressed: function(event) {
-                if (event.key === Qt.Key_Escape) {
-                    root.dashVisible = false
-                    event.accepted = true
+                    mainContainer.forceActiveFocus()
                 }
             }
 
             Connections {
+                target: root
                 function onShouldBeVisibleChanged() {
                     if (root.shouldBeVisible) {
                         Qt.callLater(function() {
@@ -86,7 +116,52 @@ DankPopout {
                         })
                     }
                 }
-                target: root
+            }
+
+            Keys.onPressed: function(event) {
+                if (event.key === Qt.Key_Escape) {
+                    root.dashVisible = false
+                    event.accepted = true
+                    return
+                }
+
+                if (event.key === Qt.Key_Tab && !(event.modifiers & Qt.ShiftModifier)) {
+                    let nextIndex = root.currentTabIndex + 1
+                    while (nextIndex < tabBar.model.length && tabBar.model[nextIndex] && tabBar.model[nextIndex].isAction) {
+                        nextIndex++
+                    }
+                    if (nextIndex >= tabBar.model.length) {
+                        nextIndex = 0
+                    }
+                    root.currentTabIndex = nextIndex
+                    event.accepted = true
+                    return
+                }
+
+                if (event.key === Qt.Key_Backtab || (event.key === Qt.Key_Tab && (event.modifiers & Qt.ShiftModifier))) {
+                    let prevIndex = root.currentTabIndex - 1
+                    while (prevIndex >= 0 && tabBar.model[prevIndex] && tabBar.model[prevIndex].isAction) {
+                        prevIndex--
+                    }
+                    if (prevIndex < 0) {
+                        prevIndex = tabBar.model.length - 1
+                        while (prevIndex >= 0 && tabBar.model[prevIndex] && tabBar.model[prevIndex].isAction) {
+                            prevIndex--
+                        }
+                    }
+                    if (prevIndex >= 0) {
+                        root.currentTabIndex = prevIndex
+                    }
+                    event.accepted = true
+                    return
+                }
+
+                if (root.currentTabIndex === 2 && wallpaperTab.handleKeyEvent) {
+                    if (wallpaperTab.handleKeyEvent(event)) {
+                        event.accepted = true
+                        return
+                    }
+                }
             }
 
             Rectangle {
@@ -128,17 +203,29 @@ DankPopout {
                     currentIndex: root.currentTabIndex
                     spacing: Theme.spacingS
                     equalWidthTabs: true
+                    enableArrowNavigation: false
+                    focus: false
+                    activeFocusOnTab: false
+                    nextFocusTarget: {
+                        const item = pages.currentItem
+                        if (!item)
+                            return null
+                        if (item.focusTarget)
+                            return item.focusTarget
+                        return item
+                    }
 
                     model: {
                         let tabs = [
                             { icon: "dashboard", text: I18n.tr("Overview") },
-                            { icon: "music_note", text: I18n.tr("Media") }
+                            { 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: "settings", text: I18n.tr("Settings"), isAction: true })
                         return tabs
                     }
@@ -148,7 +235,7 @@ DankPopout {
                     }
 
                     onActionTriggered: function(index) {
-                        let settingsIndex = SettingsData.weatherEnabled ? 3 : 2
+                        let settingsIndex = SettingsData.weatherEnabled ? 4 : 3
                         if (index === settingsIndex) {
                             dashVisible = false
                             settingsModal.show()
@@ -168,7 +255,8 @@ DankPopout {
                     implicitHeight: {
                         if (currentIndex === 0) return overviewTab.implicitHeight
                         if (currentIndex === 1) return mediaTab.implicitHeight
-                        if (SettingsData.weatherEnabled && currentIndex === 2) return weatherTab.implicitHeight
+                        if (currentIndex === 2) return wallpaperTab.implicitHeight
+                        if (SettingsData.weatherEnabled && currentIndex === 3) return weatherTab.implicitHeight
                         return overviewTab.implicitHeight
                     }
                     currentIndex: root.currentTabIndex
@@ -178,8 +266,8 @@ DankPopout {
 
                         onSwitchToWeatherTab: {
                             if (SettingsData.weatherEnabled) {
-                                tabBar.currentIndex = 2
-                                tabBar.tabClicked(2)
+                                tabBar.currentIndex = 3
+                                tabBar.tabClicked(3)
                             }
                         }
 
@@ -193,9 +281,16 @@ DankPopout {
                         id: mediaTab
                     }
 
+                    WallpaperTab {
+                        id: wallpaperTab
+                        active: root.currentTabIndex === 2
+                        tabBarItem: tabBar
+                        keyForwardTarget: mainContainer
+                    }
+
                     WeatherTab {
                         id: weatherTab
-                        visible: SettingsData.weatherEnabled && root.currentTabIndex === 2
+                        visible: SettingsData.weatherEnabled && root.currentTabIndex === 3
                     }
                 }
             }

Modules/DankDash/MediaPlayerTab.qml

@@ -128,9 +128,9 @@ Item {
 
     function getAudioDeviceIcon(device) {
         if (!device || !device.name) return "speaker"
-        
+
         const name = device.name.toLowerCase()
-        
+
         if (name.includes("bluez") || name.includes("bluetooth"))
             return "headset"
         if (name.includes("hdmi"))
@@ -139,10 +139,10 @@ Item {
             return "headset"
         if (name.includes("analog") || name.includes("built-in"))
             return "speaker"
-        
+
         return "speaker"
     }
-    
+
     function getVolumeIcon(sink) {
         if (!sink || !sink.audio) return "volume_off"
 
@@ -262,8 +262,8 @@ Item {
             maybeFinishSwitch()
         }
     }
-    
-    
+
+
 
     property bool isSeeking: false
 
@@ -325,7 +325,7 @@ Item {
                     return mouse.x < item.x || mouse.x > item.x + item.width ||
                            mouse.y < item.y || mouse.y > item.y + item.height
                 }
-                
+
                 if (playerSelectorButton.playersExpanded && clickOutside(playerSelectorDropdown)) {
                     playerSelectorButton.playersExpanded = false
                 }
@@ -400,11 +400,11 @@ Item {
                     easing.bezierCurve: Anims.standard
                 }
             }
-            
+
             Column {
                 anchors.fill: parent
                 anchors.margins: Theme.spacingM
-                
+
                 StyledText {
                     text: I18n.tr("Audio Output Devices (") + audioDevicesDropdown.availableDevices.length + ")"
                     font.pixelSize: Theme.fontSizeMedium
@@ -414,49 +414,49 @@ Item {
                     horizontalAlignment: Text.AlignHCenter
                     bottomPadding: Theme.spacingM
                 }
-                
+
                 DankFlickable {
                     width: parent.width
                     height: parent.height - 40 
                     contentHeight: deviceColumn.height
                     clip: true
-                    
+
                     Column {
                         id: deviceColumn
                         width: parent.width
                         spacing: Theme.spacingS
-                        
+
                         Repeater {
                             model: audioDevicesDropdown.availableDevices
                             delegate: Rectangle {
                                 required property var modelData
                                 required property int index
-                                
+
                                 width: parent.width
                                 height: 48
                                 radius: Theme.cornerRadius
                                 color: deviceMouseAreaLeft.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.surfaceContainerHigh
                                 border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
                                 border.width: modelData === AudioService.sink ? 2 : 1
-                                
+
                                 Row {
                                     anchors.left: parent.left
                                     anchors.leftMargin: Theme.spacingM
                                     anchors.verticalCenter: parent.verticalCenter
                                     spacing: Theme.spacingM
                                     width: parent.width - Theme.spacingM * 2
-                                    
+
                                     DankIcon {
                                         name: getAudioDeviceIcon(modelData)
                                         size: 20
                                         color: modelData === AudioService.sink ? Theme.primary : Theme.surfaceText
                                         anchors.verticalCenter: parent.verticalCenter
                                     }
-                                    
+
                                     Column {
                                         anchors.verticalCenter: parent.verticalCenter
                                         width: parent.width - 20 - Theme.spacingM * 2
-                                        
+
                                         StyledText {
                                             text: AudioService.displayName(modelData)
                                             font.pixelSize: Theme.fontSizeMedium
@@ -466,7 +466,7 @@ Item {
                                             width: parent.width
                                             wrapMode: Text.NoWrap
                                         }
-                                        
+
                                         StyledText {
                                             text: modelData === AudioService.sink ? "Active" : "Available"
                                             font.pixelSize: Theme.fontSizeSmall
@@ -477,7 +477,7 @@ Item {
                                         }
                                     }
                                 }
-                                
+
                                 MouseArea {
                                     id: deviceMouseAreaLeft
                                     anchors.fill: parent
@@ -490,7 +490,7 @@ Item {
                                         audioDevicesButton.devicesExpanded = false
                                     }
                                 }
-                                
+
                                 Behavior on border.color { ColorAnimation { duration: Anims.durShort } }
                             }
                         }
@@ -793,7 +793,7 @@ Item {
                             font.pixelSize: Theme.fontSizeSmall
                             color: Theme.surfaceVariantText
                         }
-                        
+
                         StyledText {
                             anchors.right: parent.right
                             anchors.verticalCenter: parent.verticalCenter
@@ -812,7 +812,7 @@ Item {
                     Item {
                         width: parent.width
                         height: 50
-                        
+
                         Row {
                             anchors.centerIn: parent
                             spacing: Theme.spacingM

Modules/DankDash/Overview/CalendarOverviewCard.qml

@@ -92,12 +92,12 @@ Rectangle {
         anchors.fill: parent
         anchors.margins: Theme.spacingM
         spacing: Theme.spacingS
-        
+
         Item {
             width: parent.width
             height: 40
             visible: showEventDetails
-            
+
             Rectangle {
                 width: 32
                 height: 32
@@ -122,7 +122,7 @@ Rectangle {
                     onClicked: root.showEventDetails = false
                 }
             }
-            
+
             StyledText {
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -149,7 +149,7 @@ Rectangle {
             width: parent.width
             height: 28
             visible: !showEventDetails
-            
+
             Rectangle {
                 width: 28
                 height: 28
@@ -215,7 +215,7 @@ Rectangle {
                 }
             }
         }
-        
+
         Row {
             width: parent.width
             height: 18
@@ -248,14 +248,14 @@ Rectangle {
                 }
             }
         }
-        
+
         Grid {
             id: calendarGrid
             visible: !showEventDetails
-            
+
             property date displayDate: systemClock.date
             property date selectedDate: systemClock.date
-            
+
             readonly property date firstDay: {
                 const firstOfMonth = new Date(displayDate.getFullYear(), displayDate.getMonth(), 1)
                 return startOfWeek(firstOfMonth)
@@ -341,7 +341,7 @@ Rectangle {
             visible: showEventDetails
             clip: true
             spacing: Theme.spacingXS
-            
+
             delegate: Rectangle {
                 width: parent ? parent.width : 0
                 height: eventContent.implicitHeight + Theme.spacingS
@@ -377,7 +377,7 @@ Rectangle {
 
                 Column {
                     id: eventContent
-                    
+
                     anchors.left: parent.left
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
@@ -419,7 +419,7 @@ Rectangle {
 
                 MouseArea {
                     id: eventMouseArea
-                    
+
                     anchors.fill: parent
                     hoverEnabled: true
                     cursorShape: modelData.url ? Qt.PointingHandCursor : Qt.ArrowCursor

Modules/DankDash/Overview/Card.qml

@@ -4,9 +4,9 @@ import qs.Common
 
 Rectangle {
     id: card
-    
+
     property int pad: Theme.spacingM
-    
+
     radius: Theme.cornerRadius
     color: Theme.surfaceContainerHigh
     border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)

Modules/DankDash/Overview/ClockCard.qml

@@ -35,7 +35,7 @@ Card {
                     width: 28
                     horizontalAlignment: Text.AlignHCenter
                 }
-                
+
                 StyledText {
                     text: {
                         if (SettingsData.use24HourClock) {
@@ -53,7 +53,7 @@ Card {
                     horizontalAlignment: Text.AlignHCenter
                 }
             }
-            
+
             Row {
                 spacing: 0
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -66,7 +66,7 @@ Card {
                     width: 28
                     horizontalAlignment: Text.AlignHCenter
                 }
-                
+
                 StyledText {
                     text: String(systemClock?.date?.getMinutes()).padStart(2, '0').charAt(1)
                     font.pixelSize: 48
@@ -102,7 +102,7 @@ Card {
             }
 
         }
-        
+
         StyledText {
             text: systemClock?.date?.toLocaleDateString(Qt.locale(), "MMM dd")
             font.pixelSize: Theme.fontSizeSmall

Modules/DankDash/Overview/UserInfoCard.qml

@@ -92,7 +92,7 @@ Card {
                     }
                     // Just using truncated is always true initially idk
                     property bool shouldUseShort: longTextWidth > availableWidth
-                    
+
                     text: shouldUseShort ? UserInfoService.shortUptime : UserInfoService.uptime || "up 1h 23m"
                     font.pixelSize: Theme.fontSizeSmall
                     color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.7)

Modules/DankDash/Overview/WeatherOverviewCard.qml

@@ -47,18 +47,18 @@ Card {
         anchors.verticalCenter: parent.verticalCenter
         spacing: Theme.spacingL
         visible: WeatherService.weather.available && WeatherService.weather.temp !== 0
-        
+
         DankIcon {
             name: WeatherService.getWeatherIcon(WeatherService.weather.wCode)
             size: 48
             color: Theme.primary
             anchors.verticalCenter: parent.verticalCenter
         }
-        
+
         Column {
             spacing: Theme.spacingXS
             anchors.verticalCenter: parent.verticalCenter
-            
+
             StyledText {
                 text: {
                     const temp = SettingsData.useFahrenheit ? WeatherService.weather.tempF : WeatherService.weather.temp;
@@ -71,7 +71,7 @@ Card {
                 color: Theme.surfaceText
                 font.weight: Font.Light
             }
-            
+
             StyledText {
                 text: WeatherService.getWeatherCondition(WeatherService.weather.wCode)
                 font.pixelSize: Theme.fontSizeSmall

Modules/DankDash/WallpaperTab.qml

@@ -0,0 +1,523 @@
+import Qt.labs.folderlistmodel
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Effects
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import qs.Common
+import qs.Modals.FileBrowser
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+
+    implicitWidth: 700
+    implicitHeight: 410
+
+    property var wallpaperList: []
+    property string wallpaperDir: ""
+    property int currentPage: 0
+    property int itemsPerPage: 16
+    property int totalPages: Math.max(1, Math.ceil(wallpaperList.length / itemsPerPage))
+    property bool active: false
+    property Item focusTarget: wallpaperGrid
+    property Item tabBarItem: null
+    property int gridIndex: 0
+    property Item keyForwardTarget: null
+    property int lastPage: 0
+    property bool enableAnimation: false
+
+    signal requestTabChange(int newIndex)
+
+    onCurrentPageChanged: {
+        if (currentPage !== lastPage) {
+            enableAnimation = false
+            lastPage = currentPage
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible && active) {
+            setInitialSelection()
+        }
+    }
+
+    Component.onCompleted: {
+        loadWallpapers()
+        if (visible && active) {
+            setInitialSelection()
+        }
+    }
+
+    onActiveChanged: {
+        if (active && visible) {
+            setInitialSelection()
+        }
+    }
+
+    function handleKeyEvent(event) {
+        const columns = 4
+        const rows = 4
+        const currentRow = Math.floor(gridIndex / columns)
+        const currentCol = gridIndex % columns
+        const visibleCount = wallpaperGrid.model.length
+
+        if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+            if (gridIndex >= 0) {
+                const item = wallpaperGrid.currentItem
+                if (item && item.wallpaperPath) {
+                    SessionData.setWallpaper(item.wallpaperPath)
+                }
+            }
+            return true
+        }
+
+        if (event.key === Qt.Key_Right) {
+            if (gridIndex + 1 < visibleCount) {
+                // Move right within current page
+                gridIndex++
+            } else if (gridIndex === visibleCount - 1 && currentPage < totalPages - 1) {
+                // At last item in page, go to next page
+                gridIndex = 0
+                currentPage++
+            }
+            return true
+        }
+
+        if (event.key === Qt.Key_Left) {
+            if (gridIndex > 0) {
+                // Move left within current page
+                gridIndex--
+            } else if (gridIndex === 0 && currentPage > 0) {
+                // At first item in page, go to previous page (last item)
+                currentPage--
+                gridIndex = Math.min(itemsPerPage - 1, wallpaperList.length - currentPage * itemsPerPage - 1)
+            }
+            return true
+        }
+
+        if (event.key === Qt.Key_Down) {
+            if (gridIndex + columns < visibleCount) {
+                // Move down within current page
+                gridIndex += columns
+            } else if (gridIndex >= visibleCount - columns && currentPage < totalPages - 1) {
+                // In last row, go to next page
+                gridIndex = currentCol
+                currentPage++
+            }
+            return true
+        }
+
+        if (event.key === Qt.Key_Up) {
+            if (gridIndex >= columns) {
+                // Move up within current page
+                gridIndex -= columns
+            } else if (gridIndex < columns && currentPage > 0) {
+                // In first row, go to previous page (last row)
+                currentPage--
+                const prevPageCount = Math.min(itemsPerPage, wallpaperList.length - currentPage * itemsPerPage)
+                const prevPageRows = Math.ceil(prevPageCount / columns)
+                gridIndex = (prevPageRows - 1) * columns + currentCol
+                gridIndex = Math.min(gridIndex, prevPageCount - 1)
+            }
+            return true
+        }
+
+        if (event.key === Qt.Key_PageUp && currentPage > 0) {
+            gridIndex = 0
+            currentPage--
+            return true
+        }
+
+        if (event.key === Qt.Key_PageDown && currentPage < totalPages - 1) {
+            gridIndex = 0
+            currentPage++
+            return true
+        }
+
+        if (event.key === Qt.Key_Home && event.modifiers & Qt.ControlModifier) {
+            gridIndex = 0
+            currentPage = 0
+            return true
+        }
+
+        if (event.key === Qt.Key_End && event.modifiers & Qt.ControlModifier) {
+            gridIndex = 0
+            currentPage = totalPages - 1
+            return true
+        }
+
+        return false
+    }
+
+    function setInitialSelection() {
+        if (!SessionData.wallpaperPath) {
+            gridIndex = 0
+            return
+        }
+
+        const startIndex = currentPage * itemsPerPage
+        const endIndex = Math.min(startIndex + itemsPerPage, wallpaperList.length)
+        const pageWallpapers = wallpaperList.slice(startIndex, endIndex)
+
+        for (let i = 0; i < pageWallpapers.length; i++) {
+            if (pageWallpapers[i] === SessionData.wallpaperPath) {
+                gridIndex = i
+                return
+            }
+        }
+        gridIndex = 0
+    }
+
+    onWallpaperListChanged: {
+        if (visible && active) {
+            setInitialSelection()
+        }
+    }
+
+    function loadWallpapers() {
+        const currentWallpaper = SessionData.wallpaperPath
+        
+        // Try current wallpaper path / fallback to wallpaperLastPath
+        if (!currentWallpaper || currentWallpaper.startsWith("#") || currentWallpaper.startsWith("we:")) {
+            if (CacheData.wallpaperLastPath && CacheData.wallpaperLastPath !== "") {
+                wallpaperDir = CacheData.wallpaperLastPath
+            } else {
+                wallpaperDir = ""
+                wallpaperList = []
+            }
+            return
+        }
+
+        wallpaperDir = currentWallpaper.substring(0, currentWallpaper.lastIndexOf('/'))
+    }
+
+    function updateWallpaperList() {
+        if (!wallpaperFolderModel || wallpaperFolderModel.count === 0) {
+            wallpaperList = []
+            currentPage = 0
+            gridIndex = 0
+            return
+        }
+
+        // Build list from FolderListModel
+        const files = []
+        for (let i = 0; i < wallpaperFolderModel.count; i++) {
+            const filePath = wallpaperFolderModel.get(i, "filePath")
+            if (filePath) {
+                // Remove file:// prefix if present
+                const cleanPath = filePath.toString().replace(/^file:\/\//, '')
+                files.push(cleanPath)
+            }
+        }
+
+        wallpaperList = files
+
+        const currentPath = SessionData.wallpaperPath
+        const selectedIndex = currentPath ? wallpaperList.indexOf(currentPath) : -1
+
+        if (selectedIndex >= 0) {
+            currentPage = Math.floor(selectedIndex / itemsPerPage)
+            gridIndex = selectedIndex % itemsPerPage
+        } else {
+            const maxPage = Math.max(0, Math.ceil(files.length / itemsPerPage) - 1)
+            currentPage = Math.min(Math.max(0, currentPage), maxPage)
+            gridIndex = 0
+        }
+    }
+
+    Connections {
+        target: SessionData
+        function onWallpaperPathChanged() {
+            loadWallpapers()
+        }
+    }
+
+    FolderListModel {
+        id: wallpaperFolderModel
+
+        showDirsFirst: false
+        showDotAndDotDot: false
+        showHidden: false
+        nameFilters: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+        showFiles: true
+        showDirs: false
+        sortField: FolderListModel.Name
+        folder: wallpaperDir ? "file://" + wallpaperDir : ""
+
+        onStatusChanged: {
+            if (status === FolderListModel.Ready) {
+                updateWallpaperList()
+            }
+        }
+
+        onCountChanged: {
+            if (status === FolderListModel.Ready) {
+                updateWallpaperList()
+            }
+        }
+    }
+
+    Loader {
+        id: wallpaperBrowserLoader
+        active: false
+        asynchronous: true
+
+        sourceComponent: FileBrowserModal {
+            Component.onCompleted: {
+                open()
+            }
+            browserTitle: "Select Wallpaper Directory"
+            browserIcon: "folder_open"
+            browserType: "wallpaper"
+            showHiddenFiles: false
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            allowStacking: true
+            
+            onFileSelected: (path) => {
+                // Set the selected wallpaper
+                const cleanPath = path.replace(/^file:\/\//, '')
+                SessionData.setWallpaper(cleanPath)
+                
+                // Extract directory from the selected file and load all wallpapers
+                const dirPath = cleanPath.substring(0, cleanPath.lastIndexOf('/'))
+                if (dirPath) {
+                    wallpaperDir = dirPath
+                    CacheData.wallpaperLastPath = dirPath
+                    CacheData.saveCache()
+                }
+                close()
+            }
+            
+            onDialogClosed: {
+                Qt.callLater(() => wallpaperBrowserLoader.active = false)
+            }
+        }
+    }
+
+    Column {
+        anchors.fill: parent
+        spacing: 0
+
+        Item {
+            width: parent.width
+            height: parent.height - 50
+
+            GridView {
+                id: wallpaperGrid
+                anchors.centerIn: parent
+                width: parent.width - Theme.spacingS
+                height: parent.height - Theme.spacingS
+                cellWidth: width / 4
+                cellHeight: height / 4
+                clip: true
+                enabled: root.active
+                interactive: root.active
+                boundsBehavior: Flickable.StopAtBounds
+                keyNavigationEnabled: false
+                activeFocusOnTab: false
+                highlightFollowsCurrentItem: true
+                highlightMoveDuration: enableAnimation ? Theme.shortDuration : 0
+                focus: false
+
+                highlight: Item {
+                    z: 1000
+                    Rectangle {
+                        anchors.fill: parent
+                        anchors.margins: Theme.spacingXS
+                        color: "transparent"
+                        border.width: 3
+                        border.color: Theme.primary
+                        radius: Theme.cornerRadius
+                    }
+                }
+
+                model: {
+                    const startIndex = currentPage * itemsPerPage
+                    const endIndex = Math.min(startIndex + itemsPerPage, wallpaperList.length)
+                    return wallpaperList.slice(startIndex, endIndex)
+                }
+
+                onModelChanged: {
+                    const clampedIndex = model.length > 0 ? Math.min(Math.max(0, gridIndex), model.length - 1) : 0
+                    if (gridIndex !== clampedIndex) {
+                        gridIndex = clampedIndex
+                    }
+                }
+
+                onCountChanged: {
+                    if (count > 0) {
+                        const clampedIndex = Math.min(gridIndex, count - 1)
+                        currentIndex = clampedIndex
+                        positionViewAtIndex(clampedIndex, GridView.Contain)
+                    }
+                    enableAnimation = true
+                }
+
+                Connections {
+                    target: root
+                    function onGridIndexChanged() {
+                        if (enableAnimation && wallpaperGrid.count > 0) {
+                            wallpaperGrid.currentIndex = gridIndex
+                        }
+                    }
+                }
+
+                delegate: Item {
+                    width: wallpaperGrid.cellWidth
+                    height: wallpaperGrid.cellHeight
+
+                    property string wallpaperPath: modelData || ""
+                    property bool isSelected: SessionData.wallpaperPath === modelData
+
+                    Rectangle {
+                        id: wallpaperCard
+                        anchors.fill: parent
+                        anchors.margins: Theme.spacingXS
+                        color: Theme.surfaceContainerHighest
+                        radius: Theme.cornerRadius
+                        clip: true
+
+                        Rectangle {
+                            anchors.fill: parent
+                            color: isSelected ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.15) : "transparent"
+                            radius: parent.radius
+
+                            Behavior on color {
+                                ColorAnimation {
+                                    duration: Theme.shortDuration
+                                    easing.type: Theme.standardEasing
+                                }
+                            }
+                        }
+
+                        Image {
+                            id: thumbnailImage
+                            anchors.fill: parent
+                            source: modelData ? `file://${modelData}` : ""
+                            fillMode: Image.PreserveAspectCrop
+                            asynchronous: true
+                            cache: true
+                            smooth: true
+
+                            layer.enabled: true
+                            layer.effect: MultiEffect {
+                                maskEnabled: true
+                                maskThresholdMin: 0.5
+                                maskSpreadAtMin: 1.0
+                                maskSource: ShaderEffectSource {
+                                    sourceItem: Rectangle {
+                                        width: thumbnailImage.width
+                                        height: thumbnailImage.height
+                                        radius: Theme.cornerRadius
+                                    }
+                                }
+                            }
+                        }
+
+                        BusyIndicator {
+                            anchors.centerIn: parent
+                            running: thumbnailImage.status === Image.Loading
+                            visible: running
+                        }
+
+                        StateLayer {
+                            anchors.fill: parent
+                            cornerRadius: parent.radius
+                            stateColor: Theme.primary
+                        }
+
+                        MouseArea {
+                            id: wallpaperMouseArea
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            cursorShape: Qt.PointingHandCursor
+
+                            onClicked: {
+                                gridIndex = index
+                                if (modelData) {
+                                    SessionData.setWallpaper(modelData)
+                                }
+                                // Don't steal focus - let mainContainer keep it for keyboard nav
+                            }
+                        }
+                    }
+                }
+            }
+
+            StyledText {
+                anchors.centerIn: parent
+                visible: wallpaperList.length === 0
+                text: "No wallpapers found\n\nClick the folder icon below to browse"
+                font.pixelSize: 14
+                color: Theme.outline
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
+
+        Row {
+            width: parent.width
+            height: 50
+            spacing: Theme.spacingS
+
+            Item {
+                width: (parent.width - controlsRow.width - browseButton.width - Theme.spacingS) / 2
+                height: parent.height
+            }
+
+            Row {
+                id: controlsRow
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Theme.spacingS
+
+                DankActionButton {
+                    anchors.verticalCenter: parent.verticalCenter
+                    iconName: "skip_previous"
+                    iconSize: 20
+                    buttonSize: 32
+                    enabled: currentPage > 0
+                    opacity: enabled ? 1.0 : 0.3
+                    onClicked: {
+                        if (currentPage > 0) {
+                            currentPage--
+                        }
+                    }
+                }
+
+                StyledText {
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: wallpaperList.length > 0 ? `${wallpaperList.length} wallpapers  •  ${currentPage + 1} / ${totalPages}` : "No wallpapers"
+                    font.pixelSize: 14
+                    color: Theme.surfaceText
+                    opacity: 0.7
+                }
+
+                DankActionButton {
+                    anchors.verticalCenter: parent.verticalCenter
+                    iconName: "skip_next"
+                    iconSize: 20
+                    buttonSize: 32
+                    enabled: currentPage < totalPages - 1
+                    opacity: enabled ? 1.0 : 0.3
+                    onClicked: {
+                        if (currentPage < totalPages - 1) {
+                            currentPage++
+                        }
+                    }
+                }
+            }
+
+            DankActionButton {
+                id: browseButton
+                anchors.verticalCenter: parent.verticalCenter
+                iconName: "folder_open"
+                iconSize: 20
+                buttonSize: 32
+                opacity: 0.7
+                onClicked: wallpaperBrowserLoader.active = true
+            }
+        }
+    }
+}

Modules/DankDash/WeatherTab.qml

@@ -132,7 +132,7 @@ Item {
                             anchors.left: tempText.right
                             anchors.leftMargin: Theme.spacingXS
                             anchors.verticalCenter: parent.verticalCenter
-                            
+
                             MouseArea {
                                 anchors.fill: parent
                                 hoverEnabled: true
@@ -540,7 +540,7 @@ Item {
                         width: (parent.width - Theme.spacingXS * 6) / 7
                         height: parent.height
                         radius: Theme.cornerRadius
-                        
+
                         property var dayDate: {
                             const date = new Date()
                             date.setDate(date.getDate() + index)

Modules/Dock/Dock.qml

@@ -252,8 +252,8 @@ Variants {
             property real currentScreen: modelData ? modelData : dock.screen
             property real screenWidth: currentScreen ? currentScreen.geometry.width : 1920
             property real screenHeight: currentScreen ? currentScreen.geometry.height : 1080
-            property real maxDockWidth: Math.min(screenWidth * 0.8, 1200)
-            property real maxDockHeight: Math.min(screenHeight * 0.8, 1200)
+            property real maxDockWidth: screenWidth * 0.98
+            property real maxDockHeight: screenHeight * 0.98
 
             height: {
                 if (dock.isVertical) {

Modules/Greetd/GreeterContent.qml

@@ -7,7 +7,6 @@ import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Greetd
 import Quickshell.Services.Pam
-import Quickshell.Services.Mpris
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -16,8 +15,6 @@ import qs.Modules.Lock
 Item {
     id: root
 
-    required property var sessionLock
-
     readonly property string xdgDataDirs: Quickshell.env("XDG_DATA_DIRS")
     property string screenName: ""
     property string randomFact: ""
@@ -117,21 +114,6 @@ Item {
         onTriggered: updateHyprlandLayout()
     }
 
-    // ! This was for development and testing, just leaving so people can see how I did it.
-    // Timer {
-    //     id: autoUnlockTimer
-    //     interval: 10000
-    //     running: true
-    //     onTriggered: {
-    //         root.sessionLock.locked = false
-    //         GreeterState.unlocking = true
-    //         const sessionCmd = GreeterState.selectedSession || GreeterState.sessionExecs[GreeterState.currentSessionIndex]
-    //         if (sessionCmd) {
-    //             GreetdMemory.setLastSessionId(sessionCmd.split(" ")[0])
-    //             Greetd.launch(sessionCmd.split(" "), [], true)
-    //         }
-    //     }
-    // }
 
     Connections {
         target: GreetdMemory
@@ -173,7 +155,7 @@ Item {
             }
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
-        fillMode: Image.PreserveAspectCrop
+        fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
         smooth: true
         asynchronous: false
         cache: true
@@ -673,180 +655,11 @@ Item {
                 height: 24
                 color: Qt.rgba(255, 255, 255, 0.2)
                 anchors.verticalCenter: parent.verticalCenter
-                visible: MprisController.activePlayer
-            }
-
-            Row {
-                spacing: Theme.spacingS
-                visible: MprisController.activePlayer
-                anchors.verticalCenter: parent.verticalCenter
-
-                Item {
-                    width: 20
-                    height: Theme.iconSize
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    Loader {
-                        active: MprisController.activePlayer?.playbackState === MprisPlaybackState.Playing
-
-                        sourceComponent: Component {
-                            Ref {
-                                service: CavaService
-                            }
-                        }
-                    }
-
-                    Timer {
-                        running: !CavaService.cavaAvailable && MprisController.activePlayer?.playbackState === MprisPlaybackState.Playing
-                        interval: 256
-                        repeat: true
-                        onTriggered: {
-                            CavaService.values = [Math.random() * 40 + 10, Math.random() * 60 + 20, Math.random() * 50 + 15, Math.random() * 35 + 20, Math.random() * 45 + 15, Math.random() * 55 + 25]
-                        }
-                    }
-
-                    Row {
-                        anchors.centerIn: parent
-                        spacing: 1.5
-
-                        Repeater {
-                            model: 6
-
-                            Rectangle {
-                                width: 2
-                                height: {
-                                    if (MprisController.activePlayer?.playbackState === MprisPlaybackState.Playing && CavaService.values.length > index) {
-                                        const rawLevel = CavaService.values[index] || 0
-                                        const scaledLevel = Math.sqrt(Math.min(Math.max(rawLevel, 0), 100) / 100) * 100
-                                        const maxHeight = Theme.iconSize - 2
-                                        const minHeight = 3
-                                        return minHeight + (scaledLevel / 100) * (maxHeight - minHeight)
-                                    }
-                                    return 3
-                                }
-                                radius: 1.5
-                                color: "white"
-                                anchors.verticalCenter: parent.verticalCenter
-
-                                Behavior on height {
-                                    NumberAnimation {
-                                        duration: Anims.durShort
-                                        easing.type: Easing.BezierSpline
-                                        easing.bezierCurve: Anims.standardDecel
-                                    }
-                                }
-                            }
-                        }
-                    }
+                visible: {
+                    const keyboardVisible = (CompositorService.isNiri && NiriService.keyboardLayoutNames.length > 1) ||
+                                          (CompositorService.isHyprland && hyprlandLayoutCount > 1)
+                    return keyboardVisible && WeatherService.weather.available
                 }
-
-                StyledText {
-                    text: {
-                        const player = MprisController.activePlayer
-                        if (!player?.trackTitle)
-                            return ""
-                        const title = player.trackTitle
-                        const artist = player.trackArtist || ""
-                        return artist ? title + " • " + artist : title
-                    }
-                    font.pixelSize: Theme.fontSizeLarge
-                    color: "white"
-                    opacity: 0.9
-                    anchors.verticalCenter: parent.verticalCenter
-                    elide: Text.ElideRight
-                    width: Math.min(implicitWidth, 400)
-                    wrapMode: Text.NoWrap
-                    maximumLineCount: 1
-                }
-
-                Row {
-                    spacing: Theme.spacingXS
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    Rectangle {
-                        width: 20
-                        height: 20
-                        radius: 10
-                        anchors.verticalCenter: parent.verticalCenter
-                        color: prevArea.containsMouse ? Qt.rgba(255, 255, 255, 0.2) : "transparent"
-                        visible: MprisController.activePlayer
-                        opacity: (MprisController.activePlayer?.canGoPrevious ?? false) ? 1 : 0.3
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: "skip_previous"
-                            size: 12
-                            color: "white"
-                        }
-
-                        MouseArea {
-                            id: prevArea
-                            anchors.fill: parent
-                            enabled: MprisController.activePlayer?.canGoPrevious ?? false
-                            hoverEnabled: enabled
-                            cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            onClicked: MprisController.activePlayer?.previous()
-                        }
-                    }
-
-                    Rectangle {
-                        width: 24
-                        height: 24
-                        radius: 12
-                        anchors.verticalCenter: parent.verticalCenter
-                        color: MprisController.activePlayer?.playbackState === MprisPlaybackState.Playing ? Qt.rgba(255, 255, 255, 0.9) : Qt.rgba(255, 255, 255, 0.2)
-                        visible: MprisController.activePlayer
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: MprisController.activePlayer?.playbackState === MprisPlaybackState.Playing ? "pause" : "play_arrow"
-                            size: 14
-                            color: MprisController.activePlayer?.playbackState === MprisPlaybackState.Playing ? "black" : "white"
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            enabled: MprisController.activePlayer
-                            hoverEnabled: enabled
-                            cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            onClicked: MprisController.activePlayer?.togglePlaying()
-                        }
-                    }
-
-                    Rectangle {
-                        width: 20
-                        height: 20
-                        radius: 10
-                        anchors.verticalCenter: parent.verticalCenter
-                        color: nextArea.containsMouse ? Qt.rgba(255, 255, 255, 0.2) : "transparent"
-                        visible: MprisController.activePlayer
-                        opacity: (MprisController.activePlayer?.canGoNext ?? false) ? 1 : 0.3
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: "skip_next"
-                            size: 12
-                            color: "white"
-                        }
-
-                        MouseArea {
-                            id: nextArea
-                            anchors.fill: parent
-                            enabled: MprisController.activePlayer?.canGoNext ?? false
-                            hoverEnabled: enabled
-                            cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            onClicked: MprisController.activePlayer?.next()
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                width: 1
-                height: 24
-                color: Qt.rgba(255, 255, 255, 0.2)
-                anchors.verticalCenter: parent.verticalCenter
-                visible: MprisController.activePlayer && WeatherService.weather.available
             }
 
             Row {
@@ -1247,7 +1060,6 @@ Item {
         }
 
         function onReadyToLaunch() {
-            root.sessionLock.locked = false
             GreeterState.unlocking = true
             const sessionCmd = GreeterState.selectedSession || GreeterState.sessionExecs[GreeterState.currentSessionIndex]
             if (sessionCmd) {

Modules/Greetd/GreeterSurface.qml

@@ -1,18 +1,34 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Services.Greetd
+import qs.Common
 
-WlSessionLockSurface {
-    id: root
+Variants {
+    model: Quickshell.screens
 
-    required property WlSessionLock lock
+    PanelWindow {
+        id: root
 
-    color: "transparent"
+        property var modelData
 
-    GreeterContent {
-        anchors.fill: parent
-        screenName: root.screen?.name ?? ""
-        sessionLock: root.lock
+        screen: modelData
+        anchors {
+            left: true
+            right: true
+            top: true
+            bottom: true
+        }
+        exclusionMode: ExclusionMode.Normal
+        WlrLayershell.layer: WlrLayer.Overlay
+        WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+        color: "transparent"
+
+        GreeterContent {
+            anchors.fill: parent
+            screenName: root.screen?.name ?? ""
+        }
     }
 }

Modules/Greetd/README.md

@@ -31,31 +31,10 @@ sudo systemctl enable greetd
 
 #### Syncing themes (Optional)
 
-To sync your wallpaper and theme with the greeter login screen:
-
-```bash
-dms-greeter-sync
-```
-
-Then logout/login for changes to take effect. Your wallpaper and theme will appear on the greeter!
+To sync your wallpaper and theme with the greeter login screen, follow the manual setup below:
 
 <details>
-<summary>What does dms-greeter-sync do?</summary>
-
-The `dms-greeter-sync` helper automatically:
-- Adds you to the greeter group
-- Sets minimal ACL permissions on parent directories (traverse only)
-- Sets group ownership on your DMS config directories
-- Creates symlinks to share your theme files with the greeter
-
-This uses standard Linux ACLs (Access Control Lists) - the same security model used by GNOME, KDE, and systemd. The greeter user only gets traverse permission through your directories and can only read the specific theme files you share.
-
-</details>
-
-<details>
-<summary>Manual theme syncing (advanced)</summary>
-
-If you prefer to set up theme syncing manually:
+<summary>Manual theme syncing</summary>
 
 ```bash
 # Add yourself to greeter group
@@ -100,6 +79,7 @@ The package automatically:
 - Sets up directories and permissions
 - Configures greetd with auto-detected compositor
 - Applies SELinux contexts
+- Installs the `dms-greeter-sync` helper script
 
 Then disable existing display manager and enable greetd:
 
@@ -108,7 +88,9 @@ sudo systemctl disable gdm sddm lightdm
 sudo systemctl enable greetd
 ```
 
-**Optional:** Sync your theme with the greeter:
+#### Syncing themes (Optional)
+
+The RPM package includes the `dms-greeter-sync` helper for easy theme syncing:
 
 ```bash
 dms-greeter-sync
@@ -116,6 +98,19 @@ dms-greeter-sync
 
 Then logout/login to see your wallpaper on the greeter!
 
+<details>
+<summary>What does dms-greeter-sync do?</summary>
+
+The `dms-greeter-sync` helper automatically:
+- Adds you to the greeter group
+- Sets minimal ACL permissions on parent directories (traverse only)
+- Sets group ownership on your DMS config directories
+- Creates symlinks to share your theme files with the greeter
+
+This uses standard Linux ACLs (Access Control Lists) - the same security model used by GNOME, KDE, and systemd. The greeter user only gets traverse permission through your directories and can only read the specific theme files you share.
+
+</details>
+
 ### Automatic
 
 The easiest thing is to run `dms greeter install` or `dms` for interactive installation.
@@ -167,12 +162,7 @@ sudo systemctl disable gdm sddm lightdm
 sudo systemctl enable greetd
 ```
 
-8. (Optional) Install the `dms-greeter-sync` helper for easy theme syncing:
-```bash
-# Download or copy the dms-greeter-sync script from the spec file
-sudo cp /path/to/dms-greeter-sync /usr/local/bin/dms-greeter-sync
-sudo chmod +x /usr/local/bin/dms-greeter-sync
-```
+8. (Optional) Set up theme syncing using the manual ACL method described in the Configuration → Personalization section below
 
 #### Legacy installation (deprecated)
 

Modules/HyprWorkspaces/HyprlandOverview.qml

@@ -0,0 +1,284 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import Quickshell.Hyprland
+import qs.Common
+import qs.Services
+
+Scope {
+    id: overviewScope
+
+    property bool overviewOpen: false
+
+    Loader {
+        id: hyprlandLoader
+        active: overviewScope.overviewOpen
+        asynchronous: false
+
+        sourceComponent: Variants {
+            id: overviewVariants
+            model: Quickshell.screens
+
+            PanelWindow {
+                id: root
+                required property var modelData
+                readonly property HyprlandMonitor monitor: Hyprland.monitorFor(root.screen)
+                property bool monitorIsFocused: (Hyprland.focusedMonitor?.id == monitor?.id)
+
+                screen: modelData
+                visible: overviewScope.overviewOpen
+                color: "transparent"
+
+                WlrLayershell.namespace: "quickshell:overview"
+                WlrLayershell.layer: WlrLayer.Overlay
+                WlrLayershell.exclusiveZone: -1
+                WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
+
+                anchors {
+                    top: true
+                    left: true
+                    right: true
+                    bottom: true
+                }
+
+            HyprlandFocusGrab {
+                id: grab
+                windows: [root]
+                active: false
+                property bool hasBeenActivated: false
+                onActiveChanged: {
+                    if (active) {
+                        hasBeenActivated = true
+                    }
+                }
+                onCleared: () => {
+                    if (hasBeenActivated && overviewScope.overviewOpen) {
+                        overviewScope.overviewOpen = false
+                    }
+                }
+            }
+
+            Connections {
+                target: overviewScope
+                function onOverviewOpenChanged() {
+                    if (overviewScope.overviewOpen) {
+                        grab.hasBeenActivated = false
+                        delayedGrabTimer.start()
+                    } else {
+                        delayedGrabTimer.stop()
+                        grab.active = false
+                        grab.hasBeenActivated = false
+                    }
+                }
+            }
+
+            Connections {
+                target: root
+                function onMonitorIsFocusedChanged() {
+                    if (overviewScope.overviewOpen && root.monitorIsFocused && !grab.active) {
+                        grab.hasBeenActivated = false
+                        grab.active = true
+                    } else if (overviewScope.overviewOpen && !root.monitorIsFocused && grab.active) {
+                        grab.active = false
+                    }
+                }
+            }
+
+            Timer {
+                id: delayedGrabTimer
+                interval: 150
+                repeat: false
+                onTriggered: {
+                    if (overviewScope.overviewOpen && root.monitorIsFocused) {
+                        grab.active = true
+                    }
+                }
+            }
+
+            Timer {
+                id: closeTimer
+                interval: Theme.expressiveDurations.expressiveDefaultSpatial + 120
+                onTriggered: {
+                    root.visible = false
+                }
+            }
+
+            Rectangle {
+                id: background
+                anchors.fill: parent
+                color: "black"
+                opacity: overviewScope.overviewOpen ? 0.5 : 0
+
+                Behavior on opacity {
+                    NumberAnimation {
+                        duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                        easing.type: Easing.BezierSpline
+                        easing.bezierCurve: overviewScope.overviewOpen ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: mouse => {
+                        const localPos = mapToItem(contentContainer, mouse.x, mouse.y)
+                        if (localPos.x < 0 || localPos.x > contentContainer.width || localPos.y < 0 || localPos.y > contentContainer.height) {
+                            overviewScope.overviewOpen = false
+                            closeTimer.restart()
+                        }
+                    }
+                }
+            }
+
+            Item {
+                id: contentContainer
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.top: parent.top
+                anchors.topMargin: 100
+                width: childrenRect.width
+                height: childrenRect.height
+
+                opacity: overviewScope.overviewOpen ? 1 : 0
+                transform: [scaleTransform, motionTransform]
+
+                Scale {
+                    id: scaleTransform
+                    origin.x: contentContainer.width / 2
+                    origin.y: contentContainer.height / 2
+                    xScale: overviewScope.overviewOpen ? 1 : 0.96
+                    yScale: overviewScope.overviewOpen ? 1 : 0.96
+
+                    Behavior on xScale {
+                        NumberAnimation {
+                            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                            easing.type: Easing.BezierSpline
+                            easing.bezierCurve: overviewScope.overviewOpen ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
+                        }
+                    }
+
+                    Behavior on yScale {
+                        NumberAnimation {
+                            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                            easing.type: Easing.BezierSpline
+                            easing.bezierCurve: overviewScope.overviewOpen ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
+                        }
+                    }
+                }
+
+                Translate {
+                    id: motionTransform
+                    x: 0
+                    y: overviewScope.overviewOpen ? 0 : Theme.spacingL
+
+                    Behavior on y {
+                        NumberAnimation {
+                            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                            easing.type: Easing.BezierSpline
+                            easing.bezierCurve: overviewScope.overviewOpen ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
+                        }
+                    }
+                }
+
+                Behavior on opacity {
+                    NumberAnimation {
+                        duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                        easing.type: Easing.BezierSpline
+                        easing.bezierCurve: overviewScope.overviewOpen ? Theme.expressiveCurves.expressiveDefaultSpatial : Theme.expressiveCurves.emphasized
+                    }
+                }
+
+                Loader {
+                    id: overviewLoader
+                    active: overviewScope.overviewOpen
+                    asynchronous: false
+
+                    sourceComponent: OverviewWidget {
+                        panelWindow: root
+                        overviewOpen: overviewScope.overviewOpen
+                    }
+                }
+            }
+
+            FocusScope {
+                id: focusScope
+                anchors.fill: parent
+                visible: overviewScope.overviewOpen
+                focus: overviewScope.overviewOpen && root.monitorIsFocused
+
+                Keys.onEscapePressed: event => {
+                    if (!root.monitorIsFocused) return
+                    overviewScope.overviewOpen = false
+                    closeTimer.restart()
+                    event.accepted = true
+                }
+
+                Keys.onPressed: event => {
+                    if (!root.monitorIsFocused) return
+
+                    if (event.key === Qt.Key_Left || event.key === Qt.Key_Right) {
+                        if (!overviewLoader.item) return
+
+                        const thisMonitorWorkspaceIds = overviewLoader.item.thisMonitorWorkspaceIds
+                        if (thisMonitorWorkspaceIds.length === 0) return
+
+                        const currentId = root.monitor.activeWorkspace?.id ?? thisMonitorWorkspaceIds[0]
+                        const currentIndex = thisMonitorWorkspaceIds.indexOf(currentId)
+
+                        let targetIndex
+                        if (event.key === Qt.Key_Left) {
+                            targetIndex = currentIndex - 1
+                            if (targetIndex < 0) targetIndex = thisMonitorWorkspaceIds.length - 1
+                        } else {
+                            targetIndex = currentIndex + 1
+                            if (targetIndex >= thisMonitorWorkspaceIds.length) targetIndex = 0
+                        }
+
+                        const targetId = thisMonitorWorkspaceIds[targetIndex]
+                        Hyprland.dispatch("workspace " + targetId)
+                        event.accepted = true
+                    }
+                }
+
+                onVisibleChanged: {
+                    if (visible && overviewScope.overviewOpen && root.monitorIsFocused) {
+                        Qt.callLater(() => focusScope.forceActiveFocus())
+                    }
+                }
+
+                Connections {
+                    target: root
+                    function onMonitorIsFocusedChanged() {
+                        if (root.monitorIsFocused && overviewScope.overviewOpen) {
+                            Qt.callLater(() => focusScope.forceActiveFocus())
+                        }
+                    }
+                }
+            }
+
+            onVisibleChanged: {
+                if (visible && overviewScope.overviewOpen) {
+                    Qt.callLater(() => focusScope.forceActiveFocus())
+                } else if (!visible) {
+                    grab.active = false
+                }
+            }
+
+            Connections {
+                target: overviewScope
+                function onOverviewOpenChanged() {
+                    if (overviewScope.overviewOpen) {
+                        closeTimer.stop()
+                        root.visible = true
+                        Qt.callLater(() => focusScope.forceActiveFocus())
+                    } else {
+                        closeTimer.restart()
+                        grab.active = false
+                    }
+                }
+            }
+        }
+        }
+    }
+}

Modules/HyprWorkspaces/OverviewWidget.qml

@@ -0,0 +1,428 @@
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Hyprland
+import qs.Common
+import qs.Services
+import qs.Widgets
+
+Item {
+    id: root
+    required property var panelWindow
+    required property bool overviewOpen
+    readonly property HyprlandMonitor monitor: Hyprland.monitorFor(panelWindow.screen)
+    readonly property int workspacesShown: SettingsData.overviewRows * SettingsData.overviewColumns
+
+    readonly property var allWorkspaces: Hyprland.workspaces?.values || []
+    readonly property var allWorkspaceIds: {
+        const workspaces = allWorkspaces
+        if (!workspaces || workspaces.length === 0) return []
+        try {
+            const ids = workspaces.map(ws => ws?.id).filter(id => id !== null && id !== undefined)
+            return ids.sort((a, b) => a - b)
+        } catch (e) {
+            return []
+        }
+    }
+
+    readonly property var thisMonitorWorkspaceIds: {
+        const workspaces = allWorkspaces
+        const mon = monitor
+        if (!workspaces || workspaces.length === 0 || !mon) return []
+        try {
+            const filtered = workspaces.filter(ws => ws?.monitor?.name === mon.name)
+            return filtered.map(ws => ws?.id).filter(id => id !== null && id !== undefined).sort((a, b) => a - b)
+        } catch (e) {
+            return []
+        }
+    }
+
+    readonly property var displayedWorkspaceIds: {
+        if (!allWorkspaceIds || allWorkspaceIds.length === 0) {
+            const result = []
+            for (let i = 1; i <= workspacesShown; i++) {
+                result.push(i)
+            }
+            return result
+        }
+
+        try {
+            const maxExisting = Math.max(...allWorkspaceIds)
+            const totalNeeded = Math.max(workspacesShown, allWorkspaceIds.length)
+            const result = []
+
+            for (let i = 1; i <= maxExisting; i++) {
+                result.push(i)
+            }
+
+            let nextId = maxExisting + 1
+            while (result.length < totalNeeded) {
+                result.push(nextId)
+                nextId++
+            }
+
+            return result
+        } catch (e) {
+            const result = []
+            for (let i = 1; i <= workspacesShown; i++) {
+                result.push(i)
+            }
+            return result
+        }
+    }
+
+    readonly property int minWorkspaceId: displayedWorkspaceIds.length > 0 ? displayedWorkspaceIds[0] : 1
+    readonly property int maxWorkspaceId: displayedWorkspaceIds.length > 0 ? displayedWorkspaceIds[displayedWorkspaceIds.length - 1] : workspacesShown
+    readonly property int displayWorkspaceCount: displayedWorkspaceIds.length
+
+    function getWorkspaceMonitorName(workspaceId) {
+        if (!allWorkspaces || !workspaceId) return ""
+        try {
+            const ws = allWorkspaces.find(w => w?.id === workspaceId)
+            return ws?.monitor?.name ?? ""
+        } catch (e) {
+            return ""
+        }
+    }
+
+    function workspaceHasWindows(workspaceId) {
+        if (!workspaceId) return false
+        try {
+            const workspace = allWorkspaces.find(ws => ws?.id === workspaceId)
+            if (!workspace) return false
+            const toplevels = workspace?.toplevels?.values || []
+            return toplevels.length > 0
+        } catch (e) {
+            return false
+        }
+    }
+
+    property bool monitorIsFocused: monitor?.focused ?? false
+    property real scale: SettingsData.overviewScale
+    property color activeBorderColor: Theme.primary
+
+    property real workspaceImplicitWidth: ((monitor.width / monitor.scale) * root.scale)
+    property real workspaceImplicitHeight: ((monitor.height / monitor.scale) * root.scale)
+
+    property int workspaceZ: 0
+    property int windowZ: 1
+    property int monitorLabelZ: 2
+    property int windowDraggingZ: 99999
+    property real workspaceSpacing: 5
+
+    property int draggingFromWorkspace: -1
+    property int draggingTargetWorkspace: -1
+
+    implicitWidth: overviewBackground.implicitWidth + Theme.spacingL * 2
+    implicitHeight: overviewBackground.implicitHeight + Theme.spacingL * 2
+
+    Component.onCompleted: {
+        Hyprland.refreshToplevels()
+        Hyprland.refreshWorkspaces()
+        Hyprland.refreshMonitors()
+    }
+
+    onOverviewOpenChanged: {
+        if (overviewOpen) {
+            Hyprland.refreshToplevels()
+            Hyprland.refreshWorkspaces()
+            Hyprland.refreshMonitors()
+        }
+    }
+
+    Rectangle {
+        id: overviewBackground
+        property real padding: 10
+        anchors.fill: parent
+        anchors.margins: Theme.spacingL
+
+        implicitWidth: workspaceColumnLayout.implicitWidth + padding * 2
+        implicitHeight: workspaceColumnLayout.implicitHeight + padding * 2
+        radius: Theme.cornerRadius
+        color: Theme.surfaceContainer
+
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            shadowEnabled: true
+            shadowBlur: 0.5
+            shadowHorizontalOffset: 0
+            shadowVerticalOffset: 4
+            shadowColor: Theme.shadowStrong
+            shadowOpacity: 1
+            blurMax: 32
+        }
+
+        ColumnLayout {
+            id: workspaceColumnLayout
+
+            z: root.workspaceZ
+            anchors.centerIn: parent
+            spacing: workspaceSpacing
+
+            Repeater {
+                model: SettingsData.overviewRows
+                delegate: RowLayout {
+                    id: row
+                    property int rowIndex: index
+                    spacing: workspaceSpacing
+
+                    Repeater {
+                        model: SettingsData.overviewColumns
+                        Rectangle {
+                            id: workspace
+                            property int colIndex: index
+                            property int workspaceIndex: rowIndex * SettingsData.overviewColumns + colIndex
+                            property int workspaceValue: (root.displayedWorkspaceIds && workspaceIndex < root.displayedWorkspaceIds.length) ? root.displayedWorkspaceIds[workspaceIndex] : -1
+                            property bool workspaceExists: (root.allWorkspaceIds && workspaceValue > 0) ? root.allWorkspaceIds.includes(workspaceValue) : false
+                            property var workspaceObj: (workspaceExists && Hyprland.workspaces?.values) ? Hyprland.workspaces.values.find(ws => ws?.id === workspaceValue) : null
+                            property bool isActive: workspaceObj?.active ?? false
+                            property bool isOnThisMonitor: (workspaceObj && root.monitor) ? (workspaceObj.monitor?.name === root.monitor.name) : true
+                            property bool hasWindows: (workspaceValue > 0) ? root.workspaceHasWindows(workspaceValue) : false
+                            property string workspaceMonitorName: (workspaceValue > 0) ? root.getWorkspaceMonitorName(workspaceValue) : ""
+                            property color defaultWorkspaceColor: workspaceExists ? Theme.surfaceContainer : Theme.withAlpha(Theme.surfaceContainer, 0.3)
+                            property color hoveredWorkspaceColor: Qt.lighter(defaultWorkspaceColor, 1.1)
+                            property color hoveredBorderColor: Theme.surfaceVariant
+                            property bool hoveredWhileDragging: false
+                            property bool shouldShowActiveIndicator: isActive && isOnThisMonitor && hasWindows
+
+                            visible: workspaceValue !== -1
+
+                            implicitWidth: root.workspaceImplicitWidth
+                            implicitHeight: root.workspaceImplicitHeight
+                            color: hoveredWhileDragging ? hoveredWorkspaceColor : defaultWorkspaceColor
+                            radius: Theme.cornerRadius
+                            border.width: 2
+                            border.color: hoveredWhileDragging ? hoveredBorderColor : (shouldShowActiveIndicator ? root.activeBorderColor : "transparent")
+
+                            StyledText {
+                                anchors.centerIn: parent
+                                text: workspaceValue
+                                font.pixelSize: Theme.fontSizeXLarge * 6
+                                font.weight: Font.DemiBold
+                                color: Theme.withAlpha(Theme.surfaceText, workspaceExists ? 0.2 : 0.1)
+                                horizontalAlignment: Text.AlignHCenter
+                                verticalAlignment: Text.AlignVCenter
+                            }
+
+                            MouseArea {
+                                id: workspaceArea
+                                anchors.fill: parent
+                                acceptedButtons: Qt.LeftButton
+                                onClicked: {
+                                    if (root.draggingTargetWorkspace === -1) {
+                                        root.overviewOpen = false
+                                        Hyprland.dispatch(`workspace ${workspaceValue}`)
+                                    }
+                                }
+                            }
+
+                            DropArea {
+                                anchors.fill: parent
+                                onEntered: {
+                                    root.draggingTargetWorkspace = workspaceValue
+                                    if (root.draggingFromWorkspace == root.draggingTargetWorkspace) return
+                                    hoveredWhileDragging = true
+                                }
+                                onExited: {
+                                    hoveredWhileDragging = false
+                                    if (root.draggingTargetWorkspace == workspaceValue) root.draggingTargetWorkspace = -1
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            id: windowSpace
+            anchors.centerIn: parent
+            implicitWidth: workspaceColumnLayout.implicitWidth
+            implicitHeight: workspaceColumnLayout.implicitHeight
+
+            Repeater {
+                model: ScriptModel {
+                    values: {
+                        const workspaces = root.allWorkspaces
+                        const minId = root.minWorkspaceId
+                        const maxId = root.maxWorkspaceId
+
+                        if (!workspaces || workspaces.length === 0) return []
+
+                        try {
+                            const result = []
+                            for (const workspace of workspaces) {
+                                const wsId = workspace?.id ?? -1
+                                if (wsId >= minId && wsId <= maxId) {
+                                    const toplevels = workspace?.toplevels?.values || []
+                                    for (const toplevel of toplevels) {
+                                        result.push(toplevel)
+                                    }
+                                }
+                            }
+                            return result
+                        } catch (e) {
+                            console.error("OverviewWidget filter error:", e)
+                            return []
+                        }
+                    }
+                }
+                delegate: OverviewWindow {
+                    id: window
+                    required property var modelData
+
+                    overviewOpen: root.overviewOpen
+                    readonly property int windowWorkspaceId: modelData?.workspace?.id ?? -1
+
+                    function getWorkspaceIndex() {
+                        if (!root.displayedWorkspaceIds || root.displayedWorkspaceIds.length === 0) return 0
+                        if (!windowWorkspaceId || windowWorkspaceId < 0) return 0
+                        try {
+                            for (let i = 0; i < root.displayedWorkspaceIds.length; i++) {
+                                if (root.displayedWorkspaceIds[i] === windowWorkspaceId) {
+                                    return i
+                                }
+                            }
+                            return 0
+                        } catch (e) {
+                            return 0
+                        }
+                    }
+
+                    readonly property int workspaceIndex: getWorkspaceIndex()
+                    readonly property int workspaceColIndex: workspaceIndex % SettingsData.overviewColumns
+                    readonly property int workspaceRowIndex: Math.floor(workspaceIndex / SettingsData.overviewColumns)
+
+                    toplevel: modelData
+                    scale: root.scale
+                    availableWorkspaceWidth: root.workspaceImplicitWidth
+                    availableWorkspaceHeight: root.workspaceImplicitHeight
+                    widgetMonitorId: root.monitor.id
+
+                    xOffset: (root.workspaceImplicitWidth + workspaceSpacing) * workspaceColIndex
+                    yOffset: (root.workspaceImplicitHeight + workspaceSpacing) * workspaceRowIndex
+
+                    z: atInitPosition ? root.windowZ : root.windowDraggingZ
+                    property bool atInitPosition: (initX == x && initY == y)
+
+                    Drag.hotSpot.x: width / 2
+                    Drag.hotSpot.y: height / 2
+
+                    MouseArea {
+                        id: dragArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        onEntered: window.hovered = true
+                        onExited: window.hovered = false
+                        acceptedButtons: Qt.LeftButton | Qt.MiddleButton
+                        drag.target: parent
+
+                        onPressed: (mouse) => {
+                            root.draggingFromWorkspace = windowData?.workspace.id
+                            window.pressed = true
+                            window.Drag.active = true
+                            window.Drag.source = window
+                            window.Drag.hotSpot.x = mouse.x
+                            window.Drag.hotSpot.y = mouse.y
+                        }
+
+                        onReleased: {
+                            const targetWorkspace = root.draggingTargetWorkspace
+                            window.pressed = false
+                            window.Drag.active = false
+                            root.draggingFromWorkspace = -1
+                            root.draggingTargetWorkspace = -1
+
+                            if (targetWorkspace !== -1 && targetWorkspace !== windowData?.workspace.id) {
+                                Hyprland.dispatch(`movetoworkspacesilent ${targetWorkspace},address:${windowData?.address}`)
+                                Qt.callLater(() => {
+                                    Hyprland.refreshToplevels()
+                                    Hyprland.refreshWorkspaces()
+                                    Qt.callLater(() => {
+                                        window.x = window.initX
+                                        window.y = window.initY
+                                    })
+                                })
+                            } else {
+                                window.x = window.initX
+                                window.y = window.initY
+                            }
+                        }
+
+                        onClicked: (event) => {
+                            if (!windowData) return
+
+                            if (event.button === Qt.LeftButton) {
+                                root.overviewOpen = false
+                                Hyprland.dispatch(`focuswindow address:${windowData.address}`)
+                                event.accepted = true
+                            } else if (event.button === Qt.MiddleButton) {
+                                Hyprland.dispatch(`closewindow address:${windowData.address}`)
+                                event.accepted = true
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            id: monitorLabelSpace
+            anchors.centerIn: parent
+            implicitWidth: workspaceColumnLayout.implicitWidth
+            implicitHeight: workspaceColumnLayout.implicitHeight
+            z: root.monitorLabelZ
+
+            Repeater {
+                model: SettingsData.overviewRows
+                delegate: Item {
+                    id: labelRow
+                    property int rowIndex: index
+                    y: (root.workspaceImplicitHeight + workspaceSpacing) * rowIndex
+                    width: parent.width
+                    height: root.workspaceImplicitHeight
+
+                    Repeater {
+                        model: SettingsData.overviewColumns
+                        delegate: Item {
+                            id: labelItem
+                            property int colIndex: index
+                            property int workspaceIndex: labelRow.rowIndex * SettingsData.overviewColumns + colIndex
+                            property int workspaceValue: (root.displayedWorkspaceIds && workspaceIndex < root.displayedWorkspaceIds.length) ? root.displayedWorkspaceIds[workspaceIndex] : -1
+                            property bool workspaceExists: (root.allWorkspaceIds && workspaceValue > 0) ? root.allWorkspaceIds.includes(workspaceValue) : false
+                            property string workspaceMonitorName: (workspaceValue > 0) ? root.getWorkspaceMonitorName(workspaceValue) : ""
+
+                            x: (root.workspaceImplicitWidth + workspaceSpacing) * colIndex
+                            width: root.workspaceImplicitWidth
+                            height: root.workspaceImplicitHeight
+
+                            Rectangle {
+                                anchors.right: parent.right
+                                anchors.top: parent.top
+                                anchors.margins: Theme.spacingS
+                                width: monitorNameText.contentWidth + Theme.spacingS * 2
+                                height: monitorNameText.contentHeight + Theme.spacingXS * 2
+                                radius: Theme.cornerRadius
+                                color: Theme.surface
+                                visible: labelItem.workspaceExists && labelItem.workspaceMonitorName !== ""
+
+                                StyledText {
+                                    id: monitorNameText
+                                    anchors.centerIn: parent
+                                    text: labelItem.workspaceMonitorName
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    font.weight: Font.Medium
+                                    color: Theme.surfaceText
+                                    horizontalAlignment: Text.AlignHCenter
+                                    verticalAlignment: Text.AlignVCenter
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Modules/HyprWorkspaces/OverviewWindow.qml

@@ -0,0 +1,140 @@
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Layouts
+import Quickshell
+import Quickshell.Wayland
+import qs.Common
+
+Item {
+    id: root
+    property var toplevel
+    property var scale
+    required property bool overviewOpen
+    property var availableWorkspaceWidth
+    property var availableWorkspaceHeight
+    property bool restrictToWorkspace: true
+
+    readonly property var windowData: toplevel?.lastIpcObject || null
+    readonly property var monitorObj: toplevel?.monitor
+    readonly property var monitorData: monitorObj?.lastIpcObject || null
+
+    property real initX: Math.max(((windowData?.at?.[0] ?? 0) - (monitorData?.x ?? 0) - (monitorData?.reserved?.[0] ?? 0)) * root.scale, 0) + xOffset
+    property real initY: Math.max(((windowData?.at?.[1] ?? 0) - (monitorData?.y ?? 0) - (monitorData?.reserved?.[1] ?? 0)) * root.scale, 0) + yOffset
+    property real xOffset: 0
+    property real yOffset: 0
+    property int widgetMonitorId: 0
+
+    property var targetWindowWidth: (windowData?.size?.[0] ?? 100) * scale
+    property var targetWindowHeight: (windowData?.size?.[1] ?? 100) * scale
+    property bool hovered: false
+    property bool pressed: false
+
+    property var iconToWindowRatio: 0.25
+    property var iconToWindowRatioCompact: 0.45
+    property var entry: DesktopEntries.heuristicLookup(windowData?.class)
+    property var iconPath: Quickshell.iconPath(entry?.icon ?? windowData?.class ?? "application-x-executable", "image-missing")
+    property bool compactMode: Theme.fontSizeSmall * 4 > targetWindowHeight || Theme.fontSizeSmall * 4 > targetWindowWidth
+
+    x: initX
+    y: initY
+    width: Math.min((windowData?.size?.[0] ?? 100) * root.scale, availableWorkspaceWidth)
+    height: Math.min((windowData?.size?.[1] ?? 100) * root.scale, availableWorkspaceHeight)
+    opacity: (monitorObj?.id ?? -1) == widgetMonitorId ? 1 : 0.4
+
+    Rectangle {
+        id: maskRect
+        width: root.width
+        height: root.height
+        radius: Theme.cornerRadius
+        visible: false
+        layer.enabled: true
+    }
+
+    layer.enabled: true
+    layer.effect: MultiEffect {
+        maskEnabled: true
+        maskSource: maskRect
+        maskSpreadAtMin: 1
+        maskThresholdMin: 0.5
+    }
+
+    Behavior on x {
+        NumberAnimation {
+            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+            easing.type: Easing.BezierSpline
+            easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+        }
+    }
+    Behavior on y {
+        NumberAnimation {
+            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+            easing.type: Easing.BezierSpline
+            easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+        }
+    }
+    Behavior on width {
+        NumberAnimation {
+            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+            easing.type: Easing.BezierSpline
+            easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+        }
+    }
+    Behavior on height {
+        NumberAnimation {
+            duration: Theme.expressiveDurations.expressiveDefaultSpatial
+            easing.type: Easing.BezierSpline
+            easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+        }
+    }
+
+    ScreencopyView {
+        id: windowPreview
+        anchors.fill: parent
+        captureSource: root.overviewOpen ? root.toplevel?.wayland : null
+        live: true
+
+        Rectangle {
+            anchors.fill: parent
+            radius: Theme.cornerRadius
+            color: pressed ? Theme.withAlpha(Theme.surfaceContainerHigh, 0.5) :
+                hovered ? Theme.withAlpha(Theme.surfaceVariant, 0.3) :
+                Theme.withAlpha(Theme.surfaceContainer, 0.1)
+            border.color: Theme.withAlpha(Theme.outline, 0.3)
+            border.width: 1
+        }
+
+        ColumnLayout {
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+            anchors.right: parent.right
+            spacing: Theme.fontSizeSmall * 0.5
+
+            Image {
+                id: windowIcon
+                property var iconSize: {
+                    return Math.min(targetWindowWidth, targetWindowHeight) * (root.compactMode ? root.iconToWindowRatioCompact : root.iconToWindowRatio) / (root.monitorData?.scale ?? 1)
+                }
+                Layout.alignment: Qt.AlignHCenter
+                source: root.iconPath
+                width: iconSize
+                height: iconSize
+                sourceSize: Qt.size(iconSize, iconSize)
+
+                Behavior on width {
+                    NumberAnimation {
+                        duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                        easing.type: Easing.BezierSpline
+                        easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+                    }
+                }
+                Behavior on height {
+                    NumberAnimation {
+                        duration: Theme.expressiveDurations.expressiveDefaultSpatial
+                        easing.type: Easing.BezierSpline
+                        easing.bezierCurve: Theme.expressiveCurves.emphasizedDecel
+                    }
+                }
+            }
+        }
+    }
+}

Modules/Lock/Lock.qml

@@ -20,7 +20,7 @@ Scope {
 
     function lock() {
         if (SettingsData.customPowerActionLock && SettingsData.customPowerActionLock.length > 0) {
-            Quickshell.execDetached(SettingsData.customPowerActionLock.split(" "))
+            Quickshell.execDetached(["sh", "-c", SettingsData.customPowerActionLock])
             return
         }
         if (!processingExternalEvent && SettingsData.loginctlLockIntegration && DMSService.isConnected) {
@@ -82,12 +82,16 @@ Scope {
         locked: shouldLock
 
         WlSessionLockSurface {
+            id: lockSurface
+
             color: "transparent"
 
             LockSurface {
                 anchors.fill: parent
                 lock: sessionLock
                 sharedPasswordBuffer: root.sharedPasswordBuffer
+                screenName: lockSurface.screen?.name ?? ""
+                isLocked: shouldLock
                 onUnlockRequested: {
                     root.unlock()
                 }
@@ -106,7 +110,16 @@ Scope {
         target: "lock"
 
         function lock() {
-            root.lock()
+            if (!root.processingExternalEvent && SettingsData.loginctlLockIntegration && DMSService.isConnected) {
+                DMSService.lockSession(response => {
+                    if (response.error) {
+                        console.warn("Lock: Failed to call loginctl.lock:", response.error)
+                        root.shouldLock = true
+                    }
+                })
+            } else {
+                root.shouldLock = true
+            }
         }
 
         function demo() {

Modules/Lock/LockScreenContent.qml

@@ -139,7 +139,7 @@ Item {
             }
             return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : ""
         }
-        fillMode: Image.PreserveAspectCrop
+        fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
         smooth: true
         asynchronous: false
         cache: true
@@ -324,9 +324,6 @@ Item {
                         onAccepted: {
                             if (!demoMode && !pam.passwd.active) {
                                 console.log("Enter pressed, starting PAM authentication")
-                                if (pam.fprint.active) {
-                                    pam.fprint.abort()
-                                }
                                 pam.passwd.start()
                             }
                         }
@@ -574,9 +571,6 @@ Item {
                         onClicked: {
                             if (!demoMode) {
                                 console.log("Enter button clicked, starting PAM authentication")
-                                if (pam.fprint.active) {
-                                    pam.fprint.abort()
-                                }
                                 pam.passwd.start()
                             }
                         }

Modules/Lock/LockSurface.qml

@@ -10,6 +10,8 @@ Rectangle {
 
     required property WlSessionLock lock
     required property string sharedPasswordBuffer
+    required property string screenName
+    required property bool isLocked
 
     signal passwordChanged(string newPassword)
     signal unlockRequested()
@@ -17,10 +19,12 @@ Rectangle {
     color: "transparent"
 
     LockScreenContent {
+        id: lockContent
+
         anchors.fill: parent
         demoMode: false
         passwordBuffer: root.sharedPasswordBuffer
-        screenName: ""
+        screenName: root.screenName
         onUnlockRequested: root.unlockRequested()
         onPasswordBufferChanged: {
             if (root.sharedPasswordBuffer !== passwordBuffer) {
@@ -28,4 +32,10 @@ Rectangle {
             }
         }
     }
+
+    onIsLockedChanged: {
+        if (!isLocked) {
+            lockContent.unlocking = false
+        }
+    }
 }

Modules/Notepad/NotepadTextEditor.qml

@@ -75,14 +75,14 @@ Column {
 
     property string lastTextForLineModel: ""
     property var lineModel: []
-    
+
     function updateLineModel() {
         if (!SettingsData.notepadShowLineNumbers) {
             lineModel = []
             lastTextForLineModel = ""
             return
         }
-        
+
         if (textArea.text !== lastTextForLineModel || lineModel.length === 0) {
             lastTextForLineModel = textArea.text
             lineModel = textArea.text.split('\n')
@@ -129,10 +129,10 @@ Column {
     function highlightCurrentMatch() {
         if (currentMatchIndex >= 0 && currentMatchIndex < searchMatches.length) {
             const match = searchMatches[currentMatchIndex]
-            
+
             textArea.cursorPosition = match.start
             textArea.moveCursorSelection(match.end, TextEdit.SelectCharacters)
-            
+
             const flickable = textArea.parent
             if (flickable && flickable.contentY !== undefined) {
                 const lineHeight = textArea.font.pixelSize * 1.5
@@ -219,11 +219,11 @@ Column {
                 verticalAlignment: TextInput.AlignVCenter
                 selectByMouse: true
                 clip: true
-                
+
                 Component.onCompleted: {
                     text = root.searchQuery
                 }
-                
+
                 Connections {
                     target: root
                     function onSearchQueryChanged() {
@@ -232,7 +232,7 @@ Column {
                         }
                     }
                 }
-                
+
                 onTextChanged: {
                     if (root.searchQuery !== text) {
                         root.searchQuery = text
@@ -260,7 +260,7 @@ Column {
                     event.accepted = true
                 }
             }
-            
+
             // Placeholder text
             StyledText {
                 Layout.fillWidth: true

Modules/Notifications/Center/NotificationCard.qml

@@ -537,7 +537,7 @@ Rectangle {
 
                                         StyledText {
                                             id: clearText
-                                            text: I18n.tr("Clear")
+                                            text: I18n.tr("Dismiss")
                                             color: parent.isHovered ? Theme.primary : Theme.surfaceVariantText
                                             font.pixelSize: Theme.fontSizeSmall
                                             font.weight: Font.Medium
@@ -630,7 +630,7 @@ Rectangle {
 
         StyledText {
             id: clearText
-            text: I18n.tr("Clear")
+            text: I18n.tr("Dismiss")
             color: clearButton.isHovered ? Theme.primary : Theme.surfaceVariantText
             font.pixelSize: Theme.fontSizeSmall
             font.weight: Font.Medium

Modules/Notifications/Center/NotificationHeader.qml

@@ -99,7 +99,7 @@ Item {
                 }
 
                 StyledText {
-                    text: I18n.tr("Clear All")
+                    text: I18n.tr("Clear")
                     font.pixelSize: Theme.fontSizeSmall
                     color: clearArea.containsMouse ? Theme.primary : Theme.surfaceText
                     font.weight: Font.Medium

Modules/Notifications/Popup/NotificationPopup.qml

@@ -21,7 +21,7 @@ PanelWindow {
     property bool exiting: false
     property bool _isDestroying: false
     property bool _finalized: false
-    readonly property string clearText: I18n.tr("Clear")
+    readonly property string clearText: I18n.tr("Dismiss")
 
     signal entered
     signal exitFinished
@@ -512,7 +512,7 @@ PanelWindow {
 
                 anchors.fill: parent
                 hoverEnabled: true
-                acceptedButtons: Qt.LeftButton
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
                 propagateComposedEvents: true
                 z: -1
                 onEntered: {
@@ -523,9 +523,20 @@ PanelWindow {
                     if (notificationData && notificationData.popup && notificationData.timer)
                         notificationData.timer.restart()
                 }
-                onClicked: {
-                    if (notificationData && !win.exiting)
-                        notificationData.popup = false
+                onClicked: (mouse) => {
+                    if (!notificationData || win.exiting)
+                        return
+
+                    if (mouse.button === Qt.RightButton) {
+                        NotificationService.dismissNotification(notificationData)
+                    } else if (mouse.button === Qt.LeftButton) {
+                        if (notificationData.actions && notificationData.actions.length > 0) {
+                            notificationData.actions[0].invoke()
+                            NotificationService.dismissNotification(notificationData)
+                        } else {
+                            notificationData.popup = false
+                        }
+                    }
                 }
             }
         }

Modules/Plugins/BasePill.qml

@@ -3,7 +3,7 @@ import qs.Common
 import qs.Services
 import qs.Widgets
 
-Rectangle {
+Item {
     id: root
 
     property var axis: null
@@ -12,44 +12,54 @@ Rectangle {
     property var parentScreen: null
     property real widgetThickness: 30
     property real barThickness: 48
-    property bool isVerticalOrientation: false
     property alias content: contentLoader.sourceComponent
-
+    property bool isVerticalOrientation: axis?.isVertical ?? false
     readonly property real horizontalPadding: SettingsData.dankBarNoBackground ? 0 : Math.max(Theme.spacingXS, Theme.spacingS * (widgetThickness / 30))
+    readonly property real visualWidth: isVerticalOrientation ? widgetThickness : (contentLoader.item ? (contentLoader.item.implicitWidth + horizontalPadding * 2) : 0)
+    readonly property real visualHeight: isVerticalOrientation ? (contentLoader.item ? (contentLoader.item.implicitHeight + horizontalPadding * 2) : 0) : widgetThickness
+    readonly property alias visualContent: visualContent
 
     signal clicked()
 
-    width: isVerticalOrientation ? widgetThickness : contentLoader.item ? (contentLoader.item.implicitWidth + horizontalPadding * 2) : 0
-    height: isVerticalOrientation ? (contentLoader.item ? (contentLoader.item.implicitHeight + horizontalPadding * 2) : 0) : widgetThickness
-    radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
-    color: {
-        if (SettingsData.dankBarNoBackground) {
-            return "transparent"
+    width: isVerticalOrientation ? barThickness : visualWidth
+    height: isVerticalOrientation ? visualHeight : barThickness
+
+    Rectangle {
+        id: visualContent
+        width: root.visualWidth
+        height: root.visualHeight
+        anchors.centerIn: parent
+        radius: SettingsData.dankBarNoBackground ? 0 : Theme.cornerRadius
+        color: {
+            if (SettingsData.dankBarNoBackground) {
+                return "transparent"
+            }
+
+            const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
+            return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
         }
 
-        const baseColor = mouseArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.widgetBaseBackgroundColor
-        return Qt.rgba(baseColor.r, baseColor.g, baseColor.b, baseColor.a * Theme.widgetTransparency)
-    }
-
-    Loader {
-        id: contentLoader
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
+        Loader {
+            id: contentLoader
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
     }
 
     MouseArea {
         id: mouseArea
+        z: -1
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
-        onPressed: {
+        onClicked: {
+            root.clicked()
             if (popoutTarget && popoutTarget.setTriggerPosition) {
                 const globalPos = mapToGlobal(0, 0)
                 const currentScreen = parentScreen || Screen
-                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, width)
+                const pos = SettingsData.getPopupTriggerPosition(globalPos, currentScreen, barThickness, root.visualWidth)
                 popoutTarget.setTriggerPosition(pos.x, pos.y, pos.width, section, currentScreen)
             }
-            root.clicked()
         }
     }
 }

Modules/Settings/AboutTab.qml

@@ -257,9 +257,9 @@ Item {
                     }
 
                     StyledText {
-                        text: `dms is a highly customizable, modern desktop shell with a <a href="https://m3.material.io/" style="text-decoration:none; color:${Theme.primary};">material 3 inspired</a> design.
+                        text: I18n.tr(`dms is a highly customizable, modern desktop shell with a <a href="https://m3.material.io/" style="text-decoration:none; color:${Theme.primary};">material 3 inspired</a> design.
                         <br /><br/>It is built with <a href="https://quickshell.org" style="text-decoration:none; color:${Theme.primary};">Quickshell</a>, a QT6 framework for building desktop shells, and <a href="https://go.dev" style="text-decoration:none; color:${Theme.primary};">Go</a>, a statically typed, compiled programming language.
-                        `
+                        `)
                         textFormat: Text.RichText
                         font.pixelSize: Theme.fontSizeMedium
                         linkColor: Theme.primary
@@ -366,7 +366,7 @@ Item {
 
                         Row {
                             spacing: 4
-                            
+
                             StyledText {
                                 text: `<a href="https://github.com/YaLTeR/niri" style="text-decoration:none; color:${Theme.primary};">niri</a>`
                                 font.pixelSize: Theme.fontSizeMedium
@@ -383,14 +383,14 @@ Item {
                                     propagateComposedEvents: true
                                 }
                             }
-                            
+
                             StyledText {
                                 text: "&"
                                 font.pixelSize: Theme.fontSizeMedium
                                 color: Theme.surfaceVariantText
                                 anchors.verticalCenter: parent.verticalCenter
                             }
-                            
+
                             StyledText {
                                 text: `<a href="https://github.com/hyprwm/Hyprland" style="text-decoration:none; color:${Theme.primary};">hyprland</a>`
                                 font.pixelSize: Theme.fontSizeMedium
@@ -418,7 +418,7 @@ Item {
 
                         Row {
                             spacing: 4
-                            
+
                             StyledText {
                                 text: `<a href="https://github.com/AvengeMedia/DankMaterialShell" style="text-decoration:none; color:${Theme.primary};">DankMaterialShell</a>`
                                 font.pixelSize: Theme.fontSizeMedium
@@ -435,7 +435,7 @@ Item {
                                     propagateComposedEvents: true
                                 }
                             }
-                            
+
                             StyledText {
                                 text: I18n.tr("- Support Us With a Star ⭐")
                                 font.pixelSize: Theme.fontSizeMedium
@@ -453,7 +453,7 @@ Item {
 
                         Row {
                             spacing: 4
-                            
+
                             StyledText {
                                 text: `<a href="https://github.com/AvengeMedia/dgop" style="text-decoration:none; color:${Theme.primary};">dgop</a>`
                                 font.pixelSize: Theme.fontSizeMedium
@@ -470,7 +470,7 @@ Item {
                                     propagateComposedEvents: true
                                 }
                             }
-                            
+
                             StyledText {
                                 text: I18n.tr("- Stateless System Monitoring")
                                 font.pixelSize: Theme.fontSizeMedium
@@ -488,7 +488,7 @@ Item {
 
                         Row {
                             spacing: 4
-                            
+
                             StyledText {
                                 text: `<a href="https://danklinux.com" style="text-decoration:none; color:${Theme.primary};">danklinux.com</a>`
                                 font.pixelSize: Theme.fontSizeMedium

Modules/Settings/DankBarTab.qml

@@ -371,7 +371,7 @@ Item {
             widgets = SettingsData.dankBarCenterWidgets.slice()
         else if (sectionId === "right")
             widgets = SettingsData.dankBarRightWidgets.slice()
-        
+
         if (widgetIndex >= 0 && widgetIndex < widgets.length) {
             var widget = widgets[widgetIndex]
             var widgetId = typeof widget === "string" ? widget : widget.id
@@ -401,7 +401,7 @@ Item {
                 }
             }
         }
-        
+
         if (sectionId === "left")
             SettingsData.setDankBarLeftWidgets(widgets)
         else if (sectionId === "center")
@@ -705,7 +705,7 @@ Item {
                         DankButtonGroup {
                             id: positionButtonGroup
                             anchors.verticalCenter: parent.verticalCenter
-                            model: ["Top", "Bottom", "Left", "Right"]
+                            model: [I18n.tr("Top"), I18n.tr("Bottom"), I18n.tr("Left"), I18n.tr("Right")]
                             currentIndex: {
                                 switch (SettingsData.dankBarPosition) {
                                     case SettingsData.Position.Top: return 0
@@ -1740,7 +1740,7 @@ Item {
                         id: leftSection
                         anchors.fill: parent
                         anchors.margins: Theme.spacingL
-                        title: SettingsData.dankBarIsVertical ? "Top Section" : "Left Section"
+                        title: SettingsData.dankBarIsVertical ? I18n.tr("Top Section") : I18n.tr("Left Section")
                         titleIcon: "format_align_left"
                         sectionId: "left"
                         allWidgets: dankBarTab.baseWidgetDefinitions
@@ -1892,7 +1892,7 @@ Item {
                         id: rightSection
                         anchors.fill: parent
                         anchors.margins: Theme.spacingL
-                        title: SettingsData.dankBarIsVertical ? "Bottom Section" : "Right Section"
+                        title: SettingsData.dankBarIsVertical ? I18n.tr("Bottom Section") : I18n.tr("Right Section")
                         titleIcon: "format_align_right"
                         sectionId: "right"
                         allWidgets: dankBarTab.baseWidgetDefinitions

Modules/Settings/DisplaysTab.qml

@@ -12,42 +12,42 @@ Item {
     property var variantComponents: [{
         "id": "dankBar",
         "name": "Dank Bar",
-        "description": "System bar with widgets and system information",
+        "description": I18n.tr("System bar with widgets and system information"),
         "icon": "toolbar"
     }, {
         "id": "dock",
-        "name": "Application Dock",
-        "description": "Bottom dock for pinned and running applications",
+        "name": I18n.tr("Application Dock"),
+        "description": I18n.tr("Bottom dock for pinned and running applications"),
         "icon": "dock"
     }, {
         "id": "notifications",
-        "name": "Notification Popups",
-        "description": "Notification toast popups",
+        "name": I18n.tr("Notification Popups"),
+        "description": I18n.tr("Notification toast popups"),
         "icon": "notifications"
     }, {
         "id": "wallpaper",
-        "name": "Wallpaper",
-        "description": "Desktop background images",
+        "name": I18n.tr("Wallpaper"),
+        "description": I18n.tr("Desktop background images"),
         "icon": "wallpaper"
     }, {
         "id": "osd",
-        "name": "On-Screen Displays",
-        "description": "Volume, brightness, and other system OSDs",
+        "name": I18n.tr("On-Screen Displays"),
+        "description": I18n.tr("Volume, brightness, and other system OSDs"),
         "icon": "picture_in_picture"
     }, {
         "id": "toast",
-        "name": "Toast Messages",
-        "description": "System toast notifications",
+        "name": I18n.tr("Toast Messages"),
+        "description": I18n.tr("System toast notifications"),
         "icon": "campaign"
     }, {
         "id": "notepad",
-        "name": "Notepad Slideout",
-        "description": "Quick note-taking slideout panel",
+        "name": I18n.tr("Notepad Slideout"),
+        "description": I18n.tr("Quick note-taking slideout panel"),
         "icon": "sticky_note_2"
     }, {
         "id": "systemTray",
-        "name": "System Tray",
-        "description": "System tray icons",
+        "name": I18n.tr("System Tray"),
+        "description": I18n.tr("System tray icons"),
         "icon": "notifications"
     }]
 
@@ -116,8 +116,9 @@ Item {
 
                         width: parent.width
                         text: I18n.tr("Night Mode")
-                        description: "Apply warm color temperature to reduce eye strain. Use automation settings below to control when it activates."
+                        description: DisplayService.gammaControlAvailable ? I18n.tr("Apply warm color temperature to reduce eye strain. Use automation settings below to control when it activates.") : I18n.tr("Gamma control not available. Requires DMS API v6+.")
                         checked: DisplayService.nightModeEnabled
+                        enabled: DisplayService.gammaControlAvailable
                         onToggled: checked => {
                                        DisplayService.toggleNightMode()
                                    }
@@ -136,6 +137,7 @@ Item {
                         spacing: 0
                         leftPadding: Theme.spacingM
                         rightPadding: Theme.spacingM
+                        visible: DisplayService.gammaControlAvailable
 
                         DankDropdown {
                             width: parent.width - parent.leftPadding - parent.rightPadding
@@ -160,8 +162,9 @@ Item {
                         id: automaticToggle
                         width: parent.width
                         text: I18n.tr("Automatic Control")
-                        description: "Only adjust gamma based on time or location rules."
+                        description: I18n.tr("Only adjust gamma based on time or location rules.")
                         checked: SessionData.nightModeAutoEnabled
+                        visible: DisplayService.gammaControlAvailable
                         onToggled: checked => {
                                        if (checked && !DisplayService.nightModeEnabled) {
                                            DisplayService.toggleNightMode()
@@ -183,7 +186,7 @@ Item {
                         id: automaticSettings
                         width: parent.width
                         spacing: Theme.spacingS
-                        visible: SessionData.nightModeAutoEnabled
+                        visible: SessionData.nightModeAutoEnabled && DisplayService.gammaControlAvailable
 
                         Connections {
                             target: SessionData
@@ -360,27 +363,28 @@ Item {
                             width: parent.width
 
                             DankToggle {
+                                id: ipLocationToggle
                                 width: parent.width
-                                text: I18n.tr("Auto-location")
-                                description: DisplayService.geoclueAvailable ? "Use automatic location detection (geoclue2)" : "Geoclue service not running - cannot auto-detect location"
-                                checked: SessionData.nightModeLocationProvider === "geoclue2"
-                                enabled: DisplayService.geoclueAvailable
+                                text: I18n.tr("Use IP Location")
+                                description: I18n.tr("Automatically detect location based on IP address")
+                                checked: SessionData.nightModeUseIPLocation || false
                                 onToggled: checked => {
-                                               if (checked && DisplayService.geoclueAvailable) {
-                                                   SessionData.setNightModeLocationProvider("geoclue2")
-                                                   SessionData.setLatitude(0.0)
-                                                   SessionData.setLongitude(0.0)
-                                               } else {
-                                                   SessionData.setNightModeLocationProvider("")
-                                               }
-                                           }
+                                    SessionData.setNightModeUseIPLocation(checked)
+                                }
+
+                                Connections {
+                                    target: SessionData
+                                    function onNightModeUseIPLocationChanged() {
+                                        ipLocationToggle.checked = SessionData.nightModeUseIPLocation
+                                    }
+                                }
                             }
 
                             Column {
                                 width: parent.width
                                 spacing: Theme.spacingM
-                                visible: SessionData.nightModeLocationProvider !== "geoclue2"
                                 leftPadding: Theme.spacingM
+                                visible: !SessionData.nightModeUseIPLocation
 
                                 StyledText {
                                     text: I18n.tr("Manual Coordinates")
@@ -405,9 +409,9 @@ Item {
                                             height: 40
                                             text: SessionData.latitude.toString()
                                             placeholderText: "0.0"
-                                            onTextChanged: {
-                                                const lat = parseFloat(text) || 0.0
-                                                if (lat >= -90 && lat <= 90) {
+                                            onEditingFinished: {
+                                                const lat = parseFloat(text)
+                                                if (!isNaN(lat) && lat >= -90 && lat <= 90 && lat !== SessionData.latitude) {
                                                     SessionData.setLatitude(lat)
                                                 }
                                             }
@@ -428,9 +432,9 @@ Item {
                                             height: 40
                                             text: SessionData.longitude.toString()
                                             placeholderText: "0.0"
-                                            onTextChanged: {
-                                                const lon = parseFloat(text) || 0.0
-                                                if (lon >= -180 && lon <= 180) {
+                                            onEditingFinished: {
+                                                const lon = parseFloat(text)
+                                                if (!isNaN(lon) && lon >= -180 && lon <= 180 && lon !== SessionData.longitude) {
                                                     SessionData.setLongitude(lon)
                                                 }
                                             }

Modules/Settings/LauncherTab.qml

@@ -449,7 +449,7 @@ Item {
                     DankTextField {
                         width: parent.width
                         text: SettingsData.launchPrefix
-                        placeholderText: "Enter launch prefix (e.g., 'uwsm-app')"
+                        placeholderText: I18n.tr("Enter launch prefix (e.g., 'uwsm-app')")
                         onTextEdited: {
                             SettingsData.setLaunchPrefix(text)
                         }
@@ -688,21 +688,25 @@ Item {
                                                 var diffDays = Math.floor(
                                                             diffMs / (1000 * 60 * 60 * 24))
                                                 if (diffMins < 1)
-                                                    return "Last launched just now"
+                                                    return I18n.tr("Last launched just now")
 
                                                 if (diffMins < 60)
-                                                    return "Last launched " + diffMins + " minute"
-                                                            + (diffMins === 1 ? "" : "s") + " ago"
+                                                    return I18n.tr("Last launched %1 minute%2 ago")
+                                                            .arg(diffMins)
+                                                            .arg(diffMins === 1 ? "" : "s")
 
                                                 if (diffHours < 24)
-                                                    return "Last launched " + diffHours + " hour"
-                                                            + (diffHours === 1 ? "" : "s") + " ago"
+                                                    return I18n.tr("Last launched %1 hour%2 ago")
+                                                            .arg(diffHours)
+                                                            .arg(diffHours === 1 ? "" : "s")
 
                                                 if (diffDays < 7)
-                                                    return "Last launched " + diffDays + " day"
-                                                            + (diffDays === 1 ? "" : "s") + " ago"
+                                                    return I18n.tr("Last launched %1 day%2 ago")
+                                                            .arg(diffDays)
+                                                            .arg(diffDays === 1 ? "" : "s")
 
-                                                return "Last launched " + date.toLocaleDateString()
+                                                return I18n.tr("Last launched %1")
+                                                        .arg(date.toLocaleDateString())
                                             }
                                             font.pixelSize: Theme.fontSizeSmall
                                             color: Theme.surfaceVariantText

Modules/Settings/PersonalizationTab.qml

@@ -410,6 +410,56 @@ Item {
                         }
                     }
 
+                    Item {
+                        width: parent.width
+                        height: fillModeGroup.height
+                        visible: {
+                            var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
+                            return currentWallpaper !== "" && !currentWallpaper.startsWith("#")
+                        }
+
+                        DankButtonGroup {
+                            id: fillModeGroup
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            model: ["Stretch", "Fit", "Fill", "Tile", "Tile V", "Tile H", "Pad"]
+                            selectionMode: "single"
+                            buttonHeight: 28
+                            minButtonWidth: 48
+                            buttonPadding: Theme.spacingS
+                            checkIconSize: 0
+                            textSize: Theme.fontSizeSmall
+                            checkEnabled: false
+                            currentIndex: {
+                                const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
+                                return modes.indexOf(SettingsData.wallpaperFillMode)
+                            }
+                            onSelectionChanged: (index, selected) => {
+                                if (selected) {
+                                    const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
+                                    SettingsData.setWallpaperFillMode(modes[index])
+                                }
+                            }
+
+                            Connections {
+                                target: SettingsData
+                                function onWallpaperFillModeChanged() {
+                                    const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
+                                    fillModeGroup.currentIndex = modes.indexOf(SettingsData.wallpaperFillMode)
+                                }
+                            }
+
+                            Connections {
+                                target: personalizationTab
+                                function onSelectedMonitorNameChanged() {
+                                    Qt.callLater(() => {
+                                        const modes = ["Stretch", "Fit", "Fill", "Tile", "TileVertically", "TileHorizontally", "Pad"]
+                                        fillModeGroup.currentIndex = modes.indexOf(SettingsData.wallpaperFillMode)
+                                    })
+                                }
+                            }
+                        }
+                    }
+
                     // Per-Mode Wallpaper Section - Full Width
                     Rectangle {
                         width: parent.width
@@ -966,6 +1016,179 @@ Item {
                 }
             }
 
+            // Animation Settings
+            StyledRect {
+                width: parent.width
+                height: animationSection.implicitHeight + Theme.spacingL * 2
+                radius: Theme.cornerRadius
+                color: Theme.surfaceContainerHigh
+                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+                border.width: 0
+
+                Column {
+                    id: animationSection
+
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "animation"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Animation Speed")
+                            font.pixelSize: Theme.fontSizeLarge
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    Item {
+                        width: parent.width
+                        height: childrenRect.height
+
+                        DankButtonGroup {
+                            id: animationSpeedGroup
+                            x: (parent.width - width) / 2
+                            model: ["None", "Short", "Medium", "Long", "Custom"]
+                            selectionMode: "single"
+                            currentIndex: SettingsData.animationSpeed
+                            onSelectionChanged: (index, selected) => {
+                                if (selected) {
+                                    SettingsData.setAnimationSpeed(index)
+                                }
+                            }
+
+                            Connections {
+                                target: SettingsData
+                                function onAnimationSpeedChanged() {
+                                    animationSpeedGroup.currentIndex = SettingsData.animationSpeed
+                                }
+                            }
+                        }
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        Rectangle {
+                            width: parent.width
+                            height: 1
+                            color: Theme.outline
+                            opacity: 0.2
+                        }
+
+                        Column {
+                            width: parent.width
+                            spacing: Theme.spacingS
+
+                            Row {
+                                width: parent.width
+                                spacing: Theme.spacingM
+
+                                StyledText {
+                                    text: I18n.tr("Duration")
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.surfaceText
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+
+                                Item {
+                                    width: 1
+                                    height: 1
+                                }
+
+                                StyledText {
+                                    text: Theme.currentAnimationBaseDuration + "ms"
+                                    font.pixelSize: Theme.fontSizeMedium
+                                    color: Theme.primary
+                                    font.weight: Font.Medium
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                            }
+
+                            Row {
+                                width: parent.width
+                                height: 40
+                                spacing: Theme.spacingM
+
+                                StyledText {
+                                    text: "0ms"
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    color: Theme.surfaceVariantText
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+
+                                Item {
+                                    width: parent.width - 100
+                                    height: 40
+                                    anchors.verticalCenter: parent.verticalCenter
+
+                                    DankSlider {
+                                        id: customDurationSlider
+                                        anchors.fill: parent
+                                        minimum: 0
+                                        maximum: 750
+                                        value: Theme.currentAnimationBaseDuration
+                                        unit: "ms"
+                                        showValue: false
+                                        wheelEnabled: false
+
+                                        onSliderValueChanged: (newValue) => {
+                                            SettingsData.setAnimationSpeed(SettingsData.AnimationSpeed.Custom)
+                                            SettingsData.setCustomAnimationDuration(newValue)
+                                        }
+
+                                        Connections {
+                                            target: SettingsData
+                                            function onAnimationSpeedChanged() {
+                                                if (SettingsData.animationSpeed !== SettingsData.AnimationSpeed.Custom) {
+                                                    customDurationSlider.value = Theme.currentAnimationBaseDuration
+                                                }
+                                            }
+                                        }
+
+                                        Connections {
+                                            target: Theme
+                                            function onCurrentAnimationBaseDurationChanged() {
+                                                if (SettingsData.animationSpeed !== SettingsData.AnimationSpeed.Custom) {
+                                                    customDurationSlider.value = Theme.currentAnimationBaseDuration
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                StyledText {
+                                    text: "750ms"
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    color: Theme.surfaceVariantText
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                            }
+
+                            StyledText {
+                                text: I18n.tr("Select a preset or drag the slider to customize")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                wrapMode: Text.WordWrap
+                                width: parent.width
+                            }
+                        }
+                    }
+                }
+            }
+
             StyledRect {
                 width: parent.width
                 height: dynamicThemeSection.implicitHeight + Theme.spacingL * 2
@@ -1051,7 +1274,7 @@ Item {
                     DankDropdown {
                         id: personalizationMatugenPaletteDropdown
                         text: I18n.tr("Matugen Palette")
-                        description: "Select the palette algorithm used for wallpaper-based colors"
+                        description: I18n.tr("Select the palette algorithm used for wallpaper-based colors")
                         options: Theme.availableMatugenSchemes.map(function (option) { return option.label })
                         currentValue: Theme.getMatugenScheme(SettingsData.matugenScheme).label
                         enabled: Theme.matugenAvailable
@@ -1139,62 +1362,6 @@ Item {
                 }
             }
 
-            // Animation Settings
-            StyledRect {
-                width: parent.width
-                height: animationSection.implicitHeight + Theme.spacingL * 2
-                radius: Theme.cornerRadius
-                color: Theme.surfaceContainerHigh
-                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
-                border.width: 0
-
-                Column {
-                    id: animationSection
-
-                    anchors.fill: parent
-                    anchors.margins: Theme.spacingL
-                    spacing: Theme.spacingM
-
-                    Row {
-                        width: parent.width
-                        spacing: Theme.spacingM
-
-                        DankIcon {
-                            name: "animation"
-                            size: Theme.iconSize
-                            color: Theme.primary
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-
-                        StyledText {
-                            text: I18n.tr("Animation Speed")
-                            font.pixelSize: Theme.fontSizeLarge
-                            font.weight: Font.Medium
-                            color: Theme.surfaceText
-                            anchors.verticalCenter: parent.verticalCenter
-                        }
-                    }
-
-                    Item {
-                        width: parent.width
-                        height: childrenRect.height
-
-                        DankButtonGroup {
-                            id: animationSpeedGroup
-                            x: (parent.width - width) / 2
-                            model: ["None", "Shortest", "Short", "Medium", "Long"]
-                            selectionMode: "single"
-                            currentIndex: SettingsData.animationSpeed
-                            onSelectionChanged: (index, selected) => {
-                                if (selected) {
-                                    SettingsData.setAnimationSpeed(index)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
             StyledRect {
                 width: parent.width
                 height: soundsSection.implicitHeight + Theme.spacingL * 2
@@ -1453,6 +1620,7 @@ Item {
             browserTitle: "Select Wallpaper"
             browserIcon: "wallpaper"
             browserType: "wallpaper"
+            showHiddenFiles: true
             fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
             onFileSelected: path => {
                                 if (SessionData.perMonitorWallpaper) {

Modules/Settings/PluginsTab.qml

@@ -12,6 +12,7 @@ FocusScope {
     property string expandedPluginId: ""
     property bool isRefreshingPlugins: false
     property var parentModal: null
+    property var installedPluginsData: ({})
     focus: true
 
 
@@ -245,9 +246,13 @@ FocusScope {
                                 property var pluginPermissions: pluginData ? (pluginData.permissions || []) : []
                                 property bool hasSettings: pluginData && pluginData.settings !== undefined && pluginData.settings !== ""
                                 property bool isExpanded: pluginsTab.expandedPluginId === pluginId
+                                property bool hasUpdate: {
+                                    if (DMSService.apiVersion < 8) return true
+                                    return pluginsTab.installedPluginsData[pluginDirectoryName] || pluginsTab.installedPluginsData[pluginId] || pluginsTab.installedPluginsData[pluginName] || false
+                                }
 
 
-                                color: pluginMouseArea.containsMouse ? Theme.surfacePressed : (isExpanded ? Theme.surfaceContainerHighest : Theme.surfaceContainerHigh)
+                                color: (pluginMouseArea.containsMouse || updateArea.containsMouse || uninstallArea.containsMouse || reloadArea.containsMouse) ? Theme.surfacePressed : (isExpanded ? Theme.surfaceContainerHighest : Theme.surfaceContainerHigh)
                                 border.width: 0
 
                                 MouseArea {
@@ -326,7 +331,7 @@ FocusScope {
                                                 height: 28
                                                 radius: 14
                                                 color: updateArea.containsMouse ? Theme.surfaceContainerHighest : "transparent"
-                                                visible: DMSService.dmsAvailable && PluginService.isPluginLoaded(pluginDelegate.pluginId)
+                                                visible: DMSService.dmsAvailable && PluginService.isPluginLoaded(pluginDelegate.pluginId) && pluginDelegate.hasUpdate
 
                                                 DankIcon {
                                                     anchors.centerIn: parent
@@ -343,15 +348,32 @@ FocusScope {
                                                     onClicked: {
                                                         const currentPluginDirName = pluginDelegate.pluginDirectoryName
                                                         const currentPluginName = pluginDelegate.pluginName
+                                                        const currentPluginId = pluginDelegate.pluginId
                                                         DMSService.update(currentPluginDirName, response => {
                                                             if (response.error) {
                                                                 ToastService.showError("Update failed: " + response.error)
                                                             } else {
                                                                 ToastService.showInfo("Plugin updated: " + currentPluginName)
-                                                                PluginService.scanPlugins()
+                                                                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
+                                                    }
                                                 }
                                             }
 
@@ -389,6 +411,19 @@ FocusScope {
                                                             }
                                                         })
                                                     }
+                                                    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
+                                                    }
                                                 }
                                             }
 
@@ -422,6 +457,19 @@ FocusScope {
                                                             pluginsTab.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
+                                                    }
                                                 }
                                             }
 
@@ -561,6 +609,12 @@ FocusScope {
                                         visible: pluginDelegate.isExpanded && (!settingsLoader.active || settingsLoader.status === Loader.Error)
                                     }
                                 }
+
+                                Loader {
+                                    id: tooltipLoader
+                                    active: false
+                                    sourceComponent: DankTooltip {}
+                                }
                             }
                         }
 
@@ -604,6 +658,9 @@ FocusScope {
             }
         }
         function onPluginListUpdated() {
+            if (DMSService.apiVersion >= 8) {
+                DMSService.listInstalled()
+            }
             refreshPluginList()
         }
     }
@@ -615,6 +672,21 @@ FocusScope {
             pluginBrowserModal.allPlugins = plugins
             pluginBrowserModal.updateFilteredPlugins()
         }
+        function onInstalledPluginsReceived(plugins) {
+            var pluginMap = {}
+            for (var i = 0; i < plugins.length; i++) {
+                var plugin = plugins[i]
+                var hasUpdate = plugin.hasUpdate || false
+                if (plugin.path) {
+                    pluginMap[plugin.path] = hasUpdate
+                }
+                if (plugin.name) {
+                    pluginMap[plugin.name] = hasUpdate
+                }
+            }
+            installedPluginsData = pluginMap
+            Qt.callLater(refreshPluginList)
+        }
         function onOperationSuccess(message) {
             ToastService.showInfo(message)
         }
@@ -625,6 +697,9 @@ FocusScope {
 
     Component.onCompleted: {
         pluginBrowserModal.parentModal = pluginsTab.parentModal
+        if (DMSService.dmsAvailable && DMSService.apiVersion >= 8) {
+            DMSService.listInstalled()
+        }
     }
 
     DankModal {
@@ -701,6 +776,9 @@ FocusScope {
         function refreshPlugins() {
             isLoading = true
             DMSService.listPlugins()
+            if (DMSService.apiVersion >= 8) {
+                DMSService.listInstalled()
+            }
         }
 
         function show() {

Modules/Settings/ThemeColorsTab.qml

@@ -627,7 +627,7 @@ Item {
                             DankDropdown {
                                 id: matugenPaletteDropdown
                                 text: I18n.tr("Matugen Palette")
-                                description: "Select the palette algorithm used for wallpaper-based colors"
+                                description: I18n.tr("Select the palette algorithm used for wallpaper-based colors")
                                 options: cachedMatugenSchemes
                                 currentValue: Theme.getMatugenScheme(SettingsData.matugenScheme).label
                                 enabled: Theme.matugenAvailable
@@ -1393,7 +1393,7 @@ Item {
                     }
 
                     StyledText {
-                        text: `Generate baseline GTK3/4 or QT5/QT6 (requires qt6ct-kde) configurations to follow DMS colors. Only needed once.<br /><br />It is recommended to install <a href="https://github.com/AvengeMedia/DankMaterialShell/blob/master/README.md#Theming" style="text-decoration:none; color:${Theme.primary};">Colloid</a> GTK theme prior to applying GTK themes.`
+                        text: I18n.tr(`Generate baseline GTK3/4 or QT5/QT6 (requires qt6ct-kde) configurations to follow DMS colors. Only needed once.<br /><br />It is recommended to configure <a href="https://github.com/AvengeMedia/DankMaterialShell/blob/master/README.md#Theming" style="text-decoration:none; color:${Theme.primary};">adw-gtk3</a> prior to applying GTK themes.`)
                         textFormat: Text.RichText
                         linkColor: Theme.primary
                         onLinkActivated: url => Qt.openUrlExternally(url)

Modules/Settings/WidgetTweaksTab.qml

@@ -58,7 +58,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Workspace Index Numbers")
-                        description: "Show workspace index numbers in the top bar workspace switcher"
+                        description: I18n.tr("Show workspace index numbers in the top bar workspace switcher")
                         checked: SettingsData.showWorkspaceIndex
                         onToggled: checked => {
                                        return SettingsData.setShowWorkspaceIndex(
@@ -68,7 +68,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Window Scrolling")
-                        description: "Scroll through windows, rather than workspaces"
+                        description: I18n.tr("Scroll through windows, rather than workspaces")
                         checked: SettingsData.workspaceScrolling
                         visible: CompositorService.isNiri
                         onToggled: checked => {
@@ -79,7 +79,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Workspace Padding")
-                        description: "Always show a minimum of 3 workspaces, even if fewer are available"
+                        description: I18n.tr("Always show a minimum of 3 workspaces, even if fewer are available")
                         checked: SettingsData.showWorkspacePadding
                         onToggled: checked => {
                                        return SettingsData.setShowWorkspacePadding(
@@ -90,7 +90,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Show Workspace Apps")
-                        description: "Display application icons in workspace indicators"
+                        description: I18n.tr("Display application icons in workspace indicators")
                         checked: SettingsData.showWorkspaceApps
                         onToggled: checked => {
                                        return SettingsData.setShowWorkspaceApps(
@@ -143,7 +143,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Per-Monitor Workspaces")
-                        description: "Show only workspaces belonging to each specific monitor."
+                        description: I18n.tr("Show only workspaces belonging to each specific monitor.")
                         checked: SettingsData.workspacesPerMonitor
                         onToggled: checked => {
                             return SettingsData.setWorkspacesPerMonitor(checked);
@@ -191,7 +191,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Wave Progress Bars")
-                        description: "Use animated wave progress bars for media playback"
+                        description: I18n.tr("Use animated wave progress bars for media playback")
                         checked: SettingsData.waveProgressEnabled
                         onToggled: checked => {
                             return SettingsData.setWaveProgressEnabled(checked);
@@ -251,68 +251,96 @@ Item {
                         }
                     }
 
-                    Column {
+                    FocusScope {
                         width: parent.width - Theme.spacingM * 2
-                        spacing: Theme.spacingXS
+                        height: customCommandColumn.implicitHeight
                         anchors.left: parent.left
                         anchors.leftMargin: Theme.spacingM
 
-                        StyledText {
-                            text: I18n.tr("System update custom command")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: updaterCustomCommand
+                        Column {
+                            id: customCommandColumn
                             width: parent.width
-                            height: 48
-                            placeholderText: "myPkgMngr --sysupdate"
-                            backgroundColor: Theme.surfaceVariant
-                            normalBorderColor: Theme.primarySelected
-                            focusedBorderColor: Theme.primary
+                            spacing: Theme.spacingXS
 
-                            Component.onCompleted: {
-                                if (SettingsData.updaterCustomCommand) {
-                                    text = SettingsData.updaterCustomCommand;
-                                }
+                            StyledText {
+                                text: I18n.tr("System update custom command")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
                             }
 
-                            onTextEdited: {
-                                SettingsData.setUpdaterCustomCommand(text.trim());
+                            DankTextField {
+                                id: updaterCustomCommand
+                                width: parent.width
+                                height: 48
+                                placeholderText: "myPkgMngr --sysupdate"
+                                backgroundColor: Theme.surfaceVariant
+                                normalBorderColor: Theme.primarySelected
+                                focusedBorderColor: Theme.primary
+
+                                Component.onCompleted: {
+                                    if (SettingsData.updaterCustomCommand) {
+                                        text = SettingsData.updaterCustomCommand;
+                                    }
+                                }
+
+                                onTextEdited: {
+                                    SettingsData.setUpdaterCustomCommand(text.trim());
+                                }
+
+                                MouseArea {
+                                    anchors.fill: parent
+                                    onPressed: mouse => {
+                                        updaterCustomCommand.forceActiveFocus()
+                                        mouse.accepted = false
+                                    }
+                                }
                             }
                         }
                     }
 
-                    Column {
+                    FocusScope {
                         width: parent.width - Theme.spacingM * 2
-                        spacing: Theme.spacingXS
+                        height: terminalParamsColumn.implicitHeight
                         anchors.left: parent.left
                         anchors.leftMargin: Theme.spacingM
 
-                        StyledText {
-                            text: I18n.tr("Terminal custom additional parameters")
-                            font.pixelSize: Theme.fontSizeSmall
-                            color: Theme.surfaceVariantText
-                        }
-
-                        DankTextField {
-                            id: updaterTerminalCustomClass
+                        Column {
+                            id: terminalParamsColumn
                             width: parent.width
-                            height: 48
-                            placeholderText: "-T udpClass"
-                            backgroundColor: Theme.surfaceVariant
-                            normalBorderColor: Theme.primarySelected
-                            focusedBorderColor: Theme.primary
+                            spacing: Theme.spacingXS
 
-                            Component.onCompleted: {
-                                if (SettingsData.updaterTerminalAdditionalParams) {
-                                    text = SettingsData.updaterTerminalAdditionalParams;
-                                }
+                            StyledText {
+                                text: I18n.tr("Terminal custom additional parameters")
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
                             }
 
-                            onTextEdited: {
-                                SettingsData.setUpdaterTerminalAdditionalParams(text.trim());
+                            DankTextField {
+                                id: updaterTerminalCustomClass
+                                width: parent.width
+                                height: 48
+                                placeholderText: "-T udpClass"
+                                backgroundColor: Theme.surfaceVariant
+                                normalBorderColor: Theme.primarySelected
+                                focusedBorderColor: Theme.primary
+
+                                Component.onCompleted: {
+                                    if (SettingsData.updaterTerminalAdditionalParams) {
+                                        text = SettingsData.updaterTerminalAdditionalParams;
+                                    }
+                                }
+
+                                onTextEdited: {
+                                    SettingsData.setUpdaterTerminalAdditionalParams(text.trim());
+                                }
+
+                                MouseArea {
+                                    anchors.fill: parent
+                                    onPressed: mouse => {
+                                        updaterTerminalCustomClass.forceActiveFocus()
+                                        mouse.accepted = false
+                                    }
+                                }
                             }
                         }
                     }
@@ -358,7 +386,7 @@ Item {
                     DankToggle {
                         width: parent.width
                         text: I18n.tr("Running Apps Only In Current Workspace")
-                        description: "Show only apps running in current workspace"
+                        description: I18n.tr("Show only apps running in current workspace")
                         checked: SettingsData.runningAppsCurrentWorkspace
                         onToggled: checked => {
                                        return SettingsData.setRunningAppsCurrentWorkspace(

Modules/Settings/WidgetsTabSection.qml

@@ -463,6 +463,32 @@ Column {
                                 }
                             }
 
+                            DankActionButton {
+                                id: groupByAppButton
+                                buttonSize: 28
+                                visible: modelData.id === "runningApps"
+                                iconName: "apps"
+                                iconSize: 16
+                                iconColor: SettingsData.runningAppsGroupByApp ? Theme.primary : Theme.outline
+                                onClicked: {
+                                    SettingsData.setRunningAppsGroupByApp(!SettingsData.runningAppsGroupByApp)
+                                }
+                                onEntered: {
+                                    groupByAppTooltipLoader.active = true
+                                    if (groupByAppTooltipLoader.item) {
+                                        const tooltipText = SettingsData.runningAppsGroupByApp ? "Ungroup" : "Group by App"
+                                        const p = groupByAppButton.mapToItem(null, groupByAppButton.width / 2, 0)
+                                        groupByAppTooltipLoader.item.show(tooltipText, p.x, p.y - 40, null)
+                                    }
+                                }
+                                onExited: {
+                                    if (groupByAppTooltipLoader.item) {
+                                        groupByAppTooltipLoader.item.hide()
+                                    }
+                                    groupByAppTooltipLoader.active = false
+                                }
+                            }
+
                             Rectangle {
                                 id: compactModeTooltip
                                 width: tooltipText.contentWidth + Theme.spacingM * 2
@@ -708,11 +734,11 @@ Column {
         modal: true
         focus: true
         closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-        
+
         onOpened: {
             console.log("Control Center context menu opened")
         }
-        
+
         onClosed: {
             console.log("Control Center context menu closed")
         }
@@ -930,4 +956,10 @@ Column {
         active: false
         sourceComponent: DankTooltip {}
     }
+
+    Loader {
+        id: groupByAppTooltipLoader
+        active: false
+        sourceComponent: DankTooltip {}
+    }
 }

Modules/WallpaperBackground.qml

@@ -40,6 +40,7 @@ Variants {
             property bool isColorSource: source.startsWith("#")
             property string transitionType: SessionData.wallpaperTransition
             property string actualTransitionType: transitionType
+            property bool isInitialized: false
 
             Connections {
                 target: SessionData
@@ -71,7 +72,7 @@ Variants {
                 }
             }
             property real transitionProgress: 0
-            property real fillMode: 1.0
+            property real shaderFillMode: getFillMode(SettingsData.wallpaperFillMode)
             property vector4d fillColor: Qt.vector4d(0, 0, 0, 1)
             property real edgeSmoothness: 0.1
 
@@ -86,11 +87,34 @@ Variants {
             property bool hasCurrent: currentWallpaper.status === Image.Ready && !!currentWallpaper.source
             property bool booting: !hasCurrent && nextWallpaper.status === Image.Ready
 
+            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
+                }
+            }
+
             WallpaperEngineProc {
                 id: weProc
                 monitor: modelData.name
             }
 
+            Component.onCompleted: {
+                if (source) {
+                    const formattedSource = source.startsWith("file://") ? source : "file://" + source
+                    setWallpaperImmediate(formattedSource)
+                }
+                isInitialized = true
+            }
+
             Component.onDestruction: {
                 weProc.stop()
             }
@@ -109,9 +133,9 @@ Variants {
                     } else if (isColor) {
                         setWallpaperImmediate("")
                     } else {
-                        // Always set immediately if there's no current wallpaper (startup)
-                        if (!currentWallpaper.source) {
+                        if (!isInitialized || !currentWallpaper.source) {
                             setWallpaperImmediate(source.startsWith("file://") ? source : "file://" + source)
+                            isInitialized = true
                         } else {
                             changeWallpaper(source.startsWith("file://") ? source : "file://" + source)
                         }
@@ -211,7 +235,7 @@ Variants {
                 asynchronous: true
                 smooth: true
                 cache: true
-                fillMode: Image.PreserveAspectCrop
+                fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
             }
 
             Image {
@@ -223,7 +247,7 @@ Variants {
                 asynchronous: true
                 smooth: true
                 cache: true
-                fillMode: Image.PreserveAspectCrop
+                fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
 
                 onStatusChanged: {
                     if (status !== Image.Ready)
@@ -275,7 +299,7 @@ Variants {
                     property variant source1: root.hasCurrent ? currentWallpaper : transparentSource
                     property variant source2: nextWallpaper
                     property real progress: root.transitionProgress
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)
@@ -296,7 +320,7 @@ Variants {
                     property real progress: root.transitionProgress
                     property real smoothness: root.edgeSmoothness
                     property real direction: root.wipeDirection
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)
@@ -319,7 +343,7 @@ Variants {
                     property real aspectRatio: root.width / root.height
                     property real centerX: root.discCenterX
                     property real centerY: root.discCenterY
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)
@@ -342,7 +366,7 @@ Variants {
                     property real aspectRatio: root.width / root.height
                     property real stripeCount: root.stripesCount
                     property real angle: root.stripesAngle
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)
@@ -365,7 +389,7 @@ Variants {
                     property real centerX: 0.5
                     property real centerY: 0.5
                     property real aspectRatio: root.width / root.height
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)
@@ -385,7 +409,7 @@ Variants {
                     property variant source2: nextWallpaper
                     property real progress: root.transitionProgress
                     property real smoothness: root.edgeSmoothness
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)
@@ -411,7 +435,7 @@ Variants {
                     property real aspectRatio: root.width / root.height
                     property real centerX: root.discCenterX
                     property real centerY: root.discCenterY
-                    property real fillMode: root.fillMode
+                    property real fillMode: root.shaderFillMode
                     property vector4d fillColor: root.fillColor
                     property real imageWidth1: Math.max(1, root.hasCurrent ? source1.sourceSize.width : modelData.width)
                     property real imageHeight1: Math.max(1, root.hasCurrent ? source1.sourceSize.height : modelData.height)

PLUGINS/LauncherExample/LauncherExampleLauncher.qml

@@ -14,7 +14,7 @@ Item {
 
     Component.onCompleted: {
         console.log("LauncherExample: Plugin loaded")
-        
+
         // Load custom trigger from settings
         if (pluginService) {
             trigger = pluginService.loadPluginData("launcherExample", "trigger", "#")
@@ -26,35 +26,35 @@ Item {
         const baseItems = [
             {
                 name: "Test Item 1",
-                icon: "lightbulb",
+                icon: "material:lightbulb",
                 comment: "This is a test item that shows a toast notification",
                 action: "toast:Test Item 1 executed!",
                 categories: ["LauncherExample"]
             },
             {
-                name: "Test Item 2", 
-                icon: "star",
+                name: "Test Item 2",
+                icon: "material:star",
                 comment: "Another test item with different action",
                 action: "toast:Test Item 2 clicked!",
                 categories: ["LauncherExample"]
             },
             {
                 name: "Test Item 3",
-                icon: "favorite",
+                icon: "material:favorite",
                 comment: "Third test item for demonstration",
                 action: "toast:Test Item 3 activated!",
                 categories: ["LauncherExample"]
             },
             {
                 name: "Example Copy Action",
-                icon: "content_copy",
+                icon: "material:content_copy",
                 comment: "Demonstrates copying text to clipboard",
                 action: "copy:This text was copied by the launcher plugin!",
                 categories: ["LauncherExample"]
             },
             {
                 name: "Example Script Action",
-                icon: "terminal",
+                icon: "material:terminal",
                 comment: "Demonstrates running a simple command",
                 action: "script:echo 'Hello from launcher plugin!'",
                 categories: ["LauncherExample"]
@@ -119,7 +119,7 @@ Item {
     function runScript(command) {
         console.log("LauncherExample: Would run script:", command)
         showToast("Script executed: " + command)
-        
+
         // In a real plugin, you might create a Process component here
         // For demo purposes, we just show what would happen
     }

PLUGINS/LauncherExample/README.md

@@ -88,13 +88,41 @@ function executeItem(item): void
 ```javascript
 {
     name: "Item Name",           // Display name
-    icon: "icon_name",           // Material icon
+    icon: "icon_name",           // Icon (optional, see Icon Types below)
     comment: "Description",      // Subtitle text
     action: "type:data",         // Action to execute
     categories: ["PluginName"]   // Category array
 }
 ```
 
+**Icon Types**:
+
+The `icon` field supports three formats:
+
+1. **Material Design Icons** - Use `material:` prefix:
+   ```javascript
+   icon: "material:lightbulb"  // Material Symbols Rounded font
+   ```
+   Examples: `material:star`, `material:favorite`, `material:settings`
+
+2. **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:
+   ```javascript
+   {
+       name: "😀  Grinning Face",
+       // No icon field
+       comment: "Copy emoji",
+       action: "copy:😀",
+       categories: ["MyPlugin"]
+   }
+   ```
+   Perfect for emoji pickers or text-only items where the icon area should be hidden
+
 **Action Format**: `type:data` where:
 - `type` - Action handler (toast, copy, script, etc.)
 - `data` - Action-specific data

PLUGINS/README.md

@@ -1221,11 +1221,51 @@ Item {
 Each item returned by `getItems()` must include:
 
 - `name` (string): Display name shown in launcher
-- `icon` (string): Material Design icon name
+- `icon` (string, optional): Icon specification (see Icon Types below)
 - `comment` (string): Description/subtitle text
 - `action` (string): Action identifier in `type:data` format
 - `categories` (array): Array containing your plugin name
 
+### Icon Types
+
+The `icon` field supports three formats:
+
+**1. Material Design Icons** - Use the `material:` prefix:
+```javascript
+{
+    name: "My Item",
+    icon: "material:lightbulb",  // Material Symbols Rounded font
+    comment: "Uses Material Design icon",
+    action: "toast:Hello!",
+    categories: ["MyPlugin"]
+}
+```
+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:
+```javascript
+{
+    name: "Firefox",
+    icon: "firefox",  // Uses system icon theme
+    comment: "Launches Firefox browser",
+    action: "exec:firefox",
+    categories: ["MyPlugin"]
+}
+```
+Uses the user's installed icon theme. Common examples: `firefox`, `chrome`, `folder`, `text-editor`
+
+**3. No Icon** - Omit the `icon` field entirely:
+```javascript
+{
+    name: "😀  Grinning Face",
+    // No icon field - emoji/unicode in name displays without icon area
+    comment: "Copy emoji to clipboard",
+    action: "copy:😀",
+    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.
+
 ### Trigger System
 
 Triggers control when your plugin's items appear in the launcher:

README.md

@@ -258,7 +258,7 @@ There are a lot of possible configurations that you can enable/disable in the fl
 
 #### Other Distributions - via manual installation
 
-**1. Install Quickshell (Varies by Distribution)**
+#### 1. Install Quickshell (Varies by Distribution)
 ```bash
 # Arch
 paru -S quickshell-git
@@ -267,43 +267,61 @@ sudo dnf copr enable avengemedia/danklinux && sudo dnf install quickshell-git
 # ! TODO - document other distros
 ```
 
-**2. Install fonts**
+#### 2. Install fonts
 *Inter Variable* and *Fira Code* are not strictly required, but they are the default fonts of dms.
 
-**2.1 Install Material Symbols**
+#### 2.1 Install Material Symbols
 ```bash
 sudo curl -L "https://github.com/google/material-design-icons/raw/master/variablefont/MaterialSymbolsRounded%5BFILL%2CGRAD%2Copsz%2Cwght%5D.ttf" -o /usr/share/fonts/MaterialSymbolsRounded.ttf
 ```
-**2.2 Install Inter Variable**
+#### 2.2 Install Inter Variable
 ```bash
 sudo curl -L "https://github.com/rsms/inter/raw/refs/tags/v4.1/docs/font-files/InterVariable.ttf" -o /usr/share/fonts/InterVariable.ttf
 ```
 
-**2.3 Install Fira Code (monospace font)**
+#### 2.3 Install Fira Code (monospace font)
 ```bash
 sudo curl -L "https://github.com/tonsky/FiraCode/releases/latest/download/FiraCode-Regular.ttf" -o /usr/share/fonts/FiraCode-Regular.ttf
 ```
 
-**2.4 Refresh font cache**
+#### 2.4 Refresh font cache
 ```bash
 fc-cache -fv
 ```
 
-**3. Install the shell**
+#### 3. Install the shell
+
+#### 3.1. Clone latest QML
 
-**3.1. Clone latest master**
 ```bash
 mkdir ~/.config/quickshell && git clone https://github.com/AvengeMedia/DankMaterialShell.git ~/.config/quickshell/dms
 ```
 
-**3.2. Install latest dms CLI**
+**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)
+```
+
+#### 3.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.
 
-**4. Optional Features (system monitoring, clipboard history, brightness controls, etc.)**
+If preferred, you can build the dms-cli yourself (requires GO 1.24+)
 
-**4.1 Core optional dependencies**
+```bash
+git clone https://github.com/AvengeMedia/danklinux.git && cd danklinux
+make && sudo make install
+```
+
+#### 4. Optional Features (system monitoring, clipboard history, brightness controls, etc.)
+
+#### 4.1 Core optional dependencies
 ```bash
 # Arch Linux
 sudo pacman -S cava wl-clipboard cliphist brightnessctl qt6-multimedia
@@ -317,7 +335,7 @@ Note: by enabling and installing the avengemedia/dms copr above, these core depe
 
 *Other distros will just need to find sources for the above packages*
 
-**4.2 - dgop manual installation**
+#### 4.2 - dgop manual installation
 
 `dgop` is available via AUR and a nix flake, other distributions can install it manually.
 
@@ -333,7 +351,6 @@ sudo sh -c "curl -L https://github.com/AvengeMedia/dgop/releases/latest/download
 - `wl-clipboard`: Required for copying various elements to clipboard.
 - `cava`: Audio visualizer
 - `cliphist`: Clipboard history
-- `gammastep`: Night mode support
 - `qt6-multimedia`: System sound support
 
 ## Compositor Configuration
@@ -394,6 +411,9 @@ binds {
    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";
    }
@@ -461,7 +481,9 @@ 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, C, exec, dms ipc call control-center 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
@@ -540,23 +562,18 @@ If you do not like our theme path, you can integrate this with other GTK themes,
 
 #### GTK Apps
 
-1. Install [Colloid](https://github.com/vinceliuice/Colloid-gtk-theme)
-
-Colloid is a hard requirement for the auto-theming because of how it integrates with colloid css files, however you can integrate auto-theming with other themes, you just have to do it manually (so leave the toggle OFF in settings)
-
-It will still create `~/.config/gtk-3.0/4.0/dank-colors.css` on theme updates, these you can import into other compatible GTK themes.
+1. Install adw-gtk3
 
 ```bash
-# Some default install settings for colloid
-./install.sh -s standard -l --tweaks normal
+# Arch
+sudo pacman -S adw-gtk-theme
+# Fedora
+sudo dnf install adw-gtk3-theme
 ```
 
-Configure in `~/.config/gtk-3.0/settings.ini` and `~/.config/gtk-4.0/settings.ini`:
+In dms settings, navigate to Theme & Colors, and "apply GTK themes"
 
-```ini
-[Settings]
-gtk-theme-name=Colloid
-```
+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)
 

Services/AppSearchService.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
 
     property var applications: DesktopEntries.applications.values.filter(app => !app.noDisplay && !app.runInTerminal)
-    
+
 
 
     function searchApplications(query) {
@@ -266,7 +266,7 @@ Singleton {
 
     function getPluginCategoryIcon(category) {
         if (typeof PluginService === "undefined") return null
-        
+
         const launchers = PluginService.getLauncherPlugins()
         for (const pluginId in launchers) {
             const plugin = launchers[pluginId]
@@ -296,7 +296,7 @@ Singleton {
 
     function getPluginItems(category, query) {
         if (typeof PluginService === "undefined") return []
-        
+
         const launchers = PluginService.getLauncherPlugins()
         for (const pluginId in launchers) {
             const plugin = launchers[pluginId]
@@ -338,42 +338,42 @@ Singleton {
 
     function executePluginItem(item, pluginId) {
         if (typeof PluginService === "undefined") return false
-        
+
         const component = PluginService.pluginLauncherComponents[pluginId]
         if (!component) return false
-        
+
         try {
             const instance = component.createObject(root, {
                 "pluginService": PluginService
             })
-            
+
             if (instance && typeof instance.executeItem === "function") {
                 instance.executeItem(item)
                 instance.destroy()
                 return true
             }
-            
+
             if (instance) {
                 instance.destroy()
             }
         } catch (e) {
             console.warn("AppSearchService: Error executing item from plugin", pluginId, ":", e)
         }
-        
+
         return false
     }
 
     function searchPluginItems(query) {
         if (typeof PluginService === "undefined") return []
-        
+
         let allItems = []
         const launchers = PluginService.getLauncherPlugins()
-        
+
         for (const pluginId in launchers) {
             const items = getPluginItemsForPlugin(pluginId, query)
             allItems = allItems.concat(items)
         }
-        
+
         return allItems
     }
 }

Services/BatteryService.qml

@@ -41,12 +41,17 @@ Singleton {
     readonly property bool batteryAvailable: batteries.length > 0
     // Aggregated charge level (percentage)
     readonly property real batteryLevel: {
-        if (!batteryAvailable)
-        return 0
+        if (!batteryAvailable) return 0
+        if (batteryCapacity === 0) {
+            if (usePreferred && device && device.ready) return Math.round(device.percentage)
+            const validBatteries = batteries.filter(b => b.ready && b.percentage >= 0)
+            if (validBatteries.length === 0) return 0
+            const avgPercentage = validBatteries.reduce((sum, b) => sum + b.percentage, 0) / validBatteries.length
+            return Math.round(avgPercentage)
+        }
         return Math.round((batteryEnergy * 100) / batteryCapacity)
     }
-    // Is any battery charging (at least one has changeRate > 0)
-    readonly property bool isCharging: batteryAvailable && batteries.some(b => b.state === UPowerDeviceState.Charging && b.changeRate > 0)
+    readonly property bool isCharging: batteryAvailable && batteries.some(b => b.state === UPowerDeviceState.Charging || b.state === UPowerDeviceState.FullyCharged)
 
     // Is the system plugged in (none of the batteries are discharging or empty)
     readonly property bool isPluggedIn: batteryAvailable && batteries.every(b => b.state !== UPowerDeviceState.Discharging)

Services/BluetoothService.qml

@@ -15,6 +15,15 @@ Singleton {
     readonly property bool enabled: (adapter && adapter.enabled) ?? false
     readonly property bool discovering: (adapter && adapter.discovering) ?? false
     readonly property var devices: adapter ? adapter.devices : null
+    readonly property bool connected: {
+        if (!adapter || !adapter.devices) {
+            return false
+        }
+
+        let isConnected = false
+        adapter.devices.values.forEach(dev => { if (dev.connected) isConnected = true })
+        return isConnected
+    }
     readonly property var pairedDevices: {
         if (!adapter || !adapter.devices) {
             return []

Services/CompositorService.qml

@@ -1,5 +1,4 @@
 pragma Singleton
-
 pragma ComponentBehavior: Bound
 
 import QtQuick
@@ -17,67 +16,300 @@ Singleton {
 
     readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
     readonly property string niriSocket: Quickshell.env("NIRI_SOCKET")
-
     property bool useNiriSorting: isNiri && NiriService
 
-    property var sortedToplevels: {
-        if (!ToplevelManager.toplevels || !ToplevelManager.toplevels.values) {
+    property var sortedToplevels: sortedToplevelsCache
+    property var sortedToplevelsCache: []
+
+    property bool _sortScheduled: false
+    property bool _refreshScheduled: false
+    property bool _hasRefreshedOnce: false
+
+    property var _coordCache: ({})
+
+    Timer {
+        id: refreshTimer
+        interval: 40
+        repeat: false
+        onTriggered: {
+            try {
+                Hyprland.refreshToplevels()
+            } catch(e) {}
+            _refreshScheduled = false
+            _hasRefreshedOnce = true
+            scheduleSort()
+        }
+    }
+
+    function scheduleSort() {
+        if (_sortScheduled) return
+        _sortScheduled = true
+        Qt.callLater(function() {
+            _sortScheduled = false
+            sortedToplevelsCache = computeSortedToplevels()
+        })
+    }
+
+    function scheduleRefresh() {
+        if (!isHyprland) return
+        if (_refreshScheduled) return
+        _refreshScheduled = true
+        refreshTimer.restart()
+    }
+
+    Connections {
+        target: ToplevelManager.toplevels
+        function onValuesChanged() { root.scheduleSort() }
+    }
+    Connections {
+        target: Hyprland.toplevels
+        function onValuesChanged() {
+            root._hasRefreshedOnce = false
+            root.scheduleSort()
+        }
+    }
+    Connections {
+        target: Hyprland.workspaces
+        function onValuesChanged() { root.scheduleSort() }
+    }
+    Connections {
+        target: Hyprland
+        function onFocusedWorkspaceChanged() { root.scheduleSort() }
+    }
+
+    Component.onCompleted: {
+        detectCompositor()
+        scheduleSort()
+        Qt.callLater(() => NiriService.generateNiriLayoutConfig())
+    }
+
+    function computeSortedToplevels() {
+        if (!ToplevelManager.toplevels || !ToplevelManager.toplevels.values)
             return []
-        }
 
-        if (useNiriSorting) {
+        if (useNiriSorting)
             return NiriService.sortToplevels(ToplevelManager.toplevels.values)
+
+        if (isHyprland)
+            return sortHyprlandToplevelsSafe()
+
+        return Array.from(ToplevelManager.toplevels.values)
+    }
+
+    function _get(o, path, fallback) {
+        try {
+            let v = o
+            for (let i = 0; i < path.length; i++) {
+                if (v === null || v === undefined) return fallback
+                v = v[path[i]]
+            }
+            return (v === undefined || v === null) ? fallback : v
+        } catch (e) { return fallback }
+    }
+
+    function sortHyprlandToplevelsSafe() {
+        if (!Hyprland.toplevels || !Hyprland.toplevels.values) return []
+        if (_refreshScheduled) return sortedToplevelsCache
+
+        const items = Array.from(Hyprland.toplevels.values)
+
+        function _get(o, path, fb) {
+            try {
+                let v = o
+                for (let k of path) { if (v == null) return fb; v = v[k] }
+                return (v == null) ? fb : v
+            } catch(e) { return fb }
         }
 
-        if (isHyprland) {
-            const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
+        let snap = []
+        let missingAnyPosition = false
+        let hasNewWindow = false
+        for (let i = 0; i < items.length; i++) {
+            const t = items[i]
+            if (!t) continue
 
-            const sortedHyprland = hyprlandToplevels.sort((a, b) => {
-                                                              if (a.monitor && b.monitor) {
-                                                                  const monitorCompare = a.monitor.name.localeCompare(b.monitor.name)
-                                                                  if (monitorCompare !== 0) {
-                                                                      return monitorCompare
-                                                                  }
-                                                              }
+            const addr = t.address || ""
+            const li = t.lastIpcObject || null
 
-                                                              if (a.workspace && b.workspace) {
-                                                                  const workspaceCompare = a.workspace.id - b.workspace.id
-                                                                  if (workspaceCompare !== 0) {
-                                                                      return workspaceCompare
-                                                                  }
-                                                              }
+            const monName = _get(li, ["monitor"], null) ?? _get(t, ["monitor", "name"], "")
+            const monX = _get(t, ["monitor", "x"], Number.MAX_SAFE_INTEGER)
+            const monY = _get(t, ["monitor", "y"], Number.MAX_SAFE_INTEGER)
 
-                                                              if (a.lastIpcObject && b.lastIpcObject && a.lastIpcObject.at && b.lastIpcObject.at) {
-                                                                  const aX = a.lastIpcObject.at[0]
-                                                                  const bX = b.lastIpcObject.at[0]
-                                                                  const aY = a.lastIpcObject.at[1]
-                                                                  const bY = b.lastIpcObject.at[1]
+            const wsId = _get(li, ["workspace", "id"], null) ?? _get(t, ["workspace", "id"], Number.MAX_SAFE_INTEGER)
 
-                                                                  const xCompare = aX - bX
-                                                                  if (Math.abs(xCompare) > 10) {
-                                                                      return xCompare
-                                                                  }
-                                                                  return aY - bY
-                                                              }
+            const at = _get(li, ["at"], null)
+            let atX = (at !== null && at !== undefined && typeof at[0] === "number") ? at[0] : NaN
+            let atY = (at !== null && at !== undefined && typeof at[1] === "number") ? at[1] : NaN
 
-                                                              if (a.lastIpcObject && !b.lastIpcObject) {
-                                                                  return -1
-                                                              }
-                                                              if (!a.lastIpcObject && b.lastIpcObject) {
-                                                                  return 1
-                                                              }
+            if (!(atX === atX) || !(atY === atY)) {
+                const cached = _coordCache[addr]
+                if (cached) {
+                    atX = cached.x
+                    atY = cached.y
+                } else {
+                    if (addr) hasNewWindow = true
+                    missingAnyPosition = true
+                    atX = 1e9
+                    atY = 1e9
+                }
+            } else if (addr) {
+                _coordCache[addr] = { x: atX, y: atY }
+            }
 
-                                                              if (a.title && b.title) {
-                                                                  return a.title.localeCompare(b.title)
-                                                              }
+            const relX = Number.isFinite(monX) ? (atX - monX) : atX
+            const relY = Number.isFinite(monY) ? (atY - monY) : atY
 
-                                                              return 0
-                                                          })
-
-            return sortedHyprland.map(hyprToplevel => hyprToplevel.wayland).filter(wayland => wayland !== null)
+            snap.push({
+                monKey: String(monName),
+                monOrderX: Number.isFinite(monX) ? monX : Number.MAX_SAFE_INTEGER,
+                monOrderY: Number.isFinite(monY) ? monY : Number.MAX_SAFE_INTEGER,
+                wsId: (typeof wsId === "number") ? wsId : Number.MAX_SAFE_INTEGER,
+                x: relX,
+                y: relY,
+                title: t.title || "",
+                address: addr,
+                wayland: t.wayland
+            })
         }
 
-        return ToplevelManager.toplevels.values
+        if (missingAnyPosition && hasNewWindow) {
+            _hasRefreshedOnce = false
+            scheduleRefresh()
+        }
+
+        const groups = new Map()
+        for (const it of snap) {
+            const key = it.monKey + "::" + it.wsId
+            if (!groups.has(key)) groups.set(key, [])
+            groups.get(key).push(it)
+        }
+
+        let groupList = []
+        for (const [key, arr] of groups) {
+            const repr = arr[0]
+            groupList.push({
+                key,
+                monKey: repr.monKey,
+                monOrderX: repr.monOrderX,
+                monOrderY: repr.monOrderY,
+                wsId: repr.wsId,
+                items: arr
+            })
+        }
+
+        groupList.sort((a, b) => {
+            if (a.monOrderX !== b.monOrderX) return a.monOrderX - b.monOrderX
+            if (a.monOrderY !== b.monOrderY) return a.monOrderY - b.monOrderY
+            if (a.monKey !== b.monKey) return a.monKey.localeCompare(b.monKey)
+            if (a.wsId !== b.wsId) return a.wsId - b.wsId
+            return 0
+        })
+
+        const COLUMN_THRESHOLD = 48
+        const JITTER_Y = 6
+
+        let ordered = []
+        for (const g of groupList) {
+            const arr = g.items
+
+            const xs = arr.map(it => it.x).filter(x => Number.isFinite(x)).sort((a, b) => a - b)
+            let colCenters = []
+            if (xs.length > 0) {
+                for (const x of xs) {
+                    if (colCenters.length === 0) {
+                        colCenters.push(x)
+                    } else {
+                        const last = colCenters[colCenters.length - 1]
+                        if (x - last >= COLUMN_THRESHOLD) {
+                            colCenters.push(x)
+                        }
+                    }
+                }
+            } else {
+                colCenters = [0]
+            }
+
+            for (const it of arr) {
+                let bestCol = 0
+                let bestDist = Number.POSITIVE_INFINITY
+                for (let ci = 0; ci < colCenters.length; ci++) {
+                    const d = Math.abs(it.x - colCenters[ci])
+                    if (d < bestDist) {
+                        bestDist = d
+                        bestCol = ci
+                    }
+                }
+                it._col = bestCol
+            }
+
+            arr.sort((a, b) => {
+                if (a._col !== b._col) return a._col - b._col
+
+                const dy = a.y - b.y
+                if (Math.abs(dy) > JITTER_Y) return dy
+
+                if (a.title !== b.title) return a.title.localeCompare(b.title)
+                if (a.address !== b.address) return a.address.localeCompare(b.address)
+                return 0
+            })
+
+            ordered.push.apply(ordered, arr)
+        }
+
+        return ordered.map(x => x.wayland).filter(w => w !== null && w !== undefined)
+    }
+
+    function filterCurrentWorkspace(toplevels, screen) {
+        if (useNiriSorting) return NiriService.filterCurrentWorkspace(toplevels, screen)
+        if (isHyprland) return filterHyprlandCurrentWorkspaceSafe(toplevels, screen)
+        return toplevels
+    }
+
+    function filterHyprlandCurrentWorkspaceSafe(toplevels, screenName) {
+        if (!toplevels || toplevels.length === 0 || !Hyprland.toplevels) return toplevels
+
+        let currentWorkspaceId = null
+        try {
+            const hy = Array.from(Hyprland.toplevels.values)
+            for (const t of hy) {
+                const mon = _get(t, ["monitor", "name"], "")
+                const wsId = _get(t, ["workspace", "id"], null)
+                const active = !!_get(t, ["activated"], false)
+                if (mon === screenName && wsId !== null) {
+                    if (active) { currentWorkspaceId = wsId; break }
+                    if (currentWorkspaceId === null) currentWorkspaceId = wsId
+                }
+            }
+
+            if (currentWorkspaceId === null && Hyprland.workspaces) {
+                const wss = Array.from(Hyprland.workspaces.values)
+                const focusedId = _get(Hyprland, ["focusedWorkspace", "id"], null)
+                for (const ws of wss) {
+                    const monName = _get(ws, ["monitor"], "")
+                    const wsId = _get(ws, ["id"], null)
+                    if (monName === screenName && wsId !== null) {
+                        if (focusedId !== null && wsId === focusedId) { currentWorkspaceId = wsId; break }
+                        if (currentWorkspaceId === null) currentWorkspaceId = wsId
+                    }
+                }
+            }
+        } catch (e) {
+            console.warn("CompositorService: workspace snapshot failed:", e)
+        }
+
+        if (currentWorkspaceId === null) return toplevels
+
+        // Map wayland → wsId snapshot
+        let map = new Map()
+        try {
+            const hy = Array.from(Hyprland.toplevels.values)
+            for (const t of hy) {
+                const wsId = _get(t, ["workspace", "id"], null)
+                if (t && t.wayland && wsId !== null) map.set(t.wayland, wsId)
+            }
+        } catch (e) {}
+
+        return toplevels.filter(w => map.get(w) === currentWorkspaceId)
     }
 
     Timer {
@@ -91,86 +323,30 @@ Singleton {
         }
     }
 
-    function filterCurrentWorkspace(toplevels, screen) {
-        if (useNiriSorting) {
-            return NiriService.filterCurrentWorkspace(toplevels, screen)
-        }
-        if (isHyprland) {
-            return filterHyprlandCurrentWorkspace(toplevels, screen)
-        }
-        return toplevels
-    }
-
-    function filterHyprlandCurrentWorkspace(toplevels, screenName) {
-        if (!toplevels || toplevels.length === 0 || !Hyprland.toplevels) {
-            return toplevels
-        }
-
-        let currentWorkspaceId = null
-        const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
-
-        for (const hyprToplevel of hyprlandToplevels) {
-            if (hyprToplevel.monitor && hyprToplevel.monitor.name === screenName && hyprToplevel.workspace) {
-                if (hyprToplevel.activated) {
-                    currentWorkspaceId = hyprToplevel.workspace.id
-                    break
-                }
-                if (currentWorkspaceId === null) {
-                    currentWorkspaceId = hyprToplevel.workspace.id
-                }
-            }
-        }
-
-        if (currentWorkspaceId === null && Hyprland.workspaces) {
-            const workspaces = Array.from(Hyprland.workspaces.values)
-            for (const workspace of workspaces) {
-                if (workspace.monitor && workspace.monitor === screenName) {
-                    if (Hyprland.focusedWorkspace && workspace.id === Hyprland.focusedWorkspace.id) {
-                        currentWorkspaceId = workspace.id
-                        break
-                    }
-                    if (currentWorkspaceId === null) {
-                        currentWorkspaceId = workspace.id
-                    }
-                }
-            }
-        }
-
-        if (currentWorkspaceId === null) {
-            return toplevels
-        }
-
-        return toplevels.filter(toplevel => {
-                                    for (const hyprToplevel of hyprlandToplevels) {
-                                        if (hyprToplevel.wayland === toplevel) {
-                                            return hyprToplevel.workspace && hyprToplevel.workspace.id === currentWorkspaceId
-                                        }
-                                    }
-                                    return false
-                                })
-    }
-
     function detectCompositor() {
         if (hyprlandSignature && hyprlandSignature.length > 0) {
             isHyprland = true
             isNiri = false
             compositor = "hyprland"
             console.log("CompositorService: Detected Hyprland")
+            try {
+                Hyprland.refreshToplevels()
+            } catch(e) {}
             return
         }
 
         if (niriSocket && niriSocket.length > 0) {
-            Proc.runCommand("niriSocketCheck", ["test", "-S", root.niriSocket], (output, exitCode) => {
+            Proc.runCommand("niriSocketCheck", ["test", "-S", niriSocket], (output, exitCode) => {
                 if (exitCode === 0) {
-                    root.isNiri = true
-                    root.isHyprland = false
-                    root.compositor = "niri"
-                    console.log("CompositorService: Detected Niri with socket:", root.niriSocket)
+                    isNiri = true
+                    isHyprland = false
+                    compositor = "niri"
+                    console.log("CompositorService: Detected Niri with socket:", niriSocket)
                     NiriService.generateNiriBinds()
                 } else {
-                    root.isHyprland = false
-                    root.isNiri = true
-                    root.compositor = "niri"
+                    isHyprland = false
+                    isNiri = true
+                    compositor = "niri"
                     console.warn("CompositorService: Niri socket check failed, defaulting to Niri anyway")
                 }
             }, 0)
@@ -183,22 +359,14 @@ Singleton {
     }
 
     function powerOffMonitors() {
-        if (isNiri) {
-            return NiriService.powerOffMonitors()
-        }
-        if (isHyprland) {
-            return Hyprland.dispatch("dpms off")
-        }
+        if (isNiri) return NiriService.powerOffMonitors()
+        if (isHyprland) return Hyprland.dispatch("dpms off")
         console.warn("CompositorService: Cannot power off monitors, unknown compositor")
     }
 
     function powerOnMonitors() {
-        if (isNiri) {
-            return NiriService.powerOnMonitors()
-        }
-        if (isHyprland) {
-            return Hyprland.dispatch("dpms on")
-        }
+        if (isNiri) return NiriService.powerOnMonitors()
+        if (isHyprland) return Hyprland.dispatch("dpms on")
         console.warn("CompositorService: Cannot power on monitors, unknown compositor")
     }
-}
+}

Services/DMSService.qml

@@ -41,6 +41,7 @@ Singleton {
     signal loginctlStateUpdate(var data)
     signal loginctlEvent(var event)
     signal capabilitiesReceived()
+    signal credentialsRequest(var data)
 
     Component.onCompleted: {
         if (socketPath && socketPath.length > 0) {
@@ -261,6 +262,8 @@ Singleton {
             capabilitiesReceived()
         } else if (service === "network") {
             networkStateUpdate(data)
+        } else if (service === "network.credentials") {
+            credentialsRequest(data)
         } else if (service === "loginctl") {
             if (data.event) {
                 loginctlEvent(data)

Services/DisplayService.qml

@@ -38,13 +38,8 @@ Singleton {
 
     property bool nightModeEnabled: false
     property bool automationAvailable: false
-    property bool geoclueAvailable: false
-    property bool isAutomaticNightTime: false
-
-    function buildGammastepCommand(gammastepArgs) {
-        const commandStr = "pkill gammastep; " + ["gammastep"].concat(gammastepArgs).join(" ")
-        return ["sh", "-c", commandStr]
-    }
+    property bool gammaControlAvailable: false
+    readonly property int dayTemp: 6500
 
     function setBrightnessInternal(percentage, device) {
         const clampedValue = Math.max(1, Math.min(100, percentage))
@@ -216,34 +211,49 @@ Singleton {
 
     // Night Mode Functions - Simplified
     function enableNightMode() {
-        if (!automationAvailable) {
-            gammaStepTestProcess.running = true
+        if (!gammaControlAvailable) {
+            ToastService.showWarning("Night mode failed: DMS gamma control not available")
             return
         }
 
         nightModeEnabled = true
         SessionData.setNightModeEnabled(true)
 
-        // Apply immediately or start automation
-        if (SessionData.nightModeAutoEnabled) {
-            startAutomation()
-        } else {
-            applyNightModeDirectly()
-        }
+        DMSService.sendRequest("wayland.gamma.setEnabled", {
+            "enabled": true
+        }, response => {
+            if (response.error) {
+                console.error("DisplayService: Failed to enable gamma control:", response.error)
+                ToastService.showError("Failed to enable night mode: " + response.error)
+                nightModeEnabled = false
+                SessionData.setNightModeEnabled(false)
+                return
+            }
+
+            if (SessionData.nightModeAutoEnabled) {
+                startAutomation()
+            } else {
+                applyNightModeDirectly()
+            }
+        })
     }
 
     function disableNightMode() {
         nightModeEnabled = false
         SessionData.setNightModeEnabled(false)
-        stopAutomation()
-        // Nuclear approach - kill ALL gammastep processes multiple times
-        Quickshell.execDetached(["pkill", "-f", "gammastep"])
-        Quickshell.execDetached(["pkill", "-9", "gammastep"])
-        Quickshell.execDetached(["killall", "gammastep"])
-        // Also stop all related processes
-        gammaStepProcess.running = false
-        automationProcess.running = false
-        gammaStepTestProcess.running = false
+
+        if (!gammaControlAvailable) {
+            return
+        }
+
+        DMSService.sendRequest("wayland.gamma.setEnabled", {
+            "enabled": false
+        }, response => {
+            if (response.error) {
+                console.error("DisplayService: Failed to disable gamma control:", response.error)
+                ToastService.showError("Failed to disable night mode: " + response.error)
+            }
+        })
     }
 
     function toggleNightMode() {
@@ -255,14 +265,35 @@ Singleton {
     }
 
     function applyNightModeDirectly() {
-        const temperature = SessionData.nightModeTemperature || 4500
-        gammaStepProcess.command = buildGammastepCommand(["-m", "wayland", "-O", String(temperature)])
-        gammaStepProcess.running = true
-    }
+        const temperature = SessionData.nightModeTemperature || 4000
 
-    function resetToNormalMode() {
-        // Just kill gammastep to return to normal display temperature
-        Quickshell.execDetached(["pkill", "gammastep"])
+        DMSService.sendRequest("wayland.gamma.setManualTimes", {
+            "sunrise": null,
+            "sunset": null
+        }, response => {
+            if (response.error) {
+                console.error("DisplayService: Failed to clear manual times:", response.error)
+                return
+            }
+
+            DMSService.sendRequest("wayland.gamma.setUseIPLocation", {
+                "use": false
+            }, response => {
+                if (response.error) {
+                    console.error("DisplayService: Failed to disable IP location:", response.error)
+                    return
+                }
+
+                DMSService.sendRequest("wayland.gamma.setTemperature", {
+                    "temp": temperature
+                }, response => {
+                    if (response.error) {
+                        console.error("DisplayService: Failed to set temperature:", response.error)
+                        ToastService.showError("Failed to set night mode temperature: " + response.error)
+                    }
+                })
+            })
+        })
     }
 
     function startAutomation() {
@@ -282,70 +313,103 @@ Singleton {
         }
     }
 
-    function stopAutomation() {
-        automationProcess.running = false
-        gammaStepProcess.running = false
-        isAutomaticNightTime = false
-        // Nuclear approach - kill ALL gammastep processes multiple times
-        Quickshell.execDetached(["pkill", "-f", "gammastep"])
-        Quickshell.execDetached(["pkill", "-9", "gammastep"])
-        Quickshell.execDetached(["killall", "gammastep"])
-    }
-
     function startTimeBasedMode() {
-        checkTimeBasedMode()
+        const temperature = SessionData.nightModeTemperature || 4000
+        const sunriseHour = SessionData.nightModeEndHour
+        const sunriseMinute = SessionData.nightModeEndMinute
+        const sunsetHour = SessionData.nightModeStartHour
+        const sunsetMinute = SessionData.nightModeStartMinute
+
+        const sunrise = `${String(sunriseHour).padStart(2, '0')}:${String(sunriseMinute).padStart(2, '0')}`
+        const sunset = `${String(sunsetHour).padStart(2, '0')}:${String(sunsetMinute).padStart(2, '0')}`
+
+        DMSService.sendRequest("wayland.gamma.setUseIPLocation", {
+            "use": false
+        }, response => {
+            if (response.error) {
+                console.error("DisplayService: Failed to disable IP location:", response.error)
+                return
+            }
+
+            DMSService.sendRequest("wayland.gamma.setTemperature", {
+                "low": temperature,
+                "high": dayTemp
+            }, response => {
+                if (response.error) {
+                    console.error("DisplayService: Failed to set temperature:", response.error)
+                    ToastService.showError("Failed to set night mode temperature: " + response.error)
+                    return
+                }
+
+                DMSService.sendRequest("wayland.gamma.setManualTimes", {
+                    "sunrise": sunrise,
+                    "sunset": sunset
+                }, response => {
+                    if (response.error) {
+                        console.error("DisplayService: Failed to set manual times:", response.error)
+                        ToastService.showError("Failed to set night mode schedule: " + response.error)
+                    }
+                })
+            })
+        })
     }
 
     function startLocationBasedMode() {
-        const temperature = SessionData.nightModeTemperature || 4500
+        const temperature = SessionData.nightModeTemperature || 4000
         const dayTemp = 6500
 
-        if (SessionData.latitude !== 0.0 && SessionData.longitude !== 0.0) {
-            automationProcess.command = buildGammastepCommand(["-m", "wayland", "-l", `${SessionData.latitude.toFixed(6)}:${SessionData.longitude.toFixed(6)}`, "-t", `${dayTemp}:${temperature}`, "-v"])
-            automationProcess.running = true
-            return
-        }
-
-        if (SessionData.nightModeLocationProvider === "geoclue2") {
-            automationProcess.command = buildGammastepCommand(["-m", "wayland", "-l", "geoclue2", "-t", `${dayTemp}:${temperature}`, "-v"])
-            automationProcess.running = true
-            return
-        }
-
-        console.warn("DisplayService: Location mode selected but no coordinates or geoclue provider set")
-    }
-
-    function checkTimeBasedMode() {
-        if (!nightModeEnabled || !SessionData.nightModeAutoEnabled || SessionData.nightModeAutoMode !== "time") {
-            return
-        }
-
-        const currentTime = systemClock.hours * 60 + systemClock.minutes
-
-        const startMinutes = SessionData.nightModeStartHour * 60 + SessionData.nightModeStartMinute
-        const endMinutes = SessionData.nightModeEndHour * 60 + SessionData.nightModeEndMinute
-
-        let shouldBeNight = false
-
-        if (startMinutes > endMinutes) {
-            shouldBeNight = (currentTime >= startMinutes) || (currentTime < endMinutes)
-        } else {
-            shouldBeNight = (currentTime >= startMinutes) && (currentTime < endMinutes)
-        }
-
-        if (shouldBeNight !== isAutomaticNightTime) {
-            isAutomaticNightTime = shouldBeNight
-
-            if (shouldBeNight) {
-                applyNightModeDirectly()
-            } else {
-                resetToNormalMode()
+        DMSService.sendRequest("wayland.gamma.setManualTimes", {
+            "sunrise": null,
+            "sunset": null
+        }, response => {
+            if (response.error) {
+                console.error("DisplayService: Failed to clear manual times:", response.error)
+                return
             }
-        }
-    }
 
-    function detectLocationProviders() {
-        geoclueDetectionProcess.running = true
+            DMSService.sendRequest("wayland.gamma.setTemperature", {
+                "low": temperature,
+                "high": dayTemp
+            }, response => {
+                if (response.error) {
+                    console.error("DisplayService: Failed to set temperature:", response.error)
+                    ToastService.showError("Failed to set night mode temperature: " + response.error)
+                    return
+                }
+
+                if (SessionData.nightModeUseIPLocation) {
+                    DMSService.sendRequest("wayland.gamma.setUseIPLocation", {
+                        "use": true
+                    }, response => {
+                        if (response.error) {
+                            console.error("DisplayService: Failed to enable IP location:", response.error)
+                            ToastService.showError("Failed to enable IP location: " + response.error)
+                        }
+                    })
+                } else if (SessionData.latitude !== 0.0 && SessionData.longitude !== 0.0) {
+                    DMSService.sendRequest("wayland.gamma.setUseIPLocation", {
+                        "use": false
+                    }, response => {
+                        if (response.error) {
+                            console.error("DisplayService: Failed to disable IP location:", response.error)
+                            return
+                        }
+
+                        DMSService.sendRequest("wayland.gamma.setLocation", {
+                            "latitude": SessionData.latitude,
+                            "longitude": SessionData.longitude
+                        }, response => {
+                            if (response.error) {
+                                console.error("DisplayService: Failed to set location:", response.error)
+                                ToastService.showError("Failed to set night mode location: " + response.error)
+                            }
+                        })
+                    })
+                } else {
+                    console.warn("DisplayService: Location mode selected but no coordinates set and IP location disabled")
+                }
+            })
+        })
     }
 
     function setNightModeAutomationMode(mode) {
@@ -353,9 +417,6 @@ Singleton {
     }
 
     function evaluateNightMode() {
-        // Always stop all processes first to clean slate
-        stopAutomation()
-
         if (!nightModeEnabled) {
             return
         }
@@ -369,8 +430,50 @@ Singleton {
         }
     }
 
-    function checkNightModeAvailability() {
-        gammastepAvailabilityProcess.running = true
+    function checkGammaControlAvailability() {
+        if (!DMSService.isConnected) {
+            return
+        }
+
+        if (DMSService.apiVersion < 6) {
+            gammaControlAvailable = false
+            automationAvailable = false
+            return
+        }
+
+        if (!DMSService.capabilities.includes("gamma")) {
+            gammaControlAvailable = false
+            automationAvailable = false
+            return
+        }
+
+        DMSService.sendRequest("wayland.gamma.getState", null, response => {
+            if (response.error) {
+                gammaControlAvailable = false
+                automationAvailable = false
+                console.error("DisplayService: Gamma control not available:", response.error)
+            } else {
+                gammaControlAvailable = true
+                automationAvailable = true
+
+                if (nightModeEnabled) {
+                    DMSService.sendRequest("wayland.gamma.setEnabled", {
+                        "enabled": true
+                    }, enableResponse => {
+                        if (enableResponse.error) {
+                            console.error("DisplayService: Failed to enable gamma control on startup:", enableResponse.error)
+                            return
+                        }
+
+                        if (SessionData.nightModeAutoEnabled) {
+                            startAutomation()
+                        } else {
+                            applyNightModeDirectly()
+                        }
+                    })
+                }
+            }
+        })
     }
 
     Timer {
@@ -392,27 +495,9 @@ Singleton {
     Component.onCompleted: {
         ddcDetectionProcess.running = true
         refreshDevices()
-        checkNightModeAvailability()
-
-        // Initialize night mode state from session
         nightModeEnabled = SessionData.nightModeEnabled
     }
 
-    Component.onDestruction: {
-        gammaStepProcess.running = false
-        automationProcess.running = false
-    }
-
-    SystemClock {
-        id: systemClock
-        precision: SystemClock.Minutes
-        onDateChanged: {
-            if (nightModeEnabled && SessionData.nightModeAutoEnabled && SessionData.nightModeAutoMode === "time") {
-                checkTimeBasedMode()
-            }
-        }
-    }
-
     Process {
         id: ddcDetectionProcess
 
@@ -679,83 +764,20 @@ Singleton {
         }
     }
 
-    Process {
-        id: gammastepAvailabilityProcess
-        command: ["which", "gammastep"]
-        running: false
+    Connections {
+        target: DMSService
 
-        onExited: function (exitCode) {
-            automationAvailable = (exitCode === 0)
-            if (automationAvailable) {
-                detectLocationProviders()
-
-                // If night mode should be enabled on startup
-                if (nightModeEnabled && SessionData.nightModeAutoEnabled) {
-                    startAutomation()
-                } else if (nightModeEnabled) {
-                    applyNightModeDirectly()
-                }
+        function onConnectionStateChanged() {
+            if (DMSService.isConnected) {
+                checkGammaControlAvailability()
             } else {
-                console.log("DisplayService: gammastep not available")
+                gammaControlAvailable = false
+                automationAvailable = false
             }
         }
-    }
 
-    Process {
-        id: geoclueDetectionProcess
-        command: ["sh", "-c", "busctl --system list | grep -qF org.freedesktop.GeoClue2"]
-        running: false
-
-        onExited: function (exitCode) {
-            geoclueAvailable = (exitCode === 0)
-        }
-    }
-
-    Process {
-        id: gammaStepTestProcess
-        command: ["which", "gammastep"]
-        running: false
-
-        onExited: function (exitCode) {
-            if (exitCode === 0) {
-                automationAvailable = true
-                nightModeEnabled = true
-                SessionData.setNightModeEnabled(true)
-
-                if (SessionData.nightModeAutoEnabled) {
-                    startAutomation()
-                } else {
-                    applyNightModeDirectly()
-                }
-            } else {
-                console.warn("DisplayService: gammastep not found")
-                ToastService.showWarning("Night mode failed: gammastep not found")
-            }
-        }
-    }
-
-    Process {
-        id: gammaStepProcess
-        running: false
-
-        onExited: function (exitCode) {
-            if (nightModeEnabled && exitCode !== 0 && exitCode !== 15) {
-                console.warn("DisplayService: Night mode process failed:", exitCode)
-            }
-        }
-    }
-
-    Process {
-        id: automationProcess
-        running: false
-        property string processType: "automation"
-
-        onExited: function (exitCode) {
-            if (nightModeEnabled && SessionData.nightModeAutoEnabled && exitCode !== 0 && exitCode !== 15) {
-                console.warn("DisplayService: Night mode automation failed:", exitCode)
-                // Location mode failed
-                console.warn("DisplayService: Location-based night mode failed")
-            }
+        function onCapabilitiesReceived() {
+            checkGammaControlAvailability()
         }
     }
 
@@ -795,7 +817,7 @@ Singleton {
         function onLongitudeChanged() {
             evaluateNightMode()
         }
-        function onNightModeLocationProviderChanged() {
+        function onNightModeUseIPLocationChanged() {
             evaluateNightMode()
         }
     }