labwc patch (#1391)

* niri: Handle new Cast events

* bar: Add screen sharing indicator

Configurable like other icons; on by default.

* lockscreen: Add screen sharing indicator

.gitignore

@@ -109,3 +109,4 @@ bin/
 .envrc
 .direnv/
 quickshell/dms-plugins
+__pycache__

core/cmd/dms/commands_doctor.go

@@ -87,6 +87,8 @@ var (
 	swayVersionRegex       = regexp.MustCompile(`sway version (\d+\.\d+)`)
 	riverVersionRegex      = regexp.MustCompile(`river (\d+\.\d+)`)
 	wayfireVersionRegex    = regexp.MustCompile(`wayfire (\d+\.\d+)`)
+	labwcVersionRegex      = regexp.MustCompile(`labwc (\d+\.\d+\.\d+)`)
+	mangowcVersionRegex    = regexp.MustCompile(`mango (\d+\.\d+\.\d+)`)
 )
 
 var doctorCmd = &cobra.Command{
@@ -448,11 +450,13 @@ func checkWindowManagers() []checkResult {
 		versionRegex                 *regexp.Regexp
 		commands                     []string
 	}{
-		{"Hyprland", "hyprctl", "version", hyprlandVersionRegex, []string{"hyprland", "Hyprland"}},
+		{"Hyprland", "Hyprland", "--version", hyprlandVersionRegex, []string{"hyprland", "Hyprland"}},
 		{"niri", "niri", "--version", niriVersionRegex, []string{"niri"}},
 		{"Sway", "sway", "--version", swayVersionRegex, []string{"sway"}},
 		{"River", "river", "-version", riverVersionRegex, []string{"river"}},
 		{"Wayfire", "wayfire", "--version", wayfireVersionRegex, []string{"wayfire"}},
+		{"labwc", "labwc", "--version", labwcVersionRegex, []string{"labwc"}},
+		{"mangowc", "mango", "-v", mangowcVersionRegex, []string{"mango"}},
 	}
 
 	var results []checkResult
@@ -477,7 +481,7 @@ func checkWindowManagers() []checkResult {
 		results = append(results, checkResult{
 			catCompositor, c.name, statusOK,
 			getVersionFromCommand(c.versionCmd, c.versionArg, c.versionRegex), details,
-			doctorDocsURL + "#compositor",
+			doctorDocsURL + "#compositor-checks",
 		})
 	}
 
@@ -486,7 +490,7 @@ func checkWindowManagers() []checkResult {
 			catCompositor, "Compositor", statusError,
 			"No supported Wayland compositor found",
 			"Install Hyprland, niri, Sway, River, or Wayfire",
-			doctorDocsURL + "#compositor",
+			doctorDocsURL + "#compositor-checks",
 		})
 	}
 
