restore niri overview connected mode

some more simplifications and bug fixes
de-dupe and cleanup
2026-06-10 13:13:29 -04:00 · 2026-04-23 13:11:17 -04:00 · 2026-04-23 13:11:17 -04:00 · 2026-04-23 13:11:17 -04:00 · 2026-04-23 13:11:17 -04:00 · 2026-04-23 13:11:17 -04:00
636 changed files with 24996 additions and 93853 deletions
@@ -1,104 +0,0 @@
-# Agent Skills
-
-This directory contains agent skills following the [Agent Skills](https://agentskills.io) open standard - a portable, version-controlled format for giving AI agents specialized capabilities.
-
-Each skill is a directory with a `SKILL.md` entrypoint, optional reference docs, scripts, and templates. Agents load skills progressively: metadata at startup, full instructions on activation, and supporting files on demand.
-
-## Available Skills
-
-| Skill | Description |
-|-------|-------------|
-| [dms-plugin-dev](dms-plugin-dev/) | Develop plugins for DankMaterialShell - covers all 4 plugin types (widget, daemon, launcher, desktop), manifest creation, QML components, settings UI, data persistence, theme integration, and PopoutService usage. |
-
-## Installation
-
-The `.agents/skills/` directory at the project root is the standard location defined by the agentskills.io spec. Many agents discover skills from this path automatically. Some agents use their own directory conventions and need a symlink or copy.
-
-### Claude Code
-
-Claude Code discovers skills from `.claude/skills/` (project-level) or `~/.claude/skills/` (personal). To make skills from `.agents/skills/` available, symlink them into the Claude Code skills directory:
-
-**Project-level** (this repo only):
-
-```bash
-mkdir -p .claude/skills
-ln -s ../../.agents/skills/dms-plugin-dev .claude/skills/dms-plugin-dev
-```
-
-**Personal** (all your projects):
-
-```bash
-ln -s /path/to/DankMaterialShell/.agents/skills/dms-plugin-dev ~/.claude/skills/dms-plugin-dev
-```
-
-After linking, the skill appears in Claude Code's `/` menu as `/dms-plugin-dev`, and Claude loads it automatically when you ask about DMS plugin development.
-
-See the [Claude Code skills docs](https://code.claude.com/docs/en/skills) for more on skill configuration, invocation control, and frontmatter options.
-
-### Cursor
-
-Cursor discovers skills from `.cursor/skills/` in the project root:
-
-```bash
-mkdir -p .cursor/skills
-ln -s ../../.agents/skills/dms-plugin-dev .cursor/skills/dms-plugin-dev
-```
-
-See [Cursor skills docs](https://cursor.com/docs/context/skills) for details.
-
-### VS Code (Copilot)
-
-VS Code Copilot discovers skills from `.github/skills/` or `.vscode/skills/`:
-
-```bash
-mkdir -p .github/skills
-ln -s ../../.agents/skills/dms-plugin-dev .github/skills/dms-plugin-dev
-```
-
-See [VS Code skills docs](https://code.visualstudio.com/docs/copilot/customization/agent-skills) for details.
-
-### Gemini CLI
-
-Gemini CLI discovers skills from `.gemini/skills/` in the project root:
-
-```bash
-mkdir -p .gemini/skills
-ln -s ../../.agents/skills/dms-plugin-dev .gemini/skills/dms-plugin-dev
-```
-
-See [Gemini CLI skills docs](https://geminicli.com/docs/cli/skills/) for details.
-
-### OpenAI Codex
-
-Codex discovers skills from `.codex/skills/` in the project root:
-
-```bash
-mkdir -p .codex/skills
-ln -s ../../.agents/skills/dms-plugin-dev .codex/skills/dms-plugin-dev
-```
-
-See [Codex skills docs](https://developers.openai.com/codex/skills/) for details.
-
-### Other Agents
-
-The Agent Skills standard is supported by 30+ tools including Goose, Roo Code, JetBrains Junie, Amp, OpenCode, OpenHands, Kiro, and more. Most discover skills from a dot-directory at the project root (e.g., `.goose/skills/`, `.roo/skills/`). Some read `.agents/skills/` directly.
-
-Check the [Agent Skills client showcase](https://agentskills.io/clients) for setup instructions specific to your agent.
-
-The general pattern is:
-
-```bash
-mkdir -p .<agent>/skills
-ln -s ../../.agents/skills/dms-plugin-dev .<agent>/skills/dms-plugin-dev
-```
-
-## Adding New Skills
-
-To add a new skill to this directory:
-
-1. Create a subdirectory named with lowercase letters, numbers, and hyphens (e.g., `my-new-skill/`)
-2. Add a `SKILL.md` file with YAML frontmatter (`name`, `description`) and markdown instructions
-3. Optionally add `references/`, `scripts/`, and `assets/` subdirectories
-4. Keep `SKILL.md` under 500 lines - move detailed content to reference files
-
-See the [Agent Skills specification](https://agentskills.io/specification) for the full format.
@@ -1,497 +0,0 @@
---
-name: dms-plugin-dev
-description: >
-  Develop plugins for DankMaterialShell (DMS), a QML-based Linux desktop shell built on
-  Quickshell. Supports four plugin types: widget (bar + Control Center), daemon (background
-  service), launcher (search + actions), and desktop (draggable desktop widgets). Covers
-  manifest creation, QML component development, settings UI, data persistence, theme
-  integration, PopoutService usage, and external command execution. Use when the user wants
-  to create, modify, or debug a DMS plugin, or asks about the DMS plugin API.
-compatibility: Designed for Claude Code (or similar products)
-metadata:
-  author: DankMaterialShell
-  version: "1.0"
-  domain: qml-desktop-development
-  framework: DankMaterialShell
-  languages: qml, javascript
-allowed-tools: Bash Read Write Edit
---
-
-# DankMaterialShell Plugin Development
-
-## Overview
-
-DMS plugins extend the desktop shell with custom widgets, background services, launcher
-integrations, and desktop widgets. Plugins are QML components discovered from
-`~/.config/DankMaterialShell/plugins/`.
-
-**Minimum plugin structure:**
-
-```
-~/.config/DankMaterialShell/plugins/YourPlugin/
-  plugin.json        # Required: manifest with metadata
-  YourComponent.qml  # Required: main QML component
-  YourSettings.qml   # Optional: settings UI
-  *.js               # Optional: JavaScript utilities
-```
-
-**Plugin registry:** Community plugins are available at https://plugins.danklinux.com/
-
-**Four plugin types:**
-
-| Type       | Purpose                        | Base Component             | Bar pills | CC integration |
-|------------|--------------------------------|----------------------------|-----------|----------------|
-| `widget`   | Bar widget + popout            | `PluginComponent`          | Yes       | Yes            |
-| `daemon`   | Background service             | `PluginComponent` (no UI)  | No        | Optional       |
-| `launcher` | Searchable items in launcher   | `Item`                     | No        | No             |
-| `desktop`  | Draggable desktop widget       | `DesktopPluginComponent`   | No        | No             |
-
-## Step 1: Determine Plugin Type
-
-Choose the type based on what the plugin does:
-
- **Shows in the bar?** - Use `widget`. Displays a pill in DankBar, optionally opens a popout,
-  optionally integrates with Control Center.
- **Runs in background only?** - Use `daemon`. No visible UI, reacts to events (wallpaper
-  changes, notifications, battery level, etc.).
- **Provides searchable/actionable items?** - Use `launcher`. Items appear in the DMS launcher
-  with trigger-based filtering (e.g., type `=` for calculator, `:` for emoji).
- **Shows on the desktop background?** - Use `desktop`. Draggable, resizable widget on the
-  desktop layer.
-
-## Step 2: Create the Manifest
-
-Create `plugin.json` in your plugin directory. See [plugin-manifest-reference.md](references/plugin-manifest-reference.md) for the full schema.
-
-**Minimal manifest:**
-
-```json
-{
-    "id": "yourPlugin",
-    "name": "Your Plugin Name",
-    "description": "Brief description of what your plugin does",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "widget",
-    "capabilities": ["your-capability"],
-    "component": "./YourWidget.qml"
-}
-```
-
-**With settings and permissions:**
-
-```json
-{
-    "id": "yourPlugin",
-    "name": "Your Plugin Name",
-    "description": "Brief description",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "widget",
-    "capabilities": ["your-capability"],
-    "component": "./YourWidget.qml",
-    "icon": "extension",
-    "settings": "./Settings.qml",
-    "requires_dms": ">=0.1.0",
-    "permissions": ["settings_read", "settings_write"]
-}
-```
-
-**Key rules:**
- `id` must be camelCase, matching pattern `^[a-zA-Z][a-zA-Z0-9]*$`
- `version` must be semver (e.g., `1.0.0`)
- `component` must start with `./` and end with `.qml`
- `type: "launcher"` requires a `trigger` field
- `settings_write` permission is **required** if the plugin has a settings component
-
-## Step 3: Create the Main Component
-
-### Widget
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    property var popoutService: null
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: "Hello"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    verticalBarPill: Component {
-        StyledRect {
-            width: parent.widgetThickness
-            height: label.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: "Hi"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeSmall
-                rotation: 90
-            }
-        }
-    }
-}
-```
-
-See [widget-plugin-guide.md](references/widget-plugin-guide.md) for popouts, CC integration, and advanced features.
-
-### Launcher
-
-```qml
-import QtQuick
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "#"
-
-    signal itemsChanged()
-
-    function getItems(query) {
-        const items = [
-            { name: "Item One", icon: "material:star", comment: "Description",
-              action: "toast:Hello!", categories: ["MyPlugin"] }
-        ]
-        if (!query) return items
-        const q = query.toLowerCase()
-        return items.filter(i => i.name.toLowerCase().includes(q))
-    }
-
-    function executeItem(item) {
-        const [type, ...rest] = item.action.split(":")
-        const data = rest.join(":")
-        if (type === "toast") ToastService?.showInfo(data)
-        else if (type === "copy") Quickshell.execDetached(["dms", "cl", "copy", data])
-    }
-}
-```
-
-See [launcher-plugin-guide.md](references/launcher-plugin-guide.md) for triggers, icon types, context menus, and image tiles.
-
-### Desktop
-
-```qml
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 200
-    property real widgetHeight: 200
-    property real minWidth: 150
-    property real minHeight: 150
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: 0.85
-        border.color: root.editMode ? Theme.primary : "transparent"
-        border.width: root.editMode ? 2 : 0
-
-        Text {
-            anchors.centerIn: parent
-            text: "Desktop Widget"
-            color: Theme.surfaceText
-        }
-    }
-}
-```
-
-See [desktop-plugin-guide.md](references/desktop-plugin-guide.md) for sizing, persistence, and edit mode.
-
-### Daemon
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    property var popoutService: null
-
-    Connections {
-        target: SessionData
-        function onSomeSignal() {
-            console.log("Event received")
-        }
-    }
-}
-```
-
-See [daemon-plugin-guide.md](references/daemon-plugin-guide.md) for event-driven patterns and process execution.
-
-## Step 4: Add Settings (Optional)
-
-Wrap settings in `PluginSettings` with your `pluginId`. All settings auto-save and auto-load.
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "yourPlugin"
-
-    StringSetting {
-        settingKey: "apiKey"
-        label: "API Key"
-        description: "Your API key"
-        placeholder: "sk-..."
-    }
-
-    ToggleSetting {
-        settingKey: "enabled"
-        label: "Enable Feature"
-        defaultValue: true
-    }
-
-    SelectionSetting {
-        settingKey: "interval"
-        label: "Refresh Interval"
-        options: [
-            { label: "1 min", value: "60" },
-            { label: "5 min", value: "300" }
-        ]
-        defaultValue: "300"
-    }
-}
-```
-
-**Available setting components:** StringSetting, ToggleSetting, SelectionSetting, SliderSetting, ColorSetting, ListSetting, ListSettingWithInput.
-
-See [settings-components-reference.md](references/settings-components-reference.md) for full property lists.
-
-**Important:** Your plugin must declare `"permissions": ["settings_write"]` in plugin.json, or the settings UI will show an error.
-
-## Step 5: Use Data Persistence
-
-Three tiers of persistence:
-
-| API | Persisted | Use case |
-|-----|-----------|----------|
-| `pluginService.savePluginData(id, key, val)` / `loadPluginData(id, key, default)` | Yes (settings.json) | User preferences, config |
-| `pluginService.savePluginState(id, key, val)` / `loadPluginState(id, key, default)` | Yes (separate state file) | Runtime state, history, cache |
-| `PluginGlobalVar { varName; defaultValue; value; set() }` | No (runtime only) | Cross-instance shared state |
-
- `pluginData` is a reactive property on PluginComponent, auto-loaded from settings
- React to settings changes with `Connections { target: pluginService; function onPluginDataChanged(id) { ... } }`
- Global vars sync across all instances (multi-monitor, multiple bar sections)
-
-See [data-persistence-guide.md](references/data-persistence-guide.md) for details and examples.
-
-## Step 6: Theme Integration
-
-Always use `Theme.*` properties from `qs.Common` - never hardcode colors or sizes.
-
-**Essential properties:**
- Colors: `Theme.surfaceContainerHigh`, `Theme.surfaceText`, `Theme.primary`, `Theme.onPrimary`
- Fonts: `Theme.fontSizeSmall` (12), `Theme.fontSizeMedium` (14), `Theme.fontSizeLarge` (16), `Theme.fontSizeXLarge` (20)
- Spacing: `Theme.spacingXS`, `Theme.spacingS`, `Theme.spacingM`, `Theme.spacingL`, `Theme.spacingXL`
- Radius: `Theme.cornerRadius`, `Theme.cornerRadiusSmall`, `Theme.cornerRadiusLarge`
- Icons: `Theme.iconSizeSmall` (16), `Theme.iconSize` (24), `Theme.iconSizeLarge` (32)
-
-**Common widgets from `qs.Widgets`:** `StyledText`, `StyledRect`, `DankIcon`, `DankButton`, `DankToggle`, `DankTextField`, `DankSlider`, `DankGridView`, `CachingImage`.
-
-See [theme-reference.md](references/theme-reference.md) for the complete property list.
-
-## Step 7: Add Popout Content (Widgets Only)
-
-Add a popout that opens when the bar pill is clicked:
-
-```qml
-PluginComponent {
-    popoutWidth: 400
-    popoutHeight: 300
-
-    popoutContent: Component {
-        PopoutComponent {
-            headerText: "My Plugin"
-            detailsText: "Optional subtitle"
-            showCloseButton: true
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingM
-
-                StyledText {
-                    text: "Content here"
-                    color: Theme.surfaceText
-                }
-            }
-        }
-    }
-
-    horizontalBarPill: Component { /* ... */ }
-    verticalBarPill: Component { /* ... */ }
-}
-```
-
-**PopoutComponent properties:** `headerText`, `detailsText`, `showCloseButton`, `closePopout()` (auto-injected), `headerHeight` (readonly), `detailsHeight` (readonly).
-
-Calculate available content height: `popoutHeight - headerHeight - detailsHeight - spacing`
-
-## Step 8: Control Center Integration (Widgets Only)
-
-Add your widget to the Control Center grid:
-
-```qml
-PluginComponent {
-    ccWidgetIcon: "toggle_on"
-    ccWidgetPrimaryText: "My Feature"
-    ccWidgetSecondaryText: isActive ? "On" : "Off"
-    ccWidgetIsActive: isActive
-
-    onCcWidgetToggled: {
-        isActive = !isActive
-        pluginService?.savePluginData(pluginId, "active", isActive)
-    }
-
-    // Optional: expandable detail panel (for CompoundPill)
-    ccDetailContent: Component {
-        Rectangle {
-            implicitHeight: 200
-            color: Theme.surfaceContainerHigh
-            radius: Theme.cornerRadius
-        }
-    }
-}
-```
-
-**CC sizing:** 25% width = SmallToggleButton (icon only), 50% width = ToggleButton or CompoundPill (if ccDetailContent is defined).
-
-## Step 9: External Commands and Clipboard
-
-**Run commands and capture output:**
-
-```qml
-import qs.Common
-
-Proc.runCommand(
-    "myPlugin.fetch",
-    ["curl", "-s", "https://api.example.com/data"],
-    (stdout, exitCode) => {
-        if (exitCode === 0) processData(stdout)
-    },
-    500  // debounce ms
-)
-```
-
-**Fire-and-forget (clipboard, notifications):**
-
-```qml
-import Quickshell
-
-Quickshell.execDetached(["dms", "cl", "copy", textToCopy])
-```
-
-**Long-running processes:** Use the `Process` QML component from `Quickshell.Io` with `StdioCollector`.
-
-**Shell commands with pipes:** `["sh", "-c", "ps aux | grep foo"]`
-
-**Do NOT use** `globalThis.clipboard` or browser JavaScript APIs - they don't exist in the QML runtime.
-
-## Step 10: Validate and Test
-
-1. Validate `plugin.json` against the schema at [assets/plugin-schema.json](assets/plugin-schema.json)
-2. Run the shell with verbose output: `qs -v -p $CONFIGPATH/quickshell/dms/shell.qml`
-3. Open Settings > Plugins > Scan for Plugins
-4. Enable your plugin and add it to the DankBar layout
-
-**Common issues:**
- Plugin not detected: check plugin.json syntax with `jq . plugin.json`
- Widget not showing: ensure it's enabled AND added to a DankBar section
- Settings error: verify `settings_write` permission is declared
- Data not persisting: check pluginService injection and permissions
-
-## Common Mistakes
-
-1. **Missing `settings_write` permission** - Settings UI shows error without it
-2. **Missing `property var popoutService: null`** - Must declare for injection to work
-3. **Missing vertical bar pill** - Widget disappears when bar is on left/right edge
-4. **Hardcoded colors** - Use `Theme.*` properties, not hex values
-5. **Using `globalThis.clipboard`** - Does not exist; use `Quickshell.execDetached(["dms", "cl", "copy", text])`
-6. **Wrong Theme property names** - `Theme.fontSizeS` does not exist, use `Theme.fontSizeSmall`
-7. **Wrong import for Quickshell** - Use `import Quickshell` (not `import QtQuick` for execDetached)
-8. **Forgetting `categories` in launcher items** - Items won't display without it
-9. **Not handling null pluginService** - Always use optional chaining or null checks
-10. **Using `PluginComponent` for launchers** - Launchers use plain `Item`, not `PluginComponent`
-
-## Quick Reference: Imports
-
-**Widget / Daemon:**
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-```
-
-**Launcher:**
-```qml
-import QtQuick
-import qs.Services
-```
-
-**Desktop:**
-```qml
-import QtQuick
-import qs.Common
-```
-
-**For clipboard/exec:** `import Quickshell`
-**For processes:** `import Quickshell.Io`
-**For networking:** `import Quickshell.Networking`
-**For toast notifications:** access `ToastService` from `qs.Services`
-
-## Quick Reference: File Naming
-
- **Directory name:** PascalCase (e.g., `MyAwesomePlugin/`)
- **Plugin ID:** camelCase (e.g., `myAwesomePlugin`)
- **QML files:** PascalCase (e.g., `MyWidget.qml`, `Settings.qml`)
- **Component paths in manifest:** relative with `./` prefix (e.g., `"./MyWidget.qml"`)
- **JS utility files:** camelCase (e.g., `utils.js`, `apiAdapter.js`)
-
-## Reference Files
-
-Load these on demand for detailed API documentation:
-
- [plugin-manifest-reference.md](references/plugin-manifest-reference.md) - Complete plugin.json field reference and JSON schema
- [widget-plugin-guide.md](references/widget-plugin-guide.md) - PluginComponent, bar pills, popouts, click actions, CC integration
- [launcher-plugin-guide.md](references/launcher-plugin-guide.md) - getItems/executeItem, triggers, icon types, context menus, tile view
- [desktop-plugin-guide.md](references/desktop-plugin-guide.md) - DesktopPluginComponent, sizing, edit mode, position persistence
- [daemon-plugin-guide.md](references/daemon-plugin-guide.md) - Event-driven background services, process execution
- [settings-components-reference.md](references/settings-components-reference.md) - All 7 setting components with complete property lists
- [theme-reference.md](references/theme-reference.md) - Theme colors, spacing, fonts, radii, common patterns
- [data-persistence-guide.md](references/data-persistence-guide.md) - pluginData, state API, global variables
- [popout-service-reference.md](references/popout-service-reference.md) - PopoutService API for controlling shell popouts and modals
- [advanced-patterns.md](references/advanced-patterns.md) - Variants, JS utilities, qmldir, IPC, multi-file plugins
@@ -1,115 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://danklinux.com/schemas/plugin.json",
-  "title": "DankMaterialShell Plugin Manifest",
-  "description": "Schema for DankMaterialShell plugin.json manifest files",
-  "type": "object",
-  "required": [
-    "id",
-    "name",
-    "description",
-    "version",
-    "author",
-    "type",
-    "capabilities",
-    "component"
-  ],
-  "properties": {
-    "id": {
-      "type": "string",
-      "description": "Unique plugin identifier (camelCase, no spaces)",
-      "pattern": "^[a-zA-Z][a-zA-Z0-9]*$"
-    },
-    "name": {
-      "type": "string",
-      "description": "Human-readable plugin name",
-      "minLength": 1
-    },
-    "description": {
-      "type": "string",
-      "description": "Short description of plugin functionality",
-      "minLength": 1
-    },
-    "version": {
-      "type": "string",
-      "description": "Semantic version string (e.g., '1.0.0')",
-      "pattern": "^\\d+\\.\\d+\\.\\d+(-[a-zA-Z0-9.-]+)?(\\+[a-zA-Z0-9.-]+)?$"
-    },
-    "author": {
-      "type": "string",
-      "description": "Plugin creator name or email",
-      "minLength": 1
-    },
-    "type": {
-      "type": "string",
-      "description": "Plugin type",
-      "enum": ["widget", "daemon", "launcher", "desktop"]
-    },
-    "capabilities": {
-      "type": "array",
-      "description": "Array of plugin capabilities",
-      "items": {
-        "type": "string"
-      },
-      "minItems": 1
-    },
-    "component": {
-      "type": "string",
-      "description": "Relative path to main QML component file",
-      "pattern": "^\\./.*\\.qml$"
-    },
-    "trigger": {
-      "type": "string",
-      "description": "Trigger string for launcher activation (required for launcher type)"
-    },
-    "icon": {
-      "type": "string",
-      "description": "Material Design icon name"
-    },
-    "settings": {
-      "type": "string",
-      "description": "Path to settings component QML file",
-      "pattern": "^\\./.*\\.qml$"
-    },
-    "requires_dms": {
-      "type": "string",
-      "description": "Minimum DMS version requirement (e.g., '>=0.1.18', '>0.1.0')",
-      "pattern": "^(>=?|<=?|=|>|<)\\d+\\.\\d+\\.\\d+$"
-    },
-    "requires": {
-      "type": "array",
-      "description": "Array of required system tools/dependencies",
-      "items": {
-        "type": "string"
-      }
-    },
-    "permissions": {
-      "type": "array",
-      "description": "Required capabilities",
-      "items": {
-        "type": "string",
-        "enum": [
-          "settings_read",
-          "settings_write",
-          "process",
-          "network"
-        ]
-      }
-    }
-  },
-  "allOf": [
-    {
-      "if": {
-        "properties": {
-          "type": {
-            "const": "launcher"
-          }
-        }
-      },
-      "then": {
-        "required": ["trigger"]
-      }
-    }
-  ],
-  "additionalProperties": true
-}
@@ -1,48 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    // TODO: Read configuration from settings
-    property string configValue: pluginData?.configValue || ""
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            configValue = pluginService.loadPluginData(pluginId, "configValue", "")
-        }
-    }
-
-    // TODO: Connect to the service events you need
-    // Connections {
-    //     target: SessionData
-    //     function onWallpaperPathChanged() {
-    //         console.log("[MyDaemon] Wallpaper changed:", SessionData.wallpaperPath)
-    //         handleEvent(SessionData.wallpaperPath)
-    //     }
-    // }
-
-    function handleEvent(data) {
-        Proc.runCommand(
-            "myDaemon.handle",
-            ["echo", "Event received:", data],
-            (stdout, exitCode) => {
-                if (exitCode === 0) {
-                    console.log("[MyDaemon] Output:", stdout)
-                } else {
-                    console.error("[MyDaemon] Failed:", exitCode)
-                    ToastService?.showInfo("Daemon action failed")
-                }
-            }
-        )
-    }
-
-    Component.onCompleted: {
-        console.log("[MyDaemon] Started")
-    }
-}
@@ -1,16 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myDaemon"
-
-    StringSetting {
-        settingKey: "configValue"
-        label: "Configuration"
-        description: "Value used by the daemon"
-        placeholder: "Enter value..."
-        defaultValue: ""
-    }
-}
@@ -1,13 +0,0 @@
-{
-    "id": "myDaemon",
-    "name": "My Daemon",
-    "description": "A background service that reacts to events",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "daemon",
-    "capabilities": ["background-service"],
-    "component": "./Daemon.qml",
-    "icon": "settings",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write", "process"]
-}
@@ -1,18 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myDesktopWidget"
-
-    SliderSetting {
-        settingKey: "opacity"
-        label: "Opacity"
-        description: "Widget background opacity"
-        defaultValue: 85
-        minimum: 10
-        maximum: 100
-        unit: "%"
-    }
-}
@@ -1,47 +0,0 @@
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 200
-    property real widgetHeight: 200
-    property real minWidth: 150
-    property real minHeight: 150
-
-    // TODO: Load settings reactively
-    property real bgOpacity: {
-        if (!pluginService) return 0.85
-        var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-        return val / 100
-    }
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-            bgOpacity = val / 100
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: root.bgOpacity
-        border.color: root.editMode ? Theme.primary : "transparent"
-        border.width: root.editMode ? 2 : 0
-
-        // TODO: Add your widget content here
-        Text {
-            anchors.centerIn: parent
-            text: "Desktop Widget"
-            color: Theme.surfaceText
-            font.pixelSize: Theme.fontSizeLarge
-        }
-    }
-}
@@ -1,13 +0,0 @@
-{
-    "id": "myDesktopWidget",
-    "name": "My Desktop Widget",
-    "description": "A custom desktop widget",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "desktop",
-    "capabilities": ["desktop-widget"],
-    "component": "./Widget.qml",
-    "icon": "widgets",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}
@@ -1,59 +0,0 @@
-import QtQuick
-import Quickshell
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "#"
-
-    signal itemsChanged()
-
-    // TODO: Define your items
-    property var allItems: [
-        {
-            name: "Example Item",
-            icon: "material:star",
-            comment: "An example launcher item",
-            action: "toast:Hello from my launcher!",
-            categories: ["MyLauncher"]
-        }
-    ]
-
-    function getItems(query) {
-        if (!query || query.length === 0) return allItems
-
-        var q = query.toLowerCase()
-        return allItems.filter(function(item) {
-            return item.name.toLowerCase().includes(q) ||
-                   item.comment.toLowerCase().includes(q)
-        })
-    }
-
-    function executeItem(item) {
-        var actionParts = item.action.split(":")
-        var actionType = actionParts[0]
-        var actionData = actionParts.slice(1).join(":")
-
-        switch (actionType) {
-            case "toast":
-                if (typeof ToastService !== "undefined")
-                    ToastService.showInfo(actionData)
-                break
-            case "copy":
-                Quickshell.execDetached(["dms", "cl", "copy", actionData])
-                if (typeof ToastService !== "undefined")
-                    ToastService.showInfo("Copied to clipboard")
-                break
-            default:
-                console.warn("Unknown action type:", actionType)
-        }
-    }
-
-    Component.onCompleted: {
-        if (pluginService) {
-            trigger = pluginService.loadPluginData("myLauncher", "trigger", "#")
-        }
-    }
-}
@@ -1,23 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myLauncher"
-
-    StringSetting {
-        settingKey: "trigger"
-        label: "Trigger"
-        description: "Type this prefix in the launcher to activate the plugin"
-        placeholder: "#"
-        defaultValue: "#"
-    }
-
-    ToggleSetting {
-        settingKey: "noTrigger"
-        label: "Always Visible"
-        description: "Show items alongside regular apps without needing a trigger"
-        defaultValue: false
-    }
-}
@@ -1,14 +0,0 @@
-{
-    "id": "myLauncher",
-    "name": "My Launcher",
-    "description": "Custom launcher plugin with searchable items",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "launcher",
-    "capabilities": ["launcher"],
-    "component": "./Launcher.qml",
-    "trigger": "#",
-    "icon": "search",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}
@@ -1,23 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myWidget"
-
-    StringSetting {
-        settingKey: "text"
-        label: "Display Text"
-        description: "Text shown in the bar widget"
-        placeholder: "Hello"
-        defaultValue: "Hello"
-    }
-
-    ToggleSetting {
-        settingKey: "showIcon"
-        label: "Show Icon"
-        description: "Display an icon next to the text"
-        defaultValue: true
-    }
-}
@@ -1,75 +0,0 @@
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    // TODO: Read settings reactively
-    property string displayText: pluginData?.text || "Hello"
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            displayText = pluginService.loadPluginData(pluginId, "text", "Hello")
-        }
-    }
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.displayText
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    verticalBarPill: Component {
-        StyledRect {
-            width: parent.widgetThickness
-            height: label.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.displayText
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeSmall
-                rotation: 90
-            }
-        }
-    }
-
-    // TODO: Uncomment and customize popout content
-    // popoutWidth: 350
-    // popoutHeight: 300
-    // popoutContent: Component {
-    //     PopoutComponent {
-    //         headerText: "My Widget"
-    //         showCloseButton: true
-    //
-    //         Column {
-    //             width: parent.width
-    //             spacing: Theme.spacingM
-    //
-    //             StyledText {
-    //                 text: "Popout content here"
-    //                 color: Theme.surfaceText
-    //             }
-    //         }
-    //     }
-    // }
-}
@@ -1,13 +0,0 @@
-{
-    "id": "myWidget",
-    "name": "My Widget",
-    "description": "A custom bar widget",
-    "version": "1.0.0",
-    "author": "Your Name",
-    "type": "widget",
-    "capabilities": ["dankbar-widget"],
-    "component": "./Widget.qml",
-    "icon": "extension",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}
@@ -1,320 +0,0 @@
-# Advanced Patterns
-
-Patterns observed in production DMS plugins that go beyond the basics.
-
-## Plugin Variants
-
-Create multiple widget instances from a single plugin definition. Each variant has its own configuration.
-
-### Manifest
-
-No special manifest changes needed - the variant system is built into PluginComponent.
-
-### Widget with Variant Support
-
-```qml
-PluginComponent {
-    property string variantId: ""
-    property var variantData: ({})
-
-    property string displayText: variantData?.text || "Default"
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.displayText
-            }
-        }
-    }
-}
-```
-
-Widget format in bar config: `pluginId:variantId` (e.g., `exampleVariants:variant_1234567890`)
-
-### Settings with Variant Management
-
-```qml
-PluginSettings {
-    pluginId: "exampleVariants"
-
-    // Variant creation UI
-    DankButton {
-        text: "Add New Instance"
-        onClicked: {
-            var id = "variant_" + Date.now()
-            root.createVariant(id, { name: "New Instance", text: "Hello" })
-        }
-    }
-
-    // Per-variant configuration
-    Repeater {
-        model: root.variants
-        delegate: Column {
-            StringSetting {
-                settingKey: modelData.id + "_text"
-                label: modelData.name || modelData.id
-            }
-        }
-    }
-}
-```
-
-## JavaScript Utility Files
-
-For complex logic, split into `.js` files:
-
-### utils.js
-
-```javascript
-.pragma library
-
-function formatDuration(ms) {
-    if (ms < 60000) return "just now"
-    if (ms < 3600000) return Math.floor(ms / 60000) + "m ago"
-    return Math.floor(ms / 3600000) + "h ago"
-}
-
-function parseResponse(json) {
-    try {
-        return JSON.parse(json)
-    } catch (e) {
-        return null
-    }
-}
-```
-
-### Using in QML
-
-```qml
-import "utils.js" as Utils
-
-Item {
-    StyledText {
-        text: Utils.formatDuration(Date.now() - timestamp)
-    }
-}
-```
-
-The `.pragma library` directive makes the JS file a shared singleton - it is loaded once and shared across all QML instances that import it.
-
-## qmldir for Singleton Services
-
-For plugins with internal singleton services:
-
-### qmldir
-
-```
-singleton MyService 1.0 MyService.qml
-```
-
-### MyService.qml
-
-```qml
-pragma Singleton
-import QtQuick
-
-QtObject {
-    property var cache: ({})
-
-    function getData(key) {
-        return cache[key] || null
-    }
-
-    function setData(key, value) {
-        cache[key] = value
-    }
-}
-```
-
-### Using the singleton
-
-```qml
-import "." as Local
-
-Item {
-    Component.onCompleted: {
-        Local.MyService.setData("key", "value")
-    }
-}
-```
-
-## Inline Component Declarations
-
-Reusable sub-components defined inline:
-
-```qml
-Item {
-    component StatusBadge: Rectangle {
-        property string label: ""
-        property color badgeColor: Theme.primary
-
-        width: badgeText.implicitWidth + Theme.spacingM * 2
-        height: 24
-        radius: 12
-        color: badgeColor
-
-        StyledText {
-            id: badgeText
-            anchors.centerIn: parent
-            text: label
-            color: Theme.onPrimary
-            font.pixelSize: Theme.fontSizeSmall
-        }
-    }
-
-    Row {
-        spacing: Theme.spacingS
-        StatusBadge { label: "Running"; badgeColor: Theme.success }
-        StatusBadge { label: "Stopped"; badgeColor: Theme.error }
-    }
-}
-```
-
-## Multi-Provider Adapter Pattern
-
-For plugins supporting multiple backends (AI providers, API services):
-
-### apiAdapters.js
-
-```javascript
-.pragma library
-
-function createAdapter(provider) {
-    switch (provider) {
-        case "openai": return {
-            url: "https://api.openai.com/v1/chat/completions",
-            headers: (key) => ({ "Authorization": "Bearer " + key }),
-            formatRequest: (messages) => JSON.stringify({ model: "gpt-4", messages: messages }),
-            parseResponse: (text) => JSON.parse(text).choices[0].message.content
-        }
-        case "anthropic": return {
-            url: "https://api.anthropic.com/v1/messages",
-            headers: (key) => ({ "x-api-key": key, "anthropic-version": "2023-06-01" }),
-            formatRequest: (messages) => JSON.stringify({ model: "claude-sonnet-4-20250514", messages: messages }),
-            parseResponse: (text) => JSON.parse(text).content[0].text
-        }
-        default: return null
-    }
-}
-```
-
-## IPC Integration
-
-For plugins that respond to keyboard shortcuts or external commands:
-
-```qml
-PluginComponent {
-    Connections {
-        target: DMSIpc
-        function onCommandReceived(command, args) {
-            if (command === "myPlugin.toggle") {
-                doToggle()
-            } else if (command === "myPlugin.next") {
-                goNext()
-            }
-        }
-    }
-}
-```
-
-External trigger: `dms ipc call myPlugin.toggle`
-
-## Networking with Quickshell.Networking
-
-For API calls using the built-in networking module:
-
-```qml
-import Quickshell.Networking
-
-Item {
-    NetworkRequest {
-        id: request
-        url: "https://api.example.com/data"
-        method: "GET"
-
-        onResponseReceived: (response) => {
-            const data = JSON.parse(response.body)
-            processData(data)
-        }
-
-        onErrorOccurred: (error) => {
-            console.error("Network error:", error)
-        }
-    }
-
-    function fetchData() {
-        request.send()
-    }
-}
-```
-
-## Toast Notifications
-
-Show user feedback:
-
-```qml
-import qs.Services
-
-// Info toast
-ToastService?.showInfo("Operation completed")
-
-// With title
-ToastService?.showInfo("Plugin Name", "Data refreshed successfully")
-```
-
-Always use optional chaining since ToastService may not be available in all contexts.
-
-## Clipboard Operations
-
-```qml
-import Quickshell
-
-function copyToClipboard(text) {
-    Quickshell.execDetached(["dms", "cl", "copy", text])
-    ToastService?.showInfo("Copied to clipboard")
-}
-```
-
-Do NOT use `globalThis.clipboard`, `navigator.clipboard`, or any browser API - they do not exist in the QML runtime.
-
-## Multi-File Plugin Architecture
-
-Large plugins can be split across multiple files:
-
-```
-MyPlugin/
-  plugin.json
-  Main.qml           # Main widget component
-  Settings.qml       # Settings UI
-  DetailView.qml     # Popout detail view
-  utils.js            # Utility functions
-  apiAdapter.js       # API adapter layer
-  qmldir              # Optional: singleton registrations
-```
-
-Import sibling files:
-
-```qml
-// In Main.qml
-import "." as Local
-
-Item {
-    Loader {
-        source: "DetailView.qml"
-    }
-}
-```
-
-## Performance Tips
-
-1. Use `Proc.runCommand` with appropriate debounce for external commands
-2. Pre-cache images and thumbnails for image-heavy plugins
-3. Limit concurrent network requests
-4. Use `Timer` with reasonable intervals (don't poll faster than needed)
-5. Lazy-load heavy content (use `Loader` for complex popout content)
-6. Avoid blocking the UI thread with synchronous operations
@@ -1,272 +0,0 @@
-# Daemon Plugin Guide
-
-Daemon plugins are invisible background services that react to events and execute actions. They have no bar pills or desktop presence.
-
-## Base Component
-
-Daemons use `PluginComponent` with no bar pills:
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    // Event-driven logic goes here
-}
-```
-
-## When to Use Daemons
-
- Monitor system events (wallpaper changes, battery level, notifications)
- Run periodic background tasks (polling APIs, checking system state)
- Execute scripts in response to events
- Control shell UI via PopoutService based on conditions
-
-## Event-Driven Pattern
-
-Use `Connections` to react to service signals:
-
-```qml
-PluginComponent {
-    property var popoutService: null
-
-    Connections {
-        target: SessionData
-        function onWallpaperPathChanged() {
-            console.log("Wallpaper changed to:", SessionData.wallpaperPath)
-            runScript(SessionData.wallpaperPath)
-        }
-    }
-
-    Connections {
-        target: BatteryService
-        function onPercentageChanged() {
-            if (BatteryService.percentage < 10 && !BatteryService.isCharging) {
-                popoutService?.openBattery()
-            }
-        }
-    }
-}
-```
-
-## Available Services
-
-Common services daemons can connect to:
-
-| Service | Signals/Properties | Description |
-|---------|-------------------|-------------|
-| `SessionData` | `wallpaperPath`, `onWallpaperPathChanged` | Desktop session state |
-| `BatteryService` | `percentage`, `isCharging`, `batteryAvailable` | Battery status |
-| `NotificationService` | `onNotificationReceived(notification)` | Desktop notifications |
-| `PluginService` | `onPluginLoaded`, `onGlobalVarChanged` | Plugin lifecycle |
-
-Import services from `qs.Services`.
-
-## Process Execution
-
-### Simple command with Proc
-
-```qml
-import qs.Common
-
-PluginComponent {
-    function runScript(arg) {
-        Proc.runCommand(
-            "myDaemon.script",
-            ["bash", "-c", "echo 'Processing: " + arg + "'"],
-            (stdout, exitCode) => {
-                if (exitCode === 0) {
-                    console.log("Script output:", stdout)
-                } else {
-                    ToastService?.showInfo("Script failed: exit " + exitCode)
-                }
-            }
-        )
-    }
-}
-```
-
-### Long-running process with Process component
-
-```qml
-import Quickshell.Io
-
-PluginComponent {
-    property string scriptPath: ""
-
-    Process {
-        id: proc
-        command: ["bash", scriptPath]
-        running: false
-
-        stdout: StdioCollector {
-            onTextReceived: (text) => {
-                console.log("stdout:", text)
-            }
-        }
-
-        stderr: StdioCollector {
-            onTextReceived: (text) => {
-                console.error("stderr:", text)
-            }
-        }
-
-        onExited: (exitCode) => {
-            if (exitCode !== 0) {
-                ToastService?.showInfo("Process failed: exit " + exitCode)
-            }
-        }
-    }
-
-    function startProcess() {
-        if (scriptPath && !proc.running) {
-            proc.running = true
-        }
-    }
-}
-```
-
-## Timer-Based Polling
-
-```qml
-PluginComponent {
-    Timer {
-        interval: 60000  // every minute
-        running: true
-        repeat: true
-        onTriggered: checkStatus()
-    }
-
-    function checkStatus() {
-        Proc.runCommand(
-            "myDaemon.check",
-            ["sh", "-c", "systemctl is-active myservice"],
-            (stdout, exitCode) => {
-                const active = stdout.trim() === "active"
-                PluginService.setGlobalVar("myDaemon", "serviceActive", active)
-            }
-        )
-    }
-}
-```
-
-## Data Persistence
-
-Daemons access PluginService directly (it's injected via PluginComponent):
-
-```qml
-PluginComponent {
-    property string configuredScript: pluginData?.scriptPath || ""
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId === pluginId) {
-                configuredScript = pluginService.loadPluginData(pluginId, "scriptPath", "")
-            }
-        }
-    }
-}
-```
-
-## PopoutService Usage
-
-Daemons can control shell UI via the injected popoutService:
-
-```qml
-PluginComponent {
-    property var popoutService: null
-
-    function showAlert() {
-        popoutService?.openNotificationCenter()
-    }
-
-    function openSettings() {
-        popoutService?.openSettings()
-    }
-}
-```
-
-See [popout-service-reference.md](popout-service-reference.md) for the full API.
-
-## Complete Example
-
-Based on the WallpaperWatcherDaemon:
-
-```qml
-import QtQuick
-import Quickshell
-import Quickshell.Io
-import qs.Common
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    property string scriptPath: pluginData?.scriptPath || ""
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId === pluginId) {
-                scriptPath = pluginService.loadPluginData(pluginId, "scriptPath", "")
-            }
-        }
-    }
-
-    Connections {
-        target: SessionData
-        function onWallpaperPathChanged() {
-            if (scriptPath) {
-                runWallpaperScript(SessionData.wallpaperPath)
-            }
-        }
-    }
-
-    function runWallpaperScript(wallpaperPath) {
-        console.log("[WallpaperWatcher] Running script:", scriptPath, wallpaperPath)
-
-        Proc.runCommand(
-            "wallpaperWatcher.run",
-            ["bash", scriptPath, wallpaperPath],
-            (stdout, exitCode) => {
-                if (exitCode === 0) {
-                    console.log("[WallpaperWatcher] Script output:", stdout)
-                } else {
-                    console.error("[WallpaperWatcher] Script failed:", exitCode)
-                    ToastService?.showInfo("Wallpaper script failed")
-                }
-            }
-        )
-    }
-
-    Component.onCompleted: {
-        console.log("[WallpaperWatcher] Daemon started")
-    }
-}
-```
-
-## Manifest Example
-
-```json
-{
-    "id": "wallpaperWatcher",
-    "name": "Wallpaper Watcher",
-    "description": "Runs a script when the wallpaper changes",
-    "version": "1.0.0",
-    "author": "Developer",
-    "type": "daemon",
-    "capabilities": ["wallpaper-automation"],
-    "component": "./WallpaperWatcher.qml",
-    "icon": "wallpaper",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write", "process"]
-}
-```
@@ -1,176 +0,0 @@
-# Data Persistence Guide
-
-DMS plugins have three tiers of data persistence, each suited for different use cases.
-
-## Tier 1: Plugin Data (Settings)
-
-Persisted to `settings.json`. Use for user preferences and configuration.
-
-### Saving
-
-```qml
-pluginService.savePluginData(pluginId, "key", value)
-```
-
-### Loading
-
-```qml
-var value = pluginService.loadPluginData(pluginId, "key", defaultValue)
-```
-
-### Reactive Access via pluginData
-
-`PluginComponent` has a reactive `pluginData` property that auto-loads from settings:
-
-```qml
-PluginComponent {
-    property string displayText: pluginData?.text || "Default"
-    property bool showIcon: pluginData?.showIcon !== undefined ? pluginData.showIcon : true
-}
-```
-
-### Reacting to Settings Changes
-
-When settings are changed (e.g., from the settings UI), react with `Connections`:
-
-```qml
-Connections {
-    target: pluginService
-    function onPluginDataChanged(changedId) {
-        if (changedId !== pluginId) return
-        displayText = pluginService.loadPluginData(pluginId, "text", "Default")
-        showIcon = pluginService.loadPluginData(pluginId, "showIcon", true)
-    }
-}
-```
-
-## Tier 2: Plugin State
-
-Persisted to a separate state file. Use for runtime state that should survive restarts but is not user-configurable (history, cache, counters).
-
-### Saving
-
-```qml
-pluginService.savePluginState(pluginId, "key", value)
-```
-
-### Loading
-
-```qml
-var state = pluginService.loadPluginState(pluginId, "key", defaultValue)
-```
-
-### Additional Methods
-
-```qml
-pluginService.clearPluginState(pluginId)
-pluginService.removePluginStateKey(pluginId, "key")
-```
-
-### Example: Persistent History
-
-```qml
-Item {
-    property var history: []
-
-    Component.onCompleted: {
-        history = pluginService?.loadPluginState(pluginId, "history", []) || []
-    }
-
-    function addToHistory(entry) {
-        history.unshift({
-            text: entry,
-            timestamp: Date.now()
-        })
-        if (history.length > 100) history = history.slice(0, 100)
-        pluginService?.savePluginState(pluginId, "history", history)
-    }
-
-    function clearHistory() {
-        history = []
-        pluginService?.removePluginStateKey(pluginId, "history")
-    }
-}
-```
-
-## Tier 3: Global Variables (Runtime Only)
-
-NOT persisted. Shared across all instances of a plugin. Use for cross-instance state synchronization (multi-monitor consistency, multi-instance widgets).
-
-### Using PluginGlobalVar Component
-
-```qml
-import qs.Modules.Plugins
-
-PluginComponent {
-    PluginGlobalVar {
-        id: globalCounter
-        varName: "counter"
-        defaultValue: 0
-    }
-
-    horizontalBarPill: Component {
-        StyledRect {
-            // ...
-            StyledText {
-                text: "Count: " + globalCounter.value
-            }
-
-            MouseArea {
-                onClicked: globalCounter.set(globalCounter.value + 1)
-            }
-        }
-    }
-}
-```
-
-**PluginGlobalVar properties:**
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `varName` | string | Required: name of the global variable |
-| `defaultValue` | any | Optional: default if not set |
-| `value` | any | Readonly: current value |
-
-**Methods:**
- `set(newValue)` - update the value (triggers reactivity across all instances)
-
-### Using PluginService API Directly
-
-```qml
-import qs.Services
-
-property int counter: PluginService.getGlobalVar("myPlugin", "counter", 0)
-
-Connections {
-    target: PluginService
-    function onGlobalVarChanged(pluginId, varName) {
-        if (pluginId === "myPlugin" && varName === "counter") {
-            counter = PluginService.getGlobalVar("myPlugin", "counter", 0)
-        }
-    }
-}
-
-function increment() {
-    var current = PluginService.getGlobalVar("myPlugin", "counter", 0)
-    PluginService.setGlobalVar("myPlugin", "counter", current + 1)
-}
-```
-
-## Decision Matrix
-
-| Need | API | Persisted | Scope |
-|------|-----|-----------|-------|
-| User preferences (API keys, themes, intervals) | `savePluginData` / `loadPluginData` | Yes (settings.json) | Per plugin |
-| Runtime state (history, cache, counters) | `savePluginState` / `loadPluginState` | Yes (state file) | Per plugin |
-| Cross-instance sync (multi-monitor data) | `PluginGlobalVar` or `getGlobalVar`/`setGlobalVar` | No (runtime only) | All instances |
-| Quick reactive reads from settings | `pluginData` property | N/A (read-only) | Per instance |
-
-## Important Notes
-
-1. **pluginData is reactive** - bindings update automatically when data changes
-2. **Global vars are NOT persistent** - they reset when the shell restarts
-3. **State vs Data** - data is for user-facing settings, state is for internal runtime data
-4. **Null safety** - always check `pluginService` is not null before calling methods
-5. **Signal namespacing** - global var signals include `pluginId` to filter for your plugin
-6. **Performance** - global vars are efficient for frequent updates; settings writes are batched
@@ -1,240 +0,0 @@
-# Desktop Plugin Guide
-
-Desktop plugins are widgets that appear on the desktop background layer. They support drag-and-drop positioning and resize via corner handles.
-
-## Base Component
-
-Desktop widgets use a plain `Item` with injected properties:
-
-```qml
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 200
-    property real widgetHeight: 200
-    property real minWidth: 150
-    property real minHeight: 150
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: 0.85
-
-        // Your content here
-    }
-}
-```
-
-## Injected Properties
-
-These are set automatically by the DesktopPluginWrapper:
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `pluginService` | object | PluginService reference for data persistence |
-| `pluginId` | string | Plugin's unique identifier |
-| `editMode` | bool | `true` when user is dragging/resizing |
-| `widgetWidth` | real | Current widget container width |
-| `widgetHeight` | real | Current widget container height |
-
-## Optional Properties
-
-Define these on your root item to customize behavior:
-
-| Property | Type | Default | Description |
-|----------|------|---------|-------------|
-| `minWidth` | real | 100 | Minimum allowed width during resize |
-| `minHeight` | real | 100 | Minimum allowed height during resize |
-
-## Position and Size Persistence
-
-Position (`desktopX`, `desktopY`) and size (`desktopWidth`, `desktopHeight`) are automatically managed by the DesktopPluginWrapper. You do not need to handle persistence for positioning.
-
-## Edit Mode
-
-When `editMode` is true, the user is repositioning or resizing. Use this to:
- Show visual indicators (borders, handles)
- Disable interactive elements to prevent accidental actions
- Display additional controls
-
-```qml
-Rectangle {
-    anchors.fill: parent
-    border.color: root.editMode ? Theme.primary : "transparent"
-    border.width: root.editMode ? 2 : 0
-
-    MouseArea {
-        anchors.fill: parent
-        enabled: !root.editMode
-        onClicked: doSomething()
-    }
-}
-```
-
-## Loading and Saving Data
-
-Use the injected `pluginService` for data persistence:
-
-```qml
-property string displayMode: {
-    if (!pluginService) return "default"
-    return pluginService.loadPluginData(pluginId, "displayMode", "default")
-}
-
-Connections {
-    target: pluginService
-    function onPluginDataChanged(changedId) {
-        if (changedId !== pluginId) return
-        root.displayMode = pluginService.loadPluginData(pluginId, "displayMode", "default")
-    }
-}
-
-function saveMode(mode) {
-    pluginService?.savePluginData(pluginId, "displayMode", mode)
-}
-```
-
-## Settings Component
-
-Desktop plugin settings use the same `PluginSettings` wrapper as other types:
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myDesktopWidget"
-
-    SliderSetting {
-        settingKey: "opacity"
-        label: "Opacity"
-        description: "Widget background opacity"
-        defaultValue: 85
-        minimum: 10
-        maximum: 100
-        unit: "%"
-    }
-
-    SelectionSetting {
-        settingKey: "style"
-        label: "Display Style"
-        options: [
-            { label: "Compact", value: "compact" },
-            { label: "Expanded", value: "expanded" }
-        ]
-        defaultValue: "compact"
-    }
-}
-```
-
-## User Interaction
-
-Desktop widgets support:
-1. **Drag** - click and drag anywhere (in edit mode)
-2. **Resize** - drag bottom-right corner handle (in edit mode)
-3. **Edit mode toggle** - via the desktop edit button
-
-## Complete Example
-
-Based on the ExampleDesktopClock pattern:
-
-```qml
-import QtQuick
-import qs.Common
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string pluginId: ""
-    property bool editMode: false
-    property real widgetWidth: 250
-    property real widgetHeight: 250
-    property real minWidth: 150
-    property real minHeight: 150
-
-    property string clockStyle: {
-        if (!pluginService) return "digital"
-        return pluginService.loadPluginData(pluginId, "clockStyle", "digital")
-    }
-
-    property real bgOpacity: {
-        if (!pluginService) return 0.85
-        var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-        return val / 100
-    }
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId !== pluginId) return
-            clockStyle = pluginService.loadPluginData(pluginId, "clockStyle", "digital")
-            var val = pluginService.loadPluginData(pluginId, "opacity", 85)
-            bgOpacity = val / 100
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainer
-        opacity: root.bgOpacity
-        border.color: root.editMode ? Theme.primary : "transparent"
-        border.width: root.editMode ? 2 : 0
-
-        Column {
-            anchors.centerIn: parent
-            spacing: Theme.spacingS
-
-            Text {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: Qt.formatTime(new Date(), "hh:mm:ss")
-                color: Theme.surfaceText
-                font.pixelSize: root.widgetWidth * 0.15
-                font.weight: Font.Bold
-            }
-
-            Text {
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: Qt.formatDate(new Date(), "ddd, MMM d")
-                color: Theme.onSurfaceVariant
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    Timer {
-        interval: 1000
-        running: true
-        repeat: true
-        onTriggered: root.widgetWidth = root.widgetWidth // force update
-    }
-}
-```
-
-## Manifest Example
-
-```json
-{
-    "id": "myDesktopClock",
-    "name": "Desktop Clock",
-    "description": "Analog and digital clock for the desktop",
-    "version": "1.0.0",
-    "author": "Developer",
-    "type": "desktop",
-    "capabilities": ["desktop-widget"],
-    "component": "./ClockWidget.qml",
-    "icon": "schedule",
-    "settings": "./Settings.qml",
-    "permissions": ["settings_read", "settings_write"]
-}
-```
@@ -1,308 +0,0 @@
-# Launcher Plugin Guide
-
-Launcher plugins extend the DMS launcher with custom searchable items and actions. They use trigger-based filtering and integrate directly into the app drawer.
-
-## Base Component
-
-Launchers use a plain `Item` (not PluginComponent):
-
-```qml
-import QtQuick
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "#"
-
-    signal itemsChanged()
-
-    function getItems(query) {
-        // Return array of items
-        return []
-    }
-
-    function executeItem(item) {
-        // Handle item selection
-    }
-}
-```
-
-## Required Interface
-
-| Member | Type | Description |
-|--------|------|-------------|
-| `pluginService` | property | Injected PluginService reference (declare as `null`) |
-| `trigger` | property | Trigger string for activation |
-| `itemsChanged` | signal | Emit when item list changes (triggers UI refresh) |
-| `getItems(query)` | function | Return array of items matching query |
-| `executeItem(item)` | function | Handle item selection |
-
-## Item Structure
-
-Each item returned by `getItems()`:
-
-```javascript
-{
-    name: "Item Display Name",       // Required: shown in launcher
-    icon: "material:star",           // Optional: icon specification
-    comment: "Description text",     // Required: subtitle text
-    action: "type:data",             // Required: action identifier
-    categories: ["MyPlugin"],        // Required: array with plugin category
-    imageUrl: "https://..."          // Optional: image for tile view
-}
-```
-
-## Icon Types
-
-### 1. Material Design Icons
-
-```javascript
-{ icon: "material:lightbulb" }
-{ icon: "material:terminal" }
-{ icon: "material:translate" }
-```
-
-Uses the Material Symbols Rounded font.
-
-### 2. Unicode / Emoji Icons
-
-```javascript
-{ icon: "unicode:smile_face" }
-```
-
-Rendered at 70-80% of icon size with theming.
-
-### 3. Desktop Theme Icons
-
-```javascript
-{ icon: "firefox" }
-{ icon: "folder" }
-```
-
-Uses the user's installed icon theme.
-
-### 4. No Icon
-
-Omit the `icon` field entirely. The launcher hides the icon area and gives full width to the item name.
-
-## Trigger System
-
-**Custom trigger** (items only appear when trigger is typed):
-
-```json
-{ "trigger": "#" }
-```
-
- Type `#` alone: shows all plugin items
- Type `# query`: filters plugin items by query
- The query string (without trigger) is passed to `getItems(query)`
-
-**No trigger** (items always visible alongside regular apps):
-
-```json
-{ "trigger": "" }
-```
-
-Save empty trigger at runtime:
-```qml
-Component.onCompleted: {
-    trigger = pluginService?.loadPluginData(pluginId, "trigger", "#") ?? "#"
-}
-```
-
-## Action Execution
-
-Parse action strings in `executeItem()`:
-
-```qml
-function executeItem(item) {
-    const actionParts = item.action.split(":")
-    const actionType = actionParts[0]
-    const actionData = actionParts.slice(1).join(":")
-
-    switch (actionType) {
-        case "toast":
-            ToastService?.showInfo(actionData)
-            break
-        case "copy":
-            Quickshell.execDetached(["dms", "cl", "copy", actionData])
-            ToastService?.showInfo("Copied to clipboard")
-            break
-        case "exec":
-            Quickshell.execDetached(actionData.split(" "))
-            break
-        case "url":
-            Quickshell.execDetached(["xdg-open", actionData])
-            break
-        default:
-            console.warn("Unknown action type:", actionType)
-    }
-}
-```
-
-## Search / Filtering
-
-The `query` parameter in `getItems()` contains the user's search text (without the trigger prefix).
-
-```qml
-function getItems(query) {
-    const allItems = [
-        { name: "Calculator", icon: "material:calculate",
-          comment: "Open calculator", action: "exec:gnome-calculator",
-          categories: ["Tools"] },
-        { name: "Terminal", icon: "material:terminal",
-          comment: "Open terminal", action: "exec:alacritty",
-          categories: ["Tools"] }
-    ]
-
-    if (!query || query.length === 0) return allItems
-
-    const q = query.toLowerCase()
-    return allItems.filter(item =>
-        item.name.toLowerCase().includes(q) ||
-        item.comment.toLowerCase().includes(q)
-    )
-}
-```
-
-## Context Menu Actions
-
-Add right-click actions to launcher items:
-
-```qml
-function getContextMenuActions(item) {
-    return [
-        { name: "Copy", icon: "material:content_copy",
-          action: "copy:" + item.name },
-        { name: "Open in Browser", icon: "material:open_in_new",
-          action: "url:" + item.url }
-    ]
-}
-```
-
-Context menu actions use the same `executeItem()` handler.
-
-## Image Tile View
-
-For image-heavy launchers (GIF search, sticker pickers), use tile view:
-
-In `plugin.json`:
-```json
-{
-    "viewMode": "tile",
-    "viewModeEnforced": true
-}
-```
-
-In items:
-```javascript
-{
-    name: "Image Title",
-    imageUrl: "https://example.com/image.png",
-    comment: "Description",
-    action: "copy:https://example.com/image.png",
-    categories: ["MyPlugin"]
-}
-```
-
-## State Persistence
-
-For plugins with persistent state (notes, history, favorites):
-
-```qml
-property var notes: []
-
-Component.onCompleted: {
-    const saved = pluginService?.loadPluginState(pluginId, "notes", [])
-    if (saved) notes = saved
-}
-
-function addNote(text) {
-    notes.push({ text: text, timestamp: Date.now() })
-    pluginService?.savePluginState(pluginId, "notes", notes)
-    itemsChanged()
-}
-```
-
-Use `savePluginState/loadPluginState` for runtime data and `savePluginData/loadPluginData` for user preferences.
-
-## Settings for Trigger Configuration
-
-Provide a PluginSettings component for trigger customization:
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "myLauncher"
-
-    StringSetting {
-        settingKey: "trigger"
-        label: "Trigger"
-        description: "Type this prefix to activate the launcher plugin"
-        placeholder: "#"
-        defaultValue: "#"
-    }
-
-    ToggleSetting {
-        settingKey: "noTrigger"
-        label: "Always Visible"
-        description: "Show items alongside regular apps (no trigger needed)"
-        defaultValue: false
-    }
-}
-```
-
-## Complete Example
-
-```qml
-import QtQuick
-import Quickshell
-import qs.Services
-
-Item {
-    id: root
-
-    property var pluginService: null
-    property string trigger: "!"
-
-    signal itemsChanged()
-
-    property var commands: [
-        { name: "Lock Screen", icon: "material:lock",
-          comment: "Lock the session", action: "exec:loginctl lock-session" },
-        { name: "Screenshot", icon: "material:screenshot_monitor",
-          comment: "Take a screenshot", action: "exec:grim" },
-        { name: "File Manager", icon: "material:folder",
-          comment: "Open file manager", action: "exec:nautilus" }
-    ]
-
-    function getItems(query) {
-        if (!query) return commands
-        const q = query.toLowerCase()
-        return commands.filter(c =>
-            c.name.toLowerCase().includes(q) ||
-            c.comment.toLowerCase().includes(q)
-        )
-    }
-
-    function executeItem(item) {
-        const [type, ...rest] = item.action.split(":")
-        const data = rest.join(":")
-        if (type === "exec") {
-            Quickshell.execDetached(data.split(" "))
-        }
-    }
-
-    Component.onCompleted: {
-        if (pluginService) {
-            trigger = pluginService.loadPluginData("quickCommands", "trigger", "!")
-        }
-    }
-}
-```
@@ -1,119 +0,0 @@
-# Plugin Manifest Reference (plugin.json)
-
-## Required Fields
-
-| Field | Type | Description | Validation |
-|-------|------|-------------|------------|
-| `id` | string | Unique plugin identifier | camelCase, pattern `^[a-zA-Z][a-zA-Z0-9]*$` |
-| `name` | string | Human-readable name | Non-empty |
-| `description` | string | Short description (shown in UI) | Non-empty |
-| `version` | string | Semantic version | Pattern `^\d+\.\d+\.\d+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$` |
-| `author` | string | Creator name or email | Non-empty |
-| `type` | string | Plugin type | One of: `widget`, `daemon`, `launcher`, `desktop` |
-| `capabilities` | array | Plugin capabilities | At least 1 string item |
-| `component` | string | Path to main QML file | Must start with `./`, end with `.qml` |
-
-## Conditional Requirements
-
-| Condition | Required Field | Description |
-|-----------|---------------|-------------|
-| `type: "launcher"` | `trigger` | Trigger string for launcher activation (e.g., `=`, `#`, `!`) |
-
-## Optional Fields
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `icon` | string | Material Design icon name (displayed in plugin list UI) |
-| `settings` | string | Path to settings QML file (must start with `./`, end with `.qml`) |
-| `requires_dms` | string | Minimum DMS version (e.g., `>=0.1.18`), pattern `^(>=?\|<=?\|=\|>\|<)\d+\.\d+\.\d+$` |
-| `requires` | array | System tool dependencies (e.g., `["curl", "jq"]`) |
-| `permissions` | array | Required permissions |
-| `trigger` | string | Launcher trigger string (required for launcher type) |
-
-## Permissions
-
-| Permission | Description | Enforced |
-|------------|-------------|----------|
-| `settings_read` | Read plugin configuration | No (not currently enforced) |
-| `settings_write` | Write plugin configuration / use PluginSettings | **Yes** |
-| `process` | Execute system commands | No (not currently enforced) |
-| `network` | Network access | No (not currently enforced) |
-
-If your plugin has a `settings` component but does not declare `settings_write`, users will see an error instead of the settings UI.
-
-## Capabilities
-
-Capabilities are free-form strings that describe what the plugin does. Common values:
-
- `dankbar-widget` - general bar widget
- `control-center` - integrates with Control Center
- `monitoring` - system/service monitoring
- `launcher` - launcher search provider
- `desktop-widget` - desktop background widget
- `ai` - AI/LLM integration
- `slideout` - uses slideout panel
-
-## Complete Example
-
-```json
-{
-    "id": "myPlugin",
-    "name": "My Plugin",
-    "description": "A sample plugin demonstrating all fields",
-    "version": "1.0.0",
-    "author": "Developer Name",
-    "type": "widget",
-    "capabilities": ["dankbar-widget", "control-center"],
-    "component": "./MyWidget.qml",
-    "icon": "extension",
-    "settings": "./Settings.qml",
-    "requires_dms": ">=0.1.18",
-    "requires": ["curl", "jq"],
-    "permissions": ["settings_read", "settings_write", "process", "network"]
-}
-```
-
-## Launcher Example
-
-```json
-{
-    "id": "myLauncher",
-    "name": "My Launcher",
-    "description": "Search and execute custom actions",
-    "version": "1.0.0",
-    "author": "Developer Name",
-    "type": "launcher",
-    "capabilities": ["launcher"],
-    "component": "./MyLauncher.qml",
-    "trigger": "#",
-    "icon": "search",
-    "settings": "./Settings.qml",
-    "requires_dms": ">=0.1.18",
-    "permissions": ["settings_read", "settings_write"]
-}
-```
-
-## JSON Schema
-
-The complete JSON schema is available at `assets/plugin-schema.json` in this skill. Validate with:
-
-```bash
-# Using python
-python3 -c "
-import json, jsonschema
-schema = json.load(open('path/to/plugin-schema.json'))
-manifest = json.load(open('plugin.json'))
-jsonschema.validate(manifest, schema)
-print('Valid!')
-"
-
-# Using jq (syntax check only)
-jq . plugin.json
-```
-
-## Additional Properties
-
-The schema allows additional properties (`"additionalProperties": true`), so plugins can include custom fields. Common custom fields seen in production plugins:
-
- `viewMode` - launcher display mode (`"tile"` for image grids)
- `viewModeEnforced` - lock launcher to specific view mode (`true`/`false`)
@@ -1,120 +0,0 @@
-# PopoutService Reference
-
-The `PopoutService` singleton lets plugins control all DMS popouts and modals. It is automatically injected into widget, daemon, and settings components.
-
-## Setup
-
-Declare the property in your component for injection to work:
-
-```qml
-property var popoutService: null
-```
-
-Without this declaration, injection fails with: `Cannot assign to non-existent property "popoutService"`
-
-## Popouts (DankPopout-based)
-
-| Component | Open | Close | Toggle |
-|-----------|------|-------|--------|
-| Control Center | `openControlCenter()` | `closeControlCenter()` | `toggleControlCenter()` |
-| Notification Center | `openNotificationCenter()` | `closeNotificationCenter()` | `toggleNotificationCenter()` |
-| App Drawer | `openAppDrawer()` | `closeAppDrawer()` | `toggleAppDrawer()` |
-| Process List | `openProcessList()` | `closeProcessList()` | `toggleProcessList()` |
-| DankDash | `openDankDash(tab)` | `closeDankDash()` | `toggleDankDash(tab)` |
-| Battery | `openBattery()` | `closeBattery()` | `toggleBattery()` |
-| VPN | `openVpn()` | `closeVpn()` | `toggleVpn()` |
-| System Update | `openSystemUpdate()` | `closeSystemUpdate()` | `toggleSystemUpdate()` |
-
-## Modals (DankModal-based)
-
-| Modal | Show | Hide | Notes |
-|-------|------|------|-------|
-| Settings | `openSettings()` | `closeSettings()` | Full settings interface |
-| Clipboard History | `openClipboardHistory()` | `closeClipboardHistory()` | Clipboard integration |
-| Launcher | `openDankLauncherV2()` | `closeDankLauncherV2()` | Also has `toggleDankLauncherV2()` |
-| Power Menu | `openPowerMenu()` | `closePowerMenu()` | Also has `togglePowerMenu()` |
-| Process List Modal | `showProcessListModal()` | `hideProcessListModal()` | Has `toggleProcessListModal()` |
-| Color Picker | `showColorPicker()` | `hideColorPicker()` | Theme color selection |
-| Notification | `showNotificationModal()` | `hideNotificationModal()` | Notification details |
-| WiFi Password | `showWifiPasswordModal()` | `hideWifiPasswordModal()` | Network auth |
-| Network Info | `showNetworkInfoModal()` | `hideNetworkInfoModal()` | Network details |
-
-## Slideouts
-
-| Component | Open | Close | Toggle |
-|-----------|------|-------|--------|
-| Notepad | `openNotepad()` | `closeNotepad()` | `toggleNotepad()` |
-
-## Usage Examples
-
-### Simple toggle
-
-```qml
-MouseArea {
-    onClicked: popoutService?.toggleControlCenter()
-}
-```
-
-### Conditional popout
-
-```qml
-Connections {
-    target: BatteryService
-    function onPercentageChanged() {
-        if (BatteryService.percentage < 10 && !BatteryService.isCharging) {
-            popoutService?.openBattery()
-        }
-    }
-}
-```
-
-### Context menu with multiple actions
-
-```qml
-MouseArea {
-    acceptedButtons: Qt.LeftButton | Qt.RightButton
-    onClicked: (mouse) => {
-        if (mouse.button === Qt.RightButton) contextMenu.popup()
-        else popoutService?.toggleControlCenter()
-    }
-}
-
-Menu {
-    id: contextMenu
-    MenuItem { text: "Settings"; onClicked: popoutService?.openSettings() }
-    MenuItem { text: "Notifications"; onClicked: popoutService?.toggleNotificationCenter() }
-    MenuItem { text: "Power"; onClicked: popoutService?.openPowerMenu() }
-}
-```
-
-### Position-aware toggle (from bar pill)
-
-Some toggle functions accept position parameters for proper popout placement:
-
-```qml
-pillClickAction: (x, y, width, section, screen) => {
-    popoutService?.toggleControlCenter(x, y, width, section, screen)
-}
-```
-
-## Best Practices
-
-1. **Always use optional chaining** (`?.`) - the service may not be injected yet
-2. **Check feature availability** before opening feature-specific popouts:
-   ```qml
-   if (BatteryService.batteryAvailable) {
-       popoutService?.openBattery()
-   }
-   ```
-3. **Lazy loading** - first access may activate lazy loaders; this is normal
-4. **Popouts are shared** - avoid opening conflicting popouts simultaneously
-5. **User intent** - only trigger popouts from user actions or critical system events
-6. **Multi-monitor** - positioned popouts are screen-aware when using position parameters
-
-## Injection Locations
-
-The service is injected at these points:
- `DMSShell.qml` - daemon plugins
- `WidgetHost.qml` - widget plugins in left/right bar sections
- `CenterSection.qml` - center bar widgets
- `PluginsTab.qml` - settings components
@@ -1,273 +0,0 @@
-# Settings Components Reference
-
-All plugin settings use the `PluginSettings` wrapper. Setting components auto-save on change and auto-load on creation.
-
-## PluginSettings Wrapper
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginSettings {
-    pluginId: "yourPlugin"  // Required: must match plugin.json id
-
-    // Setting components go here
-}
-```
-
-**Important:** The plugin must declare `"permissions": ["settings_write"]` in plugin.json for the settings UI to render. Without it, users see an error.
-
-**PluginSettings provides to children:**
- `saveValue(key, value)` - save a setting value
- `loadValue(key, defaultValue)` - load a setting value
- `saveState(key, value)` - save plugin state (separate file)
- `loadState(key, defaultValue)` - load plugin state
- `clearState()` - clear all plugin state
- Variant management functions (for variant plugins)
-
-## StringSetting
-
-Text input field.
-
-```qml
-StringSetting {
-    settingKey: "apiKey"        // Required: storage key
-    label: "API Key"            // Required: display label
-    description: "Your API key" // Optional: help text
-    placeholder: "sk-..."      // Optional: input placeholder
-    defaultValue: ""            // Optional: default (default: "")
-}
-```
-
-**Layout:** Vertical stack - label, description, input field.
-
-## ToggleSetting
-
-Boolean toggle switch.
-
-```qml
-ToggleSetting {
-    settingKey: "notifications"    // Required: storage key
-    label: "Enable Notifications"  // Required: display label
-    description: "Show alerts"     // Optional: help text
-    defaultValue: true             // Optional: default (default: false)
-}
-```
-
-**Layout:** Horizontal - label/description on left, toggle on right.
-
-## SelectionSetting
-
-Dropdown menu.
-
-```qml
-SelectionSetting {
-    settingKey: "theme"           // Required: storage key
-    label: "Theme"                // Required: display label
-    description: "Color scheme"   // Optional: help text
-    options: [                    // Required: array of options
-        { label: "Dark", value: "dark" },
-        { label: "Light", value: "light" },
-        { label: "Auto", value: "auto" }
-    ]
-    defaultValue: "dark"          // Optional: default value
-}
-```
-
-Options can be `{ label, value }` objects or simple strings. Stores the `value` field, displays the `label` field.
-
-**Layout:** Horizontal - label/description on left, dropdown on right.
-
-**Reacting to changes:**
-```qml
-SelectionSetting {
-    settingKey: "updateInterval"
-    label: "Update Interval"
-    options: [
-        { label: "1 minute", value: "60" },
-        { label: "5 minutes", value: "300" }
-    ]
-    defaultValue: "300"
-    onValueChanged: (newValue) => {
-        console.log("Interval changed to:", newValue)
-    }
-}
-```
-
-## SliderSetting
-
-Numeric slider with min/max.
-
-```qml
-SliderSetting {
-    settingKey: "opacity"      // Required: storage key
-    label: "Opacity"           // Required: display label
-    description: "Background"  // Optional: help text
-    defaultValue: 85           // Optional: default value
-    minimum: 0                 // Required: min value
-    maximum: 100               // Required: max value
-    unit: "%"                  // Optional: unit label shown after value
-    leftIcon: "dark_mode"      // Optional: Material icon on left
-    rightIcon: "light_mode"    // Optional: Material icon on right
-}
-```
-
-## ColorSetting
-
-Color picker.
-
-```qml
-ColorSetting {
-    settingKey: "accentColor"      // Required: storage key
-    label: "Accent Color"          // Required: display label
-    description: "Custom accent"   // Optional: help text
-    defaultValue: "#ff5722"        // Optional: default hex color
-}
-```
-
-Displays a color swatch that opens a color picker dialog.
-
-## ListSetting
-
-Manage a list of items with manual add/remove. Use when you need custom UI for adding items.
-
-```qml
-ListSetting {
-    id: itemList
-    settingKey: "items"           // Required: storage key
-    label: "Saved Items"          // Required: display label
-    description: "Your items"     // Optional: help text
-    defaultValue: []              // Optional: default array
-    delegate: Component {         // Optional: custom item display
-        StyledRect {
-            width: parent.width
-            height: 40
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                anchors.left: parent.left
-                anchors.leftMargin: Theme.spacingM
-                anchors.verticalCenter: parent.verticalCenter
-                text: modelData.name
-                color: Theme.surfaceText
-            }
-
-            Rectangle {
-                anchors.right: parent.right
-                anchors.rightMargin: Theme.spacingM
-                anchors.verticalCenter: parent.verticalCenter
-                width: 60
-                height: 28
-                color: removeArea.containsMouse ? Theme.errorHover : Theme.error
-                radius: Theme.cornerRadius
-
-                StyledText {
-                    anchors.centerIn: parent
-                    text: "Remove"
-                    color: Theme.errorText
-                    font.pixelSize: Theme.fontSizeSmall
-                    font.weight: Font.Medium
-                }
-
-                MouseArea {
-                    id: removeArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: itemList.removeItem(index)
-                }
-            }
-        }
-    }
-}
-```
-
-**Methods:**
- `addItem(item)` - add an item to the list
- `removeItem(index)` - remove item at index
-
-## ListSettingWithInput
-
-Complete list management with built-in form. Best for collecting structured data.
-
-```qml
-ListSettingWithInput {
-    settingKey: "locations"        // Required: storage key
-    label: "Locations"             // Required: display label
-    description: "Track zones"     // Optional: help text
-    defaultValue: []               // Optional: default array
-    fields: [                      // Required: field definitions
-        {
-            id: "name",            // Required: key in saved object
-            label: "Name",         // Required: column header
-            placeholder: "Home",   // Optional: input placeholder
-            width: 150,            // Optional: column width (default: 200)
-            required: true         // Optional: must have value to add
-        },
-        {
-            id: "timezone",
-            label: "Timezone",
-            placeholder: "America/New_York",
-            width: 200,
-            required: true
-        }
-    ]
-}
-```
-
-Automatically generates: column headers, input fields, add button with validation, list display, remove buttons.
-
-## Mixing Custom UI with Settings
-
-You can interleave regular QML elements with setting components:
-
-```qml
-PluginSettings {
-    pluginId: "myPlugin"
-
-    StyledText {
-        width: parent.width
-        text: "General Settings"
-        font.pixelSize: Theme.fontSizeLarge
-        font.weight: Font.Bold
-        color: Theme.surfaceText
-    }
-
-    StringSetting {
-        settingKey: "name"
-        label: "Display Name"
-    }
-
-    StyledText {
-        width: parent.width
-        text: "Advanced Settings"
-        font.pixelSize: Theme.fontSizeLarge
-        font.weight: Font.Bold
-        color: Theme.surfaceText
-        topPadding: Theme.spacingL
-    }
-
-    ToggleSetting {
-        settingKey: "debug"
-        label: "Debug Mode"
-        defaultValue: false
-    }
-}
-```
-
-## Default Values
-
-Define sensible defaults in every setting component. The default is used when no saved value exists:
-
-```qml
-StringSetting { settingKey: "text"; defaultValue: "Hello" }
-ToggleSetting { settingKey: "enabled"; defaultValue: true }
-SelectionSetting { settingKey: "mode"; defaultValue: "auto" }
-SliderSetting { settingKey: "opacity"; defaultValue: 85 }
-ColorSetting { settingKey: "color"; defaultValue: "#ff5722" }
-ListSetting { settingKey: "items"; defaultValue: [] }
-ListSettingWithInput { settingKey: "data"; defaultValue: [] }
-```
@@ -1,216 +0,0 @@
-# Theme Property Reference
-
-All theme properties are accessed via the `Theme` singleton from `qs.Common`. Always use these instead of hardcoded values.
-
-## Font Sizes
-
-```qml
-Theme.fontSizeSmall     // 12px (scaled by SettingsData.fontScale)
-Theme.fontSizeMedium    // 14px (scaled)
-Theme.fontSizeLarge     // 16px (scaled)
-Theme.fontSizeXLarge    // 20px (scaled)
-```
-
-## Icon Sizes
-
-```qml
-Theme.iconSizeSmall     // 16px
-Theme.iconSize          // 24px (default)
-Theme.iconSizeLarge     // 32px
-```
-
-## Spacing
-
-```qml
-Theme.spacingXS         // Extra small
-Theme.spacingS          // Small
-Theme.spacingM          // Medium
-Theme.spacingL          // Large
-Theme.spacingXL         // Extra large
-```
-
-## Border Radius
-
-```qml
-Theme.cornerRadius      // Standard
-Theme.cornerRadiusSmall // Smaller
-Theme.cornerRadiusLarge // Larger
-```
-
-## Surface Colors
-
-```qml
-Theme.surface
-Theme.surfaceContainerLow
-Theme.surfaceContainer
-Theme.surfaceContainerHigh
-Theme.surfaceContainerHighest
-```
-
-## Text Colors
-
-```qml
-Theme.onSurface          // Primary text on surface
-Theme.onSurfaceVariant   // Secondary text on surface
-Theme.surfaceText        // Alias for primary surface text
-Theme.surfaceVariantText // Alias for secondary surface text
-Theme.outline            // Border/divider color
-```
-
-## Semantic Colors
-
-```qml
-Theme.primary
-Theme.onPrimary
-Theme.secondary
-Theme.onSecondary
-Theme.error
-Theme.errorHover
-Theme.errorText
-Theme.warning
-Theme.success
-```
-
-## Special Functions
-
-```qml
-Theme.popupBackground()  // Popup background with proper opacity
-```
-
-## Common Widget Patterns
-
-### Icon with Text
-
-```qml
-import qs.Widgets
-
-Row {
-    spacing: Theme.spacingS
-
-    DankIcon {
-        name: "icon_name"
-        color: Theme.onSurface
-        font.pixelSize: Theme.iconSize
-    }
-
-    StyledText {
-        text: "Label"
-        color: Theme.onSurface
-        font.pixelSize: Theme.fontSizeMedium
-    }
-}
-```
-
-### Container with Border
-
-```qml
-Rectangle {
-    color: Theme.surfaceContainerHigh
-    radius: Theme.cornerRadius
-    border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
-    border.width: 1
-}
-```
-
-### Hover Effect
-
-```qml
-Rectangle {
-    id: container
-    color: Theme.surfaceContainerHigh
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        onEntered: container.color = Qt.lighter(Theme.surfaceContainerHigh, 1.1)
-        onExited: container.color = Theme.surfaceContainerHigh
-    }
-}
-```
-
-### Clickable Pill
-
-```qml
-StyledRect {
-    width: content.implicitWidth + Theme.spacingM * 2
-    height: parent.widgetThickness
-    radius: Theme.cornerRadius
-    color: mouseArea.containsMouse
-        ? Qt.lighter(Theme.surfaceContainerHigh, 1.1)
-        : Theme.surfaceContainerHigh
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-    }
-
-    Row {
-        id: content
-        anchors.centerIn: parent
-        spacing: Theme.spacingS
-
-        DankIcon {
-            name: "star"
-            color: Theme.surfaceText
-            font.pixelSize: Theme.iconSize
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        StyledText {
-            text: "Label"
-            color: Theme.surfaceText
-            font.pixelSize: Theme.fontSizeMedium
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-}
-```
-
-## Common Mistakes
-
-**Wrong property names** (these do NOT exist):
-```qml
-Theme.fontSizeS        // Use Theme.fontSizeSmall
-Theme.iconSizeS        // Use Theme.iconSizeSmall
-Theme.spacingSmall     // Use Theme.spacingS
-Theme.borderRadius     // Use Theme.cornerRadius
-```
-
-**Hardcoded values** (do NOT do this):
-```qml
-color: "#1e1e1e"       // Use Theme.surfaceContainerHigh
-color: "white"         // Use Theme.surfaceText
-font.pixelSize: 14     // Use Theme.fontSizeMedium
-```
-
-## Available Widgets from qs.Widgets
-
-| Widget | Description |
-|--------|-------------|
-| `StyledText` | Themed text with proper color defaults |
-| `StyledRect` | Themed rectangle |
-| `DankIcon` | Material Symbols icon renderer |
-| `DankNFIcon` | Nerd Font icon renderer |
-| `DankButton` | Themed button |
-| `DankToggle` | Toggle switch |
-| `DankTextField` | Text input field |
-| `DankSlider` | Slider control |
-| `DankDropdown` | Dropdown menu |
-| `DankGridView` | Grid layout view |
-| `DankListView` | List layout view |
-| `DankFlickable` | Scrollable container |
-| `DankTabBar` | Tab bar navigation |
-| `DankCollapsibleSection` | Collapsible content section |
-| `DankTooltip` | Hover tooltip |
-| `DankNumberStepper` | Number +/- control |
-| `DankFilterChips` | Filter chip row |
-| `CachingImage` | Image with disk cache |
-| `NumericText` | Fixed-width numeric display |
-
-## Checking All Properties
-
-```bash
-grep "property" Common/Theme.qml
-```
@@ -1,369 +0,0 @@
-# Widget Plugin Guide
-
-Widgets are bar plugins that display pills in DankBar, optionally open popouts, and can integrate with the Control Center.
-
-## Base Component
-
-Widgets use `PluginComponent` from `qs.Modules.Plugins`.
-
-```qml
-import QtQuick
-import qs.Common
-import qs.Widgets
-import qs.Modules.Plugins
-
-PluginComponent {
-    property var popoutService: null
-
-    horizontalBarPill: Component { /* ... */ }
-    verticalBarPill: Component { /* ... */ }
-    popoutContent: Component { /* ... */ }
-    popoutWidth: 400
-    popoutHeight: 300
-}
-```
-
-## Injected Properties
-
-These are automatically set by the plugin host:
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `axis` | object | Bar axis info (horizontal/vertical) |
-| `section` | string | Bar section: `"left"`, `"center"`, or `"right"` |
-| `parentScreen` | object | Screen reference for multi-monitor |
-| `widgetThickness` | real | Widget size perpendicular to bar edge |
-| `barThickness` | real | Bar thickness parallel to edge |
-| `pluginId` | string | This plugin's ID |
-| `pluginService` | object | PluginService reference |
-| `pluginData` | object | Reactive plugin settings data |
-
-## Bar Pills
-
-Define `horizontalBarPill` (for top/bottom bars) and `verticalBarPill` (for left/right bars).
-
-### Horizontal Bar Pill
-
-```qml
-horizontalBarPill: Component {
-    StyledRect {
-        width: content.implicitWidth + Theme.spacingM * 2
-        height: parent.widgetThickness
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainerHigh
-
-        Row {
-            id: content
-            anchors.centerIn: parent
-            spacing: Theme.spacingS
-
-            DankIcon {
-                name: "star"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.iconSize
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            StyledText {
-                text: "Label"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.fontSizeMedium
-                anchors.verticalCenter: parent.verticalCenter
-            }
-        }
-    }
-}
-```
-
-### Vertical Bar Pill
-
-```qml
-verticalBarPill: Component {
-    StyledRect {
-        width: parent.widgetThickness
-        height: content.implicitHeight + Theme.spacingM * 2
-        radius: Theme.cornerRadius
-        color: Theme.surfaceContainerHigh
-
-        Column {
-            id: content
-            anchors.centerIn: parent
-            spacing: Theme.spacingS
-
-            DankIcon {
-                name: "star"
-                color: Theme.surfaceText
-                font.pixelSize: Theme.iconSizeSmall
-            }
-        }
-    }
-}
-```
-
-**Important:** Always define both pills. If a pill is missing, the widget disappears when the bar is on that orientation's edge.
-
-## Popout Content
-
-Open a popout window when the bar pill is clicked:
-
-```qml
-PluginComponent {
-    popoutWidth: 400
-    popoutHeight: 300
-
-    popoutContent: Component {
-        PopoutComponent {
-            headerText: "My Plugin"
-            detailsText: "Optional subtitle"
-            showCloseButton: true
-
-            Column {
-                width: parent.width
-                spacing: Theme.spacingM
-
-                StyledText {
-                    text: "Content here"
-                    color: Theme.surfaceText
-                    font.pixelSize: Theme.fontSizeMedium
-                }
-            }
-        }
-    }
-}
-```
-
-**PopoutComponent properties:**
-
-| Property | Type | Default | Description |
-|----------|------|---------|-------------|
-| `headerText` | string | `""` | Main header (bold, large). Hidden if empty. |
-| `detailsText` | string | `""` | Subtitle below header. Hidden if empty. |
-| `showCloseButton` | bool | `false` | Show X button in top-right corner. |
-| `closePopout` | function | (injected) | Call to close the popout programmatically. |
-| `headerHeight` | int | (readonly) | Height of header area (0 if hidden). |
-| `detailsHeight` | int | (readonly) | Height of details area (0 if hidden). |
-
-**Content sizing:** Content children render below the header/details. Calculate available height: `popoutHeight - headerHeight - detailsHeight - spacing`
-
-## Custom Click Actions
-
-Override the default popout behavior:
-
-```qml
-PluginComponent {
-    // Simple no-args handler
-    pillClickAction: () => {
-        popoutService?.toggleControlCenter()
-    }
-
-    // With position params (x, y, width, section, screen)
-    pillClickAction: (x, y, width, section, screen) => {
-        popoutService?.toggleControlCenter(x, y, width, section, screen)
-    }
-
-    pillRightClickAction: () => {
-        popoutService?.openSettings()
-    }
-}
-```
-
-## Control Center Integration
-
-Add CC properties to show your widget in the Control Center grid:
-
-```qml
-PluginComponent {
-    ccWidgetIcon: "toggle_on"
-    ccWidgetPrimaryText: "Feature Name"
-    ccWidgetSecondaryText: isActive ? "Active" : "Off"
-    ccWidgetIsActive: isActive
-
-    onCcWidgetToggled: {
-        isActive = !isActive
-        pluginService?.savePluginData(pluginId, "active", isActive)
-    }
-}
-```
-
-**CC properties:**
-
-| Property | Type | Description |
-|----------|------|-------------|
-| `ccWidgetIcon` | string | Material icon name |
-| `ccWidgetPrimaryText` | string | Main label |
-| `ccWidgetSecondaryText` | string | Subtitle / status text |
-| `ccWidgetIsActive` | bool | Active state (changes styling) |
-
-**CC signals:**
-
-| Signal | When fired |
-|--------|-----------|
-| `ccWidgetToggled()` | Icon area clicked |
-| `ccWidgetExpanded()` | Expand area clicked (CompoundPill only) |
-
-**CC sizing rules:**
- 25% width - SmallToggleButton (icon only)
- 50% width - ToggleButton (no detail) or CompoundPill (with ccDetailContent)
- Users can resize in CC edit mode
-
-### Detail Content (CompoundPill)
-
-Add an expandable panel below the CC widget:
-
-```qml
-ccDetailContent: Component {
-    Rectangle {
-        implicitHeight: 200
-        color: Theme.surfaceContainerHigh
-        radius: Theme.cornerRadius
-
-        Column {
-            anchors.fill: parent
-            anchors.margins: Theme.spacingM
-            spacing: Theme.spacingS
-
-            // Detail UI here
-        }
-    }
-}
-```
-
-## Visibility Control
-
-Conditionally show/hide the bar pill:
-
-```qml
-PluginComponent {
-    visibilityCommand: "pgrep -x myapp"
-    visibilityInterval: 5000  // check every 5 seconds
-}
-```
-
-## Popout Namespace
-
-For plugins with multiple popout instances, use `layerNamespacePlugin` to isolate popout state:
-
-```qml
-PluginComponent {
-    layerNamespacePlugin: true
-}
-```
-
-## Reading Plugin Data
-
-Access saved settings reactively via the injected `pluginData`:
-
-```qml
-PluginComponent {
-    property string displayText: pluginData?.text || "Default"
-
-    Connections {
-        target: pluginService
-        function onPluginDataChanged(changedId) {
-            if (changedId === pluginId)
-                displayText = pluginService.loadPluginData(pluginId, "text", "Default")
-        }
-    }
-}
-```
-
-## Complete Example
-
-Based on the ExampleEmojiPlugin pattern:
-
-```qml
-import QtQuick
-import Quickshell
-import qs.Common
-import qs.Widgets
-import qs.Services
-import qs.Modules.Plugins
-
-PluginComponent {
-    id: root
-    property var popoutService: null
-
-    property var emojis: ["star", "heart", "smile"]
-    property int currentIndex: 0
-
-    Timer {
-        interval: 2000
-        running: true
-        repeat: true
-        onTriggered: currentIndex = (currentIndex + 1) % emojis.length
-    }
-
-    popoutWidth: 350
-    popoutHeight: 400
-
-    horizontalBarPill: Component {
-        StyledRect {
-            width: label.implicitWidth + Theme.spacingM * 2
-            height: parent.widgetThickness
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.emojis[root.currentIndex]
-                font.pixelSize: Theme.fontSizeLarge
-            }
-        }
-    }
-
-    verticalBarPill: Component {
-        StyledRect {
-            width: parent.widgetThickness
-            height: label.implicitHeight + Theme.spacingM * 2
-            radius: Theme.cornerRadius
-            color: Theme.surfaceContainerHigh
-
-            StyledText {
-                id: label
-                anchors.centerIn: parent
-                text: root.emojis[root.currentIndex]
-                font.pixelSize: Theme.fontSizeMedium
-            }
-        }
-    }
-
-    popoutContent: Component {
-        PopoutComponent {
-            headerText: "Emoji Picker"
-            showCloseButton: true
-
-            DankGridView {
-                width: parent.width
-                height: 300
-                cellWidth: 50
-                cellHeight: 50
-                model: root.emojis
-
-                delegate: Rectangle {
-                    width: 48
-                    height: 48
-                    radius: Theme.cornerRadius
-                    color: mouseArea.containsMouse ? Theme.surfaceContainerHighest : "transparent"
-
-                    Text {
-                        anchors.centerIn: parent
-                        text: modelData
-                        font.pixelSize: 24
-                    }
-
-                    MouseArea {
-                        id: mouseArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        onClicked: {
-                            Quickshell.execDetached(["dms", "cl", "copy", modelData])
-                            ToastService?.showInfo("Copied " + modelData)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-```
@@ -1,31 +0,0 @@
-## Description
-
-<!-- What does this PR do and why? -->
-
-## Type of change
-
-<!-- Check all that apply. -->
-
- [ ] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that changes existing behavior)
- [ ] Refactor / internal cleanup
- [ ] Documentation
- [ ] Other
-
-## Related issues
-
-<!-- e.g. "Fixes #123", "Closes #123". Leave blank if none. -->
-
-## Screenshots / video
-
-<!-- Include screenshots or a video for any user-facing or visual change. -->
-
-## Checklist
-
- [ ] My code follows the conventions in CONTRIBUTING.md
- [ ] I have tested my changes locally
- [ ] New user-facing strings are wrapped in `I18n.tr()` with translator context, reusing existing terms where possible
- [ ] Go changes: ran `make fmt`, added/updated tests, `make test` passes, and `go mod tidy` is clean
- [ ] QML changes: ran `make lint-qml` with no new warnings
- [ ] I have opened a corresponding pull request in dlx-docs to document any new behaviors: https://github.com/AvengeMedia/DankLinux-Docs
@@ -1,4 +1,4 @@
-name: Nix flake and NixOS tests
+name: Check nix flake

 on:
  pull_request:
@@ -9,7 +9,6 @@ on:
 jobs:
  check-flake:
    runs-on: ubuntu-latest
-    timeout-minutes: 120
    steps:

      - name: Checkout
@@ -19,25 +18,6 @@ jobs:

      - name: Install Nix
        uses: cachix/install-nix-action@v31
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            system-features = nixos-test benchmark big-parallel kvm

      - name: Check the flake
-        run: nix flake check -L
-
-      - name: Run NixOS module test
-        run: nix build .#nixosTests.x86_64-linux.nixos-module -L
-
-      - name: Run NixOS service start test
-        run: nix build .#nixosTests.x86_64-linux.nixos-service-start-module -L
-
-      - name: Run greeter niri test
-        run: nix build .#nixosTests.x86_64-linux.greeter-niri-module -L
-
-      - name: Run home-manager module test
-        run: nix build .#nixosTests.x86_64-linux.home-manager-module -L
-
-      - name: Run niri home-manager module test
-        run: nix build .#nixosTests.x86_64-linux.niri-home-module -L
+        run: nix flake check
@@ -26,4 +26,4 @@ jobs:
          go-version-file: core/go.mod

      - name: run pre-commit hooks
-        uses: j178/prek-action@v2
+        uses: j178/prek-action@v1
@@ -367,16 +367,6 @@ jobs:
          EOF
          chmod 600 ~/.config/osc/oscrc

-      # Cache OBS bundled Go toolchains
-      - name: Cache OBS bundled Go toolchains (dms-git)
-        if: contains(steps.packages.outputs.packages, 'dms-git')
-        uses: actions/cache@v4
-        with:
-          path: /home/runner/.cache/dms-obs-go-toolchain
-          key: dms-obs-go-toolchain-${{ runner.os }}-${{ hashFiles('core/go.mod') }}
-          restore-keys: |
-            dms-obs-go-toolchain-${{ runner.os }}-
-
      - name: Upload to OBS
        id: upload
        env:
@@ -22,13 +22,12 @@ on:

 jobs:
  check-updates:
-    name: Check package/series updates
+    name: Check for updates
    runs-on: ubuntu-latest

    outputs:
      has_updates: ${{ steps.check.outputs.has_updates }}
-      targets: ${{ steps.check.outputs.targets }}
-      targets_json: ${{ steps.check.outputs.targets_json }}
+      packages: ${{ steps.check.outputs.packages }}

    steps:
      - name: Checkout
@@ -36,57 +35,125 @@ jobs:
        with:
          fetch-depth: 0

-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq curl git
-
      - name: Check for updates
        id: check
        run: |
-          chmod +x distro/scripts/ppa-sync-plan.sh
+          # Helper function to check dms-git commit
+          check_dms_git() {
+            local CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
+            local PPA_VERSION=$(curl -s "https://api.launchpad.net/1.0/~avengemedia/+archive/ubuntu/dms-git?ws.op=getPublishedSources&source_name=dms-git&status=Published" | grep -oP '"source_package_version":\s*"\K[^"]+' | head -1 || echo "")
+            local PPA_COMMIT=$(echo "$PPA_VERSION" | grep -oP '\.[a-f0-9]{8}' | tr -d '.' || echo "")
+
+            if [[ -n "$PPA_COMMIT" && "$CURRENT_COMMIT" == "$PPA_COMMIT" ]]; then
+              echo "📋 dms-git: Commit $CURRENT_COMMIT already exists, skipping"
+              return 1  # No update needed
+            else
+              echo "📋 dms-git: New commit $CURRENT_COMMIT (PPA has ${PPA_COMMIT:-none})"
+              return 0  # Update needed
+            fi
+          }
+
+          # Helper function to check stable package tag
+          check_stable_package() {
+            local PKG="$1"
+            local PPA_NAME="$2"
+            # Use git ls-remote to find the latest tag, sorted by version (descending)
+            local LATEST_TAG=$(git ls-remote --tags --refs --sort='-v:refname' https://github.com/AvengeMedia/DankMaterialShell.git | head -n1 | awk -F/ '{print $NF}' | sed 's/^v//')
+            local PPA_VERSION=$(curl -s "https://api.launchpad.net/1.0/~avengemedia/+archive/ubuntu/$PPA_NAME?ws.op=getPublishedSources&source_name=$PKG&status=Published" | grep -oP '"source_package_version":\s*"\K[^"]+' | head -1 || echo "")
+            local PPA_BASE_VERSION=$(echo "$PPA_VERSION" | sed 's/ppa[0-9]*$//')
+
+            if [[ -n "$LATEST_TAG" && "$LATEST_TAG" == "$PPA_BASE_VERSION" ]]; then
+              echo "📋 $PKG: Tag $LATEST_TAG already exists, skipping"
+              return 1  # No update needed
+            else
+              echo "📋 $PKG: New tag ${LATEST_TAG:-unknown} (PPA has ${PPA_BASE_VERSION:-none})"
+              return 0  # Update needed
+            fi
+          }
+
+          # Main logic
+          REBUILD="${{ github.event.inputs.rebuild_release }}"

          if [[ "${{ github.event_name }}" == "schedule" ]]; then
-            PACKAGE="dms-git"
+            # Scheduled run - check dms-git only
+            echo "packages=dms-git" >> $GITHUB_OUTPUT
+            if check_dms_git; then
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+            else
+              echo "has_updates=false" >> $GITHUB_OUTPUT
+            fi
+
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            # Manual workflow trigger
+            PKG="${{ github.event.inputs.package }}"
+
+            if [[ -n "$REBUILD" ]]; then
+              # Rebuild requested - always proceed
+              echo "packages=$PKG" >> $GITHUB_OUTPUT
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "🔄 Manual rebuild requested: $PKG (ppa$REBUILD)"
+
+            elif [[ "$PKG" == "all" ]]; then
+              # Check each package and build list of those needing updates
+              PACKAGES_TO_UPDATE=()
+              check_dms_git && PACKAGES_TO_UPDATE+=("dms-git")
+              check_stable_package "dms" "dms" && PACKAGES_TO_UPDATE+=("dms")
+              check_stable_package "dms-greeter" "danklinux" && PACKAGES_TO_UPDATE+=("dms-greeter")
+
+              if [[ ${#PACKAGES_TO_UPDATE[@]} -gt 0 ]]; then
+                echo "packages=${PACKAGES_TO_UPDATE[*]}" >> $GITHUB_OUTPUT
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+                echo "✓ Packages to update: ${PACKAGES_TO_UPDATE[*]}"
+              else
+                echo "packages=" >> $GITHUB_OUTPUT
+                echo "has_updates=false" >> $GITHUB_OUTPUT
+                echo "✓ All packages up to date"
+              fi
+
+            elif [[ "$PKG" == "dms-git" ]]; then
+              if check_dms_git; then
+                echo "packages=$PKG" >> $GITHUB_OUTPUT
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+              else
+                echo "packages=" >> $GITHUB_OUTPUT
+                echo "has_updates=false" >> $GITHUB_OUTPUT
+              fi
+
+            elif [[ "$PKG" == "dms" ]]; then
+              if check_stable_package "dms" "dms"; then
+                echo "packages=$PKG" >> $GITHUB_OUTPUT
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+              else
+                echo "packages=" >> $GITHUB_OUTPUT
+                echo "has_updates=false" >> $GITHUB_OUTPUT
+              fi
+
+            elif [[ "$PKG" == "dms-greeter" ]]; then
+              if check_stable_package "dms-greeter" "danklinux"; then
+                echo "packages=$PKG" >> $GITHUB_OUTPUT
+                echo "has_updates=true" >> $GITHUB_OUTPUT
+              else
+                echo "packages=" >> $GITHUB_OUTPUT
+                echo "has_updates=false" >> $GITHUB_OUTPUT
+              fi
+
+            else
+              # Unknown package - proceed anyway
+              echo "packages=$PKG" >> $GITHUB_OUTPUT
+              echo "has_updates=true" >> $GITHUB_OUTPUT
+              echo "Manual trigger: $PKG"
+            fi
          else
-            PACKAGE="${{ github.event.inputs.package }}"
-          fi
-
-          REBUILD_RELEASE="${{ github.event.inputs.rebuild_release }}"
-          ARGS=(--package "$PACKAGE" --json)
-          if [[ -n "$REBUILD_RELEASE" ]]; then
-            ARGS+=(--rebuild "$REBUILD_RELEASE")
-          fi
-
-          TARGETS_JSON=$(distro/scripts/ppa-sync-plan.sh "${ARGS[@]}" 2> ppa-audit.log)
-          cat ppa-audit.log
-
-          TARGETS=$(echo "$TARGETS_JSON" | jq -r 'join(" ")')
-          if [[ "$TARGETS_JSON" != "[]" ]]; then
-            echo "has_updates=true" >> "$GITHUB_OUTPUT"
-            echo "targets=$TARGETS" >> "$GITHUB_OUTPUT"
-            echo "targets_json=$TARGETS_JSON" >> "$GITHUB_OUTPUT"
-            echo "Package/series targets: $TARGETS"
-          else
-            echo "has_updates=false" >> "$GITHUB_OUTPUT"
-            echo "targets=" >> "$GITHUB_OUTPUT"
-            echo "targets_json=[]" >> "$GITHUB_OUTPUT"
-            echo "No package/series uploads needed"
+            # Fallback
+            echo "packages=dms" >> $GITHUB_OUTPUT
+            echo "has_updates=true" >> $GITHUB_OUTPUT
          fi

  upload-ppa:
-    name: Upload ${{ matrix.target }}
+    name: Upload to PPA
    needs: check-updates
    runs-on: ubuntu-latest
    if: needs.check-updates.outputs.has_updates == 'true'
-    timeout-minutes: 120
-    strategy:
-      fail-fast: false
-      matrix:
-        target: ${{ fromJson(needs.check-updates.outputs.targets_json) }}
-    concurrency:
-      group: ppa-dms-${{ matrix.target }}
-      cancel-in-progress: false

    steps:
      - name: Checkout
@@ -110,8 +177,7 @@ jobs:
            lftp \
            build-essential \
            fakeroot \
-            dpkg-dev \
-            openssh-client
+            dpkg-dev

      - name: Configure GPG
        env:
@@ -119,32 +185,106 @@ jobs:
        run: |
          echo "$GPG_KEY" | gpg --import
          GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
-          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> "$GITHUB_ENV"
+          echo "DEBSIGN_KEYID=$GPG_KEY_ID" >> $GITHUB_ENV

-      - name: Upload target
-        env:
-          TARGET: ${{ matrix.target }}
-          LAUNCHPAD_SSH_PRIVATE_KEY: ${{ secrets.LAUNCHPAD_SSH_PRIVATE_KEY }}
-          LAUNCHPAD_SSH_LOGIN: ${{ secrets.LAUNCHPAD_SSH_LOGIN }}
+      - name: Determine packages to upload
+        id: packages
        run: |
-          IFS=':' read -r PACKAGE UBUNTU_SERIES PPA_NUM <<< "$TARGET"
+          # Use packages determined by check-updates job
+          echo "packages=${{ needs.check-updates.outputs.packages }}" >> $GITHUB_OUTPUT

-          case "$PACKAGE" in
-            dms) PPA_NAME="dms" ;;
-            dms-git) PPA_NAME="dms-git" ;;
-            dms-greeter) PPA_NAME="danklinux" ;;
-            *) echo "::error::Unknown package $PACKAGE"; exit 1 ;;
-          esac
+          if [[ "${{ github.event_name }}" == "schedule" ]]; then
+            echo "Triggered by schedule: uploading git package"
+          elif [[ -n "${{ github.event.inputs.package }}" ]]; then
+            echo "Manual trigger: ${{ needs.check-updates.outputs.packages }}"
+          fi

-          echo "Uploading $PACKAGE to $PPA_NAME/$UBUNTU_SERIES with ppa$PPA_NUM"
-          bash distro/scripts/ppa-upload.sh "$PACKAGE" "$PPA_NAME" "$UBUNTU_SERIES" "$PPA_NUM"
+      - name: Upload to PPA
+        run: |
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+          REBUILD_RELEASE="${{ github.event.inputs.rebuild_release }}"
+
+          if [[ -z "$PACKAGES" ]]; then
+            echo "✓ No packages need uploading. All up to date!"
+            exit 0
+          fi
+
+          # Export REBUILD_RELEASE so ppa-build.sh can use it
+          if [[ -n "$REBUILD_RELEASE" ]]; then
+            export REBUILD_RELEASE
+            echo "✓ Using rebuild release number: ppa$REBUILD_RELEASE"
+          fi
+
+          # PACKAGES can be space-separated list (e.g., "dms-git dms dms-greeter" from "all" check)
+          # Loop through each package and upload
+          for PKG in $PACKAGES; do
+            # Map package to PPA name
+            case "$PKG" in
+              dms)
+                PPA_NAME="dms"
+                ;;
+              dms-git)
+                PPA_NAME="dms-git"
+                ;;
+              dms-greeter)
+                PPA_NAME="danklinux"
+                ;;
+              *)
+                echo "⚠️ Unknown package: $PKG, skipping"
+                continue
+                ;;
+            esac
+
+            echo ""
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            echo "Uploading $PKG to PPA $PPA_NAME..."
+            if [[ -n "$REBUILD_RELEASE" ]]; then
+              echo "🔄 Using rebuild release number: ppa$REBUILD_RELEASE"
+            fi
+            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+            # ppa-upload.sh uploads to questing + resolute when series is omitted
+            if ! bash distro/scripts/ppa-upload.sh "$PKG" "$PPA_NAME" ${REBUILD_RELEASE:+"$REBUILD_RELEASE"}; then
+              echo "::error::Upload failed for $PKG"
+              exit 1
+            fi
+          done

      - name: Summary
        if: always()
        run: |
-          echo "### PPA Package Upload" >> "$GITHUB_STEP_SUMMARY"
-          echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "- **Target:** ${{ matrix.target }}" >> "$GITHUB_STEP_SUMMARY"
-          echo "- **DMS PPA:** https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages" >> "$GITHUB_STEP_SUMMARY"
-          echo "- **DMS-Git PPA:** https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages" >> "$GITHUB_STEP_SUMMARY"
-          echo "- **DankLinux PPA:** https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages" >> "$GITHUB_STEP_SUMMARY"
+          echo "### PPA Package Upload Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          PACKAGES="${{ steps.packages.outputs.packages }}"
+
+          if [[ -z "$PACKAGES" ]]; then
+            echo "**Status:** ✅ All packages up to date (no uploads needed)" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "All packages are current. Run will complete successfully." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "**Packages Uploaded:**" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+
+            for PKG in $PACKAGES; do
+              case "$PKG" in
+                dms)
+                  echo "- ✅ **dms** → [View builds](https://launchpad.net/~avengemedia/+archive/ubuntu/dms/+packages)" >> $GITHUB_STEP_SUMMARY
+                  ;;
+                dms-git)
+                  echo "- ✅ **dms-git** → [View builds](https://launchpad.net/~avengemedia/+archive/ubuntu/dms-git/+packages)" >> $GITHUB_STEP_SUMMARY
+                  ;;
+                dms-greeter)
+                  echo "- ✅ **dms-greeter** → [View builds](https://launchpad.net/~avengemedia/+archive/ubuntu/danklinux/+packages)" >> $GITHUB_STEP_SUMMARY
+                  ;;
+              esac
+            done
+
+            echo "" >> $GITHUB_STEP_SUMMARY
+
+            if [[ -n "${{ github.event.inputs.rebuild_release }}" ]]; then
+              echo "**Rebuild Number:** ppa${{ github.event.inputs.rebuild_release }}" >> $GITHUB_STEP_SUMMARY
+              echo "" >> $GITHUB_STEP_SUMMARY
+            fi
+
+            echo "Builds will appear once Launchpad processes the uploads." >> $GITHUB_STEP_SUMMARY
+          fi
@@ -107,9 +107,6 @@ vim/

 bin/

-# Core dumps
-core.*
-
 # direnv
 .envrc
 .direnv/
@@ -20,11 +20,3 @@ repos:
        language: system
        files: ^core/.*\.(go|mod|sum)$
        pass_filenames: false
-  - repo: local
-    hooks:
-      - id: no-console-in-qml
-        name: no console.* in QML (use Log service)
-        entry: bash -c 'if grep -nE "console\.(log|error|info|warn|debug)" "$@"; then echo "Use the Log service (log.info/warn/error/debug/fatal) instead of console.*" >&2; exit 1; fi' --
-        language: system
-        files: ^quickshell/.*\.qml$
-        exclude: ^quickshell/(Services/Log\.qml$|dms-plugins/|PLUGINS/)
@@ -42,7 +42,7 @@ configure passwordless sudo for your user.`,
 }

 func init() {
-	rootCmd.Flags().StringVarP(&compositor, "compositor", "c", "", "Compositor/WM to install: niri, hyprland, or mango (enables headless mode)")
+	rootCmd.Flags().StringVarP(&compositor, "compositor", "c", "", "Compositor/WM to install: niri or hyprland (enables headless mode)")
 	rootCmd.Flags().StringVarP(&term, "term", "t", "", "Terminal emulator to install: ghostty, kitty, or alacritty (enables headless mode)")
 	rootCmd.Flags().StringSliceVar(&includeDeps, "include-deps", []string{}, "Optional deps to enable (e.g. dms-greeter)")
 	rootCmd.Flags().StringSliceVar(&excludeDeps, "exclude-deps", []string{}, "Deps to skip during installation")
@@ -95,7 +95,7 @@ func runDankinstall(cmd *cobra.Command, args []string) error {
 func runHeadless() error {
 	// Validate required flags
 	if compositor == "" {
-		return fmt.Errorf("--compositor is required for headless mode (niri, hyprland, or mango)")
+		return fmt.Errorf("--compositor is required for headless mode (niri or hyprland)")
 	}
 	if term == "" {
 		return fmt.Errorf("--term is required for headless mode (ghostty, kitty, or alacritty)")
@@ -6,7 +6,6 @@ import (
 	"regexp"
 	"strings"

-	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/plugins"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server"
@@ -27,18 +26,6 @@ var runCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		daemon, _ := cmd.Flags().GetBool("daemon")
 		session, _ := cmd.Flags().GetBool("session")
-		if v, _ := cmd.Flags().GetString("log-level"); v != "" {
-			if err := os.Setenv("DMS_LOG_LEVEL", v); err != nil {
-				log.Fatalf("Failed to set DMS_LOG_LEVEL: %v", err)
-			}
-		}
-		if v, _ := cmd.Flags().GetString("log-file"); v != "" {
-			if err := os.Setenv("DMS_LOG_FILE", v); err != nil {
-				log.Fatalf("Failed to set DMS_LOG_FILE: %v", err)
-			}
-		}
-		log.ApplyEnvOverrides()
-		config.CleanupStrayHyprlandConfFile(log.Infof)
 		if daemon {
 			runShellDaemon(session)
 		} else {
@@ -539,8 +526,5 @@ func getCommonCommands() []*cobra.Command {
 		dlCmd,
 		randrCmd,
 		blurCmd,
-		trashCmd,
-		systemCmd,
-		switchUserCmd,
 	}
 }
@@ -8,7 +8,6 @@ import (
 	"strings"

 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/luaconfig"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 	"github.com/spf13/cobra"
 )
@@ -28,21 +27,7 @@ var resolveIncludeCmd = &cobra.Command{
 		case 0:
 			return []string{"hyprland", "niri", "mangowc"}, cobra.ShellCompDirectiveNoFileComp
 		case 1:
-			return []string{
-				"binds.lua",
-				"binds-user.lua",
-				"colors.lua",
-				"layout.lua",
-				"outputs.lua",
-				"cursor.lua",
-				"windowrules.lua",
-				"cursor.kdl",
-				"outputs.kdl",
-				"binds.kdl",
-				"cursor.conf",
-				"outputs.conf",
-				"binds.conf",
-			}, cobra.ShellCompDirectiveNoFileComp
+			return []string{"cursor.kdl", "cursor.conf", "outputs.kdl", "outputs.conf", "binds.kdl", "binds.conf"}, cobra.ShellCompDirectiveNoFileComp
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	},
@@ -54,10 +39,8 @@ func init() {
 }

 type IncludeResult struct {
-	Exists       bool   `json:"exists"`
-	Included     bool   `json:"included"`
-	ConfigFormat string `json:"configFormat,omitempty"`
-	ReadOnly     bool   `json:"readOnly,omitempty"`
+	Exists   bool `json:"exists"`
+	Included bool `json:"included"`
 }

 func runResolveInclude(cmd *cobra.Command, args []string) {
@@ -87,7 +70,10 @@ func runResolveInclude(cmd *cobra.Command, args []string) {
 }

 func checkHyprlandInclude(filename string) (IncludeResult, error) {
-	configDir := filepath.Join(utils.XDGConfigHome(), "hypr")
+	configDir, err := utils.ExpandPath("$HOME/.config/hypr")
+	if err != nil {
+		return IncludeResult{}, err
+	}

 	targetPath := filepath.Join(configDir, "dms", filename)
 	result := IncludeResult{}
@@ -96,41 +82,17 @@ func checkHyprlandInclude(filename string) (IncludeResult, error) {
 		result.Exists = true
 	}

-	targetAbs, err := filepath.Abs(targetPath)
-	if err != nil {
-		return result, err
-	}
-
-	targetRel := filepath.ToSlash(filepath.Join("dms", filename))
-
-	mainLua := filepath.Join(configDir, "hyprland.lua")
-	if _, err := os.Stat(mainLua); err == nil {
-		result.ConfigFormat = "lua"
-		result.ReadOnly = false
-		processedLua := make(map[string]bool)
-		if luaconfig.RequiresTarget(mainLua, targetAbs, processedLua) {
-			result.Included = true
-			return result, nil
-		}
-	}
-
-	mainConf := filepath.Join(configDir, "hyprland.conf")
-	if _, err := os.Stat(mainConf); err == nil {
-		if result.ConfigFormat == "" {
-			result.ConfigFormat = "hyprlang"
-			result.ReadOnly = true
-		}
-		processed := make(map[string]bool)
-		if hyprlandFindIncludeHyprlang(mainConf, targetRel, processed) {
-			result.Included = true
-			return result, nil
-		}
+	mainConfig := filepath.Join(configDir, "hyprland.conf")
+	if _, err := os.Stat(mainConfig); os.IsNotExist(err) {
+		return result, nil
 	}

+	processed := make(map[string]bool)
+	result.Included = hyprlandFindInclude(mainConfig, "dms/"+filename, processed)
 	return result, nil
 }

-func hyprlandFindIncludeHyprlang(filePath, target string, processed map[string]bool) bool {
+func hyprlandFindInclude(filePath, target string, processed map[string]bool) bool {
 	absPath, err := filepath.Abs(filePath)
 	if err != nil {
 		return false
@@ -179,7 +141,7 @@ func hyprlandFindIncludeHyprlang(filePath, target string, processed map[string]b
 			continue
 		}

-		if hyprlandFindIncludeHyprlang(expanded, target, processed) {
+		if hyprlandFindInclude(expanded, target, processed) {
 			return true
 		}
 	}
@@ -188,7 +150,10 @@ func hyprlandFindIncludeHyprlang(filePath, target string, processed map[string]b
 }

 func checkNiriInclude(filename string) (IncludeResult, error) {
-	configDir := filepath.Join(utils.XDGConfigHome(), "niri")
+	configDir, err := utils.ExpandPath("$HOME/.config/niri")
+	if err != nil {
+		return IncludeResult{}, err
+	}

 	targetPath := filepath.Join(configDir, "dms", filename)
 	result := IncludeResult{}
@@ -264,7 +229,10 @@ func niriFindInclude(filePath, target string, processed map[string]bool) bool {
 }

 func checkMangoWCInclude(filename string) (IncludeResult, error) {
-	configDir := filepath.Join(utils.XDGConfigHome(), "mango")
+	configDir, err := utils.ExpandPath("$HOME/.config/mango")
+	if err != nil {
+		return IncludeResult{}, err
+	}

 	targetPath := filepath.Join(configDir, "dms", filename)
 	result := IncludeResult{}
@@ -125,7 +125,6 @@ const (
 	catConfigFiles
 	catServices
 	catEnvironment
-	catFonts
 )

 func (c category) String() string {
@@ -148,8 +147,6 @@ func (c category) String() string {
 		return "Services"
 	case catEnvironment:
 		return "Environment"
-	case catFonts:
-		return "Fonts"
 	default:
 		return "Unknown"
 	}
@@ -216,7 +213,6 @@ func runDoctor(cmd *cobra.Command, args []string) {
 		checkConfigurationFiles(),
 		checkSystemdServices(),
 		checkEnvironmentVars(),
-		checkFonts(),
 	)

 	switch {
@@ -951,12 +947,9 @@ func checkSystemdServices() []checkResult {
 			message = fmt.Sprintf("%s, %s", dmsState.enabled, dmsState.active)
 		}
 		switch {
-		case dmsState.active == "failed":
-			status = statusError
-		case dmsState.active == "active":
 		case dmsState.enabled == "disabled":
 			status, message = statusWarn, "Disabled"
-		case dmsState.active == "inactive":
+		case dmsState.active == "failed" || dmsState.active == "inactive":
 			status = statusError
 		}
 		results = append(results, checkResult{catServices, "dms.service", status, message, "", doctorDocsURL + "#services"})
@@ -1139,100 +1132,3 @@ func formatResultsPlain(results []checkResult) string {

 	return sb.String()
 }
-
-func checkFonts() []checkResult {
-	var results []checkResult
-	url := doctorDocsURL + "#fonts"
-
-	configDir, err := os.UserConfigDir()
-	if err != nil {
-		return nil
-	}
-	settingsPath := filepath.Join(configDir, "DankMaterialShell", "settings.json")
-
-	fontFamily := "Inter Variable"
-	monoFontFamily := "Fira Code"
-
-	if data, err := os.ReadFile(settingsPath); err == nil {
-		var settings struct {
-			FontFamily     string `json:"fontFamily"`
-			MonoFontFamily string `json:"monoFontFamily"`
-		}
-		if err := json.Unmarshal(data, &settings); err == nil {
-			if settings.FontFamily != "" {
-				fontFamily = settings.FontFamily
-			}
-			if settings.MonoFontFamily != "" {
-				monoFontFamily = settings.MonoFontFamily
-			}
-		}
-	}
-
-	if !utils.CommandExists("fc-list") {
-		results = append(results, checkResult{catFonts, "Fontconfig Tools", statusWarn, "fc-list not installed", "Cannot verify if fonts are cached.", url})
-		return results
-	}
-
-	// Retrieve font list
-	output, err := exec.Command("fc-list", ":", "family").Output()
-	if err != nil {
-		results = append(results, checkResult{catFonts, "Fontconfig Cache", statusError, "Failed to query font list", "Fontconfig cache query failed. Try running 'fc-cache -fv'.", url})
-		return results
-	}
-
-	outStr := string(output)
-	if len(strings.TrimSpace(outStr)) == 0 {
-		results = append(results, checkResult{catFonts, "Fontconfig Cache", statusError, "Cache is empty", "No fonts found in fontconfig cache. Try running 'fc-cache -fv'.", url})
-		return results
-	}
-
-	lowerFonts := strings.ToLower(outStr)
-
-	// Helper to check if a font exists
-	hasFont := func(name string) bool {
-		target := strings.ToLower(strings.TrimSpace(name))
-		if target == "" {
-			return false
-		}
-		for _, line := range strings.Split(lowerFonts, "\n") {
-			line = strings.TrimSpace(line)
-			if line == "" {
-				continue
-			}
-			// Each line can have comma-separated families
-			families := strings.Split(line, ",")
-			for _, fam := range families {
-				if strings.TrimSpace(fam) == target {
-					return true
-				}
-			}
-		}
-		return false
-	}
-
-	// Normal Font Check
-	if hasFont(fontFamily) {
-		results = append(results, checkResult{catFonts, "Normal Font", statusOK, fontFamily, "Available", url})
-	} else {
-		results = append(results, checkResult{
-			catFonts, "Normal Font", statusWarn,
-			fmt.Sprintf("'%s' not found", fontFamily),
-			"Font is not registered. Try running 'fc-cache -fv' or install the font.",
-			url,
-		})
-	}
-
-	// Monospace Font Check
-	if hasFont(monoFontFamily) {
-		results = append(results, checkResult{catFonts, "Monospace Font", statusOK, monoFontFamily, "Available", url})
-	} else {
-		results = append(results, checkResult{
-			catFonts, "Monospace Font", statusWarn,
-			fmt.Sprintf("'%s' not found", monoFontFamily),
-			"Font is not registered. Try running 'fc-cache -fv' or install the font.",
-			url,
-		})
-	}
-
-	return results
-}
@@ -3,7 +3,6 @@ package main
 import (
 	"bufio"
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"os/exec"
@@ -60,36 +59,22 @@ var greeterInstallCmd = &cobra.Command{
 }

 var greeterSyncCmd = &cobra.Command{
-	Use:   "sync",
-	Short: "Sync DMS theme and settings with greeter",
-	Long:  "Synchronize your current user's DMS theme, settings, and wallpaper configuration with the login greeter screen. Also updates a per-user cache slot at users/<username>/ for multi-account greeter theme preview.\n\nUse --profile on secondary accounts to sync only your own users/<username>/ slot without sudo or greetd changes.",
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		profile, _ := cmd.Flags().GetBool("profile")
-		if profile {
-			return nil
-		}
-		return preRunPrivileged(cmd, args)
-	},
+	Use:     "sync",
+	Short:   "Sync DMS theme and settings with greeter",
+	Long:    "Synchronize your current user's DMS theme, settings, and wallpaper configuration with the login greeter screen",
+	PreRunE: preRunPrivileged,
 	Run: func(cmd *cobra.Command, args []string) {
 		yes, _ := cmd.Flags().GetBool("yes")
 		auth, _ := cmd.Flags().GetBool("auth")
 		local, _ := cmd.Flags().GetBool("local")
-		profile, _ := cmd.Flags().GetBool("profile")
-		autologinOnly, _ := cmd.Flags().GetBool("autologin")
 		term, _ := cmd.Flags().GetBool("terminal")
 		if term {
-			if err := syncInTerminal(yes, auth, local, profile, autologinOnly); err != nil {
+			if err := syncInTerminal(yes, auth, local); err != nil {
 				log.Fatalf("Error launching sync in terminal: %v", err)
 			}
 			return
 		}
-		if autologinOnly {
-			if err := syncGreeterAutoLoginOnly(yes); err != nil {
-				log.Fatalf("Error syncing greeter auto-login: %v", err)
-			}
-			return
-		}
-		if err := syncGreeter(yes, auth, local, profile); err != nil {
+		if err := syncGreeter(yes, auth, local); err != nil {
 			log.Fatalf("Error syncing greeter: %v", err)
 		}
 	},
@@ -100,8 +85,6 @@ func init() {
 	greeterSyncCmd.Flags().BoolP("terminal", "t", false, "Run sync in a new terminal (for entering sudo password); terminal auto-closes when done")
 	greeterSyncCmd.Flags().BoolP("auth", "a", false, "Configure PAM for fingerprint and U2F (adds both if modules exist); overrides UI toggles")
 	greeterSyncCmd.Flags().BoolP("local", "l", false, "Developer mode: force greetd config to use a local DMS checkout path")
-	greeterSyncCmd.Flags().BoolP("profile", "p", false, "Sync only your per-user greeter slot (no sudo; for secondary accounts)")
-	greeterSyncCmd.Flags().Bool("autologin", false, "Apply only greeter auto-login on startup settings to greetd (no theme or auth sync)")
 }

 var greeterEnableCmd = &cobra.Command{
@@ -529,8 +512,8 @@ func runCommandInTerminal(shellCmd string) error {
 	return fmt.Errorf("no terminal emulator found (tried: gnome-terminal, konsole, xfce4-terminal, ghostty, wezterm, alacritty, kitty, xterm)")
 }

-func syncInTerminal(nonInteractive bool, forceAuth bool, local bool, profileOnly bool, autologinOnly bool) error {
-	syncFlags := make([]string, 0, 5)
+func syncInTerminal(nonInteractive bool, forceAuth bool, local bool) error {
+	syncFlags := make([]string, 0, 3)
 	if nonInteractive {
 		syncFlags = append(syncFlags, "--yes")
 	}
@@ -540,22 +523,11 @@ func syncInTerminal(nonInteractive bool, forceAuth bool, local bool, profileOnly
 	if local {
 		syncFlags = append(syncFlags, "--local")
 	}
-	if profileOnly {
-		syncFlags = append(syncFlags, "--profile")
-	}
-	if autologinOnly {
-		syncFlags = append(syncFlags, "--autologin")
-	}
 	shellSyncCmd := "dms greeter sync"
 	if len(syncFlags) > 0 {
 		shellSyncCmd += " " + strings.Join(syncFlags, " ")
 	}
-	var shellCmd string
-	if autologinOnly {
-		shellCmd = shellSyncCmd + `; echo; echo "Auto-login update finished. Closing in 3 seconds..."; sleep 3`
-	} else {
-		shellCmd = shellSyncCmd + `; echo; echo "Sync finished. Closing in 3 seconds..."; sleep 3`
-	}
+	shellCmd := shellSyncCmd + `; echo; echo "Sync finished. Closing in 3 seconds..."; sleep 3`
 	return runCommandInTerminal(shellCmd)
 }

@@ -569,54 +541,7 @@ func resolveLocalWrapperShell() (string, error) {
 	return "", fmt.Errorf("could not find bash or sh in PATH for local greeter wrapper")
 }

-func syncGreeterAutoLoginOnly(nonInteractive bool) error {
-	logFunc := func(msg string) {
-		fmt.Println(msg)
-	}
-
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("failed to get user home directory: %w", err)
-	}
-
-	settingsPath := filepath.Join(homeDir, ".config", "DankMaterialShell", "settings.json")
-	cacheSettingsPath := filepath.Join(greeter.GreeterCacheDir, "settings.json")
-	enabled := false
-	for _, path := range []string{cacheSettingsPath, settingsPath} {
-		data, readErr := os.ReadFile(path)
-		if readErr != nil {
-			continue
-		}
-		var cfg struct {
-			GreeterAutoLogin bool `json:"greeterAutoLogin"`
-		}
-		if json.Unmarshal(data, &cfg) == nil {
-			enabled = cfg.GreeterAutoLogin
-			break
-		}
-	}
-
-	fmt.Println("=== Greeter Auto-Login ===")
-	fmt.Println()
-	if enabled {
-		fmt.Println("Enabling auto-login on startup in greetd.")
-		fmt.Println("After your next reboot, DMS will skip the greeter password until you sign out.")
-	} else {
-		fmt.Println("Disabling auto-login on startup in greetd.")
-		fmt.Println("After your next reboot, you will enter your password at the greeter again.")
-	}
-	fmt.Println()
-	fmt.Println("Administrator (sudo) access is required to update /etc/greetd/config.toml.")
-	fmt.Println()
-
-	return greeter.SyncGreeterAutoLoginOnly(logFunc, "")
-}
-
-func syncGreeter(nonInteractive bool, forceAuth bool, local bool, profileOnly bool) error {
-	if profileOnly {
-		return syncGreeterProfileOnly(nonInteractive)
-	}
-
+func syncGreeter(nonInteractive bool, forceAuth bool, local bool) error {
 	if !nonInteractive {
 		fmt.Println("=== DMS Greeter Sync ===")
 		fmt.Println()
@@ -827,26 +752,6 @@ func syncGreeter(nonInteractive bool, forceAuth bool, local bool, profileOnly bo
 	return nil
 }

-func syncGreeterProfileOnly(nonInteractive bool) error {
-	logFunc := func(msg string) {
-		fmt.Println(msg)
-	}
-	if !nonInteractive {
-		fmt.Println("=== DMS Greeter Profile Sync ===")
-		fmt.Println()
-		fmt.Println("Syncing your personal greeter theme slot (no system changes)...")
-	}
-	if err := greeter.SyncUserProfileCache(logFunc); err != nil {
-		return err
-	}
-	if !nonInteractive {
-		fmt.Println("\n=== Profile Sync Complete ===")
-		fmt.Println("\nYour theme, wallpaper, and profile photo have been synced for the login screen.")
-		fmt.Println("Log out to preview your greeter look when selecting your account.")
-	}
-	return nil
-}
-
 func hasDmsShellQml(dir string) bool {
 	info, err := os.Stat(filepath.Join(dir, "shell.qml"))
 	return err == nil && !info.IsDir()
@@ -932,14 +837,7 @@ func resolveLocalDMSPath() (string, error) {
 		}
 	}

-	configuredCommand := readDefaultSessionCommand("/etc/greetd/config.toml")
-	if pathOverride := extractGreeterPathOverrideFromCommand(configuredCommand); pathOverride != "" {
-		if resolved, ok := resolveDMSLocalCandidate(pathOverride); ok {
-			return resolved, nil
-		}
-	}
-
-	return "", fmt.Errorf("could not locate a local DMS checkout from %s; run from repo root, set DMS_LOCAL_PATH=/absolute/path/to/repo, or configure greetd with -p /path/to/quickshell", wd)
+	return "", fmt.Errorf("could not locate a local DMS checkout from %s; run from repo root or set DMS_LOCAL_PATH=/absolute/path/to/repo", wd)
 }

 func disableDisplayManager(dmName string) (bool, error) {
@@ -51,20 +51,12 @@ var keybindsSetCmd = &cobra.Command{

 var keybindsRemoveCmd = &cobra.Command{
 	Use:   "remove <provider> <key>",
-	Short: "Remove a keybind",
-	Long:  "Remove a keybind. For Hyprland this writes a negative override to dms/binds-user.lua so the key stays unbound across DMS updates. For other providers it deletes the entry from the managed file.",
+	Short: "Remove a keybind override",
+	Long:  "Remove a keybind override from the specified provider",
 	Args:  cobra.ExactArgs(2),
 	Run:   runKeybindsRemove,
 }

-var keybindsResetCmd = &cobra.Command{
-	Use:   "reset <provider> <key>",
-	Short: "Reset a keybind override to its DMS default",
-	Long:  "Drop the user override for the given key so the DMS default re-applies. For providers without a separate default file (Niri, MangoWC) this is equivalent to remove.",
-	Args:  cobra.ExactArgs(2),
-	Run:   runKeybindsReset,
-}
-
 func init() {
 	keybindsListCmd.Flags().BoolP("json", "j", false, "Output as JSON")
 	keybindsShowCmd.Flags().String("path", "", "Override config path for the provider")
@@ -80,7 +72,6 @@ func init() {
 	keybindsCmd.AddCommand(keybindsShowCmd)
 	keybindsCmd.AddCommand(keybindsSetCmd)
 	keybindsCmd.AddCommand(keybindsRemoveCmd)
-	keybindsCmd.AddCommand(keybindsResetCmd)

 	keybinds.SetJSONProviderFactory(func(filePath string) (keybinds.Provider, error) {
 		return providers.NewJSONFileProvider(filePath)
@@ -272,19 +263,3 @@ func runKeybindsRemove(_ *cobra.Command, args []string) {
 	}, "", "  ")
 	fmt.Fprintln(os.Stdout, string(output))
 }
-
-func runKeybindsReset(_ *cobra.Command, args []string) {
-	providerName, key := args[0], args[1]
-	writable := getWritableProvider(providerName)
-
-	if err := writable.ResetBind(key); err != nil {
-		log.Fatalf("Error resetting keybind: %v", err)
-	}
-
-	output, _ := json.MarshalIndent(map[string]any{
-		"success": true,
-		"key":     key,
-		"reset":   true,
-	}, "", "  ")
-	fmt.Fprintln(os.Stdout, string(output))
-}
@@ -28,9 +28,9 @@ with flags to handle different MIME types or application categories.

 Examples:
  dms open https://example.com                    # Open URL with browser picker
-  dms open file.pdf                               # Open file (MIME auto-detected)
-  dms open file.pdf --mime application/pdf        # Override MIME detection
-  dms open document.odt --category Office         # Open with office applications`,
+  dms open file.pdf --mime application/pdf        # Open PDF with compatible apps
+  dms open document.odt --category Office         # Open with office applications
+  dms open --mime image/png image.png             # Open image with image viewers`,
 	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		runOpen(args[0])
@@ -47,58 +47,123 @@ func init() {
 	})
 }

-func detectMimeFromPath(path string) string {
-	ext := filepath.Ext(path)
-	if ext == "" {
-		return ""
+// mimeTypeToCategories maps MIME types to desktop file categories
+func mimeTypeToCategories(mimeType string) []string {
+	// Split MIME type to get the main type
+	parts := strings.Split(mimeType, "/")
+	if len(parts) < 1 {
+		return nil
 	}
-	return mime.TypeByExtension(ext)
+
+	mainType := parts[0]
+
+	switch mainType {
+	case "image":
+		return []string{"Graphics", "Viewer"}
+	case "video":
+		return []string{"Video", "AudioVideo"}
+	case "audio":
+		return []string{"Audio", "AudioVideo"}
+	case "text":
+		if strings.Contains(mimeType, "html") {
+			return []string{"WebBrowser"}
+		}
+		return []string{"TextEditor", "Office"}
+	case "application":
+		if strings.Contains(mimeType, "pdf") {
+			return []string{"Office", "Viewer"}
+		}
+		if strings.Contains(mimeType, "document") || strings.Contains(mimeType, "spreadsheet") ||
+			strings.Contains(mimeType, "presentation") || strings.Contains(mimeType, "msword") ||
+			strings.Contains(mimeType, "ms-excel") || strings.Contains(mimeType, "ms-powerpoint") ||
+			strings.Contains(mimeType, "opendocument") {
+			return []string{"Office"}
+		}
+		if strings.Contains(mimeType, "zip") || strings.Contains(mimeType, "tar") ||
+			strings.Contains(mimeType, "gzip") || strings.Contains(mimeType, "compress") {
+			return []string{"Archiving", "Utility"}
+		}
+		return []string{"Office", "Viewer"}
+	}
+
+	return nil
 }

 func runOpen(target string) {
+	// Parse file:// URIs to extract the actual file path
 	actualTarget := target
 	detectedMimeType := openMimeType
+	detectedCategories := openCategories
 	detectedRequestType := openRequestType

 	log.Infof("Processing target: %s", target)

-	switch {
-	case isScheme(target, "file://"):
-		parsedURL, err := url.Parse(target)
-		if err == nil {
-			actualTarget = parsedURL.Path
-		}
-		if abs, err := filepath.Abs(actualTarget); err == nil {
-			actualTarget = abs
+	if parsedURL, err := url.Parse(target); err == nil && parsedURL.Scheme == "file" {
+		// Extract file path from file:// URI and convert to absolute path
+		actualTarget = parsedURL.Path
+		if absPath, err := filepath.Abs(actualTarget); err == nil {
+			actualTarget = absPath
 		}
+
 		if detectedRequestType == "url" || detectedRequestType == "" {
 			detectedRequestType = "file"
 		}
-		if detectedMimeType == "" {
-			detectedMimeType = detectMimeFromPath(actualTarget)
-		}
-		log.Infof("Detected file:// URI, absolute path: %s", actualTarget)

-	case isScheme(target, "http://"), isScheme(target, "https://"), isScheme(target, "dms://"):
+		log.Infof("Detected file:// URI, extracted absolute path: %s", actualTarget)
+
+		// Auto-detect MIME type if not provided
+		if detectedMimeType == "" {
+			ext := filepath.Ext(actualTarget)
+			if ext != "" {
+				detectedMimeType = mime.TypeByExtension(ext)
+				log.Infof("Detected MIME type from extension %s: %s", ext, detectedMimeType)
+			}
+		}
+
+		// Auto-detect categories based on MIME type if not provided
+		if len(detectedCategories) == 0 && detectedMimeType != "" {
+			detectedCategories = mimeTypeToCategories(detectedMimeType)
+			log.Infof("Detected categories from MIME type: %v", detectedCategories)
+		}
+	} else if strings.HasPrefix(target, "http://") || strings.HasPrefix(target, "https://") {
+		// Handle HTTP(S) URLs
 		if detectedRequestType == "" {
 			detectedRequestType = "url"
 		}
-		log.Infof("Detected URL: %s", target)
+		log.Infof("Detected HTTP(S) URL")
+	} else if strings.HasPrefix(target, "dms://") {
+		// Handle DMS internal URLs (theme/plugin install, etc.)
+		if detectedRequestType == "" {
+			detectedRequestType = "url"
+		}
+		log.Infof("Detected DMS internal URL")
+	} else if _, err := os.Stat(target); err == nil {
+		// Handle local file paths directly (not file:// URIs)
+		// Convert to absolute path
+		if absPath, err := filepath.Abs(target); err == nil {
+			actualTarget = absPath
+		}

-	default:
-		if _, err := os.Stat(target); err != nil {
-			break
-		}
-		if abs, err := filepath.Abs(target); err == nil {
-			actualTarget = abs
-		}
 		if detectedRequestType == "url" || detectedRequestType == "" {
 			detectedRequestType = "file"
 		}
+
+		log.Infof("Detected local file path, converted to absolute: %s", actualTarget)
+
+		// Auto-detect MIME type if not provided
 		if detectedMimeType == "" {
-			detectedMimeType = detectMimeFromPath(actualTarget)
+			ext := filepath.Ext(actualTarget)
+			if ext != "" {
+				detectedMimeType = mime.TypeByExtension(ext)
+				log.Infof("Detected MIME type from extension %s: %s", ext, detectedMimeType)
+			}
+		}
+
+		// Auto-detect categories based on MIME type if not provided
+		if len(detectedCategories) == 0 && detectedMimeType != "" {
+			detectedCategories = mimeTypeToCategories(detectedMimeType)
+			log.Infof("Detected categories from MIME type: %v", detectedCategories)
 		}
-		log.Infof("Detected local file path: %s", actualTarget)
 	}

 	params := map[string]any{
@@ -109,8 +174,8 @@ func runOpen(target string) {
 		params["mimeType"] = detectedMimeType
 	}

-	if len(openCategories) > 0 {
-		params["categories"] = openCategories
+	if len(detectedCategories) > 0 {
+		params["categories"] = detectedCategories
 	}

 	if detectedRequestType != "" {
@@ -118,7 +183,7 @@ func runOpen(target string) {
 	}

 	method := "apppicker.open"
-	if detectedMimeType == "" && len(openCategories) == 0 && (isScheme(target, "http://") || isScheme(target, "https://") || isScheme(target, "dms://")) {
+	if detectedMimeType == "" && len(detectedCategories) == 0 && (strings.HasPrefix(target, "http://") || strings.HasPrefix(target, "https://") || strings.HasPrefix(target, "dms://")) {
 		method = "browser.open"
 		params["url"] = target
 	}
@@ -138,7 +203,3 @@ func runOpen(target string) {

 	log.Infof("Request sent successfully")
 }
-
-func isScheme(target, prefix string) bool {
-	return strings.HasPrefix(target, prefix)
-}
@@ -4,9 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
-	"strconv"
 	"strings"

 	"github.com/AvengeMedia/DankMaterialShell/core/internal/clipboard"
@@ -181,39 +179,9 @@ func getScreenshotConfig(mode screenshot.Mode) screenshot.Config {
 	return config
 }

-// setPopoutScreenshotMode toggles the shell handshake so popouts drop their keyboard grab during region select. Best-effort.
-func setPopoutScreenshotMode(begin bool) {
-	fn := "end"
-	if begin {
-		fn = "begin"
-	}
-	cmdArgs := []string{"ipc"}
-	if pid, ok := getFirstDMSPID(); ok {
-		cmdArgs = append(cmdArgs, "--pid", strconv.Itoa(pid))
-	} else {
-		if err := findConfig(nil, nil); err != nil {
-			return
-		}
-		if qsHasAnyDisplay() {
-			cmdArgs = append(cmdArgs, "--any-display")
-		}
-		cmdArgs = append(cmdArgs, "-p", configPath)
-	}
-	cmdArgs = append(cmdArgs, "call", "screenshot", fn)
-	_ = exec.Command("qs", cmdArgs...).Run()
-}
-
 func runScreenshot(config screenshot.Config) {
-	// Region select needs the keyboard; drop popout grabs for its duration.
-	result, err := func() (*screenshot.CaptureResult, error) {
-		interactive := config.Mode == screenshot.ModeRegion || config.Mode == screenshot.ModeLastRegion
-		if interactive {
-			setPopoutScreenshotMode(true)
-			defer setPopoutScreenshotMode(false)
-		}
-		return screenshot.New(config).Run()
-	}()
-
+	sc := screenshot.New(config)
+	result, err := sc.Run()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
@@ -1,187 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"os/exec"
-	"sort"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/spf13/cobra"
-)
-
-var switchUserCmd = &cobra.Command{
-	Use:   "switch-user [target]",
-	Short: "Switch to another active session on this seat",
-	Long: `Switch the active VT to another running session.
-
-With no target, prints the list of switchable sessions. Pass a username or a
-numeric session ID to switch directly. Requires the target to already be a
-running session on the same seat (use the greeter for a fresh login).`,
-	Args: cobra.MaximumNArgs(1),
-	Run:  runSwitchUser,
-}
-
-type sessionInfo struct {
-	ID      string
-	Name    string
-	Seat    string
-	TTY     string
-	Type    string
-	Class   string
-	Active  bool
-	State   string
-	Current bool
-}
-
-func runSwitchUser(cmd *cobra.Command, args []string) {
-	currentID := os.Getenv("XDG_SESSION_ID")
-	sessions, err := listSessions(currentID)
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
-
-	switchable := make([]sessionInfo, 0, len(sessions))
-	for _, s := range sessions {
-		if s.Class != "user" || s.State == "closing" || s.Current {
-			continue
-		}
-		switchable = append(switchable, s)
-	}
-
-	if len(args) == 0 {
-		if len(switchable) == 0 {
-			fmt.Println("No other active sessions on this seat.")
-			return
-		}
-		printSessions(switchable)
-		return
-	}
-
-	target := args[0]
-	picked, err := pickSession(switchable, target)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		if len(switchable) == 0 {
-			fmt.Fprintln(os.Stderr, "No other active sessions on this seat. Only already-running sessions can be switched to.")
-		} else {
-			fmt.Fprintln(os.Stderr, "\nSwitchable sessions:")
-			printSessions(switchable)
-		}
-		os.Exit(1)
-	}
-
-	if err := activateSession(picked.ID); err != nil {
-		log.Fatalf("loginctl activate %s: %v", picked.ID, err)
-	}
-}
-
-func listSessions(currentID string) ([]sessionInfo, error) {
-	listOut, err := exec.Command("loginctl", "list-sessions", "--no-legend").Output()
-	if err != nil {
-		return nil, fmt.Errorf("loginctl list-sessions: %w", err)
-	}
-
-	var ids []string
-	scanner := bufio.NewScanner(strings.NewReader(string(listOut)))
-	for scanner.Scan() {
-		fields := strings.Fields(scanner.Text())
-		if len(fields) == 0 {
-			continue
-		}
-		ids = append(ids, fields[0])
-	}
-
-	out := make([]sessionInfo, 0, len(ids))
-	for _, id := range ids {
-		s, err := showSession(id)
-		if err != nil {
-			continue
-		}
-		s.Current = currentID != "" && s.ID == currentID
-		out = append(out, s)
-	}
-	sort.SliceStable(out, func(i, j int) bool {
-		if out[i].Name != out[j].Name {
-			return out[i].Name < out[j].Name
-		}
-		return out[i].ID < out[j].ID
-	})
-	return out, nil
-}
-
-func showSession(id string) (sessionInfo, error) {
-	out, err := exec.Command("loginctl", "show-session", id,
-		"-p", "Id", "-p", "Name", "-p", "Seat", "-p", "TTY",
-		"-p", "Type", "-p", "Class", "-p", "Active", "-p", "State").Output()
-	if err != nil {
-		return sessionInfo{}, err
-	}
-	fields := map[string]string{}
-	for _, line := range strings.Split(string(out), "\n") {
-		idx := strings.IndexByte(line, '=')
-		if idx <= 0 {
-			continue
-		}
-		fields[line[:idx]] = line[idx+1:]
-	}
-	if fields["Id"] == "" {
-		return sessionInfo{}, fmt.Errorf("session %s: no Id", id)
-	}
-	return sessionInfo{
-		ID:     fields["Id"],
-		Name:   fields["Name"],
-		Seat:   fields["Seat"],
-		TTY:    fields["TTY"],
-		Type:   fields["Type"],
-		Class:  fields["Class"],
-		Active: fields["Active"] == "yes",
-		State:  fields["State"],
-	}, nil
-}
-
-func pickSession(sessions []sessionInfo, target string) (sessionInfo, error) {
-	for _, s := range sessions {
-		if s.ID == target {
-			return s, nil
-		}
-	}
-	matches := make([]sessionInfo, 0, 2)
-	for _, s := range sessions {
-		if s.Name == target {
-			matches = append(matches, s)
-		}
-	}
-	if len(matches) == 1 {
-		return matches[0], nil
-	}
-	if len(matches) > 1 {
-		ids := make([]string, len(matches))
-		for i, m := range matches {
-			ids[i] = m.ID
-		}
-		return sessionInfo{}, fmt.Errorf("%s has multiple active sessions (%s); pass a session ID instead", target, strings.Join(ids, ", "))
-	}
-	return sessionInfo{}, fmt.Errorf("no switchable session matches %q", target)
-}
-
-func activateSession(id string) error {
-	return exec.Command("loginctl", "activate", id).Run()
-}
-
-func printSessions(sessions []sessionInfo) {
-	fmt.Printf("%-6s %-12s %-8s %-8s %-8s\n", "ID", "USER", "TYPE", "SEAT", "TTY")
-	for _, s := range sessions {
-		tty := s.TTY
-		if tty == "" {
-			tty = "-"
-		}
-		seat := s.Seat
-		if seat == "" {
-			seat = "-"
-		}
-		fmt.Printf("%-6s %-12s %-8s %-8s %-8s\n", s.ID, s.Name, s.Type, seat, tty)
-	}
-}
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"strings"

@@ -12,7 +11,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/greeter"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/privesc"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 	"github.com/spf13/cobra"
 )
@@ -100,72 +98,56 @@ var setupWindowrulesCmd = &cobra.Command{
 }

 type dmsConfigSpec struct {
-	niriFile     string
-	hyprFile     string
-	mangoFile    string
-	niriContent  func(terminal string) string
-	hyprContent  func(terminal string) string
-	mangoContent func(terminal string) string
+	niriFile    string
+	hyprFile    string
+	niriContent func(terminal string) string
+	hyprContent func(terminal string) string
 }

 var dmsConfigSpecs = map[string]dmsConfigSpec{
 	"binds": {
-		niriFile:  "binds.kdl",
-		hyprFile:  "binds.lua",
-		mangoFile: "binds.conf",
+		niriFile: "binds.kdl",
+		hyprFile: "binds.conf",
 		niriContent: func(t string) string {
 			return strings.ReplaceAll(config.NiriBindsConfig, "{{TERMINAL_COMMAND}}", t)
 		},
 		hyprContent: func(t string) string {
-			return strings.ReplaceAll(config.DMSBindsLuaConfig, "{{TERMINAL_COMMAND}}", t)
-		},
-		mangoContent: func(t string) string {
-			return strings.ReplaceAll(config.MangoBindsConfig, "{{TERMINAL_COMMAND}}", t)
+			return strings.ReplaceAll(config.HyprBindsConfig, "{{TERMINAL_COMMAND}}", t)
 		},
 	},
 	"layout": {
-		niriFile:     "layout.kdl",
-		hyprFile:     "layout.lua",
-		mangoFile:    "layout.conf",
-		niriContent:  func(_ string) string { return config.NiriLayoutConfig },
-		hyprContent:  func(_ string) string { return config.DMSLayoutLuaConfig },
-		mangoContent: func(_ string) string { return config.MangoLayoutConfig },
+		niriFile:    "layout.kdl",
+		hyprFile:    "layout.conf",
+		niriContent: func(_ string) string { return config.NiriLayoutConfig },
+		hyprContent: func(_ string) string { return config.HyprLayoutConfig },
 	},
 	"colors": {
-		niriFile:     "colors.kdl",
-		hyprFile:     "colors.lua",
-		mangoFile:    "colors.conf",
-		niriContent:  func(_ string) string { return config.NiriColorsConfig },
-		hyprContent:  func(_ string) string { return config.DMSColorsLuaConfig },
-		mangoContent: func(_ string) string { return config.MangoColorsConfig },
+		niriFile:    "colors.kdl",
+		hyprFile:    "colors.conf",
+		niriContent: func(_ string) string { return config.NiriColorsConfig },
+		hyprContent: func(_ string) string { return config.HyprColorsConfig },
 	},
 	"alttab": {
 		niriFile:    "alttab.kdl",
 		niriContent: func(_ string) string { return config.NiriAlttabConfig },
 	},
 	"outputs": {
-		niriFile:     "outputs.kdl",
-		hyprFile:     "outputs.lua",
-		mangoFile:    "outputs.conf",
-		niriContent:  func(_ string) string { return "" },
-		hyprContent:  func(_ string) string { return config.DMSOutputsLuaConfig },
-		mangoContent: func(_ string) string { return "" },
+		niriFile:    "outputs.kdl",
+		hyprFile:    "outputs.conf",
+		niriContent: func(_ string) string { return "" },
+		hyprContent: func(_ string) string { return "" },
 	},
 	"cursor": {
-		niriFile:     "cursor.kdl",
-		hyprFile:     "cursor.lua",
-		mangoFile:    "cursor.conf",
-		niriContent:  func(_ string) string { return "" },
-		hyprContent:  func(_ string) string { return config.DMSCursorLuaConfig },
-		mangoContent: func(_ string) string { return "" },
+		niriFile:    "cursor.kdl",
+		hyprFile:    "cursor.conf",
+		niriContent: func(_ string) string { return "" },
+		hyprContent: func(_ string) string { return "" },
 	},
 	"windowrules": {
-		niriFile:     "windowrules.kdl",
-		hyprFile:     "windowrules.lua",
-		mangoFile:    "windowrules.conf",
-		niriContent:  func(_ string) string { return "" },
-		hyprContent:  func(_ string) string { return config.DMSWindowRulesLuaConfig },
-		mangoContent: func(_ string) string { return "" },
+		niriFile:    "windowrules.kdl",
+		hyprFile:    "windowrules.conf",
+		niriContent: func(_ string) string { return "" },
+		hyprContent: func(_ string) string { return "" },
 	},
 }

@@ -208,7 +190,7 @@ func detectCompositorForSetup() (string, error) {

 	switch len(compositors) {
 	case 0:
-		return "", fmt.Errorf("no supported compositors found (niri, Hyprland, or mango required)")
+		return "", fmt.Errorf("no supported compositors found (niri or Hyprland required)")
 	case 1:
 		return strings.ToLower(compositors[0]), nil
 	}
@@ -240,9 +222,6 @@ func runSetupDmsConfig(name string) error {
 	case "hyprland":
 		filename = spec.hyprFile
 		contentFn = spec.hyprContent
-	case "mango", "mangowc":
-		filename = spec.mangoFile
-		contentFn = spec.mangoContent
 	default:
 		return fmt.Errorf("unsupported compositor: %s", compositor)
 	}
@@ -254,11 +233,9 @@ func runSetupDmsConfig(name string) error {
 	var dmsDir string
 	switch compositor {
 	case "niri":
-		dmsDir = filepath.Join(utils.XDGConfigHome(), "niri", "dms")
+		dmsDir = filepath.Join(os.Getenv("HOME"), ".config", "niri", "dms")
 	case "hyprland":
-		dmsDir = filepath.Join(utils.XDGConfigHome(), "hypr", "dms")
-	case "mango", "mangowc":
-		dmsDir = filepath.Join(utils.XDGConfigHome(), "mango", "dms")
+		dmsDir = filepath.Join(os.Getenv("HOME"), ".config", "hypr", "dms")
 	}

 	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
@@ -290,18 +267,9 @@ func runSetupDmsConfig(name string) error {
 func runSetup() error {
 	fmt.Println("=== DMS Configuration Setup ===")

-	ensureInputGroup()
-
 	wm, wmSelected := promptCompositor()
 	terminal, terminalSelected := promptTerminal()
-	useSystemd := true
-	if wmSelected {
-		if wm == deps.WindowManagerMango {
-			useSystemd = false
-		} else {
-			useSystemd = promptSystemd()
-		}
-	}
+	useSystemd := promptSystemd()

 	if !wmSelected && !terminalSelected {
 		fmt.Println("No configurations selected. Exiting.")
@@ -372,46 +340,14 @@ func runSetup() error {
 	return nil
 }

-// Add user to the input group for the evdev manager for inut state tracking.
-// Caps Lock OSD and the Caps Lock bar indicator.
-func ensureInputGroup() {
-	if !utils.HasGroup("input") {
-		return
-	}
-	currentUser := os.Getenv("USER")
-	if currentUser == "" {
-		currentUser = os.Getenv("LOGNAME")
-	}
-	if currentUser == "" {
-		return
-	}
-	out, err := execGroups(currentUser)
-	if err == nil && strings.Contains(out, "input") {
-		fmt.Printf("✓ %s is already in the input group (Caps Lock OSD enabled)\n", currentUser)
-		return
-	}
-	fmt.Println("Adding user to input group for Caps Lock OSD support...")
-	if err := privesc.Run(context.Background(), "", "usermod", "-aG", "input", currentUser); err != nil {
-		fmt.Printf("⚠ Could not add %s to input group (Caps Lock OSD will be unavailable): %v\n", currentUser, err)
-	} else {
-		fmt.Printf("✓ Added %s to input group (logout/login required to take effect)\n", currentUser)
-	}
-}
-
-func execGroups(user string) (string, error) {
-	out, err := exec.Command("groups", user).Output()
-	return string(out), err
-}
-
 func promptCompositor() (deps.WindowManager, bool) {
 	fmt.Println("Select compositor:")
 	fmt.Println("1) Niri")
 	fmt.Println("2) Hyprland")
-	fmt.Println("3) Mango")
-	fmt.Println("4) None")
+	fmt.Println("3) None")

 	var response string
-	fmt.Print("\nChoice (1-4): ")
+	fmt.Print("\nChoice (1-3): ")
 	fmt.Scanln(&response)
 	response = strings.TrimSpace(response)

@@ -420,8 +356,6 @@ func promptCompositor() (deps.WindowManager, bool) {
 		return deps.WindowManagerNiri, true
 	case "2":
 		return deps.WindowManagerHyprland, true
-	case "3":
-		return deps.WindowManagerMango, true
 	default:
 		return deps.WindowManagerNiri, false
 	}
@@ -469,27 +403,16 @@ func checkExistingConfigs(wm deps.WindowManager, wmSelected bool, terminal deps.
 	willBackup := false

 	if wmSelected {
-		var configPaths []string
+		var configPath string
 		switch wm {
 		case deps.WindowManagerNiri:
-			configPaths = []string{filepath.Join(homeDir, ".config", "niri", "config.kdl")}
+			configPath = filepath.Join(homeDir, ".config", "niri", "config.kdl")
 		case deps.WindowManagerHyprland:
-			configPaths = []string{
-				filepath.Join(homeDir, ".config", "hypr", "hyprland.lua"),
-				filepath.Join(homeDir, ".config", "hypr", "hyprland.conf"),
-			}
-		case deps.WindowManagerMango:
-			configPaths = []string{
-				filepath.Join(homeDir, ".config", "mango", "config.conf"),
-				filepath.Join(homeDir, ".config", "mango", "mango.conf"),
-			}
+			configPath = filepath.Join(homeDir, ".config", "hypr", "hyprland.conf")
 		}

-		for _, configPath := range configPaths {
-			if _, err := os.Stat(configPath); err == nil {
-				willBackup = true
-				break
-			}
+		if _, err := os.Stat(configPath); err == nil {
+			willBackup = true
 		}
 	}

@@ -1,365 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/sysupdate"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/spf13/cobra"
-)
-
-var systemCmd = &cobra.Command{
-	Use:   "system",
-	Short: "System operations",
-	Long:  "System-level operations (updates, etc.). Runs against installed package managers directly; does not require the DMS server.",
-}
-
-var systemUpdateCmd = &cobra.Command{
-	Use:   "update",
-	Short: "Apply or list system updates",
-	Long: `Apply or list system updates across detected package managers.
-
-Default behavior is to apply available updates after prompting for confirmation.
-Use --check to list updates without applying.
-
-Examples:
-  dms system update --check                  # list available updates
-  dms system update                          # apply updates (interactive prompt)
-  dms system update --noconfirm              # apply updates without prompting
-  dms system update --dry                    # simulate without changing anything
-  dms system update --no-flatpak --noconfirm # apply system updates only
-  dms system update --interval 3600          # set the server poll interval to 1h`,
-	Run: runSystemUpdate,
-}
-
-var (
-	sysUpdateCheck      bool
-	sysUpdateNoConfirm  bool
-	sysUpdateDry        bool
-	sysUpdateJSON       bool
-	sysUpdateNoFlatpak  bool
-	sysUpdateNoAUR      bool
-	sysUpdateIntervalS  int
-	sysUpdateListPmTime = 5 * time.Minute
-)
-
-func init() {
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateCheck, "check", false, "List available updates without applying")
-	systemUpdateCmd.Flags().BoolVarP(&sysUpdateNoConfirm, "noconfirm", "y", false, "Apply updates without prompting")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateDry, "dry", false, "Simulate the upgrade without applying changes")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateJSON, "json", false, "Output as JSON (with --check)")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateNoFlatpak, "no-flatpak", false, "Skip the Flatpak overlay")
-	systemUpdateCmd.Flags().BoolVar(&sysUpdateNoAUR, "no-aur", false, "Skip the AUR (paru/yay only)")
-	systemUpdateCmd.Flags().IntVar(&sysUpdateIntervalS, "interval", -1, "Set the DMS server poll interval in seconds and exit (requires running server)")
-
-	systemCmd.AddCommand(systemUpdateCmd)
-}
-
-func runSystemUpdate(cmd *cobra.Command, args []string) {
-	switch {
-	case sysUpdateIntervalS >= 0:
-		runSystemUpdateSetInterval(sysUpdateIntervalS)
-	case sysUpdateCheck:
-		runSystemUpdateCheck()
-	default:
-		runSystemUpdateApply()
-	}
-}
-
-func selectBackends(ctx context.Context) []sysupdate.Backend {
-	sel := sysupdate.Select(ctx)
-	backends := sel.All()
-	if !sysUpdateNoFlatpak {
-		return backends
-	}
-	out := backends[:0]
-	for _, b := range backends {
-		if b.Repo() == sysupdate.RepoFlatpak {
-			continue
-		}
-		out = append(out, b)
-	}
-	return out
-}
-
-func runSystemUpdateCheck() {
-	ctx, cancel := context.WithTimeout(context.Background(), sysUpdateListPmTime)
-	defer cancel()
-
-	backends := selectBackends(ctx)
-	if len(backends) == 0 {
-		log.Fatal("No supported package manager found")
-	}
-
-	stopSpin := startSpinner("Checking for updates… ")
-	allPkgs, firstErr := collectUpdates(ctx, backends)
-	stopSpin()
-	allPkgs = filterUpdateTargets(allPkgs)
-
-	if sysUpdateJSON {
-		out, _ := json.MarshalIndent(map[string]any{
-			"backends": backendResults(backends, allPkgs),
-			"packages": allPkgs,
-			"error":    errOrEmpty(firstErr),
-			"count":    len(allPkgs),
-		}, "", "  ")
-		fmt.Println(string(out))
-		return
-	}
-
-	printBackends(backends)
-	fmt.Printf("Updates: %d\n", len(allPkgs))
-	if firstErr != nil {
-		fmt.Printf("Error:   %v\n", firstErr)
-	}
-	if len(allPkgs) == 0 {
-		return
-	}
-	fmt.Println()
-	for _, p := range allPkgs {
-		printPackage(p)
-	}
-}
-
-type backendResult struct {
-	ID       string              `json:"id"`
-	Display  string              `json:"displayName"`
-	Packages []sysupdate.Package `json:"packages"`
-}
-
-func backendResults(backends []sysupdate.Backend, pkgs []sysupdate.Package) []backendResult {
-	results := make([]backendResult, 0, len(backends))
-	for _, b := range backends {
-		var backendPkgs []sysupdate.Package
-		for _, p := range pkgs {
-			if sysupdate.BackendHasTargets(b, []sysupdate.Package{p}, true, true) {
-				backendPkgs = append(backendPkgs, p)
-			}
-		}
-		results = append(results, backendResult{ID: b.ID(), Display: b.DisplayName(), Packages: backendPkgs})
-	}
-	return results
-}
-
-func runSystemUpdateApply() {
-	checkCtx, checkCancel := context.WithTimeout(context.Background(), sysUpdateListPmTime)
-	defer checkCancel()
-
-	backends := selectBackends(checkCtx)
-	if len(backends) == 0 {
-		log.Fatal("No supported package manager found")
-	}
-
-	stopSpin := startSpinner("Checking for updates…")
-	pkgs, firstErr := collectUpdates(checkCtx, backends)
-	stopSpin()
-	pkgs = filterUpdateTargets(pkgs)
-	if firstErr != nil {
-		fmt.Printf("Warning: %v\n\n", firstErr)
-	}
-
-	printBackends(backends)
-	fmt.Printf("Updates: %d\n", len(pkgs))
-	if len(pkgs) == 0 {
-		fmt.Println("Nothing to upgrade.")
-		return
-	}
-	fmt.Println()
-	for _, p := range pkgs {
-		printPackage(p)
-	}
-	fmt.Println()
-
-	if !sysUpdateNoConfirm && !sysUpdateDry {
-		if !promptYesNo("Proceed with upgrade? [Y/n]: ") {
-			fmt.Println("Aborted.")
-			return
-		}
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
-	defer cancel()
-
-	opts := sysupdate.UpgradeOptions{
-		Targets:        pkgs,
-		IncludeFlatpak: !sysUpdateNoFlatpak,
-		IncludeAUR:     !sysUpdateNoAUR,
-		DryRun:         sysUpdateDry,
-		UseSudo:        true,
-	}
-	opts.AttachStdio = sysupdate.UpgradeNeedsPrivilege(backends, pkgs, opts)
-
-	onLine := func(line string) { fmt.Println(line) }
-	ran := false
-	for _, b := range backends {
-		if !sysupdate.BackendHasTargets(b, pkgs, opts.IncludeAUR, opts.IncludeFlatpak) {
-			continue
-		}
-		ran = true
-		fmt.Printf("\n== %s ==\n", b.DisplayName())
-		if err := b.Upgrade(ctx, opts, onLine); err != nil {
-			log.Fatalf("%s upgrade failed: %v", b.ID(), err)
-		}
-	}
-	if !ran {
-		fmt.Println("Nothing to upgrade.")
-		return
-	}
-	if sysUpdateDry {
-		fmt.Println("\nDry run complete (no changes applied).")
-		return
-	}
-	fmt.Println("\nUpgrade complete.")
-}
-
-func collectUpdates(ctx context.Context, backends []sysupdate.Backend) ([]sysupdate.Package, error) {
-	var all []sysupdate.Package
-	var firstErr error
-	for _, b := range backends {
-		pkgs, err := b.CheckUpdates(ctx)
-		if err != nil && firstErr == nil {
-			firstErr = fmt.Errorf("%s: %w", b.ID(), err)
-		}
-		all = append(all, pkgs...)
-	}
-	return all, firstErr
-}
-
-func filterUpdateTargets(pkgs []sysupdate.Package) []sysupdate.Package {
-	if !sysUpdateNoAUR {
-		return pkgs
-	}
-	out := pkgs[:0]
-	for _, p := range pkgs {
-		if p.Repo == sysupdate.RepoAUR {
-			continue
-		}
-		out = append(out, p)
-	}
-	return out
-}
-
-func runSystemUpdateSetInterval(seconds int) {
-	resp, err := sendServerRequest(models.Request{
-		ID:     1,
-		Method: "sysupdate.setInterval",
-		Params: map[string]any{"seconds": float64(seconds)},
-	})
-	if err != nil {
-		log.Fatalf("Failed: %v (is dms server running?)", err)
-	}
-	if resp.Error != "" {
-		log.Fatalf("Error: %s", resp.Error)
-	}
-	fmt.Printf("Interval set to %d seconds.\n", seconds)
-}
-
-func promptYesNo(prompt string) bool {
-	if !stdinIsTTY() {
-		log.Fatal("Refusing to apply updates non-interactively. Re-run with --noconfirm or --check.")
-	}
-	fmt.Print(prompt)
-	reader := bufio.NewReader(os.Stdin)
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		return false
-	}
-	switch strings.ToLower(strings.TrimSpace(line)) {
-	case "n", "no":
-		return false
-	default:
-		return true
-	}
-}
-
-func printBackends(backends []sysupdate.Backend) {
-	if len(backends) == 0 {
-		return
-	}
-	names := make([]string, 0, len(backends))
-	for _, b := range backends {
-		names = append(names, b.DisplayName())
-	}
-	fmt.Printf("Backends: %s\n", strings.Join(names, ", "))
-}
-
-func stdinIsTTY() bool {
-	fi, err := os.Stdin.Stat()
-	if err != nil {
-		return false
-	}
-	return (fi.Mode() & os.ModeCharDevice) != 0
-}
-
-func stdoutIsTTY() bool {
-	fi, err := os.Stdout.Stat()
-	if err != nil {
-		return false
-	}
-	return (fi.Mode() & os.ModeCharDevice) != 0
-}
-
-// startSpinner prints an animated spinner to stdout for progress indication
-func startSpinner(msg string) func() {
-	if !stdoutIsTTY() {
-		return func() {}
-	}
-	frames := []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}
-	done := make(chan struct{})
-	go func() {
-		for i := 0; ; i++ {
-			select {
-			case <-done:
-				fmt.Print("\r\033[K")
-				return
-			case <-time.After(80 * time.Millisecond):
-				fmt.Printf("\r%s %s", frames[i%len(frames)], msg)
-			}
-		}
-	}()
-	return func() { close(done) }
-}
-
-var (
-	styleRepo  = lipgloss.NewStyle().Foreground(lipgloss.Color("244")).Bold(false)
-	styleName  = lipgloss.NewStyle().Foreground(lipgloss.Color("39")).Bold(true)
-	styleFrom  = lipgloss.NewStyle().Foreground(lipgloss.Color("243"))
-	styleArrow = lipgloss.NewStyle().Foreground(lipgloss.Color("244"))
-	styleTo    = lipgloss.NewStyle().Foreground(lipgloss.Color("76")).Bold(true)
-)
-
-func printPackage(p sysupdate.Package) {
-	if !stdoutIsTTY() {
-		fmt.Printf("  [%s] %s  %s -> %s\n", p.Repo, p.Name, defaultIfEmpty(p.FromVersion, "?"), defaultIfEmpty(p.ToVersion, "?"))
-		return
-	}
-	fmt.Printf("  %s %s  %s %s %s\n",
-		styleRepo.Render("["+string(p.Repo)+"]"),
-		styleName.Render(p.Name),
-		styleFrom.Render(defaultIfEmpty(p.FromVersion, "?")),
-		styleArrow.Render("->"),
-		styleTo.Render(defaultIfEmpty(p.ToVersion, "?")),
-	)
-}
-
-func errOrEmpty(err error) string {
-	if err == nil {
-		return ""
-	}
-	return err.Error()
-}
-
-func defaultIfEmpty(s, def string) string {
-	if s == "" {
-		return def
-	}
-	return s
-}
@@ -1,122 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/trash"
-	"github.com/spf13/cobra"
-)
-
-var trashCmd = &cobra.Command{
-	Use:   "trash",
-	Short: "Manage the user's trash (XDG Trash spec 1.0)",
-}
-
-var trashPutCmd = &cobra.Command{
-	Use:   "put <path...>",
-	Short: "Move files or directories into the trash",
-	Args:  cobra.MinimumNArgs(1),
-	Run:   runTrashPut,
-}
-
-var trashListCmd = &cobra.Command{
-	Use:   "list",
-	Short: "List trashed items across all known trash directories",
-	Run:   runTrashList,
-}
-
-var trashCountCmd = &cobra.Command{
-	Use:   "count",
-	Short: "Print the total number of trashed items",
-	Run:   runTrashCount,
-}
-
-var trashEmptyCmd = &cobra.Command{
-	Use:   "empty",
-	Short: "Permanently delete every trashed item",
-	Run:   runTrashEmpty,
-}
-
-var trashRestoreCmd = &cobra.Command{
-	Use:   "restore <name>",
-	Short: "Restore a trashed item to its original location",
-	Args:  cobra.ExactArgs(1),
-	Run:   runTrashRestore,
-}
-
-var (
-	trashJSONOutput bool
-	trashRestoreDir string
-)
-
-func init() {
-	trashListCmd.Flags().BoolVar(&trashJSONOutput, "json", false, "Output as JSON")
-	trashRestoreCmd.Flags().StringVar(&trashRestoreDir, "trash-dir", "", "Trash directory containing the item (default: home trash)")
-	trashCmd.AddCommand(trashPutCmd, trashListCmd, trashCountCmd, trashEmptyCmd, trashRestoreCmd)
-}
-
-func runTrashPut(cmd *cobra.Command, args []string) {
-	var failed int
-	for _, p := range args {
-		if _, err := trash.Put(p); err != nil {
-			log.Errorf("trash %s: %v", p, err)
-			failed++
-			continue
-		}
-		fmt.Println(p)
-	}
-	if failed > 0 {
-		os.Exit(1)
-	}
-}
-
-func runTrashList(cmd *cobra.Command, args []string) {
-	entries, err := trash.List()
-	if err != nil {
-		log.Fatalf("list trash: %v", err)
-	}
-
-	if trashJSONOutput {
-		if entries == nil {
-			entries = []trash.Entry{}
-		}
-		out, _ := json.MarshalIndent(entries, "", "  ")
-		fmt.Println(string(out))
-		return
-	}
-
-	if len(entries) == 0 {
-		fmt.Println("Trash is empty")
-		return
-	}
-	for _, e := range entries {
-		marker := "F"
-		if e.IsDir {
-			marker = "D"
-		}
-		fmt.Printf("%s  %s  %s  %s\n", marker, e.DeletionDate, e.Name, e.OriginalPath)
-	}
-}
-
-func runTrashCount(cmd *cobra.Command, args []string) {
-	n, err := trash.Count()
-	if err != nil {
-		log.Fatalf("count trash: %v", err)
-	}
-	fmt.Println(n)
-}
-
-func runTrashEmpty(cmd *cobra.Command, args []string) {
-	if err := trash.Empty(); err != nil {
-		log.Fatalf("empty trash: %v", err)
-	}
-}
-
-func runTrashRestore(cmd *cobra.Command, args []string) {
-	if err := trash.Restore(args[0], trashRestoreDir); err != nil {
-		log.Fatalf("restore: %v", err)
-	}
-}
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"

@@ -27,7 +26,7 @@ var windowrulesListCmd = &cobra.Command{
 	Args:  cobra.MaximumNArgs(1),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 0 {
-			return []string{"hyprland", "niri", "mango"}, cobra.ShellCompDirectiveNoFileComp
+			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	},
@@ -41,7 +40,8 @@ var windowrulesAddCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(2),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 0 {
-			return []string{"hyprland", "niri", "mango"}, cobra.ShellCompDirectiveNoFileComp
+			// ! disabled hyprland return []string{"hyprland", "niri"}, cobra.ShellCompDirectiveNoFileComp
+			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	},
@@ -55,7 +55,7 @@ var windowrulesUpdateCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(3),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 0 {
-			return []string{"hyprland", "niri", "mango"}, cobra.ShellCompDirectiveNoFileComp
+			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	},
@@ -69,7 +69,7 @@ var windowrulesRemoveCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(2),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 0 {
-			return []string{"hyprland", "niri", "mango"}, cobra.ShellCompDirectiveNoFileComp
+			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	},
@@ -83,7 +83,7 @@ var windowrulesReorderCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(2),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) == 0 {
-			return []string{"hyprland", "niri", "mango"}, cobra.ShellCompDirectiveNoFileComp
+			return []string{"niri"}, cobra.ShellCompDirectiveNoFileComp
 		}
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	},
@@ -118,12 +118,9 @@ func getCompositor(args []string) string {
 	if os.Getenv("NIRI_SOCKET") != "" {
 		return "niri"
 	}
-	if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
-		return "hyprland"
-	}
-	if os.Getenv("MANGO_INSTANCE_SIGNATURE") != "" {
-		return "mango"
-	}
+	// if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
+	// 	return "hyprland"
+	// }
 	return ""
 }

@@ -143,14 +140,17 @@ func writeRuleSuccess(id, path string) {
 func runWindowrulesList(cmd *cobra.Command, args []string) {
 	compositor := getCompositor(args)
 	if compositor == "" {
-		log.Fatalf("Could not detect compositor. Please specify: hyprland, niri, or mango")
+		log.Fatalf("Could not detect compositor. Please specify: hyprland or niri")
 	}

 	var result WindowRulesListResult

 	switch compositor {
 	case "niri":
-		configDir := filepath.Join(utils.XDGConfigHome(), "niri")
+		configDir, err := utils.ExpandPath("$HOME/.config/niri")
+		if err != nil {
+			log.Fatalf("Failed to expand niri config path: %v", err)
+		}

 		parseResult, err := providers.ParseNiriWindowRules(configDir)
 		if err != nil {
@@ -183,7 +183,11 @@ func runWindowrulesList(cmd *cobra.Command, args []string) {
 		result.DMSStatus = parseResult.DMSStatus

 	case "hyprland":
-		configDir := filepath.Join(utils.XDGConfigHome(), "hypr")
+		log.Fatalf("Hyprland support is currently disabled.") // ! disabled hyprland
+		configDir, err := utils.ExpandPath("$HOME/.config/hypr")
+		if err != nil {
+			log.Fatalf("Failed to expand hyprland config path: %v", err)
+		}

 		parseResult, err := providers.ParseHyprlandWindowRules(configDir)
 		if err != nil {
@@ -215,38 +219,6 @@ func runWindowrulesList(cmd *cobra.Command, args []string) {
 		result.Rules = allRules
 		result.DMSStatus = parseResult.DMSStatus

-	case "mango", "mangowc":
-		configDir := filepath.Join(utils.XDGConfigHome(), "mango")
-
-		parseResult, err := providers.ParseMangoWindowRules(configDir)
-		if err != nil {
-			log.Fatalf("Failed to parse mango window rules: %v", err)
-		}
-
-		allRules := providers.ConvertMangoRulesToWindowRules(parseResult.Rules)
-
-		provider := providers.NewMangoWritableProvider(configDir)
-		dmsRules, _ := provider.LoadDMSRules()
-
-		dmsRuleMap := make(map[int]windowrules.WindowRule)
-		for i, dr := range dmsRules {
-			dmsRuleMap[i] = dr
-		}
-
-		dmsIdx := 0
-		for i, r := range allRules {
-			if r.Source == "dms/windowrules.conf" {
-				if dmr, ok := dmsRuleMap[dmsIdx]; ok {
-					allRules[i].ID = dmr.ID
-					allRules[i].Name = dmr.Name
-				}
-				dmsIdx++
-			}
-		}
-
-		result.Rules = allRules
-		result.DMSStatus = parseResult.DMSStatus
-
 	default:
 		log.Fatalf("Unknown compositor: %s", compositor)
 	}
@@ -345,14 +317,17 @@ func runWindowrulesReorder(cmd *cobra.Command, args []string) {
 func getWindowRulesProvider(compositor string) windowrules.WritableProvider {
 	switch compositor {
 	case "niri":
-		configDir := filepath.Join(utils.XDGConfigHome(), "niri")
+		configDir, err := utils.ExpandPath("$HOME/.config/niri")
+		if err != nil {
+			return nil
+		}
 		return providers.NewNiriWritableProvider(configDir)
 	case "hyprland":
-		configDir := filepath.Join(utils.XDGConfigHome(), "hypr")
+		configDir, err := utils.ExpandPath("$HOME/.config/hypr")
+		if err != nil {
+			return nil
+		}
 		return providers.NewHyprlandWritableProvider(configDir)
-	case "mango", "mangowc":
-		configDir := filepath.Join(utils.XDGConfigHome(), "mango")
-		return providers.NewMangoWritableProvider(configDir)
 	default:
 		return nil
 	}
@@ -15,8 +15,6 @@ func init() {
 	runCmd.Flags().BoolP("daemon", "d", false, "Run in daemon mode")
 	runCmd.Flags().Bool("daemon-child", false, "Internal flag for daemon child process")
 	runCmd.Flags().Bool("session", false, "Session managed (like as a systemd unit)")
-	runCmd.Flags().String("log-level", "", "Log level: debug, info, warn, error, fatal (overrides DMS_LOG_LEVEL)")
-	runCmd.Flags().String("log-file", "", "Append logs to this file in addition to stderr (overrides DMS_LOG_FILE)")
 	runCmd.Flags().MarkHidden("daemon-child")

 	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd, greeterUninstallCmd)
@@ -15,8 +15,6 @@ func init() {
 	runCmd.Flags().BoolP("daemon", "d", false, "Run in daemon mode")
 	runCmd.Flags().Bool("daemon-child", false, "Internal flag for daemon child process")
 	runCmd.Flags().Bool("session", false, "Session managed (like as a systemd unit)")
-	runCmd.Flags().String("log-level", "", "Log level: debug, info, warn, error, fatal (overrides DMS_LOG_LEVEL)")
-	runCmd.Flags().String("log-file", "", "Append logs to this file in addition to stderr (overrides DMS_LOG_FILE)")
 	runCmd.Flags().MarkHidden("daemon-child")

 	greeterCmd.AddCommand(greeterInstallCmd, greeterSyncCmd, greeterEnableCmd, greeterStatusCmd, greeterUninstallCmd)
@@ -12,10 +12,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
 )

-// maxIPCMessageSize allows room for a 50 MB clipboard entry plus JSON/base64
-// overhead in the line-delimited IPC response.
-const maxIPCMessageSize = 96 * 1024 * 1024
-
 func sendServerRequest(req models.Request) (*models.Response[any], error) {
 	socketPath := getServerSocketPath()

@@ -26,7 +22,6 @@ func sendServerRequest(req models.Request) (*models.Response[any], error) {
 	defer conn.Close()

 	scanner := bufio.NewScanner(conn)
-	scanner.Buffer(make([]byte, bufio.MaxScanTokenSize), maxIPCMessageSize)
 	scanner.Scan() // discard initial capabilities message

 	reqData, err := json.Marshal(req)
@@ -66,7 +61,6 @@ func sendServerRequestFireAndForget(req models.Request) error {
 	defer conn.Close()

 	scanner := bufio.NewScanner(conn)
-	scanner.Buffer(make([]byte, bufio.MaxScanTokenSize), maxIPCMessageSize)
 	scanner.Scan() // discard initial capabilities message

 	reqData, err := json.Marshal(req)
@@ -2,9 +2,7 @@ package main

 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -82,16 +80,6 @@ func getRuntimeDir() string {
 	return os.TempDir()
 }

-func appendLogEnv(env []string) []string {
-	if v := os.Getenv("DMS_LOG_LEVEL"); v != "" {
-		env = append(env, "DMS_LOG_LEVEL="+v)
-	}
-	if v := os.Getenv("DMS_LOG_FILE"); v != "" {
-		env = append(env, "DMS_LOG_FILE="+v)
-	}
-	return env
-}
-
 func hasSystemdRun() bool {
 	_, err := exec.LookPath("systemd-run")
 	return err == nil
@@ -194,7 +182,6 @@ func runShellInteractive(session bool) {
 		}
 	}()

-	ensureFontCache()
 	log.Infof("Spawning quickshell with -p %s", configPath)

 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
@@ -205,6 +192,9 @@ func runShellInteractive(session bool) {
 		}
 	}

+	// ! TODO - remove when QS 0.3 is up and we can use the pragma
+	cmd.Env = append(cmd.Env, "QS_APP_ID=com.danklinux.dms")
+
 	if isSessionManaged && hasSystemdRun() {
 		cmd.Env = append(cmd.Env, "DMS_DEFAULT_LAUNCH_PREFIX=systemd-run --user --scope")
 	}
@@ -226,14 +216,10 @@ func runShellInteractive(session bool) {
 		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland;xcb")
 	}

-	cmd.Env = appendLogEnv(cmd.Env)
-
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
-	tracker := &stderrTracker{parent: os.Stderr}
-	cmd.Stderr = tracker
+	cmd.Stderr = os.Stderr

-	startTime := time.Now()
 	if err := cmd.Start(); err != nil {
 		log.Fatalf("Error starting quickshell: %v", err)
 	}
@@ -282,9 +268,7 @@ func runShellInteractive(session bool) {
 			case <-errChan:
 				cancel()
 				os.Remove(socketPath)
-				exitCode := getProcessExitCode(cmd.ProcessState)
-				logStartupFailure(startTime, exitCode, tracker)
-				os.Exit(exitCode)
+				os.Exit(getProcessExitCode(cmd.ProcessState))
 			case <-time.After(500 * time.Millisecond):
 			}

@@ -301,9 +285,7 @@ func runShellInteractive(session bool) {
 				cmd.Process.Signal(syscall.SIGTERM)
 			}
 			os.Remove(socketPath)
-			exitCode := getProcessExitCode(cmd.ProcessState)
-			logStartupFailure(startTime, exitCode, tracker)
-			os.Exit(exitCode)
+			os.Exit(getProcessExitCode(cmd.ProcessState))
 		}
 	}
 }
@@ -443,7 +425,6 @@ func runShellDaemon(session bool) {
 		}
 	}()

-	ensureFontCache()
 	log.Infof("Spawning quickshell with -p %s", configPath)

 	cmd := exec.CommandContext(ctx, "qs", "-p", configPath)
@@ -478,8 +459,6 @@ func runShellDaemon(session bool) {
 		cmd.Env = append(cmd.Env, "QT_QPA_PLATFORM=wayland;xcb")
 	}

-	cmd.Env = appendLogEnv(cmd.Env)
-
 	devNull, err := os.OpenFile("/dev/null", os.O_RDWR, 0)
 	if err != nil {
 		log.Fatalf("Error opening /dev/null: %v", err)
@@ -488,10 +467,8 @@ func runShellDaemon(session bool) {

 	cmd.Stdin = devNull
 	cmd.Stdout = devNull
-	tracker := &stderrTracker{parent: devNull}
-	cmd.Stderr = tracker
+	cmd.Stderr = devNull

-	startTime := time.Now()
 	if err := cmd.Start(); err != nil {
 		log.Fatalf("Error starting daemon: %v", err)
 	}
@@ -540,9 +517,7 @@ func runShellDaemon(session bool) {
 			case <-errChan:
 				cancel()
 				os.Remove(socketPath)
-				exitCode := getProcessExitCode(cmd.ProcessState)
-				logStartupFailure(startTime, exitCode, tracker)
-				os.Exit(exitCode)
+				os.Exit(getProcessExitCode(cmd.ProcessState))
 			case <-time.After(500 * time.Millisecond):
 			}

@@ -557,9 +532,7 @@ func runShellDaemon(session bool) {
 				cmd.Process.Signal(syscall.SIGTERM)
 			}
 			os.Remove(socketPath)
-			exitCode := getProcessExitCode(cmd.ProcessState)
-			logStartupFailure(startTime, exitCode, tracker)
-			os.Exit(exitCode)
+			os.Exit(getProcessExitCode(cmd.ProcessState))
 		}
 	}
 }
@@ -764,133 +737,3 @@ func printIPCHelp() {
 		fmt.Printf("  %-16s %s\n", targetName, strings.Join(funcNames, ", "))
 	}
 }
-
-// ensureFontCache rebuilds the fontconfig cache if user-configured fonts are missing while skipping defaults
-func ensureFontCache() {
-	if _, err := exec.LookPath("fc-list"); err != nil {
-		return
-	}
-	if _, err := exec.LookPath("fc-cache"); err != nil {
-		return
-	}
-
-	var fontsToCheck []string
-
-	if configDir, err := os.UserConfigDir(); err == nil {
-		settingsPath := filepath.Join(configDir, "DankMaterialShell", "settings.json")
-		if data, err := os.ReadFile(settingsPath); err == nil {
-			var settings struct {
-				FontFamily     string `json:"fontFamily"`
-				MonoFontFamily string `json:"monoFontFamily"`
-			}
-			if err := json.Unmarshal(data, &settings); err == nil {
-				if settings.FontFamily != "" && settings.FontFamily != "Inter Variable" {
-					fontsToCheck = append(fontsToCheck, settings.FontFamily)
-				}
-				if settings.MonoFontFamily != "" && settings.MonoFontFamily != "Fira Code" {
-					fontsToCheck = append(fontsToCheck, settings.MonoFontFamily)
-				}
-			}
-		}
-	}
-
-	if len(fontsToCheck) == 0 {
-		return
-	}
-
-	output, err := exec.Command("fc-list", ":", "family").Output()
-	if err != nil || len(strings.TrimSpace(string(output))) == 0 {
-		log.Warnf("Font cache appears empty or corrupt, rebuilding...")
-		rebuildFontCache()
-		return
-	}
-
-	cacheFonts := strings.ToLower(string(output))
-	var missing []string
-	for _, font := range fontsToCheck {
-		if !fontInCache(strings.ToLower(font), cacheFonts) {
-			missing = append(missing, font)
-		}
-	}
-
-	if len(missing) > 0 {
-		log.Warnf("Font(s) not found in cache: %s — rebuilding...", strings.Join(missing, ", "))
-		rebuildFontCache()
-	}
-}
-
-func fontInCache(target, cache string) bool {
-	for _, line := range strings.Split(cache, "\n") {
-		for _, fam := range strings.Split(strings.TrimSpace(line), ",") {
-			if strings.TrimSpace(fam) == target {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-func rebuildFontCache() {
-	cmd := exec.Command("fc-cache", "-f")
-	if output, err := cmd.CombinedOutput(); err != nil {
-		log.Warnf("Failed to rebuild font cache: %v\n%s", err, string(output))
-	} else {
-		log.Infof("Font cache rebuilt successfully")
-	}
-}
-
-type stderrTracker struct {
-	mu     sync.Mutex
-	buf    strings.Builder
-	parent io.Writer
-}
-
-func (s *stderrTracker) Write(p []byte) (n int, err error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.buf.Len() < 8192 {
-		s.buf.Write(p)
-	}
-	if s.parent != nil {
-		return s.parent.Write(p)
-	}
-	return len(p), nil
-}
-
-func (s *stderrTracker) String() string {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.buf.String()
-}
-
-// logStartupFailure logs diagnostic advice if qs crashes within 5s of launch.
-func logStartupFailure(startTime time.Time, exitCode int, tracker *stderrTracker) {
-	if time.Since(startTime) >= 5*time.Second || exitCode == 0 || exitCode > 128 {
-		return
-	}
-	if containsFontCrashSignature(tracker.String()) {
-		log.Errorf("DMS startup failed due to a potential font/rendering crash. Try running 'fc-cache -fv' and restarting DMS.")
-	} else {
-		log.Errorf("DMS startup failed (exit code %d). Run 'dms doctor' for more diagnostics.", exitCode)
-	}
-}
-
-func containsFontCrashSignature(logStr string) bool {
-	logStr = strings.ToLower(logStr)
-	signatures := []string{
-		"fontconfig",
-		"freetype",
-		"ft_load_glyph",
-		"ft_face",
-		"fc-list",
-		"fc-cache",
-		"glyph",
-		"typeface",
-	}
-	for _, sig := range signatures {
-		if strings.Contains(logStr, sig) {
-			return true
-		}
-	}
-	return false
-}
@@ -15,7 +15,7 @@ func isReadOnlyCommand(args []string) bool {
 			continue
 		}
 		switch arg {
-		case "completion", "help", "__complete", "system":
+		case "completion", "help", "__complete":
 			return true
 		}
 		return false
@@ -1,100 +1,84 @@
 module github.com/AvengeMedia/DankMaterialShell/core

-go 1.26.1
+go 1.26.0
+
+toolchain go1.26.1

 require (
 	github.com/Wifx/gonetworkmanager/v2 v2.2.0
-	github.com/alecthomas/chroma/v2 v2.24.1
+	github.com/alecthomas/chroma/v2 v2.23.1
 	github.com/charmbracelet/bubbles v1.0.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/log v1.0.0
-	github.com/fsnotify/fsnotify v1.10.1
+	github.com/charmbracelet/log v0.4.2
+	github.com/fsnotify/fsnotify v1.9.0
 	github.com/godbus/dbus/v5 v5.2.2
-	github.com/holoplot/go-evdev v0.0.0-20260504100651-66d1748fe847
+	github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83
 	github.com/pilebones/go-udev v0.9.1
 	github.com/sblinch/kdl-go v0.0.0-20260121213736-8b7053306ca6
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
 	github.com/yeqown/go-qrcode/v2 v2.2.5
 	github.com/yeqown/go-qrcode/writer/standard v1.3.0
-	github.com/yuin/goldmark v1.8.2
+	github.com/yuin/goldmark v1.7.16
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	go.etcd.io/bbolt v1.4.3
-	go4.org/mem v0.0.0-20240501181205-ae6ca9944745
-	golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
-	golang.org/x/image v0.39.0
-	tailscale.com v1.96.5
+	golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a
+	golang.org/x/image v0.36.0
 )

 require (
-	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.4.1 // indirect
-	github.com/akutz/memconn v0.1.0 // indirect
-	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/clipperhouse/displaywidth v0.10.0 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/cloudflare/circl v1.6.3 // indirect
-	github.com/coder/websocket v1.8.14 // indirect
 	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
-	github.com/dblohm7/wingoes v0.0.0-20250822163801-6d8e6105c62d // indirect
-	github.com/dlclark/regexp2 v1.12.0 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fogleman/gg v1.3.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.2 // indirect
 	github.com/go-git/gcfg/v2 v2.0.2 // indirect
-	github.com/go-git/go-billy/v6 v6.0.0-20260504142752-cb8e9d337266 // indirect
-	github.com/go-json-experiment/json v0.0.0-20260430182902-b6187a392ed4 // indirect
+	github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3 // indirect
 	github.com/go-logfmt/logfmt v0.6.1 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/hdevalence/ed25519consensus v0.2.0 // indirect
-	github.com/jsimonetti/rtnetlink v1.4.2 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/kevinburke/ssh_config v1.6.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
-	github.com/mdlayher/netlink v1.11.1 // indirect
-	github.com/mdlayher/socket v0.6.0 // indirect
-	github.com/mitchellh/go-ps v1.0.0 // indirect
-	github.com/pjbgf/sha1cd v0.6.0 // indirect
+	github.com/pjbgf/sha1cd v0.5.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
 	github.com/stretchr/objx v0.5.3 // indirect
-	github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yeqown/reedsolomon v1.0.0 // indirect
-	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
-	golang.org/x/crypto v0.50.0 // indirect
-	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.zx2c4.com/wireguard/windows v1.0.1 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/net v0.50.0 // indirect
 )

 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/charmbracelet/colorprofile v0.4.3 // indirect
+	github.com/charmbracelet/colorprofile v0.4.2 // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.11.7 // indirect
+	github.com/charmbracelet/x/ansi v0.11.6 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/go-git/go-git/v6 v6.0.0-alpha.2
+	github.com/go-git/go-git/v6 v6.0.0-20260216160506-e6a3f881772f
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.4.0
-	github.com/mattn/go-isatty v0.0.22
+	github.com/lucasb-eyer/go-colorful v1.3.0
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.23 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/termenv v0.16.0
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/afero v1.15.0
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/sys v0.43.0
-	golang.org/x/text v0.36.0
+	golang.org/x/sys v0.41.0
+	golang.org/x/text v0.34.0
 	gopkg.in/yaml.v3 v3.0.1
 )

@@ -1,18 +1,14 @@
-filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
-filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67IQOfM=
-github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
 github.com/Wifx/gonetworkmanager/v2 v2.2.0 h1:kPstgsQtY8CmDOOFZd81ytM9Gi3f6ImzPCKF7nNhQ2U=
 github.com/Wifx/gonetworkmanager/v2 v2.2.0/go.mod h1:fMDb//SHsKWxyDUAwXvCqurV3npbIyyaQWenGpZ/uXg=
-github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=
-github.com/akutz/memconn v0.1.0/go.mod h1:Jo8rI7m0NieZyLI5e2CDlRdRqRRB4S7Xp77ukDjH+Fw=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
 github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
-github.com/alecthomas/chroma/v2 v2.24.1 h1:m5ffpfZbIb++k8AqFEKy9uVgY12xIQtBsQlc6DfZJQM=
-github.com/alecthomas/chroma/v2 v2.24.1/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI=
+github.com/alecthomas/chroma/v2 v2.23.1 h1:nv2AVZdTyClGbVQkIzlDm/rnhk1E9bU9nXwmZ/Vk/iY=
+github.com/alecthomas/chroma/v2 v2.23.1/go.mod h1:NqVhfBR0lte5Ouh3DcthuUCTUpDC9cxBOfyMbMQPs3o=
 github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
@@ -28,71 +24,54 @@ github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5f
 github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
 github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
 github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
-github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
-github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/colorprofile v0.4.2 h1:BdSNuMjRbotnxHSfxy+PCSa4xAmz7szw70ktAtWRYrY=
+github.com/charmbracelet/colorprofile v0.4.2/go.mod h1:0rTi81QpwDElInthtrQ6Ni7cG0sDtwAd4C4le060fT8=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/log v1.0.0 h1:HVVVMmfOorfj3BA9i8X8UL69Hoz9lI0PYwXfJvOdRc4=
-github.com/charmbracelet/log v1.0.0/go.mod h1:uYgY3SmLpwJWxmlrPwXvzVYujxis1vAKRV/0VQB7yWA=
-github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
-github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
+github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
+github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
+github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
+github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
 github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
 github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
 github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
-github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=
-github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=
-github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
-github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/displaywidth v0.10.0 h1:GhBG8WuerxjFQQYeuZAeVTuyxuX+UraiZGD4HJQ3Y8g=
+github.com/clipperhouse/displaywidth v0.10.0/go.mod h1:XqJajYsaiEwkxOj4bowCTMcT1SgvHo9flfF3jQasdbs=
 github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
 github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
 github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
-github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
-github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/creachadair/taskgroup v0.13.2 h1:3KyqakBuFsm3KkXi/9XIb0QcA8tEzLHLgaoidf0MdVc=
-github.com/creachadair/taskgroup v0.13.2/go.mod h1:i3V1Zx7H8RjwljUEeUWYT30Lmb9poewSb2XI1yTwD0g=
 github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
 github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dblohm7/wingoes v0.0.0-20250822163801-6d8e6105c62d h1:QRKpU+9ZBDs62LyBfwhZkJdB5DJX2Sm3p4kUh7l1aA0=
-github.com/dblohm7/wingoes v0.0.0-20250822163801-6d8e6105c62d/go.mod h1:SUxUaAK/0UG5lYyZR1L1nC4AaYYvSSYTWQSH3FPcxKU=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8=
-github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
-github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
-github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78=
-github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/gaissmai/bart v0.26.1 h1:+w4rnLGNlA2GDVn382Tfe3jOsK5vOr5n4KmigJ9lbTo=
-github.com/gaissmai/bart v0.26.1/go.mod h1:GREWQfTLRWz/c5FTOsIw+KkscuFkIV5t8Rp7Nd1Td5c=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
 github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
-github.com/go-git/go-billy/v6 v6.0.0-20260504142752-cb8e9d337266 h1:wH21vHuv323v9x78JNFNJ6P7HEAsdwr9yq2k9/o4zEE=
-github.com/go-git/go-billy/v6 v6.0.0-20260504142752-cb8e9d337266/go.mod h1:CdBVp7CXl9l3sOyNEog46cP1Pvx/hjCe9AD0mtaIUYU=
-github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0 h1:XoTsdvaghuVfIr7HpNTmFDLu2nz3I2iGqyn6Uk6MkJc=
-github.com/go-git/go-git-fixtures/v6 v6.0.0-20260405195209-b16dd39735e0/go.mod h1:1Lr7/vYEYyl6Ir9Ku0tKrCIRreM5zovv0Jdx2MPSM4s=
-github.com/go-git/go-git/v6 v6.0.0-alpha.2 h1:T3loNtDuAixNzXtlQxZhnYiYpaQ3CA4vn9RssAniEeI=
-github.com/go-git/go-git/v6 v6.0.0-alpha.2/go.mod h1:oCD3i19CTz7gBpeb11ZZqL91WzqbMq9avn5KpUYy/Ak=
-github.com/go-json-experiment/json v0.0.0-20260430182902-b6187a392ed4 h1:2WmHkJINIjgXXYDGik8d3oJvFA3DAwPy00csDJ3vo+o=
-github.com/go-json-experiment/json v0.0.0-20260430182902-b6187a392ed4/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
+github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3 h1:UU7oARtwQ5g85aFiCSwIUA6PBmAshYj0sytl/5CCBgs=
+github.com/go-git/go-billy/v6 v6.0.0-20260209124918-37866f83c2d3/go.mod h1:ZW9JC5gionMP1kv5uiaOaV23q0FFmNrVOV8VW+y/acc=
+github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260122163445-0622d7459a67 h1:3hutPZF+/FBjR/9MdsLJ7e1mlt9pwHgwxMW7CrbmWII=
+github.com/go-git/go-git-fixtures/v5 v5.1.2-0.20260122163445-0622d7459a67/go.mod h1:xKt0pNHST9tYHvbiLxSY27CQWFwgIxBJuDrOE0JvbZw=
+github.com/go-git/go-git/v6 v6.0.0-20260216160506-e6a3f881772f h1:TBkCJv9YwPOuXq1OG0r01bcxRrvs15Hp/DtZuPt4H6s=
+github.com/go-git/go-git/v6 v6.0.0-20260216160506-e6a3f881772f/go.mod h1:B88nWzfnhTlIikoJ4d84Nc9noKS5mJoA7SgDdkt0aPU=
 github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE=
 github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk=
 github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -105,16 +84,12 @@ github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUv
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hdevalence/ed25519consensus v0.2.0 h1:37ICyZqdyj0lAZ8P4D1d1id3HqbbG1N3iBb1Tb4rdcU=
-github.com/hdevalence/ed25519consensus v0.2.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/holoplot/go-evdev v0.0.0-20260504100651-66d1748fe847 h1:1rQ5UQXFm02DXEtsIpotfA32WJ9KceS6t8w5K8QtFqc=
-github.com/holoplot/go-evdev v0.0.0-20260504100651-66d1748fe847/go.mod h1:iHAf8OIncO2gcQ8XOjS7CMJ2aPbX2Bs0wl5pZyanEqk=
+github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83 h1:B+A58zGFuDrvEZpPN+yS6swJA0nzqgZvDzgl/OPyefU=
+github.com/holoplot/go-evdev v0.0.0-20250804134636-ab1d56a1fe83/go.mod h1:iHAf8OIncO2gcQ8XOjS7CMJ2aPbX2Bs0wl5pZyanEqk=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jsimonetti/rtnetlink v1.4.2 h1:Df9w9TZ3npHTyDn0Ev9e1uzmN2odmXd0QX+J5GTEn90=
-github.com/jsimonetti/rtnetlink v1.4.2/go.mod h1:92s6LJdE+1iOrw+F2/RO7LYI2Qd8pPpFNNUYW06gcoM=
 github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=
 github.com/kevinburke/ssh_config v1.6.0/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
@@ -126,20 +101,14 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
-github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
-github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
+github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 h1:P8UmIzZMYDR+NGImiFvErt6VWfIRPuGM+vyjiEdkmIw=
 github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
-github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mdlayher/netlink v1.11.1 h1:T136gDS6Gkt+hLncaBwKdW5GpEC8Z0ykqimOebVoal0=
-github.com/mdlayher/netlink v1.11.1/go.mod h1:ao4LjamyK4Uq9L8+fQzqFYpAncbeCdwbvd9Edv/pYnc=
-github.com/mdlayher/socket v0.6.0 h1:ScZPaAGyO1icQnbFrhPM8mnXyMu9qukC1K4ZoM2IQKU=
-github.com/mdlayher/socket v0.6.0/go.mod h1:q7vozUAnxSqnjHc12Fik5yUKIzfZ8ITCfMkhOtE9z18=
-github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
-github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -148,13 +117,12 @@ github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pilebones/go-udev v0.9.1 h1:uN72M1C1fgzhsVmBGEM8w9RD1JY4iVsPZpr+Z6rb3O8=
 github.com/pilebones/go-udev v0.9.1/go.mod h1:Bgcl07crebF3JSeS4+nuaRvhWFdCeFoBhXXeAp93XNo=
-github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
-github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
+github.com/pjbgf/sha1cd v0.5.0 h1:a+UkboSi1znleCDUNT3M5YxjOnN1fz2FhN48FlwCxs0=
+github.com/pjbgf/sha1cd v0.5.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -178,12 +146,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 h1:Gzfnfk2TWrk8Jj4P4c1a3CtQyMaTVCznlkLZI++hok4=
-github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55/go.mod h1:4k4QO+dQ3R5FofL+SanAUZe+/QfeK0+OIuwDIRu2vSg=
-github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da h1:jVRUZPRs9sqyKlYHHzHjAqKN+6e/Vog6NpHYeNPJqOw=
-github.com/tailscale/wireguard-go v0.0.0-20250716170648-1d0488a3d7da/go.mod h1:BOm5fXUBFM+m9woLNBoxI9TaBXXhGNP50LX/TGIvGb4=
-github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
-github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/yeqown/go-qrcode/v2 v2.2.5 h1:HCOe2bSjkhZyYoyyNaXNzh4DJZll6inVJQQw+8228Zk=
@@ -193,47 +155,37 @@ github.com/yeqown/go-qrcode/writer/standard v1.3.0/go.mod h1:O4MbzsotGCvy8upYPCR
 github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0=
 github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM=
 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
-github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
+github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ=
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
 go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
 go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-go4.org/mem v0.0.0-20240501181205-ae6ca9944745 h1:Tl++JLUCe4sxGu8cTpDzRLd3tN7US4hOxG5YpKCzkek=
-go4.org/mem v0.0.0-20240501181205-ae6ca9944745/go.mod h1:reUoABIJ9ikfM5sgtSF3Wushcza7+WeD01VB9Lirh3g=
-go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
-go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
-golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
-golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
-golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
-golang.org/x/image v0.39.0 h1:skVYidAEVKgn8lZ602XO75asgXBgLj9G/FE3RbuPFww=
-golang.org/x/image v0.39.0/go.mod h1:sIbmppfU+xFLPIG0FoVUTvyBMmgng1/XAMhQ2ft0hpA=
-golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a h1:ovFr6Z0MNmU7nH8VaX5xqw+05ST2uO1exVfZPVqRC5o=
+golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA=
+golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
+golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
-golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-golang.zx2c4.com/wireguard/windows v1.0.1 h1:eOxiDVbywPC+ZQqvdCK7x+ZwWXKbYv50TtH8ysFIbw8=
-golang.zx2c4.com/wireguard/windows v1.0.1/go.mod h1:+fbT3FFdX4zzYDLwJh5+HPEcNN/3HyNdzhNSVsQM+zs=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
+golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-tailscale.com v1.96.5 h1:gNkfA/KSZAl6jCH9cj8urq00HRWItDDTtGsyATI89jA=
-tailscale.com v1.96.5/go.mod h1:/3lnZBYb2UEwnN0MNu2SDXUtT06AGd5k0s+OWx3WmcY=
@@ -12,8 +12,6 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/deps"
 )

-const hyprlandBackupDirName = ".dms-backups"
-
 type ConfigDeployer struct {
 	logChan chan<- string
 }
@@ -65,27 +63,12 @@ func (cd *ConfigDeployer) deployConfigurationsInternal(ctx context.Context, wm d
 	var results []DeploymentResult

 	// Primary config file paths used to detect fresh installs.
-	configPrimaryPaths := map[string][]string{
-		"Niri": {
-			filepath.Join(os.Getenv("HOME"), ".config", "niri", "config.kdl"),
-		},
-		"Hyprland": {
-			filepath.Join(os.Getenv("HOME"), ".config", "hypr", "hyprland.lua"),
-			filepath.Join(os.Getenv("HOME"), ".config", "hypr", "hyprland.conf"),
-		},
-		"Mango": {
-			filepath.Join(os.Getenv("HOME"), ".config", "mango", "config.conf"),
-			filepath.Join(os.Getenv("HOME"), ".config", "mango", "mango.conf"),
-		},
-		"Ghostty": {
-			filepath.Join(os.Getenv("HOME"), ".config", "ghostty", "config"),
-		},
-		"Kitty": {
-			filepath.Join(os.Getenv("HOME"), ".config", "kitty", "kitty.conf"),
-		},
-		"Alacritty": {
-			filepath.Join(os.Getenv("HOME"), ".config", "alacritty", "alacritty.toml"),
-		},
+	configPrimaryPaths := map[string]string{
+		"Niri":      filepath.Join(os.Getenv("HOME"), ".config", "niri", "config.kdl"),
+		"Hyprland":  filepath.Join(os.Getenv("HOME"), ".config", "hypr", "hyprland.conf"),
+		"Ghostty":   filepath.Join(os.Getenv("HOME"), ".config", "ghostty", "config"),
+		"Kitty":     filepath.Join(os.Getenv("HOME"), ".config", "kitty", "kitty.conf"),
+		"Alacritty": filepath.Join(os.Getenv("HOME"), ".config", "alacritty", "alacritty.toml"),
 	}

 	shouldReplaceConfig := func(configType string) bool {
@@ -98,15 +81,8 @@ func (cd *ConfigDeployer) deployConfigurationsInternal(ctx context.Context, wm d
 		}
 		// Config is explicitly set to "don't replace" — but still deploy
 		// if the config file doesn't exist yet (fresh install scenario).
-		if primaryPaths, ok := configPrimaryPaths[configType]; ok {
-			exists := false
-			for _, primaryPath := range primaryPaths {
-				if _, err := os.Stat(primaryPath); err == nil {
-					exists = true
-					break
-				}
-			}
-			if !exists {
+		if primaryPath, ok := configPrimaryPaths[configType]; ok {
+			if _, err := os.Stat(primaryPath); os.IsNotExist(err) {
 				return true
 			}
 		}
@@ -130,14 +106,6 @@ func (cd *ConfigDeployer) deployConfigurationsInternal(ctx context.Context, wm d
 				return results, fmt.Errorf("failed to deploy Hyprland config: %w", err)
 			}
 		}
-	case deps.WindowManagerMango:
-		if shouldReplaceConfig("Mango") {
-			result, err := cd.deployMangoConfig(terminal, useSystemd)
-			results = append(results, result)
-			if err != nil {
-				return results, fmt.Errorf("failed to deploy Mango config: %w", err)
-			}
-		}
 	}

 	switch terminal {
@@ -281,96 +249,6 @@ func (cd *ConfigDeployer) deployNiriDmsConfigs(dmsDir, terminalCommand string) e
 	return nil
 }

-func (cd *ConfigDeployer) deployMangoConfig(terminal deps.Terminal, useSystemd bool) (DeploymentResult, error) {
-	result := DeploymentResult{
-		ConfigType: "Mango",
-		Path:       filepath.Join(os.Getenv("HOME"), ".config", "mango", "config.conf"),
-	}
-
-	configDir := filepath.Dir(result.Path)
-	if err := os.MkdirAll(configDir, 0o755); err != nil {
-		result.Error = fmt.Errorf("failed to create config directory: %w", err)
-		return result, result.Error
-	}
-
-	dmsDir := filepath.Join(configDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		result.Error = fmt.Errorf("failed to create dms directory: %w", err)
-		return result, result.Error
-	}
-
-	var terminalCommand string
-	switch terminal {
-	case deps.TerminalGhostty:
-		terminalCommand = "ghostty"
-	case deps.TerminalKitty:
-		terminalCommand = "kitty"
-	case deps.TerminalAlacritty:
-		terminalCommand = "alacritty"
-	default:
-		terminalCommand = "ghostty"
-	}
-
-	// DMS owns config.conf for mango (like niri/hyprland): back up and replace.
-	if existingData, err := os.ReadFile(result.Path); err == nil {
-		cd.log("Found existing Mango configuration")
-		timestamp := time.Now().Format("2006-01-02_15-04-05")
-		result.BackupPath = result.Path + ".backup." + timestamp
-		if err := os.WriteFile(result.BackupPath, existingData, 0o644); err != nil {
-			result.Error = fmt.Errorf("failed to create backup: %w", err)
-			return result, result.Error
-		}
-		cd.log(fmt.Sprintf("Backed up existing config to %s", result.BackupPath))
-	}
-
-	newConfig := strings.ReplaceAll(MangoConfig, "{{TERMINAL_COMMAND}}", terminalCommand)
-	if err := os.WriteFile(result.Path, []byte(newConfig), 0o644); err != nil {
-		result.Error = fmt.Errorf("failed to write config: %w", err)
-		return result, result.Error
-	}
-
-	if err := cd.deployMangoDmsConfigs(dmsDir, terminalCommand); err != nil {
-		result.Error = fmt.Errorf("failed to deploy dms configs: %w", err)
-		return result, result.Error
-	}
-
-	result.Deployed = true
-	cd.log("Successfully deployed Mango configuration")
-	return result, nil
-}
-
-func (cd *ConfigDeployer) deployMangoDmsConfigs(dmsDir, terminalCommand string) error {
-	configs := []struct {
-		name      string
-		content   string
-		overwrite bool
-	}{
-		// binds.conf is DMS-owned (overwrite); the rest are runtime/user-managed.
-		{"binds.conf", strings.ReplaceAll(MangoBindsConfig, "{{TERMINAL_COMMAND}}", terminalCommand), true},
-		{"colors.conf", MangoColorsConfig, false},
-		{"layout.conf", MangoLayoutConfig, false},
-		{"outputs.conf", "", false},
-		{"cursor.conf", "", false},
-		{"windowrules.conf", "", false},
-	}
-
-	for _, cfg := range configs {
-		path := filepath.Join(dmsDir, cfg.name)
-		if !cfg.overwrite {
-			if info, err := os.Stat(path); err == nil && info.Size() > 0 {
-				cd.log(fmt.Sprintf("Skipping %s (already exists)", cfg.name))
-				continue
-			}
-		}
-		if err := os.WriteFile(path, []byte(cfg.content), 0o644); err != nil {
-			return fmt.Errorf("failed to write %s: %w", cfg.name, err)
-		}
-		cd.log(fmt.Sprintf("Deployed %s", cfg.name))
-	}
-
-	return nil
-}
-
 func (cd *ConfigDeployer) deployGhosttyConfig() ([]DeploymentResult, error) {
 	var results []DeploymentResult

@@ -617,7 +495,7 @@ func (cd *ConfigDeployer) mergeNiriOutputSections(newConfig, existingConfig, dms
 func (cd *ConfigDeployer) deployHyprlandConfig(terminal deps.Terminal, useSystemd bool) (DeploymentResult, error) {
 	result := DeploymentResult{
 		ConfigType: "Hyprland",
-		Path:       filepath.Join(os.Getenv("HOME"), ".config", "hypr", "hyprland.lua"),
+		Path:       filepath.Join(os.Getenv("HOME"), ".config", "hypr", "hyprland.conf"),
 	}

 	configDir := filepath.Dir(result.Path)
@@ -632,20 +510,20 @@ func (cd *ConfigDeployer) deployHyprlandConfig(terminal deps.Terminal, useSystem
 		return result, result.Error
 	}

-	timestamp := time.Now().Format("2006-01-02_15-04-05")
-	backupDir := filepath.Join(configDir, hyprlandBackupDirName, timestamp)
 	var existingConfig string
-	existingData, existingPath, err := readExistingHyprlandConfig(configDir)
-	if err != nil {
-		result.Error = err
-		return result, result.Error
-	}
-	if existingData != "" {
-		existingConfig = existingData
-		cd.log(fmt.Sprintf("Found existing Hyprland configuration at %s", existingPath))
+	if _, err := os.Stat(result.Path); err == nil {
+		cd.log("Found existing Hyprland configuration")

-		result.BackupPath = filepath.Join(backupDir, filepath.Base(existingPath))
-		if err := backupHyprlandConfigFile(existingPath, result.BackupPath, []byte(existingData), strings.EqualFold(filepath.Ext(existingPath), ".conf")); err != nil {
+		existingData, err := os.ReadFile(result.Path)
+		if err != nil {
+			result.Error = fmt.Errorf("failed to read existing config: %w", err)
+			return result, result.Error
+		}
+		existingConfig = string(existingData)
+
+		timestamp := time.Now().Format("2006-01-02_15-04-05")
+		result.BackupPath = result.Path + ".backup." + timestamp
+		if err := os.WriteFile(result.BackupPath, existingData, 0o644); err != nil {
 			result.Error = fmt.Errorf("failed to create backup: %w", err)
 			return result, result.Error
 		}
@@ -664,10 +542,10 @@ func (cd *ConfigDeployer) deployHyprlandConfig(terminal deps.Terminal, useSystem
 		terminalCommand = "ghostty"
 	}

-	newConfig := strings.ReplaceAll(HyprlandLuaConfig, "{{TERMINAL_COMMAND}}", terminalCommand)
+	newConfig := strings.ReplaceAll(HyprlandConfig, "{{TERMINAL_COMMAND}}", terminalCommand)

 	if !useSystemd {
-		newConfig = transformHyprlandLuaForNonSystemd(newConfig, terminalCommand)
+		newConfig = cd.transformHyprlandConfigForNonSystemd(newConfig, terminalCommand)
 	}

 	if existingConfig != "" {
@@ -685,144 +563,39 @@ func (cd *ConfigDeployer) deployHyprlandConfig(terminal deps.Terminal, useSystem
 		return result, result.Error
 	}

-	movedLegacy, err := backupLegacyHyprlandConfFiles(configDir, dmsDir, backupDir)
-	if err != nil {
-		result.Error = fmt.Errorf("failed to back up legacy hyprlang configs: %w", err)
-		return result, result.Error
-	}
-	if movedLegacy > 0 {
-		if result.BackupPath == "" {
-			result.BackupPath = backupDir
-		}
-		cd.log(fmt.Sprintf("Moved %d legacy hyprlang config(s) to %s", movedLegacy, backupDir))
-	}
-
 	if err := cd.deployHyprlandDmsConfigs(dmsDir, terminalCommand); err != nil {
 		result.Error = fmt.Errorf("failed to deploy dms configs: %w", err)
 		return result, result.Error
 	}

-	CleanupStrayHyprlandConfFile(func(format string, v ...any) {
-		cd.log(fmt.Sprintf(format, v...))
-	})
-
 	result.Deployed = true
 	cd.log("Successfully deployed Hyprland configuration")
 	return result, nil
 }

-func backupHyprlandConfigFile(src, dst string, data []byte, removeSource bool) error {
-	if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
-		return err
-	}
-	if err := os.WriteFile(dst, data, 0o644); err != nil {
-		return err
-	}
-	if removeSource {
-		if err := os.Remove(src); err != nil && !os.IsNotExist(err) {
-			return err
-		}
-	}
-	return nil
-}
-
-func backupLegacyHyprlandConfFiles(configDir, dmsDir, backupDir string) (int, error) {
-	legacyPaths := []string{filepath.Join(configDir, "hyprland.conf")}
-	dmsConfPaths, err := filepath.Glob(filepath.Join(dmsDir, "*.conf"))
-	if err != nil {
-		return 0, err
-	}
-	legacyPaths = append(legacyPaths, dmsConfPaths...)
-	backupPaths, err := adjacentHyprlandBackupFiles(configDir, dmsDir)
-	if err != nil {
-		return 0, err
-	}
-	legacyPaths = append(legacyPaths, backupPaths...)
-
-	moved := 0
-	for _, src := range legacyPaths {
-		info, err := os.Lstat(src)
-		if os.IsNotExist(err) {
-			continue
-		}
-		if err != nil {
-			return moved, err
-		}
-		if info.IsDir() {
-			continue
-		}
-
-		rel, err := filepath.Rel(configDir, src)
-		if err != nil {
-			rel = filepath.Base(src)
-		}
-		dst := filepath.Join(backupDir, rel)
-		if err := moveHyprlandConfigFile(src, dst); err != nil {
-			return moved, err
-		}
-		moved++
-	}
-
-	return moved, nil
-}
-
-func moveHyprlandConfigFile(src, dst string) error {
-	if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
-		return err
-	}
-	return os.Rename(src, dst)
-}
-
-func adjacentHyprlandBackupFiles(configDir, dmsDir string) ([]string, error) {
-	var paths []string
-	patterns := []string{
-		filepath.Join(configDir, "hyprland.conf.backup.*"),
-		filepath.Join(configDir, "hyprland.lua.backup.*"),
-		filepath.Join(dmsDir, "*.conf.backup.*"),
-		filepath.Join(dmsDir, "*.lua.backup.*"),
-	}
-	for _, pattern := range patterns {
-		matches, err := filepath.Glob(pattern)
-		if err != nil {
-			return nil, err
-		}
-		paths = append(paths, matches...)
-	}
-	return paths, nil
-}
-
 func (cd *ConfigDeployer) deployHyprlandDmsConfigs(dmsDir string, terminalCommand string) error {
 	configs := []struct {
-		name      string
-		content   string
-		overwrite bool
+		name    string
+		content string
 	}{
-		{name: "colors.lua", content: DMSColorsLuaConfig},
-		{name: "layout.lua", content: DMSLayoutLuaConfig},
-		{name: "binds.lua", content: strings.ReplaceAll(DMSBindsLuaConfig, "{{TERMINAL_COMMAND}}", terminalCommand), overwrite: true},
-		{name: "binds-user.lua", content: DMSBindsUserLuaConfig},
-		{name: "outputs.lua", content: DMSOutputsLuaConfig},
-		{name: "cursor.lua", content: DMSCursorLuaConfig},
-		{name: "windowrules.lua", content: DMSWindowRulesLuaConfig},
+		{"colors.conf", HyprColorsConfig},
+		{"layout.conf", HyprLayoutConfig},
+		{"binds.conf", strings.ReplaceAll(HyprBindsConfig, "{{TERMINAL_COMMAND}}", terminalCommand)},
+		{"outputs.conf", ""},
+		{"cursor.conf", ""},
+		{"windowrules.conf", ""},
 	}

 	for _, cfg := range configs {
 		path := filepath.Join(dmsDir, cfg.name)
-		existed := false
+		// Skip if file already exists and is not empty to preserve user modifications
 		if info, err := os.Stat(path); err == nil && info.Size() > 0 {
-			existed = true
-		}
-		if existed && !cfg.overwrite {
 			cd.log(fmt.Sprintf("Skipping %s (already exists)", cfg.name))
 			continue
 		}
 		if err := os.WriteFile(path, []byte(cfg.content), 0o644); err != nil {
 			return fmt.Errorf("failed to write %s: %w", cfg.name, err)
 		}
-		if existed {
-			cd.log(fmt.Sprintf("Updated %s", cfg.name))
-			continue
-		}
 		cd.log(fmt.Sprintf("Deployed %s", cfg.name))
 	}

@@ -830,42 +603,94 @@ func (cd *ConfigDeployer) deployHyprlandDmsConfigs(dmsDir string, terminalComman
 }

 func (cd *ConfigDeployer) mergeHyprlandMonitorSections(newConfig, existingConfig, dmsDir string) (string, error) {
-	_ = newConfig
-	lines := extractHyprlangMonitorLines(existingConfig)
-	if len(lines) == 0 {
+	monitorRegex := regexp.MustCompile(`(?m)^#?\s*monitor\s*=.*$`)
+	existingMonitors := monitorRegex.FindAllString(existingConfig, -1)
+
+	if len(existingMonitors) == 0 {
 		return newConfig, nil
 	}

-	outputsPath := filepath.Join(dmsDir, "outputs.lua")
-	if info, err := os.Stat(outputsPath); err == nil && info.Size() > 0 {
-		cd.log("Skipping monitor migration: dms/outputs.lua already exists")
-		return newConfig, nil
+	outputsPath := filepath.Join(dmsDir, "outputs.conf")
+	if _, err := os.Stat(outputsPath); err != nil {
+		var outputsContent strings.Builder
+		for _, monitor := range existingMonitors {
+			outputsContent.WriteString(monitor)
+			outputsContent.WriteString("\n")
+		}
+		if err := os.WriteFile(outputsPath, []byte(outputsContent.String()), 0o644); err != nil {
+			cd.log(fmt.Sprintf("Warning: Failed to migrate monitors to %s: %v", outputsPath, err))
+		} else {
+			cd.log("Migrated monitor sections to dms/outputs.conf")
+		}
 	}

-	var b strings.Builder
-	b.WriteString("-- Migrated from existing hyprlang monitor lines\n\n")
-	ok := 0
+	exampleMonitorRegex := regexp.MustCompile(`(?m)^# monitor = eDP-2.*$`)
+	mergedConfig := exampleMonitorRegex.ReplaceAllString(newConfig, "")
+
+	monitorHeaderRegex := regexp.MustCompile(`(?m)^# MONITOR CONFIG\n# ==================$`)
+	headerMatch := monitorHeaderRegex.FindStringIndex(mergedConfig)
+
+	if headerMatch == nil {
+		return "", fmt.Errorf("could not find MONITOR CONFIG section")
+	}
+
+	insertPos := headerMatch[1] + 1
+
+	var builder strings.Builder
+	builder.WriteString(mergedConfig[:insertPos])
+	builder.WriteString("# Monitors from existing configuration\n")
+
+	for _, monitor := range existingMonitors {
+		builder.WriteString(monitor)
+		builder.WriteString("\n")
+	}
+
+	builder.WriteString(mergedConfig[insertPos:])
+
+	return builder.String(), nil
+}
+
+func (cd *ConfigDeployer) transformHyprlandConfigForNonSystemd(config, terminalCommand string) string {
+	lines := strings.Split(config, "\n")
+	var result []string
+	startupSectionFound := false
+
 	for _, line := range lines {
-		lua, err := hyprlangMonitorLineToLua(line)
-		if err != nil {
-			cd.log(fmt.Sprintf("Warning: could not migrate monitor line %q: %v", line, err))
+		trimmed := strings.TrimSpace(line)
+		if strings.HasPrefix(trimmed, "exec-once = dbus-update-activation-environment") {
 			continue
 		}
-		b.WriteString(lua)
-		b.WriteByte('\n')
-		ok++
+		if strings.HasPrefix(trimmed, "exec-once = systemctl --user start") {
+			startupSectionFound = true
+			result = append(result, "exec-once = dms run")
+			result = append(result, "env = QT_QPA_PLATFORM,wayland;xcb")
+			result = append(result, "env = ELECTRON_OZONE_PLATFORM_HINT,auto")
+			result = append(result, "env = QT_QPA_PLATFORMTHEME,gtk3")
+			result = append(result, "env = QT_QPA_PLATFORMTHEME_QT6,gtk3")
+			result = append(result, fmt.Sprintf("env = TERMINAL,%s", terminalCommand))
+			continue
+		}
+		result = append(result, line)
 	}
-	if ok == 0 {
-		return newConfig, nil
+
+	if !startupSectionFound {
+		for i, line := range result {
+			if strings.Contains(line, "STARTUP APPS") {
+				insertLines := []string{
+					"exec-once = dms run",
+					"env = QT_QPA_PLATFORM,wayland;xcb",
+					"env = ELECTRON_OZONE_PLATFORM_HINT,auto",
+					"env = QT_QPA_PLATFORMTHEME,gtk3",
+					"env = QT_QPA_PLATFORMTHEME_QT6,gtk3",
+					fmt.Sprintf("env = TERMINAL,%s", terminalCommand),
+				}
+				result = append(result[:i+2], append(insertLines, result[i+2:]...)...)
+				break
+			}
+		}
 	}
-	b.WriteByte('\n')
-	b.WriteString("-- Default fallback\n")
-	b.WriteString("hl.monitor({ output = \"\", mode = \"preferred\", position = \"auto\", scale = \"auto\" })\n")
-	if err := os.WriteFile(outputsPath, []byte(b.String()), 0o644); err != nil {
-		return newConfig, err
-	}
-	cd.log("Migrated monitor sections to dms/outputs.lua")
-	return newConfig, nil
+
+	return strings.Join(result, "\n")
 }

 func (cd *ConfigDeployer) transformNiriConfigForNonSystemd(config, terminalCommand string) string {
@@ -11,55 +11,6 @@ import (
 	"github.com/stretchr/testify/require"
 )

-func TestCleanupStrayHyprlandConfFile(t *testing.T) {
-	if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") == "" {
-		t.Setenv("HYPRLAND_INSTANCE_SIGNATURE", "test-signature")
-	}
-
-	t.Run("leaves conf alone when no hyprland.lua present", func(t *testing.T) {
-		td := t.TempDir()
-		t.Setenv("HOME", td)
-		configDir := filepath.Join(td, ".config", "hypr")
-		dmsDir := filepath.Join(configDir, "dms")
-		require.NoError(t, os.MkdirAll(dmsDir, 0o755))
-		confPath := filepath.Join(configDir, "hyprland.conf")
-		dmsConfPath := filepath.Join(dmsDir, "colors.conf")
-		require.NoError(t, os.WriteFile(confPath, []byte("# legacy user config\n"), 0o644))
-		require.NoError(t, os.WriteFile(dmsConfPath, []byte("$primary = rgba(d0bcffFF)\n"), 0o644))
-
-		CleanupStrayHyprlandConfFile(nil)
-
-		assert.FileExists(t, confPath, "must not touch hyprland.conf when user has not migrated")
-		assert.FileExists(t, dmsConfPath, "must not touch dms/*.conf when user has not migrated")
-		assert.NoDirExists(t, filepath.Join(configDir, hyprlandBackupDirName))
-	})
-
-	t.Run("moves stray conf into backup when hyprland.lua exists", func(t *testing.T) {
-		td := t.TempDir()
-		t.Setenv("HOME", td)
-		configDir := filepath.Join(td, ".config", "hypr")
-		dmsDir := filepath.Join(configDir, "dms")
-		require.NoError(t, os.MkdirAll(dmsDir, 0o755))
-		luaPath := filepath.Join(configDir, "hyprland.lua")
-		require.NoError(t, os.WriteFile(luaPath, []byte("-- dms managed\n"), 0o644))
-		confPath := filepath.Join(configDir, "hyprland.conf")
-		dmsConfPath := filepath.Join(dmsDir, "colors.conf")
-		require.NoError(t, os.WriteFile(confPath, []byte("# autogen\n"), 0o644))
-		require.NoError(t, os.WriteFile(dmsConfPath, []byte("$primary = rgba(d0bcffFF)\n"), 0o644))
-
-		CleanupStrayHyprlandConfFile(nil)
-
-		assert.NoFileExists(t, confPath)
-		assert.NoFileExists(t, dmsConfPath)
-		assert.FileExists(t, luaPath)
-		entries, err := os.ReadDir(filepath.Join(configDir, hyprlandBackupDirName))
-		require.NoError(t, err)
-		require.Len(t, entries, 1)
-		assert.FileExists(t, filepath.Join(configDir, hyprlandBackupDirName, entries[0].Name(), "hyprland.conf"))
-		assert.FileExists(t, filepath.Join(configDir, hyprlandBackupDirName, entries[0].Name(), "dms", "colors.conf"))
-	})
-}
-
 func TestMergeNiriOutputSections(t *testing.T) {
 	cd := &ConfigDeployer{}

@@ -308,56 +259,130 @@ func getGhosttyPath() string {
 func TestMergeHyprlandMonitorSections(t *testing.T) {
 	cd := &ConfigDeployer{}

-	t.Run("no monitors in existing", func(t *testing.T) {
-		tmp := t.TempDir()
-		out, err := cd.mergeHyprlandMonitorSections(`hl.config({})`, `input { kb_layout = us }`, tmp)
-		require.NoError(t, err)
-		assert.Equal(t, `hl.config({})`, out)
-		_, e := os.Stat(filepath.Join(tmp, "outputs.lua"))
-		assert.True(t, os.IsNotExist(e))
-	})
+	tests := []struct {
+		name            string
+		newConfig       string
+		existingConfig  string
+		wantError       bool
+		wantContains    []string
+		wantNotContains []string
+	}{
+		{
+			name: "no existing monitors",
+			newConfig: `# ==================
+# MONITOR CONFIG
+# ==================
+# monitor = eDP-2, 2560x1600@239.998993, 2560x0, 1, vrr, 1

-	t.Run("writes outputs lua from hyprlang monitors", func(t *testing.T) {
-		tmp := t.TempDir()
-		existing := `monitor = DP-1, 1920x1080@144, 0x0, 1
+# ==================
+# ENVIRONMENT VARS
+# ==================
+env = XDG_CURRENT_DESKTOP,niri`,
+			existingConfig: `# Some other config
+input {
+    kb_layout = us
+}`,
+			wantError:    false,
+			wantContains: []string{"MONITOR CONFIG", "ENVIRONMENT VARS"},
+		},
+		{
+			name: "merge single monitor",
+			newConfig: `# ==================
+# MONITOR CONFIG
+# ==================
+# monitor = eDP-2, 2560x1600@239.998993, 2560x0, 1, vrr, 1
+
+# ==================
+# ENVIRONMENT VARS
+# ==================`,
+			existingConfig: `# My config
+monitor = DP-1, 1920x1080@144, 0x0, 1
+input {
+    kb_layout = us
+}`,
+			wantError: false,
+			wantContains: []string{
+				"MONITOR CONFIG",
+				"monitor = DP-1, 1920x1080@144, 0x0, 1",
+				"Monitors from existing configuration",
+			},
+			wantNotContains: []string{
+				"monitor = eDP-2", // Example monitor should be removed
+			},
+		},
+		{
+			name: "merge multiple monitors",
+			newConfig: `# ==================
+# MONITOR CONFIG
+# ==================
+# monitor = eDP-2, 2560x1600@239.998993, 2560x0, 1, vrr, 1
+
+# ==================
+# ENVIRONMENT VARS
+# ==================`,
+			existingConfig: `monitor = DP-1, 1920x1080@144, 0x0, 1
 # monitor = HDMI-A-1, 1920x1080@60, 1920x0, 1
-monitor = eDP-1, 2560x1440@165, auto, 1.25`
-		out, err := cd.mergeHyprlandMonitorSections(`return`, existing, tmp)
-		require.NoError(t, err)
-		assert.Equal(t, `return`, out)
-		b, err := os.ReadFile(filepath.Join(tmp, "outputs.lua"))
-		require.NoError(t, err)
-		s := string(b)
-		assert.Contains(t, s, "hl.monitor")
-		assert.Contains(t, s, "DP-1")
-		assert.Contains(t, s, "HDMI-A-1")
-		assert.Contains(t, s, "eDP-1")
-		assert.Contains(t, s, "preferred") // fallback rule at end
-	})
+monitor = eDP-1, 2560x1440@165, auto, 1.25`,
+			wantError: false,
+			wantContains: []string{
+				"monitor = DP-1",
+				"# monitor = HDMI-A-1", // Commented monitor preserved
+				"monitor = eDP-1",
+				"Monitors from existing configuration",
+			},
+			wantNotContains: []string{
+				"monitor = eDP-2", // Example monitor should be removed
+			},
+		},
+		{
+			name: "preserve commented monitors",
+			newConfig: `# ==================
+# MONITOR CONFIG
+# ==================
+# monitor = eDP-2, 2560x1600@239.998993, 2560x0, 1, vrr, 1

-	t.Run("skips when outputs lua already exists", func(t *testing.T) {
-		tmp := t.TempDir()
-		path := filepath.Join(tmp, "outputs.lua")
-		require.NoError(t, os.WriteFile(path, []byte("-- keep\n"), 0o644))
-		_, err := cd.mergeHyprlandMonitorSections(`x`, `monitor = DP-1, 1920x1080@144, 0x0, 1`, tmp)
-		require.NoError(t, err)
-		b, err := os.ReadFile(path)
-		require.NoError(t, err)
-		assert.Equal(t, "-- keep\n", string(b))
-	})
-}
+# ==================`,
+			existingConfig: `# monitor = DP-1, 1920x1080@144, 0x0, 1
+# monitor = HDMI-A-1, 1920x1080@60, 1920x0, 1`,
+			wantError: false,
+			wantContains: []string{
+				"# monitor = DP-1",
+				"# monitor = HDMI-A-1",
+				"Monitors from existing configuration",
+			},
+		},
+		{
+			name: "no monitor config section",
+			newConfig: `# Some config without monitor section
+input {
+    kb_layout = us
+}`,
+			existingConfig: `monitor = DP-1, 1920x1080@144, 0x0, 1`,
+			wantError:      true,
+		},
+	}

-func TestHyprlangMonitorLineToLuaPreservesOptions(t *testing.T) {
-	got, err := hyprlangMonitorLineToLua(`monitor = DP-1, 1920x1080@144, 0x0, 1, transform, 1, vrr, 2, bitdepth, 10, cm, hdr, sdrbrightness, 1.2, sdrsaturation, 0.98`)
-	require.NoError(t, err)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tmpDir := t.TempDir()
+			result, err := cd.mergeHyprlandMonitorSections(tt.newConfig, tt.existingConfig, tmpDir)

-	assert.Contains(t, got, `output = "DP-1"`)
-	assert.Contains(t, got, `transform = 1`)
-	assert.Contains(t, got, `vrr = 2`)
-	assert.Contains(t, got, `bitdepth = 10`)
-	assert.Contains(t, got, `cm = "hdr"`)
-	assert.Contains(t, got, `sdrbrightness = 1.2`)
-	assert.Contains(t, got, `sdrsaturation = 0.98`)
+			if tt.wantError {
+				assert.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+
+			for _, want := range tt.wantContains {
+				assert.Contains(t, result, want, "merged config should contain: %s", want)
+			}
+
+			for _, notWant := range tt.wantNotContains {
+				assert.NotContains(t, result, notWant, "merged config should NOT contain: %s", notWant)
+			}
+		})
+	}
 }

 func TestHyprlandConfigDeployment(t *testing.T) {
@@ -373,10 +398,6 @@ func TestHyprlandConfigDeployment(t *testing.T) {
 	cd := NewConfigDeployer(logChan)

 	t.Run("deploy hyprland config to empty directory", func(t *testing.T) {
-		td, err := os.MkdirTemp("", "dankinstall-hyprland-empty")
-		require.NoError(t, err)
-		defer os.RemoveAll(td)
-		os.Setenv("HOME", td)
 		result, err := cd.deployHyprlandConfig(deps.TerminalGhostty, true)
 		require.NoError(t, err)

@@ -387,16 +408,12 @@ func TestHyprlandConfigDeployment(t *testing.T) {

 		content, err := os.ReadFile(result.Path)
 		require.NoError(t, err)
-		assert.Contains(t, string(content), `require("dms.binds")`)
-		assert.Contains(t, string(content), "DMS_STARTUP_BEGIN")
-		assert.Contains(t, string(content), "hl.config(")
+		assert.Contains(t, string(content), "# MONITOR CONFIG")
+		assert.Contains(t, string(content), "source = ./dms/binds.conf")
+		assert.Contains(t, string(content), "exec-once = ")
 	})

 	t.Run("deploy hyprland config with existing monitors", func(t *testing.T) {
-		td, err := os.MkdirTemp("", "dankinstall-hyprland-merge")
-		require.NoError(t, err)
-		defer os.RemoveAll(td)
-		os.Setenv("HOME", td)
 		existingContent := `# My existing Hyprland config
 monitor = DP-1, 1920x1080@144, 0x0, 1
 monitor = HDMI-A-1, 3840x2160@60, 1920x0, 1.5
@@ -405,18 +422,11 @@ general {
    gaps_in = 10
 }
 `
-		hyprPath := filepath.Join(td, ".config", "hypr", "hyprland.conf")
-		err = os.MkdirAll(filepath.Dir(hyprPath), 0o755)
+		hyprPath := filepath.Join(tempDir, ".config", "hypr", "hyprland.conf")
+		err := os.MkdirAll(filepath.Dir(hyprPath), 0o755)
 		require.NoError(t, err)
 		err = os.WriteFile(hyprPath, []byte(existingContent), 0o644)
 		require.NoError(t, err)
-		dmsDir := filepath.Join(td, ".config", "hypr", "dms")
-		require.NoError(t, os.MkdirAll(dmsDir, 0o755))
-		require.NoError(t, os.WriteFile(filepath.Join(dmsDir, "binds.conf"), []byte("bind = SUPER, T, exec, foot\n"), 0o644))
-		require.NoError(t, os.WriteFile(filepath.Join(dmsDir, "colors.conf"), []byte("$primary = rgba(d0bcffFF)\n"), 0o644))
-		require.NoError(t, os.WriteFile(filepath.Join(dmsDir, "cursor.conf"), []byte("env = XCURSOR_SIZE,24\n"), 0o644))
-		require.NoError(t, os.WriteFile(filepath.Join(filepath.Dir(hyprPath), "hyprland.conf.backup.old"), []byte("old backup\n"), 0o644))
-		require.NoError(t, os.WriteFile(filepath.Join(dmsDir, "binds.conf.backup.old"), []byte("old dms backup\n"), 0o644))

 		result, err := cd.deployHyprlandConfig(deps.TerminalKitty, true)
 		require.NoError(t, err)
@@ -430,78 +440,13 @@ general {
 		backupContent, err := os.ReadFile(result.BackupPath)
 		require.NoError(t, err)
 		assert.Equal(t, existingContent, string(backupContent))
-		assert.Contains(t, result.BackupPath, hyprlandBackupDirName)
-		assert.NoFileExists(t, hyprPath)
-		assert.FileExists(t, filepath.Join(filepath.Dir(result.BackupPath), "dms", "binds.conf"))
-		assert.FileExists(t, filepath.Join(filepath.Dir(result.BackupPath), "dms", "colors.conf"))
-		assert.FileExists(t, filepath.Join(filepath.Dir(result.BackupPath), "dms", "cursor.conf"))
-		assert.FileExists(t, filepath.Join(filepath.Dir(result.BackupPath), "hyprland.conf.backup.old"))
-		assert.FileExists(t, filepath.Join(filepath.Dir(result.BackupPath), "dms", "binds.conf.backup.old"))
-		assert.NoFileExists(t, filepath.Join(dmsDir, "binds.conf"))
-		assert.NoFileExists(t, filepath.Join(dmsDir, "colors.conf"))
-		assert.NoFileExists(t, filepath.Join(dmsDir, "cursor.conf"))
-		assert.NoFileExists(t, filepath.Join(filepath.Dir(hyprPath), "hyprland.conf.backup.old"))
-		assert.NoFileExists(t, filepath.Join(dmsDir, "binds.conf.backup.old"))

 		newContent, err := os.ReadFile(result.Path)
 		require.NoError(t, err)
-		assert.Contains(t, string(newContent), `require("dms.binds")`)
-
-		outputsPath := filepath.Join(td, ".config", "hypr", "dms", "outputs.lua")
-		outBytes, err := os.ReadFile(outputsPath)
-		require.NoError(t, err)
-		outs := string(outBytes)
-		assert.Contains(t, outs, `hl.monitor`)
-		assert.Contains(t, outs, "DP-1")
-		assert.Contains(t, outs, "HDMI-A-1")
-	})
-
-	t.Run("deploy hyprland config removes root legacy symlink when lua exists", func(t *testing.T) {
-		td, err := os.MkdirTemp("", "dankinstall-hyprland-lua-conf-symlink")
-		require.NoError(t, err)
-		defer os.RemoveAll(td)
-		os.Setenv("HOME", td)
-
-		configDir := filepath.Join(td, ".config", "hypr")
-		require.NoError(t, os.MkdirAll(configDir, 0o755))
-		luaPath := filepath.Join(configDir, "hyprland.lua")
-		confPath := filepath.Join(configDir, "hyprland.conf")
-		require.NoError(t, os.WriteFile(luaPath, []byte(`require("dms.binds")`+"\n"), 0o644))
-		require.NoError(t, os.Symlink(filepath.Join(configDir, "missing-legacy.conf"), confPath))
-
-		result, err := cd.deployHyprlandConfig(deps.TerminalKitty, true)
-		require.NoError(t, err)
-
-		assert.Equal(t, luaPath, result.Path)
-		_, err = os.Lstat(confPath)
-		assert.True(t, os.IsNotExist(err), "root hyprland.conf symlink should be moved out of the live config directory")
-		_, err = os.Lstat(filepath.Join(filepath.Dir(result.BackupPath), "hyprland.conf"))
-		assert.NoError(t, err)
-	})
-
-	t.Run("deploy hyprland config refreshes managed binds but preserves user binds", func(t *testing.T) {
-		td, err := os.MkdirTemp("", "dankinstall-hyprland-refresh-binds")
-		require.NoError(t, err)
-		defer os.RemoveAll(td)
-		os.Setenv("HOME", td)
-
-		dmsDir := filepath.Join(td, ".config", "hypr", "dms")
-		require.NoError(t, os.MkdirAll(dmsDir, 0o755))
-		require.NoError(t, os.WriteFile(filepath.Join(dmsDir, "binds.lua"), []byte("-- stale managed binds\n"), 0o644))
-		userBinds := "-- custom user binds\n"
-		require.NoError(t, os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(userBinds), 0o644))
-
-		_, err = cd.deployHyprlandConfig(deps.TerminalKitty, true)
-		require.NoError(t, err)
-
-		managed, err := os.ReadFile(filepath.Join(dmsDir, "binds.lua"))
-		require.NoError(t, err)
-		assert.Contains(t, string(managed), `hl.bind("SUPER + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" }))`)
-		assert.Contains(t, string(managed), `hl.bind("SUPER + minus", hl.dsp.window.resize({ x = -100, y = 0, relative = true }), { repeating = true })`)
-
-		user, err := os.ReadFile(filepath.Join(dmsDir, "binds-user.lua"))
-		require.NoError(t, err)
-		assert.Equal(t, userBinds, string(user))
+		assert.Contains(t, string(newContent), "monitor = DP-1, 1920x1080@144")
+		assert.Contains(t, string(newContent), "monitor = HDMI-A-1, 3840x2160@60")
+		assert.Contains(t, string(newContent), "source = ./dms/binds.conf")
+		assert.NotContains(t, string(newContent), "monitor = eDP-2")
 	})
 }

@@ -514,22 +459,10 @@ func TestNiriConfigStructure(t *testing.T) {
 }

 func TestHyprlandConfigStructure(t *testing.T) {
-	assert.Contains(t, HyprlandLuaConfig, `require("dms.binds")`)
-	assert.Contains(t, HyprlandLuaConfig, "DMS_STARTUP_BEGIN")
-	assert.Contains(t, HyprlandLuaConfig, "hl.config(")
-	assert.Contains(t, HyprlandLuaConfig, "input =")
-}
-
-func TestMangoConfigStructure(t *testing.T) {
-	assert.Contains(t, MangoConfig, "exec-once=dms run")
-	assert.NotContains(t, MangoConfig, "exec_once=dms run")
-	assert.Contains(t, MangoConfig, "source=./dms/binds.conf")
-	assert.Contains(t, MangoBindsConfig, "bind=SUPER,H,focusdir,left")
-	assert.Contains(t, MangoBindsConfig, "bind=SUPER,J,focusdir,down")
-	assert.Contains(t, MangoBindsConfig, "bind=SUPER,K,focusdir,up")
-	assert.Contains(t, MangoBindsConfig, "bind=SUPER,L,focusdir,right")
-	assert.Contains(t, MangoBindsConfig, "gesturebind=none,right,3,viewtoleft_have_client")
-	assert.Contains(t, MangoBindsConfig, "gesturebind=none,left,3,viewtoright_have_client")
+	assert.Contains(t, HyprlandConfig, "# MONITOR CONFIG")
+	assert.Contains(t, HyprlandConfig, "# STARTUP APPS")
+	assert.Contains(t, HyprlandConfig, "# INPUT CONFIG")
+	assert.Contains(t, HyprlandConfig, "source = ./dms/binds.conf")
 }

 func TestGhosttyConfigStructure(t *testing.T) {
@@ -856,37 +789,4 @@ func TestShouldReplaceConfigDeployIfMissing(t *testing.T) {
 		}
 		assert.True(t, foundGhostty, "expected Ghostty config to be deployed when replaceConfigs is true")
 	})
-
-	t.Run("hyprland legacy config exists skips when replace false", func(t *testing.T) {
-		tempDir, err := os.MkdirTemp("", "dankinstall-hyprland-legacy-skip-test")
-		require.NoError(t, err)
-		defer os.RemoveAll(tempDir)
-
-		originalHome := os.Getenv("HOME")
-		os.Setenv("HOME", tempDir)
-		defer os.Setenv("HOME", originalHome)
-
-		hyprConf := filepath.Join(tempDir, ".config", "hypr", "hyprland.conf")
-		require.NoError(t, os.MkdirAll(filepath.Dir(hyprConf), 0o755))
-		require.NoError(t, os.WriteFile(hyprConf, []byte("monitor = , preferred, auto, 1\n"), 0o644))
-
-		logChan := make(chan string, 100)
-		cd := NewConfigDeployer(logChan)
-		results, err := cd.deployConfigurationsInternal(
-			context.Background(),
-			deps.WindowManagerHyprland,
-			deps.TerminalGhostty,
-			nil,
-			allFalse,
-			nil,
-			true,
-		)
-		require.NoError(t, err)
-
-		for _, r := range results {
-			if r.ConfigType == "Hyprland" && r.Deployed {
-				t.Fatalf("expected Hyprland deployment to be skipped when legacy config exists and replace=false")
-			}
-		}
-	})
 }
@@ -1 +0,0 @@
-- Optional per-user keybind overrides (managed by DMS). Loaded after default binds.
@@ -0,0 +1,162 @@
+# === Application Launchers ===
+bind = SUPER, T, exec, {{TERMINAL_COMMAND}}
+bind = SUPER, space, exec, dms ipc call spotlight toggle
+bind = SUPER, V, exec, dms ipc call clipboard toggle
+bind = SUPER, M, exec, dms ipc call processlist focusOrToggle
+bind = SUPER, comma, exec, dms ipc call settings focusOrToggle
+bind = SUPER, N, exec, dms ipc call notifications toggle
+bind = SUPER SHIFT, N, exec, dms ipc call notepad toggle
+bind = SUPER, Y, exec, dms ipc call dankdash wallpaper
+bind = SUPER, TAB, exec, dms ipc call hypr toggleOverview
+bind = SUPER, X, exec, dms ipc call powermenu toggle
+
+# === Cheat sheet
+bind = SUPER SHIFT, Slash, exec, dms ipc call keybinds toggle hyprland
+
+# === Security ===
+bind = SUPER ALT, L, exec, dms ipc call lock lock
+bind = SUPER SHIFT, E, exit
+bind = CTRL ALT, Delete, exec, dms ipc call processlist focusOrToggle
+
+# === Audio Controls ===
+bindel = , XF86AudioRaiseVolume, exec, dms ipc call audio increment 3
+bindel = , XF86AudioLowerVolume, exec, dms ipc call audio decrement 3
+bindl = , XF86AudioMute, exec, dms ipc call audio mute
+bindl = , XF86AudioMicMute, exec, dms ipc call audio micmute
+bindl = , XF86AudioPause, exec, dms ipc call mpris playPause
+bindl = , XF86AudioPlay, exec, dms ipc call mpris playPause
+bindl = , XF86AudioPrev, exec, dms ipc call mpris previous
+bindl = , XF86AudioNext, exec, dms ipc call mpris next
+bindel = CTRL, XF86AudioRaiseVolume, exec, dms ipc call mpris increment 3
+bindel = CTRL, XF86AudioLowerVolume, exec, dms ipc call mpris decrement 3
+
+# === Brightness Controls ===
+bindel = , XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 ""
+bindel = , XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 ""
+
+# === Window Management ===
+bind = SUPER, Q, killactive
+bind = SUPER, F, fullscreen, 1
+bind = SUPER SHIFT, F, fullscreen, 0
+bind = SUPER SHIFT, T, togglefloating
+bind = SUPER, W, togglegroup
+bind = SUPER SHIFT, W, exec, dms ipc call window-rules toggle
+
+# === Focus Navigation ===
+bind = SUPER, left, movefocus, l
+bind = SUPER, down, movefocus, d
+bind = SUPER, up, movefocus, u
+bind = SUPER, right, movefocus, r
+bind = SUPER, H, movefocus, l
+bind = SUPER, J, movefocus, d
+bind = SUPER, K, movefocus, u
+bind = SUPER, L, movefocus, r
+
+# === Window Movement ===
+bind = SUPER SHIFT, left, movewindow, l
+bind = SUPER SHIFT, down, movewindow, d
+bind = SUPER SHIFT, up, movewindow, u
+bind = SUPER SHIFT, right, movewindow, r
+bind = SUPER SHIFT, H, movewindow, l
+bind = SUPER SHIFT, J, movewindow, d
+bind = SUPER SHIFT, K, movewindow, u
+bind = SUPER SHIFT, L, movewindow, r
+
+# === Column Navigation ===
+bind = SUPER, Home, focuswindow, first
+bind = SUPER, End, focuswindow, last
+
+# === Monitor Navigation ===
+bind = SUPER CTRL, left, focusmonitor, l
+bind = SUPER CTRL, right, focusmonitor, r
+bind = SUPER CTRL, H, focusmonitor, l
+bind = SUPER CTRL, J, focusmonitor, d
+bind = SUPER CTRL, K, focusmonitor, u
+bind = SUPER CTRL, L, focusmonitor, r
+
+# === Move to Monitor ===
+bind = SUPER SHIFT CTRL, left, movewindow, mon:l
+bind = SUPER SHIFT CTRL, down, movewindow, mon:d
+bind = SUPER SHIFT CTRL, up, movewindow, mon:u
+bind = SUPER SHIFT CTRL, right, movewindow, mon:r
+bind = SUPER SHIFT CTRL, H, movewindow, mon:l
+bind = SUPER SHIFT CTRL, J, movewindow, mon:d
+bind = SUPER SHIFT CTRL, K, movewindow, mon:u
+bind = SUPER SHIFT CTRL, L, movewindow, mon:r
+
+# === Workspace Navigation ===
+bind = SUPER, Page_Down, workspace, e+1
+bind = SUPER, Page_Up, workspace, e-1
+bind = SUPER, U, workspace, e+1
+bind = SUPER, I, workspace, e-1
+bind = SUPER CTRL, down, movetoworkspace, e+1
+bind = SUPER CTRL, up, movetoworkspace, e-1
+bind = SUPER CTRL, U, movetoworkspace, e+1
+bind = SUPER CTRL, I, movetoworkspace, e-1
+
+# === Workspace Management ===
+bind = CTRL SHIFT, R, exec, dms ipc call workspace-rename open
+
+# === Move Workspaces ===
+bind = SUPER SHIFT, Page_Down, movetoworkspace, e+1
+bind = SUPER SHIFT, Page_Up, movetoworkspace, e-1
+bind = SUPER SHIFT, U, movetoworkspace, e+1
+bind = SUPER SHIFT, I, movetoworkspace, e-1
+
+# === Mouse Wheel Navigation ===
+bind = SUPER, mouse_down, workspace, e+1
+bind = SUPER, mouse_up, workspace, e-1
+bind = SUPER CTRL, mouse_down, movetoworkspace, e+1
+bind = SUPER CTRL, mouse_up, movetoworkspace, e-1
+
+# === Numbered Workspaces ===
+bind = SUPER, 1, workspace, 1
+bind = SUPER, 2, workspace, 2
+bind = SUPER, 3, workspace, 3
+bind = SUPER, 4, workspace, 4
+bind = SUPER, 5, workspace, 5
+bind = SUPER, 6, workspace, 6
+bind = SUPER, 7, workspace, 7
+bind = SUPER, 8, workspace, 8
+bind = SUPER, 9, workspace, 9
+
+# === Move to Numbered Workspaces ===
+bind = SUPER SHIFT, 1, movetoworkspace, 1
+bind = SUPER SHIFT, 2, movetoworkspace, 2
+bind = SUPER SHIFT, 3, movetoworkspace, 3
+bind = SUPER SHIFT, 4, movetoworkspace, 4
+bind = SUPER SHIFT, 5, movetoworkspace, 5
+bind = SUPER SHIFT, 6, movetoworkspace, 6
+bind = SUPER SHIFT, 7, movetoworkspace, 7
+bind = SUPER SHIFT, 8, movetoworkspace, 8
+bind = SUPER SHIFT, 9, movetoworkspace, 9
+
+# === Column Management ===
+bind = SUPER, bracketleft, layoutmsg, preselect l
+bind = SUPER, bracketright, layoutmsg, preselect r
+
+# === Sizing & Layout ===
+bind = SUPER, R, layoutmsg, togglesplit
+bind = SUPER CTRL, F, resizeactive, exact 100% 100%
+
+# === Move/resize windows with mainMod + LMB/RMB and dragging ===
+bindmd = SUPER, mouse:272, Move window, movewindow
+bindmd = SUPER, mouse:273, Resize window, resizewindow
+
+# === Move/resize windows with mainMod + LMB/RMB and dragging ===
+bindd = SUPER, code:20, Expand window left, resizeactive, -100 0
+bindd = SUPER, code:21, Shrink window left, resizeactive, 100 0
+
+# === Manual Sizing ===
+binde = SUPER, minus, resizeactive, -10% 0
+binde = SUPER, equal, resizeactive, 10% 0
+binde = SUPER SHIFT, minus, resizeactive, 0 -10%
+binde = SUPER SHIFT, equal, resizeactive, 0 10%
+
+# === Screenshots ===
+bind = , Print, exec, dms screenshot
+bind = CTRL, Print, exec, dms screenshot full
+bind = ALT, Print, exec, dms screenshot window
+
+# === System Controls ===
+bind = SUPER SHIFT, P, dpms, toggle
@@ -1,171 +0,0 @@
-- DMS default keybinds (Hyprland 0.55+ Lua)
-
-- === Application Launchers ===
-hl.bind("SUPER + T", hl.dsp.exec_cmd("{{TERMINAL_COMMAND}}"))
-hl.bind("SUPER + space", hl.dsp.exec_cmd("dms ipc call spotlight toggle"))
-hl.bind("ALT + space", hl.dsp.exec_cmd("dms ipc call spotlight-bar toggle"))
-hl.bind("SUPER + V", hl.dsp.exec_cmd("dms ipc call clipboard toggle"))
-hl.bind("SUPER + M", hl.dsp.exec_cmd("dms ipc call processlist focusOrToggle"))
-hl.bind("SUPER + comma", hl.dsp.exec_cmd("dms ipc call settings focusOrToggle"))
-hl.bind("SUPER + N", hl.dsp.exec_cmd("dms ipc call notifications toggle"))
-hl.bind("SUPER + SHIFT + N", hl.dsp.exec_cmd("dms ipc call notepad toggle"))
-hl.bind("SUPER + Y", hl.dsp.exec_cmd("dms ipc call dankdash wallpaper"))
-hl.bind("SUPER + TAB", hl.dsp.exec_cmd("dms ipc call hypr toggleOverview"))
-hl.bind("SUPER + O", hl.dsp.exec_cmd("dms ipc call hypr toggleOverview"))
-hl.bind("SUPER + X", hl.dsp.exec_cmd("dms ipc call powermenu toggle"))
-
-- === Cheat sheet
-hl.bind("SUPER + SHIFT + Slash", hl.dsp.exec_cmd("dms ipc call keybinds toggle hyprland"))
-
-- === Security ===
-hl.bind("SUPER + ALT + L", hl.dsp.exec_cmd("dms ipc call lock lock"))
-hl.bind("SUPER + SHIFT + E", hl.dsp.exit())
-hl.bind("CTRL + ALT + Delete", hl.dsp.exec_cmd("dms ipc call processlist focusOrToggle"))
-
-- === Audio Controls ===
-hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("dms ipc call audio increment 3"), { locked = true, repeating = true })
-hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("dms ipc call audio decrement 3"), { locked = true, repeating = true })
-hl.bind("XF86AudioMute", hl.dsp.exec_cmd("dms ipc call audio mute"), { locked = true })
-hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("dms ipc call audio micmute"), { locked = true })
-hl.bind("XF86AudioPause", hl.dsp.exec_cmd("dms ipc call mpris playPause"), { locked = true })
-hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("dms ipc call mpris playPause"), { locked = true })
-hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("dms ipc call mpris previous"), { locked = true })
-hl.bind("XF86AudioNext", hl.dsp.exec_cmd("dms ipc call mpris next"), { locked = true })
-hl.bind("CTRL + XF86AudioRaiseVolume", hl.dsp.exec_cmd("dms ipc call mpris increment 3"), { locked = true, repeating = true })
-hl.bind("CTRL + XF86AudioLowerVolume", hl.dsp.exec_cmd("dms ipc call mpris decrement 3"), { locked = true, repeating = true })
-
-- === Brightness Controls ===
-hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd([[dms ipc call brightness increment 5 ""]]), { locked = true, repeating = true })
-hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd([[dms ipc call brightness decrement 5 ""]]), { locked = true, repeating = true })
-
-- === Window Management ===
-hl.bind("SUPER + Q", hl.dsp.window.close())
-hl.bind("SUPER + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" }))
-hl.bind("SUPER + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" }))
-hl.bind("SUPER + SHIFT + T", hl.dsp.window.float({ action = "toggle" }))
-hl.bind("SUPER + W", hl.dsp.group.toggle())
-hl.bind("SUPER + SHIFT + W", hl.dsp.exec_cmd("dms ipc call window-rules toggle"))
-
-- === Focus Navigation ===
-hl.bind("SUPER + left", hl.dsp.focus({ direction = "l" }))
-hl.bind("SUPER + down", hl.dsp.focus({ direction = "d" }))
-hl.bind("SUPER + up", hl.dsp.focus({ direction = "u" }))
-hl.bind("SUPER + right", hl.dsp.focus({ direction = "r" }))
-hl.bind("SUPER + H", hl.dsp.focus({ direction = "l" }))
-hl.bind("SUPER + J", hl.dsp.focus({ direction = "d" }))
-hl.bind("SUPER + K", hl.dsp.focus({ direction = "u" }))
-hl.bind("SUPER + L", hl.dsp.focus({ direction = "r" }))
-
-- === Window Movement ===
-hl.bind("SUPER + SHIFT + left", hl.dsp.window.move({ direction = "l" }))
-hl.bind("SUPER + SHIFT + down", hl.dsp.window.move({ direction = "d" }))
-hl.bind("SUPER + SHIFT + up", hl.dsp.window.move({ direction = "u" }))
-hl.bind("SUPER + SHIFT + right", hl.dsp.window.move({ direction = "r" }))
-hl.bind("SUPER + SHIFT + H", hl.dsp.window.move({ direction = "l" }))
-hl.bind("SUPER + SHIFT + J", hl.dsp.window.move({ direction = "d" }))
-hl.bind("SUPER + SHIFT + K", hl.dsp.window.move({ direction = "u" }))
-hl.bind("SUPER + SHIFT + L", hl.dsp.window.move({ direction = "r" }))
-
-- === Column Navigation ===
-hl.bind("SUPER + Home", hl.dsp.focus({ window = "first" }))
-hl.bind("SUPER + End", hl.dsp.focus({ window = "last" }))
-
-- === Monitor Navigation ===
-hl.bind("SUPER + CTRL + left", hl.dsp.focus({ monitor = "l" }))
-hl.bind("SUPER + CTRL + right", hl.dsp.focus({ monitor = "r" }))
-hl.bind("SUPER + CTRL + H", hl.dsp.focus({ monitor = "l" }))
-hl.bind("SUPER + CTRL + J", hl.dsp.focus({ monitor = "d" }))
-hl.bind("SUPER + CTRL + K", hl.dsp.focus({ monitor = "u" }))
-hl.bind("SUPER + CTRL + L", hl.dsp.focus({ monitor = "r" }))
-
-- === Move to Monitor ===
-hl.bind("SUPER + SHIFT + CTRL + left", hl.dsp.window.move({ monitor = "l" }))
-hl.bind("SUPER + SHIFT + CTRL + down", hl.dsp.window.move({ monitor = "d" }))
-hl.bind("SUPER + SHIFT + CTRL + up", hl.dsp.window.move({ monitor = "u" }))
-hl.bind("SUPER + SHIFT + CTRL + right", hl.dsp.window.move({ monitor = "r" }))
-hl.bind("SUPER + SHIFT + CTRL + H", hl.dsp.window.move({ monitor = "l" }))
-hl.bind("SUPER + SHIFT + CTRL + J", hl.dsp.window.move({ monitor = "d" }))
-hl.bind("SUPER + SHIFT + CTRL + K", hl.dsp.window.move({ monitor = "u" }))
-hl.bind("SUPER + SHIFT + CTRL + L", hl.dsp.window.move({ monitor = "r" }))
-
-- === Workspace Navigation ===
-hl.bind("SUPER + Page_Down", hl.dsp.focus({ workspace = "e+1" }))
-hl.bind("SUPER + Page_Up", hl.dsp.focus({ workspace = "e-1" }))
-hl.bind("SUPER + U", hl.dsp.focus({ workspace = "e+1" }))
-hl.bind("SUPER + I", hl.dsp.focus({ workspace = "e-1" }))
-hl.bind("SUPER + CTRL + down", hl.dsp.window.move({ workspace = "e+1" }))
-hl.bind("SUPER + CTRL + up", hl.dsp.window.move({ workspace = "e-1" }))
-hl.bind("SUPER + CTRL + U", hl.dsp.window.move({ workspace = "e+1" }))
-hl.bind("SUPER + CTRL + I", hl.dsp.window.move({ workspace = "e-1" }))
-
-- === Workspace Management ===
-hl.bind("CTRL + SHIFT + R", hl.dsp.exec_cmd("dms ipc call workspace-rename open"))
-
-- === Move Workspaces ===
-hl.bind("SUPER + SHIFT + Page_Down", hl.dsp.window.move({ workspace = "e+1" }))
-hl.bind("SUPER + SHIFT + Page_Up", hl.dsp.window.move({ workspace = "e-1" }))
-hl.bind("SUPER + SHIFT + U", hl.dsp.window.move({ workspace = "e+1" }))
-hl.bind("SUPER + SHIFT + I", hl.dsp.window.move({ workspace = "e-1" }))
-
-- === Mouse Wheel Navigation ===
-hl.bind("SUPER + mouse_down", hl.dsp.focus({ workspace = "e+1" }))
-hl.bind("SUPER + mouse_up", hl.dsp.focus({ workspace = "e-1" }))
-hl.bind("SUPER + CTRL + mouse_down", hl.dsp.window.move({ workspace = "e+1" }))
-hl.bind("SUPER + CTRL + mouse_up", hl.dsp.window.move({ workspace = "e-1" }))
-
-- === Touchpad Gestures ===
-hl.gesture({ fingers = 3, direction = "horizontal", action = "workspace" })
-
-- === Numbered Workspaces ===
-hl.bind("SUPER + 1", hl.dsp.focus({ workspace = "1" }))
-hl.bind("SUPER + 2", hl.dsp.focus({ workspace = "2" }))
-hl.bind("SUPER + 3", hl.dsp.focus({ workspace = "3" }))
-hl.bind("SUPER + 4", hl.dsp.focus({ workspace = "4" }))
-hl.bind("SUPER + 5", hl.dsp.focus({ workspace = "5" }))
-hl.bind("SUPER + 6", hl.dsp.focus({ workspace = "6" }))
-hl.bind("SUPER + 7", hl.dsp.focus({ workspace = "7" }))
-hl.bind("SUPER + 8", hl.dsp.focus({ workspace = "8" }))
-hl.bind("SUPER + 9", hl.dsp.focus({ workspace = "9" }))
-
-- === Move to Numbered Workspaces ===
-hl.bind("SUPER + SHIFT + 1", hl.dsp.window.move({ workspace = "1" }))
-hl.bind("SUPER + SHIFT + 2", hl.dsp.window.move({ workspace = "2" }))
-hl.bind("SUPER + SHIFT + 3", hl.dsp.window.move({ workspace = "3" }))
-hl.bind("SUPER + SHIFT + 4", hl.dsp.window.move({ workspace = "4" }))
-hl.bind("SUPER + SHIFT + 5", hl.dsp.window.move({ workspace = "5" }))
-hl.bind("SUPER + SHIFT + 6", hl.dsp.window.move({ workspace = "6" }))
-hl.bind("SUPER + SHIFT + 7", hl.dsp.window.move({ workspace = "7" }))
-hl.bind("SUPER + SHIFT + 8", hl.dsp.window.move({ workspace = "8" }))
-hl.bind("SUPER + SHIFT + 9", hl.dsp.window.move({ workspace = "9" }))
-
-- === Column Management ===
-hl.bind("SUPER + bracketleft", hl.dsp.layout("preselect l"))
-hl.bind("SUPER + bracketright", hl.dsp.layout("preselect r"))
-
-- === Sizing & Layout ===
-hl.bind("SUPER + R", hl.dsp.layout("togglesplit"))
-hl.bind("SUPER + CTRL + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "set" }))
-
-- === Move/resize windows with mainMod + LMB/RMB and dragging ===
-hl.bind("SUPER + mouse:272", hl.dsp.window.drag(), { mouse = true, description = "Move window" })
-hl.bind("SUPER + mouse:273", hl.dsp.window.resize(), { mouse = true, description = "Resize window" })
-
-hl.bind("SUPER + code:20", hl.dsp.window.resize({ x = -100, y = 0, relative = true }), { description = "Expand window left" })
-hl.bind("SUPER + code:21", hl.dsp.window.resize({ x = 100, y = 0, relative = true }), { description = "Shrink window left" })
-
-- === Manual Sizing ===
-hl.bind("SUPER + minus", hl.dsp.window.resize({ x = -100, y = 0, relative = true }), { repeating = true })
-hl.bind("SUPER + equal", hl.dsp.window.resize({ x = 100, y = 0, relative = true }), { repeating = true })
-hl.bind("SUPER + SHIFT + minus", hl.dsp.window.resize({ x = 0, y = -100, relative = true }), { repeating = true })
-hl.bind("SUPER + SHIFT + equal", hl.dsp.window.resize({ x = 0, y = 100, relative = true }), { repeating = true })
-
-- === Screenshots ===
-hl.bind("Print", hl.dsp.exec_cmd("dms screenshot"))
-hl.bind("CTRL + Print", hl.dsp.exec_cmd("dms screenshot full"))
-hl.bind("ALT + Print", hl.dsp.exec_cmd("dms screenshot window"))
-
-- === Display Profiles ===
-hl.bind("SUPER + P", hl.dsp.exec_cmd("dms ipc outputs cycleProfile"))
-
-- === System Controls ===
-hl.bind("SUPER + SHIFT + P", hl.dsp.dpms({ action = "toggle" }))
@@ -0,0 +1,25 @@
+# ! Auto-generated file. Do not edit directly.
+# Remove source = ./dms/colors.conf from your config to override.
+
+$primary  = rgb(d0bcff)
+$outline  = rgb(948f99)
+$error    = rgb(f2b8b5)
+
+general {
+  col.active_border   = $primary
+  col.inactive_border = $outline
+}
+
+group {
+  col.border_active   = $primary
+  col.border_inactive = $outline
+  col.border_locked_active   = $error
+  col.border_locked_inactive = $outline
+
+  groupbar {
+    col.active         = $primary
+    col.inactive       = $outline
+    col.locked_active   = $error
+    col.locked_inactive = $outline
+  }
+}
@@ -1,27 +0,0 @@
-- ! Auto-generated file. Do not edit directly.
-- Regenerate via DMS theme tools or remove require("dms.colors") from hyprland.lua to override.
-
-hl.config({
-	general = {
-		col = {
-			active_border = "rgb(d0bcff)",
-			inactive_border = "rgb(948f99)",
-		},
-	},
-	group = {
-		col = {
-			border_active = "rgb(d0bcff)",
-			border_inactive = "rgb(948f99)",
-			border_locked_active = "rgb(f2b8b5)",
-			border_locked_inactive = "rgb(948f99)",
-		},
-		groupbar = {
-			col = {
-				active = "rgb(d0bcff)",
-				inactive = "rgb(948f99)",
-				locked_active = "rgb(f2b8b5)",
-				locked_inactive = "rgb(948f99)",
-			},
-		},
-	},
-})
@@ -1 +0,0 @@
-- Cursor theme overrides. Deploy writes ~/.config/hypr/dms/cursor.lua
@@ -0,0 +1,11 @@
+# Auto-generated by DMS - do not edit manually
+
+general {
+    gaps_in = 4
+    gaps_out = 4
+    border_size = 2
+}
+
+decoration {
+    rounding = 12
+}
@@ -1,12 +0,0 @@
-- Auto-generated by DMS — do not edit manually
-
-hl.config({
-	general = {
-		gaps_in = 4,
-		gaps_out = 4,
-		border_size = 2,
-	},
-	decoration = {
-		rounding = 12,
-	},
-})
@@ -1,3 +0,0 @@
-- Per-output monitor rules — embedded sibling of the legacy outputs.conf fragment. Deploy writes ~/.config/hypr/dms/outputs.lua
-
-hl.monitor({ output = "", mode = "preferred", position = "auto", scale = "auto" })
@@ -1 +0,0 @@
-- Window rules. Deploy writes ~/.config/hypr/dms/windowrules.lua
@@ -0,0 +1,121 @@
+# Hyprland Configuration
+# https://wiki.hypr.land/Configuring/
+
+# ==================
+# MONITOR CONFIG
+# ==================
+# monitor = eDP-2, 2560x1600@239.998993, 2560x0, 1, vrr, 1
+monitor = , preferred,auto,auto
+
+# ==================
+# STARTUP APPS
+# ==================
+exec-once = dbus-update-activation-environment --systemd --all
+exec-once = systemctl --user start hyprland-session.target
+
+# ==================
+# INPUT CONFIG
+# ==================
+input {
+    kb_layout = us
+    numlock_by_default = true
+}
+
+# ==================
+# GENERAL LAYOUT
+# ==================
+general {
+    gaps_in = 5
+    gaps_out = 5
+    border_size = 2
+
+    layout = dwindle
+}
+
+# ==================
+# DECORATION
+# ==================
+decoration {
+    rounding = 12
+
+    active_opacity = 1.0
+    inactive_opacity = 1.0
+
+    shadow {
+        enabled = true
+        range = 30
+        render_power = 5
+        offset = 0 5
+        color = rgba(00000070)
+    }
+}
+
+# ==================
+# ANIMATIONS
+# ==================
+animations {
+    enabled = true
+
+    animation = windowsIn, 1, 3, default
+    animation = windowsOut, 1, 3, default
+    animation = workspaces, 1, 5, default
+    animation = windowsMove, 1, 4, default
+    animation = fade, 1, 3, default
+    animation = border, 1, 3, default
+}
+
+# ==================
+# LAYOUTS
+# ==================
+dwindle {
+    preserve_split = true
+}
+
+master {
+    mfact = 0.5
+}
+
+# ==================
+# MISC
+# ==================
+misc {
+    disable_hyprland_logo = true
+    disable_splash_rendering = true
+}
+
+# ==================
+# WINDOW RULES
+# ==================
+windowrule = tile on, match:class ^(org\.wezfurlong\.wezterm)$
+
+windowrule = rounding 12, match:class ^(org\.gnome\.)
+
+windowrule = tile on, match:class ^(gnome-control-center)$
+windowrule = tile on, match:class ^(pavucontrol)$
+windowrule = tile on, match:class ^(nm-connection-editor)$
+
+windowrule = float on, match:class ^(org\.gnome\.Calculator)$
+windowrule = float on, match:class ^(gnome-calculator)$
+windowrule = float on, match:class ^(galculator)$
+windowrule = float on, match:class ^(blueman-manager)$
+windowrule = float on, match:class ^(org\.gnome\.Nautilus)$
+windowrule = float on, match:class ^(xdg-desktop-portal)$
+
+windowrule = no_initial_focus on, match:class ^(steam)$, match:title ^(notificationtoasts)
+windowrule = pin on, match:class ^(steam)$, match:title ^(notificationtoasts)
+
+windowrule = float on, match:class ^(firefox)$, match:title ^(Picture-in-Picture)$
+windowrule = float on, match:class ^(zoom)$
+
+# DMS windows floating by default
+# ! Hyprland doesn't size these windows correctly so disabling by default here
+# windowrule = float on, match:class ^(org.quickshell)$
+
+layerrule = no_anim on, match:namespace ^(quickshell)$
+layerrule = no_anim on, match:namespace ^dms:.*
+
+source = ./dms/colors.conf
+source = ./dms/outputs.conf
+source = ./dms/layout.conf
+source = ./dms/cursor.conf
+source = ./dms/binds.conf
@@ -1,88 +0,0 @@
-- Hyprland configuration (Lua) — https://wiki.hypr.land/Configuring/Start/
-
-hl.config({ autogenerated = false })
-
-- DMS_STARTUP_BEGIN
-hl.on("hyprland.start", function()
-	hl.exec_cmd("dbus-update-activation-environment --systemd --all")
-	hl.exec_cmd("systemctl --user start hyprland-session.target")
-end)
-- DMS_STARTUP_END
-
-hl.config({
-	input = {
-		kb_layout = "us",
-		numlock_by_default = true,
-		touchpad = {
-			tap_to_click = true,
-			natural_scroll = true,
-		},
-	},
-	general = {
-		gaps_in = 5,
-		gaps_out = 5,
-		border_size = 2,
-		layout = "dwindle",
-	},
-	decoration = {
-		rounding = 12,
-		active_opacity = 1.0,
-		inactive_opacity = 1.0,
-		shadow = {
-			enabled = true,
-			range = 30,
-			render_power = 5,
-			offset = "0 5",
-			color = "rgba(00000070)",
-		},
-	},
-	misc = {
-		disable_hyprland_logo = true,
-		disable_splash_rendering = true,
-	},
-	dwindle = {
-		preserve_split = true,
-	},
-	master = {
-		mfact = 0.5,
-	},
-})
-
-hl.animation({ leaf = "windowsIn", enabled = true, speed = 3, bezier = "default" })
-hl.animation({ leaf = "windowsOut", enabled = true, speed = 3, bezier = "default" })
-hl.animation({ leaf = "workspaces", enabled = true, speed = 5, bezier = "default" })
-hl.animation({ leaf = "windowsMove", enabled = true, speed = 4, bezier = "default" })
-hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "default" })
-hl.animation({ leaf = "border", enabled = true, speed = 3, bezier = "default" })
-
-hl.window_rule({ match = { class = "^(org\\.wezfurlong\\.wezterm)$" }, tile = true })
-hl.window_rule({ match = { class = "^(org\\.gnome\\.)" }, rounding = 12 })
-hl.window_rule({ match = { class = "^(gnome-control-center)$" }, tile = true })
-hl.window_rule({ match = { class = "^(pavucontrol)$" }, tile = true })
-hl.window_rule({ match = { class = "^(nm-connection-editor)$" }, tile = true })
-hl.window_rule({ match = { class = "^(org\\.gnome\\.Calculator)$" }, float = true })
-hl.window_rule({ match = { class = "^(gnome-calculator)$" }, float = true })
-hl.window_rule({ match = { class = "^(galculator)$" }, float = true })
-hl.window_rule({ match = { class = "^(blueman-manager)$" }, float = true })
-hl.window_rule({ match = { class = "^(org\\.gnome\\.Nautilus)$" }, float = true })
-hl.window_rule({ match = { class = "^(xdg-desktop-portal)$" }, float = true })
-hl.window_rule({
-	match = { class = "^(steam)$", title = "^(notificationtoasts)" },
-	no_initial_focus = true,
-	pin = true,
-})
-hl.window_rule({
-	match = { class = "^(firefox)$", title = "^(Picture-in-Picture)$" },
-	float = true,
-})
-hl.window_rule({ match = { class = "^(zoom)$" }, float = true })
-hl.layer_rule({ match = { namespace = "^(quickshell)$" }, no_anim = true })
-hl.layer_rule({ match = { namespace = "^dms:.*" }, no_anim = true })
-
-require("dms.colors")
-require("dms.outputs")
-require("dms.layout")
-require("dms.cursor")
-require("dms.binds")
-require("dms.binds-user")
-require("dms.windowrules")
@@ -1,140 +0,0 @@
-# DMS default keybinds (MangoWM) — managed by DMS, regenerated by `dms setup`.
-# Format: bind=MODS,key,action[,args]
-# Put bind descriptions above bind lines; inline # comments break Mango spawn args.
-
-# === Application Launchers ===
-# Open Terminal
-bind=SUPER,t,spawn,{{TERMINAL_COMMAND}}
-# Open Terminal
-bind=SUPER,Return,spawn,{{TERMINAL_COMMAND}}
-# Application Launcher
-bind=SUPER,space,spawn,dms ipc call spotlight toggle
-# Spotlight Bar
-bind=ALT,space,spawn,dms ipc call spotlight-bar toggle
-# Clipboard Manager
-bind=SUPER,v,spawn,dms ipc call clipboard toggle
-# Task Manager
-bind=SUPER,m,spawn,dms ipc call processlist focusOrToggle
-# Settings
-bind=SUPER,comma,spawn,dms ipc call settings focusOrToggle
-# Notification Center
-bind=SUPER,n,spawn,dms ipc call notifications toggle
-# Notepad
-bind=SUPER+SHIFT,n,spawn,dms ipc call notepad toggle
-# Browse Wallpapers
-bind=SUPER,y,spawn,dms ipc call dankdash wallpaper
-# Power Menu
-bind=SUPER,x,spawn,dms ipc call powermenu toggle
-# Cycle Display Profile
-bind=SUPER,p,spawn,dms ipc outputs cycleProfile
-
-# === Cheat sheet ===
-# Keyboard Shortcuts
-bind=SUPER+SHIFT,slash,spawn,dms ipc call keybinds toggle mangowc
-
-# === Security ===
-# Lock Screen
-bind=SUPER+ALT,l,spawn,dms ipc call lock lock
-# Task Manager
-bind=CTRL+ALT,Delete,spawn,dms ipc call processlist focusOrToggle
-
-# === Window Rules ===
-# Create Window Rule
-bind=SUPER+SHIFT,w,spawn,dms ipc call window-rules toggle
-
-# === Screenshots ===
-# Screenshot: Interactive
-bind=none,Print,spawn,dms screenshot
-# Screenshot: Full Screen
-bind=CTRL,Print,spawn,dms screenshot full
-# Screenshot: Window
-bind=ALT,Print,spawn,dms screenshot window
-
-# === Audio Controls ===
-bind=none,XF86AudioRaiseVolume,spawn,dms ipc call audio increment 3
-bind=none,XF86AudioLowerVolume,spawn,dms ipc call audio decrement 3
-bind=none,XF86AudioMute,spawn,dms ipc call audio mute
-bind=none,XF86AudioMicMute,spawn,dms ipc call audio micmute
-bind=none,XF86AudioPlay,spawn,dms ipc call mpris playPause
-bind=none,XF86AudioPause,spawn,dms ipc call mpris playPause
-bind=none,XF86AudioPrev,spawn,dms ipc call mpris previous
-bind=none,XF86AudioNext,spawn,dms ipc call mpris next
-
-# === Brightness Controls ===
-bind=none,XF86MonBrightnessUp,spawn,dms ipc call brightness increment 5
-bind=none,XF86MonBrightnessDown,spawn,dms ipc call brightness decrement 5
-
-# === Window Management ===
-# Close Window
-bind=SUPER,q,killclient,
-bind=SUPER,f,togglefullscreen,
-bind=SUPER,a,togglemaximizescreen,
-bind=SUPER+SHIFT,space,togglefloating,
-bind=SUPER,o,toggleoverview
-bind=ALT,Tab,toggleoverview
-# Exit Compositor
-bind=SUPER+SHIFT,e,quit,
-
-# === Focus Navigation ===
-bind=SUPER,Tab,focusstack,next
-bind=SUPER+SHIFT,Tab,focusstack,prev
-bind=SUPER,Left,focusdir,left
-bind=SUPER,H,focusdir,left
-bind=SUPER,Right,focusdir,right
-bind=SUPER,L,focusdir,right
-bind=SUPER,Up,focusdir,up
-bind=SUPER,K,focusdir,up
-bind=SUPER,Down,focusdir,down
-bind=SUPER,J,focusdir,down
-
-# === Window Movement ===
-bind=SUPER+SHIFT,Left,exchange_client,left
-bind=SUPER+SHIFT,Right,exchange_client,right
-bind=SUPER+SHIFT,Up,exchange_client,up
-bind=SUPER+SHIFT,Down,exchange_client,down
-bind=SUPER+SHIFT,H,exchange_client,left
-bind=SUPER+SHIFT,L,exchange_client,right
-bind=SUPER+SHIFT,K,exchange_client,up
-bind=SUPER+SHIFT,J,exchange_client,down
-
-# === Monitor Navigation ===
-bind=SUPER+ALT,Left,focusmon,left
-bind=SUPER+ALT,Right,focusmon,right
-bind=SUPER+ALT+SHIFT,Left,tagmon,left
-bind=SUPER+ALT+SHIFT,Right,tagmon,right
-
-# === Layout ===
-# Cycle Layout - Gaps, Floating, Tiling
-bind=SUPER+ALT,j,switch_layout
-bind=SUPER+SHIFT,equal,incgaps,1
-bind=SUPER+SHIFT,minus,incgaps,-1
-
-# === Tags (1-9): view tag ===
-bind=SUPER,1,view,1
-bind=SUPER,2,view,2
-bind=SUPER,3,view,3
-bind=SUPER,4,view,4
-bind=SUPER,5,view,5
-bind=SUPER,6,view,6
-bind=SUPER,7,view,7
-bind=SUPER,8,view,8
-bind=SUPER,9,view,9
-
-# === Tags (1-9): move focused window to tag ===
-bind=SUPER+SHIFT,1,tag,1
-bind=SUPER+SHIFT,2,tag,2
-bind=SUPER+SHIFT,3,tag,3
-bind=SUPER+SHIFT,4,tag,4
-bind=SUPER+SHIFT,5,tag,5
-bind=SUPER+SHIFT,6,tag,6
-bind=SUPER+SHIFT,7,tag,7
-bind=SUPER+SHIFT,8,tag,8
-bind=SUPER+SHIFT,9,tag,9
-
-# === Touchpad Gestures ===
-# 3-finger horizontal swipe: switch between occupied workspaces
-gesturebind=none,right,3,viewtoleft_have_client
-gesturebind=none,left,3,viewtoright_have_client
-# 4-finger vertical swipe: toggle the overview
-gesturebind=none,up,4,toggleoverview
-gesturebind=none,down,4,toggleoverview
@@ -1,6 +0,0 @@
-# Auto-generated by DMS. Overwritten by matugen (dms/colors.conf).
-# Remove `source=./dms/colors.conf` from config.conf to override manually.
-
-bordercolor = 0x595959ff
-focuscolor  = 0x8ab4f8ff
-urgentcolor = 0xff5555ff
@@ -1,8 +0,0 @@
-# Auto-generated by DMS. Regenerated from DMS settings (dms/layout.conf).
-
-border_radius=12
-gappih=5
-gappiv=5
-gappoh=5
-gappov=5
-borderpx=2
@@ -1,18 +0,0 @@
-# DankMaterialShell — MangoWM configuration (managed by `dms setup`)
-# Keybinds, colors, layout, outputs, cursor and window rules are pulled from the
-# ./dms fragments below. Add your own binds/rules here; they sit alongside DMS's.
-
-env=XDG_CURRENT_DESKTOP,mango
-env=XDG_SESSION_TYPE,wayland
-
-# exec-once runs only at startup. Do NOT use exec= for the shell: mango re-runs
-# every exec= on each config reload, and DMS reloads the config, which would
-# spawn a new shell on every reload.
-exec-once=dms run
-
-source=./dms/colors.conf
-source=./dms/layout.conf
-source=./dms/cursor.conf
-source=./dms/outputs.conf
-source=./dms/windowrules.conf
-source=./dms/binds.conf
@@ -1,6 +1,6 @@
 binds {
    // === System & Overview ===
-    Mod+O repeat=false { toggle-overview; }
+    Mod+D repeat=false { toggle-overview; }
    Mod+Tab repeat=false { toggle-overview; }
    Mod+Shift+Slash { show-hotkey-overlay; }

@@ -9,9 +9,6 @@ binds {
    Mod+Space hotkey-overlay-title="Application Launcher" {
        spawn "dms" "ipc" "call" "spotlight" "toggle";
    }
-    Alt+Space hotkey-overlay-title="Spotlight Bar" {
-        spawn "dms" "ipc" "call" "spotlight-bar" "toggle";
-    }
    Mod+V hotkey-overlay-title="Clipboard Manager" {
        spawn "dms" "ipc" "call" "clipboard" "toggle";
    }
@@ -218,11 +215,6 @@ binds {
    Print { screenshot; }
    Ctrl+Print { screenshot-screen; }
    Alt+Print { screenshot-window; }
-    // === Display Profiles ===
-    Mod+P hotkey-overlay-title="Cycle Display Profile" {
-        spawn "dms" "ipc" "outputs" "cycleProfile";
-    }
-
    // === System Controls ===
    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
    Mod+Shift+P { power-off-monitors; }
@@ -250,6 +250,12 @@ window-rule {
    match app-id="zoom"
    open-floating true
 }
+// Open dms windows as floating by default
+window-rule {
+    match app-id=r#"org.quickshell$"#
+    match app-id=r#"com.danklinux.dms$"#
+    open-floating true
+}
 debug {
    honor-xdg-activation-with-invalid-serial
 }
@@ -2,26 +2,14 @@ package config

 import _ "embed"

-//go:embed embedded/hyprland.lua
-var HyprlandLuaConfig string
+//go:embed embedded/hyprland.conf
+var HyprlandConfig string

-//go:embed embedded/hypr-colors.lua
-var DMSColorsLuaConfig string
+//go:embed embedded/hypr-colors.conf
+var HyprColorsConfig string

-//go:embed embedded/hypr-layout.lua
-var DMSLayoutLuaConfig string
+//go:embed embedded/hypr-layout.conf
+var HyprLayoutConfig string

-//go:embed embedded/hypr-binds.lua
-var DMSBindsLuaConfig string
-
-//go:embed embedded/hypr-outputs.lua
-var DMSOutputsLuaConfig string
-
-//go:embed embedded/hypr-cursor.lua
-var DMSCursorLuaConfig string
-
-//go:embed embedded/hypr-windowrules.lua
-var DMSWindowRulesLuaConfig string
-
-//go:embed embedded/hypr-binds-user.lua
-var DMSBindsUserLuaConfig string
+//go:embed embedded/hypr-binds.conf
+var HyprBindsConfig string
@@ -1,197 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-)
-
-const (
-	hyprlandStartupBegin = "-- DMS_STARTUP_BEGIN"
-	hyprlandStartupEnd   = "-- DMS_STARTUP_END"
-)
-
-func extractHyprlangMonitorLines(hyprlang string) []string {
-	re := regexp.MustCompile(`(?m)^\s*#?\s*monitor\s*=.*$`)
-	return re.FindAllString(hyprlang, -1)
-}
-
-func hyprlangMonitorLineToLua(line string) (string, error) {
-	re := regexp.MustCompile(`(?i)^\s*#?\s*monitor\s*=\s*(.*)\s*$`)
-	m := re.FindStringSubmatch(line)
-	if m == nil {
-		return "", fmt.Errorf("not a monitor line")
-	}
-	rest := strings.TrimSpace(m[1])
-	parts := strings.Split(rest, ",")
-	for i := range parts {
-		parts[i] = strings.TrimSpace(parts[i])
-	}
-	if len(parts) < 4 {
-		if len(parts) == 2 && strings.EqualFold(parts[1], "disable") {
-			return fmt.Sprintf(`hl.monitor({ output = %s, disabled = true })`, strconv.Quote(parts[0])), nil
-		}
-		return "", fmt.Errorf("expected at least 4 comma-separated fields")
-	}
-	out := parts[0]
-	mode := parts[1]
-	pos := parts[2]
-	scaleStr := parts[3]
-
-	scaleField := formatMonitorScaleLua(scaleStr)
-	fields := []string{
-		fmt.Sprintf("output = %s", strconv.Quote(out)),
-		fmt.Sprintf("mode = %s", strconv.Quote(mode)),
-		fmt.Sprintf("position = %s", strconv.Quote(pos)),
-		scaleField,
-	}
-	for i := 4; i < len(parts); i += 2 {
-		key := strings.ToLower(strings.TrimSpace(parts[i]))
-		if key == "" {
-			continue
-		}
-		if i+1 >= len(parts) {
-			fields = append(fields, fmt.Sprintf("%s = true", hyprlangMonitorOptionToLuaKey(key)))
-			continue
-		}
-		val := strings.TrimSpace(parts[i+1])
-		if converted, ok := formatMonitorOptionLua(key, val); ok {
-			fields = append(fields, converted)
-		}
-	}
-	return fmt.Sprintf(`hl.monitor({ %s })`, strings.Join(fields, ", ")), nil
-}
-
-func formatMonitorScaleLua(scaleStr string) string {
-	if scaleStr == "auto" {
-		return `scale = "auto"`
-	}
-	if f, err := strconv.ParseFloat(scaleStr, 64); err == nil {
-		return fmt.Sprintf(`scale = %g`, f)
-	}
-	return fmt.Sprintf(`scale = %s`, strconv.Quote(scaleStr))
-}
-
-func hyprlangMonitorOptionToLuaKey(key string) string {
-	switch strings.ToLower(strings.TrimSpace(key)) {
-	case "10bit":
-		return "bitdepth"
-	default:
-		return strings.ReplaceAll(strings.ToLower(strings.TrimSpace(key)), "-", "_")
-	}
-}
-
-func formatMonitorOptionLua(key, val string) (string, bool) {
-	luaKey := hyprlangMonitorOptionToLuaKey(key)
-	switch luaKey {
-	case "transform", "vrr", "bitdepth", "supports_wide_color", "supports_hdr", "sdr_max_luminance", "max_luminance", "max_avg_luminance":
-		if _, err := strconv.Atoi(val); err == nil {
-			return fmt.Sprintf("%s = %s", luaKey, val), true
-		}
-	case "sdrbrightness", "sdrsaturation", "sdr_min_luminance", "min_luminance":
-		if _, err := strconv.ParseFloat(val, 64); err == nil {
-			return fmt.Sprintf("%s = %s", luaKey, val), true
-		}
-	case "cm", "sdr_eotf", "icc", "mirror":
-		return fmt.Sprintf("%s = %s", luaKey, strconv.Quote(val)), true
-	}
-	return "", false
-}
-
-func transformHyprlandLuaForNonSystemd(config, terminalCommand string) string {
-	start := strings.Index(config, hyprlandStartupBegin)
-	end := strings.Index(config, hyprlandStartupEnd)
-	if start == -1 || end == -1 || end <= start {
-		return config
-	}
-	endClose := end + len(hyprlandStartupEnd)
-	replacement := hyprlandStartupBegin + "\n" +
-		`hl.env("QT_QPA_PLATFORM", "wayland;xcb")` + "\n" +
-		`hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")` + "\n" +
-		`hl.env("QT_QPA_PLATFORMTHEME", "gtk3")` + "\n" +
-		`hl.env("QT_QPA_PLATFORMTHEME_QT6", "gtk3")` + "\n" +
-		fmt.Sprintf(`hl.env("TERMINAL", %s)`, strconv.Quote(terminalCommand)) + "\n\n" +
-		`hl.on("hyprland.start", function()` + "\n" +
-		`	hl.exec_cmd("dms run")` + "\n" +
-		`end)` + "\n" +
-		hyprlandStartupEnd
-	return config[:start] + replacement + config[endClose:]
-}
-
-func readExistingHyprlandConfig(configDir string) (data string, sourcePath string, err error) {
-	luaPath := filepath.Join(configDir, "hyprland.lua")
-	if b, e := os.ReadFile(luaPath); e == nil {
-		return string(b), luaPath, nil
-	} else if !os.IsNotExist(e) {
-		return "", "", e
-	}
-	confPath := filepath.Join(configDir, "hyprland.conf")
-	if b, e := os.ReadFile(confPath); e == nil {
-		return string(b), confPath, nil
-	} else if !os.IsNotExist(e) {
-		return "", "", e
-	}
-	return "", "", nil
-}
-
-// CleanupStrayHyprlandConfFile moves stray ~/.config/hypr/hyprland.conf and
-// top-level ~/.config/hypr/dms/*.conf files into .dms-backups/<timestamp>/ only
-// when hyprland.lua also exists as the live config.
-func CleanupStrayHyprlandConfFile(logFn func(format string, v ...any)) {
-	if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") == "" {
-		return
-	}
-	home := os.Getenv("HOME")
-	if home == "" {
-		return
-	}
-	configDir := filepath.Join(home, ".config", "hypr")
-	luaPath := filepath.Join(configDir, "hyprland.lua")
-	if _, err := os.Stat(luaPath); err != nil {
-		return
-	}
-
-	var strayPaths []string
-	confPath := filepath.Join(configDir, "hyprland.conf")
-	if info, err := os.Lstat(confPath); err == nil && !info.IsDir() {
-		strayPaths = append(strayPaths, confPath)
-	}
-	dmsConfPaths, err := filepath.Glob(filepath.Join(configDir, "dms", "*.conf"))
-	if err == nil {
-		for _, p := range dmsConfPaths {
-			if info, err := os.Lstat(p); err == nil && !info.IsDir() {
-				strayPaths = append(strayPaths, p)
-			}
-		}
-	}
-	if len(strayPaths) == 0 {
-		return
-	}
-
-	ts := time.Now().Format("2006-01-02_15-04-05")
-	moved := 0
-	for _, src := range strayPaths {
-		rel, err := filepath.Rel(configDir, src)
-		if err != nil {
-			rel = filepath.Base(src)
-		}
-		dst := filepath.Join(configDir, hyprlandBackupDirName, ts, rel)
-		if err := moveHyprlandConfigFile(src, dst); err != nil {
-			if logFn != nil {
-				logFn("Could not move stray Hyprland conf file %s: %v", src, err)
-			}
-			continue
-		}
-		moved++
-		if logFn != nil {
-			logFn("Moved stray Hyprland conf file to %s", dst)
-		}
-	}
-	if moved > 0 && logFn != nil {
-		logFn("Moved %d stray Hyprland conf file(s) out of the active Lua config tree", moved)
-	}
-}
@@ -1,15 +0,0 @@
-package config
-
-import _ "embed"
-
-//go:embed embedded/mango.conf
-var MangoConfig string
-
-//go:embed embedded/mango-colors.conf
-var MangoColorsConfig string
-
-//go:embed embedded/mango-layout.conf
-var MangoLayoutConfig string
-
-//go:embed embedded/mango-binds.conf
-var MangoBindsConfig string
@@ -35,7 +35,6 @@ type WindowManager int
 const (
 	WindowManagerHyprland WindowManager = iota
 	WindowManagerNiri
-	WindowManagerMango
 )

 type Terminal int
@@ -1,203 +0,0 @@
-package desktop
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-)
-
-type Entry struct {
-	ID         string
-	Path       string
-	Name       string
-	Exec       string
-	Icon       string
-	Categories []string
-	MimeTypes  []string
-	NoDisplay  bool
-	Hidden     bool
-	Terminal   bool
-}
-
-type cachedEntry struct {
-	entry   *Entry
-	modTime time.Time
-	size    int64
-}
-
-var (
-	entryCache   = make(map[string]cachedEntry)
-	entryCacheMu sync.Mutex
-
-	listingCache   []*Entry
-	listingExpires time.Time
-	listingCacheMu sync.Mutex
-)
-
-const listingTTL = 5 * time.Second
-
-func applicationDirs() []string {
-	seen := make(map[string]bool)
-	var dirs []string
-
-	add := func(path string) {
-		if path == "" {
-			return
-		}
-		abs, err := filepath.Abs(path)
-		if err != nil {
-			abs = path
-		}
-		if seen[abs] {
-			return
-		}
-		seen[abs] = true
-		dirs = append(dirs, abs)
-	}
-
-	add(filepath.Join(utils.XDGDataHome(), "applications"))
-
-	if env := os.Getenv("XDG_DATA_DIRS"); env != "" {
-		for d := range strings.SplitSeq(env, ":") {
-			add(filepath.Join(strings.TrimSpace(d), "applications"))
-		}
-	} else {
-		add("/usr/local/share/applications")
-		add("/usr/share/applications")
-	}
-
-	home, _ := os.UserHomeDir()
-	if home != "" {
-		add(filepath.Join(home, ".local", "share", "flatpak", "exports", "share", "applications"))
-	}
-	add("/var/lib/flatpak/exports/share/applications")
-	add("/var/lib/snapd/desktop/applications")
-
-	return dirs
-}
-
-func parseEntry(path string, id string) (*Entry, error) {
-	info, err := os.Stat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	entryCacheMu.Lock()
-	if c, ok := entryCache[path]; ok && c.modTime.Equal(info.ModTime()) && c.size == info.Size() {
-		entryCacheMu.Unlock()
-		return c.entry, nil
-	}
-	entryCacheMu.Unlock()
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	groups := parseGroups(data)
-	g, ok := groups["Desktop Entry"]
-	if !ok {
-		return nil, nil
-	}
-
-	entry := &Entry{
-		ID:         id,
-		Path:       path,
-		Name:       g.keys["Name"],
-		Exec:       g.keys["Exec"],
-		Icon:       g.keys["Icon"],
-		Categories: splitList(g.keys["Categories"]),
-		MimeTypes:  splitList(g.keys["MimeType"]),
-		NoDisplay:  parseBool(g.keys["NoDisplay"]),
-		Hidden:     parseBool(g.keys["Hidden"]),
-		Terminal:   parseBool(g.keys["Terminal"]),
-	}
-
-	if t := g.keys["Type"]; t != "" && t != "Application" {
-		return nil, nil
-	}
-
-	entryCacheMu.Lock()
-	entryCache[path] = cachedEntry{entry: entry, modTime: info.ModTime(), size: info.Size()}
-	entryCacheMu.Unlock()
-
-	return entry, nil
-}
-
-func relativeID(root, path string) string {
-	rel, err := filepath.Rel(root, path)
-	if err != nil {
-		return filepath.Base(path)
-	}
-	return strings.ReplaceAll(rel, string(filepath.Separator), "-")
-}
-
-func AllEntries() []*Entry {
-	listingCacheMu.Lock()
-	if time.Now().Before(listingExpires) && listingCache != nil {
-		out := listingCache
-		listingCacheMu.Unlock()
-		return out
-	}
-	listingCacheMu.Unlock()
-
-	seen := make(map[string]bool)
-	var entries []*Entry
-
-	for _, dir := range applicationDirs() {
-		_ = filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
-			if err != nil || d.IsDir() {
-				return nil
-			}
-			if !strings.HasSuffix(path, ".desktop") {
-				return nil
-			}
-			id := relativeID(dir, path)
-			if seen[id] {
-				return nil
-			}
-			seen[id] = true
-
-			entry, err := parseEntry(path, id)
-			if err != nil || entry == nil {
-				return nil
-			}
-			entries = append(entries, entry)
-			return nil
-		})
-	}
-
-	listingCacheMu.Lock()
-	listingCache = entries
-	listingExpires = time.Now().Add(listingTTL)
-	listingCacheMu.Unlock()
-
-	return entries
-}
-
-func EntryByID(id string) *Entry {
-	if !strings.HasSuffix(id, ".desktop") {
-		id += ".desktop"
-	}
-	for _, entry := range AllEntries() {
-		if entry.ID == id {
-			return entry
-		}
-	}
-	return nil
-}
-
-func InvalidateCache() {
-	entryCacheMu.Lock()
-	entryCache = make(map[string]cachedEntry)
-	entryCacheMu.Unlock()
-
-	listingCacheMu.Lock()
-	listingCache = nil
-	listingExpires = time.Time{}
-	listingCacheMu.Unlock()
-}
@@ -1,311 +0,0 @@
-package desktop
-
-import (
-	"bufio"
-	"bytes"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-)
-
-var (
-	aliasMap      map[string]string
-	subclassMap   map[string][]string
-	aliasLoaded   time.Time
-	aliasReloadMu sync.Mutex
-
-	mimeCacheMap      map[string][]string
-	mimeCacheLoaded   time.Time
-	mimeCacheReloadMu sync.Mutex
-)
-
-const aliasTTL = 60 * time.Second
-const mimeCacheTTL = 10 * time.Second
-
-func mimeDataDirs() []string {
-	var dirs []string
-	seen := make(map[string]bool)
-
-	add := func(p string) {
-		if p == "" || seen[p] {
-			return
-		}
-		seen[p] = true
-		dirs = append(dirs, p)
-	}
-
-	add(filepath.Join(utils.XDGDataHome(), "mime"))
-
-	if env := os.Getenv("XDG_DATA_DIRS"); env != "" {
-		for d := range strings.SplitSeq(env, ":") {
-			add(filepath.Join(strings.TrimSpace(d), "mime"))
-		}
-	} else {
-		add("/usr/local/share/mime")
-		add("/usr/share/mime")
-	}
-
-	return dirs
-}
-
-func loadAliasTables() {
-	aliases := make(map[string]string)
-	subclasses := make(map[string][]string)
-
-	for _, dir := range mimeDataDirs() {
-		readKV(filepath.Join(dir, "aliases"), func(k, v string) {
-			if _, ok := aliases[k]; !ok {
-				aliases[k] = v
-			}
-		})
-		readKV(filepath.Join(dir, "subclasses"), func(k, v string) {
-			subclasses[k] = append(subclasses[k], v)
-		})
-	}
-
-	aliasMap = aliases
-	subclassMap = subclasses
-	aliasLoaded = time.Now()
-}
-
-func readKV(path string, fn func(k, v string)) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return
-	}
-	scanner := bufio.NewScanner(bytes.NewReader(data))
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		if line == "" || line[0] == '#' {
-			continue
-		}
-		sp := strings.IndexByte(line, ' ')
-		if sp <= 0 {
-			continue
-		}
-		fn(strings.TrimSpace(line[:sp]), strings.TrimSpace(line[sp+1:]))
-	}
-}
-
-func ensureAliasTables() {
-	aliasReloadMu.Lock()
-	defer aliasReloadMu.Unlock()
-
-	if aliasMap == nil || time.Since(aliasLoaded) > aliasTTL {
-		loadAliasTables()
-	}
-}
-
-func loadMimeCache() {
-	merged := make(map[string][]string)
-	seen := make(map[string]map[string]bool)
-
-	for _, dir := range applicationDirs() {
-		data, err := os.ReadFile(filepath.Join(dir, "mimeinfo.cache"))
-		if err != nil {
-			continue
-		}
-		groups := parseGroups(data)
-		g := groups["MIME Cache"]
-		if g == nil {
-			continue
-		}
-		for mime, val := range g.keys {
-			ids := splitList(val)
-			if len(ids) == 0 {
-				continue
-			}
-			if seen[mime] == nil {
-				seen[mime] = make(map[string]bool)
-			}
-			for _, id := range ids {
-				if seen[mime][id] {
-					continue
-				}
-				seen[mime][id] = true
-				merged[mime] = append(merged[mime], id)
-			}
-		}
-	}
-
-	mimeCacheMap = merged
-	mimeCacheLoaded = time.Now()
-}
-
-func ensureMimeCache() {
-	mimeCacheReloadMu.Lock()
-	defer mimeCacheReloadMu.Unlock()
-
-	if mimeCacheMap == nil || time.Since(mimeCacheLoaded) > mimeCacheTTL {
-		loadMimeCache()
-	}
-}
-
-func cacheAppsForMime(mimeType string) []string {
-	ensureMimeCache()
-	return mimeCacheMap[mimeType]
-}
-
-func StripMimeParams(mimeType string) string {
-	if semi := strings.IndexByte(mimeType, ';'); semi >= 0 {
-		mimeType = mimeType[:semi]
-	}
-	return strings.TrimSpace(mimeType)
-}
-
-func canonicalMime(mimeType string) string {
-	ensureAliasTables()
-	mimeType = StripMimeParams(mimeType)
-	if target, ok := aliasMap[mimeType]; ok {
-		return target
-	}
-	return mimeType
-}
-
-func mimeChain(mimeType string) []string {
-	ensureAliasTables()
-
-	root := canonicalMime(mimeType)
-	visited := map[string]bool{root: true}
-	chain := []string{root}
-
-	queue := []string{root}
-	for len(queue) > 0 {
-		cur := queue[0]
-		queue = queue[1:]
-		for _, parent := range subclassMap[cur] {
-			if visited[parent] {
-				continue
-			}
-			visited[parent] = true
-			chain = append(chain, parent)
-			queue = append(queue, parent)
-		}
-	}
-
-	return chain
-}
-
-func entrySupportsMime(entry *Entry, chain []string) bool {
-	for _, m := range entry.MimeTypes {
-		canonical := canonicalMime(m)
-		if slices.Contains(chain, canonical) || slices.Contains(chain, m) {
-			return true
-		}
-	}
-	return false
-}
-
-func GetDefault(mimeType string) string {
-	merged := mergedAssociations()
-	chain := mimeChain(mimeType)
-
-	for _, m := range chain {
-		if id, ok := merged.Defaults[m]; ok {
-			if !slices.Contains(merged.Removed[m], id) {
-				return id
-			}
-		}
-	}
-
-	for _, m := range chain {
-		for _, id := range merged.Added[m] {
-			if !slices.Contains(merged.Removed[m], id) {
-				return id
-			}
-		}
-	}
-
-	for _, m := range chain {
-		for _, id := range cacheAppsForMime(m) {
-			if !slices.Contains(merged.Removed[m], id) {
-				return id
-			}
-		}
-	}
-
-	for _, m := range chain {
-		for _, entry := range AllEntries() {
-			if entry.Hidden || entry.NoDisplay {
-				continue
-			}
-			if slices.Contains(merged.Removed[m], entry.ID) {
-				continue
-			}
-			if entrySupportsMime(entry, []string{m}) {
-				return entry.ID
-			}
-		}
-	}
-
-	return ""
-}
-
-func SetDefault(mimeType, desktopID string) error {
-	return setDefaultAssociation(mimeType, desktopID)
-}
-
-func SetDefaults(mimeTypes []string, desktopID string) error {
-	return setDefaultAssociations(mimeTypes, desktopID)
-}
-
-func AppsForMime(mimeType string) []string {
-	merged := mergedAssociations()
-	chain := mimeChain(mimeType)
-	removed := make(map[string]bool)
-	for _, m := range chain {
-		for _, id := range merged.Removed[m] {
-			removed[id] = true
-		}
-	}
-
-	seen := make(map[string]bool)
-	var out []string
-
-	add := func(id string) {
-		if id == "" || removed[id] || seen[id] {
-			return
-		}
-		seen[id] = true
-		out = append(out, id)
-	}
-
-	for _, m := range chain {
-		if id := merged.Defaults[m]; id != "" {
-			add(id)
-		}
-		for _, id := range merged.Added[m] {
-			add(id)
-		}
-	}
-
-	for _, m := range chain {
-		for _, id := range cacheAppsForMime(m) {
-			add(id)
-		}
-	}
-
-	for _, entry := range AllEntries() {
-		if entry.Hidden {
-			continue
-		}
-		if entrySupportsMime(entry, chain) {
-			add(entry.ID)
-		}
-	}
-
-	return out
-}
-
-func QueryDefaults(mimeTypes []string) map[string]string {
-	out := make(map[string]string, len(mimeTypes))
-	for _, m := range mimeTypes {
-		out[m] = GetDefault(m)
-	}
-	return out
-}
@@ -1,233 +0,0 @@
-package desktop
-
-import (
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-)
-
-func setupFakeXDG(t *testing.T) (configHome, dataHome string) {
-	t.Helper()
-	tmp := t.TempDir()
-	configHome = filepath.Join(tmp, "config")
-	dataHome = filepath.Join(tmp, "data")
-	if err := os.MkdirAll(filepath.Join(dataHome, "applications"), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.MkdirAll(configHome, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	t.Setenv("XDG_CONFIG_HOME", configHome)
-	t.Setenv("XDG_DATA_HOME", dataHome)
-	t.Setenv("XDG_DATA_DIRS", dataHome)
-	t.Setenv("XDG_CONFIG_DIRS", configHome)
-	InvalidateCache()
-
-	mimeCacheReloadMu.Lock()
-	mimeCacheMap = nil
-	mimeCacheReloadMu.Unlock()
-	aliasReloadMu.Lock()
-	aliasMap = nil
-	subclassMap = nil
-	aliasReloadMu.Unlock()
-
-	return configHome, dataHome
-}
-
-func writeFile(t *testing.T, path, content string) {
-	t.Helper()
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseDesktopEntry(t *testing.T) {
-	_, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "applications", "test.desktop"), `[Desktop Entry]
-Type=Application
-Name=Test
-Exec=test %f
-Icon=test
-MimeType=application/pdf;image/png;
-Categories=Office;Viewer;
-NoDisplay=false
-`)
-
-	entry := EntryByID("test.desktop")
-	if entry == nil {
-		t.Fatal("entry not found")
-	}
-	if entry.Name != "Test" {
-		t.Errorf("Name = %q", entry.Name)
-	}
-	if len(entry.MimeTypes) != 2 || entry.MimeTypes[0] != "application/pdf" {
-		t.Errorf("MimeTypes = %v", entry.MimeTypes)
-	}
-	if len(entry.Categories) != 2 || entry.Categories[1] != "Viewer" {
-		t.Errorf("Categories = %v", entry.Categories)
-	}
-}
-
-func TestSetGetDefault(t *testing.T) {
-	configHome, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "applications", "foo.desktop"), `[Desktop Entry]
-Type=Application
-Name=Foo
-MimeType=application/pdf;
-`)
-	writeFile(t, filepath.Join(dataHome, "applications", "bar.desktop"), `[Desktop Entry]
-Type=Application
-Name=Bar
-MimeType=application/pdf;
-`)
-
-	if err := SetDefault("application/pdf", "bar.desktop"); err != nil {
-		t.Fatal(err)
-	}
-
-	if got := GetDefault("application/pdf"); got != "bar.desktop" {
-		t.Errorf("GetDefault = %q want bar.desktop", got)
-	}
-
-	data, err := os.ReadFile(filepath.Join(configHome, "mimeapps.list"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !contains(string(data), "application/pdf=bar.desktop") {
-		t.Errorf("mimeapps.list missing default:\n%s", string(data))
-	}
-}
-
-func TestSetDefaultBypassesMimeSupportCheck(t *testing.T) {
-	configHome, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "applications", "dms-open.desktop"), `[Desktop Entry]
-Type=Application
-Name=DMS
-MimeType=x-scheme-handler/http;
-`)
-
-	if err := SetDefault("application/pdf", "dms-open.desktop"); err != nil {
-		t.Fatal(err)
-	}
-
-	if got := GetDefault("application/pdf"); got != "dms-open.desktop" {
-		t.Errorf("GetDefault = %q, want dms-open.desktop (native impl must not enforce MimeType= check)", got)
-	}
-
-	data, _ := os.ReadFile(filepath.Join(configHome, "mimeapps.list"))
-	if !contains(string(data), "application/pdf=dms-open.desktop") {
-		t.Errorf("mimeapps.list missing override:\n%s", string(data))
-	}
-}
-
-func TestAliasResolution(t *testing.T) {
-	_, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "mime", "aliases"), "text/javascript application/javascript\n")
-	writeFile(t, filepath.Join(dataHome, "applications", "editor.desktop"), `[Desktop Entry]
-Type=Application
-Name=Editor
-MimeType=application/javascript;
-`)
-	writeFile(t, filepath.Join(dataHome, "applications", "mimeinfo.cache"), `[MIME Cache]
-application/javascript=editor.desktop;
-`)
-
-	if got := GetDefault("text/javascript"); got != "editor.desktop" {
-		t.Errorf("GetDefault(text/javascript) = %q want editor.desktop (alias resolution)", got)
-	}
-}
-
-func TestSetDefaultsBatch(t *testing.T) {
-	configHome, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "applications", "dms-open.desktop"), `[Desktop Entry]
-Type=Application
-Name=DMS
-MimeType=x-scheme-handler/http;
-`)
-
-	mimes := []string{
-		"text/plain", "text/x-csrc", "text/x-python",
-		"text/x-shellscript", "application/json",
-	}
-	if err := SetDefaults(mimes, "dms-open.desktop"); err != nil {
-		t.Fatal(err)
-	}
-
-	data, err := os.ReadFile(filepath.Join(configHome, "mimeapps.list"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, m := range mimes {
-		if !contains(string(data), m+"=dms-open.desktop") {
-			t.Errorf("missing %s default in mimeapps.list:\n%s", m, string(data))
-		}
-	}
-}
-
-func TestConcurrentSetDefaultNoCorruption(t *testing.T) {
-	configHome, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "applications", "app.desktop"), `[Desktop Entry]
-Type=Application
-Name=App
-`)
-
-	mimes := []string{
-		"a/1", "a/2", "a/3", "a/4", "a/5", "a/6", "a/7",
-	}
-
-	var wg sync.WaitGroup
-	for _, m := range mimes {
-		wg.Add(1)
-		go func(m string) {
-			defer wg.Done()
-			if err := SetDefault(m, "app.desktop"); err != nil {
-				t.Errorf("SetDefault(%s) failed: %v", m, err)
-			}
-		}(m)
-	}
-	wg.Wait()
-
-	data, err := os.ReadFile(filepath.Join(configHome, "mimeapps.list"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, m := range mimes {
-		if !contains(string(data), m+"=app.desktop") {
-			t.Errorf("lost write for %s — concurrent writes corrupted file:\n%s", m, string(data))
-		}
-	}
-}
-
-func TestMimeCacheOrdering(t *testing.T) {
-	_, dataHome := setupFakeXDG(t)
-	writeFile(t, filepath.Join(dataHome, "applications", "a.desktop"), `[Desktop Entry]
-Type=Application
-Name=A
-MimeType=image/png;
-`)
-	writeFile(t, filepath.Join(dataHome, "applications", "b.desktop"), `[Desktop Entry]
-Type=Application
-Name=B
-MimeType=image/png;
-`)
-	writeFile(t, filepath.Join(dataHome, "applications", "mimeinfo.cache"), `[MIME Cache]
-image/png=b.desktop;a.desktop;
-`)
-
-	if got := GetDefault("image/png"); got != "b.desktop" {
-		t.Errorf("GetDefault should follow mimeinfo.cache order: got %q want b.desktop", got)
-	}
-}
-
-func contains(haystack, needle string) bool {
-	for i := 0; i+len(needle) <= len(haystack); i++ {
-		if haystack[i:i+len(needle)] == needle {
-			return true
-		}
-	}
-	return false
-}
@@ -1,226 +0,0 @@
-package desktop
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"slices"
-	"sort"
-	"strings"
-	"sync"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-)
-
-var mimeappsWriteMu sync.Mutex
-
-const (
-	groupDefaults = "Default Applications"
-	groupAdded    = "Added Associations"
-	groupRemoved  = "Removed Associations"
-)
-
-type MimeAssociations struct {
-	Defaults map[string]string
-	Added    map[string][]string
-	Removed  map[string][]string
-}
-
-func newAssociations() *MimeAssociations {
-	return &MimeAssociations{
-		Defaults: make(map[string]string),
-		Added:    make(map[string][]string),
-		Removed:  make(map[string][]string),
-	}
-}
-
-func mimeappsSearchPaths() []string {
-	var paths []string
-	seen := make(map[string]bool)
-
-	add := func(p string) {
-		if p == "" || seen[p] {
-			return
-		}
-		seen[p] = true
-		paths = append(paths, p)
-	}
-
-	add(filepath.Join(utils.XDGConfigHome(), "mimeapps.list"))
-
-	if env := os.Getenv("XDG_CONFIG_DIRS"); env != "" {
-		for d := range strings.SplitSeq(env, ":") {
-			add(filepath.Join(strings.TrimSpace(d), "mimeapps.list"))
-		}
-	} else {
-		add("/etc/xdg/mimeapps.list")
-	}
-
-	add(filepath.Join(utils.XDGDataHome(), "applications", "mimeapps.list"))
-
-	if env := os.Getenv("XDG_DATA_DIRS"); env != "" {
-		for d := range strings.SplitSeq(env, ":") {
-			add(filepath.Join(strings.TrimSpace(d), "applications", "mimeapps.list"))
-		}
-	} else {
-		add("/usr/local/share/applications/mimeapps.list")
-		add("/usr/share/applications/mimeapps.list")
-	}
-
-	return paths
-}
-
-func mimeappsWritePath() string {
-	return filepath.Join(utils.XDGConfigHome(), "mimeapps.list")
-}
-
-func readAssociations(path string) (*MimeAssociations, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	groups := parseGroups(data)
-	assoc := newAssociations()
-
-	if g := groups[groupDefaults]; g != nil {
-		for mime, val := range g.keys {
-			parts := splitList(val)
-			if len(parts) > 0 {
-				assoc.Defaults[mime] = parts[0]
-			}
-		}
-	}
-
-	if g := groups[groupAdded]; g != nil {
-		for mime, val := range g.keys {
-			assoc.Added[mime] = splitList(val)
-		}
-	}
-
-	if g := groups[groupRemoved]; g != nil {
-		for mime, val := range g.keys {
-			assoc.Removed[mime] = splitList(val)
-		}
-	}
-
-	return assoc, nil
-}
-
-func mergedAssociations() *MimeAssociations {
-	merged := newAssociations()
-
-	for _, path := range mimeappsSearchPaths() {
-		assoc, err := readAssociations(path)
-		if err != nil {
-			continue
-		}
-		for mime, app := range assoc.Defaults {
-			if _, ok := merged.Defaults[mime]; !ok {
-				merged.Defaults[mime] = app
-			}
-		}
-		for mime, apps := range assoc.Added {
-			merged.Added[mime] = append(merged.Added[mime], apps...)
-		}
-		for mime, apps := range assoc.Removed {
-			merged.Removed[mime] = append(merged.Removed[mime], apps...)
-		}
-	}
-
-	return merged
-}
-
-func writeUserMimeapps(update func(*MimeAssociations)) error {
-	mimeappsWriteMu.Lock()
-	defer mimeappsWriteMu.Unlock()
-
-	path := mimeappsWritePath()
-
-	assoc, err := readAssociations(path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return err
-		}
-		assoc = newAssociations()
-	}
-
-	update(assoc)
-
-	var buf bytes.Buffer
-	w := bufio.NewWriter(&buf)
-
-	writeSection := func(name string, entries map[string]string) {
-		fmt.Fprintf(w, "[%s]\n", name)
-		keys := make([]string, 0, len(entries))
-		for k := range entries {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		for _, k := range keys {
-			fmt.Fprintf(w, "%s=%s\n", k, entries[k])
-		}
-		fmt.Fprintln(w)
-	}
-
-	flatten := func(m map[string][]string) map[string]string {
-		out := make(map[string]string, len(m))
-		for k, list := range m {
-			out[k] = strings.Join(list, ";") + ";"
-		}
-		return out
-	}
-
-	writeSection(groupDefaults, assoc.Defaults)
-	writeSection(groupAdded, flatten(assoc.Added))
-	writeSection(groupRemoved, flatten(assoc.Removed))
-
-	if err := w.Flush(); err != nil {
-		return err
-	}
-
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		return err
-	}
-	return os.WriteFile(path, buf.Bytes(), 0o644)
-}
-
-func setDefaultAssociation(mimeType, desktopID string) error {
-	return setDefaultAssociations([]string{mimeType}, desktopID)
-}
-
-func setDefaultAssociations(mimeTypes []string, desktopID string) error {
-	if !strings.HasSuffix(desktopID, ".desktop") {
-		desktopID += ".desktop"
-	}
-	return writeUserMimeapps(func(assoc *MimeAssociations) {
-		for _, mimeType := range mimeTypes {
-			if mimeType == "" {
-				continue
-			}
-			assoc.Defaults[mimeType] = desktopID
-			existing := assoc.Added[mimeType]
-			if !slices.Contains(existing, desktopID) {
-				assoc.Added[mimeType] = append(existing, desktopID)
-			}
-			removed, ok := assoc.Removed[mimeType]
-			if !ok {
-				continue
-			}
-			filtered := removed[:0]
-			for _, id := range removed {
-				if id != desktopID {
-					filtered = append(filtered, id)
-				}
-			}
-			switch {
-			case len(filtered) == 0:
-				delete(assoc.Removed, mimeType)
-			default:
-				assoc.Removed[mimeType] = filtered
-			}
-		}
-	})
-}
@@ -1,80 +0,0 @@
-package desktop
-
-import (
-	"bufio"
-	"bytes"
-	"strings"
-)
-
-type group struct {
-	keys map[string]string
-}
-
-func parseGroups(data []byte) map[string]*group {
-	groups := make(map[string]*group)
-	var current *group
-
-	scanner := bufio.NewScanner(bytes.NewReader(data))
-	scanner.Buffer(make([]byte, 64*1024), 1024*1024)
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		if line == "" || line[0] == '#' {
-			continue
-		}
-
-		if line[0] == '[' && strings.HasSuffix(line, "]") {
-			name := line[1 : len(line)-1]
-			g, ok := groups[name]
-			if !ok {
-				g = &group{keys: make(map[string]string)}
-				groups[name] = g
-			}
-			current = g
-			continue
-		}
-
-		if current == nil {
-			continue
-		}
-
-		eq := strings.IndexByte(line, '=')
-		if eq <= 0 {
-			continue
-		}
-
-		key := strings.TrimSpace(line[:eq])
-		if bracket := strings.IndexByte(key, '['); bracket > 0 {
-			key = key[:bracket]
-		}
-		if _, ok := current.keys[key]; ok {
-			continue
-		}
-		current.keys[key] = strings.TrimSpace(line[eq+1:])
-	}
-
-	return groups
-}
-
-func splitList(value string) []string {
-	if value == "" {
-		return nil
-	}
-	parts := strings.Split(value, ";")
-	out := make([]string, 0, len(parts))
-	for _, p := range parts {
-		p = strings.TrimSpace(p)
-		if p == "" {
-			continue
-		}
-		out = append(out, p)
-	}
-	return out
-}
-
-func parseBool(value string) bool {
-	switch strings.ToLower(strings.TrimSpace(value)) {
-	case "true", "1", "yes":
-		return true
-	}
-	return false
-}
@@ -112,11 +112,6 @@ func (a *ArchDistribution) DetectDependenciesWithTerminal(ctx context.Context, w
 		dependencies = append(dependencies, a.detectXwaylandSatellite())
 	}

-	// Mango-specific tools (dwl-based, uses xwayland-satellite like niri)
-	if wm == deps.WindowManagerMango {
-		dependencies = append(dependencies, a.detectXwaylandSatellite())
-	}
-
 	dependencies = append(dependencies, a.detectMatugen())
 	dependencies = append(dependencies, a.detectDgop())

@@ -177,11 +172,6 @@ func (a *ArchDistribution) isInSystemRepo(pkg string) bool {
 	return exec.Command("pacman", "-Si", pkg).Run() == nil
 }

-// isSonameProvides reports whether dep is a shared-library soname
-func isSonameProvides(dep string) bool {
-	return strings.HasSuffix(dep, ".so") || strings.Contains(dep, ".so.")
-}
-
 func (a *ArchDistribution) GetPackageMapping(wm deps.WindowManager) map[string]PackageMapping {
 	return a.GetPackageMappingWithVariants(wm, make(map[string]deps.PackageVariant))
 }
@@ -209,9 +199,6 @@ func (a *ArchDistribution) GetPackageMappingWithVariants(wm deps.WindowManager,
 	case deps.WindowManagerNiri:
 		packages["niri"] = a.getNiriMapping(variants["niri"])
 		packages["xwayland-satellite"] = PackageMapping{Name: "xwayland-satellite", Repository: RepoTypeSystem}
-	case deps.WindowManagerMango:
-		packages["mango"] = a.getMangoMapping(variants["mango"])
-		packages["xwayland-satellite"] = PackageMapping{Name: "xwayland-satellite", Repository: RepoTypeSystem}
 	}

 	return packages
@@ -221,7 +208,8 @@ func (a *ArchDistribution) getQuickshellMapping(variant deps.PackageVariant) Pac
 	if forceQuickshellGit || variant == deps.VariantGit {
 		return PackageMapping{Name: "quickshell-git", Repository: RepoTypeAUR}
 	}
-	return PackageMapping{Name: "quickshell", Repository: RepoTypeSystem}
+	// ! TODO - for now we're only forcing quickshell-git on ARCH, as other distros use DL repos which pin a newer quickshell
+	return PackageMapping{Name: "quickshell-git", Repository: RepoTypeAUR}
 }

 func (a *ArchDistribution) getHyprlandMapping(_ deps.PackageVariant) PackageMapping {
@@ -235,13 +223,6 @@ func (a *ArchDistribution) getNiriMapping(variant deps.PackageVariant) PackageMa
 	return PackageMapping{Name: "niri", Repository: RepoTypeSystem}
 }

-func (a *ArchDistribution) getMangoMapping(variant deps.PackageVariant) PackageMapping {
-	if variant == deps.VariantGit {
-		return PackageMapping{Name: "mangowm-git", Repository: RepoTypeAUR}
-	}
-	return PackageMapping{Name: "mangowm", Repository: RepoTypeAUR}
-}
-
 func (a *ArchDistribution) getMatugenMapping(variant deps.PackageVariant) PackageMapping {
 	if runtime.GOARCH == "arm64" {
 		return PackageMapping{Name: "matugen-git", Repository: RepoTypeAUR}
@@ -351,12 +332,6 @@ func (a *ArchDistribution) InstallPackages(ctx context.Context, dependencies []d
 		aurPkgs = slices.DeleteFunc(aurPkgs, func(p string) bool { return p == "quickshell-git" })
 	}

-	if slices.Contains(systemPkgs, "quickshell") && a.packageInstalled("quickshell-git") {
-		if err := a.removeQuickshellGit(ctx, sudoPassword, progressChan); err != nil {
-			return fmt.Errorf("failed to remove quickshell-git: %w", err)
-		}
-	}
-
 	// Phase 3: System Packages
 	if len(systemPkgs) > 0 {
 		progressChan <- InstallProgressMsg{
@@ -474,20 +449,6 @@ func (a *ArchDistribution) categorizePackages(dependencies []deps.Dependency, wm
 	return systemPkgs, aurPkgs, manualPkgs, variantMap
 }

-func (a *ArchDistribution) removeQuickshellGit(ctx context.Context, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
-	progressChan <- InstallProgressMsg{
-		Phase:       PhaseSystemPackages,
-		Progress:    0.33,
-		Step:        "Removing quickshell-git...",
-		IsComplete:  false,
-		NeedsSudo:   true,
-		CommandInfo: "sudo pacman -Rdd --noconfirm quickshell-git",
-		LogOutput:   "Removing quickshell-git so stable quickshell can be installed",
-	}
-	cmd := privesc.ExecCommand(ctx, sudoPassword, "pacman -Rdd --noconfirm quickshell-git")
-	return a.runWithProgress(cmd, progressChan, PhaseSystemPackages, 0.33, 0.35)
-}
-
 func (a *ArchDistribution) preinstallQuickshellGit(ctx context.Context, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
 	if a.packageInstalled("quickshell-git") {
 		return nil
@@ -744,7 +705,7 @@ func (a *ArchDistribution) installSingleAURPackageInternal(ctx context.Context,
 				continue
 			}
 			seen[dep] = true
-			if isSonameProvides(dep) || a.isInSystemRepo(dep) {
+			if a.isInSystemRepo(dep) {
 				systemPkgs = append(systemPkgs, dep)
 			} else {
 				aurPkgs = append(aurPkgs, dep)
@@ -232,7 +232,7 @@ func (b *BaseDistribution) detectQuickshell() deps.Dependency {
 	}

 	versionStr := string(output)
-	versionRegex := regexp.MustCompile(`(?i)quickshell (\d+\.\d+\.\d+)`)
+	versionRegex := regexp.MustCompile(`quickshell (\d+\.\d+\.\d+)`)
 	matches := versionRegex.FindStringSubmatch(versionStr)

 	if len(matches) < 2 {
@@ -337,36 +337,6 @@ func (b *BaseDistribution) detectWindowManager(wm deps.WindowManager) deps.Depen
 			Variant:     variant,
 			CanToggle:   true,
 		}
-	case deps.WindowManagerMango:
-		status := deps.StatusMissing
-		variant := deps.VariantStable
-		version := ""
-
-		if b.commandExists("mango") {
-			status = deps.StatusInstalled
-			cmd := exec.Command("mango", "-v")
-			if output, err := cmd.Output(); err == nil {
-				outStr := string(output)
-				if strings.Contains(outStr, "git") || strings.Contains(outStr, "dirty") {
-					variant = deps.VariantGit
-				}
-				if versionRegex := regexp.MustCompile(`(\d+\.\d+\.\d+)`); versionRegex.MatchString(outStr) {
-					matches := versionRegex.FindStringSubmatch(outStr)
-					if len(matches) > 1 {
-						version = matches[1]
-					}
-				}
-			}
-		}
-		return deps.Dependency{
-			Name:        "mango",
-			Status:      status,
-			Version:     version,
-			Description: "dwl-based dynamic tiling Wayland compositor",
-			Required:    true,
-			Variant:     variant,
-			CanToggle:   true,
-		}
 	default:
 		return deps.Dependency{
 			Name:        "unknown-wm",
@@ -77,11 +77,7 @@ func (f *FedoraDistribution) DetectDependenciesWithTerminal(ctx context.Context,

 	// Common detections using base methods
 	dependencies = append(dependencies, f.detectGit())
-	wmDep := f.detectWindowManager(wm)
-	if wm == deps.WindowManagerMango {
-		wmDep.Description = "MangoWM (Wayland compositor) — the Terra repo will be enabled automatically to install it"
-	}
-	dependencies = append(dependencies, wmDep)
+	dependencies = append(dependencies, f.detectWindowManager(wm))
 	dependencies = append(dependencies, f.detectQuickshell())
 	dependencies = append(dependencies, f.detectDMSGreeter())
 	dependencies = append(dependencies, f.detectXDGPortal())
@@ -97,11 +93,6 @@ func (f *FedoraDistribution) DetectDependenciesWithTerminal(ctx context.Context,
 		dependencies = append(dependencies, f.detectXwaylandSatellite())
 	}

-	// Mango-specific tools (dwl-based, uses xwayland-satellite like niri)
-	if wm == deps.WindowManagerMango {
-		dependencies = append(dependencies, f.detectXwaylandSatellite())
-	}
-
 	dependencies = append(dependencies, f.detectMatugen())
 	dependencies = append(dependencies, f.detectDgop())

@@ -148,10 +139,6 @@ func (f *FedoraDistribution) GetPackageMappingWithVariants(wm deps.WindowManager
 	case deps.WindowManagerNiri:
 		packages["niri"] = f.getNiriMapping(variants["niri"])
 		packages["xwayland-satellite"] = PackageMapping{Name: "xwayland-satellite", Repository: RepoTypeSystem}
-	case deps.WindowManagerMango:
-		// mangowm resolves via Terra, enabled automatically by enableTerraRepo.
-		packages["mango"] = PackageMapping{Name: "mangowm", Repository: RepoTypeSystem}
-		packages["xwayland-satellite"] = PackageMapping{Name: "xwayland-satellite", Repository: RepoTypeSystem}
 	}

 	return packages
@@ -172,7 +159,7 @@ func (f *FedoraDistribution) getDmsMapping(variant deps.PackageVariant) PackageM
 }

 func (f *FedoraDistribution) getHyprlandMapping(_ deps.PackageVariant) PackageMapping {
-	return PackageMapping{Name: "hyprland", Repository: RepoTypeCOPR, RepoURL: "lionheartp/Hyprland"}
+	return PackageMapping{Name: "hyprland", Repository: RepoTypeCOPR, RepoURL: "sdegler/hyprland"}
 }

 func (f *FedoraDistribution) getNiriMapping(variant deps.PackageVariant) PackageMapping {
@@ -310,22 +297,6 @@ func (f *FedoraDistribution) InstallPackages(ctx context.Context, dependencies [
 		}
 	}

-	// Phase 2b: Enable Terra repo for MangoWM (not in Fedora's repos). Must run
-	// before the DNF phase so `mangowm` resolves.
-	if wm == deps.WindowManagerMango {
-		progressChan <- InstallProgressMsg{
-			Phase:      PhaseSystemPackages,
-			Progress:   0.25,
-			Step:       "Enabling Terra repository for MangoWM...",
-			IsComplete: false,
-			NeedsSudo:  true,
-			LogOutput:  "Setting up the Terra repo (fyralabs) to provide mango",
-		}
-		if err := f.enableTerraRepo(ctx, sudoPassword, progressChan); err != nil {
-			return fmt.Errorf("failed to enable Terra repository: %w", err)
-		}
-	}
-
 	// Phase 3: System Packages (DNF)
 	if len(dnfPkgs) > 0 {
 		progressChan <- InstallProgressMsg{
@@ -452,30 +423,6 @@ func (f *FedoraDistribution) extractPackageNames(packages []PackageMapping) []st
 	return names
 }

-// enableTerraRepo registers the persistent Terra repo (via terra-release) so
-// `mangowm` resolves in the DNF phase. $releasever is single-quoted so dnf, not
-// the shell, expands it.
-func (f *FedoraDistribution) enableTerraRepo(ctx context.Context, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
-	// Skip if Terra is already configured
-	if exec.CommandContext(ctx, "sh", "-c",
-		"rpm -q terra-release >/dev/null 2>&1 || test -f /etc/yum.repos.d/terra.repo").Run() == nil {
-		f.log("Terra repository already configured, skipping enable")
-		return nil
-	}
-
-	f.log("Enabling Terra repository (fyralabs) for mango...")
-	cmd := privesc.ExecCommand(ctx, sudoPassword,
-		`dnf install -y --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release 2>&1`)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		f.logError("failed to enable Terra repository", err)
-		f.log(fmt.Sprintf("Terra enable output: %s", string(output)))
-		return fmt.Errorf("failed to enable Terra repository: %w", err)
-	}
-	f.log(fmt.Sprintf("Terra repository enabled: %s", string(output)))
-	return nil
-}
-
 func (f *FedoraDistribution) enableCOPRRepos(ctx context.Context, coprPkgs []PackageMapping, sudoPassword string, progressChan chan<- InstallProgressMsg) error {
 	enabledRepos := make(map[string]bool)

@@ -106,11 +106,6 @@ func (g *GentooDistribution) DetectDependenciesWithTerminal(ctx context.Context,
 		dependencies = append(dependencies, g.detectXwaylandSatellite())
 	}

-	// Mango-specific tools (dwl-based, uses xwayland-satellite like niri)
-	if wm == deps.WindowManagerMango {
-		dependencies = append(dependencies, g.detectXwaylandSatellite())
-	}
-
 	dependencies = append(dependencies, g.detectMatugen())
 	dependencies = append(dependencies, g.detectDgop())

@@ -121,20 +116,6 @@ func (g *GentooDistribution) detectXDGPortal() deps.Dependency {
 	return g.detectPackage("xdg-desktop-portal-gtk", "Desktop integration portal for GTK", g.packageInstalled("sys-apps/xdg-desktop-portal-gtk"))
 }

-func (g *GentooDistribution) detectDMS() deps.Dependency {
-	dep := deps.Dependency{
-		Name:        "dms (DankMaterialShell)",
-		Status:      deps.StatusMissing,
-		Description: "Desktop Management System configuration",
-		Required:    true,
-		CanToggle:   false,
-	}
-	if g.packageInstalled("gui-apps/dankmaterialshell") {
-		dep.Status = deps.StatusInstalled
-	}
-	return dep
-}
-
 func (g *GentooDistribution) detectXwaylandSatellite() deps.Dependency {
 	return g.detectPackage("xwayland-satellite", "Xwayland support", g.packageInstalled("gui-apps/xwayland-satellite"))
 }
@@ -169,8 +150,8 @@ func (g *GentooDistribution) GetPackageMappingWithVariants(wm deps.WindowManager

 		"quickshell":              g.getQuickshellMapping(variants["quickshell"]),
 		"matugen":                 {Name: "x11-misc/matugen", Repository: RepoTypeGURU, AcceptKeywords: archKeyword},
-		"dms (DankMaterialShell)": g.getDmsMapping(),
-		"dgop":                    {Name: "gui-apps/dgop", Repository: RepoTypeGURU, AcceptKeywords: archKeyword},
+		"dms (DankMaterialShell)": g.getDmsMapping(variants["dms (DankMaterialShell)"]),
+		"dgop":                    {Name: "dgop", Repository: RepoTypeManual, BuildFunc: "installDgop"},
 	}

 	switch wm {
@@ -181,10 +162,6 @@ func (g *GentooDistribution) GetPackageMappingWithVariants(wm deps.WindowManager
 	case deps.WindowManagerNiri:
 		packages["niri"] = g.getNiriMapping(variants["niri"])
 		packages["xwayland-satellite"] = PackageMapping{Name: "gui-apps/xwayland-satellite", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}
-	case deps.WindowManagerMango:
-		packages["mango"] = g.getMangoMapping(variants["mango"])
-		packages["scenefx"] = PackageMapping{Name: "gui-libs/scenefx", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}
-		packages["xwayland-satellite"] = PackageMapping{Name: "gui-apps/xwayland-satellite", Repository: RepoTypeGURU, AcceptKeywords: archKeyword}
 	}

 	return packages
@@ -194,8 +171,8 @@ func (g *GentooDistribution) getQuickshellMapping(_ deps.PackageVariant) Package
 	return PackageMapping{Name: "gui-apps/quickshell", Repository: RepoTypeGURU, UseFlags: "breakpad jemalloc sockets wayland layer-shell session-lock toplevel-management screencopy X pipewire tray mpris pam hyprland hyprland-global-shortcuts hyprland-focus-grab i3 i3-ipc bluetooth", AcceptKeywords: "**"}
 }

-func (g *GentooDistribution) getDmsMapping() PackageMapping {
-	return PackageMapping{Name: "gui-apps/dankmaterialshell", Repository: RepoTypeGURU, AcceptKeywords: g.getArchKeyword()}
+func (g *GentooDistribution) getDmsMapping(_ deps.PackageVariant) PackageMapping {
+	return PackageMapping{Name: "dms", Repository: RepoTypeManual, BuildFunc: "installDankMaterialShell"}
 }

 func (g *GentooDistribution) getHyprlandMapping(_ deps.PackageVariant) PackageMapping {
@@ -206,10 +183,6 @@ func (g *GentooDistribution) getNiriMapping(_ deps.PackageVariant) PackageMappin
 	return PackageMapping{Name: "gui-wm/niri", Repository: RepoTypeGURU, UseFlags: "dbus screencast", AcceptKeywords: g.getArchKeyword()}
 }

-func (g *GentooDistribution) getMangoMapping(_ deps.PackageVariant) PackageMapping {
-	return PackageMapping{Name: "gui-wm/mangowm", Repository: RepoTypeGURU, AcceptKeywords: g.getArchKeyword()}
-}
-
 func (g *GentooDistribution) getPrerequisites() []string {
 	return []string{
 		"app-eselect/eselect-repository",
@@ -56,7 +56,7 @@ func GetOSInfo() (*OSInfo, error) {
 		}

 		key := parts[0]
-		value := strings.Trim(parts[1], "\"'")
+		value := strings.Trim(parts[1], "\"")

 		switch key {
 		case "ID":
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
@@ -192,421 +191,6 @@ func upsertDefaultSession(configContent, greeterUser, command string) string {
 	return strings.Join(out, "\n")
 }

-func removeTomlSection(configContent, sectionName string) string {
-	lines := strings.Split(configContent, "\n")
-	var out []string
-	inSection := false
-
-	for _, line := range lines {
-		if section, ok := parseTomlSection(line); ok {
-			inSection = section == sectionName
-			if inSection {
-				continue
-			}
-			out = append(out, line)
-			continue
-		}
-
-		if inSection {
-			continue
-		}
-
-		out = append(out, line)
-	}
-
-	result := strings.TrimRight(strings.Join(out, "\n"), "\n")
-	if result != "" {
-		result += "\n"
-	}
-	return result
-}
-
-func stripDesktopExecCodes(execLine string) string {
-	fields := strings.Fields(execLine)
-	cleaned := make([]string, 0, len(fields))
-	for _, field := range fields {
-		if strings.HasPrefix(field, "%") {
-			continue
-		}
-		cleaned = append(cleaned, field)
-	}
-	return strings.Join(cleaned, " ")
-}
-
-func formatInitialSessionCommand(sessionExec string) string {
-	execLine := strings.TrimSpace(stripDesktopExecCodes(sessionExec))
-	if execLine == "" {
-		return `command = ""`
-	}
-	escaped := strings.ReplaceAll(execLine, `'`, `'\''`)
-	inner := fmt.Sprintf("env XDG_SESSION_TYPE=wayland sh -c 'exec %s'", escaped)
-	tomlEscaped := strings.ReplaceAll(inner, `\`, `\\`)
-	tomlEscaped = strings.ReplaceAll(tomlEscaped, `"`, `\"`)
-	return fmt.Sprintf(`command = "%s"`, tomlEscaped)
-}
-
-func upsertInitialSession(configContent, loginUser, sessionExec string, enabled bool) string {
-	if !enabled {
-		return removeTomlSection(configContent, "initial_session")
-	}
-
-	commandLine := formatInitialSessionCommand(sessionExec)
-	lines := strings.Split(configContent, "\n")
-	var out []string
-
-	inInitialSession := false
-	foundInitialSession := false
-	initialSessionUserSet := false
-	initialSessionCommandSet := false
-
-	appendInitialSessionFields := func() {
-		if !initialSessionUserSet {
-			out = append(out, fmt.Sprintf(`user = "%s"`, loginUser))
-		}
-		if !initialSessionCommandSet {
-			out = append(out, commandLine)
-		}
-	}
-
-	for _, line := range lines {
-		if section, ok := parseTomlSection(line); ok {
-			if inInitialSession {
-				appendInitialSessionFields()
-			}
-
-			inInitialSession = section == "initial_session"
-			if inInitialSession {
-				foundInitialSession = true
-				initialSessionUserSet = false
-				initialSessionCommandSet = false
-			}
-
-			out = append(out, line)
-			continue
-		}
-
-		if inInitialSession {
-			trimmed := stripTomlComment(line)
-			if strings.HasPrefix(trimmed, "user =") || strings.HasPrefix(trimmed, "user=") {
-				out = append(out, fmt.Sprintf(`user = "%s"`, loginUser))
-				initialSessionUserSet = true
-				continue
-			}
-
-			if strings.HasPrefix(trimmed, "command =") || strings.HasPrefix(trimmed, "command=") {
-				if !initialSessionCommandSet {
-					out = append(out, commandLine)
-					initialSessionCommandSet = true
-				}
-				continue
-			}
-		}
-
-		out = append(out, line)
-	}
-
-	if inInitialSession {
-		appendInitialSessionFields()
-	}
-
-	if !foundInitialSession {
-		if len(out) > 0 && strings.TrimSpace(out[len(out)-1]) != "" {
-			out = append(out, "")
-		}
-		out = append(out, "[initial_session]")
-		out = append(out, fmt.Sprintf(`user = "%s"`, loginUser))
-		out = append(out, commandLine)
-	}
-
-	return strings.Join(out, "\n")
-}
-
-type greeterAutoLoginConfig struct {
-	GreeterAutoLogin           bool `json:"greeterAutoLogin"`
-	GreeterRememberLastUser    bool `json:"greeterRememberLastUser"`
-	GreeterRememberLastSession bool `json:"greeterRememberLastSession"`
-}
-
-type greeterAutoLoginMemory struct {
-	LastSuccessfulUser string `json:"lastSuccessfulUser"`
-	LastSessionID      string `json:"lastSessionId"`
-	LastSessionExec    string `json:"lastSessionExec"`
-	AutoLoginEnabled   bool   `json:"autoLoginEnabled"`
-}
-
-func readGreeterAutoLoginConfig(settingsPath string) (greeterAutoLoginConfig, error) {
-	cfg := greeterAutoLoginConfig{
-		GreeterRememberLastUser:    true,
-		GreeterRememberLastSession: true,
-	}
-	data, err := os.ReadFile(settingsPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return cfg, nil
-		}
-		return cfg, err
-	}
-	if err := json.Unmarshal(data, &cfg); err != nil {
-		return cfg, fmt.Errorf("failed to parse settings at %s: %w", settingsPath, err)
-	}
-	return cfg, nil
-}
-
-func readGreeterAutoLoginMemory(memoryPath string) (greeterAutoLoginMemory, error) {
-	var mem greeterAutoLoginMemory
-	data, err := os.ReadFile(memoryPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return mem, nil
-		}
-		return mem, err
-	}
-	if err := json.Unmarshal(data, &mem); err != nil {
-		return mem, fmt.Errorf("failed to parse greeter memory at %s: %w", memoryPath, err)
-	}
-	return mem, nil
-}
-
-func execFromDesktopFile(path string) (string, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return "", err
-	}
-	for line := range strings.SplitSeq(string(data), "\n") {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "Exec=") {
-			return strings.TrimSpace(trimmed[len("Exec="):]), nil
-		}
-	}
-	return "", fmt.Errorf("no Exec= line found in %s", path)
-}
-
-func resolveGreeterAutoLoginState(cacheDir, homeDir string) (enabled bool, loginUser string, sessionExec string, err error) {
-	settingsPath := filepath.Join(cacheDir, "settings.json")
-	if _, statErr := os.Stat(settingsPath); statErr != nil {
-		settingsPath = filepath.Join(homeDir, ".config", "DankMaterialShell", "settings.json")
-	}
-
-	cfg, err := readGreeterAutoLoginConfig(settingsPath)
-	if err != nil {
-		return false, "", "", err
-	}
-
-	memoryPath := filepath.Join(cacheDir, ".local/state/memory.json")
-	mem, err := readGreeterAutoLoginMemory(memoryPath)
-	if err != nil {
-		return false, "", "", err
-	}
-
-	enabled = cfg.GreeterAutoLogin
-	if !enabled {
-		return false, "", "", nil
-	}
-
-	if !cfg.GreeterRememberLastUser || !cfg.GreeterRememberLastSession {
-		return true, "", "", nil
-	}
-
-	loginUser = mem.LastSuccessfulUser
-	if loginUser == "" {
-		current, userErr := user.Current()
-		if userErr != nil {
-			return true, "", "", userErr
-		}
-		loginUser = current.Username
-	}
-
-	sessionExec = mem.LastSessionExec
-	if sessionExec == "" && mem.LastSessionID != "" {
-		sessionExec, err = execFromDesktopFile(mem.LastSessionID)
-		if err != nil {
-			sessionExec = ""
-		}
-	}
-
-	return true, loginUser, sessionExec, nil
-}
-
-func writeGreetdConfig(configPath, content string, logFunc func(string), sudoPassword, successMsg string) error {
-	if err := backupFileIfExists(sudoPassword, configPath, ".backup"); err != nil {
-		return fmt.Errorf("failed to backup greetd config: %w", err)
-	}
-
-	tmpFile, err := os.CreateTemp("", "greetd-config-*.toml")
-	if err != nil {
-		return fmt.Errorf("failed to create temp greetd config: %w", err)
-	}
-	defer os.Remove(tmpFile.Name())
-
-	if _, err := tmpFile.WriteString(content); err != nil {
-		_ = tmpFile.Close()
-		return fmt.Errorf("failed to write temp greetd config: %w", err)
-	}
-	if err := tmpFile.Close(); err != nil {
-		return fmt.Errorf("failed to close temp greetd config: %w", err)
-	}
-
-	if err := privesc.Run(context.Background(), sudoPassword, "mkdir", "-p", "/etc/greetd"); err != nil {
-		return fmt.Errorf("failed to create /etc/greetd: %w", err)
-	}
-
-	if err := privesc.Run(context.Background(), sudoPassword, "install", "-o", "root", "-g", "root", "-m", "0644", tmpFile.Name(), configPath); err != nil {
-		return fmt.Errorf("failed to install greetd config: %w", err)
-	}
-
-	if logFunc != nil && successMsg != "" {
-		logFunc(successMsg)
-	}
-	return nil
-}
-
-func clearGreeterAutoLoginMemory(memoryPath, sudoPassword string) error {
-	data, err := readGreeterMemoryFile(memoryPath, sudoPassword)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	if len(strings.TrimSpace(string(data))) == 0 {
-		return nil
-	}
-	var raw map[string]json.RawMessage
-	if err := json.Unmarshal(data, &raw); err != nil {
-		return fmt.Errorf("failed to parse greeter memory at %s: %w", memoryPath, err)
-	}
-	if _, ok := raw["autoLoginEnabled"]; !ok {
-		return nil
-	}
-	delete(raw, "autoLoginEnabled")
-	encoded, err := json.MarshalIndent(raw, "", "  ")
-	if err != nil {
-		return err
-	}
-	if len(encoded) == 0 || string(encoded) == "null" {
-		encoded = []byte("{}")
-	}
-	encoded = append(encoded, '\n')
-
-	if err := os.WriteFile(memoryPath, encoded, 0o644); err == nil {
-		return nil
-	} else if !os.IsPermission(err) {
-		return err
-	}
-
-	tmpFile, err := os.CreateTemp("", "greeter-memory-*.json")
-	if err != nil {
-		return fmt.Errorf("failed to create temp greeter memory file: %w", err)
-	}
-	defer os.Remove(tmpFile.Name())
-
-	if _, err := tmpFile.Write(encoded); err != nil {
-		_ = tmpFile.Close()
-		return fmt.Errorf("failed to write temp greeter memory file: %w", err)
-	}
-	if err := tmpFile.Close(); err != nil {
-		return fmt.Errorf("failed to close temp greeter memory file: %w", err)
-	}
-
-	greeterUser := DetectGreeterUser()
-	greeterGroup := DetectGreeterGroup()
-	owner := greeterUser + ":" + greeterGroup
-	if err := privesc.Run(context.Background(), sudoPassword, "install", "-o", greeterUser, "-g", greeterGroup, "-m", "0664", tmpFile.Name(), memoryPath); err != nil {
-		if fallbackErr := privesc.Run(context.Background(), sudoPassword, "install", "-o", "root", "-g", greeterGroup, "-m", "0664", tmpFile.Name(), memoryPath); fallbackErr != nil {
-			return fmt.Errorf("failed to install greeter memory file (preferred %s: %w; fallback root:%s: %v)", owner, err, greeterGroup, fallbackErr)
-		}
-	}
-	return nil
-}
-
-func readGreeterMemoryFile(memoryPath, sudoPassword string) ([]byte, error) {
-	data, err := os.ReadFile(memoryPath)
-	if err == nil || !os.IsPermission(err) {
-		return data, err
-	}
-
-	tmpFile, err := os.CreateTemp("", "greeter-memory-read-*")
-	if err != nil {
-		return nil, fmt.Errorf("failed to create temp file for greeter memory read: %w", err)
-	}
-	tmpPath := tmpFile.Name()
-	_ = tmpFile.Close()
-	defer os.Remove(tmpPath)
-
-	if err := privesc.Run(context.Background(), sudoPassword, "cp", "-f", memoryPath, tmpPath); err != nil {
-		return nil, fmt.Errorf("failed to read greeter memory at %s: %w", memoryPath, err)
-	}
-	return os.ReadFile(tmpPath)
-}
-
-func SyncGreetdAutoLogin(cacheDir, homeDir string, logFunc func(string), sudoPassword string) error {
-	enabled, loginUser, sessionExec, err := resolveGreeterAutoLoginState(cacheDir, homeDir)
-	if err != nil {
-		return err
-	}
-
-	configPath := "/etc/greetd/config.toml"
-	configContent := ""
-	if data, readErr := os.ReadFile(configPath); readErr == nil {
-		configContent = string(data)
-	} else if !os.IsNotExist(readErr) {
-		return fmt.Errorf("failed to read greetd config: %w", readErr)
-	}
-
-	if !enabled {
-		memoryPath := filepath.Join(cacheDir, ".local/state/memory.json")
-		if err := clearGreeterAutoLoginMemory(memoryPath, sudoPassword); err != nil && logFunc != nil {
-			logFunc(fmt.Sprintf("⚠ Warning: Failed to clear greeter auto-login memory flag: %v", err))
-		}
-		newConfig := upsertInitialSession(configContent, "", "", false)
-		if newConfig == configContent {
-			if logFunc != nil {
-				logFunc("✓ Greeter auto-login disabled")
-			}
-			return nil
-		}
-		return writeGreetdConfig(configPath, newConfig, logFunc, sudoPassword, "✓ Disabled greeter auto-login")
-	}
-
-	if loginUser == "" || sessionExec == "" {
-		if logFunc != nil {
-			logFunc("⚠ Greeter auto-login is enabled but user or session is not configured yet. Log in manually once, then run sync.")
-		}
-		newConfig := upsertInitialSession(configContent, "", "", false)
-		if newConfig != configContent {
-			return writeGreetdConfig(configPath, newConfig, nil, sudoPassword, "")
-		}
-		return nil
-	}
-
-	newConfig := upsertInitialSession(configContent, loginUser, sessionExec, true)
-	if newConfig == configContent {
-		if logFunc != nil {
-			logFunc(fmt.Sprintf("✓ Greeter auto-login already configured for %s", loginUser))
-		}
-		memoryPath := filepath.Join(cacheDir, ".local/state/memory.json")
-		_ = clearGreeterAutoLoginMemory(memoryPath, sudoPassword)
-		return nil
-	}
-
-	if err := writeGreetdConfig(configPath, newConfig, logFunc, sudoPassword, fmt.Sprintf("✓ Configured greeter auto-login for %s", loginUser)); err != nil {
-		return err
-	}
-	memoryPath := filepath.Join(cacheDir, ".local/state/memory.json")
-	if err := clearGreeterAutoLoginMemory(memoryPath, sudoPassword); err != nil && logFunc != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: Failed to clear greeter auto-login memory flag: %v", err))
-	}
-	return nil
-}
-
-func SyncGreeterAutoLoginOnly(logFunc func(string), sudoPassword string) error {
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("failed to get user home directory: %w", err)
-	}
-	return SyncGreetdAutoLogin(GreeterCacheDir, homeDir, logFunc, sudoPassword)
-}
-
 func DetectGreeterUser() string {
 	passwdData, err := os.ReadFile("/etc/passwd")
 	if err == nil {
@@ -680,9 +264,6 @@ func DetectCompositors() []string {
 	if utils.CommandExists("Hyprland") {
 		compositors = append(compositors, "Hyprland")
 	}
-	if utils.CommandExists("mango") {
-		compositors = append(compositors, "mango")
-	}

 	return compositors
 }
@@ -991,7 +572,6 @@ func EnsureGreeterCacheDir(logFunc func(string), sudoPassword string) error {
 	}

 	runtimeDirs := []string{
-		filepath.Join(cacheDir, "users"),
 		filepath.Join(cacheDir, ".local"),
 		filepath.Join(cacheDir, ".local", "state"),
 		filepath.Join(cacheDir, ".local", "share"),
@@ -1675,20 +1255,6 @@ func SyncDMSConfigs(dmsPath, compositor string, logFunc func(string), sudoPasswo
 		return fmt.Errorf("greeter wallpaper override sync failed: %w", err)
 	}

-	currentUser, err := user.Current()
-	if err != nil {
-		return fmt.Errorf("failed to resolve syncing user for per-user greeter cache: %w", err)
-	}
-	if err := syncUserGreeterCacheSlot(homeDir, cacheDir, currentUser.Username, state, logFunc, userSlotSyncOpts{
-		sudoPassword: sudoPassword,
-	}); err != nil {
-		return fmt.Errorf("per-user greeter cache sync failed: %w", err)
-	}
-
-	if err := SyncGreetdAutoLogin(cacheDir, homeDir, logFunc, sudoPassword); err != nil {
-		logFunc(fmt.Sprintf("⚠ Warning: greeter auto-login sync failed: %v", err))
-	}
-
 	if strings.ToLower(compositor) != "niri" {
 		return nil
 	}
@@ -2153,10 +1719,29 @@ vt = 1
 	commandLine := fmt.Sprintf(`command = "%s"`, commandValue)
 	newConfig := upsertDefaultSession(configContent, greeterUser, commandLine)

-	if err := writeGreetdConfig(configPath, newConfig, logFunc, sudoPassword, fmt.Sprintf("✓ Updated greetd configuration (user: %s, command: %s)", greeterUser, commandValue)); err != nil {
-		return err
+	tmpFile, err := os.CreateTemp("", "greetd-config-*.toml")
+	if err != nil {
+		return fmt.Errorf("failed to create temp greetd config: %w", err)
+	}
+	defer os.Remove(tmpFile.Name())
+
+	if _, err := tmpFile.WriteString(newConfig); err != nil {
+		_ = tmpFile.Close()
+		return fmt.Errorf("failed to write temp greetd config: %w", err)
+	}
+	if err := tmpFile.Close(); err != nil {
+		return fmt.Errorf("failed to close temp greetd config: %w", err)
 	}

+	if err := privesc.Run(context.Background(), sudoPassword, "mkdir", "-p", "/etc/greetd"); err != nil {
+		return fmt.Errorf("failed to create /etc/greetd: %w", err)
+	}
+
+	if err := privesc.Run(context.Background(), sudoPassword, "install", "-o", "root", "-g", "root", "-m", "0644", tmpFile.Name(), configPath); err != nil {
+		return fmt.Errorf("failed to install greetd config: %w", err)
+	}
+
+	logFunc(fmt.Sprintf("✓ Updated greetd configuration (user: %s, command: %s)", greeterUser, commandValue))
 	return nil
 }

@@ -3,7 +3,6 @@ package greeter
 import (
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 )

@@ -97,147 +96,3 @@ func TestResolveGreeterThemeSyncState(t *testing.T) {
 		})
 	}
 }
-
-func TestUpsertInitialSession(t *testing.T) {
-	t.Parallel()
-
-	baseConfig := `[terminal]
-vt = 1
-
-[default_session]
-user = "greeter"
-command = "/usr/bin/dms-greeter --command niri"
-`
-
-	t.Run("inserts initial session", func(t *testing.T) {
-		t.Parallel()
-		got := upsertInitialSession(baseConfig, "alice", "niri", true)
-		if !strings.Contains(got, "[initial_session]") {
-			t.Fatalf("expected [initial_session] section, got:\n%s", got)
-		}
-		if !strings.Contains(got, `user = "alice"`) {
-			t.Fatalf("expected alice user in initial session, got:\n%s", got)
-		}
-		if !strings.Contains(got, `env XDG_SESSION_TYPE=wayland sh -c 'exec niri'`) {
-			t.Fatalf("expected wrapped session command, got:\n%s", got)
-		}
-	})
-
-	t.Run("updates existing initial session", func(t *testing.T) {
-		t.Parallel()
-		existing := baseConfig + `
-[initial_session]
-user = "bob"
-command = "old-command"
-`
-		got := upsertInitialSession(existing, "alice", "Hyprland", true)
-		if strings.Contains(got, `user = "bob"`) {
-			t.Fatalf("expected bob to be replaced, got:\n%s", got)
-		}
-		if !strings.Contains(got, `exec Hyprland`) {
-			t.Fatalf("expected Hyprland command, got:\n%s", got)
-		}
-	})
-
-	t.Run("removes initial session when disabled", func(t *testing.T) {
-		t.Parallel()
-		existing := baseConfig + `
-[initial_session]
-user = "alice"
-command = "niri"
-`
-		got := upsertInitialSession(existing, "", "", false)
-		if strings.Contains(got, "[initial_session]") {
-			t.Fatalf("expected initial session removed, got:\n%s", got)
-		}
-		if !strings.Contains(got, "[default_session]") {
-			t.Fatalf("expected default session preserved, got:\n%s", got)
-		}
-	})
-}
-
-func TestStripDesktopExecCodes(t *testing.T) {
-	t.Parallel()
-
-	got := stripDesktopExecCodes("niri --session %f")
-	want := "niri --session"
-	if got != want {
-		t.Fatalf("stripDesktopExecCodes = %q, want %q", got, want)
-	}
-}
-
-func TestResolveGreeterAutoLoginState(t *testing.T) {
-	t.Parallel()
-
-	cacheDir := t.TempDir()
-	homeDir := t.TempDir()
-
-	writeTestFile(t, filepath.Join(cacheDir, "settings.json"), `{
-  "greeterAutoLogin": true,
-  "greeterRememberLastUser": true,
-  "greeterRememberLastSession": true
-}`)
-	writeTestFile(t, filepath.Join(cacheDir, ".local/state/memory.json"), `{
-  "lastSuccessfulUser": "alice",
-  "lastSessionExec": "niri"
-}`)
-
-	enabled, loginUser, sessionExec, err := resolveGreeterAutoLoginState(cacheDir, homeDir)
-	if err != nil {
-		t.Fatalf("resolveGreeterAutoLoginState returned error: %v", err)
-	}
-	if !enabled || loginUser != "alice" || sessionExec != "niri" {
-		t.Fatalf("got enabled=%v user=%q exec=%q", enabled, loginUser, sessionExec)
-	}
-}
-
-func TestResolveGreeterAutoLoginStateIgnoresMemoryFlag(t *testing.T) {
-	t.Parallel()
-
-	cacheDir := t.TempDir()
-	homeDir := t.TempDir()
-
-	writeTestFile(t, filepath.Join(cacheDir, "settings.json"), `{
-  "greeterAutoLogin": false,
-  "greeterRememberLastUser": true,
-  "greeterRememberLastSession": true
-}`)
-	writeTestFile(t, filepath.Join(cacheDir, ".local/state/memory.json"), `{
-  "autoLoginEnabled": true,
-  "lastSuccessfulUser": "alice",
-  "lastSessionExec": "niri"
-}`)
-
-	enabled, loginUser, sessionExec, err := resolveGreeterAutoLoginState(cacheDir, homeDir)
-	if err != nil {
-		t.Fatalf("resolveGreeterAutoLoginState returned error: %v", err)
-	}
-	if enabled || loginUser != "" || sessionExec != "" {
-		t.Fatalf("expected disabled with empty user/exec, got enabled=%v user=%q exec=%q", enabled, loginUser, sessionExec)
-	}
-}
-
-func TestClearGreeterAutoLoginMemory(t *testing.T) {
-	t.Parallel()
-
-	memoryPath := filepath.Join(t.TempDir(), "memory.json")
-	writeTestFile(t, memoryPath, `{
-  "autoLoginEnabled": true,
-  "lastSuccessfulUser": "alice"
-}`)
-
-	if err := clearGreeterAutoLoginMemory(memoryPath, ""); err != nil {
-		t.Fatalf("clearGreeterAutoLoginMemory returned error: %v", err)
-	}
-
-	data, err := os.ReadFile(memoryPath)
-	if err != nil {
-		t.Fatalf("failed to read memory file: %v", err)
-	}
-	if strings.Contains(string(data), "autoLoginEnabled") {
-		t.Fatalf("expected autoLoginEnabled removed, got: %s", string(data))
-	}
-	if !strings.Contains(string(data), "lastSuccessfulUser") {
-		t.Fatalf("expected other memory fields preserved, got: %s", string(data))
-	}
-}
@@ -1,548 +0,0 @@
-package greeter
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/exec"
-	"os/user"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/privesc"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
-)
-
-var monitorWallpaperSanitizer = regexp.MustCompile(`[^a-zA-Z0-9]+`)
-
-func userGreeterCacheDir(cacheDir, username string) string {
-	return filepath.Join(cacheDir, "users", username)
-}
-
-func isUserOwnedGreeterCacheSlot(path, username string) bool {
-	if strings.TrimSpace(username) == "" {
-		return false
-	}
-	userDir, err := filepath.Abs(userGreeterCacheDir(GreeterCacheDir, username))
-	if err != nil {
-		return false
-	}
-	abs, err := filepath.Abs(path)
-	if err != nil {
-		return false
-	}
-	return abs == userDir || strings.HasPrefix(abs, userDir+string(filepath.Separator))
-}
-
-func UserIsInGreeterGroup(username string) bool {
-	group := DetectGreeterGroup()
-	if !utils.HasGroup(group) {
-		return false
-	}
-	groupsCmd := exec.Command("groups", username)
-	groupsOutput, err := groupsCmd.Output()
-	if err != nil {
-		return false
-	}
-	return strings.Contains(string(groupsOutput), group)
-}
-
-func CanSyncOwnUserGreeterProfile(username string) bool {
-	currentUser, err := user.Current()
-	if err != nil || currentUser.Username != username {
-		return false
-	}
-	if !UserIsInGreeterGroup(username) {
-		return false
-	}
-	usersDir := filepath.Join(GreeterCacheDir, "users")
-	if st, err := os.Stat(usersDir); err != nil || !st.IsDir() {
-		return false
-	}
-	testFile := filepath.Join(usersDir, ".write-test-"+username)
-	file, err := os.OpenFile(testFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o660)
-	if err != nil {
-		return false
-	}
-	_ = file.Close()
-	_ = os.Remove(testFile)
-	return true
-}
-
-func GreeterProfileSyncReady() bool {
-	if command := readGreeterSessionCommand(); command != "" && strings.Contains(command, "dms-greeter") {
-		return true
-	}
-	usersDir := filepath.Join(GreeterCacheDir, "users")
-	st, err := os.Stat(usersDir)
-	return err == nil && st.IsDir()
-}
-
-func readGreeterSessionCommand() string {
-	data, err := os.ReadFile("/etc/greetd/config.toml")
-	if err != nil {
-		return ""
-	}
-	inDefaultSession := false
-	for line := range strings.SplitSeq(string(data), "\n") {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "[") && strings.HasSuffix(trimmed, "]") {
-			inDefaultSession = strings.EqualFold(strings.Trim(trimmed, "[]"), "default_session")
-			continue
-		}
-		if !inDefaultSession {
-			continue
-		}
-		if idx := strings.Index(trimmed, "#"); idx >= 0 {
-			trimmed = strings.TrimSpace(trimmed[:idx])
-		}
-		if !strings.HasPrefix(trimmed, "command") {
-			continue
-		}
-		parts := strings.SplitN(trimmed, "=", 2)
-		if len(parts) != 2 {
-			continue
-		}
-		command := strings.Trim(strings.TrimSpace(parts[1]), `"`)
-		if command != "" {
-			return command
-		}
-	}
-	return ""
-}
-
-// SyncUserProfileCache writes the current user's theme slot under users/<username>/
-// without modifying greetd or other system configuration. Requires membership in the
-// greeter group and a prior full greeter setup by an administrator.
-func SyncUserProfileCache(logFunc func(string)) error {
-	if logFunc == nil {
-		logFunc = func(string) {}
-	}
-	if !GreeterProfileSyncReady() {
-		return fmt.Errorf("greeter is not set up on this system yet; an administrator must run 'dms greeter install' or 'dms greeter sync' once first")
-	}
-
-	currentUser, err := user.Current()
-	if err != nil {
-		return fmt.Errorf("failed to resolve current user: %w", err)
-	}
-	if !CanSyncOwnUserGreeterProfile(currentUser.Username) {
-		group := DetectGreeterGroup()
-		return fmt.Errorf("cannot sync greeter profile: you must be in the %s group with write access to %s/users\nAsk an administrator to run:\n  sudo usermod -aG %s %s\nThen log out and back in before running:\n  dms greeter sync --profile",
-			group, GreeterCacheDir, group, currentUser.Username)
-	}
-
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return fmt.Errorf("failed to get user home directory: %w", err)
-	}
-
-	state, err := resolveGreeterThemeSyncState(homeDir)
-	if err != nil {
-		return fmt.Errorf("failed to resolve greeter color source: %w", err)
-	}
-
-	if err := syncUserGreeterCacheSlot(homeDir, GreeterCacheDir, currentUser.Username, state, logFunc, userSlotSyncOpts{
-		profileOnly: true,
-	}); err != nil {
-		return err
-	}
-
-	logFunc(fmt.Sprintf("  → %s/users/%s/", GreeterCacheDir, currentUser.Username))
-	return nil
-}
-
-func canWriteUserGreeterCacheSlot(dest, username string) bool {
-	return isUserOwnedGreeterCacheSlot(dest, username) && CanSyncOwnUserGreeterProfile(username)
-}
-
-type userSlotSyncOpts struct {
-	sudoPassword string
-	profileOnly  bool
-	username     string
-}
-
-func (o userSlotSyncOpts) useDirectWrite(dest string) bool {
-	if !o.profileOnly {
-		return false
-	}
-	return canWriteUserGreeterCacheSlot(dest, o.username)
-}
-
-func isGreeterCachePath(path string) bool {
-	abs, err := filepath.Abs(path)
-	if err != nil {
-		return true
-	}
-	cacheAbs, err := filepath.Abs(GreeterCacheDir)
-	if err != nil {
-		return true
-	}
-	if abs == cacheAbs {
-		return true
-	}
-	return strings.HasPrefix(abs, cacheAbs+string(filepath.Separator))
-}
-
-func greeterCacheOwner() string {
-	greeterGroup := DetectGreeterGroup()
-	daemonUser := DetectGreeterUser()
-	return daemonUser + ":" + greeterGroup
-}
-
-func ensureGreeterCacheSubdir(dir string, opts userSlotSyncOpts) error {
-	if opts.useDirectWrite(dir) {
-		if err := os.MkdirAll(dir, 0o770); err != nil {
-			return fmt.Errorf("failed to create cache directory %s: %w", dir, err)
-		}
-		return nil
-	}
-
-	if err := privesc.Run(context.Background(), opts.sudoPassword, "mkdir", "-p", dir); err != nil {
-		return fmt.Errorf("failed to create cache directory %s: %w", dir, err)
-	}
-
-	owner := greeterCacheOwner()
-	if err := privesc.Run(context.Background(), opts.sudoPassword, "chown", owner, dir); err != nil {
-		if fallbackErr := privesc.Run(context.Background(), opts.sudoPassword, "chown", "root:"+DetectGreeterGroup(), dir); fallbackErr != nil {
-			return fmt.Errorf("failed to set ownership on %s: %w", dir, err)
-		}
-	}
-	if err := privesc.Run(context.Background(), opts.sudoPassword, "chmod", "2770", dir); err != nil {
-		return fmt.Errorf("failed to set permissions on %s: %w", dir, err)
-	}
-	return nil
-}
-
-func setGreeterCacheFileOwnership(path, sudoPassword string) error {
-	owner := greeterCacheOwner()
-	if err := privesc.Run(context.Background(), sudoPassword, "chown", owner, path); err != nil {
-		if fallbackErr := privesc.Run(context.Background(), sudoPassword, "chown", "root:"+DetectGreeterGroup(), path); fallbackErr != nil {
-			return fmt.Errorf("failed to set ownership on %s: %w", path, err)
-		}
-	}
-	if err := privesc.Run(context.Background(), sudoPassword, "chmod", "644", path); err != nil {
-		return fmt.Errorf("failed to set permissions on %s: %w", path, err)
-	}
-	return nil
-}
-
-func syncUserGreeterCacheSlot(homeDir, cacheDir, username string, state greeterThemeSyncState, logFunc func(string), opts userSlotSyncOpts) error {
-	if strings.TrimSpace(username) == "" {
-		return nil
-	}
-	opts.username = username
-
-	userDir := userGreeterCacheDir(cacheDir, username)
-	if err := ensureGreeterCacheSubdir(userDir, opts); err != nil {
-		return err
-	}
-
-	settingsPath := filepath.Join(homeDir, ".config", "DankMaterialShell", "settings.json")
-	settingsBytes, err := os.ReadFile(settingsPath)
-	if err != nil {
-		return fmt.Errorf("failed to read settings for user cache slot: %w", err)
-	}
-
-	settingsMap := map[string]any{}
-	if strings.TrimSpace(string(settingsBytes)) != "" {
-		if err := json.Unmarshal(settingsBytes, &settingsMap); err != nil {
-			return fmt.Errorf("failed to parse settings for user cache slot: %w", err)
-		}
-	}
-
-	if customTheme, ok := settingsMap["customThemeFile"].(string); ok && strings.TrimSpace(customTheme) != "" {
-		resolvedTheme := customTheme
-		if !filepath.IsAbs(resolvedTheme) {
-			resolvedTheme = filepath.Join(homeDir, resolvedTheme)
-		}
-		if st, statErr := os.Stat(resolvedTheme); statErr == nil && !st.IsDir() {
-			destTheme := filepath.Join(userDir, "custom-theme.json")
-			if err := copyFileWithPrivesc(resolvedTheme, destTheme, opts); err != nil {
-				return err
-			}
-			settingsMap["customThemeFile"] = destTheme
-		}
-	}
-
-	settingsBytes, err = json.Marshal(settingsMap)
-	if err != nil {
-		return fmt.Errorf("failed to marshal settings for user cache slot: %w", err)
-	}
-	if err := writeFileWithPrivesc(filepath.Join(userDir, "settings.json"), settingsBytes, opts); err != nil {
-		return err
-	}
-
-	sessionPath := filepath.Join(homeDir, ".local", "state", "DankMaterialShell", "session.json")
-	sessionBytes, err := os.ReadFile(sessionPath)
-	if err != nil {
-		return fmt.Errorf("failed to read session for user cache slot: %w", err)
-	}
-
-	sessionMap := map[string]any{}
-	if strings.TrimSpace(string(sessionBytes)) != "" {
-		if err := json.Unmarshal(sessionBytes, &sessionMap); err != nil {
-			return fmt.Errorf("failed to parse session for user cache slot: %w", err)
-		}
-	}
-
-	if err := localizeSessionWallpapers(sessionMap, userDir, opts); err != nil {
-		return err
-	}
-
-	sessionBytes, err = json.Marshal(sessionMap)
-	if err != nil {
-		return fmt.Errorf("failed to marshal session for user cache slot: %w", err)
-	}
-	if err := writeFileWithPrivesc(filepath.Join(userDir, "session.json"), sessionBytes, opts); err != nil {
-		return err
-	}
-
-	colorsSource := state.effectiveColorsSource(homeDir)
-	if err := copyFileWithPrivesc(colorsSource, filepath.Join(userDir, "colors.json"), opts); err != nil {
-		return fmt.Errorf("failed to copy colors for user cache slot: %w", err)
-	}
-
-	if err := syncUserProfileImage(homeDir, userDir, opts); err != nil {
-		return err
-	}
-
-	rootOverride := filepath.Join(cacheDir, "greeter_wallpaper_override.jpg")
-	userOverride := filepath.Join(userDir, "greeter_wallpaper_override.jpg")
-	if st, statErr := os.Stat(rootOverride); statErr == nil && !st.IsDir() {
-		if err := copyFileWithPrivesc(rootOverride, userOverride, opts); err != nil {
-			return fmt.Errorf("failed to copy greeter wallpaper override for user cache slot: %w", err)
-		}
-	} else if opts.useDirectWrite(userOverride) {
-		_ = os.Remove(userOverride)
-	} else {
-		_ = privesc.Run(context.Background(), opts.sudoPassword, "rm", "-f", userOverride)
-	}
-
-	logFunc(fmt.Sprintf("✓ Synced per-user greeter cache for %s", username))
-	return nil
-}
-
-func localizeSessionWallpapers(session map[string]any, userDir string, opts userSlotSyncOpts) error {
-	stringKeys := []struct {
-		key    string
-		prefix string
-	}{
-		{"wallpaperPath", "wallpaper"},
-		{"wallpaperPathLight", "wallpaper-light"},
-		{"wallpaperPathDark", "wallpaper-dark"},
-	}
-	for _, item := range stringKeys {
-		if err := localizeWallpaperStringField(session, item.key, userDir, item.prefix, opts); err != nil {
-			return err
-		}
-	}
-
-	mapKeys := []struct {
-		key    string
-		prefix string
-	}{
-		{"monitorWallpapers", "wallpaper-monitor"},
-		{"monitorWallpapersLight", "wallpaper-monitor-light"},
-		{"monitorWallpapersDark", "wallpaper-monitor-dark"},
-	}
-	for _, item := range mapKeys {
-		if err := localizeWallpaperMapField(session, item.key, userDir, item.prefix, opts); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func localizeWallpaperStringField(session map[string]any, key, userDir, prefix string, opts userSlotSyncOpts) error {
-	raw, ok := session[key]
-	if !ok {
-		return nil
-	}
-	path, ok := raw.(string)
-	if !ok || strings.TrimSpace(path) == "" {
-		return nil
-	}
-	dest, err := copyWallpaperIntoUserCache(path, userDir, prefix, opts)
-	if err != nil {
-		return err
-	}
-	if dest != "" {
-		session[key] = dest
-	}
-	return nil
-}
-
-func localizeWallpaperMapField(session map[string]any, key, userDir, prefix string, opts userSlotSyncOpts) error {
-	raw, ok := session[key]
-	if !ok || raw == nil {
-		return nil
-	}
-	values, ok := raw.(map[string]any)
-	if !ok {
-		return nil
-	}
-	for monitor, rawPath := range values {
-		path, ok := rawPath.(string)
-		if !ok || strings.TrimSpace(path) == "" {
-			continue
-		}
-		safeMonitor := monitorWallpaperSanitizer.ReplaceAllString(monitor, "-")
-		dest, err := copyWallpaperIntoUserCache(path, userDir, prefix+"-"+safeMonitor, opts)
-		if err != nil {
-			return err
-		}
-		if dest != "" {
-			values[monitor] = dest
-		}
-	}
-	return nil
-}
-
-func copyWallpaperIntoUserCache(srcPath, userDir, prefix string, opts userSlotSyncOpts) (string, error) {
-	if strings.TrimSpace(srcPath) == "" {
-		return "", nil
-	}
-	st, err := os.Stat(srcPath)
-	if err != nil || st.IsDir() {
-		return "", nil
-	}
-	ext := filepath.Ext(srcPath)
-	if ext == "" {
-		ext = ".jpg"
-	}
-	dest := filepath.Join(userDir, prefix+ext)
-	if err := copyFileWithPrivesc(srcPath, dest, opts); err != nil {
-		return "", err
-	}
-	return dest, nil
-}
-
-func copyFileWithPrivesc(src, dest string, opts userSlotSyncOpts) error {
-	if opts.useDirectWrite(dest) {
-		if err := os.MkdirAll(filepath.Dir(dest), 0o770); err != nil {
-			return fmt.Errorf("failed to create parent dir for %s: %w", dest, err)
-		}
-		data, err := os.ReadFile(src)
-		if err != nil {
-			return fmt.Errorf("failed to read %s: %w", src, err)
-		}
-		if err := os.WriteFile(dest, data, 0o644); err != nil {
-			return fmt.Errorf("failed to write %s: %w", dest, err)
-		}
-		return nil
-	}
-
-	if !isGreeterCachePath(dest) {
-		if err := os.MkdirAll(filepath.Dir(dest), 0o755); err != nil {
-			return fmt.Errorf("failed to create parent dir for %s: %w", dest, err)
-		}
-		data, err := os.ReadFile(src)
-		if err != nil {
-			return fmt.Errorf("failed to read %s: %w", src, err)
-		}
-		if err := os.WriteFile(dest, data, 0o644); err != nil {
-			return fmt.Errorf("failed to write %s: %w", dest, err)
-		}
-		return nil
-	}
-
-	_ = privesc.Run(context.Background(), opts.sudoPassword, "rm", "-f", dest)
-	if err := privesc.Run(context.Background(), opts.sudoPassword, "cp", src, dest); err != nil {
-		return fmt.Errorf("failed to copy %s to %s: %w", src, dest, err)
-	}
-	return setGreeterCacheFileOwnership(dest, opts.sudoPassword)
-}
-
-func writeFileWithPrivesc(path string, data []byte, opts userSlotSyncOpts) error {
-	if opts.useDirectWrite(path) {
-		if err := os.MkdirAll(filepath.Dir(path), 0o770); err != nil {
-			return fmt.Errorf("failed to create parent dir for %s: %w", path, err)
-		}
-		if err := os.WriteFile(path, data, 0o644); err != nil {
-			return fmt.Errorf("failed to write %s: %w", path, err)
-		}
-		return nil
-	}
-
-	if !isGreeterCachePath(path) {
-		if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-			return fmt.Errorf("failed to create parent dir for %s: %w", path, err)
-		}
-		if err := os.WriteFile(path, data, 0o644); err != nil {
-			return fmt.Errorf("failed to write %s: %w", path, err)
-		}
-		return nil
-	}
-
-	tmp, err := os.CreateTemp("", "dms-greeter-user-cache-*")
-	if err != nil {
-		return fmt.Errorf("failed to create temp file for %s: %w", path, err)
-	}
-	tmpPath := tmp.Name()
-	if _, err := tmp.Write(data); err != nil {
-		_ = tmp.Close()
-		_ = os.Remove(tmpPath)
-		return fmt.Errorf("failed to write temp file for %s: %w", path, err)
-	}
-	if err := tmp.Close(); err != nil {
-		_ = os.Remove(tmpPath)
-		return fmt.Errorf("failed to close temp file for %s: %w", path, err)
-	}
-	defer os.Remove(tmpPath)
-
-	_ = privesc.Run(context.Background(), opts.sudoPassword, "rm", "-f", path)
-	if err := privesc.Run(context.Background(), opts.sudoPassword, "cp", tmpPath, path); err != nil {
-		return fmt.Errorf("failed to install %s: %w", path, err)
-	}
-	return setGreeterCacheFileOwnership(path, opts.sudoPassword)
-}
-
-func resolveUserProfileImageSource(homeDir string) string {
-	candidates := []string{
-		filepath.Join(homeDir, ".face"),
-		filepath.Join(homeDir, ".face.icon"),
-	}
-	if homeDir != "" {
-		username := filepath.Base(homeDir)
-		if username != "" && username != "." && username != string(filepath.Separator) {
-			candidates = append([]string{filepath.Join("/var/lib/AccountsService/icons", username)}, candidates...)
-		}
-	}
-	for _, src := range candidates {
-		st, err := os.Stat(src)
-		if err == nil && !st.IsDir() && st.Size() > 0 {
-			return src
-		}
-	}
-	return ""
-}
-
-func syncUserProfileImage(homeDir, userDir string, opts userSlotSyncOpts) error {
-	for _, name := range []string{"profile.jpg", "profile.jpeg", "profile.png", "profile.webp"} {
-		path := filepath.Join(userDir, name)
-		if opts.useDirectWrite(path) {
-			_ = os.Remove(path)
-		} else {
-			_ = privesc.Run(context.Background(), opts.sudoPassword, "rm", "-f", path)
-		}
-	}
-
-	src := resolveUserProfileImageSource(homeDir)
-	if src == "" {
-		return nil
-	}
-
-	ext := filepath.Ext(src)
-	if ext == "" {
-		ext = ".jpg"
-	}
-	dest := filepath.Join(userDir, "profile"+ext)
-	if err := copyFileWithPrivesc(src, dest, opts); err != nil {
-		return fmt.Errorf("failed to copy profile image for user cache slot: %w", err)
-	}
-	return nil
-}
@@ -1,81 +0,0 @@
-package greeter
-
-import (
-	"path/filepath"
-	"testing"
-)
-
-func TestUserGreeterCacheDir(t *testing.T) {
-	t.Parallel()
-
-	got := userGreeterCacheDir("/var/cache/dms-greeter", "alice")
-	want := filepath.Join("/var/cache/dms-greeter", "users", "alice")
-	if got != want {
-		t.Fatalf("userGreeterCacheDir() = %q, want %q", got, want)
-	}
-}
-
-func TestResolveUserProfileImageSource(t *testing.T) {
-	t.Parallel()
-
-	homeDir := t.TempDir()
-	facePath := filepath.Join(homeDir, ".face")
-	writeTestFile(t, facePath, "face")
-
-	got := resolveUserProfileImageSource(homeDir)
-	if got != facePath {
-		t.Fatalf("resolveUserProfileImageSource() = %q, want %q", got, facePath)
-	}
-}
-
-func TestIsUserOwnedGreeterCacheSlot(t *testing.T) {
-	t.Parallel()
-
-	slot := filepath.Join(GreeterCacheDir, "users", "alice", "settings.json")
-	if !isUserOwnedGreeterCacheSlot(slot, "alice") {
-		t.Fatalf("expected alice to own %q", slot)
-	}
-	if isUserOwnedGreeterCacheSlot(slot, "bob") {
-		t.Fatalf("expected bob not to own alice slot")
-	}
-	if isUserOwnedGreeterCacheSlot(filepath.Join(GreeterCacheDir, "settings.json"), "alice") {
-		t.Fatalf("expected root cache file not to be a user slot")
-	}
-}
-
-func TestLocalizeSessionWallpapers(t *testing.T) {
-	t.Parallel()
-
-	homeDir := t.TempDir()
-	userDir := filepath.Join(homeDir, "users", "alice")
-	wallpaperPath := filepath.Join(homeDir, "wall.jpg")
-	writeTestFile(t, wallpaperPath, "wallpaper")
-
-	session := map[string]any{
-		"wallpaperPath": wallpaperPath,
-		"monitorWallpapers": map[string]any{
-			"DP-1": wallpaperPath,
-		},
-	}
-
-	if err := localizeSessionWallpapers(session, userDir, userSlotSyncOpts{}); err != nil {
-		t.Fatalf("localizeSessionWallpapers returned error: %v", err)
-	}
-
-	gotPath, ok := session["wallpaperPath"].(string)
-	if !ok || gotPath == "" {
-		t.Fatalf("expected localized wallpaperPath, got %#v", session["wallpaperPath"])
-	}
-	if gotPath == wallpaperPath {
-		t.Fatalf("expected copied wallpaper path, still points to source")
-	}
-
-	monitorMap, ok := session["monitorWallpapers"].(map[string]any)
-	if !ok {
-		t.Fatalf("expected monitorWallpapers map")
-	}
-	monitorPath, ok := monitorMap["DP-1"].(string)
-	if !ok || monitorPath == "" || monitorPath == wallpaperPath {
-		t.Fatalf("expected localized monitor wallpaper, got %#v", monitorMap["DP-1"])
-	}
-}
@@ -364,10 +364,8 @@ func (r *Runner) parseWindowManager() (deps.WindowManager, error) {
 		return deps.WindowManagerNiri, nil
 	case "hyprland":
 		return deps.WindowManagerHyprland, nil
-	case "mango", "mangowc":
-		return deps.WindowManagerMango, nil
 	default:
-		return 0, fmt.Errorf("invalid --compositor value %q: must be 'niri', 'hyprland', or 'mango'", r.cfg.Compositor)
+		return 0, fmt.Errorf("invalid --compositor value %q: must be 'niri' or 'hyprland'", r.cfg.Compositor)
 	}
 }

@@ -3,10 +3,7 @@ package providers
 import (
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds"
 )

 func TestHyprlandAutogenerateComment(t *testing.T) {
@@ -63,544 +60,6 @@ func TestHyprlandAutogenerateComment(t *testing.T) {
 	}
 }

-func TestHyprlandLuaBindRoundTripHelpers(t *testing.T) {
-	tests := []struct {
-		expr           string
-		wantDispatcher string
-		wantParams     string
-	}{
-		{`hl.dsp.exec_cmd([[dms ipc call brightness increment 5 ""]])`, "exec", `dms ipc call brightness increment 5 ""`},
-		{`hl.dsp.exec_cmd([[hyprctl dispatch workspace 1]])`, "workspace", "1"},
-		{`hl.dispatch("workspace 2")`, "workspace", "2"},
-		{`hl.dispatch([[customdispatcher arg one]])`, "customdispatcher", "arg one"},
-		{`hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" })`, "fullscreen", "1"},
-		{`hl.dsp.window.float({ action = "on" })`, "setfloating", ""},
-		{`hl.dsp.window.close()`, "killactive", ""},
-		{`hl.dsp.window.kill()`, "forcekillactive", ""},
-		{`hl.dsp.window.close({ window = "class:^(kitty)$" })`, "closewindow", "class:^(kitty)$"},
-		{`hl.dsp.focus({ workspace = "e+1" })`, "workspace", "e+1"},
-		{`hl.dsp.focus({ workspace = "2", on_current_monitor = true })`, "focusworkspaceoncurrentmonitor", "2"},
-		{`hl.dsp.window.move({ monitor = "l" })`, "movewindow", "mon:l"},
-		{`hl.dsp.window.move({ direction = "r", group_aware = true })`, "movewindoworgroup", "r"},
-		{`hl.dsp.window.move({ into_group = "l" })`, "moveintogroup", "l"},
-		{`hl.dsp.window.move({ out_of_group = true })`, "moveoutofgroup", ""},
-		{`hl.dsp.window.move({ workspace = "special:magic", follow = false })`, "movetoworkspacesilent", "special:magic"},
-		{`hl.dsp.window.resize({ x = -100, y = 0, relative = true })`, "resizeactive", "-100 0"},
-		{`hl.dsp.window.resize({ x = 1280, y = 720, relative = false })`, "resizeactive", "exact 1280 720"},
-		{`hl.dsp.window.resize({ x = 100, y = 50, relative = true, window = "class:^(app)$" })`, "resizewindowpixel", "100 50,class:^(app)$"},
-		{`hl.dsp.window.cycle_next({ next = false, tiled = true })`, "cyclenext", "prev tiled"},
-		{`hl.dsp.group.next()`, "changegroupactive", "f"},
-		{`hl.dsp.group.prev()`, "changegroupactive", "b"},
-		{`hl.dsp.group.active({ index = 2 })`, "changegroupactive", "2"},
-		{`hl.dsp.group.move_window({ forward = false })`, "movegroupwindow", "b"},
-		{`hl.dsp.group.lock({ action = "on" })`, "lockgroups", "lock"},
-		{`hl.dsp.group.lock_active({ action = "off" })`, "lockactivegroup", "unlock"},
-		{`hl.dsp.window.deny_from_group({ action = "toggle" })`, "denywindowfromgroup", "toggle"},
-		{`function() hl.exec_cmd("hyprctl dispatch splitratio +0.1") end`, "splitratio", "+0.1"},
-		{`hl.dsp.layout("togglesplit")`, "layoutmsg", "togglesplit"},
-		{`hl.dsp.dpms({ action = "toggle" })`, "dpms", "toggle"},
-		{`hl.dsp.workspace.rename({ workspace = "1", name = "work" })`, "renameworkspace", "1 work"},
-		{`hl.dsp.no_op()`, "hl.dsp.no_op()", ""},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.expr, func(t *testing.T) {
-			gotDispatcher, gotParams := luaExprToDispatcherParams(tt.expr)
-			if gotDispatcher != tt.wantDispatcher || gotParams != tt.wantParams {
-				t.Fatalf("luaExprToDispatcherParams() = %q, %q; want %q, %q", gotDispatcher, gotParams, tt.wantDispatcher, tt.wantParams)
-			}
-		})
-	}
-}
-
-func TestWriteLuaBindLineOptionsInsideCall(t *testing.T) {
-	var sb strings.Builder
-	writeLuaBindLine(&sb, &hyprlandOverrideBind{
-		Key:         "Super+k",
-		Action:      "exec kitty",
-		Description: "Open terminal",
-		Flags:       "led",
-	})
-
-	want := `hl.unbind("SUPER + K")
-hl.bind("SUPER + K", hl.dsp.exec_cmd("kitty"), { locked = true, repeating = true, description = "Open terminal" })`
-	if got := strings.TrimSpace(sb.String()); got != want {
-		t.Fatalf("writeLuaBindLine() = %q, want %q", got, want)
-	}
-}
-
-func TestWriteLuaBindLineMapsSpawnActionForHyprland(t *testing.T) {
-	var sb strings.Builder
-	writeLuaBindLine(&sb, &hyprlandOverrideBind{
-		Key:         "Super+n",
-		Action:      "spawn dms ipc call notepad toggle",
-		Description: "Notepad: Toggle",
-	})
-
-	want := `hl.unbind("SUPER + N")
-hl.bind("SUPER + N", hl.dsp.exec_cmd("dms ipc call notepad toggle"), { description = "Notepad: Toggle" })`
-	if got := strings.TrimSpace(sb.String()); got != want {
-		t.Fatalf("writeLuaBindLine() = %q, want %q", got, want)
-	}
-}
-
-func TestWriteLuaBindLineLeavesCustomLuaDispatcherRaw(t *testing.T) {
-	var sb strings.Builder
-	writeLuaBindLine(&sb, &hyprlandOverrideBind{
-		Key:         "Super+u",
-		Action:      "hl.dsp.no_op()",
-		Description: "Custom Lua",
-	})
-
-	want := `hl.unbind("SUPER + U")
-hl.bind("SUPER + U", hl.dsp.no_op(), { description = "Custom Lua" })`
-	if got := strings.TrimSpace(sb.String()); got != want {
-		t.Fatalf("writeLuaBindLine() = %q, want %q", got, want)
-	}
-}
-
-func TestLuaActionStringFromHyprlangActionUsesNativeDispatchers(t *testing.T) {
-	tests := []struct {
-		action string
-		want   string
-	}{
-		{"killactive", `hl.dsp.window.close()`},
-		{"forcekillactive", `hl.dsp.window.kill()`},
-		{"workspace 1", `hl.dsp.focus({ workspace = "1" })`},
-		{"movetoworkspace 2", `hl.dsp.window.move({ workspace = "2" })`},
-		{"movetoworkspacesilent special:magic", `hl.dsp.window.move({ workspace = "special:magic", follow = false })`},
-		{"focusmonitor DP-1", `hl.dsp.focus({ monitor = "DP-1" })`},
-		{"resizeactive exact 1280 720", `hl.dsp.window.resize({ x = 1280, y = 720, relative = false })`},
-		{"dpms toggle", `hl.dsp.dpms({ action = "toggle" })`},
-		{"renameworkspace 1 work", `hl.dsp.workspace.rename({ workspace = "1", name = "work" })`},
-		{"changegroupactive f", `hl.dsp.group.next()`},
-		{"changegroupactive b", `hl.dsp.group.prev()`},
-		{"changegroupactive 2", `hl.dsp.group.active({ index = 2 })`},
-		{"moveintogroup l", `hl.dsp.window.move({ into_group = "l" })`},
-		{"moveoutofgroup", `hl.dsp.window.move({ out_of_group = true })`},
-		{"movewindoworgroup r", `hl.dsp.window.move({ direction = "r", group_aware = true })`},
-		{"movegroupwindow b", `hl.dsp.group.move_window({ forward = false })`},
-		{"lockgroups lock", `hl.dsp.group.lock({ action = "on" })`},
-		{"lockactivegroup unlock", `hl.dsp.group.lock_active({ action = "off" })`},
-		{"denywindowfromgroup toggle", `hl.dsp.window.deny_from_group({ action = "toggle" })`},
-		{"cyclenext prev", `hl.dsp.window.cycle_next({ next = false })`},
-		{"setfloating", `hl.dsp.window.float({ action = "on" })`},
-		{"settiled", `hl.dsp.window.float({ action = "off" })`},
-		{"bringactivetotop", `hl.dsp.window.bring_to_top()`},
-		{"toggleswallow", `hl.dsp.window.toggle_swallow()`},
-		{"forceidle 300", `hl.dsp.force_idle(300)`},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.action, func(t *testing.T) {
-			got := luaActionStringFromHyprlangAction(tt.action)
-			if got != tt.want {
-				t.Fatalf("luaActionStringFromHyprlangAction(%q) = %q, want %q", tt.action, got, tt.want)
-			}
-			if strings.Contains(got, "hyprctl dispatch") {
-				t.Fatalf("expected native Lua dispatcher, got legacy dispatch wrapper: %q", got)
-			}
-		})
-	}
-}
-
-func TestLuaActionStringFallsBackForUnsupportedResizePercentages(t *testing.T) {
-	got := luaActionStringFromHyprlangAction("resizeactive exact 100% 100%")
-	want := `function() hl.exec_cmd("hyprctl dispatch resizeactive exact 100% 100%") end`
-	if got != want {
-		t.Fatalf("luaActionStringFromHyprlangAction() = %q, want %q", got, want)
-	}
-}
-
-func TestParseLuaBindLineHandlesFunctionDispatcherFallback(t *testing.T) {
-	line := `hl.bind("SUPER + R", function() hl.exec_cmd("hyprctl dispatch resizeactive exact 100% 100%") end, { description = "Unsupported Resize" })`
-	got, ok := parseLuaBindOverrideLine(line)
-	if !ok {
-		t.Fatalf("expected line to parse")
-	}
-	if got.Action != "resizeactive exact 100% 100%" {
-		t.Fatalf("Action = %q, want resizeactive exact 100%% 100%%", got.Action)
-	}
-	if got.Description != "Unsupported Resize" {
-		t.Fatalf("Description = %q, want Unsupported Resize", got.Description)
-	}
-}
-
-func TestLuaActionStringLeavesCustomLuaDispatcherRaw(t *testing.T) {
-	got := luaActionStringFromHyprlangAction("hl.dsp.no_op()")
-	want := `hl.dsp.no_op()`
-	if got != want {
-		t.Fatalf("luaActionStringFromHyprlangAction() = %q, want %q", got, want)
-	}
-	if strings.Contains(got, "hl.dispatch") || strings.Contains(got, "hyprctl dispatch") {
-		t.Fatalf("expected custom Lua dispatcher expression to stay raw, got %q", got)
-	}
-}
-
-func TestReadLuaOverrideMigratesTrailingCommentToDescription(t *testing.T) {
-	tmpDir := t.TempDir()
-	overridePath := filepath.Join(tmpDir, "binds-user.lua")
-	contents := `hl.unbind("SUPER + N")
-hl.bind("SUPER + N", hl.dsp.exec_cmd("dms ipc call notepad toggle")) -- Notepad: Toggle
-hl.bind("SUPER + H", hl.dsp.exec_cmd("app --help"))
-`
-	if err := os.WriteFile(overridePath, []byte(contents), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	binds, err := readLuaOrHyprlangOverride(overridePath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	got := binds["super+n"]
-	if got == nil {
-		t.Fatalf("expected SUPER+N override, got %#v", binds)
-	}
-	if got.Description != "Notepad: Toggle" {
-		t.Fatalf("expected trailing comment to be preserved as description, got %q", got.Description)
-	}
-	if got := binds["super+h"]; got == nil || got.Description != "" {
-		t.Fatalf("expected -- inside a Lua string to stay out of the description, got %#v", got)
-	}
-}
-
-func TestHyprlandLuaBindsUserOverridesDefaults(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(tmpDir, "hyprland.lua"), []byte(`
-require("dms.binds")
-require("dms.binds-user")
-`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds.lua"), []byte(`hl.bind("SUPER + T", hl.dsp.exec_cmd("kitty"))`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(`hl.bind("SUPER + T", hl.dsp.exec_cmd("foot"), { description = "User terminal" })`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	result, err := ParseHyprlandKeysWithDMS(tmpDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var found []HyprlandKeyBinding
-	var walk func(HyprlandSection)
-	walk = func(section HyprlandSection) {
-		for _, kb := range section.Keybinds {
-			if strings.EqualFold(strings.Join(append(kb.Mods, kb.Key), "+"), "SUPER+T") {
-				found = append(found, kb)
-			}
-		}
-		for _, child := range section.Children {
-			walk(child)
-		}
-	}
-	walk(*result.Section)
-
-	if len(found) != 1 {
-		t.Fatalf("expected one effective SUPER+T bind, got %d: %#v", len(found), found)
-	}
-	if found[0].Params != "foot" || found[0].Comment != "User terminal" {
-		t.Fatalf("expected user override bind, got %#v", found[0])
-	}
-}
-
-func TestWriteLuaBindLineEmitsUnbindOnlyForNegativeOverride(t *testing.T) {
-	var sb strings.Builder
-	writeLuaBindLine(&sb, &hyprlandOverrideBind{Key: "Super+i", Unbind: true})
-
-	want := `hl.unbind("SUPER + I")`
-	if got := strings.TrimSpace(sb.String()); got != want {
-		t.Fatalf("writeLuaBindLine() = %q, want %q", got, want)
-	}
-}
-
-func TestReadLuaOverrideRecognizesLoneUnbindAsNegativeOverride(t *testing.T) {
-	tmpDir := t.TempDir()
-	overridePath := filepath.Join(tmpDir, "binds-user.lua")
-	contents := `-- DMS user keybind overrides
-hl.unbind("SUPER + I")
-hl.unbind("SUPER + N")
-hl.bind("SUPER + N", hl.dsp.exec_cmd("dms ipc call notepad toggle"))
-`
-	if err := os.WriteFile(overridePath, []byte(contents), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	binds, err := readLuaOrHyprlangOverride(overridePath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	got, ok := binds["super+i"]
-	if !ok {
-		t.Fatalf("expected SUPER+I entry in override map, got: %#v", binds)
-	}
-	if !got.Unbind {
-		t.Fatalf("expected SUPER+I to be marked Unbind, got: %#v", got)
-	}
-	if rebind, ok := binds["super+n"]; !ok || rebind.Unbind {
-		t.Fatalf("expected SUPER+N to be a normal rebind override, got: %#v", rebind)
-	}
-}
-
-func TestParserDropsDMSDefaultsSuppressedByBindsUserUnbind(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(tmpDir, "hyprland.lua"), []byte(`
-require("dms.binds")
-require("dms.binds-user")
-`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds.lua"), []byte(
-		`hl.bind("SUPER + I", hl.dsp.focus({ workspace = "e-1" }))
-hl.bind("SUPER + T", hl.dsp.exec_cmd("kitty"))`,
-	), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(`hl.unbind("SUPER + I")`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	result, err := ParseHyprlandKeysWithDMS(tmpDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var keys []string
-	var walk func(HyprlandSection)
-	walk = func(section HyprlandSection) {
-		for _, kb := range section.Keybinds {
-			keys = append(keys, strings.ToUpper(strings.Join(append(kb.Mods, kb.Key), "+")))
-		}
-		for _, child := range section.Children {
-			walk(child)
-		}
-	}
-	walk(*result.Section)
-
-	for _, k := range keys {
-		if k == "SUPER+I" {
-			t.Fatalf("expected SUPER+I to be suppressed by binds-user.lua unbind, got: %v", keys)
-		}
-	}
-	foundT := false
-	for _, k := range keys {
-		if k == "SUPER+T" {
-			foundT = true
-		}
-	}
-	if !foundT {
-		t.Fatalf("expected SUPER+T to remain (only SUPER+I was unbound), got: %v", keys)
-	}
-}
-
-func TestHyprlandRemoveBindWritesNegativeOverrideForDefault(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-
-	provider := NewHyprlandProvider(tmpDir)
-	if err := provider.RemoveBind("SUPER+I"); err != nil {
-		t.Fatal(err)
-	}
-
-	data, err := os.ReadFile(filepath.Join(dmsDir, "binds-user.lua"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !strings.Contains(string(data), `hl.unbind("SUPER + I")`) {
-		t.Fatalf("expected negative override hl.unbind line, got:\n%s", string(data))
-	}
-	if strings.Contains(string(data), `hl.bind("SUPER + I"`) {
-		t.Fatalf("expected NO hl.bind for SUPER+I, got:\n%s", string(data))
-	}
-}
-
-func TestHyprlandSetBindLeavesConfOnlyInstallReadOnly(t *testing.T) {
-	tmpDir := t.TempDir()
-	if err := os.WriteFile(filepath.Join(tmpDir, "hyprland.conf"), []byte("bind = SUPER, T, exec, kitty\n"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	provider := NewHyprlandProvider(tmpDir)
-	err := provider.SetBind("SUPER+N", "workspace 1", "Workspace 1", nil)
-	if err == nil {
-		t.Fatal("expected SetBind to reject conf-only Hyprland config")
-	}
-	if !strings.Contains(err.Error(), "read-only") {
-		t.Fatalf("expected read-only error, got %v", err)
-	}
-	if _, err := os.Stat(filepath.Join(tmpDir, "dms", "binds-user.lua")); !os.IsNotExist(err) {
-		t.Fatalf("expected no Lua override to be created for conf-only config, stat err=%v", err)
-	}
-}
-
-func TestHyprlandSetBindUpdatesSpacedLuaOverrideWithoutDuplicates(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	override := `-- DMS user keybind overrides
-
-hl.unbind("SUPER + SHIFT + S")
-hl.bind("SUPER + 1", hl.dsp.exec_cmd("hyprctl dispatch workspace 1"))
-`
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(override), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	provider := NewHyprlandProvider(tmpDir)
-	if err := provider.SetBind("SUPER + 1", "workspace 1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	data, err := os.ReadFile(filepath.Join(dmsDir, "binds-user.lua"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	got := string(data)
-	if strings.Count(got, `hl.unbind("SUPER + 1")`) != 1 {
-		t.Fatalf("expected one SUPER+1 unbind, got:\n%s", got)
-	}
-	if strings.Count(got, `hl.bind("SUPER + 1", hl.dsp.focus({ workspace = "1" }))`) != 1 {
-		t.Fatalf("expected one native SUPER+1 bind, got:\n%s", got)
-	}
-	if strings.Contains(got, "hyprctl dispatch workspace 1") {
-		t.Fatalf("expected old hyprctl workspace dispatcher to be replaced, got:\n%s", got)
-	}
-	if !strings.Contains(got, `hl.unbind("SUPER + SHIFT + S")`) {
-		t.Fatalf("expected unrelated override to be preserved, got:\n%s", got)
-	}
-}
-
-func TestHyprlandRemoveBindReplacesExistingOverrideWithNegativeOverride(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	override := `hl.unbind("SUPER + N")
-hl.bind("SUPER + N", hl.dsp.exec_cmd("dms ipc call notepad toggle"))
-`
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(override), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	provider := NewHyprlandProvider(tmpDir)
-	if err := provider.RemoveBind("SUPER+N"); err != nil {
-		t.Fatal(err)
-	}
-
-	data, err := os.ReadFile(filepath.Join(dmsDir, "binds-user.lua"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !strings.Contains(string(data), `hl.unbind("SUPER + N")`) {
-		t.Fatalf("expected negative override hl.unbind line, got:\n%s", string(data))
-	}
-	if strings.Contains(string(data), `hl.bind("SUPER + N"`) {
-		t.Fatalf("expected NO hl.bind for SUPER+N after remove, got:\n%s", string(data))
-	}
-}
-
-func TestHyprlandResetBindRevertsExistingOverrideToDefault(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	override := `hl.unbind("SUPER + N")
-hl.bind("SUPER + N", hl.dsp.exec_cmd("dms ipc call notepad toggle"))
-`
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(override), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	provider := NewHyprlandProvider(tmpDir)
-	if err := provider.ResetBind("SUPER+N"); err != nil {
-		t.Fatal(err)
-	}
-
-	data, err := os.ReadFile(filepath.Join(dmsDir, "binds-user.lua"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if strings.Contains(string(data), `SUPER + N`) {
-		t.Fatalf("expected SUPER+N to be fully removed (revert to default), got:\n%s", string(data))
-	}
-}
-
-func TestHyprlandHasDefaultSetForOverrideOfDefaultKey(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(tmpDir, "hyprland.lua"), []byte(`
-require("dms.binds")
-require("dms.binds-user")
-`), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds.lua"), []byte(
-		`hl.bind("SUPER + T", hl.dsp.exec_cmd("kitty"))`,
-	), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(filepath.Join(dmsDir, "binds-user.lua"), []byte(
-		`hl.unbind("SUPER + T")
-hl.bind("SUPER + T", hl.dsp.exec_cmd("foot"))
-hl.bind("SUPER + Z", hl.dsp.exec_cmd("custom"))`,
-	), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	provider := NewHyprlandProvider(tmpDir)
-	sheet, err := provider.GetCheatSheet()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var foundT, foundZ *keybinds.Keybind
-	for _, group := range sheet.Binds {
-		for i := range group {
-			kb := group[i]
-			keyUpper := strings.ToUpper(kb.Key)
-			if keyUpper == "SUPER+T" {
-				foundT = &group[i]
-			}
-			if keyUpper == "SUPER+Z" {
-				foundZ = &group[i]
-			}
-		}
-	}
-	if foundT == nil {
-		t.Fatalf("expected SUPER+T override in cheatsheet")
-	}
-	if !foundT.HasDefault {
-		t.Fatalf("expected SUPER+T HasDefault=true (default exists in binds.lua), got %+v", foundT)
-	}
-	if foundZ == nil {
-		t.Fatalf("expected SUPER+Z (user-only) in cheatsheet")
-	}
-	if foundZ.HasDefault {
-		t.Fatalf("expected SUPER+Z HasDefault=false (no default), got %+v", foundZ)
-	}
-}
-
 func TestHyprlandGetKeybindAtLine(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -7,7 +7,6 @@ import (
 	"sort"
 	"strings"

-	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/keybinds"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/utils"
 )
@@ -142,7 +141,7 @@ func (m *MangoWCProvider) convertKeybind(kb *MangoWCKeyBinding, conflicts map[st

 	source := "config"
 	if strings.Contains(kb.Source, "dms/binds.conf") || strings.Contains(kb.Source, "dms"+string(filepath.Separator)+"binds.conf") {
-		source = "dms-default"
+		source = "dms"
 	}

 	bind := keybinds.Keybind{
@@ -152,7 +151,7 @@ func (m *MangoWCProvider) convertKeybind(kb *MangoWCKeyBinding, conflicts map[st
 		Source:      source,
 	}

-	if source == "dms-default" && conflicts != nil {
+	if source == "dms" && conflicts != nil {
 		normalizedKey := strings.ToLower(keyStr)
 		if conflictKb, ok := conflicts[normalizedKey]; ok {
 			bind.Conflict = &keybinds.Keybind{
@@ -229,20 +228,11 @@ func (m *MangoWCProvider) SetBind(key, action, description string, options map[s
 	}

 	normalizedKey := strings.ToLower(key)
-	prefix := "bind"
-	if existing, ok := existingBinds[normalizedKey]; ok && existing.Prefix != "" {
-		prefix = existing.Prefix
-	}
-	if optionPrefix := m.bindPrefixFromOptions(options); optionPrefix != "" {
-		prefix = optionPrefix
-	}
-
 	existingBinds[normalizedKey] = &mangowcOverrideBind{
 		Key:         key,
 		Action:      action,
 		Description: description,
 		Options:     options,
-		Prefix:      prefix,
 	}

 	return m.writeOverrideBinds(existingBinds)
@@ -256,11 +246,7 @@ func (m *MangoWCProvider) RemoveBind(key string) error {

 	normalizedKey := strings.ToLower(key)
 	delete(existingBinds, normalizedKey)
-	return m.writeOverrideBindsWithRemoved(existingBinds, map[string]bool{normalizedKey: true})
-}
-
-func (m *MangoWCProvider) ResetBind(key string) error {
-	return m.RemoveBind(key)
+	return m.writeOverrideBinds(existingBinds)
 }

 type mangowcOverrideBind struct {
@@ -268,7 +254,6 @@ type mangowcOverrideBind struct {
 	Action      string
 	Description string
 	Options     map[string]any
-	Prefix      string
 }

 func (m *MangoWCProvider) loadOverrideBinds() (map[string]*mangowcOverrideBind, error) {
@@ -283,99 +268,62 @@ func (m *MangoWCProvider) loadOverrideBinds() (map[string]*mangowcOverrideBind,
 		return nil, err
 	}

-	var pendingComment string
-	for _, line := range strings.Split(string(data), "\n") {
-		trimmed := strings.TrimSpace(line)
-		if trimmed == "" {
-			pendingComment = ""
-			continue
-		}
-		if strings.HasPrefix(trimmed, "#") {
-			pendingComment = strings.TrimSpace(strings.TrimPrefix(trimmed, "#"))
-			if isMangoWCSectionComment(pendingComment) {
-				pendingComment = ""
-			}
+	lines := strings.Split(string(data), "\n")
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if line == "" || strings.HasPrefix(line, "#") {
 			continue
 		}

-		bind, ok := m.parseOverrideBindLine(line, pendingComment)
-		pendingComment = ""
-		if !ok || bind == nil {
+		if !strings.HasPrefix(line, "bind") {
 			continue
 		}

-		binds[strings.ToLower(bind.Key)] = bind
+		parts := strings.SplitN(line, "=", 2)
+		if len(parts) < 2 {
+			continue
+		}
+
+		content := strings.TrimSpace(parts[1])
+		commentParts := strings.SplitN(content, "#", 2)
+		bindContent := strings.TrimSpace(commentParts[0])
+
+		var comment string
+		if len(commentParts) > 1 {
+			comment = strings.TrimSpace(commentParts[1])
+		}
+
+		fields := strings.SplitN(bindContent, ",", 4)
+		if len(fields) < 3 {
+			continue
+		}
+
+		mods := strings.TrimSpace(fields[0])
+		keyName := strings.TrimSpace(fields[1])
+		command := strings.TrimSpace(fields[2])
+
+		var params string
+		if len(fields) > 3 {
+			params = strings.TrimSpace(fields[3])
+		}
+
+		keyStr := m.buildKeyString(mods, keyName)
+		normalizedKey := strings.ToLower(keyStr)
+		action := command
+		if params != "" {
+			action = command + " " + params
+		}
+
+		binds[normalizedKey] = &mangowcOverrideBind{
+			Key:         keyStr,
+			Action:      action,
+			Description: comment,
+		}
 	}

 	return binds, nil
 }

-func (m *MangoWCProvider) parseOverrideBindLine(line, precedingComment string) (*mangowcOverrideBind, bool) {
-	trimmed := strings.TrimSpace(line)
-	parts := strings.SplitN(trimmed, "=", 2)
-	if len(parts) < 2 {
-		return nil, false
-	}
-
-	prefix := strings.TrimSpace(parts[0])
-	if !m.isBindPrefix(prefix) {
-		return nil, false
-	}
-
-	content := strings.TrimSpace(parts[1])
-	commentParts := strings.SplitN(content, "#", 2)
-	bindContent := strings.TrimSpace(commentParts[0])
-
-	description := strings.TrimSpace(precedingComment)
-	if isMangoWCSectionComment(description) {
-		description = ""
-	}
-	if len(commentParts) > 1 {
-		description = strings.TrimSpace(commentParts[1])
-	}
-	if strings.HasPrefix(description, MangoWCHideComment) {
-		return nil, true
-	}
-
-	fields := strings.SplitN(bindContent, ",", 4)
-	if len(fields) < 3 {
-		return nil, false
-	}
-
-	mods := strings.TrimSpace(fields[0])
-	keyName := strings.TrimSpace(fields[1])
-	command := strings.TrimSpace(fields[2])
-
-	var params string
-	if len(fields) > 3 {
-		params = strings.TrimSpace(fields[3])
-	}
-
-	action := command
-	if params != "" {
-		action = command + " " + params
-	}
-
-	return &mangowcOverrideBind{
-		Key:         m.buildKeyString(mods, keyName),
-		Action:      action,
-		Description: description,
-		Prefix:      prefix,
-	}, true
-}
-
-func (m *MangoWCProvider) isBindPrefix(prefix string) bool {
-	if !strings.HasPrefix(prefix, "bind") {
-		return false
-	}
-	for _, ch := range strings.TrimPrefix(prefix, "bind") {
-		if !strings.ContainsRune("lsrp", ch) {
-			return false
-		}
-	}
-	return true
-}
-
 func (m *MangoWCProvider) buildKeyString(mods, key string) string {
 	if mods == "" || strings.EqualFold(mods, "none") {
 		return key
@@ -410,113 +358,21 @@ func (m *MangoWCProvider) getBindSortPriority(action string) int {
 }

 func (m *MangoWCProvider) writeOverrideBinds(binds map[string]*mangowcOverrideBind) error {
-	return m.writeOverrideBindsWithRemoved(binds, nil)
-}
-
-func (m *MangoWCProvider) writeOverrideBindsWithRemoved(binds map[string]*mangowcOverrideBind, removed map[string]bool) error {
 	overridePath := m.GetOverridePath()
-	existingContent := ""
-	if data, err := os.ReadFile(overridePath); err == nil {
-		existingContent = string(data)
-	}
-
-	content := m.generatePreservedBindsContent(existingContent, binds, removed)
+	content := m.generateBindsContent(binds)
 	return os.WriteFile(overridePath, []byte(content), 0o644)
 }

-func (m *MangoWCProvider) generatePreservedBindsContent(existingContent string, binds map[string]*mangowcOverrideBind, removed map[string]bool) string {
-	useStockScaffold := m.shouldUseStockScaffold(existingContent)
-	source := existingContent
-	if useStockScaffold {
-		source = m.stockBindsScaffold(binds)
-	}
-
-	remaining := make(map[string]*mangowcOverrideBind, len(binds))
-	for key, bind := range binds {
-		remaining[key] = bind
-	}
-	if useStockScaffold {
-		m.dropReplacedStockBinds(remaining)
-	}
-
-	var lines []string
-	for _, line := range strings.Split(source, "\n") {
-		templateBind, ok := m.parseOverrideBindLine(line, m.previousComment(lines))
-		if !ok || templateBind == nil {
-			lines = append(lines, line)
-			continue
-		}
-
-		normalizedKey := strings.ToLower(templateBind.Key)
-		m.dropPreviousDescriptionComment(&lines)
-
-		if bind, exists := remaining[normalizedKey]; exists {
-			if useStockScaffold && bind.Description == "" {
-				bind = m.copyBindWithDescription(bind, templateBind.Description)
-			}
-			m.writeBindLineToLines(&lines, bind)
-			delete(remaining, normalizedKey)
-			continue
-		}
-
-		if useStockScaffold && !removed[normalizedKey] {
-			m.writeBindLineToLines(&lines, templateBind)
-		}
-	}
-
-	if len(remaining) > 0 {
-		m.trimTrailingEmptyLines(&lines)
-		if len(lines) > 0 {
-			lines = append(lines, "")
-		}
-		lines = append(lines, "# === Custom Keybinds ===")
-		for _, bind := range m.sortedBinds(remaining) {
-			m.writeBindLineToLines(&lines, bind)
-		}
-	}
-
-	m.trimTrailingEmptyLines(&lines)
-	if len(lines) == 0 {
+func (m *MangoWCProvider) generateBindsContent(binds map[string]*mangowcOverrideBind) string {
+	if len(binds) == 0 {
 		return ""
 	}
-	return strings.Join(lines, "\n") + "\n"
-}

-func (m *MangoWCProvider) shouldUseStockScaffold(content string) bool {
-	if strings.TrimSpace(content) == "" {
-		return true
-	}
-	if strings.Contains(content, "gesturebind=") && strings.Contains(content, "# ===") {
-		return false
-	}
-	return !strings.Contains(content, "gesturebind=") && (strings.Count(content, "\nbind=")+strings.Count(content, "\nbindl=")+strings.Count(content, "\nbinds=")+strings.Count(content, "\nbindr=")+strings.Count(content, "\nbindp=") >= 10 || strings.Contains(content, "dms ipc call"))
-}
-
-func (m *MangoWCProvider) stockBindsScaffold(binds map[string]*mangowcOverrideBind) string {
-	terminalCommand := "ghostty"
-	for _, key := range []string{"super+t", "super+return"} {
-		if bind, ok := binds[key]; ok {
-			command, params := m.parseAction(bind.Action)
-			if command == "spawn" && strings.TrimSpace(params) != "" && !strings.Contains(params, "dms ") {
-				terminalCommand = params
-				break
-			}
-		}
-	}
-	return strings.ReplaceAll(config.MangoBindsConfig, "{{TERMINAL_COMMAND}}", terminalCommand)
-}
-
-func (m *MangoWCProvider) dropReplacedStockBinds(binds map[string]*mangowcOverrideBind) {
-	if bind, ok := binds["super+j"]; ok && bind.Action == "switch_layout" {
-		delete(binds, "super+j")
-	}
-}
-
-func (m *MangoWCProvider) sortedBinds(binds map[string]*mangowcOverrideBind) []*mangowcOverrideBind {
 	bindList := make([]*mangowcOverrideBind, 0, len(binds))
 	for _, bind := range binds {
 		bindList = append(bindList, bind)
 	}
+
 	sort.Slice(bindList, func(i, j int) bool {
 		pi, pj := m.getBindSortPriority(bindList[i].Action), m.getBindSortPriority(bindList[j].Action)
 		if pi != pj {
@@ -524,75 +380,20 @@ func (m *MangoWCProvider) sortedBinds(binds map[string]*mangowcOverrideBind) []*
 		}
 		return bindList[i].Key < bindList[j].Key
 	})
-	return bindList
-}

-func (m *MangoWCProvider) writeBindLineToLines(lines *[]string, bind *mangowcOverrideBind) {
 	var sb strings.Builder
-	m.writeBindLine(&sb, bind)
-	text := strings.TrimSuffix(sb.String(), "\n")
-	if text == "" {
-		return
+	for _, bind := range bindList {
+		m.writeBindLine(&sb, bind)
 	}
-	*lines = append(*lines, strings.Split(text, "\n")...)
-}

-func (m *MangoWCProvider) previousComment(lines []string) string {
-	if len(lines) == 0 {
-		return ""
-	}
-	trimmed := strings.TrimSpace(lines[len(lines)-1])
-	if !strings.HasPrefix(trimmed, "#") {
-		return ""
-	}
-	comment := strings.TrimSpace(strings.TrimPrefix(trimmed, "#"))
-	if isMangoWCSectionComment(comment) {
-		return ""
-	}
-	return comment
-}
-
-func (m *MangoWCProvider) dropPreviousDescriptionComment(lines *[]string) {
-	if len(*lines) == 0 {
-		return
-	}
-	trimmed := strings.TrimSpace((*lines)[len(*lines)-1])
-	if !strings.HasPrefix(trimmed, "#") || strings.HasPrefix(trimmed, "# ===") {
-		return
-	}
-	*lines = (*lines)[:len(*lines)-1]
-}
-
-func (m *MangoWCProvider) trimTrailingEmptyLines(lines *[]string) {
-	for len(*lines) > 0 && strings.TrimSpace((*lines)[len(*lines)-1]) == "" {
-		*lines = (*lines)[:len(*lines)-1]
-	}
-}
-
-func (m *MangoWCProvider) copyBindWithDescription(bind *mangowcOverrideBind, description string) *mangowcOverrideBind {
-	copy := *bind
-	copy.Description = description
-	return &copy
+	return sb.String()
 }

 func (m *MangoWCProvider) writeBindLine(sb *strings.Builder, bind *mangowcOverrideBind) {
 	mods, key := m.parseKeyString(bind.Key)
 	command, params := m.parseAction(bind.Action)

-	// Description goes on the line ABOVE the bind: mango doesn't strip inline `#`
-	// comments from a value, so a trailing comment would break spawn (extra argv).
-	if bind.Description != "" {
-		sb.WriteString("# ")
-		sb.WriteString(bind.Description)
-		sb.WriteString("\n")
-	}
-
-	prefix := bind.Prefix
-	if prefix == "" {
-		prefix = "bind"
-	}
-	sb.WriteString(prefix)
-	sb.WriteString("=")
+	sb.WriteString("bind=")
 	if mods == "" {
 		sb.WriteString("none")
 	} else {
@@ -608,37 +409,12 @@ func (m *MangoWCProvider) writeBindLine(sb *strings.Builder, bind *mangowcOverri
 		sb.WriteString(params)
 	}

-	sb.WriteString("\n")
-}
+	if bind.Description != "" {
+		sb.WriteString(" # ")
+		sb.WriteString(bind.Description)
+	}

-func (m *MangoWCProvider) bindPrefixFromOptions(options map[string]any) string {
-	if options == nil {
-		return ""
-	}
-	value, ok := options["flags"]
-	if !ok {
-		return ""
-	}
-	flags := ""
-	switch v := value.(type) {
-	case string:
-		flags = v
-	case fmt.Stringer:
-		flags = v.String()
-	default:
-		return ""
-	}
-	flags = strings.TrimSpace(flags)
-	if flags == "" {
-		return "bind"
-	}
-	var clean strings.Builder
-	for _, ch := range flags {
-		if strings.ContainsRune("lsrp", ch) && !strings.ContainsRune(clean.String(), ch) {
-			clean.WriteRune(ch)
-		}
-	}
-	return "bind" + clean.String()
+	sb.WriteString("\n")
 }

 func (m *MangoWCProvider) parseKeyString(keyStr string) (mods, key string) {
@@ -15,10 +15,6 @@ const (

 var MangoWCModSeparators = []rune{'+', ' '}

-func isMangoWCSectionComment(comment string) bool {
-	return strings.HasPrefix(strings.TrimSpace(comment), "===")
-}
-
 type MangoWCKeyBinding struct {
 	Mods    []string `json:"mods"`
 	Key     string   `json:"key"`
@@ -220,40 +216,101 @@ func mangowcAutogenerateComment(command, params string) string {
 	}
 }

-func (p *MangoWCParser) getKeybindAtLine(lineNumber int, precedingComment string) *MangoWCKeyBinding {
+func (p *MangoWCParser) getKeybindAtLine(lineNumber int) *MangoWCKeyBinding {
 	if lineNumber >= len(p.contentLines) {
 		return nil
 	}
-	return p.getKeybindAtLineContent(p.contentLines[lineNumber], precedingComment)
+
+	line := p.contentLines[lineNumber]
+
+	bindMatch := regexp.MustCompile(`^(bind[lsr]*)\s*=\s*(.+)$`)
+	matches := bindMatch.FindStringSubmatch(line)
+	if len(matches) < 3 {
+		return nil
+	}
+
+	bindType := matches[1]
+	content := matches[2]
+
+	parts := strings.SplitN(content, "#", 2)
+	keys := parts[0]
+
+	var comment string
+	if len(parts) > 1 {
+		comment = strings.TrimSpace(parts[1])
+	}
+
+	if strings.HasPrefix(comment, MangoWCHideComment) {
+		return nil
+	}
+
+	keyFields := strings.SplitN(keys, ",", 4)
+	if len(keyFields) < 3 {
+		return nil
+	}
+
+	mods := strings.TrimSpace(keyFields[0])
+	key := strings.TrimSpace(keyFields[1])
+	command := strings.TrimSpace(keyFields[2])
+
+	var params string
+	if len(keyFields) > 3 {
+		params = strings.TrimSpace(keyFields[3])
+	}
+
+	if comment == "" {
+		comment = mangowcAutogenerateComment(command, params)
+	}
+
+	var modList []string
+	if mods != "" && !strings.EqualFold(mods, "none") {
+		modstring := mods + string(MangoWCModSeparators[0])
+		p := 0
+		for index, char := range modstring {
+			isModSep := false
+			for _, sep := range MangoWCModSeparators {
+				if char == sep {
+					isModSep = true
+					break
+				}
+			}
+			if isModSep {
+				if index-p > 1 {
+					modList = append(modList, modstring[p:index])
+				}
+				p = index + 1
+			}
+		}
+	}
+
+	_ = bindType
+
+	return &MangoWCKeyBinding{
+		Mods:    modList,
+		Key:     key,
+		Command: command,
+		Params:  params,
+		Comment: comment,
+	}
 }

 func (p *MangoWCParser) ParseKeys() []MangoWCKeyBinding {
 	var keybinds []MangoWCKeyBinding
-	var pendingComment string

 	for lineNumber := 0; lineNumber < len(p.contentLines); lineNumber++ {
-		trimmed := strings.TrimSpace(p.contentLines[lineNumber])
-		if trimmed == "" {
-			pendingComment = ""
-			continue
-		}
-		if strings.HasPrefix(trimmed, "#") {
-			pendingComment = strings.TrimSpace(strings.TrimPrefix(trimmed, "#"))
-			if isMangoWCSectionComment(pendingComment) {
-				pendingComment = ""
-			}
-			continue
-		}
-		if !strings.HasPrefix(trimmed, "bind") {
-			pendingComment = ""
+		line := p.contentLines[lineNumber]
+		if line == "" || strings.HasPrefix(strings.TrimSpace(line), "#") {
 			continue
 		}

-		keybind := p.getKeybindAtLine(lineNumber, pendingComment)
+		if !strings.HasPrefix(strings.TrimSpace(line), "bind") {
+			continue
+		}
+
+		keybind := p.getKeybindAtLine(lineNumber)
 		if keybind != nil {
 			keybinds = append(keybinds, *keybind)
 		}
-		pendingComment = ""
 	}

 	return keybinds
@@ -402,38 +459,21 @@ func (p *MangoWCParser) parseFileWithSource(filePath string) ([]MangoWCKeyBindin
 	p.currentSource = absPath

 	var keybinds []MangoWCKeyBinding
-	var pendingComment string
 	lines := strings.Split(string(data), "\n")

-	for _, line := range lines {
+	for lineNum, line := range lines {
 		trimmed := strings.TrimSpace(line)

-		if trimmed == "" {
-			pendingComment = ""
-			continue
-		}
-
 		if strings.HasPrefix(trimmed, "source") {
 			p.handleSource(trimmed, filepath.Dir(absPath), &keybinds)
-			pendingComment = ""
-			continue
-		}
-
-		if strings.HasPrefix(trimmed, "#") {
-			pendingComment = strings.TrimSpace(strings.TrimPrefix(trimmed, "#"))
-			if isMangoWCSectionComment(pendingComment) {
-				pendingComment = ""
-			}
 			continue
 		}

 		if !strings.HasPrefix(trimmed, "bind") {
-			pendingComment = ""
 			continue
 		}

-		kb := p.getKeybindAtLineContent(line, pendingComment)
-		pendingComment = ""
+		kb := p.getKeybindAtLineContent(line, lineNum)
 		if kb == nil {
 			continue
 		}
@@ -489,11 +529,8 @@ func (p *MangoWCParser) parseDMSBindsDirectly(dmsBindsPath string) []MangoWCKeyB
 	return keybinds
 }

-// getKeybindAtLineContent parses one `bind=` line. precedingComment (a `# ...`
-// line directly above) is the description: mango feeds inline comments to spawn
-// as argv, so DMS keeps descriptions on the line above; inline `#` is a fallback.
-func (p *MangoWCParser) getKeybindAtLineContent(line string, precedingComment string) *MangoWCKeyBinding {
-	bindMatch := regexp.MustCompile(`^(bind[lsrp]*)\s*=\s*(.+)$`)
+func (p *MangoWCParser) getKeybindAtLineContent(line string, _ int) *MangoWCKeyBinding {
+	bindMatch := regexp.MustCompile(`^(bind[lsr]*)\s*=\s*(.+)$`)
 	matches := bindMatch.FindStringSubmatch(line)
 	if len(matches) < 3 {
 		return nil
@@ -507,12 +544,6 @@ func (p *MangoWCParser) getKeybindAtLineContent(line string, precedingComment st
 	if len(parts) > 1 {
 		comment = strings.TrimSpace(parts[1])
 	}
-	if comment == "" {
-		comment = strings.TrimSpace(precedingComment)
-		if isMangoWCSectionComment(comment) {
-			comment = ""
-		}
-	}

 	if strings.HasPrefix(comment, MangoWCHideComment) {
 		return nil
@@ -71,10 +71,9 @@ func TestMangoWCAutogenerateComment(t *testing.T) {

 func TestMangoWCGetKeybindAtLine(t *testing.T) {
 	tests := []struct {
-		name             string
-		line             string
-		precedingComment string
-		expected         *MangoWCKeyBinding
+		name     string
+		line     string
+		expected *MangoWCKeyBinding
 	}{
 		{
 			name: "basic_keybind",
@@ -158,41 +157,6 @@ func TestMangoWCGetKeybindAtLine(t *testing.T) {
 				Comment: "dms ipc call lock lock",
 			},
 		},
-		{
-			name: "bindp_flag",
-			line: "bindp=SUPER,p,spawn,pass-through",
-			expected: &MangoWCKeyBinding{
-				Mods:    []string{"SUPER"},
-				Key:     "p",
-				Command: "spawn",
-				Params:  "pass-through",
-				Comment: "pass-through",
-			},
-		},
-		{
-			name:             "preceding_comment",
-			line:             "bind=SUPER+SHIFT,S,spawn,dms screenshot",
-			precedingComment: "Screenshot: Interactive",
-			expected: &MangoWCKeyBinding{
-				Mods:    []string{"SUPER", "SHIFT"},
-				Key:     "S",
-				Command: "spawn",
-				Params:  "dms screenshot",
-				Comment: "Screenshot: Interactive",
-			},
-		},
-		{
-			name:             "section_header_not_description",
-			line:             "bind=none,XF86AudioRaiseVolume,spawn,dms ipc call audio increment 3",
-			precedingComment: "=== Audio Controls ===",
-			expected: &MangoWCKeyBinding{
-				Mods:    []string{},
-				Key:     "XF86AudioRaiseVolume",
-				Command: "spawn",
-				Params:  "dms ipc call audio increment 3",
-				Comment: "dms ipc call audio increment 3",
-			},
-		},
 		{
 			name: "keybind_with_spaces",
 			line: "bind = SUPER, r, reload_config",
@@ -210,7 +174,7 @@ func TestMangoWCGetKeybindAtLine(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			parser := NewMangoWCParser("")
 			parser.contentLines = []string{tt.line}
-			result := parser.getKeybindAtLine(0, tt.precedingComment)
+			result := parser.getKeybindAtLine(0)

 			if tt.expected == nil {
 				if result != nil {
@@ -457,7 +421,7 @@ func TestMangoWCInvalidBindLines(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			parser := NewMangoWCParser("")
 			parser.contentLines = []string{tt.line}
-			result := parser.getKeybindAtLine(0, "")
+			result := parser.getKeybindAtLine(0)

 			if result != nil {
 				t.Errorf("expected nil for invalid line, got %+v", result)
@@ -3,10 +3,7 @@ package providers
 import (
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
-
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/config"
 )

 func TestMangoWCProviderName(t *testing.T) {
@@ -321,138 +318,3 @@ bind=Ctrl,1,view,1,0
 		t.Error("Did not find terminal keybind with correct key and description")
 	}
 }
-
-func TestMangoWCSetBindPreservesStockCommentsAndGestures(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatalf("failed to create dms dir: %v", err)
-	}
-	bindsPath := filepath.Join(dmsDir, "binds.conf")
-	stock := strings.ReplaceAll(config.MangoBindsConfig, "{{TERMINAL_COMMAND}}", "ghostty")
-	if err := os.WriteFile(bindsPath, []byte(stock), 0o644); err != nil {
-		t.Fatalf("failed to write stock binds: %v", err)
-	}
-
-	provider := NewMangoWCProvider(tmpDir)
-	if err := provider.SetBind("SUPER+SHIFT+S", "spawn dms screenshot", "Screenshot: Interactive", nil); err != nil {
-		t.Fatalf("SetBind failed: %v", err)
-	}
-
-	contentBytes, err := os.ReadFile(bindsPath)
-	if err != nil {
-		t.Fatalf("failed to read binds: %v", err)
-	}
-	content := string(contentBytes)
-
-	for _, want := range []string{
-		"# === Application Launchers ===",
-		"# === Touchpad Gestures ===",
-		"gesturebind=none,right,3,viewtoleft_have_client",
-		"gesturebind=none,left,3,viewtoright_have_client",
-		"# Screenshot: Interactive\nbind=SUPER+SHIFT,S,spawn,dms screenshot",
-	} {
-		if !strings.Contains(content, want) {
-			t.Fatalf("expected saved binds to contain %q\ncontent:\n%s", want, content)
-		}
-	}
-	if strings.Contains(content, "# === Audio Controls ===\n# === Audio Controls ===") {
-		t.Fatalf("section header should not be duplicated as a bind description\ncontent:\n%s", content)
-	}
-}
-
-func TestMangoWCSetBindRestoresScaffoldForStrippedFile(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatalf("failed to create dms dir: %v", err)
-	}
-	bindsPath := filepath.Join(dmsDir, "binds.conf")
-	stripped := `bind=SUPER,t,spawn,ghostty
-bind=SUPER,Return,spawn,ghostty
-bind=SUPER,space,spawn,dms ipc call spotlight toggle
-bind=SUPER,v,spawn,dms ipc call clipboard toggle
-bind=SUPER,q,killclient
-bind=SUPER,Left,focusdir,left
-bind=SUPER,Right,focusdir,right
-bind=SUPER,Up,focusdir,up
-bind=SUPER,Down,focusdir,down
-bind=SUPER,1,view,1
-bind=SUPER,2,view,2
-bind=SUPER,3,view,3
-`
-	if err := os.WriteFile(bindsPath, []byte(stripped), 0o644); err != nil {
-		t.Fatalf("failed to write stripped binds: %v", err)
-	}
-
-	provider := NewMangoWCProvider(tmpDir)
-	if err := provider.SetBind("SUPER+SHIFT+S", "spawn dms screenshot", "Screenshot: Interactive", nil); err != nil {
-		t.Fatalf("SetBind failed: %v", err)
-	}
-
-	contentBytes, err := os.ReadFile(bindsPath)
-	if err != nil {
-		t.Fatalf("failed to read binds: %v", err)
-	}
-	content := string(contentBytes)
-
-	for _, want := range []string{
-		"# DMS default keybinds (MangoWM)",
-		"# === Touchpad Gestures ===",
-		"gesturebind=none,right,3,viewtoleft_have_client",
-		"bind=SUPER,H,focusdir,left",
-		"bind=SUPER,J,focusdir,down",
-		"bind=SUPER,K,focusdir,up",
-		"bind=SUPER,L,focusdir,right",
-		"# === Custom Keybinds ===",
-		"# Screenshot: Interactive\nbind=SUPER+SHIFT,S,spawn,dms screenshot",
-		"bind=SUPER,t,spawn,ghostty",
-	} {
-		if !strings.Contains(content, want) {
-			t.Fatalf("expected restored binds to contain %q\ncontent:\n%s", want, content)
-		}
-	}
-	if strings.Contains(content, "{{TERMINAL_COMMAND}}") {
-		t.Fatalf("terminal placeholder should have been resolved\ncontent:\n%s", content)
-	}
-}
-
-func TestMangoWCRemoveBindPreservesNonBindLines(t *testing.T) {
-	tmpDir := t.TempDir()
-	dmsDir := filepath.Join(tmpDir, "dms")
-	if err := os.MkdirAll(dmsDir, 0o755); err != nil {
-		t.Fatalf("failed to create dms dir: %v", err)
-	}
-	bindsPath := filepath.Join(dmsDir, "binds.conf")
-	stock := strings.ReplaceAll(config.MangoBindsConfig, "{{TERMINAL_COMMAND}}", "ghostty")
-	if err := os.WriteFile(bindsPath, []byte(stock), 0o644); err != nil {
-		t.Fatalf("failed to write stock binds: %v", err)
-	}
-
-	provider := NewMangoWCProvider(tmpDir)
-	if err := provider.RemoveBind("SUPER+Tab"); err != nil {
-		t.Fatalf("RemoveBind failed: %v", err)
-	}
-
-	contentBytes, err := os.ReadFile(bindsPath)
-	if err != nil {
-		t.Fatalf("failed to read binds: %v", err)
-	}
-	content := string(contentBytes)
-
-	if strings.Contains(content, "bind=SUPER,Tab,focusstack,next") {
-		t.Fatalf("removed bind should be absent\ncontent:\n%s", content)
-	}
-	if strings.Contains(content, "# Focus Next Window") {
-		t.Fatalf("removed bind description should be absent\ncontent:\n%s", content)
-	}
-	for _, want := range []string{
-		"# === Focus Navigation ===",
-		"# === Touchpad Gestures ===",
-		"gesturebind=none,down,4,toggleoverview",
-	} {
-		if !strings.Contains(content, want) {
-			t.Fatalf("expected non-bind line %q to be preserved\ncontent:\n%s", want, content)
-		}
-	}
-}
@@ -149,7 +149,7 @@ func (n *NiriProvider) convertKeybind(kb *NiriKeyBinding, subcategory string, co

 	source := "config"
 	if strings.Contains(kb.Source, "dms/binds.kdl") {
-		source = "dms-default"
+		source = "dms"
 	}

 	bind := keybinds.Keybind{
@@ -165,8 +165,8 @@ func (n *NiriProvider) convertKeybind(kb *NiriKeyBinding, subcategory string, co
 		Repeat:          kb.Repeat,
 	}

-	if source == "dms-default" && conflicts != nil {
-		if conflictKb, ok := conflicts[normalizeNiriBindKey(keyStr)]; ok {
+	if source == "dms" && conflicts != nil {
+		if conflictKb, ok := conflicts[keyStr]; ok {
 			bind.Conflict = &keybinds.Keybind{
 				Key:         keyStr,
 				Description: conflictKb.Description,
@@ -249,7 +249,7 @@ func (n *NiriProvider) SetBind(key, action, description string, options map[stri
 		existingBinds = make(map[string]*overrideBind)
 	}

-	existingBinds[normalizeNiriBindKey(key)] = &overrideBind{
+	existingBinds[key] = &overrideBind{
 		Key:         key,
 		Action:      action,
 		Description: description,
@@ -265,14 +265,10 @@ func (n *NiriProvider) RemoveBind(key string) error {
 		return nil
 	}

-	delete(existingBinds, normalizeNiriBindKey(key))
+	delete(existingBinds, key)
 	return n.writeOverrideBinds(existingBinds)
 }

-func (n *NiriProvider) ResetBind(key string) error {
-	return n.RemoveBind(key)
-}
-
 type overrideBind struct {
 	Key         string
 	Action      string
@@ -316,7 +312,7 @@ func (n *NiriProvider) loadOverrideBinds() (map[string]*overrideBind, error) {
 				action = n.formatRawAction(kb.Action, kb.Args)
 			}

-			binds[normalizeNiriBindKey(keyStr)] = &overrideBind{
+			binds[keyStr] = &overrideBind{
 				Key:         keyStr,
 				Action:      action,
 				Description: kb.Description,
@@ -162,14 +162,6 @@ func NewNiriParser(configDir string) *NiriParser {
 	}
 }

-func normalizeNiriBindKey(key string) string {
-	parts := strings.Split(key, "+")
-	for i := range parts {
-		parts[i] = strings.ToLower(strings.TrimSpace(parts[i]))
-	}
-	return strings.Join(parts, "+")
-}
-
 func (p *NiriParser) Parse() (*NiriSection, error) {
 	dmsBindsPath := filepath.Join(p.configDir, "dms", "binds.kdl")
 	if _, err := os.Stat(dmsBindsPath); err == nil {
@@ -221,25 +213,24 @@ func (p *NiriParser) finalizeBinds() []NiriKeyBinding {

 func (p *NiriParser) addBind(kb *NiriKeyBinding) {
 	key := p.formatBindKey(kb)
-	normalizedKey := normalizeNiriBindKey(key)
 	isDMSBind := strings.Contains(kb.Source, "dms/binds.kdl")

 	if isDMSBind {
-		p.dmsBindKeys[normalizedKey] = true
-		p.dmsBindMap[normalizedKey] = kb
-	} else if p.dmsBindKeys[normalizedKey] {
+		p.dmsBindKeys[key] = true
+		p.dmsBindMap[key] = kb
+	} else if p.dmsBindKeys[key] {
 		p.bindsAfterDMS++
-		p.conflictingConfigs[normalizedKey] = kb
-		p.configBindKeys[normalizedKey] = true
+		p.conflictingConfigs[key] = kb
+		p.configBindKeys[key] = true
 		return
 	} else {
-		p.configBindKeys[normalizedKey] = true
+		p.configBindKeys[key] = true
 	}

-	if _, exists := p.bindMap[normalizedKey]; !exists {
-		p.bindOrder = append(p.bindOrder, normalizedKey)
+	if _, exists := p.bindMap[key]; !exists {
+		p.bindOrder = append(p.bindOrder, key)
 	}
-	p.bindMap[normalizedKey] = kb
+	p.bindMap[key] = kb
 }

 func (p *NiriParser) formatBindKey(kb *NiriKeyBinding) string {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bbedward	b9064d3bbb	restore niri overview connected mode	2026-04-23 13:11:17 -04:00
bbedward	1905d51595	some more simplifications and bug fixes	2026-04-23 13:11:17 -04:00
bbedward	7f906128fa	de-dupe and cleanup	2026-04-23 13:11:17 -04:00
bbedward	b588d2dac5	restore CC and notification standalone behavior	2026-04-23 13:11:17 -04:00
bbedward	e0abeb3708	refactor connected/standalone architecture	2026-04-23 13:11:17 -04:00
purian23	bdbbfc79c0	(frameMode): New Modal & Launcher connections	2026-04-23 13:11:17 -04:00
purian23	62926d8f0c	(Notifications): Update body card expansions	2026-04-23 13:11:17 -04:00
purian23	86dc14b58d	(frame): QOL Control Center & Notification updates	2026-04-23 13:11:17 -04:00
purian23	397ccad113	feat(Frame): Close the gaps	2026-04-23 13:11:17 -04:00
purian23	9036368da3	frame(Notifications): Update Arc path & Motion	2026-04-23 13:11:17 -04:00
purian23	c96136f381	(frame): Update animation sync w/Dank Popouts	2026-04-23 13:11:17 -04:00
purian23	1660e0c065	(frame): Performance round	2026-04-23 13:11:17 -04:00
purian23	7c7299d33f	(frame): Update Connected blur Arcs & Enable shadow modes	2026-04-23 13:11:17 -04:00
purian23	dbf9b86956	frame(ConnectedMode): Wire up Notifications	2026-04-23 13:11:17 -04:00
purian23	7d7819c693	(frame): Update connected mode animation & motion logic	2026-04-23 13:11:17 -04:00
purian23	7b9dcab54b	(frame): implement ConnectedModeState to better handle component sync	2026-04-23 13:11:17 -04:00
purian23	9946421dac	(frameMode): Restore user settings when exiting frame mode - Align blur settings in non-FrameMode motion settings	2026-04-23 13:11:17 -04:00
purian23	c66de3b5df	(frame): Update connected mode with blur	2026-04-23 13:11:17 -04:00
purian23	09088bbb27	(frame): Update connected mode & opacity connection settings	2026-04-23 13:11:17 -04:00
purian23	0310b76ab5	(frameInMotion): Initial Unified Frame Connected Mode	2026-04-23 13:11:17 -04:00
purian23	e9f3e25e24	Add Directional Motion options	2026-04-23 13:11:17 -04:00
purian23	7596423d69	Initial staging for Animation & Motion effects	2026-04-23 13:11:17 -04:00
purian23	1987f2c279	(frame): Add blur support & cleanup	2026-04-23 13:11:17 -04:00
purian23	f64e0653f4	(frame): Multi-monitor support	2026-04-23 13:11:17 -04:00
purian23	ac49332d5d	Connected frames & defaults	2026-04-23 13:11:17 -04:00
purian23	cf3d553ace	Continue frame implementation	2026-04-23 13:11:17 -04:00
purian23	bc79b6575c	Initial framework	2026-04-23 13:11:17 -04:00
				`@@ -1 +0,0 @@`
				`-- Optional per-user keybind overrides (managed by DMS). Loaded after default binds.`
				`@@ -1 +0,0 @@`
				`-- Cursor theme overrides. Deploy writes ~/.config/hypr/dms/cursor.lua`
				`@@ -1 +0,0 @@`
				`-- Window rules. Deploy writes ~/.config/hypr/dms/windowrules.lua`