@@ -498,8 +502,8 @@ func checkWindowManagers() []checkResult {
 }
 
 func getVersionFromCommand(cmd, arg string, regex *regexp.Regexp) string {
-	output, err := exec.Command(cmd, arg).Output()
-	if err != nil {
+	output, err := exec.Command(cmd, arg).CombinedOutput()
+	if err != nil && len(output) == 0 {
 		return "installed"
 	}
 
@@ -634,19 +638,14 @@ func checkI2CAvailability() checkResult {
 	return checkResult{catOptionalFeatures, "I2C/DDC", statusOK, fmt.Sprintf("%d monitor(s) detected", len(devices)), "External monitor brightness control", doctorDocsURL + "#optional-features"}
 }
 
-func detectNetworkBackend() string {
-	result, err := network.DetectNetworkStack()
-	if err != nil {
-		return ""
-	}
-
-	switch result.Backend {
+func detectNetworkBackend(stackResult *network.DetectResult) string {
+	switch stackResult.Backend {
 	case network.BackendNetworkManager:
 		return "NetworkManager"
 	case network.BackendIwd:
 		return "iwd"
 	case network.BackendNetworkd:
-		if result.HasIwd {
+		if stackResult.HasIwd {
 			return "iwd + systemd-networkd"
 		}
 		return "systemd-networkd"
@@ -657,75 +656,73 @@ func detectNetworkBackend() string {
 	}
 }
 
+func getOptionalDBusStatus(busName string) (status, string) {
+	if utils.IsDBusServiceAvailable(busName) {
+		return statusOK, "Available"
+	} else {
+		return statusWarn, "Not available"
+	}
+}
+
 func checkOptionalDependencies() []checkResult {
 	var results []checkResult
 
-	if utils.IsServiceActive("accounts-daemon", false) {
-		results = append(results, checkResult{catOptionalFeatures, "accountsservice", statusOK, "Running", "User accounts", doctorDocsURL + "#optional-features"})
-	} else {
-		results = append(results, checkResult{catOptionalFeatures, "accountsservice", statusWarn, "Not running", "User accounts", doctorDocsURL + "#optional-features"})
-	}
+	optionalFeaturesURL := doctorDocsURL + "#optional-features"
 
-	if utils.IsServiceActive("power-profiles-daemon", false) {
-		results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", statusOK, "Running", "Power profile management", doctorDocsURL + "#optional-features"})
-	} else {
-		results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", statusInfo, "Not running", "Power profile management", doctorDocsURL + "#optional-features"})
-	}
+	accountsStatus, accountsMsg := getOptionalDBusStatus("org.freedesktop.Accounts")
+	results = append(results, checkResult{catOptionalFeatures, "accountsservice", accountsStatus, accountsMsg, "User accounts", optionalFeaturesURL})
+
+	ppdStatus, ppdMsg := getOptionalDBusStatus("org.freedesktop.UPower.PowerProfiles")
+	results = append(results, checkResult{catOptionalFeatures, "power-profiles-daemon", ppdStatus, ppdMsg, "Power profile management", optionalFeaturesURL})
+
+	logindStatus, logindMsg := getOptionalDBusStatus("org.freedesktop.login1")
+	results = append(results, checkResult{catOptionalFeatures, "logind", logindStatus, logindMsg, "Session management", optionalFeaturesURL})
 
 	results = append(results, checkI2CAvailability())
 
 	terminals := []string{"ghostty", "kitty", "alacritty", "foot", "wezterm"}
 	if idx := slices.IndexFunc(terminals, utils.CommandExists); idx >= 0 {
-		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, terminals[idx], "", doctorDocsURL + "#optional-features"})
+		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusOK, terminals[idx], "", optionalFeaturesURL})
 	} else {
-		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", doctorDocsURL + "#optional-features"})
+		results = append(results, checkResult{catOptionalFeatures, "Terminal", statusWarn, "None found", "Install ghostty, kitty, or alacritty", optionalFeaturesURL})
 	}
 
+	networkResult, err := network.DetectNetworkStack()
+	networkStatus, networkMessage, networkDetails := statusOK, "Not available", "Network management"
+
+	if err == nil && networkResult.Backend != network.BackendNone {
+		networkMessage = detectNetworkBackend(networkResult)
+		if doctorVerbose {
+			networkDetails = networkResult.ChosenReason
+		}
+	} else {
+		networkStatus = statusInfo
+	}
+
+	results = append(results, checkResult{catOptionalFeatures, "Network", networkStatus, networkMessage, networkDetails, optionalFeaturesURL})
+
 	deps := []struct {
-		name, cmd, altCmd, desc string
-		important               bool
+		name, cmd, desc string
+		important       bool
 	}{
-		{"matugen", "matugen", "", "Dynamic theming", true},
-		{"dgop", "dgop", "", "System monitoring", true},
-		{"cava", "cava", "", "Audio visualizer", true},
-		{"khal", "khal", "", "Calendar events", false},
-		{"Network", "nmcli", "iwctl", "Network management", false},
-		{"danksearch", "dsearch", "", "File search", false},
-		{"loginctl", "loginctl", "", "Session management", false},
-		{"fprintd", "fprintd-list", "", "Fingerprint auth", false},
+		{"matugen", "matugen", "Dynamic theming", true},
+		{"dgop", "dgop", "System monitoring", true},
+		{"cava", "cava", "Audio visualizer", true},
+		{"khal", "khal", "Calendar events", false},
+		{"danksearch", "dsearch", "File search", false},
+		{"fprintd", "fprintd-list", "Fingerprint auth", false},
 	}
 
 	for _, d := range deps {
-		found, foundCmd := utils.CommandExists(d.cmd), d.cmd
-		if !found && d.altCmd != "" && utils.CommandExists(d.altCmd) {
-			found, foundCmd = true, d.altCmd
-		}
+		found := utils.CommandExists(d.cmd)
 
 		switch {
 		case found:
-			message := "Installed"
-			details := d.desc
-			if d.name == "Network" {
-				result, err := network.DetectNetworkStack()
-				if err == nil && result.Backend != network.BackendNone {
-					message = detectNetworkBackend() + " (active)"
-					if doctorVerbose {
-						details = result.ChosenReason
-					}
-				} else {
-					switch foundCmd {
-					case "nmcli":
-						message = "NetworkManager (installed)"
-					case "iwctl":
-						message = "iwd (installed)"
-					}
-				}
-			}
-			results = append(results, checkResult{catOptionalFeatures, d.name, statusOK, message, details, doctorDocsURL + "#optional-features"})
+			results = append(results, checkResult{catOptionalFeatures, d.name, statusOK, "Installed", d.desc, optionalFeaturesURL})
 		case d.important:
-			results = append(results, checkResult{catOptionalFeatures, d.name, statusWarn, "Missing", d.desc, doctorDocsURL + "#optional-features"})
+			results = append(results, checkResult{catOptionalFeatures, d.name, statusWarn, "Missing", d.desc, optionalFeaturesURL})
 		default:
-			results = append(results, checkResult{catOptionalFeatures, d.name, statusInfo, "Not installed", d.desc, doctorDocsURL + "#optional-features"})
+			results = append(results, checkResult{catOptionalFeatures, d.name, statusInfo, "Not installed", d.desc, optionalFeaturesURL})
 		}
 	}
 
@@ -893,6 +890,10 @@ func printResultLine(r checkResult, styles tui.Styles) {
 	if doctorVerbose && r.details != "" {
 		fmt.Printf("      %s\n", styles.Subtle.Render("└─ "+r.details))
 	}
+
+	if (r.status == statusError || r.status == statusWarn) && r.url != "" {
+		fmt.Printf("      %s\n", styles.Subtle.Render("→ "+r.url))
+	}
 }
 
 func printSummary(results []checkResult, qsMissingFeatures bool) {

core/internal/config/embedded/hypr-binds.conf

@@ -8,6 +8,7 @@ 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

core/internal/config/embedded/niri-binds.kdl

@@ -15,6 +15,8 @@ binds {
     Mod+M hotkey-overlay-title="Task Manager" {
         spawn "dms" "ipc" "call" "processlist" "focusOrToggle";
     }
+
+    Super+X hotkey-overlay-title="Power Menu: Toggle" { spawn "dms" "ipc" "call" "powermenu" "toggle"; }
     Mod+Comma hotkey-overlay-title="Settings" {
         spawn "dms" "ipc" "call" "settings" "focusOrToggle";
     }

core/internal/distros/opensuse.go

@@ -108,7 +108,6 @@ func (o *OpenSUSEDistribution) GetPackageMappingWithVariants(wm deps.WindowManag
 	packages := map[string]PackageMapping{
 		// Standard zypper packages
 		"git":                    {Name: "git", Repository: RepoTypeSystem},
-		"ghostty":                {Name: "ghostty", Repository: RepoTypeSystem},
 		"kitty":                  {Name: "kitty", Repository: RepoTypeSystem},
 		"alacritty":              {Name: "alacritty", Repository: RepoTypeSystem},
 		"xdg-desktop-portal-gtk": {Name: "xdg-desktop-portal-gtk", Repository: RepoTypeSystem},
@@ -117,6 +116,7 @@ func (o *OpenSUSEDistribution) GetPackageMappingWithVariants(wm deps.WindowManag
 		// DMS packages from OBS
 		"dms (DankMaterialShell)": o.getDmsMapping(variants["dms (DankMaterialShell)"]),
 		"quickshell":              o.getQuickshellMapping(variants["quickshell"]),
+		"ghostty":                 {Name: "ghostty", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"matugen":                 {Name: "matugen", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 		"dgop":                    {Name: "dgop", Repository: RepoTypeOBS, RepoURL: "home:AvengeMedia:danklinux"},
 	}

core/internal/keybinds/providers/niri.go

@@ -325,24 +325,30 @@ func (n *NiriProvider) buildActionFromNode(bindNode *document.Node) string {
 	}
 
 	actionNode := bindNode.Children[0]
-
-	kdlStr := strings.TrimSpace(actionNode.String())
-	if kdlStr == "" {
+	actionName := actionNode.Name.String()
+	if actionName == "" {
 		return ""
 	}
 
-	return n.kdlActionToInternal(kdlStr)
-}
-
-func (n *NiriProvider) kdlActionToInternal(kdlAction string) string {
-	parts := n.parseActionParts(kdlAction)
-	if len(parts) == 0 {
-		return kdlAction
+	parts := []string{actionName}
+	for _, arg := range actionNode.Arguments {
+		val := arg.ValueString()
+		if val == "" {
+			parts = append(parts, `""`)
+		} else {
+			parts = append(parts, val)
+		}
 	}
 
-	for i, part := range parts {
-		if part == "" {
-			parts[i] = `""`
+	if actionNode.Properties != nil {
+		if val, ok := actionNode.Properties.Get("focus"); ok {
+			parts = append(parts, "focus="+val.String())
+		}
+		if val, ok := actionNode.Properties.Get("show-pointer"); ok {
+			parts = append(parts, "show-pointer="+val.String())
+		}
+		if val, ok := actionNode.Properties.Get("write-to-disk"); ok {
+			parts = append(parts, "write-to-disk="+val.String())
 		}
 	}
 

core/internal/matugen/matugen.go

@@ -314,6 +314,7 @@ output_path = '%s'
 			appendVSCodeConfig(cfgFile, "codeoss", filepath.Join(homeDir, ".config/Code - OSS/extensions"), opts.ShellDir)
 			appendVSCodeConfig(cfgFile, "cursor", filepath.Join(homeDir, ".cursor/extensions"), opts.ShellDir)
 			appendVSCodeConfig(cfgFile, "windsurf", filepath.Join(homeDir, ".windsurf/extensions"), opts.ShellDir)
+			appendVSCodeConfig(cfgFile, "vscode-insiders", filepath.Join(homeDir, ".vscode-insiders/extensions"), opts.ShellDir)
 		default:
 			appendConfig(opts, cfgFile, tmpl.Commands, tmpl.Flatpaks, tmpl.ConfigFile)
 		}

core/internal/server/wlcontext/context.go

@@ -124,27 +124,23 @@ func (sc *SharedContext) eventDispatcher() {
 	}
 
 	for {
+		sc.drainCmdQueue()
+
 		select {
 		case <-sc.stopChan:
 			return
 		default:
 		}
 
-		sc.drainCmdQueue()
-
-		n, err := unix.Poll(pollFds, 50)
-		if err != nil {
-			if err == unix.EINTR {
-				continue
-			}
+		_, err := unix.Poll(pollFds, -1)
+		switch {
+		case err == unix.EINTR:
+			continue
+		case err != nil:
 			log.Errorf("Poll error: %v", err)
 			return
 		}
 
-		if n == 0 {
-			continue
-		}
-
 		if pollFds[1].Revents&unix.POLLIN != 0 {
 			var buf [64]byte
 			if _, err := unix.Read(sc.wakeR, buf[:]); err != nil && err != unix.EAGAIN {
@@ -152,13 +148,13 @@ func (sc *SharedContext) eventDispatcher() {
 			}
 		}
 
-		if pollFds[0].Revents&unix.POLLIN != 0 {
-			if err := ctx.Dispatch(); err != nil {
-				if !os.IsTimeout(err) {
-					log.Errorf("Wayland connection error: %v", err)
-					return
-				}
-			}
+		if pollFds[0].Revents&unix.POLLIN == 0 {
+			continue
+		}
+
+		if err := ctx.Dispatch(); err != nil && !os.IsTimeout(err) {
+			log.Errorf("Wayland connection error: %v", err)
+			return
 		}
 	}
 }
@@ -176,12 +172,16 @@ func (sc *SharedContext) drainCmdQueue() {
 
 func (sc *SharedContext) Close() {
 	close(sc.stopChan)
+	if _, err := unix.Write(sc.wakeW, []byte{1}); err != nil && err != unix.EAGAIN {
+		log.Errorf("wake pipe write error on close: %v", err)
+	}
 	sc.wg.Wait()
 
 	unix.Close(sc.wakeR)
 	unix.Close(sc.wakeW)
 
-	if sc.display != nil {
-		sc.display.Context().Close()
+	if sc.display == nil {
+		return
 	}
+	sc.display.Context().Close()
 }

core/internal/utils/dbus.go

@@ -0,0 +1,20 @@
+package utils
+
+import (
+	"github.com/godbus/dbus/v5"
+)
+
+func IsDBusServiceAvailable(busName string) bool {
+	conn, err := dbus.ConnectSystemBus()
+	if err != nil {
+		return false
+	}
+	defer conn.Close()
+
+	obj := conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
+	var owned bool
+	if err := obj.Call("org.freedesktop.DBus.NameHasOwner", 0, busName).Store(&owned); err != nil {
+		return false
+	}
+	return owned
+}

core/internal/utils/exec.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"os/exec"
-	"strings"
 )
 
 type AppChecker interface {
@@ -43,16 +42,3 @@ func AnyCommandExists(cmds ...string) bool {
 	}
 	return false
 }
-
-func IsServiceActive(name string, userService bool) bool {
-	if !CommandExists("systemctl") {
-		return false
-	}
-
-	args := []string{"is-active", name}
-	if userService {
-		args = []string{"--user", "is-active", name}
-	}
-	output, _ := exec.Command("systemctl", args...).Output()
-	return strings.EqualFold(strings.TrimSpace(string(output)), "active")
-}

distro/nix/common.nix

@@ -19,7 +19,8 @@ in
   ]
   ++ lib.optional cfg.enableDynamicTheming pkgs.matugen
   ++ lib.optional cfg.enableAudioWavelength pkgs.cava
-  ++ lib.optional cfg.enableCalendarEvents pkgs.khal;
+  ++ lib.optional cfg.enableCalendarEvents pkgs.khal
+  ++ lib.optional cfg.enableClipboardPaste pkgs.wtype;
 
   plugins = lib.mapAttrs (name: plugin: {
     source = plugin.src;

distro/nix/greeter.nix

@@ -11,12 +11,18 @@ let
 
   inherit (config.services.greetd.settings.default_session) user;
 
+  compositorPackage =
+    let
+      configured = lib.attrByPath [ "programs" cfg.compositor.name "package" ] null config;
+    in
+    if configured != null then configured else builtins.getAttr cfg.compositor.name pkgs;
+
   cacheDir = "/var/lib/dms-greeter";
   greeterScript = pkgs.writeShellScriptBin "dms-greeter" ''
     export PATH=$PATH:${
       lib.makeBinPath [
         cfg.quickshell.package
-        config.programs.${cfg.compositor.name}.package
+        compositorPackage
       ]
     }
     ${
@@ -64,6 +70,7 @@ in
         "niri"
         "hyprland"
         "sway"
+        "labwc"
       ];
       description = "Compositor to run greeter in";
     };

distro/nix/home.nix

@@ -73,6 +73,13 @@ in
       default = hasPluginSettings;
       description = ''Whether to manage plugin settings. Automatically enabled if any plugins have settings configured.'';
     };
+
+    systemd.target = lib.mkOption {
+      type = lib.types.str;
+      default = config.wayland.systemd.target;
+      defaultText = lib.literalExpression "config.wayland.systemd.target";
+      description = "Systemd target to bind to.";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -84,8 +91,8 @@ in
     systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
       Unit = {
         Description = "DankMaterialShell";
-        PartOf = [ config.wayland.systemd.target ];
-        After = [ config.wayland.systemd.target ];
+        PartOf = [ cfg.systemd.target ];
+        After = [ cfg.systemd.target ];
       };
 
       Service = {
@@ -93,7 +100,7 @@ in
         Restart = "on-failure";
       };
 
-      Install.WantedBy = [ config.wayland.systemd.target ];
+      Install.WantedBy = [ cfg.systemd.target ];
     };
 
     xdg.stateFile."DankMaterialShell/session.json" = lib.mkIf (cfg.session != { }) {

distro/nix/nixos.nix

@@ -20,15 +20,19 @@ in
   imports = [
     (import ./options.nix args)
   ];
-
+  options.programs.dank-material-shell.systemd.target = lib.mkOption {
+    type = lib.types.str;
+    description = "Systemd target to bind to.";
+    default = "graphical-session.target";
+  };
   config = lib.mkIf cfg.enable {
     systemd.user.services.dms = lib.mkIf cfg.systemd.enable {
       description = "DankMaterialShell";
       path = lib.mkForce [ ];
 
-      partOf = [ "graphical-session.target" ];
-      after = [ "graphical-session.target" ];
-      wantedBy = [ "graphical-session.target" ];
+      partOf = [ cfg.systemd.target ];
+      after = [ cfg.systemd.target ];
+      wantedBy = [ cfg.systemd.target ];
       restartIfChanged = cfg.systemd.restartIfChanged;
 
       serviceConfig = {

distro/nix/options.nix

@@ -70,6 +70,12 @@ in
       description = "Add calendar events support via khal";
     };
 
+    enableClipboardPaste = lib.mkOption {
+      type = types.bool;
+      default = true;
+      description = "Adds needed dependencies for directly pasting items from the clipboard history.";
+    };
+
     quickshell = {
       package = lib.mkPackageOption dmsPkgs "quickshell" {
         extraDescription = "The quickshell package to use (defaults to be built from source, due to unreleased features used by DMS).";

flake.nix

@@ -61,11 +61,13 @@
               (builtins.substring 6 2 longDate)
             ];
           version =
-            pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION))
-            + "+date="
-            + mkDate (self.lastModifiedDate or "19700101")
-            + "_"
-            + (self.shortRev or "dirty");
+            let
+              rawVersion = pkgs.lib.removePrefix "v" (pkgs.lib.trim (builtins.readFile ./quickshell/VERSION));
+              cleanVersion = builtins.replaceStrings [ " " ] [ "" ] rawVersion;
+              dateSuffix = "+date=" + mkDate (self.lastModifiedDate or "19700101");
+              revSuffix = "_" + (self.shortRev or "dirty");
+            in
+            "${cleanVersion}${dateSuffix}${revSuffix}";
         in
         {
           dms-shell = pkgs.buildGoModule (
@@ -83,7 +85,7 @@
               ldflags = [
                 "-s"
                 "-w"
-                "-X main.Version=${version}"
+                "-X 'main.Version=${version}'"
               ];
 
               nativeBuildInputs = with pkgs; [

quickshell/Common/KeybindActions.js

@@ -450,10 +450,7 @@ const NIRI_ACTION_ARGS = {
         ]
     },
     "screenshot-window": {
-        args: [
-            { name: "show-pointer", type: "bool", label: "Show pointer" },
-            { name: "write-to-disk", type: "bool", label: "Save to disk" }
-        ]
+        args: [{ name: "write-to-disk", type: "bool", label: "Save to disk" }]
     }
 };
 
@@ -841,7 +838,7 @@ function getActionType(action) {
         return "compositor";
     if (action.startsWith("spawn dms ipc call "))
         return "dms";
-    if (action.startsWith("spawn sh -c ") || action.startsWith("spawn bash -c ") || action.startsWith("spawn_shell "))
+    if (/^spawn \w+ -c /.test(action) || action.startsWith("spawn_shell "))
         return "shell";
     if (action.startsWith("spawn "))
         return "spawn";
@@ -888,12 +885,13 @@ function buildSpawnAction(command, args) {
     return "spawn " + parts.join(" ");
 }
 
-function buildShellAction(compositor, shellCmd) {
+function buildShellAction(compositor, shellCmd, shell) {
     if (!shellCmd)
         return "";
     if (compositor === "mangowc")
         return "spawn_shell " + shellCmd;
-    return "spawn sh -c \"" + shellCmd.replace(/"/g, "\\\"") + "\"";
+    var shellBin = shell || "sh";
+    return "spawn " + shellBin + " -c \"" + shellCmd.replace(/"/g, "\\\"") + "\"";
 }
 
 function parseSpawnCommand(action) {
@@ -910,8 +908,9 @@ function parseSpawnCommand(action) {
 function parseShellCommand(action) {
     if (!action)
         return "";
-    if (action.startsWith("spawn sh -c ")) {
-        var content = action.slice(12);
+    var match = action.match(/^spawn (\w+) -c (.+)$/);
+    if (match) {
+        var content = match[2];
         if ((content.startsWith('"') && content.endsWith('"')) || (content.startsWith("'") && content.endsWith("'")))
             content = content.slice(1, -1);
         return content.replace(/\\"/g, "\"");
@@ -921,6 +920,13 @@ function parseShellCommand(action) {
     return "";
 }
 
+function getShellFromAction(action) {
+    if (!action)
+        return "sh";
+    var match = action.match(/^spawn (\w+) -c /);
+    return match ? match[1] : "sh";
+}
+
 function getActionArgConfig(compositor, action) {
     if (!action)
         return null;
@@ -1107,12 +1113,27 @@ function buildCompositorAction(compositor, base, args) {
                 parts.push("focus=false");
             break;
         default:
-            if (base.startsWith("screenshot")) {
+            switch (base) {
+            case "screenshot":
                 if (args["show-pointer"] === true)
                     parts.push("show-pointer=true");
+                else if (args["show-pointer"] === false)
+                    parts.push("show-pointer=false");
+                break;
+            case "screenshot-screen":
+                if (args["show-pointer"] === true)
+                    parts.push("show-pointer=true");
+                else if (args["show-pointer"] === false)
+                    parts.push("show-pointer=false");
                 if (args["write-to-disk"] === true)
                     parts.push("write-to-disk=true");
-            } else if (args.value) {
+                break;
+            case "screenshot-window":
+                if (args["write-to-disk"] === true)
+                    parts.push("write-to-disk=true");
+                break;
+            }
+            if (args.value) {
                 parts.push(args.value);
             } else if (args.index) {
                 parts.push(args.index);

quickshell/Common/ModalManager.qml

@@ -13,17 +13,16 @@ Singleton {
     property var currentModalsByScreen: ({})
 
     function openModal(modal) {
-        if (!modal.allowStacking) {
-            closeAllModalsExcept(modal);
-        }
-        if (!modal.keepPopoutsOpen) {
-            PopoutManager.closeAllPopouts();
-        }
-        TrayMenuManager.closeAllMenus();
-
         const screenName = modal.effectiveScreen?.name ?? "unknown";
         currentModalsByScreen[screenName] = modal;
         modalChanged();
+        Qt.callLater(() => {
+            if (!modal.allowStacking)
+                closeAllModalsExcept(modal);
+            if (!modal.keepPopoutsOpen)
+                PopoutManager.closeAllPopouts();
+            TrayMenuManager.closeAllMenus();
+        });
     }
 
     function closeModal(modal) {

quickshell/Common/Paths.qml

@@ -45,20 +45,28 @@ Singleton {
         Quickshell.execDetached(["cp", strip(from), strip(to)]);
     }
 
+    function isSteamApp(appId: string): bool {
+        return appId && /^steam_app_\d+$/.test(appId);
+    }
+
     function moddedAppId(appId: string): string {
-        if (appId === "Spotify")
-            return "spotify";
-        if (appId === "beepertexts")
-            return "beeper";
-        if (appId === "home assistant desktop")
-            return "homeassistant-desktop";
-        if (appId.includes("com.transmissionbt.transmission")) {
-            if (DesktopEntries.heuristicLookup("transmission-gtk"))
-                return "transmission-gtk";
-            if (DesktopEntries.heuristicLookup("transmission"))
-                return "transmission";
-            return "transmission-gtk";
+        const subs = SettingsData.appIdSubstitutions || [];
+        for (let i = 0; i < subs.length; i++) {
+            const sub = subs[i];
+            if (sub.type === "exact" && appId === sub.pattern) {
+                return sub.replacement;
+            } else if (sub.type === "contains" && appId.includes(sub.pattern)) {
+                return sub.replacement;
+            } else if (sub.type === "regex") {
+                const match = appId.match(new RegExp(sub.pattern));
+                if (match) {
+                    return sub.replacement.replace(/\$(\d+)/g, (_, n) => match[n] || "");
+                }
+            }
         }
+        const steamMatch = appId.match(/^steam_app_(\d+)$/);
+        if (steamMatch)
+            return `steam_icon_${steamMatch[1]}`;
         return appId;
     }
 
@@ -68,8 +76,8 @@ Singleton {
         }
 
         const moddedId = moddedAppId(appId);
-        if (moddedId.toLowerCase().includes("steam_app")) {
-            return "";
+        if (moddedId !== appId) {
+            return Quickshell.iconPath(moddedId, true);
         }
 
         return desktopEntry && desktopEntry.icon ? Quickshell.iconPath(desktopEntry.icon, true) : "";

quickshell/Common/PopoutManager.qml

@@ -82,15 +82,19 @@ Singleton {
             popoutOpening();
         }
 
-        let justClosedSamePopout = false;
+        let movedFromOtherScreen = false;
         for (const otherScreenName in currentPopoutsByScreen) {
             if (otherScreenName === screenName)
                 continue;
             const otherPopout = currentPopoutsByScreen[otherScreenName];
             if (!otherPopout)
                 continue;
+
             if (otherPopout === popout) {
-                justClosedSamePopout = true;
+                movedFromOtherScreen = true;
+                currentPopoutsByScreen[otherScreenName] = null;
+                currentPopoutTriggers[otherScreenName] = null;
+                continue;
             }
 
             if (otherPopout.dashVisible !== undefined) {
@@ -112,7 +116,7 @@ Singleton {
             }
         }
 
-        if (currentPopout === popout && popout.shouldBeVisible) {
+        if (currentPopout === popout && popout.shouldBeVisible && !movedFromOtherScreen) {
             if (triggerId !== undefined && currentPopoutTriggers[screenName] === triggerId) {
                 if (popout.dashVisible !== undefined) {
                     popout.dashVisible = false;
@@ -139,6 +143,7 @@ Singleton {
                 popout.currentTabIndex = tabIndex;
             }
             currentPopoutTriggers[screenName] = triggerId;
+            return;
         }
 
         currentPopoutTriggers[screenName] = triggerId;
@@ -153,16 +158,8 @@ Singleton {
             ModalManager.closeAllModalsExcept(null);
         }
 
-        if (justClosedSamePopout) {
-            Qt.callLater(() => {
-                if (popout.dashVisible !== undefined) {
-                    popout.dashVisible = true;
-                } else if (popout.notificationHistoryVisible !== undefined) {
-                    popout.notificationHistoryVisible = true;
-                } else {
-                    popout.open();
-                }
-            });
+        if (movedFromOtherScreen) {
+            popout.open();
         } else {
             if (popout.dashVisible !== undefined) {
                 popout.dashVisible = true;

quickshell/Common/SettingsData.qml

@@ -1,5 +1,5 @@
 pragma Singleton
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
@@ -145,6 +145,7 @@ Singleton {
     property bool controlCenterShowMicPercent: true
     property bool controlCenterShowBatteryIcon: false
     property bool controlCenterShowPrinterIcon: false
+    property bool controlCenterShowScreenSharingIcon: true
     property bool showPrivacyButton: true
     property bool privacyShowMicIcon: false
     property bool privacyShowCameraIcon: false
@@ -200,10 +201,16 @@ Singleton {
     property bool showWorkspaceApps: false
     property bool groupWorkspaceApps: true
     property int maxWorkspaceIcons: 3
-    property bool workspacesPerMonitor: true
+    property bool workspaceFollowFocus: false
     property bool showOccupiedWorkspacesOnly: false
     property bool reverseScrolling: false
     property bool dwlShowAllTags: false
+    property string workspaceColorMode: "default"
+    property string workspaceUnfocusedColorMode: "default"
+    property string workspaceUrgentColorMode: "default"
+    property bool workspaceFocusedBorderEnabled: false
+    property string workspaceFocusedBorderColor: "primary"
+    property int workspaceFocusedBorderThickness: 2
     property var workspaceNameIcons: ({})
     property bool waveProgressEnabled: true
     property bool scrollTitleEnabled: true
@@ -215,6 +222,7 @@ Singleton {
     property bool keyboardLayoutNameCompactMode: false
     property bool runningAppsCurrentWorkspace: false
     property bool runningAppsGroupByApp: false
+    property var appIdSubstitutions: []
     property string centeringMode: "index"
     property string clockDateFormat: ""
     property string lockDateFormat: ""
@@ -397,6 +405,7 @@ Singleton {
     property int notificationTimeoutLow: 5000
     property int notificationTimeoutNormal: 5000
     property int notificationTimeoutCritical: 0
+    property bool notificationCompactMode: false
     property int notificationPopupPosition: SettingsData.Position.Top
     property bool notificationHistoryEnabled: true
     property int notificationHistoryMaxCount: 50
@@ -530,6 +539,7 @@ Singleton {
     property var desktopWidgetPositions: ({})
     property var desktopWidgetGridSettings: ({})
     property var desktopWidgetInstances: []
+    property var desktopWidgetGroups: []
 
     function getDesktopWidgetGridSetting(screenKey, property, defaultValue) {
         const val = desktopWidgetGridSettings?.[screenKey]?.[property];
@@ -681,6 +691,38 @@ Singleton {
         saveSettings();
     }
 
+    function syncDesktopWidgetPositionToAllScreens(instanceId) {
+        const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
+        const idx = instances.findIndex(inst => inst.id === instanceId);
+        if (idx === -1)
+            return;
+        const positions = instances[idx].positions || {};
+        const screenKeys = Object.keys(positions).filter(k => k !== "_synced");
+        if (screenKeys.length === 0)
+            return;
+        const sourceKey = screenKeys[0];
+        const sourcePos = positions[sourceKey];
+        if (!sourcePos)
+            return;
+        const screen = Array.from(Quickshell.screens.values()).find(s => getScreenDisplayName(s) === sourceKey);
+        if (!screen)
+            return;
+        const screenW = screen.width;
+        const screenH = screen.height;
+        const synced = {};
+        if (sourcePos.x !== undefined)
+            synced.x = sourcePos.x / screenW;
+        if (sourcePos.y !== undefined)
+            synced.y = sourcePos.y / screenH;
+        if (sourcePos.width !== undefined)
+            synced.width = sourcePos.width;
+        if (sourcePos.height !== undefined)
+            synced.height = sourcePos.height;
+        instances[idx].positions["_synced"] = synced;
+        desktopWidgetInstances = instances;
+        saveSettings();
+    }
+
     function duplicateDesktopWidgetInstance(instanceId) {
         const source = getDesktopWidgetInstance(instanceId);
         if (!source)
@@ -713,6 +755,110 @@ Singleton {
         return (desktopWidgetInstances || []).filter(inst => inst.enabled);
     }
 
+    function moveDesktopWidgetInstance(instanceId, direction) {
+        const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
+        const idx = instances.findIndex(inst => inst.id === instanceId);
+        if (idx === -1)
+            return false;
+        const targetIdx = direction === "up" ? idx - 1 : idx + 1;
+        if (targetIdx < 0 || targetIdx >= instances.length)
+            return false;
+        const temp = instances[idx];
+        instances[idx] = instances[targetIdx];
+        instances[targetIdx] = temp;
+        desktopWidgetInstances = instances;
+        saveSettings();
+        return true;
+    }
+
+    function reorderDesktopWidgetInstance(instanceId, newIndex) {
+        const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
+        const idx = instances.findIndex(inst => inst.id === instanceId);
+        if (idx === -1 || newIndex < 0 || newIndex >= instances.length)
+            return false;
+        const [item] = instances.splice(idx, 1);
+        instances.splice(newIndex, 0, item);
+        desktopWidgetInstances = instances;
+        saveSettings();
+        return true;
+    }
+
+    function reorderDesktopWidgetInstanceInGroup(instanceId, groupId, newIndexInGroup) {
+        const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
+        const groups = desktopWidgetGroups || [];
+        const groupMatches = inst => {
+            if (groupId === null)
+                return !inst.group || !groups.some(g => g.id === inst.group);
+            return inst.group === groupId;
+        };
+        const groupInstances = instances.filter(groupMatches);
+        const currentGroupIdx = groupInstances.findIndex(inst => inst.id === instanceId);
+        if (currentGroupIdx === -1 || currentGroupIdx === newIndexInGroup)
+            return false;
+        if (newIndexInGroup < 0 || newIndexInGroup >= groupInstances.length)
+            return false;
+        const globalIdx = instances.findIndex(inst => inst.id === instanceId);
+        if (globalIdx === -1)
+            return false;
+        const [item] = instances.splice(globalIdx, 1);
+        const targetInstance = groupInstances[newIndexInGroup];
+        let targetGlobalIdx = instances.findIndex(inst => inst.id === targetInstance.id);
+        if (newIndexInGroup > currentGroupIdx)
+            targetGlobalIdx++;
+        instances.splice(targetGlobalIdx, 0, item);
+        desktopWidgetInstances = instances;
+        saveSettings();
+        return true;
+    }
+
+    function createDesktopWidgetGroup(name) {
+        const id = "dwg_" + Date.now() + "_" + Math.random().toString(36).substr(2, 9);
+        const group = {
+            id: id,
+            name: name,
+            collapsed: false
+        };
+        const groups = JSON.parse(JSON.stringify(desktopWidgetGroups || []));
+        groups.push(group);
+        desktopWidgetGroups = groups;
+        saveSettings();
+        return group;
+    }
+
+    function updateDesktopWidgetGroup(groupId, updates) {
+        const groups = JSON.parse(JSON.stringify(desktopWidgetGroups || []));
+        const idx = groups.findIndex(g => g.id === groupId);
+        if (idx === -1)
+            return;
+        Object.assign(groups[idx], updates);
+        desktopWidgetGroups = groups;
+        saveSettings();
+    }
+
+    function removeDesktopWidgetGroup(groupId) {
+        const instances = JSON.parse(JSON.stringify(desktopWidgetInstances || []));
+        for (let i = 0; i < instances.length; i++) {
+            if (instances[i].group === groupId)
+                instances[i].group = null;
+        }
+        desktopWidgetInstances = instances;
+        const groups = (desktopWidgetGroups || []).filter(g => g.id !== groupId);
+        desktopWidgetGroups = groups;
+        saveSettings();
+    }
+
+    function getDesktopWidgetGroup(groupId) {
+        return (desktopWidgetGroups || []).find(g => g.id === groupId) || null;
+    }
+
+    function getDesktopWidgetInstancesByGroup(groupId) {
+        return (desktopWidgetInstances || []).filter(inst => inst.group === groupId);
+    }
+
+    function getUngroupedDesktopWidgetInstances() {
+        return (desktopWidgetInstances || []).filter(inst => !inst.group);
+    }
+
     signal forceDankBarLayoutRefresh
     signal forceDockLayoutRefresh
     signal widgetDataChanged
@@ -1836,6 +1982,48 @@ Singleton {
         return workspaceNameIcons[workspaceName] || null;
     }
 
+    function addAppIdSubstitution(pattern, replacement, type) {
+        var subs = JSON.parse(JSON.stringify(appIdSubstitutions));
+        subs.push({
+            pattern: pattern,
+            replacement: replacement,
+            type: type
+        });
+        appIdSubstitutions = subs;
+        saveSettings();
+    }
+
+    function updateAppIdSubstitution(index, pattern, replacement, type) {
+        var subs = JSON.parse(JSON.stringify(appIdSubstitutions));
+        if (index < 0 || index >= subs.length)
+            return;
+        subs[index] = {
+            pattern: pattern,
+            replacement: replacement,
+            type: type
+        };
+        appIdSubstitutions = subs;
+        saveSettings();
+    }
+
+    function removeAppIdSubstitution(index) {
+        var subs = JSON.parse(JSON.stringify(appIdSubstitutions));
+        if (index < 0 || index >= subs.length)
+            return;
+        subs.splice(index, 1);
+        appIdSubstitutions = subs;
+        saveSettings();
+    }
+
+    function getDefaultAppIdSubstitutions() {
+        return Spec.SPEC.appIdSubstitutions.def;
+    }
+
+    function resetAppIdSubstitutions() {
+        appIdSubstitutions = JSON.parse(JSON.stringify(Spec.SPEC.appIdSubstitutions.def));
+        saveSettings();
+    }
+
     function getRegistryThemeVariant(themeId, defaultVariant) {
         var stored = registryThemeVariants[themeId];
         if (typeof stored === "string")

quickshell/Common/Theme.qml

@@ -904,7 +904,7 @@ Singleton {
         if (typeof SettingsData !== "undefined") {
             const skipTemplates = [];
             if (!SettingsData.runDmsMatugenTemplates) {
-                skipTemplates.push("gtk", "neovim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode");
+                skipTemplates.push("gtk", "nvim", "niri", "qt5ct", "qt6ct", "firefox", "pywalfox", "zenbrowser", "vesktop", "equibop", "ghostty", "kitty", "foot", "alacritty", "wezterm", "dgop", "kcolorscheme", "vscode");
             } else {
                 if (!SettingsData.matugenTemplateGtk)
                     skipTemplates.push("gtk");

quickshell/Common/settings/Lists.qml

@@ -28,7 +28,8 @@ Singleton {
             showMicIcon: false,
             showMicPercent: true,
             showBatteryIcon: false,
-            showPrinterIcon: false
+            showPrinterIcon: false,
+            showScreenSharingIcon: true
         };
         leftModel.append(dummy);
         centerModel.append(dummy);
@@ -84,6 +85,8 @@ Singleton {
                 item.showBatteryIcon = order[i].showBatteryIcon;
             if (isObj && order[i].showPrinterIcon !== undefined)
                 item.showPrinterIcon = order[i].showPrinterIcon;
+            if (isObj && order[i].showScreenSharingIcon !== undefined)
+                item.showScreenSharingIcon = order[i].showScreenSharingIcon;
 
             model.append(item);
         }

quickshell/Common/settings/SettingsSpec.js

@@ -70,6 +70,7 @@ var SPEC = {
     controlCenterShowMicPercent: { def: false },
     controlCenterShowBatteryIcon: { def: false },
     controlCenterShowPrinterIcon: { def: false },
+    controlCenterShowScreenSharingIcon: { def: true },
 
     showPrivacyButton: { def: true },
     privacyShowMicIcon: { def: false },
@@ -94,10 +95,16 @@ var SPEC = {
     showWorkspaceApps: { def: false },
     maxWorkspaceIcons: { def: 3 },
     groupWorkspaceApps: { def: true },
-    workspacesPerMonitor: { def: true },
+    workspaceFollowFocus: { def: false },
     showOccupiedWorkspacesOnly: { def: false },
     reverseScrolling: { def: false },
     dwlShowAllTags: { def: false },
+    workspaceColorMode: { def: "default" },
+    workspaceUnfocusedColorMode: { def: "default" },
+    workspaceUrgentColorMode: { def: "default" },
+    workspaceFocusedBorderEnabled: { def: false },
+    workspaceFocusedBorderColor: { def: "primary" },
+    workspaceFocusedBorderThickness: { def: 2 },
     workspaceNameIcons: { def: {} },
     waveProgressEnabled: { def: true },
     scrollTitleEnabled: { def: true },
@@ -109,6 +116,13 @@ var SPEC = {
     keyboardLayoutNameCompactMode: { def: false },
     runningAppsCurrentWorkspace: { def: false },
     runningAppsGroupByApp: { def: false },
+    appIdSubstitutions: { def: [
+        { pattern: "Spotify", replacement: "spotify", type: "exact" },
+        { pattern: "beepertexts", replacement: "beeper", type: "exact" },
+        { pattern: "home assistant desktop", replacement: "homeassistant-desktop", type: "exact" },
+        { pattern: "com.transmissionbt.transmission", replacement: "transmission-gtk", type: "contains" },
+        { pattern: "^steam_app_(\\d+)$", replacement: "steam_icon_$1", type: "regex" }
+    ]},
     centeringMode: { def: "index" },
     clockDateFormat: { def: "" },
     lockDateFormat: { def: "" },
@@ -255,6 +269,7 @@ var SPEC = {
     notificationTimeoutLow: { def: 5000 },
     notificationTimeoutNormal: { def: 5000 },
     notificationTimeoutCritical: { def: 0 },
+    notificationCompactMode: { def: false },
     notificationPopupPosition: { def: 0 },
     notificationHistoryEnabled: { def: true },
     notificationHistoryMaxCount: { def: 50 },
@@ -388,6 +403,8 @@ var SPEC = {
 
     desktopWidgetInstances: { def: [] },
 
+    desktopWidgetGroups: { def: [] },
+
     builtInPluginSettings: { def: {} }
 };
 

quickshell/DMSShell.qml

@@ -203,6 +203,8 @@ Item {
 
     Component.onCompleted: {
         dockRecreateDebounce.start();
+        // Force PolkitService singleton to initialize
+        PolkitService.polkitAvailable;
     }
 
     Connections {
@@ -315,19 +317,44 @@ Item {
         }
     }
 
-    WifiPasswordModal {
-        id: wifiPasswordModal
+    LazyLoader {
+        id: wifiPasswordModalLoader
+        active: false
 
         Component.onCompleted: {
-            PopoutService.wifiPasswordModal = wifiPasswordModal;
+            PopoutService.wifiPasswordModalLoader = wifiPasswordModalLoader;
+        }
+
+        WifiPasswordModal {
+            id: wifiPasswordModalItem
+
+            Component.onCompleted: {
+                PopoutService.wifiPasswordModal = wifiPasswordModalItem;
+            }
         }
     }
 
-    PolkitAuthModal {
-        id: polkitAuthModal
+    LazyLoader {
+        id: polkitAuthModalLoader
+        active: false
 
-        Component.onCompleted: {
-            PopoutService.polkitAuthModal = polkitAuthModal;
+        PolkitAuthModal {
+            id: polkitAuthModal
+
+            Component.onCompleted: {
+                PopoutService.polkitAuthModal = polkitAuthModal;
+            }
+        }
+    }
+
+    Connections {
+        target: PolkitService.agent
+        enabled: PolkitService.polkitAvailable
+
+        function onAuthenticationRequestStarted() {
+            polkitAuthModalLoader.active = true;
+            if (polkitAuthModalLoader.item)
+                polkitAuthModalLoader.item.show();
         }
     }
 
@@ -349,17 +376,21 @@ Item {
             const now = Date.now();
             const timeSinceLastPrompt = now - lastCredentialsTime;
 
-            if (wifiPasswordModal.visible && timeSinceLastPrompt < 1000) {
+            wifiPasswordModalLoader.active = true;
+            if (!wifiPasswordModalLoader.item)
+                return;
+
+            if (wifiPasswordModalLoader.item.visible && timeSinceLastPrompt < 1000) {
                 NetworkService.cancelCredentials(lastCredentialsToken);
                 lastCredentialsToken = token;
                 lastCredentialsTime = now;
-                wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
+                wifiPasswordModalLoader.item.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
                 return;
             }
 
             lastCredentialsToken = token;
             lastCredentialsTime = now;
-            wifiPasswordModal.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
+            wifiPasswordModalLoader.item.showFromPrompt(token, ssid, setting, fields, hints, reason, connType, connName, vpnService, fieldsInfo);
         }
     }
 
@@ -442,17 +473,15 @@ Item {
             PopoutService.settingsModalLoader = settingsModalLoader;
         }
 
-        onActiveChanged: {
-            if (active && item) {
-                PopoutService.settingsModal = item;
-                PopoutService._onSettingsModalLoaded();
-            }
-        }
-
         SettingsModal {
             id: settingsModal
             property bool wasShown: false
 
+            Component.onCompleted: {
+                PopoutService.settingsModal = settingsModal;
+                PopoutService._onSettingsModalLoaded();
+            }
+
             onVisibleChanged: {
                 if (visible) {
                     wasShown = true;

quickshell/DMSShellIPC.qml

@@ -132,8 +132,11 @@ Item {
                 case "media":
                     root.dankDashPopoutLoader.item.currentTabIndex = 1;
                     break;
+                case "wallpaper":
+                    root.dankDashPopoutLoader.item.currentTabIndex = 2;
+                    break;
                 case "weather":
-                    root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 2 : 0;
+                    root.dankDashPopoutLoader.item.currentTabIndex = SettingsData.weatherEnabled ? 3 : 0;
                     break;
                 default:
                     root.dankDashPopoutLoader.item.currentTabIndex = 0;
@@ -599,6 +602,39 @@ Item {
             return barConfig.autoHide ? "BAR_MANUAL_HIDE_SUCCESS" : "BAR_AUTO_HIDE_SUCCESS";
         }
 
+        function getPosition(selector: string, value: string): string {
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            const positions = ["top", "bottom", "left", "right"];
+            return positions[barConfig.position] || "unknown";
+        }
+
+        function setPosition(selector: string, value: string, position: string): string {
+            const {
+                barConfig,
+                error
+            } = getBarConfig(selector, value);
+            if (error)
+                return error;
+            const positionMap = {
+                "top": SettingsData.Position.Top,
+                "bottom": SettingsData.Position.Bottom,
+                "left": SettingsData.Position.Left,
+                "right": SettingsData.Position.Right
+            };
+            const posValue = positionMap[position.toLowerCase()];
+            if (posValue === undefined)
+                return "BAR_INVALID_POSITION";
+            SettingsData.updateBarConfig(barConfig.id, {
+                position: posValue
+            });
+            return "BAR_POSITION_SET_SUCCESS";
+        }
+
         target: "bar"
     }
 
@@ -764,11 +800,9 @@ Item {
             const modal = PopoutService.settingsModal;
             if (modal) {
                 if (type === "wallpaper") {
-                    modal.wallpaperBrowser.allowStacking = false;
-                    modal.wallpaperBrowser.open();
+                    modal.openWallpaperBrowser(false);
                 } else if (type === "profile") {
-                    modal.profileBrowser.allowStacking = false;
-                    modal.profileBrowser.open();
+                    modal.openProfileBrowser(false);
                 }
             } else {
                 PopoutService.openSettings();
@@ -1035,7 +1069,7 @@ Item {
             const instances = SettingsData.desktopWidgetInstances || [];
             if (instances.length === 0)
                 return "No desktop widgets configured";
-            return instances.map(i => `${i.id} [${i.widgetType}] ${i.name || i.widgetType}`).join("\n");
+            return instances.map(i => `${i.id} [${i.widgetType}] ${i.name || i.widgetType} ${i.enabled ? "[enabled]" : "[disabled]"}`).join("\n");
         }
 
         function status(instanceId: string): string {
@@ -1046,9 +1080,115 @@ Item {
             if (!instance)
                 return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
 
+            const enabled = instance.enabled ?? true;
             const overlay = instance.config?.showOnOverlay ?? false;
             const overview = instance.config?.showOnOverview ?? false;
-            return `overlay: ${overlay}, overview: ${overview}`;
+            const clickThrough = instance.config?.clickThrough ?? false;
+            const syncPosition = instance.config?.syncPositionAcrossScreens ?? false;
+            return `enabled: ${enabled}, overlay: ${overlay}, overview: ${overview}, clickThrough: ${clickThrough}, syncPosition: ${syncPosition}`;
+        }
+
+        function enable(instanceId: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            SettingsData.updateDesktopWidgetInstance(instanceId, {
+                enabled: true
+            });
+            return `DESKTOP_WIDGET_ENABLED: ${instanceId}`;
+        }
+
+        function disable(instanceId: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            SettingsData.updateDesktopWidgetInstance(instanceId, {
+                enabled: false
+            });
+            return `DESKTOP_WIDGET_DISABLED: ${instanceId}`;
+        }
+
+        function toggleEnabled(instanceId: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            const currentValue = instance.enabled ?? true;
+            SettingsData.updateDesktopWidgetInstance(instanceId, {
+                enabled: !currentValue
+            });
+            return !currentValue ? `DESKTOP_WIDGET_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_DISABLED: ${instanceId}`;
+        }
+
+        function toggleClickThrough(instanceId: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            const currentValue = instance.config?.clickThrough ?? false;
+            SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
+                clickThrough: !currentValue
+            });
+            return !currentValue ? `DESKTOP_WIDGET_CLICK_THROUGH_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_CLICK_THROUGH_DISABLED: ${instanceId}`;
+        }
+
+        function setClickThrough(instanceId: string, enabled: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            const enabledBool = enabled === "true" || enabled === "1";
+            SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
+                clickThrough: enabledBool
+            });
+            return enabledBool ? `DESKTOP_WIDGET_CLICK_THROUGH_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_CLICK_THROUGH_DISABLED: ${instanceId}`;
+        }
+
+        function toggleSyncPosition(instanceId: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            const currentValue = instance.config?.syncPositionAcrossScreens ?? false;
+            SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
+                syncPositionAcrossScreens: !currentValue
+            });
+            return !currentValue ? `DESKTOP_WIDGET_SYNC_POSITION_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_SYNC_POSITION_DISABLED: ${instanceId}`;
+        }
+
+        function setSyncPosition(instanceId: string, enabled: string): string {
+            if (!instanceId)
+                return "ERROR: No instance ID specified";
+
+            const instance = SettingsData.getDesktopWidgetInstance(instanceId);
+            if (!instance)
+                return `DESKTOP_WIDGET_NOT_FOUND: ${instanceId}`;
+
+            const enabledBool = enabled === "true" || enabled === "1";
+            SettingsData.updateDesktopWidgetInstanceConfig(instanceId, {
+                syncPositionAcrossScreens: enabledBool
+            });
+            return enabledBool ? `DESKTOP_WIDGET_SYNC_POSITION_ENABLED: ${instanceId}` : `DESKTOP_WIDGET_SYNC_POSITION_DISABLED: ${instanceId}`;
         }
 
         target: "desktopWidget"

quickshell/Modals/Changelog/ChangelogModal.qml

@@ -128,7 +128,7 @@ FloatingWindow {
                     iconName: "open_in_new"
                     backgroundColor: Theme.surfaceContainerHighest
                     textColor: Theme.surfaceText
-                    onClicked: Qt.openUrlExternally("https://danklinux.com/blog/dms-1-2-spicy-miso")
+                    onClicked: Qt.openUrlExternally("https://danklinux.com/blog/v1-2-release")
                 }
 
                 DankButton {

quickshell/Modals/Common/DankModal.qml

@@ -49,7 +49,7 @@ Item {
     readonly property alias clickCatcher: clickCatcher
     readonly property bool useHyprlandFocusGrab: CompositorService.useHyprlandFocusGrab
     readonly property bool useBackground: showBackground && SettingsData.modalDarkenBackground
-    readonly property bool useSingleWindow: useHyprlandFocusGrab || useBackground
+    readonly property bool useSingleWindow: CompositorService.isHyprland || useBackground
 
     signal opened
     signal dialogClosed
@@ -58,7 +58,6 @@ Item {
     property bool animationsEnabled: true
 
     function open() {
-        ModalManager.openModal(root);
         closeTimer.stop();
         const focusedScreen = CompositorService.getFocusedScreen();
         if (focusedScreen) {
@@ -66,6 +65,7 @@ Item {
             if (!useSingleWindow)
                 clickCatcher.screen = focusedScreen;
         }
+        ModalManager.openModal(root);
         shouldBeVisible = true;
         if (!useSingleWindow)
             clickCatcher.visible = true;
@@ -302,7 +302,7 @@ Item {
 
             MouseArea {
                 anchors.fill: parent
-                enabled: root.useSingleWindow
+                enabled: root.useSingleWindow && root.shouldBeVisible
                 hoverEnabled: false
                 acceptedButtons: Qt.AllButtons
                 onPressed: mouse.accepted = true

quickshell/Modals/PolkitAuthModal.qml

@@ -11,7 +11,6 @@ FloatingWindow {
     property var currentFlow: PolkitService.agent?.flow
     property bool isLoading: false
     readonly property int inputFieldHeight: Theme.fontSizeMedium + Theme.spacingL * 2
-    property int calculatedHeight: Math.max(240, headerRow.implicitHeight + mainColumn.implicitHeight + Theme.spacingM * 3)
 
     function focusPasswordField() {
         passwordField.forceActiveFocus();
@@ -37,15 +36,19 @@ FloatingWindow {
     }
 
     function cancelAuth() {
-        if (!currentFlow || isLoading)
+        if (isLoading)
             return;
-        currentFlow.cancelAuthenticationRequest();
+        if (currentFlow) {
+            currentFlow.cancelAuthenticationRequest();
+            return;
+        }
+        hide();
     }
 
     objectName: "polkitAuthModal"
     title: I18n.tr("Authentication")
-    minimumSize: Qt.size(420, calculatedHeight)
-    maximumSize: Qt.size(420, calculatedHeight)
+    minimumSize: Qt.size(460, 220)
+    maximumSize: Qt.size(460, 220)
     color: Theme.surfaceContainer
     visible: false
 
@@ -108,29 +111,24 @@ FloatingWindow {
             event.accepted = true;
         }
 
-        MouseArea {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            height: headerRow.height + Theme.spacingM
-            onPressed: windowControls.tryStartMove()
-            onDoubleClicked: windowControls.tryToggleMaximize()
-        }
-
         Item {
-            id: headerRow
+            id: headerSection
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.top: parent.top
-            anchors.leftMargin: Theme.spacingM
-            anchors.rightMargin: Theme.spacingM
-            anchors.topMargin: Theme.spacingM
-            height: Math.max(titleColumn.height, buttonRow.height)
+            anchors.margins: Theme.spacingM
+            height: Math.max(titleColumn.implicitHeight, windowButtonRow.implicitHeight)
+
+            MouseArea {
+                anchors.fill: parent
+                onPressed: windowControls.tryStartMove()
+                onDoubleClicked: windowControls.tryToggleMaximize()
+            }
 
             Column {
                 id: titleColumn
                 anchors.left: parent.left
-                anchors.right: buttonRow.left
+                anchors.right: windowButtonRow.left
                 anchors.rightMargin: Theme.spacingM
                 spacing: Theme.spacingXS
 
@@ -141,33 +139,34 @@ FloatingWindow {
                     font.weight: Font.Medium
                 }
 
-                Column {
+                StyledText {
+                    text: currentFlow?.message ?? ""
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: Theme.surfaceTextMedium
                     width: parent.width
-                    spacing: Theme.spacingXS
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 2
+                    elide: Text.ElideRight
+                    visible: text !== ""
+                }
 
-                    StyledText {
-                        text: currentFlow?.message ?? ""
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceTextMedium
-                        width: parent.width
-                        wrapMode: Text.Wrap
-                    }
-
-                    StyledText {
-                        visible: (currentFlow?.supplementaryMessage ?? "") !== ""
-                        text: currentFlow?.supplementaryMessage ?? ""
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: (currentFlow?.supplementaryIsError ?? false) ? Theme.error : Theme.surfaceTextMedium
-                        width: parent.width
-                        wrapMode: Text.Wrap
-                        opacity: (currentFlow?.supplementaryIsError ?? false) ? 1 : 0.8
-                    }
+                StyledText {
+                    text: currentFlow?.supplementaryMessage ?? ""
+                    font.pixelSize: Theme.fontSizeSmall
+                    color: (currentFlow?.supplementaryIsError ?? false) ? Theme.error : Theme.surfaceTextMedium
+                    width: parent.width
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 2
+                    elide: Text.ElideRight
+                    opacity: (currentFlow?.supplementaryIsError ?? false) ? 1 : 0.8
+                    visible: text !== ""
                 }
             }
 
             Row {
-                id: buttonRow
+                id: windowButtonRow
                 anchors.right: parent.right
+                anchors.top: parent.top
                 spacing: Theme.spacingXS
 
                 DankActionButton {
@@ -190,21 +189,19 @@ FloatingWindow {
         }
 
         Column {
-            id: mainColumn
+            id: bottomSection
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
-            anchors.leftMargin: Theme.spacingM
-            anchors.rightMargin: Theme.spacingM
-            anchors.bottomMargin: Theme.spacingM
-            spacing: Theme.spacingM
+            anchors.margins: Theme.spacingM
+            spacing: Theme.spacingS
 
             StyledText {
                 text: currentFlow?.inputPrompt ?? ""
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceText
                 width: parent.width
-                visible: (currentFlow?.inputPrompt ?? "") !== ""
+                visible: text !== ""
             }
 
             Rectangle {
@@ -229,7 +226,8 @@ FloatingWindow {
                     font.pixelSize: Theme.fontSizeMedium
                     textColor: Theme.surfaceText
                     text: passwordInput
-                    echoMode: (currentFlow?.responseVisible ?? false) ? TextInput.Normal : TextInput.Password
+                    showPasswordToggle: !(currentFlow?.responseVisible ?? false)
+                    echoMode: (currentFlow?.responseVisible ?? false) || passwordVisible ? TextInput.Normal : TextInput.Password
                     placeholderText: ""
                     backgroundColor: "transparent"
                     enabled: !isLoading
@@ -238,38 +236,17 @@ FloatingWindow {
                 }
             }
 
-            Item {
+            StyledText {
+                text: I18n.tr("Authentication failed, please try again")
+                font.pixelSize: Theme.fontSizeSmall
+                color: Theme.error
                 width: parent.width
-                height: (currentFlow?.failed ?? false) ? failedText.implicitHeight : 0
-                visible: height > 0
-
-                StyledText {
-                    id: failedText
-                    text: I18n.tr("Authentication failed, please try again")
-                    font.pixelSize: Theme.fontSizeSmall
-                    color: Theme.error
-                    width: parent.width
-                    opacity: (currentFlow?.failed ?? false) ? 1 : 0
-
-                    Behavior on opacity {
-                        NumberAnimation {
-                            duration: Theme.shortDuration
-                            easing.type: Theme.standardEasing
-                        }
-                    }
-                }
-
-                Behavior on height {
-                    NumberAnimation {
-                        duration: Theme.shortDuration
-                        easing.type: Theme.standardEasing
-                    }
-                }
+                visible: currentFlow?.failed ?? false
             }
 
             Item {
                 width: parent.width
-                height: 40
+                height: 36
 
                 Row {
                     anchors.right: parent.right

quickshell/Modals/Settings/ProfileSection.qml

@@ -74,9 +74,7 @@ Rectangle {
                                 if (root.parentModal) {
                                     root.parentModal.allowFocusOverride = true;
                                     root.parentModal.shouldHaveFocus = false;
-                                    if (root.parentModal.profileBrowser) {
-                                        root.parentModal.profileBrowser.open();
-                                    }
+                                    root.parentModal.openProfileBrowser();
                                 }
                             }
                         }

quickshell/Modals/Settings/SettingsModal.qml

@@ -8,8 +8,26 @@ import qs.Widgets
 FloatingWindow {
     id: settingsModal
 
-    property alias profileBrowser: profileBrowser
-    property alias wallpaperBrowser: wallpaperBrowser
+    property var profileBrowser: profileBrowserLoader.item
+    property var wallpaperBrowser: wallpaperBrowserLoader.item
+
+    function openProfileBrowser(allowStacking) {
+        profileBrowserLoader.active = true;
+        if (!profileBrowserLoader.item)
+            return;
+        if (allowStacking !== undefined)
+            profileBrowserLoader.item.allowStacking = allowStacking;
+        profileBrowserLoader.item.open();
+    }
+
+    function openWallpaperBrowser(allowStacking) {
+        wallpaperBrowserLoader.active = true;
+        if (!wallpaperBrowserLoader.item)
+            return;
+        if (allowStacking !== undefined)
+            wallpaperBrowserLoader.item.allowStacking = allowStacking;
+        wallpaperBrowserLoader.item.open();
+    }
     property alias sidebar: sidebar
     property int currentTabIndex: 0
     property bool shouldHaveFocus: visible
@@ -96,41 +114,51 @@ FloatingWindow {
         }
     }
 
-    FileBrowserModal {
-        id: profileBrowser
+    LazyLoader {
+        id: profileBrowserLoader
+        active: false
 
-        allowStacking: true
-        parentModal: settingsModal
-        browserTitle: I18n.tr("Select Profile Image", "profile image file browser title")
-        browserIcon: "person"
-        browserType: "profile"
-        showHiddenFiles: true
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: path => {
-            PortalService.setProfileImage(path);
-            close();
-        }
-        onDialogClosed: () => {
-            allowStacking = true;
+        FileBrowserModal {
+            id: profileBrowserItem
+
+            allowStacking: true
+            parentModal: settingsModal
+            browserTitle: I18n.tr("Select Profile Image", "profile image file browser title")
+            browserIcon: "person"
+            browserType: "profile"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                PortalService.setProfileImage(path);
+                close();
+            }
+            onDialogClosed: () => {
+                allowStacking = true;
+            }
         }
     }
 
-    FileBrowserModal {
-        id: wallpaperBrowser
+    LazyLoader {
+        id: wallpaperBrowserLoader
+        active: false
 
-        allowStacking: true
-        parentModal: settingsModal
-        browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
-        browserIcon: "wallpaper"
-        browserType: "wallpaper"
-        showHiddenFiles: true
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: path => {
-            SessionData.setWallpaper(path);
-            close();
-        }
-        onDialogClosed: () => {
-            allowStacking = true;
+        FileBrowserModal {
+            id: wallpaperBrowserItem
+
+            allowStacking: true
+            parentModal: settingsModal
+            browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
+            browserIcon: "wallpaper"
+            browserType: "wallpaper"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                SessionData.setWallpaper(path);
+                close();
+            }
+            onDialogClosed: () => {
+                allowStacking = true;
+            }
         }
     }
 
@@ -319,8 +347,8 @@ FloatingWindow {
                     visible: settingsModal.isCompactMode ? settingsModal.menuVisible : true
                     parentModal: settingsModal
                     currentIndex: settingsModal.currentTabIndex
-                    onCurrentIndexChanged: {
-                        settingsModal.currentTabIndex = currentIndex;
+                    onTabChangeRequested: tabIndex => {
+                        settingsModal.currentTabIndex = tabIndex;
                         if (settingsModal.isCompactMode) {
                             settingsModal.enableAnimations = true;
                             settingsModal.menuVisible = false;

quickshell/Modals/Settings/SettingsSidebar.qml

@@ -15,6 +15,8 @@ Rectangle {
 
     property int currentIndex: 0
     property var parentModal: null
+
+    signal tabChangeRequested(int tabIndex)
     property var expandedCategories: ({})
     property var autoExpandedCategories: ({})
     property bool searchActive: searchField.text.length > 0
@@ -55,8 +57,9 @@ Rectangle {
         if (keyboardHighlightIndex < 0)
             return;
         var oldIndex = currentIndex;
-        currentIndex = keyboardHighlightIndex;
-        autoCollapseIfNeeded(oldIndex, currentIndex);
+        var newIndex = keyboardHighlightIndex;
+        tabChangeRequested(newIndex);
+        autoCollapseIfNeeded(oldIndex, newIndex);
         keyboardHighlightIndex = -1;
         Qt.callLater(searchField.forceActiveFocus);
     }
@@ -398,28 +401,32 @@ Rectangle {
         var flatItems = getFlatNavigableItems();
         var currentPos = flatItems.findIndex(item => item.tabIndex === currentIndex);
         var oldIndex = currentIndex;
+        var newIndex;
         if (currentPos === -1) {
-            currentIndex = flatItems[0]?.tabIndex ?? 0;
+            newIndex = flatItems[0]?.tabIndex ?? 0;
         } else {
             var nextPos = (currentPos + 1) % flatItems.length;
-            currentIndex = flatItems[nextPos].tabIndex;
+            newIndex = flatItems[nextPos].tabIndex;
         }
-        autoCollapseIfNeeded(oldIndex, currentIndex);
-        autoExpandForTab(currentIndex);
+        tabChangeRequested(newIndex);
+        autoCollapseIfNeeded(oldIndex, newIndex);
+        autoExpandForTab(newIndex);
     }
 
     function navigatePrevious() {
         var flatItems = getFlatNavigableItems();
         var currentPos = flatItems.findIndex(item => item.tabIndex === currentIndex);
         var oldIndex = currentIndex;
+        var newIndex;
         if (currentPos === -1) {
-            currentIndex = flatItems[0]?.tabIndex ?? 0;
+            newIndex = flatItems[0]?.tabIndex ?? 0;
         } else {
             var prevPos = (currentPos - 1 + flatItems.length) % flatItems.length;
-            currentIndex = flatItems[prevPos].tabIndex;
+            newIndex = flatItems[prevPos].tabIndex;
         }
-        autoCollapseIfNeeded(oldIndex, currentIndex);
-        autoExpandForTab(currentIndex);
+        tabChangeRequested(newIndex);
+        autoCollapseIfNeeded(oldIndex, newIndex);
+        autoExpandForTab(newIndex);
     }
 
     function getFlatNavigableItems() {
@@ -488,7 +495,7 @@ Rectangle {
             SettingsSearchService.navigateToSection(result.section);
         }
         var oldIndex = root.currentIndex;
-        root.currentIndex = result.tabIndex;
+        tabChangeRequested(result.tabIndex);
         autoCollapseIfNeeded(oldIndex, result.tabIndex);
         autoExpandForTab(result.tabIndex);
         searchField.text = "";
@@ -807,7 +814,7 @@ Rectangle {
                                 if (categoryDelegate.modelData.children) {
                                     root.toggleCategory(categoryDelegate.modelData.id);
                                 } else if (categoryDelegate.modelData.tabIndex !== undefined) {
-                                    root.currentIndex = categoryDelegate.modelData.tabIndex;
+                                    root.tabChangeRequested(categoryDelegate.modelData.tabIndex);
                                 }
                                 Qt.callLater(searchField.forceActiveFocus);
                             }
@@ -882,7 +889,7 @@ Rectangle {
                                     cursorShape: Qt.PointingHandCursor
                                     onClicked: {
                                         root.keyboardHighlightIndex = -1;
-                                        root.currentIndex = childDelegate.modelData.tabIndex;
+                                        root.tabChangeRequested(childDelegate.modelData.tabIndex);
                                         Qt.callLater(searchField.forceActiveFocus);
                                     }
                                 }

quickshell/Modals/Spotlight/SpotlightModal.qml

@@ -38,11 +38,10 @@ DankModal {
         isClosing = false;
         resetContent();
         spotlightOpen = true;
-        if (spotlightContent?.appLauncher)
-            spotlightContent.appLauncher.ensureInitialized();
         open();
-
         Qt.callLater(() => {
+            if (spotlightContent?.appLauncher)
+                spotlightContent.appLauncher.ensureInitialized();
             if (spotlightContent?.searchField)
                 spotlightContent.searchField.forceActiveFocus();
         });
@@ -53,15 +52,14 @@ DankModal {
         isClosing = false;
         resetContent();
         spotlightOpen = true;
-        if (spotlightContent?.appLauncher) {
-            spotlightContent.appLauncher.ensureInitialized();
-            spotlightContent.appLauncher.searchQuery = query;
-        }
         if (spotlightContent?.searchField)
             spotlightContent.searchField.text = query;
         open();
-
         Qt.callLater(() => {
+            if (spotlightContent?.appLauncher) {
+                spotlightContent.appLauncher.ensureInitialized();
+                spotlightContent.appLauncher.searchQuery = query;
+            }
             if (spotlightContent?.searchField)
                 spotlightContent.searchField.forceActiveFocus();
         });

quickshell/Modals/WifiPasswordModal.qml

@@ -33,7 +33,6 @@ FloatingWindow {
     readonly property bool showPasswordField: fieldsInfo.length === 0
     readonly property bool showAnonField: requiresEnterprise && !isVpnPrompt
     readonly property bool showDomainField: requiresEnterprise && !isVpnPrompt
-    readonly property bool showShowPasswordCheckbox: fieldsInfo.length === 0
     readonly property bool showSavePasswordCheckbox: (isVpnPrompt || fieldsInfo.length > 0) && promptReason !== "pkcs11"
 
     readonly property int inputFieldHeight: Theme.fontSizeMedium + Theme.spacingL * 2
@@ -55,8 +54,6 @@ FloatingWindow {
             h += inputFieldWithSpacing;
         if (showDomainField)
             h += inputFieldWithSpacing;
-        if (showShowPasswordCheckbox)
-            h += checkboxRowHeight;
         if (showSavePasswordCheckbox)
             h += checkboxRowHeight;
         return h;
@@ -447,7 +444,8 @@ FloatingWindow {
                         anchors.fill: parent
                         font.pixelSize: Theme.fontSizeMedium
                         textColor: Theme.surfaceText
-                        echoMode: modelData.isSecret ? TextInput.Password : TextInput.Normal
+                        showPasswordToggle: modelData.isSecret
+                        echoMode: modelData.isSecret && !passwordVisible ? TextInput.Password : TextInput.Normal
                         placeholderText: getFieldLabel(modelData.name)
                         backgroundColor: "transparent"
                         enabled: root.visible
@@ -549,7 +547,8 @@ FloatingWindow {
                     font.pixelSize: Theme.fontSizeMedium
                     textColor: Theme.surfaceText
                     text: wifiPasswordInput
-                    echoMode: showPasswordCheckbox.checked ? TextInput.Normal : TextInput.Password
+                    showPasswordToggle: true
+                    echoMode: passwordVisible ? TextInput.Normal : TextInput.Password
                     placeholderText: (requiresEnterprise && !isVpnPrompt) ? I18n.tr("Password") : ""
                     backgroundColor: "transparent"
                     enabled: root.visible
@@ -628,88 +627,43 @@ FloatingWindow {
                 }
             }
 
-            Column {
+            Row {
                 spacing: Theme.spacingS
-                width: parent.width
+                visible: showSavePasswordCheckbox
 
-                Row {
-                    spacing: Theme.spacingS
-                    visible: showShowPasswordCheckbox
+                Rectangle {
+                    id: savePasswordCheckbox
 
-                    Rectangle {
-                        id: showPasswordCheckbox
+                    property bool checked: true
 
-                        property bool checked: false
+                    width: 20
+                    height: 20
+                    radius: 4
+                    color: checked ? Theme.primary : "transparent"
+                    border.color: checked ? Theme.primary : Theme.outlineButton
+                    border.width: 2
 
-                        width: 20
-                        height: 20
-                        radius: 4
-                        color: checked ? Theme.primary : "transparent"
-                        border.color: checked ? Theme.primary : Theme.outlineButton
-                        border.width: 2
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: "check"
-                            size: 12
-                            color: Theme.background
-                            visible: parent.checked
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: showPasswordCheckbox.checked = !showPasswordCheckbox.checked
-                        }
+                    DankIcon {
+                        anchors.centerIn: parent
+                        name: "check"
+                        size: 12
+                        color: Theme.background
+                        visible: parent.checked
                     }
 
-                    StyledText {
-                        text: I18n.tr("Show password")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
+                    MouseArea {
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: savePasswordCheckbox.checked = !savePasswordCheckbox.checked
                     }
                 }
 
-                Row {
-                    spacing: Theme.spacingS
-                    visible: showSavePasswordCheckbox
-
-                    Rectangle {
-                        id: savePasswordCheckbox
-
-                        property bool checked: false
-
-                        width: 20
-                        height: 20
-                        radius: 4
-                        color: checked ? Theme.primary : "transparent"
-                        border.color: checked ? Theme.primary : Theme.outlineButton
-                        border.width: 2
-
-                        DankIcon {
-                            anchors.centerIn: parent
-                            name: "check"
-                            size: 12
-                            color: Theme.background
-                            visible: parent.checked
-                        }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
-                            onClicked: savePasswordCheckbox.checked = !savePasswordCheckbox.checked
-                        }
-                    }
-
-                    StyledText {
-                        text: I18n.tr("Save password")
-                        font.pixelSize: Theme.fontSizeMedium
-                        color: Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
+                StyledText {
+                    text: I18n.tr("Save password")
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
                 }
             }
 

quickshell/Modules/ControlCenter/Details/AudioInputDetail.qml

@@ -122,6 +122,21 @@ Rectangle {
         contentHeight: audioColumn.height
         clip: true
 
+        property int maxPinnedInputs: 3
+
+        function normalizePinList(value) {
+            if (Array.isArray(value))
+                return value.filter(v => v)
+            if (typeof value === "string" && value.length > 0)
+                return [value]
+            return []
+        }
+
+        function getPinnedInputs() {
+            const pins = SettingsData.audioInputDevicePins || {}
+            return normalizePinList(pins["preferredInput"])
+        }
+
         Column {
             id: audioColumn
             width: parent.width
@@ -133,16 +148,20 @@ Rectangle {
                         const nodes = Pipewire.nodes.values.filter(node => {
                             return node.audio && !node.isSink && !node.isStream;
                         });
-                        const pins = SettingsData.audioInputDevicePins || {};
-                        const pinnedName = pins["preferredInput"];
+                        const pinnedList = audioContent.getPinnedInputs();
 
                         let sorted = [...nodes];
                         sorted.sort((a, b) => {
                             // Pinned device first
-                            if (a.name === pinnedName && b.name !== pinnedName)
-                                return -1;
-                            if (b.name === pinnedName && a.name !== pinnedName)
-                                return 1;
+                            const aPinnedIndex = pinnedList.indexOf(a.name)
+                            const bPinnedIndex = pinnedList.indexOf(b.name)
+                            if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
+                                if (aPinnedIndex === -1)
+                                    return 1
+                                if (bPinnedIndex === -1)
+                                    return -1
+                                return aPinnedIndex - bPinnedIndex
+                            }
                             // Then active device
                             if (a === AudioService.source && b !== AudioService.source)
                                 return -1;
@@ -224,7 +243,7 @@ Rectangle {
                         height: 28
                         radius: height / 2
                         color: {
-                            const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
+                            const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
                             return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
                         }
 
@@ -237,7 +256,7 @@ Rectangle {
                                 name: "push_pin"
                                 size: 16
                                 color: {
-                                    const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
+                                    const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
                                     return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -245,12 +264,12 @@ Rectangle {
 
                             StyledText {
                                 text: {
-                                    const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
+                                    const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
                                     return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin");
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: {
-                                    const isThisDevicePinned = (SettingsData.audioInputDevicePins || {})["preferredInput"] === modelData.name;
+                                    const isThisDevicePinned = audioContent.getPinnedInputs().includes(modelData.name);
                                     return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -261,16 +280,24 @@ Rectangle {
                             anchors.fill: parent
                             cursorShape: Qt.PointingHandCursor
                             onClicked: {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.audioInputDevicePins || {}));
-                                const isCurrentlyPinned = pins["preferredInput"] === modelData.name;
+                                const pins = JSON.parse(JSON.stringify(SettingsData.audioInputDevicePins || {}))
+                                let pinnedList = audioContent.normalizePinList(pins["preferredInput"])
+                                const pinIndex = pinnedList.indexOf(modelData.name)
 
-                                if (isCurrentlyPinned) {
-                                    delete pins["preferredInput"];
+                                if (pinIndex !== -1) {
+                                    pinnedList.splice(pinIndex, 1)
                                 } else {
-                                    pins["preferredInput"] = modelData.name;
+                                    pinnedList.unshift(modelData.name)
+                                    if (pinnedList.length > audioContent.maxPinnedInputs)
+                                        pinnedList = pinnedList.slice(0, audioContent.maxPinnedInputs)
                                 }
 
-                                SettingsData.set("audioInputDevicePins", pins);
+                                if (pinnedList.length > 0)
+                                    pins["preferredInput"] = pinnedList
+                                else
+                                    delete pins["preferredInput"]
+
+                                SettingsData.set("audioInputDevicePins", pins)
                             }
                         }
                     }

quickshell/Modules/ControlCenter/Details/AudioOutputDetail.qml

@@ -132,6 +132,21 @@ Rectangle {
         contentHeight: audioColumn.height
         clip: true
 
+        property int maxPinnedOutputs: 3
+
+        function normalizePinList(value) {
+            if (Array.isArray(value))
+                return value.filter(v => v)
+            if (typeof value === "string" && value.length > 0)
+                return [value]
+            return []
+        }
+
+        function getPinnedOutputs() {
+            const pins = SettingsData.audioOutputDevicePins || {}
+            return normalizePinList(pins["preferredOutput"])
+        }
+
         Column {
             id: audioColumn
             width: parent.width
@@ -143,16 +158,20 @@ Rectangle {
                         const nodes = Pipewire.nodes.values.filter(node => {
                             return node.audio && node.isSink && !node.isStream;
                         });
-                        const pins = SettingsData.audioOutputDevicePins || {};
-                        const pinnedName = pins["preferredOutput"];
+                        const pinnedList = audioContent.getPinnedOutputs();
 
                         let sorted = [...nodes];
                         sorted.sort((a, b) => {
                             // Pinned device first
-                            if (a.name === pinnedName && b.name !== pinnedName)
-                                return -1;
-                            if (b.name === pinnedName && a.name !== pinnedName)
-                                return 1;
+                            const aPinnedIndex = pinnedList.indexOf(a.name)
+                            const bPinnedIndex = pinnedList.indexOf(b.name)
+                            if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
+                                if (aPinnedIndex === -1)
+                                    return 1
+                                if (bPinnedIndex === -1)
+                                    return -1
+                                return aPinnedIndex - bPinnedIndex
+                            }
                             // Then active device
                             if (a === AudioService.sink && b !== AudioService.sink)
                                 return -1;
@@ -236,7 +255,7 @@ Rectangle {
                         height: 28
                         radius: height / 2
                         color: {
-                            const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
+                            const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
                             return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
                         }
 
@@ -249,7 +268,7 @@ Rectangle {
                                 name: "push_pin"
                                 size: 16
                                 color: {
-                                    const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
+                                    const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
                                     return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -257,12 +276,12 @@ Rectangle {
 
                             StyledText {
                                 text: {
-                                    const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
+                                    const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
                                     return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin");
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: {
-                                    const isThisDevicePinned = (SettingsData.audioOutputDevicePins || {})["preferredOutput"] === modelData.name;
+                                    const isThisDevicePinned = audioContent.getPinnedOutputs().includes(modelData.name);
                                     return isThisDevicePinned ? Theme.primary : Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -273,16 +292,24 @@ Rectangle {
                             anchors.fill: parent
                             cursorShape: Qt.PointingHandCursor
                             onClicked: {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.audioOutputDevicePins || {}));
-                                const isCurrentlyPinned = pins["preferredOutput"] === modelData.name;
+                                const pins = JSON.parse(JSON.stringify(SettingsData.audioOutputDevicePins || {}))
+                                let pinnedList = audioContent.normalizePinList(pins["preferredOutput"])
+                                const pinIndex = pinnedList.indexOf(modelData.name)
 
-                                if (isCurrentlyPinned) {
-                                    delete pins["preferredOutput"];
+                                if (pinIndex !== -1) {
+                                    pinnedList.splice(pinIndex, 1)
                                 } else {
-                                    pins["preferredOutput"] = modelData.name;
+                                    pinnedList.unshift(modelData.name)
+                                    if (pinnedList.length > audioContent.maxPinnedOutputs)
+                                        pinnedList = pinnedList.slice(0, audioContent.maxPinnedOutputs)
                                 }
 
-                                SettingsData.set("audioOutputDevicePins", pins);
+                                if (pinnedList.length > 0)
+                                    pins["preferredOutput"] = pinnedList
+                                else
+                                    delete pins["preferredOutput"]
+
+                                SettingsData.set("audioOutputDevicePins", pins)
                             }
                         }
                     }

quickshell/Modules/ControlCenter/Details/BluetoothDetail.qml

@@ -150,6 +150,21 @@ Rectangle {
         contentHeight: bluetoothColumn.height
         clip: true
 
+        property int maxPinnedDevices: 3
+
+        function normalizePinList(value) {
+            if (Array.isArray(value))
+                return value.filter(v => v)
+            if (typeof value === "string" && value.length > 0)
+                return [value]
+            return []
+        }
+
+        function getPinnedDevices() {
+            const pins = SettingsData.bluetoothDevicePins || {}
+            return normalizePinList(pins["preferredDevice"])
+        }
+
         Column {
             id: bluetoothColumn
             width: parent.width
@@ -162,14 +177,18 @@ Rectangle {
                     if (!BluetoothService.adapter || !BluetoothService.adapter.devices)
                         return []
 
-                    const pins = SettingsData.bluetoothDevicePins || {}
-                    const pinnedAddr = pins["preferredDevice"]
+                    const pinnedList = bluetoothContent.getPinnedDevices()
 
                     let devices = [...BluetoothService.adapter.devices.values.filter(dev => dev && (dev.paired || dev.trusted))]
                     devices.sort((a, b) => {
                         // Pinned device first
-                        if (a.address === pinnedAddr && b.address !== pinnedAddr) return -1
-                        if (b.address === pinnedAddr && a.address !== pinnedAddr) return 1
+                        const aPinnedIndex = pinnedList.indexOf(a.address)
+                        const bPinnedIndex = pinnedList.indexOf(b.address)
+                        if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
+                            if (aPinnedIndex === -1) return 1
+                            if (bPinnedIndex === -1) return -1
+                            return aPinnedIndex - bPinnedIndex
+                        }
                         // Then connected devices
                         if (a.connected && !b.connected) return -1
                         if (!a.connected && b.connected) return 1
@@ -302,7 +321,7 @@ Rectangle {
                         height: 28
                         radius: height / 2
                         color: {
-                            const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
+                            const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
                             return isThisDevicePinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05)
                         }
 
@@ -315,7 +334,7 @@ Rectangle {
                                 name: "push_pin"
                                 size: 16
                                 color: {
-                                    const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
+                                    const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
                                     return isThisDevicePinned ? Theme.primary : Theme.surfaceText
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -323,12 +342,12 @@ Rectangle {
 
                             StyledText {
                                 text: {
-                                    const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
+                                    const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
                                     return isThisDevicePinned ? I18n.tr("Pinned") : I18n.tr("Pin")
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: {
-                                    const isThisDevicePinned = (SettingsData.bluetoothDevicePins || {})["preferredDevice"] === modelData.address
+                                    const isThisDevicePinned = bluetoothContent.getPinnedDevices().includes(modelData.address)
                                     return isThisDevicePinned ? Theme.primary : Theme.surfaceText
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -340,14 +359,22 @@ Rectangle {
                             cursorShape: Qt.PointingHandCursor
                             onClicked: {
                                 const pins = JSON.parse(JSON.stringify(SettingsData.bluetoothDevicePins || {}))
-                                const isCurrentlyPinned = pins["preferredDevice"] === modelData.address
+                                let pinnedList = bluetoothContent.normalizePinList(pins["preferredDevice"])
+                                const pinIndex = pinnedList.indexOf(modelData.address)
 
-                                if (isCurrentlyPinned) {
-                                    delete pins["preferredDevice"]
+                                if (pinIndex !== -1) {
+                                    pinnedList.splice(pinIndex, 1)
                                 } else {
-                                    pins["preferredDevice"] = modelData.address
+                                    pinnedList.unshift(modelData.address)
+                                    if (pinnedList.length > bluetoothContent.maxPinnedDevices)
+                                        pinnedList = pinnedList.slice(0, bluetoothContent.maxPinnedDevices)
                                 }
 
+                                if (pinnedList.length > 0)
+                                    pins["preferredDevice"] = pinnedList
+                                else
+                                    delete pins["preferredDevice"]
+
                                 SettingsData.set("bluetoothDevicePins", pins)
                             }
                         }

quickshell/Modules/ControlCenter/Details/NetworkDetail.qml

@@ -37,6 +37,10 @@ Rectangle {
         NetworkService.removeRef();
     }
 
+    property bool hasEthernetAvailable: (NetworkService.ethernetDevices?.length ?? 0) > 0
+    property bool hasWifiAvailable: (NetworkService.wifiDevices?.length ?? 0) > 0
+    property bool hasBothConnectionTypes: hasEthernetAvailable && hasWifiAvailable
+
     property int currentPreferenceIndex: {
         if (DMSService.apiVersion < 5) {
             return 1;
@@ -46,19 +50,24 @@ Rectangle {
             return 1;
         }
 
-        const pref = NetworkService.userPreference;
-        const status = NetworkService.networkStatus;
-        let index = 1;
-
-        if (pref === "ethernet") {
-            index = 0;
-        } else if (pref === "wifi") {
-            index = 1;
-        } else {
-            index = status === "ethernet" ? 0 : 1;
+        if (!hasEthernetAvailable) {
+            return 1;
         }
 
-        return index;
+        if (!hasWifiAvailable) {
+            return 0;
+        }
+
+        const pref = NetworkService.userPreference;
+        const status = NetworkService.networkStatus;
+
+        if (pref === "ethernet") {
+            return 0;
+        }
+        if (pref === "wifi") {
+            return 1;
+        }
+        return status === "ethernet" ? 0 : 1;
     }
 
     Row {
@@ -117,7 +126,7 @@ Rectangle {
             DankButtonGroup {
                 id: preferenceControls
                 anchors.verticalCenter: parent.verticalCenter
-                visible: NetworkService.backend === "networkmanager" && DMSService.apiVersion > 10
+                visible: hasBothConnectionTypes && NetworkService.backend === "networkmanager" && DMSService.apiVersion > 10
                 buttonHeight: 28
                 textSize: Theme.fontSizeSmall
 
@@ -454,20 +463,39 @@ Rectangle {
         contentHeight: wifiColumn.height
         clip: true
 
+        property int maxPinnedNetworks: 3
+
+        function normalizePinList(value) {
+            if (Array.isArray(value))
+                return value.filter(v => v)
+            if (typeof value === "string" && value.length > 0)
+                return [value]
+            return []
+        }
+
+        function getPinnedNetworks() {
+            const pins = SettingsData.wifiNetworkPins || {}
+            return normalizePinList(pins["preferredWifi"])
+        }
+
         property var frozenNetworks: []
         property bool menuOpen: false
         property var sortedNetworks: {
             const ssid = NetworkService.currentWifiSSID;
             const networks = NetworkService.wifiNetworks;
-            const pins = SettingsData.wifiNetworkPins || {};
-            const pinnedSSID = pins["preferredWifi"];
+            const pinnedList = getPinnedNetworks()
 
             let sorted = [...networks];
             sorted.sort((a, b) => {
-                if (a.ssid === pinnedSSID && b.ssid !== pinnedSSID)
-                    return -1;
-                if (b.ssid === pinnedSSID && a.ssid !== pinnedSSID)
-                    return 1;
+                const aPinnedIndex = pinnedList.indexOf(a.ssid)
+                const bPinnedIndex = pinnedList.indexOf(b.ssid)
+                if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
+                    if (aPinnedIndex === -1)
+                        return 1
+                    if (bPinnedIndex === -1)
+                        return -1
+                    return aPinnedIndex - bPinnedIndex
+                }
                 if (a.ssid === ssid)
                     return -1;
                 if (b.ssid === ssid)
@@ -616,7 +644,7 @@ Rectangle {
                         height: 28
                         radius: height / 2
                         color: {
-                            const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
+                            const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
                             return isThisNetworkPinned ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.withAlpha(Theme.surfaceText, 0.05);
                         }
 
@@ -629,7 +657,7 @@ Rectangle {
                                 name: "push_pin"
                                 size: 16
                                 color: {
-                                    const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
+                                    const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
                                     return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -637,12 +665,12 @@ Rectangle {
 
                             StyledText {
                                 text: {
-                                    const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
+                                    const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
                                     return isThisNetworkPinned ? I18n.tr("Pinned") : I18n.tr("Pin");
                                 }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: {
-                                    const isThisNetworkPinned = (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid;
+                                    const isThisNetworkPinned = wifiContent.getPinnedNetworks().includes(modelData.ssid);
                                     return isThisNetworkPinned ? Theme.primary : Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
@@ -653,16 +681,24 @@ Rectangle {
                             anchors.fill: parent
                             cursorShape: Qt.PointingHandCursor
                             onClicked: {
-                                const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
-                                const isCurrentlyPinned = pins["preferredWifi"] === modelData.ssid;
+                                const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}))
+                                let pinnedList = wifiContent.normalizePinList(pins["preferredWifi"])
+                                const pinIndex = pinnedList.indexOf(modelData.ssid)
 
-                                if (isCurrentlyPinned) {
-                                    delete pins["preferredWifi"];
+                                if (pinIndex !== -1) {
+                                    pinnedList.splice(pinIndex, 1)
                                 } else {
-                                    pins["preferredWifi"] = modelData.ssid;
+                                    pinnedList.unshift(modelData.ssid)
+                                    if (pinnedList.length > wifiContent.maxPinnedNetworks)
+                                        pinnedList = pinnedList.slice(0, wifiContent.maxPinnedNetworks)
                                 }
 
-                                SettingsData.set("wifiNetworkPins", pins);
+                                if (pinnedList.length > 0)
+                                    pins["preferredWifi"] = pinnedList
+                                else
+                                    delete pins["preferredWifi"]
+
+                                SettingsData.set("wifiNetworkPins", pins)
                             }
                         }
                     }
@@ -678,8 +714,8 @@ Rectangle {
                                 if (modelData.secured && !modelData.saved) {
                                     if (DMSService.apiVersion >= 7) {
                                         NetworkService.connectToWifi(modelData.ssid);
-                                    } else if (PopoutService.wifiPasswordModal) {
-                                        PopoutService.wifiPasswordModal.show(modelData.ssid);
+                                    } else {
+                                        PopoutService.showWifiPasswordModal(modelData.ssid);
                                     }
                                 } else {
                                     NetworkService.connectToWifi(modelData.ssid);
@@ -740,8 +776,8 @@ Rectangle {
                     if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved) {
                         if (DMSService.apiVersion >= 7) {
                             NetworkService.connectToWifi(networkContextMenu.currentSSID);
-                        } else if (PopoutService.wifiPasswordModal) {
-                            PopoutService.wifiPasswordModal.show(networkContextMenu.currentSSID);
+                        } else {
+                            PopoutService.showWifiPasswordModal(networkContextMenu.currentSSID);
                         }
                     } else {
                         NetworkService.connectToWifi(networkContextMenu.currentSSID);

quickshell/Modules/DankBar/DankBarContent.qml

@@ -39,7 +39,7 @@ Item {
 
     function getRealWorkspaces() {
         if (CompositorService.isNiri) {
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 return NiriService.getCurrentOutputWorkspaceNumbers();
             }
             const workspaces = NiriService.allWorkspaces.filter(ws => ws.output === barWindow.screenName).map(ws => ws.idx + 1);
@@ -47,7 +47,7 @@ Item {
         } else if (CompositorService.isHyprland) {
             const workspaces = Hyprland.workspaces?.values || [];
 
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 const sorted = workspaces.slice().sort((a, b) => a.id - b.id);
                 const filtered = sorted.filter(ws => ws.id > -1);
                 return filtered.length > 0 ? filtered : [
@@ -91,7 +91,7 @@ Item {
                     }
                 ];
 
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 return workspaces.slice().sort((a, b) => a.num - b.num);
             }
 
@@ -107,7 +107,7 @@ Item {
 
     function getCurrentWorkspace() {
         if (CompositorService.isNiri) {
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 return NiriService.getCurrentWorkspaceNumber();
             }
             const activeWs = NiriService.allWorkspaces.find(ws => ws.output === barWindow.screenName && ws.is_active);
@@ -125,7 +125,7 @@ Item {
             const activeTags = DwlService.getActiveTags(barWindow.screenName);
             return activeTags.length > 0 ? activeTags[0] : 0;
         } else if (CompositorService.isSway || CompositorService.isScroll) {
-            if (!barWindow.screenName || !SettingsData.workspacesPerMonitor) {
+            if (!barWindow.screenName || SettingsData.workspaceFollowFocus) {
                 const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
                 return focusedWs ? focusedWs.num : 1;
             }

quickshell/Modules/DankBar/Widgets/ControlCenterButton.qml

@@ -24,10 +24,12 @@ BasePill {
     property bool showMicPercent: widgetData?.showMicPercent !== undefined ? widgetData.showMicPercent : SettingsData.controlCenterShowMicPercent
     property bool showBatteryIcon: widgetData?.showBatteryIcon !== undefined ? widgetData.showBatteryIcon : SettingsData.controlCenterShowBatteryIcon
     property bool showPrinterIcon: widgetData?.showPrinterIcon !== undefined ? widgetData.showPrinterIcon : SettingsData.controlCenterShowPrinterIcon
+    property bool showScreenSharingIcon: widgetData?.showScreenSharingIcon !== undefined ? widgetData.showScreenSharingIcon : SettingsData.controlCenterShowScreenSharingIcon
     property real touchpadThreshold: 100
     property real micAccumulator: 0
     property real volumeAccumulator: 0
     property real brightnessAccumulator: 0
+    readonly property real vIconSize: Theme.barIconSize(root.barThickness, -4)
 
     Loader {
         active: root.showPrinterIcon
@@ -213,7 +215,25 @@ BasePill {
     }
 
     function hasNoVisibleIcons() {
-        return !root.showNetworkIcon && !root.showBluetoothIcon && !root.showAudioIcon && !root.showVpnIcon && !root.showBrightnessIcon && !root.showMicIcon && !root.showBatteryIcon && !root.showPrinterIcon;
+        if (root.showScreenSharingIcon && NiriService.hasCasts)
+            return false;
+        if (root.showNetworkIcon && NetworkService.networkAvailable)
+            return false;
+        if (root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected)
+            return false;
+        if (root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled)
+            return false;
+        if (root.showAudioIcon)
+            return false;
+        if (root.showMicIcon)
+            return false;
+        if (root.showBrightnessIcon && DisplayService.brightnessAvailable && root.hasPinnedBrightnessDevice())
+            return false;
+        if (root.showBatteryIcon && BatteryService.batteryAvailable)
+            return false;
+        if (root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs())
+            return false;
+        return true;
     }
 
     content: Component {
@@ -224,48 +244,74 @@ BasePill {
             Column {
                 id: controlColumn
                 visible: root.isVerticalOrientation
-                anchors.centerIn: parent
+                width: root.vIconSize
+                anchors.horizontalCenter: parent.horizontalCenter
                 spacing: Theme.spacingXS
 
-                DankIcon {
-                    name: root.getNetworkIconName()
-                    size: Theme.barIconSize(root.barThickness, -4)
-                    color: root.getNetworkIconColor()
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
+                    visible: root.showScreenSharingIcon && NiriService.hasCasts
+
+                    DankIcon {
+                        name: "screen_record"
+                        size: root.vIconSize
+                        color: NiriService.hasActiveCast ? Theme.primary : Theme.surfaceText
+                        anchors.centerIn: parent
+                    }
+                }
+
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
                     visible: root.showNetworkIcon && NetworkService.networkAvailable
+
+                    DankIcon {
+                        name: root.getNetworkIconName()
+                        size: root.vIconSize
+                        color: root.getNetworkIconColor()
+                        anchors.centerIn: parent
+                    }
                 }
 
-                DankIcon {
-                    name: "vpn_lock"
-                    size: Theme.barIconSize(root.barThickness, -4)
-                    color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
                     visible: root.showVpnIcon && NetworkService.vpnAvailable && NetworkService.vpnConnected
+
+                    DankIcon {
+                        name: "vpn_lock"
+                        size: root.vIconSize
+                        color: NetworkService.vpnConnected ? Theme.primary : Theme.surfaceText
+                        anchors.centerIn: parent
+                    }
                 }
 
-                DankIcon {
-                    name: "bluetooth"
-                    size: Theme.barIconSize(root.barThickness, -4)
-                    color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
                     visible: root.showBluetoothIcon && BluetoothService.available && BluetoothService.enabled
+
+                    DankIcon {
+                        name: "bluetooth"
+                        size: root.vIconSize
+                        color: BluetoothService.connected ? Theme.primary : Theme.surfaceText
+                        anchors.centerIn: parent
+                    }
                 }
 
-                Rectangle {
-                    width: audioIconV.implicitWidth + 4
-                    height: audioIconV.implicitHeight + (root.showAudioPercent ? audioPercentV.implicitHeight : 0) + 4
-                    color: "transparent"
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize + (root.showAudioPercent ? audioPercentV.implicitHeight + 2 : 0)
                     visible: root.showAudioIcon
 
                     DankIcon {
                         id: audioIconV
                         name: root.getVolumeIconName()
-                        size: Theme.barIconSize(root.barThickness, -4)
+                        size: root.vIconSize
                         color: Theme.widgetIconColor
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.top: parent.top
-                        anchors.topMargin: 2
                     }
 
                     StyledText {
@@ -292,21 +338,18 @@ BasePill {
                     }
                 }
 
-                Rectangle {
-                    width: micIconV.implicitWidth + 4
-                    height: micIconV.implicitHeight + (root.showAudioPercent ? micPercentV.implicitHeight : 0) + 4
-                    color: "transparent"
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize + (root.showMicPercent ? micPercentV.implicitHeight + 2 : 0)
                     visible: root.showMicIcon
 
                     DankIcon {
                         id: micIconV
                         name: root.getMicIconName()
-                        size: Theme.barIconSize(root.barThickness, -4)
+                        size: root.vIconSize
                         color: root.getMicIconColor()
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.top: parent.top
-                        anchors.topMargin: 2
                     }
 
                     StyledText {
@@ -333,21 +376,18 @@ BasePill {
                     }
                 }
 
-                Rectangle {
-                    width: brightnessIconV.implicitWidth + 4
-                    height: brightnessIconV.implicitHeight + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight : 0) + 4
-                    color: "transparent"
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize + (root.showBrightnessPercent ? brightnessPercentV.implicitHeight + 2 : 0)
                     visible: root.showBrightnessIcon && DisplayService.brightnessAvailable && root.hasPinnedBrightnessDevice()
 
                     DankIcon {
                         id: brightnessIconV
                         name: root.getBrightnessIconName()
-                        size: Theme.barIconSize(root.barThickness, -4)
+                        size: root.vIconSize
                         color: Theme.widgetIconColor
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.top: parent.top
-                        anchors.topMargin: 2
                     }
 
                     StyledText {
@@ -371,28 +411,43 @@ BasePill {
                     }
                 }
 
-                DankIcon {
-                    name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable)
-                    size: Theme.barIconSize(root.barThickness, -4)
-                    color: root.getBatteryIconColor()
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
                     visible: root.showBatteryIcon && BatteryService.batteryAvailable
+
+                    DankIcon {
+                        name: Theme.getBatteryIcon(BatteryService.batteryLevel, BatteryService.isCharging, BatteryService.batteryAvailable)
+                        size: root.vIconSize
+                        color: root.getBatteryIconColor()
+                        anchors.centerIn: parent
+                    }
                 }
 
-                DankIcon {
-                    name: "print"
-                    size: Theme.barIconSize(root.barThickness, -4)
-                    color: Theme.primary
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
                     visible: root.showPrinterIcon && CupsService.cupsAvailable && root.hasPrintJobs()
+
+                    DankIcon {
+                        name: "print"
+                        size: root.vIconSize
+                        color: Theme.primary
+                        anchors.centerIn: parent
+                    }
                 }
 
-                DankIcon {
-                    name: "settings"
-                    size: Theme.barIconSize(root.barThickness, -4)
-                    color: root.isActive ? Theme.primary : Theme.widgetIconColor
-                    anchors.horizontalCenter: parent.horizontalCenter
+                Item {
+                    width: root.vIconSize
+                    height: root.vIconSize
                     visible: root.hasNoVisibleIcons()
+
+                    DankIcon {
+                        name: "settings"
+                        size: root.vIconSize
+                        color: root.isActive ? Theme.primary : Theme.widgetIconColor
+                        anchors.centerIn: parent
+                    }
                 }
             }
 
@@ -402,6 +457,14 @@ BasePill {
                 anchors.centerIn: parent
                 spacing: Theme.spacingXS
 
+                DankIcon {
+                    name: "screen_record"
+                    size: Theme.barIconSize(root.barThickness, -4)
+                    color: NiriService.hasActiveCast ? Theme.primary : Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: root.showScreenSharingIcon && NiriService.hasCasts
+                }
+
                 DankIcon {
                     id: networkIcon
                     name: root.getNetworkIconName()

quickshell/Modules/DankBar/Widgets/FocusedApp.qml

@@ -56,6 +56,13 @@ BasePill {
         }
     }
 
+    Connections {
+        target: SettingsData
+        function onAppIdSubstitutionsChanged() {
+            root.updateDesktopEntry();
+        }
+    }
+
     function updateDesktopEntry() {
         if (activeWindow && activeWindow.appId) {
             const moddedId = Paths.moddedAppId(activeWindow.appId);
@@ -153,24 +160,12 @@ BasePill {
                 size: 18
                 name: "sports_esports"
                 color: Theme.widgetTextColor
-                visible: {
-                    if (!root.isVerticalOrientation || !activeWindow || !activeWindow.appId)
-                        return false;
-                    const moddedId = Paths.moddedAppId(activeWindow.appId);
-                    return moddedId.toLowerCase().includes("steam_app");
-                }
+                visible: root.isVerticalOrientation && activeWindow && activeWindow.appId && appIcon.status !== Image.Ready && Paths.isSteamApp(activeWindow.appId)
             }
 
             Text {
                 anchors.centerIn: parent
-                visible: {
-                    if (!root.isVerticalOrientation || !activeWindow || !activeWindow.appId)
-                        return false;
-                    if (appIcon.status === Image.Ready)
-                        return false;
-                    const moddedId = Paths.moddedAppId(activeWindow.appId);
-                    return !moddedId.toLowerCase().includes("steam_app");
-                }
+                visible: root.isVerticalOrientation && activeWindow && activeWindow.appId && appIcon.status !== Image.Ready && !Paths.isSteamApp(activeWindow.appId)
                 text: {
                     if (!activeWindow || !activeWindow.appId)
                         return "?";

quickshell/Modules/DankBar/Widgets/NotificationCenterButton.qml

@@ -19,7 +19,7 @@ BasePill {
                 anchors.centerIn: parent
                 name: SessionData.doNotDisturb ? "notifications_off" : "notifications"
                 size: Theme.barIconSize(root.barThickness, -4)
-                color: SessionData.doNotDisturb ? Theme.error : (root.isActive ? Theme.primary : Theme.widgetIconColor)
+                color: SessionData.doNotDisturb ? Theme.primary : (root.isActive ? Theme.primary : Theme.widgetIconColor)
             }
 
             Rectangle {
@@ -35,6 +35,6 @@ BasePill {
     }
 
     onRightClicked: {
-        SessionData.setDoNotDisturb(!SessionData.doNotDisturb)
+        SessionData.setDoNotDisturb(!SessionData.doNotDisturb);
     }
 }

quickshell/Modules/DankBar/Widgets/RunningApps.qml

@@ -69,6 +69,7 @@ Item {
 
     property int _desktopEntriesUpdateTrigger: 0
     property int _toplevelsUpdateTrigger: 0
+    property int _appIdSubstitutionsTrigger: 0
 
     readonly property var sortedToplevels: {
         _toplevelsUpdateTrigger;
@@ -95,6 +96,13 @@ Item {
             _desktopEntriesUpdateTrigger++;
         }
     }
+
+    Connections {
+        target: SettingsData
+        function onAppIdSubstitutionsChanged() {
+            _appIdSubstitutionsTrigger++;
+        }
+    }
     readonly property var groupedWindows: {
         if (!SettingsData.runningAppsGroupByApp) {
             return [];
@@ -364,6 +372,7 @@ Item {
                             height: Theme.barIconSize(root.barThickness)
                             source: {
                                 root._desktopEntriesUpdateTrigger;
+                                root._appIdSubstitutionsTrigger;
                                 if (!appId)
                                     return "";
                                 const moddedId = Paths.moddedAppId(appId);
@@ -391,20 +400,12 @@ Item {
                             size: Theme.barIconSize(root.barThickness)
                             name: "sports_esports"
                             color: Theme.widgetTextColor
-                            visible: {
-                                const moddedId = Paths.moddedAppId(appId);
-                                return moddedId.toLowerCase().includes("steam_app");
-                            }
+                            visible: !iconImg.visible && Paths.isSteamApp(appId)
                         }
 
-                        // Fallback text if no icon found
                         Text {
                             anchors.centerIn: parent
-                            visible: {
-                                const moddedId = Paths.moddedAppId(appId);
-                                const isSteamApp = moddedId.toLowerCase().includes("steam_app");
-                                return !iconImg.visible && !isSteamApp;
-                            }
+                            visible: !iconImg.visible && !Paths.isSteamApp(appId)
                             text: {
                                 root._desktopEntriesUpdateTrigger;
                                 if (!appId)
@@ -502,8 +503,10 @@ Item {
                                         const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
                                         const screenX = root.parentScreen ? root.parentScreen.x : 0;
                                         const relativeX = globalPos.x - screenX;
-                                        const yPos = root.barThickness + root.barSpacing - 7;
-                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, "top");
+                                        const screenHeight = root.parentScreen ? root.parentScreen.height : Screen.height;
+                                        const isBottom = root.axis?.edge === "bottom";
+                                        const yPos = isBottom ? (screenHeight - root.barThickness - root.barSpacing - 32 - Theme.spacingXS) : (root.barThickness + root.barSpacing + Theme.spacingXS);
+                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, root.axis?.edge);
                                     }
                                 }
                             } else if (mouse.button === Qt.MiddleButton) {
@@ -614,6 +617,7 @@ Item {
                             height: Theme.barIconSize(root.barThickness)
                             source: {
                                 root._desktopEntriesUpdateTrigger;
+                                root._appIdSubstitutionsTrigger;
                                 if (!appId)
                                     return "";
                                 const moddedId = Paths.moddedAppId(appId);
@@ -641,19 +645,12 @@ Item {
                             size: Theme.barIconSize(root.barThickness)
                             name: "sports_esports"
                             color: Theme.widgetTextColor
-                            visible: {
-                                const moddedId = Paths.moddedAppId(appId);
-                                return moddedId.toLowerCase().includes("steam_app");
-                            }
+                            visible: !iconImg.visible && Paths.isSteamApp(appId)
                         }
 
                         Text {
                             anchors.centerIn: parent
-                            visible: {
-                                const moddedId = Paths.moddedAppId(appId);
-                                const isSteamApp = moddedId.toLowerCase().includes("steam_app");
-                                return !iconImg.visible && !isSteamApp;
-                            }
+                            visible: !iconImg.visible && !Paths.isSteamApp(appId)
                             text: {
                                 root._desktopEntriesUpdateTrigger;
                                 if (!appId)
@@ -751,8 +748,10 @@ Item {
                                         const globalPos = delegateItem.mapToGlobal(delegateItem.width / 2, 0);
                                         const screenX = root.parentScreen ? root.parentScreen.x : 0;
                                         const relativeX = globalPos.x - screenX;
-                                        const yPos = root.barThickness + root.barSpacing - 7;
-                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, "top");
+                                        const screenHeight = root.parentScreen ? root.parentScreen.height : Screen.height;
+                                        const isBottom = root.axis?.edge === "bottom";
+                                        const yPos = isBottom ? (screenHeight - root.barThickness - root.barSpacing - 32 - Theme.spacingXS) : (root.barThickness + root.barSpacing + Theme.spacingXS);
+                                        windowContextMenuLoader.item.showAt(relativeX, yPos, false, root.axis?.edge);
                                     }
                                 }
                             }

quickshell/Modules/DankBar/Widgets/SystemTrayBar.qml

@@ -1208,7 +1208,7 @@ Item {
                             visible: entryStack.count === 0
                             width: parent.width
                             height: 28
-                            radius: 0
+                            radius: Theme.cornerRadius
                             color: visibilityToggleArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.withAlpha(Theme.surfaceContainer, 0)
 
                             StyledText {
@@ -1261,7 +1261,7 @@ Item {
                             visible: entryStack.count > 0
                             width: parent.width
                             height: 28
-                            radius: 0
+                            radius: Theme.cornerRadius
                             color: backArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.withAlpha(Theme.surfaceContainer, 0)
 
                             Row {
@@ -1309,11 +1309,10 @@ Item {
 
                                 width: menuColumn.width
                                 height: menuEntry?.isSeparator ? 1 : 28
-                                radius: 0
+                                radius: menuEntry?.isSeparator ? 0 : Theme.cornerRadius
                                 color: {
-                                    if (menuEntry?.isSeparator) {
+                                    if (menuEntry?.isSeparator)
                                         return Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2);
-                                    }
                                     return itemArea.containsMouse ? Theme.widgetBaseHoverColor : Theme.withAlpha(Theme.surfaceContainer, 0);
                                 }
 

quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml

@@ -24,6 +24,26 @@ Item {
         return CompositorService.filterCurrentWorkspace(CompositorService.sortedToplevels, screenName);
     }
 
+    readonly property string effectiveScreenName: {
+        if (!SettingsData.workspaceFollowFocus)
+            return root.screenName;
+
+        switch (CompositorService.compositor) {
+        case "niri":
+            return NiriService.currentOutput || root.screenName;
+        case "hyprland":
+            return Hyprland.focusedWorkspace?.monitor?.name || root.screenName;
+        case "dwl":
+            return DwlService.activeOutput || root.screenName;
+        case "sway":
+        case "scroll":
+            const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
+            return focusedWs?.monitor?.name || root.screenName;
+        default:
+            return root.screenName;
+        }
+    }
+
     readonly property bool useExtWorkspace: DMSService.forceExtWorkspace || (!CompositorService.isNiri && !CompositorService.isHyprland && !CompositorService.isDwl && !CompositorService.isSway && !CompositorService.isScroll && ExtWorkspaceService.extWorkspaceAvailable)
 
     Connections {
@@ -94,7 +114,7 @@ Item {
                 }
             ];
 
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             return workspaces.slice().sort((a, b) => a.num - b.num);
         }
 
@@ -107,7 +127,7 @@ Item {
     }
 
     function getSwayActiveWorkspace() {
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             return focusedWs ? focusedWs.num : 1;
         }
@@ -137,7 +157,7 @@ Item {
             ];
         }
 
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             filtered = filtered.slice().sort((a, b) => a.id - b.id);
         } else {
             const monitorWorkspaces = filtered.filter(ws => ws.monitor?.name === root.screenName);
@@ -163,7 +183,7 @@ Item {
     }
 
     function getHyprlandActiveWorkspace() {
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             return Hyprland.focusedWorkspace?.id || 1;
         }
 
@@ -183,7 +203,7 @@ Item {
             if (wsNumber <= 0) {
                 return [];
             }
-            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNumber && w.output === root.screenName);
+            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNumber && w.output === root.effectiveScreenName);
             if (!workspace) {
                 return [];
             }
@@ -211,7 +231,7 @@ Item {
             const focusedWs = I3.workspaces?.values?.find(ws => ws.focused === true);
             isActiveWs = focusedWs ? (focusedWs.num === targetWorkspaceId) : false;
         } else if (CompositorService.isDwl) {
-            const output = DwlService.getOutputState(root.screenName);
+            const output = DwlService.getOutputState(root.effectiveScreenName);
             if (output && output.tags) {
                 const tag = output.tags.find(t => t.tag === targetWorkspaceId);
                 isActiveWs = tag ? (tag.state === 1) : false;
@@ -244,16 +264,16 @@ Item {
             const key = isActiveWs || !SettingsData.groupWorkspaceApps ? `${keyBase}_${i}` : keyBase;
 
             if (!byApp[key]) {
-                const moddedId = Paths.moddedAppId(keyBase);
-                const isSteamApp = moddedId.toLowerCase().includes("steam_app");
                 const isQuickshell = keyBase === "org.quickshell";
-                const desktopEntry = DesktopEntries.heuristicLookup(keyBase);
-                const icon = isSteamApp ? "" : Paths.getAppIcon(keyBase, desktopEntry);
+                const isSteamApp = Paths.isSteamApp(keyBase);
+                const moddedId = Paths.moddedAppId(keyBase);
+                const desktopEntry = DesktopEntries.heuristicLookup(moddedId);
+                const icon = Paths.getAppIcon(keyBase, desktopEntry);
                 byApp[key] = {
                     "type": "icon",
                     "icon": icon,
-                    "isSteamApp": isSteamApp,
                     "isQuickshell": isQuickshell,
+                    "isSteamApp": isSteamApp,
                     "active": !!((w.activated || w.is_focused) || (CompositorService.isNiri && w.is_focused)),
                     "count": 1,
                     "windowId": w.address || w.id,
@@ -308,7 +328,7 @@ Item {
         }
 
         let workspaces;
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             workspaces = NiriService.getCurrentOutputWorkspaceNumbers();
         } else {
             const displayWorkspaces = NiriService.allWorkspaces.filter(ws => ws.output === root.screenName).map(ws => ws.idx + 1);
@@ -320,7 +340,7 @@ Item {
         }
 
         return workspaces.filter(wsNum => {
-            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNum && w.output === root.screenName);
+            const workspace = NiriService.allWorkspaces.find(w => w.idx + 1 === wsNum && w.output === root.effectiveScreenName);
             if (!workspace)
                 return false;
             if (workspace.is_active)
@@ -334,7 +354,7 @@ Item {
             return 1;
         }
 
-        if (!root.screenName || !SettingsData.workspacesPerMonitor) {
+        if (!root.screenName || SettingsData.workspaceFollowFocus) {
             return NiriService.getCurrentWorkspaceNumber();
         }
 
@@ -343,14 +363,13 @@ Item {
     }
 
     function getDwlTags() {
-        if (!DwlService.dwlAvailable) {
+        if (!DwlService.dwlAvailable)
             return [];
-        }
 
-        const output = DwlService.getOutputState(root.screenName);
-        if (!output || !output.tags || output.tags.length === 0) {
+        const targetScreen = root.effectiveScreenName;
+        const output = DwlService.getOutputState(targetScreen);
+        if (!output || !output.tags || output.tags.length === 0)
             return [];
-        }
 
         if (SettingsData.dwlShowAllTags) {
             return output.tags.map(tag => ({
@@ -361,7 +380,7 @@ Item {
                     }));
         }
 
-        const visibleTagIndices = DwlService.getVisibleTags(root.screenName);
+        const visibleTagIndices = DwlService.getVisibleTags(targetScreen);
         return visibleTagIndices.map(tagIndex => {
             const tagData = output.tags.find(t => t.tag === tagIndex);
             return {
@@ -374,12 +393,10 @@ Item {
     }
 
     function getDwlActiveTags() {
-        if (!DwlService.dwlAvailable) {
+        if (!DwlService.dwlAvailable)
             return [];
-        }
 
-        const activeTags = DwlService.getActiveTags(root.screenName);
-        return activeTags;
+        return DwlService.getActiveTags(root.effectiveScreenName);
     }
 
     function getExtWorkspaceWorkspaces() {
@@ -790,6 +807,68 @@ Item {
                 readonly property real visualWidth: baseWidth + iconsExtraWidth
                 readonly property real visualHeight: baseHeight + iconsExtraHeight
 
+                readonly property color unfocusedColor: {
+                    switch (SettingsData.workspaceUnfocusedColorMode) {
+                    case "s":
+                        return Theme.surface;
+                    case "sc":
+                        return Theme.surfaceContainer;
+                    case "sch":
+                        return Theme.surfaceContainerHigh;
+                    default:
+                        return Theme.surfaceTextAlpha;
+                    }
+                }
+
+                readonly property color activeColor: {
+                    switch (SettingsData.workspaceColorMode) {
+                    case "s":
+                        return Theme.surface;
+                    case "sc":
+                        return Theme.surfaceContainer;
+                    case "sch":
+                        return Theme.surfaceContainerHigh;
+                    case "none":
+                        return unfocusedColor;
+                    default:
+                        return Theme.primary;
+                    }
+                }
+
+                readonly property color urgentColor: {
+                    switch (SettingsData.workspaceUrgentColorMode) {
+                    case "primary":
+                        return Theme.primary;
+                    case "secondary":
+                        return Theme.secondary;
+                    case "s":
+                        return Theme.surface;
+                    case "sc":
+                        return Theme.surfaceContainer;
+                    default:
+                        return Theme.error;
+                    }
+                }
+
+                readonly property color focusedBorderColor: {
+                    switch (SettingsData.workspaceFocusedBorderColor) {
+                    case "surfaceText":
+                        return Theme.surfaceText;
+                    case "secondary":
+                        return Theme.secondary;
+                    default:
+                        return Theme.primary;
+                    }
+                }
+
+                function getContrastingIconColor(bgColor) {
+                    const luminance = 0.299 * bgColor.r + 0.587 * bgColor.g + 0.114 * bgColor.b;
+                    return luminance > 0.4 ? Qt.rgba(0.15, 0.15, 0.15, 1) : Qt.rgba(0.8, 0.8, 0.8, 1);
+                }
+
+                readonly property color quickshellIconActiveColor: getContrastingIconColor(activeColor)
+                readonly property color quickshellIconInactiveColor: getContrastingIconColor(unfocusedColor)
+
                 MouseArea {
                     id: mouseArea
                     anchors.fill: parent
@@ -850,7 +929,7 @@ Item {
                         if (root.useExtWorkspace) {
                             wsData = modelData;
                         } else if (CompositorService.isNiri) {
-                            wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.screenName) || null;
+                            wsData = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.effectiveScreenName) || null;
                         } else if (CompositorService.isHyprland) {
                             wsData = modelData;
                         } else if (CompositorService.isDwl) {
@@ -892,16 +971,61 @@ Item {
                 width: root.isVertical ? root.barThickness : visualWidth
                 height: root.isVertical ? visualHeight : root.barThickness
 
+                Rectangle {
+                    id: focusedBorderRing
+                    anchors.centerIn: parent
+                    width: {
+                        const borderWidth = (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? SettingsData.workspaceFocusedBorderThickness : 0;
+                        return delegateRoot.visualWidth + borderWidth * 2;
+                    }
+                    height: {
+                        const borderWidth = (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? SettingsData.workspaceFocusedBorderThickness : 0;
+                        return delegateRoot.visualHeight + borderWidth * 2;
+                    }
+                    radius: Theme.cornerRadius
+                    color: "transparent"
+                    border.width: (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? SettingsData.workspaceFocusedBorderThickness : 0
+                    border.color: (SettingsData.workspaceFocusedBorderEnabled && isActive && !isPlaceholder) ? focusedBorderColor : "transparent"
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on height {
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on border.width {
+                        NumberAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+
+                    Behavior on border.color {
+                        ColorAnimation {
+                            duration: Theme.mediumDuration
+                            easing.type: Theme.emphasizedEasing
+                        }
+                    }
+                }
+
                 Rectangle {
                     id: visualContent
                     width: delegateRoot.visualWidth
                     height: delegateRoot.visualHeight
                     anchors.centerIn: parent
                     radius: Theme.cornerRadius
-                    color: isActive ? Theme.primary : isUrgent ? Theme.error : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.withAlpha(Theme.surfaceText, 0.45) : Theme.surfaceTextAlpha
+                    color: isActive ? activeColor : isUrgent ? urgentColor : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.withAlpha(unfocusedColor, 0.7) : unfocusedColor
 
                     border.width: isUrgent ? 2 : 0
-                    border.color: isUrgent ? Theme.error : Theme.withAlpha(Theme.error, 0)
+                    border.color: isUrgent ? urgentColor : "transparent"
 
                     Behavior on width {
                         NumberAnimation {
@@ -1013,7 +1137,7 @@ Item {
                                                 anchors.fill: parent
                                                 source: modelData.icon
                                                 opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
-                                                visible: !modelData.isSteamApp && !modelData.isQuickshell
+                                                visible: !modelData.isQuickshell && !modelData.isSteamApp
                                             }
 
                                             IconImage {
@@ -1025,17 +1149,24 @@ Item {
                                                 layer.effect: MultiEffect {
                                                     saturation: 0
                                                     colorization: 1
-                                                    colorizationColor: isActive ? Theme.primaryContainer : Theme.primary
+                                                    colorizationColor: isActive ? quickshellIconActiveColor : quickshellIconInactiveColor
                                                 }
                                             }
 
+                                            IconImage {
+                                                anchors.fill: parent
+                                                source: modelData.icon
+                                                opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: modelData.isSteamApp && modelData.icon
+                                            }
+
                                             DankIcon {
                                                 anchors.centerIn: parent
                                                 size: root.appIconSize
                                                 name: "sports_esports"
                                                 color: Theme.widgetTextColor
                                                 opacity: modelData.active ? 1.0 : rowAppMouseArea.containsMouse ? 0.8 : 0.6
-                                                visible: modelData.isSteamApp
+                                                visible: modelData.isSteamApp && !modelData.icon
                                             }
 
                                             MouseArea {
@@ -1116,7 +1247,7 @@ Item {
                                                 anchors.fill: parent
                                                 source: modelData.icon
                                                 opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
-                                                visible: !modelData.isSteamApp && !modelData.isQuickshell
+                                                visible: !modelData.isQuickshell && !modelData.isSteamApp
                                             }
 
                                             IconImage {
@@ -1128,17 +1259,24 @@ Item {
                                                 layer.effect: MultiEffect {
                                                     saturation: 0
                                                     colorization: 1
-                                                    colorizationColor: isActive ? Theme.primaryContainer : Theme.primary
+                                                    colorizationColor: isActive ? quickshellIconActiveColor : quickshellIconInactiveColor
                                                 }
                                             }
 
+                                            IconImage {
+                                                anchors.fill: parent
+                                                source: modelData.icon
+                                                opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
+                                                visible: modelData.isSteamApp && modelData.icon
+                                            }
+
                                             DankIcon {
                                                 anchors.centerIn: parent
                                                 size: root.appIconSize
                                                 name: "sports_esports"
                                                 color: Theme.widgetTextColor
                                                 opacity: modelData.active ? 1.0 : colAppMouseArea.containsMouse ? 0.8 : 0.6
-                                                visible: modelData.isSteamApp
+                                                visible: modelData.isSteamApp && !modelData.icon
                                             }
 
                                             MouseArea {
@@ -1264,6 +1402,9 @@ Item {
                     function onWorkspaceNameIconsChanged() {
                         delegateRoot.updateAllData();
                     }
+                    function onAppIdSubstitutionsChanged() {
+                        delegateRoot.updateAllData();
+                    }
                 }
                 Connections {
                     target: DwlService

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -327,11 +327,12 @@ Item {
         clip: false
         visible: !_noneAvailable && (!showNoPlayerNow)
         ColumnLayout {
-            x: 72
-            y: 20
             width: 484
             height: 370
             spacing: Theme.spacingXS
+            anchors.top: parent.top
+            anchors.topMargin: 20
+            anchors.horizontalCenter: parent.horizontalCenter
 
             Item {
                 width: parent.width

quickshell/Modules/DankDash/WeatherForecastCard.qml

@@ -20,7 +20,19 @@ Rectangle {
         }
     }
 
-    readonly property string dateText: (daily ? root.forecastData?.day : root.forecastData?.time) ?? "--"
+    readonly property string dateText: {
+        if (daily)
+            return root.forecastData?.day ?? "--";
+        if (!root.forecastData?.rawTime)
+            return root.forecastData?.time ?? "--";
+        try {
+            const date = new Date(root.forecastData.rawTime);
+            const format = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
+            return date.toLocaleTimeString(Qt.locale(), format);
+        } catch (e) {
+            return root.forecastData?.time ?? "--";
+        }
+    }
 
     readonly property var minTemp: WeatherService.formatTemp(root.forecastData?.tempMin)
     readonly property var maxTemp: WeatherService.formatTemp(root.forecastData?.tempMax)

quickshell/Modules/DankDash/WeatherTab.qml

@@ -4,7 +4,6 @@ import QtQuick.Shapes
 import qs.Common
 import qs.Services
 import qs.Widgets
-import qs.Modules.DankBar.Widgets
 
 Item {
     id: root
@@ -261,7 +260,17 @@ Item {
 
                             StyledText {
                                 id: sunriseText
-                                text: WeatherService.weather.sunrise || ""
+                                text: {
+                                    if (!WeatherService.weather.rawSunrise)
+                                        return WeatherService.weather.sunrise || "";
+                                    try {
+                                        const date = new Date(WeatherService.weather.rawSunrise);
+                                        const format = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
+                                        return date.toLocaleTimeString(Qt.locale(), format);
+                                    } catch (e) {
+                                        return WeatherService.weather.sunrise || "";
+                                    }
+                                }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
                                 anchors.left: sunriseIcon.right
@@ -285,7 +294,17 @@ Item {
 
                             StyledText {
                                 id: sunsetText
-                                text: WeatherService.weather.sunset || ""
+                                text: {
+                                    if (!WeatherService.weather.rawSunset)
+                                        return WeatherService.weather.sunset || "";
+                                    try {
+                                        const date = new Date(WeatherService.weather.rawSunset);
+                                        const format = SettingsData.use24HourClock ? "HH:mm" : "h:mm AP";
+                                        return date.toLocaleTimeString(Qt.locale(), format);
+                                    } catch (e) {
+                                        return WeatherService.weather.sunset || "";
+                                    }
+                                }
                                 font.pixelSize: Theme.fontSizeSmall
                                 color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.6)
                                 anchors.left: sunsetIcon.right
@@ -324,14 +343,14 @@ Item {
                             break;
                         }
                     }
-                    readonly property var splitDate: Qt.formatDateTime(dateStepper.currentDate, "yyyy.MM.dd.hh.mm.AP").split('.')
+                    readonly property var splitDate: Qt.formatDateTime(dateStepper.currentDate, SettingsData.use24HourClock ? "yyyy.MM.dd.HH.mm" : "yyyy.MM.dd.hh.mm.AP").split('.')
 
                     Item {
                         id: dateStepperInner
                         anchors.fill: parent
                         anchors.verticalCenter: parent.verticalCenter
                         readonly property var space: Theme.spacingXS
-                        width: yearStepper.width + monthStepper.width + dayStepper.width + hourStepper.width + minuteStepper.width + suffix.width + 10.5 * space + 2 * dateStepperInnerPadding.width
+                        width: yearStepper.width + monthStepper.width + dayStepper.width + hourStepper.width + minuteStepper.width + (suffix.visible ? suffix.width : 0) + 10.5 * space + 2 * dateStepperInnerPadding.width
 
                         Item {
                             id: dateStepperInnerPadding
@@ -420,13 +439,14 @@ Item {
                         }
                         Rectangle {
                             id: suffix
+                            visible: !SettingsData.use24HourClock
                             anchors.verticalCenter: parent.verticalCenter
                             anchors.left: minuteStepper.right
                             anchors.leftMargin: 2 * parent.space
                             StyledText {
                                 isMonospace: true
                                 anchors.horizontalCenter: parent.horizontalCenter
-                                text: dateStepper.splitDate[5]
+                                text: dateStepper.splitDate[5] ?? ""
                                 font.pixelSize: Theme.fontSizeSmall
                                 x: -Theme.fontSizeSmall / 2
                                 y: -Theme.fontSizeSmall / 2

quickshell/Modules/Dock/DockAppButton.qml

@@ -49,6 +49,13 @@ Item {
             updateDesktopEntry();
         }
     }
+
+    Connections {
+        target: SettingsData
+        function onAppIdSubstitutionsChanged() {
+            updateDesktopEntry();
+        }
+    }
     property bool isWindowFocused: {
         if (!appData) {
             return false;
@@ -392,25 +399,11 @@ Item {
             }
         }
 
-        DankIcon {
-            anchors.centerIn: parent
-            size: actualIconSize
-            name: "sports_esports"
-            color: Theme.surfaceText
-            visible: {
-                if (!appData || !appData.appId || appData.appId === "__SEPARATOR__") {
-                    return false;
-                }
-                const moddedId = Paths.moddedAppId(appData.appId);
-                return moddedId.toLowerCase().includes("steam_app");
-            }
-        }
-
         Rectangle {
             width: actualIconSize
             height: actualIconSize
             anchors.centerIn: parent
-            visible: iconImg.status !== Image.Ready
+            visible: iconImg.status !== Image.Ready && appData && appData.appId && !Paths.isSteamApp(appData.appId)
             color: Theme.surfaceLight
             radius: Theme.cornerRadius
             border.width: 1
@@ -432,6 +425,14 @@ Item {
             }
         }
 
+        DankIcon {
+            anchors.centerIn: parent
+            size: actualIconSize
+            name: "sports_esports"
+            color: Theme.surfaceText
+            visible: iconImg.status !== Image.Ready && appData && appData.appId && Paths.isSteamApp(appData.appId)
+        }
+
         Loader {
             anchors.horizontalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? undefined : parent.horizontalCenter
             anchors.verticalCenter: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right ? parent.verticalCenter : undefined

quickshell/Modules/Greetd/assets/dms-greeter

@@ -2,8 +2,6 @@
 
 set -e
 
-export WLR_DRM_DEVICES=/dev/dri/card1
-
 COMPOSITOR=""
 COMPOSITOR_CONFIG=""
 DMS_PATH="dms-greeter"
@@ -16,7 +14,7 @@ dms-greeter - DankMaterialShell greeter launcher
 Usage: dms-greeter --command COMPOSITOR [OPTIONS]
 
 Required:
-    --command COMPOSITOR    Compositor to use (niri, hyprland, sway, scroll or mangowc)
+    --command COMPOSITOR    Compositor to use (niri, hyprland, sway, scroll, mangowc, or labwc)
 
 Options:
     -C, --config PATH       Custom compositor config file
@@ -33,6 +31,7 @@ Examples:
     dms-greeter --command scroll -p /home/user/.config/quickshell/custom-dms
     dms-greeter --command niri --cache-dir /tmp/dmsgreeter
     dms-greeter --command mangowc
+    dms-greeter --command labwc
 EOF
 }
 
@@ -231,6 +230,15 @@ SCROLL_EOF
         exec scroll -c "$COMPOSITOR_CONFIG"
         ;;
 
+
+    labwc)
+        if [[ -n "$COMPOSITOR_CONFIG" ]]; then
+            exec labwc --config "$COMPOSITOR_CONFIG" --session "$QS_CMD"
+        else
+            exec labwc --session "$QS_CMD"
+        fi
+        ;;
+
     mangowc)
         if [[ -n "$COMPOSITOR_CONFIG" ]]; then
             exec mango -c "$COMPOSITOR_CONFIG" -s "$QS_CMD && mmsg -d quit"
@@ -241,7 +249,7 @@ SCROLL_EOF
 
     *)
         echo "Error: Unsupported compositor: $COMPOSITOR" >&2
-        echo "Supported compositors: niri, hyprland, sway, mangowc" >&2
+        echo "Supported compositors: niri, hyprland, sway, scroll, mangowc, labwc" >&2
         exit 1
         ;;
 esac

quickshell/Modules/Lock/Lock.qml

@@ -12,37 +12,54 @@ Scope {
 
     property string sharedPasswordBuffer: ""
     property bool shouldLock: false
-    property bool processingExternalEvent: false
+    property bool lockInitiatedLocally: false
+    property bool pendingLock: false
 
     Component.onCompleted: {
         IdleService.lockComponent = this;
     }
 
+    function notifyLoginctl(lockAction: bool) {
+        if (!SettingsData.loginctlLockIntegration || !DMSService.isConnected)
+            return;
+        if (lockAction)
+            DMSService.lockSession(() => {});
+        else
+            DMSService.unlockSession(() => {});
+    }
+
     function lock() {
-        if (SettingsData.customPowerActionLock && SettingsData.customPowerActionLock.length > 0) {
+        if (SettingsData.customPowerActionLock?.length > 0) {
             Quickshell.execDetached(["sh", "-c", SettingsData.customPowerActionLock]);
             return;
         }
-        shouldLock = true;
-        if (!processingExternalEvent && SettingsData.loginctlLockIntegration && DMSService.isConnected) {
-            DMSService.lockSession(response => {
-                if (response.error)
-                    console.warn("Lock: loginctl.lock failed:", response.error);
-            });
+        if (shouldLock || pendingLock)
+            return;
+
+        lockInitiatedLocally = true;
+
+        if (!SessionService.active && SessionService.loginctlAvailable) {
+            pendingLock = true;
+            notifyLoginctl(true);
+            return;
         }
+
+        shouldLock = true;
+        notifyLoginctl(true);
     }
 
     function unlock() {
-        if (!processingExternalEvent && SettingsData.loginctlLockIntegration && DMSService.isConnected) {
-            DMSService.unlockSession(response => {
-                if (response.error) {
-                    console.warn("Lock: Failed to call loginctl.unlock:", response.error);
-                    shouldLock = false;
-                }
-            });
-        } else {
-            shouldLock = false;
-        }
+        if (!shouldLock)
+            return;
+        lockInitiatedLocally = false;
+        notifyLoginctl(false);
+        shouldLock = false;
+    }
+
+    function forceReset() {
+        lockInitiatedLocally = false;
+        pendingLock = false;
+        shouldLock = false;
     }
 
     function activate() {
@@ -53,15 +70,39 @@ Scope {
         target: SessionService
 
         function onSessionLocked() {
-            processingExternalEvent = true;
+            if (shouldLock || pendingLock)
+                return;
+            if (!SessionService.active && SessionService.loginctlAvailable) {
+                pendingLock = true;
+                lockInitiatedLocally = false;
+                return;
+            }
+            lockInitiatedLocally = false;
             shouldLock = true;
-            processingExternalEvent = false;
         }
 
         function onSessionUnlocked() {
-            processingExternalEvent = true;
+            if (pendingLock) {
+                pendingLock = false;
+                lockInitiatedLocally = false;
+                return;
+            }
+            if (!shouldLock || lockInitiatedLocally)
+                return;
             shouldLock = false;
-            processingExternalEvent = false;
+        }
+
+        function onLoginctlStateChanged() {
+            if (SessionService.active && pendingLock) {
+                pendingLock = false;
+                lockInitiatedLocally = true;
+                shouldLock = true;
+                return;
+            }
+            if (SessionService.locked && !shouldLock && !pendingLock) {
+                lockInitiatedLocally = false;
+                shouldLock = true;
+            }
         }
     }
 
@@ -79,8 +120,10 @@ Scope {
         locked: shouldLock
 
         onLockedChanged: {
-            if (locked)
+            if (locked) {
+                pendingLock = false;
                 dpmsReapplyTimer.start();
+            }
         }
 
         WlSessionLockSurface {
@@ -104,9 +147,7 @@ Scope {
                 sharedPasswordBuffer: root.sharedPasswordBuffer
                 screenName: lockSurface.currentScreenName
                 isLocked: shouldLock
-                onUnlockRequested: {
-                    root.unlock();
-                }
+                onUnlockRequested: root.unlock()
                 onPasswordChanged: newPassword => {
                     root.sharedPasswordBuffer = newPassword;
                 }
@@ -122,13 +163,15 @@ Scope {
         target: "lock"
 
         function lock() {
-            root.shouldLock = true;
-            if (SettingsData.loginctlLockIntegration && DMSService.isConnected) {
-                DMSService.lockSession(response => {
-                    if (response.error)
-                        console.warn("Lock: loginctl.lock failed:", response.error);
-                });
-            }
+            root.lock();
+        }
+
+        function unlock() {
+            root.unlock();
+        }
+
+        function forceReset() {
+            root.forceReset();
         }
 
         function demo() {
@@ -138,6 +181,17 @@ Scope {
         function isLocked(): bool {
             return sessionLock.locked;
         }
+
+        function status(): string {
+            return JSON.stringify({
+                shouldLock: root.shouldLock,
+                sessionLockLocked: sessionLock.locked,
+                lockInitiatedLocally: root.lockInitiatedLocally,
+                pendingLock: root.pendingLock,
+                loginctlLocked: SessionService.locked,
+                loginctlActive: SessionService.active
+            });
+        }
     }
 
     Timer {

quickshell/Modules/Lock/LockScreenContent.qml

@@ -34,6 +34,13 @@ Item {
 
     signal unlockRequested
 
+    function resetLockState() {
+        lockerReadySent = false;
+        lockerReadyArmed = true;
+        unlocking = false;
+        pamState = "";
+    }
+
     function pickRandomFact() {
         randomFact = Facts.getRandomFact();
     }
@@ -1399,6 +1406,14 @@ Item {
                 anchors.verticalCenter: parent.verticalCenter
                 visible: NetworkService.networkAvailable || (BluetoothService.available && BluetoothService.enabled) || (AudioService.sink && AudioService.sink.audio)
 
+                DankIcon {
+                    name: "screen_record"
+                    size: Theme.iconSize - 2
+                    color: NiriService.hasActiveCast ? "white" : Qt.rgba(255, 255, 255, 0.5)
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: NiriService.hasCasts
+                }
+
                 DankIcon {
                     name: {
                         if (NetworkService.wifiToggling)

quickshell/Modules/Lock/LockScreenDemo.qml

@@ -3,7 +3,6 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import Quickshell.Wayland
-import qs.Common
 
 PanelWindow {
     id: root
@@ -26,13 +25,13 @@ PanelWindow {
     color: "transparent"
 
     function showDemo(): void {
-        console.log("Showing lock screen demo")
-        demoActive = true
+        console.log("Showing lock screen demo");
+        demoActive = true;
     }
 
     function hideDemo(): void {
-        console.log("Hiding lock screen demo")
-        demoActive = false
+        console.log("Hiding lock screen demo");
+        demoActive = false;
     }
 
     Loader {

quickshell/Modules/Lock/LockSurface.qml

@@ -32,8 +32,10 @@ Rectangle {
     }
 
     onIsLockedChanged: {
-        if (!isLocked) {
-            lockContent.unlocking = false;
+        if (isLocked) {
+            lockContent.resetLockState();
+            return;
         }
+        lockContent.unlocking = false;
     }
 }

quickshell/Modules/Notifications/Center/HistoryNotificationCard.qml

@@ -10,9 +10,17 @@ Rectangle {
     required property var historyItem
     property bool isSelected: false
     property bool keyboardNavigationActive: false
+    property bool descriptionExpanded: NotificationService.expandedMessages[historyItem?.id ? (historyItem.id + "_hist") : ""] || false
+
+    readonly property bool compactMode: SettingsData.notificationCompactMode
+    readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM
+    readonly property real iconSize: compactMode ? 48 : 63
+    readonly property real contentSpacing: compactMode ? Theme.spacingXS : Theme.spacingS
+    readonly property real collapsedContentHeight: iconSize + cardPadding
+    readonly property real baseCardHeight: cardPadding * 2 + collapsedContentHeight
 
     width: parent ? parent.width : 400
-    height: 116
+    height: baseCardHeight + contentItem.extraHeight
     radius: Theme.cornerRadius
     clip: true
 
@@ -65,23 +73,28 @@ Rectangle {
     }
 
     Item {
+        id: contentItem
+
+        readonly property real expandedTextHeight: descriptionText.contentHeight
+        readonly property real twoLineHeight: descriptionText.font.pixelSize * 1.2 * 2
+        readonly property real extraHeight: (descriptionExpanded && expandedTextHeight > twoLineHeight + 2) ? (expandedTextHeight - twoLineHeight) : 0
+
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.topMargin: 12
-        anchors.leftMargin: 16
-        anchors.rightMargin: 56
-        height: 92
+        anchors.topMargin: cardPadding
+        anchors.leftMargin: Theme.spacingL
+        anchors.rightMargin: Theme.spacingL + (compactMode ? 32 : 40)
+        height: collapsedContentHeight + extraHeight
 
         DankCircularImage {
             id: iconContainer
             readonly property bool hasNotificationImage: historyItem.image && historyItem.image !== ""
 
-            width: 63
-            height: 63
+            width: iconSize
+            height: iconSize
             anchors.left: parent.left
             anchors.top: parent.top
-            anchors.topMargin: 14
 
             imageSource: {
                 if (hasNotificationImage)
@@ -116,60 +129,79 @@ Rectangle {
 
         Rectangle {
             anchors.left: iconContainer.right
-            anchors.leftMargin: 12
+            anchors.leftMargin: Theme.spacingM
             anchors.right: parent.right
             anchors.top: parent.top
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: 8
+            anchors.bottomMargin: contentSpacing
             color: "transparent"
 
-            Item {
+            Column {
                 width: parent.width
-                height: parent.height
                 anchors.top: parent.top
-                anchors.topMargin: -2
+                spacing: compactMode ? 1 : 2
 
-                Column {
+                StyledText {
                     width: parent.width
-                    spacing: 2
+                    text: {
+                        const timeStr = NotificationService.formatHistoryTime(historyItem.timestamp);
+                        const appName = historyItem.appName || "";
+                        return timeStr.length > 0 ? `${appName} • ${timeStr}` : appName;
+                    }
+                    color: Theme.surfaceVariantText
+                    font.pixelSize: Theme.fontSizeSmall
+                    font.weight: Font.Medium
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    visible: text.length > 0
+                }
 
-                    StyledText {
-                        width: parent.width
-                        text: {
-                            const timeStr = NotificationService.formatHistoryTime(historyItem.timestamp);
-                            const appName = historyItem.appName || "";
-                            return timeStr.length > 0 ? `${appName} • ${timeStr}` : appName;
+                StyledText {
+                    text: historyItem.summary || ""
+                    color: Theme.surfaceText
+                    font.pixelSize: Theme.fontSizeMedium
+                    font.weight: Font.Medium
+                    width: parent.width
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    visible: text.length > 0
+                }
+
+                StyledText {
+                    id: descriptionText
+                    property bool hasMoreText: truncated
+
+                    text: historyItem.htmlBody || historyItem.body || ""
+                    color: Theme.surfaceVariantText
+                    font.pixelSize: Theme.fontSizeSmall
+                    width: parent.width
+                    elide: descriptionExpanded ? Text.ElideNone : Text.ElideRight
+                    maximumLineCount: descriptionExpanded ? -1 : (compactMode ? 1 : 2)
+                    wrapMode: Text.WordWrap
+                    visible: text.length > 0
+                    linkColor: Theme.primary
+                    onLinkActivated: link => Qt.openUrlExternally(link)
+
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : (parent.hasMoreText || descriptionExpanded) ? Qt.PointingHandCursor : Qt.ArrowCursor
+
+                        onClicked: mouse => {
+                            if (!parent.hoveredLink && (parent.hasMoreText || descriptionExpanded)) {
+                                const messageId = historyItem?.id ? (historyItem.id + "_hist") : "";
+                                NotificationService.toggleMessageExpansion(messageId);
+                            }
                         }
-                        color: Theme.surfaceVariantText
-                        font.pixelSize: Theme.fontSizeSmall
-                        font.weight: Font.Medium
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                    }
 
-                    StyledText {
-                        text: historyItem.summary || ""
-                        color: Theme.surfaceText
-                        font.pixelSize: Theme.fontSizeMedium
-                        font.weight: Font.Medium
-                        width: parent.width
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                        visible: text.length > 0
-                    }
-
-                    StyledText {
-                        id: descriptionText
-                        text: historyItem.htmlBody || historyItem.body || ""
-                        color: Theme.surfaceVariantText
-                        font.pixelSize: Theme.fontSizeSmall
-                        width: parent.width
-                        elide: Text.ElideRight
-                        maximumLineCount: 2
-                        wrapMode: Text.WordWrap
-                        visible: text.length > 0
-                        linkColor: Theme.primary
-                        onLinkActivated: link => Qt.openUrlExternally(link)
+                        propagateComposedEvents: true
+                        onPressed: mouse => {
+                            if (parent.hoveredLink)
+                                mouse.accepted = false;
+                        }
+                        onReleased: mouse => {
+                            if (parent.hoveredLink)
+                                mouse.accepted = false;
+                        }
                     }
                 }
             }
@@ -179,11 +211,11 @@ Rectangle {
     DankActionButton {
         anchors.top: parent.top
         anchors.right: parent.right
-        anchors.topMargin: 12
-        anchors.rightMargin: 16
+        anchors.topMargin: cardPadding
+        anchors.rightMargin: Theme.spacingL
         iconName: "close"
-        iconSize: 18
-        buttonSize: 28
+        iconSize: compactMode ? 16 : 18
+        buttonSize: compactMode ? 24 : 28
         onClicked: NotificationService.removeFromHistory(historyItem.id)
     }
 }

quickshell/Modules/Notifications/Center/HistoryNotificationList.qml

@@ -83,23 +83,54 @@ Item {
     }
 
     readonly property var allFilters: [
-        { label: I18n.tr("All", "notification history filter"), key: "all", maxDays: 0 },
-        { label: I18n.tr("Last hour", "notification history filter"), key: "1h", maxDays: 1 },
-        { label: I18n.tr("Today", "notification history filter"), key: "today", maxDays: 1 },
-        { label: I18n.tr("Yesterday", "notification history filter"), key: "yesterday", maxDays: 2 },
-        { label: I18n.tr("7 days", "notification history filter"), key: "7d", maxDays: 7 },
-        { label: I18n.tr("30 days", "notification history filter"), key: "30d", maxDays: 30 },
-        { label: I18n.tr("Older", "notification history filter for content older than other filters"), key: "older", maxDays: 0 }
+        {
+            label: I18n.tr("All", "notification history filter"),
+            key: "all",
+            maxDays: 0
+        },
+        {
+            label: I18n.tr("Last hour", "notification history filter"),
+            key: "1h",
+            maxDays: 1
+        },
+        {
+            label: I18n.tr("Today", "notification history filter"),
+            key: "today",
+            maxDays: 1
+        },
+        {
+            label: I18n.tr("Yesterday", "notification history filter"),
+            key: "yesterday",
+            maxDays: 2
+        },
+        {
+            label: I18n.tr("7 days", "notification history filter"),
+            key: "7d",
+            maxDays: 7
+        },
+        {
+            label: I18n.tr("30 days", "notification history filter"),
+            key: "30d",
+            maxDays: 30
+        },
+        {
+            label: I18n.tr("Older", "notification history filter for content older than other filters"),
+            key: "older",
+            maxDays: 0
+        }
     ]
 
     function filterRelevantForRetention(filter) {
         const retention = SettingsData.notificationHistoryMaxAgeDays;
         if (filter.key === "older") {
-            if (retention === 0) return true;
+            if (retention === 0)
+                return true;
             return retention > 2 && retention < 7 || retention > 30;
         }
-        if (retention === 0) return true;
-        if (filter.maxDays === 0) return true;
+        if (retention === 0)
+            return true;
+        if (filter.maxDays === 0)
+            return true;
         return filter.maxDays <= retention;
     }
 
@@ -119,10 +150,15 @@ Item {
         const retention = SettingsData.notificationHistoryMaxAgeDays;
         for (let i = 0; i < allFilters.length; i++) {
             const f = allFilters[i];
-            if (!filterRelevantForRetention(f)) continue;
+            if (!filterRelevantForRetention(f))
+                continue;
             const count = countForFilter(f.key);
             if (f.key === "all" || count > 0) {
-                result.push({ label: f.label, key: f.key, count: count });
+                result.push({
+                    label: f.label,
+                    key: f.key,
+                    count: count
+                });
             }
         }
         return result;
@@ -165,6 +201,14 @@ Item {
     function enableAutoScroll() {
     }
 
+    function removeWithScrollPreserve(itemId) {
+        historyListView.savedY = historyListView.contentY;
+        NotificationService.removeFromHistory(itemId);
+        Qt.callLater(() => {
+            historyListView.forceLayout();
+        });
+    }
+
     Column {
         anchors.fill: parent
         spacing: Theme.spacingS
@@ -201,14 +245,66 @@ Item {
                 anchors.horizontalCenter: parent.horizontalCenter
             }
 
-            delegate: HistoryNotificationCard {
+            delegate: Item {
+                id: delegateRoot
                 required property var modelData
                 required property int index
 
+                property real swipeOffset: 0
+                property bool isDismissing: false
+                readonly property real dismissThreshold: width * 0.35
+
                 width: ListView.view.width
-                historyItem: modelData
-                isSelected: root.keyboardActive && root.selectedIndex === index
-                keyboardNavigationActive: root.keyboardActive
+                height: historyCard.height
+                clip: true
+
+                HistoryNotificationCard {
+                    id: historyCard
+                    width: parent.width
+                    x: delegateRoot.swipeOffset
+                    historyItem: modelData
+                    isSelected: root.keyboardActive && root.selectedIndex === index
+                    keyboardNavigationActive: root.keyboardActive
+                    opacity: 1 - Math.abs(delegateRoot.swipeOffset) / (delegateRoot.width * 0.5)
+
+                    Behavior on x {
+                        enabled: !swipeDragHandler.active
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                            easing.type: Theme.standardEasing
+                        }
+                    }
+
+                    Behavior on opacity {
+                        NumberAnimation {
+                            duration: Theme.shortDuration
+                        }
+                    }
+                }
+
+                DragHandler {
+                    id: swipeDragHandler
+                    target: null
+                    yAxis.enabled: false
+                    xAxis.enabled: true
+
+                    onActiveChanged: {
+                        if (active || delegateRoot.isDismissing)
+                            return;
+                        if (Math.abs(delegateRoot.swipeOffset) > delegateRoot.dismissThreshold) {
+                            delegateRoot.isDismissing = true;
+                            root.removeWithScrollPreserve(delegateRoot.modelData?.id || "");
+                        } else {
+                            delegateRoot.swipeOffset = 0;
+                        }
+                    }
+
+                    onTranslationChanged: {
+                        if (delegateRoot.isDismissing)
+                            return;
+                        delegateRoot.swipeOffset = translation.x;
+                    }
+                }
             }
         }
     }

quickshell/Modules/Notifications/Center/NotificationCard.qml

@@ -18,17 +18,17 @@ Rectangle {
     property int selectedNotificationIndex: -1
     property bool keyboardNavigationActive: false
 
+    readonly property bool compactMode: SettingsData.notificationCompactMode
+    readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM
+    readonly property real iconSize: compactMode ? 48 : 63
+    readonly property real contentSpacing: compactMode ? Theme.spacingXS : Theme.spacingS
+    readonly property real badgeSize: compactMode ? 16 : 18
+    readonly property real actionButtonHeight: compactMode ? 20 : 24
+    readonly property real collapsedContentHeight: iconSize
+    readonly property real baseCardHeight: cardPadding * 2 + collapsedContentHeight + actionButtonHeight + contentSpacing
+
     width: parent ? parent.width : 400
-    height: {
-        if (expanded) {
-            return expandedContent.height + 28;
-        }
-        const baseHeight = 116;
-        if (descriptionExpanded) {
-            return baseHeight + descriptionText.contentHeight - (descriptionText.font.pixelSize * 1.2 * 2);
-        }
-        return baseHeight;
-    }
+    height: expanded ? (expandedContent.height + cardPadding * 2) : (baseCardHeight + collapsedContent.extraHeight)
     radius: Theme.cornerRadius
 
     Behavior on border.color {
@@ -97,24 +97,28 @@ Rectangle {
 
     Item {
         id: collapsedContent
+
+        readonly property real expandedTextHeight: descriptionText.contentHeight
+        readonly property real twoLineHeight: descriptionText.font.pixelSize * 1.2 * 2
+        readonly property real extraHeight: (descriptionExpanded && expandedTextHeight > twoLineHeight + 2) ? (expandedTextHeight - twoLineHeight) : 0
+
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.topMargin: 12
-        anchors.leftMargin: 16
-        anchors.rightMargin: 56
-        height: 92
+        anchors.topMargin: cardPadding
+        anchors.leftMargin: Theme.spacingL
+        anchors.rightMargin: Theme.spacingL + (compactMode ? 32 : 40)
+        height: collapsedContentHeight + extraHeight
         visible: !expanded
 
         DankCircularImage {
             id: iconContainer
             readonly property bool hasNotificationImage: notificationGroup?.latestNotification?.image && notificationGroup.latestNotification.image !== ""
 
-            width: 63
-            height: 63
+            width: iconSize
+            height: iconSize
             anchors.left: parent.left
             anchors.top: parent.top
-            anchors.topMargin: 14
 
             imageSource: {
                 if (hasNotificationImage)
@@ -147,9 +151,9 @@ Rectangle {
             }
 
             Rectangle {
-                width: 18
-                height: 18
-                radius: 9
+                width: badgeSize
+                height: badgeSize
+                radius: badgeSize / 2
                 color: Theme.primary
                 anchors.top: parent.top
                 anchors.right: parent.right
@@ -161,7 +165,7 @@ Rectangle {
                     anchors.centerIn: parent
                     text: (notificationGroup?.count || 0) > 99 ? "99+" : (notificationGroup?.count || 0).toString()
                     color: Theme.primaryText
-                    font.pixelSize: 9
+                    font.pixelSize: compactMode ? 8 : 9
                     font.weight: Font.Bold
                 }
             }
@@ -171,87 +175,79 @@ Rectangle {
             id: textContainer
 
             anchors.left: iconContainer.right
-            anchors.leftMargin: 12
+            anchors.leftMargin: Theme.spacingM
             anchors.right: parent.right
-            anchors.rightMargin: 0
             anchors.top: parent.top
             anchors.bottom: parent.bottom
-            anchors.bottomMargin: 8
+            anchors.bottomMargin: contentSpacing
             color: "transparent"
 
-            Item {
+            Column {
                 width: parent.width
-                height: parent.height
                 anchors.top: parent.top
-                anchors.topMargin: -2
+                spacing: compactMode ? 1 : 2
 
-                Column {
+                StyledText {
                     width: parent.width
-                    spacing: 2
+                    text: {
+                        const timeStr = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.timeStr) || "";
+                        const appName = (notificationGroup && notificationGroup.appName) || "";
+                        return timeStr.length > 0 ? `${appName} • ${timeStr}` : appName;
+                    }
+                    color: Theme.surfaceVariantText
+                    font.pixelSize: Theme.fontSizeSmall
+                    font.weight: Font.Medium
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    visible: text.length > 0
+                }
 
-                    StyledText {
-                        width: parent.width
-                        text: {
-                            const timeStr = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.timeStr) || "";
-                            const appName = (notificationGroup && notificationGroup.appName) || "";
-                            return timeStr.length > 0 ? `${appName} • ${timeStr}` : appName;
+                StyledText {
+                    text: (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.summary) || ""
+                    color: Theme.surfaceText
+                    font.pixelSize: Theme.fontSizeMedium
+                    font.weight: Font.Medium
+                    width: parent.width
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    visible: text.length > 0
+                }
+
+                StyledText {
+                    id: descriptionText
+                    property string fullText: (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.htmlBody) || ""
+                    property bool hasMoreText: truncated
+
+                    text: fullText
+                    color: Theme.surfaceVariantText
+                    font.pixelSize: Theme.fontSizeSmall
+                    width: parent.width
+                    elide: Text.ElideRight
+                    maximumLineCount: descriptionExpanded ? -1 : (compactMode ? 1 : 2)
+                    wrapMode: Text.WordWrap
+                    visible: text.length > 0
+                    linkColor: Theme.primary
+                    onLinkActivated: link => Qt.openUrlExternally(link)
+
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : (parent.hasMoreText || descriptionExpanded) ? Qt.PointingHandCursor : Qt.ArrowCursor
+
+                        onClicked: mouse => {
+                            if (!parent.hoveredLink && (parent.hasMoreText || descriptionExpanded)) {
+                                const messageId = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.notification && notificationGroup.latestNotification.notification.id) ? (notificationGroup.latestNotification.notification.id + "_desc") : "";
+                                NotificationService.toggleMessageExpansion(messageId);
+                            }
                         }
-                        color: Theme.surfaceVariantText
-                        font.pixelSize: Theme.fontSizeSmall
-                        font.weight: Font.Medium
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                    }
 
-                    StyledText {
-                        text: (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.summary) || ""
-                        color: Theme.surfaceText
-                        font.pixelSize: Theme.fontSizeMedium
-                        font.weight: Font.Medium
-                        width: parent.width
-                        elide: Text.ElideRight
-                        maximumLineCount: 1
-                        visible: text.length > 0
-                    }
-
-                    StyledText {
-                        id: descriptionText
-                        property string fullText: (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.htmlBody) || ""
-                        property bool hasMoreText: truncated
-
-                        text: fullText
-                        color: Theme.surfaceVariantText
-                        font.pixelSize: Theme.fontSizeSmall
-                        width: parent.width
-                        elide: Text.ElideRight
-                        maximumLineCount: descriptionExpanded ? -1 : 2
-                        wrapMode: Text.WordWrap
-                        visible: text.length > 0
-                        linkColor: Theme.primary
-                        onLinkActivated: link => Qt.openUrlExternally(link)
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : (parent.hasMoreText || descriptionExpanded) ? Qt.PointingHandCursor : Qt.ArrowCursor
-
-                            onClicked: mouse => {
-                                if (!parent.hoveredLink && (parent.hasMoreText || descriptionExpanded)) {
-                                    const messageId = (notificationGroup && notificationGroup.latestNotification && notificationGroup.latestNotification.notification && notificationGroup.latestNotification.notification.id) ? (notificationGroup.latestNotification.notification.id + "_desc") : "";
-                                    NotificationService.toggleMessageExpansion(messageId);
-                                }
-                            }
-
-                            propagateComposedEvents: true
-                            onPressed: mouse => {
-                                if (parent.hoveredLink) {
-                                    mouse.accepted = false;
-                                }
-                            }
-                            onReleased: mouse => {
-                                if (parent.hoveredLink) {
-                                    mouse.accepted = false;
-                                }
-                            }
+                        propagateComposedEvents: true
+                        onPressed: mouse => {
+                            if (parent.hoveredLink)
+                                mouse.accepted = false;
+                        }
+                        onReleased: mouse => {
+                            if (parent.hoveredLink)
+                                mouse.accepted = false;
                         }
                     }
                 }
@@ -265,21 +261,20 @@ Rectangle {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.topMargin: 14
-        anchors.bottomMargin: 14
+        anchors.topMargin: cardPadding
         anchors.leftMargin: Theme.spacingL
         anchors.rightMargin: Theme.spacingL
-        spacing: -1
+        spacing: compactMode ? Theme.spacingXS : Theme.spacingS
         visible: expanded
 
         Item {
             width: parent.width
-            height: 40
+            height: compactMode ? 32 : 40
 
             Row {
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.rightMargin: 56
+                anchors.rightMargin: Theme.spacingL + (compactMode ? 32 : 40)
                 anchors.verticalCenter: parent.verticalCenter
                 spacing: Theme.spacingS
 
@@ -294,9 +289,9 @@ Rectangle {
                 }
 
                 Rectangle {
-                    width: 18
-                    height: 18
-                    radius: 9
+                    width: badgeSize
+                    height: badgeSize
+                    radius: badgeSize / 2
                     color: Theme.primary
                     visible: (notificationGroup?.count || 0) > 1
                     anchors.verticalCenter: parent.verticalCenter
@@ -305,7 +300,7 @@ Rectangle {
                         anchors.centerIn: parent
                         text: (notificationGroup?.count || 0) > 99 ? "99+" : (notificationGroup?.count || 0).toString()
                         color: Theme.primaryText
-                        font.pixelSize: 9
+                        font.pixelSize: compactMode ? 8 : 9
                         font.weight: Font.Bold
                     }
                 }
@@ -314,7 +309,7 @@ Rectangle {
 
         Column {
             width: parent.width
-            spacing: 16
+            spacing: compactMode ? Theme.spacingS : Theme.spacingL
 
             Repeater {
                 id: notificationRepeater
@@ -328,23 +323,23 @@ Rectangle {
                     required property int index
                     readonly property bool messageExpanded: NotificationService.expandedMessages[modelData?.notification?.id] || false
                     readonly property bool isSelected: root.selectedNotificationIndex === index
+                    readonly property real expandedIconSize: compactMode ? 40 : 48
+                    readonly property real expandedItemPadding: compactMode ? Theme.spacingS : Theme.spacingM
+                    readonly property real expandedBaseHeight: expandedItemPadding * 2 + expandedIconSize + actionButtonHeight + contentSpacing * 2
 
                     width: parent.width
                     height: {
-                        const baseHeight = 120;
-                        if (messageExpanded) {
-                            const twoLineHeight = bodyText.font.pixelSize * 1.2 * 2;
-                            if (bodyText.implicitHeight > twoLineHeight + 2) {
-                                const extraHeight = bodyText.implicitHeight - twoLineHeight;
-                                return baseHeight + extraHeight;
-                            }
-                        }
-                        return baseHeight;
+                        if (!messageExpanded)
+                            return expandedBaseHeight;
+                        const twoLineHeight = bodyText.font.pixelSize * 1.2 * 2;
+                        if (bodyText.implicitHeight > twoLineHeight + 2)
+                            return expandedBaseHeight + bodyText.implicitHeight - twoLineHeight;
+                        return expandedBaseHeight;
                     }
                     radius: Theme.cornerRadius
                     color: isSelected ? Theme.primaryPressed : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
                     border.color: isSelected ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.4) : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
-                    border.width: isSelected ? 1 : 1
+                    border.width: 1
 
                     Behavior on border.color {
                         ColorAnimation {
@@ -359,19 +354,19 @@ Rectangle {
 
                     Item {
                         anchors.fill: parent
-                        anchors.margins: 12
-                        anchors.bottomMargin: 8
+                        anchors.margins: compactMode ? Theme.spacingS : Theme.spacingM
+                        anchors.bottomMargin: contentSpacing
 
                         DankCircularImage {
                             id: messageIcon
 
                             readonly property bool hasNotificationImage: modelData?.image && modelData.image !== ""
 
-                            width: 48
-                            height: 48
+                            width: expandedIconSize
+                            height: expandedIconSize
                             anchors.left: parent.left
                             anchors.top: parent.top
-                            anchors.topMargin: 32
+                            anchors.topMargin: compactMode ? Theme.spacingM : Theme.spacingXL
 
                             imageSource: {
                                 if (hasNotificationImage)
@@ -397,9 +392,9 @@ Rectangle {
 
                         Item {
                             anchors.left: messageIcon.right
-                            anchors.leftMargin: 12
+                            anchors.leftMargin: Theme.spacingM
                             anchors.right: parent.right
-                            anchors.rightMargin: 12
+                            anchors.rightMargin: Theme.spacingM
                             anchors.top: parent.top
                             anchors.bottom: parent.bottom
 
@@ -408,8 +403,8 @@ Rectangle {
                                 anchors.right: parent.right
                                 anchors.top: parent.top
                                 anchors.bottom: buttonArea.top
-                                anchors.bottomMargin: 4
-                                spacing: 2
+                                anchors.bottomMargin: contentSpacing
+                                spacing: compactMode ? 1 : 2
 
                                 StyledText {
                                     width: parent.width
@@ -477,12 +472,12 @@ Rectangle {
                                 anchors.left: parent.left
                                 anchors.right: parent.right
                                 anchors.bottom: parent.bottom
-                                height: 30
+                                height: actionButtonHeight + contentSpacing
 
                                 Row {
                                     anchors.right: parent.right
                                     anchors.bottom: parent.bottom
-                                    spacing: 8
+                                    spacing: contentSpacing
 
                                     Repeater {
                                         model: modelData?.actions || []
@@ -490,18 +485,17 @@ Rectangle {
                                         Rectangle {
                                             property bool isHovered: false
 
-                                            width: Math.max(actionText.implicitWidth + 12, 50)
-                                            height: 24
-                                            radius: 4
+                                            width: Math.max(actionText.implicitWidth + Theme.spacingM, compactMode ? 40 : 50)
+                                            height: actionButtonHeight
+                                            radius: Theme.spacingXS
                                             color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
 
                                             StyledText {
                                                 id: actionText
                                                 text: {
                                                     const baseText = modelData.text || "View";
-                                                    if (keyboardNavigationActive && (isGroupSelected || selectedNotificationIndex >= 0)) {
+                                                    if (keyboardNavigationActive && (isGroupSelected || selectedNotificationIndex >= 0))
                                                         return `${baseText} (${index + 1})`;
-                                                    }
                                                     return baseText;
                                                 }
                                                 color: parent.isHovered ? Theme.primary : Theme.surfaceVariantText
@@ -518,9 +512,8 @@ Rectangle {
                                                 onEntered: parent.isHovered = true
                                                 onExited: parent.isHovered = false
                                                 onClicked: {
-                                                    if (modelData && modelData.invoke) {
+                                                    if (modelData && modelData.invoke)
                                                         modelData.invoke();
-                                                    }
                                                 }
                                             }
                                         }
@@ -529,9 +522,9 @@ Rectangle {
                                     Rectangle {
                                         property bool isHovered: false
 
-                                        width: Math.max(clearText.implicitWidth + 12, 50)
-                                        height: 24
-                                        radius: 4
+                                        width: Math.max(clearText.implicitWidth + Theme.spacingM, compactMode ? 40 : 50)
+                                        height: actionButtonHeight
+                                        radius: Theme.spacingXS
                                         color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
 
                                         StyledText {
@@ -563,11 +556,11 @@ Rectangle {
 
     Row {
         visible: !expanded
-        anchors.right: clearButton.left
-        anchors.rightMargin: 8
+        anchors.right: clearButton.visible ? clearButton.left : parent.right
+        anchors.rightMargin: clearButton.visible ? contentSpacing : Theme.spacingL
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: 8
-        spacing: 8
+        anchors.bottomMargin: contentSpacing
+        spacing: contentSpacing
 
         Repeater {
             model: notificationGroup?.latestNotification?.actions || []
@@ -575,9 +568,9 @@ Rectangle {
             Rectangle {
                 property bool isHovered: false
 
-                width: Math.max(actionText.implicitWidth + 12, 50)
-                height: 24
-                radius: 4
+                width: Math.max(actionText.implicitWidth + Theme.spacingM, compactMode ? 40 : 50)
+                height: actionButtonHeight
+                radius: Theme.spacingXS
                 color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
 
                 StyledText {
@@ -616,15 +609,16 @@ Rectangle {
         id: clearButton
 
         property bool isHovered: false
+        readonly property int actionCount: (notificationGroup?.latestNotification?.actions || []).length
 
-        visible: !expanded
+        visible: !expanded && actionCount < 3
         anchors.right: parent.right
-        anchors.rightMargin: 16
+        anchors.rightMargin: Theme.spacingL
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: 8
-        width: Math.max(clearText.implicitWidth + 12, 50)
-        height: 24
-        radius: 4
+        anchors.bottomMargin: contentSpacing
+        width: Math.max(clearText.implicitWidth + Theme.spacingM, compactMode ? 40 : 50)
+        height: actionButtonHeight
+        radius: Theme.spacingXS
         color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
 
         StyledText {
@@ -660,18 +654,18 @@ Rectangle {
         id: fixedControls
         anchors.top: parent.top
         anchors.right: parent.right
-        anchors.topMargin: 12
-        anchors.rightMargin: 16
-        width: 60
-        height: 28
+        anchors.topMargin: cardPadding
+        anchors.rightMargin: Theme.spacingL
+        width: compactMode ? 52 : 60
+        height: compactMode ? 24 : 28
 
         DankActionButton {
             anchors.left: parent.left
             anchors.top: parent.top
             visible: (notificationGroup?.count || 0) > 1
             iconName: expanded ? "expand_less" : "expand_more"
-            iconSize: 18
-            buttonSize: 28
+            iconSize: compactMode ? 16 : 18
+            buttonSize: compactMode ? 24 : 28
             onClicked: {
                 root.userInitiatedExpansion = true;
                 NotificationService.toggleGroupExpansion(notificationGroup?.key || "");
@@ -682,8 +676,8 @@ Rectangle {
             anchors.right: parent.right
             anchors.top: parent.top
             iconName: "close"
-            iconSize: 18
-            buttonSize: 28
+            iconSize: compactMode ? 16 : 18
+            buttonSize: compactMode ? 24 : 28
             onClicked: NotificationService.dismissGroup(notificationGroup?.key || "")
         }
     }

quickshell/Modules/Notifications/Popup/NotificationPopup.qml

@@ -22,6 +22,15 @@ PanelWindow {
     property bool _isDestroying: false
     property bool _finalized: false
     readonly property string clearText: I18n.tr("Dismiss")
+    property bool descriptionExpanded: false
+
+    readonly property bool compactMode: SettingsData.notificationCompactMode
+    readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM
+    readonly property real popupIconSize: compactMode ? 48 : 63
+    readonly property real contentSpacing: compactMode ? Theme.spacingXS : Theme.spacingS
+    readonly property real actionButtonHeight: compactMode ? 20 : 24
+    readonly property real collapsedContentHeight: popupIconSize
+    readonly property real basePopupHeight: cardPadding * 2 + collapsedContentHeight + actionButtonHeight + Theme.spacingS
 
     signal entered
     signal exitStarted
@@ -92,7 +101,15 @@ PanelWindow {
     WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
     color: "transparent"
     implicitWidth: 400
-    implicitHeight: 122
+    implicitHeight: {
+        if (!descriptionExpanded)
+            return basePopupHeight;
+        const bodyTextHeight = bodyText.contentHeight || 0;
+        const twoLineHeight = Theme.fontSizeSmall * 1.2 * 2;
+        if (bodyTextHeight > twoLineHeight + 2)
+            return basePopupHeight + bodyTextHeight - twoLineHeight;
+        return basePopupHeight;
+    }
     onHasValidDataChanged: {
         if (!hasValidData && !exiting && !_isDestroying) {
             forceExit();
@@ -352,13 +369,17 @@ PanelWindow {
             Item {
                 id: notificationContent
 
+                readonly property real expandedTextHeight: bodyText.contentHeight || 0
+                readonly property real twoLineHeight: Theme.fontSizeSmall * 1.2 * 2
+                readonly property real extraHeight: (descriptionExpanded && expandedTextHeight > twoLineHeight + 2) ? (expandedTextHeight - twoLineHeight) : 0
+
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.topMargin: 12
-                anchors.leftMargin: 16
-                anchors.rightMargin: 56
-                height: 98
+                anchors.topMargin: cardPadding
+                anchors.leftMargin: Theme.spacingL
+                anchors.rightMargin: Theme.spacingL + (compactMode ? 32 : 40)
+                height: collapsedContentHeight + extraHeight
 
                 DankCircularImage {
                     id: iconContainer
@@ -366,10 +387,10 @@ PanelWindow {
                     readonly property bool hasNotificationImage: notificationData && notificationData.image && notificationData.image !== ""
                     readonly property bool needsImagePersist: hasNotificationImage && notificationData.image.startsWith("image://qsimage/") && !notificationData.persistedImagePath
 
-                    width: 63
-                    height: 63
+                    width: popupIconSize
+                    height: popupIconSize
                     anchors.left: parent.left
-                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.top: parent.top
 
                     imageSource: {
                         if (!notificationData)
@@ -412,81 +433,78 @@ PanelWindow {
                     }
                 }
 
-                Rectangle {
+                Column {
                     id: textContainer
 
                     anchors.left: iconContainer.right
-                    anchors.leftMargin: 12
+                    anchors.leftMargin: Theme.spacingM
                     anchors.right: parent.right
-                    anchors.rightMargin: 0
                     anchors.top: parent.top
-                    anchors.bottom: parent.bottom
-                    anchors.bottomMargin: 8
-                    color: "transparent"
+                    spacing: compactMode ? 1 : 2
 
-                    Item {
+                    StyledText {
                         width: parent.width
-                        height: parent.height
-                        anchors.top: parent.top
-                        anchors.topMargin: -2
+                        text: {
+                            if (!notificationData)
+                                return "";
+                            const appName = notificationData.appName || "";
+                            const timeStr = notificationData.timeStr || "";
+                            return timeStr.length > 0 ? appName + " • " + timeStr : appName;
+                        }
+                        color: Theme.surfaceVariantText
+                        font.pixelSize: Theme.fontSizeSmall
+                        font.weight: Font.Medium
+                        elide: Text.ElideRight
+                        horizontalAlignment: Text.AlignLeft
+                        maximumLineCount: 1
+                        visible: text.length > 0
+                    }
 
-                        Column {
-                            width: parent.width
-                            spacing: 2
+                    StyledText {
+                        text: notificationData ? (notificationData.summary || "") : ""
+                        color: Theme.surfaceText
+                        font.pixelSize: Theme.fontSizeMedium
+                        font.weight: Font.Medium
+                        width: parent.width
+                        elide: Text.ElideRight
+                        horizontalAlignment: Text.AlignLeft
+                        maximumLineCount: 1
+                        visible: text.length > 0
+                    }
 
-                            StyledText {
-                                width: parent.width
-                                text: {
-                                    if (!notificationData)
-                                        return "";
+                    StyledText {
+                        id: bodyText
+                        property bool hasMoreText: truncated
 
-                                    const appName = notificationData.appName || "";
-                                    const timeStr = notificationData.timeStr || "";
-                                    if (timeStr.length > 0)
-                                        return appName + " • " + timeStr;
-                                    else
-                                        return appName;
-                                }
-                                color: Theme.surfaceVariantText
-                                font.pixelSize: Theme.fontSizeSmall
-                                font.weight: Font.Medium
-                                elide: Text.ElideRight
-                                horizontalAlignment: Text.AlignLeft
-                                maximumLineCount: 1
+                        text: notificationData ? (notificationData.htmlBody || "") : ""
+                        color: Theme.surfaceVariantText
+                        font.pixelSize: Theme.fontSizeSmall
+                        width: parent.width
+                        elide: descriptionExpanded ? Text.ElideNone : Text.ElideRight
+                        horizontalAlignment: Text.AlignLeft
+                        maximumLineCount: descriptionExpanded ? -1 : (compactMode ? 1 : 2)
+                        wrapMode: Text.WordWrap
+                        visible: text.length > 0
+                        linkColor: Theme.primary
+                        onLinkActivated: link => Qt.openUrlExternally(link)
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : (bodyText.hasMoreText || descriptionExpanded) ? Qt.PointingHandCursor : Qt.ArrowCursor
+
+                            onClicked: mouse => {
+                                if (!parent.hoveredLink && (bodyText.hasMoreText || descriptionExpanded))
+                                    win.descriptionExpanded = !win.descriptionExpanded;
                             }
 
-                            StyledText {
-                                text: notificationData ? (notificationData.summary || "") : ""
-                                color: Theme.surfaceText
-                                font.pixelSize: Theme.fontSizeMedium
-                                font.weight: Font.Medium
-                                width: parent.width
-                                elide: Text.ElideRight
-                                horizontalAlignment: Text.AlignLeft
-                                maximumLineCount: 1
-                                visible: text.length > 0
+                            propagateComposedEvents: true
+                            onPressed: mouse => {
+                                if (parent.hoveredLink)
+                                    mouse.accepted = false;
                             }
-
-                            StyledText {
-                                text: notificationData ? (notificationData.htmlBody || "") : ""
-                                color: Theme.surfaceVariantText
-                                font.pixelSize: Theme.fontSizeSmall
-                                width: parent.width
-                                elide: Text.ElideRight
-                                horizontalAlignment: Text.AlignLeft
-                                maximumLineCount: 2
-                                wrapMode: Text.WordWrap
-                                visible: text.length > 0
-                                linkColor: Theme.primary
-                                onLinkActivated: link => {
-                                    return Qt.openUrlExternally(link);
-                                }
-
-                                MouseArea {
-                                    anchors.fill: parent
-                                    acceptedButtons: Qt.NoButton
-                                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                                }
+                            onReleased: mouse => {
+                                if (parent.hoveredLink)
+                                    mouse.accepted = false;
                             }
                         }
                     }
@@ -498,11 +516,11 @@ PanelWindow {
 
                 anchors.right: parent.right
                 anchors.top: parent.top
-                anchors.topMargin: 12
-                anchors.rightMargin: 16
+                anchors.topMargin: cardPadding
+                anchors.rightMargin: Theme.spacingL
                 iconName: "close"
-                iconSize: 18
-                buttonSize: 28
+                iconSize: compactMode ? 16 : 18
+                buttonSize: compactMode ? 24 : 28
                 z: 15
                 onClicked: {
                     if (notificationData && !win.exiting)
@@ -511,11 +529,11 @@ PanelWindow {
             }
 
             Row {
-                anchors.right: clearButton.left
-                anchors.rightMargin: 8
+                anchors.right: clearButton.visible ? clearButton.left : parent.right
+                anchors.rightMargin: clearButton.visible ? contentSpacing : Theme.spacingL
                 anchors.bottom: parent.bottom
-                anchors.bottomMargin: 8
-                spacing: 8
+                anchors.bottomMargin: contentSpacing
+                spacing: contentSpacing
                 z: 20
 
                 Repeater {
@@ -524,9 +542,9 @@ PanelWindow {
                     Rectangle {
                         property bool isHovered: false
 
-                        width: Math.max(actionText.implicitWidth + 12, 50)
-                        height: 24
-                        radius: 4
+                        width: Math.max(actionText.implicitWidth + Theme.spacingM, compactMode ? 40 : 50)
+                        height: actionButtonHeight
+                        radius: Theme.spacingXS
                         color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
 
                         StyledText {
@@ -550,7 +568,6 @@ PanelWindow {
                             onClicked: {
                                 if (modelData && modelData.invoke)
                                     modelData.invoke();
-
                                 if (notificationData && !win.exiting)
                                     notificationData.popup = false;
                             }
@@ -563,14 +580,16 @@ PanelWindow {
                 id: clearButton
 
                 property bool isHovered: false
+                readonly property int actionCount: notificationData ? (notificationData.actions || []).length : 0
 
+                visible: actionCount < 3
                 anchors.right: parent.right
-                anchors.rightMargin: 16
+                anchors.rightMargin: Theme.spacingL
                 anchors.bottom: parent.bottom
-                anchors.bottomMargin: 8
-                width: Math.max(clearTextLabel.implicitWidth + 12, 50)
-                height: 24
-                radius: 4
+                anchors.bottomMargin: contentSpacing
+                width: Math.max(clearTextLabel.implicitWidth + Theme.spacingM, compactMode ? 40 : 50)
+                height: actionButtonHeight
+                radius: Theme.spacingXS
                 color: isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : "transparent"
                 z: 20
 

quickshell/Modules/Notifications/Popup/NotificationPopupManager.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import qs.Common
 import qs.Services
 
 QtObject {
@@ -6,7 +7,12 @@ QtObject {
 
     property var modelData
     property int topMargin: 0
-    property int baseNotificationHeight: 120
+    readonly property bool compactMode: SettingsData.notificationCompactMode
+    readonly property real cardPadding: compactMode ? Theme.spacingS : Theme.spacingM
+    readonly property real popupIconSize: compactMode ? 48 : 63
+    readonly property real actionButtonHeight: compactMode ? 20 : 24
+    readonly property real popupSpacing: 4
+    readonly property int baseNotificationHeight: cardPadding * 2 + popupIconSize + actionButtonHeight + Theme.spacingS + popupSpacing
     property int maxTargetNotifications: 4
     property var popupWindows: [] // strong refs to windows (live until exitFinished)
     property var destroyingWindows: new Set()

quickshell/Modules/OSD/VolumeOSD.qml

@@ -262,9 +262,7 @@ DankOSD {
                     target: AudioService.sink && AudioService.sink.audio ? AudioService.sink.audio : null
 
                     function onVolumeChanged() {
-                        if (!vertSlider.dragging) {
-                            vertSlider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100));
-                        }
+                        vertSlider.value = Math.min(100, Math.round(AudioService.sink.audio.volume * 100));
                     }
                 }
             }

quickshell/Modules/Plugins/DesktopPluginWrapper.qml

@@ -26,6 +26,8 @@ Item {
     readonly property bool showOnOverview: instanceData?.config?.showOnOverview ?? false
     readonly property bool showOnOverviewOnly: instanceData?.config?.showOnOverviewOnly ?? false
     readonly property bool overviewActive: CompositorService.isNiri && NiriService.inOverview
+    readonly property bool clickThrough: instanceData?.config?.clickThrough ?? false
+    readonly property bool syncPositionAcrossScreens: instanceData?.config?.syncPositionAcrossScreens ?? false
 
     Connections {
         target: PluginService
@@ -83,6 +85,7 @@ Item {
         }
     }
     readonly property string screenKey: SettingsData.getScreenDisplayName(screen)
+    readonly property string positionKey: syncPositionAcrossScreens ? "_synced" : screenKey
 
     readonly property int screenWidth: screen?.width ?? 1920
     readonly property int screenHeight: screen?.height ?? 1080
@@ -96,53 +99,114 @@ Item {
 
     readonly property bool hasSavedPosition: {
         if (isInstance)
-            return instanceData?.positions?.[screenKey]?.x !== undefined;
+            return instanceData?.positions?.[positionKey]?.x !== undefined;
         if (usePluginService)
-            return pluginService.loadPluginData(pluginId, "desktopX_" + screenKey, null) !== null;
-        return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "x", null) !== null;
+            return pluginService.loadPluginData(pluginId, "desktopX_" + positionKey, null) !== null;
+        return SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "x", null) !== null;
     }
 
     readonly property bool hasSavedSize: {
         if (isInstance)
-            return instanceData?.positions?.[screenKey]?.width !== undefined;
+            return instanceData?.positions?.[positionKey]?.width !== undefined;
         if (usePluginService)
-            return pluginService.loadPluginData(pluginId, "desktopWidth_" + screenKey, null) !== null;
-        return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "width", null) !== null;
+            return pluginService.loadPluginData(pluginId, "desktopWidth_" + positionKey, null) !== null;
+        return SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "width", null) !== null;
     }
 
     property real savedX: {
-        if (isInstance)
-            return instanceData?.positions?.[screenKey]?.x ?? (screenWidth / 2 - savedWidth / 2);
-        if (usePluginService)
-            return pluginService.loadPluginData(pluginId, "desktopX_" + screenKey, screenWidth / 2 - savedWidth / 2);
-        return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "x", screenWidth / 2 - savedWidth / 2);
+        if (isInstance) {
+            const val = instanceData?.positions?.[positionKey]?.x;
+            if (val === undefined)
+                return screenWidth / 2 - savedWidth / 2;
+            return syncPositionAcrossScreens ? val * screenWidth : val;
+        }
+        if (usePluginService) {
+            const val = pluginService.loadPluginData(pluginId, "desktopX_" + positionKey, null);
+            if (val === null)
+                return screenWidth / 2 - savedWidth / 2;
+            return syncPositionAcrossScreens ? val * screenWidth : val;
+        }
+        const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "x", null);
+        if (val === null)
+            return screenWidth / 2 - savedWidth / 2;
+        return syncPositionAcrossScreens ? val * screenWidth : val;
     }
     property real savedY: {
-        if (isInstance)
-            return instanceData?.positions?.[screenKey]?.y ?? (screenHeight / 2 - savedHeight / 2);
-        if (usePluginService)
-            return pluginService.loadPluginData(pluginId, "desktopY_" + screenKey, screenHeight / 2 - savedHeight / 2);
-        return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "y", screenHeight / 2 - savedHeight / 2);
+        if (isInstance) {
+            const val = instanceData?.positions?.[positionKey]?.y;
+            if (val === undefined)
+                return screenHeight / 2 - savedHeight / 2;
+            return syncPositionAcrossScreens ? val * screenHeight : val;
+        }
+        if (usePluginService) {
+            const val = pluginService.loadPluginData(pluginId, "desktopY_" + positionKey, null);
+            if (val === null)
+                return screenHeight / 2 - savedHeight / 2;
+            return syncPositionAcrossScreens ? val * screenHeight : val;
+        }
+        const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "y", null);
+        if (val === null)
+            return screenHeight / 2 - savedHeight / 2;
+        return syncPositionAcrossScreens ? val * screenHeight : val;
     }
     property real savedWidth: {
-        if (isInstance)
-            return instanceData?.positions?.[screenKey]?.width ?? 280;
-        if (usePluginService)
-            return pluginService.loadPluginData(pluginId, "desktopWidth_" + screenKey, 200);
-        return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "width", 280);
+        if (isInstance) {
+            const val = instanceData?.positions?.[positionKey]?.width;
+            if (val === undefined)
+                return 280;
+            return val;
+        }
+        if (usePluginService) {
+            const val = pluginService.loadPluginData(pluginId, "desktopWidth_" + positionKey, null);
+            if (val === null)
+                return 200;
+            return val;
+        }
+        const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "width", null);
+        if (val === null)
+            return 280;
+        return val;
     }
     property real savedHeight: {
-        if (isInstance)
-            return instanceData?.positions?.[screenKey]?.height ?? 180;
-        if (usePluginService)
-            return pluginService.loadPluginData(pluginId, "desktopHeight_" + screenKey, 200);
-        return SettingsData.getDesktopWidgetPosition(pluginId, screenKey, "height", 180);
+        if (isInstance) {
+            const val = instanceData?.positions?.[positionKey]?.height;
+            if (val === undefined)
+                return forceSquare ? savedWidth : 180;
+            return forceSquare ? savedWidth : val;
+        }
+        if (usePluginService) {
+            const val = pluginService.loadPluginData(pluginId, "desktopHeight_" + positionKey, null);
+            if (val === null)
+                return forceSquare ? savedWidth : 200;
+            return forceSquare ? savedWidth : val;
+        }
+        const val = SettingsData.getDesktopWidgetPosition(pluginId, positionKey, "height", null);
+        if (val === null)
+            return forceSquare ? savedWidth : 180;
+        return forceSquare ? savedWidth : val;
     }
 
-    property real widgetX: Math.max(0, Math.min(savedX, screenWidth - widgetWidth))
-    property real widgetY: Math.max(0, Math.min(savedY, screenHeight - widgetHeight))
-    property real widgetWidth: Math.max(minWidth, Math.min(savedWidth, screenWidth))
-    property real widgetHeight: Math.max(minHeight, Math.min(savedHeight, screenHeight))
+    property real dragOverrideX: -1
+    property real dragOverrideY: -1
+    property real dragOverrideW: -1
+    property real dragOverrideH: -1
+
+    readonly property real effectiveX: dragOverrideX >= 0 ? dragOverrideX : savedX
+    readonly property real effectiveY: dragOverrideY >= 0 ? dragOverrideY : savedY
+    readonly property real effectiveW: dragOverrideW >= 0 ? dragOverrideW : savedWidth
+    readonly property real effectiveH: dragOverrideH >= 0 ? dragOverrideH : savedHeight
+
+    readonly property real widgetX: Math.max(0, Math.min(effectiveX, screenWidth - widgetWidth))
+    readonly property real widgetY: Math.max(0, Math.min(effectiveY, screenHeight - widgetHeight))
+    readonly property real widgetWidth: Math.max(minWidth, Math.min(effectiveW, screenWidth))
+    readonly property real widgetHeight: Math.max(minHeight, Math.min(effectiveH, screenHeight))
+
+    function clearDragOverrides() {
+        dragOverrideX = -1;
+        dragOverrideY = -1;
+        dragOverrideW = -1;
+        dragOverrideH = -1;
+    }
 
     property real minWidth: contentLoader.item?.minWidth ?? 100
     property real minHeight: contentLoader.item?.minHeight ?? 100
@@ -163,41 +227,45 @@ Item {
         return Math.round(value / gridSize) * gridSize;
     }
 
-    function savePosition() {
+    function savePosition(finalX, finalY) {
+        const xVal = syncPositionAcrossScreens ? finalX / screenWidth : finalX;
+        const yVal = syncPositionAcrossScreens ? finalY / screenHeight : finalY;
         if (isInstance && instanceData) {
-            SettingsData.updateDesktopWidgetInstancePosition(instanceId, screenKey, {
-                x: root.widgetX,
-                y: root.widgetY
+            SettingsData.updateDesktopWidgetInstancePosition(instanceId, positionKey, {
+                x: xVal,
+                y: yVal
             });
             return;
         }
         if (usePluginService) {
-            pluginService.savePluginData(pluginId, "desktopX_" + screenKey, root.widgetX);
-            pluginService.savePluginData(pluginId, "desktopY_" + screenKey, root.widgetY);
+            pluginService.savePluginData(pluginId, "desktopX_" + positionKey, xVal);
+            pluginService.savePluginData(pluginId, "desktopY_" + positionKey, yVal);
             return;
         }
-        SettingsData.updateDesktopWidgetPosition(pluginId, screenKey, {
-            x: root.widgetX,
-            y: root.widgetY
+        SettingsData.updateDesktopWidgetPosition(pluginId, positionKey, {
+            x: xVal,
+            y: yVal
         });
     }
 
-    function saveSize() {
+    function saveSize(finalW, finalH) {
+        const sizeVal = forceSquare ? Math.max(finalW, finalH) : finalW;
+        const heightVal = forceSquare ? sizeVal : finalH;
         if (isInstance && instanceData) {
-            SettingsData.updateDesktopWidgetInstancePosition(instanceId, screenKey, {
-                width: root.widgetWidth,
-                height: root.widgetHeight
+            SettingsData.updateDesktopWidgetInstancePosition(instanceId, positionKey, {
+                width: sizeVal,
+                height: heightVal
             });
             return;
         }
         if (usePluginService) {
-            pluginService.savePluginData(pluginId, "desktopWidth_" + screenKey, root.widgetWidth);
-            pluginService.savePluginData(pluginId, "desktopHeight_" + screenKey, root.widgetHeight);
+            pluginService.savePluginData(pluginId, "desktopWidth_" + positionKey, sizeVal);
+            pluginService.savePluginData(pluginId, "desktopHeight_" + positionKey, heightVal);
             return;
         }
-        SettingsData.updateDesktopWidgetPosition(pluginId, screenKey, {
-            width: root.widgetWidth,
-            height: root.widgetHeight
+        SettingsData.updateDesktopWidgetPosition(pluginId, positionKey, {
+            width: sizeVal,
+            height: heightVal
         });
     }
 
@@ -213,6 +281,12 @@ Item {
         }
         color: "transparent"
 
+        Region {
+            id: emptyMask
+        }
+
+        mask: root.clickThrough ? emptyMask : null
+
         WlrLayershell.namespace: "quickshell:desktop-widget:" + root.pluginId + (root.instanceId ? ":" + root.instanceId : "")
         WlrLayershell.layer: {
             if (root.isInteracting && !CompositorService.useHyprlandFocusGrab)
@@ -315,12 +389,14 @@ Item {
                 if (!root.hasSavedSize) {
                     const defW = item.defaultWidth ?? item.widgetWidth ?? 280;
                     const defH = item.defaultHeight ?? item.widgetHeight ?? 180;
-                    root.widgetWidth = Math.max(root.minWidth, Math.min(defW, root.screenWidth));
-                    root.widgetHeight = Math.max(root.minHeight, Math.min(defH, root.screenHeight));
+                    const finalW = Math.max(root.minWidth, Math.min(defW, root.screenWidth));
+                    const finalH = Math.max(root.minHeight, Math.min(defH, root.screenHeight));
+                    root.saveSize(finalW, finalH);
                 }
                 if (!root.hasSavedPosition) {
-                    root.widgetX = Math.max(0, Math.min(root.screenWidth / 2 - root.widgetWidth / 2, root.screenWidth - root.widgetWidth));
-                    root.widgetY = Math.max(0, Math.min(root.screenHeight / 2 - root.widgetHeight / 2, root.screenHeight - root.widgetHeight));
+                    const finalX = Math.max(0, Math.min(root.screenWidth / 2 - root.widgetWidth / 2, root.screenWidth - root.widgetWidth));
+                    const finalY = Math.max(0, Math.min(root.screenHeight / 2 - root.widgetHeight / 2, root.screenHeight - root.widgetHeight));
+                    root.savePosition(finalX, finalY);
                 }
                 if (item.widgetWidth !== undefined)
                     item.widgetWidth = Qt.binding(() => contentLoader.width);
@@ -355,6 +431,7 @@ Item {
             id: dragArea
             anchors.fill: parent
             acceptedButtons: Qt.RightButton
+            enabled: !root.clickThrough
             cursorShape: pressed ? Qt.ClosedHandCursor : Qt.ArrowCursor
 
             property point startPos
@@ -367,6 +444,8 @@ Item {
                 startY = root.widgetY;
                 root.previewX = root.widgetX;
                 root.previewY = root.widgetY;
+                root.dragOverrideX = root.widgetX;
+                root.dragOverrideY = root.widgetY;
             }
 
             onPositionChanged: mouse => {
@@ -384,16 +463,15 @@ Item {
                     root.previewY = newY;
                     return;
                 }
-                root.widgetX = newX;
-                root.widgetY = newY;
+                root.dragOverrideX = newX;
+                root.dragOverrideY = newY;
             }
 
             onReleased: {
-                if (root.useGhostPreview) {
-                    root.widgetX = root.previewX;
-                    root.widgetY = root.previewY;
-                }
-                root.savePosition();
+                const finalX = root.useGhostPreview ? root.previewX : root.dragOverrideX;
+                const finalY = root.useGhostPreview ? root.previewY : root.dragOverrideY;
+                root.savePosition(finalX, finalY);
+                root.clearDragOverrides();
             }
         }
 
@@ -404,6 +482,7 @@ Item {
             anchors.right: parent.right
             anchors.bottom: parent.bottom
             acceptedButtons: Qt.RightButton
+            enabled: !root.clickThrough
             cursorShape: pressed ? Qt.SizeFDiagCursor : Qt.ArrowCursor
 
             property point startPos
@@ -416,6 +495,8 @@ Item {
                 startHeight = root.widgetHeight;
                 root.previewWidth = root.widgetWidth;
                 root.previewHeight = root.widgetHeight;
+                root.dragOverrideW = root.widgetWidth;
+                root.dragOverrideH = root.widgetHeight;
             }
 
             onPositionChanged: mouse => {
@@ -438,16 +519,15 @@ Item {
                     root.previewHeight = newH;
                     return;
                 }
-                root.widgetWidth = newW;
-                root.widgetHeight = newH;
+                root.dragOverrideW = newW;
+                root.dragOverrideH = newH;
             }
 
             onReleased: {
-                if (root.useGhostPreview) {
-                    root.widgetWidth = root.previewWidth;
-                    root.widgetHeight = root.previewHeight;
-                }
-                root.saveSize();
+                const finalW = root.useGhostPreview ? root.previewWidth : root.dragOverrideW;
+                const finalH = root.useGhostPreview ? root.previewHeight : root.dragOverrideH;
+                root.saveSize(finalW, finalH);
+                root.clearDragOverrides();
             }
         }
     }

quickshell/Modules/Settings/AboutTab.qml

@@ -177,10 +177,11 @@ Item {
 
                     StyledText {
                         text: {
-                            if (!SystemUpdateService.shellVersion)
+                            if (!SystemUpdateService.shellVersion && !DMSService.cliVersion)
                                 return "dms";
 
-                            let version = SystemUpdateService.shellVersion;
+                            let version = SystemUpdateService.shellVersion || "";
+                            let cliVersion = DMSService.cliVersion || "";
 
                             // Debian/Ubuntu/OpenSUSE git format: 1.0.3+git2264.c5c5ce84
                             let match = version.match(/^([\d.]+)\+git(\d+)\./);
@@ -191,7 +192,25 @@ Item {
                             // Fedora COPR git format: 0.0.git.2267.d430cae9
                             match = version.match(/^[\d.]+\.git\.(\d+)\./);
                             if (match) {
-                                return `dms (git) v1.0.3-${match[1]}`;
+                                function extractBaseVersion(value) {
+                                    if (!value)
+                                        return "";
+                                    let baseMatch = value.match(/(\d+\.\d+\.\d+)/);
+                                    if (baseMatch)
+                                        return baseMatch[1];
+                                    baseMatch = value.match(/(\d+\.\d+)/);
+                                    if (baseMatch)
+                                        return baseMatch[1];
+                                    return "";
+                                }
+
+                                let baseVersion = extractBaseVersion(cliVersion);
+                                if (!baseVersion)
+                                    baseVersion = extractBaseVersion(SystemUpdateService.semverVersion);
+                                if (baseVersion) {
+                                    return `dms (git) v${baseVersion}-${match[1]}`;
+                                }
+                                return `dms (git) v${match[1]}`;
                             }
 
                             // Stable release format: 1.0.3
@@ -200,6 +219,18 @@ Item {
                                 return `dms v${match[1]}`;
                             }
 
+                            if (!version && cliVersion) {
+                                match = cliVersion.match(/^([\d.]+)\+git(\d+)\./);
+                                if (match) {
+                                    return `dms (git) v${match[1]}-${match[2]}`;
+                                }
+                                match = cliVersion.match(/^([\d.]+)$/);
+                                if (match) {
+                                    return `dms v${match[1]}`;
+                                }
+                                return `dms ${cliVersion}`;
+                            }
+
                             return `dms ${version}`;
                         }
                         font.pixelSize: Theme.fontSizeXLarge

quickshell/Modules/Settings/DesktopWidgetBrowser.qml

@@ -1,4 +1,4 @@
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtQuick
 import Quickshell

quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml

@@ -63,7 +63,13 @@ SettingsCard {
         DankActionButton {
             id: menuButton
             iconName: "more_vert"
-            onClicked: actionsMenu.open()
+            onClicked: {
+                if (actionsMenu.opened) {
+                    actionsMenu.close();
+                    return;
+                }
+                actionsMenu.open();
+            }
 
             Popup {
                 id: actionsMenu
@@ -71,7 +77,7 @@ SettingsCard {
                 y: parent.height + Theme.spacingXS
                 width: 160
                 padding: Theme.spacingXS
-                modal: true
+                modal: false
                 focus: true
                 closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
 
@@ -218,6 +224,73 @@ SettingsCard {
 
         SettingsDivider {}
 
+        Item {
+            width: parent.width
+            height: groupRow.height + Theme.spacingM * 2
+            visible: (SettingsData.desktopWidgetGroups || []).length > 0
+
+            Row {
+                id: groupRow
+                x: Theme.spacingM
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: Theme.spacingM
+                width: parent.width - Theme.spacingM * 2
+
+                StyledText {
+                    text: I18n.tr("Group")
+                    font.pixelSize: Theme.fontSizeMedium
+                    color: Theme.surfaceText
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: 80
+                    horizontalAlignment: Text.AlignLeft
+                }
+
+                DankDropdown {
+                    id: groupDropdown
+                    width: parent.width - 80 - Theme.spacingM
+                    compactMode: true
+
+                    property var groupsData: {
+                        const groups = SettingsData.desktopWidgetGroups || [];
+                        const items = [
+                            {
+                                value: "",
+                                label: I18n.tr("None")
+                            }
+                        ];
+                        for (const g of groups) {
+                            items.push({
+                                value: g.id,
+                                label: g.name
+                            });
+                        }
+                        return items;
+                    }
+
+                    options: groupsData.map(g => g.label)
+                    currentValue: {
+                        const currentGroup = root.instanceData?.group ?? "";
+                        const item = groupsData.find(g => g.value === currentGroup);
+                        return item?.label ?? I18n.tr("None");
+                    }
+
+                    onValueChanged: value => {
+                        if (!root.instanceId)
+                            return;
+                        const item = groupsData.find(g => g.label === value);
+                        const groupId = item?.value ?? "";
+                        SettingsData.updateDesktopWidgetInstance(root.instanceId, {
+                            group: groupId || null
+                        });
+                    }
+                }
+            }
+        }
+
+        SettingsDivider {
+            visible: (SettingsData.desktopWidgetGroups || []).length > 0
+        }
+
         SettingsToggleRow {
             text: I18n.tr("Show on Overlay")
             checked: instanceData?.config?.showOnOverlay ?? false
@@ -266,6 +339,38 @@ SettingsCard {
 
         SettingsDivider {}
 
+        SettingsToggleRow {
+            text: I18n.tr("Click Through")
+            description: I18n.tr("Allow clicks to pass through the widget")
+            checked: instanceData?.config?.clickThrough ?? false
+            onToggled: isChecked => {
+                if (!root.instanceId)
+                    return;
+                SettingsData.updateDesktopWidgetInstanceConfig(root.instanceId, {
+                    clickThrough: isChecked
+                });
+            }
+        }
+
+        SettingsDivider {}
+
+        SettingsToggleRow {
+            text: I18n.tr("Sync Position Across Screens")
+            description: I18n.tr("Use the same position and size on all displays")
+            checked: instanceData?.config?.syncPositionAcrossScreens ?? false
+            onToggled: isChecked => {
+                if (!root.instanceId)
+                    return;
+                if (isChecked)
+                    SettingsData.syncDesktopWidgetPositionToAllScreens(root.instanceId);
+                SettingsData.updateDesktopWidgetInstanceConfig(root.instanceId, {
+                    syncPositionAcrossScreens: isChecked
+                });
+            }
+        }
+
+        SettingsDivider {}
+
         Item {
             width: parent.width
             height: ipcColumn.height + Theme.spacingM * 2

quickshell/Modules/Settings/DesktopWidgetsTab.qml

@@ -14,20 +14,46 @@ Item {
     LayoutMirroring.childrenInherit: true
 
     property var expandedStates: ({})
+    property var groupCollapsedStates: ({})
     property var parentModal: null
+    property string editingGroupId: ""
+    property string newGroupName: ""
 
-    DesktopWidgetBrowser {
-        id: widgetBrowser
-        parentModal: root.parentModal
-        onWidgetAdded: widgetType => {
-            ToastService.showInfo(I18n.tr("Widget added"));
+    readonly property var allInstances: SettingsData.desktopWidgetInstances || []
+    readonly property var allGroups: SettingsData.desktopWidgetGroups || []
+
+    function showWidgetBrowser() {
+        widgetBrowserLoader.active = true;
+        if (widgetBrowserLoader.item)
+            widgetBrowserLoader.item.show();
+    }
+
+    function showDesktopPluginBrowser() {
+        desktopPluginBrowserLoader.active = true;
+        if (desktopPluginBrowserLoader.item)
+            desktopPluginBrowserLoader.item.show();
+    }
+
+    LazyLoader {
+        id: widgetBrowserLoader
+        active: false
+
+        DesktopWidgetBrowser {
+            parentModal: root.parentModal
+            onWidgetAdded: widgetType => {
+                ToastService.showInfo(I18n.tr("Widget added"));
+            }
         }
     }
 
-    PluginBrowser {
-        id: desktopPluginBrowser
-        parentModal: root.parentModal
-        typeFilter: "desktop-widget"
+    LazyLoader {
+        id: desktopPluginBrowserLoader
+        active: false
+
+        PluginBrowser {
+            parentModal: root.parentModal
+            typeFilter: "desktop-widget"
+        }
     }
 
     DankFlickable {
@@ -68,66 +94,512 @@ Item {
                         DankButton {
                             text: I18n.tr("Add Widget")
                             iconName: "add"
-                            onClicked: widgetBrowser.show()
+                            onClicked: root.showWidgetBrowser()
                         }
 
                         DankButton {
                             text: I18n.tr("Browse Plugins")
                             iconName: "store"
-                            onClicked: desktopPluginBrowser.show()
+                            onClicked: root.showDesktopPluginBrowser()
+                        }
+                    }
+                }
+            }
+
+            SettingsCard {
+                width: parent.width
+                iconName: "folder"
+                title: I18n.tr("Groups")
+                collapsible: true
+                expanded: root.allGroups.length > 0
+
+                Column {
+                    width: parent.width - Theme.spacingM * 2
+                    x: Theme.spacingM
+                    spacing: Theme.spacingM
+
+                    StyledText {
+                        width: parent.width
+                        text: I18n.tr("Organize widgets into collapsible groups")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        wrapMode: Text.WordWrap
+                        horizontalAlignment: Text.AlignLeft
+                    }
+
+                    Row {
+                        spacing: Theme.spacingS
+                        width: parent.width
+
+                        DankTextField {
+                            id: newGroupField
+                            width: parent.width - addGroupBtn.width - Theme.spacingS
+                            placeholderText: I18n.tr("New group name...")
+                            text: root.newGroupName
+                            onTextChanged: root.newGroupName = text
+                            onAccepted: {
+                                if (!text.trim())
+                                    return;
+                                SettingsData.createDesktopWidgetGroup(text.trim());
+                                root.newGroupName = "";
+                                text = "";
+                            }
+                        }
+
+                        DankButton {
+                            id: addGroupBtn
+                            iconName: "add"
+                            text: I18n.tr("Add")
+                            enabled: root.newGroupName.trim().length > 0
+                            onClicked: {
+                                SettingsData.createDesktopWidgetGroup(root.newGroupName.trim());
+                                root.newGroupName = "";
+                                newGroupField.text = "";
+                            }
+                        }
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingXS
+                        visible: root.allGroups.length > 0
+
+                        Repeater {
+                            model: root.allGroups
+
+                            Rectangle {
+                                id: groupItem
+                                required property var modelData
+                                required property int index
+
+                                width: parent.width
+                                height: 40
+                                radius: Theme.cornerRadius
+                                color: groupMouseArea.containsMouse ? Theme.surfaceHover : Theme.surfaceContainer
+
+                                Row {
+                                    anchors.fill: parent
+                                    anchors.leftMargin: Theme.spacingS
+                                    anchors.rightMargin: Theme.spacingS
+                                    spacing: Theme.spacingS
+
+                                    DankIcon {
+                                        name: "folder"
+                                        size: Theme.iconSizeSmall
+                                        color: Theme.surfaceText
+                                        anchors.verticalCenter: parent.verticalCenter
+                                    }
+
+                                    Loader {
+                                        active: root.editingGroupId === groupItem.modelData.id
+                                        width: active ? parent.width - Theme.iconSizeSmall - deleteGroupBtn.width - Theme.spacingS * 3 : 0
+                                        height: active ? 32 : 0
+                                        anchors.verticalCenter: parent.verticalCenter
+
+                                        sourceComponent: DankTextField {
+                                            text: groupItem.modelData.name
+                                            onAccepted: {
+                                                if (!text.trim())
+                                                    return;
+                                                SettingsData.updateDesktopWidgetGroup(groupItem.modelData.id, {
+                                                    name: text.trim()
+                                                });
+                                                root.editingGroupId = "";
+                                            }
+                                            onEditingFinished: {
+                                                if (!text.trim())
+                                                    return;
+                                                SettingsData.updateDesktopWidgetGroup(groupItem.modelData.id, {
+                                                    name: text.trim()
+                                                });
+                                                root.editingGroupId = "";
+                                            }
+                                            Component.onCompleted: forceActiveFocus()
+                                        }
+                                    }
+
+                                    StyledText {
+                                        visible: root.editingGroupId !== groupItem.modelData.id
+                                        text: groupItem.modelData.name
+                                        font.pixelSize: Theme.fontSizeMedium
+                                        color: Theme.surfaceText
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        elide: Text.ElideRight
+                                        width: parent.width - Theme.iconSizeSmall - deleteGroupBtn.width - Theme.spacingS * 3
+                                    }
+
+                                    DankActionButton {
+                                        id: deleteGroupBtn
+                                        iconName: "delete"
+                                        anchors.verticalCenter: parent.verticalCenter
+                                        onClicked: {
+                                            SettingsData.removeDesktopWidgetGroup(groupItem.modelData.id);
+                                            ToastService.showInfo(I18n.tr("Group removed"));
+                                        }
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: groupMouseArea
+                                    anchors.fill: parent
+                                    hoverEnabled: true
+                                    onDoubleClicked: root.editingGroupId = groupItem.modelData.id
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            Repeater {
+                model: root.allGroups
+
+                Column {
+                    id: groupSection
+                    required property var modelData
+                    required property int index
+
+                    readonly property string groupId: modelData.id
+                    readonly property var groupInstances: root.allInstances.filter(inst => inst.group === groupId)
+
+                    width: mainColumn.width
+                    spacing: Theme.spacingM
+                    visible: groupInstances.length > 0
+
+                    Rectangle {
+                        width: parent.width
+                        height: 44
+                        radius: Theme.cornerRadius
+                        color: Theme.surfaceContainer
+
+                        Row {
+                            anchors.fill: parent
+                            anchors.leftMargin: Theme.spacingM
+                            anchors.rightMargin: Theme.spacingM
+                            spacing: Theme.spacingS
+
+                            DankIcon {
+                                name: (root.groupCollapsedStates[groupSection.groupId] ?? false) ? "expand_more" : "expand_less"
+                                size: Theme.iconSize
+                                color: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            DankIcon {
+                                name: "folder"
+                                size: Theme.iconSize
+                                color: Theme.primary
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            StyledText {
+                                text: groupSection.modelData.name
+                                font.pixelSize: Theme.fontSizeMedium
+                                font.weight: Font.Medium
+                                color: Theme.surfaceText
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+
+                            StyledText {
+                                text: "(" + groupSection.groupInstances.length + ")"
+                                font.pixelSize: Theme.fontSizeSmall
+                                color: Theme.surfaceVariantText
+                                anchors.verticalCenter: parent.verticalCenter
+                            }
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                var states = Object.assign({}, root.groupCollapsedStates);
+                                states[groupSection.groupId] = !(states[groupSection.groupId] ?? false);
+                                root.groupCollapsedStates = states;
+                            }
+                        }
+                    }
+
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingM
+                        visible: !(root.groupCollapsedStates[groupSection.groupId] ?? false)
+                        leftPadding: Theme.spacingM
+
+                        Repeater {
+                            model: ScriptModel {
+                                objectProp: "id"
+                                values: groupSection.groupInstances
+                            }
+
+                            Item {
+                                id: groupDelegateItem
+                                required property var modelData
+                                required property int index
+
+                                property bool held: groupDragArea.pressed
+                                property real originalY: y
+
+                                readonly property string instanceIdRef: modelData.id
+                                readonly property var liveInstanceData: {
+                                    const instances = root.allInstances;
+                                    return instances.find(inst => inst.id === instanceIdRef) ?? modelData;
+                                }
+
+                                width: groupSection.width - Theme.spacingM
+                                height: groupCard.height
+                                z: held ? 2 : 1
+
+                                DesktopWidgetInstanceCard {
+                                    id: groupCard
+                                    width: parent.width
+                                    headerLeftPadding: 20
+                                    instanceData: groupDelegateItem.liveInstanceData
+                                    isExpanded: root.expandedStates[groupDelegateItem.instanceIdRef] ?? false
+
+                                    onExpandedChanged: {
+                                        if (expanded === (root.expandedStates[groupDelegateItem.instanceIdRef] ?? false))
+                                            return;
+                                        var states = Object.assign({}, root.expandedStates);
+                                        states[groupDelegateItem.instanceIdRef] = expanded;
+                                        root.expandedStates = states;
+                                    }
+
+                                    onDuplicateRequested: SettingsData.duplicateDesktopWidgetInstance(groupDelegateItem.instanceIdRef)
+
+                                    onDeleteRequested: {
+                                        SettingsData.removeDesktopWidgetInstance(groupDelegateItem.instanceIdRef);
+                                        ToastService.showInfo(I18n.tr("Widget removed"));
+                                    }
+                                }
+
+                                MouseArea {
+                                    id: groupDragArea
+                                    anchors.left: parent.left
+                                    anchors.top: parent.top
+                                    width: 40
+                                    height: 50
+                                    hoverEnabled: true
+                                    cursorShape: Qt.SizeVerCursor
+                                    drag.target: groupDelegateItem.held ? groupDelegateItem : undefined
+                                    drag.axis: Drag.YAxis
+                                    preventStealing: true
+
+                                    onPressed: {
+                                        groupDelegateItem.z = 2;
+                                        groupDelegateItem.originalY = groupDelegateItem.y;
+                                    }
+                                    onReleased: {
+                                        groupDelegateItem.z = 1;
+                                        if (!drag.active) {
+                                            groupDelegateItem.y = groupDelegateItem.originalY;
+                                            return;
+                                        }
+                                        const spacing = Theme.spacingM;
+                                        const itemH = groupDelegateItem.height + spacing;
+                                        var newIndex = Math.round(groupDelegateItem.y / itemH);
+                                        newIndex = Math.max(0, Math.min(newIndex, groupSection.groupInstances.length - 1));
+                                        if (newIndex !== groupDelegateItem.index)
+                                            SettingsData.reorderDesktopWidgetInstanceInGroup(groupDelegateItem.instanceIdRef, groupSection.groupId, newIndex);
+                                        groupDelegateItem.y = groupDelegateItem.originalY;
+                                    }
+                                }
+
+                                DankIcon {
+                                    x: Theme.spacingL - 2
+                                    y: Theme.spacingL + (Theme.iconSize / 2) - (size / 2)
+                                    name: "drag_indicator"
+                                    size: 18
+                                    color: Theme.outline
+                                    opacity: groupDragArea.containsMouse || groupDragArea.pressed ? 1 : 0.5
+                                }
+
+                                Behavior on y {
+                                    enabled: !groupDragArea.pressed && !groupDragArea.drag.active
+                                    NumberAnimation {
+                                        duration: Theme.shortDuration
+                                        easing.type: Theme.standardEasing
+                                    }
+                                }
+                            }
                         }
                     }
                 }
             }
 
             Column {
-                id: instancesColumn
+                id: ungroupedSection
                 width: parent.width
                 spacing: Theme.spacingM
-                visible: SettingsData.desktopWidgetInstances.length > 0
+                visible: ungroupedInstances.length > 0
 
-                Repeater {
-                    id: instanceRepeater
-                    model: ScriptModel {
-                        id: instancesModel
-                        objectProp: "id"
-                        values: SettingsData.desktopWidgetInstances
+                readonly property var ungroupedInstances: root.allInstances.filter(inst => {
+                    if (!inst.group)
+                        return true;
+                    return !root.allGroups.some(g => g.id === inst.group);
+                })
+
+                Rectangle {
+                    width: parent.width
+                    height: 44
+                    radius: Theme.cornerRadius
+                    color: Theme.surfaceContainer
+                    visible: root.allGroups.length > 0
+
+                    Row {
+                        anchors.fill: parent
+                        anchors.leftMargin: Theme.spacingM
+                        anchors.rightMargin: Theme.spacingM
+                        spacing: Theme.spacingS
+
+                        DankIcon {
+                            name: (root.groupCollapsedStates["_ungrouped"] ?? false) ? "expand_more" : "expand_less"
+                            size: Theme.iconSize
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        DankIcon {
+                            name: "widgets"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Ungrouped")
+                            font.pixelSize: Theme.fontSizeMedium
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: "(" + ungroupedSection.ungroupedInstances.length + ")"
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
                     }
 
-                    DesktopWidgetInstanceCard {
-                        required property var modelData
-                        required property int index
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            var states = Object.assign({}, root.groupCollapsedStates);
+                            states["_ungrouped"] = !(states["_ungrouped"] ?? false);
+                            root.groupCollapsedStates = states;
+                        }
+                    }
+                }
 
-                        readonly property string instanceIdRef: modelData.id
-                        readonly property var liveInstanceData: {
-                            const instances = SettingsData.desktopWidgetInstances || [];
-                            return instances.find(inst => inst.id === instanceIdRef) ?? modelData;
+                Column {
+                    width: parent.width
+                    spacing: Theme.spacingM
+                    visible: !(root.groupCollapsedStates["_ungrouped"] ?? false)
+                    leftPadding: root.allGroups.length > 0 ? Theme.spacingM : 0
+
+                    Repeater {
+                        model: ScriptModel {
+                            objectProp: "id"
+                            values: ungroupedSection.ungroupedInstances
                         }
 
-                        width: instancesColumn.width
-                        instanceData: liveInstanceData
-                        isExpanded: root.expandedStates[instanceIdRef] ?? false
+                        Item {
+                            id: ungroupedDelegateItem
+                            required property var modelData
+                            required property int index
 
-                        onExpandedChanged: {
-                            if (expanded === (root.expandedStates[instanceIdRef] ?? false))
-                                return;
-                            var states = Object.assign({}, root.expandedStates);
-                            states[instanceIdRef] = expanded;
-                            root.expandedStates = states;
-                        }
+                            property bool held: ungroupedDragArea.pressed
+                            property real originalY: y
 
-                        onDuplicateRequested: SettingsData.duplicateDesktopWidgetInstance(instanceIdRef)
+                            readonly property string instanceIdRef: modelData.id
+                            readonly property var liveInstanceData: {
+                                const instances = root.allInstances;
+                                return instances.find(inst => inst.id === instanceIdRef) ?? modelData;
+                            }
 
-                        onDeleteRequested: {
-                            SettingsData.removeDesktopWidgetInstance(instanceIdRef);
-                            ToastService.showInfo(I18n.tr("Widget removed"));
+                            width: ungroupedSection.width - (root.allGroups.length > 0 ? Theme.spacingM : 0)
+                            height: ungroupedCard.height
+                            z: held ? 2 : 1
+
+                            DesktopWidgetInstanceCard {
+                                id: ungroupedCard
+                                width: parent.width
+                                headerLeftPadding: 20
+                                instanceData: ungroupedDelegateItem.liveInstanceData
+                                isExpanded: root.expandedStates[ungroupedDelegateItem.instanceIdRef] ?? false
+
+                                onExpandedChanged: {
+                                    if (expanded === (root.expandedStates[ungroupedDelegateItem.instanceIdRef] ?? false))
+                                        return;
+                                    var states = Object.assign({}, root.expandedStates);
+                                    states[ungroupedDelegateItem.instanceIdRef] = expanded;
+                                    root.expandedStates = states;
+                                }
+
+                                onDuplicateRequested: SettingsData.duplicateDesktopWidgetInstance(ungroupedDelegateItem.instanceIdRef)
+
+                                onDeleteRequested: {
+                                    SettingsData.removeDesktopWidgetInstance(ungroupedDelegateItem.instanceIdRef);
+                                    ToastService.showInfo(I18n.tr("Widget removed"));
+                                }
+                            }
+
+                            MouseArea {
+                                id: ungroupedDragArea
+                                anchors.left: parent.left
+                                anchors.top: parent.top
+                                width: 40
+                                height: 50
+                                hoverEnabled: true
+                                cursorShape: Qt.SizeVerCursor
+                                drag.target: ungroupedDelegateItem.held ? ungroupedDelegateItem : undefined
+                                drag.axis: Drag.YAxis
+                                preventStealing: true
+
+                                onPressed: {
+                                    ungroupedDelegateItem.z = 2;
+                                    ungroupedDelegateItem.originalY = ungroupedDelegateItem.y;
+                                }
+                                onReleased: {
+                                    ungroupedDelegateItem.z = 1;
+                                    if (!drag.active) {
+                                        ungroupedDelegateItem.y = ungroupedDelegateItem.originalY;
+                                        return;
+                                    }
+                                    const spacing = Theme.spacingM;
+                                    const itemH = ungroupedDelegateItem.height + spacing;
+                                    var newIndex = Math.round(ungroupedDelegateItem.y / itemH);
+                                    newIndex = Math.max(0, Math.min(newIndex, ungroupedSection.ungroupedInstances.length - 1));
+                                    if (newIndex !== ungroupedDelegateItem.index)
+                                        SettingsData.reorderDesktopWidgetInstanceInGroup(ungroupedDelegateItem.instanceIdRef, null, newIndex);
+                                    ungroupedDelegateItem.y = ungroupedDelegateItem.originalY;
+                                }
+                            }
+
+                            DankIcon {
+                                x: Theme.spacingL - 2
+                                y: Theme.spacingL + (Theme.iconSize / 2) - (size / 2)
+                                name: "drag_indicator"
+                                size: 18
+                                color: Theme.outline
+                                opacity: ungroupedDragArea.containsMouse || ungroupedDragArea.pressed ? 1 : 0.5
+                            }
+
+                            Behavior on y {
+                                enabled: !ungroupedDragArea.pressed && !ungroupedDragArea.drag.active
+                                NumberAnimation {
+                                    duration: Theme.shortDuration
+                                    easing.type: Theme.standardEasing
+                                }
+                            }
                         }
                     }
                 }
             }
 
             StyledText {
-                visible: SettingsData.desktopWidgetInstances.length === 0
+                visible: root.allInstances.length === 0
                 text: I18n.tr("No widgets added. Click \"Add Widget\" to get started.")
                 font.pixelSize: Theme.fontSizeMedium
                 color: Theme.surfaceVariantText
@@ -147,6 +619,7 @@ Item {
                     spacing: Theme.spacingM
 
                     Row {
+                        width: parent.width
                         spacing: Theme.spacingM
 
                         Rectangle {
@@ -188,6 +661,7 @@ Item {
                     }
 
                     Row {
+                        width: parent.width
                         spacing: Theme.spacingM
 
                         Rectangle {

quickshell/Modules/Settings/DockTab.qml

@@ -29,6 +29,9 @@ Item {
                 SettingsButtonGroupRow {
                     text: I18n.tr("Position")
                     model: ["Top", "Bottom", "Left", "Right"]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                     currentIndex: {
                         switch (SettingsData.dockPosition) {
                         case SettingsData.Position.Top:
@@ -129,6 +132,9 @@ Item {
                     tags: ["dock", "indicator", "style", "circle", "line"]
                     text: I18n.tr("Indicator Style")
                     model: ["Circle", "Line"]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                     currentIndex: SettingsData.dockIndicatorStyle === "circle" ? 0 : 1
                     onSelectionChanged: (index, selected) => {
                         if (selected) {
@@ -225,6 +231,9 @@ Item {
                     description: I18n.tr("Choose the border accent color")
                     visible: SettingsData.dockBorderEnabled
                     model: ["Surface", "Secondary", "Primary"]
+                    buttonPadding: Theme.spacingS
+                    minButtonWidth: 44
+                    textSize: Theme.fontSizeSmall
                     currentIndex: {
                         switch (SettingsData.dockBorderColor) {
                         case "surfaceText":

quickshell/Modules/Settings/NetworkTab.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import qs.Common
 import qs.Modals.Common
 import qs.Modals.FileBrowser
@@ -14,6 +15,7 @@ Item {
     property string expandedVpnUuid: ""
     property string expandedWifiSsid: ""
     property string expandedEthDevice: ""
+    property int maxPinnedWifiNetworks: 3
 
     Component.onCompleted: {
         NetworkService.addRef();
@@ -23,15 +25,59 @@ Item {
         NetworkService.removeRef();
     }
 
-    FileBrowserModal {
-        id: vpnFileBrowser
-        browserTitle: I18n.tr("Import VPN")
-        browserIcon: "vpn_key"
-        browserType: "vpn"
-        fileExtensions: VPNService.getFileFilter()
+    function openVpnFileBrowser() {
+        vpnFileBrowserLoader.active = true;
+        if (vpnFileBrowserLoader.item)
+            vpnFileBrowserLoader.item.open();
+    }
 
-        onFileSelected: path => {
-            VPNService.importVpn(path.replace("file://", ""));
+    function normalizePinList(value) {
+        if (Array.isArray(value))
+            return value.filter(v => v)
+        if (typeof value === "string" && value.length > 0)
+            return [value]
+        return []
+    }
+
+    function getPinnedWifiNetworks() {
+        const pins = SettingsData.wifiNetworkPins || {}
+        return normalizePinList(pins["preferredWifi"])
+    }
+
+    function toggleWifiPin(ssid) {
+        const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}))
+        let pinnedList = normalizePinList(pins["preferredWifi"])
+        const pinIndex = pinnedList.indexOf(ssid)
+
+        if (pinIndex !== -1) {
+            pinnedList.splice(pinIndex, 1)
+        } else {
+            pinnedList.unshift(ssid)
+            if (pinnedList.length > maxPinnedWifiNetworks)
+                pinnedList = pinnedList.slice(0, maxPinnedWifiNetworks)
+        }
+
+        if (pinnedList.length > 0)
+            pins["preferredWifi"] = pinnedList
+        else
+            delete pins["preferredWifi"]
+
+        SettingsData.set("wifiNetworkPins", pins)
+    }
+
+    LazyLoader {
+        id: vpnFileBrowserLoader
+        active: false
+
+        FileBrowserModal {
+            browserTitle: I18n.tr("Import VPN")
+            browserIcon: "vpn_key"
+            browserType: "vpn"
+            fileExtensions: VPNService.getFileFilter()
+
+            onFileSelected: path => {
+                VPNService.importVpn(path.replace("file://", ""));
+            }
         }
     }
 
@@ -1014,15 +1060,19 @@ Item {
                                 model: {
                                     const ssid = NetworkService.currentWifiSSID;
                                     const networks = NetworkService.wifiNetworks || [];
-                                    const pins = SettingsData.wifiNetworkPins || {};
-                                    const pinnedSSID = pins["preferredWifi"];
+                                    const pinnedList = networkTab.getPinnedWifiNetworks();
 
                                     let sorted = [...networks];
                                     sorted.sort((a, b) => {
-                                        if (a.ssid === pinnedSSID && b.ssid !== pinnedSSID)
-                                            return -1;
-                                        if (b.ssid === pinnedSSID && a.ssid !== pinnedSSID)
-                                            return 1;
+                                        const aPinnedIndex = pinnedList.indexOf(a.ssid)
+                                        const bPinnedIndex = pinnedList.indexOf(b.ssid)
+                                        if (aPinnedIndex !== -1 || bPinnedIndex !== -1) {
+                                            if (aPinnedIndex === -1)
+                                                return 1
+                                            if (bPinnedIndex === -1)
+                                                return -1
+                                            return aPinnedIndex - bPinnedIndex
+                                        }
                                         if (a.ssid === ssid)
                                             return -1;
                                         if (b.ssid === ssid)
@@ -1038,7 +1088,7 @@ Item {
                                     required property int index
 
                                     readonly property bool isConnected: modelData.ssid === NetworkService.currentWifiSSID
-                                    readonly property bool isPinned: (SettingsData.wifiNetworkPins || {})["preferredWifi"] === modelData.ssid
+                                    readonly property bool isPinned: networkTab.getPinnedWifiNetworks().includes(modelData.ssid)
                                     readonly property bool isExpanded: networkTab.expandedWifiSsid === modelData.ssid
 
                                     width: parent.width
@@ -1213,13 +1263,7 @@ Item {
                                                     buttonSize: 28
                                                     iconColor: isPinned ? Theme.primary : Theme.surfaceVariantText
                                                     onClicked: {
-                                                        const pins = JSON.parse(JSON.stringify(SettingsData.wifiNetworkPins || {}));
-                                                        if (isPinned) {
-                                                            delete pins["preferredWifi"];
-                                                        } else {
-                                                            pins["preferredWifi"] = modelData.ssid;
-                                                        }
-                                                        SettingsData.set("wifiNetworkPins", pins);
+                                                        networkTab.toggleWifiPin(modelData.ssid)
                                                     }
                                                 }
 
@@ -1520,7 +1564,7 @@ Item {
                                     hoverEnabled: true
                                     cursorShape: VPNService.importing ? Qt.BusyCursor : Qt.PointingHandCursor
                                     enabled: !VPNService.importing
-                                    onClicked: vpnFileBrowser.open()
+                                    onClicked: networkTab.openVpnFileBrowser()
                                 }
                             }
 

quickshell/Modules/Settings/NotificationsTab.qml

@@ -144,6 +144,15 @@ Item {
                     checked: SettingsData.notificationOverlayEnabled
                     onToggled: checked => SettingsData.set("notificationOverlayEnabled", checked)
                 }
+
+                SettingsToggleRow {
+                    settingKey: "notificationCompactMode"
+                    tags: ["notification", "compact", "size", "display", "mode"]
+                    text: I18n.tr("Compact")
+                    description: I18n.tr("Use smaller notification cards")
+                    checked: SettingsData.notificationCompactMode
+                    onToggled: checked => SettingsData.set("notificationCompactMode", checked)
+                }
             }
 
             SettingsCard {

quickshell/Modules/Settings/PluginBrowser.qml

@@ -270,7 +270,9 @@ FloatingWindow {
                                 root.updateFilteredPlugins();
                                 return;
                             }
-                            thirdPartyConfirmModal.visible = true;
+                            thirdPartyConfirmLoader.active = true;
+                            if (thirdPartyConfirmLoader.item)
+                                thirdPartyConfirmLoader.item.show();
                         }
                     }
 
@@ -668,119 +670,132 @@ FloatingWindow {
         }
     }
 
-    FloatingWindow {
-        id: thirdPartyConfirmModal
+    LazyLoader {
+        id: thirdPartyConfirmLoader
+        active: false
 
-        objectName: "thirdPartyConfirm"
-        title: I18n.tr("Third-Party Plugin Warning")
-        implicitWidth: 500
-        implicitHeight: 350
-        color: Theme.surfaceContainer
-        visible: false
+        FloatingWindow {
+            id: thirdPartyConfirmModal
 
-        FocusScope {
-            anchors.fill: parent
-            focus: true
-
-            Keys.onPressed: event => {
-                if (event.key === Qt.Key_Escape) {
-                    thirdPartyConfirmModal.visible = false;
-                    event.accepted = true;
-                }
+            function show() {
+                visible = true;
             }
 
-            Column {
+            function hide() {
+                visible = false;
+            }
+
+            objectName: "thirdPartyConfirm"
+            title: I18n.tr("Third-Party Plugin Warning")
+            implicitWidth: 500
+            implicitHeight: 350
+            color: Theme.surfaceContainer
+            visible: false
+
+            FocusScope {
                 anchors.fill: parent
-                anchors.margins: Theme.spacingL
-                spacing: Theme.spacingL
+                focus: true
 
-                Row {
-                    width: parent.width
-                    spacing: Theme.spacingM
-
-                    DankIcon {
-                        name: "warning"
-                        size: Theme.iconSize
-                        color: Theme.warning
-                        anchors.verticalCenter: parent.verticalCenter
+                Keys.onPressed: event => {
+                    if (event.key === Qt.Key_Escape) {
+                        thirdPartyConfirmModal.hide();
+                        event.accepted = true;
                     }
-
-                    StyledText {
-                        text: I18n.tr("Third-Party Plugin Warning")
-                        font.pixelSize: Theme.fontSizeLarge
-                        font.weight: Font.Medium
-                        color: Theme.surfaceText
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    Item {
-                        width: parent.width - parent.spacing * 2 - Theme.iconSize - parent.children[1].implicitWidth - closeConfirmBtn.width
-                        height: 1
-                    }
-
-                    DankActionButton {
-                        id: closeConfirmBtn
-                        iconName: "close"
-                        iconSize: Theme.iconSize - 2
-                        iconColor: Theme.outline
-                        anchors.verticalCenter: parent.verticalCenter
-                        onClicked: thirdPartyConfirmModal.visible = false
-                    }
-                }
-
-                StyledText {
-                    width: parent.width
-                    text: I18n.tr("Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\n\nThese plugins may pose security and privacy risks - install at your own risk.")
-                    font.pixelSize: Theme.fontSizeMedium
-                    color: Theme.surfaceText
-                    wrapMode: Text.WordWrap
                 }
 
                 Column {
-                    width: parent.width
-                    spacing: Theme.spacingS
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingL
 
-                    StyledText {
-                        text: I18n.tr("• Plugins may contain bugs or security issues")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "warning"
+                            size: Theme.iconSize
+                            color: Theme.warning
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("Third-Party Plugin Warning")
+                            font.pixelSize: Theme.fontSizeLarge
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        Item {
+                            width: parent.width - parent.spacing * 2 - Theme.iconSize - parent.children[1].implicitWidth - closeConfirmBtn.width
+                            height: 1
+                        }
+
+                        DankActionButton {
+                            id: closeConfirmBtn
+                            iconName: "close"
+                            iconSize: Theme.iconSize - 2
+                            iconColor: Theme.outline
+                            anchors.verticalCenter: parent.verticalCenter
+                            onClicked: thirdPartyConfirmModal.hide()
+                        }
                     }
 
                     StyledText {
-                        text: I18n.tr("• Review code before installation when possible")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
+                        width: parent.width
+                        text: I18n.tr("Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\n\nThese plugins may pose security and privacy risks - install at your own risk.")
+                        font.pixelSize: Theme.fontSizeMedium
+                        color: Theme.surfaceText
+                        wrapMode: Text.WordWrap
                     }
 
-                    StyledText {
-                        text: I18n.tr("• Install only from trusted sources")
-                        font.pixelSize: Theme.fontSizeSmall
-                        color: Theme.surfaceVariantText
-                    }
-                }
+                    Column {
+                        width: parent.width
+                        spacing: Theme.spacingS
 
-                Item {
-                    width: parent.width
-                    height: parent.height - parent.spacing * 3 - y
-                }
+                        StyledText {
+                            text: I18n.tr("• Plugins may contain bugs or security issues")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
 
-                Row {
-                    anchors.right: parent.right
-                    spacing: Theme.spacingM
+                        StyledText {
+                            text: I18n.tr("• Review code before installation when possible")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
 
-                    DankButton {
-                        text: I18n.tr("Cancel")
-                        iconName: "close"
-                        onClicked: thirdPartyConfirmModal.visible = false
+                        StyledText {
+                            text: I18n.tr("• Install only from trusted sources")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
                     }
 
-                    DankButton {
-                        text: I18n.tr("I Understand")
-                        iconName: "check"
-                        onClicked: {
-                            SessionData.setShowThirdPartyPlugins(true);
-                            root.updateFilteredPlugins();
-                            thirdPartyConfirmModal.visible = false;
+                    Item {
+                        width: parent.width
+                        height: parent.height - parent.spacing * 3 - y
+                    }
+
+                    Row {
+                        anchors.right: parent.right
+                        spacing: Theme.spacingM
+
+                        DankButton {
+                            text: I18n.tr("Cancel")
+                            iconName: "close"
+                            onClicked: thirdPartyConfirmModal.hide()
+                        }
+
+                        DankButton {
+                            text: I18n.tr("I Understand")
+                            iconName: "check"
+                            onClicked: {
+                                SessionData.setShowThirdPartyPlugins(true);
+                                root.updateFilteredPlugins();
+                                thirdPartyConfirmModal.hide();
+                            }
                         }
                     }
                 }

quickshell/Modules/Settings/PluginsTab.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import Quickshell
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -209,7 +210,7 @@ FocusScope {
                             iconName: "store"
                             enabled: DMSService.dmsAvailable
                             onClicked: {
-                                pluginBrowser.show();
+                                showPluginBrowser();
                             }
                         }
 
@@ -382,9 +383,11 @@ FocusScope {
     Connections {
         target: DMSService
         function onPluginsListReceived(plugins) {
-            pluginBrowser.isLoading = false;
-            pluginBrowser.allPlugins = plugins;
-            pluginBrowser.updateFilteredPlugins();
+            if (!pluginBrowserLoader.item)
+                return;
+            pluginBrowserLoader.item.isLoading = false;
+            pluginBrowserLoader.item.allPlugins = plugins;
+            pluginBrowserLoader.item.updateFilteredPlugins();
         }
         function onInstalledPluginsReceived(plugins) {
             var pluginMap = {};
@@ -410,22 +413,36 @@ FocusScope {
     }
 
     Component.onCompleted: {
-        pluginBrowser.parentModal = pluginsTab.parentModal;
         if (DMSService.dmsAvailable && DMSService.apiVersion >= 8)
             DMSService.listInstalled();
         if (PopoutService.pendingPluginInstall)
-            Qt.callLater(() => pluginBrowser.show());
+            Qt.callLater(showPluginBrowser);
     }
 
     Connections {
         target: PopoutService
         function onPendingPluginInstallChanged() {
             if (PopoutService.pendingPluginInstall)
-                pluginBrowser.show();
+                showPluginBrowser();
         }
     }
 
-    PluginBrowser {
-        id: pluginBrowser
+    LazyLoader {
+        id: pluginBrowserLoader
+        active: false
+
+        PluginBrowser {
+            id: pluginBrowserItem
+
+            Component.onCompleted: {
+                pluginBrowserItem.parentModal = pluginsTab.parentModal;
+            }
+        }
+    }
+
+    function showPluginBrowser() {
+        pluginBrowserLoader.active = true;
+        if (pluginBrowserLoader.item)
+            pluginBrowserLoader.item.show();
     }
 }

quickshell/Modules/Settings/RunningAppsTab.qml

@@ -32,6 +32,159 @@ Item {
                     onToggled: checked => SettingsData.set("runningAppsCurrentWorkspace", checked)
                 }
             }
+
+            SettingsCard {
+                width: parent.width
+                iconName: "find_replace"
+                title: I18n.tr("App ID Substitutions")
+                settingKey: "appIdSubstitutions"
+                tags: ["app", "icon", "substitution", "replacement", "pattern", "window", "class", "regex"]
+
+                headerActions: [
+                    DankActionButton {
+                        buttonSize: 36
+                        iconName: "restart_alt"
+                        iconSize: 20
+                        visible: JSON.stringify(SettingsData.appIdSubstitutions) !== JSON.stringify(SettingsData.getDefaultAppIdSubstitutions())
+                        backgroundColor: Theme.surfaceContainer
+                        iconColor: Theme.surfaceVariantText
+                        onClicked: SettingsData.resetAppIdSubstitutions()
+                    },
+                    DankActionButton {
+                        buttonSize: 36
+                        iconName: "add"
+                        iconSize: 20
+                        backgroundColor: Theme.surfaceContainer
+                        iconColor: Theme.primary
+                        onClicked: SettingsData.addAppIdSubstitution("", "", "exact")
+                    }
+                ]
+
+                Column {
+                    width: parent.width
+                    spacing: Theme.spacingS
+
+                    StyledText {
+                        text: I18n.tr("Map window class names to icon names for proper icon display")
+                        font.pixelSize: Theme.fontSizeSmall
+                        color: Theme.surfaceVariantText
+                        wrapMode: Text.WordWrap
+                        width: parent.width
+                        bottomPadding: Theme.spacingS
+                    }
+
+                    Repeater {
+                        model: SettingsData.appIdSubstitutions
+
+                        delegate: Rectangle {
+                            id: subItem
+                            width: parent.width
+                            height: subColumn.implicitHeight + Theme.spacingM
+                            radius: Theme.cornerRadius
+                            color: Theme.withAlpha(Theme.surfaceContainer, 0.5)
+
+                            Column {
+                                id: subColumn
+                                anchors.fill: parent
+                                anchors.margins: Theme.spacingS
+                                spacing: Theme.spacingS
+
+                                Row {
+                                    width: parent.width
+                                    spacing: Theme.spacingS
+
+                                    Column {
+                                        width: (parent.width - deleteBtn.width - Theme.spacingS) / 2
+                                        spacing: 2
+
+                                        StyledText {
+                                            text: I18n.tr("Pattern")
+                                            font.pixelSize: Theme.fontSizeSmall - 1
+                                            color: Theme.surfaceVariantText
+                                        }
+
+                                        DankTextField {
+                                            id: patternField
+                                            width: parent.width
+                                            text: modelData.pattern
+                                            font.pixelSize: Theme.fontSizeSmall
+                                            onEditingFinished: SettingsData.updateAppIdSubstitution(index, text, replacementField.text, modelData.type)
+                                        }
+                                    }
+
+                                    Column {
+                                        width: (parent.width - deleteBtn.width - Theme.spacingS) / 2
+                                        spacing: 2
+
+                                        StyledText {
+                                            text: I18n.tr("Replacement")
+                                            font.pixelSize: Theme.fontSizeSmall - 1
+                                            color: Theme.surfaceVariantText
+                                        }
+
+                                        DankTextField {
+                                            id: replacementField
+                                            width: parent.width
+                                            text: modelData.replacement
+                                            font.pixelSize: Theme.fontSizeSmall
+                                            onEditingFinished: SettingsData.updateAppIdSubstitution(index, patternField.text, text, modelData.type)
+                                        }
+                                    }
+
+                                    Item {
+                                        id: deleteBtn
+                                        width: 32
+                                        height: 40
+                                        anchors.verticalCenter: parent.verticalCenter
+
+                                        Rectangle {
+                                            anchors.fill: parent
+                                            radius: Theme.cornerRadius
+                                            color: deleteArea.containsMouse ? Theme.withAlpha(Theme.error, 0.2) : "transparent"
+                                        }
+
+                                        DankIcon {
+                                            anchors.centerIn: parent
+                                            name: "delete"
+                                            size: 18
+                                            color: deleteArea.containsMouse ? Theme.error : Theme.surfaceVariantText
+                                        }
+
+                                        MouseArea {
+                                            id: deleteArea
+                                            anchors.fill: parent
+                                            hoverEnabled: true
+                                            cursorShape: Qt.PointingHandCursor
+                                            onClicked: SettingsData.removeAppIdSubstitution(index)
+                                        }
+                                    }
+                                }
+
+                                Column {
+                                    width: 120
+                                    spacing: 2
+
+                                    StyledText {
+                                        text: I18n.tr("Type")
+                                        font.pixelSize: Theme.fontSizeSmall - 1
+                                        color: Theme.surfaceVariantText
+                                    }
+
+                                    DankDropdown {
+                                        width: parent.width
+                                        compactMode: true
+                                        dropdownWidth: 120
+                                        currentValue: modelData.type
+                                        options: ["exact", "contains", "regex"]
+                                        onValueChanged: value => SettingsData.updateAppIdSubstitution(index, modelData.pattern, modelData.replacement, value)
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
         }
     }
 }

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -131,7 +131,7 @@ Item {
         if (DMSService.dmsAvailable)
             DMSService.listInstalledThemes();
         if (PopoutService.pendingThemeInstall)
-            Qt.callLater(() => themeBrowser.show());
+            Qt.callLater(() => showThemeBrowser());
         templateCheckProcess.running = true;
         if (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl)
             checkCursorIncludeStatus();
@@ -169,7 +169,7 @@ Item {
         target: PopoutService
         function onPendingThemeInstallChanged() {
             if (PopoutService.pendingThemeInstall)
-                themeBrowser.show();
+                showThemeBrowser();
         }
     }
 
@@ -307,7 +307,7 @@ Item {
 
                     Item {
                         width: parent.width
-                        height: genericColorGrid.implicitHeight
+                        height: genericColorGrid.implicitHeight + Math.ceil(genericColorGrid.dotSize * 0.05)
                         visible: Theme.currentThemeCategory === "generic" && Theme.currentTheme !== Theme.dynamic && Theme.currentThemeName !== "custom"
 
                         Grid {
@@ -939,7 +939,7 @@ Item {
                             text: I18n.tr("Browse Themes", "browse themes button")
                             iconName: "store"
                             anchors.horizontalCenter: parent.horizontalCenter
-                            onClicked: themeBrowser.show()
+                            onClicked: showThemeBrowser()
                         }
                     }
                 }
@@ -2041,7 +2041,18 @@ Item {
         }
     }
 
-    ThemeBrowser {
-        id: themeBrowser
+    LazyLoader {
+        id: themeBrowserLoader
+        active: false
+
+        ThemeBrowser {
+            id: themeBrowserItem
+        }
+    }
+
+    function showThemeBrowser() {
+        themeBrowserLoader.active = true;
+        if (themeBrowserLoader.item)
+            themeBrowserLoader.item.show();
     }
 }

quickshell/Modules/Settings/WallpaperTab.qml

@@ -139,7 +139,7 @@ Item {
                                     MouseArea {
                                         anchors.fill: parent
                                         cursorShape: Qt.PointingHandCursor
-                                        onClicked: mainWallpaperBrowser.open()
+                                        onClicked: root.openMainWallpaperBrowser()
                                     }
                                 }
 
@@ -476,7 +476,7 @@ Item {
                                             MouseArea {
                                                 anchors.fill: parent
                                                 cursorShape: Qt.PointingHandCursor
-                                                onClicked: lightWallpaperBrowser.open()
+                                                onClicked: root.openLightWallpaperBrowser()
                                             }
                                         }
 
@@ -660,7 +660,7 @@ Item {
                                             MouseArea {
                                                 anchors.fill: parent
                                                 cursorShape: Qt.PointingHandCursor
-                                                onClicked: darkWallpaperBrowser.open()
+                                                onClicked: root.openDarkWallpaperBrowser()
                                             }
                                         }
 
@@ -1242,53 +1242,83 @@ Item {
         }
     }
 
-    FileBrowserModal {
-        id: mainWallpaperBrowser
-        parentModal: root.parentModal
-        browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
-        browserIcon: "wallpaper"
-        browserType: "wallpaper"
-        showHiddenFiles: true
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: path => {
-            if (SessionData.perMonitorWallpaper) {
-                SessionData.setMonitorWallpaper(selectedMonitorName, path);
-            } else {
-                SessionData.setWallpaper(path);
+    function openMainWallpaperBrowser() {
+        mainWallpaperBrowserLoader.active = true;
+        if (mainWallpaperBrowserLoader.item)
+            mainWallpaperBrowserLoader.item.open();
+    }
+
+    function openLightWallpaperBrowser() {
+        lightWallpaperBrowserLoader.active = true;
+        if (lightWallpaperBrowserLoader.item)
+            lightWallpaperBrowserLoader.item.open();
+    }
+
+    function openDarkWallpaperBrowser() {
+        darkWallpaperBrowserLoader.active = true;
+        if (darkWallpaperBrowserLoader.item)
+            darkWallpaperBrowserLoader.item.open();
+    }
+
+    LazyLoader {
+        id: mainWallpaperBrowserLoader
+        active: false
+
+        FileBrowserModal {
+            parentModal: root.parentModal
+            browserTitle: I18n.tr("Select Wallpaper", "wallpaper file browser title")
+            browserIcon: "wallpaper"
+            browserType: "wallpaper"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                if (SessionData.perMonitorWallpaper) {
+                    SessionData.setMonitorWallpaper(selectedMonitorName, path);
+                } else {
+                    SessionData.setWallpaper(path);
+                }
+                close();
             }
-            close();
         }
     }
 
-    FileBrowserModal {
-        id: lightWallpaperBrowser
-        parentModal: root.parentModal
-        browserTitle: I18n.tr("Select Wallpaper", "light mode wallpaper file browser title")
-        browserIcon: "light_mode"
-        browserType: "wallpaper"
-        showHiddenFiles: true
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: path => {
-            SessionData.wallpaperPathLight = path;
-            SessionData.syncWallpaperForCurrentMode();
-            SessionData.saveSettings();
-            close();
+    LazyLoader {
+        id: lightWallpaperBrowserLoader
+        active: false
+
+        FileBrowserModal {
+            parentModal: root.parentModal
+            browserTitle: I18n.tr("Select Wallpaper", "light mode wallpaper file browser title")
+            browserIcon: "light_mode"
+            browserType: "wallpaper"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                SessionData.wallpaperPathLight = path;
+                SessionData.syncWallpaperForCurrentMode();
+                SessionData.saveSettings();
+                close();
+            }
         }
     }
 
-    FileBrowserModal {
-        id: darkWallpaperBrowser
-        parentModal: root.parentModal
-        browserTitle: I18n.tr("Select Wallpaper", "dark mode wallpaper file browser title")
-        browserIcon: "dark_mode"
-        browserType: "wallpaper"
-        showHiddenFiles: true
-        fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
-        onFileSelected: path => {
-            SessionData.wallpaperPathDark = path;
-            SessionData.syncWallpaperForCurrentMode();
-            SessionData.saveSettings();
-            close();
+    LazyLoader {
+        id: darkWallpaperBrowserLoader
+        active: false
+
+        FileBrowserModal {
+            parentModal: root.parentModal
+            browserTitle: I18n.tr("Select Wallpaper", "dark mode wallpaper file browser title")
+            browserIcon: "dark_mode"
+            browserType: "wallpaper"
+            showHiddenFiles: true
+            fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
+            onFileSelected: path => {
+                SessionData.wallpaperPathDark = path;
+                SessionData.syncWallpaperForCurrentMode();
+                SessionData.saveSettings();
+                close();
+            }
         }
     }
 }

quickshell/Modules/Settings/Widgets/SettingsCard.qml

@@ -19,6 +19,7 @@ StyledRect {
     property string iconName: ""
     property bool collapsible: false
     property bool expanded: true
+    property real headerLeftPadding: 0
 
     default property alias content: contentColumn.children
     property alias headerActions: headerActionsRow.children
@@ -115,6 +116,7 @@ StyledRect {
 
             Row {
                 anchors.left: parent.left
+                anchors.leftMargin: root.headerLeftPadding
                 anchors.verticalCenter: parent.verticalCenter
                 spacing: Theme.spacingM
 
@@ -142,7 +144,7 @@ StyledRect {
 
             Row {
                 id: headerActionsRow
-                anchors.right: caretIcon.left
+                anchors.right: root.collapsible ? caretIcon.left : parent.right
                 anchors.rightMargin: root.collapsible ? Theme.spacingS : 0
                 anchors.verticalCenter: parent.verticalCenter
                 spacing: Theme.spacingXS
@@ -172,6 +174,7 @@ StyledRect {
             }
 
             MouseArea {
+                visible: root.collapsible
                 anchors.left: caretIcon.left
                 anchors.right: parent.right
                 anchors.top: parent.top

quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml

@@ -51,6 +51,7 @@ StyledRect {
 
                 Row {
                     spacing: Theme.spacingM
+                    width: parent.width
 
                     DankIcon {
                         id: headerIcon
@@ -69,6 +70,8 @@ StyledRect {
                         color: Theme.surfaceText
                         anchors.verticalCenter: parent.verticalCenter
                         visible: root.title !== ""
+                        width: parent.width - (headerIcon.visible ? headerIcon.width + parent.spacing : 0)
+                        horizontalAlignment: Text.AlignLeft
                     }
                 }
 

quickshell/Modules/Settings/WidgetsTab.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -382,6 +383,7 @@ Item {
             widgetObj.showMicPercent = SettingsData.controlCenterShowMicPercent;
             widgetObj.showBatteryIcon = SettingsData.controlCenterShowBatteryIcon;
             widgetObj.showPrinterIcon = SettingsData.controlCenterShowPrinterIcon;
+            widgetObj.showScreenSharingIcon = SettingsData.controlCenterShowScreenSharingIcon;
         }
         if (widgetId === "diskUsage")
             widgetObj.mountPath = "/";
@@ -400,6 +402,24 @@ Item {
         setWidgetsForSection(sectionId, widgets);
     }
 
+    function cloneWidgetData(widget) {
+        if (typeof widget === "string")
+            return {
+                "id": widget,
+                "enabled": true
+            };
+        var result = {
+            "id": widget.id,
+            "enabled": widget.enabled
+        };
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon"];
+        for (var i = 0; i < keys.length; i++) {
+            if (widget[keys[i]] !== undefined)
+                result[keys[i]] = widget[keys[i]];
+        }
+        return result;
+    }
+
     function handleItemEnabledChanged(sectionId, itemId, enabled) {
         var widgets = getWidgetsForSection(sectionId).slice();
         for (var i = 0; i < widgets.length; i++) {
@@ -407,42 +427,8 @@ Item {
             var widgetId = typeof widget === "string" ? widget : widget.id;
             if (widgetId !== itemId)
                 continue;
-
-            if (typeof widget === "string") {
-                widgets[i] = {
-                    "id": widget,
-                    "enabled": enabled
-                };
-                break;
-            }
-
-            var newWidget = {
-                "id": widget.id,
-                "enabled": enabled
-            };
-            if (widget.size !== undefined)
-                newWidget.size = widget.size;
-            if (widget.selectedGpuIndex !== undefined)
-                newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-            else if (widget.id === "gpuTemp")
-                newWidget.selectedGpuIndex = 0;
-            if (widget.pciId !== undefined)
-                newWidget.pciId = widget.pciId;
-            else if (widget.id === "gpuTemp")
-                newWidget.pciId = "";
-            if (widget.id === "controlCenterButton") {
-                newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-                newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-                newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-                newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-                newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-                newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-                newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-                newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-                newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-                newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-                newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-            }
+            var newWidget = cloneWidgetData(widget);
+            newWidget.enabled = enabled;
             widgets[i] = newWidget;
             break;
         }
@@ -455,128 +441,36 @@ Item {
 
     function handleSpacerSizeChanged(sectionId, widgetIndex, newSize) {
         var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetIndex < 0 || widgetIndex >= widgets.length)
             return;
-        }
-
         var widget = widgets[widgetIndex];
         var widgetId = typeof widget === "string" ? widget : widget.id;
-        if (widgetId !== "spacer") {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetId !== "spacer")
             return;
-        }
-
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "size": newSize
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "size": newSize
-        };
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-        }
+        var newWidget = cloneWidgetData(widget);
+        newWidget.size = newSize;
         widgets[widgetIndex] = newWidget;
         setWidgetsForSection(sectionId, widgets);
     }
 
     function handleGpuSelectionChanged(sectionId, widgetIndex, selectedGpuIndex) {
         var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetIndex < 0 || widgetIndex >= widgets.length)
             return;
-        }
-
         var pciId = DgopService.availableGpus && DgopService.availableGpus.length > selectedGpuIndex ? DgopService.availableGpus[selectedGpuIndex].pciId : "";
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "selectedGpuIndex": selectedGpuIndex,
-                "pciId": pciId
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "selectedGpuIndex": selectedGpuIndex,
-            "pciId": pciId
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.selectedGpuIndex = selectedGpuIndex;
+        newWidget.pciId = pciId;
         widgets[widgetIndex] = newWidget;
         setWidgetsForSection(sectionId, widgets);
     }
 
     function handleDiskMountSelectionChanged(sectionId, widgetIndex, mountPath) {
         var widgets = getWidgetsForSection(sectionId).slice();
-        if (widgetIndex < 0 || widgetIndex >= widgets.length) {
-            setWidgetsForSection(sectionId, widgets);
+        if (widgetIndex < 0 || widgetIndex >= widgets.length)
             return;
-        }
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "mountPath": mountPath
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "mountPath": mountPath
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-        }
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.mountPath = mountPath;
         widgets[widgetIndex] = newWidget;
         setWidgetsForSection(sectionId, widgets);
     }
@@ -585,32 +479,8 @@ Item {
         var widgets = getWidgetsForSection(sectionId).slice();
         if (widgetIndex < 0 || widgetIndex >= widgets.length)
             return;
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widget = {
-                "id": widget,
-                "enabled": true
-            };
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled !== undefined ? widget.enabled : true,
-            "showNetworkIcon": widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon,
-            "showBluetoothIcon": widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon,
-            "showAudioIcon": widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon,
-            "showAudioPercent": widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent,
-            "showVpnIcon": widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon,
-            "showBrightnessIcon": widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon,
-            "showBrightnessPercent": widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent,
-            "showMicIcon": widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon,
-            "showMicPercent": widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent,
-            "showBatteryIcon": widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon,
-            "showPrinterIcon": widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon
-        };
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
         newWidget[settingName] = value;
-
         widgets[widgetIndex] = newWidget;
         setWidgetsForSection(sectionId, widgets);
     }
@@ -635,46 +505,8 @@ Item {
             setWidgetsForSection(sectionId, widgets);
             return;
         }
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "minimumWidth": enabled
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "minimumWidth": enabled
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.mountPath !== undefined)
-            newWidget.mountPath = widget.mountPath;
-        if (widget.showSwap !== undefined)
-            newWidget.showSwap = widget.showSwap;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-        }
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.minimumWidth = enabled;
         widgets[widgetIndex] = newWidget;
         setWidgetsForSection(sectionId, widgets);
     }
@@ -685,141 +517,41 @@ Item {
             setWidgetsForSection(sectionId, widgets);
             return;
         }
-
-        var widget = widgets[widgetIndex];
-        if (typeof widget === "string") {
-            widgets[widgetIndex] = {
-                "id": widget,
-                "enabled": true,
-                "showSwap": enabled
-            };
-            setWidgetsForSection(sectionId, widgets);
-            return;
-        }
-
-        var newWidget = {
-            "id": widget.id,
-            "enabled": widget.enabled,
-            "showSwap": enabled
-        };
-        if (widget.size !== undefined)
-            newWidget.size = widget.size;
-        if (widget.selectedGpuIndex !== undefined)
-            newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-        if (widget.pciId !== undefined)
-            newWidget.pciId = widget.pciId;
-        if (widget.mountPath !== undefined)
-            newWidget.mountPath = widget.mountPath;
-        if (widget.minimumWidth !== undefined)
-            newWidget.minimumWidth = widget.minimumWidth;
-        if (widget.mediaSize !== undefined)
-            newWidget.mediaSize = widget.mediaSize;
-        if (widget.clockCompactMode !== undefined)
-            newWidget.clockCompactMode = widget.clockCompactMode;
-        if (widget.focusedWindowCompactMode !== undefined)
-            newWidget.focusedWindowCompactMode = widget.focusedWindowCompactMode;
-        if (widget.runningAppsCompactMode !== undefined)
-            newWidget.runningAppsCompactMode = widget.runningAppsCompactMode;
-        if (widget.keyboardLayoutNameCompactMode !== undefined)
-            newWidget.keyboardLayoutNameCompactMode = widget.keyboardLayoutNameCompactMode;
-        if (widget.id === "controlCenterButton") {
-            newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-            newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-            newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-            newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-            newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-            newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-            newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-            newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-            newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-            newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-            newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-        }
+        var newWidget = cloneWidgetData(widgets[widgetIndex]);
+        newWidget.showSwap = enabled;
         widgets[widgetIndex] = newWidget;
         setWidgetsForSection(sectionId, widgets);
     }
 
     function handleCompactModeChanged(sectionId, widgetId, value) {
         var widgets = getWidgetsForSection(sectionId).slice();
-
         for (var i = 0; i < widgets.length; i++) {
             var widget = widgets[i];
             var currentId = typeof widget === "string" ? widget : widget.id;
-
             if (currentId !== widgetId)
                 continue;
 
-            if (typeof widget === "string") {
-                widgets[i] = {
-                    "id": widget,
-                    "enabled": true
-                };
-                widget = widgets[i];
-            } else {
-                var newWidget = {
-                    "id": widget.id,
-                    "enabled": widget.enabled
-                };
-                if (widget.size !== undefined)
-                    newWidget.size = widget.size;
-                if (widget.selectedGpuIndex !== undefined)
-                    newWidget.selectedGpuIndex = widget.selectedGpuIndex;
-                if (widget.pciId !== undefined)
-                    newWidget.pciId = widget.pciId;
-                if (widget.mountPath !== undefined)
-                    newWidget.mountPath = widget.mountPath;
-                if (widget.minimumWidth !== undefined)
-                    newWidget.minimumWidth = widget.minimumWidth;
-                if (widget.showSwap !== undefined)
-                    newWidget.showSwap = widget.showSwap;
-                if (widget.mediaSize !== undefined)
-                    newWidget.mediaSize = widget.mediaSize;
-                if (widget.clockCompactMode !== undefined)
-                    newWidget.clockCompactMode = widget.clockCompactMode;
-                if (widget.focusedWindowCompactMode !== undefined)
-                    newWidget.focusedWindowCompactMode = widget.focusedWindowCompactMode;
-                if (widget.runningAppsCompactMode !== undefined)
-                    newWidget.runningAppsCompactMode = widget.runningAppsCompactMode;
-                if (widget.keyboardLayoutNameCompactMode !== undefined)
-                    newWidget.keyboardLayoutNameCompactMode = widget.keyboardLayoutNameCompactMode;
-                if (widget.id === "controlCenterButton") {
-                    newWidget.showNetworkIcon = widget.showNetworkIcon ?? SettingsData.controlCenterShowNetworkIcon;
-                    newWidget.showBluetoothIcon = widget.showBluetoothIcon ?? SettingsData.controlCenterShowBluetoothIcon;
-                    newWidget.showAudioIcon = widget.showAudioIcon ?? SettingsData.controlCenterShowAudioIcon;
-                    newWidget.showAudioPercent = widget.showAudioPercent ?? SettingsData.controlCenterShowAudioPercent;
-                    newWidget.showVpnIcon = widget.showVpnIcon ?? SettingsData.controlCenterShowVpnIcon;
-                    newWidget.showBrightnessIcon = widget.showBrightnessIcon ?? SettingsData.controlCenterShowBrightnessIcon;
-                    newWidget.showBrightnessPercent = widget.showBrightnessPercent ?? SettingsData.controlCenterShowBrightnessPercent;
-                    newWidget.showMicIcon = widget.showMicIcon ?? SettingsData.controlCenterShowMicIcon;
-                    newWidget.showMicPercent = widget.showMicPercent ?? SettingsData.controlCenterShowMicPercent;
-                    newWidget.showBatteryIcon = widget.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
-                    newWidget.showPrinterIcon = widget.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
-                }
-                widgets[i] = newWidget;
-                widget = newWidget;
-            }
-
+            var newWidget = cloneWidgetData(widget);
             switch (widgetId) {
             case "music":
-                widget.mediaSize = value;
+                newWidget.mediaSize = value;
                 break;
             case "clock":
-                widget.clockCompactMode = value;
+                newWidget.clockCompactMode = value;
                 break;
             case "focusedWindow":
-                widget.focusedWindowCompactMode = value;
+                newWidget.focusedWindowCompactMode = value;
                 break;
             case "runningApps":
-                widget.runningAppsCompactMode = value;
+                newWidget.runningAppsCompactMode = value;
                 break;
             case "keyboard_layout_name":
-                widget.keyboardLayoutNameCompactMode = value;
+                newWidget.keyboardLayoutNameCompactMode = value;
                 break;
             }
-
+            widgets[i] = newWidget;
             break;
         }
-
         setWidgetsForSection(sectionId, widgets);
     }
 
@@ -866,6 +598,8 @@ Item {
                     item.showBatteryIcon = widget.showBatteryIcon;
                 if (widget.showPrinterIcon !== undefined)
                     item.showPrinterIcon = widget.showPrinterIcon;
+                if (widget.showScreenSharingIcon !== undefined)
+                    item.showScreenSharingIcon = widget.showScreenSharingIcon;
                 if (widget.minimumWidth !== undefined)
                     item.minimumWidth = widget.minimumWidth;
                 if (widget.showSwap !== undefined)
@@ -916,14 +650,28 @@ Item {
         });
     }
 
-    WidgetSelectionPopup {
-        id: widgetSelectionPopup
-        parentModal: widgetsTab.parentModal
-        onWidgetSelected: (widgetId, targetSection) => {
-            widgetsTab.addWidgetToSection(widgetId, targetSection);
+    LazyLoader {
+        id: widgetSelectionPopupLoader
+        active: false
+
+        WidgetSelectionPopup {
+            id: widgetSelectionPopupItem
+            parentModal: widgetsTab.parentModal
+            onWidgetSelected: (widgetId, targetSection) => {
+                widgetsTab.addWidgetToSection(widgetId, targetSection);
+            }
         }
     }
 
+    function showWidgetSelectionPopup(sectionId) {
+        widgetSelectionPopupLoader.active = true;
+        if (!widgetSelectionPopupLoader.item)
+            return;
+        widgetSelectionPopupLoader.item.targetSection = sectionId;
+        widgetSelectionPopupLoader.item.allWidgets = widgetsTab.getWidgetsForPopup();
+        widgetSelectionPopupLoader.item.show();
+    }
+
     DankFlickable {
         anchors.fill: parent
         clip: true
@@ -1113,9 +861,7 @@ Item {
                             widgetsTab.handleItemOrderChanged(sectionId, newOrder);
                         }
                         onAddWidget: sectionId => {
-                            widgetSelectionPopup.targetSection = sectionId;
-                            widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
-                            widgetSelectionPopup.show();
+                            showWidgetSelectionPopup(sectionId);
                         }
                         onRemoveWidget: (sectionId, index) => {
                             widgetsTab.removeWidgetFromSection(sectionId, index);
@@ -1170,9 +916,7 @@ Item {
                             widgetsTab.handleItemOrderChanged(sectionId, newOrder);
                         }
                         onAddWidget: sectionId => {
-                            widgetSelectionPopup.targetSection = sectionId;
-                            widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
-                            widgetSelectionPopup.show();
+                            showWidgetSelectionPopup(sectionId);
                         }
                         onRemoveWidget: (sectionId, index) => {
                             widgetsTab.removeWidgetFromSection(sectionId, index);
@@ -1227,9 +971,7 @@ Item {
                             widgetsTab.handleItemOrderChanged(sectionId, newOrder);
                         }
                         onAddWidget: sectionId => {
-                            widgetSelectionPopup.targetSection = sectionId;
-                            widgetSelectionPopup.allWidgets = widgetsTab.getWidgetsForPopup();
-                            widgetSelectionPopup.show();
+                            showWidgetSelectionPopup(sectionId);
                         }
                         onRemoveWidget: (sectionId, index) => {
                             widgetsTab.removeWidgetFromSection(sectionId, index);

quickshell/Modules/Settings/WidgetsTabSection.qml

@@ -31,6 +31,19 @@ Column {
     signal minimumWidthChanged(string sectionId, int widgetIndex, bool enabled)
     signal showSwapChanged(string sectionId, int widgetIndex, bool enabled)
 
+    function cloneWidgetData(widget) {
+        var result = {
+            "id": widget.id,
+            "enabled": widget.enabled
+        };
+        var keys = ["size", "selectedGpuIndex", "pciId", "mountPath", "minimumWidth", "showSwap", "mediaSize", "clockCompactMode", "focusedWindowCompactMode", "runningAppsCompactMode", "keyboardLayoutNameCompactMode", "showNetworkIcon", "showBluetoothIcon", "showAudioIcon", "showAudioPercent", "showVpnIcon", "showBrightnessIcon", "showBrightnessPercent", "showMicIcon", "showMicPercent", "showBatteryIcon", "showPrinterIcon", "showScreenSharingIcon"];
+        for (var i = 0; i < keys.length; i++) {
+            if (widget[keys[i]] !== undefined)
+                result[keys[i]] = widget[keys[i]];
+        }
+        return result;
+    }
+
     width: parent.width
     height: implicitHeight
     spacing: Theme.spacingM
@@ -727,13 +740,7 @@ Column {
                                     var newItems = root.items.slice();
                                     var draggedItem = newItems.splice(index, 1)[0];
                                     newItems.splice(newIndex, 0, draggedItem);
-                                    root.itemOrderChanged(newItems.map(item => {
-                                        return ({
-                                                "id": item.id,
-                                                "enabled": item.enabled,
-                                                "size": item.size
-                                            });
-                                    }));
+                                    root.itemOrderChanged(newItems.map(item => root.cloneWidgetData(item)));
                                 }
                             }
                             delegateItem.x = 0;
@@ -875,6 +882,11 @@ Column {
                             icon: "print",
                             label: I18n.tr("Printer"),
                             setting: "showPrinterIcon"
+                        },
+                        {
+                            icon: "screen_record",
+                            label: I18n.tr("Screen Sharing"),
+                            setting: "showScreenSharingIcon"
                         }
                     ]
 
@@ -907,6 +919,8 @@ Column {
                                 return wd?.showBatteryIcon ?? SettingsData.controlCenterShowBatteryIcon;
                             case "showPrinterIcon":
                                 return wd?.showPrinterIcon ?? SettingsData.controlCenterShowPrinterIcon;
+                            case "showScreenSharingIcon":
+                                return wd?.showScreenSharingIcon ?? SettingsData.controlCenterShowScreenSharingIcon;
                             default:
                                 return false;
                             }

quickshell/Modules/Settings/WorkspacesTab.qml

@@ -63,15 +63,15 @@ Item {
                     onToggled: checked => SettingsData.set("showWorkspaceApps", checked)
                 }
 
-                Row {
-                    width: parent.width - Theme.spacingL
-                    spacing: Theme.spacingL
+                Item {
+                    width: parent.width
+                    height: maxAppsColumn.height
                     visible: SettingsData.showWorkspaceApps
                     opacity: visible ? 1 : 0
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.spacingL
 
                     Column {
+                        id: maxAppsColumn
+                        x: Theme.spacingL
                         width: 120
                         spacing: Theme.spacingS
 
@@ -80,14 +80,15 @@ Item {
                             font.pixelSize: Theme.fontSizeSmall
                             color: Theme.surfaceText
                             font.weight: Font.Medium
+                            horizontalAlignment: Text.AlignLeft
                         }
 
                         DankTextField {
                             width: 100
                             height: 28
-                            placeholderText: "#ffffff"
+                            placeholderText: "3"
                             text: SettingsData.maxWorkspaceIcons
-                            maximumLength: 7
+                            maximumLength: 2
                             font.pixelSize: Theme.fontSizeSmall
                             topPadding: Theme.spacingXS
                             bottomPadding: Theme.spacingXS
@@ -114,12 +115,13 @@ Item {
                 }
 
                 SettingsToggleRow {
-                    settingKey: "workspacesPerMonitor"
-                    tags: ["workspace", "per-monitor", "multi-monitor"]
-                    text: I18n.tr("Per-Monitor Workspaces")
-                    description: I18n.tr("Show only workspaces belonging to each specific monitor.")
-                    checked: SettingsData.workspacesPerMonitor
-                    onToggled: checked => SettingsData.set("workspacesPerMonitor", checked)
+                    settingKey: "workspaceFollowFocus"
+                    tags: ["workspace", "focus", "follow", "monitor"]
+                    text: I18n.tr("Follow Monitor Focus")
+                    description: I18n.tr("Show workspaces of the currently focused monitor")
+                    checked: SettingsData.workspaceFollowFocus
+                    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway || CompositorService.isScroll
+                    onToggled: checked => SettingsData.set("workspaceFollowFocus", checked)
                 }
 
                 SettingsToggleRow {
@@ -153,6 +155,189 @@ Item {
                 }
             }
 
+            SettingsCard {
+                width: parent.width
+                iconName: "palette"
+                title: I18n.tr("Workspace Appearance")
+                settingKey: "workspaceAppearance"
+
+                SettingsButtonGroupRow {
+                    text: I18n.tr("Focused Color")
+                    model: ["pri", "s", "sc", "sch", "none"]
+                    buttonHeight: 22
+                    minButtonWidth: 36
+                    buttonPadding: Theme.spacingS
+                    checkIconSize: Theme.iconSizeSmall - 2
+                    textSize: Theme.fontSizeSmall - 1
+                    spacing: 1
+                    currentIndex: {
+                        switch (SettingsData.workspaceColorMode) {
+                        case "s":
+                            return 1;
+                        case "sc":
+                            return 2;
+                        case "sch":
+                            return 3;
+                        case "none":
+                            return 4;
+                        default:
+                            return 0;
+                        }
+                    }
+                    onSelectionChanged: (index, selected) => {
+                        if (!selected)
+                            return;
+                        const modes = ["default", "s", "sc", "sch", "none"];
+                        SettingsData.set("workspaceColorMode", modes[index]);
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Theme.outline
+                    opacity: 0.15
+                }
+
+                SettingsButtonGroupRow {
+                    text: I18n.tr("Unfocused Color")
+                    model: ["def", "s", "sc", "sch"]
+                    buttonHeight: 22
+                    minButtonWidth: 36
+                    buttonPadding: Theme.spacingS
+                    checkIconSize: Theme.iconSizeSmall - 2
+                    textSize: Theme.fontSizeSmall - 1
+                    spacing: 1
+                    currentIndex: {
+                        switch (SettingsData.workspaceUnfocusedColorMode) {
+                        case "s":
+                            return 1;
+                        case "sc":
+                            return 2;
+                        case "sch":
+                            return 3;
+                        default:
+                            return 0;
+                        }
+                    }
+                    onSelectionChanged: (index, selected) => {
+                        if (!selected)
+                            return;
+                        const modes = ["default", "s", "sc", "sch"];
+                        SettingsData.set("workspaceUnfocusedColorMode", modes[index]);
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Theme.outline
+                    opacity: 0.15
+                    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway || CompositorService.isScroll
+                }
+
+                SettingsButtonGroupRow {
+                    text: I18n.tr("Urgent Color")
+                    visible: CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl || CompositorService.isSway || CompositorService.isScroll
+                    model: ["err", "pri", "sec", "s", "sc"]
+                    buttonHeight: 22
+                    minButtonWidth: 36
+                    buttonPadding: Theme.spacingS
+                    checkIconSize: Theme.iconSizeSmall - 2
+                    textSize: Theme.fontSizeSmall - 1
+                    spacing: 1
+                    currentIndex: {
+                        switch (SettingsData.workspaceUrgentColorMode) {
+                        case "primary":
+                            return 1;
+                        case "secondary":
+                            return 2;
+                        case "s":
+                            return 3;
+                        case "sc":
+                            return 4;
+                        default:
+                            return 0;
+                        }
+                    }
+                    onSelectionChanged: (index, selected) => {
+                        if (!selected)
+                            return;
+                        const modes = ["default", "primary", "secondary", "s", "sc"];
+                        SettingsData.set("workspaceUrgentColorMode", modes[index]);
+                    }
+                }
+
+                Rectangle {
+                    width: parent.width
+                    height: 1
+                    color: Theme.outline
+                    opacity: 0.15
+                }
+
+                SettingsToggleRow {
+                    settingKey: "workspaceFocusedBorderEnabled"
+                    tags: ["workspace", "border", "outline", "focused", "ring"]
+                    text: I18n.tr("Focused Border")
+                    description: I18n.tr("Show an outline ring around the focused workspace indicator")
+                    checked: SettingsData.workspaceFocusedBorderEnabled
+                    onToggled: checked => SettingsData.set("workspaceFocusedBorderEnabled", checked)
+                }
+
+                Column {
+                    width: parent.width
+                    spacing: Theme.spacingS
+                    visible: SettingsData.workspaceFocusedBorderEnabled
+                    leftPadding: Theme.spacingM
+
+                    SettingsButtonGroupRow {
+                        width: parent.width - parent.leftPadding
+                        text: I18n.tr("Border Color")
+                        model: [I18n.tr("Surface"), I18n.tr("Secondary"), I18n.tr("Primary")]
+                        currentIndex: {
+                            switch (SettingsData.workspaceFocusedBorderColor) {
+                            case "surfaceText":
+                                return 0;
+                            case "secondary":
+                                return 1;
+                            case "primary":
+                                return 2;
+                            default:
+                                return 2;
+                            }
+                        }
+                        onSelectionChanged: (index, selected) => {
+                            if (!selected)
+                                return;
+                            let newColor = "primary";
+                            switch (index) {
+                            case 0:
+                                newColor = "surfaceText";
+                                break;
+                            case 1:
+                                newColor = "secondary";
+                                break;
+                            case 2:
+                                newColor = "primary";
+                                break;
+                            }
+                            SettingsData.set("workspaceFocusedBorderColor", newColor);
+                        }
+                    }
+
+                    SettingsSliderRow {
+                        width: parent.width - parent.leftPadding
+                        text: I18n.tr("Thickness")
+                        value: SettingsData.workspaceFocusedBorderThickness
+                        minimum: 1
+                        maximum: 6
+                        unit: "px"
+                        defaultValue: 2
+                        onSliderValueChanged: newValue => SettingsData.set("workspaceFocusedBorderThickness", newValue)
+                    }
+                }
+            }
+
             SettingsCard {
                 width: parent.width
                 iconName: "label"

quickshell/Modules/WorkspaceOverlays/NiriOverviewOverlay.qml

@@ -14,7 +14,7 @@ Scope {
     property bool isClosing: false
     property bool releaseKeyboard: false
     readonly property bool spotlightModalOpen: PopoutService.spotlightModal?.spotlightOpen ?? false
-    property bool overlayActive: (NiriService.inOverview && !spotlightModalOpen) || searchActive
+    property bool overlayActive: NiriService.inOverview || searchActive
 
     function showSpotlight(screenName) {
         isClosing = false;

quickshell/Modules/WorkspaceOverlays/OverviewWindow.qml

@@ -33,8 +33,8 @@ Item {
 
     property var iconToWindowRatio: 0.25
     property var iconToWindowRatioCompact: 0.45
-    property var entry: DesktopEntries.heuristicLookup(windowData?.class)
-    property var iconPath: Quickshell.iconPath(entry?.icon ?? windowData?.class ?? "application-x-executable", "image-missing")
+    property var entry: DesktopEntries.heuristicLookup(Paths.moddedAppId(windowData?.class ?? ""))
+    property var iconPath: Paths.getAppIcon(windowData?.class ?? "", entry) || Quickshell.iconPath("application-x-executable", "image-missing")
     property bool compactMode: Theme.fontSizeSmall * 4 > targetWindowHeight || Theme.fontSizeSmall * 4 > targetWindowWidth
 
     x: initX

quickshell/Services/AudioService.qml

@@ -510,6 +510,16 @@ Singleton {
         objects: Pipewire.nodes.values.filter(node => node.audio && !node.isStream)
     }
 
+    Connections {
+        target: Pipewire
+        function onDefaultAudioSinkChanged() {
+            if (soundsAvailable) {
+                Qt.callLater(root.destroySoundPlayers);
+                Qt.callLater(root.createSoundPlayers);
+            }
+        }
+    }
+
     function setVolume(percentage) {
         if (!root.sink?.audio) {
             return "No audio sink available";

quickshell/Services/ChangelogService.qml

@@ -11,7 +11,7 @@ Singleton {
     id: root
 
     readonly property string currentVersion: "1.2"
-    readonly property bool changelogEnabled: false
+    readonly property bool changelogEnabled: true
 
     readonly property string configDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation)) + "/DankMaterialShell"
     readonly property string changelogMarkerPath: configDir + "/.changelog-" + currentVersion
@@ -37,7 +37,27 @@ Singleton {
     Component.onCompleted: {
         if (!changelogEnabled)
             return;
-        changelogCheckProcess.running = true;
+        if (FirstLaunchService.checkComplete)
+            handleFirstLaunchResult();
+    }
+
+    function handleFirstLaunchResult() {
+        if (FirstLaunchService.isFirstLaunch) {
+            checkComplete = true;
+            changelogDismissed = true;
+            touchMarkerProcess.running = true;
+        } else {
+            changelogCheckProcess.running = true;
+        }
+    }
+
+    Connections {
+        target: FirstLaunchService
+
+        function onCheckCompleteChanged() {
+            if (FirstLaunchService.checkComplete && root.changelogEnabled && !root.checkComplete)
+                root.handleFirstLaunchResult();
+        }
     }
 
     function showChangelog() {
@@ -66,9 +86,7 @@ Singleton {
                     root.changelogDismissed = true;
                     break;
                 case "show":
-                    if (typeof FirstLaunchService === "undefined" || !FirstLaunchService.isFirstLaunch) {
-                        root.changelogRequested();
-                    }
+                    root.changelogRequested();
                     break;
                 }
             }

quickshell/Services/DgopService.qml

@@ -316,15 +316,16 @@ Singleton {
             const totalKB = mem.total || 0;
             const availableKB = mem.available || 0;
             const freeKB = mem.free || 0;
+            const usedKB = mem.used !== undefined ? mem.used : (totalKB - availableKB);
 
             totalMemoryMB = totalKB / 1024;
             availableMemoryMB = availableKB / 1024;
             freeMemoryMB = freeKB / 1024;
-            usedMemoryMB = totalMemoryMB - availableMemoryMB;
-            memoryUsage = totalKB > 0 ? ((totalKB - availableKB) / totalKB) * 100 : 0;
+            usedMemoryMB = usedKB / 1024;
+            memoryUsage = mem.usedPercent !== undefined ? mem.usedPercent : (totalKB > 0 ? ((totalKB - availableKB) / totalKB) * 100 : 0);
 
             totalMemoryKB = totalKB;
-            usedMemoryKB = totalKB - availableKB;
+            usedMemoryKB = usedKB;
             totalSwapKB = mem.swaptotal || 0;
             usedSwapKB = (mem.swaptotal || 0) - (mem.swapfree || 0);
 

quickshell/Services/FirstLaunchService.qml

@@ -74,12 +74,10 @@ Singleton {
         stdout: SplitParser {
             onRead: data => {
                 const result = data.trim();
-                root.checkComplete = true;
 
                 if (result === "first") {
                     root.isFirstLaunch = true;
                     console.info("FirstLaunchService: First launch detected, greeter will be shown");
-                    root.greeterRequested();
                 } else if (result === "existing_user") {
                     root.isFirstLaunch = false;
                     console.info("FirstLaunchService: Existing user detected, silently creating marker");
@@ -87,6 +85,11 @@ Singleton {
                 } else {
                     root.isFirstLaunch = false;
                 }
+
+                root.checkComplete = true;
+
+                if (root.isFirstLaunch)
+                    root.greeterRequested();
             }
         }
     }

quickshell/Services/KeybindsService.qml

@@ -1,5 +1,5 @@
 pragma Singleton
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
@@ -501,8 +501,12 @@ Singleton {
         return Actions.buildSpawnAction(command, args);
     }
 
-    function buildShellAction(shellCmd) {
-        return Actions.buildShellAction(currentProvider, shellCmd);
+    function buildShellAction(shellCmd, shell) {
+        return Actions.buildShellAction(currentProvider, shellCmd, shell);
+    }
+
+    function getShellFromAction(action) {
+        return Actions.getShellFromAction(action);
     }
 
     function parseSpawnCommand(action) {

quickshell/Services/NiriService.qml

@@ -1,5 +1,5 @@
 pragma Singleton
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtCore
 import QtQuick
@@ -27,6 +27,10 @@ Singleton {
 
     property bool inOverview: false
 
+    property var casts: []
+    property bool hasCasts: casts.length > 0
+    property bool hasActiveCast: casts.some(c => c.is_active)
+
     property int currentKeyboardLayoutIndex: 0
     property var keyboardLayoutNames: []
 
@@ -356,6 +360,15 @@ Singleton {
         case 'ScreenshotCaptured':
             handleScreenshotCaptured(event.ScreenshotCaptured);
             break;
+        case 'CastsChanged':
+            handleCastsChanged(event.CastsChanged);
+            break;
+        case 'CastStartedOrChanged':
+            handleCastStartedOrChanged(event.CastStartedOrChanged);
+            break;
+        case 'CastStopped':
+            handleCastStopped(event.CastStopped);
+            break;
         }
     }
 
@@ -649,6 +662,28 @@ Singleton {
         }
     }
 
+    function handleCastsChanged(data) {
+        casts = data.casts || [];
+    }
+
+    function handleCastStartedOrChanged(data) {
+        if (!data.cast)
+            return;
+        const cast = data.cast;
+        const existingIndex = casts.findIndex(c => c.stream_id === cast.stream_id);
+        if (existingIndex >= 0) {
+            const updatedCasts = [...casts];
+            updatedCasts[existingIndex] = cast;
+            casts = updatedCasts;
+        } else {
+            casts = [...casts, cast];
+        }
+    }
+
+    function handleCastStopped(data) {
+        casts = casts.filter(c => c.stream_id !== data.stream_id);
+    }
+
     function updateCurrentOutputWorkspaces() {
         if (!currentOutput) {
             currentOutputWorkspaces = allWorkspaces;

quickshell/Services/NotificationService.qml

@@ -32,7 +32,6 @@ Singleton {
     property int maxIngressPerSecond: 20
     property double _lastIngressSec: 0
     property int _ingressCountThisSec: 0
-    property int maxStoredNotifications: SettingsData.notificationHistoryMaxCount
 
     property var _dismissQueue: []
     property int _dismissBatchSize: 8
@@ -340,30 +339,6 @@ Singleton {
         historyFileView.writeAdapter();
     }
 
-    function _trimStored() {
-        if (notifications.length > maxStoredNotifications) {
-            const overflow = notifications.length - maxStoredNotifications;
-            const toDrop = [];
-            for (var i = notifications.length - 1; i >= 0 && toDrop.length < overflow; --i) {
-                const w = notifications[i];
-                if (w && w.notification && w.urgency !== NotificationUrgency.Critical) {
-                    toDrop.push(w);
-                }
-            }
-            for (var i = notifications.length - 1; i >= 0 && toDrop.length < overflow; --i) {
-                const w = notifications[i];
-                if (w && w.notification && toDrop.indexOf(w) === -1) {
-                    toDrop.push(w);
-                }
-            }
-            for (const w of toDrop) {
-                try {
-                    w.notification.dismiss();
-                } catch (e) {}
-            }
-        }
-    }
-
     function onOverlayOpen() {
         popupsDisabled = true;
         addGate.stop();
@@ -493,7 +468,6 @@ Singleton {
                 root.allWrappers.push(wrapper);
                 if (!isTransient) {
                     root.notifications.push(wrapper);
-                    _trimStored();
                     if (_shouldSaveToHistory(notif.urgency)) {
                         root.addToHistory(wrapper);
                     }
@@ -529,10 +503,8 @@ Singleton {
 
         readonly property Timer timer: Timer {
             interval: {
-                if (!wrapper.notification) {
+                if (!wrapper.notification)
                     return 5000;
-                }
-
                 switch (wrapper.notification.urgency) {
                 case NotificationUrgency.Low:
                     return SettingsData.notificationTimeoutLow;
@@ -601,37 +573,38 @@ Singleton {
         }
 
         required property Notification notification
-        readonly property string summary: notification.summary
-        readonly property string body: notification.body
+        readonly property string summary: notification?.summary ?? ""
+        readonly property string body: notification?.body ?? ""
         readonly property string htmlBody: {
-            if (body && (body.includes('<') && body.includes('>'))) {
+            if (!body)
+                return "";
+            if (body.includes('<') && body.includes('>'))
                 return body;
-            }
             return Markdown2Html.markdownToHtml(body);
         }
-        readonly property string appIcon: notification.appIcon
+        readonly property string appIcon: notification?.appIcon ?? ""
         readonly property string appName: {
+            if (!notification)
+                return "app";
             if (notification.appName == "") {
                 const entry = DesktopEntries.heuristicLookup(notification.desktopEntry);
-                if (entry && entry.name) {
+                if (entry && entry.name)
                     return entry.name.toLowerCase();
-                }
             }
             return notification.appName || "app";
         }
-        readonly property string desktopEntry: notification.desktopEntry
-        readonly property string image: notification.image
+        readonly property string desktopEntry: notification?.desktopEntry ?? ""
+        readonly property string image: notification?.image ?? ""
         readonly property string cleanImage: {
-            if (!image) {
+            if (!image)
                 return "";
-            }
             return Paths.strip(image);
         }
-        readonly property int urgency: notification.urgency
-        readonly property list<NotificationAction> actions: notification.actions
+        readonly property int urgency: notification?.urgency ?? 1
+        readonly property list<NotificationAction> actions: notification?.actions ?? []
 
         readonly property Connections conn: Connections {
-            target: wrapper.notification.Retainable
+            target: wrapper.notification?.Retainable ?? null
 
             function onDropped(): void {
                 root.allWrappers = root.allWrappers.filter(w => w !== wrapper);
@@ -743,6 +716,8 @@ Singleton {
         }
 
         const next = notificationQueue.shift();
+        if (!next)
+            return;
 
         next.seq = ++seqCounter;
         visibleNotifications = [...visibleNotifications, next];
@@ -805,7 +780,7 @@ Singleton {
         const groups = {};
 
         for (const notif of notifications) {
-            if (!notif)
+            if (!notif || !notif.notification)
                 continue;
             const groupKey = getGroupKey(notif);
             if (!groups[groupKey]) {
@@ -823,14 +798,15 @@ Singleton {
             groups[groupKey].latestNotification = groups[groupKey].notifications[0];
             groups[groupKey].count = groups[groupKey].notifications.length;
 
-            if (notif.notification.hasInlineReply) {
+            if (notif.notification?.hasInlineReply)
                 groups[groupKey].hasInlineReply = true;
-            }
         }
 
         return Object.values(groups).sort((a, b) => {
-            const aUrgency = a.latestNotification.urgency || NotificationUrgency.Low;
-            const bUrgency = b.latestNotification.urgency || NotificationUrgency.Low;
+            if (!a.latestNotification || !b.latestNotification)
+                return 0;
+            const aUrgency = a.latestNotification.urgency ?? NotificationUrgency.Low;
+            const bUrgency = b.latestNotification.urgency ?? NotificationUrgency.Low;
             if (aUrgency !== bUrgency) {
                 return bUrgency - aUrgency;
             }
@@ -842,7 +818,7 @@ Singleton {
         const groups = {};
 
         for (const notif of popups) {
-            if (!notif)
+            if (!notif || !notif.notification)
                 continue;
             const groupKey = getGroupKey(notif);
             if (!groups[groupKey]) {
@@ -860,12 +836,13 @@ Singleton {
             groups[groupKey].latestNotification = groups[groupKey].notifications[0];
             groups[groupKey].count = groups[groupKey].notifications.length;
 
-            if (notif.notification.hasInlineReply) {
+            if (notif.notification?.hasInlineReply)
                 groups[groupKey].hasInlineReply = true;
-            }
         }
 
         return Object.values(groups).sort((a, b) => {
+            if (!a.latestNotification || !b.latestNotification)
+                return 0;
             return b.latestNotification.time.getTime() - a.latestNotification.time.getTime();
         });
     }

quickshell/Services/PluginService.qml

@@ -287,11 +287,14 @@ Singleton {
                 return false;
             }
 
-            // MODIFICATION: Treat Launchers as persistent instances like Daemons
-            if (isDaemon || isLauncher) {
+            if (isDaemon) {
+                const newDaemons = Object.assign({}, pluginDaemonComponents);
+                newDaemons[pluginId] = comp;
+                pluginDaemonComponents = newDaemons;
+            } else if (isLauncher) {
                 const instance = comp.createObject(root, {
                     "pluginId": pluginId,
-                    "pluginService": root // Inject PluginService
+                    "pluginService": root
                 });
                 if (!instance) {
                     console.error("PluginService: failed to instantiate plugin:", pluginId, comp.errorString());
@@ -302,15 +305,9 @@ Singleton {
                 newInstances[pluginId] = instance;
                 pluginInstances = newInstances;
 
-                if (isDaemon) {
-                    const newDaemons = Object.assign({}, pluginDaemonComponents);
-                    newDaemons[pluginId] = comp;
-                    pluginDaemonComponents = newDaemons;
-                } else {
-                    const newLaunchers = Object.assign({}, pluginLauncherComponents);
-                    newLaunchers[pluginId] = comp;
-                    pluginLauncherComponents = newLaunchers;
-                }
+                const newLaunchers = Object.assign({}, pluginLauncherComponents);
+                newLaunchers[pluginId] = comp;
+                pluginLauncherComponents = newLaunchers;
             } else if (isDesktop) {
                 const newDesktop = Object.assign({}, pluginDesktopComponents);
                 newDesktop[pluginId] = comp;

quickshell/Services/PopoutService.qml

@@ -27,7 +27,9 @@ Singleton {
     property var colorPickerModal: null
     property var notificationModal: null
     property var wifiPasswordModal: null
+    property var wifiPasswordModalLoader: null
     property var polkitAuthModal: null
+    property var polkitAuthModalLoader: null
     property var bluetoothPairingModal: null
     property var networkInfoModal: null
 
@@ -416,11 +418,17 @@ Singleton {
     }
 
     function showWifiPasswordModal(ssid) {
-        wifiPasswordModal?.show(ssid);
+        if (wifiPasswordModalLoader)
+            wifiPasswordModalLoader.active = true;
+        if (wifiPasswordModal)
+            wifiPasswordModal.show(ssid);
     }
 
     function showHiddenNetworkModal() {
-        wifiPasswordModal?.showHidden();
+        if (wifiPasswordModalLoader)
+            wifiPasswordModalLoader.active = true;
+        if (wifiPasswordModal)
+            wifiPasswordModal.showHidden();
     }
 
     function hideWifiPasswordModal() {

quickshell/Services/SystemUpdateService.qml

@@ -96,7 +96,7 @@ Singleton {
         "paru": archBasedPMSettings,
         "dnf": fedoraBasedPMSettings
     }
-    readonly property list<string> supportedDistributions: ["arch", "cachyos", "manjaro", "endeavouros", "fedora"]
+    readonly property list<string> supportedDistributions: ["arch", "artix", "cachyos", "manjaro", "endeavouros", "fedora"]
     readonly property int updateCount: availableUpdates.length
     readonly property bool helperAvailable: pkgManager !== "" && distributionSupported
 

quickshell/Services/WeatherService.qml

@@ -745,6 +745,7 @@ Singleton {
 
                             hourly_forecast.push({
                                 "time": formatTime(hourly.time[i]),
+                                "rawTime": hourly.time[i],
                                 "temp": Math.round(tempC),
                                 "tempF": Math.round(tempF),
                                 "feelsLike": Math.round(feelsLikeC),
@@ -753,7 +754,7 @@ Singleton {
                                 "humidity": Math.round(hourly.relative_humidity_2m?.[i] || 0),
                                 "wind": Math.round(hourly.wind_speed_10m?.[i] || 0),
                                 "pressure": Math.round(hourly.surface_pressure?.[i] || 0),
-                                "precipitationProbability": Math.round(hourly.precipitation_probability_max?.[0] || 0),
+                                "precipitationProbability": Math.round(hourly.precipitation_probability?.[i] || 0),
                                 "visibility": Math.round(hourly.visibility?.[i] || 0),
                                 "isDay": isDay
                             });
@@ -778,7 +779,9 @@ Singleton {
                                 "tempMaxF": Math.round(tempMaxF),
                                 "precipitationProbability": Math.round(daily.precipitation_probability_max?.[i] || 0),
                                 "sunrise": daily.sunrise?.[i] ? formatTime(daily.sunrise[i]) : "",
-                                "sunset": daily.sunset?.[i] ? formatTime(daily.sunset[i]) : ""
+                                "sunset": daily.sunset?.[i] ? formatTime(daily.sunset[i]) : "",
+                                "rawSunrise": daily.sunrise?.[i] || "",
+                                "rawSunset": daily.sunset?.[i] || ""
                             });
                         }
                     }
@@ -805,6 +808,8 @@ Singleton {
                         "wind": Math.round(current.wind_speed_10m || 0) + " " + (currentUnits.wind_speed_10m || 'm/s'),
                         "sunrise": formatTime(daily.sunrise?.[0]) || "06:00",
                         "sunset": formatTime(daily.sunset?.[0]) || "18:00",
+                        "rawSunrise": daily.sunrise?.[0] || "",
+                        "rawSunset": daily.sunset?.[0] || "",
                         "uv": 0,
                         "pressure": Math.round(current.surface_pressure || 0),
                         "precipitationProbability": Math.round(daily.precipitation_probability_max?.[0] || 0),

quickshell/VERSION

@@ -1 +1 @@
-v1.2-unstable
+v1.2.3

quickshell/Widgets/CachingImage.qml

@@ -34,7 +34,10 @@ Image {
             return;
         }
         Paths.mkdir(Paths.imagecache);
-        source = cachePath || encodedImagePath;
+        const hash = djb2Hash(imagePath);
+        const cPath = hash ? `${Paths.stringify(Paths.imagecache)}/${hash}@${maxCacheSize}x${maxCacheSize}.png` : "";
+        const encoded = "file://" + imagePath.split('/').map(s => encodeURIComponent(s)).join('/');
+        source = cPath || encoded;
     }
 
     onStatusChanged: {

quickshell/Widgets/DankButtonGroup.qml

@@ -94,10 +94,10 @@ Flow {
             border.color: "transparent"
             border.width: 0
 
-            topLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : 4
-            bottomLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : 4
-            topRightRadius: (visualLast || selected) ? Theme.cornerRadius : 4
-            bottomRightRadius: (visualLast || selected) ? Theme.cornerRadius : 4
+            topLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
+            bottomLeftRadius: (visualFirst || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
+            topRightRadius: (visualLast || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
+            bottomRightRadius: (visualLast || selected) ? Theme.cornerRadius : Math.min(4, Theme.cornerRadius)
 
             Behavior on width {
                 enabled: root.userInteracted

quickshell/Widgets/DankNFIcon.qml

@@ -26,6 +26,8 @@ Item {
             "endeavouros": "\u{f322}",
             "manjaro": "\u{f160a}",
             "opensuse": "\u{f314}",
+            "artix": "\u{f31f}",
+            "void": "\u{f32e}",
 
             // --- special types ---
             "folder": "\u{F024B}",

quickshell/Widgets/DankPopout.qml

@@ -96,7 +96,7 @@ Item {
         setBarContext(pos, bottomGap);
     }
 
-    readonly property bool useBackgroundWindow: true
+    readonly property bool useBackgroundWindow: !CompositorService.isHyprland || CompositorService.useHyprlandFocusGrab
 
     function open() {
         if (!screen)
@@ -304,20 +304,37 @@ Item {
         anchors {
             left: true
             top: true
+            right: !useBackgroundWindow
+            bottom: !useBackgroundWindow
         }
 
         WlrLayershell.margins {
-            left: root.alignedX - shadowBuffer
-            top: root.alignedY - shadowBuffer
+            left: useBackgroundWindow ? (root.alignedX - shadowBuffer) : 0
+            top: useBackgroundWindow ? (root.alignedY - shadowBuffer) : 0
         }
 
-        implicitWidth: root.alignedWidth + (shadowBuffer * 2)
-        implicitHeight: root.alignedHeight + (shadowBuffer * 2)
+        implicitWidth: useBackgroundWindow ? (root.alignedWidth + (shadowBuffer * 2)) : 0
+        implicitHeight: useBackgroundWindow ? (root.alignedHeight + (shadowBuffer * 2)) : 0
+
+        MouseArea {
+            anchors.fill: parent
+            enabled: !useBackgroundWindow && shouldBeVisible && backgroundInteractive
+            acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
+            z: -1
+            onClicked: mouse => {
+                const clickX = mouse.x;
+                const clickY = mouse.y;
+                const outsideContent = clickX < root.alignedX || clickX > root.alignedX + root.alignedWidth || clickY < root.alignedY || clickY > root.alignedY + root.alignedHeight;
+                if (!outsideContent)
+                    return;
+                backgroundClicked();
+            }
+        }
 
         Item {
             id: contentContainer
-            x: shadowBuffer
-            y: shadowBuffer
+            x: useBackgroundWindow ? shadowBuffer : root.alignedX
+            y: useBackgroundWindow ? shadowBuffer : root.alignedY
             width: root.alignedWidth
             height: root.alignedHeight
 

quickshell/Widgets/DankTextField.qml

@@ -32,6 +32,8 @@ StyledRect {
     property color leftIconColor: Theme.surfaceVariantText
     property color leftIconFocusedColor: Theme.primary
     property bool showClearButton: false
+    property bool showPasswordToggle: false
+    property bool passwordVisible: false
     property color backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
     property color focusedBorderColor: Theme.primary
     property color normalBorderColor: Theme.outlineMedium
@@ -40,7 +42,14 @@ StyledRect {
     property int focusedBorderWidth: 2
     property real cornerRadius: Theme.cornerRadius
     readonly property real leftPadding: Theme.spacingM + (leftIconName ? leftIconSize + Theme.spacingM : 0)
-    readonly property real rightPadding: Theme.spacingM + (showClearButton && text.length > 0 ? 24 + Theme.spacingM : 0)
+    readonly property real rightPadding: {
+        let p = Theme.spacingM;
+        if (showPasswordToggle)
+            p += 24 + Theme.spacingS;
+        if (showClearButton && text.length > 0)
+            p += 24 + Theme.spacingS;
+        return p;
+    }
     property real topPadding: Theme.spacingM
     property real bottomPadding: Theme.spacingM
     property bool ignoreLeftRightKeys: false
@@ -97,8 +106,8 @@ StyledRect {
 
         anchors.left: leftIcon.visible ? leftIcon.right : parent.left
         anchors.leftMargin: Theme.spacingM
-        anchors.right: clearButton.visible ? clearButton.left : parent.right
-        anchors.rightMargin: Theme.spacingM
+        anchors.right: rightButtonsRow.left
+        anchors.rightMargin: rightButtonsRow.visible ? Theme.spacingS : Theme.spacingM
         anchors.top: parent.top
         anchors.topMargin: root.topPadding
         anchors.bottom: parent.bottom
@@ -151,33 +160,64 @@ StyledRect {
         }
     }
 
-    StyledRect {
-        id: clearButton
+    Row {
+        id: rightButtonsRow
 
-        width: 24
-        height: 24
-        radius: 12
-        color: clearArea.containsMouse ? Theme.outlineStrong : "transparent"
         anchors.right: parent.right
         anchors.rightMargin: Theme.spacingM
         anchors.verticalCenter: parent.verticalCenter
-        visible: showClearButton && text.length > 0
+        spacing: Theme.spacingXS
+        visible: showPasswordToggle || (showClearButton && text.length > 0)
 
-        DankIcon {
-            anchors.centerIn: parent
-            name: "close"
-            size: 16
-            color: clearArea.containsMouse ? Theme.outline : Theme.surfaceVariantText
+        StyledRect {
+            id: passwordToggleButton
+
+            width: 24
+            height: 24
+            radius: 12
+            color: passwordToggleArea.containsMouse ? Theme.outlineStrong : "transparent"
+            visible: showPasswordToggle
+
+            DankIcon {
+                anchors.centerIn: parent
+                name: passwordVisible ? "visibility_off" : "visibility"
+                size: 16
+                color: passwordToggleArea.containsMouse ? Theme.outline : Theme.surfaceVariantText
+            }
+
+            MouseArea {
+                id: passwordToggleArea
+
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onClicked: passwordVisible = !passwordVisible
+            }
         }
 
-        MouseArea {
-            id: clearArea
+        StyledRect {
+            id: clearButton
 
-            anchors.fill: parent
-            hoverEnabled: true
-            cursorShape: Qt.PointingHandCursor
-            onClicked: {
-                textInput.text = "";
+            width: 24
+            height: 24
+            radius: 12
+            color: clearArea.containsMouse ? Theme.outlineStrong : "transparent"
+            visible: showClearButton && text.length > 0
+
+            DankIcon {
+                anchors.centerIn: parent
+                name: "close"
+                size: 16
+                color: clearArea.containsMouse ? Theme.outline : Theme.surfaceVariantText
+            }
+
+            MouseArea {
+                id: clearArea
+
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onClicked: textInput.text = ""
             }
         }
     }

quickshell/Widgets/KeybindItem.qml

@@ -1,4 +1,4 @@
-pragma ComponentBehavior
+pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
@@ -1273,6 +1273,7 @@ Item {
                             spacing: Theme.spacingM
 
                             RowLayout {
+                                visible: optionsRow.argConfig?.base !== "screenshot-window"
                                 spacing: Theme.spacingXS
 
                                 DankToggle {
@@ -1441,8 +1442,9 @@ Item {
                         onTextChanged: {
                             if (root._actionType !== "shell")
                                 return;
+                            var shell = Actions.getShellFromAction(root.editAction);
                             root.updateEdit({
-                                "action": Actions.buildShellAction(KeybindsService.currentProvider, text)
+                                "action": Actions.buildShellAction(KeybindsService.currentProvider, text, shell)
                             });
                         }
                     }

quickshell/matugen/configs/mangowc.toml

@@ -1,3 +1,4 @@
 [templates.dmsmango]
 input_path = 'SHELL_DIR/matugen/templates/mango-colors.conf'
 output_path = 'CONFIG_DIR/mango/dms/colors.conf'
+post_hook = 'sh -c "mmsg -d reload_config 2>&1 || true"'

quickshell/matugen/templates/vscode-color-theme-dark.json

@@ -23,7 +23,7 @@
     // Focus + active indicators
     //
     "focusBorder": "{{colors.primary.dark.hex}}",
-    "selection.background": "{{colors.primary_container.dark.hex}}66",
+    "selection.background": "{{colors.primary_container.dark.hex}}99",
     //
     // Title bar, activity bar, sidebar
     //
@@ -127,7 +127,7 @@
     "editor.lineHighlightBackground": "{{colors.surface_container.dark.hex}}66",
     "editor.wordHighlightBackground": "{{colors.secondary.dark.hex}}22",
     "editor.wordHighlightStrongBackground": "{{colors.tertiary.dark.hex}}22",
-    "editor.selectionBackground": "{{colors.primary_container.dark.hex}}66",
+    "editor.selectionBackground": "{{colors.primary_container.dark.hex}}99",
     "editor.inactiveSelectionBackground": "{{colors.primary_container.dark.hex}}33",
     "editorWhitespace.foreground": "{{colors.outline.dark.hex}}66",
     "editorIndentGuide.background1": "{{colors.outline.dark.hex}}33",
@@ -186,7 +186,8 @@
     "terminal.ansiBrightBlue": "{{dank16.color12.dark.hex}}",
     "terminal.ansiBrightMagenta": "{{dank16.color13.dark.hex}}",
     "terminal.ansiBrightCyan": "{{dank16.color14.dark.hex}}",
-    "terminal.ansiBrightWhite": "{{dank16.color15.dark.hex}}"
+    "terminal.ansiBrightWhite": "{{dank16.color15.dark.hex}}",
+    "terminal.selectionBackground": "{{colors.primary_container.dark.hex}}99"
   },
   //
   // Token colors